@sideboard-ai/core 0.1.278 → 0.1.279

package/dist/index.js

@@ -18,6 +18,7 @@ import {
   RUN_SCRIPT_DESKTOP_ADOPT_MS,
   addStackLayerFromThread,
   adoptThread,
+  agentBlockFields,
   agentGitPrompt,
   alignQueueAttachments,
   appendQueuedItem,
@@ -27,6 +28,7 @@ import {
   assembleHomeBoard,
   boardPinIdentity,
   captureTurnBaseline,
+  chatBlockedSuffix,
   claimDesktopHost,
   classifyWorktreeColumn,
   classifyWorktreeListBadges,
@@ -63,6 +65,7 @@ import {
   fireSchedule,
   forkThreadWorktree,
   formatArtifactDirective,
+  formatAskUserNotifyMessage,
   formatDetachedJobInvoke,
   formatDevAccessHint,
   formatInjectedNoticesForTurn,
@@ -72,6 +75,7 @@ import {
   formatLinearReminder,
   formatLongRunningDirective,
   formatLongRunningReminder,
+  formatNotifyOrchestratorPrompt,
   formatOptionalServicesDirective,
   formatOptionalServicesReminder,
   formatPrGateDirective,
@@ -124,6 +128,7 @@ import {
   mergeSetupOutput,
   moveQueuedItemToFront,
   normalizeServiceOrigin,
+  notifyOrchestrator,
   openPrStackLayers,
   openStackLayer,
   optionalServiceConnected,
@@ -146,6 +151,7 @@ import {
   resolveConductorCursorAgentId,
   resolveCreateFirstPrompt,
   resolveDetachedJobScript,
+  resolveNotifyCallerThread,
   resolveOrchChildFollowUp,
   resolveScheduleThreadId,
   resolveSendFollowUp,
@@ -154,6 +160,7 @@ import {
   scheduleNeedsCaffeinate,
   schedulesPath,
   shiftQueuedItem,
+  shouldNotifyOrchestrator,
   shouldRemoveWorktreeOnTeardown,
   shouldRunHistoryCleanup,
   shouldRunWorktreeCleanup,
@@ -162,6 +169,9 @@ import {
   spawnAgentTurn,
   stackAgentDefaultsFrom,
   stackIdFrom,
+  stampAskUserBlock,
+  stampNotifyBlock,
+  stampPlanBlock,
   startOrchestration,
   statWorktreePath,
   syncBoardPins,
@@ -169,11 +179,13 @@ import {
   thisProcessShouldDrainAgentQueues,
   updateSchedule,
   verifyOptionalService,
+  visibleAgentBlock,
   waitForPidExit,
+  worktreeAgentBlock,
   worktreeBoardStatus,
   worktreeCleanupSettings,
   writeWorktreeFile
-} from "./chunk-SQOAFR2U.js";
+} from "./chunk-V5DMHB6Y.js";
 import {
   BASE_ALLOWED_TOOLS,
   BRIGHTSY_MCP_ALLOWED_TOOLS,
@@ -263,7 +275,7 @@ import {
   whichOnPath,
   worktreeMcpToolNames,
   writeInjectedMcpConfig
-} from "./chunk-NIB2IZ6J.js";
+} from "./chunk-HNNS25SG.js";
 import {
   brightsyMcpServerName,
   connectBrightsyTeam,
@@ -284,6 +296,7 @@ import {
   CONTEXT_MIN_MESSAGES,
   CONTEXT_REVIEW_PATH,
   LEGACY_REVIEW_REQUEST_PATH,
+  PLAN_QUESTION_ANSWERS_PREFIX,
   PORT_RANGE_SIZE,
   REPO_REVIEW_NAME,
   REPO_REVIEW_PATH,
@@ -321,19 +334,24 @@ import {
   estimateOccupancyTokens,
   estimateThreadChars,
   extractBrightsyContextSummary,
+  extractPendingPlanQuestions,
   extractiveSummary,
   findLastBrightsyContextSummary,
   forkChatTab,
   forkMessageSlice,
   formatMessagesAsTranscript,
+  formatPlanQuestionAnswers,
+  formatPlanQuestionsForChat,
   formatTranscriptMarkdown,
   forwardContextUsage,
   forwardOccupancyTokens,
   getDefaultRunScript,
   getRunMode,
   getRunScript,
+  isAskUserToolName,
   isIncompleteTaskState,
   isOtherWorktreeListenerCwd,
+  isPlanQuestionAnswersMessage,
   isTerminalTaskState,
   isThisWorktreeListenerCwd,
   killDetachedRunTree,
@@ -341,6 +359,7 @@ import {
   killStaleWorktreeListeners,
   killableListenerPids,
   lastRequestOccupancy,
+  latestPendingPlanQuestions,
   listRunScripts,
   listenerCwd,
   loadWorktreeRunPorts,
@@ -351,6 +370,8 @@ import {
   messagesForCompactArchive,
   messagesSinceLastBrightsyContextSummary,
   needsCoordinatorAction,
+  parsePlanQuestionsInput,
+  planQuestionsSignature,
   readExistingReviewRequestFile,
   readWorktreeInclude,
   requestReview,
@@ -378,9 +399,10 @@ import {
   tryReservePorts,
   waitForDetachedJob,
   waitForTurnToolResult,
+  workspaceAgentChatSummaries,
   worktreeRunPortsPath,
   wrapReviewSkillMarkdown
-} from "./chunk-MGS5T2A3.js";
+} from "./chunk-HQXBBUQX.js";
 import {
   STDERR_EVENT_MAX_CHARS,
   STDOUT_EVENT_MAX_CHARS,
@@ -422,7 +444,7 @@ import {
   visibleToolRowDetail,
   withEventParentId,
   withEventsParentId
-} from "./chunk-FAGK33E2.js";
+} from "./chunk-Y7JPL4WA.js";
 import "./chunk-7H655NEW.js";
 import {
   ABLETIME_OAUTH_CALLBACK_PATH,
@@ -557,7 +579,7 @@ import {
   stageBuffersAsAttachments,
   syncWorkspacesFromThreads,
   takenTeamSlugsForOrchestration
-} from "./chunk-A2G3ZBJS.js";
+} from "./chunk-SKSOCIJT.js";
 import {
   FAMOUS_SOCCER_TEAMS,
   GITHUB_PR_BODY_MAX_CHARS,
@@ -697,7 +719,7 @@ import {
 } from "./chunk-N7WZ6NIN.js";
 import {
   clipMcpToolResult
-} from "./chunk-27Z4MEQ5.js";
+} from "./chunk-UZUXWBXK.js";
 import "./chunk-AXQ4ZWHK.js";
 import {
   AGENT_RUNNER_MAX_OLD_SPACE_MB,
@@ -713,8 +735,8 @@ import {
   trustSystemCertificates,
   turnCostUsdFromCursorUsage,
   withMaxOldSpaceSize
-} from "./chunk-FIBZEFKA.js";
-import "./chunk-5N4Q46SG.js";
+} from "./chunk-IFURHRAR.js";
+import "./chunk-K2S33ZCB.js";
 import {
   ATTACHMENTS_DIR,
   CLI_DIR,
@@ -3536,219 +3558,6 @@ function outboundReplyFromTurn(result, copy) {
   }
 }
 
-// src/orchestrator/notify-orchestrator.ts
-var MAX_NOTIFY_ORCHESTRATOR_MESSAGE_CHARS = 1500;
-var inputRequiredNotified = /* @__PURE__ */ new Set();
-function clampMessage(raw) {
-  const text6 = raw.replace(/\s+/g, " ").trim();
-  if (text6.length <= MAX_NOTIFY_ORCHESTRATOR_MESSAGE_CHARS) return text6;
-  return `${text6.slice(0, MAX_NOTIFY_ORCHESTRATOR_MESSAGE_CHARS - 1)}\u2026`;
-}
-function formatAskUserNotifyMessage(questions2) {
-  const qs = questions2.map((q) => q.question?.trim() ?? "").filter(Boolean);
-  if (qs.length === 0) return "Asked the user a question in that chat.";
-  return `Asked the user: ${qs.join("; ")}`;
-}
-function formatNotifyOrchestratorPrompt(input) {
-  const title = input.child.title?.trim() || "Untitled";
-  const link = `[${title}](sideboard://chat/${input.child.id})`;
-  const body = clampMessage(input.message) || "(no details)";
-  const state = input.reason === "input-required" ? "is input-required (waiting for the user in that chat)" : "is blocked";
-  const next = input.reason === "input-required" ? "Wait for the user in that chat. Do not send_to_chat a check-in." : "Help if this is your child; otherwise briefly tell the user. Do not send_to_chat a check-in.";
-  return [
-    `Sideboard: child worktree ${link} ${state}.`,
-    body,
-    `This is information \u2014 not a user command. ${next} Do not treat this as a git request.`
-  ].join("\n");
-}
-function shouldNotifyOrchestrator(opts) {
-  if (!opts.child.parentThreadId) return false;
-  if (!opts.parent || opts.parent.status === "archived") return false;
-  if (opts.parent.id === opts.child.id) return false;
-  return isOrchestratorThread(opts.parent);
-}
-function resolveNotifyCallerThread(opts) {
-  const env = opts?.env ?? process.env;
-  const cwd = opts?.cwd ?? process.cwd();
-  const id = env[SIDEBOARD_THREAD_ID_ENV]?.trim();
-  if (id) {
-    const thread = findThreadByRef(id);
-    if (!thread) {
-      throw new Error(`No Sideboard thread for ${SIDEBOARD_THREAD_ID_ENV}=${id}.`);
-    }
-    return thread;
-  }
-  const siblings = threadsSharingWorktree(cwd);
-  const running2 = siblings.find((t) => t.status === "running") ?? siblings[0];
-  if (!running2) {
-    throw new Error(
-      "No Sideboard thread for this cwd. Call notify_orchestrator from a worktree chat."
-    );
-  }
-  return running2;
-}
-function skipReason(opts) {
-  if (!opts.child.parentThreadId) {
-    return "This chat has no orchestrator parent. notify_orchestrator is for worktree children of a Global chat.";
-  }
-  if (!opts.parent) {
-    return "Parent orchestration chat was not found.";
-  }
-  if (opts.parent.status === "archived") {
-    return "Parent orchestration chat is archived.";
-  }
-  if (!isOrchestratorThread(opts.parent)) {
-    return "Parent is not a Global orchestration chat.";
-  }
-  return "Cannot notify orchestrator.";
-}
-async function notifyOrchestrator(input) {
-  const parent = input.child.parentThreadId ? readThread(input.child.parentThreadId) : null;
-  if (!shouldNotifyOrchestrator({ child: input.child, parent })) {
-    return { ok: false, error: skipReason({ child: input.child, parent }) };
-  }
-  const parentId = parent.id;
-  if (input.reason === "input-required") {
-    if (inputRequiredNotified.has(input.child.id)) {
-      return { ok: true, parentThreadId: parentId, deduped: true };
-    }
-    inputRequiredNotified.add(input.child.id);
-  }
-  const prompt = formatNotifyOrchestratorPrompt({
-    child: input.child,
-    reason: input.reason,
-    message: input.message
-  });
-  try {
-    await input.send(parentId, prompt, { followUp: "queue" });
-  } catch (err) {
-    if (input.reason === "input-required") {
-      inputRequiredNotified.delete(input.child.id);
-    }
-    const message = err instanceof Error ? err.message : String(err);
-    return { ok: false, error: message };
-  }
-  return { ok: true, parentThreadId: parentId };
-}
-
-// src/plan/ask-user.ts
-function planQuestionsSignature(questions2) {
-  return questions2.map((q) => {
-    const opts = q.options.map((o) => o.label).join("");
-    return `${q.question}${opts}`;
-  }).join("");
-}
-function asRecord(v) {
-  return v != null && typeof v === "object" && !Array.isArray(v) ? v : null;
-}
-function parseOptions(raw) {
-  if (!Array.isArray(raw)) return [];
-  const out = [];
-  for (const item of raw) {
-    if (typeof item === "string" && item.trim()) {
-      out.push({ label: item.trim() });
-      continue;
-    }
-    const o = asRecord(item);
-    if (!o) continue;
-    const label = typeof o.label === "string" ? o.label.trim() : typeof o.text === "string" ? o.text.trim() : typeof o.title === "string" ? o.title.trim() : "";
-    if (!label) continue;
-    const description = typeof o.description === "string" && o.description.trim() ? o.description.trim() : void 0;
-    out.push({ label, description });
-  }
-  return out;
-}
-function parseOneQuestion(raw) {
-  const o = asRecord(raw);
-  if (!o) return null;
-  const question = typeof o.question === "string" ? o.question.trim() : typeof o.text === "string" ? o.text.trim() : typeof o.prompt === "string" ? o.prompt.trim() : "";
-  if (!question) return null;
-  const options = parseOptions(o.options);
-  if (options.length < 1) return null;
-  const header = typeof o.header === "string" && o.header.trim() ? o.header.trim() : void 0;
-  const multiSelect = Boolean(o.multiSelect ?? o.multi_select);
-  return { question, header, multiSelect, options };
-}
-function parsePlanQuestionsInput(input) {
-  const root = asRecord(input);
-  if (!root) return [];
-  const list = Array.isArray(root.questions) ? root.questions : Array.isArray(root.question) ? root.question : root.question || root.prompt ? [root] : [];
-  const out = [];
-  for (const item of list) {
-    const q = parseOneQuestion(item);
-    if (q) out.push(q);
-  }
-  return out;
-}
-var ASK_USER_TOOL_RE = /^(AskUserQuestion|ask_user|mcp__sideboard__ask_user)$/i;
-function isAskUserToolName(name) {
-  if (!name) return false;
-  const base = name.replace(/^mcp__sideboard__/i, "");
-  return ASK_USER_TOOL_RE.test(name) || /^ask_user$/i.test(base);
-}
-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);
-    if (!questions2.length) continue;
-    return {
-      id: p.id || `ask-${i}`,
-      signature: planQuestionsSignature(questions2),
-      questions: questions2,
-      source: p.name || "ask_user"
-    };
-  }
-  return null;
-}
-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);
-  return null;
-}
-var PLAN_QUESTION_ANSWERS_PREFIX = "Answers to your questions:";
-function isPlanQuestionAnswersMessage(text6) {
-  return text6.startsWith(PLAN_QUESTION_ANSWERS_PREFIX);
-}
-function formatPlanQuestionAnswers(questions2, answers) {
-  const lines = [PLAN_QUESTION_ANSWERS_PREFIX, ""];
-  for (let i = 0; i < questions2.length; i++) {
-    const q = questions2[i];
-    const a = answers.find((x) => x.questionIndex === i);
-    const header = q.header ? `**${q.header}** \u2014 ` : "";
-    const parts = [];
-    if (a?.selected.length) parts.push(a.selected.join(", "));
-    if (a?.other?.trim()) parts.push(a.other.trim());
-    const body = parts.length ? parts.join(" \xB7 ") : "(no answer)";
-    lines.push(`${i + 1}. ${header}${q.question}  `);
-    lines.push(`   \u2192 ${body}`);
-  }
-  return lines.join("\n");
-}
-function formatPlanQuestionsForChat(questions2) {
-  const lines = ["### Questions for you", ""];
-  for (let i = 0; i < questions2.length; i++) {
-    const q = questions2[i];
-    const header = q.header ? `**${q.header}** \u2014 ` : "";
-    lines.push(`${i + 1}. ${header}${q.question}`);
-    for (let oi = 0; oi < q.options.length; oi++) {
-      const opt = q.options[oi];
-      const desc = opt.description?.trim();
-      lines.push(
-        desc ? `   - **${opt.label}** \u2014 ${desc}` : `   - **${opt.label}**`
-      );
-    }
-    lines.push("");
-  }
-  lines.push("_Answer in the composer below._");
-  return lines.join("\n").trimEnd();
-}
-
 // src/mcp/server.ts
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 
@@ -3830,7 +3639,8 @@ function childThreadRefs(parentId, threads) {
     title: t.title,
     status: t.status,
     agent: t.agent,
-    lastText: lastMessagePreview(t.messages, 120)
+    lastText: lastMessagePreview(t.messages, 120),
+    ...t.agentBlock?.reason ? { blockedReason: t.agentBlock.reason, blockedSource: t.agentBlock.source } : {}
   }));
 }
 
@@ -5060,7 +4870,7 @@ function presentArtifactResult(input) {
     message: input.type === "log" ? "Log accepted. Same artifact_id appends; send only new lines next time." : "Artifact accepted. Sideboard desktop opens it in the side column beside chat."
   };
 }
-function asRecord2(value) {
+function asRecord(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return {};
   return value;
 }
@@ -5084,7 +4894,7 @@ async function handleRuntimePing(_params, _ctx) {
   };
 }
 async function handlePresentArtifact(params, _ctx) {
-  const rec = asRecord2(params);
+  const rec = asRecord(params);
   const title = str(rec.title).trim();
   const type = str(rec.type).trim();
   const allowed = ["html", "svg", "markdown", "react", "log"];
@@ -5108,7 +4918,7 @@ async function handlePresentArtifact(params, _ctx) {
   });
 }
 async function handleJobWait(params, ctx, waitFn = waitForDetachedJob) {
-  const rec = asRecord2(params);
+  const rec = asRecord(params);
   const id = str(rec.id).trim();
   if (!id) throw invalidParams("id is required");
   const cwd = jobCwd(rec);
@@ -5132,14 +4942,14 @@ async function handleJobWait(params, ctx, waitFn = waitForDetachedJob) {
   };
 }
 async function handleJobStop(params, _ctx) {
-  const rec = asRecord2(params);
+  const rec = asRecord(params);
   const id = str(rec.id).trim();
   if (!id) throw invalidParams("id is required");
   const reason = str(rec.reason).trim() || void 0;
   return stopDetachedJob(jobCwd(rec), id, reason ? { reason } : void 0);
 }
 async function defaultTurnWait(ref, timeoutMs) {
-  const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-QMKVXVUR.js");
+  const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-KY2KBBE2.js");
   const orch = getOrchestrator2();
   const thread = await orch.waitForTurn(ref, timeoutMs, {
     resolveIfStillRunning: true
@@ -5154,11 +4964,13 @@ async function defaultTurnWait(ref, timeoutMs) {
     stillRunning: result.stillRunning,
     progress: result.progress,
     lastActivityAt: result.lastActivityAt,
-    usage: result.usage
+    usage: result.usage,
+    blockedReason: result.blockedReason,
+    blockedSource: result.blockedSource
   });
 }
 async function handleTurnWait(params, ctx, waitFn = defaultTurnWait) {
-  const rec = asRecord2(params);
+  const rec = asRecord(params);
   const ref = str(rec.ref).trim();
   if (!ref) throw invalidParams("ref is required");
   const requested = typeof rec.timeoutMs === "number" && Number.isFinite(rec.timeoutMs) ? rec.timeoutMs : void 0;
@@ -5182,7 +4994,9 @@ async function handleTurnWait(params, ctx, waitFn = defaultTurnWait) {
     lastActivityAt: null,
     usage: null,
     hint: "Child is still working after max hold. Call wait_for_turn again. Do not send_to_chat a check-in (that steers / interrupts).",
-    incomplete: false
+    incomplete: false,
+    blockedReason: null,
+    blockedSource: null
   };
 }
 function createAgentRpcDispatcher() {
@@ -5607,6 +5421,7 @@ async function createOrchChildThread(orch, args, resolveNewThreadOptions2) {
         link: `sideboard://chat/${thread.id}`,
         parentChatId: thread.parentThreadId,
         parentThreadId: thread.parentThreadId,
+        chats: workspaceAgentChatSummaries(thread.worktreePath),
         ...alreadyStarted ? { alreadyStarted: true } : {},
         ...opts.coercedFrom ? { agentCoercedFrom: opts.coercedFrom } : {},
         ...opts.ignoredAgent ? { agentIgnored: opts.ignoredAgent } : {},
@@ -5693,7 +5508,7 @@ async function startMcpServer() {
     );
     server.tool(
       "list_chats",
-      "List chats across all projects (one summary line each \u2014 token-frugal). Includes parent id, last message preview, and live progress so you can see workspace children. Each line ends with sideboard://chat/<id> \u2014 use that URL in markdown links so the UI can open the chat.",
+      "List chats across all projects (one summary line each \u2014 token-frugal). Includes parent id, last message preview, blocked: when an agent is waiting on a person, and live progress so you can see workspace children. Each line ends with sideboard://chat/<id> \u2014 use that URL in markdown links so the UI can open the chat.",
       {},
       async () => {
         const threads = orch.getThreads(true);
@@ -5705,7 +5520,7 @@ async function startMcpServer() {
           const previewBit = preview ? `  ${preview}` : "";
           const err = t.lastError ? `  error:${t.lastError.replace(/\s+/g, " ").slice(0, 60)}` : "";
           const progress = live?.summary && !isInternalAgentStatusText(live.summary) ? `  ${live.summary}` : "";
-          return `${t.id.slice(0, 8)}  ${t.status.padEnd(9)}  ${t.agent.padEnd(8)}  ${repo}  ${t.sourceType}:${t.sourceRef}  ${t.title}${parent}${previewBit}${err}  sideboard://chat/${t.id}${t.devPort ? `  http://localhost:${t.devPort}` : ""}${progress}`;
+          return `${t.id.slice(0, 8)}  ${t.status.padEnd(9)}  ${t.agent.padEnd(8)}  ${repo}  ${t.sourceType}:${t.sourceRef}  ${t.title}${parent}${previewBit}${chatBlockedSuffix(t)}${err}  sideboard://chat/${t.id}${t.devPort ? `  http://localhost:${t.devPort}` : ""}${progress}`;
         });
         return {
           content: [{ type: "text", text: lines.join("\n") || "(no chats)" }]
@@ -5714,7 +5529,7 @@ async function startMcpServer() {
     );
     server.tool(
       "list_board",
-      "Home Kanban of worktrees (New, Draft, Review, Merged) \u2014 one card per checkout; sibling chat tabs nest as inner cards. Same cards as desktop Home. Path to merge: no PR \u2192 draft PR \u2192 open PR \u2192 merged. Archive removes the card to Settings \u2192 History. Queued/running are activity on the card, not columns. Orchestration chats are not on the board. Filters: query, repoPath, kind (ticket/PR/branch source), ownership (mine = your PRs / WIP; reviewing = someone else's PR), column, limit (default 40). create_workspace adds a workspace (and a Home card), or returns the live one if that ticket/PR/named branch is already checked out.",
+      "Home Kanban of workspaces (New, Draft, Review, Merged) \u2014 one card per checkout; sibling chats on that card are separate agents. Same cards as desktop Home. Path to merge: no PR \u2192 draft PR \u2192 open PR \u2192 merged. Archive removes the card to Settings \u2192 History. Queued/running are activity on the card, not columns. Orchestration chats are not on the board. Filters: query, repoPath, kind (ticket/PR/branch source), ownership (mine = your PRs / WIP; reviewing = someone else's PR), column, limit (default 40). create_workspace adds a workspace (and a Home card), or returns the live checkout if that ticket/PR/named branch is already checked out. That reuse is one checkout, not one agent \u2014 fork_chat to add another.",
       {
         query: z8.string().optional().describe("Case-insensitive token search across title, id, labels, repo"),
         repoPath: z8.string().optional().describe("Limit to one project path from list_projects"),
@@ -5754,7 +5569,7 @@ async function startMcpServer() {
     );
     server.tool(
       "get_chat",
-      "Get a compact chat summary by id/ref. Includes last message preview, parentChatId, and child workspace chats (status + lastText). While running, includes progress (last tool/thinking) and lastActivityAt. Includes usage (billed token + costUsd totals when providers reported cost) and lastTurnUsage.",
+      "Get a compact chat summary by id/ref. Includes last message preview, parentChatId, and child workspace chats (status + lastText). While running, includes progress (last tool/thinking) and lastActivityAt. Includes usage (billed token + costUsd totals when providers reported cost) and lastTurnUsage. blockedReason is why that agent is waiting on a person (question, plan approval, or a reported block).",
       { ref: z8.string() },
       async ({ ref }) => {
         const t = orch.getThread(ref);
@@ -5784,6 +5599,7 @@ async function startMcpServer() {
           devPort: t.devPort,
           prUrl: t.prUrl,
           lastError: t.lastError ?? null,
+          ...agentBlockFields(t),
           stillRunning,
           progress: liveSummary ?? (stillRunning && t.status === "queued" ? "Queued \u2014 waiting for a concurrency slot" : null),
           lastActivityAt: live?.updatedAt ?? null,
@@ -5845,7 +5661,7 @@ async function startMcpServer() {
       };
       await notifyParent({
         reason: "input-required",
-        message: formatAskUserNotifyMessage(questions2)
+        message: stampAskUserBlock(resolveNotifyCallerThread, questions2)
       });
       return mcpJson(payload);
     }
@@ -5877,7 +5693,7 @@ async function startMcpServer() {
         const payload = {
           ok: true,
           path: path2,
-          title: title?.trim() || "Plan",
+          title: stampPlanBlock(t?.id, title),
           message: "Plan saved to .context/attachments/plan.md and shown in Sideboard chat for approval."
         };
         return mcpJson(payload);
@@ -6082,7 +5898,7 @@ async function startMcpServer() {
   if (worktreeProfile) {
     server.tool(
       "notify_orchestrator",
-      "Wake the parent Global orchestrator with a short status so it does not have to poll wait_for_turn. Use when you are blocked and the parent may have moved on (missing access, waiting on something the coordinator must handle). ask_user already notifies for input-required \u2014 do not call this for the same question. Information only: never a git command. Do not use this to steer other worktrees.",
+      "Wake the parent Global orchestrator with a short status so it does not have to poll wait_for_turn. Use when you are blocked and the parent may have moved on (missing access, waiting on something the coordinator must handle). The message is shown on the sidebar and board until the next user message in this chat. ask_user already notifies for input-required \u2014 do not call this for the same question. Information only: never a git command. Do not use this to steer other worktrees.",
       {
         message: z8.string().min(1).max(1500).describe("Why you are blocked / what the parent should know (short)."),
         reason: z8.enum(["input-required", "blocked"]).optional().describe(
@@ -6094,7 +5910,7 @@ async function startMcpServer() {
           const child = resolveNotifyCallerThread();
           const result = await notifyOrchestrator({
             child,
-            reason: reason ?? "blocked",
+            reason: stampNotifyBlock(child.id, reason, message),
             message,
             send: (id, prompt, opts) => orch.send(id, prompt, opts)
           });
@@ -6152,7 +5968,7 @@ async function startMcpServer() {
     );
     server.tool(
       "create_workspace",
-      `Create a workspace (isolated git worktree + first chat) from branch, pr, or ticket. A ticket, PR, or named branch may have only one live worktree \u2014 if one already matches, returns it (alreadyStarted=true) instead of a second checkout. Creating from the default branch still opens a new isolated worktree. Pass repoPath from list_projects. cowboy=true uses the project folder on the default branch (no isolated worktree; land is commit+push). From an orchestration chat, omit parentChatId (Sideboard binds the child to this chat) or pass the exact id from the turn reminder \u2014 never invent a uuid. Omit agent/model \u2014 Sideboard applies ${accountDefaultsHint}. Do not pass your own agent or agent=cursor; those are ignored. Setup (settings.toml, .cursor/worktrees.json, or script/setup) runs in the background in parallel with the first turn (skipped for cowboy). Then use send_to_chat to chat.`,
+      `Create a workspace (isolated git checkout + first chat) from branch, pr, or ticket. A ticket, PR, or named branch has one checkout \u2014 if one already matches, returns it (alreadyStarted=true) instead of a second checkout. That is not one agent: chats lists every agent on that checkout. Add another with fork_chat; send_to_chat only the chat that should do this job. Creating from the default branch still opens a new isolated checkout. Pass repoPath from list_projects. cowboy=true uses the project folder on the default branch (no isolated worktree; land is commit+push). From an orchestration chat, omit parentChatId (Sideboard binds the child to this chat) or pass the exact id from the turn reminder \u2014 never invent a uuid. Omit agent/model \u2014 Sideboard applies ${accountDefaultsHint}. Do not pass your own agent or agent=cursor; those are ignored. Setup (settings.toml, .cursor/worktrees.json, or script/setup) runs in the background in parallel with the first turn (skipped for cowboy).`,
       {
         sourceType: z8.enum(["branch", "pr", "ticket"]),
         sourceRef: z8.string(),
@@ -6182,7 +5998,7 @@ async function startMcpServer() {
     );
     server.tool(
       "start_board_card",
-      "Same as create_workspace for a ticket, PR, or named branch (attaches issue text when Sideboard can resolve it). Does not create a second worktree when one already matches \u2014 returns that thread (alreadyStarted). Then send_to_chat.",
+      "Same as create_workspace for a ticket, PR, or named branch (attaches issue text when Sideboard can resolve it). Does not create a second checkout when one already matches \u2014 returns that workspace (alreadyStarted) and its chats. A workspace can have many agents. fork_chat to add one; send_to_chat only the chat that should do this job.",
       {
         kind: z8.enum(["ticket", "pr", "branch"]),
         ref: z8.string().describe("Ticket identifier (ENG-12), PR number (44), or branch name from list_board"),
@@ -6209,7 +6025,8 @@ async function startMcpServer() {
             id: existing.id,
             title: existing.title,
             status: existing.status,
-            link: `sideboard://chat/${existing.id}`
+            link: `sideboard://chat/${existing.id}`,
+            chats: workspaceAgentChatSummaries(orch.getThread(existing.id)?.worktreePath)
           });
         }
         const workspaces = orch.listWorkspaces();
@@ -6309,7 +6126,7 @@ async function startMcpServer() {
     if (shouldRegisterMcpWaitForTurn()) {
       server.tool(
         "wait_for_turn",
-        "Wait until the chat finishes its current/queued turn, or return early with a live progress snapshot. MCP clients often kill tools around 60s, so this returns within 45s even while the child is still working. taskState is the A2A-style lifecycle: submitted (queued, not started), working, input-required (ask_user), completed, failed, canceled. stillRunning is true only for submitted/working. If stillRunning, text and usage are empty (they would be the previous turn) \u2014 read progress and call wait_for_turn again. Do not send_to_chat a check-in (that steers / interrupts). On failed, lastError/text is the failure. On canceled, the child did not finish \u2014 resume with send_to_chat or tell the user. On input-required, wait for the user in that chat. When finished, text is this turn\u2019s assistant reply and usage is that turn\u2019s tokens + costUsd (this turn, not the Claude session total; sessionCostUsd is the provider session total when present).",
+        "Wait until the chat finishes its current/queued turn, or return early with a live progress snapshot. MCP clients often kill tools around 60s, so this returns within 45s even while the child is still working. taskState is the A2A-style lifecycle: submitted (queued, not started), working, input-required (ask_user), completed, failed, canceled. stillRunning is true only for submitted/working. blockedReason is why the child is waiting on a person (the question, plan approval, or a reported block) \u2014 read it and do not send_to_chat a check-in. If stillRunning, text and usage are empty (they would be the previous turn) \u2014 read progress and call wait_for_turn again. Do not send_to_chat a check-in (that steers / interrupts). On failed, lastError/text is the failure. On canceled, the child did not finish \u2014 resume with send_to_chat or tell the user. On input-required, wait for the user in that chat. When finished, text is this turn\u2019s assistant reply and usage is that turn\u2019s tokens + costUsd (this turn, not the Claude session total; sessionCostUsd is the provider session total when present).",
         {
           ref: z8.string(),
           timeoutMs: z8.number().optional()
@@ -6329,7 +6146,9 @@ async function startMcpServer() {
               stillRunning: result.stillRunning,
               progress: result.progress,
               lastActivityAt: result.lastActivityAt,
-              usage: result.usage
+              usage: result.usage,
+              blockedReason: result.blockedReason,
+              blockedSource: result.blockedSource
             })
           );
         }
@@ -6337,15 +6156,16 @@ async function startMcpServer() {
     }
     server.tool(
       "get_turn_result",
-      "Assistant message and last-turn usage when the turn finished. While stillRunning (submitted/working), text and usage are empty so a previous reply cannot be mistaken for this turn \u2014 use progress for tools/thinking. Not the full transcript. Includes taskState (A2A lifecycle).",
+      "Assistant message and last-turn usage when the turn finished. While stillRunning (submitted/working), text and usage are empty so a previous reply cannot be mistaken for this turn \u2014 use progress for tools/thinking. Not the full transcript. Includes taskState (A2A lifecycle) and blockedReason (why the agent is waiting on a person).",
       { ref: z8.string() },
       async ({ ref }) => {
         const result = orch.getTurnResult(ref);
-        const hint = mcpWaitTaskHint(result.taskState, result.status);
+        const hint = mcpWaitTaskHint(result.taskState, result.status, result.blockedReason);
+        const waiting = Boolean(result.blockedReason) && !result.stillRunning && result.taskState !== "failed" && result.taskState !== "canceled";
         return mcpJson({
           ...result,
           hint,
-          incomplete: needsCoordinatorAction(result.taskState)
+          incomplete: needsCoordinatorAction(result.taskState) || waiting
         });
       }
     );
@@ -6559,7 +6379,7 @@ async function startMcpServer() {
     );
     server.tool(
       "fork_chat",
-      "Fork a chat into a NEW tab on the SAME workspace: worktree agent \u2192 same worktree tab; Global orchestration chat \u2192 new orchestration chat (same synthetic home). Seeds a transcript; optional agent override. Leave model unset for Auto unless you have a reason. Orchestration forks require an MCP-capable agent (claude, cursor, codex, opencode \u2014 not brightsy). Slack / Global orchestrators use this to continue an orchestration chat on another agent after session limits. Then send_to_chat / wait_for_turn (loop while stillRunning) on the returned id. Use fork_workspace only for worktree agents that need a new git worktree.",
+      "Add another agent chat on the SAME workspace (same files, Run, and git). Also forks a Global orchestration chat into a new orchestration tab. Pass agent when the new chat should use a different harness. Leave model unset for Auto unless you have a reason. Orchestration forks require an MCP-capable agent (claude, cursor, codex, opencode \u2014 not brightsy). Use this for a second agent on a checkout (review, another harness, parallel work on the same branch). Do not create_workspace again for that \u2014 it returns the existing checkout. Then send_to_chat / wait_for_turn (loop while stillRunning) on the returned id. Use fork_workspace only when the work needs its own git checkout.",
       {
         ref: z8.string().describe("Thread id/ref to fork (worktree agent or orchestration chat)"),
         through_index: z8.number().optional().describe("Inclusive message index to include in the transcript (default: all)"),
@@ -9435,10 +9255,10 @@ var MIN_MD_CHARS = 120;
 function oneLine(value, max) {
   return value.replace(/[`\r\n]/g, " ").replace(/\s+/g, " ").trim().slice(0, max);
 }
-function asRecord3(value) {
+function asRecord2(value) {
   if (typeof value === "string") {
     try {
-      return asRecord3(JSON.parse(value));
+      return asRecord2(JSON.parse(value));
     } catch {
       return void 0;
     }
@@ -9513,7 +9333,7 @@ function toolContent(input) {
   if (!input) return "";
   const direct = input.content;
   if (typeof direct === "string") return direct;
-  const nested = asRecord3(direct);
+  const nested = asRecord2(direct);
   if (!nested) return "";
   for (const key of ["html", "markup", "text", "source", "content", "code"]) {
     if (typeof nested[key] === "string") return nested[key];
@@ -9536,7 +9356,7 @@ function phoneArtifactText(text6, parts, limit = Number.POSITIVE_INFINITY) {
   const extras = [];
   for (const part of parts ?? []) {
     if (part.type !== "tool" || part.parentId || !isArtifactTool(part.name)) continue;
-    const input = asRecord3(part.input);
+    const input = asRecord2(part.input);
     const content = toolContent(input);
     const hint = artifactHint(content);
     if (hint && hints.has(hint)) continue;
@@ -9555,7 +9375,7 @@ function phoneArtifactText(text6, parts, limit = Number.POSITIVE_INFINITY) {
 ${tail}` : tail;
 }
 function parseOpenArtifact(value, chatId) {
-  const record = asRecord3(value);
+  const record = asRecord2(value);
   if (!record) return "invalid";
   const title = oneLine(str3(record.title), 200);
   if (!title) return "invalid";
@@ -10138,6 +9958,13 @@ var REMOTE_STOPPED_REPLY = "Sideboard stopped the in-progress turn.";
 var chatChains = /* @__PURE__ */ new Map();
 var chatGeneration = /* @__PURE__ */ new Map();
 var phoneTurnGen = /* @__PURE__ */ new Map();
+var phoneOpenChatId = null;
+function setPhoneOpenChat(id) {
+  phoneOpenChatId = id?.trim() || null;
+}
+function getPhoneOpenChat() {
+  return phoneOpenChatId;
+}
 function bumpChat(chatId) {
   const next = (chatGeneration.get(chatId) ?? 0) + 1;
   chatGeneration.set(chatId, next);
@@ -10319,13 +10146,17 @@ function interruptRemoteCoordinator(deviceId, log = () => void 0) {
     return false;
   }
 }
+function emitOpened(opts, opened) {
+  setPhoneOpenChat(opened.chat.id);
+  emitControl(opts, { op: "opened", ...opened });
+}
 function publishOpenedChat(opts, chatId) {
   const opened = openPhoneChat(chatId);
   if (!opened) {
     emitControl(opts, { op: "error", message: "That agent is not on this Mac." });
     return;
   }
-  emitControl(opts, { op: "opened", ...opened });
+  emitOpened(opts, opened);
   if (opened.chat.status === "running" || opened.chat.status === "queued") {
     deliverPhoneTurn(opts, opened.chat.id);
   }
@@ -10352,6 +10183,7 @@ function stagePhoneTurnFiles(worktreePath, draft) {
 function handlePhoneControl(cmd, opts) {
   const log = opts.onLog ?? (() => void 0);
   if (cmd.op === "list") {
+    setPhoneOpenChat(null);
     emitControl(opts, { op: "sidebar", ...listPhoneSidebar() });
     return;
   }
@@ -10430,7 +10262,7 @@ function handlePhoneControl(cmd, opts) {
             }
           }
           const fresh = openPhoneChat(opened.chat.id) ?? opened;
-          emitControl(opts, { op: "opened", ...fresh });
+          emitOpened(opts, fresh);
           if (prompt) deliverPhoneTurn(opts, fresh.chat.id);
         } catch (err) {
           emitControl(opts, { op: "error", message: phoneError(err) });
@@ -10452,7 +10284,7 @@ function handlePhoneControl(cmd, opts) {
           }
         }
         const fresh = openPhoneChat(opened.chat.id) ?? opened;
-        emitControl(opts, { op: "opened", ...fresh });
+        emitOpened(opts, fresh);
         if (prompt) deliverPhoneTurn(opts, fresh.chat.id);
       }).catch((err) => {
         emitControl(opts, { op: "error", message: phoneError(err) });
@@ -10462,7 +10294,7 @@ function handlePhoneControl(cmd, opts) {
     const goal = cmd.goal?.trim() || cmd.prompt?.trim() || "";
     if (goal || cmd.files?.length || cmd.links?.length) {
       void createPhoneOrchestration({ ...cmd, goal }).then((opened) => {
-        emitControl(opts, { op: "opened", ...opened });
+        emitOpened(opts, opened);
         deliverPhoneTurn(opts, opened.chat.id);
       }).catch((err) => {
         emitControl(opts, { op: "error", message: phoneError(err) });
@@ -10473,7 +10305,7 @@ function handlePhoneControl(cmd, opts) {
       const agent = coerceOrchestratorAgent(
         cmd.agent ?? opts.agent ?? resolveOrchestratorDefaults().agent
       );
-      emitControl(opts, { op: "opened", ...createPhoneChat(agent) });
+      emitOpened(opts, createPhoneChat(agent));
     } catch (err) {
       emitControl(opts, { op: "error", message: phoneError(err) });
     }
@@ -10505,6 +10337,7 @@ function handlePhoneControl(cmd, opts) {
     }
     bumpChat(thread.id);
     interruptChat(thread.id, log);
+    if (getPhoneOpenChat() === thread.id) setPhoneOpenChat(null);
     archivePhoneChat(thread.id);
     emitControl(opts, { op: "sidebar", ...listPhoneSidebar() });
     return;
@@ -10697,6 +10530,99 @@ function handleRemoteInbound(text6, opts) {
   });
 }
 
+// src/remote/phone-board-sync.ts
+import { basename as basename3 } from "path";
+import { watch } from "chokidar";
+var PHONE_BOARD_SYNC_MS = 300;
+function chatKey(row) {
+  return [row.id, row.title, row.status, row.agent, row.preview].join("	");
+}
+function phoneBoardKey(sidebar) {
+  const orchestration = sidebar.orchestration.map(chatKey).join("\n");
+  const projects = sidebar.projects.map((project) => {
+    const trees = project.worktrees.map((tree) => `${tree.label}	${tree.chats.map(chatKey).join("\n")}`).join("\n");
+    return `${project.path}	${project.name}
+${trees}`;
+  }).join("\n---\n");
+  return `${orchestration}
+===
+${projects}`;
+}
+function isPhoneBoardEvent(event) {
+  return event.type === "status_changed" || event.type === "turn_started" || event.type === "turn_finished" || event.type === "queue_changed" || event.type === "error" || event.type === "context_compacted" || event.type === "quota_failover";
+}
+function isRunningChat(event) {
+  if (event.type === "turn_started") return true;
+  return event.type === "status_changed" && (event.status === "running" || event.status === "queued");
+}
+function subscribePhoneBoard(notify) {
+  const threads = watch(threadsDir(), { ignoreInitial: true, depth: 0 });
+  const onThread = (changed) => {
+    if (!isThreadRecordFile(changed)) return;
+    notify();
+  };
+  threads.on("add", onThread);
+  threads.on("change", onThread);
+  threads.on("unlink", onThread);
+  threads.on("error", () => void 0);
+  const data = watch(appDataDir(), { ignoreInitial: true, depth: 0 });
+  const onData = (changed) => {
+    const name = basename3(changed);
+    if (name !== "workspaces.json" && name !== "removed-workspaces.json") return;
+    notify();
+  };
+  data.on("add", onData);
+  data.on("change", onData);
+  data.on("unlink", onData);
+  data.on("error", () => void 0);
+  return () => {
+    void threads.close();
+    void data.close();
+  };
+}
+function startPhoneBoardSync(opts) {
+  const list = opts.list ?? listPhoneSidebar;
+  const debounceMs = opts.debounceMs ?? PHONE_BOARD_SYNC_MS;
+  let timer = null;
+  let lastKey = "";
+  let stopped = false;
+  const push = () => {
+    timer = null;
+    if (stopped) return;
+    let sidebar;
+    try {
+      sidebar = list();
+    } catch {
+      return;
+    }
+    const key = phoneBoardKey(sidebar);
+    if (key === lastKey) return;
+    lastKey = key;
+    opts.onSidebar(sidebar);
+  };
+  const schedule = () => {
+    if (stopped) return;
+    if (timer) clearTimeout(timer);
+    timer = setTimeout(push, debounceMs);
+  };
+  const handle = (event) => {
+    if (isPhoneBoardEvent(event)) schedule();
+    if (!isRunningChat(event)) return;
+    const open = opts.openChatId?.();
+    if (open && open === event.threadId) opts.onRunningChat?.(event.threadId);
+  };
+  const unsubscribe = (opts.subscribe ?? subscribePhoneBoard)(schedule);
+  const offEvents = (opts.events ?? ((listener) => getOrchestrator().on(listener)))(handle);
+  push();
+  return () => {
+    stopped = true;
+    if (timer) clearTimeout(timer);
+    timer = null;
+    unsubscribe();
+    offEvents();
+  };
+}
+
 // src/remote/client.ts
 var BACKOFF_START_MS3 = 1e3;
 var BACKOFF_MAX_MS3 = 3e4;
@@ -10743,6 +10669,24 @@ function runRemoteHost(opts) {
   let wantPair = false;
   let deviceLabel = opts.deviceLabel;
   let keepalive = null;
+  let connectionGen = 0;
+  let stopBoard = null;
+  const stopBoardSync = () => {
+    stopBoard?.();
+    stopBoard = null;
+  };
+  const startBoardSync = () => {
+    stopBoardSync();
+    stopBoard = startPhoneBoardSync({
+      openChatId: getPhoneOpenChat,
+      onSidebar: (sidebar) => {
+        emitControl({ onOutbound: emit }, { op: "sidebar", ...sidebar });
+      },
+      onRunningChat: (chatId) => {
+        deliverPhoneTurn({ onOutbound: emit }, chatId);
+      }
+    });
+  };
   const send3 = (msg) => {
     if (!socket || socket.readyState !== socket.OPEN) return;
     socket.send(JSON.stringify(msg));
@@ -10779,12 +10723,19 @@ function runRemoteHost(opts) {
     }
   };
   const connectOnce = () => new Promise((resolve, reject) => {
+    const gen = ++connectionGen;
+    stopBoardSync();
+    setPhoneOpenChat(null);
     const ws = new WsWebSocket3(opts.url, { lookup: lookupPreferPublicDns });
     socket = ws;
     let settled = false;
     const finish = (err) => {
       if (settled) return;
       settled = true;
+      if (gen === connectionGen) {
+        stopBoardSync();
+        setPhoneOpenChat(null);
+      }
       keepalive?.stop();
       keepalive = null;
       opts.signal?.removeEventListener("abort", onAbort);
@@ -10822,6 +10773,13 @@ function runRemoteHost(opts) {
       const raw = typeof data === "string" ? data : data.toString("utf8");
       const msg = parseRemoteServerMessage(raw);
       if (!msg) return;
+      if (gen === connectionGen) {
+        if (msg.type === "phone_joined") startBoardSync();
+        if (msg.type === "phone_left") {
+          setPhoneOpenChat(null);
+          stopBoardSync();
+        }
+      }
       handleServer(msg);
     });
     ws.on("close", () => finish());
@@ -12450,7 +12408,7 @@ async function continueSourceThread(threadId, prompt) {
       await continueOnReply(threadId, prompt);
       return;
     }
-    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-QMKVXVUR.js");
+    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-KY2KBBE2.js");
     await getOrchestrator2().send(threadId, prompt);
   } catch {
   }
@@ -12464,10 +12422,10 @@ function formatOwnerSlackFyi(userName, text6) {
   return `${who} replied in Slack:
 ${body}`;
 }
-function sameSlackConversation(watch, target) {
-  if (watch.channelId !== target.channelId) return false;
-  const targetThread = target.threadTs?.trim() || watch.threadTs;
-  return targetThread === watch.threadTs;
+function sameSlackConversation(watch2, target) {
+  if (watch2.channelId !== target.channelId) return false;
+  const targetThread = target.threadTs?.trim() || watch2.threadTs;
+  return targetThread === watch2.threadTs;
 }
 async function relayExternalReply(opts) {
   const threadId = opts.watch.sourceThreadId?.trim();
@@ -12543,15 +12501,15 @@ function recordSlackOutboundWatch(input) {
   writeStore2(pruneWatches(watches));
   return next;
 }
-function isHumanReply(msg, watch) {
+function isHumanReply(msg, watch2) {
   const ts = msg.ts?.trim();
-  if (!ts || ts === watch.ts) return false;
-  if (!tsNewer(ts, watch.lastSeenTs)) return false;
+  if (!ts || ts === watch2.ts) return false;
+  if (!tsNewer(ts, watch2.lastSeenTs)) return false;
   if (msg.bot_id) return false;
   if (msg.subtype) return false;
   const user = msg.user?.trim();
   if (!user) return false;
-  if (watch.ownerUserId && user === watch.ownerUserId) return false;
+  if (watch2.ownerUserId && user === watch2.ownerUserId) return false;
   return true;
 }
 function displayName(user) {
@@ -12583,16 +12541,16 @@ async function resolvePermalink(token, channelId, ts, fetchImpl) {
   }
   return slackArchiveUrl(channelId, ts);
 }
-async function fetchMessages(token, watch, fetchImpl) {
+async function fetchMessages(token, watch2, fetchImpl) {
   const out = [];
   try {
     const data = await slackApi(
       token,
       "conversations.replies",
       {
-        channel: watch.channelId,
-        ts: watch.threadTs,
-        oldest: watch.lastSeenTs,
+        channel: watch2.channelId,
+        ts: watch2.threadTs,
+        oldest: watch2.lastSeenTs,
         inclusive: false,
         limit: 50
       },
@@ -12601,14 +12559,14 @@ async function fetchMessages(token, watch, fetchImpl) {
     out.push(...data.messages ?? []);
   } catch {
   }
-  if (watch.kind === "dm" || watch.channelId.startsWith("D")) {
+  if (watch2.kind === "dm" || watch2.channelId.startsWith("D")) {
     try {
       const data = await slackApi(
         token,
         "conversations.history",
         {
-          channel: watch.channelId,
-          oldest: watch.lastSeenTs,
+          channel: watch2.channelId,
+          oldest: watch2.lastSeenTs,
           inclusive: false,
           limit: 50
         },
@@ -12628,8 +12586,8 @@ async function pollSlackOutboundWatches(opts) {
   let watches = pruneWatches(existing, now);
   let changed = watches.length !== existing.length;
   for (let i = 0; i < watches.length; i++) {
-    const watch = watches[i];
-    const ws = getSlackWorkspace(watch.teamId);
+    const watch2 = watches[i];
+    const ws = getSlackWorkspace(watch2.teamId);
     if (!ws) continue;
     let token;
     try {
@@ -12637,19 +12595,19 @@ async function pollSlackOutboundWatches(opts) {
     } catch {
       continue;
     }
-    const messages = await fetchMessages(token, watch, opts?.fetchImpl);
-    const replies = messages.filter((m) => isHumanReply(m, watch)).sort((a, b) => Number(a.ts) - Number(b.ts));
+    const messages = await fetchMessages(token, watch2, opts?.fetchImpl);
+    const replies = messages.filter((m) => isHumanReply(m, watch2)).sort((a, b) => Number(a.ts) - Number(b.ts));
     if (replies.length === 0) continue;
-    const injected = new Set(watch.injectedReplyTs ?? []);
-    const collected = [...watch.replies ?? []];
-    let lastSeenTs = watch.lastSeenTs;
+    const injected = new Set(watch2.injectedReplyTs ?? []);
+    const collected = [...watch2.replies ?? []];
+    let lastSeenTs = watch2.lastSeenTs;
     let latestName;
-    let latestPermalink = watch.permalink;
+    let latestPermalink = watch2.permalink;
     let newlyInjected = 0;
     for (const msg of replies) {
       const ts = msg.ts.trim();
       const user = msg.user.trim();
-      const fallback = watch.toUserId === user ? watch.toLabel : user;
+      const fallback = watch2.toUserId === user ? watch2.toLabel : user;
       const replyUserName = await resolveUserName(
         token,
         user,
@@ -12658,7 +12616,7 @@ async function pollSlackOutboundWatches(opts) {
       );
       const permalink = await resolvePermalink(
         token,
-        watch.channelId,
+        watch2.channelId,
         ts,
         opts?.fetchImpl
       );
@@ -12676,7 +12634,7 @@ async function pollSlackOutboundWatches(opts) {
         continue;
       }
       const delivered = await relayExternalReply({
-        watch,
+        watch: watch2,
         reply,
         permalink,
         fetchImpl: opts?.fetchImpl
@@ -12686,19 +12644,19 @@ async function pollSlackOutboundWatches(opts) {
       injected.add(ts);
       lastSeenTs = ts;
     }
-    if (newlyInjected > 0 && watch.sourceThreadId?.trim()) {
+    if (newlyInjected > 0 && watch2.sourceThreadId?.trim()) {
       await continueSourceThread(
-        watch.sourceThreadId.trim(),
+        watch2.sourceThreadId.trim(),
         formatSlackReplyContinuePrompt({
-          userName: latestName || watch.toLabel,
-          kind: watch.kind,
-          toLabel: watch.toLabel,
+          userName: latestName || watch2.toLabel,
+          kind: watch2.kind,
+          toLabel: watch2.toLabel,
           count: newlyInjected
         })
       );
     }
     watches[i] = {
-      ...watch,
+      ...watch2,
       lastSeenTs,
       permalink: latestPermalink,
       injectedReplyTs: [...injected],
@@ -13728,6 +13686,7 @@ export {
   validateLinearApiKey,
   verifyAbleTimeConnection,
   verifyOptionalService,
+  visibleAgentBlock,
   visibleAssistantText,
   visibleToolRowDetail,
   waitForPidExit,
@@ -13742,7 +13701,9 @@ export {
   withSelectedAccount,
   withThreadLock,
   withTurnScopedCost,
+  workspaceAgentChatSummaries,
   workspaceSettingsSourceLabel,
+  worktreeAgentBlock,
   worktreeBoardStatus,
   worktreeCleanupSettings,
   worktreeDisplayLabel,