sisyphi 1.2.18 → 1.2.20

package/dist/templates/agent-plugin/agents/review/CLAUDE.md

@@ -1,3 +1,2 @@
-- **`reuse` dismissed entries cite `existing-file:line`** (the existing utility evaluated), not `file:line` (the new code) — the validation wave parses reuse dismissals differently from all other sub-agents.
 - **No output ≠ clean**: a sub-agent that produces no output is treated as failed. The explicit clean sentence ("No X concerns — ...") is the signal the validation wave uses to skip spawning a validator.
 - **Adding a sub-agent**: create `{name}.md` with frontmatter, add `subagent_type: {name}` to the scaling table in `review.md` step 4, and update the scaling guidance table if conditionally spawned — without the registration, the sub-agent is silently never spawned.

package/dist/templates/agent-plugin/agents/spec.md

@@ -77,7 +77,7 @@ Run this pass on **every startup**, **before** entering resume logic.
 
 ### 1. Explore
 
-Use Bash + Glob + Grep + Read to explore the codebase relevant to the user's stated topic. Identify files, modules, and existing patterns that will be affected.
+Use Bash + Glob + Grep + Read + the Agent tool to explore the codebase relevant to the user's stated topic. Identify files, modules, and existing patterns that will be affected.
 
 ### 2. Gauge Clarity
 
