@sideboard-ai/core 0.1.307 → 0.1.309

package/dist/agents/cursor-runner.cjs

@@ -638,6 +638,33 @@ var CURSOR_STREAM_CUTOFF = /nghttp2|premature close|\[unavailable\]\s+error\b|ht
 function looksLikeCursorStreamCutOff(text) {
   return CURSOR_STREAM_CUTOFF.test(text.trim());
 }
+function cursorModelDisplayName(model) {
+  const raw = (model ?? "").trim();
+  if (!raw || /^(auto|default)$/i.test(raw)) return "";
+  if (/^grok-/i.test(raw)) return raw.replace(/^grok-/i, "Grok ");
+  return raw;
+}
+function formatCursorStreamIdleAfterToolsError(model) {
+  const label = cursorModelDisplayName(model);
+  return label ? `Cursor stopped responding after a tool call (${label})` : "Cursor stopped responding after a tool call";
+}
+function createCursorStreamToolProgress() {
+  return { completedTool: false, assistantAfterTool: false };
+}
+function noteCursorAgentEvent(state, event) {
+  if (event.type === "tool_result" && event.partial !== true) {
+    state.completedTool = true;
+    state.assistantAfterTool = false;
+    return;
+  }
+  if (event.type === "stdout" && !event.parentId) {
+    const text = typeof event.data === "string" ? event.data.trim() : "";
+    if (state.completedTool && text) state.assistantAfterTool = true;
+  }
+}
+function isCursorIdleAfterCompletedTool(state) {
+  return state.completedTool && !state.assistantAfterTool;
+}
 
 // src/agents/error-detail.ts
 function formatUnknownDetail(err) {
@@ -2081,25 +2108,29 @@ async function main() {
     } catch {
     }
     let lastUsageRunId;
+    const toolProgress = createCursorStreamToolProgress();
     const run2 = await sendPrompt(agent, prompt, {
       onDelta: ({ update }) => {
         bump();
         for (const event of cursorDeltaToEvents(update)) {
+          noteCursorAgentEvent(toolProgress, event);
           stream.push(event);
         }
       }
     });
     liveRun = run2;
     let streamIdle = false;
+    let streamIdleAfterTools = false;
     try {
       for await (const msg of iterateUntilIdle(
         run2.stream(),
         CURSOR_STREAM_IDLE_MS,
         () => {
           streamIdle = true;
+          streamIdleAfterTools = isCursorIdleAfterCompletedTool(toolProgress);
           emit({
             type: "stderr",
-            data: "Cursor stream idle \u2014 finishing the turn (SDK stream did not close)"
+            data: streamIdleAfterTools ? `Cursor run failed: ${formatCursorStreamIdleAfterToolsError(req.model)}` : "Cursor stream idle \u2014 finishing the turn (SDK stream did not close)"
           });
           void cancelLiveRun();
         },
@@ -2111,6 +2142,7 @@ async function main() {
           lastUsageRunId = sdkMsg.run_id.trim();
         }
         for (const event of cursorSdkMessageToEvents(msg)) {
+          noteCursorAgentEvent(toolProgress, event);
           stream.push(event);
         }
       }
@@ -2121,6 +2153,9 @@ async function main() {
           setTimeout(() => resolve2({ status: "cancelled" }), 5e3);
         })
       ]) : await run2.wait();
