@sideboard-ai/core 0.1.299 → 0.1.301

package/dist/index.cjs

@@ -43,6 +43,103 @@ var init_thread = __esm({
   }
 });
 
+// src/agents/claude-mcp.ts
+function parseMcpList(text7) {
+  const servers = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const raw of text7.split("\n")) {
+    const line = raw.trim();
+    if (!line || /^Checking MCP/i.test(line)) continue;
+    const m = line.match(/^(.+?):\s+\S+/);
+    if (!m) continue;
+    const name = m[1].trim();
+    if (!name || seen.has(name)) continue;
+    const needsAuth = /Needs authentication/i.test(line);
+    const connected = !needsAuth && /Connected/i.test(line);
+    if (!needsAuth && !connected) continue;
+    seen.add(name);
+    servers.push({ name, connected, needsAuth });
+  }
+  return servers;
+}
+function sanitizeMcpServerName(name) {
+  return name.replace(/[^A-Za-z0-9_-]/g, "_");
+}
+function mcpServerIdForPermission(toolName, serverName) {
+  if (toolName.startsWith("mcp__")) {
+    const rest = toolName.slice("mcp__".length);
+    const split = rest.indexOf("__");
+    const id = (split === -1 ? rest : rest.slice(0, split)).trim();
+    if (id && id !== "*") return id;
+  }
+  const sanitized = sanitizeMcpServerName((serverName ?? "").trim());
+  return sanitized || null;
+}
+function mcpServerPermissionUpdate(serverId) {
+  return {
+    type: "addRules",
+    behavior: "allow",
+    destination: "session",
+    rules: [{ toolName: `mcp__${serverId}` }, { toolName: `mcp__${serverId}__*` }]
+  };
+}
+function mcpAllowTools(servers) {
+  const out = [];
+  for (const s of servers) {
+    if (!s.connected) continue;
+    const id = sanitizeMcpServerName(s.name);
+    if (!id) continue;
+    out.push(`mcp__${id}`);
+    out.push(`mcp__${id}__*`);
+  }
+  return out;
+}
+function mcpAllowToolsFromNames(names) {
+  return mcpAllowTools(
+    [...names].map((name) => name.trim()).filter(Boolean).map((name) => ({ name, connected: true, needsAuth: false }))
+  );
+}
+function mcpAuthWarnings(servers) {
+  const needing = servers.filter((s) => s.needsAuth).map((s) => s.name);
+  if (needing.length === 0) return [];
+  return [
+    `MCP needs login: ${needing.join(", ")}. Run: claude mcp login "<name>"`
+  ];
+}
+var BASE_ALLOWED_TOOLS, CLAUDE_PRINT_BG_WAIT_CEILING_MS, CLAUDE_CHROME_ALLOWED_TOOLS, CLAUDE_POSTHOG_CONNECTOR_ALLOWED_TOOLS;
+var init_claude_mcp = __esm({
+  "src/agents/claude-mcp.ts"() {
+    "use strict";
+    BASE_ALLOWED_TOOLS = [
+      "Edit",
+      "Write",
+      "Bash",
+      "Read",
+      "Glob",
+      "Grep",
+      "WebFetch",
+      "WebSearch",
+      "Task",
+      "Agent",
+      "TaskOutput",
+      "TaskStop",
+      "EnterWorktree",
+      "ExitWorktree",
+      "Skill"
+    ];
+    CLAUDE_PRINT_BG_WAIT_CEILING_MS = 72e5;
+    CLAUDE_CHROME_ALLOWED_TOOLS = [
+      "mcp__claude-in-chrome",
+      "mcp__claude-in-chrome__*",
+      "Skill(claude-in-chrome)"
+    ];
+    CLAUDE_POSTHOG_CONNECTOR_ALLOWED_TOOLS = [
+      "mcp__claude_ai_PostHog",
+      "mcp__claude_ai_PostHog__*"
+    ];
+  }
+});
+
 // src/agents/tool-permission.ts
 function setToolPermissionPublisher(next) {
   publisher = next;
@@ -68,6 +165,7 @@ function denied(message) {
   return { behavior: "deny", message, decisionClassification: "user_reject" };
 }
 function sessionGrants(item) {
+  if (item.mcpServerId) return [mcpServerPermissionUpdate(item.mcpServerId)];
   if (Array.isArray(item.suggestions) && item.suggestions.length > 0) {
     return item.suggestions;
   }
@@ -126,12 +224,16 @@ function askToolPermission(ask) {
   const toolName = clean(ask.toolName);
   if (!threadId || !toolName) return Promise.resolve(denied("Missing chat or tool."));
   const described = describeToolPermission({ ...ask, threadId, toolName });
+  const mcpServerId = mcpServerIdForPermission(toolName, ask.mcpServer) ?? void 0;
   const prompt = {
     id: (0, import_node_crypto.randomUUID)(),
     title: described.title,
     detail: described.detail,
     path: described.path || void 0,
-    allowSession: !ask.suppressAlwaysAllow,
+    // Claude hides "always allow" when the saved rule would be broader than
+    // this call. For MCP that broader rule is what we want: the whole server.
+    allowSession: mcpServerId ? true : !ask.suppressAlwaysAllow,
+    ...mcpServerId ? { sessionLabel: "Allow this MCP" } : {},
     defaultToNo: Boolean(ask.defaultToNo)
   };
   return new Promise((resolve2) => {
@@ -140,6 +242,7 @@ function askToolPermission(ask) {
       threadId,
       prompt,
       suggestions: ask.suggestions,
+      mcpServerId,
       resolve: resolve2
     };
     const q = queues.get(threadId) ?? [];
@@ -175,6 +278,7 @@ var init_tool_permission = __esm({
     "use strict";
     import_node_crypto = require("crypto");
     import_node_path = require("path");
+    init_claude_mcp();
     queues = /* @__PURE__ */ new Map();
     publisher = null;
   }
@@ -4702,6 +4806,15 @@ function resolveThreadEffort(raw) {
   if (raw.fast) return "low";
   return "high";
 }
+function normalizeApprovedMcpServers(raw) {
+  if (!Array.isArray(raw)) return void 0;
+  const ids = [
+    ...new Set(
+      raw.map((value) => typeof value === "string" ? sanitizeMcpServerName(value.trim()) : "").filter(Boolean)
+    )
+  ];
+  return ids.length > 0 ? ids : void 0;
+}
 function normalizeRunScriptRequest(raw) {
   if (!raw || typeof raw !== "object") return void 0;
   const req = raw;
@@ -4727,6 +4840,7 @@ function normalizeThread(raw) {
     planMode: Boolean(raw.planMode),
     isolateCodexPlugins: raw.isolateCodexPlugins === true ? true : void 0,
     autonomy: raw.autonomy ?? "default",
+    approvedMcpServers: normalizeApprovedMcpServers(raw.approvedMcpServers),
     lastError: raw.lastError ?? null,
     agentPid: raw.agentPid ?? null,
     attachments: Array.isArray(raw.attachments) ? raw.attachments : [],
@@ -4965,6 +5079,7 @@ var init_thread_store = __esm({
     import_node_path15 = require("path");
     import_proper_lockfile = __toESM(require("proper-lockfile"), 1);
     init_thinking_effort();
+    init_claude_mcp();
     init_cursor_store();
     init_paths();
     listCache = null;
@@ -6613,13 +6728,13 @@ function isClosedPrState(prUrl, prState) {
   if (!prUrl?.trim()) return false;
   return (prState ?? "").trim().toUpperCase() === "CLOSED";
 }
-function listBadge(id, title, conflict = false) {
+function listBadge(id, title, note) {
   return {
     id,
     label: id,
-    title: conflict ? `${title} \xB7 merge conflicts` : title,
+    title: note ? `${title} \xB7 ${note}` : title,
     mod: `is-${id}`,
-    ...conflict ? { conflict: true } : {}
+    ...note ? { conflict: true } : {}
   };
 }
 function hasMergeConflict(thread) {
@@ -6630,69 +6745,52 @@ function hasMergeConflict(thread) {
     isInMergeQueue: thread.prIsInMergeQueue
   }) === "conflicts";
 }
-function groupPrError(group) {
+function blockerNote(group) {
   const open = group.filter(
     (thread) => isOpenPrState(thread.prUrl, thread.prState) && !thread.prIsInMergeQueue
   );
+  const parts = [];
   if (open.some(
     (thread) => thread.prChecksFailed || mergeStateSuggestsCheckFailure({
       mergeStateStatus: thread.prMergeStateStatus ?? null,
       reviewDecision: thread.prReviewDecision ?? null
     })
   )) {
-    return { label: "failing", title: "Checks failing" };
-  }
-  if (open.some(
+    parts.push("checks failing");
+  } else if (open.some(
     (thread) => !thread.prIsDraft && (thread.prReviewDecision ?? "").trim().toUpperCase() === "CHANGES_REQUESTED"
   )) {
-    return { label: "changes", title: "Changes requested" };
-  }
-  return void 0;
-}
-function withPrError(badges, error, conflict) {
-  if (!error) return badges;
-  const [first] = badges;
-  if (!first) {
-    return [
-      {
-        id: "error",
-        label: error.label,
-        title: conflict ? `${error.title} \xB7 merge conflicts` : error.title,
-        mod: "is-error",
-        ...conflict ? { conflict: true } : {}
-      }
-    ];
+    parts.push("changes requested");
   }
-  return [{ ...first, error }];
+  if (open.some(hasMergeConflict)) parts.push("merge conflicts");
+  return parts.length > 0 ? parts.join(" \xB7 ") : void 0;
 }
 function classifyWorktreeListBadges(group, viewerLogin = "", reviewLabel = "") {
   if (group.length === 0 || group.some((t) => t.cowboy)) return [];
   if (group.some((t) => isMergedPrState(t.prUrl, t.prState))) {
     return [listBadge("merged", "Merged")];
   }
-  const conflict = group.some(hasMergeConflict);
-  const error = groupPrError(group);
-  const finish2 = (badges) => withPrError(badges, error, conflict);
+  const note = blockerNote(group);
   if (group.some((t) => isApprovedOpenPr(t))) {
-    return finish2([listBadge("approved", "Approved, not merged", conflict)]);
+    return [listBadge("approved", "Approved, not merged", note)];
   }
   const open = group.filter((t) => isOpenPrState(t.prUrl, t.prState));
   if (open.length === 0) {
     if (group.some((t) => isClosedPrState(t.prUrl, t.prState))) return [];
-    return finish2([listBadge("new", "No pull request")]);
+    return [listBadge("new", "No pull request")];
   }
   const ownership = classifyWorktreeOwnership(group, viewerLogin);
   if (ownership === "reviewing") {
-    return finish2([listBadge("review", "Someone else's PR", conflict)]);
+    return [listBadge("review", "Someone else's PR", note)];
   }
-  if (!normalizeViewerLogin(viewerLogin)) return finish2([]);
+  if (!normalizeViewerLogin(viewerLogin)) return [];
   if (!open.some((t) => !t.prIsDraft)) {
-    return finish2([listBadge("draft", "Draft pull request", conflict)]);
+    return [listBadge("draft", "Draft pull request", note)];
   }
   const readyLabel = reviewLabel.trim();
   const inReview = readyLabel ? labelsInclude(groupPrLabels(group), readyLabel) : true;
-  if (!inReview) return finish2([]);
-  return finish2([listBadge("pending", "Waiting for review", conflict)]);
+  if (!inReview) return [];
+  return [listBadge("pending", "Waiting for review", note)];
 }
 var init_worktree_list_badges = __esm({
   "src/board/worktree-list-badges.ts"() {
@@ -13324,85 +13422,6 @@ var init_brightsy = __esm({
   }
 });
 
-// src/agents/claude-mcp.ts
-function parseMcpList(text7) {
-  const servers = [];
-  const seen = /* @__PURE__ */ new Set();
-  for (const raw of text7.split("\n")) {
-    const line = raw.trim();
-    if (!line || /^Checking MCP/i.test(line)) continue;
-    const m = line.match(/^(.+?):\s+\S+/);
-    if (!m) continue;
-    const name = m[1].trim();
-    if (!name || seen.has(name)) continue;
-    const needsAuth = /Needs authentication/i.test(line);
-    const connected = !needsAuth && /Connected/i.test(line);
-    if (!needsAuth && !connected) continue;
-    seen.add(name);
-    servers.push({ name, connected, needsAuth });
-  }
-  return servers;
-}
-function sanitizeMcpServerName(name) {
-  return name.replace(/[^A-Za-z0-9_-]/g, "_");
-}
-function mcpAllowTools(servers) {
-  const out = [];
-  for (const s of servers) {
-    if (!s.connected) continue;
-    const id = sanitizeMcpServerName(s.name);
-    if (!id) continue;
-    out.push(`mcp__${id}`);
-    out.push(`mcp__${id}__*`);
-  }
-  return out;
-}
-function mcpAllowToolsFromNames(names) {
-  return mcpAllowTools(
-    [...names].map((name) => name.trim()).filter(Boolean).map((name) => ({ name, connected: true, needsAuth: false }))
-  );
-}
-function mcpAuthWarnings(servers) {
-  const needing = servers.filter((s) => s.needsAuth).map((s) => s.name);
-  if (needing.length === 0) return [];
-  return [
-    `MCP needs login: ${needing.join(", ")}. Run: claude mcp login "<name>"`
-  ];
-}
-var BASE_ALLOWED_TOOLS, CLAUDE_PRINT_BG_WAIT_CEILING_MS, CLAUDE_CHROME_ALLOWED_TOOLS, CLAUDE_POSTHOG_CONNECTOR_ALLOWED_TOOLS;
-var init_claude_mcp = __esm({
-  "src/agents/claude-mcp.ts"() {
-    "use strict";
-    BASE_ALLOWED_TOOLS = [
-      "Edit",
-      "Write",
-      "Bash",
-      "Read",
-      "Glob",
-      "Grep",
-      "WebFetch",
-      "WebSearch",
-      "Task",
-      "Agent",
-      "TaskOutput",
-      "TaskStop",
-      "EnterWorktree",
-      "ExitWorktree",
-      "Skill"
-    ];
-    CLAUDE_PRINT_BG_WAIT_CEILING_MS = 72e5;
-    CLAUDE_CHROME_ALLOWED_TOOLS = [
-      "mcp__claude-in-chrome",
-      "mcp__claude-in-chrome__*",
-      "Skill(claude-in-chrome)"
-    ];
-    CLAUDE_POSTHOG_CONNECTOR_ALLOWED_TOOLS = [
-      "mcp__claude_ai_PostHog",
-      "mcp__claude_ai_PostHog__*"
-    ];
-  }
-});
-
 // src/agent-rpc/protocol.ts
 function isJsonRpcRequest(value) {
   if (!value || typeof value !== "object") return false;
@@ -15252,12 +15271,13 @@ var init_claude = __esm({
           allowedTools = [
             ...BASE_ALLOWED_TOOLS,
             ...SIDEBOARD_MCP_ALLOWED_TOOLS,
-            ...brightsyMcpAllowedTools(injectedBrightsyNames)
+            ...brightsyMcpAllowedTools(injectedBrightsyNames),
+            ...mcpAllowToolsFromNames(thread.approvedMcpServers ?? [])
           ];
         } else {
           allowedTools = [
             ...BASE_ALLOWED_TOOLS,
-            ...mcpAllowToolsFromNames(Object.keys(userMcpEntries)),
+            ...mcpAllowToolsFromNames([...Object.keys(userMcpEntries), ...thread.approvedMcpServers ?? []]),
             ...sideboardWorktreeAllowedTools({
               github: true,
               linear: isLinearConnected(),
@@ -15297,7 +15317,8 @@ var init_claude = __esm({
           "--verbose",
           "--include-partial-messages",
           "--permission-mode",
-          mode.claude
+          mode.claude,
+          ...mode.claude === "bypassPermissions" ? ["--dangerously-skip-permissions"] : []
         ];
         if (systemPrompt) {
           args.push("--append-system-prompt", systemPrompt);
@@ -31751,6 +31772,8 @@ __export(index_exports, {
   mcpAllowTools: () => mcpAllowTools,
   mcpAllowToolsFromNames: () => mcpAllowToolsFromNames,
   mcpAuthWarnings: () => mcpAuthWarnings,
+  mcpServerIdForPermission: () => mcpServerIdForPermission,
+  mcpServerPermissionUpdate: () => mcpServerPermissionUpdate,
   mcpStatusThinkingFromClaudeInit: () => mcpStatusThinkingFromClaudeInit,
   mentionsPrGoal: () => mentionsPrGoal,
   mergeAgentGitAuthEnv: () => mergeAgentGitAuthEnv,
@@ -36492,6 +36515,7 @@ init_wait_for_turn();
 // src/agent-rpc/permission-handler.ts
 init_agent_block();
 init_thread_store();
+init_claude_mcp();
 init_tool_permission();
 
 // src/remote/phone-permission.ts
@@ -36518,6 +36542,7 @@ function permissionViewFromBlock(block) {
     detail: typeof prompt.detail === "string" ? prompt.detail : "",
     ...prompt.path ? { path: prompt.path } : {},
     allowSession: prompt.allowSession !== false,
+    ...prompt.sessionLabel ? { sessionLabel: prompt.sessionLabel } : {},
     ...prompt.defaultToNo ? { defaultToNo: true } : {}
   };
 }
@@ -36606,10 +36631,27 @@ var handlePermissionAsk = async (params, _ctx) => {
     description: str4(rec.description).trim() || void 0,
     displayName: str4(rec.displayName).trim() || void 0,
     suggestions: rec.suggestions,
+    mcpServer: str4(rec.mcpServer).trim() || void 0,
     suppressAlwaysAllow: rec.suppressAlwaysAllow === true,
     defaultToNo: rec.defaultToNo === true
   };
-  return askToolPermission(ask);
+  const serverId = mcpServerIdForPermission(toolName, ask.mcpServer);
+  if (serverId && readThread(threadId)?.approvedMcpServers?.includes(serverId)) {
+    return {
+      behavior: "allow",
+      updatedPermissions: [mcpServerPermissionUpdate(serverId)],
+      decisionClassification: "user_permanent"
+    };
+  }
+  const answer = await askToolPermission(ask);
+  if (serverId && answer.behavior === "allow" && answer.decisionClassification === "user_permanent") {
+    const fresh = readThread(threadId);
+    const prev = fresh?.approvedMcpServers ?? [];
+    if (fresh && !prev.includes(serverId)) {
+      updateThread(threadId, { approvedMcpServers: [...prev, serverId] });
+    }
+  }
+  return answer;
 };
 
 // src/agent-rpc/handlers.ts
@@ -42013,7 +42055,7 @@ function listPhoneSidebar(viewerLogin = phoneViewerLogin()) {
         label: worktreeDisplayLabelForGroup(group),
         chats: group.map(summarize),
         ...tags.length > 0 ? { tags } : {},
-        ...badge ? { badge: { id: badge.id, label: badge.label, title: badge.title, ...badge.conflict ? { conflict: true } : {}, ...badge.error ? { error: badge.error } : {} } } : {}
+        ...badge ? { badge: { id: badge.id, label: badge.label, title: badge.title, ...badge.conflict ? { conflict: true } : {} } } : {}
       };
     })
   }));
@@ -45934,6 +45976,8 @@ async function pollSlackOutboundWatches(opts) {
   mcpAllowTools,
   mcpAllowToolsFromNames,
   mcpAuthWarnings,
+  mcpServerIdForPermission,
+  mcpServerPermissionUpdate,
   mcpStatusThinkingFromClaudeInit,
   mentionsPrGoal,
   mergeAgentGitAuthEnv,