@sideboard-ai/core 0.1.327 → 0.1.328

package/dist/agents/claude-runner.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   isAskUserToolName
-} from "../chunk-ULWPSBAB.js";
+} from "../chunk-NJV5YEKI.js";
 import {
   isClaudeAiConnectorMcp,
   mcpServerIdForPermission,

package/dist/{chunk-RZJ3QJZT.js → chunk-EYDLXVED.js}

@@ -1215,16 +1215,6 @@ function isAskUserToolName(name) {
   const base = name.replace(/^mcp__sideboard__/i, "");
   return ASK_USER_TOOL_RE.test(name) || /^ask_user$/i.test(base);
 }
-function lastTopLevelToolIsAskUser(parts) {
-  if (!parts?.length) return false;
-  for (let i = parts.length - 1; i >= 0; i--) {
-    const part = parts[i];
-    if (part.type === "tool" && !part.parentId) {
-      return isAskUserToolName(part.name);
-    }
-  }
-  return false;
-}
 function questionsFromToolPart(part) {
   const fromInput = parsePlanQuestionsInput(part.input);
   if (fromInput.length) return fromInput;
@@ -1240,7 +1230,7 @@ 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;
+    if (p.type !== "tool" || p.parentId || !isAskUserToolName(p.name)) continue;
     const questions = questionsFromToolPart(p);
     if (!questions.length) continue;
     return {
@@ -1272,8 +1262,32 @@ function isIncompleteTaskState(state) {
 function needsCoordinatorAction(state) {
   return isIncompleteTaskState(state) || state === "input-required";
 }
-function endedOnAskUser(parts) {
-  return lastTopLevelToolIsAskUser(parts);
+function turnWaitingOnAskUser(parts, dismissedQuestionSignature) {
+  if (!parts?.length) return false;
+  let ask = null;
+  for (let i = parts.length - 1; i >= 0; i--) {
+    const part = parts[i];
+    if (part.type === "tool" && !part.parentId && isAskUserToolName(part.name)) {
+      ask = part;
+      break;
+    }
+  }
+  if (!ask) return false;
+  const dismissed = dismissedQuestionSignature?.trim();
+  if (!dismissed) return true;
+  const pending = extractPendingPlanQuestions([ask]);
+  if (!pending?.signature) return false;
+  return pending.signature !== dismissed;
+}
+function userRepliedAfterAgent(messages, lastAgent) {
+  if (!messages || !lastAgent) return false;
+  const index = messages.lastIndexOf(lastAgent);
+  if (index < 0) return false;
+  for (let i = index + 1; i < messages.length; i++) {
+    const message = messages[i];
+    if (message.role === "user" && message.origin !== "continue") return true;
+  }
+  return false;
 }
 function deriveTaskState(input) {
   if (input.stillRunning) {
@@ -1286,7 +1300,7 @@ function deriveTaskState(input) {
     case "stopped":
       return "canceled";
     default:
-      return endedOnAskUser(input.lastAgentParts) ? "input-required" : "completed";
+      return !input.userAnswered && turnWaitingOnAskUser(input.lastAgentParts, input.dismissedQuestionSignature) ? "input-required" : "completed";
   }
 }
 
@@ -1682,7 +1696,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-D62Q2XJC.js");
+  const { killListenersOnPorts: killListenersOnPorts2, killStaleWorktreeListeners: killStaleWorktreeListeners2 } = await import("./conductor-U5LGJZUJ.js");
   if (worktreePath) killStaleWorktreeListeners2(ports, worktreePath, signal);
   else killListenersOnPorts2(ports);
 }
@@ -2369,6 +2383,7 @@ export {
   extractPendingPlanQuestions,
   askBlockStillWaiting,
   needsCoordinatorAction,
+  userRepliedAfterAgent,
   deriveTaskState,
   mcpWaitForTurnTimeoutMs,
   mcpWaitTaskHint,

package/dist/{chunk-ULWPSBAB.js → chunk-NJV5YEKI.js}

@@ -63,9 +63,6 @@ function lastTopLevelToolIsAskUser(parts) {
   }
   return false;
 }
-function hasTopLevelTool(parts) {
-  return Boolean(parts?.some((part) => part.type === "tool" && !part.parentId));
-}
 function questionsFromToolPart(part) {
   const fromInput = parsePlanQuestionsInput(part.input);
   if (fromInput.length) return fromInput;
@@ -81,7 +78,7 @@ 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;
+    if (p.type !== "tool" || p.parentId || !isAskUserToolName(p.name)) continue;
     const questions = questionsFromToolPart(p);
     if (!questions.length) continue;
     return {
@@ -121,18 +118,23 @@ function askBlockStillWaiting(block, messages) {
 }
 function latestPendingPlanQuestions(input) {
   if (input.userReplied) return null;
+  const dismissed = input.dismissedQuestionSignature?.trim();
+  const accept = (pending) => {
+    if (!pending) return null;
+    if (dismissed && pending.signature === dismissed) return null;
+    return pending;
+  };
   const fromBlock = () => pendingFromAskBlock(input.agentBlock, input.dismissedQuestionSignature);
-  if (lastTopLevelToolIsAskUser(input.liveParts)) {
-    return extractPendingPlanQuestions(input.liveParts) ?? fromBlock();
-  }
+  const liveAsk = accept(extractPendingPlanQuestions(input.liveParts));
+  if (liveAsk) return liveAsk;
   const last = input.messages[input.messages.length - 1];
-  if (last?.role === "agent" && lastTopLevelToolIsAskUser(last.parts)) {
-    return extractPendingPlanQuestions(last.parts) ?? fromBlock();
+  if (last?.role === "agent") {
+    const fromTranscript = accept(extractPendingPlanQuestions(last.parts));
+    if (fromTranscript) return fromTranscript;
   }
-  if (hasTopLevelTool(input.liveParts) || last?.role === "agent" && hasTopLevelTool(last.parts)) {
+  if ((input.status === "running" || input.status === "queued") && !input.agentBlock?.onScreen) {
     return null;
   }
-  if (input.status === "running" || input.status === "queued") return null;
   const stamped = fromBlock();
   if (stamped && askBlockStillWaiting(input.agentBlock, input.messages)) {
     return stamped;

package/dist/{chunk-DEB47BII.js → chunk-WD222BVP.js}

@@ -51,10 +51,11 @@ import {
   startDevServer,
   threadsSharingWorktree,
   turnWatchedDetachedJob,
+  userRepliedAfterAgent,
   worktreeDevProcessKey,
   worktreeRunProcessKey,
   worktreeSetupProcessKey
-} from "./chunk-IXWPCOLQ.js";
+} from "./chunk-X3XTO45Y.js";
 import {
   applyAgentEvent,
   clipAgentEventForPaint,
@@ -187,7 +188,7 @@ import {
   isAskUserToolName,
   parsePlanQuestionsInput,
   planQuestionsSignature
-} from "./chunk-ULWPSBAB.js";
+} from "./chunk-NJV5YEKI.js";
 import {
   mcpServerIdForPermission,
   mcpServerPermissionUpdate
@@ -2011,6 +2012,9 @@ function decisionBlockFromParts(parts, planMode, at = (/* @__PURE__ */ new Date(
     at
   );
 }
+function attentionOutranksAsk(existing) {
+  return existing?.source === "reported" || existing?.source === "permission";
+}
 function withStampedQuestions(decision, existing) {
   if (decision.source !== "ask_user" || decision.questions?.length) return decision;
   if (existing?.source !== "ask_user" || !existing.questions?.length) return decision;
@@ -2024,12 +2028,37 @@ function agentBlockAfterTurn(input) {
   if (input.failed) return null;
   const decision = decisionBlockFromParts(input.parts, input.planMode);
   if (decision) {
+    if (decision.source === "ask_user" && attentionOutranksAsk(input.existing)) {
+      return input.existing ?? null;
+    }
     const next = withStampedQuestions(decision, input.existing);
     if (isDismissedAskUserBlock(next, input.dismissedQuestionSignature)) {
       return input.existing?.source === "reported" ? input.existing : null;
     }
     return next;
   }
+  const pending = extractPendingPlanQuestions(input.parts);
+  if (pending && attentionOutranksAsk(input.existing)) {
+    return input.existing ?? null;
+  }
+  if (pending) {
+    const kept = withStampedQuestions(
+      {
+        ...makeAgentBlock(
+          "ask_user",
+          formatAskUserNotifyMessage(pending.questions),
+          input.existing?.source === "ask_user" ? input.existing.at : void 0
+        ),
+        onScreen: true,
+        questionSignature: pending.signature,
+        questions: pending.questions
+      },
+      input.existing
+    );
+    if (!isDismissedAskUserBlock(kept, input.dismissedQuestionSignature)) return kept;
+  } else if (input.existing?.source === "ask_user" && input.existing.onScreen && input.existing.questions?.length && !isDismissedAskUserBlock(input.existing, input.dismissedQuestionSignature)) {
+    return input.existing;
+  }
   if (input.existing && input.existing.source !== "reported" && lastTopLevelTool(input.parts)) {
     return null;
   }
@@ -2058,11 +2087,15 @@ function askBlocksEqual(a, b) {
   if (!a || !b) return false;
   return a.source === b.source && a.reason === b.reason && a.at === b.at && a.onScreen === b.onScreen && a.questionSignature === b.questionSignature;
 }
-function askBlockAfterLiveParts(existing, parts) {
+function askBlockAfterLiveParts(existing, parts, dismissedQuestionSignature) {
+  if (attentionOutranksAsk(existing)) return existing ?? null;
+  if (isDismissedAskUserBlock(existing, dismissedQuestionSignature)) return null;
+  const dismissed = dismissedQuestionSignature?.trim() ?? "";
+  let pending = extractPendingPlanQuestions(parts);
+  if (dismissed && pending?.signature === dismissed) pending = null;
   const last = lastTopLevelTool(parts);
   if (last?.type === "tool" && isAskUserToolName(last.name)) {
     if (existing?.source === "ask_user" && existing.onScreen) return existing;
-    const pending = extractPendingPlanQuestions(parts);
     const questions = pending?.questions ?? existing?.questions;
     if (!questions?.length) {
       return existing?.source === "ask_user" ? { ...existing, onScreen: true } : existing ?? null;
@@ -2075,13 +2108,32 @@ function askBlockAfterLiveParts(existing, parts) {
       questions
     };
   }
+  if (pending) {
+    if (existing?.source === "ask_user" && existing.onScreen && existing.questions?.length) {
+      return existing;
+    }
+    const at = existing?.source === "ask_user" ? existing.at : void 0;
+    return {
+      ...makeAgentBlock("ask_user", formatAskUserNotifyMessage(pending.questions), at),
+      onScreen: true,
+      questionSignature: pending.signature,
+      questions: pending.questions
+    };
+  }
+  if (existing?.source === "ask_user" && existing.onScreen && existing.questions?.length) {
+    return existing;
+  }
   if (last && existing?.source === "ask_user") return null;
   return existing ?? null;
 }
 function syncAskUserBlockFromLive(threadId, parts) {
   const thread = readThread(threadId);
   if (!thread || thread.status === "archived") return;
-  const next = askBlockAfterLiveParts(thread.agentBlock, parts);
+  const next = askBlockAfterLiveParts(
+    thread.agentBlock,
+    parts,
+    thread.dismissedQuestionSignature
+  );
   if (askBlocksEqual(thread.agentBlock, next)) return;
   updateThread(threadId, { agentBlock: next });
 }
@@ -7091,7 +7143,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-EN3ZKD73.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-YY2JUYKD.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -9311,7 +9363,9 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
     const taskState = deriveTaskState({
       status: thread.status,
       stillRunning,
-      lastAgentParts: lastAgent?.parts
+      lastAgentParts: lastAgent?.parts,
+      dismissedQuestionSignature: thread.dismissedQuestionSignature,
+      userAnswered: userRepliedAfterAgent(thread.messages, lastAgent)
     });
     const block = thread.agentBlock?.reason?.trim() ? thread.agentBlock : null;
     return {

package/dist/{chunk-IXWPCOLQ.js → chunk-X3XTO45Y.js}

@@ -29,8 +29,10 @@ import {
   ensureWorktreeSideboardIgnored
 } from "./chunk-QKHEVSB5.js";
 import {
+  extractPendingPlanQuestions,
+  isAskUserToolName,
   lastTopLevelToolIsAskUser
-} from "./chunk-ULWPSBAB.js";
+} from "./chunk-NJV5YEKI.js";
 import {
   clipToolResultForStore
 } from "./chunk-OPXEJJBM.js";
@@ -1228,6 +1230,33 @@ function needsCoordinatorAction(state) {
 function endedOnAskUser(parts) {
   return lastTopLevelToolIsAskUser(parts);
 }
+function turnWaitingOnAskUser(parts, dismissedQuestionSignature) {
+  if (!parts?.length) return false;
+  let ask = null;
+  for (let i = parts.length - 1; i >= 0; i--) {
+    const part = parts[i];
+    if (part.type === "tool" && !part.parentId && isAskUserToolName(part.name)) {
+      ask = part;
+      break;
+    }
+  }
+  if (!ask) return false;
+  const dismissed = dismissedQuestionSignature?.trim();
+  if (!dismissed) return true;
+  const pending = extractPendingPlanQuestions([ask]);
+  if (!pending?.signature) return false;
+  return pending.signature !== dismissed;
+}
+function userRepliedAfterAgent(messages, lastAgent) {
+  if (!messages || !lastAgent) return false;
+  const index = messages.lastIndexOf(lastAgent);
+  if (index < 0) return false;
+  for (let i = index + 1; i < messages.length; i++) {
+    const message = messages[i];
+    if (message.role === "user" && message.origin !== "continue") return true;
+  }
+  return false;
+}
 function deriveTaskState(input) {
   if (input.stillRunning) {
     return input.status === "queued" ? "submitted" : "working";
@@ -1239,7 +1268,7 @@ function deriveTaskState(input) {
     case "stopped":
       return "canceled";
     default:
-      return endedOnAskUser(input.lastAgentParts) ? "input-required" : "completed";
+      return !input.userAnswered && turnWaitingOnAskUser(input.lastAgentParts, input.dismissedQuestionSignature) ? "input-required" : "completed";
   }
 }
 
@@ -1635,7 +1664,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-CP7TW6TN.js");
+  const { killListenersOnPorts: killListenersOnPorts2, killStaleWorktreeListeners: killStaleWorktreeListeners2 } = await import("./conductor-G6GH5ZMU.js");
   if (worktreePath) killStaleWorktreeListeners2(ports, worktreePath, signal);
   else killListenersOnPorts2(ports);
 }
@@ -2320,6 +2349,7 @@ export {
   isIncompleteTaskState,
   needsCoordinatorAction,
   endedOnAskUser,
+  userRepliedAfterAgent,
   deriveTaskState,
   mcpWaitForTurnTimeoutMs,
   mcpWaitTaskHint,

package/dist/{chunk-YUHZEIVG.js → chunk-XOMVOBPU.js}

@@ -49,10 +49,11 @@ import {
   startDevServer,
   threadsSharingWorktree,
   turnWatchedDetachedJob,
+  userRepliedAfterAgent,
   worktreeDevProcessKey,
   worktreeRunProcessKey,
   worktreeSetupProcessKey
-} from "./chunk-RZJ3QJZT.js";
+} from "./chunk-EYDLXVED.js";
 import {
   applyAgentEvent,
   clipAgentEventForPaint,
@@ -1887,6 +1888,9 @@ function decisionBlockFromParts(parts, planMode, at = (/* @__PURE__ */ new Date(
     at
   );
 }
+function attentionOutranksAsk(existing) {
+  return existing?.source === "reported" || existing?.source === "permission";
+}
 function withStampedQuestions(decision, existing) {
   if (decision.source !== "ask_user" || decision.questions?.length) return decision;
   if (existing?.source !== "ask_user" || !existing.questions?.length) return decision;
@@ -1900,12 +1904,37 @@ function agentBlockAfterTurn(input) {
   if (input.failed) return null;
   const decision = decisionBlockFromParts(input.parts, input.planMode);
   if (decision) {
+    if (decision.source === "ask_user" && attentionOutranksAsk(input.existing)) {
+      return input.existing ?? null;
+    }
     const next = withStampedQuestions(decision, input.existing);
     if (isDismissedAskUserBlock(next, input.dismissedQuestionSignature)) {
       return input.existing?.source === "reported" ? input.existing : null;
     }
     return next;
   }
+  const pending = extractPendingPlanQuestions(input.parts);
+  if (pending && attentionOutranksAsk(input.existing)) {
+    return input.existing ?? null;
+  }
+  if (pending) {
+    const kept = withStampedQuestions(
+      {
+        ...makeAgentBlock(
+          "ask_user",
+          formatAskUserNotifyMessage(pending.questions),
+          input.existing?.source === "ask_user" ? input.existing.at : void 0
+        ),
+        onScreen: true,
+        questionSignature: pending.signature,
+        questions: pending.questions
+      },
+      input.existing
+    );
+    if (!isDismissedAskUserBlock(kept, input.dismissedQuestionSignature)) return kept;
+  } else if (input.existing?.source === "ask_user" && input.existing.onScreen && input.existing.questions?.length && !isDismissedAskUserBlock(input.existing, input.dismissedQuestionSignature)) {
+    return input.existing;
+  }
   if (input.existing && input.existing.source !== "reported" && lastTopLevelTool(input.parts)) {
     return null;
   }
@@ -1934,11 +1963,15 @@ function askBlocksEqual(a, b) {
   if (!a || !b) return false;
   return a.source === b.source && a.reason === b.reason && a.at === b.at && a.onScreen === b.onScreen && a.questionSignature === b.questionSignature;
 }
-function askBlockAfterLiveParts(existing, parts) {
+function askBlockAfterLiveParts(existing, parts, dismissedQuestionSignature) {
+  if (attentionOutranksAsk(existing)) return existing ?? null;
+  if (isDismissedAskUserBlock(existing, dismissedQuestionSignature)) return null;
+  const dismissed = dismissedQuestionSignature?.trim() ?? "";
+  let pending = extractPendingPlanQuestions(parts);
+  if (dismissed && pending?.signature === dismissed) pending = null;
   const last = lastTopLevelTool(parts);
   if (last?.type === "tool" && isAskUserToolName(last.name)) {
     if (existing?.source === "ask_user" && existing.onScreen) return existing;
-    const pending = extractPendingPlanQuestions(parts);
     const questions = pending?.questions ?? existing?.questions;
     if (!questions?.length) {
       return existing?.source === "ask_user" ? { ...existing, onScreen: true } : existing ?? null;
@@ -1951,13 +1984,32 @@ function askBlockAfterLiveParts(existing, parts) {
       questions
     };
   }
+  if (pending) {
+    if (existing?.source === "ask_user" && existing.onScreen && existing.questions?.length) {
+      return existing;
+    }
+    const at = existing?.source === "ask_user" ? existing.at : void 0;
+    return {
+      ...makeAgentBlock("ask_user", formatAskUserNotifyMessage(pending.questions), at),
+      onScreen: true,
+      questionSignature: pending.signature,
+      questions: pending.questions
+    };
+  }
+  if (existing?.source === "ask_user" && existing.onScreen && existing.questions?.length) {
+    return existing;
+  }
   if (last && existing?.source === "ask_user") return null;
   return existing ?? null;
 }
 function syncAskUserBlockFromLive(threadId, parts) {
   const thread = readThread(threadId);
   if (!thread || thread.status === "archived") return;
-  const next = askBlockAfterLiveParts(thread.agentBlock, parts);
+  const next = askBlockAfterLiveParts(
+    thread.agentBlock,
+    parts,
+    thread.dismissedQuestionSignature
+  );
   if (askBlocksEqual(thread.agentBlock, next)) return;
   updateThread(threadId, { agentBlock: next });
 }
@@ -6741,7 +6793,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-W4TZBBDO.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-3F53AZEN.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -8961,7 +9013,9 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
     const taskState = deriveTaskState({
       status: thread.status,
       stillRunning,
-      lastAgentParts: lastAgent?.parts
+      lastAgentParts: lastAgent?.parts,
+      dismissedQuestionSignature: thread.dismissedQuestionSignature,
+      userAnswered: userRepliedAfterAgent(thread.messages, lastAgent)
     });
     const block = thread.agentBlock?.reason?.trim() ? thread.agentBlock : null;
     return {

package/dist/{conductor-CP7TW6TN.js → conductor-G6GH5ZMU.js}

@@ -32,13 +32,13 @@ import {
   tryReservePort,
   tryReservePorts,
   worktreeRunPortsPath
-} from "./chunk-IXWPCOLQ.js";
+} from "./chunk-X3XTO45Y.js";
 import "./chunk-OOXRMTU6.js";
 import "./chunk-RDXODLEN.js";
 import "./chunk-R2C45NHT.js";
 import "./chunk-Y6OHM672.js";
 import "./chunk-QKHEVSB5.js";
-import "./chunk-ULWPSBAB.js";
+import "./chunk-NJV5YEKI.js";
 import "./chunk-N6ZF3XRP.js";
 import "./chunk-OPXEJJBM.js";
 import "./chunk-6K64FJDD.js";

package/dist/{conductor-D62Q2XJC.js → conductor-U5LGJZUJ.js}

@@ -34,7 +34,7 @@ import {
   tryReservePort,
   tryReservePorts,
   worktreeRunPortsPath
-} from "./chunk-RZJ3QJZT.js";
+} from "./chunk-EYDLXVED.js";
 import "./chunk-5MXLDDYF.js";
 import "./chunk-Q4UPRQOS.js";
 import "./chunk-JKHCADKB.js";

package/dist/index.cjs

@@ -7383,9 +7383,6 @@ function lastTopLevelToolIsAskUser(parts) {
   }
   return false;
 }
-function hasTopLevelTool(parts) {
-  return Boolean(parts?.some((part) => part.type === "tool" && !part.parentId));
-}
 function questionsFromToolPart(part) {
   const fromInput = parsePlanQuestionsInput(part.input);
   if (fromInput.length) return fromInput;
@@ -7401,7 +7398,7 @@ 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;
+    if (p.type !== "tool" || p.parentId || !isAskUserToolName(p.name)) continue;
     const questions2 = questionsFromToolPart(p);
     if (!questions2.length) continue;
     return {
@@ -7441,18 +7438,23 @@ function askBlockStillWaiting(block, messages) {
 }
 function latestPendingPlanQuestions(input) {
   if (input.userReplied) return null;
+  const dismissed = input.dismissedQuestionSignature?.trim();
+  const accept = (pending) => {
+    if (!pending) return null;
+    if (dismissed && pending.signature === dismissed) return null;
+    return pending;
+  };
   const fromBlock = () => pendingFromAskBlock(input.agentBlock, input.dismissedQuestionSignature);
-  if (lastTopLevelToolIsAskUser(input.liveParts)) {
-    return extractPendingPlanQuestions(input.liveParts) ?? fromBlock();
-  }
+  const liveAsk = accept(extractPendingPlanQuestions(input.liveParts));
+  if (liveAsk) return liveAsk;
   const last = input.messages[input.messages.length - 1];
-  if (last?.role === "agent" && lastTopLevelToolIsAskUser(last.parts)) {
-    return extractPendingPlanQuestions(last.parts) ?? fromBlock();
+  if (last?.role === "agent") {
+    const fromTranscript = accept(extractPendingPlanQuestions(last.parts));
+    if (fromTranscript) return fromTranscript;
   }
-  if (hasTopLevelTool(input.liveParts) || last?.role === "agent" && hasTopLevelTool(last.parts)) {
+  if ((input.status === "running" || input.status === "queued") && !input.agentBlock?.onScreen) {
     return null;
   }
-  if (input.status === "running" || input.status === "queued") return null;
   const stamped = fromBlock();
   if (stamped && askBlockStillWaiting(input.agentBlock, input.messages)) {
     return stamped;
@@ -9174,6 +9176,33 @@ function needsCoordinatorAction(state) {
 function endedOnAskUser(parts) {
   return lastTopLevelToolIsAskUser(parts);
 }
+function turnWaitingOnAskUser(parts, dismissedQuestionSignature) {
+  if (!parts?.length) return false;
+  let ask = null;
+  for (let i = parts.length - 1; i >= 0; i--) {
+    const part = parts[i];
+    if (part.type === "tool" && !part.parentId && isAskUserToolName(part.name)) {
+      ask = part;
+      break;
+    }
+  }
+  if (!ask) return false;
+  const dismissed = dismissedQuestionSignature?.trim();
+  if (!dismissed) return true;
+  const pending = extractPendingPlanQuestions([ask]);
+  if (!pending?.signature) return false;
+  return pending.signature !== dismissed;
+}
+function userRepliedAfterAgent(messages, lastAgent) {
+  if (!messages || !lastAgent) return false;
+  const index = messages.lastIndexOf(lastAgent);
+  if (index < 0) return false;
+  for (let i = index + 1; i < messages.length; i++) {
+    const message = messages[i];
+    if (message.role === "user" && message.origin !== "continue") return true;
+  }
+  return false;
+}
 function deriveTaskState(input) {
   if (input.stillRunning) {
     return input.status === "queued" ? "submitted" : "working";
@@ -9185,7 +9214,7 @@ function deriveTaskState(input) {
     case "stopped":
       return "canceled";
     default:
-      return endedOnAskUser(input.lastAgentParts) ? "input-required" : "completed";
+      return !input.userAnswered && turnWaitingOnAskUser(input.lastAgentParts, input.dismissedQuestionSignature) ? "input-required" : "completed";
   }
 }
 var init_task_state = __esm({
@@ -25625,6 +25654,9 @@ function decisionBlockFromParts(parts, planMode, at = (/* @__PURE__ */ new Date(
     at
   );
 }
+function attentionOutranksAsk(existing) {
+  return existing?.source === "reported" || existing?.source === "permission";
+}
 function withStampedQuestions(decision, existing) {
   if (decision.source !== "ask_user" || decision.questions?.length) return decision;
   if (existing?.source !== "ask_user" || !existing.questions?.length) return decision;
@@ -25638,12 +25670,37 @@ function agentBlockAfterTurn(input) {
   if (input.failed) return null;
   const decision = decisionBlockFromParts(input.parts, input.planMode);
   if (decision) {
+    if (decision.source === "ask_user" && attentionOutranksAsk(input.existing)) {
+      return input.existing ?? null;
+    }
     const next = withStampedQuestions(decision, input.existing);
     if (isDismissedAskUserBlock(next, input.dismissedQuestionSignature)) {
       return input.existing?.source === "reported" ? input.existing : null;
     }
     return next;
   }
+  const pending = extractPendingPlanQuestions(input.parts);
+  if (pending && attentionOutranksAsk(input.existing)) {
+    return input.existing ?? null;
+  }
+  if (pending) {
+    const kept = withStampedQuestions(
+      {
+        ...makeAgentBlock(
+          "ask_user",
+          formatAskUserNotifyMessage(pending.questions),
+          input.existing?.source === "ask_user" ? input.existing.at : void 0
+        ),
+        onScreen: true,
+        questionSignature: pending.signature,
+        questions: pending.questions
+      },
+      input.existing
+    );
+    if (!isDismissedAskUserBlock(kept, input.dismissedQuestionSignature)) return kept;
+  } else if (input.existing?.source === "ask_user" && input.existing.onScreen && input.existing.questions?.length && !isDismissedAskUserBlock(input.existing, input.dismissedQuestionSignature)) {
+    return input.existing;
+  }
   if (input.existing && input.existing.source !== "reported" && lastTopLevelTool(input.parts)) {
     return null;
   }
@@ -25672,11 +25729,15 @@ function askBlocksEqual(a, b) {
   if (!a || !b) return false;
   return a.source === b.source && a.reason === b.reason && a.at === b.at && a.onScreen === b.onScreen && a.questionSignature === b.questionSignature;
 }
-function askBlockAfterLiveParts(existing, parts) {
+function askBlockAfterLiveParts(existing, parts, dismissedQuestionSignature) {
+  if (attentionOutranksAsk(existing)) return existing ?? null;
+  if (isDismissedAskUserBlock(existing, dismissedQuestionSignature)) return null;
+  const dismissed = dismissedQuestionSignature?.trim() ?? "";
+  let pending = extractPendingPlanQuestions(parts);
+  if (dismissed && pending?.signature === dismissed) pending = null;
   const last = lastTopLevelTool(parts);
   if (last?.type === "tool" && isAskUserToolName(last.name)) {
     if (existing?.source === "ask_user" && existing.onScreen) return existing;
-    const pending = extractPendingPlanQuestions(parts);
     const questions2 = pending?.questions ?? existing?.questions;
     if (!questions2?.length) {
       return existing?.source === "ask_user" ? { ...existing, onScreen: true } : existing ?? null;
@@ -25689,13 +25750,32 @@ function askBlockAfterLiveParts(existing, parts) {
       questions: questions2
     };
   }
+  if (pending) {
+    if (existing?.source === "ask_user" && existing.onScreen && existing.questions?.length) {
+      return existing;
+    }
+    const at = existing?.source === "ask_user" ? existing.at : void 0;
+    return {
+      ...makeAgentBlock("ask_user", formatAskUserNotifyMessage(pending.questions), at),
+      onScreen: true,
+      questionSignature: pending.signature,
+      questions: pending.questions
+    };
+  }
+  if (existing?.source === "ask_user" && existing.onScreen && existing.questions?.length) {
+    return existing;
+  }
   if (last && existing?.source === "ask_user") return null;
   return existing ?? null;
 }
 function syncAskUserBlockFromLive(threadId, parts) {
   const thread = readThread(threadId);
   if (!thread || thread.status === "archived") return;
-  const next = askBlockAfterLiveParts(thread.agentBlock, parts);
+  const next = askBlockAfterLiveParts(
+    thread.agentBlock,
+    parts,
+    thread.dismissedQuestionSignature
+  );
   if (askBlocksEqual(thread.agentBlock, next)) return;
   updateThread(threadId, { agentBlock: next });
 }
@@ -34724,7 +34804,9 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
         const taskState2 = deriveTaskState({
           status: thread.status,
           stillRunning,
-          lastAgentParts: lastAgent?.parts
+          lastAgentParts: lastAgent?.parts,
+          dismissedQuestionSignature: thread.dismissedQuestionSignature,
+          userAnswered: userRepliedAfterAgent(thread.messages, lastAgent)
         });
         const block = thread.agentBlock?.reason?.trim() ? thread.agentBlock : null;
         return {

package/dist/index.d.cts

@@ -8,8 +8,9 @@ import { EventEmitter } from 'node:events';
  * Why an agent is waiting on a person. Process liveness stays on
  * `ThreadStatus`; this is the attention flag (Herdr `blocked`).
  * Cleared when the next user message starts a turn. An ask_user highlight
- * is shown only while that question is on screen in the agent, and drops
- * when the picker is gone (skip, a later user message, or the agent moved on).
+ * stays until the user answers or skips. A later tool in the same turn
+ * does not remove it — the tool returns immediately, and the model often
+ * keeps going before the person can answer.
  */
 type AgentBlockSource = 'ask_user' | 'plan' | 'reported' | 'permission';
 /** Composer Allow / Deny while a tool waits on the user. */
@@ -47,9 +48,9 @@ interface AgentBlock {
         }>;
     }>;
     /**
-     * True once ask_user is the last top-level tool in the live stream or
-     * the finished turn. A mid-turn stamp without this stays off the
-     * sidebar / board / phone until the picker is actually on screen.
+     * True once ask_user is in the live stream or the finished turn.
+     * A mid-turn stamp without this stays off the sidebar / board / phone
+     * until the picker is actually on screen. A later tool does not clear it.
      */
     onScreen?: boolean;
     permission?: AgentPermissionPrompt;
@@ -5833,7 +5834,7 @@ declare function applyThreadIntoMain(thread: Pick<Thread, 'repoPath' | 'worktree
  * |------------------|-----------------------------------------------------------|
  * | submitted        | queued — waiting for a concurrency slot, not started      |
  * | working          | the agent is running this turn                            |
- * | input-required   | turn ended on `ask_user`; the human must answer           |
+ * | input-required   | unanswered `ask_user`, even if a later tool ran           |
  * | completed        | turn ended with an answer                                 |
  * | failed           | runner / agent error, or worktree missing (`broken`)      |
  * | canceled         | force-stopped before finishing                            |
@@ -5855,6 +5856,9 @@ declare function deriveTaskState(input: {
     stillRunning: boolean;
     /** Parts of the last agent reply (not an injected notice). */
     lastAgentParts?: MessagePart[];
+    dismissedQuestionSignature?: string | null;
+    /** A real user message landed after the agent reply that asked. */
+    userAnswered?: boolean;
 }): TaskState;
 /** Snapshot returned by `getTurnResult`. Block fields are optional so older test doubles typecheck. */
 type TurnResult = {
@@ -6636,7 +6640,7 @@ type ToolPartLike = {
 };
 /** True when the last top-level tool (not a nested child) is ask_user. */
 declare function lastTopLevelToolIsAskUser(parts: ToolPartLike[] | undefined | null): boolean;
-/** Newest ask-user tool part with parseable questions (live or persisted). */
+/** Newest top-level ask-user tool with parseable questions. Nested calls do not count. */
 declare function extractPendingPlanQuestions(parts: ToolPartLike[] | undefined | null): PendingPlanQuestions | null;
 /** Sidebar ask_user highlight, including questions stamped at call time. */
 interface AskBlockSnapshot {
@@ -6644,6 +6648,8 @@ interface AskBlockSnapshot {
     at?: string;
     questionSignature?: string;
     questions?: PlanQuestion[];
+    /** Set once the picker is in the live stream. A mid-turn stamp omits it. */
+    onScreen?: boolean;
 }
 /**
  * True when no later user reply has landed after this ask.
@@ -6675,7 +6681,10 @@ declare function latestPendingPlanQuestions(input: {
      */
     agentBlock?: AskBlockSnapshot | null;
     dismissedQuestionSignature?: string | null;
-    /** Hide a mid-turn stamp until the ask is the last tool (or the turn ends). */
+    /**
+     * Hide a mid-turn stamp until the ask is in the stream (or the turn
+     * ends). Once the picker is on screen, a later tool must not hide it.
+     */
     status?: string;
 }): PendingPlanQuestions | null;
 interface PlanQuestionAnswer {
@@ -6994,7 +7003,7 @@ declare function worktreeBoardStatus(group: Array<Pick<Thread, 'status'>>): Thre
  * Blocked highlight. Errors and archived chats keep their own status.
  * An ask_user stamp lands when the tool is called — before the picker is on
  * screen — so hide it while the turn is in flight unless `onScreen` (the
- * live last tool is ask_user). Drop it once the chat is no longer asking.
+ * ask is in the live stream). Drop it once the user answers or skips.
  */
 declare function visibleAgentBlock(thread: AgentBlockThread): AgentBlock | null;
 /**

package/dist/index.d.ts

@@ -8,8 +8,9 @@ import { EventEmitter } from 'node:events';
  * Why an agent is waiting on a person. Process liveness stays on
  * `ThreadStatus`; this is the attention flag (Herdr `blocked`).
  * Cleared when the next user message starts a turn. An ask_user highlight
- * is shown only while that question is on screen in the agent, and drops
- * when the picker is gone (skip, a later user message, or the agent moved on).
+ * stays until the user answers or skips. A later tool in the same turn
+ * does not remove it — the tool returns immediately, and the model often
+ * keeps going before the person can answer.
  */
 type AgentBlockSource = 'ask_user' | 'plan' | 'reported' | 'permission';
 /** Composer Allow / Deny while a tool waits on the user. */
@@ -47,9 +48,9 @@ interface AgentBlock {
         }>;
     }>;
     /**
-     * True once ask_user is the last top-level tool in the live stream or
-     * the finished turn. A mid-turn stamp without this stays off the
-     * sidebar / board / phone until the picker is actually on screen.
+     * True once ask_user is in the live stream or the finished turn.
+     * A mid-turn stamp without this stays off the sidebar / board / phone
+     * until the picker is actually on screen. A later tool does not clear it.
      */
     onScreen?: boolean;
     permission?: AgentPermissionPrompt;
@@ -5833,7 +5834,7 @@ declare function applyThreadIntoMain(thread: Pick<Thread, 'repoPath' | 'worktree
  * |------------------|-----------------------------------------------------------|
  * | submitted        | queued — waiting for a concurrency slot, not started      |
  * | working          | the agent is running this turn                            |
- * | input-required   | turn ended on `ask_user`; the human must answer           |
+ * | input-required   | unanswered `ask_user`, even if a later tool ran           |
  * | completed        | turn ended with an answer                                 |
  * | failed           | runner / agent error, or worktree missing (`broken`)      |
  * | canceled         | force-stopped before finishing                            |
@@ -5855,6 +5856,9 @@ declare function deriveTaskState(input: {
     stillRunning: boolean;
     /** Parts of the last agent reply (not an injected notice). */
     lastAgentParts?: MessagePart[];
+    dismissedQuestionSignature?: string | null;
+    /** A real user message landed after the agent reply that asked. */
+    userAnswered?: boolean;
 }): TaskState;
 /** Snapshot returned by `getTurnResult`. Block fields are optional so older test doubles typecheck. */
 type TurnResult = {
@@ -6636,7 +6640,7 @@ type ToolPartLike = {
 };
 /** True when the last top-level tool (not a nested child) is ask_user. */
 declare function lastTopLevelToolIsAskUser(parts: ToolPartLike[] | undefined | null): boolean;
-/** Newest ask-user tool part with parseable questions (live or persisted). */
+/** Newest top-level ask-user tool with parseable questions. Nested calls do not count. */
 declare function extractPendingPlanQuestions(parts: ToolPartLike[] | undefined | null): PendingPlanQuestions | null;
 /** Sidebar ask_user highlight, including questions stamped at call time. */
 interface AskBlockSnapshot {
@@ -6644,6 +6648,8 @@ interface AskBlockSnapshot {
     at?: string;
     questionSignature?: string;
     questions?: PlanQuestion[];
+    /** Set once the picker is in the live stream. A mid-turn stamp omits it. */
+    onScreen?: boolean;
 }
 /**
  * True when no later user reply has landed after this ask.
@@ -6675,7 +6681,10 @@ declare function latestPendingPlanQuestions(input: {
      */
     agentBlock?: AskBlockSnapshot | null;
     dismissedQuestionSignature?: string | null;
-    /** Hide a mid-turn stamp until the ask is the last tool (or the turn ends). */
+    /**
+     * Hide a mid-turn stamp until the ask is in the stream (or the turn
+     * ends). Once the picker is on screen, a later tool must not hide it.
+     */
     status?: string;
 }): PendingPlanQuestions | null;
 interface PlanQuestionAnswer {
@@ -6994,7 +7003,7 @@ declare function worktreeBoardStatus(group: Array<Pick<Thread, 'status'>>): Thre
  * Blocked highlight. Errors and archived chats keep their own status.
  * An ask_user stamp lands when the tool is called — before the picker is on
  * screen — so hide it while the turn is in flight unless `onScreen` (the
- * live last tool is ask_user). Drop it once the chat is no longer asking.
+ * ask is in the live stream). Drop it once the user answers or skips.
  */
 declare function visibleAgentBlock(thread: AgentBlockThread): AgentBlock | null;
 /**

package/dist/index.js

@@ -218,7 +218,7 @@ import {
   worktreeCleanupSettings,
   writeAgentBlock,
   writeWorktreeFile
-} from "./chunk-DEB47BII.js";
+} from "./chunk-WD222BVP.js";
 import {
   OPTIONAL_SERVICES,
   OPTIONAL_SERVICE_IDS,
@@ -512,7 +512,7 @@ import {
   workspaceAgentChatSummaries,
   worktreeRunPortsPath,
   wrapReviewSkillMarkdown
-} from "./chunk-IXWPCOLQ.js";
+} from "./chunk-X3XTO45Y.js";
 import {
   STDERR_EVENT_MAX_CHARS,
   STDOUT_EVENT_MAX_CHARS,
@@ -833,7 +833,7 @@ import {
   latestPendingPlanQuestions,
   parsePlanQuestionsInput,
   planQuestionsSignature
-} from "./chunk-ULWPSBAB.js";
+} from "./chunk-NJV5YEKI.js";
 import {
   BASE_ALLOWED_TOOLS,
   CLAUDE_CHROME_ALLOWED_TOOLS,
@@ -7685,7 +7685,7 @@ async function startHeadlessHost(opts) {
   };
   const refreshRunning = async () => {
     try {
-      const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-EN3ZKD73.js");
+      const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-YY2JUYKD.js");
       agentsRunning = getOrchestrator2().getRuntime().running;
     } catch {
       agentsRunning = 0;
@@ -9828,7 +9828,7 @@ async function handleJobStop(params, _ctx) {
   return stopDetachedJob(jobCwd(rec), id, reason ? { reason } : void 0);
 }
 async function defaultTurnWait(ref, timeoutMs) {
-  const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-EN3ZKD73.js");
+  const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-YY2JUYKD.js");
   const orch = getOrchestrator2();
   const thread = await orch.waitForTurn(ref, timeoutMs, {
     resolveIfStillRunning: true
@@ -13496,7 +13496,7 @@ async function continueSourceThread(threadId, prompt) {
       await continueOnReply(threadId, prompt);
       return;
     }
-    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-EN3ZKD73.js");
+    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-YY2JUYKD.js");
     await getOrchestrator2().send(threadId, prompt);
   } catch {
   }

package/dist/mcp/run-stdio.cjs

@@ -2153,16 +2153,6 @@ function isAskUserToolName(name) {
   const base = name.replace(/^mcp__sideboard__/i, "");
   return ASK_USER_TOOL_RE.test(name) || /^ask_user$/i.test(base);
 }
-function lastTopLevelToolIsAskUser(parts) {
-  if (!parts?.length) return false;
-  for (let i = parts.length - 1; i >= 0; i--) {
-    const part = parts[i];
-    if (part.type === "tool" && !part.parentId) {
-      return isAskUserToolName(part.name);
-    }
-  }
-  return false;
-}
 function questionsFromToolPart(part) {
   const fromInput = parsePlanQuestionsInput(part.input);
   if (fromInput.length) return fromInput;
@@ -2178,7 +2168,7 @@ 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;
+    if (p.type !== "tool" || p.parentId || !isAskUserToolName(p.name)) continue;
     const questions = questionsFromToolPart(p);
     if (!questions.length) continue;
     return {
@@ -2217,8 +2207,32 @@ function isIncompleteTaskState(state) {
 function needsCoordinatorAction(state) {
   return isIncompleteTaskState(state) || state === "input-required";
 }
-function endedOnAskUser(parts) {
-  return lastTopLevelToolIsAskUser(parts);
+function turnWaitingOnAskUser(parts, dismissedQuestionSignature) {
+  if (!parts?.length) return false;
+  let ask = null;
+  for (let i = parts.length - 1; i >= 0; i--) {
+    const part = parts[i];
+    if (part.type === "tool" && !part.parentId && isAskUserToolName(part.name)) {
+      ask = part;
+      break;
+    }
+  }
+  if (!ask) return false;
+  const dismissed = dismissedQuestionSignature?.trim();
+  if (!dismissed) return true;
+  const pending = extractPendingPlanQuestions([ask]);
+  if (!pending?.signature) return false;
+  return pending.signature !== dismissed;
+}
+function userRepliedAfterAgent(messages, lastAgent) {
+  if (!messages || !lastAgent) return false;
+  const index = messages.lastIndexOf(lastAgent);
+  if (index < 0) return false;
+  for (let i = index + 1; i < messages.length; i++) {
+    const message = messages[i];
+    if (message.role === "user" && message.origin !== "continue") return true;
+  }
+  return false;
 }
 function deriveTaskState(input) {
   if (input.stillRunning) {
@@ -2231,7 +2245,7 @@ function deriveTaskState(input) {
     case "stopped":
       return "canceled";
     default:
-      return endedOnAskUser(input.lastAgentParts) ? "input-required" : "completed";
+      return !input.userAnswered && turnWaitingOnAskUser(input.lastAgentParts, input.dismissedQuestionSignature) ? "input-required" : "completed";
   }
 }
 var init_task_state = __esm({
@@ -22413,6 +22427,9 @@ function decisionBlockFromParts(parts, planMode, at = (/* @__PURE__ */ new Date(
     at
   );
 }
+function attentionOutranksAsk(existing) {
+  return existing?.source === "reported" || existing?.source === "permission";
+}
 function withStampedQuestions(decision, existing) {
   if (decision.source !== "ask_user" || decision.questions?.length) return decision;
   if (existing?.source !== "ask_user" || !existing.questions?.length) return decision;
@@ -22426,12 +22443,37 @@ function agentBlockAfterTurn(input) {
   if (input.failed) return null;
   const decision = decisionBlockFromParts(input.parts, input.planMode);
   if (decision) {
+    if (decision.source === "ask_user" && attentionOutranksAsk(input.existing)) {
+      return input.existing ?? null;
+    }
     const next = withStampedQuestions(decision, input.existing);
     if (isDismissedAskUserBlock(next, input.dismissedQuestionSignature)) {
       return input.existing?.source === "reported" ? input.existing : null;
     }
     return next;
   }
+  const pending = extractPendingPlanQuestions(input.parts);
+  if (pending && attentionOutranksAsk(input.existing)) {
+    return input.existing ?? null;
+  }
+  if (pending) {
+    const kept = withStampedQuestions(
+      {
+        ...makeAgentBlock(
+          "ask_user",
+          formatAskUserNotifyMessage(pending.questions),
+          input.existing?.source === "ask_user" ? input.existing.at : void 0
+        ),
+        onScreen: true,
+        questionSignature: pending.signature,
+        questions: pending.questions
+      },
+      input.existing
+    );
+    if (!isDismissedAskUserBlock(kept, input.dismissedQuestionSignature)) return kept;
+  } else if (input.existing?.source === "ask_user" && input.existing.onScreen && input.existing.questions?.length && !isDismissedAskUserBlock(input.existing, input.dismissedQuestionSignature)) {
+    return input.existing;
+  }
   if (input.existing && input.existing.source !== "reported" && lastTopLevelTool(input.parts)) {
     return null;
   }
@@ -22460,11 +22502,15 @@ function askBlocksEqual(a, b) {
   if (!a || !b) return false;
   return a.source === b.source && a.reason === b.reason && a.at === b.at && a.onScreen === b.onScreen && a.questionSignature === b.questionSignature;
 }
-function askBlockAfterLiveParts(existing, parts) {
+function askBlockAfterLiveParts(existing, parts, dismissedQuestionSignature) {
+  if (attentionOutranksAsk(existing)) return existing ?? null;
+  if (isDismissedAskUserBlock(existing, dismissedQuestionSignature)) return null;
+  const dismissed = dismissedQuestionSignature?.trim() ?? "";
+  let pending = extractPendingPlanQuestions(parts);
+  if (dismissed && pending?.signature === dismissed) pending = null;
   const last = lastTopLevelTool(parts);
   if (last?.type === "tool" && isAskUserToolName(last.name)) {
     if (existing?.source === "ask_user" && existing.onScreen) return existing;
-    const pending = extractPendingPlanQuestions(parts);
     const questions = pending?.questions ?? existing?.questions;
     if (!questions?.length) {
       return existing?.source === "ask_user" ? { ...existing, onScreen: true } : existing ?? null;
@@ -22477,13 +22523,32 @@ function askBlockAfterLiveParts(existing, parts) {
       questions
     };
   }
+  if (pending) {
+    if (existing?.source === "ask_user" && existing.onScreen && existing.questions?.length) {
+      return existing;
+    }
+    const at = existing?.source === "ask_user" ? existing.at : void 0;
+    return {
+      ...makeAgentBlock("ask_user", formatAskUserNotifyMessage(pending.questions), at),
+      onScreen: true,
+      questionSignature: pending.signature,
+      questions: pending.questions
+    };
+  }
+  if (existing?.source === "ask_user" && existing.onScreen && existing.questions?.length) {
+    return existing;
+  }
   if (last && existing?.source === "ask_user") return null;
   return existing ?? null;
 }
 function syncAskUserBlockFromLive(threadId, parts) {
   const thread = readThread(threadId);
   if (!thread || thread.status === "archived") return;
-  const next = askBlockAfterLiveParts(thread.agentBlock, parts);
+  const next = askBlockAfterLiveParts(
+    thread.agentBlock,
+    parts,
+    thread.dismissedQuestionSignature
+  );
   if (askBlocksEqual(thread.agentBlock, next)) return;
   updateThread(threadId, { agentBlock: next });
 }
@@ -32213,7 +32278,9 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
         const taskState = deriveTaskState({
           status: thread.status,
           stillRunning,
-          lastAgentParts: lastAgent?.parts
+          lastAgentParts: lastAgent?.parts,
+          dismissedQuestionSignature: thread.dismissedQuestionSignature,
+          userAnswered: userRepliedAfterAgent(thread.messages, lastAgent)
         });
         const block = thread.agentBlock?.reason?.trim() ? thread.agentBlock : null;
         return {

package/dist/mcp/run-stdio.js

@@ -45,7 +45,7 @@ import {
   syncBoardPins,
   workspaceTagTargetRef,
   writeAgentBlock
-} from "../chunk-YUHZEIVG.js";
+} from "../chunk-XOMVOBPU.js";
 import "../chunk-DC3VZXMA.js";
 import {
   SIDEBOARD_THREAD_ID_ENV,
@@ -66,7 +66,7 @@ import {
   waitForDetachedJob,
   waitForTurnToolResult,
   workspaceAgentChatSummaries
-} from "../chunk-RZJ3QJZT.js";
+} from "../chunk-EYDLXVED.js";
 import {
   HUGE_TOOL_RESULT_SUMMARY,
   clipToolResultForStore,

package/dist/{orchestrator-W4TZBBDO.js → orchestrator-3F53AZEN.js}

@@ -11,10 +11,10 @@ import {
   resolveSendFollowUp,
   startOrchestration,
   waitForPidExit
-} from "./chunk-YUHZEIVG.js";
+} from "./chunk-XOMVOBPU.js";
 import "./chunk-DC3VZXMA.js";
 import "./chunk-MO46K6WK.js";
-import "./chunk-RZJ3QJZT.js";
+import "./chunk-EYDLXVED.js";
 import "./chunk-5MXLDDYF.js";
 import "./chunk-LX5R5JOR.js";
 import "./chunk-2GEUFPQQ.js";

package/dist/{orchestrator-EN3ZKD73.js → orchestrator-YY2JUYKD.js}

@@ -9,7 +9,7 @@ import {
   resolveSendFollowUp,
   startOrchestration,
   waitForPidExit
-} from "./chunk-DEB47BII.js";
+} from "./chunk-WD222BVP.js";
 import "./chunk-ECY7WL6T.js";
 import "./chunk-PGPSIEMW.js";
 import "./chunk-W3ZLE4PO.js";
@@ -17,7 +17,7 @@ import "./chunk-NQGLDQYB.js";
 import "./chunk-KLVW3J2B.js";
 import "./chunk-S5CJUIPY.js";
 import "./chunk-ATQLP22S.js";
-import "./chunk-IXWPCOLQ.js";
+import "./chunk-X3XTO45Y.js";
 import "./chunk-OOXRMTU6.js";
 import "./chunk-7H655NEW.js";
 import "./chunk-RDXODLEN.js";
@@ -26,7 +26,7 @@ import "./chunk-Y6OHM672.js";
 import "./chunk-QKHEVSB5.js";
 import "./chunk-RSA47QYR.js";
 import "./chunk-JAT3JFOS.js";
-import "./chunk-ULWPSBAB.js";
+import "./chunk-NJV5YEKI.js";
 import "./chunk-N6ZF3XRP.js";
 import "./chunk-AXQ4ZWHK.js";
 import "./chunk-NURZOXGN.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sideboard-ai/core",
-  "version": "0.1.327",
+  "version": "0.1.328",
   "description": "Sideboard core — orchestration, agents, git worktrees, MCP server",
   "license": "Apache-2.0",
   "type": "module",