+      if (streamIdleAfterTools) {
+        return 2;
+      }
       if (result.status === "error") {
         const detail = formatUnknownDetail(result.error);
         if (isAgentBusyError(detail)) {

package/dist/agents/cursor-runner.js

@@ -5,7 +5,7 @@ import {
   guardCursorCustomTool,
   shouldReturnRunErrorToAgent,
   sideboardCursorRpcTools
-} from "../chunk-YJBUYGPN.js";
+} from "../chunk-NCHOTN3C.js";
 import {
   createAgentStreamCoalescer
 } from "../chunk-AXQ4ZWHK.js";
@@ -20,12 +20,16 @@ import {
   fetchCursorTurnCostUsd,
   importCursorSdk,
   resolveCursorSdkRoot
-} from "../chunk-MMVMQ34G.js";
+} from "../chunk-UA3YKQ3D.js";
 import {
   TOOL_RESULT_STORE_MAX_CHARS,
+  createCursorStreamToolProgress,
+  formatCursorStreamIdleAfterToolsError,
   formatUnknownDetail,
-  looksLikeCursorStreamCutOff
-} from "../chunk-HO5R3ZRH.js";
+  isCursorIdleAfterCompletedTool,
+  looksLikeCursorStreamCutOff,
+  noteCursorAgentEvent
+} from "../chunk-5XNT6BCG.js";
 import "../chunk-6K64FJDD.js";
 import {
   cursorSdkStoreDir
@@ -829,25 +833,29 @@ async function main() {
     } catch {
     }
     let lastUsageRunId;
+    const toolProgress = createCursorStreamToolProgress();
     const run = await sendPrompt(agent, prompt, {
       onDelta: ({ update }) => {
         bump();
         for (const event of cursorDeltaToEvents(update)) {
+          noteCursorAgentEvent(toolProgress, event);
           stream.push(event);
         }
       }
     });
     liveRun = run;
     let streamIdle = false;
+    let streamIdleAfterTools = false;
     try {
       for await (const msg of iterateUntilIdle(
         run.stream(),
         CURSOR_STREAM_IDLE_MS,
         () => {
           streamIdle = true;
+          streamIdleAfterTools = isCursorIdleAfterCompletedTool(toolProgress);
           emit({
             type: "stderr",
-            data: "Cursor stream idle \u2014 finishing the turn (SDK stream did not close)"
+            data: streamIdleAfterTools ? `Cursor run failed: ${formatCursorStreamIdleAfterToolsError(req.model)}` : "Cursor stream idle \u2014 finishing the turn (SDK stream did not close)"
           });
           void cancelLiveRun();
         },
@@ -859,6 +867,7 @@ async function main() {
           lastUsageRunId = sdkMsg.run_id.trim();
         }
         for (const event of cursorSdkMessageToEvents(msg)) {
+          noteCursorAgentEvent(toolProgress, event);
           stream.push(event);
         }
       }
@@ -869,6 +878,9 @@ async function main() {
           setTimeout(() => resolve2({ status: "cancelled" }), 5e3);
         })
       ]) : await run.wait();
