@bike4mind/cli 0.2.5-fix-github-issue-type.17095 → 0.2.6-fix-cli-mcp-type-mismatch.17119

package/dist/index.js

@@ -4,9 +4,9 @@ import {
   getEffectiveApiKey,
   getOpenWeatherKey,
   getSerperKey
-} from "./chunk-MPZQL3KY.js";
-import "./chunk-PKOGN2ZZ.js";
-import "./chunk-TPWKBMIZ.js";
+} from "./chunk-3CCBDIFR.js";
+import "./chunk-LIRY24M5.js";
+import "./chunk-YXHQN7SK.js";
 import {
   BFLImageService,
   BaseStorage,
@@ -15,7 +15,7 @@ import {
   OpenAIBackend,
   OpenAIImageService,
   XAIImageService
-} from "./chunk-KH2C4VVX.js";
+} from "./chunk-DNSBC3LO.js";
 import {
   Logger
 } from "./chunk-AMDXHL6S.js";
@@ -73,14 +73,14 @@ import {
   XAI_IMAGE_MODELS,
   b4mLLMTools,
   getMcpProviderMetadata
-} from "./chunk-7Y3E4OY6.js";
+} from "./chunk-H6SHASMZ.js";
 import {
   __require
 } from "./chunk-PDX44BCA.js";
 
 // src/index.tsx
-import React12, { useState as useState4, useEffect as useEffect3, useCallback } from "react";
-import { render, Box as Box12, Text as Text11, useApp, useInput as useInput3 } from "ink";
+import React13, { useState as useState4, useEffect as useEffect3, useCallback } from "react";
+import { render, Box as Box13, Text as Text12, useApp, useInput as useInput3 } from "ink";
 import { v4 as uuidv49 } from "uuid";
 
 // src/components/App.tsx
@@ -685,103 +685,128 @@ var EXPORT_FORMAT_OPTIONS = [
   { label: "markdown", value: "markdown" },
   { label: "json", value: "json" }
 ];
