@yagni-app/code-staging 1.2.7-staging.2062.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)
@@ -559,11 +563,14 @@ export async function runHeadlessGo(argv, deps = {}) {
     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 keeps the bare `git diff`.
-    const reviewLane = lane && baseSha && !continuation
+    // 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: baseSha } : s)),
+            stages: lane.stages.map((s) => (s.id === "review" ? { ...s, diffBase } : s)),
         }
         : lane;
     let gate;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yagni-app/code-staging",
-  "version": "1.2.7-staging.2062.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": "a52f06325dd8542ceb7055b6fc9a7c965c8c77bd"
+  "yagniSourceSha": "618a0d09ec56651efeb5669dc92e21a1ce8699ef"
 }