@sideboard-ai/core 0.1.306 → 0.1.308

package/dist/{chunk-OVNIP265.js → chunk-CTFBZZGZ.js}

@@ -1288,12 +1288,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}`,
@@ -1304,13 +1315,47 @@ function extractPendingPlanQuestions(parts) {
   }
   return null;
 }
+function pendingFromAskBlock(block, dismissedQuestionSignature) {
+  if (!block || block.source !== "ask_user" || !block.questions?.length) return null;
+  const dismissed = dismissedQuestionSignature?.trim();
+  if (dismissed && (!block.questionSignature || block.questionSignature === dismissed)) {
+    return null;
+  }
+  const signature = block.questionSignature?.trim() || planQuestionsSignature(block.questions);
+  return {
+    id: `ask-block:${signature}`,
+    signature,
+    questions: block.questions,
+    source: "ask_user"
+  };
+}
+function askBlockStillWaiting(block, messages) {
+  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;
+}
 function latestPendingPlanQuestions(input) {
   if (input.userReplied) return null;
   const fromLive = extractPendingPlanQuestions(input.liveParts);
   if (fromLive) return fromLive;
   const last = input.messages[input.messages.length - 1];
-  if (last?.role === "user") return null;
-  if (last?.role === "agent") return extractPendingPlanQuestions(last.parts);
+  if (last?.role === "agent") {
+    const fromParts = extractPendingPlanQuestions(last.parts);
+    if (fromParts) return fromParts;
+  }
+  const fromBlock = pendingFromAskBlock(
+    input.agentBlock,
+    input.dismissedQuestionSignature
+  );
+  if (fromBlock && askBlockStillWaiting(input.agentBlock, input.messages)) {
+    return fromBlock;
+  }
   return null;
 }
 var PLAN_QUESTION_ANSWERS_PREFIX = "Answers to your questions:";
@@ -1778,7 +1823,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-YBXURAUL.js");
+  const { killListenersOnPorts: killListenersOnPorts2, killStaleWorktreeListeners: killStaleWorktreeListeners2 } = await import("./conductor-IPIMGUR4.js");
   if (worktreePath) killStaleWorktreeListeners2(ports, worktreePath, signal);
   else killListenersOnPorts2(ports);
 }

package/dist/{chunk-WBCKUFXC.js → chunk-GXFOZ5XL.js}

@@ -55,7 +55,7 @@ import {
   worktreeDevProcessKey,
   worktreeRunProcessKey,
   worktreeSetupProcessKey
-} from "./chunk-OVNIP265.js";
+} from "./chunk-CTFBZZGZ.js";
 import {
   applyAgentEvent,
   clipAgentEventForPaint,
@@ -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 {
   }
@@ -5837,6 +5868,15 @@ function connectedOrchestratorTurnReminder(thread, find) {
 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.';
+}
+function claudeSubagentTurnReminder(thread) {
+  if (thread.agent !== "claude" || thread.planMode || isOrchestratorThread(thread)) {
+    return null;
+  }
+  return formatClaudeSubagentReminder();
+}
 var PR_GOAL_RE = /greptile|\bci\b.*\b(green|pass)|checks?\s+(pass|green)|until\s+.*\b(pass|green|merge|clean)|\bfix ci\b|watch[- ]fix[- ]push/i;
 function mentionsPrGoal(prompt) {
   return PR_GOAL_RE.test(prompt);
@@ -6701,7 +6741,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-XP5S4E5F.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-SJU5LYAO.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -7773,6 +7813,7 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
       );
       const turnReminders = [
         worktreeReminder,
+        claudeSubagentTurnReminder(thread),
         connectedOrchestratorTurnReminder(thread, (id) => readThread(id)),
         optionalServicesReminder,
         issueToolsReminder,
@@ -9611,6 +9652,9 @@ export {
   worktreeBoardStatus,
   visibleAgentBlock,
   worktreeAgentBlock,
+  sidebarRowAgentBlock,
+  sidebarParentSelectId,
+  sidebarQuestionThreadId,
   reviewLabelForRepo,
   classifyWorktreeListBadges,
   isHomeBoardThread,
@@ -9764,6 +9808,8 @@ export {
   formatConnectedOrchestratorReminder,
   connectedOrchestratorTurnReminder,
   formatWorktreeReminder,
+  formatClaudeSubagentReminder,
+  claudeSubagentTurnReminder,
   mentionsPrGoal,
   issueTicketFromThread,
   linearTicketIdFromThread,

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

@@ -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-E6M3BATZ.js");
   if (worktreePath) killStaleWorktreeListeners2(ports, worktreePath, signal);
   else killListenersOnPorts2(ports);
 }

package/dist/{chunk-32IN7PXB.js → chunk-T6TEANP5.js}

@@ -68,7 +68,7 @@ import {
   worktreeDevProcessKey,
   worktreeRunProcessKey,
   worktreeSetupProcessKey
-} from "./chunk-5SFA27CF.js";
+} from "./chunk-HRPSFU4Q.js";
 import {
   applyAgentEvent,
   clipAgentEventForPaint,
@@ -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 {
   }
@@ -5533,6 +5547,15 @@ function connectedOrchestratorTurnReminder(thread, find) {
 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.';
+}
+function claudeSubagentTurnReminder(thread) {
+  if (thread.agent !== "claude" || thread.planMode || isOrchestratorThread(thread)) {
+    return null;
+  }
+  return formatClaudeSubagentReminder();
+}
 var PR_GOAL_RE = /greptile|\bci\b.*\b(green|pass)|checks?\s+(pass|green)|until\s+.*\b(pass|green|merge|clean)|\bfix ci\b|watch[- ]fix[- ]push/i;
 function mentionsPrGoal(prompt) {
   return PR_GOAL_RE.test(prompt);
@@ -6366,7 +6389,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-UXHU766C.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-JTDQ47H7.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -7438,6 +7461,7 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
       );
       const turnReminders = [
         worktreeReminder,
+        claudeSubagentTurnReminder(thread),
         connectedOrchestratorTurnReminder(thread, (id) => readThread(id)),
         optionalServicesReminder,
         issueToolsReminder,

package/dist/{conductor-ZFRXTVGP.js → conductor-E6M3BATZ.js}

@@ -34,7 +34,7 @@ import {
   tryReservePort,
   tryReservePorts,
   worktreeRunPortsPath
-} from "./chunk-5SFA27CF.js";
+} from "./chunk-HRPSFU4Q.js";
 import "./chunk-5XQ43YZU.js";
 import "./chunk-X3FSWWW2.js";
 import "./chunk-DLGGLV2M.js";

package/dist/{conductor-YBXURAUL.js → conductor-IPIMGUR4.js}

@@ -32,7 +32,7 @@ import {
   tryReservePort,
   tryReservePorts,
   worktreeRunPortsPath
-} from "./chunk-OVNIP265.js";
+} from "./chunk-CTFBZZGZ.js";
 import "./chunk-F36QRDM4.js";
 import "./chunk-5QX2NYXL.js";
 import "./chunk-BIPXOHZI.js";

package/dist/index.cjs

@@ -6746,6 +6746,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;
@@ -8339,12 +8356,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 questions2 = parsePlanQuestionsInput(p.input);
+    const questions2 = questionsFromToolPart(p);
     if (!questions2.length) continue;
     return {
       id: p.id || `ask-${i}`,
@@ -8355,13 +8383,47 @@ function extractPendingPlanQuestions(parts) {
   }
   return null;
 }
+function pendingFromAskBlock(block, dismissedQuestionSignature) {
+  if (!block || block.source !== "ask_user" || !block.questions?.length) return null;
+  const dismissed = dismissedQuestionSignature?.trim();
+  if (dismissed && (!block.questionSignature || block.questionSignature === dismissed)) {
+    return null;
+  }
+  const signature = block.questionSignature?.trim() || planQuestionsSignature(block.questions);
+  return {
+    id: `ask-block:${signature}`,
+    signature,
+    questions: block.questions,
+    source: "ask_user"
+  };
+}
+function askBlockStillWaiting(block, messages) {
+  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;
+}
 function latestPendingPlanQuestions(input) {
   if (input.userReplied) return null;
   const fromLive = extractPendingPlanQuestions(input.liveParts);
   if (fromLive) return fromLive;
   const last = input.messages[input.messages.length - 1];
-  if (last?.role === "user") return null;
-  if (last?.role === "agent") return extractPendingPlanQuestions(last.parts);
+  if (last?.role === "agent") {
+    const fromParts = extractPendingPlanQuestions(last.parts);
+    if (fromParts) return fromParts;
+  }
+  const fromBlock = pendingFromAskBlock(
+    input.agentBlock,
+    input.dismissedQuestionSignature
+  );
+  if (fromBlock && askBlockStillWaiting(input.agentBlock, input.messages)) {
+    return fromBlock;
+  }
   return null;
 }
 function isPlanQuestionAnswersMessage(text7) {
@@ -22161,7 +22223,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;
@@ -22176,14 +22238,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;
@@ -22226,7 +22298,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 });
@@ -22249,7 +22321,11 @@ function stampAskUserBlock(resolveCaller, questions2) {
   try {
     writeAgentBlock(
       resolveCaller().id,
-      parsed.length ? { ...block, questionSignature: planQuestionsSignature(parsed) } : block
+      parsed.length ? {
+        ...block,
+        questionSignature: planQuestionsSignature(parsed),
+        questions: parsed
+      } : block
     );
   } catch {
   }
@@ -27622,6 +27698,15 @@ function connectedOrchestratorTurnReminder(thread, find) {
 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.';
+}
+function claudeSubagentTurnReminder(thread) {
+  if (thread.agent !== "claude" || thread.planMode || isOrchestratorThread(thread)) {
+    return null;
+  }
+  return formatClaudeSubagentReminder();
+}
 function mentionsPrGoal(prompt) {
   return PR_GOAL_RE.test(prompt);
 }
@@ -29903,6 +29988,7 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
           );
           const turnReminders = [
             worktreeReminder,
+            claudeSubagentTurnReminder(thread),
             connectedOrchestratorTurnReminder(thread, (id) => readThread(id)),
             optionalServicesReminder,
             issueToolsReminder,
@@ -32052,6 +32138,7 @@ __export(index_exports, {
   classifyWorktreeListBadges: () => classifyWorktreeListBadges,
   claudeAdapter: () => claudeAdapter,
   claudeChromeEnabled: () => claudeChromeEnabled,
+  claudeSubagentTurnReminder: () => claudeSubagentTurnReminder,
   claudeUsageOverLimitWindows: () => claudeUsageOverLimitWindows,
   claudeUserSettingsPath: () => claudeUserSettingsPath,
   cleanupArchivedHistory: () => cleanupArchivedHistory,
@@ -32203,6 +32290,7 @@ __export(index_exports, {
   formatAskUserNotifyMessage: () => formatAskUserNotifyMessage,
   formatBrightsyFetchError: () => formatBrightsyFetchError,
   formatClaudeExtraUsageDetail: () => formatClaudeExtraUsageDetail,
+  formatClaudeSubagentReminder: () => formatClaudeSubagentReminder,
   formatClaudeUsageCompact: () => formatClaudeUsageCompact,
   formatClaudeUsageFetchedAt: () => formatClaudeUsageFetchedAt,
   formatClaudeUsageOverLimitConfirm: () => formatClaudeUsageOverLimitConfirm,
@@ -32739,6 +32827,9 @@ __export(index_exports, {
   shouldRunWorktreeCleanup: () => shouldRunWorktreeCleanup,
   shouldStampSetupLastError: () => shouldStampSetupLastError,
   showCostEnabled: () => showCostEnabled,
+  sidebarParentSelectId: () => sidebarParentSelectId,
+  sidebarQuestionThreadId: () => sidebarQuestionThreadId,
+  sidebarRowAgentBlock: () => sidebarRowAgentBlock,
   sideboardHomeDir: () => sideboardHomeDir,
   sideboardMcpProfile: () => sideboardMcpProfile,
   sideboardReposDir: () => sideboardReposDir,
@@ -35060,10 +35151,12 @@ function emitChatTurn(opts, chatId, threadId) {
     return;
   }
   const result = getOrchestrator().getTurnResult(thread.id);
-  const pending = extractPendingPlanQuestions(
-    [...thread.messages].reverse().find((m) => m.role === "agent")?.parts
-  );
-  if (result.taskState === "input-required" && pending) {
+  const pending = latestPendingPlanQuestions({
+    messages: thread.messages,
+    agentBlock: thread.agentBlock,
+    dismissedQuestionSignature: thread.dismissedQuestionSignature
+  });
+  if (pending && result.taskState !== "failed" && result.taskState !== "canceled" && (result.taskState === "input-required" || thread.agentBlock?.source === "ask_user")) {
     emitControl(opts, {
       op: "ask",
       chatId,
@@ -35430,7 +35523,11 @@ init_ask_user();
 function republishPendingAsk(opts, chatId) {
   const thread = readPhoneThread(chatId);
   if (!thread) return;
-  const pending = latestPendingPlanQuestions({ messages: thread.messages });
+  const pending = latestPendingPlanQuestions({
+    messages: thread.messages,
+    agentBlock: thread.agentBlock,
+    dismissedQuestionSignature: thread.dismissedQuestionSignature
+  });
   if (!pending) return;
   emitControl(opts, {
     op: "ask",
@@ -37689,10 +37786,12 @@ function runCoordinatorPrompt(opts, body, generation) {
     thread = readThread(thread.id) ?? thread;
     if (thread.status === "stopped") return;
     const result = orch.getTurnResult(thread.id);
-    const pending = extractPendingPlanQuestions(
-      [...thread.messages].reverse().find((m) => m.role === "agent")?.parts
-    );
-    if (result.taskState === "input-required" && pending) {
+    const pending = latestPendingPlanQuestions({
+      messages: thread.messages,
+      agentBlock: thread.agentBlock,
+      dismissedQuestionSignature: thread.dismissedQuestionSignature
+    });
+    if (pending && result.taskState !== "failed" && result.taskState !== "canceled" && (result.taskState === "input-required" || thread.agentBlock?.source === "ask_user")) {
       opts.onOutbound({
         type: "ask_user",
         text: result.text.trim(),
@@ -46899,6 +46998,7 @@ async function pollSlackOutboundWatches(opts) {
   classifyWorktreeListBadges,
   claudeAdapter,
   claudeChromeEnabled,
+  claudeSubagentTurnReminder,
   claudeUsageOverLimitWindows,
   claudeUserSettingsPath,
   cleanupArchivedHistory,
@@ -47050,6 +47150,7 @@ async function pollSlackOutboundWatches(opts) {
   formatAskUserNotifyMessage,
   formatBrightsyFetchError,
   formatClaudeExtraUsageDetail,
+  formatClaudeSubagentReminder,
   formatClaudeUsageCompact,
   formatClaudeUsageFetchedAt,
   formatClaudeUsageOverLimitConfirm,
@@ -47586,6 +47687,9 @@ async function pollSlackOutboundWatches(opts) {
   shouldRunWorktreeCleanup,
   shouldStampSetupLastError,
   showCostEnabled,
+  sidebarParentSelectId,
+  sidebarQuestionThreadId,
+  sidebarRowAgentBlock,
   sideboardHomeDir,
   sideboardMcpProfile,
   sideboardReposDir,