@coreplane/switchboard 1.230.0 → 1.231.1

package/dist/cli.js

@@ -443,8 +443,10 @@ var init_store = __esm({
         const contentType = res.headers.get("content-type") ?? "application/octet-stream";
         if (res.status === 416) {
           const total = /\/(\d+)\s*$/.exec(res.headers.get("content-range") ?? "");
-          if (!total) throw new Error(`artifact store: GET ${key} answered HTTP 416 without the object's size`);
-          return { unsatisfiable: true, size: Number(total[1]), contentType };
+          if (total) return { unsatisfiable: true, size: Number(total[1]), contentType };
+          const head = await this.head(key);
+          if (!head) return null;
+          return { unsatisfiable: true, size: head.size, contentType: head.contentType };
         }
         if (!res.ok || !res.body) throw new Error(`artifact store: GET ${key} answered HTTP ${res.status}`);
         if (res.status === 206) {
@@ -1616,7 +1618,18 @@ function resolveSpecRow(ref, specMarkdown) {
     validation: parseValidationRows(specMarkdown).filter((row) => itemNumbersNamed(row.criterion).has(ref.item))
   };
 }
+function unitTitleOf(text) {
+  const firstLine2 = text.split("\n").find((l) => l.trim() !== "")?.trim() ?? "";
+  return firstLine2.length > TITLE_MAX ? `${firstLine2.slice(0, TITLE_MAX - 1).trimEnd()}\u2026` : firstLine2;
+}
+function generatedUnit(id, text) {
+  const title = unitTitleOf(text);
+  return { id, title, section: `### ${id}. ${title}
+
+${text}`, bullets: {} };
+}
 function contractFromPlan(input) {
+  if ("unit" in input) return contractOf(input.unit, input);
   const unit = parsePlanUnit(input.planMarkdown, input.unitId);
   if (!unit) {
     const ids = planUnitIds(input.planMarkdown);
@@ -1624,6 +1637,9 @@ function contractFromPlan(input) {
       `the plan has no unit ${input.unitId} (its units: ${ids.length > 0 ? ids.join(", ") : "none \u2014 no `### U<n>.` heading"})`
     );
   }
+  return contractOf(unit, input);
+}
+function contractOf(unit, input) {
   return {
     unit,
     specRows: specItemRefs(unit.section).map((ref) => resolveSpecRow(ref, input.readSpec(ref.spec))),
@@ -1633,18 +1649,6 @@ function contractFromPlan(input) {
     issue: input.issue
   };
 }
-function contractFromTask(input) {
-  const firstLine2 = input.task.split("\n").find((l) => l.trim() !== "")?.trim() ?? "";
-  const title = firstLine2.length > TITLE_MAX ? `${firstLine2.slice(0, TITLE_MAX - 1).trimEnd()}\u2026` : firstLine2;
-  return {
-    unit: { id: "task", title, section: input.task, bullets: {} },
-    specRows: [],
-    agentRules: input.agentRules,
-    guards: GUARDS,
-    rebase: { branch: input.rebase?.branch, onto: input.rebase?.onto },
-    issue: input.issue
-  };
-}
 function unitBody(unit, dropApproach) {
   const lines = unit.section.split("\n");
   if (dropApproach) {
@@ -12192,7 +12196,8 @@ function isCoordinatorInstance(v) {
   if (typeof r.repo !== "string" || !REPO_SLUG2.test(r.repo)) return false;
   if (!isText(r.branch) || !isOptionalText(r.base)) return false;
   if (!isFinite(r.createdAt)) return false;
-  if (r.plan !== void 0 && !(isObject(r.plan) && isText(r.plan.id) && isText(r.plan.path, 1024))) return false;
+  if (r.plan !== void 0 && !(isObject(r.plan) && isText(r.plan.id) && (r.plan.path === void 0 || isText(r.plan.path, 1024))))
+    return false;
   if (r.merge !== void 0 && r.merge !== "runner" && r.merge !== "person") return false;
   if (r.caps !== void 0 && !(isObject(r.caps) && isFinite(r.caps.maxRounds) && isFinite(r.caps.maxMinutes)))
     return false;
@@ -14159,11 +14164,10 @@ async function viewerRunUserIds(userIds, viewer, emailOfSlackUser, cache2) {
   const out = [];
   for (const id of new Set(userIds)) {
     if (!id.startsWith("slack:") || id.startsWith("slack:bot:")) continue;
-    const slackId = id.slice("slack:".length);
-    let known = cache2.get(slackId);
+    let known = cache2.get(id);
     if (known === void 0) {
-      known = (await emailOfSlackUser(slackId))?.toLowerCase();
-      if (known !== void 0) cache2.set(slackId, known);
+      known = (await emailOfSlackUser(id))?.toLowerCase();
+      if (known !== void 0) cache2.set(id, known);
     }
     if (known === email) out.push(id);
   }
@@ -29741,7 +29745,7 @@ var init_statusCardFrame = __esm({
     SPINNER_GLYPHS = ["\u25D0", "\u25D3", "\u25D1", "\u25D2"];
     LIVE_CARD_PREFIXES = [...SPINNER_GLYPHS, "\u{1F440}"];
     ROUTED_LABEL_PREFIX = "routed:";
-    ROUTED_CARD_FOOTER = "reply agent:<preset> to run it another way";
+    ROUTED_CARD_FOOTER = "wrong preset? reply agent:<preset> to run it another way";
   }
 });
 
@@ -35674,7 +35678,6 @@ var init_runLoop = __esm({
 });
 
 // ../../src/core/ship/preflight.ts
-import { createHash as createHash5 } from "node:crypto";
 function shipTaskText(requestText, repo) {
   let t = requestText.replace(/<((?:https?):\/\/[^|>\s]+)(?:\|[^>]*)?>/gi, " $1 ");
   t = t.replace(/https?:\/\/\S+/gi, " ");
@@ -35684,11 +35687,6 @@ function shipTaskText(requestText, repo) {
   t = t.replace(/\b[a-z0-9][\w.-]*\/[\w.-]+#\d+\b/gi, " ");
   return t.replace(/\s+/g, " ").trim().replace(/^[:,\-—.\s]+/, "").trim();
 }
-function shipBranchName(task, threadKey) {
-  const slug = task.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 24).replace(/-+$/, "") || "task";
-  const hash = createHash5("sha256").update(threadKey).digest("hex").slice(0, 6);
-  return `ship/${slug}-${hash}`;
-}
 async function shipPreflight(input) {
   const { repoCtx } = input;
   if (!input.channelId.startsWith("slack:") && !input.channelId.startsWith("cli:")) {
@@ -35812,7 +35810,7 @@ async function shipPreflight(input) {
   const ref = repoCtx.ref && !repoCtx.refFromPr && repoCtx.ref.toLowerCase() !== repo.toLowerCase() ? repoCtx.ref : void 0;
   return {
     ok: true,
-    entry: { repo, branch: shipBranchName(task, input.threadKey), base: resolveBaseRef([ref], info.defaultBranch) }
+    entry: { repo, base: resolveBaseRef([ref], info.defaultBranch) }
   };
 }
 var refuse2;
@@ -35855,6 +35853,133 @@ function planInstanceId(planId, attempt = 1) {
   const suffix = `-${attempt}`;
   return `${base.slice(0, INSTANCE_ID_MAX - suffix.length)}${suffix}`;
 }
+function sha256Hex2(text) {
+  const K = new Uint32Array([
+    1116352408,
+    1899447441,
+    3049323471,
+    3921009573,
+    961987163,
+    1508970993,
+    2453635748,
+    2870763221,
+    3624381080,
+    310598401,
+    607225278,
+    1426881987,
+    1925078388,
+    2162078206,
+    2614888103,
+    3248222580,
+    3835390401,
+    4022224774,
+    264347078,
+    604807628,
+    770255983,
+    1249150122,
+    1555081692,
+    1996064986,
+    2554220882,
+    2821834349,
+    2952996808,
+    3210313671,
+    3336571891,
+    3584528711,
+    113926993,
+    338241895,
+    666307205,
+    773529912,
+    1294757372,
+    1396182291,
+    1695183700,
+    1986661051,
+    2177026350,
+    2456956037,
+    2730485921,
+    2820302411,
+    3259730800,
+    3345764771,
+    3516065817,
+    3600352804,
+    4094571909,
+    275423344,
+    430227734,
+    506948616,
+    659060556,
+    883997877,
+    958139571,
+    1322822218,
+    1537002063,
+    1747873779,
+    1955562222,
+    2024104815,
+    2227730452,
+    2361852424,
+    2428436474,
+    2756734187,
+    3204031479,
+    3329325298
+  ]);
+  const h = new Uint32Array([
+    1779033703,
+    3144134277,
+    1013904242,
+    2773480762,
+    1359893119,
+    2600822924,
+    528734635,
+    1541459225
+  ]);
+  const bytes = new TextEncoder().encode(text);
+  const padded = new Uint8Array((bytes.length + 8 >> 6 << 6) + 64);
+  padded.set(bytes);
+  padded[bytes.length] = 128;
+  new DataView(padded.buffer).setBigUint64(padded.length - 8, BigInt(bytes.length) * 8n);
+  const w = new Uint32Array(64);
+  const rotr = (x, n2) => x >>> n2 | x << 32 - n2;
+  const view = new DataView(padded.buffer);
+  for (let i = 0; i < padded.length; i += 64) {
+    for (let t = 0; t < 16; t++) w[t] = view.getUint32(i + t * 4);
+    for (let t = 16; t < 64; t++) {
+      const s0 = rotr(w[t - 15], 7) ^ rotr(w[t - 15], 18) ^ w[t - 15] >>> 3;
+      const s1 = rotr(w[t - 2], 17) ^ rotr(w[t - 2], 19) ^ w[t - 2] >>> 10;
+      w[t] = w[t - 16] + s0 + w[t - 7] + s1 >>> 0;
+    }
+    let [a, b, c, d, e, f, g, hh] = [h[0], h[1], h[2], h[3], h[4], h[5], h[6], h[7]];
+    for (let t = 0; t < 64; t++) {
+      const S1 = rotr(e, 6) ^ rotr(e, 11) ^ rotr(e, 25);
+      const ch = e & f ^ ~e & g;
+      const t1 = hh + S1 + ch + K[t] + w[t] >>> 0;
+      const S0 = rotr(a, 2) ^ rotr(a, 13) ^ rotr(a, 22);
+      const maj = a & b ^ a & c ^ b & c;
+      const t2 = S0 + maj >>> 0;
+      hh = g;
+      g = f;
+      f = e;
+      e = d + t1 >>> 0;
+      d = c;
+      c = b;
+      b = a;
+      a = t1 + t2 >>> 0;
+    }
+    h[0] = h[0] + a >>> 0;
+    h[1] = h[1] + b >>> 0;
+    h[2] = h[2] + c >>> 0;
+    h[3] = h[3] + d >>> 0;
+    h[4] = h[4] + e >>> 0;
+    h[5] = h[5] + f >>> 0;
+    h[6] = h[6] + g >>> 0;
+    h[7] = h[7] + hh >>> 0;
+  }
+  return [...h].map((x) => x.toString(16).padStart(8, "0")).join("");
+}
+function generatedPlanId(text, threadKey) {
+  const normalised = text.toLowerCase().replace(/\s+/g, " ").trim();
+  const slug = normalised.replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, SLUG_MAX).replace(/-+$/, "") || "task";
+  const hash = sha256Hex2(`${threadKey}
+${normalised}`).slice(0, 6);
+  return `${slug}-${hash}`;
+}
 function dependenciesOf(text, self) {
   const out = [];
   const add = (id) => {
@@ -35947,141 +36072,6 @@ var init_coordinator = __esm({
   }
 });
 
-// ../../src/core/ship/reviewChild.ts
-function buildShipReviewTurn(input) {
-  const at = input.headSha ? ` at head \`${input.headSha}\`` : "";
-  if (input.round <= 1 || !input.prior) {
-    return `Review pull request ${input.where}${at}. Submit your verdict with findings via submit_verdict before your final message.`;
-  }
-  const findings = input.prior.findings.map(formatFinding).join("\n") || "(none recorded)";
-  const dispositions = input.prior.dispositions.map((d) => `${d.findingId}: ${d.disposition}${d.note ? ` \u2014 ${d.note}` : ""}`).join("\n") || "(none recorded)";
-  const dropped = input.prior.dropped !== void 0 && input.prior.dropped.length > 0 ? `
-Dispositions naming no finding of the previous round (dropped): ${input.prior.dropped.join(", ")}` : "";
-  return `Re-review pull request ${input.where}${at} \u2014 review round ${input.round} of this ship pipeline. Load the \`re-review-delta\` skill: narrow your READING to the delta since the previously reviewed head and verify each prior finding's disposition, but your verdict still covers the full diff against base. Carry every unresolved prior finding forward under its existing id.
-
-Previous round's findings:
-${findings}
-
-Fix round's dispositions:
-${dispositions}${dropped}`;
-}
-var init_reviewChild = __esm({
-  "../../src/core/ship/reviewChild.ts"() {
-    "use strict";
-    init_reviewVerdict();
-  }
-});
-
-// ../../src/core/coordinator/briefs.ts
-async function contractFor(instance, unit, readers) {
-  const rebase = { branch: unit.branch, onto: instance.base ?? "main" };
-  const issue = unit.issue !== void 0 ? { repo: instance.repo, number: unit.issue } : void 0;
-  if (unit.unit === TASK_UNIT || instance.plan === void 0) {
-    const request = await readers.readShipRequest();
-    const task = request !== void 0 ? shipTaskText(parseDirectives(request).text, instance.repo) : "";
-    return contractFromTask({
-      task: task || "Implement the task this thread's ship request describes.",
-      rebase,
-      ...issue ? { issue } : {}
-    });
-  }
-  const planMarkdown = await readers.readRepoFile(instance.plan.path);
-  if (planMarkdown === void 0)
-    throw new Error(`the plan ${instance.plan.path} is not readable at ${rebase.onto} in ${instance.repo}`);
-  const section = parsePlanUnit(planMarkdown, unit.unit)?.section ?? "";
-  const specs = /* @__PURE__ */ new Map();
-  for (const spec of new Set(specItemRefs(section).map((r) => r.spec)))
-    specs.set(spec, await readers.readRepoFile(`${SPECS_DIR2}/${spec}`));
-  let agentRules;
-  for (const file of RULES_FILES2) {
-    const text = await readers.readRepoFile(file);
-    if (text !== void 0) {
-      agentRules = { file, text };
-      break;
-    }
-  }
-  return contractFromPlan({
-    planMarkdown,
-    unitId: unit.unit,
-    readSpec: (spec) => specs.get(spec),
-    ...agentRules ? { agentRules } : {},
-    rebase,
-    ...issue ? { issue } : {}
-  });
-}
-function findingsRequest(input) {
-  const findings = input.findings.map(formatFinding).join("\n") || "(the review listed no structured findings, address its prose)";
-  return `The review of ${input.where} requested changes. Load the \`address-review-findings\` skill and address every finding below, nits included: record one disposition per finding with submit_dispositions (fixed or declined, with a note), squash to coherent commits, resubmit the pull request description with submit_pr_description, and push the branch. Never merge and never approve.
-
-Findings:
-${findings}
-
-Review:
-${input.review}`;
-}
-async function composeChild(brief, instance, unit, readers) {
-  const where = `${instance.repo}#${"pr" in brief ? brief.pr : ""}`;
-  switch (brief.kind) {
-    case "contract": {
-      const contract = await contractFor(instance, unit, readers);
-      const prompt = contract.unit.id === TASK_UNIT ? contract.unit.section : `Implement unit ${contract.unit.id} \u2014 ${contract.unit.title} \u2014 of ${instance.plan?.path ?? "the plan"}: the contract below is the unit. Do its first instruction first, then add every test scenario it lists, update every spec row it names and weaken no guard.`;
-      return { preset: "coding", prompt, ref: unit.branch, contract };
-    }
-    case "review": {
-      let prior;
-      if (brief.prior !== void 0) {
-        const findings = (await facts(readers, brief.prior.reviewRunId)).findings ?? [];
-        const recorded = brief.prior.codingRunId !== void 0 ? (await facts(readers, brief.prior.codingRunId)).dispositions ?? [] : [];
-        const { matched, dropped } = matchDispositions(findings, recorded);
-        prior = { findings, dispositions: matched, dropped };
-      }
-      const turn = buildShipReviewTurn({
-        where,
-        round: brief.round,
-        ...brief.headSha !== void 0 ? { headSha: brief.headSha } : {},
-        ...prior ? { prior } : {}
-      });
-      const contract = await contractFor(instance, unit, readers);
-      return { preset: "review", prompt: `${prUrl(instance.repo, brief.pr)}
-
-${turn}`, contract };
-    }
-    case "findings": {
-      const review = await facts(readers, brief.reviewRunId);
-      return {
-        preset: "coding",
-        prompt: findingsRequest({ where, findings: review.findings ?? [], review: review.finalReply ?? "" }),
-        ref: unit.branch
-      };
-    }
-    default: {
-      const unknown = brief;
-      throw new Error(`unknown brief kind ${JSON.stringify(unknown.kind)}`);
-    }
-  }
-}
-async function facts(readers, runId3) {
-  const read = await readers.readRunFacts(runId3);
-  if (!read) throw new Error(`run ${runId3} is not in the run history`);
-  return read;
-}
-var SPECS_DIR2, RULES_FILES2, TASK_UNIT, prUrl;
-var init_briefs = __esm({
-  "../../src/core/coordinator/briefs.ts"() {
-    "use strict";
-    init_directives();
-    init_reviewVerdict();
-    init_coordinator();
-    init_contract();
-    init_preflight();
-    init_reviewChild();
-    SPECS_DIR2 = "docs/reference/specs";
-    RULES_FILES2 = ["AGENTS.md", "CLAUDE.md"];
-    TASK_UNIT = "task";
-    prUrl = (repo, pr) => `https://github.com/${repo}/pull/${pr}`;
-  }
-});
-
 // ../../src/core/coordinator/handOff.ts
 async function plan(deps, input) {
   const { entry, msg } = input;
@@ -36107,29 +36097,26 @@ async function plan(deps, input) {
     runId: input.runId,
     label: input.label
   };
-  const request = parseShipPlanRequest(shipTaskText(input.requestText, entry.repo));
+  const taskText = shipTaskText(input.requestText, entry.repo);
+  const request = parseShipPlanRequest(taskText);
   if (request === void 0) {
-    const id = `ship-${input.runId}`;
-    const resume = entry.resume;
-    const prUrl2 = resume?.url ?? (resume !== void 0 ? `https://github.com/${entry.repo}/pull/${resume.pr}` : void 0);
+    const text2 = taskText || "Implement the task this thread's ship request describes.";
+    const planId2 = generatedPlanId(text2, msg.threadKey);
+    const graph2 = {
+      planId: planId2,
+      units: [{ id: "U1", title: unitTitleOf(text2), slug: "u1", branch: unitBranch(planId2, "u1"), dependsOn: [] }]
+    };
     return {
       ok: true,
       planned: {
-        kind: "task",
-        // A task's merge is a person's, whatever the request's words say.
-        instance: { id, ...identity2, branch: entry.branch, merge: "person" },
-        units: [
-          {
-            instanceId: id,
-            unit: TASK_UNIT,
-            slug: TASK_UNIT,
-            branch: entry.branch,
-            dependsOn: [],
-            rounds: [],
-            ...resume !== void 0 ? { resume } : {}
-          }
-        ],
-        where: resume !== void 0 ? `the review loop of ${prUrl2} resumes at its next review round on \`${entry.branch}\` in this thread under your grants \u2014 no new coding round first; this card follows it and the report lands here.` : `the task runs on \`${entry.branch}\` in this thread under your grants; this card follows it and the report lands here.`
+        planId: planId2,
+        base,
+        graph: graph2,
+        selected: ["U1"],
+        identity: identity2,
+        merge: "person",
+        ...entry.resume !== void 0 ? { resume: entry.resume } : {},
+        ...entry.branch !== void 0 ? { entryBranch: entry.branch } : {}
       }
     };
   }
@@ -36160,42 +36147,55 @@ async function plan(deps, input) {
   } catch (err2) {
     return { ok: false, reply: `\u{1F6AB} ${describe6(err2)}` };
   }
-  return { ok: true, planned: { kind: "plan", planId, path: request.planPath, base, graph, selected, identity: identity2 } };
+  return {
+    ok: true,
+    planned: { planId, path: request.planPath, base, graph, selected, identity: identity2, merge: "runner" }
+  };
 }
-function rowsFor(graph, selected, instanceId) {
-  return graph.units.filter((u) => selected.includes(u.id)).map((u) => ({
+function rowsFor(p, selected, instanceId) {
+  return p.graph.units.filter((u) => selected.includes(u.id)).map((u) => ({
     instanceId,
     unit: u.id,
     slug: u.slug,
     title: u.title,
-    branch: u.branch,
+    branch: p.entryBranch ?? u.branch,
     dependsOn: u.dependsOn,
-    rounds: []
+    rounds: [],
+    ...p.resume !== void 0 ? { resume: p.resume } : {}
   }));
 }
 function planWhere(p, units, mergedBefore) {
+  const at = p.path !== void 0 ? ` (\`${p.path}\` at \`${p.base}\`)` : "";
   const count = `${units.length} unit${units.length === 1 ? "" : "s"}`;
   const left = mergedBefore.length > 0 ? ` left` : "";
   const merged = mergedBefore.length > 0 ? `; merged before: ${mergedBefore.join(", ")}` : "";
-  return `plan \`${p.planId}\` (\`${p.path}\` at \`${p.base}\`), ${count}${left} in dependency order \u2014 ${units.map((u) => u.unit).join(", ")}${merged}. Each unit runs in a thread of its own in this channel under your grants; this card follows the plan and its summary lands in this thread.`;
+  const head = `plan \`${p.planId}\`${at}, ${count}${left} in dependency order \u2014 ${units.map((u) => u.unit).join(", ")}${merged}.`;
+  if (p.path !== void 0)
+    return `${head} Each unit runs in a thread of its own in this channel under your grants; this card follows the plan and its summary lands in this thread.`;
+  const branch2 = units[0]?.branch ?? "";
+  const prUrl2 = p.resume?.url ?? (p.resume !== void 0 ? `https://github.com/${p.identity.repo}/pull/${p.resume.pr}` : void 0);
+  const runs = p.resume !== void 0 ? `the review loop of ${prUrl2} resumes at its next review round on \`${branch2}\` in this thread under your grants \u2014 no new coding round first` : `the unit runs on \`${branch2}\` in this thread under your grants`;
+  return `${head} ${runs}; this card follows it and the report lands here.`;
 }
 async function handOffToCoordinator(deps, input) {
   const log = deps.log ?? console.log;
   const planned = await plan(deps, input);
   if (!planned.ok) return refused3(planned.reply);
   const p = planned.planned;
-  if (p.kind === "task") return start(deps, input, p.instance, p.units, p.where, "put");
+  const planOf = () => ({
+    id: p.planId,
+    ...p.path !== void 0 ? { path: p.path } : {}
+  });
   const firstId = planInstanceId(p.planId);
   const first = await deps.instances.get(firstId);
   if (first === null) {
-    const units2 = rowsFor(p.graph, p.selected, firstId);
+    const units2 = rowsFor(p, p.selected, firstId);
     const instance2 = {
       id: firstId,
       ...p.identity,
       branch: units2[0].branch,
-      plan: { id: p.planId, path: p.path },
-      // A seeded plan's units are the runner's to merge (record 0031's merge grant).
-      merge: "runner"
+      plan: planOf(),
+      merge: p.merge
     };
     return start(deps, input, instance2, units2, planWhere(p, units2, []), "put");
   }
@@ -36232,13 +36232,13 @@ async function handOffToCoordinator(deps, input) {
     );
   const mergedBefore = p.selected.filter((u) => merged.has(u));
   if (status3.kind === "absent") {
-    const units2 = rowsFor(p.graph, remaining, latest.id);
+    const units2 = rowsFor(p, remaining, latest.id);
     const instance2 = {
       id: latest.id,
       ...p.identity,
       branch: units2[0].branch,
-      plan: { id: p.planId, path: p.path },
-      merge: "runner",
+      plan: planOf(),
+      merge: p.merge,
       ...attempt > 1 ? { attempt } : {}
     };
     log(`[ship] ${input.msg.threadKey}: ${latest.id} has records but no instance \u2014 replacing the earlier attempt's`);
@@ -36246,13 +36246,13 @@ async function handOffToCoordinator(deps, input) {
     return start(deps, input, instance2, units2, `${prefix}${planWhere(p, units2, mergedBefore)}`, "replace");
   }
   const nextId = planInstanceId(p.planId, attempt + 1);
-  const units = rowsFor(p.graph, remaining, nextId);
+  const units = rowsFor(p, remaining, nextId);
   const instance = {
     id: nextId,
     ...p.identity,
     branch: units[0].branch,
-    plan: { id: p.planId, path: p.path },
-    merge: "runner",
+    plan: planOf(),
+    merge: p.merge,
     attempt: attempt + 1
   };
   return start(deps, input, instance, units, `attempt ${attempt + 1} of ${planWhere(p, units, mergedBefore)}`, "put");
@@ -36304,9 +36304,9 @@ var refused3, describe6, RUNNING, ENDED;
 var init_handOff = __esm({
   "../../src/core/coordinator/handOff.ts"() {
     "use strict";
+    init_contract();
     init_preflight();
     init_coordinator();
-    init_briefs();
     refused3 = (reply) => ({ status: "aborted", reply });
     describe6 = (err2) => err2 instanceof Error ? err2.message : String(err2);
     RUNNING = /* @__PURE__ */ new Set(["queued", "running", "paused", "waiting", "waitingForPause"]);
@@ -40486,7 +40486,7 @@ var init_threadTurns = __esm({
     "use strict";
     init_reply();
     APP_FOOTER_RE = /(?:^|\s)(?:\*Sent using\*|Sent using)\s+<@[A-Z0-9]+(?:\|[^>]*)?>(?:\s*\[[^\]\n]*\])?\s*$/;
-    RELAY_FOOTER_RE = /(?:^|\s)Sent by Claude in <#([CGD][A-Z0-9_]+)(?:\|[^>]*)?>\s*(?:·|•|-|—)\s*<(https?:\/\/[^|>\s]+)(?:\|[^>]*)?>\s*$/;
+    RELAY_FOOTER_RE = /(?:^|\s)Sent by Claude in <#([CGD][A-Z0-9_]+)(?:\|[^>]*)?>(?:\s+on behalf of <@([A-Z0-9]+)(?:\|[^>]*)?>)?\s*(?:·|•|-|—)\s*<(https?:\/\/[^|>\s]+)(?:\|[^>]*)?>\s*$/;
   }
 });
 
@@ -41257,12 +41257,35 @@ var init_lookups = __esm({
 });
 
 // ../../src/channels/slack/requester.ts
+function textOfBlocks(blocks) {
+  if (!blocks) return "";
+  const out = [];
+  const walk2 = (b) => {
+    if (typeof b.text === "string") out.push(b.text);
+    else if (b.text && typeof b.text.text === "string") out.push(b.text.text);
+    for (const e of b.elements ?? []) walk2(e);
+  };
+  for (const b of blocks) {
+    const before = out.length;
+    walk2(b);
+    if (out.length > before) out.push("\n");
+  }
+  return out.join("").replace(/\n+$/, "");
+}
+function rawTextOf(text, blocks) {
+  const base = text ?? "";
+  const fromBlocks = textOfBlocks(blocks);
+  if (!fromBlocks) return base;
+  const extra = fromBlocks.split("\n").map((l) => l.trim()).filter((l) => l.length > 0 && !base.includes(l));
+  return extra.length > 0 ? `${base}
+${extra.join("\n")}` : base;
+}
 function parseRelayFooter(text) {
   const m = RELAY_FOOTER_RE.exec(text);
   if (!m) return void 0;
   let url;
   try {
-    url = new URL(m[2].replaceAll("&amp;", "&"));
+    url = new URL(m[3].replaceAll("&amp;", "&"));
   } catch {
     return void 0;
   }
@@ -41272,7 +41295,7 @@ function parseRelayFooter(text) {
   if (!ts) return void 0;
   const threadTs = url.searchParams.get("thread_ts") ?? `${ts[1]}.${ts[2]}`;
   if (!THREAD_TS.test(threadTs)) return void 0;
-  return { channel: parts[1], threadTs };
+  return { channel: parts[1], threadTs, ...m[2] ? { onBehalfOf: m[2] } : {} };
 }
 function rememberParent(key, user) {
   relayParentCache.set(key, user);
@@ -41302,6 +41325,7 @@ async function resolveSlackRequester(client, ev) {
   const poster = ev.poster ?? {};
   const relay = parseRelayFooter(ev.text);
   if (relay) {
+    if (relay.onBehalfOf) return personRequester(relay.onBehalfOf, "relay-footer", poster);
     const user = await threadParentUser(client, relay.channel, relay.threadTs);
     if (user) return personRequester(user, "relay-footer", poster);
   }
@@ -41552,7 +41576,7 @@ function createSlackApp(deps) {
         channel: event.channel,
         user: event.user,
         poster: posterOf(posted),
-        rawText: event.text ?? "",
+        rawText: rawTextOf(event.text, posted.blocks),
         text: stripMention(event.text ?? "", botUserId),
         ts: event.ts,
         threadTs: event.thread_ts ?? event.ts,
@@ -41579,7 +41603,7 @@ function createSlackApp(deps) {
         channel: m.channel,
         user: m.user,
         poster: posterOf(m),
-        rawText: m.text ?? "",
+        rawText: rawTextOf(m.text, m.blocks),
         text: stripMention(m.text ?? "", botUserId),
         ts: m.ts,
         threadTs: m.thread_ts ?? m.ts,
@@ -43751,7 +43775,7 @@ var init_accessAuth = __esm({
 });
 
 // ../../src/channels/dashboardAuth.ts
-import { createHash as createHash6, timingSafeEqual as timingSafeEqual4 } from "node:crypto";
+import { createHash as createHash5, timingSafeEqual as timingSafeEqual4 } from "node:crypto";
 function header2(headers, name) {
   const raw = headers[name];
   return Array.isArray(raw) ? raw[0] : raw;
@@ -43769,8 +43793,8 @@ function accessVerifier(config, deps) {
   };
 }
 function secretsEqual(a, b) {
-  const ha = createHash6("sha256").update(a).digest();
-  const hb = createHash6("sha256").update(b).digest();
+  const ha = createHash5("sha256").update(a).digest();
+  const hb = createHash5("sha256").update(b).digest();
   return timingSafeEqual4(ha, hb);
 }
 function tokenVerifier(opts) {
@@ -44799,6 +44823,147 @@ var init_adminRestartAuthorize = __esm({
   }
 });
 
+// ../../src/core/ship/reviewChild.ts
+function buildShipReviewTurn(input) {
+  const at = input.headSha ? ` at head \`${input.headSha}\`` : "";
+  if (input.round <= 1 || !input.prior) {
+    return `Review pull request ${input.where}${at}. Submit your verdict with findings via submit_verdict before your final message.`;
+  }
+  const findings = input.prior.findings.map(formatFinding).join("\n") || "(none recorded)";
+  const dispositions = input.prior.dispositions.map((d) => `${d.findingId}: ${d.disposition}${d.note ? ` \u2014 ${d.note}` : ""}`).join("\n") || "(none recorded)";
+  const dropped = input.prior.dropped !== void 0 && input.prior.dropped.length > 0 ? `
+Dispositions naming no finding of the previous round (dropped): ${input.prior.dropped.join(", ")}` : "";
+  return `Re-review pull request ${input.where}${at} \u2014 review round ${input.round} of this ship pipeline. Load the \`re-review-delta\` skill: narrow your READING to the delta since the previously reviewed head and verify each prior finding's disposition, but your verdict still covers the full diff against base. Carry every unresolved prior finding forward under its existing id.
+
+Previous round's findings:
+${findings}
+
+Fix round's dispositions:
+${dispositions}${dropped}`;
+}
+var init_reviewChild = __esm({
+  "../../src/core/ship/reviewChild.ts"() {
+    "use strict";
+    init_reviewVerdict();
+  }
+});
+
+// ../../src/core/coordinator/briefs.ts
+async function generatedUnitOf(instance, unit, readers) {
+  const resume = unit.resume;
+  if (resume !== void 0) {
+    const url = resume.url ?? `https://github.com/${instance.repo}/pull/${resume.pr}`;
+    return generatedUnit(unit.unit, `Resume the review loop of ${url}`);
+  }
+  const request = await readers.readShipRequest();
+  const task = request !== void 0 ? shipTaskText(parseDirectives(request).text, instance.repo) : "";
+  return generatedUnit(unit.unit, task || "Implement the task this thread's ship request describes.");
+}
+async function contractFor(instance, unit, readers) {
+  const rebase = { branch: unit.branch, onto: instance.base ?? "main" };
+  const issue = unit.issue !== void 0 ? { repo: instance.repo, number: unit.issue } : void 0;
+  let source2;
+  if (isGenerated(instance)) {
+    source2 = { unit: await generatedUnitOf(instance, unit, readers) };
+  } else {
+    const planMarkdown = await readers.readRepoFile(instance.plan.path);
+    if (planMarkdown === void 0)
+      throw new Error(`the plan ${instance.plan.path} is not readable at ${rebase.onto} in ${instance.repo}`);
+    source2 = { planMarkdown, unitId: unit.unit };
+  }
+  const section = ("unit" in source2 ? source2.unit : parsePlanUnit(source2.planMarkdown, unit.unit))?.section ?? "";
+  const specs = /* @__PURE__ */ new Map();
+  for (const spec of new Set(specItemRefs(section).map((r) => r.spec)))
+    specs.set(spec, await readers.readRepoFile(`${SPECS_DIR2}/${spec}`));
+  let agentRules;
+  for (const file of RULES_FILES2) {
+    const text = await readers.readRepoFile(file);
+    if (text !== void 0) {
+      agentRules = { file, text };
+      break;
+    }
+  }
+  return contractFromPlan({
+    ...source2,
+    readSpec: (spec) => specs.get(spec),
+    ...agentRules ? { agentRules } : {},
+    rebase,
+    ...issue ? { issue } : {}
+  });
+}
+function findingsRequest(input) {
+  const findings = input.findings.map(formatFinding).join("\n") || "(the review listed no structured findings, address its prose)";
+  return `The review of ${input.where} requested changes. Load the \`address-review-findings\` skill and address every finding below, nits included: record one disposition per finding with submit_dispositions (fixed or declined, with a note), squash to coherent commits, resubmit the pull request description with submit_pr_description, and push the branch. Never merge and never approve.
+
+Findings:
+${findings}
+
+Review:
+${input.review}`;
+}
+async function composeChild(brief, instance, unit, readers) {
+  const where = `${instance.repo}#${"pr" in brief ? brief.pr : ""}`;
+  switch (brief.kind) {
+    case "contract": {
+      const contract = await contractFor(instance, unit, readers);
+      const prompt = isGenerated(instance) ? contract.unit.section.split("\n").slice(1).join("\n").trim() : `Implement unit ${contract.unit.id} \u2014 ${contract.unit.title} \u2014 of ${instance.plan?.path ?? "the plan"}: the contract below is the unit. Do its first instruction first, then add every test scenario it lists, update every spec row it names and weaken no guard.`;
+      return { preset: "coding", prompt, ref: unit.branch, contract };
+    }
+    case "review": {
+      let prior;
+      if (brief.prior !== void 0) {
+        const findings = (await facts(readers, brief.prior.reviewRunId)).findings ?? [];
+        const recorded = brief.prior.codingRunId !== void 0 ? (await facts(readers, brief.prior.codingRunId)).dispositions ?? [] : [];
+        const { matched, dropped } = matchDispositions(findings, recorded);
+        prior = { findings, dispositions: matched, dropped };
+      }
+      const turn = buildShipReviewTurn({
+        where,
+        round: brief.round,
+        ...brief.headSha !== void 0 ? { headSha: brief.headSha } : {},
+        ...prior ? { prior } : {}
+      });
+      const contract = await contractFor(instance, unit, readers);
+      return { preset: "review", prompt: `${prUrl(instance.repo, brief.pr)}
+
+${turn}`, contract };
+    }
+    case "findings": {
+      const review = await facts(readers, brief.reviewRunId);
+      return {
+        preset: "coding",
+        prompt: findingsRequest({ where, findings: review.findings ?? [], review: review.finalReply ?? "" }),
+        ref: unit.branch
+      };
+    }
+    default: {
+      const unknown = brief;
+      throw new Error(`unknown brief kind ${JSON.stringify(unknown.kind)}`);
+    }
+  }
+}
+async function facts(readers, runId3) {
+  const read = await readers.readRunFacts(runId3);
+  if (!read) throw new Error(`run ${runId3} is not in the run history`);
+  return read;
+}
+var SPECS_DIR2, RULES_FILES2, isGenerated, prUrl;
+var init_briefs = __esm({
+  "../../src/core/coordinator/briefs.ts"() {
+    "use strict";
+    init_directives();
+    init_reviewVerdict();
+    init_coordinator();
+    init_contract();
+    init_preflight();
+    init_reviewChild();
+    SPECS_DIR2 = "docs/reference/specs";
+    RULES_FILES2 = ["AGENTS.md", "CLAUDE.md"];
+    isGenerated = (instance) => instance.plan?.path === void 0;
+    prUrl = (repo, pr) => `https://github.com/${repo}/pull/${pr}`;
+  }
+});
+
 // ../../src/channels/adminCoordinator.ts
 function isCoordinatorAdminPath(path) {
   return path.startsWith(COORDINATOR_ADMIN_PREFIX) && path.length > COORDINATOR_ADMIN_PREFIX.length;
@@ -44913,7 +45078,7 @@ async function unitRowOf(deps, instance, unit) {
   return { ok: true, row };
 }
 function unitThread(instance, row) {
-  const threadKey = row?.threadKey ?? (row === void 0 || row.unit === TASK_UNIT ? instance.threadKey : void 0);
+  const threadKey = row?.threadKey ?? (row === void 0 || isGenerated2(instance) ? instance.threadKey : void 0);
   const sourceUrl = row?.sourceUrl ?? (threadKey === instance.threadKey ? instance.sourceUrl : void 0);
   return { threadKey, sourceUrl };
 }
@@ -45054,7 +45219,7 @@ async function spawn6(body, deps) {
   if (req.brief !== void 0) {
     if (row === void 0) return json(400, { ok: false, error: "a brief needs the unit it runs for" });
     try {
-      turn = await composeChild(req.brief, instance, row, briefReaders(deps, instance, io));
+      turn = await composeChild(req.brief, instance, row, briefReaders(deps, instance));
     } catch (err2) {
       log(`[coordinator] ${instance.id} ${req.step}: the brief could not be composed: ${describe11(err2)}`);
       return json(502, { ok: false, error: "brief_failed", message: describe11(err2), at });
@@ -45283,6 +45448,8 @@ async function plan2(body, deps) {
     ...instance.plan !== void 0 ? { planId: instance.plan.id } : {},
     // Who merges: the instance's field; a record written before it existed is a person's merge.
     merge: instance.merge ?? "person",
+    // The mark (item 16): the machine's report keys its re-issue line on it.
+    generated: isGenerated2(instance),
     repo: instance.repo,
     base: instance.base ?? "main",
     caps: instance.caps ?? resolveShipCaps(void 0),
@@ -45312,7 +45479,7 @@ async function unitStart(body, deps) {
   if (!unit.ok) return unit.response;
   let row = unit.row;
   if (row.threadKey === void 0) {
-    if (row.unit === TASK_UNIT) {
+    if (isGenerated2(instance)) {
       row = {
         ...row,
         threadKey: instance.threadKey,
@@ -45332,7 +45499,7 @@ async function unitStart(body, deps) {
     }
     row = review.row;
   }
-  if (row.issue === void 0 && row.unit !== TASK_UNIT) {
+  if (row.issue === void 0 && !isGenerated2(instance)) {
     const issue = await unitIssueOf(deps, instance.repo, row.unit);
     if (issue !== void 0) row = { ...row, issue };
   }
@@ -45359,7 +45526,7 @@ function unitLead(instance, row) {
 function reviewLead(instance, row) {
   const who2 = instance.userName ?? instance.userId;
   const from = instance.sourceUrl !== void 0 ? `[the *ship* run](${instance.sourceUrl})` : "the *ship* run";
-  const what = row.unit === TASK_UNIT ? "the task" : `unit ${row.unit}${row.title ? ` \u2014 ${row.title}` : ""}`;
+  const what = isGenerated2(instance) ? "the task" : `unit ${row.unit}${row.title ? ` \u2014 ${row.title}` : ""}`;
   return `\u21B3 *ship* review of ${what} for ${who2}, from ${from}: \`${row.branch}\` in ${instance.repo}`;
 }
 async function branch(body, deps) {
@@ -45382,11 +45549,11 @@ async function branch(body, deps) {
     return json(200, { ok: false, reason: describe11(err2), at });
   }
 }
-function unitLines(units) {
+function unitLines(units, generated) {
   return units.map((u) => {
     const last = u.rounds.at(-1);
     const state = u.ending ? u.ending.kind : last ? `${shipRoundHeader({ index: last.index, agent: last.agent })} \xB7 ${last.outcome}` : u.threadKey ? "starting" : "waiting";
-    return u.unit === TASK_UNIT ? state : `${u.unit} \xB7 ${state}`;
+    return generated ? state : `${u.unit} \xB7 ${state}`;
   });
 }
 async function drawCard(deps, instance, units, close) {
@@ -45395,7 +45562,7 @@ async function drawCard(deps, instance, units, close) {
   if (!io) return;
   const clock4 = deps.clock ?? systemClock;
   const shell = createCardShell({ label: instance.label ?? "*ship*", startedAt: instance.createdAt, now: clock4 });
-  const detail = unitLines(units);
+  const detail = unitLines(units, isGenerated2(instance));
   if (!close) {
     await io.status(shell.live({ detail }));
     return;
@@ -45613,7 +45780,7 @@ function parentRunRecord(instance, units, outcome, channelVisibility, finishedAt
         at: r.at
       }))
     ),
-    { type: "answer", text: planSummary(units), at: finishedAt }
+    { type: "answer", text: planSummary(units, isGenerated2(instance)), at: finishedAt }
   ];
   events.forEach((e, i) => {
     e.seq = i + 1;
@@ -45639,11 +45806,11 @@ function parentRunRecord(instance, units, outcome, channelVisibility, finishedAt
     ...instance.sourceUrl !== void 0 ? { sourceUrl: instance.sourceUrl } : {}
   };
 }
-function planSummary(units) {
+function planSummary(units, generated = false) {
   const lines = units.map((u) => {
     const how = u.ending ? u.ending.kind : u.threadKey ? "unfinished" : "not started";
     const pr = u.pr ? ` \u2014 ${u.pr.url}` : "";
-    return u.unit === TASK_UNIT ? `${ENDING_ICON[how] ?? "\u2022"} ${how}${pr}` : `${ENDING_ICON[how] ?? "\u2022"} ${u.unit} \u2014 ${how}${pr}`;
+    return generated ? `${ENDING_ICON[how] ?? "\u2022"} ${how}${pr}` : `${ENDING_ICON[how] ?? "\u2022"} ${u.unit} \u2014 ${how}${pr}`;
   });
   return lines.join("\n");
 }
@@ -45661,8 +45828,7 @@ async function finish(body, deps) {
   deps.runHistoryWriter.write(record2);
   await drawCard(deps, instance, units, { icon: body.outcome === "completed" ? "\u2705" : "\u26A0\uFE0F" }).catch(() => {
   });
-  const isPlan = units.some((u) => u.unit !== TASK_UNIT);
-  if (isPlan) {
+  if (!isGenerated2(instance)) {
     const io = deps.ioFor({ threadKey: instance.threadKey, userId: instance.userId });
     await io?.reply(`Plan ${instance.plan?.id ?? ""} ended (${body.outcome}):
 ${planSummary(units)}`).catch(() => {
@@ -45671,7 +45837,7 @@ ${planSummary(units)}`).catch(() => {
   (deps.log ?? console.log)(`[coordinator] ${instance.id}: finished ${body.outcome} \u2014 record ${record2.id}`);
   return json(200, { ok: true, runId: record2.id, at });
 }
-function briefReaders(deps, instance, io) {
+function briefReaders(deps, instance) {
   const ref = instance.base ?? "main";
   return {
     readRepoFile: async (path) => {
@@ -45691,9 +45857,16 @@ function briefReaders(deps, instance, io) {
         ...finalReplyOf2(r.events) !== void 0 ? { finalReply: finalReplyOf2(r.events) } : {}
       };
     },
+    // The generated plan's request text: the ship run's own record
+    // (`instance.runId`, its `input` event) — never a scan of the thread, so a
+    // routed request with no `agent:ship` turn anywhere still reads back the
+    // words the person typed (agent-ship item 13).
     readShipRequest: async () => {
-      const history = await io.history().catch(() => []);
-      return [...history].reverse().find((h) => h.role === "user" && /\bagent:ship\b/.test(h.text))?.text;
+      if (instance.runId === void 0) return void 0;
+      const res = await deps.runs.getRun(instance.runId, { include: "messages" }).catch(() => void 0);
+      if (res === void 0 || !res.ok) return void 0;
+      const input = (res.value.events ?? []).find((e) => e.type === "input");
+      return input?.type === "input" ? input.text : void 0;
     }
   };
 }
@@ -45769,7 +45942,7 @@ function createAdminCoordinatorHandler(deps) {
     })();
   };
 }
-var COORDINATOR_ADMIN_PREFIX, MAX_SPAWN_PROMPT_CHARS, FINISHED_LOOKBACK_PAGES, MAX_ADMIN_BODY_BYTES, UNIT_ID, PRESETS_OF_KIND, invalid, json, describe11, EVERY_RUN, REVIEW_POSTED_CHECKS, REVIEW_POSTED_RECHECK_MS, ROUND_OUTCOMES, ENDING_ICON, STEPS;
+var COORDINATOR_ADMIN_PREFIX, MAX_SPAWN_PROMPT_CHARS, FINISHED_LOOKBACK_PAGES, MAX_ADMIN_BODY_BYTES, UNIT_ID, PRESETS_OF_KIND, invalid, json, describe11, isGenerated2, EVERY_RUN, REVIEW_POSTED_CHECKS, REVIEW_POSTED_RECHECK_MS, ROUND_OUTCOMES, ENDING_ICON, STEPS;
 var init_adminCoordinator = __esm({
   "../../src/channels/adminCoordinator.ts"() {
     "use strict";
@@ -45803,6 +45976,7 @@ var init_adminCoordinator = __esm({
     invalid = (error) => ({ ok: false, error });
     json = (status3, body) => ({ status: status3, body });
     describe11 = (err2) => err2 instanceof Error ? err2.message : String(err2);
+    isGenerated2 = (instance) => instance.plan?.path === void 0;
     EVERY_RUN = { kind: "all" };
     REVIEW_POSTED_CHECKS = 3;
     REVIEW_POSTED_RECHECK_MS = 2e3;