Merge pull request #178 from PhysShell/claude/griff-task-erqa7z

feat(tonal): S15 Phase 2 — explicit scoped tonal context (accepted)

Accepted, closed and frozen at 8799b55 after three independent review rounds;
closure recorded in 1172b0d. Independent CI green on the PR: 15/15 checks.

Carried, not consumed: generation, pitch selection, reranking, and cadence are
unchanged, and the S6 chain baseline golden is untouched.

Author: PhysShell

cli/src/main.rs

@@ -908,6 +908,10 @@ fn phrase_reasons(r: boundary::BoundaryReason) -> String {
 /// and novelty has nothing to measure against (all candidates read fully
 /// novel). With `--corpus`, rhythm templates, novelty references, and the
 /// burst/rest gesture ask come from the curated chunks.
+// `tonal: _` is deliberate over `..`: the field is named so a `RankedSet` shape
+// change still breaks this command's compilation, while the value is explicitly
+// not reported.
+#[allow(clippy::unneeded_field_pattern)]
 fn cmd_generate(input: &Path, output: &Path, opts: &GenerateOpts<'_>) -> Result<(), CliError> {
     let GenerateOpts {
         seed,
@@ -960,6 +964,9 @@ fn cmd_generate(input: &Path, output: &Path, opts: &GenerateOpts<'_>) -> Result<
             bars,
             variants_per_strategy: candidates,
             gesture: !no_gesture,
+            // No `--tonal-scope` flag exists: the scope is a caller's choice
+            // and `griff generate` does not make one (S15 Phase 2).
+            tonal: None,
         },
         plan.as_ref().map(|p| p.templates.as_slice()),
     )?;
@@ -970,6 +977,10 @@ fn cmd_generate(input: &Path, output: &Path, opts: &GenerateOpts<'_>) -> Result<
         rhythm_explicit,
         gesture,
         policy,
+        // Carried through the pass but not reported: `griff generate` never
+        // supplies a tonal context (there is no scope flag), and printing an
+        // always-`None` line would be a CLI output change S15 Phase 2 forbids.
+        tonal: _,
     } = &set;
 
     if *rhythm_explicit {

cockpit/src/generation.rs

@@ -137,6 +137,9 @@ impl GeneratePanel {
             bars: self.bars,
             variants_per_strategy: self.variants,
             gesture: self.gesture,
+            // The Generate panel exposes no scope control yet (S15 Phase 2 is
+            // the carriage, not the UI), so the ask carries no tonal context.
+            tonal: None,
         }
     }
 

core/src/candidate_chain.rs

@@ -2097,6 +2097,7 @@ mod tests {
             rhythm_explicit: false,
             gesture: None,
             policy: s6_policy(),
+            tonal: None,
         }
     }
 
@@ -2428,6 +2429,7 @@ mod tests {
             bars: 4,
             variants_per_strategy: 2,
             gesture: false,
+            tonal: None,
         };
         let set = ranked_candidates(&source, None, &ask, None).expect("the pass runs");
         let a = plan_candidate_chain(&set).expect("plans");

core/src/generation_input.rs

@@ -19,6 +19,7 @@ use crate::rerank;
 use crate::score::{AtomEvent, Score, Track};
 use crate::scoring::{Scored, WeightPolicy};
 use crate::slice;
+use crate::tonal::TonalContext;
 
 /// Why building a generation input failed.
 #[derive(Debug)]
@@ -170,6 +171,18 @@ pub struct GenerationAsk {
     /// Carve the corpus's burst/rest gesture. Ignored without a corpus, and
     /// when no chunk carries gesture stats — a pass never invents a gesture.
     pub gesture: bool,
+    /// An explicitly scoped tonal estimate to record with the pass, or `None`.
+    ///
+    /// **Carried, not consumed** (S15 Phase 2): the pass reads no pitch, no
+    /// palette, and no weight from it, so a set generated with a context is
+    /// byte-identical to one generated without. It travels so a session, a
+    /// candidate record, or a frontend can say which scope's estimate was on
+    /// the table, and reproduce it.
+    ///
+    /// The core never measures one on the caller's behalf — the scope is a
+    /// human/frontend choice ([`TonalContext::measure`]), and `None` means the
+    /// caller supplied no context, never that the source has no key.
+    pub tonal: Option<TonalContext>,
 }
 
 /// A ranked candidate set and the input it was generated from — enough to show
@@ -194,6 +207,10 @@ pub struct RankedSet {
     pub gesture: Option<GestureControl>,
     /// The rerank policy the aggregates were scored under.
     pub policy: WeightPolicy,
+    /// The tonal context the ask carried, verbatim — `None` when it carried
+    /// none. Provenance only: nothing in the pass consulted it, and a pass that
+    /// was given none reports none rather than measuring a default.
+    pub tonal: Option<TonalContext>,
 }
 
 /// Generates and reranks the full candidate set for `score` under `ask`.
@@ -264,6 +281,8 @@ pub fn ranked_candidates(
         rhythm_explicit: explicit.is_some(),
         gesture,
         policy,
+        // Echoed, never read: the pass above is the Phase-1 pass, unchanged.
+        tonal: ask.tonal,
     })
 }