@seanyao/roll 4.719.2 → 4.720.1

package/dist/roll.mjs

@@ -7285,8 +7285,8 @@ function writeSyncBlock(original, block) {
     }
   }
   if (start === -1) {
-    const sep8 = text2.endsWith("\n\n") || text2 === "" ? "" : text2.endsWith("\n") ? "\n" : "\n\n";
-    return `${text2}${sep8}${block}
+    const sep9 = text2.endsWith("\n\n") || text2 === "" ? "" : text2.endsWith("\n") ? "\n" : "\n\n";
+    return `${text2}${sep9}${block}
 `;
   }
   let end = start + 1;
@@ -16195,7 +16195,7 @@ function parseFlowMap2(body) {
   }
   return out3;
 }
-function splitTopLevel(s, sep8) {
+function splitTopLevel(s, sep9) {
   const parts = [];
   let depth = 0;
   let cur = "";
@@ -16204,7 +16204,7 @@ function splitTopLevel(s, sep8) {
       depth++;
     else if (ch === "}")
       depth = Math.max(0, depth - 1);
-    if (ch === sep8 && depth === 0) {
+    if (ch === sep9 && depth === 0) {
       parts.push(cur);
       cur = "";
     } else {
@@ -31174,15 +31174,15 @@ var init_mcp = __esm({
         }
       }
       tryParseMessage() {
-        const sep8 = this.buffer.indexOf("\r\n\r\n");
-        if (sep8 < 0)
+        const sep9 = this.buffer.indexOf("\r\n\r\n");
+        if (sep9 < 0)
           return void 0;
-        const header = this.buffer.slice(0, sep8).toString("utf8");
+        const header = this.buffer.slice(0, sep9).toString("utf8");
         const length = /^Content-Length:\s*(\d+)$/im.exec(header)?.[1];
         if (length === void 0)
           return void 0;
         const bodyLength = Number.parseInt(length, 10);
-        const start = sep8 + 4;
+        const start = sep9 + 4;
         if (this.buffer.length < start + bodyLength)
           return void 0;
         const body = this.buffer.slice(start, start + bodyLength);
@@ -80311,11 +80311,11 @@ ${lanes.join("\n")}
             if (i < rootLength) {
               return void 0;
             }
-            const sep8 = directory.lastIndexOf(directorySeparator, i - 1);
-            if (sep8 === -1) {
+            const sep9 = directory.lastIndexOf(directorySeparator, i - 1);
+            if (sep9 === -1) {
               return void 0;
             }
-            return directory.substr(0, Math.max(sep8, rootLength));
+            return directory.substr(0, Math.max(sep9, rootLength));
           }
         }
       }
@@ -244439,7 +244439,7 @@ __export(showcase_exports, {
   showcaseCommand: () => showcaseCommand
 });
 import { spawnSync as spawnSync17 } from "node:child_process";
-import { cpSync as cpSync2, existsSync as existsSync140, mkdirSync as mkdirSync78, mkdtempSync as mkdtempSync8, readdirSync as readdirSync53, readFileSync as readFileSync141, rmSync as rmSync26, statSync as statSync40, writeFileSync as writeFileSync77 } from "node:fs";
+import { cpSync as cpSync2, existsSync as existsSync141, mkdirSync as mkdirSync78, mkdtempSync as mkdtempSync8, readdirSync as readdirSync54, readFileSync as readFileSync141, rmSync as rmSync27, statSync as statSync40, writeFileSync as writeFileSync77 } from "node:fs";
 import { tmpdir as tmpdir13 } from "node:os";
 import { dirname as dirname77, join as join164 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
@@ -244482,7 +244482,7 @@ function parseArgs3(args) {
 function packageRoot() {
   let dir = dirname77(fileURLToPath3(import.meta.url));
   for (let i = 0; i < 12; i++) {
-    if (existsSync140(join164(dir, "conventions")))
+    if (existsSync141(join164(dir, "conventions")))
       return dir;
     const parent = dirname77(dir);
     if (parent === dir)
@@ -244493,7 +244493,7 @@ function packageRoot() {
 }
 function rollBin3() {
   const devPath = join164(packageRoot(), "packages", "cli", "bin", "roll.js");
-  if (existsSync140(devPath))
+  if (existsSync141(devPath))
     return devPath;
   return "roll";
 }
@@ -244520,7 +244520,7 @@ function runRoll(sandbox, rollHome4, args, opts = {}) {
 }
 function fileNonEmpty3(p) {
   try {
-    return existsSync140(p) && statSync40(p).size > 0;
+    return existsSync141(p) && statSync40(p).size > 0;
   } catch {
     return false;
   }
@@ -244532,7 +244532,7 @@ function makeSandbox(sourceProject) {
   mkdirSync78(sandbox, { recursive: true });
   mkdirSync78(rollHome4, { recursive: true });
   const srcRoll = join164(sourceProject, ".roll");
-  if (existsSync140(srcRoll)) {
+  if (existsSync141(srcRoll)) {
     cpSync2(srcRoll, join164(sandbox, ".roll"), { recursive: true });
   } else {
     mkdirSync78(join164(sandbox, ".roll", "features"), { recursive: true });
@@ -244543,11 +244543,11 @@ function findCardSpec2(sandbox, card) {
   const featuresDir = join164(sandbox, ".roll", "features");
   const candidates = [];
   const walk2 = (dir, depth) => {
-    if (depth > 3 || !existsSync140(dir))
+    if (depth > 3 || !existsSync141(dir))
       return;
     let entries = [];
     try {
-      entries = readdirSync53(dir);
+      entries = readdirSync54(dir);
     } catch {
       return;
     }
@@ -244560,7 +244560,7 @@ function findCardSpec2(sandbox, card) {
         continue;
       }
       if (isDir4) {
-        if (name === card && existsSync140(join164(full, "spec.md")))
+        if (name === card && existsSync141(join164(full, "spec.md")))
           candidates.push(join164(full, "spec.md"));
         walk2(full, depth + 1);
       }
@@ -244574,7 +244574,7 @@ function resetSandbox(sandbox, card) {
   let reset2 = false;
   let ok12 = false;
   const backlogPath = join164(sandbox, ".roll", "backlog.md");
-  if (existsSync140(backlogPath)) {
+  if (existsSync141(backlogPath)) {
     const before = readFileSync141(backlogPath, "utf8");
     const cardRow = before.split("\n").find((line) => line.startsWith("|") && line.includes(card));
     const hadStatusToken = cardRow !== void 0 && statusMarkerRe(false).test(cardRow);
@@ -244603,8 +244603,8 @@ function resetSandbox(sandbox, card) {
     notes.push("backlog: .roll/backlog.md absent");
   }
   const pulseCmd = join164(sandbox, "packages", "cli", "src", "commands", "pulse.ts");
-  if (existsSync140(pulseCmd)) {
-    rmSync26(pulseCmd, { force: true });
+  if (existsSync141(pulseCmd)) {
+    rmSync27(pulseCmd, { force: true });
     notes.push("removed prior pulse.ts surface");
   }
   return { ok: ok12, reset: reset2, notes };
@@ -244636,7 +244636,7 @@ async function captureScreenshots(sandbox, card) {
   const web = await infra.captureScreenshot({
     kind: "web",
     out: webOut,
-    url: existsSync140(nowPage) ? `file://${nowPage}#now` : "about:blank"
+    url: existsSync141(nowPage) ? `file://${nowPage}#now` : "about:blank"
   });
   shots.push({
     surface: "web",
@@ -244648,7 +244648,7 @@ async function captureScreenshots(sandbox, card) {
 }
 function readBacklogStatus(sandbox, card) {
   const backlogPath = join164(sandbox, ".roll", "backlog.md");
-  if (!existsSync140(backlogPath))
+  if (!existsSync141(backlogPath))
     return void 0;
   for (const line of readFileSync141(backlogPath, "utf8").split("\n")) {
     if (line.startsWith("|") && line.includes(card)) {
@@ -244661,7 +244661,7 @@ function readBacklogStatus(sandbox, card) {
 }
 function readTruthLadder(sandbox, card) {
   const truthPath = join164(sandbox, ".roll", "features", "truth.json");
-  if (!existsSync140(truthPath))
+  if (!existsSync141(truthPath))
     return void 0;
   try {
     const snap = JSON.parse(readFileSync141(truthPath, "utf8"));
@@ -244673,7 +244673,7 @@ function readTruthLadder(sandbox, card) {
 }
 function readTcrCommits(sandbox) {
   const runsPath3 = join164(sandbox, ".roll", "loop", "runs.jsonl");
-  if (!existsSync140(runsPath3))
+  if (!existsSync141(runsPath3))
     return [];
   const out3 = [];
   try {
@@ -244816,7 +244816,7 @@ ROLL_HOME: ${rollHome4}
     return 1;
   } finally {
     if (!keepSandbox) {
-      rmSync26(dirname77(sandbox), { recursive: true, force: true });
+      rmSync27(dirname77(sandbox), { recursive: true, force: true });
     }
   }
 }
@@ -247550,6 +247550,7 @@ Loop \u5DF2\u5904\u4E8E\u6682\u505C
 Loop \u5DF2\u6682\u505C \u2014 \u540E\u7EED\u6392\u7A0B\u5468\u671F\u5C06\u8DF3\u8FC7
 `);
   process.stdout.write("mode: guided \u2014 scheduler will not start long-running Story execution until `roll loop resume`\n");
+  process.stdout.write("  supervisor one-shot: `roll loop go --cards <ids> --max-cycles 1` runs exactly those cards while staying paused (no autonomous scheduling).\n");
   return 0;
 }
 async function loopResumeCommand(_args, deps = realDeps()) {
@@ -259883,9 +259884,9 @@ function writeFeatureStub(issue, featuresDir, epic = "backlog-lifecycle") {
   if (existsSync47(path)) {
     const existing = readFileSync47(path, "utf8");
     const block = ac ? ac + "\n" : "";
-    const sep8 = existing.endsWith("\n") || existing === "" ? "" : "\n";
+    const sep9 = existing.endsWith("\n") || existing === "" ? "" : "\n";
     if (block)
-      appendFileSync5(path, sep8 + block);
+      appendFileSync5(path, sep9 + block);
     return path;
   }
   writeFileSync26(path, featureStubContent(issue));
@@ -262225,8 +262226,8 @@ function writeSet(runtimeDir11, set) {
   writeFileSync30(tmp, JSON.stringify([...set].sort(), null, 2), "utf8");
   writeFileSync30(path, readFileSync53(tmp, "utf8"), "utf8");
   try {
-    const { rmSync: rmSync30 } = __require("node:fs");
-    rmSync30(tmp, { force: true });
+    const { rmSync: rmSync31 } = __require("node:fs");
+    rmSync31(tmp, { force: true });
   } catch {
   }
 }
@@ -264497,6 +264498,7 @@ import { createInterface as createInterface3 } from "node:readline";
 // packages/cli/dist/lib/goal-progress.js
 init_dist();
 var GOAL_ALLOWED_CARDS_ENV = "ROLL_LOOP_GO_ALLOWED_CARDS";
+var GOAL_GUIDED_ENV = "ROLL_LOOP_GO_GUIDED";
 var DELIVERY_STATUSES = /* @__PURE__ */ new Set(["built", "published", "done", "merged"]);
 var DELIVERY_OUTCOMES = /* @__PURE__ */ new Set(["published_pending_merge", "delivered"]);
 function parseAllowedCardsEnv(env = process.env) {
@@ -264505,6 +264507,11 @@ function parseAllowedCardsEnv(env = process.env) {
   const raw = env[GOAL_ALLOWED_CARDS_ENV] ?? "";
   return new Set(raw.split(",").map((s) => s.trim()).filter((s) => s !== ""));
 }
+function isGuidedRunOnce(allowed2, env = process.env) {
+  if ((env[GOAL_GUIDED_ENV] ?? "").trim() !== "1")
+    return false;
+  return allowed2 !== void 0 && allowed2.size > 0;
+}
 var OUT_OF_SCOPE_STATUS = "\u{1F6AB} Hold (outside goal scope)";
 function scopeBacklogForAllowedCards(items, allowed2) {
   if (allowed2 === void 0)
@@ -265428,6 +265435,7 @@ function parseOptions(args) {
   let noTmux = false;
   let attach = false;
   let scopeSpecified = false;
+  let cardsFlagSpecified = false;
   let reviewMode = "auto";
   let reviewModeSpecified = false;
   for (let i = 0; i < args.length; i += 1) {
@@ -265497,11 +265505,13 @@ function parseOptions(args) {
     }
     if (arg === "--cards") {
       cards.push(...parseCards(args[i + 1]));
+      cardsFlagSpecified = true;
       i += 1;
       continue;
     }
     if (arg.startsWith("--cards=")) {
       cards.push(...parseCards(arg.slice("--cards=".length)));
+      cardsFlagSpecified = true;
       continue;
     }
     if (!arg.startsWith("-"))
@@ -265517,6 +265527,7 @@ function parseOptions(args) {
     attach,
     scope,
     scopeSpecified,
+    cardsFlagSpecified,
     reviewMode,
     reviewModeSpecified,
     ...maxCycles !== void 0 ? { maxCycles } : {},
@@ -265526,6 +265537,9 @@ function parseOptions(args) {
 function hasHelpArg2(args) {
   return args.includes("--help") || args.includes("-h");
 }
+function isGuidedRun(opts) {
+  return opts.cardsFlagSpecified && opts.scopeSpecified && opts.scope.kind === "cards" && opts.scope.cards.length > 0;
+}
 function loopGoHelp() {
   return [
     "Usage: roll loop go [--epic <name>|--cards <ids>|--all] [--for <duration>] [--max-cycles <n>] [--review <auto|hetero|self|off>] [--attach] [--no-tmux]",
@@ -265550,6 +265564,12 @@ function loopGoHelp() {
     "  The startup banner shows the EFFECTIVE scope; an inherited scope is flagged so a flagless go can never silently narrow. Pass --all to reset to the full backlog.",
     "  \u542F\u52A8\u6A2A\u5E45\u663E\u793A\u751F\u6548\u7684 scope\uFF1B\u6CBF\u7528\u7684 scope \u4F1A\u88AB\u6807\u6CE8\uFF0Cflagless go \u7EDD\u4E0D\u9759\u9ED8\u6536\u7A84\u3002\u7528 --all \u91CD\u7F6E\u56DE\u5168\u91CF\u3002",
     "",
+    "Guided one-shot while paused (FIX-1472):",
+    "  An explicit `roll loop go --cards X` runs the named card(s) even while `roll loop pause` is in effect \u2014 it is a supervisor action, not autonomous scheduling. It installs no scheduler and picks no other card; bound it with --max-cycles.",
+    "  \u663E\u5F0F\u7684 `roll loop go --cards X` \u5373\u4F7F\u5728 `roll loop pause` \u751F\u6548\u65F6\u4E5F\u4F1A\u6267\u884C\u6307\u5B9A\u5361\u2014\u2014\u8FD9\u662F Supervisor \u624B\u52A8\u52A8\u4F5C\uFF0C\u4E0D\u662F\u81EA\u4E3B\u6392\u7A0B\u3002\u5B83\u4E0D\u5B89\u88C5\u6392\u7A0B\u3001\u4E0D\u9009\u522B\u7684\u5361\uFF1B\u7528 --max-cycles \u9650\u5B9A\u6B21\u6570\u3002",
+    "  Pause still stops autonomous scheduling; only an explicitly-named --cards scope bypasses it (a flagless/inherited/--all/--epic go keeps honoring the pause).",
+    "  pause \u4ECD\u7136\u505C\u6B62\u81EA\u4E3B\u6392\u7A0B\uFF1B\u53EA\u6709\u672C\u6B21\u663E\u5F0F\u6307\u5B9A\u7684 --cards \u8303\u56F4\u624D\u4F1A\u7ED5\u8FC7\uFF08flagless/\u6CBF\u7528/--all/--epic \u7684 go \u4ECD\u9075\u5B88\u6682\u505C\uFF09\u3002",
+    "",
     "Progress guardrails (the loop stops on NO PROGRESS, not on cost):",
     "  productivity floor  A cycle whose agent EXECUTED but produced 0 commits and no delivery is a `gave_up` terminal \u2014 alerted on the first occurrence (no streak).",
     "  dead-loop breaker   A card is skipped after consecutive no-progress cycles; the whole goal STOPS after K consecutive no-progress cycles (a loud ALERT) \u2014 an unmergeable card can never spin forever.",
@@ -265673,6 +265693,20 @@ function followGoLiveFeed(projectPath3, rollBin4) {
     watch.on("error", finish);
   });
 }
+function buildRunOnceChildEnv(input, base = process.env) {
+  return {
+    ...base,
+    ROLL_LOOP_GO_CHILD: "1",
+    // FIX-1022: unattended go-driver child must never trigger the macOS
+    // screencapture TCC prompt (isTTY is unreliable under PTY wrapping).
+    ROLL_NO_SCREENCAP: base["ROLL_NO_SCREENCAP"] ?? "1",
+    ...input.allowedCards !== void 0 ? { [GOAL_ALLOWED_CARDS_ENV]: input.allowedCards.join(",") } : {},
+    // FIX-1472: guided is set on EVERY call (never conditionally spread) so an
+    // inherited ambient "1" cannot survive into an unguided child. Fail closed
+    // to "0" — isGuidedRunOnce treats anything but "1" as not guided.
+    [GOAL_GUIDED_ENV]: input.guided === true ? "1" : "0"
+  };
+}
 function realRunOnce(input) {
   const bin = rollBin();
   const cmd = bin.endsWith(".js") || bin.endsWith(".mjs") ? process.execPath : bin;
@@ -265681,14 +265715,7 @@ function realRunOnce(input) {
     const child = spawn8(cmd, args, {
       cwd: input.projectPath,
       detached: true,
-      env: {
-        ...process.env,
-        ROLL_LOOP_GO_CHILD: "1",
-        // FIX-1022: unattended go-driver child must never trigger the macOS
-        // screencapture TCC prompt (isTTY is unreliable under PTY wrapping).
-        ROLL_NO_SCREENCAP: process.env["ROLL_NO_SCREENCAP"] ?? "1",
-        ...input.allowedCards !== void 0 ? { [GOAL_ALLOWED_CARDS_ENV]: input.allowedCards.join(",") } : {}
-      },
+      env: buildRunOnceChildEnv(input),
       stdio: "inherit"
     });
     child.on("exit", (code) => resolve17(code ?? 1));
@@ -266587,11 +266614,12 @@ async function runGoWorker(id, opts, deps) {
     progress = progressFromGoal(goal);
     initialUsage = runSummaryFromGoal(goal);
     const deadlineSec = timeboxDeadlineSec(goal, opts, startedSec);
+    const guided = isGuidedRun(opts);
     bus.appendEvent(evPath, { type: "goal:session_start", sessionId: sid, scope: goal.scope, ts: startedSec });
     while (true) {
       if (stopRequested)
         break;
-      if (existsSync64(pauseMarkerPath2(id.path, id.slug))) {
+      if (!guided && existsSync64(pauseMarkerPath2(id.path, id.slug))) {
         stopReason2 = "pause_marker";
         break;
       }
@@ -266647,10 +266675,10 @@ async function runGoWorker(id, opts, deps) {
       }
       if (stopRequested)
         break;
-      if (existsSync64(pauseMarkerPath2(id.path, id.slug)))
+      if (!guided && existsSync64(pauseMarkerPath2(id.path, id.slug)))
         continue;
       const before = readRunSnapshot(runsPath2(id.path));
-      await deps.runOnce({ projectPath: id.path, allowedCards });
+      await deps.runOnce({ projectPath: id.path, allowedCards, ...guided ? { guided: true } : {} });
       goal = updateUsage(id.path, goal, baseline, initialUsage, deps.nowIso());
       writeGoal(gPath, goal);
       const after = readRunSnapshot(runsPath2(id.path));
@@ -266707,7 +266735,7 @@ async function runGoWorker(id, opts, deps) {
         stopReason2 = "safety_pause";
         break;
       }
-      if (existsSync64(pauseMarkerPath2(id.path, id.slug))) {
+      if (!guided && existsSync64(pauseMarkerPath2(id.path, id.slug))) {
         stopReason2 = "pause_marker";
         break;
       }
@@ -271420,8 +271448,8 @@ function topBar(input) {
   const switcher = multi ? `<div class="proj-switch" style="position:relative;flex:none;"><button type="button" id="proj-switch-btn" class="proj-switch-btn" aria-haspopup="menu" aria-expanded="false" style="display:flex;align-items:center;gap:9px;cursor:pointer;background:transparent;border:0;padding:5px 7px;border-radius:8px;">` + dot + projName + `<span class="proj-caret" style="${MONO}font-size:9px;color:#8f98ad;flex:none;transition:transform .18s;">\u25BE</span></button><div id="proj-menu" class="proj-menu" role="menu" aria-label="switch project \xB7 \u5207\u6362\u9879\u76EE" hidden style="position:absolute;top:42px;left:0;min-width:240px;background:rgba(27,34,56,.99);border:1px solid #313a55;border-radius:10px;padding:6px;box-shadow:0 10px 30px rgba(7,10,20,.5);z-index:40;"><div style="${MONO}font-size:9.5px;letter-spacing:.14em;text-transform:uppercase;color:#6f7892;padding:6px 13px 8px;">${esc4(input.brand.name)} \xB7 ${bi("this machine", "\u8FD9\u53F0\u673A\u5668")}</div>` + menuItems + `</div></div>` : `<a href="${homeHref}" class="proj-switch-btn" style="display:flex;align-items:center;gap:9px;cursor:pointer;flex:none;text-decoration:none;padding:5px 7px;">` + dot + projName + `</a>`;
   const crumbsNav = `<nav style="flex:1 1 auto;min-width:0;display:flex;align-items:center;gap:9px;${MONO}font-size:12px;color:#8f98ad;overflow:hidden;" aria-label="machine layer \xB7 \u673A\u5668\u5C42"><span style="${MONO}font-size:9.5px;letter-spacing:.14em;text-transform:uppercase;color:#5b6480;flex:none;">${bi("Machine", "\u673A\u5668")}</span>` + MACHINE_NAV.map((m7, i) => {
     const active = input.machinePage === m7.key;
-    const sep8 = i > 0 ? `<span style="color:#3a4360;flex:none;">\xB7</span>` : "";
-    return sep8 + `<a class="mach-link${active ? " on" : ""}" data-machine="${m7.key}" href="${esc4(m7.href)}"${active ? ' aria-current="page"' : ""} style="text-decoration:none;color:${active ? "#fff" : "#8f98ad"};font-weight:${active ? "600" : "400"};white-space:nowrap;flex:none;">${bi(m7.en, m7.zh)}</a>`;
+    const sep9 = i > 0 ? `<span style="color:#3a4360;flex:none;">\xB7</span>` : "";
+    return sep9 + `<a class="mach-link${active ? " on" : ""}" data-machine="${m7.key}" href="${esc4(m7.href)}"${active ? ' aria-current="page"' : ""} style="text-decoration:none;color:${active ? "#fff" : "#8f98ad"};font-weight:${active ? "600" : "400"};white-space:nowrap;flex:none;">${bi(m7.en, m7.zh)}</a>`;
   }).join("") + `</nav>`;
   const releaseTag = input.snapshot.release?.latestTag;
   const releaseBadge = releaseTag !== void 0 && releaseTag !== "" ? `<span style="${MONO}font-size:11px;color:#6f7892;letter-spacing:.02em;white-space:nowrap;">${bi("release", "\u53D1\u7248")} <b style="color:#cfd5e3;font-weight:600;">${esc4(releaseTag)}</b></span>` : "";
@@ -277700,11 +277728,11 @@ function printMergeSummary(summary) {
 function summaryAction(summary, file) {
   for (let index = summary.length - 1; index >= 0; index -= 1) {
     const entry = summary[index] ?? "";
-    const sep8 = entry.indexOf("|");
-    if (sep8 < 0)
+    const sep9 = entry.indexOf("|");
+    if (sep9 < 0)
       continue;
-    if (entry.slice(sep8 + 1) === file)
-      return entry.slice(0, sep8);
+    if (entry.slice(sep9 + 1) === file)
+      return entry.slice(0, sep9);
   }
   return null;
 }
@@ -278249,10 +278277,10 @@ function emitInitUi(projectDir, hasAgents, syncStatus, summary, shouldNudge, mod
   lines3.push("  " + c(iconColor, icon) + " " + c(iconColor, fLabel, { bold: true }));
   const nudgeMsg = shouldNudge ? renderDesignNudge(msgLang6())[0] ?? "" : "";
   const nudgePair = shouldNudge && nudgeMsg !== "" ? (() => {
-    const sep8 = nudgeMsg.indexOf(" \u2014 ");
-    if (sep8 < 0)
+    const sep9 = nudgeMsg.indexOf(" \u2014 ");
+    if (sep9 < 0)
       return [nudgeMsg, ""];
-    return [nudgeMsg.slice(0, sep8), nudgeMsg.slice(sep8 + 3)];
+    return [nudgeMsg.slice(0, sep9), nudgeMsg.slice(sep9 + 3)];
   })() : void 0;
   const nextItems = nextItemsOverride ?? (hasAgents ? [
     ...nudgePair ? [nudgePair] : [],
@@ -281224,7 +281252,7 @@ async function loopExhaustionSplitCommand(argv, deps = realExhaustionSplitDeps()
 init_dist2();
 init_dist();
 init_dist3();
-import { appendFileSync as appendFileSync21, existsSync as existsSync134, mkdirSync as mkdirSync74, readdirSync as readdirSync48, readFileSync as readFileSync135, writeFileSync as writeFileSync72 } from "node:fs";
+import { appendFileSync as appendFileSync21, existsSync as existsSync135, mkdirSync as mkdirSync74, readdirSync as readdirSync49, readFileSync as readFileSync135, writeFileSync as writeFileSync72 } from "node:fs";
 import { dirname as dirname74, join as join158 } from "node:path";
 
 // packages/cli/dist/runner/executor.js
@@ -288367,7 +288395,7 @@ function applyCorrectionCircuitBreaker(projectPath3, slug3, eventsPath4, alertsP
 init_dist2();
 init_dist3();
 import { execFileSync as execFileSync31 } from "node:child_process";
-import { readFileSync as readFileSync133 } from "node:fs";
+import { readFileSync as readFileSync133, readdirSync as readdirSync48, realpathSync as realpathSync20 } from "node:fs";
 import { homedir as homedir33 } from "node:os";
 import { basename as basename22, dirname as dirname72, join as join156, relative as relative13, resolve as resolve13 } from "node:path";
 function git3(args, cwd) {
@@ -288437,6 +288465,60 @@ function extractCycleId(dirName) {
   const m7 = /^(cycle-\d{8}-\d{6}-\d+)$/.exec(dirName);
   return m7 ? m7[1] : void 0;
 }
+var ORPHAN_DELIVERED_OUTCOMES = /* @__PURE__ */ new Set(["delivered", "merged"]);
+function realpathSafe2(p) {
+  try {
+    return realpathSync20(p);
+  } catch {
+    return p;
+  }
+}
+function defaultReadDirNames(dir) {
+  try {
+    return readdirSync48(dir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
+  } catch {
+    return [];
+  }
+}
+function scanOrphanLoopWorktrees(repoRoot3, registeredPaths, cycles, deps) {
+  const worktreesDir = join156(repoRoot3, ".roll", "loop", "worktrees");
+  const names = deps.readDir ? deps.readDir(worktreesDir) : defaultReadDirNames(worktreesDir);
+  const out3 = [];
+  for (const name of [...names].sort()) {
+    const absPath = resolve13(join156(worktreesDir, name));
+    if (registeredPaths.has(realpathSafe2(absPath)))
+      continue;
+    const cycleId = extractCycleId(name);
+    const ce = cycleId ? cycles.get(cycleId) : void 0;
+    const outcome = ce?.outcome;
+    const active = isActiveCycle(cycleId, repoRoot3, deps);
+    const rec = {
+      path: absPath,
+      owner: "loop",
+      ...cycleId ? { cycleId } : {},
+      ...ce?.storyId ? { storyId: ce.storyId } : {},
+      ...outcome ? { outcome } : {},
+      dirtyTracked: "unknown",
+      // no git metadata for a deregistered dir
+      dirtyUntracked: "unknown",
+      ahead: null,
+      mergeEvidence: { kind: "none" },
+      active,
+      disposition: "preserved_orphan",
+      reason: ""
+    };
+    if (active) {
+      rec.reason = "orphan loop dir with an active cycle lock; never reclaimed";
+    } else if (outcome && ORPHAN_DELIVERED_OUTCOMES.has(outcome)) {
+      rec.disposition = "orphan_reclaimable";
+      rec.reason = `orphan loop dir (deregistered from git); owning cycle outcome '${outcome}' is delivered \u2014 bounded reclaim`;
+    } else {
+      rec.reason = `orphan loop dir (deregistered from git); delivery not provable (cycle outcome '${outcome ?? "unknown"}') \u2014 preserved, reclaim manually after review`;
+    }
+    out3.push(rec);
+  }
+  return out3;
+}
 function detectDirty(wtPath, deps) {
   try {
     const g = deps.git ?? git3;
@@ -288637,6 +288719,10 @@ function auditWorktrees(deps) {
     baseRec.reason = disp.reason;
     records.push(baseRec);
   }
+  const registeredLoopPaths = new Set(records.map((r) => realpathSafe2(resolve13(r.path))));
+  for (const orphan of scanOrphanLoopWorktrees(repoRoot3, registeredLoopPaths, cycles, deps)) {
+    records.push(orphan);
+  }
   let ephemeralBranches = [];
   try {
     const g = deps.git ?? git3;
@@ -288695,7 +288781,9 @@ function renderHuman(output) {
     "preserved_unpublished",
     "preserved_dirty_no_tcr",
     "preserved_needs_review",
+    "preserved_orphan",
     "disposable_candidate",
+    "orphan_reclaimable",
     "external_unmanaged"
   ];
   for (const disp of order) {
@@ -288767,12 +288855,24 @@ function worktreeAuditCommand(args, deps) {
 init_dist2();
 import { execFileSync as execFileSync32 } from "node:child_process";
 import { homedir as homedir34 } from "node:os";
-import { appendFileSync as appendFileSync20, mkdirSync as mkdirSync73 } from "node:fs";
-import { dirname as dirname73, join as join157, relative as relative14, resolve as resolve14 } from "node:path";
-var MERGED_KINDS = /* @__PURE__ */ new Set(["ancestor", "patch_equivalent"]);
+import { appendFileSync as appendFileSync20, existsSync as existsSync134, mkdirSync as mkdirSync73, rmSync as rmSync25 } from "node:fs";
+import { dirname as dirname73, join as join157, relative as relative14, resolve as resolve14, sep as sep8 } from "node:path";
+var MERGED_KINDS = /* @__PURE__ */ new Set(["ancestor", "patch_equivalent", "final_tree"]);
 function isSafelyDisposable(rec) {
   return rec.owner === "loop" && rec.active === false && rec.dirtyTracked === false && rec.disposition === "disposable_candidate" && MERGED_KINDS.has(rec.mergeEvidence.kind) && typeof rec.head === "string" && rec.head.length > 0;
 }
+function isReclaimableOrphan(rec) {
+  return rec.owner === "loop" && rec.active === false && rec.disposition === "orphan_reclaimable";
+}
+function isBoundedLoopWorktreeDir(repoRoot3, path) {
+  const base = resolve14(join157(repoRoot3, ".roll", "loop", "worktrees"));
+  const abs = resolve14(path);
+  if (abs === base)
+    return false;
+  if (!abs.startsWith(base + sep8))
+    return false;
+  return dirname73(abs) === base;
+}
 var PROTECTED_BRANCHES = /* @__PURE__ */ new Set(["main", "master", "HEAD"]);
 function resolveStandaloneMergedBranches(audit, deps) {
   const out3 = [];
@@ -288797,20 +288897,25 @@ function planWorktreeCleanup(audit, threshold, standaloneMergedBranches = []) {
   const loopWorktrees = audit.records.filter((r) => r.owner === "loop");
   const canaryTotal = audit.ephemeralBranches.length + loopWorktrees.length;
   const excess = canaryTotal - threshold;
-  const pool = audit.records.filter(isSafelyDisposable).sort((a, b) => a.path.localeCompare(b.path));
+  const pool = audit.records.filter((r) => isSafelyDisposable(r) || isReclaimableOrphan(r)).sort((a, b) => a.path.localeCompare(b.path));
   const branchPool = [...standaloneMergedBranches].sort((a, b) => a.branch.localeCompare(b.branch));
   const excessN = excess > 0 ? excess : 0;
   const chosen = pool.slice(0, Math.min(excessN, pool.length));
   const remainingExcess = excessN - chosen.length;
   const chosenBranches = branchPool.slice(0, Math.min(remainingExcess, branchPool.length));
   const chosenPaths = new Set(chosen.map((r) => r.path));
-  const candidates = chosen.map((r) => ({
-    path: r.path,
-    ...r.cycleId ? { cycleId: r.cycleId } : {},
-    ...r.branch ? { branch: r.branch } : {},
-    expectedHead: r.head,
-    reason: "disposable_candidate"
-  }));
+  const candidates = chosen.map((r) => {
+    const orphan = isReclaimableOrphan(r);
+    return {
+      path: r.path,
+      ...r.cycleId ? { cycleId: r.cycleId } : {},
+      ...r.branch ? { branch: r.branch } : {},
+      // An orphan has no registered HEAD; apply skips the head check for rm_dir.
+      expectedHead: orphan ? "" : r.head,
+      reason: orphan ? "orphan_reclaimable" : "disposable_candidate",
+      reclaim: orphan ? "rm_dir" : "git_worktree"
+    };
+  });
   const preserved = audit.records.filter((r) => !chosenPaths.has(r.path)).map((r) => ({ path: r.path, disposition: r.disposition, reason: r.reason }));
   const countedWorktrees = loopWorktrees.map((r) => ({
     path: r.path,
@@ -288829,9 +288934,12 @@ function planWorktreeCleanup(audit, threshold, standaloneMergedBranches = []) {
     preserved
   };
 }
-function defaultRemoveBranch(repositoryRoot, branch) {
+function defaultRemoveBranch(repositoryRoot, branch, expectedSha) {
+  if (!isFullGitOid(expectedSha)) {
+    return { ok: false, detail: `refused: expected sha ${expectedSha} is not a full git OID` };
+  }
   try {
-    execFileSync32("git", ["-C", repositoryRoot, "branch", "-D", branch], {
+    execFileSync32("git", ["-C", repositoryRoot, "update-ref", "-d", `refs/heads/${branch}`, expectedSha], {
       encoding: "utf8",
       stdio: ["ignore", "pipe", "pipe"]
     });
@@ -288841,13 +288949,47 @@ function defaultRemoveBranch(repositoryRoot, branch) {
   return { ok: true, detail: "" };
 }
 function defaultRemoveWorktree(repositoryRoot, path) {
+  let gitErr = "";
   try {
     execFileSync32("git", ["-C", repositoryRoot, "worktree", "remove", "--force", path], {
       encoding: "utf8",
       stdio: ["ignore", "pipe", "pipe"]
     });
   } catch (err16) {
-    return { ok: false, detail: err16 instanceof Error ? err16.message : String(err16) };
+    gitErr = err16 instanceof Error ? err16.message : String(err16);
+  }
+  if (existsSync134(path)) {
+    if (!isBoundedLoopWorktreeDir(repositoryRoot, path)) {
+      return { ok: false, detail: gitErr || `refused: ${path} is outside .roll/loop/worktrees` };
+    }
+    try {
+      rmSync25(path, { recursive: true, force: true });
+    } catch (e) {
+      return { ok: false, detail: gitErr || (e instanceof Error ? e.message : String(e)) };
+    }
+  } else if (gitErr) {
+    return { ok: false, detail: gitErr };
+  }
+  try {
+    execFileSync32("git", ["-C", repositoryRoot, "worktree", "prune", "--expire", "now"], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+  } catch {
+  }
+  return { ok: true, detail: "" };
+}
+function defaultReclaimOrphanDir(repositoryRoot, path) {
+  if (!isBoundedLoopWorktreeDir(repositoryRoot, path)) {
+    return { ok: false, detail: `refused: ${path} is outside .roll/loop/worktrees` };
+  }
+  if (!existsSync134(path)) {
+    return { ok: false, detail: "missing: orphan dir already gone" };
+  }
+  try {
+    rmSync25(path, { recursive: true, force: true });
+  } catch (e) {
+    return { ok: false, detail: e instanceof Error ? e.message : String(e) };
   }
   try {
     execFileSync32("git", ["-C", repositoryRoot, "worktree", "prune", "--expire", "now"], {
@@ -288862,6 +289004,7 @@ async function applyWorktreeCleanup(plan, options) {
   const repositoryRoot = resolve14(options.repositoryRoot);
   const auditFn = options.audit ?? (() => auditWorktrees({ repoRoot: repositoryRoot, home: homedir34() }));
   const removeFn = options.removeWorktree ?? defaultRemoveWorktree;
+  const reclaimOrphanFn = options.reclaimOrphanDir ?? defaultReclaimOrphanDir;
   const removeBranchFn = options.removeBranch ?? defaultRemoveBranch;
   const emit4 = options.emit ?? (() => {
   });
@@ -288877,17 +289020,47 @@ async function applyWorktreeCleanup(plan, options) {
       emit4({ type: "worktree_cleanup_refused", path: candidate.path, reason, ts: nowMs2() });
     };
     if (!rec) {
-      refuse("missing: worktree no longer registered (already removed or pruned)");
-      continue;
-    }
-    if (rec.head !== candidate.expectedHead) {
-      refuse(`changed-head: expected ${candidate.expectedHead}, found ${rec.head ?? "none"}`);
+      refuse(candidate.reclaim === "rm_dir" ? "missing: orphan dir no longer present (already reclaimed)" : "missing: worktree no longer registered (already removed or pruned)");
       continue;
     }
     if (rec.active) {
       refuse("active: worktree activated concurrently (fresh lock/heartbeat)");
       continue;
     }
+    if (candidate.reclaim === "rm_dir") {
+      if (!isReclaimableOrphan(rec)) {
+        refuse(`disposition: fresh audit reports '${rec.disposition}' (orphan no longer provably delivered)`);
+        continue;
+      }
+      const removal2 = {
+        path: rec.path,
+        expectedHead: "",
+        reclaim: "rm_dir",
+        ...rec.cycleId ? { cycleId: rec.cycleId } : {}
+      };
+      if (options.dryRun) {
+        removed.push(removal2);
+        continue;
+      }
+      const result3 = reclaimOrphanFn(repositoryRoot, rec.path);
+      if (!result3.ok) {
+        refuse(`reclaim-failed: ${result3.detail}`);
+        continue;
+      }
+      removed.push(removal2);
+      emit4({
+        type: "worktree_cleanup_applied",
+        path: rec.path,
+        expectedHead: "",
+        ...rec.cycleId ? { cycleId: rec.cycleId } : {},
+        ts: nowMs2()
+      });
+      continue;
+    }
+    if (rec.head !== candidate.expectedHead) {
+      refuse(`changed-head: expected ${candidate.expectedHead}, found ${rec.head ?? "none"}`);
+      continue;
+    }
     if (rec.dirtyTracked === true) {
       refuse("dirty: tracked changes appeared after planning");
       continue;
@@ -288903,6 +289076,7 @@ async function applyWorktreeCleanup(plan, options) {
     const removal = {
       path: rec.path,
       expectedHead: candidate.expectedHead,
+      reclaim: "git_worktree",
       ...rec.branch ? { branch: rec.branch } : {},
       ...rec.cycleId ? { cycleId: rec.cycleId } : {}
     };
@@ -288968,7 +289142,7 @@ async function applyWorktreeCleanup(plan, options) {
         branchesRemoved.push(removalB);
         continue;
       }
-      const r = removeBranchFn(repositoryRoot, bc.branch);
+      const r = removeBranchFn(repositoryRoot, bc.branch, bc.expectedSha);
       if (!r.ok) {
         refuseB(`delete-failed: ${r.detail}`);
         continue;
@@ -289058,12 +289232,22 @@ function renderPlanHuman(plan, mode) {
   lines3.push(`minimal candidate set (${plan.canaryTotal} \u2192 ${plan.projectedTotal})`);
   for (const c2 of plan.candidates) {
     const tags = [c2.branch, c2.cycleId].filter(Boolean).join(" ");
-    lines3.push(`  worktree ${rel(c2.path)}${tags ? "  " + tags : ""}  [disposable_candidate]`);
+    const label5 = c2.reclaim === "rm_dir" ? "orphan_reclaimable \xB7 bounded rm" : "disposable_candidate";
+    const kind = c2.reclaim === "rm_dir" ? "orphan  " : "worktree";
+    lines3.push(`  ${kind} ${rel(c2.path)}${tags ? "  " + tags : ""}  [${label5}]`);
   }
   for (const b of plan.branchCandidates) {
     lines3.push(`  branch   ${b.branch}  ${b.expectedSha.slice(0, 9)}  [merged: ${b.mergeKind}]`);
   }
   lines3.push("");
+  const preservedOrphans = plan.preserved.filter((p) => p.disposition === "preserved_orphan");
+  if (preservedOrphans.length > 0) {
+    lines3.push(`preserved orphan dirs (${preservedOrphans.length}) \u2014 visible + counted, never auto-deleted`);
+    for (const p of preservedOrphans)
+      lines3.push(`  ${rel(p.path)}  \u2014 ${p.reason}`);
+    lines3.push("  Reclaim one after review with: roll worktree cleanup --reclaim-orphan <path>");
+    lines3.push("");
+  }
   if (mode === "dry-run") {
     lines3.push("Dry run \u2014 no git state changed.");
     lines3.push("Apply the audited set with: roll worktree cleanup --apply");
@@ -289104,7 +289288,7 @@ function renderResultHuman(result2) {
   }
   return lines3.join("\n").trimEnd() + "\n";
 }
-var CLEANUP_USAGE = "Usage: roll worktree cleanup [--dry-run | --apply] [--json] [--repo <path>]\n  Safely recover from branch/worktree canary pressure using the worktree\n  audit as the SOLE authority. Removes ONLY inactive, merged, clean\n  `disposable_candidate` loop worktrees, plus (FIX-1454) standalone ephemeral\n  branches that are verifiably merged (ancestor of the integration branch or a\n  merged GitHub PR) and attached to no worktree \u2014 never a path/ref that is\n  merely old or counted, and never a preserved (unpublished / dirty / active /\n  external / current / protected / unmerged) one.\n\n  Always dry-run first. Default (no flag) is --dry-run.\n  --dry-run  print counted refs/dirs, audit dispositions, and the minimal\n             candidate set to clear pressure. Never mutates git state.\n  --apply    re-run the audit before EVERY removal; remove only revalidated\n             candidates via git, prune registration, emit events. A changed\n             head / new dirt / missing path / concurrent activation fails\n             closed (no substitution). Then resume explicitly: roll loop resume\n  --json     emit the schema-1 plan (dry-run) or result (apply) as JSON\n  --repo     override the project root (default: current directory)\n\n  \u5B89\u5168\u6E05\u7406:\u4EC5\u79FB\u9664\u5BA1\u8BA1\u5224\u5B9A\u4E3A\u5DF2\u5408\u5E76\u3001\u5E72\u51C0\u3001\u975E\u6D3B\u8DC3\u7684 disposable_candidate;\n  \u5148\u8DD1 --dry-run,\u518D --apply,\u6700\u540E\u624B\u52A8 roll loop resume\u3002";
+var CLEANUP_USAGE = "Usage: roll worktree cleanup [--dry-run | --apply] [--json] [--repo <path>]\n  Safely recover from branch/worktree canary pressure using the worktree\n  audit as the SOLE authority. Removes ONLY inactive, merged, clean\n  `disposable_candidate` loop worktrees, plus (FIX-1454) standalone ephemeral\n  branches that are verifiably delivered and attached to no worktree. Delivery\n  is PROVEN by one of: every commit is an ancestor of the integration branch;\n  `git cherry` shows every commit already has an equivalent patch upstream; or\n  (FIX-1471, squash merges) the branch tip tree is byte-identical to the merge\n  commit of the branch's OWN merged GitHub PR (matched by exact head ref) AND\n  that merge commit is an ancestor of the integration branch. A merged PR alone\n  is NEVER sufficient, and no arbitrary same-tree commit on the integration\n  branch is ever used. Never a path/ref that is merely old or counted, and never\n  a preserved (unpublished / dirty / active / external / current / protected /\n  unmerged) one.\n\n  Always dry-run first. Default (no flag) is --dry-run.\n  --dry-run  print counted refs/dirs, audit dispositions, and the minimal\n             candidate set to clear pressure. Never mutates git state.\n  --apply    re-run the audit before EVERY removal; remove only revalidated\n             candidates via git, prune registration, emit events. A changed\n             head / new dirt / missing path / concurrent activation fails\n             closed (no substitution). Then resume explicitly: roll loop resume\n  --json     emit the schema-1 plan (dry-run) or result (apply) as JSON\n  --repo     override the project root (default: current directory)\n  --reclaim-orphan <path>  (FIX-1460) bounded-rm ONE named orphan loop dir\n             (deregistered from git; delivery not auto-provable) after you\n             review it. Fails closed unless it is an inactive loop orphan\n             inside .roll/loop/worktrees. Auto-reclaim of provably-delivered\n             orphans happens under --apply.\n\n  \u5B89\u5168\u6E05\u7406:\u4EC5\u79FB\u9664\u5BA1\u8BA1\u5224\u5B9A\u4E3A\u5DF2\u5408\u5E76\u3001\u5E72\u51C0\u3001\u975E\u6D3B\u8DC3\u7684 disposable_candidate;\n  \u5148\u8DD1 --dry-run,\u518D --apply,\u6700\u540E\u624B\u52A8 roll loop resume\u3002";
 function resolveThreshold() {
   const parsed = parseInt(process.env["ROLL_BRANCH_CANARY_MAX"] ?? "", 10);
   return Number.isFinite(parsed) && parsed > 0 ? parsed : DEFAULT_BRANCH_CANARY_MAX;
@@ -289112,20 +289296,41 @@ function resolveThreshold() {
 function gitCap(repoRoot3, args) {
   return execFileSync32("git", ["-C", repoRoot3, ...args], { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] });
 }
-function classifyBranchMerge(branch, integrationBranch, git5) {
+function classifyBranchMerge(branch, integrationBranch, git5, prMergeCommit) {
   if (git5(["merge-base", "--is-ancestor", branch, integrationBranch]).ok)
     return "ancestor";
   const cherry = git5(["cherry", integrationBranch, branch]);
-  if (!cherry.ok)
+  if (cherry.ok) {
+    const lines3 = cherry.stdout.split("\n").map((l) => l.trim()).filter((l) => l !== "");
+    if (lines3.length > 0 && lines3.every((l) => l.startsWith("-")))
+      return "patch_equivalent";
+  }
+  return classifyFinalTreeDelivery(branch, integrationBranch, git5, prMergeCommit);
+}
+function classifyFinalTreeDelivery(branch, integrationBranch, git5, prMergeCommit) {
+  const rawMerge = prMergeCommit(branch);
+  if (rawMerge === null)
     return null;
-  const lines3 = cherry.stdout.split("\n").map((l) => l.trim()).filter((l) => l !== "");
-  if (lines3.length === 0)
+  const merge = rawMerge.trim();
+  if (!isFullGitOid(merge))
     return null;
-  if (lines3.some((l) => l.startsWith("+")))
+  if (!git5(["merge-base", "--is-ancestor", merge, integrationBranch]).ok)
     return null;
-  if (lines3.every((l) => l.startsWith("-")))
-    return "patch_equivalent";
-  return null;
+  const branchTreeProbe = git5(["rev-parse", `${branch}^{tree}`]);
+  if (!branchTreeProbe.ok)
+    return null;
+  const branchTree = branchTreeProbe.stdout.trim();
+  if (branchTree === "")
+    return null;
+  const mergeTreeProbe = git5(["rev-parse", `${merge}^{tree}`]);
+  if (!mergeTreeProbe.ok)
+    return null;
+  const mergeTree = mergeTreeProbe.stdout.trim();
+  if (mergeTree === "")
+    return null;
+  if (branchTree !== mergeTree)
+    return null;
+  return "final_tree";
 }
 function buildStandaloneBranchDeps(repoRoot3, audit, integrationBranch) {
   const attachedBranches = new Set(audit.records.filter((r) => r.owner === "loop" && typeof r.branch === "string" && r.branch !== "").map((r) => r.branch.replace(/^refs\/heads\//, "")));
@@ -289145,11 +289350,12 @@ function buildStandaloneBranchDeps(repoRoot3, audit, integrationBranch) {
         return null;
       }
     },
-    // FIX-1458 (#1465): delivery is proven ONLY by fresh git patch evidence via
-    // classifyBranchMerge (ancestor OR `git cherry` patch-equivalence). A merged
-    // GitHub PR is deliberately NOT consulted: a squash merge leaves the exact
-    // branch tips undelivered, so authorizing deletion on a merged PR alone
-    // silently discards unique commits (US-ORG-003/007/004 in the report).
+    // FIX-1458 (#1465), FIX-1471: delivery is proven by fresh git patch evidence
+    // (ancestor OR `git cherry` patch-equivalence) OR, for the squash-merge case,
+    // by the branch tip tree matching the merge commit of the branch's OWN merged
+    // GitHub PR (an ancestor of integration). A merged PR label alone never
+    // authorizes deletion, and no arbitrary same-tree integration commit is ever
+    // consulted — that would silently discard unique commits (US-ORG-003/007/004).
     branchMerge: (branch) => classifyBranchMerge(branch, integrationBranch, (args) => {
       try {
         return { ok: true, stdout: gitCap(repoRoot3, args) };
@@ -289157,9 +289363,39 @@ function buildStandaloneBranchDeps(repoRoot3, audit, integrationBranch) {
         const stdout = typeof err16.stdout === "string" ? err16.stdout : "";
         return { ok: false, stdout };
       }
-    })
+    }, (b) => ghMergedPrMergeCommit(repoRoot3, b))
   };
 }
+function isFullGitOid(value) {
+  return /^[0-9a-f]{40}$/.test(value) || /^[0-9a-f]{64}$/.test(value);
+}
+function parseMergedPrMergeCommit(raw, branch) {
+  let j;
+  try {
+    j = JSON.parse(raw);
+  } catch {
+    return null;
+  }
+  if (j.state !== "MERGED")
+    return null;
+  if (typeof j.mergedAt !== "string" || j.mergedAt === "")
+    return null;
+  if (typeof j.headRefName !== "string" || j.headRefName !== branch)
+    return null;
+  const oid = j.mergeCommit?.oid;
+  if (typeof oid !== "string" || !isFullGitOid(oid))
+    return null;
+  return oid;
+}
+function ghMergedPrMergeCommit(repoRoot3, branch) {
+  let out3;
+  try {
+    out3 = execFileSync32("gh", ["pr", "view", branch, "--json", "state,mergedAt,mergeCommit,headRefName"], { cwd: repoRoot3, encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] });
+  } catch {
+    return null;
+  }
+  return parseMergedPrMergeCommit(out3, branch);
+}
 function resolveIntegrationForCleanup(repoRoot3) {
   try {
     const head = gitCap(repoRoot3, ["symbolic-ref", "--quiet", "--short", "refs/remotes/origin/HEAD"]).trim();
@@ -289189,10 +289425,57 @@ async function worktreeCleanupCommand(args, deps) {
     home: deps?.home ?? homedir34(),
     git: deps?.git,
     readFile: deps?.readFile,
+    readDir: deps?.readDir,
     nowISO: deps?.nowISO,
     nowSec: deps?.nowSec,
     integrationBranch: deps?.integrationBranch
   };
+  const reclaimIdx = args.indexOf("--reclaim-orphan");
+  if (reclaimIdx >= 0) {
+    const named2 = args[reclaimIdx + 1];
+    if (!named2) {
+      process.stderr.write("roll worktree cleanup: --reclaim-orphan requires a <path>.\n");
+      return 2;
+    }
+    const fresh = auditWorktrees(fullDeps);
+    const target = resolve14(named2);
+    const rec = fresh.records.find((r2) => resolve14(r2.path) === target);
+    if (!rec) {
+      process.stderr.write(`refused: ${named2} is not in the worktree audit.
+`);
+      return 2;
+    }
+    if (rec.owner !== "loop") {
+      process.stderr.write(`refused: ${named2} is not a loop worktree (owner=${rec.owner}).
+`);
+      return 2;
+    }
+    if (rec.active) {
+      process.stderr.write(`refused: ${named2} has an active cycle lock.
+`);
+      return 2;
+    }
+    if (rec.disposition !== "orphan_reclaimable" && rec.disposition !== "preserved_orphan") {
+      process.stderr.write(`refused: ${named2} audits as '${rec.disposition}', not an orphan dir \u2014 use --apply for registered worktrees.
+`);
+      return 2;
+    }
+    if (!isBoundedLoopWorktreeDir(repoRoot3, rec.path)) {
+      process.stderr.write(`refused: ${named2} is outside .roll/loop/worktrees.
+`);
+      return 2;
+    }
+    const reclaimFn = deps?.reclaimOrphanDir ?? defaultReclaimOrphanDir;
+    const r = reclaimFn(repoRoot3, rec.path);
+    if (!r.ok) {
+      process.stderr.write(`reclaim-failed: ${r.detail}
+`);
+      return 1;
+    }
+    process.stdout.write(`reclaimed orphan dir: ${rec.path}
+`);
+    return 0;
+  }
   const threshold = resolveThreshold();
   const integrationBranch = fullDeps.integrationBranch ?? resolveIntegrationForCleanup(repoRoot3);
   const auditNow = auditWorktrees(fullDeps);
@@ -289330,13 +289613,13 @@ function announceReport(projectPath3, slug3, storyId, opener = (p) => {
   const latest = join158(cardArchiveDir(projectPath3, storyId), "latest");
   const review = join158(latest, reviewFileName(storyId));
   const legacyReport = join158(latest, reportFileName(storyId));
-  const report = existsSync134(review) ? review : existsSync134(legacyReport) ? legacyReport : null;
+  const report = existsSync135(review) ? review : existsSync135(legacyReport) ? legacyReport : null;
   if (report === null)
     return null;
   const label5 = currentLang() === "zh" ? "\u9A8C\u6536 Review Page" : "Acceptance Review Page";
   process.stdout.write(`${label5}: ${report}
 `);
-  const muted = existsSync134(join158(projectPath3, ".roll", "loop", `mute-${slug3}`)) || existsSync134(join158(process.env["ROLL_SHARED_ROOT"] || join158(process.env["HOME"] ?? "", ".shared", "roll"), "loop", `mute-${slug3}`));
+  const muted = existsSync135(join158(projectPath3, ".roll", "loop", `mute-${slug3}`)) || existsSync135(join158(process.env["ROLL_SHARED_ROOT"] || join158(process.env["HOME"] ?? "", ".shared", "roll"), "loop", `mute-${slug3}`));
   if (!muted)
     opener(report);
   return report;
@@ -289360,7 +289643,7 @@ function cycleSignalTeardown(paths, cycleId, branch, sig, deps = {}) {
   }
   let owned = false;
   try {
-    owned = existsSync134(paths.lockPath) && readLockOwner(paths.lockPath)?.pid === pid;
+    owned = existsSync135(paths.lockPath) && readLockOwner(paths.lockPath)?.pid === pid;
   } catch {
     owned = false;
   }
@@ -289505,7 +289788,7 @@ function incrementConsecutiveFails(projectPath3, slug3, alertsPath, eventsPath4,
   const counterFile = join158(rt, "consecutive-fails");
   let count = 0;
   try {
-    if (existsSync134(counterFile)) {
+    if (existsSync135(counterFile)) {
       count = parseInt(readFileSync135(counterFile, "utf8").trim(), 10) || 0;
     }
   } catch {
@@ -289519,7 +289802,7 @@ function incrementConsecutiveFails(projectPath3, slug3, alertsPath, eventsPath4,
   if (count < threshold)
     return;
   const pauseMarker = join158(projectPath3, ".roll", "loop", `PAUSE-${slug3}`);
-  if (existsSync134(pauseMarker))
+  if (existsSync135(pauseMarker))
     return;
   const alertMsg = `# ALERT \u2014 loop auto-paused after ${count} consecutive failures
 
@@ -289555,7 +289838,7 @@ loop run-once: \u8FDE\u7EED ${count} \u6B21\u5931\u8D25\u540E\u81EA\u52A8\u6682\
 }
 function writeRootCausePause(projectPath3, slug3, alertsPath, eventsPath4, cycleId, attribution, count, snapshotPath2) {
   const pauseMarker = join158(projectPath3, ".roll", "loop", `PAUSE-${slug3}`);
-  if (existsSync134(pauseMarker))
+  if (existsSync135(pauseMarker))
     return;
   const playbook = playbookForFailure(attribution.failureClass, attribution.rootCauseKey);
   const alertMsg = `# ALERT \u2014 loop auto-paused on ${attribution.failureClass} failure
@@ -289617,7 +289900,7 @@ function handleNonCardFailure(projectPath3, slug3, alertsPath, eventsPath4, runt
 function readFailurePauseThreshold(projectPath3) {
   try {
     const policy = join158(projectPath3, ".roll", "policy.yaml");
-    if (!existsSync134(policy))
+    if (!existsSync135(policy))
       return PAUSE_THRESHOLD;
     return parsePolicy(readFileSync135(policy, "utf8")).loopSafety.maxConsecutiveFailures;
   } catch {
@@ -289647,7 +289930,7 @@ function incrementConsecutiveIdle(projectPath3, slug3) {
   const file = idleCounterPath(projectPath3, slug3);
   let count = 0;
   try {
-    if (existsSync134(file)) {
+    if (existsSync135(file)) {
       count = parseInt(readFileSync135(file, "utf8").trim(), 10) || 0;
     }
   } catch {
@@ -289717,7 +290000,7 @@ function readExternalBlock(eventsPath4, cycleId) {
   const authDetails = [];
   const networkDetails = [];
   try {
-    if (!existsSync134(eventsPath4))
+    if (!existsSync135(eventsPath4))
       return null;
     for (const line of readFileSync135(eventsPath4, "utf8").split("\n")) {
       if (line.trim() === "" || !line.includes("agent:blocked"))
@@ -289782,7 +290065,7 @@ function writeReviewerBlockedAlert(projectPath3, slug3, alertsPath, eventsPath4,
   }
   if (block.cause === "auth") {
     const pauseMarker = join158(projectPath3, ".roll", "loop", `PAUSE-${slug3}`);
-    if (!existsSync134(pauseMarker)) {
+    if (!existsSync135(pauseMarker)) {
       try {
         writeFileSync72(pauseMarker, msg7, "utf8");
         bus.appendEvent(eventsPath4, { type: "policy:safety_pause", loop: "ci", reason: `agent auth block: ${agents}`, ts: ts2 });
@@ -289810,7 +290093,7 @@ function buildLoopRouteDeps(projectPath3) {
       }
       return readRouteSlot(text2, slot);
     } catch {
-      if (existsSync134(agentsYaml)) {
+      if (existsSync135(agentsYaml)) {
         throw new Error("legacy agent configuration is unsupported; run `roll agent migrate`");
       }
       return void 0;
@@ -289911,7 +290194,7 @@ async function loopRunOnceCommand(args) {
       removePendingPublish(rt, storyId);
     }
   }
-  if (isLoopPaused(id.path, id.slug)) {
+  if (isLoopPaused(id.path, id.slug) && !isGuidedRunOnce(allowedCards)) {
     const lang10 = resolveLang({
       rollLang: process.env["ROLL_LANG"],
       lcAll: process.env["LC_ALL"],
@@ -290088,7 +290371,7 @@ loop run-once: \u8BC4\u5BA1\u5224\u5B9A ${resizeStory} \u8303\u56F4\u8FC7\u5927(
         slug: id.slug,
         count: idleCount,
         resolveState: () => resolveLoopRunState(id.path, id.slug),
-        readBacklog: () => existsSync134(backlogFile) ? readFileSync135(backlogFile, "utf8") : "",
+        readBacklog: () => existsSync135(backlogFile) ? readFileSync135(backlogFile, "utf8") : "",
         scheduler: createScheduler(process.platform, { uid: process.getuid?.() ?? 0 }),
         loopLabel: launchdLabel("loop", id.slug),
         now: () => (/* @__PURE__ */ new Date()).toISOString(),
@@ -290277,7 +290560,7 @@ async function isOffline(resolve17 = (h) => lookup2(h)) {
   }
 }
 function isLoopPaused(projectPath3, slug3) {
-  return existsSync134(join158(projectPath3, ".roll", "loop", `PAUSE-${slug3}`));
+  return existsSync135(join158(projectPath3, ".roll", "loop", `PAUSE-${slug3}`));
 }
 function branchCanaryTrips(projectPath3, slug3, rt, alertsPath) {
   let ephemeralBranchCount = 0;
@@ -290288,7 +290571,7 @@ function branchCanaryTrips(projectPath3, slug3, rt, alertsPath) {
   }
   let worktreeCount = 0;
   try {
-    worktreeCount = readdirSync48(join158(rt, "worktrees"), { withFileTypes: true }).filter((e) => e.isDirectory()).length;
+    worktreeCount = readdirSync49(join158(rt, "worktrees"), { withFileTypes: true }).filter((e) => e.isDirectory()).length;
   } catch {
   }
   const parsed = parseInt(process.env["ROLL_BRANCH_CANARY_MAX"] ?? "", 10);
@@ -290396,7 +290679,7 @@ function checkCoreWorktreeContamination(cwd) {
 // packages/cli/dist/commands/offboard.js
 init_dist();
 import { spawnSync as spawnSync16 } from "node:child_process";
-import { existsSync as existsSync135, readFileSync as readFileSync136, realpathSync as realpathSync20, renameSync as renameSync29, rmSync as rmSync25, writeFileSync as writeFileSync73 } from "node:fs";
+import { existsSync as existsSync136, readFileSync as readFileSync136, realpathSync as realpathSync21, renameSync as renameSync29, rmSync as rmSync26, writeFileSync as writeFileSync73 } from "node:fs";
 import { homedir as homedir35 } from "node:os";
 import { join as join159, resolve as resolve15 } from "node:path";
 function pal4() {
@@ -290497,7 +290780,7 @@ function writeFileAtomic2(path, text2) {
     writeFileSync73(tmp, text2);
     renameSync29(tmp, path);
   } catch (error) {
-    rmSync25(tmp, { force: true });
+    rmSync26(tmp, { force: true });
     throw error;
   }
 }
@@ -290523,12 +290806,12 @@ function offboardCommand(args) {
   }
   let projectDir;
   try {
-    projectDir = realpathSync20(resolve15(process.cwd()));
+    projectDir = realpathSync21(resolve15(process.cwd()));
   } catch {
     projectDir = process.cwd();
   }
   const changeset = changesetPath2(projectDir);
-  if (!existsSync135(changeset)) {
+  if (!existsSync136(changeset)) {
     err10(m4("offboard.no_changeset_en"));
     err10(m4("offboard.no_changeset_zh"));
     process.stderr.write("\n");
@@ -290627,7 +290910,7 @@ function offboardCommand(args) {
   process.stdout.write(m4("offboard.applying_offboard") + "\n");
   for (const item of mergedFiles) {
     const path = resolveChangesetItem(projectDir, item);
-    if (!existsSync135(path))
+    if (!existsSync136(path))
       continue;
     const before = readFileSync136(path, "utf8");
     const after = stripRollMergeBlocks(before);
@@ -290640,8 +290923,8 @@ function offboardCommand(args) {
   for (const item of files) {
     try {
       const path = resolveChangesetItem(projectDir, item);
-      rmSync25(path, { force: true });
-      if (!existsSync135(path))
+      rmSync26(path, { force: true });
+      if (!existsSync136(path))
         process.stdout.write(`    removed file ${item}
 `);
     } catch {
@@ -290649,7 +290932,7 @@ function offboardCommand(args) {
   }
   for (const item of dirs) {
     try {
-      rmSync25(resolveChangesetItem(projectDir, item), { recursive: true, force: true });
+      rmSync26(resolveChangesetItem(projectDir, item), { recursive: true, force: true });
       process.stdout.write(`    removed dir  ${item}
 `);
     } catch {
@@ -290657,7 +290940,7 @@ function offboardCommand(args) {
   }
   for (const item of giEntries) {
     const gi = join159(projectDir, ".gitignore");
-    if (existsSync135(gi)) {
+    if (existsSync136(gi)) {
       const lines3 = readFileSync136(gi, "utf8").split("\n");
       if (lines3.includes(item)) {
         const kept = lines3.filter((l) => l !== item);
@@ -290673,21 +290956,21 @@ function offboardCommand(args) {
     if (r === 0)
       process.stdout.write(`    unloaded     ${item}
 `);
-    rmSync25(plistPath, { force: true });
+    rmSync26(plistPath, { force: true });
   }
-  rmSync25(changeset, { force: true });
+  rmSync26(changeset, { force: true });
   ok11(m4("offboard.offboard_complete_offboard"));
   return 0;
 }
 
 // packages/cli/dist/commands/prices.js
 init_dist();
-import { existsSync as existsSync137, readdirSync as readdirSync50, readFileSync as readFileSync138 } from "node:fs";
+import { existsSync as existsSync138, readdirSync as readdirSync51, readFileSync as readFileSync138 } from "node:fs";
 import { join as join161 } from "node:path";
 
 // packages/cli/dist/commands/prices-refresh.js
 init_dist();
-import { existsSync as existsSync136, mkdirSync as mkdirSync75, readdirSync as readdirSync49, readFileSync as readFileSync137, writeFileSync as writeFileSync74 } from "node:fs";
+import { existsSync as existsSync137, mkdirSync as mkdirSync75, readdirSync as readdirSync50, readFileSync as readFileSync137, writeFileSync as writeFileSync74 } from "node:fs";
 import { join as join160 } from "node:path";
 var FetchError = class extends Error {
   constructor(message) {
@@ -290909,9 +291192,9 @@ function vendorFromSnapshotName(name) {
   return match[2] ?? "anthropic";
 }
 function latestSnapshotPath(snapshotDir, vendor) {
-  if (!existsSync136(snapshotDir))
+  if (!existsSync137(snapshotDir))
     return null;
-  const snaps = readdirSync49(snapshotDir).filter((name) => SNAPSHOT_RE.test(name) && vendorFromSnapshotName(name) === vendor).sort().map((name) => join160(snapshotDir, name));
+  const snaps = readdirSync50(snapshotDir).filter((name) => SNAPSHOT_RE.test(name) && vendorFromSnapshotName(name) === vendor).sort().map((name) => join160(snapshotDir, name));
   return snaps[snaps.length - 1] ?? null;
 }
 function readPrices(path) {
@@ -291118,10 +291401,10 @@ async function pricesRefreshCommand(args, deps = {}) {
 // packages/cli/dist/commands/prices.js
 function loadSnapshots() {
   const dir = join161(repoRoot2(), "lib", "prices");
-  if (!existsSync137(dir)) {
+  if (!existsSync138(dir)) {
     throw new Error(`no price snapshots found in ${dir}; run \`roll prices refresh\``);
   }
-  const files = readdirSync50(dir).filter((n) => n.startsWith("snapshot-") && n.endsWith(".json")).sort();
+  const files = readdirSync51(dir).filter((n) => n.startsWith("snapshot-") && n.endsWith(".json")).sort();
   return files.map((name) => {
     const data = JSON.parse(readFileSync138(join161(dir, name), "utf8"));
     for (const key of ["version", "effective_at", "source_url", "prices"]) {
@@ -291302,7 +291585,7 @@ init_dist3();
 init_dist();
 init_render();
 import { execFileSync as execFileSync35 } from "node:child_process";
-import { mkdirSync as mkdirSync79, readFileSync as readFileSync142, writeFileSync as writeFileSync78, existsSync as existsSync141 } from "node:fs";
+import { mkdirSync as mkdirSync79, readFileSync as readFileSync142, writeFileSync as writeFileSync78, existsSync as existsSync142 } from "node:fs";
 import { dirname as dirname78, join as join165 } from "node:path";
 
 // packages/cli/dist/lib/release-consistency.js
@@ -291311,7 +291594,7 @@ init_dist3();
 init_dist();
 init_render();
 import { execFileSync as execFileSync34 } from "node:child_process";
-import { existsSync as existsSync139, mkdirSync as mkdirSync77, readFileSync as readFileSync140, readdirSync as readdirSync52, statSync as statSync39, writeFileSync as writeFileSync76 } from "node:fs";
+import { existsSync as existsSync140, mkdirSync as mkdirSync77, readFileSync as readFileSync140, readdirSync as readdirSync53, statSync as statSync39, writeFileSync as writeFileSync76 } from "node:fs";
 import { dirname as dirname76, join as join163 } from "node:path";
 
 // packages/cli/dist/lib/consistency-audit.js
@@ -291319,7 +291602,7 @@ init_dist2();
 init_dist3();
 init_dist();
 import { execFile as execFile19 } from "node:child_process";
-import { existsSync as existsSync138, mkdirSync as mkdirSync76, readFileSync as readFileSync139, readdirSync as readdirSync51, writeFileSync as writeFileSync75 } from "node:fs";
+import { existsSync as existsSync139, mkdirSync as mkdirSync76, readFileSync as readFileSync139, readdirSync as readdirSync52, writeFileSync as writeFileSync75 } from "node:fs";
 import { dirname as dirname75, join as join162 } from "node:path";
 import { promisify as promisify18 } from "node:util";
 init_dist();
@@ -291328,7 +291611,7 @@ var PROBE_CAP = 20;
 var COUNT_WINDOW_SEC = 72 * 3600;
 var execFileAsync18 = promisify18(execFile19);
 function readJsonl(path) {
-  if (!existsSync138(path))
+  if (!existsSync139(path))
     return [];
   const out3 = [];
   for (const line of readFileSync139(path, "utf8").split("\n")) {
@@ -291344,7 +291627,7 @@ function readJsonl(path) {
   return out3;
 }
 function readJson(path) {
-  if (!existsSync138(path))
+  if (!existsSync139(path))
     return null;
   try {
     const parsed = JSON.parse(readFileSync139(path, "utf8"));
@@ -291372,10 +291655,10 @@ function hasScreenshotArtifact(reportPath) {
     }
   }
   const dir = join162(runDir, "screenshots");
-  if (!existsSync138(dir))
+  if (!existsSync139(dir))
     return false;
   try {
-    return readdirSync51(dir).some((name) => /\.png$/i.test(name));
+    return readdirSync52(dir).some((name) => /\.png$/i.test(name));
   } catch {
     return false;
   }
@@ -291409,7 +291692,7 @@ async function gatherAuditSnapshot(projectPath3, runtimeDir11, deps = {}) {
   const snapshot = emptyAuditSnapshot(nowSec, TERMINAL_SCHEMA_EPOCH_SEC);
   const skipped2 = [];
   const backlogPath = join162(projectPath3, ".roll", "backlog.md");
-  if (existsSync138(backlogPath)) {
+  if (existsSync139(backlogPath)) {
     snapshot.backlog = parseBacklog(readFileSync139(backlogPath, "utf8")).map((r) => ({ id: r.id, status: r.status }));
   }
   snapshot.index = readIndex(projectPath3);
@@ -291418,7 +291701,7 @@ async function gatherAuditSnapshot(projectPath3, runtimeDir11, deps = {}) {
   let eventFailed = 0;
   const terminal = [];
   const eventsPath4 = join162(runtimeDir11, "events.ndjson");
-  if (existsSync138(eventsPath4)) {
+  if (existsSync139(eventsPath4)) {
     for (const line of readFileSync139(eventsPath4, "utf8").split("\n")) {
       const e = parseEventLine(line);
       if (e === null)
@@ -291441,22 +291724,22 @@ async function gatherAuditSnapshot(projectPath3, runtimeDir11, deps = {}) {
     if (!row2.status.includes("\u2705"))
       continue;
     const card = cardArchiveDir(projectPath3, row2.id);
-    if (!existsSync138(card))
+    if (!existsSync139(card))
       continue;
     const reportPath = join162(card, "latest", reportFileName(row2.id));
     const specPath = join162(card, "spec.md");
     let noVisualSurface = false;
-    if (existsSync138(specPath)) {
+    if (existsSync139(specPath)) {
       try {
         noVisualSurface = !hasVisualEvidenceAc(readFileSync139(specPath, "utf8"));
       } catch {
       }
     }
     snapshot.attest[row2.id] = {
-      report: existsSync138(reportPath),
-      acMap: existsSync138(join162(card, "ac-map.json")),
-      visualEvidence: existsSync138(reportPath) ? hasScreenshotArtifact(reportPath) : false,
-      machineSkip: existsSync138(reportPath) ? hasMachineCaptureSkip2(reportPath) : false,
+      report: existsSync139(reportPath),
+      acMap: existsSync139(join162(card, "ac-map.json")),
+      visualEvidence: existsSync139(reportPath) ? hasScreenshotArtifact(reportPath) : false,
+      machineSkip: existsSync139(reportPath) ? hasMachineCaptureSkip2(reportPath) : false,
       noVisualSurface
     };
   }
@@ -291628,7 +291911,7 @@ function walkTextFiles(projectDir, relDir, extensions) {
     const dirAbs = join163(projectDir, dirRel);
     let entries;
     try {
-      entries = readdirSync52(dirAbs, { withFileTypes: true });
+      entries = readdirSync53(dirAbs, { withFileTypes: true });
     } catch {
       return;
     }
@@ -291837,11 +292120,11 @@ function manualDirectMainDelivery(projectDir, id, mergeShas) {
 function findCardSpec(projectDir, id) {
   const featuresDir = join163(projectDir, ".roll", "features");
   try {
-    for (const epic of readdirSync52(featuresDir, { withFileTypes: true })) {
+    for (const epic of readdirSync53(featuresDir, { withFileTypes: true })) {
       if (!epic.isDirectory())
         continue;
       const spec = join163(featuresDir, epic.name, id, "spec.md");
-      if (existsSync139(spec))
+      if (existsSync140(spec))
         return spec;
     }
   } catch {
@@ -291860,12 +292143,12 @@ function cardChangelogExempt(projectDir, id) {
 }
 function checkFeaturesCatalog(projectDir) {
   const backlog = join163(projectDir, ".roll", "backlog.md");
-  if (!existsSync139(backlog))
+  if (!existsSync140(backlog))
     return { status: "pass", gaps: [] };
   const backlogText = readText(backlog);
   const gaps = [];
   const features = join163(projectDir, ".roll", "features.md");
-  if (existsSync139(features)) {
+  if (existsSync140(features)) {
     const featuresText = readText(features);
     for (const featName of readDoneFeatures(backlogText).keys()) {
       const escaped = escapeRegExp4(featName);
@@ -291889,7 +292172,7 @@ function checkFeaturesCatalog(projectDir) {
 }
 function checkTruthLive(projectDir) {
   const backlog = join163(projectDir, ".roll", "backlog.md");
-  if (!existsSync139(backlog))
+  if (!existsSync140(backlog))
     return { status: "pass", gaps: [] };
   const backlogText = readText(backlog);
   const facts = backlogRowFacts(backlogText);
@@ -291934,17 +292217,17 @@ function checkTruthLive(projectDir) {
 function checkCards(projectDir) {
   const backlog = join163(projectDir, ".roll", "backlog.md");
   const featuresDir = join163(projectDir, ".roll", "features");
-  if (!existsSync139(backlog) || !existsSync139(featuresDir))
+  if (!existsSync140(backlog) || !existsSync140(featuresDir))
     return { status: "pass", gaps: [] };
   const cardEpic = /* @__PURE__ */ new Map();
   try {
-    for (const epic of readdirSync52(featuresDir, { withFileTypes: true })) {
+    for (const epic of readdirSync53(featuresDir, { withFileTypes: true })) {
       if (!epic.isDirectory())
         continue;
-      for (const card of readdirSync52(join163(featuresDir, epic.name), { withFileTypes: true })) {
+      for (const card of readdirSync53(join163(featuresDir, epic.name), { withFileTypes: true })) {
         if (!card.isDirectory())
           continue;
-        if (existsSync139(join163(featuresDir, epic.name, card.name, "spec.md")) && !cardEpic.has(card.name)) {
+        if (existsSync140(join163(featuresDir, epic.name, card.name, "spec.md")) && !cardEpic.has(card.name)) {
           cardEpic.set(card.name, epic.name);
         }
       }
@@ -291979,12 +292262,12 @@ function checkCards(projectDir) {
     const ev = /\[evidence\]\(([^)]+)\)/.exec(line);
     if (ev !== null) {
       const target = (ev[1] ?? "").replace(/^\.roll\//, "");
-      if (!existsSync139(join163(projectDir, ".roll", target))) {
+      if (!existsSync140(join163(projectDir, ".roll", target))) {
         gaps.push(`Backlog row ${id} evidence link is broken: ${ev[1] ?? ""}`);
       }
     } else if (line.includes(STATUS_MARKER.done)) {
       const epic = cardEpic.get(id) ?? "";
-      if (!existsSync139(join163(featuresDir, epic, id, "latest", `${id}-report.html`))) {
+      if (!existsSync140(join163(featuresDir, epic, id, "latest", `${id}-report.html`))) {
         if (hasAcBlock(epic, id)) {
           gaps.push(`Done backlog row ${id} has ACs but no attest report`);
         } else {
@@ -292007,7 +292290,7 @@ function checkCards(projectDir) {
 function checkDocs(projectDir) {
   const gaps = checkTopLevelCommands(activeDocsFiles(projectDir), DOC_RETIRED_TOP_LEVEL_COMMANDS);
   const changelogPath = join163(projectDir, "CHANGELOG.md");
-  if (existsSync139(changelogPath)) {
+  if (existsSync140(changelogPath)) {
     const changelog = readText(changelogPath);
     for (const id of releaseDeltaCardIds(projectDir)) {
       const base = id.replace(/[a-z]$/, "");
@@ -292082,7 +292365,7 @@ function checkSite(projectDir) {
   const gaps = checkTopLevelCommands(activeSiteFiles(projectDir), SITE_HIDDEN_TOP_LEVEL_COMMANDS);
   const siteJs = join163(projectDir, "site", "roll-data.js");
   const backlog = join163(projectDir, ".roll", "backlog.md");
-  if (!existsSync139(siteJs) || !existsSync139(backlog))
+  if (!existsSync140(siteJs) || !existsSync140(backlog))
     return { status: gaps.length === 0 ? "pass" : "fail", gaps };
   const siteText = readText(siteJs);
   const seenGuideRefs = /* @__PURE__ */ new Set();
@@ -292091,7 +292374,7 @@ function checkSite(projectDir) {
     if (seenGuideRefs.has(rel2))
       continue;
     seenGuideRefs.add(rel2);
-    if (!existsSync139(join163(projectDir, rel2))) {
+    if (!existsSync140(join163(projectDir, rel2))) {
       gaps.push(`site/roll-data.js links a guide that does not exist: ${rel2}`);
     }
   }
@@ -292130,7 +292413,7 @@ function checkSite(projectDir) {
 }
 function listFiles2(dir) {
   try {
-    return readdirSync52(dir).filter((n) => {
+    return readdirSync53(dir).filter((n) => {
       try {
         return statSync39(join163(dir, n)).isFile();
       } catch {
@@ -292145,7 +292428,7 @@ function checkI18n(projectDir) {
   const gaps = [];
   const guideEn = join163(projectDir, "guide", "en");
   const guideZh = join163(projectDir, "guide", "zh");
-  if (existsSync139(guideEn) && existsSync139(guideZh)) {
+  if (existsSync140(guideEn) && existsSync140(guideZh)) {
     const enFiles = new Set(listFiles2(guideEn));
     const zhFiles = new Set(listFiles2(guideZh));
     const enOnly = [...enFiles].filter((f) => !zhFiles.has(f)).sort();
@@ -292156,12 +292439,12 @@ function checkI18n(projectDir) {
       gaps.push(`guide/zh/${f} has no corresponding guide/en/${f}`);
   }
   const i18nDir = join163(projectDir, "lib", "i18n");
-  if (existsSync139(i18nDir)) {
+  if (existsSync140(i18nDir)) {
     const keysEn = /* @__PURE__ */ new Set();
     const keysZh = /* @__PURE__ */ new Set();
     let shFiles = [];
     try {
-      shFiles = readdirSync52(i18nDir).filter((n) => n.endsWith(".sh")).sort();
+      shFiles = readdirSync53(i18nDir).filter((n) => n.endsWith(".sh")).sort();
     } catch {
       shFiles = [];
     }
@@ -292201,7 +292484,7 @@ function rglobBats(dir) {
   const walk2 = (d) => {
     let entries = [];
     try {
-      entries = readdirSync52(d);
+      entries = readdirSync53(d);
     } catch {
       return;
     }
@@ -292226,7 +292509,7 @@ function checkTests(projectDir) {
   const gaps = [];
   const backlog = join163(projectDir, ".roll", "backlog.md");
   const testsDir = join163(projectDir, "tests");
-  if (!existsSync139(backlog))
+  if (!existsSync140(backlog))
     return { status: "pass", gaps: [] };
   const backlogText = readText(backlog);
   const allFeatures = /* @__PURE__ */ new Set();
@@ -292251,7 +292534,7 @@ function checkTests(projectDir) {
         doneFeatures.push(currentFeature);
     }
   }
-  const testFiles = existsSync139(testsDir) ? rglobBats(testsDir) : [];
+  const testFiles = existsSync140(testsDir) ? rglobBats(testsDir) : [];
   if (testFiles.length === 0)
     return { status: "pass", gaps: [] };
   for (const feat of doneFeatures) {
@@ -292603,7 +292886,7 @@ function writeReleaseTestProof(exec) {
 function assertTestProofFresh(exec) {
   const cwd = exec("git", ["rev-parse", "--show-toplevel"]).trim();
   const proofPath = join165(cwd, ".roll", "last-test-pass");
-  if (!existsSync141(proofPath)) {
+  if (!existsSync142(proofPath)) {
     throw new Error("test-pass proof missing \u2014 run `roll test` before committing");
   }
   const body = readFileSync142(proofPath, "utf8");
@@ -292623,28 +292906,49 @@ function assertTestProofFresh(exec) {
     throw new Error("code changed since last test run \u2014 run `roll test` on the current staged tree");
   }
 }
+function hasOnlyPreparedReleaseChanges(exec) {
+  const status2 = exec("git", ["status", "--porcelain", "--untracked-files=all"]).trim();
+  if (status2 === "")
+    return false;
+  const allowed2 = /* @__PURE__ */ new Set(["package.json", "CHANGELOG.md"]);
+  const unexpected = status2.split("\n").map((line) => line.slice(2).trim()).filter((path) => !allowed2.has(path));
+  if (unexpected.length > 0) {
+    throw new Error(`unexpected worktree changes during release recovery: ${unexpected.join(", ")}`);
+  }
+  return true;
+}
 function commitPushWithGate(opts) {
   const { branch, message, rollManaged, exec } = opts;
   const original = exec("git", ["rev-parse", "--abbrev-ref", "HEAD"]).trim();
+  const preparedChanges = hasOnlyPreparedReleaseChanges(exec);
   let createdLocal = false;
+  const checkoutExistingBranch = () => {
+    if (preparedChanges) {
+      exec("git", ["checkout", "--merge", branch]);
+      return;
+    }
+    exec("git", ["checkout", branch]);
+  };
   const checkoutBranch = () => {
+    let localSha = "";
     try {
-      const localSha = exec("git", ["rev-parse", "--verify", `refs/heads/${branch}`]).trim();
-      if (localSha !== "") {
-        exec("git", ["checkout", branch]);
-        return;
-      }
+      localSha = exec("git", ["rev-parse", "--verify", `refs/heads/${branch}`]).trim();
     } catch {
     }
+    if (localSha !== "") {
+      checkoutExistingBranch();
+      return;
+    }
+    let remote = "";
     try {
-      const remote = exec("git", ["ls-remote", "--heads", "origin", branch]).trim();
-      if (remote !== "") {
-        exec("git", ["fetch", "origin", `${branch}:${branch}`]);
-        exec("git", ["checkout", branch]);
-        return;
-      }
+      remote = exec("git", ["ls-remote", "--heads", "origin", branch]).trim();
     } catch {
     }
+    if (remote !== "") {
+      exec("git", ["fetch", "origin", `${branch}:${branch}`]);
+      checkoutExistingBranch();
+      return;
+    }
     createdLocal = true;
     exec("git", ["checkout", "-b", branch]);
   };
@@ -292747,7 +293051,7 @@ function realReleaseDeps() {
       commitPushWithGate({
         branch,
         message,
-        rollManaged: existsSync141(join165(cwd, ".roll")),
+        rollManaged: existsSync142(join165(cwd, ".roll")),
         exec: (cmd, args) => execFileSync35(cmd, args, { cwd, encoding: "utf8", stdio: ["ignore", "pipe", "pipe"], timeout: 6e5 })
       });
     },
@@ -293072,13 +293376,13 @@ ${c("dim", "\u2192 Running the golden-path showcase (real models; its verdict do
 init_dist();
 init_render();
 import { spawnSync as spawnSync19 } from "node:child_process";
-import { existsSync as existsSync143, lstatSync as lstatSync13, mkdirSync as mkdirSync81, readFileSync as readFileSync144, readdirSync as readdirSync55, readlinkSync as readlinkSync3, statSync as statSync42 } from "node:fs";
+import { existsSync as existsSync144, lstatSync as lstatSync13, mkdirSync as mkdirSync81, readFileSync as readFileSync144, readdirSync as readdirSync56, readlinkSync as readlinkSync3, statSync as statSync42 } from "node:fs";
 import { join as join167 } from "node:path";
 
 // packages/cli/dist/lib/roll-capture-install.js
 init_dist();
 import { spawnSync as spawnSync18 } from "node:child_process";
-import { chmodSync as chmodSync2, existsSync as existsSync142, lstatSync as lstatSync12, mkdirSync as mkdirSync80, mkdtempSync as mkdtempSync9, readdirSync as readdirSync54, readFileSync as readFileSync143, renameSync as renameSync30, rmSync as rmSync27, statSync as statSync41, writeFileSync as writeFileSync79 } from "node:fs";
+import { chmodSync as chmodSync2, existsSync as existsSync143, lstatSync as lstatSync12, mkdirSync as mkdirSync80, mkdtempSync as mkdtempSync9, readdirSync as readdirSync55, readFileSync as readFileSync143, renameSync as renameSync30, rmSync as rmSync28, statSync as statSync41, writeFileSync as writeFileSync79 } from "node:fs";
 import { homedir as homedir36 } from "node:os";
 import { join as join166 } from "node:path";
 var RELEASE_API = "https://api.github.com/repos/seanyao/roll-capture/releases/latest";
@@ -293105,7 +293409,7 @@ function defaultRollCaptureInstallDeps() {
     home: homedir36(),
     uid: typeof process.getuid === "function" ? process.getuid() : void 0,
     ...platform3 === "darwin" && !isCi3(process.env) && process.env["ROLL_SKIP_CAPTURE_INSTALL"] !== "1" ? { hasAquaGUI: macosHasAquaGUI3(execFile20) } : {},
-    exists: existsSync142,
+    exists: existsSync143,
     renamePath: renameSync30,
     execFile: execFile20,
     fetchLatestRelease: (timeoutMs) => defaultFetchLatestRelease(timeoutMs, process.env, execFile20),
@@ -293177,7 +293481,7 @@ async function installRollCapture(deps = defaultRollCaptureInstallDeps()) {
   } catch (error) {
     return manual(`install failed: ${errorMessage2(error)}`, release.tagName);
   } finally {
-    rmSync27(workDir, { recursive: true, force: true });
+    rmSync28(workDir, { recursive: true, force: true });
   }
 }
 function renderRollCaptureInstallResult(result2, lang10) {
@@ -293313,7 +293617,7 @@ function macosHasAquaGUI3(execFile20) {
 }
 function findExtractedApp(dir) {
   try {
-    for (const name of readdirSync54(dir)) {
+    for (const name of readdirSync55(dir)) {
       const candidate = join166(dir, name);
       const st = lstatSync12(candidate);
       if (st.isSymbolicLink())
@@ -293334,7 +293638,7 @@ function findExtractedApp(dir) {
 function findBundleExecutable(appPath) {
   const macosDir = join166(appPath, "Contents", "MacOS");
   try {
-    for (const name of readdirSync54(macosDir)) {
+    for (const name of readdirSync55(macosDir)) {
       const candidate = join166(macosDir, name);
       const st = lstatSync12(candidate);
       if (st.isSymbolicLink())
@@ -293351,7 +293655,7 @@ function replaceAppAtomically(app, targetApp, deps) {
   const renamePath = deps.renamePath ?? renameSync30;
   const backupApp = `${targetApp}.bak`;
   const hadExisting = lstatExists(targetApp);
-  rmSync27(backupApp, { recursive: true, force: true });
+  rmSync28(backupApp, { recursive: true, force: true });
   if (!hadExisting) {
     renamePath(app, targetApp);
     return;
@@ -293363,10 +293667,10 @@ function replaceAppAtomically(app, targetApp, deps) {
     backupCreated = true;
     renamePath(app, targetApp);
     targetReplaced = true;
-    rmSync27(backupApp, { recursive: true, force: true });
+    rmSync28(backupApp, { recursive: true, force: true });
   } catch (error) {
     if (targetReplaced)
-      rmSync27(targetApp, { recursive: true, force: true });
+      rmSync28(targetApp, { recursive: true, force: true });
     if (backupCreated) {
       try {
         renamePath(backupApp, targetApp);
@@ -293542,7 +293846,7 @@ function setupSnapshot(watch) {
 function walk(dir, lines3) {
   let names;
   try {
-    names = readdirSync55(dir);
+    names = readdirSync56(dir);
   } catch {
     return;
   }
@@ -293617,11 +293921,11 @@ function tmuxPresent() {
 function submoduleGuard() {
   const pkg = rollPkgDir();
   const skills = join167(pkg, "skills");
-  const hasGit = existsSync143(join167(pkg, ".git"));
-  const hasMods = existsSync143(join167(pkg, ".gitmodules"));
+  const hasGit = existsSync144(join167(pkg, ".git"));
+  const hasMods = existsSync144(join167(pkg, ".gitmodules"));
   let empty = true;
   try {
-    empty = readdirSync55(skills).length === 0;
+    empty = readdirSync56(skills).length === 0;
   } catch {
     empty = true;
   }
@@ -293735,7 +294039,7 @@ async function setupCommand2(args) {
       return 1;
     }
   }
-  if (!existsSync143(rollPkgConventions())) {
+  if (!existsSync144(rollPkgConventions())) {
     err13(m5("shared.convention_source_not_found_at_2", rollPkgConventions()));
     err13(m5("shared.run_this_from_the_roll_repo"));
     return 1;
@@ -293826,7 +294130,7 @@ init_showcase2();
 // packages/cli/dist/commands/test.js
 init_dist2();
 import { spawnSync as spawnSync20 } from "node:child_process";
-import { appendFileSync as appendFileSync22, existsSync as existsSync144, mkdirSync as mkdirSync82, readFileSync as readFileSync145, rmSync as rmSync28, writeFileSync as writeFileSync80 } from "node:fs";
+import { appendFileSync as appendFileSync22, existsSync as existsSync145, mkdirSync as mkdirSync82, readFileSync as readFileSync145, rmSync as rmSync29, writeFileSync as writeFileSync80 } from "node:fs";
 import { dirname as dirname79, join as join168, resolve as resolve16 } from "node:path";
 function pal6() {
   const noColor2 = (process.env["NO_COLOR"] ?? "") !== "";
@@ -293848,7 +294152,7 @@ function currentEvidenceFrame() {
   if (raw === "")
     return null;
   const runDir = resolve16(raw);
-  if (!existsSync144(runDir))
+  if (!existsSync145(runDir))
     return null;
   const frame = {
     runDir,
@@ -293905,7 +294209,7 @@ function appendRollTestEvidence(frame, cmd, argv, status2, stdout, stderr) {
 }
 function isolationGetType() {
   const file = join168(process.cwd(), ".roll", "local.yaml");
-  if (!existsSync144(file))
+  if (!existsSync145(file))
     return "none";
   let text2;
   try {
@@ -293957,11 +294261,11 @@ function resetLockPath() {
   return ".roll/.iso-reset.lock";
 }
 function resetLockHeld() {
-  return existsSync144(resetLockPath());
+  return existsSync145(resetLockPath());
 }
 function resetAcquireLock() {
   const lock = resetLockPath();
-  if (existsSync144(lock))
+  if (existsSync145(lock))
     return false;
   mkdirSync82(dirname79(lock), { recursive: true });
   writeFileSync80(lock, `${process.pid}
@@ -293969,7 +294273,7 @@ function resetAcquireLock() {
   return true;
 }
 function resetReleaseLock() {
-  rmSync28(resetLockPath(), { force: true });
+  rmSync29(resetLockPath(), { force: true });
 }
 function runForward(cmd, argv) {
   const frame = currentEvidenceFrame();
@@ -293987,7 +294291,7 @@ function runForward(cmd, argv) {
 }
 function readTestScript(cwd) {
   const p = join168(cwd, "package.json");
-  if (!existsSync144(p))
+  if (!existsSync145(p))
     return void 0;
   try {
     const pkg = JSON.parse(readFileSync145(p, "utf8"));
@@ -294001,7 +294305,7 @@ function detectVitestVersion(cwd) {
   let dir = cwd;
   for (let i = 0; i < 6; i++) {
     const vp = join168(dir, "node_modules", "vitest", "package.json");
-    if (existsSync144(vp)) {
+    if (existsSync145(vp)) {
       try {
         const v = JSON.parse(readFileSync145(vp, "utf8")).version;
         if (typeof v === "string")
@@ -294039,14 +294343,14 @@ function writeTestProof(cwd, mode, command) {
 function ensureSkillsSubmoduleReady() {
   const pkg = rollPkgDir();
   const required2 = join168(pkg, "skills", "roll-onboard", "SKILL.md");
-  if (existsSync144(required2))
+  if (existsSync145(required2))
     return true;
-  if (existsSync144(join168(pkg, ".git")) && existsSync144(join168(pkg, ".gitmodules"))) {
+  if (existsSync145(join168(pkg, ".git")) && existsSync145(join168(pkg, ".gitmodules"))) {
     spawnSync20("git", ["submodule", "update", "--init", "--recursive", "--quiet", "skills"], {
       cwd: pkg,
       stdio: "ignore"
     });
-    if (existsSync144(required2))
+    if (existsSync145(required2))
       return true;
   }
   err14("roll test: skills submodule is empty");
@@ -294055,7 +294359,7 @@ function ensureSkillsSubmoduleReady() {
 }
 function ensureNoneIsolation() {
   const type = isolationGetType();
-  if (type === "none" && !existsSync144(join168(process.cwd(), ".roll", "local.yaml"))) {
+  if (type === "none" && !existsSync145(join168(process.cwd(), ".roll", "local.yaml"))) {
     infoErr("isolation: no test_isolation config, falling back to type=none (host)");
   }
   if (!SUPPORTED_TYPES.includes(type)) {
@@ -294170,7 +294474,7 @@ function testCommand(args) {
   }
   const cwd = process.cwd();
   const resolution = resolveGateCommand({
-    hasPackageJson: existsSync144(join168(cwd, "package.json")),
+    hasPackageJson: existsSync145(join168(cwd, "package.json")),
     testScript: readTestScript(cwd),
     vitestVersion: detectVitestVersion(cwd)
   });
@@ -294596,7 +294900,7 @@ function emitRepair(json, outcome) {
 // packages/cli/dist/commands/truth.js
 init_dist();
 init_dist2();
-import { statSync as statSync43, readFileSync as readFileSync147, writeFileSync as writeFileSync82, mkdirSync as mkdirSync84, existsSync as existsSync145 } from "node:fs";
+import { statSync as statSync43, readFileSync as readFileSync147, writeFileSync as writeFileSync82, mkdirSync as mkdirSync84, existsSync as existsSync146 } from "node:fs";
 import { dirname as dirname81, join as join171 } from "node:path";
 var TRUTH_USAGE = "Usage: roll truth <command>\n  query <storyId>  Deterministic delivery-truth query (structured, zero markdown parse).\n  audit            Bidirectional drift audit: backlog Done \u2194 projection truth.\n\u547D\u4EE4:\n  query <storyId>  \u7ED3\u6784\u5316\u4EA4\u4ED8\u771F\u76F8\u67E5\u8BE2\uFF08\u786E\u5B9A\u6027\uFF0C\u4E0D\u89E3\u6790 markdown\uFF09\n  audit            \u53CC\u5411\u6F02\u79FB\u5BA1\u8BA1\uFF1Abacklog Done \u2194 \u6295\u5F71\u771F\u76F8";
 function formatTruth(t2, lang10) {
@@ -294644,7 +294948,7 @@ function truthAuditCommand(args, lang10) {
   const cwd = process.cwd();
   const nowSec = Math.floor(Date.now() / 1e3);
   const backlogPath = join171(cwd, ".roll", "backlog.md");
-  const backlogRows = existsSync145(backlogPath) ? parseBacklog(readFileSync147(backlogPath, "utf8")).map((r) => ({ id: r.id, status: r.status })) : [];
+  const backlogRows = existsSync146(backlogPath) ? parseBacklog(readFileSync147(backlogPath, "utf8")).map((r) => ({ id: r.id, status: r.status })) : [];
   const deliveries = ensureDeliveriesFresh(cwd, nodeFreshnessPort4, nodeExecPort);
   const snapshot = emptyAuditSnapshot(nowSec, TERMINAL_SCHEMA_EPOCH_SEC);
   snapshot.backlog = backlogRows;
@@ -294729,7 +295033,7 @@ function truthCommand(args) {
 
 // packages/cli/dist/commands/tune.js
 init_dist2();
-import { existsSync as existsSync146, readFileSync as readFileSync148 } from "node:fs";
+import { existsSync as existsSync147, readFileSync as readFileSync148 } from "node:fs";
 import { join as join172 } from "node:path";
 function projectPath2() {
   return (process.env["ROLL_MAIN_PROJECT"] ?? "").trim() || process.cwd();
@@ -294738,7 +295042,7 @@ function str6(v, dflt = "") {
   return typeof v === "string" ? v : dflt;
 }
 function parseJsonl(path) {
-  if (!existsSync146(path))
+  if (!existsSync147(path))
     return [];
   let text2;
   try {
@@ -294914,7 +295218,7 @@ function tuneCommand(argv) {
 // packages/cli/dist/commands/update.js
 init_dist();
 import { spawnSync as spawnSync21 } from "node:child_process";
-import { existsSync as existsSync147, mkdtempSync as mkdtempSync10, readFileSync as readFileSync149, rmSync as rmSync29 } from "node:fs";
+import { existsSync as existsSync148, mkdtempSync as mkdtempSync10, readFileSync as readFileSync149, rmSync as rmSync30 } from "node:fs";
 import { tmpdir as tmpdir14 } from "node:os";
 import { join as join173 } from "node:path";
 function pal7() {
@@ -295004,7 +295308,7 @@ function downloadAndInstallCurl(tag) {
     }
     return { ok: true, newVersion: treeVersion(extractDir) };
   } finally {
-    rmSync29(tmpDir, { recursive: true, force: true });
+    rmSync30(tmpDir, { recursive: true, force: true });
   }
 }
 function checkInstalledVersionOrRetry() {
@@ -295024,11 +295328,11 @@ function checkInstalledVersionOrRetry() {
   }
 }
 function invalidateUpdateCache() {
-  rmSync29(join173(rollHome(), ".update-check"), { force: true });
+  rmSync30(join173(rollHome(), ".update-check"), { force: true });
 }
 function showChangelog() {
   const changelog = join173(rollPkgDir(), "CHANGELOG.md");
-  if (!existsSync147(changelog))
+  if (!existsSync148(changelog))
     return;
   const { BOLD: BOLD2, CYAN, NC } = pal7();
   process.stdout.write(`${BOLD2}${m6("changelog.heading")}:${NC}
@@ -295059,7 +295363,7 @@ async function updateCommand(args) {
   info5(m6("update.current_version", rollVersion()));
   let installMethod = "npm";
   const methodFile = join173(rollPkgDir(), ".install-method");
-  if (existsSync147(methodFile)) {
+  if (existsSync148(methodFile)) {
     installMethod = readFileSync149(methodFile, "utf8").trim() || "npm";
   }
   if (installMethod === "curl") {