@yagni-app/code-staging 1.2.7-staging.2059.1 → 1.2.7-staging.2069.1

package/dist/extension/pipeline/continuation.d.ts

@@ -29,11 +29,22 @@ export interface ContinuationInputs {
     reviewRoundsDone: number;
     /** The host's short code for why the earlier attempt stopped. */
     priorStop: string;
+    /**
+     * The attempt's base commit, which the cloud lane's host names (YAG-1042): a
+     * cloud execution starts past the earlier executions' commits, so its
+     * reviewer diffs the whole change from here. Absent from an older host's
+     * file, or when the value is not a commit id.
+     */
+    baseSha?: string;
 }
-/** Parse and validate the continue file's text; a reason when it cannot be used. */
+/**
+ * Parse and validate the continue file's text; a reason when it cannot be
+ * used. `ignored` says what a usable file carried that was dropped.
+ */
 export declare function parseContinuation(raw: string): {
     ok: true;
     value: ContinuationInputs;
+    ignored?: string;
 } | {
     ok: false;
     reason: string;

package/dist/extension/pipeline/continuation.js

@@ -20,7 +20,11 @@
 import { missionDesignContext } from "./mission.js";
 import { MAX_REVIEW_ROUNDS } from "./types.js";
 const CONTINUATION_STAGES = ["implement", "review", "fix", "verify"];
-/** Parse and validate the continue file's text; a reason when it cannot be used. */
+const COMMIT_SHA = /^[0-9a-f]{40}$/;
+/**
+ * Parse and validate the continue file's text; a reason when it cannot be
+ * used. `ignored` says what a usable file carried that was dropped.
+ */
 export function parseContinuation(raw) {
     let data;
     try {
@@ -48,9 +52,17 @@ export function parseContinuation(raw) {
         };
     }
     const priorStop = typeof obj.priorStop === "string" ? obj.priorStop.trim() : "";
+    // It reaches a shell command and a prompt, so only a commit id is read.
+    const baseSha = typeof obj.baseSha === "string" && COMMIT_SHA.test(obj.baseSha) ? obj.baseSha : undefined;
     return {
         ok: true,
-        value: { stageAtStop: stage, reviewRoundsDone: rounds, priorStop },
+        value: {
+            stageAtStop: stage,
+            reviewRoundsDone: rounds,
+            priorStop,
+            ...(baseSha ? { baseSha } : {}),
+        },
+        ...("baseSha" in obj && !baseSha ? { ignored: "its baseSha is not a commit id" } : {}),
     };
 }
 /** True when the earlier attempt got past implement, so the run re-enters the review loop. */
@@ -69,10 +81,14 @@ export function continuationReviewInput(continuation, mission, committed = false
     const stopped = `this build continues an earlier attempt that stopped during its ${continuation.stageAtStop ?? "unknown"} stage${why}. `;
     // A cloud execution starts from the attempt's pushed branch: the earlier
     // work is in its commits, not in the working tree.
+    const base = continuation.baseSha;
     const summary = committed
         ? `No implement summary: ${stopped}` +
-            "That attempt's change is committed on this branch. Review the whole change against the base commit the ticket names " +
-            "(`git diff <base>...HEAD`), plus anything `git status` lists."
+            (base
+                ? `That attempt's change is committed on this branch, past the attempt's base commit ${base}. Review the whole change against it ` +
+                    `(\`git diff ${base}\`, committed or not; \`git log ${base}..HEAD\` lists the commits), plus any new files \`git status\` lists.`
+                : "That attempt's change is committed on this branch. Review the whole change against the base commit the ticket names " +
+                    "(`git diff <base>...HEAD`), plus anything `git status` lists.")
         : `No implement summary: ${stopped}` +
             "That attempt's change is already in the working tree as uncommitted edits on top of HEAD. " +
             "Review the whole change against HEAD (`git diff HEAD`, plus any untracked files `git status` lists).";

package/dist/extension/pipeline/headlessGo.js

@@ -354,8 +354,12 @@ export async function runHeadlessGo(argv, deps = {}) {
     else if (args.continueFile) {
         const raw = read(args.continueFile, "continue file");
         const parsed = typeof raw === "string" ? parseContinuation(raw) : undefined;
-        if (parsed?.ok)
+        if (parsed?.ok) {
             continuation = parsed.value;
+            if (parsed.ignored) {
+                writeErr(`Ignoring part of --continue-file ${args.continueFile}: ${parsed.ignored}, so the reviewer reads the change with a bare \`git diff\`.`);
+            }
+        }
         else if (typeof raw !== "string")
             writeErr(`${raw.error}. Running as a normal mission.`);
         else if (parsed)
@@ -557,6 +561,18 @@ export async function runHeadlessGo(argv, deps = {}) {
     const baseSha = startTree?.head ?? "";
     const preRunDirt = startTree ? parseChangedPaths(startTree.status) : [];
     const onBase = baseSha ? { base: baseSha } : {};
+    // Its reviewer reads the change from that commit too (YAG-1041). A
+    // continuation starts past the attempt's earlier commits, so its start is
+    // not where the change begins: its reviewer reads from the attempt's base
+    // that `continue.json` names (YAG-1042), and an older host's file, which
+    // names none, keeps the bare `git diff`.
+    const diffBase = continuation ? continuation.baseSha : baseSha;
+    const reviewLane = lane && diffBase
+        ? {
+            ...lane,
+            stages: lane.stages.map((s) => (s.id === "review" ? { ...s, diffBase } : s)),
+        }
+        : lane;
     let gate;
     let lastVerify;
     // A cloud session's gate also runs the host's secret and binary scans on
@@ -606,7 +622,7 @@ export async function runHeadlessGo(argv, deps = {}) {
         ...(budget ? { budget } : {}),
         ...(deps.stages ? { stages: deps.stages } : {}),
         grounded: deps.grounded ?? grounding,
-        ...(lane ? { lane } : {}),
+        ...(reviewLane ? { lane: reviewLane } : {}),
         ...(mission ? { mission } : {}),
         ...(runVerify ? { runVerify } : {}),
         ...(baseline ? { runWorkstreamCheck: makeWorkstreamCheck({ baseline }) } : {}),

package/dist/extension/pipeline/personas.d.ts

@@ -50,10 +50,11 @@ export declare function builderPersonaClause(workstream?: PartitionWorkstream, s
  * Resolve the system-prompt body for a stage. For non-review stages this is the
  * role body; for the review stage it appends the lens-specific clause (or, with
  * no lens, the one-reviewer clause covering all three) and the required
- * findings output contract so the reviewer's output parses. A stage carrying a
- * `personaClause` (the fan-out builders) gets it appended last, and one
- * carrying a `persona` (the cloud plan stage's host persona) runs with that in
- * place of its agent's body.
+ * findings output contract so the reviewer's output parses. A review carrying
+ * a `diffBase` (a cloud session's) diffs from that commit in its first step. A
+ * stage carrying a `personaClause` (the fan-out builders) gets it appended
+ * last, and one carrying a `persona` (the cloud plan stage's host persona)
+ * runs with that in place of its agent's body.
  *
  * `grounded` defaults true (every real /go stage). The M6 eval passes
  * `grounded: false` to select the grounding-free bodies + lens clauses for the

package/dist/extension/pipeline/personas.js

@@ -86,12 +86,22 @@ What was done.
 Any record_decision calls you made, and why.
 ## Notes
 Anything the reviewer should know (exact file paths, key functions touched).`;
+/** The reviewer's first step, which a stage's `diffBase` rewrites (see `personaBody`). */
+const REVIEWER_DIFF_STEP = "1. `git diff` to see the change.";
+/**
+ * The reviewer's first step on a change read from `base`, the commit a cloud
+ * session started on: its model may have committed its work, which a bare
+ * `git diff` no longer shows (YAG-1041).
+ */
+function reviewerDiffStepFrom(base) {
+    return `1. \`git diff ${base}\` to see the change: everything this session changed since its base commit ${base}, committed or not (a bare \`git diff\` shows only what is not committed yet). \`git log ${base}..HEAD\` lists its commits, and \`git status\` lists new files git does not track yet.`;
+}
 const REVIEWER_BODY = `You are a senior, adversarial code reviewer. Analyze the change for real problems, not style nits. Bash is read-only here (\`git diff\`, \`git log\`, \`git show\`); do NOT modify files or run builds.
 
 You are grounded in how THIS company works — that context is your edge over a repo-only reviewer.
 
 Strategy:
-1. \`git diff\` to see the change.
+${REVIEWER_DIFF_STEP}
 2. Read the modified files and their surroundings.
 3. Judge the change through your assigned lens (below).`;
 const ADVISOR_BODY = `You are a senior advisor, brought in on ONE hard call by an agent that is already working the problem. You are the strongest model in this system and you are expensive, so you are consulted, not driven — the caller does the work, you supply the judgment.
@@ -300,7 +310,7 @@ Anything the reviewer should know (exact file paths, key functions touched).`;
 const REVIEWER_BLIND = `You are a senior, adversarial code reviewer. Analyze the change for real problems, not style nits. Bash is read-only here (\`git diff\`, \`git log\`, \`git show\`); do NOT modify files or run builds.
 
 Strategy:
-1. \`git diff\` to see the change.
+${REVIEWER_DIFF_STEP}
 2. Read the modified files and their surroundings.
 3. Judge the change through your assigned lens (below).`;
 const ADVISOR_BLIND = `You are a senior advisor, brought in on ONE hard call by an agent that is already working the problem. You are the strongest model in this system and you are expensive, so you are consulted, not driven — the caller does the work, you supply the judgment.
@@ -428,10 +438,11 @@ export function builderPersonaClause(workstream, siblings = []) {
  * Resolve the system-prompt body for a stage. For non-review stages this is the
  * role body; for the review stage it appends the lens-specific clause (or, with
  * no lens, the one-reviewer clause covering all three) and the required
- * findings output contract so the reviewer's output parses. A stage carrying a
- * `personaClause` (the fan-out builders) gets it appended last, and one
- * carrying a `persona` (the cloud plan stage's host persona) runs with that in
- * place of its agent's body.
+ * findings output contract so the reviewer's output parses. A review carrying
+ * a `diffBase` (a cloud session's) diffs from that commit in its first step. A
+ * stage carrying a `personaClause` (the fan-out builders) gets it appended
+ * last, and one carrying a `persona` (the cloud plan stage's host persona)
+ * runs with that in place of its agent's body.
  *
  * `grounded` defaults true (every real /go stage). The M6 eval passes
  * `grounded: false` to select the grounding-free bodies + lens clauses for the
@@ -443,7 +454,10 @@ export function personaBody(stage, opts = {}) {
     const base = stage.persona?.trim() || bodies[stage.agent];
     if (!base)
         throw new Error(`No persona body for agent "${stage.agent}"`);
-    const parts = [base];
+    const diffBase = stage.diffBase;
+    const parts = [
+        diffBase ? base.replace(REVIEWER_DIFF_STEP, () => reviewerDiffStepFrom(diffBase)) : base,
+    ];
     if (stage.id === "review") {
         const clauses = grounded ? LENS_CLAUSES : BLIND_LENS_CLAUSES;
         if (stage.lens)

package/dist/extension/pipeline/types.d.ts

@@ -72,6 +72,12 @@ export interface PipelineStage {
      * plan stage takes the host's `plan-persona.md` (Reeve's persona) here.
      */
     persona?: string;
+    /**
+     * The commit a review reads the change from (a cloud session's start,
+     * YAG-1041): its first step is `git diff <diffBase>`, since a model that
+     * commits its work leaves a bare `git diff` empty. Absent: `git diff`.
+     */
+    diffBase?: string;
     /**
      * The stage's own clock, in milliseconds (`stageClock.ts`). Past it the
      * child refuses every tool call, so the model writes its answer from what it

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yagni-app/code-staging",
-  "version": "1.2.7-staging.2059.1",
+  "version": "1.2.7-staging.2069.1",
   "description": "YAGNI Code: a terminal coding agent that already knows your company. One YAGNI login routes the model and grounds the agent in your team's context.",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "YAGNI, Inc. <jack@yagni.app> (https://yagni.app)",
@@ -58,5 +58,5 @@
     "turndown": "^7.2.4",
     "typebox": "^1.3.15"
   },
-  "yagniSourceSha": "6e9cbb06e7ae4d5b15b14fecc749fb5fbab2e93b"
+  "yagniSourceSha": "618a0d09ec56651efeb5669dc92e21a1ce8699ef"
 }