-var CONFIG_ITEMS = [
-  {
-    key: "maxIterations",
-    label: "Max Iterations",
-    type: "select",
-    options: MAX_ITERATIONS_OPTIONS,
-    getValue: (config) => config.preferences.maxIterations,
-    setValue: (config, value) => ({
-      ...config,
-      preferences: {
-        ...config.preferences,
-        maxIterations: value
-      }
-    })
-  },
-  {
-    key: "maxTokens",
-    label: "Max Tokens",
-    type: "number",
-    min: 256,
-    max: 128e3,
-    step: 256,
-    getValue: (config) => config.preferences.maxTokens,
-    setValue: (config, value) => ({
-      ...config,
-      preferences: {
-        ...config.preferences,
-        maxTokens: value
-      }
-    })
-  },
-  {
-    key: "temperature",
-    label: "Temperature",
-    type: "number",
-    min: 0,
-    max: 2,
-    step: 0.1,
-    getValue: (config) => config.preferences.temperature,
-    setValue: (config, value) => ({
-      ...config,
-      preferences: {
-        ...config.preferences,
-        temperature: value
-      }
-    })
-  },
-  {
-    key: "autoSave",
-    label: "Auto Save",
-    type: "boolean",
-    getValue: (config) => config.preferences.autoSave,
-    setValue: (config, value) => ({
-      ...config,
-      preferences: {
-        ...config.preferences,
-        autoSave: value
-      }
-    })
-  },
-  {
-    key: "theme",
-    label: "Theme",
-    type: "select",
-    options: THEME_OPTIONS,
-    getValue: (config) => config.preferences.theme,
-    setValue: (config, value) => ({
-      ...config,
-      preferences: {
-        ...config.preferences,
-        theme: value
-      }
-    })
-  },
-  {
-    key: "exportFormat",
-    label: "Export Format",
-    type: "select",
-    options: EXPORT_FORMAT_OPTIONS,
-    getValue: (config) => config.preferences.exportFormat,
-    setValue: (config, value) => ({
-      ...config,
-      preferences: {
-        ...config.preferences,
-        exportFormat: value
-      }
-    })
+function buildConfigItems(availableModels) {
+  const modelOptions = availableModels.map((model) => ({
+    label: model.name,
+    value: model.id
+  }));
+  const items = [];
+  if (modelOptions.length > 0) {
+    items.push({
+      key: "model",
+      label: "Model",
+      type: "select",
+      options: modelOptions,
+      getValue: (config) => {
+        const modelExists = modelOptions.some((opt) => opt.value === config.defaultModel);
+        return modelExists ? config.defaultModel : modelOptions[0]?.value ?? config.defaultModel;
+      },
+      setValue: (config, value) => ({
+        ...config,
+        defaultModel: value
+      })
+    });
   }
-];
-function ConfigEditor({ config, onSave, onClose }) {
+  items.push(
+    {
+      key: "maxIterations",
+      label: "Max Iterations",
+      type: "select",
+      options: MAX_ITERATIONS_OPTIONS,
+      getValue: (config) => config.preferences.maxIterations,
+      setValue: (config, value) => ({
+        ...config,
+        preferences: {
+          ...config.preferences,
+          maxIterations: value
+        }
+      })
+    },
+    {
+      key: "maxTokens",
+      label: "Max Tokens",
+      type: "number",
+      min: 256,
+      max: 128e3,
+      step: 256,
+      getValue: (config) => config.preferences.maxTokens,
+      setValue: (config, value) => ({
+        ...config,
+        preferences: {
+          ...config.preferences,
+          maxTokens: value
+        }
+      })
+    },
+    {
+      key: "temperature",
+      label: "Temperature",
+      type: "number",
+      min: 0,
+      max: 2,
+      step: 0.1,
+      getValue: (config) => config.preferences.temperature,
+      setValue: (config, value) => ({
+        ...config,
+        preferences: {
+          ...config.preferences,
+          temperature: value
+        }
+      })
+    },
+    {
+      key: "autoSave",
+      label: "Auto Save",
+      type: "boolean",
+      getValue: (config) => config.preferences.autoSave,
+      setValue: (config, value) => ({
+        ...config,
+        preferences: {
+          ...config.preferences,
+          autoSave: value
+        }
+      })
+    },
+    {
+      key: "theme",
+      label: "Theme",
+      type: "select",
+      options: THEME_OPTIONS,
+      getValue: (config) => config.preferences.theme,
+      setValue: (config, value) => ({
+        ...config,
+        preferences: {
+          ...config.preferences,
+          theme: value
+        }
+      })
+    },
+    {
+      key: "exportFormat",
+      label: "Export Format",
+      type: "select",
+      options: EXPORT_FORMAT_OPTIONS,
+      getValue: (config) => config.preferences.exportFormat,
+      setValue: (config, value) => ({
+        ...config,
+        preferences: {
+          ...config.preferences,
+          exportFormat: value
+        }
+      })
+    }
+  );
+  return items;
+}
+function ConfigEditor({ config, availableModels, onSave, onClose }) {
   const [selectedIndex, setSelectedIndex] = useState2(0);
   const [editedConfig, setEditedConfig] = useState2(config);
   const [saveError, setSaveError] = useState2(null);
   const [isSaving, setIsSaving] = useState2(false);
+  const configItems = useMemo2(() => buildConfigItems(availableModels), [availableModels]);
   const hasChanges = useMemo2(() => {
-    return JSON.stringify(config.preferences) !== JSON.stringify(editedConfig.preferences);
-  }, [config.preferences, editedConfig.preferences]);
+    return JSON.stringify(config.preferences) !== JSON.stringify(editedConfig.preferences) || config.defaultModel !== editedConfig.defaultModel;
+  }, [config.preferences, editedConfig.preferences, config.defaultModel, editedConfig.defaultModel]);
   const handleSaveAndClose = async () => {
     if (hasChanges) {
       try {
@@ -798,13 +823,13 @@ function ConfigEditor({ config, onSave, onClose }) {
     onClose();
   };
   useInput2((input, key) => {
-    const currentItem = CONFIG_ITEMS[selectedIndex];
+    const currentItem = configItems[selectedIndex];
     if (key.upArrow) {
-      setSelectedIndex((prev) => prev > 0 ? prev - 1 : CONFIG_ITEMS.length - 1);
+      setSelectedIndex((prev) => prev > 0 ? prev - 1 : configItems.length - 1);
       return;
     }
     if (key.downArrow) {
-      setSelectedIndex((prev) => prev < CONFIG_ITEMS.length - 1 ? prev + 1 : 0);
+      setSelectedIndex((prev) => prev < configItems.length - 1 ? prev + 1 : 0);
       return;
     }
     if ((key.escape || input === "q") && !isSaving) {
@@ -862,7 +887,7 @@ function ConfigEditor({ config, onSave, onClose }) {
     }
     return String(value);
   };
-  return /* @__PURE__ */ React8.createElement(Box8, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 2, paddingY: 1, marginY: 1 }, /* @__PURE__ */ React8.createElement(Box8, { justifyContent: "space-between", marginBottom: 1 }, /* @__PURE__ */ React8.createElement(Text7, { bold: true, color: "cyan" }, "Settings"), isSaving ? /* @__PURE__ */ React8.createElement(Text7, { color: "yellow" }, "Saving...") : hasChanges ? /* @__PURE__ */ React8.createElement(Text7, { dimColor: true, color: "yellow" }, "(unsaved changes)") : null), saveError && /* @__PURE__ */ React8.createElement(Box8, { marginBottom: 1 }, /* @__PURE__ */ React8.createElement(Text7, { color: "red" }, "Error: ", saveError)), /* @__PURE__ */ React8.createElement(Box8, { flexDirection: "column", marginBottom: 1 }, CONFIG_ITEMS.map((item, index) => {
+  return /* @__PURE__ */ React8.createElement(Box8, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 2, paddingY: 1, marginY: 1 }, /* @__PURE__ */ React8.createElement(Box8, { justifyContent: "space-between", marginBottom: 1 }, /* @__PURE__ */ React8.createElement(Text7, { bold: true, color: "cyan" }, "Settings"), isSaving ? /* @__PURE__ */ React8.createElement(Text7, { color: "yellow" }, "Saving...") : hasChanges ? /* @__PURE__ */ React8.createElement(Text7, { dimColor: true, color: "yellow" }, "(unsaved changes)") : null), saveError && /* @__PURE__ */ React8.createElement(Box8, { marginBottom: 1 }, /* @__PURE__ */ React8.createElement(Text7, { color: "red" }, "Error: ", saveError)), /* @__PURE__ */ React8.createElement(Box8, { flexDirection: "column", marginBottom: 1 }, configItems.map((item, index) => {
     const isSelected = index === selectedIndex;
     const value = item.getValue(editedConfig);
     const displayValue = formatValue(item, value);
@@ -992,6 +1017,7 @@ function App({
   onPermissionResponse,
   commandHistory = [],
   config,
+  availableModels = [],
   onSaveConfig
 }) {
   const messages = useCliStore((state) => state.session?.messages || []);
@@ -1033,7 +1059,15 @@ ${errorBlock}`;
     },
     [onMessage, onCommand, setIsThinking]
   );
-  return /* @__PURE__ */ React9.createElement(Box9, { flexDirection: "column" }, /* @__PURE__ */ React9.createElement(StatusBar, { sessionName, model: currentModel, tokenUsage: totalTokens }), showConfigEditor && config && onSaveConfig ? /* @__PURE__ */ React9.createElement(Box9, { flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React9.createElement(ConfigEditor, { config, onSave: onSaveConfig, onClose: () => setShowConfigEditor(false) })) : permissionPrompt ? /* @__PURE__ */ React9.createElement(Box9, { flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React9.createElement(
+  return /* @__PURE__ */ React9.createElement(Box9, { flexDirection: "column" }, /* @__PURE__ */ React9.createElement(StatusBar, { sessionName, model: currentModel, tokenUsage: totalTokens }), showConfigEditor && config && onSaveConfig ? /* @__PURE__ */ React9.createElement(Box9, { flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React9.createElement(
+    ConfigEditor,
+    {
+      config,
+      availableModels,
+      onSave: onSaveConfig,
+      onClose: () => setShowConfigEditor(false)
+    }
+  )) : permissionPrompt ? /* @__PURE__ */ React9.createElement(Box9, { flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React9.createElement(
     PermissionPrompt,
     {
       toolName: permissionPrompt.toolName,
@@ -1099,9 +1133,42 @@ var MessageList = React10.memo(
   }
 );
 
-// src/components/LoginFlow.tsx
-import React11, { useState as useState3, useEffect as useEffect2 } from "react";
+// src/components/TrustLocationSelector.tsx
+import React11 from "react";
 import { Box as Box11, Text as Text10 } from "ink";
+import SelectInput2 from "ink-select-input";
+function TrustLocationSelector({ inProject, onSelect, onCancel }) {
+  const items = [];
+  if (inProject) {
+    items.push({
+      label: "Project settings (local) - Saved in .bike4mind/local.json (not committed)",
+      value: "local"
+    });
+    items.push({
+      label: "Project settings (team-wide) - Checked in at .bike4mind/config.json",
+      value: "project"
+    });
+  }
+  items.push({
+    label: "User settings - Saved at ~/.bike4mind/config.json",
+    value: "global"
+  });
+  const handleSelect = (item) => {
+    onSelect(item.value);
+  };
+  return /* @__PURE__ */ React11.createElement(Box11, { flexDirection: "column", marginY: 1 }, /* @__PURE__ */ React11.createElement(Box11, { marginBottom: 1 }, /* @__PURE__ */ React11.createElement(Text10, { bold: true }, "Where should this rule be saved?")), /* @__PURE__ */ React11.createElement(
+    SelectInput2,
+    {
+      items,
+      onSelect: handleSelect,
+      itemComponent: ({ isSelected, label }) => /* @__PURE__ */ React11.createElement(Box11, null, /* @__PURE__ */ React11.createElement(Text10, { color: isSelected ? "cyan" : void 0 }, isSelected ? "\u276F " : "  ", label))
+    }
+  ), /* @__PURE__ */ React11.createElement(Box11, { marginTop: 1 }, /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, "Use \u2191\u2193 arrows to navigate, Enter to select, Ctrl+C to cancel")));
+}
+
+// src/components/LoginFlow.tsx
+import React12, { useState as useState3, useEffect as useEffect2 } from "react";
+import { Box as Box12, Text as Text11 } from "ink";
 import Spinner2 from "ink-spinner";
 import jwt from "jsonwebtoken";
 import open from "open";
@@ -1264,15 +1331,15 @@ function LoginFlow({ apiUrl = "http://localhost:3000", configStore, onSuccess, o
     }
   }, [deviceFlow, status]);
   if (status === "initiating") {
-    return /* @__PURE__ */ React11.createElement(Box11, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React11.createElement(Box11, null, /* @__PURE__ */ React11.createElement(Text10, { color: "cyan" }, /* @__PURE__ */ React11.createElement(Spinner2, { type: "dots" }), " Initiating device authorization...")));
+    return /* @__PURE__ */ React12.createElement(Box12, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React12.createElement(Box12, null, /* @__PURE__ */ React12.createElement(Text11, { color: "cyan" }, /* @__PURE__ */ React12.createElement(Spinner2, { type: "dots" }), " Initiating device authorization...")));
   }
   if (status === "error") {
-    return /* @__PURE__ */ React11.createElement(Box11, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React11.createElement(Box11, { marginBottom: 1 }, /* @__PURE__ */ React11.createElement(Text10, { color: "red", bold: true }, "\u2716 Authentication Failed")), /* @__PURE__ */ React11.createElement(Box11, null, /* @__PURE__ */ React11.createElement(Text10, { color: "red" }, error)));
+    return /* @__PURE__ */ React12.createElement(Box12, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React12.createElement(Box12, { marginBottom: 1 }, /* @__PURE__ */ React12.createElement(Text11, { color: "red", bold: true }, "\u2716 Authentication Failed")), /* @__PURE__ */ React12.createElement(Box12, null, /* @__PURE__ */ React12.createElement(Text11, { color: "red" }, error)));
   }
   if (status === "success") {
-    return /* @__PURE__ */ React11.createElement(Box11, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React11.createElement(Box11, { marginBottom: 1 }, /* @__PURE__ */ React11.createElement(Text10, { color: "green", bold: true }, "\u2714 Successfully authenticated!")), /* @__PURE__ */ React11.createElement(Box11, null, /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, "You can now use B4M CLI with your account.")));
+    return /* @__PURE__ */ React12.createElement(Box12, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React12.createElement(Box12, { marginBottom: 1 }, /* @__PURE__ */ React12.createElement(Text11, { color: "green", bold: true }, "\u2714 Successfully authenticated!")), /* @__PURE__ */ React12.createElement(Box12, null, /* @__PURE__ */ React12.createElement(Text11, { dimColor: true }, "You can now use B4M CLI with your account.")));
   }
-  return /* @__PURE__ */ React11.createElement(Box11, { flexDirection: "column", padding: 1, borderStyle: "round", borderColor: "cyan" }, /* @__PURE__ */ React11.createElement(Box11, { marginBottom: 1 }, /* @__PURE__ */ React11.createElement(Text10, { color: "cyan", bold: true }, "\u{1F510} Device Authorization")), /* @__PURE__ */ React11.createElement(Box11, { marginBottom: 1 }, /* @__PURE__ */ React11.createElement(Text10, null, "Opening browser automatically... If it doesn't open, please visit:")), /* @__PURE__ */ React11.createElement(Box11, { marginBottom: 1, paddingLeft: 2 }, /* @__PURE__ */ React11.createElement(Text10, { color: "blue", bold: true }, deviceFlow?.verification_uri)), /* @__PURE__ */ React11.createElement(Box11, { marginBottom: 1 }, /* @__PURE__ */ React11.createElement(Text10, null, "And enter this code when prompted:")), /* @__PURE__ */ React11.createElement(Box11, { marginBottom: 1, paddingLeft: 2 }, /* @__PURE__ */ React11.createElement(Text10, { color: "yellow", bold: true }, deviceFlow?.user_code)), /* @__PURE__ */ React11.createElement(Box11, { marginTop: 1 }, /* @__PURE__ */ React11.createElement(Text10, { color: "cyan" }, /* @__PURE__ */ React11.createElement(Spinner2, { type: "dots" }), " ", statusMessage)), /* @__PURE__ */ React11.createElement(Box11, { marginTop: 1 }, /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, "Expires in ", deviceFlow ? Math.floor(deviceFlow.expires_in / 60) : 0, " minutes")));
+  return /* @__PURE__ */ React12.createElement(Box12, { flexDirection: "column", padding: 1, borderStyle: "round", borderColor: "cyan" }, /* @__PURE__ */ React12.createElement(Box12, { marginBottom: 1 }, /* @__PURE__ */ React12.createElement(Text11, { color: "cyan", bold: true }, "\u{1F510} Device Authorization")), /* @__PURE__ */ React12.createElement(Box12, { marginBottom: 1 }, /* @__PURE__ */ React12.createElement(Text11, null, "Opening browser automatically... If it doesn't open, please visit:")), /* @__PURE__ */ React12.createElement(Box12, { marginBottom: 1, paddingLeft: 2 }, /* @__PURE__ */ React12.createElement(Text11, { color: "blue", bold: true }, deviceFlow?.verification_uri)), /* @__PURE__ */ React12.createElement(Box12, { marginBottom: 1 }, /* @__PURE__ */ React12.createElement(Text11, null, "And enter this code when prompted:")), /* @__PURE__ */ React12.createElement(Box12, { marginBottom: 1, paddingLeft: 2 }, /* @__PURE__ */ React12.createElement(Text11, { color: "yellow", bold: true }, deviceFlow?.user_code)), /* @__PURE__ */ React12.createElement(Box12, { marginTop: 1 }, /* @__PURE__ */ React12.createElement(Text11, { color: "cyan" }, /* @__PURE__ */ React12.createElement(Spinner2, { type: "dots" }), " ", statusMessage)), /* @__PURE__ */ React12.createElement(Box12, { marginTop: 1 }, /* @__PURE__ */ React12.createElement(Text11, { dimColor: true }, "Expires in ", deviceFlow ? Math.floor(deviceFlow.expires_in / 60) : 0, " minutes")));
 }
 
 // src/storage/SessionStore.ts
@@ -1394,7 +1461,7 @@ var SessionStore = class {
 };
 
 // src/storage/ConfigStore.ts
-import { promises as fs4 } from "fs";
+import { promises as fs4, existsSync as existsSync2 } from "fs";
 import path4 from "path";
 import { homedir as homedir2 } from "os";
 import { v4 as uuidv4 } from "uuid";
@@ -1421,8 +1488,8 @@ var CliConfigSchema = z.object({
   mcpServers: z.array(
     z.object({
       name: z.string(),
-      command: z.string(),
-      args: z.array(z.string()),
+      command: z.string().optional(),
+      args: z.array(z.string()).optional(),
       env: z.record(z.string()),
       enabled: z.boolean()
     })
@@ -1442,6 +1509,53 @@ var CliConfigSchema = z.object({
   }),
   trustedTools: z.array(z.string()).optional().default([])
 });
+var ProjectConfigSchema = z.object({
+  tools: z.object({
+    enabled: z.array(z.string()).optional(),
+    denied: z.array(z.string()).optional(),
+    config: z.record(z.any()).optional()
+  }).optional(),
+  defaultModel: z.string().optional(),
+  mcpServers: z.array(
+    z.object({
+      name: z.string(),
+      command: z.string().optional(),
+      args: z.array(z.string()).optional(),
+      env: z.record(z.string()),
+      enabled: z.boolean()
+    })
+  ).optional(),
+  preferences: z.object({
+    maxTokens: z.number().optional(),
+    temperature: z.number().optional(),
+    autoSave: z.boolean().optional(),
+    theme: z.enum(["light", "dark"]).optional(),
+    exportFormat: z.enum(["markdown", "json"]).optional()
+  }).optional()
+});
+var ProjectLocalConfigSchema = z.object({
+  trustedTools: z.array(z.string()).optional(),
+  toolApiKeys: z.object({
+    openweather: z.string().optional(),
+    serper: z.string().optional()
+  }).optional(),
+  preferences: z.object({
+    maxTokens: z.number().optional(),
+    temperature: z.number().optional(),
+    autoSave: z.boolean().optional(),
+    theme: z.enum(["light", "dark"]).optional(),
+    exportFormat: z.enum(["markdown", "json"]).optional()
+  }).optional(),
+  mcpServers: z.array(
+    z.object({
+      name: z.string(),
+      command: z.string().optional(),
+      args: z.array(z.string()).optional(),
+      env: z.record(z.string()),
+      enabled: z.boolean()
+    })
+  ).optional()
+});
 var DEFAULT_CONFIG = {
   version: "0.1.0",
   userId: uuidv4(),
@@ -1468,9 +1582,124 @@ var DEFAULT_CONFIG = {
   trustedTools: []
   // No tools trusted by default
 };
+function findProjectConfigDir(startDir = process.cwd()) {
+  let currentDir = startDir;
+  const { root } = path4.parse(currentDir);
+  while (currentDir !== root) {
+    const gitPath = path4.join(currentDir, ".git");
+    try {
+      if (existsSync2(gitPath)) {
+        return currentDir;
+      }
+    } catch {
+    }
+    currentDir = path4.dirname(currentDir);
+  }
+  return process.cwd();
+}
+async function loadProjectConfig(projectDir) {
+  const configPath = path4.join(projectDir, ".bike4mind", "config.json");
+  try {
+    const data = await fs4.readFile(configPath, "utf-8");
+    const rawConfig = JSON.parse(data);
+    const validated = ProjectConfigSchema.parse(rawConfig);
+    return validated;
+  } catch (error) {
+    if (error.code === "ENOENT") {
+      return null;
+    }
+    if (error instanceof z.ZodError) {
+      console.error("Project config validation error:", error.errors);
+      return null;
+    }
+    console.error("Failed to load project config:", error);
+    return null;
+  }
+}
+async function loadProjectLocalConfig(projectDir) {
+  const configPath = path4.join(projectDir, ".bike4mind", "local.json");
+  try {
+    const data = await fs4.readFile(configPath, "utf-8");
+    const rawConfig = JSON.parse(data);
+    const validated = ProjectLocalConfigSchema.parse(rawConfig);
+    return validated;
+  } catch (error) {
+    if (error.code === "ENOENT") {
+      return null;
+    }
+    if (error instanceof z.ZodError) {
+      console.error("Project local config validation error:", error.errors);
+      return null;
+    }
+    console.error("Failed to load project local config:", error);
+    return null;
+  }
+}
+function mergeMcpServers(...serverArrays) {
+  const serverMap = /* @__PURE__ */ new Map();
+  for (const servers of serverArrays) {
+    if (servers) {
+      for (const server of servers) {
+        serverMap.set(server.name, server);
+      }
+    }
+  }
+  return Array.from(serverMap.values());
+}
+function mergeConfigs(global, project, local) {
+  const merged = { ...global };
+  if (project) {
+    if (project.defaultModel) {
+      merged.defaultModel = project.defaultModel;
+    }
+    if (project.preferences) {
+      merged.preferences = {
+        ...merged.preferences,
+        ...project.preferences
+      };
+    }
+    if (project.tools) {
+      merged.tools = {
+        ...merged.tools,
+        enabled: [...merged.tools.enabled || [], ...project.tools.enabled || []],
+        disabled: [...merged.tools.disabled, ...project.tools.denied || []],
+        config: {
+          ...merged.tools.config,
+          ...project.tools.config
+        }
+      };
+    }
+    if (project.mcpServers) {
+      merged.mcpServers = mergeMcpServers(merged.mcpServers, project.mcpServers);
+    }
+  }
+  if (local) {
+    if (local.trustedTools) {
+      const trustedSet = /* @__PURE__ */ new Set([...merged.trustedTools || [], ...local.trustedTools]);
+      merged.trustedTools = Array.from(trustedSet);
+    }
+    if (local.toolApiKeys) {
+      merged.toolApiKeys = {
+        ...merged.toolApiKeys,
+        ...local.toolApiKeys
+      };
+    }
+    if (local.preferences) {
+      merged.preferences = {
+        ...merged.preferences,
+        ...local.preferences
+      };
+    }
+    if (local.mcpServers) {
+      merged.mcpServers = mergeMcpServers(merged.mcpServers, local.mcpServers);
+    }
+  }
+  return merged;
+}
 var ConfigStore = class {
   constructor(configPath) {
     this.config = null;
+    this.projectConfigDir = null;
     this.configPath = configPath || path4.join(homedir2(), ".bike4mind", "config.json");
   }
   /**
@@ -1487,51 +1716,76 @@ var ConfigStore = class {
   }
   /**
    * Load configuration from disk with Zod validation
+   * Merges global → project → local configs
    */
   async load() {
     if (this.config) {
       return this.config;
     }
     try {
+      let globalConfig;
       try {
-        const stats = await fs4.stat(this.configPath);
-        const mode = stats.mode & 511;
-        if (mode !== 384) {
-          console.warn(`\u26A0\uFE0F  Config file has insecure permissions (${mode.toString(8)}). Setting to 0600...`);
-          await fs4.chmod(this.configPath, 384);
+        try {
+          const stats = await fs4.stat(this.configPath);
+          const mode = stats.mode & 511;
+          if (mode !== 384) {
+            console.warn(`\u26A0\uFE0F  Config file has insecure permissions (${mode.toString(8)}). Setting to 0600...`);
+            await fs4.chmod(this.configPath, 384);
+          }
+        } catch (statError) {
+        }
+        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 = {};
+          }
         }
-      } catch (statError) {
-      }
-      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 };
+        const validated = CliConfigSchema.parse(rawConfig);
+        globalConfig = {
+          ...DEFAULT_CONFIG,
+          ...validated,
+          auth: validated.auth,
+          // Explicitly preserve auth field
+          preferences: {
+            ...DEFAULT_CONFIG.preferences,
+            ...validated.preferences
+          },
+          tools: {
+            ...DEFAULT_CONFIG.tools,
+            ...validated.tools
+          },
+          toolApiKeys: {
+            ...DEFAULT_CONFIG.toolApiKeys,
+            ...validated.toolApiKeys || {}
+          },
+          trustedTools: validated.trustedTools || []
+        };
+      } catch (error) {
+        if (error.code === "ENOENT") {
+          globalConfig = { ...DEFAULT_CONFIG };
+        } else if (error instanceof z.ZodError) {
+          console.error("Global config validation error:", error.errors);
+          console.error("Using default configuration");
+          globalConfig = { ...DEFAULT_CONFIG };
         } else {
-          rawConfig.apiConfig = {};
+          throw error;
         }
       }
-      const validated = CliConfigSchema.parse(rawConfig);
-      this.config = {
-        ...DEFAULT_CONFIG,
-        ...validated,
-        auth: validated.auth,
-        // Explicitly preserve auth field
-        preferences: {
-          ...DEFAULT_CONFIG.preferences,
-          ...validated.preferences
-        },
-        tools: {
-          ...DEFAULT_CONFIG.tools,
-          ...validated.tools
-        },
-        toolApiKeys: {
-          ...DEFAULT_CONFIG.toolApiKeys,
-          ...validated.toolApiKeys || {}
-        },
-        trustedTools: validated.trustedTools || []
-      };
+      this.projectConfigDir = findProjectConfigDir();
+      let projectConfig = null;
+      let projectLocalConfig = null;
+      if (this.projectConfigDir) {
+        projectConfig = await loadProjectConfig(this.projectConfigDir);
+        projectLocalConfig = await loadProjectLocalConfig(this.projectConfigDir);
+        if (projectConfig) {
+          console.log(`\u{1F4C1} Project config loaded from: ${this.projectConfigDir}/.bike4mind/`);
+        }
+      }
+      this.config = mergeConfigs(globalConfig, projectConfig, projectLocalConfig);
       return this.config;
     } catch (error) {
       if (error.code === "ENOENT") {
@@ -1720,6 +1974,92 @@ var ConfigStore = class {
     }
     await this.save(config);
   }
+  /**
+   * Get project config directory (if any)
+   */
+  getProjectConfigDir() {
+    return this.projectConfigDir;
+  }
+  /**
+   * Initialize project config directory
+   * Creates .bike4mind/ directory and ensures local.json is gitignored
+   * Does NOT auto-create config.json (user creates that manually)
+   */
+  async initProjectConfig() {
+    const projectDir = this.projectConfigDir || findProjectConfigDir();
+    if (!projectDir) {
+      return;
+    }
+    const configDir = path4.join(projectDir, ".bike4mind");
+    await fs4.mkdir(configDir, { recursive: true });
+    await this.ensureGitignore(projectDir);
+  }
+  /**
+   * Ensure .gitignore includes .bike4mind/local.json
+   */
+  async ensureGitignore(projectDir) {
+    const gitignorePath = path4.join(projectDir, ".gitignore");
+    const entryToAdd = ".bike4mind/local.json";
+    try {
+      let gitignoreContent = "";
+      try {
+        gitignoreContent = await fs4.readFile(gitignorePath, "utf-8");
+      } catch {
+      }
+      if (gitignoreContent.includes(entryToAdd)) {
+        return;
+      }
+      const newContent = gitignoreContent.trim() + (gitignoreContent ? "\n" : "") + `
+# Bike4Mind local config (developer-specific)
+${entryToAdd}
+`;
+      await fs4.writeFile(gitignorePath, newContent, "utf-8");
+      console.log(`\u2705 Added ${entryToAdd} to .gitignore`);
+    } catch (error) {
+      console.warn(`\u26A0\uFE0F  Failed to update .gitignore:`, error);
+    }
+  }
+  /**
+   * Save project config to .bike4mind/config.json
+   */
+  async saveProjectConfig(config, projectDir) {
+    const targetDir = projectDir || this.projectConfigDir || process.cwd();
+    const configPath = path4.join(targetDir, ".bike4mind", "config.json");
+    await fs4.mkdir(path4.dirname(configPath), { recursive: true });
+    const validated = ProjectConfigSchema.parse(config);
+    await fs4.writeFile(configPath, JSON.stringify(validated, null, 2), "utf-8");
+    console.log(`\u2705 Saved project config to: ${configPath}`);
+  }
+  /**
+   * Save project-local config to .bike4mind/local.json
+   */
+  async saveProjectLocalConfig(config, projectDir) {
+    const targetDir = projectDir || this.projectConfigDir || process.cwd();
+    const configPath = path4.join(targetDir, ".bike4mind", "local.json");
+    await fs4.mkdir(path4.dirname(configPath), { recursive: true });
+    const validated = ProjectLocalConfigSchema.parse(config);
+    await fs4.writeFile(configPath, JSON.stringify(validated, null, 2), "utf-8");
+    await fs4.chmod(configPath, 384);
+    console.log(`\u2705 Saved project-local config to: ${configPath}`);
+  }
+  /**
+   * Load raw project config (without merging)
+   */
+  async loadRawProjectConfig() {
+    if (!this.projectConfigDir) {
+      return null;
+    }
+    return loadProjectConfig(this.projectConfigDir);
+  }
+  /**
+   * Load raw project-local config (without merging)
+   */
+  async loadRawProjectLocalConfig() {
+    if (!this.projectConfigDir) {
+      return null;
+    }
+    return loadProjectLocalConfig(this.projectConfigDir);
+  }
 };
 
 // src/storage/CommandHistoryStore.ts
@@ -4471,13 +4811,30 @@ async function performWebSearch(adapters, params) {
       link: result.link,
       snippet: result.snippet
     })) || [];
+    const citables = results.map((result, index) => ({
+      id: result.link,
+      // Use URL as unique identifier
+      type: "web_url",
+      title: result.title,
+      url: result.link,
+      description: result.snippet,
+      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+      status: "complete",
+      metadata: {
+        sourceSystem: "web_search",
+        relevanceScore: 1 - index * 0.1,
+        // Higher relevance for earlier results
+        fullContext: result.snippet
+      }
+    }));
     const formattedResults = results.map((result, index) => `${index + 1}. **${result.title}**
 ${result.snippet}
 Source: [${new URL(result.link).hostname}](${result.link})
 `).join("\n");
-    return formattedResults ? `Here's what I found from searching the web:
+    const formattedOutput = formattedResults ? `Here's what I found from searching the web:
 
 ${formattedResults}` : "No results found from web search.";
+    return { formattedResults: formattedOutput, citables };
   } catch (error) {
     console.error("\u274C WebSearch Tool: Error during search:", error);
     throw error;
@@ -4488,7 +4845,18 @@ var webSearchTool = {
   implementation: (context) => ({
     toolFn: async (value) => {
       const params = value;
-      return performWebSearch({ db: context.db }, params);
+      const { formattedResults, citables } = await performWebSearch({ db: context.db }, params);
+      if (citables.length > 0) {
+        await context.statusUpdate({
+          // Store citables in promptMeta - statusUpdate will Object.assign this
+          // The receiving code needs to handle merging promptMeta.citables
+          promptMeta: {
+            citables
+          }
+        }, "Web search complete");
+        console.log(`\u{1F4DA} WebSearch Tool: Stored ${citables.length} citables`);
+      }
+      return formattedResults;
     },
     toolSchema: {
       name: "web_search",
@@ -7305,7 +7673,7 @@ var planetVisibilityTool = {
 
 // ../../b4m-core/packages/services/dist/src/llm/tools/implementation/fileRead/index.js
 import { promises as fs7 } from "fs";
-import { existsSync as existsSync2, statSync as statSync3 } from "fs";
+import { existsSync as existsSync3, statSync as statSync3 } from "fs";
 import path6 from "path";
 var MAX_FILE_SIZE2 = 10 * 1024 * 1024;
 async function readFileContent(params) {
@@ -7316,7 +7684,7 @@ async function readFileContent(params) {
   if (!resolvedPath.startsWith(cwd)) {
     throw new Error(`Access denied: Cannot read files outside of current working directory`);
   }
-  if (!existsSync2(resolvedPath)) {
+  if (!existsSync3(resolvedPath)) {
     throw new Error(`File not found: ${filePath}`);
   }
   const stats = statSync3(resolvedPath);
@@ -7402,7 +7770,7 @@ var fileReadTool = {
 
 // ../../b4m-core/packages/services/dist/src/llm/tools/implementation/createFile/index.js
 import { promises as fs8 } from "fs";
-import { existsSync as existsSync3 } from "fs";
+import { existsSync as existsSync4 } from "fs";
 import path7 from "path";
 async function createFile(params) {
   const { path: filePath, content, createDirectories = true } = params;
@@ -7412,7 +7780,7 @@ async function createFile(params) {
   if (!resolvedPath.startsWith(cwd)) {
     throw new Error(`Access denied: Cannot create files outside of current working directory`);
   }
-  const fileExists = existsSync3(resolvedPath);
+  const fileExists = existsSync4(resolvedPath);
   const action = fileExists ? "overwritten" : "created";
   if (createDirectories) {
     const dir = path7.dirname(resolvedPath);
@@ -7430,7 +7798,7 @@ var createFileTool = {
   implementation: (context) => ({
     toolFn: async (value) => {
       const params = value;
-      const fileExists = existsSync3(path7.resolve(process.cwd(), path7.normalize(params.path)));
+      const fileExists = existsSync4(path7.resolve(process.cwd(), path7.normalize(params.path)));
       context.logger.info(`\u{1F4DD} CreateFile: ${fileExists ? "Overwriting" : "Creating"} file`, {
         path: params.path,
         size: params.content.length
@@ -7810,7 +8178,7 @@ var grepSearchTool = {
 
 // ../../b4m-core/packages/services/dist/src/llm/tools/implementation/deleteFile/index.js
 import { promises as fs9 } from "fs";
-import { existsSync as existsSync4, statSync as statSync6 } from "fs";
+import { existsSync as existsSync5, statSync as statSync6 } from "fs";
 import path10 from "path";
 async function deleteFile(params) {
   const { path: filePath, recursive = false } = params;
@@ -7820,7 +8188,7 @@ async function deleteFile(params) {
   if (!resolvedPath.startsWith(cwd)) {
     throw new Error(`Access denied: Cannot delete files outside of current working directory`);
   }
-  if (!existsSync4(resolvedPath)) {
+  if (!existsSync5(resolvedPath)) {
     throw new Error(`File or directory not found: ${filePath}`);
   }
   const stats = statSync6(resolvedPath);
@@ -7844,7 +8212,7 @@ var deleteFileTool = {
     toolFn: async (value) => {
       const params = value;
       const resolvedPath = path10.resolve(process.cwd(), path10.normalize(params.path));
-      const isDirectory = existsSync4(resolvedPath) && statSync6(resolvedPath).isDirectory();
+      const isDirectory = existsSync5(resolvedPath) && statSync6(resolvedPath).isDirectory();
       context.logger.info(`\u{1F5D1}\uFE0F  DeleteFile: Deleting ${isDirectory ? "directory" : "file"}`, {
         path: params.path,
         recursive: params.recursive
@@ -8134,10 +8502,10 @@ import jwt2 from "jsonwebtoken";
 // src/utils/diffPreview.ts
 import * as Diff from "diff";
 import { readFile } from "fs/promises";
-import { existsSync as existsSync5 } from "fs";
+import { existsSync as existsSync6 } from "fs";
 async function generateFileDiffPreview(args) {
   try {
-    if (!existsSync5(args.path)) {
+    if (!existsSync6(args.path)) {
       const lines2 = args.content.split("\n");
       const preview = lines2.slice(0, 20).join("\n");
       const hasMore = lines2.length > 20;
@@ -8167,7 +8535,7 @@ ${preview}${hasMore ? `
 }
 async function generateFileDeletePreview(args) {
   try {
-    if (!existsSync5(args.path)) {
+    if (!existsSync6(args.path)) {
       return `[File does not exist: ${args.path}]`;
     }
     const stats = await import("fs/promises").then((fs11) => fs11.stat(args.path));
@@ -8220,7 +8588,7 @@ var CliLogger = class extends Logger {
   log(...args) {
   }
 };
-function wrapToolWithPermission(tool, permissionManager, showPermissionPrompt, agentContext) {
+function wrapToolWithPermission(tool, permissionManager, showPermissionPrompt, agentContext, configStore) {
   const originalFn = tool.toolFn;
   const toolName = tool.toolSchema.name;
   return {
@@ -8264,7 +8632,25 @@ function wrapToolWithPermission(tool, permissionManager, showPermissionPrompt, a
         throw new PermissionDeniedError(toolName, args);
       }
       if (response.action === "allow-always") {
-        permissionManager.trustTool(toolName);
+        const canTrust = permissionManager.trustTool(toolName);
+        if (canTrust) {
+          const projectDir = configStore.getProjectConfigDir();
+          if (projectDir) {
+            try {
+              await configStore.initProjectConfig();
+              const existingLocal = await configStore.loadRawProjectLocalConfig() || {};
+              const updatedLocal = {
+                ...existingLocal,
+                trustedTools: [...existingLocal.trustedTools || [], toolName]
+              };
+              await configStore.saveProjectLocalConfig(updatedLocal);
+            } catch (error) {
+              await configStore.trustTool(toolName);
+            }
+          } else {
+            await configStore.trustTool(toolName);
+          }
+        }
       }
       const result = await originalFn(args);
       agentContext.observationQueue.push({ toolName, result });
@@ -8272,7 +8658,7 @@ function wrapToolWithPermission(tool, permissionManager, showPermissionPrompt, a
     }
   };
 }
-function generateCliTools(userId, llm, model, permissionManager, showPermissionPrompt, agentContext, toolApiKeys) {
+function generateCliTools(userId, llm, model, permissionManager, showPermissionPrompt, agentContext, configStore, toolApiKeys) {
   const logger2 = new CliLogger();
   const storage = new NoOpStorage();
   const user = {
@@ -8356,7 +8742,9 @@ function generateCliTools(userId, llm, model, permissionManager, showPermissionP
     toolConfig,
     model
   );
-  const tools2 = Object.entries(toolsMap).filter(([key]) => toolConfig[key] !== void 0).map(([_, tool]) => wrapToolWithPermission(tool, permissionManager, showPermissionPrompt, agentContext));
+  const tools2 = Object.entries(toolsMap).filter(([key]) => toolConfig[key] !== void 0).map(
+    ([_, tool]) => wrapToolWithPermission(tool, permissionManager, showPermissionPrompt, agentContext, configStore)
+  );
   return { tools: tools2, agentContext };
 }
 
@@ -8421,23 +8809,30 @@ function canTrustTool(toolName, customCategories) {
 
 // src/utils/PermissionManager.ts
 var PermissionManager = class {
-  constructor(trustedTools = [], customCategories) {
+  constructor(trustedTools = [], customCategories, deniedTools) {
     this.trustedTools = /* @__PURE__ */ new Set();
+    this.deniedTools = /* @__PURE__ */ new Set();
     this.trustedTools = new Set(trustedTools);
     this.customCategories = new Map(Object.entries(customCategories || {}));
+    this.deniedTools = new Set(deniedTools || []);
   }
   /**
    * Check if a tool needs permission before execution
    *
    * A tool needs permission if:
-   * 1. It's not in the auto_approve category, AND
-   * 2. It's not in the trusted tools set
+   * 1. It's in the denied tools list (from project config), OR
+   * 2. It's not in the auto_approve category, AND
+   * 3. It's not in the trusted tools set
    *
    * Note: prompt_always tools CANNOT be trusted, so they always need permission
+   * Note: denied tools from project config ALWAYS need permission (cannot be overridden locally)
    */
   needsPermission(toolName) {
     const categoryMap = Object.fromEntries(this.customCategories);
     const category = getToolCategory(toolName, categoryMap);
+    if (this.deniedTools.has(toolName)) {
+      return true;
+    }
     if (category === "auto_approve") {
       return false;
     }
@@ -8448,10 +8843,13 @@ var PermissionManager = class {
   }
   /**
    * Add a tool to the trusted list
-   * Returns false if the tool cannot be trusted (prompt_always category)
+   * Returns false if the tool cannot be trusted (prompt_always category or denied by project)
    */
   trustTool(toolName) {
     const categoryMap = Object.fromEntries(this.customCategories);
+    if (this.deniedTools.has(toolName)) {
+      return false;
+    }
     if (!canTrustTool(toolName, categoryMap)) {
       return false;
     }
@@ -8484,12 +8882,27 @@ var PermissionManager = class {
     return getToolCategory(toolName, categoryMap);
   }
   /**
-   * Check if a tool can be trusted (not in prompt_always category)
+   * Check if a tool can be trusted (not in prompt_always category or denied by project)
    */
   canBeTrusted(toolName) {
     const categoryMap = Object.fromEntries(this.customCategories);
+    if (this.deniedTools.has(toolName)) {
+      return false;
+    }
     return canTrustTool(toolName, categoryMap);
   }
+  /**
+   * Check if a tool is denied by project config
+   */
+  isDenied(toolName) {
+    return this.deniedTools.has(toolName);
+  }
+  /**
+   * Get list of denied tools
+   */
+  getDeniedTools() {
+    return Array.from(this.deniedTools).sort();
+  }
   /**
    * Clear all trusted tools
    */
@@ -8784,18 +9197,22 @@ var logger = Logger2.getInstance();
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 import { Client as Client2 } from "@modelcontextprotocol/sdk/client/index.js";
 import path12 from "path";
-import { existsSync as existsSync6, readdirSync as readdirSync3 } from "fs";
+import { existsSync as existsSync7, readdirSync as readdirSync3 } from "fs";
 var MCPClient = class {
   // Note: This class handles MCP server communication with repository filtering
   mcp;
   transport = null;
   envVariables;
+  customCommand;
+  customArgs;
   tools = [];
   serverName;
-  constructor({ envVariables, name, selectedRepositories }) {
+  constructor({ envVariables, name, selectedRepositories, command, args }) {
     this.mcp = new Client2({ name: "mcp-client-cli", version: "1.0.0" });
     this.envVariables = [...envVariables];
     this.serverName = name;
+    this.customCommand = command;
+    this.customArgs = args;
     if (name === "github" && selectedRepositories) {
       const reposJson = JSON.stringify(selectedRepositories);
       this.envVariables.push({
@@ -8806,37 +9223,48 @@ 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(", ")}`);
-      }
-      console.log(`[MCP] Using server: ${this.serverName} at ${serverScriptPath}`);
+      const envVarsObject = this.envVariables.reduce((acc, env) => ({
+        ...acc,
+        [env.key]: env.value
+      }), {});
+      let command;
+      let args;
+      if (this.customCommand && this.customCommand.trim() !== "") {
+        command = this.customCommand;
+        args = this.customArgs ?? [];
+        console.log(`[MCP] Using external command for ${this.serverName}: ${command} ${args.join(" ")}`);
+      } 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 serverScriptPath = candidatePaths.find((p) => existsSync7(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(", ")}`);
+        }
+        command = process.execPath;
+        args = [serverScriptPath];
+        console.log(`[MCP] Using server: ${this.serverName} at ${serverScriptPath}`);
+      }
       this.transport = new StdioClientTransport({
-        command: process.execPath,
-        args: [serverScriptPath],
+        command,
+        args,
         env: {
-          ...process.env,
-          ...this.envVariables.reduce((acc, env) => ({
-            ...acc,
-            [env.key]: env.value
-          }), {})
+          ...Object.fromEntries(Object.entries(process.env).filter((entry) => entry[1] !== void 0)),
+          ...envVarsObject
         }
       });
       this.transport.onerror = (error) => {
@@ -8944,7 +9372,9 @@ var McpManager = class {
       }));
       const client = new MCPClient({
         envVariables,
-        name: serverConfig.name
+        name: serverConfig.name,
+        command: serverConfig.command,
+        args: serverConfig.args
       });
       await client.connectToServer();
       const mcpData = {
@@ -9215,9 +9645,40 @@ var ServerLlmBackend = class {
   }
   /**
    * Get available models from server
-   * For now, returns hardcoded list of supported models
+   * Fetches from /api/models and filters for CLI-compatible models
+   * Falls back to hardcoded list if API fails
    */
   async getModelInfo() {
+    try {
+      logger.debug("[ServerLlmBackend] Fetching models from /api/models");
+      const response = await this.apiClient.get("/api/models");
+      if (!response || typeof response !== "object" || !Array.isArray(response.models)) {
+        logger.warn("[ServerLlmBackend] Invalid API response format, using fallback models");
+        logger.info("\u26A0\uFE0F  Using fallback model list (API returned invalid format)");
+        return this.getFallbackModels();
+      }
+      const filteredModels = response.models.filter((model) => model.type === "text" && model.supportsTools === true);
+      logger.debug(`[ServerLlmBackend] Fetched ${filteredModels.length} CLI-compatible models`);
+      if (filteredModels.length === 0) {
+        logger.warn("[ServerLlmBackend] No CLI-compatible models found from API, using fallback");
+        logger.info("\u26A0\uFE0F  Using fallback model list (no CLI-compatible models available)");
+        return this.getFallbackModels();
+      }
+      logger.info(`\u{1F4CB} Loaded ${filteredModels.length} models from server`);
+      return filteredModels;
+    } catch (error) {
+      logger.warn(
+        `[ServerLlmBackend] Failed to fetch models from API, using fallback: ${error instanceof Error ? error.message : String(error)}`
+      );
+      logger.info("\u26A0\uFE0F  Using fallback model list (API unavailable)");
+      return this.getFallbackModels();
+    }
+  }
+  /**
+   * Fallback models when API is unavailable
+   * Returns hardcoded list of commonly supported models
+   */
+  getFallbackModels() {
     return [
       {
         id: "claude-sonnet-4-5-20250929",
@@ -9402,7 +9863,7 @@ import { isAxiosError as isAxiosError2 } from "axios";
 // package.json
 var package_default = {
   name: "@bike4mind/cli",
-  version: "0.2.5-fix-github-issue-type.17095+7ae053c6e",
+  version: "0.2.6-fix-cli-mcp-type-mismatch.17119+0906e1e34",
   type: "module",
   description: "Interactive CLI tool for Bike4Mind with ReAct agents",
   license: "UNLICENSED",
@@ -9504,10 +9965,10 @@ var package_default = {
   },
   devDependencies: {
     "@bike4mind/agents": "0.1.0",
-    "@bike4mind/common": "2.37.1-fix-github-issue-type.17095+7ae053c6e",
-    "@bike4mind/mcp": "1.19.6-fix-github-issue-type.17095+7ae053c6e",
-    "@bike4mind/services": "2.32.2-fix-github-issue-type.17095+7ae053c6e",
-    "@bike4mind/utils": "2.1.1-fix-github-issue-type.17095+7ae053c6e",
+    "@bike4mind/common": "2.38.1-fix-cli-mcp-type-mismatch.17119+0906e1e34",
+    "@bike4mind/mcp": "1.20.1-fix-cli-mcp-type-mismatch.17119+0906e1e34",
+    "@bike4mind/services": "2.33.1-fix-cli-mcp-type-mismatch.17119+0906e1e34",
+    "@bike4mind/utils": "2.1.2-fix-cli-mcp-type-mismatch.17119+0906e1e34",
     "@types/diff": "^5.0.9",
     "@types/jsonwebtoken": "^9.0.4",
     "@types/node": "^22.9.0",
@@ -9519,7 +9980,7 @@ var package_default = {
     typescript: "^5.9.3",
     vitest: "^3.2.4"
   },
-  gitHead: "7ae053c6e896d08aa21ed44cdf3502ba04ae3cb7"
+  gitHead: "0906e1e34709a52074b386d9b51a94776db1d33d"
 };
 
 // src/config/constants.ts
@@ -9548,7 +10009,8 @@ function CliApp() {
     agent: null,
     mcpManager: null,
     permissionManager: null,
-    permissionPrompt: null
+    permissionPrompt: null,
+    trustLocationSelector: null
   });
   const [isInitialized, setIsInitialized] = useState4(false);
   const [initError, setInitError] = useState4(null);
@@ -9710,7 +10172,13 @@ function CliApp() {
         debug: () => {
         }
       };
-      const permissionManager = new PermissionManager(config.trustedTools || []);
+      const permissionManager = new PermissionManager(
+        config.trustedTools || [],
+        void 0,
+        // customCategories (not used yet)
+        config.tools.disabled || []
+        // denied tools from project config
+      );
       const promptFn = (toolName, args, preview) => {
         return new Promise((resolve3) => {
           const canBeTrusted = permissionManager.canBeTrusted(toolName);
@@ -9738,6 +10206,7 @@ function CliApp() {
         permissionManager,
         promptFn,
         agentContext,
+        state.configStore,
         config.toolApiKeys
       );
       console.log(`\u{1F6E0}\uFE0F  Loaded ${b4mTools.length} B4M tool(s)`);
@@ -9802,8 +10271,10 @@ Remember: Use context from previous messages to understand follow-up questions.`
         agent,
         mcpManager,
         permissionManager,
-        config
+        config,
         // Store config for synchronous access
+        availableModels: models
+        // Store models for ConfigEditor
       }));
       setStoreSession(newSession);
       setIsInitialized(true);
@@ -9919,6 +10390,9 @@ Tool Permissions:
   /trust <tool-name> - Trust a tool (won't ask permission again)
   /untrust <tool-name> - Remove tool from trusted list
   /trusted - List all trusted tools
+
+Project Configuration:
+  /project-config - Show merged project configuration
         `);
         break;
       case "exit":
@@ -9997,7 +10471,7 @@ Tool Permissions:
         console.log("");
         break;
       }
-      case "trust":
+      case "trust": {
         if (!state.permissionManager) {
           console.log("Permission manager not initialized");
           return;
@@ -10005,16 +10479,97 @@ Tool Permissions:
         const toolToTrust = args[0];
         if (!toolToTrust) {
           console.log("Usage: /trust <tool-name>");
+          console.log("");
+          console.log("Example:");
+          console.log("  /trust file_read  - Opens interactive location selector");
+          console.log("");
           return;
         }
-        const trusted = state.permissionManager.trustTool(toolToTrust);
-        if (trusted) {
-          await state.configStore.trustTool(toolToTrust);
-          console.log(`\u2705 Tool '${toolToTrust}' is now trusted and won't require permission`);
-        } else {
-          console.log(`\u274C Tool '${toolToTrust}' cannot be trusted (it's in the 'prompt_always' category)`);
+        const canTrust = state.permissionManager.trustTool(toolToTrust);
+        if (!canTrust) {
+          if (state.permissionManager.isDenied(toolToTrust)) {
+            console.log(`\u274C Tool '${toolToTrust}' is denied by project configuration and cannot be trusted`);
+          } else {
+            console.log(`\u274C Tool '${toolToTrust}' cannot be trusted (it's in the 'prompt_always' category)`);
+          }
+          return;
         }
+        state.permissionManager.untrustTool(toolToTrust);
+        const handleLocationSelect = async (location) => {
+          setState((prev) => ({ ...prev, trustLocationSelector: null }));
+          if (!location) {
+            console.log("\u274C Trust operation cancelled");
+            return;
+          }
+          const projectDir = state.configStore.getProjectConfigDir();
+          switch (location) {
+            case "local": {
+              if (!projectDir) {
+                console.log('\u274C No project found. Use "global" to save to ~/.bike4mind/config.json');
+                return;
+              }
+              try {
+                await state.configStore.initProjectConfig();
+                const existingLocal = await state.configStore.loadRawProjectLocalConfig() || {};
+                const updatedLocal = {
+                  ...existingLocal,
+                  trustedTools: [.../* @__PURE__ */ new Set([...existingLocal.trustedTools || [], toolToTrust])]
+                };
+                await state.configStore.saveProjectLocalConfig(updatedLocal);
+                state.permissionManager?.trustTool(toolToTrust);
+                console.log(`\u2705 Tool '${toolToTrust}' trusted for this project only`);
+                console.log(`   Saved in: ${projectDir}/.bike4mind/local.json`);
+              } catch (error) {
+                console.error(`\u274C Failed to save project-local config:`, error);
+              }
+              break;
+            }
+            case "project": {
+              if (!projectDir) {
+                console.log('\u274C No project found. Use "global" to save to ~/.bike4mind/config.json');
+                return;
+              }
+              try {
+                const existingProject = await state.configStore.loadRawProjectConfig() || {};
+                const updatedProject = {
+                  ...existingProject,
+                  tools: {
+                    ...existingProject.tools,
+                    enabled: [.../* @__PURE__ */ new Set([...existingProject.tools?.enabled || [], toolToTrust])]
+                  }
+                };
+                await state.configStore.saveProjectConfig(updatedProject);
+                state.permissionManager?.trustTool(toolToTrust);
+                console.log(`\u2705 Tool '${toolToTrust}' trusted for entire team`);
+                console.log(`   Saved in: ${projectDir}/.bike4mind/config.json`);
+                console.log("   \u26A0\uFE0F  Remember to commit this file to share with your team!");
+              } catch (error) {
+                console.error(`\u274C Failed to save project config:`, error);
+              }
+              break;
+            }
+            case "global": {
+              try {
+                await state.configStore.trustTool(toolToTrust);
+                state.permissionManager?.trustTool(toolToTrust);
+                console.log(`\u2705 Tool '${toolToTrust}' trusted globally (all projects)`);
+                console.log("   Saved in: ~/.bike4mind/config.json");
+              } catch (error) {
+                console.error(`\u274C Failed to save global config:`, error);
+              }
+              break;
+            }
+          }
+        };
+        setState((prev) => ({
+          ...prev,
+          trustLocationSelector: {
+            toolName: toolToTrust,
+            resolve: handleLocationSelect
+          }
+        }));
         break;
+      }
       case "untrust":
         if (!state.permissionManager) {
           console.log("Permission manager not initialized");
@@ -10190,6 +10745,49 @@ Usage by Model (Last ${USAGE_DAYS} days):`);
           console.log(`
 No usage data available for the last ${USAGE_DAYS} days.`);
         }
+        break;
+      }
+      case "project-config": {
+        const projectDir = state.configStore.getProjectConfigDir();
+        const config = await state.configStore.get();
+        console.log("\n\u{1F4C1} Project Configuration:\n");
+        if (projectDir) {
+          console.log(`Project Directory: ${projectDir}/.bike4mind/`);
+          console.log("");
+          const projectConfig = await state.configStore.loadRawProjectConfig();
+          const localConfig = await state.configStore.loadRawProjectLocalConfig();
+          if (projectConfig) {
+            console.log("Team Config (.bike4mind/config.json):");
+            if (projectConfig.defaultModel) {
+              console.log(`  Default Model: ${projectConfig.defaultModel}`);
+            }
+            if (projectConfig.tools?.denied && projectConfig.tools.denied.length > 0) {
+              console.log(`  Denied Tools: ${projectConfig.tools.denied.join(", ")}`);
+            }
+            if (projectConfig.mcpServers && projectConfig.mcpServers.length > 0) {
+              console.log(`  MCP Servers: ${projectConfig.mcpServers.map((s) => s.name).join(", ")}`);
+            }
+            console.log("");
+          }
+          if (localConfig) {
+            console.log("Local Config (.bike4mind/local.json):");
+            if (localConfig.trustedTools && localConfig.trustedTools.length > 0) {
+              console.log(`  Trusted Tools: ${localConfig.trustedTools.join(", ")}`);
+            }
+            if (localConfig.mcpServers && localConfig.mcpServers.length > 0) {
+              console.log(`  MCP Servers: ${localConfig.mcpServers.map((s) => s.name).join(", ")}`);
+            }
+            console.log("");
+          }
+          console.log("Merged Configuration (what you're using):");
+          console.log(`  Default Model: ${config.defaultModel}`);
+          console.log(`  Trusted Tools: ${config.trustedTools?.length || 0} tools`);
+          console.log(`  Denied Tools: ${config.tools.disabled.length} tools`);
+          console.log(`  MCP Servers: ${config.mcpServers.length} servers`);
+        } else {
+          console.log("No project configuration found.");
+          console.log("Tip: Create .bike4mind/config.json in your project root for team-wide settings.");
+        }
         console.log("");
         break;
       }
@@ -10203,11 +10801,31 @@ No usage data available for the last ${USAGE_DAYS} days.`);
     setState((prev) => ({ ...prev, config: updatedConfig }));
   };
   if (initError) {
-    return /* @__PURE__ */ React12.createElement(Box12, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React12.createElement(Text11, { color: "red", bold: true }, "\u274C Initialization Error"), /* @__PURE__ */ React12.createElement(Text11, null, initError), /* @__PURE__ */ React12.createElement(Text11, { dimColor: true }, "\n", "Tip: Run /config to set up your API keys"));
+    return /* @__PURE__ */ React13.createElement(Box13, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React13.createElement(Text12, { color: "red", bold: true }, "\u274C Initialization Error"), /* @__PURE__ */ React13.createElement(Text12, null, initError), /* @__PURE__ */ React13.createElement(Text12, { dimColor: true }, "\n", "Tip: Run /config to set up your API keys"));
+  }
+  if (state.trustLocationSelector) {
+    const projectDir = state.configStore.getProjectConfigDir();
+    const inProject = projectDir !== null;
+    return /* @__PURE__ */ React13.createElement(
+      TrustLocationSelector,
+      {
+        inProject,
+        onSelect: (location) => {
+          if (state.trustLocationSelector) {
+            state.trustLocationSelector.resolve(location);
+          }
+        },
+        onCancel: () => {
+          if (state.trustLocationSelector) {
+            state.trustLocationSelector.resolve(null);
+          }
+        }
+      }
+    );
   }
   if (state.showLoginFlow) {
     const loginApiUrl = getApiUrl(state.config?.apiConfig);
-    return /* @__PURE__ */ React12.createElement(
+    return /* @__PURE__ */ React13.createElement(
       LoginFlow,
       {
         apiUrl: loginApiUrl,
@@ -10230,15 +10848,16 @@ No usage data available for the last ${USAGE_DAYS} days.`);
     );
   }
   if (!isInitialized) {
-    return /* @__PURE__ */ React12.createElement(Box12, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React12.createElement(Text11, null, "\u{1F680} Initializing..."));
+    return /* @__PURE__ */ React13.createElement(Box13, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React13.createElement(Text12, null, "\u{1F680} Initializing..."));
   }
-  return /* @__PURE__ */ React12.createElement(
+  return /* @__PURE__ */ React13.createElement(
     App,
     {
       onMessage: handleMessage,
       onCommand: handleCommand,
       commandHistory,
       config: state.config,
+      availableModels: state.availableModels,
       onSaveConfig: handleSaveConfig,
       onPermissionResponse: (response) => {
         if (state.permissionPrompt) {
@@ -10265,6 +10884,6 @@ var isDevMode = import.meta.url.includes("/src/") || process.env.NODE_ENV === "d
 if (isDevMode) {
   console.log("\u{1F527} Running in development mode (using TypeScript source)\n");
 }
-render(/* @__PURE__ */ React12.createElement(CliApp, null), {
+render(/* @__PURE__ */ React13.createElement(CliApp, null), {
   exitOnCtrlC: false
 });