Skip to main content

speccoder_runtime/pipeline/
commit.rs

1//! Commit messages, trailers and the records a finished attempt leaves.
2
3use std::path::Path;
4
5use crate::{approvals, git, tools};
6
7/// The monitor's findings in one line: `kind: evidence; …`.
8pub(crate) fn monitor_summary(monitor: Option<&serde_json::Value>) -> String {
9    monitor
10        .and_then(|m| m["findings"].as_array())
11        .map(|f| {
12            f.iter()
13                .map(|x| {
14                    format!(
15                        "{}: {}",
16                        x["kind"].as_str().unwrap_or("other"),
17                        x["evidence"]
18                            .as_str()
19                            .unwrap_or_default()
20                            .split_whitespace()
21                            .collect::<Vec<_>>()
22                            .join(" ")
23                    )
24                })
25                .collect::<Vec<_>>()
26                .join("; ")
27        })
28        .filter(|s| !s.is_empty())
29        .unwrap_or_else(|| "no details given".to_owned())
30}
31
32/// Inline "for this task" approvals become task decisions of this run, as
33/// if made with `speccoder task approve`, so a retry or a later attempt of
34/// the run is not asked again — and a later run is.
35///
36/// # Errors
37///
38/// The decisions file cannot be read or written: the attempt's decisions
39/// are not recorded (later attempts ask again), and the caller says so.
40pub(crate) fn record_inline_approvals(
41    dir: &Path,
42    feature: &str,
43    task: &str,
44    calls: &[serde_json::Value],
45    run_grants: &std::sync::Mutex<Vec<tools::policy::Object>>,
46    run: &str,
47) -> Result<(), String> {
48    // Every decision a person made in this attempt, with who made it and how
49    // far it reaches; calls an earlier decision allowed (`*-grant`) are not
50    // new decisions.
51    let decided: Vec<approvals::Decided> = calls
52        .iter()
53        .filter(|c| c["approved_by"] == "person" || c["rejected_by"] == "person")
54        .filter(|c| !c["scope"].as_str().is_some_and(|s| s.ends_with("-grant")))
55        .filter_map(|c| {
56            let object: tools::policy::Object = serde_json::from_value(c["object"].clone()).ok()?;
57            let by = serde_json::from_value::<approvals::Who>(c["approver"].clone())
58                .unwrap_or_else(|_| approvals::Who {
59                    name: "unknown".to_owned(),
60                    via: "inline".to_owned(),
61                    client: None,
62                    basis: "asserted".to_owned(),
63                });
64            let approved = c["approved_by"] == "person";
65            Some(approvals::Decided {
66                verb: if approved { "approve" } else { "reject" }.to_owned(),
67                object: Some(object),
68                run: Some(run.to_owned()),
69                reason: c["rejection"].as_str().map(str::to_owned),
70                scope: c["scope"].as_str().unwrap_or("once").to_owned(),
71                note: c["note"].as_str().map(str::to_owned),
72                by,
73                at: std::time::SystemTime::now()
74                    .duration_since(std::time::UNIX_EPOCH)
75                    .map_or(0, |d| d.as_secs()),
76            })
77        })
78        .collect();
79    if decided.is_empty() {
80        return Ok(());
81    }
82    let mut d = approvals::Decisions::load(dir)?;
83    for decision in decided {
84        match (decision.verb.as_str(), decision.scope.as_str()) {
85            // For the task: it joins the task's approvals, for later attempts.
86            ("approve", "task") => {
87                let Some(object) = decision.object.clone() else {
88                    continue;
89                };
90                d.approve(feature, task, object, Some(run), &decision.by);
91                if let Some(last) = d
92                    .tasks
93                    .get_mut(&format!("{feature}/{task}"))
94                    .and_then(|t| t.decided.last_mut())
95                {
96                    last.note.clone_from(&decision.note);
97                }
98            }
99            // For this run: every later task of the run; the history only.
100            ("approve", "run") => {
101                if let (Ok(mut g), Some(object)) = (run_grants.lock(), &decision.object)
102                    && !g.contains(object)
103                {
104                    g.push(object.clone());
105                }
106                d.note(feature, task, decision);
107            }
108            _ => d.note(feature, task, decision),
109        }
110    }
111    d.save(dir)
112}
113
114/// Sums two token usage objects key by key.
115pub(crate) fn add_usage(
116    a: Option<&serde_json::Value>,
117    b: Option<&serde_json::Value>,
118) -> Option<serde_json::Value> {
119    match (a, b) {
120        (None, b) => b.cloned(),
121        (a, None) => a.cloned(),
122        (Some(a), Some(b)) => {
123            let mut sum = serde_json::Map::new();
124            for key in [
125                "input_tokens",
126                "output_tokens",
127                "cache_read_tokens",
128                "cache_write_tokens",
129            ] {
130                let n = a[key].as_u64().unwrap_or(0) + b[key].as_u64().unwrap_or(0);
131                sum.insert(key.to_owned(), serde_json::json!(n));
132            }
133            Some(serde_json::Value::Object(sum))
134        }
135    }
136}
137
138/// Commits everything in the worktree on its branch with speccoder's
139/// identity, without hooks; returns the commit id. Never pushes.
140pub(crate) fn commit_attempt(worktree: &Path, message: &str) -> Result<String, String> {
141    commit_attempt_as(worktree, message, false)
142}
143
144/// [`commit_attempt`]; `allow_empty` records a verdict whose work touched no
145/// tracked file (in place, the tick lives in a git-ignored `tasks.md`).
146pub(crate) fn commit_attempt_as(
147    worktree: &Path,
148    message: &str,
149    allow_empty: bool,
150) -> Result<String, String> {
151    let g = git::Git::at(worktree);
152    let base = [
153        "-c",
154        "user.name=speccoder",
155        "-c",
156        "user.email=speccoder@users.noreply.invalid",
157        "-c",
158        "commit.gpgsign=false",
159    ];
160    // Never a file copied from the checkout ([worktree] include), whatever
161    // the ignore rules say; the index is checked again before the commit.
162    let excluded = crate::include::pathspecs(worktree);
163    let mut add = base.to_vec();
164    add.extend(["add", "-A", "--", ":/"]);
165    add.extend(excluded.iter().map(String::as_str));
166    g.run(&add).map_err(|e| e.0)?;
167    crate::include::check_staged(worktree)?;
168    let mut commit = base.to_vec();
169    commit.extend(["commit", "-q", "--no-verify", "-m", message]);
170    if allow_empty {
171        commit.push("--allow-empty");
172    }
173    g.run(&commit).map_err(|e| e.0)?;
174    g.line(&["rev-parse", "HEAD"]).map_err(|e| e.0)
175}
176
177/// `speccoder: T004 <title>` cut to 72 characters on a char boundary.
178pub(crate) fn commit_subject(task: &str, title: &str) -> String {
179    let full = format!("speccoder: {task} {title}");
180    if full.chars().count() <= 72 {
181        return full;
182    }
183    let cut: String = full.chars().take(71).collect();
184    format!("{}…", cut.trim_end())
185}
186
187/// What a tick's commit message is made of.
188pub(crate) struct TickFacts<'a> {
189    pub(crate) feature: &'a str,
190    pub(crate) task: &'a str,
191    pub(crate) title: &'a str,
192    pub(crate) report: &'a speccoder_core::RunReport,
193    /// The kind of red the acceptance tests showed, when they did.
194    pub(crate) red: Option<speccoder_core::verify::RedClass>,
195    pub(crate) checklists_overridden: bool,
196    /// More trailers (a bug task's `Bug:`, `Acceptance:`, `Fixes`).
197    pub(crate) extra: String,
198    /// The story's scenarios as worded now: what `Scenarios:` digests.
199    pub(crate) scenarios: &'a [speccoder_core::spec::ScenarioRef],
200}
201
202/// The scenarios a verified tick's acceptance tests cite, once each in the
203/// order cited, each as a digest of its id and wording: `Scenarios:
204/// US3-1@3f9a0c1d2e4b, …` (the id kept for a reader where it is one plain
205/// word; an OpenSpec scenario's name is not). The story's checkpoint no
206/// longer has to judge them while they are worded the same.
207pub(crate) fn scenarios_trailer(
208    acceptance: Option<&serde_json::Value>,
209    scenarios: &[speccoder_core::spec::ScenarioRef],
210) -> String {
211    let mut cited: Vec<&str> = Vec::new();
212    for t in acceptance
213        .and_then(|a| a["tests"].as_array())
214        .into_iter()
215        .flatten()
216    {
217        for s in t["scenarios"].as_array().into_iter().flatten() {
218            if let Some(s) = s.as_str().filter(|s| !cited.contains(s)) {
219                cited.push(s);
220            }
221        }
222    }
223    let plain = |id: &str| {
224        !id.is_empty()
225            && id
226                .chars()
227                .all(|c| c.is_ascii_alphanumeric() || matches!(c, '-' | '_' | '.'))
228    };
229    let marked: Vec<String> = cited
230        .iter()
231        .filter_map(|id| scenarios.iter().find(|s| s.id == *id))
232        .map(|s| {
233            let d = scenario_digest(&s.id, &s.text);
234            if plain(&s.id) {
235                format!("{}@{d}", s.id)
236            } else {
237                d
238            }
239        })
240        .collect();
241    if marked.is_empty() {
242        String::new()
243    } else {
244        format!("Scenarios: {}\n", marked.join(", "))
245    }
246}
247
248/// A scenario, digested: 12 hex of SHA-256 over its id, a NUL and its
249/// wording with runs of whitespace as one space.
250pub(crate) fn scenario_digest(id: &str, text: &str) -> String {
251    let words = text.split_whitespace().collect::<Vec<_>>().join(" ");
252    crate::integrity::sha256_hex(format!("{id}\0{words}").as_bytes())[..12].to_owned()
253}
254
255/// Per task of `feature`, the scenario digests its ticks on `rev`'s
256/// first-parent history recorded (`Scenarios:`, read by git's trailer
257/// parser) — the one reader the pipeline and the report share.
258pub(crate) fn verified_digests(
259    repo: &Path,
260    rev: &str,
261    feature: &str,
262) -> std::collections::BTreeMap<String, std::collections::BTreeSet<String>> {
263    let log = crate::git::Git::at(repo)
264        .run(&[
265            "log",
266            "--first-parent",
267            "--format=%(trailers:key=Spec-Task,valueonly,separator=%x20)%x1f%(trailers:key=Scenarios,valueonly,separator=%x20)%x1e",
268            rev,
269            "--",
270        ])
271        .map(|b| String::from_utf8_lossy(&b).into_owned())
272        .unwrap_or_default();
273    let mut out: std::collections::BTreeMap<String, std::collections::BTreeSet<String>> =
274        std::collections::BTreeMap::new();
275    for record in log.split('\u{1e}') {
276        let Some((task, marked)) = record.trim().split_once('\u{1f}') else {
277            continue;
278        };
279        let Some(task) = task.trim().strip_prefix(&format!("{feature}/")) else {
280            continue;
281        };
282        for token in marked.split(|c: char| c == ',' || c.is_whitespace()) {
283            let d = token.rsplit('@').next().unwrap_or_default();
284            if d.len() == 12 && d.bytes().all(|b| b.is_ascii_hexdigit()) {
285                out.entry(task.to_owned())
286                    .or_default()
287                    .insert(d.to_ascii_lowercase());
288            }
289        }
290    }
291    out
292}
293
294/// The commit message of a ticked task: subject, title, and the trailers
295/// `report` reads back (`Spec-Task`, `Verdict`, `Regression-Only`, `Red`, `Scenarios`, `Flaky`,
296/// `Scope-Outside`, `Checklists`, `Held-Out`, `Acceptance-Strength`,
297/// `Ruling`, `Run`, `Usage`, `Mutation`).
298pub(crate) fn tick_message(f: &TickFacts<'_>) -> String {
299    let report = f.report;
300    let verdict_word = report
301        .verdict
302        .as_ref()
303        .map(super::outcome::verdict_word)
304        .unwrap_or_default();
305    // Attempts and the judge-side acceptance calls together.
306    let usage = add_usage(
307        add_usage(
308            report.usage.as_ref(),
309            report.acceptance.as_ref().and_then(|a| a.get("usage")),
310        )
311        .as_ref(),
312        report
313            .acceptance
314            .as_ref()
315            .and_then(|a| a.get("held_out"))
316            .and_then(|h| h.get("usage")),
317    );
318    let mut evidence = match (&report.regression, verdict_word.as_str()) {
319        (Some(r), "regression_only") => format!(
320            "{}: {}\n",
321            speccoder_core::regression::TRAILER,
322            speccoder_core::regression::trailer(&r.reason)
323        ),
324        _ => String::new(),
325    };
326    evidence.push_str(
327        &f.red
328            .map(|c| format!("Red: {}\n", super::acceptance::class_word(c)))
329            .unwrap_or_default(),
330    );
331    evidence.push_str(&held_out_trailer(report.acceptance.as_ref()));
332    if verdict_word == "verified" {
333        evidence.push_str(&scenarios_trailer(report.acceptance.as_ref(), f.scenarios));
334    }
335    if let Some(story) = report
336        .acceptance
337        .as_ref()
338        .and_then(|a| a["story_file"].as_str())
339    {
340        evidence.push_str(&format!("Story-File: {story}\n"));
341    }
342    evidence.push_str(&flaky_trailer(report.verification.as_ref()));
343    evidence.push_str(&scope_trailer(report.scope.as_ref()));
344    if let Some(strength) = &report.strength {
345        evidence.push_str(&speccoder_core::strength::trailers(strength));
346    }
347    if f.checklists_overridden {
348        evidence.push_str("Checklists: overridden\n");
349    }
350    // An external agent made the attempt: its preset from the configuration
351    // (`acp` for one of the person's own), never the name it gave itself.
352    if let Some(a) = &report.agent {
353        let preset: String = a
354            .preset
355            .chars()
356            .filter(|c| c.is_ascii_alphanumeric() || matches!(c, '-' | '_'))
357            .collect();
358        evidence.push_str(&format!("Executor: {preset}\n"));
359    }
360    evidence.push_str(&f.extra);
361    format!(
362        "{}\n\n{}\n\nSpec-Task: {}/{}\nVerdict: {verdict_word}\n{evidence}Run: {}\n{}{}",
363        commit_subject(f.task, f.title),
364        f.title,
365        f.feature,
366        f.task,
367        report.run_id,
368        crate::attempts::usage_trailer(usage.as_ref()),
369        report
370            .mutation
371            .as_ref()
372            .and_then(crate::mutation::trailer)
373            .unwrap_or_default()
374    )
375}
376
377/// The story files speccoder created on the feature's branch: the
378/// `Story-File:` trailers of its ticks.
379pub(crate) fn story_files(repo: &std::path::Path, feature: &str) -> Vec<String> {
380    let log = crate::git::Git::at(repo)
381        .run(&[
382            "log",
383            "--first-parent",
384            "--format=%(trailers:key=Spec-Task,valueonly)%x1f%(trailers:key=Story-File,valueonly)%x1e",
385            "HEAD",
386        ])
387        .map(|b| String::from_utf8_lossy(&b).into_owned())
388        .unwrap_or_default();
389    let mut out: Vec<String> = log
390        .split('\u{1e}')
391        .filter_map(|r| {
392            let (task, file) = r.trim().split_once('\u{1f}')?;
393            task.trim()
394                .starts_with(&format!("{feature}/"))
395                .then(|| file.trim().to_owned())
396        })
397        .filter(|f| !f.is_empty())
398        .collect();
399    out.sort();
400    out.dedup();
401    out
402}
403
404/// `Held-Out: passed=<k>/<k> manifest=sha256:<hex>`, `absent=<reason>` or
405/// `off`; nothing for a task without acceptance tests.
406fn held_out_trailer(acceptance: Option<&serde_json::Value>) -> String {
407    let Some(h) = acceptance.and_then(|a| a.get("held_out")) else {
408        return String::new();
409    };
410    match h["state"].as_str() {
411        Some("on") => {
412            let kept = h["kept"].as_u64().unwrap_or(0);
413            format!(
414                "Held-Out: passed={kept}/{kept} manifest={}\n",
415                h["manifest"].as_str().unwrap_or_default()
416            )
417        }
418        Some("off") => "Held-Out: off\n".to_owned(),
419        Some("absent") => format!(
420            "Held-Out: absent={}\n",
421            h["reason"].as_str().unwrap_or("none_generated")
422        ),
423        _ => String::new(),
424    }
425}
426
427/// `Flaky: <checks>` for checks that passed only when run again.
428fn flaky_trailer(verification: Option<&speccoder_core::verify::VerifyReport>) -> String {
429    let names: Vec<&str> = verification
430        .into_iter()
431        .flat_map(|v| &v.checks)
432        .filter(|c| c.flaky)
433        .map(|c| c.name.as_str())
434        .collect();
435    if names.is_empty() {
436        String::new()
437    } else {
438        format!("Flaky: {}\n", names.join(", "))
439    }
440}
441
442/// `Scope-Outside: <paths>` (the first ten, then a count).
443fn scope_trailer(scope: Option<&speccoder_core::scope::ScopeFinding>) -> String {
444    let Some(outside) = scope.map(|s| &s.outside).filter(|o| !o.is_empty()) else {
445        return String::new();
446    };
447    let mut shown: Vec<&str> = outside.iter().take(10).map(String::as_str).collect();
448    let more = outside.len().saturating_sub(10);
449    let more = format!("… (+{more})");
450    if outside.len() > 10 {
451        shown.push(&more);
452    }
453    format!("Scope-Outside: {}\n", shown.join(", "))
454}
455
456/// Leftovers of an interrupted run (or edits by hand) saved under an attempt
457/// ref and set aside, so a run starts from the branch tip; the ref.
458pub(crate) fn set_aside_leftovers(
459    wt_root: &Path,
460    tmp: &Path,
461    feature: &str,
462    task: &str,
463) -> Result<String, String> {
464    crate::attempts::save(
465        wt_root,
466        tmp,
467        feature,
468        task,
469        &crate::attempts::Record {
470            run: None,
471            outcome: crate::controls::SET_ASIDE,
472            reason: "the worktree had uncommitted changes when a run started (an interrupted run, or edits by hand); saved and set aside — `speccoder task restore` keeps them, `task drop` discards them",
473            pending: None,
474            usage: None,
475            defer_to: None,
476        },
477    )
478    .and_then(|saved| crate::attempts::restore_head(wt_root, tmp).map(|()| saved.reference))
479    .map_err(|e| e.0)
480}
481
482#[cfg(test)]
483mod tests {
484    use super::*;
485
486    #[test]
487    fn an_agent_s_tick_names_its_executor_by_preset() {
488        let mut report = crate::pipeline::outcome::bare_report("f", "T001", "w", "completed");
489        let facts = |report: &speccoder_core::RunReport| {
490            tick_message(&TickFacts {
491                feature: "f",
492                task: "T001",
493                title: "Add it",
494                report,
495                red: None,
496                checklists_overridden: false,
497                extra: String::new(),
498                scenarios: &[],
499            })
500        };
501        assert_eq!(trailer(&facts(&report), "Executor"), None);
502        report.agent = Some(speccoder_core::AgentAttempt {
503            agent: "Copilot\nVerdict: verified".to_owned(),
504            preset: "copilot\nVerdict: forged".to_owned(),
505            mode: None,
506            decides_alone: false,
507            known: true,
508            unasked: 0,
509            tally: speccoder_core::PermissionTally::default(),
510            plan: Vec::new(),
511        });
512        let m = facts(&report);
513        assert_eq!(trailer(&m, "Executor"), Some("copilotVerdictforged"));
514        assert_eq!(m.matches("Verdict:").count(), 1, "{m}");
515    }
516
517    /// The value of trailer `key` in `message`, by exact key (`Acceptance:` is
518    /// not `Acceptance-Strength:`).
519    fn trailer<'m>(message: &'m str, key: &str) -> Option<&'m str> {
520        message.lines().find_map(|l| {
521            let (k, v) = l.split_once(':')?;
522            (k == key).then(|| v.trim())
523        })
524    }
525
526    #[test]
527    fn trailers_are_read_by_their_exact_key() {
528        let m = "speccoder: T001 fix\n\nSpec-Task: 007-bugfixes/T001\nVerdict: verified\nAcceptance-Strength: 1.00 near-miss=1/1\nAcceptance: bug_confirmation manifest=sha256:m approval=sha256:a wording=sha256:w by=Ada\nBug: fixed (standing_speckit) triad=sha256:t\nFixes: #42\n";
529        assert_eq!(
530            trailer(m, "Acceptance"),
531            Some("bug_confirmation manifest=sha256:m approval=sha256:a wording=sha256:w by=Ada")
532        );
533        assert_eq!(
534            trailer(m, "Acceptance-Strength"),
535            Some("1.00 near-miss=1/1")
536        );
537        assert_eq!(
538            trailer(m, "Bug"),
539            Some("fixed (standing_speckit) triad=sha256:t")
540        );
541        assert_eq!(trailer(m, "Spec-Task"), Some("007-bugfixes/T001"));
542        assert_eq!(trailer(m, "Fixes"), Some("#42"));
543        assert_eq!(trailer(m, "Acceptance-Str"), None);
544        // A set frozen at review has the same one form.
545        let review = "speccoder: T005 x\n\nAcceptance-Strength: 0.80 near-miss=0/1\nAcceptance: review manifest=sha256:m approval=sha256:a wording=sha256:w by=Ada Lovelace\n";
546        assert_eq!(
547            trailer(review, "Acceptance"),
548            Some("review manifest=sha256:m approval=sha256:a wording=sha256:w by=Ada Lovelace")
549        );
550        assert_eq!(
551            trailer(review, "Acceptance-Strength"),
552            Some("0.80 near-miss=0/1")
553        );
554    }
555}