mandrel 2.36.0 → 2.38.0

package/.agents/scripts/lib/orchestration/light-suitability.js

@@ -29,11 +29,11 @@
  *      3 below does the real enforcement against ground truth.
  *   2. **Over-scope stops, never silently proceeds ({@link
  *      resolveLightGateOutcome}).** An over-ceiling prompt does **not**
- *      hard-fail — it STOPS and asks the operator to escalate to `/plan` or
+ *      hard-fail — it STOPS and asks the operator to escalate to `/mandrel-plan` or
  *      proceed light. Both answers are executable: `proceed-light` is recorded
  *      through {@link resolveOperatorOverride}, which waives a *size
  *      prediction* only, never a risk rule, and only with a human present.
- *      Under `--yes` (unattended) it fails closed to recommending `/plan`.
+ *      Under `--yes` (unattended) it fails closed to recommending `/mandrel-plan`.
  *   3. **Diff-derived backstop ({@link checkLightDiffBackstop}).** After
  *      implementation the **actual** change set is re-checked with
  *      {@link module:lib/orchestration/review-depth.deriveChangeLevel} plus the
@@ -41,7 +41,7 @@
  *      the diff is the real scope signal — and an over-ceiling diff is blocked
  *      rather than landed silently. Story #4856 moved this from a `maxFiles: 4`
  *      cardinality ceiling to changed lines over implementation files, and made
- *      a block **recycle** its receipt Story through `/plan` tickets mode
+ *      a block **recycle** its receipt Story through `/mandrel-plan` tickets mode
  *      instead of orphaning it.
  *   4. **Minimal receipt Story ({@link buildReceiptStoryTicket}).** A
  *      `type::story` ticket is authored inline so `refs #`, history, telemetry,
@@ -131,7 +131,7 @@ function deriveUnwaivableRisk(decision) {
         `class(es) ${classes.join(', ')} — this is risk, not size, so no ` +
         `re-slicing, shrinking, or operator override satisfies it and the ` +
         `diff backstop would refuse the same footprint after the work is ` +
-        `finished; take this to /plan now`,
+        `finished; take this to /mandrel-plan now`,
     };
   }
   if (shape?.migrationSpan === true) {
@@ -142,7 +142,7 @@ function deriveUnwaivableRisk(decision) {
       reason:
         `un-waivable: the predicted footprint pairs a migration with its ` +
         `consumers — this is risk, not size, so no re-slicing or operator ` +
-        `override satisfies it; take this to /plan now`,
+        `override satisfies it; take this to /mandrel-plan now`,
     };
   }
   return { present: false, code: null, classes: [], reason: null };
