sisyphi 1.2.18 → 1.2.20

package/dist/daemon.js

@@ -1058,6 +1058,31 @@ var init_spawn_helpers = __esm({
   }
 });
 
+// src/cli/help-rubric.ts
+var ROOT_AFTER_HELP;
+var init_help_rubric = __esm({
+  "src/cli/help-rubric.ts"() {
+    "use strict";
+    ROOT_AFTER_HELP = `
+I/O contract: flags and positional args on input, JSON on stdout (JSONL for streams).
+
+Exit codes:
+  0   success
+  1   permanent error (fallback)
+  2   usage error (bad args/shape)
+  3   not found
+  4   ambiguous (multiple matches \u2014 see error.candidates)
+  5   conflict (already-exists, wrong-state)
+  60  transient (retry-safe: daemon down, timeout, lock contention)
+
+Errors:
+  {"ok": false,
+   "error": {"code": "<stable-enum>", "kind": "<usage|not_found|ambiguous|conflict|transient|permanent>",
+             "message": "...", "received"?: ..., "expected"?: ..., "next"?: "...", "candidates"?: [...]}}
+`;
+  }
+});
+
 // src/daemon/help-inject.ts
 import { execSync } from "child_process";
 function injectHelp(text) {
@@ -1078,6 +1103,12 @@ function injectHelp(text) {
   };
   return text.replace(/\{\{HELP:([^}]+)\}\}/g, (_m, cmd) => {
     const c = cmd.trim();
+    if (c === ".") {
+      const root = renderHelp("").replace(ROOT_AFTER_HELP.trim(), "").trimEnd();
+      return `<cli-guide bash="sis -h">
+${root}
+</cli-guide>`;
+    }
     return `<cli-guide bash="sis ${c} -h">
 ${renderHelp(c)}
 </cli-guide>`;
@@ -1087,6 +1118,7 @@ var init_help_inject = __esm({
   "src/daemon/help-inject.ts"() {
     "use strict";
     init_spawn_helpers();
+    init_help_rubric();
   }
 });
 
@@ -2472,7 +2504,7 @@ var init_history = __esm({
 });
 
 // src/shared/platform.ts
-import { execSync as execSync4 } from "child_process";
+import { execFileSync as execFileSync2, execSync as execSync4 } from "child_process";
 import { existsSync as existsSync9, readFileSync as readFileSync11 } from "fs";
 function detectPlatform() {
   if (cachedPlatform) return cachedPlatform;
@@ -2662,13 +2694,14 @@ var init_notify = __esm({
 });
 
 // src/daemon/ask-store.ts
-import { existsSync as existsSync11, mkdirSync as mkdirSync6, readFileSync as readFileSync12, readdirSync as readdirSync7 } from "fs";
+import { existsSync as existsSync11, mkdirSync as mkdirSync6, readFileSync as readFileSync12, readdirSync as readdirSync7, unlinkSync } from "fs";
 import { basename as basename4 } from "path";
-function maybeNotifyOnAskCreated(cwd, sessionId, meta) {
+function maybeNotifyOnAskCreated(cwd, sessionId, meta, suppress = false) {
   if (process.env.NODE_ENV === "test" || process.env.SISYPHUS_DISABLE_NOTIFY === "1") return;
   const isActionable = meta.kind !== void 0 && ACTIONABLE_KINDS.has(meta.kind);
   const isHeartbeat = meta.askedBy === HEARTBEAT_ASKED_BY;
   if (!isActionable && !isHeartbeat) return;
+  if (suppress) return;
   try {
     const config = loadConfig(cwd);
     if (config.notifications?.enabled === false) return;
@@ -2694,8 +2727,7 @@ function createAsk(cwd, sessionId, params) {
     ...params.title !== void 0 ? { title: params.title } : {},
     ...params.subtitle !== void 0 ? { subtitle: params.subtitle } : {},
     ...params.kind !== void 0 ? { kind: params.kind } : {},
-    ...params.orphanTarget !== void 0 ? { orphanTarget: params.orphanTarget } : {},
-    ...params.modeTransition !== void 0 ? { modeTransition: params.modeTransition } : {}
+    ...params.orphanTarget !== void 0 ? { orphanTarget: params.orphanTarget } : {}
   };
   atomicWrite(askMetaPath(cwd, sessionId, params.askId), JSON.stringify(meta, null, 2));
   emitHistoryEvent(sessionId, "ask-issued", {
@@ -2704,7 +2736,7 @@ function createAsk(cwd, sessionId, params) {
     blocking: params.blocking,
     askedAt
   });
-  maybeNotifyOnAskCreated(cwd, sessionId, meta);
+  maybeNotifyOnAskCreated(cwd, sessionId, meta, params.suppressTerminalNotification === true);
   return meta;
 }
 function writeDecisions(cwd, sessionId, askId, deck) {
@@ -2839,6 +2871,26 @@ async function maybeAutoResolveAsk(cwd, sessionId, askId, deck) {
   } catch {
   }
 }
+async function clearStaleAskClaims(cwd, sessionId) {
+  let cleared = 0;
+  for (const askId of listAsks(cwd, sessionId)) {
+    const progressPath = askProgressPath(cwd, sessionId, askId);
+    if (!existsSync11(progressPath)) continue;
+    if (existsSync11(askOutputPath(cwd, sessionId, askId))) continue;
+    try {
+      unlinkSync(progressPath);
+    } catch {
+      continue;
+    }
+    cleared++;
+    const meta = readMeta(cwd, sessionId, askId);
+    if (meta?.status === "in-progress") {
+      await updateMeta(cwd, sessionId, askId, { status: "pending", startedAt: void 0 }).catch(() => {
+      });
+    }
+  }
+  return cleared;
+}
 function listOpenAsksFor(cwd, sessionId, askedBy) {
   const out = [];
   for (const askId of listAsks(cwd, sessionId)) {
@@ -3261,7 +3313,7 @@ var init_orphan_sweep = __esm({
 });
 
 // src/daemon/agent.ts
-import { readFileSync as readFileSync13, writeFileSync as writeFileSync9, mkdirSync as mkdirSync7, readdirSync as readdirSync8, existsSync as existsSync13, unlinkSync } from "fs";
+import { readFileSync as readFileSync13, writeFileSync as writeFileSync9, mkdirSync as mkdirSync7, readdirSync as readdirSync8, existsSync as existsSync13, unlinkSync as unlinkSync2 } from "fs";
 import { execSync as execSync5 } from "child_process";
 import { randomUUID as randomUUID3 } from "crypto";
 import { resolve as resolve5, relative as relative2, dirname as dirname3, join as join12 } from "path";
@@ -3628,7 +3680,7 @@ function gcBgTasks(cwd, sessionId, agentId) {
       console.warn(`[bg-tasks] ${agentId} exited with ${leftover.length} untracked background task(s): ${leftover.join(", ")}`);
       emitHistoryEvent(sessionId, "bg-tasks-leftover", { agentId, leftover });
     }
-    unlinkSync(file);
+    unlinkSync2(file);
   } catch (err) {
     console.warn(`[bg-tasks] ${agentId} cleanup failed:`, err instanceof Error ? err.message : err);
   }
@@ -5108,13 +5160,12 @@ function buildPersonality(stats) {
 function shouldGenerateCommentary(event) {
   switch (event) {
     case "session-start":
+    case "mode-transition":
     case "session-complete":
     case "level-up":
     case "achievement":
     case "late-night":
       return true;
-    case "cycle-boundary":
-      return Math.random() < 0.5;
     case "idle-wake":
       return Math.random() < 0.5;
     case "agent-crash":
@@ -5306,18 +5357,17 @@ var init_companion_commentary = __esm({
       { event: "session-start", mood: "grinding", context: "migrate database schema", output: "Database migration. The kind of task that sounds simple until you're three hours in." },
       { event: "agent-crash", mood: "frustrated", context: "agent-003 (reviewer) crashed. 2/5 agents still running", output: "Down to two out of five. The reviewer went first, which is either ironic or fitting." },
       { event: "late-night", mood: "existential", context: "3:14am, 2 sessions active", output: "Something about 3am makes every function look like a confession." },
-      { event: "cycle-boundary", mood: "zen", context: "Cycle 4 complete. 5 agents all submitted clean reports", output: "Five clean reports. No notes. That quiet after the last one lands is the best part." },
+      { event: "mode-transition", mood: "grinding", context: "Entering Implementation mode. Discovery: 3 cycles \xB7 24m active.", output: "Discovery is done pretending it was the hard part. Now we actually build the thing." },
+      { event: "mode-transition", mood: "zen", context: "Entering Validation mode. Implementation: 5 cycles \xB7 1h active.", output: "Code is written. Now the part where we find out which of my assumptions were lies." },
       { event: "level-up", mood: "excited", context: "Level 7 (Boulder Artisan) \u2192 8 (Crag Whisperer)", output: 'Crag Whisperer. Could be worse. Could be "guy who pushes rocks forever."' },
       { event: "idle-wake", mood: "sleepy", context: "Idle for 45 minutes", output: "Forty-five minutes of nothing, and the workspace looks exactly the same. Comforting or depressing." },
       { event: "session-complete", mood: "zen", context: "Task: fix CI pipeline. 1 agent, 1 cycle, 4min", output: "One agent, one cycle, four minutes. If they were all like this, what would I complain about." },
       { event: "session-start", mood: "existential", context: "rewrite the entire test suite", output: "Rewriting every test. Each one a small promise that the code does what someone thinks it does." },
-      { event: "cycle-boundary", mood: "grinding", context: "Cycle 7. 3 agents running, 1 crashed, 2 completed", output: "Cycle seven and the survivors are doing the work of five. Nobody asked them to." },
       { event: "late-night", mood: "sleepy", context: "1:30am, 1 session active", output: "Past one. Everything takes twice as long and matters half as much at this hour." },
       { event: "session-complete", mood: "excited", context: "Task: implement search. 8 agents, 3 cycles", output: "Search works. Eight agents and none of them stepped on each other. That never happens." },
       { event: "agent-crash", mood: "zen", context: "agent-001 crashed during linting", output: "Lost one to the linter. Not the worst way to go." },
       { event: "idle-wake", mood: "grinding", context: "Idle for 2 hours", output: "Two hours away and nothing changed. Exactly as expected, exactly as disappointing." },
       { event: "session-start", mood: "happy", context: "add dark mode", output: "Dark mode. Finally a task that matches the terminal aesthetic." },
-      { event: "cycle-boundary", mood: "frustrated", context: "Cycle 3. 2 agents crashed, 1 completed with errors", output: "Two crashed, one limped back. If this were a heist movie, we'd be in the part where the plan falls apart." },
       { event: "level-up", mood: "zen", context: "Level 12 (Slope Philosopher) \u2192 13 (Gradient Monk)", output: "Gradient Monk. A title for finding calm in repetition. Accurate enough." },
       { event: "session-complete", mood: "grinding", context: "Task: dependency upgrades. 6 agents, 5 cycles, 40min", output: "Forty minutes on dependencies. The kind of work that feels like running in place until suddenly you're done." },
       { event: "late-night", mood: "grinding", context: "4:22am, 3 sessions running", output: "Three sessions at four in the morning. Either dedication or the absence of better judgment." },
@@ -6143,7 +6193,7 @@ var init_companion_render = __esm({
 });
 
 // src/daemon/companion-popup.ts
-import { writeFileSync as writeFileSync12, readFileSync as readFileSync16, unlinkSync as unlinkSync2, existsSync as existsSync16 } from "fs";
+import { writeFileSync as writeFileSync12, readFileSync as readFileSync16, unlinkSync as unlinkSync3, existsSync as existsSync16 } from "fs";
 import { tmpdir } from "os";
 import { join as join15, resolve as resolve6 } from "path";
 function wrapText(text, width) {
@@ -6236,7 +6286,7 @@ fi
 `;
     writeFileSync12(POPUP_SCRIPT, script, { mode: 493 });
     try {
-      unlinkSync2(POPUP_RESULT_PREFIX);
+      unlinkSync3(POPUP_RESULT_PREFIX);
     } catch {
     }
     const clientsRaw = execSafe('tmux list-clients -F "#{client_name} #{client_width}"');
@@ -6246,14 +6296,14 @@ fi
       const client = line.slice(0, lastSpace);
       const clientWidth = parseInt(line.slice(lastSpace + 1), 10);
       if (!clientWidth) continue;
-      const x = Math.max(0, clientWidth - POPUP_WIDTH);
+      const x = Math.max(0, clientWidth - POPUP_WIDTH - 1);
       const args = [
         `-c ${shellQuote(client)}`,
         "-E -b rounded",
         `-T ${shellQuote(initialTitle)}`,
         `-S "fg=${moodColor}"`,
         `-s "fg=${moodColor}"`,
-        `-x ${x} -y 0`,
+        `-x ${x} -y 2`,
         `-w ${POPUP_WIDTH} -h ${maxContentHeight}`,
         shellQuote(POPUP_SCRIPT)
       ].join(" ");
@@ -6266,7 +6316,7 @@ fi
       return null;
     } finally {
       try {
-        unlinkSync2(POPUP_RESULT_PREFIX);
+        unlinkSync3(POPUP_RESULT_PREFIX);
       } catch {
       }
     }
@@ -6737,152 +6787,15 @@ var init_pane_monitor = __esm({
   }
 });
 
-// src/daemon/mode-notify.ts
-import { existsSync as existsSync17 } from "fs";
-import { ulid as ulid2 } from "ulid";
-function capitalize(s) {
-  return s.length === 0 ? s : s[0].toUpperCase() + s.slice(1);
-}
-function formatDuration(ms) {
-  const sec = Math.round(ms / 1e3);
-  if (sec < 60) return `${sec}s`;
-  const min = Math.round(sec / 60);
-  if (min < 60) return `${min}m`;
-  const h = Math.floor(min / 60);
-  const remM = min % 60;
-  return remM ? `${h}h ${remM}m` : `${h}h`;
-}
-function findOpenModeTransitionAsk(cwd, sessionId) {
-  for (const askId of listAsks(cwd, sessionId)) {
-    const meta = readMeta(cwd, sessionId, askId);
-    if (!meta) continue;
-    if (meta.askedBy !== ORCHESTRATOR_ASKED_BY) continue;
-    if (meta.modeTransition !== true) continue;
-    if (meta.status === "answered") continue;
-    if (meta.orphaned === true) continue;
-    if (existsSync17(askOutputPath(cwd, sessionId, askId))) continue;
-    return askId;
-  }
-  return null;
-}
-function buildNextChain(prevChain, prevMode, nextMode, prevModeStats) {
-  const stats = prevModeStats ? { cycles: prevModeStats.cycles, activeMs: prevModeStats.activeMs } : {};
-  if (prevChain && prevChain.length > 0) {
-    const updated = prevChain.map(
-      (e, i) => i === prevChain.length - 1 && prevModeStats ? { ...e, ...stats } : e
-    );
-    updated.push({ mode: nextMode });
-    return updated;
-  }
-  if (prevMode !== void 0) {
-    return [{ mode: prevMode, ...stats }, { mode: nextMode }];
-  }
-  return [{ mode: "unknown" }, { mode: nextMode }];
-}
-function renderBody(chain, cwd) {
-  const current = chain[chain.length - 1];
-  const description = discoverOrchestratorModes(cwd).find((m) => m.name === current.mode)?.description?.trim();
-  const lines = [];
-  if (description) {
-    lines.push(`**${capitalize(current.mode)}** \u2014 ${description}`);
-  } else {
-    lines.push(`Now in **${capitalize(current.mode)}** mode.`);
-  }
-  for (let i = 0; i < chain.length - 1; i++) {
-    const e = chain[i];
-    if (e.cycles === void 0) continue;
-    const label = e.cycles === 1 ? "cycle" : "cycles";
-    lines.push(
-      `${capitalize(e.mode)}: ${e.cycles} ${label} \xB7 ${formatDuration(e.activeMs ?? 0)} active`
-    );
-  }
-  return lines.join("\n\n");
-}
-async function emitModeTransitionNotify(cwd, sessionId, prevMode, nextMode, prevModeStats) {
-  let sessionName;
-  try {
-    sessionName = getSession(cwd, sessionId).name;
-  } catch {
-  }
-  const existingAskId = findOpenModeTransitionAsk(cwd, sessionId);
-  const existingDeck = existingAskId ? readDecisions(cwd, sessionId, existingAskId) : null;
-  const chain = buildNextChain(
-    existingDeck?.source?.modeChain,
-    prevMode,
-    nextMode,
-    prevModeStats
-  );
-  const subtitle = chain.map((e) => e.mode).join(" \u2192 ");
-  const title = "Mode change";
-  const deckTitle = `Mode: ${subtitle}`;
-  const body = renderBody(chain, cwd);
-  const interaction = {
-    id: "mode-transition",
-    title,
-    subtitle,
-    body,
-    kind: "notify",
-    options: [{ id: "ack", label: "Acknowledged" }]
-  };
-  const deckSource = {
-    ...sessionName !== void 0 ? { sessionName } : {},
-    askedBy: ORCHESTRATOR_ASKED_BY,
-    modeChain: chain
-  };
-  const deck = {
-    title: deckTitle,
-    source: deckSource,
-    interactions: [interaction]
-  };
-  try {
-    if (existingAskId) {
-      writeDecisions(cwd, sessionId, existingAskId, deck);
-      await updateMeta(cwd, sessionId, existingAskId, {
-        title,
-        subtitle,
-        askedAt: (/* @__PURE__ */ new Date()).toISOString()
-      });
-      return;
-    }
-    const askId = ulid2();
-    createAsk(cwd, sessionId, {
-      askId,
-      askedBy: ORCHESTRATOR_ASKED_BY,
-      blocking: false,
-      cwd,
-      title,
-      subtitle,
-      kind: "notify",
-      modeTransition: true
-    });
-    writeDecisions(cwd, sessionId, askId, deck);
-  } catch (err) {
-    console.warn(
-      `[sisyphus] mode-notify: failed to emit mode transition ask for ${sessionId}:`,
-      err instanceof Error ? err.message : err
-    );
-  }
-}
-var init_mode_notify = __esm({
-  "src/daemon/mode-notify.ts"() {
-    "use strict";
-    init_ask_store();
-    init_state();
-    init_orchestrator_modes();
-    init_paths();
-    init_types();
-  }
-});
-
 // src/daemon/orchestrator.ts
-import { existsSync as existsSync18, readdirSync as readdirSync10, readFileSync as readFileSync17, writeFileSync as writeFileSync13 } from "fs";
+import { existsSync as existsSync17, readdirSync as readdirSync10, readFileSync as readFileSync17, writeFileSync as writeFileSync13 } from "fs";
 import { execSync as execSync6 } from "child_process";
 import { randomUUID as randomUUID6 } from "crypto";
 import { resolve as resolve7, join as join16, relative as relative3 } from "path";
 function detectRepos(cwd) {
   const config = loadConfig(cwd);
   const repos = [];
-  if (existsSync18(join16(cwd, ".git"))) {
+  if (existsSync17(join16(cwd, ".git"))) {
     try {
       repos.push(getRepoInfo(cwd, "."));
     } catch {
@@ -6894,7 +6807,7 @@ function detectRepos(cwd) {
       if (!entry.isDirectory()) continue;
       if (entry.name.startsWith(".")) continue;
       const childPath = join16(cwd, entry.name);
-      if (existsSync18(join16(childPath, ".git"))) {
+      if (existsSync17(join16(childPath, ".git"))) {
         try {
           repos.push(getRepoInfo(childPath, entry.name));
         } catch {
@@ -6932,13 +6845,13 @@ function resolveOrchestratorSettings(cwd, sessionId) {
   const bundled = resolve7(import.meta.dirname, "../templates/orchestrator-settings.json");
   const projectSettings = projectOrchestratorSettingsPath(cwd);
   const userSettings = userOrchestratorSettingsPath();
-  const hasProject = existsSync18(projectSettings);
-  const hasUser = existsSync18(userSettings);
+  const hasProject = existsSync17(projectSettings);
+  const hasUser = existsSync17(userSettings);
   const digestVerbs = digestSpinnerVerbs(cwd, sessionId);
   if (!hasProject && !hasUser && !digestVerbs) return bundled;
   let merged = {};
   for (const path of [bundled, hasUser ? userSettings : null, hasProject ? projectSettings : null]) {
-    if (!path || !existsSync18(path)) continue;
+    if (!path || !existsSync17(path)) continue;
     try {
       const parsed = JSON.parse(readFileSync17(path, "utf-8"));
       merged = { ...merged, ...parsed };
@@ -6955,11 +6868,11 @@ function resolveOrchestratorSettings(cwd, sessionId) {
 }
 function loadOrchestratorPrompt(cwd, sessionId, mode) {
   const projectPath = projectOrchestratorPromptPath(cwd);
-  if (existsSync18(projectPath)) {
+  if (existsSync17(projectPath)) {
     return readFileSync17(projectPath, "utf-8");
   }
   const userPath = userOrchestratorPromptPath();
-  if (existsSync18(userPath)) {
+  if (existsSync17(userPath)) {
     return readFileSync17(userPath, "utf-8");
   }
   const basePath = resolve7(import.meta.dirname, "../templates/orchestrator-base.md");
@@ -6987,7 +6900,7 @@ function buildCompletionContent(session) {
     lines.push("");
   }
   const logsDirPath = logsDir(session.cwd, session.id);
-  if (existsSync18(logsDirPath)) {
+  if (existsSync17(logsDirPath)) {
     const logFiles = readdirSync10(logsDirPath).filter((f) => f.startsWith("cycle-") && f.endsWith(".md")).sort();
     if (logFiles.length > 0) {
       lines.push("### Cycle Logs\n");
@@ -7039,7 +6952,7 @@ function buildCompletionContent(session) {
     }
   }
   const reportsDirPath = reportsDir(session.cwd, session.id);
-  if (existsSync18(reportsDirPath)) {
+  if (existsSync17(reportsDirPath)) {
     const reportFiles = readdirSync10(reportsDirPath).filter((f) => f.endsWith(".md"));
     if (reportFiles.length > 0) {
       lines.push("### Detailed Reports\n");
@@ -7065,7 +6978,7 @@ ${session.context}
     }
   } else {
     let ctxFiles = [];
-    if (existsSync18(ctxDir)) {
+    if (existsSync17(ctxDir)) {
       ctxFiles = readdirSync10(ctxDir).filter((f) => f !== "CLAUDE.md");
     }
     if (ctxFiles.length > 0) {
@@ -7107,10 +7020,10 @@ ${agentLines}
     }
   }
   const strategyFile = strategyPath(session.cwd, session.id);
-  const strategyRef = existsSync18(strategyFile) ? `@${relative3(session.cwd, strategyFile)}` : "(empty)";
-  const roadmapRef = existsSync18(roadmapFile) ? `@${relative3(session.cwd, roadmapFile)}` : "(empty)";
+  const strategyRef = existsSync17(strategyFile) ? `@${relative3(session.cwd, strategyFile)}` : "(empty)";
+  const roadmapRef = existsSync17(roadmapFile) ? `@${relative3(session.cwd, roadmapFile)}` : "(empty)";
   const digestFile = digestPath(session.cwd, session.id);
-  const digestRef = existsSync18(digestFile) ? `@${relative3(session.cwd, digestFile)}` : "(not yet created)";
+  const digestRef = existsSync17(digestFile) ? `@${relative3(session.cwd, digestFile)}` : "(not yet created)";
   const repos = detectRepos(session.cwd);
   let repositoriesSection = "\n\n## Repositories\n";
   if (repos.length === 0) {
@@ -7137,7 +7050,7 @@ ${agentLines}
     }
   }
   const goalFile = goalPath(session.cwd, session.id);
-  const goalContent = existsSync18(goalFile) ? readFileSync17(goalFile, "utf-8").trim() : session.task;
+  const goalContent = existsSync17(goalFile) ? readFileSync17(goalFile, "utf-8").trim() : session.task;
   const modeContent = modeContentBuilders[mode]?.(session) ?? "";
   return `## Goal
 
@@ -7330,14 +7243,12 @@ async function handleOrchestratorYield(sessionId, cwd, nextPrompt, mode) {
     prevModeStats = { cycles, activeMs };
   }
   await completeOrchestratorCycle(cwd, sessionId, nextPrompt, mode, cycleActiveMs);
-  if (mode && mode !== prevMode) {
-    await emitModeTransitionNotify(cwd, sessionId, prevMode, mode, prevModeStats);
-  }
   const freshSession = getSession(cwd, sessionId);
   const runningAgents = freshSession.agents.filter((a) => a.status === "running");
   if (runningAgents.length === 0) {
     console.log(`[sisyphus] Orchestrator yielded with no running agents for session ${sessionId}`);
   }
+  return prevModeStats ? { prevMode, nextMode: mode, prevModeStats } : void 0;
 }
 async function handleOrchestratorComplete(sessionId, cwd, report) {
   const session = getSession(cwd, sessionId);
@@ -7373,7 +7284,6 @@ var init_orchestrator = __esm({
     init_tmux();
     init_pane_registry();
     init_pane_monitor();
-    init_mode_notify();
     init_plugins();
     sessionWindowMap = /* @__PURE__ */ new Map();
     sessionOrchestratorPane = /* @__PURE__ */ new Map();
@@ -7541,6 +7451,36 @@ var init_status_dots = __esm({
   }
 });
 
+// src/daemon/mode-transition.ts
+function capitalize(s) {
+  return s.length === 0 ? s : s[0].toUpperCase() + s.slice(1);
+}
+function formatDuration(ms) {
+  const sec = Math.round(ms / 1e3);
+  if (sec < 60) return `${sec}s`;
+  const min = Math.round(sec / 60);
+  if (min < 60) return `${min}m`;
+  const h = Math.floor(min / 60);
+  const remM = min % 60;
+  return remM ? `${h}h ${remM}m` : `${h}h`;
+}
+function buildModeTransitionCommentary(cwd, prevMode, nextMode, prevModeStats) {
+  const popupTitle = ` Starting ${capitalize(nextMode)} `;
+  const description = discoverOrchestratorModes(cwd).find((m) => m.name === nextMode)?.description?.trim();
+  const label = prevModeStats.cycles === 1 ? "cycle" : "cycles";
+  const context = [
+    description ? `Entering ${capitalize(nextMode)} mode \u2014 ${description}` : `Entering ${capitalize(nextMode)} mode.`,
+    `${capitalize(prevMode)}: ${prevModeStats.cycles} ${label} \xB7 ${formatDuration(prevModeStats.activeMs)} active.`
+  ].join("\n");
+  return { context, popupTitle };
+}
+var init_mode_transition = __esm({
+  "src/daemon/mode-transition.ts"() {
+    "use strict";
+    init_orchestrator_modes();
+  }
+});
+
 // src/shared/manifest.ts
 import os from "os";
 function mapEffortFallback(level) {
@@ -7581,7 +7521,7 @@ var init_manifest = __esm({
 // src/shared/session-export.ts
 import { execFile as execFile3 } from "child_process";
 import { promisify as promisify2 } from "util";
-import { existsSync as existsSync19, readFileSync as readFileSync19, mkdirSync as mkdirSync10, symlinkSync, rmSync as rmSync5, writeFileSync as writeFileSync14 } from "fs";
+import { existsSync as existsSync18, readFileSync as readFileSync19, mkdirSync as mkdirSync10, symlinkSync, rmSync as rmSync5, writeFileSync as writeFileSync14 } from "fs";
 import { homedir as homedir6 } from "os";
 import { join as join17 } from "path";
 function sanitizeName(name) {
@@ -7593,7 +7533,7 @@ function buildOutputPath(label, dir) {
   const base = `sisyphus-${label}-${date}`;
   let candidate = join17(dir, `${base}.zip`);
   let counter = 1;
-  while (existsSync19(candidate)) {
+  while (existsSync18(candidate)) {
     counter++;
     candidate = join17(dir, `${base}-${counter}.zip`);
   }
@@ -7656,14 +7596,14 @@ async function exportSessionToZip(sessionId, cwd, options) {
   const reveal = options?.reveal ?? true;
   const sessDir = sessionDir(cwd, sessionId);
   const histDir = historySessionDir(sessionId);
-  const sessExists = existsSync19(sessDir);
-  const histExists = existsSync19(histDir);
+  const sessExists = existsSync18(sessDir);
+  const histExists = existsSync18(histDir);
   if (!sessExists && !histExists) {
     throw new Error(`No data found for session ${sessionId}`);
   }
   let label = sessionId.slice(0, 8);
   const stPath = statePath(cwd, sessionId);
-  if (existsSync19(stPath)) {
+  if (existsSync18(stPath)) {
     try {
       const state = JSON.parse(readFileSync19(stPath, "utf-8"));
       if (state.name) {
@@ -7855,7 +7795,7 @@ var init_format = __esm({
 });
 
 // src/cli/deploy/creds.ts
-import { chmodSync, existsSync as existsSync20, mkdirSync as mkdirSync11, readFileSync as readFileSync21 } from "fs";
+import { chmodSync, existsSync as existsSync19, mkdirSync as mkdirSync11, readFileSync as readFileSync21 } from "fs";
 import { createInterface } from "readline";
 function isValidProvider(value) {
   return PROVIDERS.includes(value);
@@ -7896,10 +7836,10 @@ var init_pricing = __esm({
 });
 
 // src/cli/deploy/runtime.ts
-import { existsSync as existsSync21, readFileSync as readFileSync22, unlinkSync as unlinkSync3 } from "fs";
+import { existsSync as existsSync20, readFileSync as readFileSync22, unlinkSync as unlinkSync4 } from "fs";
 function readRuntimeState(provider) {
   const path = deployRuntimePath(provider);
-  if (!existsSync21(path)) return null;
+  if (!existsSync20(path)) return null;
   try {
     return JSON.parse(readFileSync22(path, "utf-8"));
   } catch {
@@ -7923,15 +7863,15 @@ var init_tailnet = __esm({
 });
 
 // src/cli/deploy/templates.ts
-import { existsSync as existsSync22 } from "fs";
+import { existsSync as existsSync21 } from "fs";
 import { dirname as dirname6, resolve as resolve9 } from "path";
 import { fileURLToPath } from "url";
 function deployRoot() {
   const here = dirname6(fileURLToPath(import.meta.url));
   const bundled = resolve9(here, "..", "deploy");
-  if (existsSync22(bundled)) return bundled;
+  if (existsSync21(bundled)) return bundled;
   const sourceRoot = resolve9(here, "..", "..", "..", "deploy");
-  if (existsSync22(sourceRoot)) return sourceRoot;
+  if (existsSync21(sourceRoot)) return sourceRoot;
   throw new Error(
     `Could not locate deploy/ templates. Looked at:
   ${bundled}
@@ -7960,7 +7900,7 @@ var init_tailscale = __esm({
 
 // src/cli/deploy/runner.ts
 import { spawn as spawn2, spawnSync } from "child_process";
-import { copyFileSync as copyFileSync5, existsSync as existsSync23, mkdirSync as mkdirSync12, readFileSync as readFileSync23 } from "fs";
+import { copyFileSync as copyFileSync5, existsSync as existsSync22, mkdirSync as mkdirSync12, readFileSync as readFileSync23 } from "fs";
 function readOutputs(provider) {
   const result = spawnSync("terraform", ["output", "-json", `-state=${deployStatePath(provider)}`], {
     cwd: providerModuleDir(provider),
@@ -7986,7 +7926,7 @@ function readOutputs(provider) {
   }
 }
 function isProvisioned(provider) {
-  if (!existsSync23(deployStatePath(provider))) return false;
+  if (!existsSync22(deployStatePath(provider))) return false;
   return readOutputs(provider) !== null;
 }
 function effectiveSshTarget(provider) {
@@ -8105,7 +8045,7 @@ var init_grove = __esm({
 
 // src/cli/cloud/repo.ts
 import { spawnSync as spawnSync3 } from "child_process";
-import { existsSync as existsSync24 } from "fs";
+import { existsSync as existsSync23 } from "fs";
 import { basename as basename6, join as join18 } from "path";
 function captureGit(args, cwd) {
   const result = spawnSync3("git", args, {
@@ -8146,10 +8086,10 @@ function buildRsyncArgs(localDir, remoteTarget) {
   ];
 }
 function detectPackageManager(toplevel) {
-  if (existsSync24(join18(toplevel, "pnpm-lock.yaml"))) return "pnpm";
-  if (existsSync24(join18(toplevel, "bun.lockb"))) return "bun";
-  if (existsSync24(join18(toplevel, "yarn.lock"))) return "yarn";
-  if (existsSync24(join18(toplevel, "package-lock.json"))) return "npm";
+  if (existsSync23(join18(toplevel, "pnpm-lock.yaml"))) return "pnpm";
+  if (existsSync23(join18(toplevel, "bun.lockb"))) return "bun";
+  if (existsSync23(join18(toplevel, "yarn.lock"))) return "yarn";
+  if (existsSync23(join18(toplevel, "package-lock.json"))) return "npm";
   return null;
 }
 function packageManagerInstallCmd(pm) {
@@ -8350,7 +8290,7 @@ __export(cloud_handoff_exports, {
   triggerForceHandoff: () => triggerForceHandoff
 });
 import { spawn as spawn5 } from "child_process";
-import { existsSync as existsSync25 } from "fs";
+import { existsSync as existsSync24 } from "fs";
 import { join as join19 } from "path";
 function runRsync2(args) {
   return new Promise((resolve13) => {
@@ -8390,7 +8330,7 @@ async function syncSessionState(cwd, sessionId, repo, target, provider) {
   const candidates = ["config.json", "orchestrator.md", "orchestrator-settings.json"];
   for (const name of candidates) {
     const localPath = join19(localProject, name);
-    if (!existsSync25(localPath)) continue;
+    if (!existsSync24(localPath)) continue;
     const remotePath = `${boxRepoPath(repo)}/.sisyphus/${name}`;
     const args = [
       "-avz",
@@ -8557,14 +8497,14 @@ var init_cloud_handoff = __esm({
 
 // src/daemon/session-manager.ts
 import { v4 as uuidv4 } from "uuid";
-import { existsSync as existsSync26, readFileSync as readFileSync24, readdirSync as readdirSync11, rmSync as rmSync6 } from "fs";
+import { existsSync as existsSync25, readFileSync as readFileSync24, readdirSync as readdirSync11, rmSync as rmSync6 } from "fs";
 function truncate(s, max) {
   return s.length <= max ? s : s.slice(0, max) + "...";
 }
 function readGoal(cwd, sessionId, fallback) {
   try {
     const p = goalPath(cwd, sessionId);
-    if (existsSync26(p)) return readFileSync24(p, "utf-8").trim();
+    if (existsSync25(p)) return readFileSync24(p, "utf-8").trim();
   } catch {
   }
   return fallback;
@@ -8618,7 +8558,7 @@ function fireHaikuNaming(sessionId, cwd, fallbackTmuxName, task) {
     console.error(`[sisyphus] Name generation failed for session ${sessionId}:`, err);
   });
 }
-function fireCommentary(event, companion, context, flash = false, repo, sessionId) {
+function fireCommentary(event, companion, context, flash = false, repo, sessionId, popupTitle) {
   const memoryCtx = buildMemoryContext(repo);
   generateCommentary(event, companion, context, memoryCtx).then((text) => {
     if (text) {
@@ -8626,7 +8566,7 @@ function fireCommentary(event, companion, context, flash = false, repo, sessionI
         const c = loadCompanion();
         recordCommentary(c, text, event);
         if (flash) {
-          const feedback = showCommentaryPopup(text);
+          const feedback = showCommentaryPopupQueue([{ text, title: popupTitle }]);
           if (feedback) {
             recordFeedback(c, text, feedback.rating, event, feedback.comment);
             if (sessionId) {
@@ -8803,7 +8743,7 @@ It is the other session's responsibility. You do not need to monitor it.
 function pruneOldSessions(cwd) {
   try {
     const dir = sessionsDir(cwd);
-    if (!existsSync26(dir)) return;
+    if (!existsSync25(dir)) return;
     const entries = readdirSync11(dir, { withFileTypes: true });
     const candidates = [];
     for (const entry of entries) {
@@ -8941,7 +8881,7 @@ function getSessionStatus(cwd, sessionId) {
 }
 function countSessions(cwd) {
   const dir = sessionsDir(cwd);
-  if (!existsSync26(dir)) return 0;
+  if (!existsSync25(dir)) return 0;
   let n = 0;
   for (const entry of readdirSync11(dir, { withFileTypes: true })) {
     if (entry.isDirectory()) n++;
@@ -8950,7 +8890,7 @@ function countSessions(cwd) {
 }
 function listSessions(cwd) {
   const dir = sessionsDir(cwd);
-  if (!existsSync26(dir)) return [];
+  if (!existsSync25(dir)) return [];
   const entries = readdirSync11(dir, { withFileTypes: true });
   const sessions = [];
   for (const entry of entries) {
@@ -9014,23 +8954,6 @@ function onAllAgentsDone2(sessionId, cwd, windowId) {
     const companion = loadCompanion();
     companion.spinnerVerbIndex = (companion.spinnerVerbIndex + 1) % SPINNER_VERBS.length;
     saveCompanion(companion);
-    const goal = readGoal(cwd, sessionId, session.task);
-    const modeLabel = lastCycle?.mode ? ` (${lastCycle.mode})` : "";
-    const agentMap = new Map(session.agents.map((a) => [a.id, a]));
-    const spawnedThisCycle = (lastCycle?.agentsSpawned ?? []).map((id) => agentMap.get(id)).filter(Boolean).map((a) => `${a.name} (${a.agentType.replace(/^sisyphus:/, "")}, ${a.status})`).join(", ");
-    let cycleCtx = `Cycle ${cycleNumber}${modeLabel} complete. Goal: ${truncate(goal, 80)}`;
-    if (spawnedThisCycle) cycleCtx += `
-Agents: ${truncate(spawnedThisCycle, 200)}`;
-    try {
-      const logPath2 = cycleLogPath(cwd, sessionId, cycleNumber);
-      if (existsSync26(logPath2)) {
-        const log = readFileSync24(logPath2, "utf-8").trim();
-        if (log) cycleCtx += `
-Cycle log: ${truncate(log, 200)}`;
-      }
-    } catch {
-    }
-    fireCommentary("cycle-boundary", companion, cycleCtx, true, session.cwd, sessionId);
   } catch {
   }
   setImmediate(async () => {
@@ -9203,8 +9126,23 @@ async function handleYield(sessionId, cwd, nextPrompt, mode) {
     await updateSessionStatus(cwd, sessionId, "active");
   }
   respawningSessions.add(sessionId);
-  await handleOrchestratorYield(sessionId, cwd, nextPrompt, mode);
+  const transition = await handleOrchestratorYield(sessionId, cwd, nextPrompt, mode);
   orchestratorDone.add(sessionId);
+  if (transition) {
+    try {
+      const companion = loadCompanion();
+      const goal = readGoal(cwd, sessionId, getSession(cwd, sessionId).task);
+      const { context, popupTitle } = buildModeTransitionCommentary(
+        cwd,
+        transition.prevMode,
+        transition.nextMode,
+        transition.prevModeStats
+      );
+      fireCommentary("mode-transition", companion, `Goal: ${truncate(goal, 100)}
+${context}`, true, cwd, sessionId, popupTitle);
+    } catch {
+    }
+  }
   try {
     recomputeDots();
   } catch {
@@ -9259,6 +9197,7 @@ async function handleComplete(sessionId, cwd, report) {
     console.warn("[sisyphus] Sentiment generation failed:", err instanceof Error ? err.message : err);
   });
   const config = loadConfig(cwd);
+  const uploadCfg = config.upload;
   if (isUploadConfigured(config.upload)) {
     runSessionUploadAndPersist({
       sessionId,
@@ -9270,11 +9209,10 @@ async function handleComplete(sessionId, cwd, report) {
     }).catch(() => {
       console.warn("[sisyphus] upload pipeline crashed; check uploadError on session state");
     });
-  } else if (config.upload) {
-    const partialUpload = config.upload;
+  } else if (uploadCfg) {
     const missing = [];
-    if (!partialUpload.url) missing.push("upload.url");
-    if (!partialUpload.token) missing.push("upload.token");
+    if (!uploadCfg.url) missing.push("upload.url");
+    if (!uploadCfg.token) missing.push("upload.token");
     const error = `upload skipped: missing ${missing.join(", ")}`;
     console.warn(`[sisyphus] ${error}`);
     updateSession(cwd, sessionId, { uploadStatus: "failed", uploadError: error }).catch(() => console.warn("[sisyphus] failed to persist upload skip status"));
@@ -9548,6 +9486,7 @@ var init_session_manager = __esm({
     init_companion_render();
     init_companion_commentary();
     init_companion_popup();
+    init_mode_transition();
     init_history();
     init_uploader();
     init_upload();
@@ -9669,7 +9608,7 @@ var init_transcript_digest = __esm({
 import {
   closeSync as closeSync2,
   constants,
-  existsSync as existsSync27,
+  existsSync as existsSync26,
   fstatSync as fstatSync2,
   lstatSync,
   openSync as openSync2,
@@ -9691,7 +9630,7 @@ async function generateVisualForQuestion(opts) {
   if (!question) return { ok: false, error: `qid ${opts.qid} not found in decisions` };
   const mdPath = askVisualMarkdownPath(opts.cwd, opts.sessionId, opts.askId, opts.qid);
   const ansiPath = askVisualAnsiPath(opts.cwd, opts.sessionId, opts.askId, opts.qid);
-  if (!opts.force && existsSync27(mdPath) && existsSync27(ansiPath)) {
+  if (!opts.force && existsSync26(mdPath) && existsSync26(ansiPath)) {
     return { ok: true, markdownPath: mdPath, ansiPath, turns: 0 };
   }
   if (opts.force) {
@@ -9765,7 +9704,7 @@ function buildUserPrompt(q, askedBy, ctx) {
 }
 function readSystemPrompt() {
   if (cachedSystemPrompt !== void 0) return cachedSystemPrompt;
-  const found = SYSTEM_PROMPT_CANDIDATES.find((p) => existsSync27(p));
+  const found = SYSTEM_PROMPT_CANDIDATES.find((p) => existsSync26(p));
   if (found === void 0) {
     throw new Error(
       `termrender-haiku-system.md not found in any candidate location: ${SYSTEM_PROMPT_CANDIDATES.join(", ")}`
@@ -9912,7 +9851,7 @@ var init_ask_visual = __esm({
 
 // src/daemon/server.ts
 import { createServer } from "net";
-import { unlinkSync as unlinkSync4, existsSync as existsSync28, writeFileSync as writeFileSync15, readFileSync as readFileSync26, mkdirSync as mkdirSync13, readdirSync as readdirSync12, rmSync as rmSync8, chmodSync as chmodSync2 } from "fs";
+import { unlinkSync as unlinkSync5, existsSync as existsSync27, writeFileSync as writeFileSync15, readFileSync as readFileSync26, mkdirSync as mkdirSync13, readdirSync as readdirSync12, rmSync as rmSync8, chmodSync as chmodSync2 } from "fs";
 import { join as join21, basename as basename7, dirname as dirname8 } from "path";
 import { scanInbox } from "@crouton-kit/humanloop";
 function setCompositor(c) {
@@ -9932,7 +9871,7 @@ function persistSessionRegistry() {
 }
 function loadSessionRegistry() {
   const p = registryPath();
-  if (!existsSync28(p)) return {};
+  if (!existsSync27(p)) return {};
   try {
     return JSON.parse(readFileSync26(p, "utf-8"));
   } catch (err) {
@@ -9988,7 +9927,7 @@ function collectAllSessionIds() {
     scannedCwds.add(cwd);
     try {
       const dir = sessionsDir(cwd);
-      if (!existsSync28(dir)) continue;
+      if (!existsSync27(dir)) continue;
       for (const entry of readdirSync12(dir, { withFileTypes: true })) {
         if (entry.isDirectory() && !idToCwd.has(entry.name)) {
           idToCwd.set(entry.name, cwd);
@@ -10220,7 +10159,7 @@ async function handleRequest(req) {
         let tracking = sessionTrackingMap.get(req.sessionId);
         if (!tracking) {
           const stateFile = `${req.cwd}/.sisyphus/sessions/${req.sessionId}/state.json`;
-          if (existsSync28(stateFile)) {
+          if (existsSync27(stateFile)) {
             tracking = { cwd: req.cwd, messageCounter: 0 };
             sessionTrackingMap.set(req.sessionId, tracking);
             persistSessionRegistry();
@@ -10242,7 +10181,7 @@ async function handleRequest(req) {
       }
       case "clear-orphan": {
         const stateFile = `${req.cwd}/.sisyphus/sessions/${req.sessionId}/state.json`;
-        if (!existsSync28(stateFile)) {
+        if (!existsSync27(stateFile)) {
           return {
             ok: false,
             error: errNotFound("unknown_session", {
@@ -10300,7 +10239,7 @@ async function handleRequest(req) {
         let tracking = sessionTrackingMap.get(req.sessionId);
         if (!tracking) {
           const stateFile = `${req.cwd}/.sisyphus/sessions/${req.sessionId}/state.json`;
-          if (existsSync28(stateFile)) {
+          if (existsSync27(stateFile)) {
             registerSessionCwd(req.sessionId, req.cwd);
             tracking = sessionTrackingMap.get(req.sessionId);
           } else {
@@ -10314,7 +10253,7 @@ async function handleRequest(req) {
         let tracking = sessionTrackingMap.get(req.sessionId);
         if (!tracking) {
           const stateFile = `${req.cwd}/.sisyphus/sessions/${req.sessionId}/state.json`;
-          if (existsSync28(stateFile)) {
+          if (existsSync27(stateFile)) {
             registerSessionCwd(req.sessionId, req.cwd);
             tracking = sessionTrackingMap.get(req.sessionId);
           } else {
@@ -10331,7 +10270,7 @@ async function handleRequest(req) {
         let tracking = sessionTrackingMap.get(req.sessionId);
         if (!tracking) {
           const stateFile = `${req.cwd}/.sisyphus/sessions/${req.sessionId}/state.json`;
-          if (existsSync28(stateFile)) {
+          if (existsSync27(stateFile)) {
             tracking = { cwd: req.cwd, messageCounter: 0 };
             sessionTrackingMap.set(req.sessionId, tracking);
             persistSessionRegistry();
@@ -10401,7 +10340,7 @@ async function handleRequest(req) {
       }
       case "set-upload-status": {
         const stateFile = `${req.cwd}/.sisyphus/sessions/${req.sessionId}/state.json`;
-        if (!existsSync28(stateFile)) {
+        if (!existsSync27(stateFile)) {
           return unknownSessionError(req.sessionId);
         }
         try {
@@ -10600,6 +10539,7 @@ async function handleRequest(req) {
         const reviewItems = [];
         for (const [sessionId, tracking] of sessionTrackingMap) {
           if (!tracking.cwd) continue;
+          if (tracking.cwd !== req.cwd) continue;
           askDirs.push(askDir(tracking.cwd, sessionId));
           reviewItems.push(...listReviewInboxItems(tracking.cwd, sessionId));
         }
@@ -10623,6 +10563,26 @@ async function handleRequest(req) {
         });
         return { ok: true, data: { items: itemsWithName } };
       }
+      case "focus-set": {
+        const ID_RE = /^[A-Za-z0-9_-]{1,64}$/;
+        if (!ID_RE.test(req.askId)) return {
+          ok: false,
+          error: errUsage("invalid_ask_id", { message: `Invalid askId: ${req.askId}`, received: req.askId })
+        };
+        pendingFocus = { cwd: req.cwd, sessionId: req.sessionId, askId: req.askId, requestedAt: Date.now() };
+        return { ok: true };
+      }
+      case "focus-get": {
+        if (pendingFocus && pendingFocus.cwd === req.cwd) {
+          const captured = pendingFocus;
+          pendingFocus = null;
+          if (Date.now() - captured.requestedAt > FOCUS_TTL_MS) {
+            return { ok: true, data: { focus: null } };
+          }
+          return { ok: true, data: { focus: captured } };
+        }
+        return { ok: true, data: { focus: null } };
+      }
       case "cloud-handoff": {
         const tracking = sessionTrackingMap.get(req.sessionId);
         if (!tracking) return unknownSessionError(req.sessionId);
@@ -10770,8 +10730,8 @@ async function handleRequest(req) {
 function startServer() {
   return new Promise((resolve13, reject) => {
     const sock = socketPath();
-    if (existsSync28(sock)) {
-      unlinkSync4(sock);
+    if (existsSync27(sock)) {
+      unlinkSync5(sock);
     }
     server = createServer((conn) => {
       let buffer = "";
@@ -10825,15 +10785,15 @@ function stopServer() {
     }
     server.close(() => {
       const sock = socketPath();
-      if (existsSync28(sock)) {
-        unlinkSync4(sock);
+      if (existsSync27(sock)) {
+        unlinkSync5(sock);
       }
       server = null;
       resolve13();
     });
   });
 }
-var server, compositor, sessionTrackingMap;
+var server, compositor, sessionTrackingMap, pendingFocus, FOCUS_TTL_MS;
 var init_server = __esm({
   "src/daemon/server.ts"() {
     "use strict";
@@ -10857,6 +10817,8 @@ var init_server = __esm({
     server = null;
     compositor = null;
     sessionTrackingMap = /* @__PURE__ */ new Map();
+    pendingFocus = null;
+    FOCUS_TTL_MS = 3e4;
   }
 });
 
@@ -10865,7 +10827,7 @@ init_paths();
 init_config();
 init_server();
 init_orphan_sweep();
-import { mkdirSync as mkdirSync15, readFileSync as readFileSync30, writeFileSync as writeFileSync17, unlinkSync as unlinkSync6, existsSync as existsSync33 } from "fs";
+import { mkdirSync as mkdirSync15, readFileSync as readFileSync30, writeFileSync as writeFileSync17, unlinkSync as unlinkSync7, existsSync as existsSync32 } from "fs";
 import { execSync as execSync8 } from "child_process";
 import { setTimeout as sleep } from "timers/promises";
 import { Command } from "commander";
@@ -10875,8 +10837,8 @@ init_ask_store();
 init_state();
 init_server();
 init_paths();
-import { ulid as ulid3 } from "ulid";
-import { existsSync as existsSync29 } from "fs";
+import { ulid as ulid2 } from "ulid";
+import { existsSync as existsSync28 } from "fs";
 var HEARTBEAT_ASKED_BY2 = "system:heartbeat";
 var HEARTBEAT_THRESHOLD_MS = 60 * 60 * 1e3;
 var HEARTBEAT_SCAN_INTERVAL_MS = 15 * 60 * 1e3;
@@ -10919,7 +10881,7 @@ async function emitHeartbeatAsk(cwd, sessionId, original) {
     },
     interactions: [interaction]
   };
-  const askId = ulid3();
+  const askId = ulid2();
   createAsk(cwd, sessionId, {
     askId,
     askedBy: HEARTBEAT_ASKED_BY2,
@@ -10935,43 +10897,14 @@ async function emitHeartbeatAsk(cwd, sessionId, original) {
     heartbeatAskId: askId
   });
 }
-function isModeGateStale(deck, currentMode) {
-  const source = deck.source;
-  const chain = source?.modeChain;
-  if (!chain || chain.length === 0) return false;
-  if (!currentMode) return false;
-  return !chain.some((e) => e.mode === currentMode);
-}
 async function scanSessionForStaleAsks(cwd, sessionId) {
   const now = Date.now();
-  let currentMode;
-  try {
-    const session = getSession(cwd, sessionId);
-    currentMode = session.orchestratorCycles[session.orchestratorCycles.length - 1]?.mode;
-  } catch {
-  }
   for (const askId of listAsks(cwd, sessionId)) {
     try {
       const meta = readMeta(cwd, sessionId, askId);
       if (!meta) continue;
       if (meta.status === "answered") continue;
       if (meta.orphaned) continue;
-      if (meta.modeTransition === true) {
-        const deck = readDecisions(cwd, sessionId, askId);
-        if (deck && isModeGateStale(deck, currentMode)) {
-          writeOutput(cwd, sessionId, askId, [{
-            id: "mode-transition",
-            selectedOptionId: "ack",
-            freetext: "auto-resolved: session advanced past mode-transition"
-          }]);
-          await updateMeta(cwd, sessionId, askId, {
-            status: "answered",
-            completedAt: (/* @__PURE__ */ new Date()).toISOString()
-          });
-          console.log(`[sisyphus] mode-gate auto-resolved ask ${askId} for session ${sessionId} (currentMode: ${currentMode})`);
-        }
-        continue;
-      }
       if (meta.heartbeatNotifiedAt) continue;
       if (meta.askedBy === HEARTBEAT_ASKED_BY2) continue;
       const askedAtMs = new Date(meta.askedAt).getTime();
@@ -10989,7 +10922,7 @@ async function scanSessionForStaleAsks(cwd, sessionId) {
 async function scanAllSessionsForStaleAsks() {
   const reg = loadSessionRegistry();
   for (const [sessionId, cwd] of Object.entries(reg)) {
-    if (!existsSync29(statePath(cwd, sessionId))) continue;
+    if (!existsSync28(statePath(cwd, sessionId))) continue;
     try {
       await scanSessionForStaleAsks(cwd, sessionId);
     } catch (err) {
@@ -11052,14 +10985,14 @@ var DEFAULT_STATUS_BAR_CONFIG = {
 init_tmux();
 init_status_dots();
 init_companion();
-import { readFileSync as readFileSync27, existsSync as existsSync30 } from "fs";
+import { readFileSync as readFileSync27, existsSync as existsSync29 } from "fs";
 import { homedir as homedir8 } from "os";
 import { join as join22 } from "path";
 var STATUS_BAR_BG = "#1d1e21";
 var SESSION_ORDER_PATH = join22(homedir8(), ".config", "tmux", "session-order");
 function getSessionOrder() {
   try {
-    if (!existsSync30(SESSION_ORDER_PATH)) return [];
+    if (!existsSync29(SESSION_ORDER_PATH)) return [];
     return readFileSync27(SESSION_ORDER_PATH, "utf-8").split("\n").filter(Boolean);
   } catch {
     return [];
@@ -11612,6 +11545,7 @@ function writeEmptyManifest() {
 
 // src/daemon/index.ts
 init_agent();
+init_ask_store();
 init_orphan_asks();
 init_process();
 init_orchestrator();
@@ -11623,7 +11557,7 @@ init_state();
 init_paths();
 init_version();
 import { execSync as execSync7 } from "child_process";
-import { writeFileSync as writeFileSync16, unlinkSync as unlinkSync5, lstatSync as lstatSync2 } from "fs";
+import { writeFileSync as writeFileSync16, unlinkSync as unlinkSync6, lstatSync as lstatSync2 } from "fs";
 import { resolve as resolve11 } from "path";
 import { get } from "https";
 function isNewer(latest, current) {
@@ -11700,7 +11634,7 @@ function markUpdating(version) {
 }
 function clearUpdating() {
   try {
-    unlinkSync5(daemonUpdatingPath());
+    unlinkSync6(daemonUpdatingPath());
   } catch {
   }
 }
@@ -11750,7 +11684,7 @@ function stopPeriodicUpdateCheck() {
 }
 
 // src/daemon/plugin-install.ts
-import { copyFileSync as copyFileSync6, mkdirSync as mkdirSync14, readdirSync as readdirSync13, statSync as statSync4, existsSync as existsSync31, readFileSync as readFileSync28, chmodSync as chmodSync3 } from "fs";
+import { copyFileSync as copyFileSync6, mkdirSync as mkdirSync14, readdirSync as readdirSync13, statSync as statSync4, existsSync as existsSync30, readFileSync as readFileSync28, chmodSync as chmodSync3 } from "fs";
 import { join as join23, resolve as resolve12 } from "path";
 import { homedir as homedir9 } from "os";
 var PLUGIN_NAME = "sisyphus-tmux";
@@ -11764,7 +11698,7 @@ function copyDir(src, dest) {
       copyDir(srcPath, destPath);
     } else {
       const srcMtime = statSync4(srcPath).mtimeMs;
-      const destMtime = existsSync31(destPath) ? statSync4(destPath).mtimeMs : 0;
+      const destMtime = existsSync30(destPath) ? statSync4(destPath).mtimeMs : 0;
       if (srcMtime > destMtime) {
         copyFileSync6(srcPath, destPath);
       }
@@ -11774,7 +11708,7 @@ function copyDir(src, dest) {
 function pluginNeedsUpdate(sourceDir) {
   const srcHooks = join23(sourceDir, "hooks", "hooks.json");
   const destHooks = join23(INSTALL_DIR, "hooks", "hooks.json");
-  if (!existsSync31(destHooks)) return true;
+  if (!existsSync30(destHooks)) return true;
   try {
     return readFileSync28(srcHooks, "utf-8") !== readFileSync28(destHooks, "utf-8");
   } catch {
@@ -11783,7 +11717,7 @@ function pluginNeedsUpdate(sourceDir) {
 }
 function installPlugin() {
   const sourceDir = resolve12(import.meta.dirname, "../templates/sisyphus-tmux-plugin");
-  if (!existsSync31(sourceDir)) {
+  if (!existsSync30(sourceDir)) {
     console.error(`[plugin-install] Source dir not found: ${sourceDir}`);
     return;
   }
@@ -11791,7 +11725,7 @@ function installPlugin() {
   try {
     copyDir(sourceDir, INSTALL_DIR);
     const hookScript = join23(INSTALL_DIR, "hooks", "tmux-state.sh");
-    if (existsSync31(hookScript)) {
+    if (existsSync30(hookScript)) {
       try {
         chmodSync3(hookScript, 493);
       } catch {
@@ -11847,7 +11781,7 @@ init_upload();
 init_version();
 init_state();
 init_uploader();
-import { existsSync as existsSync32, readdirSync as readdirSync14, readFileSync as readFileSync29 } from "fs";
+import { existsSync as existsSync31, readdirSync as readdirSync14, readFileSync as readFileSync29 } from "fs";
 var backfillStarted = false;
 async function backfillUploads() {
   if (backfillStarted) return;
@@ -11880,7 +11814,7 @@ async function backfillUploads() {
     let failed = 0;
     let unexportable = 0;
     for (const { sessionId, cwd } of candidates) {
-      if (!existsSync32(statePath(cwd, sessionId))) {
+      if (!existsSync31(statePath(cwd, sessionId))) {
         unexportable++;
         continue;
       }
@@ -11958,7 +11892,7 @@ function isLaunchdManaged() {
 }
 function releasePidLock() {
   try {
-    unlinkSync6(daemonPidPath());
+    unlinkSync7(daemonPidPath());
   } catch {
   }
 }
@@ -11997,7 +11931,7 @@ function stopDaemon() {
 }
 async function recoverOneSession(sessionId, cwd, tmuxIdSet, tmuxNameToId, panesByWindow) {
   const stateFile = statePath(cwd, sessionId);
-  if (!existsSync33(stateFile)) return false;
+  if (!existsSync32(stateFile)) return false;
   let session;
   try {
     session = JSON.parse(readFileSync30(stateFile, "utf-8"));
@@ -12008,6 +11942,10 @@ async function recoverOneSession(sessionId, cwd, tmuxIdSet, tmuxNameToId, panesB
   if (session.status !== "active" && session.status !== "paused") return false;
   registerSessionCwd(sessionId, cwd);
   resetAgentCounterFromState(sessionId, session.agents ?? []);
+  const clearedClaims = await clearStaleAskClaims(cwd, sessionId);
+  if (clearedClaims > 0) {
+    console.log(`[sisyphus] Cleared ${clearedClaims} stale ask claim(s) for session ${sessionId} on recovery`);
+  }
   if (!session.tmuxSessionName) return true;
   let sessionAlive = false;
   let currentTmuxId = session.tmuxSessionId;