@bike4mind/cli 0.2.10-slack-metrics-admin-dashboard.17277 → 0.2.11-feat-api-key-rate-limiting.17321

package/dist/index.js

@@ -4,9 +4,9 @@ import {
   getEffectiveApiKey,
   getOpenWeatherKey,
   getSerperKey
-} from "./chunk-TFXE7AI6.js";
-import "./chunk-VOOM6DLV.js";
-import "./chunk-E2VXQGEM.js";
+} from "./chunk-PCZVBQPE.js";
+import "./chunk-R3OGMLPO.js";
+import "./chunk-OX6W5SJ7.js";
 import {
   BFLImageService,
   BaseStorage,
@@ -15,7 +15,7 @@ import {
   OpenAIBackend,
   OpenAIImageService,
   XAIImageService
-} from "./chunk-23GLLYOT.js";
+} from "./chunk-4RN2B56U.js";
 import {
   Logger
 } from "./chunk-AMDXHL6S.js";
@@ -73,7 +73,7 @@ import {
   XAI_IMAGE_MODELS,
   b4mLLMTools,
   getMcpProviderMetadata
-} from "./chunk-6EQ62KRQ.js";
+} from "./chunk-JS23EPWX.js";
 import {
   __require
 } from "./chunk-PDX44BCA.js";
