@sideboard-ai/core 0.1.310 → 0.1.311

package/dist/{chunk-IT6A4FZF.js → chunk-2ER7DQJP.js}

@@ -18,6 +18,7 @@ import {
 import {
   REVIEW_TAB_TITLE,
   applyWorktreePkgCacheEnv,
+  askBlockStillWaiting,
   buildBrightsySessionSeed,
   buildForkTranscriptAttachment,
   buildSessionSeed,
@@ -55,7 +56,7 @@ import {
   worktreeDevProcessKey,
   worktreeRunProcessKey,
   worktreeSetupProcessKey
-} from "./chunk-VBVSJUM2.js";
+} from "./chunk-QC2TQMPJ.js";
 import {
   applyAgentEvent,
   clipAgentEventForPaint,
@@ -1643,6 +1644,11 @@ function visibleAgentBlock(thread) {
   const block = thread.agentBlock;
   if (!block?.reason?.trim()) return null;
   if (isDismissedAskUserBlock(block, thread.dismissedQuestionSignature)) return null;
+  if (block.source === "ask_user") {
+    const inFlight = thread.status === "running" || thread.status === "queued";
+    if (inFlight && !block.onScreen) return null;
+    if (!askBlockStillWaiting(block, thread.messages)) return null;
+  }
   return block;
 }
 function worktreeAgentBlock(group) {
@@ -1817,6 +1823,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),
+      onScreen: true,
       ...pending ? { questionSignature: pending.signature, questions: pending.questions } : {}
     };
   }
@@ -1874,6 +1881,38 @@ function dismissAskUserQuestion(threadId, signature) {
     ...clearBlock ? { agentBlock: null } : {}
   });
 }
+function askBlocksEqual(a, b) {
+  if (a === b) return true;
+  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) {
+  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;
+    }
+    const at = existing?.source === "ask_user" ? existing.at : void 0;
+    return {
+      ...makeAgentBlock("ask_user", formatAskUserNotifyMessage(questions), at),
+      onScreen: true,
+      questionSignature: pending?.signature ?? existing?.questionSignature,
+      questions
+    };
+  }
+  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);
+  if (askBlocksEqual(thread.agentBlock, next)) return;
+  updateThread(threadId, { agentBlock: next });
+}
 function writeAgentBlock(threadId, block) {
   const thread = readThread(threadId);
   if (!thread || thread.status === "archived") return;
@@ -3419,6 +3458,7 @@ function noteTurnLiveEvent(threadId, event) {
   const prev = buffers.get(threadId) ?? { parts: [], timer: null };
   prev.parts = trimParts(applyAgentEvent(prev.parts, event));
   buffers.set(threadId, prev);
+  syncAskUserBlockFromLive(threadId, prev.parts);
   if (event.type === "exit") {
     flush(threadId);
     const cur = buffers.get(threadId);
@@ -6741,7 +6781,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-XFE3U3RP.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-2CCFGYAA.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),

package/dist/{chunk-JXOW5JAW.js → chunk-7ORMOP3D.js}

@@ -31,6 +31,7 @@ import {
 import {
   REVIEW_TAB_TITLE,
   applyWorktreePkgCacheEnv,
+  askBlockStillWaiting,
   buildBrightsySessionSeed,
   buildForkTranscriptAttachment,
   buildSessionSeed,
@@ -68,7 +69,7 @@ import {
   worktreeDevProcessKey,
   worktreeRunProcessKey,
   worktreeSetupProcessKey
-} from "./chunk-AILQRQ26.js";
+} from "./chunk-ZW7RSQHY.js";
 import {
   applyAgentEvent,
   clipAgentEventForPaint,
@@ -1546,6 +1547,11 @@ function visibleAgentBlock(thread) {
   const block = thread.agentBlock;
   if (!block?.reason?.trim()) return null;
   if (isDismissedAskUserBlock(block, thread.dismissedQuestionSignature)) return null;
+  if (block.source === "ask_user") {
+    const inFlight = thread.status === "running" || thread.status === "queued";
+    if (inFlight && !block.onScreen) return null;
+    if (!askBlockStillWaiting(block, thread.messages)) return null;
+  }
   return block;
 }
 function worktreeAgentBlock(group) {
@@ -1703,6 +1709,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),
+      onScreen: true,
       ...pending ? { questionSignature: pending.signature, questions: pending.questions } : {}
     };
   }
@@ -1760,6 +1767,38 @@ function dismissAskUserQuestion(threadId, signature) {
     ...clearBlock ? { agentBlock: null } : {}
   });
 }
