@sideboard-ai/core 0.1.310 → 0.1.312

package/dist/index.js

@@ -188,6 +188,7 @@ import {
   stampNotifyBlock,
   stampPlanBlock,
   startOrchestration,
+  stashMcpAppModelContext,
   statWorktreePath,
   syncBoardPins,
   takePendingTurnAttachments,
@@ -201,7 +202,7 @@ import {
   worktreeCleanupSettings,
   writeAgentBlock,
   writeWorktreeFile
-} from "./chunk-IT6A4FZF.js";
+} from "./chunk-VIVXKN5N.js";
 import {
   LEGACY_PLAN_FILE_REL,
   PLAN_FILE_NAME,
@@ -237,9 +238,9 @@ import {
   buildClaudeStreamJsonUserMessage,
   claudeAdapter,
   claudeUsageOverLimitWindows,
+  closeMcpUiHost,
   codexAdapter,
   countCacheControlBlocks,
-  cspFromMeta,
   cursorAdapter,
   decodeBrightsyTarget,
   dropCachedPrefixOnResume,
@@ -256,8 +257,8 @@ import {
   formatClaudeUsageTooltip,
   getAdapter,
   getClaudePlanUsage,
+  getMcpUiHost,
   hottestClaudeWindow,
-  htmlFromResourceContent,
   isBrightsyConnected,
   isCursorApiKeyConfigured,
   isCursorAutoModel,
@@ -268,15 +269,12 @@ import {
   listCursorModels,
   listModelsForAgent,
   listOpencodeModels,
-  listUserClaudeMcpServerEntries,
-  matchClaudeMcpTool,
   mcpStatusThinkingFromClaudeInit,
   mcpUiContentSecurityPolicy,
   mergeSideboardIntoMcpServersJson,
   normalizeTurnInput,
   opencodeAdapter,
   parseClaudeUsagePayload,
-  parseMcpServerLaunch,
   parseSessionQuotaResetAt,
   permissionMode,
   planModeTurnInstruction,
@@ -289,13 +287,12 @@ import {
   sideboardMcpProfile,
   splitTurnInputForSystemPrompt,
   threadRequestsBrightsyMcp,
-  uiResourceUriFromMeta,
   userClaudeMcpConfigPath,
   userCursorMcpConfigPath,
   userMcpNamesToDisable,
   worktreeMcpToolNames,
   writeInjectedMcpConfig
-} from "./chunk-4YBQBVYL.js";
+} from "./chunk-4FZUUH6W.js";
 import {
   brightsyMcpServerName,
   connectBrightsyTeam,
@@ -335,6 +332,7 @@ import {
   appendCompactedMessages,
   applyCompaction,
   applyForwardOccupancy,
+  askBlockStillWaiting,
   buildBrightsySessionSeed,
   buildForkTranscriptAttachment,
   buildReviewRequestAttachment,
@@ -380,6 +378,7 @@ import {
   killStaleWorktreeListeners,
   killableListenerPids,
   lastRequestOccupancy,
+  lastTopLevelToolIsAskUser,
   latestPendingPlanQuestions,
   linkSharedDirectories,
   listRunScripts,
@@ -424,7 +423,7 @@ import {
   workspaceAgentChatSummaries,
   worktreeRunPortsPath,
   wrapReviewSkillMarkdown
-} from "./chunk-VBVSJUM2.js";
+} from "./chunk-QC2TQMPJ.js";
 import {
   STDERR_EVENT_MAX_CHARS,
   STDOUT_EVENT_MAX_CHARS,
@@ -1660,208 +1659,6 @@ function buildPathRefAttachment(input) {
   };
 }
 
-// src/mcp-ui/host.ts
-import { homedir } from "os";
-
-// src/mcp-ui/session.ts
-import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
-import { StdioClientTransport, getDefaultEnvironment } from "@modelcontextprotocol/sdk/client/stdio.js";
-import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
-var REQUEST_TIMEOUT_MS = 2e4;
-var UI_CAPABILITIES = {
-  extensions: {
-    "io.modelcontextprotocol/ui": {
-      mimeTypes: ["text/html;profile=mcp-app"]
-    }
-  }
-};
-async function openMcpUiSession(launch) {
-  return openMcpUiSessionFromTransport(transportForLaunch(launch));
-}
-async function openMcpUiSessionFromTransport(transport) {
-  const client = new Client(
-    { name: "sideboard", version: "1.0.0" },
-    { capabilities: UI_CAPABILITIES }
-  );
-  await client.connect(transport, { timeout: REQUEST_TIMEOUT_MS });
-  return {
-    async listTools() {
-      const listed = await client.listTools(void 0, { timeout: REQUEST_TIMEOUT_MS });
-      return listed.tools.map((tool) => {
-        const meta = tool._meta;
-        return {
-          name: tool.name,
-          ...tool.description ? { description: tool.description } : {},
-          ...tool.inputSchema ? { inputSchema: tool.inputSchema } : {},
-          resourceUri: uiResourceUriFromMeta(meta),
-          ...cspFromMeta(meta) ? { csp: cspFromMeta(meta) } : {}
-        };
-      });
-    },
-    async readResource(uri) {
-      const result = await client.readResource({ uri }, { timeout: REQUEST_TIMEOUT_MS });
-      const content = result.contents?.[0];
-      if (!content) return null;
-      const text5 = "text" in content && typeof content.text === "string" ? content.text : void 0;
-      const blob = "blob" in content && typeof content.blob === "string" ? content.blob : void 0;
-      return {
-        uri: content.uri,
-        ...content.mimeType ? { mimeType: content.mimeType } : {},
-        ...text5 != null ? { text: text5 } : {},
-        ...blob != null ? { blob } : {},
-        ...cspFromMeta(content._meta) ? { csp: cspFromMeta(content._meta) } : {}
-      };
-    },
-    async callTool(name, args) {
-      return client.callTool({ name, arguments: args }, void 0, { timeout: REQUEST_TIMEOUT_MS });
-    },
-    async close() {
-      await client.close();
-    }
-  };
-}
-function transportForLaunch(launch) {
-  if (launch.kind === "stdio") {
-    return new StdioClientTransport({
-      command: launch.command,
-      args: launch.args,
-      env: { ...getDefaultEnvironment(), ...launch.env },
-      stderr: "ignore",
-      ...launch.cwd ? { cwd: launch.cwd } : {}
-    });
-  }
-  const url = new URL(launch.url);
-  const requestInit = launch.headers ? { headers: launch.headers } : void 0;
-  if (launch.kind === "sse") {
-    return new SSEClientTransport(url, requestInit ? { requestInit } : void 0);
-  }
-  return new StreamableHTTPClientTransport(url, requestInit ? { requestInit } : void 0);
-}
-
-// src/mcp-ui/host.ts
-var TOOL_TTL_MS = 5 * 60 * 1e3;
-var McpUiHost = class {
-  constructor(opts) {
-    this.opts = opts;
-  }
-  opts;
-  sessions = /* @__PURE__ */ new Map();
-  toolLists = /* @__PURE__ */ new Map();
-  async viewForClaudeTool(toolName, projectDirs) {
-    const entries = this.userEntries(projectDirs);
-    const match = matchClaudeMcpTool(toolName, Object.keys(entries));
-    if (!match) return null;
-    const launch = parseMcpServerLaunch(entries[match.server] ?? {});
-    if (!launch) return null;
-    try {
-      const session = await this.sessionFor(match.server, launch);
-      const tools = await this.toolsFor(match.server, launch, session);
-      const tool = tools.find((item) => item.name === match.tool);
-      if (!tool?.resourceUri) return null;
-      const resource = await session.readResource(tool.resourceUri);
-      if (!resource) return null;
-      const html = htmlFromResourceContent(resource);
-      if (!html) return null;
-      const csp = resource.csp ?? tool.csp;
-      return {
-        server: match.server,
-        tool: match.tool,
-        uri: html.uri,
-        mimeType: html.mimeType,
-        html: html.html,
-        csp: mcpUiContentSecurityPolicy(csp)
-      };
-    } catch (err) {
-      console.error(
-        `[mcp-ui] ${match.server}/${match.tool}:`,
-        err instanceof Error ? err.message : err
-      );
-      return null;
-    }
-  }
-  async callTool(server, tool, args, projectDirs) {
-    const session = await this.sessionForName(server, projectDirs);
-    if (!session) throw new Error(`MCP server ${server} is not available`);
-    return session.callTool(tool, args);
-  }
-  async readResource(server, uri, projectDirs) {
-    const session = await this.sessionForName(server, projectDirs);
-    if (!session) throw new Error(`MCP server ${server} is not available`);
-    const resource = await session.readResource(uri);
-    if (!resource) throw new Error(`Resource ${uri} was empty`);
-    return {
-      contents: [
-        {
-          uri: resource.uri,
-          ...resource.mimeType ? { mimeType: resource.mimeType } : {},
-          ...resource.text != null ? { text: resource.text } : {},
-          ...resource.blob != null ? { blob: resource.blob } : {}
-        }
-      ]
-    };
-  }
-  async closeAll() {
-    const pending = [...this.sessions.values()];
-    this.sessions.clear();
-    this.toolLists.clear();
-    await Promise.all(
-      pending.map((session) => session.then((open) => open.close()).catch(() => void 0))
-    );
-  }
-  userEntries(projectDirs) {
-    const out = {};
-    for (const [name, entry] of Object.entries(this.opts.entries(projectDirs))) {
-      if (!name.trim() || isInjectedOrchMcpName(name) || !entry) continue;
-      out[name] = entry;
-    }
-    return out;
-  }
-  async sessionForName(server, projectDirs) {
-    const entry = this.userEntries(projectDirs)[server];
-    if (!entry) return null;
-    const launch = parseMcpServerLaunch(entry);
-    if (!launch) return null;
-    return this.sessionFor(server, launch);
-  }
-  sessionFor(server, launch) {
-    const key = `${server}
-${JSON.stringify(launch)}`;
-    const existing = this.sessions.get(key);
-    if (existing) return existing;
-    const open = this.opts.openSession ?? openMcpUiSession;
-    const pending = open(launch).catch((err) => {
-      this.sessions.delete(key);
-      throw err;
-    });
-    this.sessions.set(key, pending);
-    return pending;
-  }
-  async toolsFor(server, launch, session) {
-    const key = `${server}
-${JSON.stringify(launch)}`;
-    const cached2 = this.toolLists.get(key);
-    if (cached2 && cached2.key === key && Date.now() - cached2.at < TOOL_TTL_MS) return cached2.tools;
-    const tools = await session.listTools();
-    this.toolLists.set(key, { at: Date.now(), key, tools });
-    return tools;
-  }
-};
-var singleton;
-function getMcpUiHost() {
-  if (!singleton) {
-    singleton = new McpUiHost({
-      entries: (projectDirs) => listUserClaudeMcpServerEntries(homedir(), projectDirs)
-    });
-  }
-  return singleton;
-}
-function closeMcpUiHost() {
-  const host = singleton;
-  singleton = void 0;
-  if (host) void host.closeAll();
-}
-
 // src/remote/phone-chats.ts
 import { randomUUID as randomUUID2 } from "crypto";
 
@@ -2452,13 +2249,21 @@ function parsePhoneMcpUi(value, op, chatId) {
     }
     return { op: "mcp-ui", chatId, tool: tool2, callId, reqId: reqId2 };
   }
+  if (op === "mcp-ui-context") {
+    const reqId2 = controlText(value, "reqId");
+    const text5 = controlText(value, "text");
+    if (!reqId2 || reqId2.length > 40 || !text5 || text5.length > 8e3) return "invalid";
+    return { op, chatId, reqId: reqId2, text: text5 };
+  }
   if (op !== "mcp-ui-call" && op !== "mcp-ui-read") return "invalid";
   const reqId = controlText(value, "reqId");
   const server = controlText(value, "server");
   if (!reqId || reqId.length > 40 || !server || server.length > 120) return "invalid";
   if (op === "mcp-ui-read") {
     const uri = controlText(value, "uri");
-    if (!uri.startsWith("ui://") || uri.length > 500) return "invalid";
+    if (!uri || uri.length > 500 || /\s/.test(uri) || /^(javascript|data):/i.test(uri)) {
+      return "invalid";
+    }
     return { op, chatId, reqId, server, uri };
   }
   const tool = controlText(value, "tool");
@@ -2676,7 +2481,7 @@ function parsePhoneControl(value) {
   }
   if (op === "pane") return parsePhonePane(value, chatId);
   if (op === "open-artifact") return parseOpenArtifact(value, chatId);
-  if (op === "mcp-ui" || op === "mcp-ui-call" || op === "mcp-ui-read") return parsePhoneMcpUi(value, op, chatId);
+  if (op === "mcp-ui" || op === "mcp-ui-call" || op === "mcp-ui-read" || op === "mcp-ui-context") return parsePhoneMcpUi(value, op, chatId);
   if (op === "open-file" || op === "media") {
     const path2 = textField(value, "path");
     if (!path2 || path2.length > 2e3) return "invalid";
@@ -2848,6 +2653,7 @@ function parsePhoneCreate(value) {
 }
 function summarize(thread) {
   const pr = phonePrPill(thread);
+  const block = visibleAgentBlock(thread);
   return {
     id: thread.id,
     title: thread.title?.trim() || "Untitled",
@@ -2858,14 +2664,12 @@ function summarize(thread) {
     ...pr?.url ? { prUrl: pr.url } : {},
     ...pr?.number ? { prNumber: pr.number } : {},
     ...pr?.status ? { prStatus: pr.status } : {},
-    ...thread.agentBlock ? { needsYou: true, blockedReason: thread.agentBlock.reason } : {}
+    ...block ? { needsYou: true, blockedReason: block.reason } : {}
   };
 }
 function previewOf2(thread) {
-  const messages = listPhoneMessages(thread);
-  const last = messages[messages.length - 1];
-  if (!last) return "";
-  return clip(last.text.replace(/\s+/g, " ").trim(), PREVIEW_LIMIT2);
+  const last = listPhoneMessages(thread).at(-1);
+  return last ? clip(last.text.replace(/\s+/g, " ").trim(), PREVIEW_LIMIT2) : "";
 }
 function repoName2(repoPath) {
   return repoPath.replace(/\/$/, "").split("/").pop() || repoPath;
@@ -3215,7 +3019,8 @@ function emitChatTurn(opts, chatId, threadId) {
   const pending = latestPendingPlanQuestions({
     messages: thread.messages,
     agentBlock: thread.agentBlock,
-    dismissedQuestionSignature: thread.dismissedQuestionSignature
+    dismissedQuestionSignature: thread.dismissedQuestionSignature,
+    status: thread.status
   });
   if (pending && result.taskState !== "failed" && result.taskState !== "canceled" && (result.taskState === "input-required" || thread.agentBlock?.source === "ask_user")) {
     emitControl(opts, {
@@ -3279,7 +3084,9 @@ function deliverPhoneTurn(opts, chatId) {
 // src/remote/phone-mcp-ui-listen.ts
 var PHONE_HTML_CAP = 7e5;
 function dispatchPhoneMcpUi(cmd, opts) {
-  if (cmd.op !== "mcp-ui" && cmd.op !== "mcp-ui-call" && cmd.op !== "mcp-ui-read") return false;
+  if (cmd.op !== "mcp-ui" && cmd.op !== "mcp-ui-call" && cmd.op !== "mcp-ui-read" && cmd.op !== "mcp-ui-context") {
+    return false;
+  }
   const thread = readPhoneThread(cmd.chatId);
   const reqId = cmd.reqId;
   const chatId = cmd.chatId;
@@ -3289,6 +3096,11 @@ function dispatchPhoneMcpUi(cmd, opts) {
     return true;
   }
   const projectDirs = [thread.repoPath, thread.worktreePath];
+  if (cmd.op === "mcp-ui-context") {
+    stashMcpAppModelContext(thread.id, cmd.text);
+    emitControl(opts, { op: "mcp-ui-context", chatId, reqId, result: {} });
+    return true;
+  }
   if (cmd.op === "mcp-ui-call") {
     void getMcpUiHost().callTool(cmd.server, cmd.tool, cmd.args, projectDirs).then((result) => emitControl(opts, { op: "mcp-ui-call", chatId, reqId, result })).catch(
       (err) => emitControl(opts, { op: "mcp-ui-call", chatId, reqId, error: phoneError(err) })
@@ -3575,7 +3387,8 @@ function republishPendingAsk(opts, chatId) {
   const pending = latestPendingPlanQuestions({
     messages: thread.messages,
     agentBlock: thread.agentBlock,
-    dismissedQuestionSignature: thread.dismissedQuestionSignature
+    dismissedQuestionSignature: thread.dismissedQuestionSignature,
+    status: thread.status
   });
   if (!pending) return;
   emitControl(opts, {
@@ -5800,7 +5613,8 @@ function runCoordinatorPrompt(opts, body, generation) {
     const pending = latestPendingPlanQuestions({
       messages: thread.messages,
       agentBlock: thread.agentBlock,
-      dismissedQuestionSignature: thread.dismissedQuestionSignature
+      dismissedQuestionSignature: thread.dismissedQuestionSignature,
+      status: thread.status
     });
     if (pending && result.taskState !== "failed" && result.taskState !== "canceled" && (result.taskState === "input-required" || thread.agentBlock?.source === "ask_user")) {
       opts.onOutbound({
@@ -6246,7 +6060,15 @@ import { basename as basename2 } from "path";
 import { watch } from "chokidar";
 var PHONE_BOARD_SYNC_MS = 300;
 function chatKey(row2) {
-  return [row2.id, row2.title, row2.status, row2.agent, row2.preview].join("	");
+  return [
+    row2.id,
+    row2.title,
+    row2.status,
+    row2.agent,
+    row2.preview,
+    row2.needsYou ? "1" : "0",
+    row2.blockedReason ?? ""
+  ].join("	");
 }
 function phoneBoardKey(sidebar) {
   const orchestration = sidebar.orchestration.map(chatKey).join("\n");
@@ -8905,7 +8727,7 @@ async function startHeadlessHost(opts) {
   };
   const refreshRunning = async () => {
     try {
-      const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-XFE3U3RP.js");
+      const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-BYTSILLH.js");
       agentsRunning = getOrchestrator2().getRuntime().running;
     } catch {
       agentsRunning = 0;
@@ -10837,7 +10659,7 @@ async function handleJobStop(params, _ctx) {
   return stopDetachedJob(jobCwd(rec), id, reason ? { reason } : void 0);
 }
 async function defaultTurnWait(ref, timeoutMs) {
-  const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-XFE3U3RP.js");
+  const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-BYTSILLH.js");
   const orch = getOrchestrator2();
   const thread = await orch.waitForTurn(ref, timeoutMs, {
     resolveIfStillRunning: true
@@ -14213,7 +14035,7 @@ async function continueSourceThread(threadId, prompt) {
       await continueOnReply(threadId, prompt);
       return;
     }
-    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-XFE3U3RP.js");
+    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-BYTSILLH.js");
     await getOrchestrator2().send(threadId, prompt);
   } catch {
   }
@@ -14677,6 +14499,7 @@ export {
   archiveRemovedWorkspaceChats,
   archivesWithRemovedWorkspace,
   armSchedules,
+  askBlockStillWaiting,
   assertAbleTimeCredential,
   assertAbleTimeMcpCredential,
   assertOrchestratorCapableAgent,
@@ -15117,6 +14940,7 @@ export {
   lastAgentReply,
   lastAssistantMessageText,
   lastRequestOccupancy,
+  lastTopLevelToolIsAskUser,
   latestPendingPlanQuestions,
   linearAuthorizationHeader,
   linearCycleIsActive,
@@ -15463,6 +15287,7 @@ export {
   startRelayServer,
   startRemoteAccountLogin,
   startSlackOAuth,
+  stashMcpAppModelContext,
   statWorktreePath,
   stopAgentRpcServer,
   stripBrightsyNdjsonNoise,