@bike4mind/cli 0.2.5-feat-auto-context-customization.17095 → 0.2.5-feat-server-side-tool-execution.17096

package/dist/index.js

@@ -4,9 +4,9 @@ import {
   getEffectiveApiKey,
   getOpenWeatherKey,
   getSerperKey
-} from "./chunk-55PRVW6C.js";
-import "./chunk-GXADX53I.js";
-import "./chunk-QFDR3XXO.js";
+} from "./chunk-WNBKV4FX.js";
+import "./chunk-LEG2UM5Q.js";
+import "./chunk-6AJODFPC.js";
 import {
   BFLImageService,
   BaseStorage,
@@ -15,7 +15,7 @@ import {
   OpenAIBackend,
   OpenAIImageService,
   XAIImageService
-} from "./chunk-RM2KFSVU.js";
+} from "./chunk-LYNNVNEC.js";
 import {
   Logger
 } from "./chunk-AMDXHL6S.js";
@@ -73,7 +73,7 @@ import {
   XAI_IMAGE_MODELS,
   b4mLLMTools,
   getMcpProviderMetadata
-} from "./chunk-2RFX62SX.js";
+} from "./chunk-WR6YZRQV.js";
 import {
   __require
 } from "./chunk-PDX44BCA.js";
@@ -1408,16 +1408,16 @@ var AuthTokensSchema = z.object({
 var ApiConfigSchema = z.object({
   customUrl: z.string().url().optional()
 });
+var LegacyApiConfigSchema = z.object({
+  environment: z.enum(["production", "staging", "preview", "local", "custom"]),
+  customUrl: z.string().url().optional()
+});
 var CliConfigSchema = z.object({
   version: z.string(),
   userId: z.string(),
   auth: AuthTokensSchema.optional(),
   defaultModel: z.string(),
   apiConfig: ApiConfigSchema.optional(),
-  toolApiKeys: z.object({
-    openweather: z.string().optional(),
-    serper: z.string().optional()
-  }).optional(),
   mcpServers: z.array(
     z.object({
       name: z.string(),
@@ -1442,15 +1442,36 @@ var CliConfigSchema = z.object({
   }),
   trustedTools: z.array(z.string()).optional().default([])
 });
+var getCliPackageRoot = () => {
+  const currentFile = new URL(import.meta.url).pathname;
+  const currentDir = path4.dirname(currentFile);
+  if (currentDir.endsWith("/dist") || currentDir.includes("/dist/")) {
+    return path4.resolve(currentDir, "..");
+  }
+  if (currentDir.includes("/src")) {
+    const srcIndex = currentDir.lastIndexOf("/src");
+    return currentDir.substring(0, srcIndex);
+  }
+  return process.cwd();
+};
 var DEFAULT_CONFIG = {
   version: "0.1.0",
   userId: uuidv4(),
   defaultModel: "claude-sonnet-4-5-20250929",
-  toolApiKeys: {
-    openweather: void 0,
-    serper: void 0
-  },
-  mcpServers: [],
+  mcpServers: [
+    // B4M server-side tools (weather, serper) via MCP proxy
+    {
+      name: "b4m-tools",
+      command: "node",
+      args: [path4.join(getCliPackageRoot(), "bin/b4m-mcp-proxy.mjs")],
+      // Absolute path to wrapper script
+      env: {
+        // Token and API URL injected dynamically by wrapper script
+        B4M_TIMEOUT: "30000"
+      },
+      enabled: true
+    }
+  ],
   preferences: {
     maxTokens: 4096,
     temperature: 0.7,
@@ -1505,11 +1526,14 @@ var ConfigStore = class {
       const data = await fs4.readFile(this.configPath, "utf-8");
       const rawConfig = JSON.parse(data);
       if (rawConfig.apiConfig && "environment" in rawConfig.apiConfig) {
-        const oldApiConfig = rawConfig.apiConfig;
-        if (oldApiConfig.environment === "custom" && oldApiConfig.customUrl) {
-          rawConfig.apiConfig = { customUrl: oldApiConfig.customUrl };
-        } else {
-          rawConfig.apiConfig = {};
+        const legacyConfigResult = LegacyApiConfigSchema.safeParse(rawConfig.apiConfig);
+        if (legacyConfigResult.success) {
+          const oldApiConfig = legacyConfigResult.data;
+          if (oldApiConfig.environment === "custom" && oldApiConfig.customUrl) {
+            rawConfig.apiConfig = { customUrl: oldApiConfig.customUrl };
+          } else {
+            rawConfig.apiConfig = {};
+          }
         }
       }
       const validated = CliConfigSchema.parse(rawConfig);
@@ -1526,10 +1550,6 @@ var ConfigStore = class {
           ...DEFAULT_CONFIG.tools,
           ...validated.tools
         },
-        toolApiKeys: {
-          ...DEFAULT_CONFIG.toolApiKeys,
-          ...validated.toolApiKeys || {}
-        },
         trustedTools: validated.trustedTools || []
       };
       return this.config;
@@ -1564,10 +1584,6 @@ var ConfigStore = class {
         tools: {
           ...existingConfig.tools,
           ...config.tools || {}
-        },
-        toolApiKeys: {
-          ...existingConfig.toolApiKeys,
-          ...config.toolApiKeys || {}
         }
       };
     }
@@ -1720,6 +1736,26 @@ var ConfigStore = class {
     }
     await this.save(config);
   }
+  /**
+   * Ensure B4M MCP server is configured (auto-add if missing)
+   * This provides server-side tools (weather, serper) to the CLI
+   */
+  async ensureB4mMcpServer() {
+    const config = await this.load();
+    const hasB4mServer = config.mcpServers.some((s) => s.name === "b4m-tools");
+    if (!hasB4mServer) {
+      config.mcpServers.push({
+        name: "b4m-tools",
+        command: "node",
+        args: [path4.join(getCliPackageRoot(), "bin/b4m-mcp-proxy.mjs")],
+        env: {
+          B4M_TIMEOUT: "30000"
+        },
+        enabled: true
+      });
+      await this.save(config);
+    }
+  }
 };
 
 // src/storage/CommandHistoryStore.ts
@@ -3087,9 +3123,7 @@ var updateSchema = z76.object({
   name: z76.string().optional(),
   description: z76.string().optional(),
   billingContact: z76.string().optional(),
-  currentCredits: z76.coerce.number().optional(),
-  systemPrompt: z76.string().max(1e4).optional()
-  // ~2500 tokens
+  currentCredits: z76.coerce.number().optional()
 });
 
 // ../../b4m-core/packages/services/dist/src/organizationService/delete.js
@@ -4283,8 +4317,8 @@ async function processAndStoreImages(images, context) {
     const buffer = await downloadImage(image);
     const fileType = await fileTypeFromBuffer2(buffer);
     const filename = `${uuidv45()}.${fileType?.ext}`;
-    const path13 = await context.imageGenerateStorage.upload(buffer, filename, {});
-    return path13;
+    const path14 = await context.imageGenerateStorage.upload(buffer, filename, {});
+    return path14;
   }));
 }
 async function updateQuestAndReturnMarkdown(storedImageUrls, context) {
@@ -5468,8 +5502,8 @@ async function processAndStoreImage(imageUrl, context) {
   const buffer = await downloadImage2(imageUrl);
   const fileType = await fileTypeFromBuffer3(buffer);
   const filename = `${uuidv46()}.${fileType?.ext}`;
-  const path13 = await context.imageGenerateStorage.upload(buffer, filename, {});
-  return path13;
+  const path14 = await context.imageGenerateStorage.upload(buffer, filename, {});
+  return path14;
 }
 async function updateQuestAndReturnMarkdown2(storedImagePath, context) {
   await context.onFinish?.("edit_image", storedImagePath);
@@ -7881,92 +7915,6 @@ var deleteFileTool = {
   })
 };
 
-// ../../b4m-core/packages/services/dist/src/llm/tools/implementation/knowledgeBaseSearch/index.js
-function formatSearchResults(files) {
-  if (files.length === 0) {
-    return "No documents found matching your search query in your knowledge base.";
-  }
-  const formattedFiles = files.map((file, index) => {
-    const tags = file.tags?.map((t) => t.name).join(", ") || "none";
-    const notes = file.notes ? `
-   Notes: ${file.notes}` : "";
-    const fileType = file.type || "FILE";
-    return `${index + 1}. **${file.fileName}**
-   Type: ${fileType} | MIME: ${file.mimeType}
-   Tags: ${tags}${notes}`;
-  });
-  return `Found ${files.length} document(s) in your knowledge base:
-
-` + formattedFiles.join("\n\n") + "\n\n*To use these documents in your conversation, you can ask me to reference specific files by name.*";
-}
-var knowledgeBaseSearchTool = {
-  name: "search_knowledge_base",
-  implementation: (context) => ({
-    toolFn: async (value) => {
-      const params = value;
-      const { query, tags, file_type, max_results = 5 } = params;
-      console.log("\u{1F4DA} Knowledge Base Search: Starting search for query:", query);
-      if (!context.db.fabfiles) {
-        console.error("\u274C Knowledge Base Search: fabfiles repository not available");
-        return "Knowledge base search is not available at this time.";
-      }
-      try {
-        const searchResults = await context.db.fabfiles.search(context.userId, query, {
-          tags: tags || [],
-          type: file_type,
-          shared: false
-          // Search all accessible files, not just shared
-        }, {
-          page: 1,
-          limit: Math.min(max_results, 10)
-          // Cap at 10 results
-        }, {
-          by: "fileName",
-          direction: "asc"
-        }, {
-          includeShared: true
-          // Include organization and explicitly shared files
-        });
-        console.log("\u{1F4DA} Knowledge Base Search: Found", searchResults.data.length, "results");
-        return formatSearchResults(searchResults.data);
-      } catch (error) {
-        console.error("\u274C Knowledge Base Search: Error during search:", error);
-        return "An error occurred while searching your knowledge base. Please try again.";
-      }
-    },
-    toolSchema: {
-      name: "search_knowledge_base",
-      description: "Search the user's uploaded knowledge base (fab files). Returns relevant documents from the user's own files, organization-shared files, and files explicitly shared with them. Use this tool when the user asks about their own documents, uploaded files, or organization knowledge.",
-      parameters: {
-        type: "object",
-        properties: {
-          query: {
-            type: "string",
-            description: "The search query to find relevant documents by filename or content"
-          },
-          tags: {
-            type: "array",
-            items: { type: "string" },
-            description: "Optional: filter results to only include files with these tags"
-          },
-          file_type: {
-            type: "string",
-            enum: ["pdf", "text", "image", "excel", "word", "json", "csv", "markdown", "code", "url"],
-            description: "Optional: filter results by file type"
-          },
-          max_results: {
-            type: "number",
-            description: "Maximum number of results to return (default: 5, max: 10)",
-            minimum: 1,
-            maximum: 10
-          }
-        },
-        required: ["query"]
-      }
-    }
-  })
-};
-
 // ../../b4m-core/packages/services/dist/src/llm/tools/index.js
 var tools = {
   dice_roll: diceRollTool,
@@ -7994,9 +7942,7 @@ var tools = {
   create_file: createFileTool,
   glob_files: globFilesTool,
   grep_search: grepSearchTool,
-  delete_file: deleteFileTool,
-  // Knowledge base search
-  search_knowledge_base: knowledgeBaseSearchTool
+  delete_file: deleteFileTool
 };
 var generateTools = (userId, user, logger2, { db }, storage, imageGenerateStorage, statusUpdate, onStart, onFinish, llm, config, model) => {
   const context = {
@@ -8276,21 +8222,21 @@ var NoOpStorage = class extends BaseStorage {
   async upload(input, destination, options) {
     return `/tmp/${destination}`;
   }
-  async download(path13) {
+  async download(path14) {
     throw new Error("Download not supported in CLI");
   }
-  async delete(path13) {
+  async delete(path14) {
   }
-  async getSignedUrl(path13) {
-    return `/tmp/${path13}`;
+  async getSignedUrl(path14) {
+    return `/tmp/${path14}`;
   }
-  getPublicUrl(path13) {
-    return `/tmp/${path13}`;
+  getPublicUrl(path14) {
+    return `/tmp/${path14}`;
   }
-  async getPreview(path13) {
-    return `/tmp/${path13}`;
+  async getPreview(path14) {
+    return `/tmp/${path14}`;
   }
-  async getMetadata(path13) {
+  async getMetadata(path14) {
     return { size: 0, contentType: "application/octet-stream" };
   }
 };
@@ -8362,7 +8308,7 @@ function wrapToolWithPermission(tool, permissionManager, showPermissionPrompt, a
     }
   };
 }
-function generateCliTools(userId, llm, model, permissionManager, showPermissionPrompt, agentContext, toolApiKeys) {
+function generateCliTools(userId, llm, model, permissionManager, showPermissionPrompt, agentContext) {
   const logger2 = new CliLogger();
   const storage = new NoOpStorage();
   const user = {
@@ -8377,50 +8323,27 @@ function generateCliTools(userId, llm, model, permissionManager, showPermissionP
   };
   const onFinish = async (toolName, data) => {
   };
-  const mockAdminSettings = {
-    findBySettingName: async (settingName) => {
-      if (settingName === "OpenWeatherKey") {
-        const key = toolApiKeys?.openweather || process.env.OPENWEATHER_API_KEY;
-        if (key) {
-          return { settingValue: key };
-        }
-      }
-      if (settingName === "SerperKey") {
-        const key = toolApiKeys?.serper || process.env.SERPER_API_KEY;
-        if (key) {
-          return { settingValue: key };
-        }
-      }
-      return null;
-    }
-  };
   const dbAdapters = {
     db: {
       apiKeys: null,
-      adminSettings: mockAdminSettings
+      adminSettings: null
     }
   };
-  const hasSerperKey = !!(toolApiKeys?.serper || process.env.SERPER_API_KEY);
-  const hasOpenWeatherKey = !!(toolApiKeys?.openweather || process.env.OPENWEATHER_API_KEY);
   const toolConfig = {
-    // Enable these tools for CLI (no external API keys needed)
+    // Local-only tools (no external API keys needed)
     dice_roll: {},
     math_evaluate: {},
     current_datetime: {},
     prompt_enhancement: {},
-    // File operation tools (CLI-specific)
+    // File operation tools (CLI-specific, local execution)
     file_read: {},
     create_file: {},
     glob_files: {},
     grep_search: {},
-    delete_file: {},
-    // Tools requiring API keys (only include if API key is available)
-    ...hasSerperKey && { web_search: {} },
-    // Requires SERPER_API_KEY
-    ...hasOpenWeatherKey && { weather_info: {} },
-    // Requires OPENWEATHER_API_KEY
-    ...hasSerperKey && { deep_research: {} }
-    // Requires SERPER_API_KEY
+    delete_file: {}
+    // REMOVED: weather_info, web_search, deep_research
+    // These are now provided by B4M MCP server (b4m-tools)
+    // They execute server-side using B4M company API keys
     // Disable web-only tools
     // blog_publish: undefined,
     // blog_edit: undefined,
@@ -8880,12 +8803,14 @@ var MCPClient = class {
   mcp;
   transport = null;
   envVariables;
+  customScriptPath;
   tools = [];
   serverName;
-  constructor({ envVariables, name, selectedRepositories }) {
+  constructor({ envVariables, name, selectedRepositories, customScriptPath }) {
     this.mcp = new Client2({ name: "mcp-client-cli", version: "1.0.0" });
     this.envVariables = [...envVariables];
     this.serverName = name;
+    this.customScriptPath = customScriptPath;
     if (name === "github" && selectedRepositories) {
       const reposJson = JSON.stringify(selectedRepositories);
       this.envVariables.push({
@@ -8896,26 +8821,35 @@ var MCPClient = class {
   }
   async connectToServer() {
     try {
-      const root = process.env.INIT_CWD || process.cwd();
-      const candidatePaths = [
-        // When running from SST Lambda with node_modules structure (copyFiles)
-        path12.join(root, `node_modules/@bike4mind/mcp/dist/src/${this.serverName}/index.js`),
-        // When running from SST Lambda deployed environment (/var/task)
-        path12.join(root, `b4m-core/packages/mcp/dist/src/${this.serverName}/index.js`),
-        // When running from SST Lambda (.sst/artifacts/mcpHandler-dev), navigate to monorepo root (3 levels up)
-        path12.join(root, `../../../b4m-core/packages/mcp/dist/src/${this.serverName}/index.js`),
-        // When running from packages/client (Next.js app), navigate to monorepo root (2 levels up)
-        path12.join(root, `../../b4m-core/packages/mcp/dist/src/${this.serverName}/index.js`),
-        // Original paths (backward compatibility)
-        path12.join(root, `/b4m-core/packages/mcp/dist/src/${this.serverName}/index.js`),
-        path12.join(root, "core", "mcp", "servers", this.serverName, "dist", "index.js")
-      ];
-      const serverScriptPath = candidatePaths.find((p) => existsSync6(p));
-      if (!serverScriptPath) {
-        const getDirectories = (source) => readdirSync3(source, { withFileTypes: true }).filter((dirent) => dirent.isDirectory()).map((dirent) => dirent.name);
-        console.error(`[MCP] Server script not found. Tried paths:`, candidatePaths);
-        console.error(`[MCP] Available directories in ${root}:`, getDirectories(root));
-        throw new Error(`MCP Server script path not found for ${this.serverName}. Root: ${root}, Available dirs: ${getDirectories(root).join(", ")}`);
+      let serverScriptPath;
+      if (this.customScriptPath) {
+        if (!existsSync6(this.customScriptPath)) {
+          throw new Error(`Custom MCP server script not found at: ${this.customScriptPath}`);
+        }
+        serverScriptPath = this.customScriptPath;
+      } else {
+        const root = process.env.INIT_CWD || process.cwd();
+        const candidatePaths = [
+          // When running from SST Lambda with node_modules structure (copyFiles)
+          path12.join(root, `node_modules/@bike4mind/mcp/dist/src/${this.serverName}/index.js`),
+          // When running from SST Lambda deployed environment (/var/task)
+          path12.join(root, `b4m-core/packages/mcp/dist/src/${this.serverName}/index.js`),
+          // When running from SST Lambda (.sst/artifacts/mcpHandler-dev), navigate to monorepo root (3 levels up)
+          path12.join(root, `../../../b4m-core/packages/mcp/dist/src/${this.serverName}/index.js`),
+          // When running from packages/client (Next.js app), navigate to monorepo root (2 levels up)
+          path12.join(root, `../../b4m-core/packages/mcp/dist/src/${this.serverName}/index.js`),
+          // Original paths (backward compatibility)
+          path12.join(root, `/b4m-core/packages/mcp/dist/src/${this.serverName}/index.js`),
+          path12.join(root, "core", "mcp", "servers", this.serverName, "dist", "index.js")
+        ];
+        const foundPath = candidatePaths.find((p) => existsSync6(p));
+        if (!foundPath) {
+          const getDirectories = (source) => readdirSync3(source, { withFileTypes: true }).filter((dirent) => dirent.isDirectory()).map((dirent) => dirent.name);
+          console.error(`[MCP] Server script not found. Tried paths:`, candidatePaths);
+          console.error(`[MCP] Available directories in ${root}:`, getDirectories(root));
+          throw new Error(`MCP Server script path not found for ${this.serverName}. Root: ${root}, Available dirs: ${getDirectories(root).join(", ")}`);
+        }
+        serverScriptPath = foundPath;
       }
       console.log(`[MCP] Using server: ${this.serverName} at ${serverScriptPath}`);
       this.transport = new StdioClientTransport({
@@ -8997,6 +8931,20 @@ var MCPClient = class {
 };
 
 // src/utils/mcpAdapter.ts
+import path13 from "path";
+import { fileURLToPath } from "url";
+var getCliPackageRoot2 = () => {
+  const currentFile = fileURLToPath(import.meta.url);
+  const currentDir = path13.dirname(currentFile);
+  if (currentDir.includes("/dist")) {
+    return path13.resolve(currentDir, "..");
+  }
+  if (currentDir.includes("/src")) {
+    const srcIndex = currentDir.lastIndexOf("/src");
+    return currentDir.substring(0, srcIndex);
+  }
+  return process.cwd();
+};
 var McpManager = class {
   constructor(config) {
     this.servers = /* @__PURE__ */ new Map();
@@ -9032,9 +8980,16 @@ var McpManager = class {
         key,
         value
       }));
+      let scriptPath = serverConfig.args?.[0];
+      if (scriptPath && !path13.isAbsolute(scriptPath)) {
+        scriptPath = path13.join(getCliPackageRoot2(), scriptPath);
+        logger.debug(`Resolved MCP script path: ${scriptPath}`);
+      }
       const client = new MCPClient({
         envVariables,
-        name: serverConfig.name
+        name: serverConfig.name,
+        // Pass custom script path for bundled servers like b4m-tools
+        customScriptPath: scriptPath
       });
       await client.connectToServer();
       const mcpData = {
@@ -9492,7 +9447,7 @@ import { isAxiosError as isAxiosError2 } from "axios";
 // package.json
 var package_default = {
   name: "@bike4mind/cli",
-  version: "0.2.5-feat-auto-context-customization.17095+87596453c",
+  version: "0.2.5-feat-server-side-tool-execution.17096+d6b936a82",
   type: "module",
   description: "Interactive CLI tool for Bike4Mind with ReAct agents",
   license: "UNLICENSED",
@@ -9525,6 +9480,7 @@ var package_default = {
   scripts: {
     dev: "tsx src/index.tsx",
     build: "tsup",
+    postbuild: "node scripts/bundle-mcp-proxy.mjs",
     typecheck: "tsc --noEmit",
     test: "vitest run",
     "test:watch": "vitest",
@@ -9594,10 +9550,11 @@ var package_default = {
   },
   devDependencies: {
     "@bike4mind/agents": "0.1.0",
-    "@bike4mind/common": "2.37.1-feat-auto-context-customization.17095+87596453c",
-    "@bike4mind/mcp": "1.19.6-feat-auto-context-customization.17095+87596453c",
-    "@bike4mind/services": "2.32.2-feat-auto-context-customization.17095+87596453c",
-    "@bike4mind/utils": "2.1.1-feat-auto-context-customization.17095+87596453c",
+    "@bike4mind/common": "2.37.1-feat-server-side-tool-execution.17096+d6b936a82",
+    "@bike4mind/mcp": "1.19.6-feat-server-side-tool-execution.17096+d6b936a82",
+    "@bike4mind/mcp-server-b4m-proxy": "1.0.1-feat-server-side-tool-execution.17096+d6b936a82",
+    "@bike4mind/services": "2.32.2-feat-server-side-tool-execution.17096+d6b936a82",
+    "@bike4mind/utils": "2.1.1-feat-server-side-tool-execution.17096+d6b936a82",
     "@types/diff": "^5.0.9",
     "@types/jsonwebtoken": "^9.0.4",
     "@types/node": "^22.9.0",
@@ -9609,7 +9566,7 @@ var package_default = {
     typescript: "^5.9.3",
     vitest: "^3.2.4"
   },
-  gitHead: "87596453cb00639e899f648a585324f86425ab17"
+  gitHead: "d6b936a82aed081ee4ef534a0e5260bc9fbe5714"
 };
 
 // src/config/constants.ts
@@ -9716,6 +9673,7 @@ function CliApp() {
           isAuthenticated = true;
           const daysUntilExpiry = Math.floor((expiresAt.getTime() - Date.now()) / (1e3 * 60 * 60 * 24));
           console.log(`\u2705 Authenticated (expires in ${daysUntilExpiry} day${daysUntilExpiry !== 1 ? "s" : ""})`);
+          await state.configStore.ensureB4mMcpServer();
         }
       }
       if (!isAuthenticated) {
@@ -9813,10 +9771,6 @@ function CliApp() {
           setPermissionPrompt(prompt);
         });
       };
-      console.log("\u{1F511} Tool API Keys:", {
-        openweather: config.toolApiKeys?.openweather ? "\u2713 configured" : "\u2717 missing",
-        serper: config.toolApiKeys?.serper ? "\u2713 configured" : "\u2717 missing"
-      });
       const agentContext = {
         currentAgent: null,
         observationQueue: []
@@ -9827,18 +9781,35 @@ function CliApp() {
         modelInfo.id,
         permissionManager,
         promptFn,
-        agentContext,
-        config.toolApiKeys
+        agentContext
       );
-      console.log(`\u{1F6E0}\uFE0F  Loaded ${b4mTools.length} B4M tool(s)`);
-      const mcpManager = new McpManager(config);
-      await mcpManager.initialize();
-      const mcpTools = mcpManager.getTools();
-      if (mcpTools.length > 0) {
-        const toolCounts = mcpManager.getToolCount();
-        toolCounts.forEach(({ serverName, count }) => {
-          console.log(`  \u{1F4E1} ${serverName}: ${count} tool(s)`);
-        });
+      console.log(`\u{1F6E0}\uFE0F  Loaded ${b4mTools.length} local tool(s)`);
+      let mcpManager = null;
+      let mcpTools = [];
+      try {
+        mcpManager = new McpManager(config);
+        await mcpManager.initialize();
+        mcpTools = mcpManager.getTools();
+        if (mcpTools.length > 0) {
+          const toolCounts = mcpManager.getToolCount();
+          toolCounts.forEach(({ serverName, count }) => {
+            console.log(`  \u{1F4E1} ${serverName}: ${count} tool(s)`);
+          });
+        }
+        const hasB4mServer = mcpManager.getServerNames().includes("b4m-tools");
+        if (hasB4mServer) {
+          console.log("\u{1F310} B4M server tools available (weather, web search)");
+        } else if (!authTokens) {
+          console.log("\u2139\uFE0F  Weather and search tools require authentication");
+          console.log("   Run /login to enable B4M server tools");
+        }
+      } catch (error) {
+        console.log("\u26A0\uFE0F  MCP server initialization failed - continuing with local tools only");
+        if (error instanceof Error) {
+          console.log(`   Error: ${error.message}`);
+        }
+        mcpManager = null;
+        mcpTools = [];
       }
       const allTools = [...b4mTools, ...mcpTools];
       console.log(`\u2705 Total: ${allTools.length} tool(s) available`);
@@ -10302,9 +10273,10 @@ No usage data available for the last ${USAGE_DAYS} days.`);
       {
         apiUrl: loginApiUrl,
         configStore: state.configStore,
-        onSuccess: () => {
+        onSuccess: async () => {
           setState((prev) => ({ ...prev, showLoginFlow: false }));
           console.log("\n\u2705 Login successful! Initializing CLI...\n");
+          await state.configStore.ensureB4mMcpServer();
           init().catch((err) => {
             console.error("\n\u274C Initialization failed:", err.message, "\n");
             exit();

package/dist/{llmMarkdownGenerator-T3OBRBEL.js → llmMarkdownGenerator-4ZR3FLEQ.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   CurationArtifactType
-} from "./chunk-2RFX62SX.js";
+} from "./chunk-WR6YZRQV.js";
 import "./chunk-PDX44BCA.js";
 
 // ../../b4m-core/packages/services/dist/src/notebookCurationService/llmMarkdownGenerator.js

package/dist/{markdownGenerator-3CHNICAY.js → markdownGenerator-7WE7WKME.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   CurationArtifactType
-} from "./chunk-2RFX62SX.js";
+} from "./chunk-WR6YZRQV.js";
 import "./chunk-PDX44BCA.js";
 
 // ../../b4m-core/packages/services/dist/src/notebookCurationService/markdownGenerator.js