@@ -237,7 +237,7 @@ export function resolveLedgeredVerdict({ route, reason } = {}) {
       route: 'full',
       reason: recordedReason || null,
       recorded: recordedReason !== '',
-      note: 'model verdict is not lite — standard /plan route',
+      note: 'model verdict is not lite — standard /mandrel-plan route',
     };
   }
   if (recordedReason === '') {
@@ -261,7 +261,7 @@ export function resolveLedgeredVerdict({ route, reason } = {}) {
  * light path. The deterministic effort/risk derivation and the ledgered model
  * verdict must **both** agree on `lite`; anything else — clearly-epic work, a
  * sensitive-path footprint, an unledgered verdict — resolves to `full` (the
- * conservative default that routes the operator to `/plan`).
+ * conservative default that routes the operator to `/mandrel-plan`).
  *
  * The predicted axes are declared by the caller: `predictedKinds` (the distinct
  * kinds of change; absent, each entry's `assumption` is its kind, so N
@@ -394,7 +394,7 @@ export function resolveOperatorOverride({
   }
   if (yes === true) {
     return refuse(
-      'operator override refused — it is attended-only, and --yes means nobody is at the keyboard; over-scope still fails closed to /plan',
+      'operator override refused — it is attended-only, and --yes means nobody is at the keyboard; over-scope still fails closed to /mandrel-plan',
     );
   }
 
@@ -412,7 +412,7 @@ export function resolveOperatorOverride({
             ? ` (${unwaivable.classes.join(', ')})`
             : ''
         }; waiving the size prediction cannot make this land light, and the ` +
-        `diff backstop would refuse the finished work. Escalate to /plan.`,
+        `diff backstop would refuse the finished work. Escalate to /mandrel-plan.`,
     );
   }
   if (!OVERRIDABLE_SHAPE_CODES.includes(code)) {
@@ -441,7 +441,7 @@ export function resolveOperatorOverride({
  * Resolve what the light gate does with a suitability decision (Story #4740
  * AC-3). Over-scope never hard-fails: it STOPS and asks the operator to choose,
  * unless the run is unattended (`--yes`), where it fails closed to recommending
- * `/plan` rather than silently proceeding light.
+ * `/mandrel-plan` rather than silently proceeding light.
  *
  *   - suitable          → `proceed-light`
  *   - over-scope + attended (`yes:false`)  → `ask-operator` (escalate | proceed)
@@ -498,7 +498,7 @@ export function resolveLightGateOutcome({
       action: 'escalate-plan',
       reasons: [
         ...reasons,
-        '--yes on over-scope fails closed to /plan (never silently proceeds light)',
+        '--yes on over-scope fails closed to /mandrel-plan (never silently proceeds light)',
       ],
     };
   }
@@ -519,7 +519,7 @@ export function resolveLightGateOutcome({
     options: ['escalate-plan', 'proceed-light'],
     reasons: [
       ...reasons,
-      'predicted scope exceeds the light ceilings — STOP and ask the operator to escalate to /plan or proceed light',
+      'predicted scope exceeds the light ceilings — STOP and ask the operator to escalate to /mandrel-plan or proceed light',
     ],
   };
 }
@@ -587,7 +587,7 @@ export function checkLightDiffBackstop({
       magnitude: null,
       ceilings: resolved,
       reasons: [
-        'actual change set is unknown or empty — cannot verify the diff is light; escalate to /plan',
+        'actual change set is unknown or empty — cannot verify the diff is light; escalate to /mandrel-plan',
       ],
     };
   }
@@ -646,12 +646,12 @@ function normalizeMagnitude(magnitude) {
 function describeSensitivity({ level, classes }) {
   if (classes.length > 0) {
     return [
-      `diff intersects sensitive-path class(es) ${classes.join(', ')} — escalate to /plan (do not land light)`,
+      `diff intersects sensitive-path class(es) ${classes.join(', ')} — escalate to /mandrel-plan (do not land light)`,
     ];
   }
   if (level !== 'low') {
     return [
-      'sensitive-path classification unavailable — cannot verify the diff is non-sensitive; escalate to /plan',
+      'sensitive-path classification unavailable — cannot verify the diff is non-sensitive; escalate to /mandrel-plan',
     ];
   }
   return [];
@@ -667,18 +667,18 @@ function describeSensitivity({ level, classes }) {
 function describeMagnitude(measured, ceilings) {
   if (measured === null) {
     return [
-      'change magnitude could not be measured (unreadable or unparseable numstat) — cannot verify the diff is light; escalate to /plan',
+      'change magnitude could not be measured (unreadable or unparseable numstat) — cannot verify the diff is light; escalate to /mandrel-plan',
     ];
   }
   const reasons = [];
   if (measured.implLines > ceilings.maxImplLines) {
     reasons.push(
-      `diff changes ${measured.implLines} implementation line(s) (> maxImplLines ${ceilings.maxImplLines}) — escalate to /plan (do not land light)`,
+      `diff changes ${measured.implLines} implementation line(s) (> maxImplLines ${ceilings.maxImplLines}) — escalate to /mandrel-plan (do not land light)`,
     );
   }
   if (measured.implFiles > ceilings.maxImplFiles) {
     reasons.push(
-      `diff spans ${measured.implFiles} implementation file(s) (> maxImplFiles ${ceilings.maxImplFiles}) — escalate to /plan (do not land light)`,
+      `diff spans ${measured.implFiles} implementation file(s) (> maxImplFiles ${ceilings.maxImplFiles}) — escalate to /mandrel-plan (do not land light)`,
     );
   }
   return reasons;
@@ -832,7 +832,7 @@ export function buildReceiptStoryTicket({
       goal: `${text}${amendNote}`,
       spec:
         `Delivered via /deliver-light as a validated single-session change — ` +
-        `the /plan session is removed for genuinely small work while every ` +
+        `the /mandrel-plan session is removed for genuinely small work while every ` +
         `single-story-close gate runs byte-identical.${amendNote}` +
         `${overrideNote} ` +
         `Operator prompt: ${text}`,

package/.agents/scripts/lib/orchestration/plan-context.js

@@ -1,5 +1,5 @@
 /**
- * plan-context.js — single planner-context envelope build for `/plan`.
+ * plan-context.js — single planner-context envelope build for `/mandrel-plan`.
  *
  * Folds the authoring-context builders plus the cross-Story dup search into
  * ONE JSON envelope, so the authoring middle reads a single file instead of
@@ -481,7 +481,7 @@ export function buildDeliverLightSuggestion(complexitySignals) {
     reasons: suggested
       ? [
           'seed carries no risk signal (no risk-heuristic hits, no ' +
-            'sensitive-path classes) — the operator may prefer /deliver for ' +
+            'sensitive-path classes) — the operator may prefer /mandrel-deliver for ' +
             "this scope; the light path's own gate and diff backstop decide size",
         ]
       : reasons,
@@ -597,7 +597,7 @@ function uiSurfaceReason({
  * derived from the consumer's own checkout, so a frontend-less project — this
  * repository included — resolves falsey and the offer never fires.
  *
- * The signal carries **no routing authority** (`automatic: false`): `/plan`
+ * The signal carries **no routing authority** (`automatic: false`): `/mandrel-plan`
  * may say that a plan touches UI and that `/prototype` exists, and must never
  * invoke it. Pure over its inputs and total — a malformed signal bag or an
  * unreadable manifest degrades, never throws.
@@ -911,7 +911,7 @@ async function gatherEnvelopeInputs({
     (gather) => gather(),
     // The per-mode envelope gathers (Story #4952): the duplicate search, the
     // authoring-context fold and the docs digest have no data dependency on
-    // one another, so their serialization was incidental and `/plan` paid it
+    // one another, so their serialization was incidental and `/mandrel-plan` paid it
     // with the operator waiting at Gate #1.
     { concurrency: FANOUT_CONCURRENCY },
   );

package/.agents/scripts/lib/orchestration/plan-critic-conditions.js

@@ -1,6 +1,6 @@
 /**
  * plan-critic-conditions.js — size/heuristic-conditional dispatch decisions for
- * the /plan author-step critics (Epic #4474 PR6, design §4).
+ * the /mandrel-plan author-step critics (Epic #4474 PR6, design §4).
  *
  * The collapsed plan flow keeps the consolidation and pre-mortem critics as
  * fresh-context sub-agent dispatches, but makes each dispatch
@@ -44,7 +44,7 @@
  * (`appendCriticSkip`) by the caller so under-firing is auditable.
  *
  * Pure, synchronous, no I/O. The single caller is `plan-critics-evaluate.js`,
- * driven by the `plan-critics.js` CLI that `/plan` runs between Author and
+ * driven by the `plan-critics.js` CLI that `/mandrel-plan` runs between Author and
  * Persist (Story #4592); the CLI owns reading the authored artifacts and the
  * resolved config.
  */

package/.agents/scripts/lib/orchestration/plan-critics-evaluate.js

@@ -1,8 +1,8 @@
 /**
  * plan-critics-evaluate.js — shared critic-dispatch evaluation for the
- * collapsed /plan flow (#4496 fix 6).
+ * collapsed /mandrel-plan flow (#4496 fix 6).
  *
- * One consumer: the `plan-critics.js` CLI, which `/plan` runs between its
+ * One consumer: the `plan-critics.js` CLI, which `/mandrel-plan` runs between its
  * Author and Persist steps. The CLI loads the draft artifacts, calls this
  * module, prints the verdict as JSON, and records every skip on the
  * plan-metrics ledger; the workflow dispatches a fresh-context critic

package/.agents/scripts/lib/orchestration/plan-metrics.js

@@ -1,7 +1,7 @@
 /**
  * plan-metrics.js — append-only plan-invocation ledger (Epic #4474, PR1).
  *
- * The `/plan` collapse (#4474) is measured, not asserted: before any pipeline
+ * The `/mandrel-plan` collapse (#4474) is measured, not asserted: before any pipeline
  * phase is removed, every plan CLI invocation stamps an entry/exit record so
  * the current 12-phase baseline is captured on disk. Each record is one
  * newline-terminated JSON line appended to

package/.agents/scripts/lib/orchestration/plan-persist/persist-helpers.js

@@ -1,5 +1,5 @@
 /**
- * persist-helpers.js — pure helper surface for the flat Story `/plan` persist.
+ * persist-helpers.js — pure helper surface for the flat Story `/mandrel-plan` persist.
  *
  * Exports:
  *   - `resolveBaseBranchRef(config)` — the one place the persist gates learn

package/.agents/scripts/lib/orchestration/plan-persist/plan-context-source.js

@@ -1,6 +1,6 @@
 /**
  * plan-context-source.js — locate and read the `plan-context.js` envelope so
- * persist can derive the `/plan --tickets` source ids from the run that
+ * persist can derive the `/mandrel-plan --tickets` source ids from the run that
  * actually fetched them (Story #4554).
  *
  * This lives beside the persist ops rather than inside `plan-persist.js` so
@@ -17,7 +17,7 @@ import path from 'node:path';
 import { Logger } from '../../Logger.js';
 
 /**
- * Filename the `/plan` interrogate step writes its envelope to inside
+ * Filename the `/mandrel-plan` interrogate step writes its envelope to inside
  * `--plan-dir` (`plan-context.js --out <plan-dir>/plan-context.json`).
  */
 export const PLAN_CONTEXT_FILENAME = 'plan-context.json';
@@ -81,7 +81,7 @@ export async function loadPlanContextEnvelope(planContext) {
   if (!planContext) {
     Logger.warn(
       '[plan-persist] no --plan-dir or --plan-context given, so no ' +
-        'plan-context envelope was read. If this was a `/plan --tickets` ' +
+        'plan-context envelope was read. If this was a `/mandrel-plan --tickets` ' +
         'run, its source tickets can only come from --source-tickets and ' +
         `will NOT be closed otherwise. ${CAPTURE_HINT}`,
     );

package/.agents/scripts/lib/orchestration/plan-persist/run-plan-persist.js

@@ -1,5 +1,5 @@
 /**
- * run-plan-persist.js — flat Story persist for the v2 `/plan` collapse
+ * run-plan-persist.js — flat Story persist for the v2 `/mandrel-plan` collapse
  * (Stage 3 — `docs/roadmap.md`).
  *
  * Ordered, fail-closed pipeline:
@@ -293,7 +293,7 @@ async function renderRunScopedPlanMetricsLine({
  *      from the seed.
  *
  * The resolved route decides whether the created Stories carry the
- * {@link LITE_ROUTE_LABEL} **hint** (never the control signal — `/deliver`
+ * {@link LITE_ROUTE_LABEL} **hint** (never the control signal — `/mandrel-deliver`
  * re-derives the route from the Story body's shape) and the `route` block
  * ledgered on their `story-plan-state` checkpoint, including the authored
  * verdict, its recorded reason, and the per-Story shape evidence. A refused
@@ -531,7 +531,7 @@ async function enforceReachability(reachability, config) {
  * concurrency, but the `await` on that whole fan-out is what keeps the
  * Story #4541 invariant intact: *every* checkpoint is on its ticket before the
  * first `agent::ready` flip is issued, so `ready` still means "fully
- * persisted" and a `/deliver` that picks a Story up cannot read a null
+ * persisted" and a `/mandrel-deliver` that picks a Story up cannot read a null
  * checkpoint. Concurrency inside the phase is safe; overlapping the phases is
  * the race this ordering exists to close.
  *
@@ -611,7 +611,7 @@ function logEffectiveRoute(route, isLiteRoute) {
     Logger.info(
       `[plan-persist] ceremony-lite route upheld by the shape backstop: ` +
         `created Stories carry the ${LITE_ROUTE_LABEL} hint ` +
-        `(recorded reason: ${route.authored.reason}). /deliver re-derives ` +
+        `(recorded reason: ${route.authored.reason}). /mandrel-deliver re-derives ` +
         'the route from each Story body — the label is never the control signal.',
     );
     return;
@@ -644,10 +644,10 @@ function logPersistEpilogue({ created, primary, planRunLabel }) {
       `; primary #${primary.id} is agent::ready.`,
   );
   Logger.info(
-    `[plan-persist] Deliver with: /deliver ${created.map((s2) => s2.id).join(' ')}`,
+    `[plan-persist] Deliver with: /mandrel-deliver ${created.map((s2) => s2.id).join(' ')}`,
   );
   // Metadata only — a GitHub filter for the cohort this run authored, never
-  // a delivery-resolution input (/deliver stays ids-only, Story #4540).
+  // a delivery-resolution input (/mandrel-deliver stays ids-only, Story #4540).
   Logger.info(
     `[plan-persist] Cohort grouping label: ${planRunLabel} — filter with ` +
       `label:${planRunLabel}`,

package/.agents/scripts/lib/orchestration/plan-persist/story-ops.js

@@ -1,7 +1,7 @@
 /**
  * story-ops.js — flat Story creation for v2 plan-persist (Stage 3).
  *
- * Under the Story collapse (`docs/roadmap.md` § Stage 3), `/plan` persists
+ * Under the Story collapse (`docs/roadmap.md` § Stage 3), `/mandrel-plan` persists
  * zero-or-more Story issues directly — no Epic parent, no reconciler tree,
  * no `deliveryShape` mode matrix. Default is **one Story**; N>1 is gated by
  * the Stage-1 split-policy validator (`assertAcceptancePartition`).
@@ -44,7 +44,7 @@ import {
  *
  * Reintroduced (Story #4692) after Story #4540 retired it: #4540 was right
  * that batch identity is the wrong axis for *ordering delivery across runs*
- * (`/deliver` takes ids and resolves the graph from live state — that stays),
+ * (`/mandrel-deliver` takes ids and resolves the graph from live state — that stays),
  * but it is the correct axis for *grouping the Stories one plan run created*
  * so a cohort is filterable and traceable in the GitHub UI. The label is
  * metadata only; nothing in persist or delivery reads it as a
@@ -57,7 +57,7 @@ const PLAN_RUN_LABEL_COLOR = '#C5DEF5';
 
 /**
  * Stable color for the `route::lite` ceremony-route hint (Story #4707;
- * hint-only since Story #4722 — `/deliver` re-derives the route from the
+ * hint-only since Story #4722 — `/mandrel-deliver` re-derives the route from the
  * Story body's shape).
  */
 const LITE_ROUTE_LABEL_COLOR = '#D4C5F9';
@@ -197,6 +197,26 @@ function planFingerprintMarker(fingerprint) {
   return `<!-- ${PLAN_FINGERPRINT_MARKER_PREFIX} ${fingerprint} -->`;
 }
 
+/** The one parser for the marker {@link planFingerprintMarker} renders. */
+const PLAN_FINGERPRINT_MARKER_RE = new RegExp(
+  `<!--\\s*${PLAN_FINGERPRINT_MARKER_PREFIX}\\s*([0-9a-f]+)\\s*-->`,
+);
+
+/**
+ * Recover the plan fingerprint an issue body was stamped with, or `null` when
+ * the body carries no marker. Module-private: both readers of the marker (the
+ * resume index and the create-retry adoption probe) go through it so they can
+ * never drift into recognising different Stories as "already created".
+ *
+ * @param {unknown} body
+ * @returns {string|null}
+ */
+function extractPlanFingerprint(body) {
+  if (typeof body !== 'string') return null;
+  const match = body.match(PLAN_FINGERPRINT_MARKER_RE);
+  return match ? match[1] : null;
+}
+
 /**
  * Labels the authoring pass is never allowed to set. The `agent::*` axis is
  * the runtime's lifecycle state (persist owns the terminal `agent::ready`
@@ -455,7 +475,7 @@ function assembleOnePlanStory(ticket, opts) {
   const serialized = serializeStoryBody({ ...folded, depends_on });
   // Carry audit dedup provenance into the persisted body (Story #4877). The
   // audit sweep's Single-plan path stamps the `audit-fingerprints` /
-  // `audit-semantic-keys` footers into the seed it hands `/plan`; without this
+  // `audit-semantic-keys` footers into the seed it hands `/mandrel-plan`; without this
   // the persisted Story carries no provenance and the next sweep re-files work
   // it already planned. Mechanical on purpose — the authoring agent is not
   // asked to notice HTML comments in a one-pager. A non-audit seed carries no
@@ -509,7 +529,7 @@ function assertSharedSpecAllowed(tickets, sharedSpec) {
  * @param {object} [opts]
  * @param {string|null} [opts.sharedSpec]
  * @param {string[]} [opts.planAcceptance]
- * @param {number[]} [opts.sourceTicketIds] Ids passed to `/plan --tickets`.
+ * @param {number[]} [opts.sourceTicketIds] Ids passed to `/mandrel-plan --tickets`.
  * @returns {{ stories: Array<{ slug: string, title: string, body: string, acceptance: string[], depends_on: string[], supersedes: Array<{ id: number, note: string|null }> }> }}
  */
 export function assemblePlanStories(tickets, opts = {}) {
@@ -617,14 +637,9 @@ async function indexExistingStories(provider) {
     if (title !== '') {
       idsByTitle.set(title, [...(idsByTitle.get(title) ?? []), id]);
     }
-    const body = typeof issue?.body === 'string' ? issue.body : '';
-    const match = body.match(
-      new RegExp(
-        `<!--\\s*${PLAN_FINGERPRINT_MARKER_PREFIX}\\s*([0-9a-f]+)\\s*-->`,
-      ),
-    );
-    if (!match) continue;
-    byFingerprint.set(match[1], {
+    const fingerprint = extractPlanFingerprint(issue?.body);
+    if (!fingerprint) continue;
+    byFingerprint.set(fingerprint, {
       id,
       title,
       url: issue.html_url ?? issue.url ?? undefined,
@@ -633,6 +648,42 @@ async function indexExistingStories(provider) {
   return { byFingerprint, idsByTitle };
 }
 
+/**
+ * Re-run the resume lookup for a single fingerprint and return the **raw**
+ * issue, or `null`.
+ *
+ * This is the probe `createIssue` calls before any retry POST (Story #5112).
+ * A create whose response was lost has already filed the issue; retrying
+ * blind duplicates it. Because the body posted carries the fingerprint
+ * marker, the same content-keyed lookup the resume path uses answers "did
+ * attempt 1 land?" authoritatively — from the server's state, not from a
+ * client-side guess about where the connection broke.
+ *
+ * Best-effort like {@link indexExistingStories}: a provider without the
+ * listing surface, or a listing that throws, yields `null` and the retry
+ * proceeds exactly as it did before.
+ *
+ * @param {{ provider: object, fingerprint: string }} args
+ * @returns {Promise<object|null>}
+ */
+async function findOpenStoryByPlanFingerprint({ provider, fingerprint }) {
+  if (typeof provider?.listIssuesByLabel !== 'function') return null;
+  if (typeof fingerprint !== 'string' || fingerprint.length === 0) return null;
+  let issues;
+  try {
+    issues = await provider.listIssuesByLabel({
+      state: 'open',
+      labels: TYPE_LABELS.STORY,
+    });
+  } catch {
+    return null;
+  }
+  for (const issue of Array.isArray(issues) ? issues : []) {
+    if (extractPlanFingerprint(issue?.body) === fingerprint) return issue;
+  }
+  return null;
+}
+
 /**
  * Warn when a Story with this title is already open but did **not** match the
  * fingerprint — i.e. its authored content differs from what this run is about
@@ -705,14 +756,14 @@ function renderStoryBodyForCreate(story, idBySlug) {
  *
  * Ordering is authored as slugs and, until now, survived persist only as
  * `blocked by #N` prose in the body footer. That footer stays — it is what
- * `/deliver`'s resolver falls back on — but a native edge is the durable,
+ * `/mandrel-deliver`'s resolver falls back on — but a native edge is the durable,
  * machine-readable form: visible in the GitHub UI, readable without parsing
  * markdown, and settable by an operator later for cross-run order.
  *
  * **Non-fatal by design, and deliberately asymmetric with the read path.** A
  * missing native edge is cosmetic here: `renderStoryBodyForCreate` has already
  * written the footer, so ordering is not lost when the dependencies API says
- * no. `/deliver`'s *read* of these edges is a real dispatch gate, which is why
+ * no. `/mandrel-deliver`'s *read* of these edges is a real dispatch gate, which is why
  * that side fails loud. Persist reports the failure and completes.
  *
  * Two shape hazards this crossing has to get right, both silent if missed:
@@ -788,7 +839,7 @@ async function mirrorNativeDependencyEdges({ provider, stories, idBySlug }) {
  *
  * **Non-fatal by design**, matching the native-blocked_by mirroring posture:
  * neither label is load-bearing for correctness (grouping is cosmetic, and
- * the route label is a human-visible hint only — `/deliver` re-derives the
+ * the route label is a human-visible hint only — `/mandrel-deliver` re-derives the
  * route from the Story body's shape, Story #4722), so it is never a reason
  * to fail persist. On an ensure
  * failure (throw, or the label reported `missing` by the post-loop
@@ -869,7 +920,7 @@ async function ensurePersistLabel({
  * create — no relabel call is needed on the resume path, and the cohort is
  * never split across two labels. The label is ensured to exist before the
  * first POST, **non-fatally**: grouping is cosmetic and never fails the run
- * (see `ensureCohortLabel`). `/deliver` never reads it — delivery stays
+ * (see `ensureCohortLabel`). `/mandrel-deliver` never reads it — delivery stays
  * ids-only over live state (Story #4540's actual point).
  *
  * **The create loop stays serial and dependency-ordered** — deliberately, and
@@ -889,7 +940,7 @@ async function ensurePersistLabel({
  * effective complexity route to `lite` (the planner's recorded verdict,
  * upheld by the shape backstop), it passes the label via `opts.routeLabel`
  * and every created Story carries it — a **human-visible hint only**, never
- * the control signal: `/deliver` re-derives the route from each Story body's
+ * the control signal: `/mandrel-deliver` re-derives the route from each Story body's
  * own shape (`resolveStoryDispatchMode`), so a lost or failed label write
  * cannot misroute delivery. A full-routed plan passes nothing and its
  * Stories carry **no** route label. Like the cohort label, the ensure is
@@ -949,8 +1000,8 @@ export async function createStoryIssues({ provider, stories, opts = {} }) {
     label: cohortLabel,
     color: PLAN_RUN_LABEL_COLOR,
     description:
-      'Groups the Stories one /plan persist run authored (metadata ' +
-      'only — /deliver stays ids-only).',
+      'Groups the Stories one /mandrel-plan persist run authored (metadata ' +
+      'only — /mandrel-deliver stays ids-only).',
     role: 'cohort',
   });
   const applyRouteLabel =
@@ -960,7 +1011,7 @@ export async function createStoryIssues({ provider, stories, opts = {} }) {
       label: routeLabel,
       color: LITE_ROUTE_LABEL_COLOR,
       description:
-        'Ceremony-lite hint (human-visible only): /deliver re-derives the ' +
+        'Ceremony-lite hint (human-visible only): /mandrel-deliver re-derives the ' +
         'route from the Story body shape; every close gate runs unchanged.',
       role: 'route-marker',
     }));
@@ -1000,6 +1051,14 @@ export async function createStoryIssues({ provider, stories, opts = {} }) {
         ...(applyCohortLabel ? [cohortLabel] : []),
         ...(applyRouteLabel ? [routeLabel] : []),
       ],
+      // Story #5112 — hand the provider the same content-keyed lookup this
+      // loop's resume path uses, so a retry after a lost response adopts the
+      // issue attempt 1 already filed instead of creating a twin.
+      findExisting: () =>
+        findOpenStoryByPlanFingerprint({
+          provider,
+          fingerprint: story.fingerprint,
+        }),
     });
     const id = result?.id ?? result?.number;
     if (!Number.isInteger(id)) {
@@ -1012,7 +1071,9 @@ export async function createStoryIssues({ provider, stories, opts = {} }) {
       id,
       title: story.title,
       url: result.url,
-      adopted: false,
+      // True when the provider's retry probe adopted an issue a lost-response
+      // first attempt had already filed — pre-existing either way.
+      adopted: result.adopted === true,
     });
     idBySlug.set(story.slug, id);
   }
@@ -1040,9 +1101,9 @@ export async function createStoryIssues({ provider, stories, opts = {} }) {
  *
  * This is what makes `agent::ready` *mean* "fully persisted": by the time it
  * lands, the Story's `story-plan-state` checkpoint is already on the ticket, so
- * a `/deliver` that picks it up cannot read a null checkpoint.
+ * a `/mandrel-deliver` that picks it up cannot read a null checkpoint.
  *
- * Fails closed: an un-flipped Story is invisible to `/deliver`, which is the
+ * Fails closed: an un-flipped Story is invisible to `/mandrel-deliver`, which is the
  * safe direction — the operator is told exactly which ids need the label.
  *
  * **Collect failures, never fast-fail** (preserved verbatim under the
@@ -1098,7 +1159,7 @@ export async function markStoriesReady({ provider, created }) {
       `[plan-persist] ${failed.length} Story(ies) were created with their ` +
         'checkpoints but could not be flipped to agent::ready:\n' +
         `${failed.map((f) => `  - ${f}`).join('\n')}\n` +
-        'They are invisible to /deliver until the label lands. Re-run persist ' +
+        'They are invisible to /mandrel-deliver until the label lands. Re-run persist ' +
         '(it resumes rather than duplicating) or add the label by hand.',
     );
   }

package/.agents/scripts/lib/orchestration/plan-persist/summary.js

@@ -163,8 +163,8 @@ export function buildPlanSummaryCommentBody({
   // must name real ids, not a batch token that no longer exists.
   const deliverCommand =
     Array.isArray(stories) && stories.length > 0
-      ? `/deliver ${stories.map((s) => s.id).join(' ')}`
-      : '/deliver <storyId> [<storyId> ...]';
+      ? `/mandrel-deliver ${stories.map((s) => s.id).join(' ')}`
+      : '/mandrel-deliver <storyId> [<storyId> ...]';
 
   return [
     `### 📋 Plan Summary — Story #${epicId} is \`agent::ready\``,
@@ -182,6 +182,6 @@ export function buildPlanSummaryCommentBody({
     ...renderWaveTableLines(waveTable),
     ...renderSharedEditorLines(conflictFindings),
     '',
-    `_Deliver with \`${deliverCommand}\` — \`/deliver\` resolves the dependency graph from live state, so edges may point at Stories from earlier plan runs._`,
+    `_Deliver with \`${deliverCommand}\` — \`/mandrel-deliver\` resolves the dependency graph from live state, so edges may point at Stories from earlier plan runs._`,
   ].join('\n');
 }

package/.agents/scripts/lib/orchestration/plan-persist/supersede-ops.js

@@ -1,11 +1,11 @@
 /**
- * supersede-ops.js — close the `/plan --tickets` source issues that the
+ * supersede-ops.js — close the `/mandrel-plan --tickets` source issues that the
  * authored Stories supersede (Story #4535).
  *
  * `plan-context.js` fetches the source issues, emits `sourceTickets[]` on the
- * `/plan` envelope, and (with `--out`) writes that envelope to disk.
+ * `/mandrel-plan` envelope, and (with `--out`) writes that envelope to disk.
  * `resolveSourceTicketIds` below reads the id set back off it, so the normal
- * `/plan --tickets` path needs no flag; an explicit `--source-tickets` still
+ * `/mandrel-plan --tickets` path needs no flag; an explicit `--source-tickets` still
  * wins when passed, as the override for hand-driven runs (Story #4554).
  * Before that thread existed the ids reached
  * this module *solely* via the hand-passed flag, so a forgotten flag left
@@ -187,7 +187,7 @@ function sameIdSet(a, b) {
  *      loudly (the operator is overriding what the run actually fetched)
  *      but honoured.
  *   2. otherwise the envelope's `sourceTickets[]` — so the common
- *      `/plan --tickets` path needs no flag at all.
+ *      `/mandrel-plan --tickets` path needs no flag at all.
  *   3. otherwise empty, reported as `origin: 'none'`.
  *
  * `origin` is surfaced on the persist envelope so a run that superseded
@@ -240,7 +240,7 @@ function describeStoryIds(entries) {
  * live against an inconsistent tracker.
  *
  * @param {Array<{ slug: string, supersedes: Array<{ id: number }> }>} stories
- * @param {number[]} sourceTicketIds Ids passed to `/plan --tickets`.
+ * @param {number[]} sourceTicketIds Ids passed to `/mandrel-plan --tickets`.
  */
 export function assertSupersedePartition(stories, sourceTicketIds = []) {
   const list = Array.isArray(stories) ? stories : [];
@@ -313,7 +313,7 @@ export function buildSupersedeCommentBody({
   const lines = [
     `**Superseded by #${story.id}** — *${story.title}* (${labels.join(', ')}).`,
     '',
-    `Planned via \`/plan --tickets ${sourceTicketIds.join(',')}\`.`,
+    `Planned via \`/mandrel-plan --tickets ${sourceTicketIds.join(',')}\`.`,
   ];
   if (note) {
     lines.push('', note);