@@ -82,7 +82,7 @@ import {
 import React17, { useState as useState8, useEffect as useEffect3, useCallback, useRef as useRef2 } from "react";
 import { render, Box as Box16, Text as Text16, useApp, useInput as useInput6 } from "ink";
 import { execSync } from "child_process";
-import { v4 as uuidv49 } from "uuid";
+import { v4 as uuidv410 } from "uuid";
 
 // src/components/App.tsx
 import React11, { useState as useState4 } from "react";
@@ -107,7 +107,8 @@ function CustomTextInput({
   onChange,
   onSubmit,
   placeholder = "",
-  showCursor = true
+  showCursor = true,
+  disabled = false
 }) {
   const [cursorOffset, setCursorOffset] = useState(value.length);
   useInput(
@@ -188,7 +189,7 @@ function CustomTextInput({
         setCursorOffset(cursorOffset + 1);
       }
     },
-    { isActive: true }
+    { isActive: !disabled }
   );
   const hasValue = value.length > 0;
   if (!hasValue) {
@@ -827,56 +828,59 @@ function InputPrompt({
   useEffect(() => {
     setFileSelectedIndex(0);
   }, [filteredFiles]);
-  useInput2((_input, key) => {
-    if (fileAutocomplete?.active && filteredFiles.length > 0) {
-      if (key.upArrow) {
-        setFileSelectedIndex((prev) => prev > 0 ? prev - 1 : filteredFiles.length - 1);
-        return;
-      } else if (key.downArrow) {
-        setFileSelectedIndex((prev) => prev < filteredFiles.length - 1 ? prev + 1 : 0);
-        return;
-      } else if (key.tab) {
-        const selectedFile = filteredFiles[fileSelectedIndex];
-        if (selectedFile) {
-          insertSelectedFile(selectedFile);
+  useInput2(
+    (_input, key) => {
+      if (fileAutocomplete?.active && filteredFiles.length > 0) {
+        if (key.upArrow) {
+          setFileSelectedIndex((prev) => prev > 0 ? prev - 1 : filteredFiles.length - 1);
+          return;
+        } else if (key.downArrow) {
+          setFileSelectedIndex((prev) => prev < filteredFiles.length - 1 ? prev + 1 : 0);
+          return;
+        } else if (key.tab) {
+          const selectedFile = filteredFiles[fileSelectedIndex];
+          if (selectedFile) {
+            insertSelectedFile(selectedFile);
+          }
+          return;
+        } else if (key.escape) {
+          setFileAutocomplete(null);
+          return;
         }
-        return;
-      } else if (key.escape) {
-        setFileAutocomplete(null);
-        return;
-      }
-    }
-    if (shouldShowCommandAutocomplete && filteredCommands.length > 0) {
-      if (key.upArrow) {
-        setSelectedIndex((prev) => prev > 0 ? prev - 1 : filteredCommands.length - 1);
-      } else if (key.downArrow) {
-        setSelectedIndex((prev) => prev < filteredCommands.length - 1 ? prev + 1 : 0);
       }
-      return;
-    }
-    if (!shouldShowCommandAutocomplete && !fileAutocomplete?.active && history.length > 0) {
-      if (key.upArrow) {
-        if (historyIndex === -1) {
-          setTempInput(value);
-          setHistoryIndex(0);
-          setValue(history[0]);
-        } else if (historyIndex < history.length - 1) {
-          const newIndex = historyIndex + 1;
-          setHistoryIndex(newIndex);
-          setValue(history[newIndex]);
+      if (shouldShowCommandAutocomplete && filteredCommands.length > 0) {
+        if (key.upArrow) {
+          setSelectedIndex((prev) => prev > 0 ? prev - 1 : filteredCommands.length - 1);
+        } else if (key.downArrow) {
+          setSelectedIndex((prev) => prev < filteredCommands.length - 1 ? prev + 1 : 0);
         }
-      } else if (key.downArrow) {
-        if (historyIndex > 0) {
-          const newIndex = historyIndex - 1;
-          setHistoryIndex(newIndex);
-          setValue(history[newIndex]);
-        } else if (historyIndex === 0) {
-          setHistoryIndex(-1);
-          setValue(tempInput);
+        return;
+      }
+      if (!shouldShowCommandAutocomplete && !fileAutocomplete?.active && history.length > 0) {
+        if (key.upArrow) {
+          if (historyIndex === -1) {
+            setTempInput(value);
+            setHistoryIndex(0);
+            setValue(history[0]);
+          } else if (historyIndex < history.length - 1) {
+            const newIndex = historyIndex + 1;
+            setHistoryIndex(newIndex);
+            setValue(history[newIndex]);
+          }
+        } else if (key.downArrow) {
+          if (historyIndex > 0) {
+            const newIndex = historyIndex - 1;
+            setHistoryIndex(newIndex);
+            setValue(history[newIndex]);
+          } else if (historyIndex === 0) {
+            setHistoryIndex(-1);
+            setValue(tempInput);
+          }
         }
       }
-    }
-  });
+    },
+    { isActive: !disabled }
+  );
   const insertSelectedFile = (file) => {
     if (!fileAutocomplete) return;
     const beforeAt = value.slice(0, fileAutocomplete.startIndex);
@@ -970,7 +974,8 @@ function InputPrompt({
       onChange: handleChange,
       onSubmit: handleSubmit,
       placeholder: getPlaceholder(),
-      showCursor: !disabled
+      showCursor: !disabled,
+      disabled
     }
   )), shouldShowCommandAutocomplete && /* @__PURE__ */ React5.createElement(CommandAutocomplete, { commands: filteredCommands, selectedIndex }), fileAutocomplete?.active && /* @__PURE__ */ React5.createElement(FileAutocomplete, { files: filteredFiles, selectedIndex: fileSelectedIndex, query: fileAutocomplete.query }));
 }
@@ -1523,7 +1528,7 @@ ${errorBlock}`;
       onSave: onSaveConfig,
       onClose: () => setShowConfigEditor(false)
     }
-  )) : permissionPrompt ? /* @__PURE__ */ React11.createElement(Box10, { flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React11.createElement(
+  )) : /* @__PURE__ */ React11.createElement(React11.Fragment, null, /* @__PURE__ */ React11.createElement(Static, { items: messages }, (message) => /* @__PURE__ */ React11.createElement(Box10, { key: message.id, flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React11.createElement(MessageItem, { message }))), /* @__PURE__ */ React11.createElement(Box10, { flexDirection: "column" }, pendingMessages.map((message) => /* @__PURE__ */ React11.createElement(Box10, { key: message.id, flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React11.createElement(MessageItem, { message })))), permissionPrompt && /* @__PURE__ */ React11.createElement(Box10, { flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React11.createElement(
     PermissionPrompt,
     {
       toolName: permissionPrompt.toolName,
@@ -1532,13 +1537,13 @@ ${errorBlock}`;
       canBeTrusted: permissionPrompt.canBeTrusted,
       onResponse: onPermissionResponse
     }
-  )) : /* @__PURE__ */ React11.createElement(React11.Fragment, null, /* @__PURE__ */ React11.createElement(Static, { items: messages }, (message, index) => /* @__PURE__ */ React11.createElement(Box10, { key: `${message.timestamp}-${message.role}-${index}`, flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React11.createElement(MessageItem, { message }))), /* @__PURE__ */ React11.createElement(Box10, { flexDirection: "column" }, pendingMessages.map((message, index) => /* @__PURE__ */ React11.createElement(Box10, { key: `pending-${message.timestamp}-${index}`, flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React11.createElement(MessageItem, { message })))), /* @__PURE__ */ React11.createElement(AgentThinking, null), exitRequested && /* @__PURE__ */ React11.createElement(Box10, { paddingX: 1, marginBottom: 1 }, /* @__PURE__ */ React11.createElement(Text10, { color: "yellow", bold: true }, "Press Ctrl+C again to exit")), /* @__PURE__ */ React11.createElement(Box10, { borderStyle: "single", borderColor: isBashMode ? "yellow" : "cyan", paddingX: 1 }, /* @__PURE__ */ React11.createElement(
+  )), !permissionPrompt && /* @__PURE__ */ React11.createElement(AgentThinking, null), exitRequested && /* @__PURE__ */ React11.createElement(Box10, { paddingX: 1, marginBottom: 1 }, /* @__PURE__ */ React11.createElement(Text10, { color: "yellow", bold: true }, "Press Ctrl+C again to exit")), /* @__PURE__ */ React11.createElement(Box10, { borderStyle: "single", borderColor: isBashMode ? "yellow" : "cyan", paddingX: 1 }, /* @__PURE__ */ React11.createElement(
     InputPrompt,
     {
       onSubmit: handleSubmit,
       onBashCommand,
       onImageDetected,
-      disabled: isThinking,
+      disabled: isThinking || !!permissionPrompt,
       history: commandHistory,
       commands,
       prefillInput,
@@ -1932,6 +1937,7 @@ function LoginFlow({ apiUrl = "http://localhost:3000", configStore, onSuccess, o
 import { promises as fs3 } from "fs";
 import path3 from "path";
 import { homedir } from "os";
+import { v4 as uuidv4 } from "uuid";
 var SessionStore = class {
   constructor(basePath) {
     this.basePath = basePath || path3.join(homedir(), ".bike4mind", "sessions");
@@ -1967,7 +1973,14 @@ var SessionStore = class {
     const filePath = path3.join(this.basePath, `${id}.json`);
     try {
       const data = await fs3.readFile(filePath, "utf-8");
-      return JSON.parse(data);
+      const session = JSON.parse(data);
+      session.messages = session.messages.map((msg) => {
+        if (!msg.id) {
+          return { ...msg, id: uuidv4() };
+        }
+        return msg;
+      });
+      return session;
     } catch (error) {
       if (error.code === "ENOENT") {
         return null;
@@ -1996,7 +2009,14 @@ var SessionStore = class {
         jsonFiles.map(async (file) => {
           const filePath = path3.join(this.basePath, file);
           const data = await fs3.readFile(filePath, "utf-8");
-          return JSON.parse(data);
+          const session = JSON.parse(data);
+          session.messages = session.messages.map((msg) => {
+            if (!msg.id) {
+              return { ...msg, id: uuidv4() };
+            }
+            return msg;
+          });
+          return session;
         })
       );
       return sessions.sort((a, b) => new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime());
@@ -2050,7 +2070,7 @@ var SessionStore = class {
 import { promises as fs4, existsSync as existsSync3 } from "fs";
 import path4 from "path";
 import { homedir as homedir2 } from "os";
-import { v4 as uuidv4 } from "uuid";
+import { v4 as uuidv42 } from "uuid";
 import { z } from "zod";
 var AuthTokensSchema = z.object({
   accessToken: z.string(),
@@ -2144,7 +2164,7 @@ var ProjectLocalConfigSchema = z.object({
 });
 var DEFAULT_CONFIG = {
   version: "0.1.0",
-  userId: uuidv4(),
+  userId: uuidv42(),
   defaultModel: "claude-sonnet-4-5-20250929",
   toolApiKeys: {
     openweather: void 0,
@@ -2426,7 +2446,7 @@ var ConfigStore = class {
    * Reset configuration to defaults
    */
   async reset() {
-    this.config = { ...DEFAULT_CONFIG, userId: uuidv4() };
+    this.config = { ...DEFAULT_CONFIG, userId: uuidv42() };
     await this.save();
     return this.config;
   }
@@ -3129,6 +3149,7 @@ ${options.context}` : this.getSystemPrompt()
               }
               if (completionInfo.toolsUsed && completionInfo.toolsUsed.length > 0) {
                 hadToolCalls = true;
+                const thinkingBlocks = completionInfo.thinking || [];
                 for (const toolUse of completionInfo.toolsUsed) {
                   const toolCallId = `${toolUse.name}_${JSON.stringify(toolUse.arguments)}`;
                   if (processedToolIds.has(toolCallId)) {
@@ -3161,16 +3182,23 @@ ${options.context}` : this.getSystemPrompt()
                     const params = typeof toolUse.arguments === "string" ? JSON.parse(toolUse.arguments) : toolUse.arguments;
                     observation = await tool.toolFn(params);
                     const toolCallId2 = `${toolUse.name}_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
+                    const assistantContent = [
+                      // Include thinking blocks first (required by Anthropic when thinking is enabled)
+                      ...thinkingBlocks,
+                      // Then the tool use
+                      {
+                        type: "tool_use",
+                        id: toolCallId2,
+                        name: toolUse.name,
+                        input: params
+                      }
+                    ];
+                    this.context.logger.debug(
+                      `[assistantContent] ${assistantContent.length} blocks (${thinkingBlocks.length} thinking, 1 tool_use)`
+                    );
                     messages.push({
                       role: "assistant",
-                      content: [
-                        {
-                          type: "tool_use",
-                          id: toolCallId2,
-                          name: toolUse.name,
-                          input: params
-                        }
-                      ]
+                      content: assistantContent
                     });
                     messages.push({
                       role: "user",
@@ -4336,7 +4364,7 @@ var listFabFilesSchema = z86.object({
 
 // ../../b4m-core/packages/services/dist/src/fabFileService/update.js
 import mime from "mime-types";
-import { v4 as uuidv42 } from "uuid";
+import { v4 as uuidv43 } from "uuid";
 import { z as z87 } from "zod";
 var updateFabFileSchema = z87.object({
   id: z87.string(),
@@ -4457,7 +4485,7 @@ var editFabFileSchema = z98.object({
 
 // ../../b4m-core/packages/services/dist/src/fabFileService/applyEdit.js
 import mime2 from "mime-types";
-import { v4 as uuidv43 } from "uuid";
+import { v4 as uuidv44 } from "uuid";
 import { z as z99 } from "zod";
 var applyEditSchema = z99.object({
   id: z99.string(),
@@ -5285,7 +5313,7 @@ import { toFile } from "openai/uploads";
 import { Readable } from "stream";
 import { TranscribeClient, StartTranscriptionJobCommand, GetTranscriptionJobCommand, LanguageCode, MediaFormat } from "@aws-sdk/client-transcribe";
 import { S3Client, PutObjectCommand, GetObjectCommand, DeleteObjectCommand } from "@aws-sdk/client-s3";
-import { v4 as uuidv44 } from "uuid";
+import { v4 as uuidv45 } from "uuid";
 
 // ../../b4m-core/packages/services/dist/src/emailIngestionService/processIngestedEmail.js
 import { randomUUID as randomUUID5 } from "crypto";
@@ -5446,7 +5474,7 @@ var weatherTool = {
 // ../../b4m-core/packages/services/dist/src/llm/tools/implementation/imageGeneration/index.js
 import axios6 from "axios";
 import { fileTypeFromBuffer as fileTypeFromBuffer2 } from "file-type";
-import { v4 as uuidv45 } from "uuid";
+import { v4 as uuidv46 } from "uuid";
 async function downloadImage(url) {
   if (url.startsWith("data:image/")) {
     const base64Data = url.split(",")[1];
@@ -5460,7 +5488,7 @@ async function processAndStoreImages(images, context) {
   return Promise.all(images.map(async (image) => {
     const buffer = await downloadImage(image);
     const fileType = await fileTypeFromBuffer2(buffer);
-    const filename = `${uuidv45()}.${fileType?.ext}`;
+    const filename = `${uuidv46()}.${fileType?.ext}`;
     const path16 = await context.imageGenerateStorage.upload(buffer, filename, {});
     return path16;
   }));
@@ -6629,7 +6657,7 @@ Return only the edited content without any markdown code blocks or explanations.
 // ../../b4m-core/packages/services/dist/src/llm/tools/implementation/imageEdit/index.js
 import axios7 from "axios";
 import { fileTypeFromBuffer as fileTypeFromBuffer3 } from "file-type";
-import { v4 as uuidv46 } from "uuid";
+import { v4 as uuidv47 } from "uuid";
 async function downloadImage2(url) {
   if (url.startsWith("data:image/")) {
     const base64Data = url.split(",")[1];
@@ -6673,7 +6701,7 @@ async function getImageFromFileId(fileId, context) {
 async function processAndStoreImage(imageUrl, context) {
   const buffer = await downloadImage2(imageUrl);
   const fileType = await fileTypeFromBuffer3(buffer);
-  const filename = `${uuidv46()}.${fileType?.ext}`;
+  const filename = `${uuidv47()}.${fileType?.ext}`;
   const path16 = await context.imageGenerateStorage.upload(buffer, filename, {});
   return path16;
 }
@@ -8579,7 +8607,8 @@ var fileReadTool = {
         return content;
       } catch (error) {
         context.logger.error("\u274C FileRead: Failed", error);
-        throw error;
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        return `Error reading file: ${errorMessage}`;
       }
     },
     toolSchema: {
@@ -9649,7 +9678,7 @@ var QuestStartBodySchema = z139.object({
 // ../../b4m-core/packages/services/dist/src/llm/ImageGeneration.js
 import axios8 from "axios";
 import { fileTypeFromBuffer as fileTypeFromBuffer4 } from "file-type";
-import { v4 as uuidv47 } from "uuid";
+import { v4 as uuidv48 } from "uuid";
 import { z as z140 } from "zod";
 import { fromZodError as fromZodError2 } from "zod-validation-error";
 var ImageGenerationBodySchema = OpenAIImageGenerationInput.extend({
@@ -9670,7 +9699,7 @@ var ImageGenerationBodySchema = OpenAIImageGenerationInput.extend({
 // ../../b4m-core/packages/services/dist/src/llm/ImageEdit.js
 import axios9 from "axios";
 import { fileTypeFromBuffer as fileTypeFromBuffer5 } from "file-type";
-import { v4 as uuidv48 } from "uuid";
+import { v4 as uuidv49 } from "uuid";
 import { z as z141 } from "zod";
 import { fromZodError as fromZodError3 } from "zod-validation-error";
 var ImageEditBodySchema = OpenAIImageGenerationInput.extend({
@@ -10224,7 +10253,31 @@ function wrapToolWithPermission(tool, permissionManager, showPermissionPrompt, a
     }
   };
 }
-function generateCliTools(userId, llm, model, permissionManager, showPermissionPrompt, agentContext, configStore, apiClient) {
+var TOOL_NAME_MAPPING = {
+  // Claude Code -> B4M
+  read: "file_read",
+  write: "create_file",
+  edit: "edit_file",
+  delete: "delete_file",
+  glob: "glob_files",
+  grep: "grep_search",
+  bash: "bash_execute",
+  // B4M -> Claude Code (reverse mapping)
+  file_read: "read",
+  create_file: "write",
+  edit_file: "edit",
+  delete_file: "delete",
+  glob_files: "glob",
+  grep_search: "grep",
+  bash_execute: "bash"
+};
+function normalizeToolName(toolName) {
+  if (toolName.includes("_")) {
+    return toolName;
+  }
+  return TOOL_NAME_MAPPING[toolName] || toolName;
+}
+function generateCliTools(userId, llm, model, permissionManager, showPermissionPrompt, agentContext, configStore, apiClient, toolFilter) {
   const logger2 = new CliLogger();
   const storage = new NoOpStorage();
   const user = {
@@ -10294,9 +10347,24 @@ function generateCliTools(userId, llm, model, permissionManager, showPermissionP
     toolConfig,
     model
   );
-  const tools2 = Object.entries(toolsMap).filter(([key]) => toolConfig[key] !== void 0).map(
+  let tools2 = Object.entries(toolsMap).filter(([key]) => toolConfig[key] !== void 0).map(
     ([_, tool]) => wrapToolWithPermission(tool, permissionManager, showPermissionPrompt, agentContext, configStore, apiClient)
   );
+  if (toolFilter) {
+    const { allowedTools, deniedTools } = toolFilter;
+    const normalizedAllowed = allowedTools?.map(normalizeToolName);
+    const normalizedDenied = deniedTools?.map(normalizeToolName);
+    tools2 = tools2.filter((tool) => {
+      const toolName = tool.toolSchema.name;
+      if (normalizedDenied && normalizedDenied.includes(toolName)) {
+        return false;
+      }
+      if (normalizedAllowed && normalizedAllowed.length > 0) {
+        return normalizedAllowed.includes(toolName);
+      }
+      return true;
+    });
+  }
   return { tools: tools2, agentContext };
 }
 
@@ -11079,6 +11147,7 @@ var ServerLlmBackend = class {
         let accumulatedText = "";
         let lastUsageInfo = {};
         let toolsUsed = [];
+        let thinkingBlocks = [];
         let receivedDone = false;
         const parser = createParser({
           onEvent: (event) => {
@@ -11092,9 +11161,12 @@ var ServerLlmBackend = class {
               if (toolsUsed.length > 0) {
                 const info = {
                   toolsUsed,
+                  thinking: thinkingBlocks.length > 0 ? thinkingBlocks : void 0,
                   ...lastUsageInfo
                 };
-                logger.debug("[ServerLlmBackend] Calling callback with tools, will wait for completion");
+                logger.debug(
+                  `[ServerLlmBackend] Calling callback with tools, thinking blocks: ${thinkingBlocks.length}`
+                );
                 callback([cleanedText], info).catch((err) => {
                   logger.error("[ServerLlmBackend] Callback error:", err);
                   reject(err);
@@ -11150,6 +11222,10 @@ var ServerLlmBackend = class {
                 if (parsed.tools && parsed.tools.length > 0) {
                   toolsUsed = parsed.tools;
                 }
+                if (parsed.thinking && parsed.thinking.length > 0) {
+                  thinkingBlocks = parsed.thinking;
+                  logger.debug(`[ServerLlmBackend] Received ${thinkingBlocks.length} thinking blocks`);
+                }
                 if (parsed.usage) {
                   lastUsageInfo = {
                     inputTokens: parsed.usage.inputTokens,
@@ -11472,7 +11548,7 @@ import { isAxiosError as isAxiosError2 } from "axios";
 // package.json
 var package_default = {
   name: "@bike4mind/cli",
-  version: "0.2.10-slack-metrics-admin-dashboard.17277+8887342ab",
+  version: "0.2.11-feat-api-key-rate-limiting.17321+5d0057357",
   type: "module",
   description: "Interactive CLI tool for Bike4Mind with ReAct agents",
   license: "UNLICENSED",
@@ -11576,10 +11652,10 @@ var package_default = {
   },
   devDependencies: {
     "@bike4mind/agents": "0.1.0",
-    "@bike4mind/common": "2.39.1-slack-metrics-admin-dashboard.17277+8887342ab",
-    "@bike4mind/mcp": "1.20.4-slack-metrics-admin-dashboard.17277+8887342ab",
-    "@bike4mind/services": "2.34.2-slack-metrics-admin-dashboard.17277+8887342ab",
-    "@bike4mind/utils": "2.1.4-slack-metrics-admin-dashboard.17277+8887342ab",
+    "@bike4mind/common": "2.40.1-feat-api-key-rate-limiting.17321+5d0057357",
+    "@bike4mind/mcp": "1.20.5-feat-api-key-rate-limiting.17321+5d0057357",
+    "@bike4mind/services": "2.35.1-feat-api-key-rate-limiting.17321+5d0057357",
+    "@bike4mind/utils": "2.1.5-feat-api-key-rate-limiting.17321+5d0057357",
     "@types/better-sqlite3": "^7.6.13",
     "@types/diff": "^5.0.9",
     "@types/jsonwebtoken": "^9.0.4",
@@ -11592,7 +11668,7 @@ var package_default = {
     typescript: "^5.9.3",
     vitest: "^3.2.4"
   },
-  gitHead: "8887342ab75fec0c6122cc7ddae61f5da01dc164"
+  gitHead: "5d0057357536a200c8b1806ccb7f2b47e6868036"
 };
 
 // src/config/constants.ts
@@ -11600,6 +11676,353 @@ var USAGE_DAYS = 30;
 var MODEL_NAME_COLUMN_WIDTH = 18;
 var USAGE_CACHE_TTL = 5 * 60 * 1e3;
 
+// src/agents/SubagentOrchestrator.ts
+var SubagentOrchestrator = class {
+  constructor(deps) {
+    this.beforeRunCallback = null;
+    this.afterRunCallback = null;
+    this.deps = deps;
+  }
+  /**
+   * Set a callback to be invoked before each subagent.run()
+   * Use this to subscribe to agent events (e.g., subagent.on('action', handler))
+   */
+  setBeforeRunCallback(callback) {
+    this.beforeRunCallback = callback;
+  }
+  /**
+   * Set a callback to be invoked after each subagent.run()
+   * Use this to unsubscribe from agent events (e.g., subagent.off('action', handler))
+   */
+  setAfterRunCallback(callback) {
+    this.afterRunCallback = callback;
+  }
+  /**
+   * Delegate a task to a specialized subagent
+   *
+   * @param options - Configuration for subagent execution
+   * @returns Subagent result with summary
+   */
+  async delegateToSubagent(options) {
+    const { task, type, thoroughness, parentSessionId, config: configOverride } = options;
+    const baseConfig = this.deps.subagentConfigs.get(type);
+    if (!baseConfig) {
+      throw new Error(`No configuration found for subagent type: ${type}`);
+    }
+    const config = {
+      ...baseConfig,
+      ...configOverride,
+      type
+    };
+    const model = config.model || "claude-3-5-haiku-20241022";
+    const maxIterations = this.getMaxIterations(config, thoroughness);
+    const toolFilter = {
+      allowedTools: config.allowedTools,
+      deniedTools: config.deniedTools
+    };
+    const agentContext = {
+      currentAgent: null,
+      observationQueue: []
+    };
+    const { tools: tools2, agentContext: updatedContext } = generateCliTools(
+      this.deps.userId,
+      this.deps.llm,
+      model,
+      this.deps.permissionManager,
+      this.deps.showPermissionPrompt,
+      agentContext,
+      this.deps.configStore,
+      this.deps.apiClient,
+      toolFilter
+    );
+    this.deps.logger.debug(`Spawning ${type} subagent with ${tools2.length} tools, thoroughness: ${thoroughness}`);
+    const subagent = new ReActAgent({
+      userId: this.deps.userId,
+      logger: this.deps.logger,
+      llm: this.deps.llm,
+      model,
+      tools: tools2,
+      maxIterations,
+      systemPrompt: config.systemPrompt || this.getDefaultSystemPrompt(type)
+    });
+    updatedContext.currentAgent = subagent;
+    if (this.beforeRunCallback) {
+      this.beforeRunCallback(subagent, type);
+    }
+    const startTime = Date.now();
+    const result = await subagent.run(task, {
+      maxIterations
+    });
+    const duration = Date.now() - startTime;
+    if (this.afterRunCallback) {
+      this.afterRunCallback(subagent, type);
+    }
+    this.deps.logger.debug(
+      `Subagent completed in ${duration}ms, ${result.completionInfo.iterations} iterations, ${result.completionInfo.totalTokens} tokens`
+    );
+    const summary = this.summarizeResult(result, type);
+    const subagentResult = {
+      ...result,
+      subagentType: type,
+      thoroughness,
+      summary,
+      parentSessionId
+    };
+    return subagentResult;
+  }
+  /**
+   * Get max iterations based on thoroughness and config
+   */
+  getMaxIterations(config, thoroughness) {
+    const defaults = {
+      quick: 2,
+      medium: 5,
+      very_thorough: 10
+    };
+    const configIterations = config.maxIterations || defaults;
+    return configIterations[thoroughness];
+  }
+  /**
+   * Get default system prompt for subagent type
+   */
+  getDefaultSystemPrompt(type) {
+    switch (type) {
+      case "explore":
+        return `You are a code exploration specialist. Your job is to search and analyze codebases efficiently.
+
+Focus on:
+- Finding relevant files and functions
+- Understanding code structure and patterns
+- Providing clear, concise summaries
+
+You have read-only access. Use file_read, grep_search, and glob_files to explore.
+
+When you find what you're looking for, provide a clear summary including:
+1. What you found (files, functions, patterns)
+2. Key insights or observations
+3. Relevant code locations
+
+Be thorough but concise. Your summary will be used by the main agent.`;
+      case "plan":
+        return `You are a task planning specialist. Your job is to break down complex tasks into clear, actionable steps.
+
+Focus on:
+- Identifying dependencies and blockers
+- Creating logical sequence of steps
+- Estimating scope and priorities
+
+Provide a structured plan that the main agent can execute.`;
+      case "review":
+        return `You are a code review specialist. Your job is to analyze code quality and identify issues.
+
+Focus on:
+- Code quality and best practices
+- Potential bugs and edge cases
+- Performance and security considerations
+
+Provide actionable feedback with specific file and line references.`;
+      default:
+        return "You are a helpful AI assistant.";
+    }
+  }
+  /**
+   * Summarize subagent result for parent agent
+   */
+  summarizeResult(result, type) {
+    const { finalAnswer, steps, completionInfo } = result;
+    const toolCalls = steps.filter((s) => s.type === "action");
+    const filesRead = toolCalls.filter((s) => s.metadata?.toolName === "file_read").length;
+    const searches = toolCalls.filter((s) => s.metadata?.toolName === "grep_search").length;
+    const globs = toolCalls.filter((s) => s.metadata?.toolName === "glob_files").length;
+    let summary = `**${type.charAt(0).toUpperCase() + type.slice(1)} Subagent Results**
+
+`;
+    summary += `*Execution: ${completionInfo.iterations} iterations, ${completionInfo.toolCalls} tool calls*
+
+`;
+    if (type === "explore") {
+      summary += `*Exploration: ${filesRead} files read, ${searches} searches, ${globs} glob patterns*
+
+`;
+    }
+    const maxLength = 1e3;
+    if (finalAnswer.length > maxLength) {
+      summary += finalAnswer.slice(0, maxLength) + "\n\n...(truncated)";
+    } else {
+      summary += finalAnswer;
+    }
+    return summary;
+  }
+};
+
+// src/agents/configs.ts
+var EXPLORE_CONFIG = {
+  type: "explore",
+  model: "claude-3-5-haiku-20241022",
+  systemPrompt: `You are a code exploration specialist. Your job is to search and analyze codebases efficiently.
+
+Focus on:
+- Finding relevant files and functions
+- Understanding code structure and patterns
+- Providing clear, concise summaries
+
+You have read-only access. Use file_read, grep_search, and glob_files to explore.
+
+When you find what you're looking for, provide a clear summary including:
+1. What you found (files, functions, patterns)
+2. Key insights or observations
+3. Relevant code locations
+
+Be thorough but concise. Your summary will be used by the main agent.`,
+  allowedTools: [
+    "file_read",
+    "grep_search",
+    "glob_files",
+    "bash_execute",
+    // Only for read-only commands like ls, cat, find
+    "current_datetime",
+    "math_evaluate"
+  ],
+  deniedTools: [
+    "create_file",
+    "edit_file",
+    "delete_file",
+    "web_search",
+    "weather_info",
+    "blog_publish",
+    "blog_edit",
+    "blog_draft"
+  ],
+  maxIterations: {
+    quick: 2,
+    medium: 5,
+    very_thorough: 10
+  },
+  defaultThoroughness: "medium"
+};
+var PLAN_CONFIG = {
+  type: "plan",
+  model: "claude-3-5-haiku-20241022",
+  systemPrompt: `You are a task planning specialist. Your job is to break down complex tasks into clear, actionable steps.
+
+Focus on:
+- Identifying dependencies and blockers
+- Creating logical sequence of steps
+- Estimating scope and priorities
+
+You can explore the codebase to understand the current architecture before planning.
+
+Provide a structured plan that the main agent can execute.`,
+  allowedTools: ["file_read", "grep_search", "glob_files", "bash_execute", "current_datetime", "math_evaluate"],
+  deniedTools: ["create_file", "edit_file", "delete_file", "web_search", "weather_info"],
+  maxIterations: {
+    quick: 3,
+    medium: 7,
+    very_thorough: 12
+  },
+  defaultThoroughness: "medium"
+};
+var REVIEW_CONFIG = {
+  type: "review",
+  model: "claude-sonnet-4-5-20250929",
+  // Use latest Sonnet for better reasoning
+  systemPrompt: `You are a code review specialist. Your job is to analyze code quality and identify issues.
+
+Focus on:
+- Code quality and best practices
+- Potential bugs and edge cases
+- Performance and security considerations
+
+You have read-only access to analyze code.
+
+Provide actionable feedback with specific file and line references.`,
+  allowedTools: ["file_read", "grep_search", "glob_files", "bash_execute", "current_datetime"],
+  deniedTools: ["create_file", "edit_file", "delete_file", "web_search", "weather_info"],
+  maxIterations: {
+    quick: 3,
+    medium: 8,
+    very_thorough: 15
+  },
+  defaultThoroughness: "medium"
+};
+function getDefaultSubagentConfigs() {
+  return /* @__PURE__ */ new Map([
+    ["explore", EXPLORE_CONFIG],
+    ["plan", PLAN_CONFIG],
+    ["review", REVIEW_CONFIG]
+  ]);
+}
+
+// src/agents/delegateTool.ts
+function createSubagentDelegateTool(orchestrator, parentSessionId) {
+  return {
+    toolFn: async (args) => {
+      const params = args;
+      if (!params.task) {
+        throw new Error("subagent_delegate: task parameter is required");
+      }
+      if (!params.type) {
+        throw new Error("subagent_delegate: type parameter is required");
+      }
+      const thoroughness = params.thoroughness || "medium";
+      const type = params.type;
+      const result = await orchestrator.delegateToSubagent({
+        task: params.task,
+        type,
+        thoroughness,
+        parentSessionId
+      });
+      return result.summary;
+    },
+    toolSchema: {
+      name: "subagent_delegate",
+      description: `Delegate a task to a specialized subagent for focused work.
+
+**When to use this tool:**
+- **Explore**: When you need to search through the codebase, find files, or understand code structure (read-only)
+- **Plan**: When you need to break down a complex task into actionable steps
+- **Review**: When you need to analyze code quality and identify potential issues
+
+**Benefits:**
+- Keeps main conversation focused and clean
+- Uses specialized prompts optimized for each task type
+- Faster execution with appropriate models (Haiku for explore/plan, Sonnet for review)
+
+**Example uses:**
+- "Find all files that use the authentication system" \u2192 explore
+- "Search for components that handle user input" \u2192 explore
+- "Break down implementing a new feature into steps" \u2192 plan
+- "Review this module for potential bugs" \u2192 review`,
+      parameters: {
+        type: "object",
+        properties: {
+          task: {
+            type: "string",
+            description: "Clear description of what you want the subagent to do. Be specific about what you're looking for or what needs to be accomplished."
+          },
+          type: {
+            type: "string",
+            enum: ["explore", "plan", "review"],
+            description: `Type of subagent to use:
+- explore: Read-only codebase exploration and search (fast, uses Haiku)
+- plan: Task breakdown and planning (uses Haiku)
+- review: Code quality analysis and review (uses Sonnet for better reasoning)`
+          },
+          thoroughness: {
+            type: "string",
+            enum: ["quick", "medium", "very_thorough"],
+            description: `How thoroughly to execute:
+- quick: Fast lookup, 1-2 iterations
+- medium: Balanced exploration, 3-5 iterations (default)
+- very_thorough: Comprehensive analysis, 8-10 iterations`
+          }
+        },
+        required: ["task", "type"]
+      }
+    }
+  };
+}
+
 // src/index.tsx
 process.removeAllListeners("warning");
 process.on("warning", (warning) => {
@@ -11630,7 +12053,8 @@ function CliApp() {
     permissionPrompt: null,
     trustLocationSelector: null,
     rewindSelector: null,
-    sessionSelector: null
+    sessionSelector: null,
+    orchestrator: null
   });
   const [isInitialized, setIsInitialized] = useState8(false);
   const [initError, setInitError] = useState8(null);
@@ -11730,7 +12154,7 @@ function CliApp() {
       if (!isAuthenticated) {
         console.log("\u2139\uFE0F  AI features disabled. Available commands: /login, /help, /config\n");
         const minimalSession = {
-          id: uuidv49(),
+          id: uuidv410(),
           name: `Session ${(/* @__PURE__ */ new Date()).toLocaleString()}`,
           createdAt: (/* @__PURE__ */ new Date()).toISOString(),
           updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -11774,7 +12198,7 @@ function CliApp() {
       }
       llm.currentModel = modelInfo.id;
       const newSession = {
-        id: uuidv49(),
+        id: uuidv410(),
         name: `Session ${(/* @__PURE__ */ new Date()).toLocaleString()}`,
         createdAt: (/* @__PURE__ */ new Date()).toISOString(),
         updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -11847,7 +12271,34 @@ function CliApp() {
           console.log(`  \u{1F4E1} ${serverName}: ${count} tool(s)`);
         });
       }
-      const allTools = [...b4mTools, ...mcpTools];
+      const subagentConfigs = getDefaultSubagentConfigs();
+      if (config.subagents) {
+        if (config.subagents.explore) {
+          const currentConfig = subagentConfigs.get("explore");
+          subagentConfigs.set("explore", { ...currentConfig, ...config.subagents.explore });
+        }
+        if (config.subagents.plan) {
+          const currentConfig = subagentConfigs.get("plan");
+          subagentConfigs.set("plan", { ...currentConfig, ...config.subagents.plan });
+        }
+        if (config.subagents.review) {
+          const currentConfig = subagentConfigs.get("review");
+          subagentConfigs.set("review", { ...currentConfig, ...config.subagents.review });
+        }
+      }
+      const orchestrator = new SubagentOrchestrator({
+        userId: config.userId,
+        llm,
+        logger: silentLogger,
+        permissionManager,
+        showPermissionPrompt: promptFn,
+        configStore: state.configStore,
+        apiClient,
+        subagentConfigs
+      });
+      const subagentDelegateTool = createSubagentDelegateTool(orchestrator, newSession.id);
+      const allTools = [...b4mTools, ...mcpTools, subagentDelegateTool];
+      console.log(`\u{1F916} Subagent delegation enabled (explore, plan, review)`);
       const projectDir = state.configStore.getProjectConfigDir();
       const contextResult = await loadContextFiles(projectDir);
       if (contextResult.globalContext) {
@@ -11884,6 +12335,15 @@ FOR CODING TASKS:
 - When searching for code: Use grep_search or glob_files to find relevant files
 - Permission system will ask for approval before any file writes
 
+SUBAGENT DELEGATION:
+- You have access to specialized subagents via the subagent_delegate tool
+- Use subagents for focused exploration, planning, or review tasks:
+  * explore: Fast read-only codebase search (e.g., "find all auth files", "locate API endpoints")
+  * plan: Break down complex tasks into actionable steps
+  * review: Analyze code quality and identify issues
+- Subagents keep the main conversation clean and run faster with optimized models
+- Delegate when you need to search extensively or analyze code structure
+
 FOR GENERAL TASKS:
 - Use available tools to get information (weather, web search, calculations, etc.)
 - When user asks follow-up questions, use conversation context to understand what they're referring to
@@ -11894,6 +12354,7 @@ EXAMPLES:
 - "how about Japan?" \u2192 use weather tool for Japan (applying same question from context)
 - "enhance README" \u2192 file_read \u2192 generate \u2192 create_file
 - "what packages installed?" \u2192 glob_files "**/package.json" \u2192 file_read
+- "find all components using React hooks" \u2192 subagent_delegate(task="find all components using React hooks", type="explore")
 
 Remember: Use context from previous messages to understand follow-up questions.${contextSection}`;
       const maxIterations = config.preferences.maxIterations === null ? 999999 : config.preferences.maxIterations;
@@ -11910,6 +12371,27 @@ Remember: Use context from previous messages to understand follow-up questions.$
       });
       agentContext.currentAgent = agent;
       agent.observationQueue = agentContext.observationQueue;
+      const stepHandler = (step) => {
+        const { pendingMessages, updatePendingMessage } = useCliStore.getState();
+        const lastIdx = pendingMessages.length - 1;
+        if (lastIdx >= 0 && pendingMessages[lastIdx].role === "assistant") {
+          const existingSteps = pendingMessages[lastIdx].metadata?.steps || [];
+          updatePendingMessage(lastIdx, {
+            ...pendingMessages[lastIdx],
+            metadata: {
+              ...pendingMessages[lastIdx].metadata,
+              steps: [...existingSteps, step]
+            }
+          });
+        }
+      };
+      agent.on("action", stepHandler);
+      orchestrator.setBeforeRunCallback((subagent, _subagentType) => {
+        subagent.on("action", stepHandler);
+      });
+      orchestrator.setAfterRunCallback((subagent, _subagentType) => {
+        subagent.off("action", stepHandler);
+      });
       setState((prev) => ({
         ...prev,
         session: newSession,
@@ -11918,8 +12400,10 @@ Remember: Use context from previous messages to understand follow-up questions.$
         permissionManager,
         config,
         // Store config for synchronous access
-        availableModels: models
+        availableModels: models,
         // Store models for ConfigEditor
+        orchestrator
+        // Store orchestrator for step handler updates
       }));
       setStoreSession(newSession);
       setIsInitialized(true);
@@ -11983,11 +12467,13 @@ Remember: Use context from previous messages to understand follow-up questions.$
         messageContent = multimodalMessage.content;
       }
       const userMessage = {
+        id: uuidv410(),
         role: "user",
         content: userMessageContent,
         timestamp: (/* @__PURE__ */ new Date()).toISOString()
       };
       const pendingAssistantMessage = {
+        id: uuidv410(),
         role: "assistant",
         content: "...",
         timestamp: (/* @__PURE__ */ new Date()).toISOString(),
@@ -12018,7 +12504,10 @@ Remember: Use context from previous messages to understand follow-up questions.$
       const currentSession = useCliStore.getState().session;
       if (!currentSession) return;
       const updatedMessages = [...currentSession.messages];
+      const lastMessage = updatedMessages[updatedMessages.length - 1];
       updatedMessages[updatedMessages.length - 1] = {
+        id: lastMessage.id,
+        // Preserve the original message ID
         role: "assistant",
         content: result.finalAnswer,
         timestamp: (/* @__PURE__ */ new Date()).toISOString(),
@@ -12108,22 +12597,6 @@ Remember: Use context from previous messages to understand follow-up questions.$
       return;
     }
     useCliStore.getState().setIsThinking(true);
-    const currentSteps = [];
-    const stepHandler = (step) => {
-      currentSteps.push(step);
-      const { pendingMessages, updatePendingMessage } = useCliStore.getState();
-      const lastIdx = pendingMessages.length - 1;
-      if (lastIdx >= 0 && pendingMessages[lastIdx].role === "assistant") {
-        updatePendingMessage(lastIdx, {
-          ...pendingMessages[lastIdx],
-          metadata: {
-            ...pendingMessages[lastIdx].metadata,
-            steps: [...currentSteps]
-          }
-        });
-      }
-    };
-    state.agent.on("action", stepHandler);
     try {
       let messageContent = message;
       let userMessageContent = message;
@@ -12133,11 +12606,13 @@ Remember: Use context from previous messages to understand follow-up questions.$
         userMessageContent = message;
       }
       const userMessage = {
+        id: uuidv410(),
         role: "user",
         content: userMessageContent,
         timestamp: (/* @__PURE__ */ new Date()).toISOString()
       };
       const pendingAssistantMessage = {
+        id: uuidv410(),
         role: "assistant",
         content: "...",
         timestamp: (/* @__PURE__ */ new Date()).toISOString(),
@@ -12167,6 +12642,8 @@ Remember: Use context from previous messages to understand follow-up questions.$
       }
       const successfulToolCalls = result.steps.filter((s) => s.type === "observation").length;
       const finalAssistantMessage = {
+        id: pendingAssistantMessage.id,
+        // Preserve the original message ID
         role: "assistant",
         content: result.finalAnswer,
         timestamp: pendingAssistantMessage.timestamp,
@@ -12205,8 +12682,6 @@ Remember: Use context from previous messages to understand follow-up questions.$
         }
       }
       console.error("Error processing message:", error);
-    } finally {
-      state.agent.off("action", stepHandler);
     }
   };
   const handleBashCommand = useCallback(
@@ -12228,11 +12703,13 @@ Remember: Use context from previous messages to understand follow-up questions.$
         isError = true;
       }
       const userMessage = {
+        id: uuidv410(),
         role: "user",
         content: `$ ${command}`,
         timestamp: (/* @__PURE__ */ new Date()).toISOString()
       };
       const assistantMessage = {
+        id: uuidv410(),
         role: "assistant",
         content: isError ? `\u274C Error:
 ${output}` : output.trim() || "(no output)",
@@ -12643,7 +13120,7 @@ Custom Commands:
         console.clear();
         const model = state.session?.model || state.config?.defaultModel || "claude-sonnet";
         const newSession = {
-          id: uuidv49(),
+          id: uuidv410(),
           name: `Session ${(/* @__PURE__ */ new Date()).toLocaleString()}`,
           createdAt: (/* @__PURE__ */ new Date()).toISOString(),
           updatedAt: (/* @__PURE__ */ new Date()).toISOString(),