@@ -227,7 +227,7 @@ Dispatch a single `requirements-writer` subagent for the entire design (see "Sub
 
 Validate the chunk (parseable JSON + `groups` array where each group has `id` and `requirements`). If invalid, increment N and re-dispatch; if it fails twice, bail.
 
-**Snapshot prior approvals before merging.** If `context/requirements.json` already exists (this is a re-dispatch — §5.1 bounce-return or §5.2 writer-redispatch), read its current `groups[].requirements[]` and `groups[].safeAssumptions[]` and build an in-memory **approval map**: for every item where `status === 'approved'` AND `userNotes` is empty/absent, record `contentKey(item) → true`. The content key is the SHA-256 of the canonical-JSON `{title, ears}` after normalizing every string with `trim()` + collapse runs of whitespace to a single space. Items with `status: 'draft'`/`'rejected'` or non-empty `userNotes` are NOT added — the re-dispatch was triggered by their unresolved state, and the writer is meant to revisit them.
+**Snapshot prior approvals before merging.** If `context/requirements.json` already exists (this is a re-dispatch — §5.1 bounce-return or §5.2 fresh-writer escalation; the §5.2 lead-patch path never reaches here), read its current `groups[].requirements[]` and `groups[].safeAssumptions[]` and build an in-memory **approval map**: for every item where `status === 'approved'` AND `userNotes` is empty/absent, record `contentKey(item) → true`. The content key is the SHA-256 of the canonical-JSON `{title, ears}` after normalizing every string with `trim()` + collapse runs of whitespace to a single space. Items with `status: 'draft'`/`'rejected'` or non-empty `userNotes` are NOT added — the re-dispatch was triggered by their unresolved state, and the writer is meant to revisit them.
 
 **Merge.** Replace `groups` entirely with the new chunk; preserve `meta`. Set `meta.stage = 'stage-2-in-progress'`. Then walk the new `groups[].requirements[]` and `groups[].safeAssumptions[]`: for each item, compute its content key; if the approval map contains it, set `status = 'approved'` and clear `userNotes`. Otherwise leave whatever the writer emitted untouched. Delete the chunk file.
 
@@ -283,22 +283,33 @@ With `meta.stage === 'stage-2-verdict-pending'`:
 
 1. All requirements (incl. safeAssumptions) `status === 'approved'` → atomic-write `meta.stage = 'stage-2-done'`; proceed to Stage 3.
 2. Any `status === 'rejected'` → §5.1 bounce-to-design.
-3. Else (some `draft` with non-empty `userNotes`, no `rejected`) → §5.2 writer re-dispatch.
+3. Else (some `draft` with non-empty `userNotes`, no `rejected`) → §5.2 comment resolution.
 
 ### §5.1 Bounce-to-design
 
 Increment `meta.bounceIterations` (init 0 if absent; **never decrements**). If new value > 3, bail. Quote rejected items + `userNotes` to user. Dispatch engineer in revision mode (Stage 1 revision contract) with rejected items as feedback. After engineer returns, run `crtr human show` to display the revised design; re-sign-off. Re-render to text via `hl doc render`. Atomic-write `meta.stage = 'stage-2-in-progress'`. Return to Step 2. REQ ids may shift — each pass is independent. User comments flow to the engineer; the writer re-extracts from the revised design.
 
-### §5.2 Writer re-dispatch
+### §5.2 Comment resolution
 
-Increment `meta.writerRedispatchIterations` (init 0 if absent; **never decrements**). If new value > 3, bail: `"Stage 2 writer-redispatch cap reached after 3 passes. Latest comments preserved in requirements.json. Re-spawn spec fresh or escalate."` Atomic-write `meta.stage = 'writer-redispatch-pending'` BEFORE re-dispatching. Tell user: `"Draft comments noted but the writer re-extracts from design — re-flag any items it missed on the next pass."` After writer chunk merge (which resets `meta.stage = 'stage-2-in-progress'`), return to Step 3.
+The design is unchanged here — design-level objections route through bounce-to-design (§5.1, where the user picked "Bounce"). What remains is `draft` items carrying `userNotes`. **Resolve them in place by default; escalate to a fresh writer only when the comments demand broad re-extraction.** Patching in place is what keeps already-approved items from being reworded and re-asked: the writer regenerates the whole document and its wording drifts, so re-dispatching it for a localized tweak forces the human to re-approve everything.
+
+**Triage the commented items.** Classify every `draft`-with-`userNotes` item:
+
+- **Localized** — satisfiable by editing that requirement's own fields: reword its EARS clause, fix/add/remove a criterion, tighten or split its scope, correct a detail, clarify wording.
+- **Broad** — implies behavior not captured anywhere (a coverage gap / a missing requirement), a regrouping or restructure across the document, or otherwise can't be met by editing the named items alone. (If a comment reveals the *design* is wrong rather than the requirement text, that is a bounce — tell the user and route to §5.1.)
+
+**All comments localized → lead patch (no writer).** Edit each commented requirement in place to satisfy its `userNotes`. Hold the same bar as the writer (`agents/spec/requirements-writer.md`): keep the EARS shape valid (exactly one of `when`/`while`/`if`/`where` plus `shall`) and behavioral, not technical — verbs an external observer sees; no function names, file paths, or algorithms. Stay within the approved design; do not invent behavior it doesn't support. For each patched item: apply the edit, record a one-line rationale in `agentNotes` (e.g. `Revised per review: <what changed>`), clear `userNotes`, and set `status = 'draft'`. **Leave every `approved` item byte-for-byte untouched** — do not run the Step 2 snapshot/merge; that path is for the writer only. Atomic-write `requirements.json` with `meta.stage = 'stage-2-in-progress'` and return to Step 3. Only the patched items reappear as fresh decisions; approved items keep their `status` and surface with the `preAnswered` ◆ marker. Tell the user: `"Revised the N commented requirement(s) in place — only those are back for review; previously-approved items carry forward (◆)."`
+
+**Any comment broad → fresh-writer escalation.** Increment `meta.writerRedispatchIterations` (init 0 if absent; **never decrements**). If new value > 3, bail: `"Stage 2 writer-redispatch cap reached after 3 passes. Latest comments preserved in requirements.json. Re-spawn spec fresh or escalate."` Atomic-write `meta.stage = 'writer-redispatch-pending'` BEFORE re-dispatching. Tell user: `"Comments span more than the named items — re-running the writer over the design; re-flag anything it misses on the next pass."` After the writer chunk merge (Step 2, which resets `meta.stage = 'stage-2-in-progress'`), return to Step 3.
+
+**Patch not converging.** If an item you already patched comes back with another comment, the localized edit isn't landing — escalate that round via fresh-writer (or bounce via §5.1 if the new comment points at the design) rather than patching the same item a third time.
 
 ### Step 6 — Stage-2 state-machine table
 
 | `meta.stage` | Set at | Resume action on lead respawn |
 |---|---|---|
-| `stage-2-in-progress` | Step 2 merge / §5.1 bounce-returns / §5.2 writer-merge | If `meta.openAskId` set → Resume Logic re-attach; else → Step 3 (issue review deck) |
-| `writer-redispatch-pending` | §5.2 entry | §5.2 writer re-dispatch |
+| `stage-2-in-progress` | Step 2 merge / §5.1 bounce-returns / §5.2 writer-merge / §5.2 lead patch | If `meta.openAskId` set → Resume Logic re-attach; else → Step 3 (issue review deck) |
+| `writer-redispatch-pending` | §5.2 fresh-writer escalation entry | §5.2 fresh-writer re-dispatch |
 | `stage-2-verdict-pending` | Step 4 atomic writeback | Step 5 verdict |
 | `stage-2-done` | Step 5 case 1 | Stage 3 entry |
 

package/dist/templates/agent-suffix.md

@@ -14,9 +14,17 @@ You are an agent in a sisyphus session.
 
 If you're blocked by ambiguity, contradictions, or unclear requirements — **don't guess**. Submit what you found instead. A clear report is more valuable than a wrong implementation.
 
+## The sis CLI
+
+You operate inside a sisyphus session driven by the `sis` CLI. Run `sis <group> -h` to drill into any command.
+
+{{HELP:.}}
+
 ## The User
 
-A human may interact with you directly in your pane — if they do, prioritize their input over your original instruction. Otherwise, communicate through the orchestrator via reports. 
+A human may interact with you directly in your pane — if they do, prioritize their input over your original instruction. Otherwise, communicate through the orchestrator via reports.
+
+**If the user complains about sisyphus itself** — a crash, a CLI that misbehaved, a confusing or broken workflow, behavior they disliked — file it with `sis feedback "<summary>"` (run `sis feedback -h`). Low-cost side-action; do it without asking. It's for the tool, not your task. 
 
 ## Context
 

package/dist/templates/orchestrator-base.md

@@ -101,6 +101,16 @@ goal.md is a plain statement of what "done" looks like — scope boundaries and
 **What belongs in goal.md:** the desired end state, what's in scope, what's out of scope.
 **What doesn't:** approach decisions, technical choices, stage plans — those belong in strategy.md and context docs.
 
+**Scope files keep goal.md lean.** goal.md is inlined into every wakeup and capped at 100 lines, so concrete detail about one slice of the goal does not belong inline — it taxes every cycle, including ones abstracted far away from that slice. When a part of the goal needs maintained detail (a subsystem, a workstream, a newly-authorized expansion), write `context/scope-<topic>.md` for it and add a one-line pointer under a `## Scope` list in goal.md:
+
+```
+## Scope
+- context/scope-backend.md — DB + API-layer refactors for X
+- context/scope-frontend.md — render-path cleanup for X
+```
+
+This is how scope *grows* without rewriting the goal: a mid-session "let's also do the microservices" becomes a new scope file linked from goal.md, never a condensed or deleted goal. Scope files are maintained like other context docs (current understanding, not history) and read on demand; strategy.md and roadmap.md point at the scope file a stage is focused on rather than restating it. A hook rejects any goal.md edit that leaves the file over 100 lines and tells you to offload into scope files.
+
 ### strategy.md — Your problem-solving map
 
 strategy.md defines **how to approach this problem** — the stages, gates, backtrack edges, and behavioral style for this session. It is generated during discovery and progressively updated as the goal crystallizes or shifts.
@@ -225,6 +235,7 @@ Context dir contents are listed in your prompt each cycle. Read files when you n
 - Roadmap items should **reference** context files: `"See context/{plan-lead-agent-id}/plan-stage-1-auth.md for detail."` Copy the path from the plan lead's submission report; don't reconstruct it.
 - Agents writing requirements and designs save to the context dir with descriptive filenames: `requirements-auth.md`, `design-auth.md`. Plan agents save plans under their own subdirectory `context/{agent-id}/plan-*.md`; treat those paths as authoritative from the plan lead's report.
 - **Implementation plans belong here**, not in roadmap.md
+- **Scope files** (`context/scope-<topic>.md`) hold maintained detail for one slice of the goal, linked from goal.md's `## Scope` list — see the goal.md section. You write and maintain them directly, like strategy.md.
 
 ### Session Directory
 
@@ -284,6 +295,8 @@ You have unlimited cycles. Failed implementations, deferred issues, and skipped
 
 ## CLI Reference
 
+{{HELP:.}}
+
 {{HELP:session clone}}
 
 ## File Conflicts

package/dist/templates/orchestrator-plugin/hooks/goal-length-guard.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+# PostToolUse(Write|Edit|MultiEdit) hook for the orchestrator: enforce the
+# 100-line cap on goal.md. The edit has already landed (PostToolUse runs after
+# success); if goal.md is now over the cap, emit a decision:block so the
+# orchestrator must trim it and move the detail into context/scope-*.md before
+# proceeding. Under the cap → silent passthrough.
+
+if [ -z "$SISYPHUS_SESSION_ID" ] || [ -z "$SISYPHUS_SESSION_DIR" ]; then exit 0; fi
+
+STDIN_JSON=$(cat)
+
+FP=$(printf '%s' "$STDIN_JSON" | python3 -c "
+import json, sys
+try:
+    d = json.load(sys.stdin)
+    print((d.get('tool_input') or {}).get('file_path') or '')
+except Exception:
+    pass
+" 2>/dev/null)
+
+[ -z "$FP" ] && exit 0
+
+GOAL_FILE="$SISYPHUS_SESSION_DIR/goal.md"
+
+SAME=$(python3 -c "
+import os, sys
+try:
+    print('1' if os.path.realpath(sys.argv[1]) == os.path.realpath(sys.argv[2]) else '0')
+except Exception:
+    print('0')
+" "$FP" "$GOAL_FILE" 2>/dev/null)
+
+[ "$SAME" = "1" ] || exit 0
+[ -f "$GOAL_FILE" ] || exit 0
+
+LINES=$(python3 -c "
+import sys
+try:
+    with open(sys.argv[1], encoding='utf-8') as f:
+        print(sum(1 for _ in f))
+except Exception:
+    print(0)
+" "$GOAL_FILE" 2>/dev/null)
+
+[ -z "$LINES" ] && exit 0
+if [ "$LINES" -le 100 ]; then exit 0; fi
+
+REASON=$(cat <<TXT
+goal.md is now ${LINES} lines — over the 100-line cap. Trim it back to the north-star paragraph plus a "## Scope" reference list before continuing.
+
+Move the detail you just added into context/scope-<topic>.md (the maintained home for one slice of the goal) and leave only a one-line pointer in goal.md:
+  - context/scope-<topic>.md — one-line description
+
+Why the cap: goal.md is inlined into every orchestrator wakeup, so length here taxes every future cycle, even ones working far from this detail. Scope files are read on demand and can be referenced from strategy.md / roadmap.md. Restructure the over-cap detail into scope files rather than deleting still-relevant scope to fit.
+TXT
+)
+
+ESCAPED=$(printf '%s' "$REASON" | python3 -c "import json,sys; print(json.dumps(sys.stdin.read()))")
+echo "{\"decision\":\"block\",\"reason\":$ESCAPED,\"hookSpecificOutput\":{\"hookEventName\":\"PostToolUse\"}}"
+exit 0

package/dist/templates/orchestrator-plugin/hooks/goal-read-advisory.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+# PostToolUse(Read) hook for the orchestrator: when the orchestrator reads
+# goal.md, surface the scope-file convention. goal.md is inlined into every
+# wakeup, so the orchestrator only Reads it when it intends to edit — that's
+# the moment to remind it to push concrete detail into context/scope-*.md
+# rather than into the goal. Neutral guidance (additionalContext), not a block.
+
+if [ -z "$SISYPHUS_SESSION_ID" ] || [ -z "$SISYPHUS_SESSION_DIR" ]; then exit 0; fi
+
+STDIN_JSON=$(cat)
+
+FP=$(printf '%s' "$STDIN_JSON" | python3 -c "
+import json, sys
+try:
+    d = json.load(sys.stdin)
+    print((d.get('tool_input') or {}).get('file_path') or '')
+except Exception:
+    pass
+" 2>/dev/null)
+
+[ -z "$FP" ] && exit 0
+
+GOAL_FILE="$SISYPHUS_SESSION_DIR/goal.md"
+
+# Only fire for the session's own goal.md (compare resolved paths).
+SAME=$(python3 -c "
+import os, sys
+try:
+    print('1' if os.path.realpath(sys.argv[1]) == os.path.realpath(sys.argv[2]) else '0')
+except Exception:
+    print('0')
+" "$FP" "$GOAL_FILE" 2>/dev/null)
+
+[ "$SAME" = "1" ] || exit 0
+
+ADVISORY=$(cat <<'TXT'
+Editing goal.md? Keep it to the north-star paragraph plus a `## Scope` list of references — nothing more. Put any concrete detail about one slice of the goal (a subsystem, a workstream, a newly-authorized expansion) in `context/scope-<topic>.md`, and link it from goal.md with a one-liner:
+  - context/scope-backend.md — DB + API-layer refactors for X
+  - context/scope-frontend.md — render-path cleanup for X
+
+Why: goal.md is inlined into every orchestrator wakeup and capped at 100 lines, so per-slice detail here taxes every future cycle — even ones working far from that slice. Routing detail into scope files lets scope grow without rewriting the goal: a mid-session "let's also do the microservices" becomes a new scope file linked from goal.md, never a condensed or deleted goal. Maintain scope files like other context docs (current understanding, not history); they are read on demand, and strategy.md/roadmap.md point at whichever scope a stage is focused on.
+TXT
+)
+
+printf '%s' "$ADVISORY" | python3 -c "
+import json, sys
+print(json.dumps({
+  'hookSpecificOutput': {
+    'hookEventName': 'PostToolUse',
+    'additionalContext': sys.stdin.read(),
+  }
+}))
+"
+exit 0

package/dist/templates/orchestrator-plugin/hooks/hooks.json

@@ -9,6 +9,26 @@
           }
         ]
       }
+    ],
+    "PostToolUse": [
+      {
+        "matcher": "Read",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash ${CLAUDE_PLUGIN_ROOT}/hooks/goal-read-advisory.sh"
+          }
+        ]
+      },
+      {
+        "matcher": "Write|Edit|MultiEdit",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash ${CLAUDE_PLUGIN_ROOT}/hooks/goal-length-guard.sh"
+          }
+        ]
+      }
     ]
   }
 }

