@rallycry/conveyor-agent 10.13.70 → 10.13.71

package/dist/{boot-7UWVK777.js → boot-PKHZUDAC.js}

@@ -490,7 +490,108 @@ import {
   symlinkSync,
   writeFileSync as writeFileSync2
 } from "fs";
-import { dirname, join as join2 } from "path";
+import { dirname, join as join3 } from "path";
+
+// src/boot/memory-integrity.ts
+import { readFile, readdir, stat, writeFile } from "fs/promises";
+import { join as join2 } from "path";
+var FRONTMATTER_OPEN = "---\n";
+var FRONTMATTER_CLOSE = "\n---\n";
+var MAX_MEMORY_FILE_BYTES = 512 * 1024;
+var READ_CONCURRENCY = 16;
+function readFrontmatterBlock(content) {
+  if (!content.startsWith(FRONTMATTER_OPEN)) return null;
+  const close = content.indexOf(FRONTMATTER_CLOSE, FRONTMATTER_OPEN.length - 1);
+  if (close === -1) return null;
+  return content.slice(0, close + FRONTMATTER_CLOSE.length);
+}
+function inspectMemoryFile(content) {
+  const header = readFrontmatterBlock(content);
+  if (!header) return { status: "clean" };
+  const repeat = content.indexOf(header, header.length);
+  if (repeat === -1) return { status: "clean" };
+  const half = content.length / 2;
+  if (repeat === half && content.slice(0, half) === content.slice(half)) {
+    return { status: "self-append", repaired: content.slice(0, half) };
+  }
+  return {
+    status: "suspicious",
+    detail: `frontmatter block repeats at offset ${repeat} of ${content.length} without identical halves`
+  };
+}
+async function candidateSize(path) {
+  try {
+    const info = await stat(path);
+    if (!info.isFile() || info.size === 0) return null;
+    if (info.size > MAX_MEMORY_FILE_BYTES || info.size % 2 !== 0) return null;
+    return info.size;
+  } catch {
+    return null;
+  }
+}
+async function repairOneFile(dir, name, log, out) {
+  const path = join2(dir, name);
+  const size = await candidateSize(path);
+  if (size === null) {
+    out.skipped += 1;
+    return;
+  }
+  out.scanned += 1;
+  const verdict = inspectMemoryFile(await readFile(path, "utf8"));
+  if (verdict.status === "suspicious") {
+    out.suspicious.push(name);
+    log.warn(
+      `[boot] WARN shared memory ${name} looks doubled but was left alone: ${verdict.detail}`
+    );
+    return;
+  }
+  if (verdict.status !== "self-append" || verdict.repaired === void 0) return;
+  if (await candidateSize(path) !== size) {
+    log.warn(`[boot] WARN shared memory ${name} changed mid-check; left alone`);
+    return;
+  }
+  await writeFile(path, verdict.repaired);
+  out.repaired.push(name);
+}
+async function forEachLimited(items, limit, fn) {
+  let cursor = 0;
+  const workers = Array.from({ length: Math.min(limit, items.length) }, async () => {
+    for (let i = cursor++; i < items.length; i = cursor++) {
+      const item = items[i];
+      if (item !== void 0) await fn(item);
+    }
+  });
+  await Promise.all(workers);
+}
+async function repairSharedMemory(dir, log) {
+  const out = { scanned: 0, repaired: [], suspicious: [], skipped: 0 };
+  let entries;
+  try {
+    entries = await readdir(dir);
+  } catch {
+    return out;
+  }
+  const names = entries.filter((name) => name.endsWith(".md"));
+  await forEachLimited(names, READ_CONCURRENCY, async (name) => {
+    try {
+      await repairOneFile(dir, name, log, out);
+    } catch (err) {
+      log.warn(
+        `[boot] WARN shared memory integrity check failed for ${name}: ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+  });
+  out.repaired.sort();
+  out.suspicious.sort();
+  if (out.repaired.length > 0) {
+    log.info(
+      `[boot] shared memory: repaired ${out.repaired.length} self-appended file(s): ${out.repaired.join(", ")}`
+    );
+  }
+  return out;
+}
+
+// src/boot/user-home.ts
 var SEED_GATES = {
   hasCompletedOnboarding: true,
   bypassPermissionsModeAccepted: true,
@@ -566,8 +667,8 @@ function relink(target, link) {
 }
 function wireCredentials(opts) {
   const { home, root, sharedDir, log } = opts;
-  const shared = join2(root, ".claude", ".credentials.json");
-  const podLocal = sharedDir ? join2(sharedDir, "claude-credentials.pod.json") : join2(home, ".claude-credentials.pod.json");
+  const shared = join3(root, ".claude", ".credentials.json");
+  const podLocal = sharedDir ? join3(sharedDir, "claude-credentials.pod.json") : join3(home, ".claude-credentials.pod.json");
   safely(log, "carry legacy shared credentials", () => {
     if (isRegularFile(shared)) copyFileSync(shared, podLocal);
   });
@@ -583,66 +684,78 @@ function migrateMemories(from, to, log) {
     return;
   }
   for (const entry of entries) {
-    const target = join2(to, entry);
+    const target = join3(to, entry);
     if (existsSync(target)) continue;
-    safely(log, `migrate memory ${entry}`, () => copyFileSync(join2(from, entry), target));
+    safely(log, `migrate memory ${entry}`, () => copyFileSync(join3(from, entry), target));
   }
 }
+function startSharedMemoryRepair(shared, log) {
+  return repairSharedMemory(shared, log).then(
+    () => void 0,
+    (err) => {
+      log.warn(
+        `[boot] WARN repair self-appended shared memories failed: ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+  );
+}
 function wireSharedMemory(root, userHomeMount, projectId, log) {
-  const shared = join2(userHomeMount, "users", "_shared", "memory", projectId);
-  const link = join2(root, ".claude", "projects", AGENT_MEMORY_PROJECT_DIR, "memory");
+  const shared = join3(userHomeMount, "users", "_shared", "memory", projectId);
+  const link = join3(root, ".claude", "projects", AGENT_MEMORY_PROJECT_DIR, "memory");
   safely(log, "mkdir shared memory dir", () => mkdirSync(shared, { recursive: true }));
   safely(log, "migrate per-user memories", () => {
     if (existsSync(link) && !lstatSync(link).isSymbolicLink()) migrateMemories(link, shared, log);
   });
   safely(log, "wire shared memory symlink", () => relink(shared, link));
+  return startSharedMemoryRepair(shared, log);
 }
 function wireMountedUserHome(opts) {
   const { home, userHomeMount, userId, projectId, sharedDir, log } = opts;
-  const root = join2(userHomeMount, "users", userId, projectId);
+  const root = join3(userHomeMount, "users", userId, projectId);
   safely(log, "mkdir user-home root", () => {
-    mkdirSync(join2(root, ".claude"), { recursive: true });
-    mkdirSync(join2(root, ".config", "claude"), { recursive: true });
+    mkdirSync(join3(root, ".claude"), { recursive: true });
+    mkdirSync(join3(root, ".config", "claude"), { recursive: true });
   });
-  safely(log, "wire ~/.claude symlink", () => relink(join2(root, ".claude"), join2(home, ".claude")));
+  safely(log, "wire ~/.claude symlink", () => relink(join3(root, ".claude"), join3(home, ".claude")));
   safely(
     log,
     "wire ~/.config/claude symlink",
-    () => relink(join2(root, ".config", "claude"), join2(home, ".config", "claude"))
+    () => relink(join3(root, ".config", "claude"), join3(home, ".config", "claude"))
   );
   safely(log, "seed pod-local ~/.claude.json", () => {
-    rmSync(join2(home, ".claude.json"), { recursive: true, force: true });
-    seedClaudeJson(join2(home, ".claude.json"));
+    rmSync(join3(home, ".claude.json"), { recursive: true, force: true });
+    seedClaudeJson(join3(home, ".claude.json"));
   });
-  wireSharedMemory(root, userHomeMount, projectId, log);
+  const pendingRepair = wireSharedMemory(root, userHomeMount, projectId, log);
   wireCredentials({ home, root, sharedDir, log });
   safely(log, "mkdir opencode root", () => {
-    mkdirSync(join2(root, ".local", "share", "opencode"), { recursive: true });
-    mkdirSync(join2(root, ".config", "opencode"), { recursive: true });
+    mkdirSync(join3(root, ".local", "share", "opencode"), { recursive: true });
+    mkdirSync(join3(root, ".config", "opencode"), { recursive: true });
   });
   safely(
     log,
     "wire opencode data symlink",
-    () => relink(join2(root, ".local", "share", "opencode"), join2(home, ".local", "share", "opencode"))
+    () => relink(join3(root, ".local", "share", "opencode"), join3(home, ".local", "share", "opencode"))
   );
   safely(
     log,
     "wire opencode config symlink",
-    () => relink(join2(root, ".config", "opencode"), join2(home, ".config", "opencode"))
+    () => relink(join3(root, ".config", "opencode"), join3(home, ".config", "opencode"))
   );
+  return pendingRepair;
 }
 function wireNoMountUserHome(opts) {
   const { home, sharedDir, log } = opts;
   safely(
     log,
     "seed pod-local ~/.claude.json (no mount)",
-    () => seedClaudeJson(join2(home, ".claude.json"))
+    () => seedClaudeJson(join3(home, ".claude.json"))
   );
   if (sharedDir) {
     safely(log, "wire ~/.claude to shared emptyDir", () => {
-      const target = join2(sharedDir, "claude-home", ".claude");
+      const target = join3(sharedDir, "claude-home", ".claude");
       mkdirSync(target, { recursive: true });
-      relink(target, join2(home, ".claude"));
+      relink(target, join3(home, ".claude"));
     });
   }
 }
@@ -654,14 +767,14 @@ function wireUserHome(opts) {
     () => mkdirSync(opts.scratchDir ?? "/tmp/claude-cmd", { recursive: true })
   );
   if (userId && projectId && isDir(userHomeMount)) {
-    wireMountedUserHome({ home, userHomeMount, userId, projectId, sharedDir, log });
-  } else {
-    wireNoMountUserHome({ home, sharedDir, log });
+    return wireMountedUserHome({ home, userHomeMount, userId, projectId, sharedDir, log });
   }
+  wireNoMountUserHome({ home, sharedDir, log });
+  return Promise.resolve();
 }
 var RECLAIM_FIND_TIMEOUT_MS = 1e4;
 async function reclaimHomeOwnership(home, exec, log) {
-  for (const dir of [join2(home, ".config"), join2(home, ".local")]) {
+  for (const dir of [join3(home, ".config"), join3(home, ".local")]) {
     if (!isDir(dir)) continue;
     try {
       await exec(
@@ -691,9 +804,9 @@ async function reclaimHomeOwnership(home, exec, log) {
 
 // src/boot/sshd.ts
 import { chmodSync as chmodSync2, closeSync, copyFileSync as copyFileSync2, existsSync as existsSync2, mkdirSync as mkdirSync2, openSync } from "fs";
-import { join as join3 } from "path";
+import { join as join4 } from "path";
 function persistedAuthorizedKeys() {
-  return join3(
+  return join4(
     process.env.CONVEYOR_SHARED_DIR || "/var/run/conveyor-workbench",
     "ssh",
     "authorized_keys"
@@ -701,10 +814,10 @@ function persistedAuthorizedKeys() {
 }
 async function startWorkspaceSshd(exec, log, port = process.env.CONVEYOR_WORKSPACE_SSH_PORT || "2222", home = "/home/conveyor") {
   try {
-    const sshDir = join3(home, ".ssh");
+    const sshDir = join4(home, ".ssh");
     mkdirSync2(sshDir, { recursive: true });
     chmodSync2(sshDir, 448);
-    const authorizedKeys = join3(sshDir, "authorized_keys");
+    const authorizedKeys = join4(sshDir, "authorized_keys");
     const persisted = persistedAuthorizedKeys();
     if (existsSync2(persisted)) {
       copyFileSync2(persisted, authorizedKeys);
@@ -746,7 +859,7 @@ import {
   statSync as statSync3,
   symlinkSync as symlinkSync2
 } from "fs";
-import { join as join4 } from "path";
+import { join as join5 } from "path";
 function errText(err) {
   return redactToken(err instanceof Error ? err.message : String(err));
 }
@@ -782,7 +895,7 @@ function bindGraphifyBundle(workspace, graphifyEnv, log) {
     log.info(`[boot] Graphify bundle not found for '${slug}' at ${sourceDir}`);
     return;
   }
-  const targetDir = join4(workspace, "graphify-out");
+  const targetDir = join5(workspace, "graphify-out");
   try {
     mkdirSync3(targetDir, { recursive: true });
   } catch {
@@ -790,8 +903,8 @@ function bindGraphifyBundle(workspace, graphifyEnv, log) {
     return;
   }
   for (const rel of GRAPHIFY_BUNDLE_FILES) {
-    const source = join4(sourceDir, rel);
-    const target = join4(targetDir, rel);
+    const source = join5(sourceDir, rel);
+    const target = join5(targetDir, rel);
     if (!existsSync3(source)) continue;
     if (existsSync3(target) || isSymlink(target)) continue;
     try {
@@ -803,7 +916,7 @@ function bindGraphifyBundle(workspace, graphifyEnv, log) {
 }
 async function ensureGrimoireSubmodule(workspace, githubToken, git, log) {
   try {
-    if (!existsSync3(join4(workspace, ".gitmodules"))) return;
+    if (!existsSync3(join5(workspace, ".gitmodules"))) return;
     let paths = "";
     try {
       ({ stdout: paths } = await git(
@@ -814,7 +927,7 @@ async function ensureGrimoireSubmodule(workspace, githubToken, git, log) {
       return;
     }
     if (!paths.split("\n").some((line) => line.trim().endsWith(".claude/grimoire"))) return;
-    if (isDir2(join4(workspace, ".claude", "grimoire", "skills"))) return;
+    if (isDir2(join5(workspace, ".claude", "grimoire", "skills"))) return;
     if (!githubToken) {
       log.warn("[boot] WARN: grimoire submodule absent and no token to fetch it");
       return;
@@ -843,11 +956,11 @@ async function ensureGrimoireSubmodule(workspace, githubToken, git, log) {
 }
 function excludeLinkedSkills(workspace, names, log) {
   if (names.length === 0) return;
-  const infoDir = join4(workspace, ".git", "info");
-  if (!isDir2(join4(workspace, ".git"))) return;
+  const infoDir = join5(workspace, ".git", "info");
+  if (!isDir2(join5(workspace, ".git"))) return;
   try {
     mkdirSync3(infoDir, { recursive: true });
-    const excludePath = join4(infoDir, "exclude");
+    const excludePath = join5(infoDir, "exclude");
     const existing = existsSync3(excludePath) ? readFileSync2(excludePath, "utf8") : "";
     const missing = names.map((name) => `.claude/skills/${name}`).filter((line) => !existing.split("\n").includes(line));
     if (missing.length === 0) return;
@@ -860,14 +973,14 @@ function excludeLinkedSkills(workspace, names, log) {
 }
 function symlinkTargetsGrimoire(path) {
   try {
-    return readlinkSync(path).includes(join4("grimoire", "skills"));
+    return readlinkSync(path).includes(join5("grimoire", "skills"));
   } catch {
     return false;
   }
 }
 function linkGrimoireSkills(workspace, log) {
-  const sourceDir = join4(workspace, ".claude", "grimoire", "skills");
-  const targetDir = join4(workspace, ".claude", "skills");
+  const sourceDir = join5(workspace, ".claude", "grimoire", "skills");
+  const targetDir = join5(workspace, ".claude", "skills");
   if (!isDir2(sourceDir)) return;
   try {
     mkdirSync3(targetDir, { recursive: true });
@@ -883,8 +996,8 @@ function linkGrimoireSkills(workspace, log) {
     return;
   }
   for (const name of names) {
-    if (!isDir2(join4(sourceDir, name))) continue;
-    const target = join4(targetDir, name);
+    if (!isDir2(join5(sourceDir, name))) continue;
+    const target = join5(targetDir, name);
     if (existsSync3(target) && !isSymlink(target)) {
       log.warn(`[boot] WARN: ${target} exists and is not a symlink; skipping`);
       continue;
@@ -892,7 +1005,7 @@ function linkGrimoireSkills(workspace, log) {
     if (isSymlink(target) && !symlinkTargetsGrimoire(target)) continue;
     try {
       rmSync2(target, { force: true });
-      symlinkSync2(join4("..", "grimoire", "skills", name), target);
+      symlinkSync2(join5("..", "grimoire", "skills", name), target);
       linkedNames.push(name);
     } catch {
     }
@@ -901,7 +1014,7 @@ function linkGrimoireSkills(workspace, log) {
   log.info(`[boot] Linked ${linkedNames.length} grimoire skills into ${targetDir}`);
 }
 async function neutralizeGrimoirePointer(workspace, git, log) {
-  if (!existsSync3(join4(workspace, ".claude", "grimoire"))) return;
+  if (!existsSync3(join5(workspace, ".claude", "grimoire"))) return;
   try {
     await git(["update-index", "--assume-unchanged", ".claude/grimoire"], {
       cwd: workspace,
@@ -953,8 +1066,8 @@ async function cloneReferenceRepos(refsJson, git, log, referencesDir = "/workspa
     return;
   }
   for (const ref of refs) {
-    const dest = join4(referencesDir, ref.slug);
-    if (existsSync3(join4(dest, ".git"))) continue;
+    const dest = join5(referencesDir, ref.slug);
+    if (existsSync3(join5(dest, ".git"))) continue;
     try {
       await git(
         [
@@ -1024,7 +1137,7 @@ function defaultWorkbenchBootDeps() {
       ctx.log.info(`[boot] ensured workspace dir ${WORKSPACE_DIR}`);
     },
     wireHome: (ctx) => {
-      wireUserHome({
+      void wireUserHome({
         home: HOME_DIR,
         userHomeMount: USER_HOME_MOUNT2,
         userId: ctx.childEnv?.CONVEYOR_USER_ID,
@@ -1183,7 +1296,7 @@ function agentBootSteps(deps = defaultBootDeps(), signal = new AbortController()
       critical: true,
       run: (ctx) => {
         if (ctx.bundle) {
-          wireUserHome({
+          void wireUserHome({
             home: HOME_DIR2,
             userHomeMount: USER_HOME_MOUNT3,
             userId: ctx.childEnv?.CONVEYOR_USER_ID,

package/dist/{chunk-E6WWH4WJ.js → chunk-7MMECTTJ.js}

@@ -2041,7 +2041,8 @@ var projectCheckpointSettingsSchema = z.object({
   finalizeCommand: z.string().trim().min(1),
   credentialEpoch: z.string().trim().min(1),
   requiredSecretNames: uniqueSortedArray(secretNameSchema).optional(),
-  optionalSecretNames: uniqueSortedArray(secretNameSchema).optional()
+  optionalSecretNames: uniqueSortedArray(secretNameSchema).optional(),
+  bakeWebAppBuild: z.boolean().optional()
 }).superRefine((checkpoint, ctx) => {
   const required = new Set(checkpoint.requiredSecretNames ?? []);
   for (const name of checkpoint.optionalSecretNames ?? []) {
@@ -2291,7 +2292,15 @@ var PostToChatInputSchema = z4.object({
 });
 var GetTaskContextRequestSchema = z4.object({
   sessionId: z4.string(),
-  includeHistory: z4.boolean().optional().default(false)
+  includeHistory: z4.boolean().optional().default(false),
+  /**
+   * Read the plan-revised marker WITHOUT consuming it. Bookkeeping fetches
+   * (the session-identity check, the branch refresh) pass true so they cannot
+   * race the boot fetch and swallow the notice before it reaches the prompt.
+   * Defaults to false — consuming — so a pod running an older agent build still
+   * clears the marker instead of showing the notice on every boot forever.
+   */
+  peekPlanRevision: z4.boolean().optional().default(false)
 });
 var GetChatMessagesRequestSchema = z4.object({
   sessionId: z4.string(),
@@ -3856,6 +3865,17 @@ var PRE_BUILD_TASK_STATUSES = /* @__PURE__ */ new Set(["Planning", "Open"]);
 function hasTaskPlan(plan) {
   return !!plan?.trim();
 }
+var CARD_TYPE_SURFACE = {
+  task: "board",
+  chat: "board",
+  incident: "report",
+  suggestion: "report"
+};
+var surfaceTypes = (surface) => Object.keys(CARD_TYPE_SURFACE).filter(
+  (type) => CARD_TYPE_SURFACE[type] === surface
+);
+var BOARD_CARD_TYPES = surfaceTypes("board");
+var REPORT_CARD_TYPES = surfaceTypes("report");
 
 // src/runner/mode-controller.ts
 var ModeController = class {
@@ -8615,6 +8635,36 @@ After addressing the feedback, resume your autonomous loop: call list_subtasks a
   return parts;
 }
 
+// src/execution/plan-revision-notice.ts
+var MINUTE_MS = 60 * 1e3;
+var HOUR_MS = 60 * MINUTE_MS;
+var DAY_MS = 24 * HOUR_MS;
+function describeAge(revisedAt, now) {
+  const at = Date.parse(revisedAt);
+  if (Number.isNaN(at)) return "";
+  const ago = now - at;
+  if (ago < MINUTE_MS) return "just now";
+  if (ago < HOUR_MS) return `${Math.round(ago / MINUTE_MS)} minutes ago`;
+  if (ago < DAY_MS) return `${Math.round(ago / HOUR_MS)} hours ago`;
+  return `${Math.round(ago / DAY_MS)} days ago`;
+}
+function buildPlanRevisionNotice(context, now = Date.now()) {
+  const revisedAt = context.planRevisedAt;
+  if (!revisedAt) return [];
+  const age = describeAge(revisedAt, now);
+  const when = age ? `${age} (${revisedAt})` : revisedAt;
+  return [
+    `
+## \u26A0\uFE0F The plan changed since this build was dispatched`,
+    `Someone revised this card's plan ${when}. It was NOT you \u2014 an agent is never told about its own plan edit.`,
+    `Before your next Write or Edit:`,
+    `1. Call \`get_current_plan\` and read the current plan in full.`,
+    `2. Compare it against the plan you were launched with. Treat the current plan as the truth.`,
+    `3. Drop or redo any work the revision supersedes. Do NOT keep building the old plan.`,
+    `If the revision invalidates work you already committed, say so with post_to_chat before you continue.`
+  ];
+}
+
 // src/execution/prompt-formatters.ts
 function baseDiffCommand(baseBranch, flags) {
   const base = baseBranch ?? "dev";
@@ -9265,6 +9315,17 @@ function buildPlanDocumentationSection(context) {
     `- Identification auto-fills title, story points, and icon with quick AI guesses. After exploring, refine the title, story points, and risk with update_task_properties whenever they no longer match what the work actually is \u2014 adjust in either direction. Icons are automatic \u2014 never set them.`
   ];
 }
+function buildPlanRevisionSection() {
+  return [
+    ``,
+    `### The plan can change while you sleep`,
+    `If a turn opens with "The plan changed since this build was dispatched", honor it BEFORE your next Write or Edit:`,
+    `1. Call get_current_plan and read the current plan in full.`,
+    `2. Compare it against the plan you were launched with \u2014 the current plan wins.`,
+    `3. Drop or redo whatever the revision supersedes, and say so with post_to_chat if it invalidates work you already committed.`,
+    `Building on a superseded plan is the most expensive mistake a resumed card can make.`
+  ];
+}
 function buildNoPrWhenNoCodeSection(baseBranch) {
   const diffCommand = baseDiffCommand(baseBranch);
   return [
@@ -9464,6 +9525,7 @@ function buildAutoPrompt(context, runnerMode) {
       ...buildPrGuideSection(),
       ...buildNoPrWhenNoCodeSection(context?.baseBranch)
     ],
+    ...buildPlanRevisionSection(),
     ``,
     `### Autonomous Guidelines:`,
     `- Make decisions independently \u2014 do not ask the team for approval at each step`,
@@ -9493,7 +9555,8 @@ function buildBuildingPrompt(context) {
       ...buildPrGuideSection(),
       ...buildNoPrWhenNoCodeSection(context?.baseBranch),
       ...context?.isAuto || !context?.plan?.trim() ? buildPlanDocumentationSection(context) : []
-    ]
+    ],
+    ...buildPlanRevisionSection()
   ];
   if (context) parts.push(...buildPropertyInstructions(context));
   return parts.join("\n");
@@ -9939,6 +10002,7 @@ ${context.description}`);
 ## Plan
 ${truncatePlanForPrompt(context.plan)}`);
   }
+  parts.push(...buildPlanRevisionNotice(context));
   if (context.files && context.files.length > 0) {
     parts.push(`
 ## Attached Files`);
@@ -10209,7 +10273,9 @@ async function buildInitialPrompt(mode, context, isAuto, agentMode) {
   const isPackRunner = mode === "pack" || mode === "pm" && !!isAuto && !!context.isParentTask;
   if (!isPackRunner) {
     const sessionRelaunch = buildRelaunchWithSession(mode, context, agentMode, isAuto);
-    if (sessionRelaunch) return sessionRelaunch;
+    if (sessionRelaunch) {
+      return [...buildPlanRevisionNotice(context), sessionRelaunch].join("\n");
+    }
   }
   const isPm = mode === "pm";
   let scenario = detectRelaunchScenario(context, isPm);
@@ -11160,7 +11226,12 @@ function buildGetCurrentPlanTool(connection) {
         const ctx = await connection.call("getTaskContext", {
           sessionId: connection.sessionId
         });
-        return textResult(ctx.plan ?? "No plan available.");
+        const plan = ctx.plan ?? "No plan available.";
+        return textResult(
+          ctx.planRevisedAt ? `\u26A0\uFE0F This plan was revised ${ctx.planRevisedAt}, after your build was dispatched. Treat it as the truth and drop any work it supersedes.
+
+${plan}` : plan
+        );
       } catch {
         return textResult("Could not fetch updated plan.");
       }
@@ -16893,6 +16964,9 @@ var SessionRunner = class _SessionRunner {
       title: ctx.title,
       description: ctx.description,
       plan: ctx.plan,
+      // The server hands this to exactly one context fetch per revision, so it
+      // must survive the mapping or the notice is lost.
+      planRevisedAt: ctx.planRevisedAt ?? null,
       status: ctx.status,
       chatHistory,
       agentId: ctx.agentId ?? null,
@@ -17065,7 +17139,10 @@ ${outcome.failures.join("\n")}
     try {
       const ctx = await this.connection.call("getTaskContext", {
         sessionId: this.sessionId,
-        includeHistory: false
+        includeHistory: false,
+        // Bookkeeping fetch — it must not swallow a plan-revised notice the
+        // next prompt is about to carry.
+        peekPlanRevision: true
       });
       if (ctx?.githubBranch && this.fullContext) {
         this.fullContext.githubBranch = ctx.githubBranch;

package/dist/cli.js

@@ -35,7 +35,7 @@ import {
   sampleKeyUsage,
   statWorkspacePath,
   workspacePathExists
-} from "./chunk-E6WWH4WJ.js";
+} from "./chunk-7MMECTTJ.js";
 import {
   reportBootMilestone
 } from "./chunk-QU53HND5.js";
@@ -1715,7 +1715,7 @@ function hostsSpawnedChildren(mode) {
 
 // src/cli.ts
 if (process.argv[2] === "boot") {
-  const { runBoot } = await import("./boot-7UWVK777.js");
+  const { runBoot } = await import("./boot-PKHZUDAC.js");
   process.exit(await runBoot(process.argv.slice(3)));
 }
 if (isLegacyEntrypointLaunch(process.env)) {
@@ -2100,7 +2100,10 @@ void checkSessionTaskIdentity({
   sessionId: process.env.CONVEYOR_SESSION_ID,
   taskId: CONVEYOR_TASK_ID,
   fetchSessionTaskId: async (sessionId) => {
-    const ctx = await runner.connection.call("getTaskContext", { sessionId });
+    const ctx = await runner.connection.call("getTaskContext", {
+      sessionId,
+      peekPlanRevision: true
+    });
     return ctx.id;
   },
   logger: logger5

package/dist/index.js

@@ -13,7 +13,7 @@ import {
   unshallowRepo,
   updateRemoteToken,
   workspacePathExists
-} from "./chunk-E6WWH4WJ.js";
+} from "./chunk-7MMECTTJ.js";
 import "./chunk-QU53HND5.js";
 import "./chunk-IA45XHOA.js";
 import {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rallycry/conveyor-agent",
-  "version": "10.13.70",
+  "version": "10.13.71",
   "description": "Conveyor Agent Runner v10 - PTY harness for the task chat (SDK harness for audit/project-chat). Agent-as-User architecture with BaseService patterns. Works locally too.",
   "keywords": [
     "agent",