@coreplane/switchboard 1.260.2 → 1.260.4

package/dist/assets/src/core/coordinator/driver.ts

@@ -40,6 +40,7 @@
 // the shim Worker imports this by relative path.
 
 import { DAY_MS, DEFAULT_GRANT, GRANT_RENEWALS_MAX, IDLE_DAYS_MAX, type Grant, type GrantSource } from "../budgets.js";
+import { isFindingShape, type Finding } from "../reviewVerdict.js";
 import { DEFAULT_VERBOSITY, isVerbosity, type Verbosity } from "../verbosity.js";
 import {
   applyReturn,
@@ -343,6 +344,8 @@ function readRecordReturn(step: string, a: BotAnswer): StepReturn {
   // they were written (the run record's validator), read here as they are.
   const facts = run as unknown as Omit<Extract<ChildFacts, { finished: true }>, "finished" | "status">;
   const {
+    finishedAt,
+    reviewAskedAt,
     finalReply,
     pr,
     headSha,
@@ -367,6 +370,8 @@ function readRecordReturn(step: string, a: BotAnswer): StepReturn {
     run: {
       finished: true,
       status: run.status as Extract<ChildFacts, { finished: true }>["status"],
+      ...(typeof finishedAt === "number" ? { finishedAt } : {}),
+      ...(typeof reviewAskedAt === "number" ? { reviewAskedAt } : {}),
       ...(finalReply !== undefined ? { finalReply } : {}),
       ...(pr !== undefined ? { pr } : {}),
       ...(headSha !== undefined ? { headSha } : {}),
@@ -403,6 +408,33 @@ function isCommitChecks(v: unknown): v is { total: number; pending: string[]; fa
   return typeof c.total === "number" && names(c.pending) && names(c.failed);
 }
 
+function entryHumanGate(v: unknown):
+  | {
+      round: number;
+      findings: Finding[];
+      verdict: "approve" | "request_changes";
+      answer: string;
+      author: string;
+      commentId: string;
+    }
+  | undefined {
+  if (typeof v !== "object" || v === null) return undefined;
+  const row = v as Record<string, unknown>;
+  if (typeof row.round !== "number" || !Number.isInteger(row.round) || row.round < 1) return undefined;
+  if (!Array.isArray(row.findings) || !row.findings.every(isFindingShape)) return undefined;
+  if (row.verdict !== "approve" && row.verdict !== "request_changes") return undefined;
+  if (typeof row.answer !== "string" || typeof row.author !== "string" || typeof row.commentId !== "string")
+    return undefined;
+  return {
+    round: row.round,
+    findings: row.findings,
+    verdict: row.verdict,
+    answer: row.answer,
+    author: row.author,
+    commentId: row.commentId,
+  };
+}
+
 function prCheckReturn(step: string, a: BotAnswer): StepReturn {
   const { ok, state, prNumber, url, headSha, sha, mergedAt, at } = a.body;
   if (ok === true && state === "none") {
@@ -448,6 +480,7 @@ function prCheckReturn(step: string, a: BotAnswer): StepReturn {
         // The base's merge-queue rule beside the checks (issue 2011): the
         // merge:person report says the person's merge is queued.
         ...(typeof a.body.baseHasMergeQueue === "boolean" ? { baseHasMergeQueue: a.body.baseHasMergeQueue } : {}),
+        ...(entryHumanGate(a.body.humanGate) !== undefined ? { humanGate: entryHumanGate(a.body.humanGate)! } : {}),
       },
       at,
     };
@@ -773,7 +806,7 @@ async function tellStepThrew(
         : `in round ${at.round.index} (\`${at.step}\`)`;
   const report =
     `⚠️ The runner failed ${where}: ${line}\n\n` +
-    "Re-issue `agent:ship` in this thread to continue — a pull request already approved with green checks resumes at the checks step, never at a fresh coding round.";
+    "The unit remains bound to this thread; the next reply continues it, and a pull request already approved with green checks resumes at the checks step, never at a fresh coding round.";
   const body = {
     ...tag,
     ending: {
@@ -961,6 +994,7 @@ async function runUnit(
                     ...(note.ending.from !== undefined ? { from: note.ending.from } : {}),
                     spendUsd: note.ending.spendUsd,
                     ...(note.ending.handoff !== undefined ? { handoff: note.ending.handoff } : {}),
+                    ...(note.ending.humanGate !== undefined ? { humanGate: note.ending.humanGate } : {}),
                   }
                 : {}),
             },
@@ -1007,14 +1041,14 @@ async function runUnit(
 
 /** The report of a unit the hard stop ended before it ran (record 0060; issue 1924). */
 function stoppedReport(unit: string): string {
-  return `⏹ Stopped: the pipeline's hosted parent was hard-stopped, so ${unit} was ended without running. Re-issue the plan naming the remaining units to run them.`;
+  return `⏹ Stopped: the pipeline's hosted parent was hard-stopped, so ${unit} was ended without running. The original plan remains the durable task for any later pipeline.`;
 }
 
 function blockedReport(unit: string, dep: string, depEnding: string): string {
   if (depEnding === "blocked")
-    return `⛔ Blocked: ${unit} waits on ${dep}, which is blocked itself. Re-issue the plan naming the remaining units once it is resolved.`;
+    return `⛔ Blocked: ${unit} waits on ${dep}, which is blocked itself. A later pipeline recognizes both units once the dependency is resolved.`;
   const person = depEnding === "merge_ready";
-  return `⛔ Blocked: ${unit} waits on ${dep}, which ended ${depEnding}${person ? " — a person's merge" : ""}. Re-issue the plan naming the remaining units once it is ${person ? "merged" : "resolved"}.`;
+  return `⛔ Blocked: ${unit} waits on ${dep}, which ended ${depEnding}${person ? " — a person's merge" : ""}. A later pipeline recognizes the dependency once it is ${person ? "merged" : "resolved"}.`;
 }
 
 /** End a unit that never entered `runUnit` under the same failure net. */
@@ -1171,6 +1205,7 @@ async function waitOnIdle(
         ...(answer.runId !== undefined ? { previousRunId: answer.runId } : {}),
         ...(answer.handoff !== undefined ? { previousHandoff: answer.handoff } : {}),
         ...(answer.texts.length > 0 ? { texts: answer.texts } : {}),
+        ...(answer.humanGate !== undefined ? { humanGate: answer.humanGate } : {}),
         ...(answer.leaseMs !== undefined
           ? { resume: { leaseMs: answer.leaseMs, attempt: (currentSession?.resume?.attempt ?? 0) + 1 } }
           : {}),
@@ -1240,7 +1275,7 @@ async function walk(step: StepRunner, bot: CoordinatorBot, instanceId: string):
           next,
           stepPrefixOf(next, session),
           ending,
-          plan.idleDays,
+          ending.parkDays ?? plan.idleDays,
           session,
         );
         if (parked.kind === "ending") {

package/dist/assets/src/core/reviewVerdict.ts

@@ -328,8 +328,14 @@ function findingCounts(findings: readonly Finding[] | undefined): string {
   return `${findings.length} finding${findings.length === 1 ? "" : "s"}: ${by}`;
 }
 
-/** A table cell: pipes escaped so the row holds, already one line. */
-const cell = (text: string): string => oneLine(text).replace(/\|/g, "\\|");
+/** A one-line Markdown table cell. Backslashes are escaped before pipes so
+ * input cannot consume the pipe escape and split the row. */
+export const escapeMarkdownTableCell = (text: string): string =>
+  oneLine(text).replace(/\\/g, "\\\\").replace(/\|/g, "\\|");
+
+/** Decode the two escapes emitted by `escapeMarkdownTableCell`. This also
+ * accepts the legacy form that escaped pipes without first escaping slashes. */
+export const unescapeMarkdownTableCell = (text: string): string => text.replace(/\\([\\|])/g, "$1");
 
 /** Whether a finding's `file` is a path a blob URL can point at: no
  *  whitespace, no backtick, not a URL. */
@@ -339,7 +345,7 @@ const isRepoPath = (file: string): boolean => /^[^\s`]+$/.test(file) && !/^[a-z]
  *  file is a path and a target is known. */
 function whereCell(f: Finding, target: ReviewBodyTarget | undefined): string {
   const location = f.line !== undefined ? `${f.file}:${f.line}` : f.file;
-  const label = `\`${cell(location)}\``;
+  const label = `\`${escapeMarkdownTableCell(location)}\``;
   if (!target || !isRepoPath(f.file)) return label;
   const path = encodeURI(f.file).replace(/#/g, "%23").replace(/\?/g, "%3F");
   const url = `https://github.com/${target.repo}/blob/${target.head}/${path}${f.line !== undefined ? `#L${f.line}` : ""}`;
@@ -360,6 +366,7 @@ function verdictMarker(verdict: ReviewVerdict | undefined, target: ReviewBodyTar
             id: f.id,
             severity: f.severity,
             file: f.file,
+            title: f.title,
             ...(f.line !== undefined ? { line: f.line } : {}),
             ...(f.humanGated ? { humanGated: true } : {}),
           })),
@@ -395,7 +402,10 @@ export function buildReviewPostBody(
       [
         "| Severity | Finding | Where |",
         "| --- | --- | --- |",
-        ...findings.map((f) => `| ${f.severity} | **${cell(f.id)}** ${cell(f.title)} | ${whereCell(f, target)} |`),
+        ...findings.map(
+          (f) =>
+            `| ${f.severity} | **${escapeMarkdownTableCell(f.id)}** ${escapeMarkdownTableCell(f.title)} | ${whereCell(f, target)} |`,
+        ),
       ].join("\n"),
     );
   }
@@ -517,7 +527,7 @@ const DISPOSITION_KINDS: readonly string[] = ["fixed", "declined"];
 
 const isRecordLike = (v: unknown): v is Record<string, unknown> => typeof v === "object" && v !== null;
 
-function isFindingShape(v: unknown): v is Finding {
+export function isFindingShape(v: unknown): v is Finding {
   if (!isRecordLike(v)) return false;
   return (
     typeof v.id === "string" &&

package/dist/assets/src/core/runFriction.ts

@@ -621,7 +621,7 @@ export function analyzeRunFriction(events: readonly RunEvent[], opts: FrictionOp
       findings.push({
         category: "infra_failure",
         severity: "high",
-        summary: `no result for tool call (run ended mid-tool): ${event.summary}`,
+        summary: `no result for tool call (the run ended mid-tool): ${event.summary}`,
         tool: event.tool,
         eventIndex: index,
         ...(durationMs !== undefined ? { durationMs } : {}),

package/dist/assets/src/core/ship/contract.ts

@@ -480,9 +480,9 @@ function renderFirstInstruction(rebase: ChildContract["rebase"]): string {
   const gates = `${FAST_GATES_POINTER} ${GATE_RECEIPTS}`;
   return (
     `Rebase ${branch} onto ${onto} before any other work — the parent unit has merged and the base has moved; ` +
-    `the only writes are your own on that branch. A conflict ends the unit: report it as the handoff and stop. ` +
+    `the only writes are your own on that branch. ` +
     `Push the branch as soon as the change exists and the fast gates pass — the project's full verification ` +
-    `is CI's gate, run there after the push with any fix as a further commit; an unpushed tree does not ` +
+    `is CI's gate and runs there after the push, with any fix as a further commit; an unpushed tree does not ` +
     `survive the run's end. ${gates} ${REBASE_POINTER} At the wind-down note, ` +
     `commit and push what compiles, say what does not, then answer. ${TIMEOUT_ON_LONG_COMMANDS}`
   );