@charzhu/openjaw-agent 0.2.2 → 0.2.4

package/dist/main.js

@@ -125,6 +125,7 @@ function loadAgentConfig() {
       use_responses_api: parsedLlm?.use_responses_api ?? DEFAULT_CONFIG.llm.use_responses_api,
       openai_tool_mode: parsedLlm?.openai_tool_mode ?? DEFAULT_CONFIG.llm.openai_tool_mode,
       openai_max_tools: parsedLlm?.openai_max_tools ?? DEFAULT_CONFIG.llm.openai_max_tools,
+      openai_mcp_max_tools: parsedLlm?.openai_mcp_max_tools,
       copilot_enterprise_url: parsedLlm?.copilot_enterprise_url,
       copilot_oauth_client_id: parsedLlm?.copilot_oauth_client_id ?? DEFAULT_CONFIG.llm.copilot_oauth_client_id,
       context_compression: parsedLlm?.context_compression,
@@ -214,7 +215,7 @@ var init_config = __esm({
         computer_use: true,
         // Enable computer use by default (auto-disabled for proxy)
         openai_tool_mode: "auto",
-        openai_max_tools: 32,
+        openai_max_tools: 64,
         copilot_oauth_client_id: DEFAULT_COPILOT_OAUTH_CLIENT_ID
       }
     };
@@ -2432,9 +2433,9 @@ function systemPromptSection(name, compute) {
 function DANGEROUS_uncachedSection(name, compute, _reason) {
   return { name, compute, cacheBreak: true };
 }
-async function resolveSystemPromptSections(sections2) {
+async function resolveSystemPromptSections(sections) {
   const results = [];
-  for (const section of sections2) {
+  for (const section of sections) {
     if (!section.cacheBreak && sectionCache.has(section.name)) {
       results.push(sectionCache.get(section.name));
       continue;
@@ -2781,9 +2782,9 @@ var init_cache_monitor = __esm({
       /**
        * Take a snapshot of the current prompt state BEFORE an API call.
        */
-      snapshot(sections2, toolNames) {
+      snapshot(sections, toolNames) {
         const sectionHashes = /* @__PURE__ */ new Map();
-        sections2.forEach((s, i) => {
+        sections.forEach((s, i) => {
           sectionHashes.set(`section_${i}`, hash(s));
         });
         const toolsHash = hash(toolNames.sort().join("|"));
@@ -2793,14 +2794,14 @@ var init_cache_monitor = __esm({
        * Check for cache break AFTER an API call by comparing current state to previous snapshot.
        * Also uses cache_read_tokens from the API response to detect breaks.
        */
-      check(sections2, toolNames, cacheReadTokens, previousCacheReadTokens) {
+      check(sections, toolNames, cacheReadTokens, previousCacheReadTokens) {
         this.totalTurns++;
         if (!this.lastSnapshot) {
-          this.snapshot(sections2, toolNames);
+          this.snapshot(sections, toolNames);
           return null;
         }
         const changedSections = [];
-        sections2.forEach((s, i) => {
+        sections.forEach((s, i) => {
           const key = `section_${i}`;
           const oldHash = this.lastSnapshot.sectionHashes.get(key);
           const newHash = hash(s);
@@ -2814,7 +2815,7 @@ var init_cache_monitor = __esm({
         }
         const tokenDrop = previousCacheReadTokens - cacheReadTokens;
         const hasTokenDrop = previousCacheReadTokens > 0 && tokenDrop > 1e3;
-        this.snapshot(sections2, toolNames);
+        this.snapshot(sections, toolNames);
         if (changedSections.length > 0 || hasTokenDrop) {
           const event = {
             timestamp: Date.now(),
@@ -3394,6 +3395,13 @@ function resolveOpenAIMaxTools(config) {
   }
   return DEFAULT_OPENAI_MAX_TOOLS;
 }
+function resolveMcpMaxTools(config) {
+  const configured = config.llm.openai_mcp_max_tools;
+  if (typeof configured === "number" && Number.isFinite(configured) && configured >= 0) {
+    return Math.floor(configured);
+  }
+  return null;
+}
 function rememberLoadedToolExposure(state, input, allTools) {
   const names = /* @__PURE__ */ new Set();
   const byName2 = new Map(allTools.map((tool) => [tool.name, tool]));
@@ -3425,36 +3433,54 @@ function rememberLoadedToolExposure(state, input, allTools) {
 }
 function selectToolsForRequest(params) {
   const { config, allTools, userMessage, state } = params;
-  const maxTools = resolveOpenAIMaxTools(config);
+  const configuredMax = resolveOpenAIMaxTools(config);
   const compact = shouldCompactOpenAITools(config);
+  const mcpTools = allTools.filter((tool) => categoryForTool(tool.name) === "mcp");
   if (!compact) {
     return {
       tools: allTools,
       mode: "full",
       reason: "full-mode",
-      maxTools,
+      maxTools: configuredMax,
       fullToolCount: allTools.length,
-      exposedToolNames: allTools.map((tool) => tool.name)
+      exposedToolNames: allTools.map((tool) => tool.name),
+      mcpToolCount: mcpTools.length
     };
   }
+  const mcpCap = resolveMcpMaxTools(config);
+  const includedMcpTools = mcpCap !== null && mcpTools.length > mcpCap ? mcpTools.slice(0, mcpCap) : mcpTools;
+  const maxTools = Math.min(
+    MCP_AUTO_GROW_HARD_CAP,
+    Math.max(configuredMax, FOUNDATION_TOOL_NAMES.length + includedMcpTools.length + BUILTIN_HEADROOM)
+  );
   const selected = /* @__PURE__ */ new Map();
   const addByName = /* @__PURE__ */ __name((name) => {
     const tool = allTools.find((candidate) => candidate.name === name);
     if (tool) selected.set(tool.name, tool);
   }, "addByName");
   for (const name of FOUNDATION_TOOL_NAMES) addByName(name);
-  for (const name of state.exposedToolNames) addByName(name);
+  for (const tool of includedMcpTools) {
+    if (selected.size >= maxTools) break;
+    selected.set(tool.name, tool);
+  }
+  for (const name of state.exposedToolNames) {
+    if (selected.size >= maxTools) break;
+    addByName(name);
+  }
   const relevantCategories = categoriesForMessage(userMessage);
   for (const tool of allTools) {
     if (selected.size >= maxTools) break;
-    if (relevantCategories.has(categoryForTool(tool.name))) {
+    const cat = categoryForTool(tool.name);
+    if (cat === "mcp") continue;
+    if (relevantCategories.has(cat)) {
       selected.set(tool.name, tool);
     }
   }
   if (selected.size < maxTools && relevantCategories.size === 0) {
     for (const tool of allTools) {
       if (selected.size >= maxTools) break;
-      if (categoryForTool(tool.name) === "memory" || categoryForTool(tool.name) === "system") {
+      const cat = categoryForTool(tool.name);
+      if (cat === "memory" || cat === "system") {
         selected.set(tool.name, tool);
       }
     }
@@ -3466,7 +3492,8 @@ function selectToolsForRequest(params) {
     reason: config.llm.provider === "github-copilot" ? "github-copilot" : isOpenAIProxyConfig(config) ? "openai-proxy" : "configured-compact",
     maxTools,
     fullToolCount: allTools.length,
-    exposedToolNames: tools.map((tool) => tool.name)
+    exposedToolNames: tools.map((tool) => tool.name),
+    mcpToolCount: includedMcpTools.length
   };
 }
 function categoriesForMessage(message) {
@@ -3498,11 +3525,13 @@ function categoryForTool(toolName) {
   if (toolName.startsWith("system_") || toolName.startsWith("clipboard_") || ["code_execute", "web_fetch", "web_search", "notify", "sleep", "ask_user", "config"].includes(toolName)) return "system";
   return "mcp";
 }
-var DEFAULT_OPENAI_MAX_TOOLS, FOUNDATION_TOOL_NAMES, PROFILE_CATEGORIES, CATEGORY_KEYWORDS;
+var DEFAULT_OPENAI_MAX_TOOLS, MCP_AUTO_GROW_HARD_CAP, BUILTIN_HEADROOM, FOUNDATION_TOOL_NAMES, PROFILE_CATEGORIES, CATEGORY_KEYWORDS;
 var init_tool_exposure = __esm({
   "src/tool-exposure.ts"() {
     "use strict";
-    DEFAULT_OPENAI_MAX_TOOLS = 32;
+    DEFAULT_OPENAI_MAX_TOOLS = 64;
+    MCP_AUTO_GROW_HARD_CAP = 100;
+    BUILTIN_HEADROOM = 8;
     FOUNDATION_TOOL_NAMES = [
       "openjaw_load_tools",
       "invoke_skill",
@@ -3530,6 +3559,7 @@ var init_tool_exposure = __esm({
     __name(isOpenAIProxyConfig, "isOpenAIProxyConfig");
     __name(shouldCompactOpenAITools, "shouldCompactOpenAITools");
     __name(resolveOpenAIMaxTools, "resolveOpenAIMaxTools");
+    __name(resolveMcpMaxTools, "resolveMcpMaxTools");
     __name(rememberLoadedToolExposure, "rememberLoadedToolExposure");
     __name(selectToolsForRequest, "selectToolsForRequest");
     __name(categoriesForMessage, "categoriesForMessage");
@@ -19289,6 +19319,16 @@ var init_registry = __esm({
           this.registerTool(tool);
         }
       }
+      /**
+       * Remove a tool by name. Returns true if a tool was removed.
+       *
+       * Used to drop stale MCP tools when a server reconnects, is denied,
+       * or is removed so the LLM does not try to call a tool whose backing
+       * connection no longer exists.
+       */
+      unregisterTool(name) {
+        return this.tools.delete(name);
+      }
       getTool(name) {
         return this.tools.get(name);
       }
@@ -19915,6 +19955,54 @@ var init_context = __esm({
   }
 });
 
+// src/prompts/mcp.ts
+function getMcpSection(mcpManager) {
+  if (!mcpManager) return null;
+  const servers = mcpManager.getConnectedServers();
+  if (servers.length === 0) return null;
+  const lines = [
+    "# Connected MCP Servers",
+    "",
+    "The following Model Context Protocol (MCP) servers are connected.",
+    "Their tools are ALREADY registered and visible in your tool list \u2014",
+    "you do NOT need to call `openjaw_load_tools` to use them.",
+    ""
+  ];
+  const allTools = mcpManager.getTools();
+  for (const server of servers) {
+    const prefix = normalizeServerName(server);
+    const toolsForServer = allTools.filter((t) => t.name.startsWith(`mcp__${prefix}__`));
+    lines.push(`- **${server}** (${toolsForServer.length} tools) \u2014 tools start with \`mcp__${prefix}__\``);
+  }
+  lines.push(
+    "",
+    "## Tool Selection Rule",
+    "",
+    "When a user request maps to a domain covered by a connected MCP server,",
+    "**call the `mcp__*` tool directly**. Do NOT call `openjaw_load_tools`",
+    "first to load equivalent built-in openjaw tools. Only fall back to",
+    "`openjaw_load_tools` and built-in `outlook_*` / `teams_*` / `office_*`",
+    "tools when no connected MCP tool covers the task.",
+    "",
+    "Examples:",
+    "- Work items, work-related Teams chats, project/task tracking \u2192 if a",
+    "  workiq-style MCP server is listed above, use its `mcp__*` tools.",
+    "- Generic web search / file ops / shell \u2014 use the openjaw built-ins",
+    "  when no MCP server provides equivalent functionality."
+  );
+  return lines.join("\n");
+}
+function normalizeServerName(name) {
+  return name.replace(/[^a-zA-Z0-9_-]/g, "_");
+}
+var init_mcp = __esm({
+  "src/prompts/mcp.ts"() {
+    "use strict";
+    __name(getMcpSection, "getMcpSection");
+    __name(normalizeServerName, "normalizeServerName");
+  }
+});
+
 // src/prompts/index.ts
 var prompts_exports = {};
 __export(prompts_exports, {
@@ -19922,14 +20010,14 @@ __export(prompts_exports, {
   clearPromptCache: () => clearPromptCache,
   getSystemPrompt: () => getSystemPrompt
 });
-async function getSystemPrompt() {
-  const resolved = await resolveSystemPromptSections(sections);
+async function getSystemPrompt(opts = {}) {
+  const resolved = await resolveSystemPromptSections(buildSections(opts));
   return resolved.filter((s) => s != null && s.length > 0);
 }
 function clearPromptCache() {
   clearSectionCache();
 }
-var sections;
+var buildSections;
 var init_prompts = __esm({
   "src/prompts/index.ts"() {
     "use strict";
@@ -19942,8 +20030,9 @@ var init_prompts = __esm({
     init_memory2();
     init_skills();
     init_context();
+    init_mcp();
     init_sections();
-    sections = [
+    buildSections = /* @__PURE__ */ __name((opts = {}) => [
       // Static sections (cached across calls)
       systemPromptSection("identity", () => getIdentitySection()),
       systemPromptSection("reasoning", () => getReasoningSection()),
@@ -19955,8 +20044,9 @@ var init_prompts = __esm({
       DANGEROUS_uncachedSection("user", () => getUserSection(), "user prompt may be edited between calls"),
       DANGEROUS_uncachedSection("memory", () => getMemorySection(), "memory prefetch changes per query"),
       DANGEROUS_uncachedSection("skills", () => getSkillsSection(), "skill files may be added/edited between calls"),
+      DANGEROUS_uncachedSection("mcp", () => getMcpSection(opts.mcpManager ?? null), "MCP servers can connect/disconnect mid-session via /mcp"),
       DANGEROUS_uncachedSection("context", () => getContextSection(), "time and cwd change between calls")
-    ];
+    ], "buildSections");
     __name(getSystemPrompt, "getSystemPrompt");
     __name(clearPromptCache, "clearPromptCache");
   }
@@ -20211,8 +20301,8 @@ var init_telegram = __esm({
           }, "updateStatus");
           const { setMemoryPrefetchQuery: setMemoryPrefetchQuery2 } = await Promise.resolve().then(() => (init_memory2(), memory_exports));
           setMemoryPrefetchQuery2(text);
-          const sections2 = await this.systemPromptFn();
-          const systemPrompt = sections2.filter(Boolean).join("\n\n");
+          const sections = await this.systemPromptFn();
+          const systemPrompt = sections.filter(Boolean).join("\n\n");
           let answer = "";
           let toolCalls = [];
           const typingInterval = setInterval(() => {
@@ -20354,8 +20444,8 @@ Options: ${chunk.choices.join(" | ")}` : "";
           await this.bot.sendMessage(chatId, `\u{1F4F7} Processing image...`);
           const { setMemoryPrefetchQuery: setMemoryPrefetchQuery2 } = await Promise.resolve().then(() => (init_memory2(), memory_exports));
           setMemoryPrefetchQuery2(text);
-          const sections2 = await this.systemPromptFn();
-          const systemPrompt = sections2.filter(Boolean).join("\n\n");
+          const sections = await this.systemPromptFn();
+          const systemPrompt = sections.filter(Boolean).join("\n\n");
           const typingInterval = setInterval(() => {
             this.bot.sendChatAction(chatId, "typing").catch(() => {
             });
@@ -20491,7 +20581,7 @@ __export(meta_exports, {
 function createMetaTool(registry) {
   return {
     name: "openjaw_load_tools",
-    description: 'Dynamically load additional tools. PREFERRED: Load individual tools by name: tools: ["word_focus", "word_insert_text", "word_save"]. Only load specific tools you need for the task \u2014 avoid loading entire categories. Alternative: Load full category if many tools needed: categories: ["office"]. Available categories: ' + ALL_CATEGORIES.join(", ") + ".",
+    description: 'Dynamically load additional openjaw built-in tools (file, browser, office, etc.). NOTE: MCP server tools (any tool whose name starts with `mcp__`) are ALWAYS loaded automatically \u2014 never call this tool to load them, and never assume you need it before invoking an `mcp__*` tool. Load individual openjaw built-in tools by name: tools: ["word_focus", "word_insert_text", "word_save"]. Only load specific tools you need for the task \u2014 avoid loading entire categories. Alternative: Load full category if many tools needed: categories: ["office"]. Available categories: ' + ALL_CATEGORIES.join(", ") + ".",
     parameters: {
       type: "object",
       properties: {
@@ -25294,8 +25384,8 @@ Type /resume <id> to resume.` });
           const { spawnFork: spawnFork2 } = await Promise.resolve().then(() => (init_fork(), fork_exports));
           const { loadAgentConfig: loadAgentConfig2 } = await Promise.resolve().then(() => (init_config(), config_exports));
           const forkConfig = loadAgentConfig2();
-          const sections2 = await systemPromptFn();
-          const sysPrompt = sections2.filter(Boolean).join("\n\n");
+          const sections = await systemPromptFn();
+          const sysPrompt = sections.filter(Boolean).join("\n\n");
           const task = spawnFork2(
             forkPrompt,
             forkConfig,
@@ -25337,8 +25427,8 @@ ${list}` });
               addMessage({ type: "system", content: "Not enough history to compact (need >12 messages)." });
               return;
             }
-            const sections2 = await systemPromptFn();
-            const systemPrompt = sections2.filter(Boolean).join("\n\n");
+            const sections = await systemPromptFn();
+            const systemPrompt = sections.filter(Boolean).join("\n\n");
             const result = await agentLoop.compact(systemPrompt);
             if (result) {
               const afterTokens = contextManager.getEstimatedTokens();
@@ -25360,8 +25450,8 @@ ${list}` });
               addMessage({ type: "system", content: "Not enough history to compress (need >6 messages)." });
               return;
             }
-            const sections2 = await systemPromptFn();
-            const systemPrompt = sections2.filter(Boolean).join("\n\n");
+            const sections = await systemPromptFn();
+            const systemPrompt = sections.filter(Boolean).join("\n\n");
             const compressor = agentLoop.contextCompressor;
             if (compressor.isThrottled) {
               addMessage({ type: "system", content: "\u26A0 Compression throttled \u2014 recent attempts saved <10%. Try /compact or /clear instead." });
@@ -25660,8 +25750,8 @@ ${voices.length > 20 ? `... and ${voices.length - 20} more` : ""}` });
         try {
           const { setMemoryPrefetchQuery: setMemoryPrefetchQuery2 } = await Promise.resolve().then(() => (init_memory2(), memory_exports));
           setMemoryPrefetchQuery2(input);
-          const sections2 = await systemPromptFn();
-          const systemPrompt = sections2.filter(Boolean).join("\n\n");
+          const sections = await systemPromptFn();
+          const systemPrompt = sections.filter(Boolean).join("\n\n");
           let userMessage = image ? `${input}
 
 [User has attached a screenshot image (${image.width}\xD7${image.height}). Analyze the image carefully.]` : input;
@@ -26522,8 +26612,8 @@ var init_teams = __esm({
           }, "updateStatus");
           const { setMemoryPrefetchQuery: setMemoryPrefetchQuery2 } = await Promise.resolve().then(() => (init_memory2(), memory_exports));
           setMemoryPrefetchQuery2(text);
-          const sections2 = await this.systemPromptFn();
-          const systemPrompt = sections2.filter(Boolean).join("\n\n");
+          const sections = await this.systemPromptFn();
+          const systemPrompt = sections.filter(Boolean).join("\n\n");
           let answer = "";
           let thinkingBuffer = "";
           let toolCalls = [];
@@ -26801,8 +26891,8 @@ var init_feishu = __esm({
           }, "updateStatus");
           const { setMemoryPrefetchQuery: setMemoryPrefetchQuery2 } = await Promise.resolve().then(() => (init_memory2(), memory_exports));
           setMemoryPrefetchQuery2(text);
-          const sections2 = await this.systemPromptFn();
-          const systemPrompt = sections2.filter(Boolean).join("\n\n");
+          const sections = await this.systemPromptFn();
+          const systemPrompt = sections.filter(Boolean).join("\n\n");
           let answer = "";
           let thinkingBuffer = "";
           let toolCalls = [];
@@ -27579,8 +27669,8 @@ Scan URL manually: ${qrUrl}` });
           });
           const { setMemoryPrefetchQuery: setMemoryPrefetchQuery2 } = await Promise.resolve().then(() => (init_memory2(), memory_exports));
           setMemoryPrefetchQuery2(text);
-          const sections2 = await this.systemPromptFn();
-          const systemPrompt = sections2.filter(Boolean).join("\n\n");
+          const sections = await this.systemPromptFn();
+          const systemPrompt = sections.filter(Boolean).join("\n\n");
           let answer = "";
           let thinkingBuffer = "";
           let lastThinkingSegment = "";
@@ -28119,7 +28209,7 @@ async function startInkUI(resumeSessionId, bridges = []) {
     join36(homedir22(), ".openjaw", "memory", "MEMORY.md")
   ];
   const memoryStatus = existsSync28(memoryDbPath) ? "loaded" : memoryLegacyPaths.some((p) => existsSync28(p)) ? "legacy" : "empty";
-  const systemPromptFn = /* @__PURE__ */ __name(() => getSystemPrompt(), "systemPromptFn");
+  const systemPromptFn = /* @__PURE__ */ __name(() => getSystemPrompt({ mcpManager }), "systemPromptFn");
   const { createSkillTool: createSkillTool2 } = await Promise.resolve().then(() => (init_skill_tool(), skill_tool_exports));
   toolRegistry.registerTool(createSkillTool2(agentConfig, toolRegistry, systemPromptFn));
   const totalToolCount = toolRegistry.listTools().length;
@@ -28906,7 +28996,7 @@ async function bootstrapAgent(opts = {}) {
     join38(homedir24(), ".openjaw", "memory", "MEMORY.md")
   ];
   const memoryStatus = existsSync30(memoryDbPath) ? "loaded" : memoryLegacyPaths.some((p) => existsSync30(p)) ? "legacy" : "empty";
-  const systemPromptFn = /* @__PURE__ */ __name(() => getSystemPrompt(), "systemPromptFn");
+  const systemPromptFn = /* @__PURE__ */ __name(() => getSystemPrompt({ mcpManager }), "systemPromptFn");
   const { createSkillTool: createSkillTool2 } = await Promise.resolve().then(() => (init_skill_tool(), skill_tool_exports));
   toolRegistry.registerTool(createSkillTool2(agentConfig, toolRegistry, systemPromptFn));
   const totalToolCount = toolRegistry.listTools().length;
@@ -44229,7 +44319,7 @@ var init_details = __esm({
     resolveSections = /* @__PURE__ */ __name((raw) => raw && typeof raw === "object" && !Array.isArray(raw) ? Object.fromEntries(
       Object.entries(raw).map(([k, v]) => [k, parseDetailsMode(v)]).filter(([k, m]) => !!m && isSectionName(k))
     ) : {}, "resolveSections");
-    sectionMode = /* @__PURE__ */ __name((name, global, sections2, commandOverride = false) => sections2?.[name] ?? (commandOverride ? global : SECTION_DEFAULTS[name] ?? global), "sectionMode");
+    sectionMode = /* @__PURE__ */ __name((name, global, sections, commandOverride = false) => sections?.[name] ?? (commandOverride ? global : SECTION_DEFAULTS[name] ?? global), "sectionMode");
     nextDetailsMode = /* @__PURE__ */ __name((m) => MODES[(MODES.indexOf(m) + 1) % MODES.length], "nextDetailsMode");
   }
 });
@@ -44803,14 +44893,14 @@ var init_core = __esm({
         help: "list commands + hotkeys",
         name: "help",
         run: /* @__PURE__ */ __name((_arg, ctx) => {
-          const sections2 = (ctx.local.catalog?.categories ?? []).map((cat) => ({
+          const sections = (ctx.local.catalog?.categories ?? []).map((cat) => ({
             rows: cat.pairs,
             title: cat.name
           }));
           if (ctx.local.catalog?.skillCount) {
-            sections2.push({ text: `${ctx.local.catalog.skillCount} skill commands available \u2014 /skills to browse` });
+            sections.push({ text: `${ctx.local.catalog.skillCount} skill commands available \u2014 /skills to browse` });
           }
-          sections2.push(
+          sections.push(
             {
               rows: [
                 ["/details [hidden|collapsed|expanded|cycle]", "set global agent detail visibility mode"],
@@ -44824,7 +44914,7 @@ var init_core = __esm({
             },
             { rows: HOTKEYS, title: "Hotkeys" }
           );
-          ctx.transcript.panel(ctx.ui.theme.brand.helpHeader, sections2);
+          ctx.transcript.panel(ctx.ui.theme.brand.helpHeader, sections);
         }, "run")
       },
       {
@@ -44985,8 +45075,8 @@ var init_core = __esm({
           if (!next) {
             return transcript.sys(DETAILS_USAGE);
           }
-          const sections2 = Object.fromEntries(SECTION_NAMES.map((section) => [section, next]));
-          patchUiState({ detailsMode: next, detailsModeCommandOverride: true, sections: sections2 });
+          const sections = Object.fromEntries(SECTION_NAMES.map((section) => [section, next]));
+          patchUiState({ detailsMode: next, detailsModeCommandOverride: true, sections });
           gateway.rpc("config.set", { key: "details_mode", value: next }).catch(() => {
           });
           transcript.sys(`details: ${next}`);
@@ -45821,7 +45911,7 @@ var init_openjaw = __esm({
         run: /* @__PURE__ */ __name((_arg, ctx) => {
           ctx.gateway.rpc("session.stats", { session_id: ctx.sid }).then(
             ctx.guarded((r) => {
-              const sections2 = [
+              const sections = [
                 {
                   rows: [
                     ["Session", r.session_id ?? ctx.sid ?? "(none)"],
@@ -45834,7 +45924,7 @@ var init_openjaw = __esm({
                   ]
                 }
               ];
-              ctx.transcript.panel("Session stats", sections2);
+              ctx.transcript.panel("Session stats", sections);
             })
           ).catch(ctx.guardedErr);
         }, "run")
@@ -46335,11 +46425,11 @@ ${body}` : body;
                   ["Category", String(info.category ?? "")],
                   ["Path", String(info.path ?? "")]
                 ];
-                const sections2 = [{ rows }];
+                const sections = [{ rows }];
                 if (info.description) {
-                  sections2.push({ text: String(info.description) });
+                  sections.push({ text: String(info.description) });
                 }
-                panel("Skill", sections2);
+                panel("Skill", sections);
               })
             ).catch(ctx.guardedErr);
             return;
@@ -47094,14 +47184,14 @@ var init_session2 = __esm({
             if (cost) {
               rows.push(["Cost", cost]);
             }
-            const sections2 = [{ rows }];
+            const sections = [{ rows }];
             if (r.context_max) {
-              sections2.push({ text: `Context: ${f(r.context_used)} / ${f(r.context_max)} (${r.context_percent}%)` });
+              sections.push({ text: `Context: ${f(r.context_used)} / ${f(r.context_max)} (${r.context_percent}%)` });
             }
             if (r.compressions) {
-              sections2.push({ text: `Compressions: ${r.compressions}` });
+              sections.push({ text: `Compressions: ${r.compressions}` });
             }
-            ctx.transcript.panel("Usage", sections2);
+            ctx.transcript.panel("Usage", sections);
           });
         }, "run")
       }
@@ -48116,8 +48206,8 @@ ${helpMessage}` : field.label;
     if (!prompt) {
       return { id: 0, status: "error" };
     }
-    const sections2 = await systemPromptFn();
-    const systemPrompt = sections2.filter(Boolean).join("\n\n");
+    const sections = await systemPromptFn();
+    const systemPrompt = sections.filter(Boolean).join("\n\n");
     const task = spawnFork(prompt, loadAgentConfig(), toolRegistry, systemPrompt, (completed) => {
       const success = completed.status === "done";
       const text = `${success ? "\u2705" : "\u274C"} Fork #${completed.id} completed: ${completed.result || "(no result)"}`;
@@ -48324,8 +48414,8 @@ ${helpMessage}` : field.label;
       };
     }
     const before = agentLoop.history.length;
-    const sections2 = await systemPromptFn();
-    const systemPrompt = sections2.filter(Boolean).join("\n\n");
+    const sections = await systemPromptFn();
+    const systemPrompt = sections.filter(Boolean).join("\n\n");
     let ok = false;
     try {
       ok = await agentLoop.compact(systemPrompt);
@@ -48382,8 +48472,8 @@ ${helpMessage}` : field.label;
   bus.registerRpc("prompt.background", async (params) => {
     const text = String(params.text ?? "").trim();
     if (!text) return { task_id: "" };
-    const sections2 = await systemPromptFn();
-    const systemPrompt = sections2.filter(Boolean).join("\n\n");
+    const sections = await systemPromptFn();
+    const systemPrompt = sections.filter(Boolean).join("\n\n");
     const task = spawnFork(text, loadAgentConfig(), toolRegistry, systemPrompt, (completed) => {
       const success = completed.status === "done";
       const taskText = `${success ? "\u2705" : "\u274C"} bg ${completed.id} done: ${completed.result || "(no result)"}`;
@@ -48558,12 +48648,14 @@ ${helpMessage}` : field.label;
   bus.registerRpc("delegation.status", () => ({ delegated: [], paused: false }));
   bus.registerRpc("delegation.pause", (params) => ({ paused: Boolean(params.paused) }));
   bus.registerRpc("subagent.interrupt", () => ({ ok: true }));
+  syncMcpTools(mcpManager, toolRegistry);
   bus.emitEvent({
     payload: sessionInfoSnapshot(agentLoop, toolRegistry),
     session_id: agentLoop.sessionId,
     type: "session.info"
   });
   const onToolsChanged = /* @__PURE__ */ __name(() => {
+    syncMcpTools(mcpManager, toolRegistry);
     bus.emitEvent({
       payload: sessionInfoSnapshot(agentLoop, toolRegistry),
       session_id: agentLoop.sessionId,
@@ -48580,7 +48672,7 @@ ${helpMessage}` : field.label;
     }
   };
 }
-var PROVIDERS2, PROVIDER_LABELS, PROVIDER_AUTH, isProviderAuthenticated, buildProviderOption, fetchLiveModels, BRIDGE_SOURCES, isBridgeSource, inferBridgeSource, bridgeLabels, bridgeEventLabels, stripBridgeGlyph, firstLogLine, bridgeUser, formatBridgeText, runProcess, contentToText, sessionMessageToMarkdown, usageSnapshot, sessionInfoSnapshot;
+var PROVIDERS2, PROVIDER_LABELS, PROVIDER_AUTH, isProviderAuthenticated, buildProviderOption, fetchLiveModels, BRIDGE_SOURCES, isBridgeSource, inferBridgeSource, bridgeLabels, bridgeEventLabels, stripBridgeGlyph, firstLogLine, bridgeUser, formatBridgeText, runProcess, contentToText, sessionMessageToMarkdown, usageSnapshot, sessionInfoSnapshot, MCP_TOOL_PREFIX, MAX_TOTAL_TOOLS, syncMcpTools;
 var init_rpcHandlers = __esm({
   "src/rpcHandlers.ts"() {
     "use strict";
@@ -48809,6 +48901,23 @@ ${raw}`;
       tools: { [agentLoop.providerName]: toolRegistry.listTools().map((t) => t.name) },
       usage: usageSnapshot(agentLoop)
     }), "sessionInfoSnapshot");
+    MCP_TOOL_PREFIX = "mcp__";
+    MAX_TOTAL_TOOLS = 200;
+    syncMcpTools = /* @__PURE__ */ __name((mcpManager, toolRegistry) => {
+      let removed = 0;
+      for (const tool of toolRegistry.listTools()) {
+        if (tool.name.startsWith(MCP_TOOL_PREFIX)) {
+          if (toolRegistry.unregisterTool(tool.name)) removed++;
+        }
+      }
+      const nonMcpCount = toolRegistry.listTools().length;
+      const budget = Math.max(0, MAX_TOTAL_TOOLS - nonMcpCount);
+      const mcpTools = mcpManager.getTools(budget);
+      for (const tool of mcpTools) {
+        toolRegistry.registerTool(tool);
+      }
+      return { added: mcpTools.length, removed };
+    }, "syncMcpTools");
     __name(registerRpcHandlers, "registerRpcHandlers");
   }
 });
@@ -53504,7 +53613,7 @@ function useMainApp(gw) {
     []
   );
   const panel = useCallback10(
-    (title, sections2) => appendMessage({ kind: "panel", panelData: { sections: sections2, title }, role: "system", text: "" }),
+    (title, sections) => appendMessage({ kind: "panel", panelData: { sections, title }, role: "system", text: "" }),
     [appendMessage]
   );
   const maybeWarn = useCallback10(
@@ -57932,10 +58041,10 @@ function SessionPanel({ info, sid, t }) {
     ] })
   ] });
 }
-function Panel({ sections: sections2, t, title }) {
+function Panel({ sections, t, title }) {
   return /* @__PURE__ */ jsxs18(Box_default, { borderColor: t.color.border, borderStyle: "round", flexDirection: "column", paddingX: 2, paddingY: 1, children: [
     /* @__PURE__ */ jsx30(Box_default, { justifyContent: "center", marginBottom: 1, children: /* @__PURE__ */ jsx30(Text9, { bold: true, color: t.color.primary, children: title }) }),
-    sections2.map((sec, si) => /* @__PURE__ */ jsxs18(Box_default, { flexDirection: "column", marginTop: si > 0 ? 1 : 0, children: [
+    sections.map((sec, si) => /* @__PURE__ */ jsxs18(Box_default, { flexDirection: "column", marginTop: si > 0 ? 1 : 0, children: [
       sec.title && /* @__PURE__ */ jsx30(Text9, { bold: true, color: t.color.accent, children: sec.title }),
       sec.rows?.map(([k, v], ri) => /* @__PURE__ */ jsxs18(Text9, { wrap: "truncate", children: [
         /* @__PURE__ */ jsx30(Text9, { color: t.color.muted, children: k.padEnd(20) }),
@@ -60097,9 +60206,9 @@ function SubagentAccordion({
   const noteRows = [...summary ? [summary] : [], ...item.notes];
   const hasNotes = noteRows.length > 0;
   const noteColor = statusTone === "error" ? t.color.error : statusTone === "warn" ? t.color.warn : t.color.muted;
-  const sections2 = [];
+  const sections = [];
   if (hasThinking) {
-    sections2.push({
+    sections.push({
       header: /* @__PURE__ */ jsx36(
         Chevron,
         {
@@ -60133,7 +60242,7 @@ function SubagentAccordion({
     });
   }
   if (hasTools) {
-    sections2.push({
+    sections.push({
       header: /* @__PURE__ */ jsx36(
         Chevron,
         {
@@ -60169,7 +60278,7 @@ function SubagentAccordion({
     });
   }
   if (hasNotes) {
-    sections2.push({
+    sections.push({
       header: /* @__PURE__ */ jsx36(
         Chevron,
         {
@@ -60204,7 +60313,7 @@ function SubagentAccordion({
     });
   }
   if (children.length > 0) {
-    sections2.push({
+    sections.push({
       header: /* @__PURE__ */ jsx36(
         Chevron,
         {
@@ -60270,10 +60379,10 @@ function SubagentAccordion({
       stemColor: stem,
       stemDim: stem == null,
       t,
-      children: (childRails) => /* @__PURE__ */ jsx36(Box_default, { flexDirection: "column", children: sections2.map((section, index) => /* @__PURE__ */ jsx36(
+      children: (childRails) => /* @__PURE__ */ jsx36(Box_default, { flexDirection: "column", children: sections.map((section, index) => /* @__PURE__ */ jsx36(
         TreeNode,
         {
-          branch: index === sections2.length - 1 ? "last" : "mid",
+          branch: index === sections.length - 1 ? "last" : "mid",
           header: section.header,
           open: section.open,
           rails: childRails,
@@ -60345,7 +60454,7 @@ var init_thinking = __esm({
       reasoning = "",
       reasoningTokens,
       reasoningStreaming = false,
-      sections: sections2,
+      sections,
       subagents = [],
       t,
       tools = [],
@@ -60355,12 +60464,12 @@ var init_thinking = __esm({
     }) {
       const visible = useMemo15(
         () => ({
-          thinking: sectionMode("thinking", detailsMode, sections2, commandOverride),
-          tools: sectionMode("tools", detailsMode, sections2, commandOverride),
-          subagents: sectionMode("subagents", detailsMode, sections2, commandOverride),
-          activity: sectionMode("activity", detailsMode, sections2, commandOverride)
+          thinking: sectionMode("thinking", detailsMode, sections, commandOverride),
+          tools: sectionMode("tools", detailsMode, sections, commandOverride),
+          subagents: sectionMode("subagents", detailsMode, sections, commandOverride),
+          activity: sectionMode("activity", detailsMode, sections, commandOverride)
         }),
-        [commandOverride, detailsMode, sections2]
+        [commandOverride, detailsMode, sections]
       );
       const [now2, setNow] = useState26(() => Date.now());
       const [openThinking, setOpenThinking] = useState26(visible.thinking === "expanded");
@@ -60819,13 +60928,13 @@ var init_messageLine = __esm({
       isStreaming = false,
       limitHistoryRender = false,
       msg,
-      sections: sections2,
+      sections,
       t,
       tools = []
     }) {
-      const thinkingMode = sectionMode("thinking", detailsMode, sections2, detailsModeCommandOverride);
-      const toolsMode = sectionMode("tools", detailsMode, sections2, detailsModeCommandOverride);
-      const activityMode = sectionMode("activity", detailsMode, sections2, detailsModeCommandOverride);
+      const thinkingMode = sectionMode("thinking", detailsMode, sections, detailsModeCommandOverride);
+      const toolsMode = sectionMode("tools", detailsMode, sections, detailsModeCommandOverride);
+      const activityMode = sectionMode("activity", detailsMode, sections, detailsModeCommandOverride);
       const thinking = msg.thinking?.trim() ?? "";
       const systemHasBoxArt = msg.role === "system" && (msg.text.match(/[\u2500-\u259F]/g)?.length ?? 0) >= 3;
       const systemIsLong = msg.role === "system" && msg.text.length > SYSTEM_COLLAPSE_CHARS && !systemHasBoxArt;
@@ -60849,7 +60958,7 @@ var init_messageLine = __esm({
             detailsMode,
             reasoning: thinking,
             reasoningTokens: msg.thinkingTokens,
-            sections: sections2,
+            sections,
             t,
             tools,
             toolTokens: msg.toolTokens,
@@ -60921,7 +61030,7 @@ var init_messageLine = __esm({
                 detailsMode,
                 reasoning: thinking,
                 reasoningTokens: msg.thinkingTokens,
-                sections: sections2,
+                sections,
                 t,
                 toolTokens: msg.toolTokens,
                 trail: msg.tools
@@ -61010,7 +61119,7 @@ var init_streamingAssistant = __esm({
       detailsMode,
       detailsModeCommandOverride,
       progress,
-      sections: sections2
+      sections
     }) {
       const ui = useStore8($uiState);
       const streamSegments = useTurnSelector((state) => state.streamSegments);
@@ -61030,7 +61139,7 @@ var init_streamingAssistant = __esm({
             detailsMode,
             detailsModeCommandOverride,
             msg,
-            sections: sections2,
+            sections,
             t: ui.theme
           },
           `seg:${i}`
@@ -61043,7 +61152,7 @@ var init_streamingAssistant = __esm({
             detailsMode,
             detailsModeCommandOverride,
             msg: { kind: "trail", role: "system", text: "" },
-            sections: sections2,
+            sections,
             t: ui.theme,
             tools: activeTools
           }
@@ -61061,7 +61170,7 @@ var init_streamingAssistant = __esm({
               text: streaming,
               ...streamPendingTools.length && { tools: streamPendingTools }
             },
-            sections: sections2,
+            sections,
             t: ui.theme
           }
         ),
@@ -61073,7 +61182,7 @@ var init_streamingAssistant = __esm({
             detailsMode,
             detailsModeCommandOverride,
             msg: { kind: "trail", role: "system", text: "", tools: streamPendingTools },
-            sections: sections2,
+            sections,
             t: ui.theme
           }
         )
@@ -61669,7 +61778,7 @@ Memory: ~/.openjaw/memory/ (shared with MCP mode)
       token: agentConfig.telegram.token,
       allowedUsers: agentConfig.telegram.allowed_users,
       agentLoop,
-      systemPromptFn: /* @__PURE__ */ __name(() => getSystemPrompt2(), "systemPromptFn")
+      systemPromptFn: /* @__PURE__ */ __name(() => getSystemPrompt2({ mcpManager }), "systemPromptFn")
     });
     try {
       await bridge.validate();