+function askBlocksEqual(a, b) {
+  if (a === b) return true;
+  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) {
+  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;
+    }
+    const at = existing?.source === "ask_user" ? existing.at : void 0;
+    return {
+      ...makeAgentBlock("ask_user", formatAskUserNotifyMessage(questions), at),
+      onScreen: true,
+      questionSignature: pending?.signature ?? existing?.questionSignature,
+      questions
+    };
+  }
+  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);
+  if (askBlocksEqual(thread.agentBlock, next)) return;
+  updateThread(threadId, { agentBlock: next });
+}
 function writeAgentBlock(threadId, block) {
   const thread = readThread(threadId);
   if (!thread || thread.status === "archived") return;
@@ -3117,6 +3156,7 @@ function noteTurnLiveEvent(threadId, event) {
   const prev = buffers.get(threadId) ?? { parts: [], timer: null };
   prev.parts = trimParts(applyAgentEvent(prev.parts, event));
   buffers.set(threadId, prev);
+  syncAskUserBlockFromLive(threadId, prev.parts);
   if (event.type === "exit") {
     flush(threadId);
     const cur = buffers.get(threadId);
@@ -6389,7 +6429,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-7374OI7T.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-3W5S6TNP.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),

package/dist/{chunk-VBVSJUM2.js → chunk-QC2TQMPJ.js}

@@ -1288,6 +1288,19 @@ 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 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;
@@ -1330,6 +1343,7 @@ function pendingFromAskBlock(block, dismissedQuestionSignature) {
   };
 }
 function askBlockStillWaiting(block, messages) {
+  if (!messages?.length) return Boolean(block?.at);
   const askedAt = block?.at;
   if (!askedAt) return false;
   for (let i = messages.length - 1; i >= 0; i--) {
@@ -1342,19 +1356,21 @@ function askBlockStillWaiting(block, messages) {
 }
 function latestPendingPlanQuestions(input) {
   if (input.userReplied) return null;
-  const fromLive = extractPendingPlanQuestions(input.liveParts);
-  if (fromLive) return fromLive;
+  const fromBlock = () => pendingFromAskBlock(input.agentBlock, input.dismissedQuestionSignature);
+  if (lastTopLevelToolIsAskUser(input.liveParts)) {
+    return extractPendingPlanQuestions(input.liveParts) ?? fromBlock();
+  }
   const last = input.messages[input.messages.length - 1];
-  if (last?.role === "agent") {
-    const fromParts = extractPendingPlanQuestions(last.parts);
-    if (fromParts) return fromParts;
+  if (last?.role === "agent" && lastTopLevelToolIsAskUser(last.parts)) {
+    return extractPendingPlanQuestions(last.parts) ?? fromBlock();
   }
-  const fromBlock = pendingFromAskBlock(
-    input.agentBlock,
-    input.dismissedQuestionSignature
-  );
-  if (fromBlock && askBlockStillWaiting(input.agentBlock, input.messages)) {
-    return fromBlock;
+  if (hasTopLevelTool(input.liveParts) || last?.role === "agent" && hasTopLevelTool(last.parts)) {
+    return null;
+  }
+  if (input.status === "running" || input.status === "queued") return null;
+  const stamped = fromBlock();
+  if (stamped && askBlockStillWaiting(input.agentBlock, input.messages)) {
+    return stamped;
   }
   return null;
 }
@@ -1407,14 +1423,7 @@ function needsCoordinatorAction(state) {
   return isIncompleteTaskState(state) || state === "input-required";
 }
 function endedOnAskUser(parts) {
-  if (!parts?.length) return false;
-  for (let i = parts.length - 1; i >= 0; i--) {
-    const p = parts[i];
-    if (p.type === "tool" && !p.parentId) {
-      return isAskUserToolName(p.name);
-    }
-  }
-  return false;
+  return lastTopLevelToolIsAskUser(parts);
 }
 function deriveTaskState(input) {
   if (input.stillRunning) {
@@ -1823,7 +1832,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-OFXA5BST.js");
+  const { killListenersOnPorts: killListenersOnPorts2, killStaleWorktreeListeners: killStaleWorktreeListeners2 } = await import("./conductor-YOBSYPLT.js");
   if (worktreePath) killStaleWorktreeListeners2(ports, worktreePath, signal);
   else killListenersOnPorts2(ports);
 }
@@ -2507,7 +2516,9 @@ export {
   planQuestionsSignature,
   parsePlanQuestionsInput,
   isAskUserToolName,
+  lastTopLevelToolIsAskUser,
   extractPendingPlanQuestions,
+  askBlockStillWaiting,
   latestPendingPlanQuestions,
   PLAN_QUESTION_ANSWERS_PREFIX,
   isPlanQuestionAnswersMessage,

package/dist/{chunk-AILQRQ26.js → chunk-ZW7RSQHY.js}

@@ -1235,6 +1235,16 @@ 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;
@@ -1262,6 +1272,18 @@ function extractPendingPlanQuestions(parts) {
   }
   return null;
 }
+function askBlockStillWaiting(block, messages) {
+  if (!messages?.length) return Boolean(block?.at);
+  const askedAt = block?.at;
+  if (!askedAt) return false;
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const message = messages[i];
+    if (message.role !== "user" || message.origin === "continue") continue;
+    if (!message.ts) return true;
+    return askedAt > message.ts;
+  }
+  return true;
+}
 
 // src/orchestrator/task-state.ts
 function isIncompleteTaskState(state) {
@@ -1271,14 +1293,7 @@ function needsCoordinatorAction(state) {
   return isIncompleteTaskState(state) || state === "input-required";
 }
 function endedOnAskUser(parts) {
-  if (!parts?.length) return false;
-  for (let i = parts.length - 1; i >= 0; i--) {
-    const p = parts[i];
-    if (p.type === "tool" && !p.parentId) {
-      return isAskUserToolName(p.name);
-    }
-  }
-  return false;
+  return lastTopLevelToolIsAskUser(parts);
 }
 function deriveTaskState(input) {
   if (input.stillRunning) {
@@ -1687,7 +1702,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-AMZ5SKG2.js");
+  const { killListenersOnPorts: killListenersOnPorts2, killStaleWorktreeListeners: killStaleWorktreeListeners2 } = await import("./conductor-CTWR6NH4.js");
   if (worktreePath) killStaleWorktreeListeners2(ports, worktreePath, signal);
   else killListenersOnPorts2(ports);
 }
@@ -2372,6 +2387,7 @@ export {
   parsePlanQuestionsInput,
   isAskUserToolName,
   extractPendingPlanQuestions,
+  askBlockStillWaiting,
   needsCoordinatorAction,
   deriveTaskState,
   mcpWaitForTurnTimeoutMs,

package/dist/{conductor-AMZ5SKG2.js → conductor-CTWR6NH4.js}

@@ -34,7 +34,7 @@ import {
   tryReservePort,
   tryReservePorts,
   worktreeRunPortsPath
-} from "./chunk-AILQRQ26.js";
+} from "./chunk-ZW7RSQHY.js";
 import "./chunk-I5TESHDN.js";
 import "./chunk-X3FSWWW2.js";
 import "./chunk-DLGGLV2M.js";

package/dist/{conductor-OFXA5BST.js → conductor-YOBSYPLT.js}

@@ -32,7 +32,7 @@ import {
   tryReservePort,
   tryReservePorts,
   worktreeRunPortsPath
-} from "./chunk-VBVSJUM2.js";
+} from "./chunk-QC2TQMPJ.js";
 import "./chunk-7Q327QF2.js";
 import "./chunk-5QX2NYXL.js";
 import "./chunk-BIPXOHZI.js";