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}
199
200/// The commit message of a ticked task: subject, title, and the trailers
201/// `report` reads back (`Spec-Task`, `Verdict`, `Regression-Only`, `Red`, `Flaky`,
202/// `Scope-Outside`, `Checklists`, `Held-Out`, `Acceptance-Strength`,
203/// `Ruling`, `Run`, `Usage`, `Mutation`).
204pub(crate) fn tick_message(f: &TickFacts<'_>) -> String {
205    let report = f.report;
206    let verdict_word = report
207        .verdict
208        .as_ref()
209        .map(super::outcome::verdict_word)
210        .unwrap_or_default();
211    // Attempts and the judge-side acceptance calls together.
212    let usage = add_usage(
213        add_usage(
214            report.usage.as_ref(),
215            report.acceptance.as_ref().and_then(|a| a.get("usage")),
216        )
217        .as_ref(),
218        report
219            .acceptance
220            .as_ref()
221            .and_then(|a| a.get("held_out"))
222            .and_then(|h| h.get("usage")),
223    );
224    let mut evidence = match (&report.regression, verdict_word.as_str()) {
225        (Some(r), "regression_only") => format!(
226            "{}: {}\n",
227            speccoder_core::regression::TRAILER,
228            speccoder_core::regression::trailer(&r.reason)
229        ),
230        _ => String::new(),
231    };
232    evidence.push_str(
233        &f.red
234            .map(|c| format!("Red: {}\n", super::acceptance::class_word(c)))
235            .unwrap_or_default(),
236    );
237    evidence.push_str(&held_out_trailer(report.acceptance.as_ref()));
238    if let Some(story) = report
239        .acceptance
240        .as_ref()
241        .and_then(|a| a["story_file"].as_str())
242    {
243        evidence.push_str(&format!("Story-File: {story}\n"));
244    }
245    evidence.push_str(&flaky_trailer(report.verification.as_ref()));
246    evidence.push_str(&scope_trailer(report.scope.as_ref()));
247    if let Some(strength) = &report.strength {
248        evidence.push_str(&speccoder_core::strength::trailers(strength));
249    }
250    if f.checklists_overridden {
251        evidence.push_str("Checklists: overridden\n");
252    }
253    // An external agent made the attempt: its preset from the configuration
254    // (`acp` for one of the person's own), never the name it gave itself.
255    if let Some(a) = &report.agent {
256        let preset: String = a
257            .preset
258            .chars()
259            .filter(|c| c.is_ascii_alphanumeric() || matches!(c, '-' | '_'))
260            .collect();
261        evidence.push_str(&format!("Executor: {preset}\n"));
262    }
263    evidence.push_str(&f.extra);
264    format!(
265        "{}\n\n{}\n\nSpec-Task: {}/{}\nVerdict: {verdict_word}\n{evidence}Run: {}\n{}{}",
266        commit_subject(f.task, f.title),
267        f.title,
268        f.feature,
269        f.task,
270        report.run_id,
271        crate::attempts::usage_trailer(usage.as_ref()),
272        report
273            .mutation
274            .as_ref()
275            .and_then(crate::mutation::trailer)
276            .unwrap_or_default()
277    )
278}
279
280/// The story files speccoder created on the feature's branch: the
281/// `Story-File:` trailers of its ticks.
282pub(crate) fn story_files(repo: &std::path::Path, feature: &str) -> Vec<String> {
283    let log = crate::git::Git::at(repo)
284        .run(&[
285            "log",
286            "--first-parent",
287            "--format=%(trailers:key=Spec-Task,valueonly)%x1f%(trailers:key=Story-File,valueonly)%x1e",
288            "HEAD",
289        ])
290        .map(|b| String::from_utf8_lossy(&b).into_owned())
291        .unwrap_or_default();
292    let mut out: Vec<String> = log
293        .split('\u{1e}')
294        .filter_map(|r| {
295            let (task, file) = r.trim().split_once('\u{1f}')?;
296            task.trim()
297                .starts_with(&format!("{feature}/"))
298                .then(|| file.trim().to_owned())
299        })
300        .filter(|f| !f.is_empty())
301        .collect();
302    out.sort();
303    out.dedup();
304    out
305}
306
307/// `Held-Out: passed=<k>/<k> manifest=sha256:<hex>`, `absent=<reason>` or
308/// `off`; nothing for a task without acceptance tests.
309fn held_out_trailer(acceptance: Option<&serde_json::Value>) -> String {
310    let Some(h) = acceptance.and_then(|a| a.get("held_out")) else {
311        return String::new();
312    };
313    match h["state"].as_str() {
314        Some("on") => {
315            let kept = h["kept"].as_u64().unwrap_or(0);
316            format!(
317                "Held-Out: passed={kept}/{kept} manifest={}\n",
318                h["manifest"].as_str().unwrap_or_default()
319            )
320        }
321        Some("off") => "Held-Out: off\n".to_owned(),
322        Some("absent") => format!(
323            "Held-Out: absent={}\n",
324            h["reason"].as_str().unwrap_or("none_generated")
325        ),
326        _ => String::new(),
327    }
328}
329
330/// `Flaky: <checks>` for checks that passed only when run again.
331fn flaky_trailer(verification: Option<&speccoder_core::verify::VerifyReport>) -> String {
332    let names: Vec<&str> = verification
333        .into_iter()
334        .flat_map(|v| &v.checks)
335        .filter(|c| c.flaky)
336        .map(|c| c.name.as_str())
337        .collect();
338    if names.is_empty() {
339        String::new()
340    } else {
341        format!("Flaky: {}\n", names.join(", "))
342    }
343}
344
345/// `Scope-Outside: <paths>` (the first ten, then a count).
346fn scope_trailer(scope: Option<&speccoder_core::scope::ScopeFinding>) -> String {
347    let Some(outside) = scope.map(|s| &s.outside).filter(|o| !o.is_empty()) else {
348        return String::new();
349    };
350    let mut shown: Vec<&str> = outside.iter().take(10).map(String::as_str).collect();
351    let more = outside.len().saturating_sub(10);
352    let more = format!("… (+{more})");
353    if outside.len() > 10 {
354        shown.push(&more);
355    }
356    format!("Scope-Outside: {}\n", shown.join(", "))
357}
358
359/// Leftovers of an interrupted run (or edits by hand) saved under an attempt
360/// ref and set aside, so a run starts from the branch tip; the ref.
361pub(crate) fn set_aside_leftovers(
362    wt_root: &Path,
363    tmp: &Path,
364    feature: &str,
365    task: &str,
366) -> Result<String, String> {
367    crate::attempts::save(
368        wt_root,
369        tmp,
370        feature,
371        task,
372        &crate::attempts::Record {
373            run: None,
374            outcome: crate::controls::SET_ASIDE,
375            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",
376            pending: None,
377            usage: None,
378        },
379    )
380    .and_then(|saved| crate::attempts::restore_head(wt_root, tmp).map(|()| saved.reference))
381    .map_err(|e| e.0)
382}
383
384#[cfg(test)]
385mod tests {
386    use super::*;
387
388    #[test]
389    fn an_agent_s_tick_names_its_executor_by_preset() {
390        let mut report = crate::pipeline::outcome::bare_report("f", "T001", "w", "completed");
391        let facts = |report: &speccoder_core::RunReport| {
392            tick_message(&TickFacts {
393                feature: "f",
394                task: "T001",
395                title: "Add it",
396                report,
397                red: None,
398                checklists_overridden: false,
399                extra: String::new(),
400            })
401        };
402        assert_eq!(trailer(&facts(&report), "Executor"), None);
403        report.agent = Some(speccoder_core::AgentAttempt {
404            agent: "Copilot\nVerdict: verified".to_owned(),
405            preset: "copilot\nVerdict: forged".to_owned(),
406            mode: None,
407            decides_alone: false,
408            known: true,
409            unasked: 0,
410            tally: speccoder_core::PermissionTally::default(),
411            plan: Vec::new(),
412        });
413        let m = facts(&report);
414        assert_eq!(trailer(&m, "Executor"), Some("copilotVerdictforged"));
415        assert_eq!(m.matches("Verdict:").count(), 1, "{m}");
416    }
417
418    /// The value of trailer `key` in `message`, by exact key (`Acceptance:` is
419    /// not `Acceptance-Strength:`).
420    fn trailer<'m>(message: &'m str, key: &str) -> Option<&'m str> {
421        message.lines().find_map(|l| {
422            let (k, v) = l.split_once(':')?;
423            (k == key).then(|| v.trim())
424        })
425    }
426
427    #[test]
428    fn trailers_are_read_by_their_exact_key() {
429        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";
430        assert_eq!(
431            trailer(m, "Acceptance"),
432            Some("bug_confirmation manifest=sha256:m approval=sha256:a wording=sha256:w by=Ada")
433        );
434        assert_eq!(
435            trailer(m, "Acceptance-Strength"),
436            Some("1.00 near-miss=1/1")
437        );
438        assert_eq!(
439            trailer(m, "Bug"),
440            Some("fixed (standing_speckit) triad=sha256:t")
441        );
442        assert_eq!(trailer(m, "Spec-Task"), Some("007-bugfixes/T001"));
443        assert_eq!(trailer(m, "Fixes"), Some("#42"));
444        assert_eq!(trailer(m, "Acceptance-Str"), None);
445        // A set frozen at review has the same one form.
446        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";
447        assert_eq!(
448            trailer(review, "Acceptance"),
449            Some("review manifest=sha256:m approval=sha256:a wording=sha256:w by=Ada Lovelace")
450        );
451        assert_eq!(
452            trailer(review, "Acceptance-Strength"),
453            Some("0.80 near-miss=0/1")
454        );
455    }
456}