+      if (streamIdleAfterTools) {
+        return 2;
+      }
       if (result.status === "error") {
         const detail = formatUnknownDetail(result.error);
         if (isAgentBusyError(detail)) {

package/dist/{agents-IWNQOQOU.js → agents-DG2UPJ6N.js}

@@ -37,9 +37,9 @@ import {
   planModeTurnInstruction,
   resolveCursorModelId,
   resolveQuotaFallbackAgent
-} from "./chunk-G2L3CR3A.js";
+} from "./chunk-FMSLOWKR.js";
 import "./chunk-VEVFHO6K.js";
-import "./chunk-F36QRDM4.js";
+import "./chunk-7Q327QF2.js";
 import {
   getAgentSetupInfo,
   installAgent,
@@ -67,8 +67,8 @@ import {
   preferredCursorCostCents,
   resolveCursorSdkRoot,
   turnCostUsdFromCursorUsage
-} from "./chunk-MMVMQ34G.js";
-import "./chunk-HO5R3ZRH.js";
+} from "./chunk-UA3YKQ3D.js";
+import "./chunk-5XNT6BCG.js";
 import "./chunk-6K64FJDD.js";
 import "./chunk-LG6RJBIY.js";
 import {

package/dist/{agents-PGU5WVSO.js → agents-LK6JGQRF.js}

@@ -46,7 +46,7 @@ import {
   resolveCursorSdkRoot,
   resolveQuotaFallbackAgent,
   turnCostUsdFromCursorUsage
-} from "./chunk-EZYZGDWU.js";
+} from "./chunk-VXI7FFGO.js";
 import {
   getAgentSetupInfo,
   installAgent,
@@ -62,7 +62,7 @@ import {
 import "./chunk-42JGPPVS.js";
 import "./chunk-PXMLMBMI.js";
 import "./chunk-2GPQZZLY.js";
-import "./chunk-5XQ43YZU.js";
+import "./chunk-I5TESHDN.js";
 import "./chunk-X3FSWWW2.js";
 import "./chunk-DLGGLV2M.js";
 import "./chunk-N2WW62LF.js";

package/dist/{chunk-HO5R3ZRH.js → chunk-5XNT6BCG.js}

@@ -1,9 +1,16 @@
 // src/agents/cursor-stream-cutoff.ts
 var CURSOR_STREAM_CUTOFF = /nghttp2|premature close|\[unavailable\]\s+error\b|http\/2 stream closed|\bcancel \(0x8\)|error code cancel\b/i;
+var CURSOR_STREAM_IDLE_AFTER_TOOLS = /stopped responding after a tool call/i;
 var CURSOR_STREAM_CUTOFF_CONTINUE_LIMIT = 3;
 function looksLikeCursorStreamCutOff(text) {
   return CURSOR_STREAM_CUTOFF.test(text.trim());
 }
+function looksLikeCursorStreamIdleAfterTools(text) {
+  return CURSOR_STREAM_IDLE_AFTER_TOOLS.test(text.trim());
+}
+function looksLikeCursorStreamFailure(text) {
+  return looksLikeCursorStreamCutOff(text) || looksLikeCursorStreamIdleAfterTools(text);
+}
 function cursorStreamCutOffContinueLimit(detail) {
   if (looksLikeCursorStreamCutOff(detail) || /connection stalled/i.test(detail)) {
     return CURSOR_STREAM_CUTOFF_CONTINUE_LIMIT;
@@ -15,6 +22,33 @@ function nextCrashContinueCount(detail, used) {
   if (used >= limit) return null;
   return used + 1;
 }
+function cursorModelDisplayName(model) {
+  const raw = (model ?? "").trim();
+  if (!raw || /^(auto|default)$/i.test(raw)) return "";
+  if (/^grok-/i.test(raw)) return raw.replace(/^grok-/i, "Grok ");
+  return raw;
+}
+function formatCursorStreamIdleAfterToolsError(model) {
+  const label = cursorModelDisplayName(model);
+  return label ? `Cursor stopped responding after a tool call (${label})` : "Cursor stopped responding after a tool call";
+}
+function createCursorStreamToolProgress() {
+  return { completedTool: false, assistantAfterTool: false };
+}
+function noteCursorAgentEvent(state, event) {
+  if (event.type === "tool_result" && event.partial !== true) {
+    state.completedTool = true;
+    state.assistantAfterTool = false;
+    return;
+  }
+  if (event.type === "stdout" && !event.parentId) {
+    const text = typeof event.data === "string" ? event.data.trim() : "";
+    if (state.completedTool && text) state.assistantAfterTool = true;
+  }
+}
+function isCursorIdleAfterCompletedTool(state) {
+  return state.completedTool && !state.assistantAfterTool;
+}
 
 // src/agents/error-detail.ts
 function formatUnknownDetail(err) {
@@ -223,7 +257,7 @@ function looksLikeRetryableRunnerCrash(text) {
   if (looksLikeInvalidAgentSession(text)) return false;
   if (looksLikeV8Oom(text)) return false;
   if (looksLikeHugeToolResultDump(text)) return true;
-  if (looksLikeCursorStreamCutOff(text)) return true;
+  if (looksLikeCursorStreamFailure(text)) return true;
   if (looksLikeBrightsyEmptyCompletion(text)) return true;
   const lower = text.trim().toLowerCase();
   if (/cannot find (?:package|module)|err_module_not_found/.test(lower)) return false;
@@ -300,7 +334,7 @@ function humanizeAgentFailDetail(detail) {
   if (/corrupt local agent checkpoint|missing root blob|truncated crash dump/.test(lower)) {
     return `${raw} \u2014 retry the turn (Sideboard will start a fresh Cursor session).`;
   }
-  if (/connection stalled/.test(lower) || looksLikeCursorStreamCutOff(raw)) {
+  if (/connection stalled/.test(lower) || looksLikeCursorStreamFailure(raw)) {
     return /retry the turn/i.test(raw) ? raw : `${raw} \u2014 retry the turn (Sideboard will start a fresh Cursor session).`;
   }
   if (looksLikeBrightsyEmptyCompletion(raw)) {
@@ -387,6 +421,10 @@ function formatTurnExitError(exitCode, stderrSummary) {
 export {
   looksLikeCursorStreamCutOff,
   nextCrashContinueCount,
+  formatCursorStreamIdleAfterToolsError,
+  createCursorStreamToolProgress,
+  noteCursorAgentEvent,
+  isCursorIdleAfterCompletedTool,
   formatUnknownDetail,
   extractJsonErrorMessage,
   pushTurnStderr,

package/dist/{chunk-F36QRDM4.js → chunk-7Q327QF2.js}

@@ -1,6 +1,6 @@
 import {
   clipToolResultForStore
-} from "./chunk-HO5R3ZRH.js";
+} from "./chunk-5XNT6BCG.js";
 
 // src/agents/message-parts.ts
 function asRecord(input) {

package/dist/{chunk-5SFA27CF.js → chunk-AILQRQ26.js}

@@ -5,7 +5,7 @@ import {
   compactSummaryPart,
   isInternalAgentStatusText,
   lastAssistantMessageText
-} from "./chunk-5XQ43YZU.js";
+} from "./chunk-I5TESHDN.js";
 import {
   isCloudCoordinatorThread,
   isGlobalThread,
@@ -1235,12 +1235,23 @@ function isAskUserToolName(name) {
   const base = name.replace(/^mcp__sideboard__/i, "");
   return ASK_USER_TOOL_RE.test(name) || /^ask_user$/i.test(base);
 }
+function questionsFromToolPart(part) {
+  const fromInput = parsePlanQuestionsInput(part.input);
+  if (fromInput.length) return fromInput;
+  const raw = part.result?.trim();
+  if (!raw || !raw.startsWith("{")) return [];
+  try {
+    return parsePlanQuestionsInput(JSON.parse(raw));
+  } catch {
+    return [];
+  }
+}
 function extractPendingPlanQuestions(parts) {
   if (!parts?.length) return null;
   for (let i = parts.length - 1; i >= 0; i--) {
     const p = parts[i];
     if (p.type !== "tool" || !isAskUserToolName(p.name)) continue;
-    const questions = parsePlanQuestionsInput(p.input);
+    const questions = questionsFromToolPart(p);
     if (!questions.length) continue;
     return {
       id: p.id || `ask-${i}`,
@@ -1676,7 +1687,7 @@ var PORT_RANGE_SIZE = 10;
 var RECLAIM_RETRY_DELAY_MS = 40;
 var RECLAIM_TRIES = 8;
 async function killReclaimable(ports, worktreePath, signal) {
-  const { killListenersOnPorts: killListenersOnPorts2, killStaleWorktreeListeners: killStaleWorktreeListeners2 } = await import("./conductor-ZFRXTVGP.js");
+  const { killListenersOnPorts: killListenersOnPorts2, killStaleWorktreeListeners: killStaleWorktreeListeners2 } = await import("./conductor-AMZ5SKG2.js");
   if (worktreePath) killStaleWorktreeListeners2(ports, worktreePath, signal);
   else killListenersOnPorts2(ports);
 }

package/dist/{chunk-G2L3CR3A.js → chunk-FMSLOWKR.js}

@@ -9,7 +9,7 @@ import {
   looksLikeSkillBody,
   skillCommandFromBody,
   withEventParentId
-} from "./chunk-F36QRDM4.js";
+} from "./chunk-7Q327QF2.js";
 import {
   isOrchestratorThread
 } from "./chunk-5QX2NYXL.js";
@@ -45,13 +45,13 @@ import {
   packagedMcpStdioPath,
   parseCursorRunnerLine,
   resolveNodeLaunch
-} from "./chunk-MMVMQ34G.js";
+} from "./chunk-UA3YKQ3D.js";
 import {
   extractJsonErrorMessage,
   formatUnknownDetail,
   looksLikeAgentFailureMessage,
   looksLikeBrightsyEmptyCompletion
-} from "./chunk-HO5R3ZRH.js";
+} from "./chunk-5XNT6BCG.js";
 import {
   run
 } from "./chunk-QVN2WOKJ.js";

package/dist/{chunk-5XQ43YZU.js → chunk-I5TESHDN.js}

@@ -3,10 +3,17 @@
 
 // src/agents/cursor-stream-cutoff.ts
 var CURSOR_STREAM_CUTOFF = /nghttp2|premature close|\[unavailable\]\s+error\b|http\/2 stream closed|\bcancel \(0x8\)|error code cancel\b/i;
+var CURSOR_STREAM_IDLE_AFTER_TOOLS = /stopped responding after a tool call/i;
 var CURSOR_STREAM_CUTOFF_CONTINUE_LIMIT = 3;
 function looksLikeCursorStreamCutOff(text) {
   return CURSOR_STREAM_CUTOFF.test(text.trim());
 }
+function looksLikeCursorStreamIdleAfterTools(text) {
+  return CURSOR_STREAM_IDLE_AFTER_TOOLS.test(text.trim());
+}
+function looksLikeCursorStreamFailure(text) {
+  return looksLikeCursorStreamCutOff(text) || looksLikeCursorStreamIdleAfterTools(text);
+}
 function cursorStreamCutOffContinueLimit(detail) {
   if (looksLikeCursorStreamCutOff(detail) || /connection stalled/i.test(detail)) {
     return CURSOR_STREAM_CUTOFF_CONTINUE_LIMIT;
@@ -226,7 +233,7 @@ function looksLikeRetryableRunnerCrash(text) {
   if (looksLikeInvalidAgentSession(text)) return false;
   if (looksLikeV8Oom(text)) return false;
   if (looksLikeHugeToolResultDump(text)) return true;
-  if (looksLikeCursorStreamCutOff(text)) return true;
+  if (looksLikeCursorStreamFailure(text)) return true;
   if (looksLikeBrightsyEmptyCompletion(text)) return true;
   const lower = text.trim().toLowerCase();
   if (/cannot find (?:package|module)|err_module_not_found/.test(lower)) return false;
@@ -303,7 +310,7 @@ function humanizeAgentFailDetail(detail) {
   if (/corrupt local agent checkpoint|missing root blob|truncated crash dump/.test(lower)) {
     return `${raw} \u2014 retry the turn (Sideboard will start a fresh Cursor session).`;
   }
-  if (/connection stalled/.test(lower) || looksLikeCursorStreamCutOff(raw)) {
+  if (/connection stalled/.test(lower) || looksLikeCursorStreamFailure(raw)) {
     return /retry the turn/i.test(raw) ? raw : `${raw} \u2014 retry the turn (Sideboard will start a fresh Cursor session).`;
   }
   if (looksLikeBrightsyEmptyCompletion(raw)) {

package/dist/{chunk-R5RQLKMP.js → chunk-M6PAT6HG.js}

@@ -14,7 +14,7 @@ import {
   parseSessionQuotaResetAt,
   planModeTurnInstruction,
   resolveQuotaFallbackAgent
-} from "./chunk-G2L3CR3A.js";
+} from "./chunk-FMSLOWKR.js";
 import {
   REVIEW_TAB_TITLE,
   applyWorktreePkgCacheEnv,
@@ -55,7 +55,7 @@ import {
   worktreeDevProcessKey,
   worktreeRunProcessKey,
   worktreeSetupProcessKey
-} from "./chunk-OVNIP265.js";
+} from "./chunk-VBVSJUM2.js";
 import {
   applyAgentEvent,
   clipAgentEventForPaint,
@@ -70,7 +70,7 @@ import {
   partsToAssistantText,
   stripBrightsyNdjsonNoise,
   toolDescription
-} from "./chunk-F36QRDM4.js";
+} from "./chunk-7Q327QF2.js";
 import {
   titleFromPrompt
 } from "./chunk-7H655NEW.js";
@@ -181,7 +181,7 @@ import {
 import {
   applyAgentRunnerHeapEnv,
   packagedMcpDir
-} from "./chunk-MMVMQ34G.js";
+} from "./chunk-UA3YKQ3D.js";
 import {
   fallbackTurnFailDetail,
   formatAgentErrorContinuePrompt,
@@ -196,7 +196,7 @@ import {
   shouldRetryFailedAgentTurn,
   summarizeTurnStderr,
   turnFailChatText
-} from "./chunk-HO5R3ZRH.js";
+} from "./chunk-5XNT6BCG.js";
 import {
   clearStaleIndexLocks,
   enrichPathWithNpmGlobalBin,
@@ -1654,6 +1654,23 @@ function worktreeAgentBlock(group) {
   }
   return best;
 }
+function sidebarRowAgentBlock(group, opts) {
+  if (opts.active) {
+    const open = group.find((thread) => thread.id === opts.selectedId);
+    if (open) return visibleAgentBlock(open);
+  }
+  return worktreeAgentBlock(group);
+}
+function sidebarParentSelectId(group, primaryId, opts) {
+  if (opts.active) return primaryId;
+  return sidebarQuestionThreadId(group, primaryId);
+}
+function sidebarQuestionThreadId(group, primaryId) {
+  const block = worktreeAgentBlock(group);
+  if (!block) return primaryId;
+  const owner = group.find((thread) => visibleAgentBlock(thread) === block);
+  return owner?.id ?? primaryId;
+}
 function threadCardBlockFields(group) {
   const block = worktreeAgentBlock(group);
   return block ? { blockedReason: block.reason, blockedSource: block.source } : null;
@@ -1800,7 +1817,7 @@ function decisionBlockFromParts(parts, planMode, at = (/* @__PURE__ */ new Date(
     const reason = pending ? formatAskUserNotifyMessage(pending.questions) : "Waiting for an answer in that chat.";
     return {
       ...makeAgentBlock("ask_user", reason, at),
-      ...pending ? { questionSignature: pending.signature } : {}
+      ...pending ? { questionSignature: pending.signature, questions: pending.questions } : {}
     };
   }
   if (!planMode || last?.type !== "tool") return null;
@@ -1815,14 +1832,24 @@ function decisionBlockFromParts(parts, planMode, at = (/* @__PURE__ */ new Date(
     at
   );
 }
+function withStampedQuestions(decision, existing) {
+  if (decision.source !== "ask_user" || decision.questions?.length) return decision;
+  if (existing?.source !== "ask_user" || !existing.questions?.length) return decision;
+  return {
+    ...decision,
+    questions: existing.questions,
+    questionSignature: decision.questionSignature ?? existing.questionSignature
+  };
+}
 function agentBlockAfterTurn(input) {
   if (input.failed) return null;
   const decision = decisionBlockFromParts(input.parts, input.planMode);
   if (decision) {
-    if (isDismissedAskUserBlock(decision, input.dismissedQuestionSignature)) {
+    const next = withStampedQuestions(decision, input.existing);
+    if (isDismissedAskUserBlock(next, input.dismissedQuestionSignature)) {
       return input.existing?.source === "reported" ? input.existing : null;
     }
-    return decision;
+    return next;
   }
   if (input.existing && input.existing.source !== "reported" && lastTopLevelTool(input.parts)) {
     return null;
@@ -1865,7 +1892,7 @@ function settleAgentBlock(threadId, parts, failed) {
   });
   const prev = thread.agentBlock ?? null;
   if (prev === next) return;
-  if (prev && next && prev.source === next.source && prev.reason === next.reason && prev.at === next.at && prev.questionSignature === next.questionSignature) {
+  if (prev && next && prev.source === next.source && prev.reason === next.reason && prev.at === next.at && prev.questionSignature === next.questionSignature && planQuestionsSignature(prev.questions ?? []) === planQuestionsSignature(next.questions ?? [])) {
     return;
   }
   updateThread(threadId, { agentBlock: next });
@@ -1888,7 +1915,11 @@ function stampAskUserBlock(resolveCaller, questions) {
   try {
     writeAgentBlock(
       resolveCaller().id,
-      parsed.length ? { ...block, questionSignature: planQuestionsSignature(parsed) } : block
+      parsed.length ? {
+        ...block,
+        questionSignature: planQuestionsSignature(parsed),
+        questions: parsed
+      } : block
     );
   } catch {
   }
@@ -2996,7 +3027,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("./agents-IWNQOQOU.js");
+  const { getAdapter: getAdapter2 } = await import("./agents-DG2UPJ6N.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -5838,7 +5869,7 @@ function formatWorktreeReminder() {
   return "Sideboard workspace: stay in this cwd for all file and git work. Push and open PRs against origin, never upstream. Do not edit the main repo checkout. If a goal is given (Greptile 5/5, CI green), watch-fix-push until it lands \u2014 do not watch after every push. Schedules: create_schedule (at / every / cron; chatId=self for this chat). set_workspace_tags updates labels on this workspace (omit ref).";
 }
 function formatClaudeSubagentReminder() {
-  return 'Claude subagents: if Task/Agent workers will edit files, write a short plan in this chat and continue in the same turn. Do not ask the user whether to isolate, and do not set worktree.bgIsolation to none. One writer may edit this workspace. Every other writer is an Agent with isolation "worktree" and a disjoint file list (read-only explore agents may overlap). While those agents run, leave their files alone. Merge each returned branch into this workspace, then remove the temporary worktree. You stay in this cwd. If Claude says another write-capable agent is in this directory, or that writes to the shared checkout are blocked, re-spawn that agent with isolation "worktree" or make the edit yourself.';
+  return 'Claude subagents: if Task/Agent workers will edit files, write a short plan in this chat and continue in the same turn. Do not ask the user whether to isolate, and do not set worktree.bgIsolation to none. One writer may edit this workspace. Every other writer is an Agent with isolation "worktree" and a disjoint file list (read-only explore agents may overlap). While those agents run, leave their files alone. Merge each returned branch into this workspace, then remove the temporary worktree. You stay in this cwd. If Claude says another write-capable agent is in this directory, or that writes to the shared checkout are blocked, re-spawn that agent with isolation "worktree" or make the edit yourself. That note is another worker in this chat, or a worker Claude still has marked running. Do not mention it to the user.';
 }
 function claudeSubagentTurnReminder(thread) {
   if (thread.agent !== "claude" || thread.planMode || isOrchestratorThread(thread)) {
@@ -6710,7 +6741,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-XRTUGSKX.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-T76JRIIN.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -9621,6 +9652,9 @@ export {
   worktreeBoardStatus,
   visibleAgentBlock,
   worktreeAgentBlock,
+  sidebarRowAgentBlock,
+  sidebarParentSelectId,
+  sidebarQuestionThreadId,
   reviewLabelForRepo,
   classifyWorktreeListBadges,
   isHomeBoardThread,

package/dist/{chunk-YJBUYGPN.js → chunk-NCHOTN3C.js}

@@ -4,7 +4,7 @@ import {
   formatUnknownDetail,
   looksLikeCursorStreamCutOff,
   looksLikeHugeToolResultDump
-} from "./chunk-HO5R3ZRH.js";
+} from "./chunk-5XNT6BCG.js";
 import {
   CLI_DIR
 } from "./chunk-6K64FJDD.js";

package/dist/{chunk-IEOOYBYT.js → chunk-OU5V56OI.js}

@@ -27,7 +27,7 @@ import {
   parseSessionQuotaResetAt,
   planModeTurnInstruction,
   resolveQuotaFallbackAgent
-} from "./chunk-EZYZGDWU.js";
+} from "./chunk-VXI7FFGO.js";
 import {
   REVIEW_TAB_TITLE,
   applyWorktreePkgCacheEnv,
@@ -68,7 +68,7 @@ import {
   worktreeDevProcessKey,
   worktreeRunProcessKey,
   worktreeSetupProcessKey
-} from "./chunk-5SFA27CF.js";
+} from "./chunk-AILQRQ26.js";
 import {
   applyAgentEvent,
   clipAgentEventForPaint,
@@ -95,7 +95,7 @@ import {
   summarizeTurnStderr,
   toolDescription,
   turnFailChatText
-} from "./chunk-5XQ43YZU.js";
+} from "./chunk-I5TESHDN.js";
 import {
   SLACK_REPLY_FORMATTING,
   addWorkspace,
@@ -1703,7 +1703,7 @@ function decisionBlockFromParts(parts, planMode, at = (/* @__PURE__ */ new Date(
     const reason = pending ? formatAskUserNotifyMessage(pending.questions) : "Waiting for an answer in that chat.";
     return {
       ...makeAgentBlock("ask_user", reason, at),
-      ...pending ? { questionSignature: pending.signature } : {}
+      ...pending ? { questionSignature: pending.signature, questions: pending.questions } : {}
     };
   }
   if (!planMode || last?.type !== "tool") return null;
@@ -1718,14 +1718,24 @@ function decisionBlockFromParts(parts, planMode, at = (/* @__PURE__ */ new Date(
     at
   );
 }
+function withStampedQuestions(decision, existing) {
+  if (decision.source !== "ask_user" || decision.questions?.length) return decision;
+  if (existing?.source !== "ask_user" || !existing.questions?.length) return decision;
+  return {
+    ...decision,
+    questions: existing.questions,
+    questionSignature: decision.questionSignature ?? existing.questionSignature
+  };
+}
 function agentBlockAfterTurn(input) {
   if (input.failed) return null;
   const decision = decisionBlockFromParts(input.parts, input.planMode);
   if (decision) {
-    if (isDismissedAskUserBlock(decision, input.dismissedQuestionSignature)) {
+    const next = withStampedQuestions(decision, input.existing);
+    if (isDismissedAskUserBlock(next, input.dismissedQuestionSignature)) {
       return input.existing?.source === "reported" ? input.existing : null;
     }
-    return decision;
+    return next;
   }
   if (input.existing && input.existing.source !== "reported" && lastTopLevelTool(input.parts)) {
     return null;
@@ -1768,7 +1778,7 @@ function settleAgentBlock(threadId, parts, failed) {
   });
   const prev = thread.agentBlock ?? null;
   if (prev === next) return;
-  if (prev && next && prev.source === next.source && prev.reason === next.reason && prev.at === next.at && prev.questionSignature === next.questionSignature) {
+  if (prev && next && prev.source === next.source && prev.reason === next.reason && prev.at === next.at && prev.questionSignature === next.questionSignature && planQuestionsSignature(prev.questions ?? []) === planQuestionsSignature(next.questions ?? [])) {
     return;
   }
   updateThread(threadId, { agentBlock: next });
@@ -1791,7 +1801,11 @@ function stampAskUserBlock(resolveCaller, questions) {
   try {
     writeAgentBlock(
       resolveCaller().id,
-      parsed.length ? { ...block, questionSignature: planQuestionsSignature(parsed) } : block
+      parsed.length ? {
+        ...block,
+        questionSignature: planQuestionsSignature(parsed),
+        questions: parsed
+      } : block
     );
   } catch {
   }
@@ -5534,7 +5548,7 @@ function formatWorktreeReminder() {
   return "Sideboard workspace: stay in this cwd for all file and git work. Push and open PRs against origin, never upstream. Do not edit the main repo checkout. If a goal is given (Greptile 5/5, CI green), watch-fix-push until it lands \u2014 do not watch after every push. Schedules: create_schedule (at / every / cron; chatId=self for this chat). set_workspace_tags updates labels on this workspace (omit ref).";
 }
 function formatClaudeSubagentReminder() {
-  return 'Claude subagents: if Task/Agent workers will edit files, write a short plan in this chat and continue in the same turn. Do not ask the user whether to isolate, and do not set worktree.bgIsolation to none. One writer may edit this workspace. Every other writer is an Agent with isolation "worktree" and a disjoint file list (read-only explore agents may overlap). While those agents run, leave their files alone. Merge each returned branch into this workspace, then remove the temporary worktree. You stay in this cwd. If Claude says another write-capable agent is in this directory, or that writes to the shared checkout are blocked, re-spawn that agent with isolation "worktree" or make the edit yourself.';
+  return 'Claude subagents: if Task/Agent workers will edit files, write a short plan in this chat and continue in the same turn. Do not ask the user whether to isolate, and do not set worktree.bgIsolation to none. One writer may edit this workspace. Every other writer is an Agent with isolation "worktree" and a disjoint file list (read-only explore agents may overlap). While those agents run, leave their files alone. Merge each returned branch into this workspace, then remove the temporary worktree. You stay in this cwd. If Claude says another write-capable agent is in this directory, or that writes to the shared checkout are blocked, re-spawn that agent with isolation "worktree" or make the edit yourself. That note is another worker in this chat, or a worker Claude still has marked running. Do not mention it to the user.';
 }
 function claudeSubagentTurnReminder(thread) {
   if (thread.agent !== "claude" || thread.planMode || isOrchestratorThread(thread)) {
@@ -6375,7 +6389,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-MB2Q6KIR.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-4OIMDLIR.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),