package/dist/tui.js

@@ -55,6 +55,11 @@ function setupTerminal() {
     console.error(err);
     process.exit(1);
   });
+  process.on("unhandledRejection", (reason) => {
+    cleanup2();
+    console.error(reason);
+    process.exit(1);
+  });
   return cleanup2;
 }
 function writeToStdout(data) {
@@ -309,7 +314,7 @@ var init_paths = __esm({
 });
 
 // src/shared/platform.ts
-import { execSync } from "child_process";
+import { execFileSync, execSync } from "child_process";
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
 function detectPlatform() {
   if (cachedPlatform) return cachedPlatform;
@@ -892,7 +897,7 @@ var init_notify = __esm({
 });
 
 // src/daemon/ask-store.ts
-import { existsSync as existsSync9, mkdirSync as mkdirSync8, readFileSync as readFileSync13, readdirSync as readdirSync6 } from "fs";
+import { existsSync as existsSync9, mkdirSync as mkdirSync8, readFileSync as readFileSync13, readdirSync as readdirSync6, unlinkSync } from "fs";
 import { basename as basename3 } from "path";
 function readDecisions(cwd2, sessionId2, askId2) {
   const p = askDecisionsPath(cwd2, sessionId2, askId2);
@@ -1200,7 +1205,6 @@ function createAppState(cwd2) {
   const strategyScroll = new ThrottledScroll(requestRender);
   const roadmapScroll = new ThrottledScroll(requestRender);
   const expanded = /* @__PURE__ */ new Set();
-  expanded.add("section:needs-you");
   expanded.add("section:running");
   return {
     rows,
@@ -1261,6 +1265,8 @@ function createAppState(cwd2) {
     inlineDeck: null,
     visuals: /* @__PURE__ */ new Map(),
     reviewPanel: null,
+    pendingFocus: null,
+    inlineDeckStartAskId: null,
     cwd: cwd2
   };
 }
@@ -1471,7 +1477,7 @@ async function exportSessionToZip(sessionId2, cwd2, options) {
 
 // src/shared/clipboard.ts
 init_platform();
-import { execFileSync, spawnSync } from "child_process";
+import { execFileSync as execFileSync2, spawnSync } from "child_process";
 function detectClipboard() {
   const platform = detectPlatform();
   if (platform === "darwin") {
@@ -1535,7 +1541,7 @@ function copyToClipboard(text) {
     return { reason: c.hint === null ? "No clipboard backend available" : c.hint };
   }
   try {
-    execFileSync(c.copy.cmd, c.copy.args, { input: text, stdio: ["pipe", "ignore", "pipe"] });
+    execFileSync2(c.copy.cmd, c.copy.args, { input: text, stdio: ["pipe", "ignore", "pipe"] });
     return null;
   } catch (err) {
     const msg = err instanceof Error ? err.message.split("\n")[0] : String(err);
@@ -1865,28 +1871,12 @@ function sessionSortKey(s) {
 }
 function buildTree(sessions, selectedSession, expanded, cwd2, polledContextFiles = [], aggregateInbox = []) {
   const nodes = [];
-  const inboxBySession = /* @__PURE__ */ new Map();
-  for (const item of aggregateInbox) {
-    const sessionId2 = sessionIdFromDir(item.dir);
-    const arr = inboxBySession.get(sessionId2) ?? [];
-    arr.push(item);
-    inboxBySession.set(sessionId2, arr);
-  }
-  const needsYou = [];
   const running = [];
   const done = [];
   for (const s of sessions) {
-    if (inboxBySession.has(s.id)) needsYou.push(s);
-    else if (s.status === "completed") done.push(s);
+    if (s.status === "completed") done.push(s);
     else running.push(s);
   }
-  needsYou.sort((a, b) => {
-    const aItems = inboxBySession.get(a.id);
-    const bItems = inboxBySession.get(b.id);
-    const aOldest = Math.min(...aItems.map((i) => Date.parse(i.blockedSince)));
-    const bOldest = Math.min(...bItems.map((i) => Date.parse(i.blockedSince)));
-    return aOldest - bOldest;
-  });
   running.sort((a, b) => {
     const k = sessionSortKey(a) - sessionSortKey(b);
     if (k !== 0) return k;
@@ -2039,7 +2029,7 @@ function buildTree(sessions, selectedSession, expanded, cwd2, polledContextFiles
       }
     }
   }
-  function emitSessionRow(s, askCount) {
+  function emitSessionRow(s) {
     const sessionNodeId = `session:${s.id}`;
     const isSelected = selectedSession?.id === s.id;
     const isExpanded = expanded.has(sessionNodeId);
@@ -2059,38 +2049,31 @@ function buildTree(sessions, selectedSession, expanded, cwd2, polledContextFiles
       createdAt: s.createdAt,
       completedAt: isSelected ? selectedSession?.completedAt : void 0,
       activeMs: isSelected ? selectedSession?.activeMs ?? s.activeMs : s.activeMs,
-      askCount: askCount > 0 ? askCount : void 0,
       orphaned: s.orphaned ?? false
     });
     if (isExpanded && isSelected) {
       emitSessionChildren(s);
     }
   }
-  emitSection("needs-you", needsYou.length);
-  if (sectionExpanded("needs-you")) {
-    nodes.push({
-      id: "needs-you-virtual",
-      type: "needs-you-virtual",
-      depth: 1,
-      expandable: false,
-      expanded: false,
-      sessionId: "",
-      pendingCount: aggregateInbox.length
-    });
-    for (const s of needsYou) {
-      emitSessionRow(s, inboxBySession.get(s.id)?.length ?? 0);
-    }
-  }
+  nodes.push({
+    id: "needs-you-virtual",
+    type: "needs-you-virtual",
+    depth: 0,
+    expandable: false,
+    expanded: false,
+    sessionId: "",
+    pendingCount: aggregateInbox.length
+  });
   emitSection("running", running.length);
   if (sectionExpanded("running")) {
     for (const s of running) {
-      emitSessionRow(s, 0);
+      emitSessionRow(s);
     }
   }
   emitSection("done", done.length);
   if (sectionExpanded("done")) {
     for (const s of done) {
-      emitSessionRow(s, 0);
+      emitSessionRow(s);
     }
   }
   return nodes;
@@ -4909,8 +4892,8 @@ function handleInlineDeckKey(input, key, state2, actions) {
     handle.unmount();
     const nodes = actions.getNodes();
     const i = nodes.findIndex((n) => n.id === "needs-you-virtual");
-    const prev = i > 0 ? nodes[i - 1] : nodes.find((n) => n.type === "session") ?? nodes[0];
-    state2.cursorNodeId = prev?.id ?? null;
+    const next = nodes.find((n) => n.type === "session") ?? nodes[i + 1] ?? nodes[0];
+    state2.cursorNodeId = next?.id ?? null;
     state2.focusPane = "tree";
     requestRender();
     return;
@@ -5530,11 +5513,16 @@ function rawSend(request, timeoutMs = 1e4) {
 function send(request) {
   return rawSend(request, 8e3);
 }
-async function inboxList() {
-  const res = await send({ type: "inbox-list" });
+async function inboxList(cwd2) {
+  const res = await send({ type: "inbox-list", cwd: cwd2 });
   if (!res.ok) return [];
   return res.data?.items ?? [];
 }
+async function focusGet(cwd2) {
+  const res = await send({ type: "focus-get", cwd: cwd2 });
+  if (!res.ok) return null;
+  return res.data?.focus ?? null;
+}
 
 // src/tui/lib/tmux.ts
 init_paths();
@@ -5845,15 +5833,6 @@ function renderNodeContent(node, maxWidth) {
   switch (node.type) {
     case "section": {
       switch (node.section) {
-        case "needs-you":
-          return {
-            icon: "",
-            label: "Needs You",
-            meta: node.count > 0 ? `${node.count}` : "",
-            color: node.count > 0 ? "red" : "gray",
-            dim: false,
-            metaColor: "red"
-          };
         case "running":
           return {
             icon: "",
@@ -5891,15 +5870,13 @@ function renderNodeContent(node, maxWidth) {
       const cyclePart = node.cycleCount > 0 ? `C${node.cycleCount}` : "";
       const dur = formatDuration(node.activeMs);
       const agopart = node.status === "completed" && node.completedAt ? formatTimeAgo(node.completedAt) : "";
-      const askBadge = node.askCount ? `!${node.askCount}` : "";
-      const meta = [askBadge, cyclePart, dur, agopart].filter(Boolean).join(" ");
-      const metaColor = node.askCount ? "red" : void 0;
+      const meta = [cyclePart, dur, agopart].filter(Boolean).join(" ");
       const suffix = node.orphaned ? "\u26A0 orphan" : void 0;
       const suffixColor = node.orphaned ? "red" : void 0;
       const displayText = node.name ?? node.task;
       const suffixWidth = suffix ? suffix.length + 1 : 0;
       const maxLabel = Math.max(8, maxWidth - meta.length - 4 - suffixWidth);
-      return { icon, label: truncate(displayText, maxLabel), meta, color, dim: dim2, metaColor, suffix, suffixColor };
+      return { icon, label: truncate(displayText, maxLabel), meta, color, dim: dim2, suffix, suffixColor };
     }
     case "cycle": {
       const isRunning = !node.completedAt;
@@ -7341,7 +7318,7 @@ function renderFleetRollup(rect, state2, focused) {
     }
     const uniqueSessions = new Set(items.map((i) => sessionIdFromDir(i.dir))).size;
     lines = [];
-    lines.push([seg("  Fleet Inbox", { color: "red", bold: true })]);
+    lines.push([seg("  Inbox", { color: "red", bold: true })]);
     lines.push(singleLine(`    ${items.length} pending across ${uniqueSessions} sessions`, { dim: true }));
     lines.push(singleLine(" "));
     lines.push([seg("  By Type", { color: "cyan", bold: true })]);
@@ -8312,9 +8289,20 @@ function mountResolutionPanel(opts, state2) {
     };
     return deck;
   }
+  function firstBuildableFrom(start) {
+    if (queue.length === 0) return null;
+    for (let off = 0; off < queue.length; off++) {
+      const idx = (start + off) % queue.length;
+      const deck = buildDeck(idx);
+      if (deck) return { idx, deck };
+    }
+    return null;
+  }
+  const initial = firstBuildableFrom(currentIndex);
+  if (!initial) return null;
+  currentIndex = initial.idx;
+  const initialDeck = initial.deck;
   const { cwd: initCwd, sessionId: initSessionId, askId: initAskId } = itemCoords(item());
-  const initialDeck = buildDeck(currentIndex);
-  if (!initialDeck) return null;
   let currentDeck = initialDeck;
   const initialProgress = readProgress(initCwd, initSessionId, initAskId);
   let answeredCount = initialProgress?.responses.length ?? 0;
@@ -8375,14 +8363,14 @@ function mountResolutionPanel(opts, state2) {
         teardown();
         return;
       }
-      currentIndex = Math.min(currentIndex, queue.length - 1);
-      const nextItem = queue[currentIndex];
-      const nextCoords = itemCoords(nextItem);
-      const nextDeck = buildDeck(currentIndex);
-      if (!nextDeck) {
+      const next = firstBuildableFrom(Math.min(currentIndex, queue.length - 1));
+      if (!next) {
         teardown();
         return;
       }
+      currentIndex = next.idx;
+      const nextDeck = next.deck;
+      const nextCoords = itemCoords(queue[currentIndex]);
       currentDeck = nextDeck;
       const nextProgress = readProgress(nextCoords.cwd, nextCoords.sessionId, nextCoords.askId);
       answeredCount = nextProgress?.responses.length ?? 0;
@@ -8393,7 +8381,10 @@ function mountResolutionPanel(opts, state2) {
       });
       setDeckWatch(nextCoords, nextDeck);
       requestRender();
-    })();
+    })().catch((err) => {
+      notify(state2, `Failed to submit answer: ${err instanceof Error ? err.message : String(err)}`);
+      requestRender();
+    });
   };
   let watchedDeckPath = null;
   let lastWatchedDeckJson = "";
@@ -8437,7 +8428,8 @@ function mountResolutionPanel(opts, state2) {
       const { cwd: cwd2, sessionId: sessionId2, askId: askId2 } = itemCoords(it);
       const cur = readMeta(cwd2, sessionId2, askId2);
       if (cur?.status === "pending") {
-        void updateMeta(cwd2, sessionId2, askId2, { status: "in-progress", startedAt: (/* @__PURE__ */ new Date()).toISOString() });
+        void updateMeta(cwd2, sessionId2, askId2, { status: "in-progress", startedAt: (/* @__PURE__ */ new Date()).toISOString() }).catch(() => {
+        });
       }
     },
     onComplete: (responses) => {
@@ -8617,22 +8609,23 @@ function mountReviewActionPanel(opts) {
 // src/tui/panels/inbox-deck.ts
 var lastMountDims = null;
 function mountInlineDeck(state2, cols, rows) {
+  const deckQueue = state2.aggregateInbox.filter((i) => i.kind !== "review");
+  let startIndex = 0;
+  if (state2.inlineDeckStartAskId) {
+    const idx = deckQueue.findIndex((i) => askIdFromDir(i.dir) === state2.inlineDeckStartAskId);
+    if (idx >= 0) startIndex = idx;
+    state2.inlineDeckStartAskId = null;
+  }
   return mountResolutionPanel(
     {
-      // Reviews are surfaced by the review-action panel, not the deck resolver —
-      // they have no deck.json, so buildDeck() returns null and the resolver
-      // would tear the whole inbox surface down the moment it advanced onto one.
-      // Excluding them keeps the resolver to deck-backed asks; once those drain
-      // it tears down and renderInboxDeckRows re-dispatches the now-front review.
-      aggregateInbox: state2.aggregateInbox.filter((i) => i.kind !== "review"),
-      startIndex: 0,
+      aggregateInbox: deckQueue,
+      startIndex,
       cols,
       rows,
       daemonSend: send,
       onUnmount: () => {
         state2.inlineDeck = null;
         state2.visuals.clear();
-        state2.focusPane = "tree";
         requestRender();
       },
       onOrphanTakeover: makeOrphanTakeover(state2, {
@@ -8962,13 +8955,19 @@ function startApp(state2, cleanup2) {
       let contextFiles = [];
       const listPromise = send({ type: "list", cwd: state2.cwd });
       const statusPromise = state2.selectedSessionId ? send({ type: "status", sessionId: state2.selectedSessionId, cwd: state2.cwd }) : null;
-      const inboxPromise = inboxList();
-      const [listRes, statusRes, aggregateInbox] = await Promise.all([
+      const inboxPromise = inboxList(state2.cwd);
+      const focusPromise = focusGet(state2.cwd);
+      const [listRes, statusRes, aggregateInbox, focusReq] = await Promise.all([
         listPromise,
         statusPromise ?? Promise.resolve(null),
-        inboxPromise
+        inboxPromise,
+        focusPromise
       ]);
       state2.aggregateInbox = aggregateInbox;
+      if (focusReq !== null && !state2.resolutionActive) {
+        state2.pendingFocus = { sessionId: focusReq.sessionId, askId: focusReq.askId, attempts: 0 };
+        state2.searchFilter = null;
+      }
       const sessions = listRes.ok ? listRes.data?.sessions ?? [] : [];
       if (!state2.resolutionActive) {
         const aliveWindows = listAllWindowIds();
@@ -9169,6 +9168,10 @@ function startApp(state2, cleanup2) {
       const q = state2.searchFilter.toLowerCase();
       return s.task.toLowerCase().includes(q) || s.id.toLowerCase().includes(q);
     }) : state2.sessions;
+    if (state2.pendingFocus) {
+      state2.expanded.add("section:running");
+      state2.expanded.add("section:done");
+    }
     const statusFP = filteredSessions.map((s) => `${s.status}:${s.windowAlive}:${s.runningAgentCount}:${s.orphaned ?? false}`).join(",");
     const inboxFP = `${state2.aggregateInbox.length}:${state2.aggregateInbox.map((i) => askIdFromDir(i.dir)).join(",")}`;
     const cacheKey = `${state2.expanded.size}:${filteredSessions.length}:${state2.selectedSession?.id}:${state2.contextFiles.length}:${state2.searchFilter}:${statusFP}:${inboxFP}`;
@@ -9195,6 +9198,22 @@ function startApp(state2, cleanup2) {
     const onNeedsYou = cursorNode?.type === "needs-you-virtual";
     if (prevCursorOnNeedsYou && !onNeedsYou && state2.inlineDeck) state2.inlineDeck.unmount();
     prevCursorOnNeedsYou = onNeedsYou;
+    if (state2.pendingFocus) {
+      const { askId: askId2 } = state2.pendingFocus;
+      const askPresent = state2.aggregateInbox.some((i) => askIdFromDir(i.dir) === askId2);
+      const nyIdx = nodes.findIndex((n) => n.type === "needs-you-virtual");
+      if (askPresent && nyIdx >= 0) {
+        state2.cursorIndex = nyIdx;
+        state2.cursorNodeId = nodes[nyIdx].id;
+        state2.inlineDeckStartAskId = askId2;
+        state2.focusPane = "detail";
+        state2.pendingFocus = null;
+        requestRender();
+      } else {
+        state2.pendingFocus.attempts++;
+        if (state2.pendingFocus.attempts > 25) state2.pendingFocus = null;
+      }
+    }
     const rawSessionId = cursorNode?.sessionId;
     const newSessionId = rawSessionId ? rawSessionId : null;
     if (newSessionId !== state2.selectedSessionId) {