@bike4mind/cli 0.2.10-fix-extendend-thinking-with-tool-use.17269 → 0.2.10-fix-cli-socket-hangup-error-handling.17310

package/dist/{artifactExtractor-3KB44W7B.js → artifactExtractor-JAGU7QRL.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   CurationArtifactType
-} from "./chunk-3OX632TE.js";
+} from "./chunk-DJPXSSP4.js";
 import "./chunk-PDX44BCA.js";
 
 // ../../b4m-core/packages/services/dist/src/notebookCurationService/artifactExtractor.js

package/dist/{chunk-J5CBHZGK.js → chunk-AQBZVAYO.js}

@@ -7,11 +7,11 @@ import {
   getSettingsMap,
   getSettingsValue,
   secureParameters
-} from "./chunk-T7NEJI2V.js";
+} from "./chunk-GCVIRGIN.js";
 import {
   KnowledgeType,
   SupportedFabFileMimeTypes
-} from "./chunk-3OX632TE.js";
+} from "./chunk-DJPXSSP4.js";
 
 // ../../b4m-core/packages/services/dist/src/fabFileService/create.js
 import { z } from "zod";

package/dist/{chunk-3OX632TE.js → chunk-DJPXSSP4.js}

@@ -5901,9 +5901,6 @@ function buildSSEEvent(text, info) {
       outputTokens: info.outputTokens
     };
   }
-  if (info?.thinking && info.thinking.length > 0) {
-    event.thinking = info.thinking;
-  }
   return event;
 }
 function formatSSEError(error) {

package/dist/{chunk-T7NEJI2V.js → chunk-GCVIRGIN.js}

@@ -16,7 +16,7 @@ import {
   dayjsConfig_default,
   extractSnippetMeta,
   settingsMap
-} from "./chunk-3OX632TE.js";
+} from "./chunk-DJPXSSP4.js";
 
 // ../../b4m-core/packages/utils/dist/src/storage/S3Storage.js
 import { S3Client, PutObjectCommand, DeleteObjectCommand, GetObjectCommand, HeadObjectCommand } from "@aws-sdk/client-s3";
@@ -701,12 +701,8 @@ var AnthropicBackend = class {
             this.logger.debug(`[Tool Execution] Last few messages:`, JSON.stringify(messages.slice(-3), null, 2));
             await this.complete(model, messages, options, cb, toolsUsed);
           } else {
-            const thinkingBlocks = this.isThinkingEnabled ? this.lastAssistantContent.filter((block) => block?.type === "thinking" || block?.type === "redacted_thinking") : void 0;
-            this.logger.debug(`[Tool Execution] executeTools=false, passing tool calls to callback with ${thinkingBlocks?.length || 0} thinking blocks`);
-            await cb([null], {
-              toolsUsed,
-              thinking: thinkingBlocks?.length ? thinkingBlocks : void 0
-            });
+            this.logger.debug(`[Tool Execution] executeTools=false, passing tool calls to callback`);
+            await cb([null], { toolsUsed });
           }
           return;
         }
@@ -778,12 +774,8 @@ var AnthropicBackend = class {
               await this.complete(model, messages, { ...options, tools: void 0, _internal: void 0 }, cb, toolsUsed);
             }
           } else {
-            const thinkingBlocks = this.isThinkingEnabled ? this.lastAssistantContent.filter((block) => block?.type === "thinking" || block?.type === "redacted_thinking") : void 0;
-            this.logger.debug(`[Tool Execution] executeTools=false, passing tool calls to callback with ${thinkingBlocks?.length || 0} thinking blocks`);
-            await cb([null], {
-              toolsUsed,
-              thinking: thinkingBlocks?.length ? thinkingBlocks : void 0
-            });
+            this.logger.debug(`[Tool Execution] executeTools=false, passing tool calls to callback`);
+            await cb([null], { toolsUsed });
           }
           return;
         }

package/dist/{chunk-AKSB42HL.js → chunk-GO75FMLY.js}

@@ -6,12 +6,12 @@ import {
   getSettingsByNames,
   obfuscateApiKey,
   secureParameters
-} from "./chunk-T7NEJI2V.js";
+} from "./chunk-GCVIRGIN.js";
 import {
   ApiKeyType,
   MementoTier,
   isSupportedEmbeddingModel
-} from "./chunk-3OX632TE.js";
+} from "./chunk-DJPXSSP4.js";
 
 // ../../b4m-core/packages/services/dist/src/apiKeyService/get.js
 import { z } from "zod";

package/dist/{chunk-OX65IHIA.js → chunk-VZU4Z7WI.js}

@@ -2,7 +2,7 @@
 import {
   BadRequestError,
   secureParameters
-} from "./chunk-T7NEJI2V.js";
+} from "./chunk-GCVIRGIN.js";
 import {
   GenericCreditDeductTransaction,
   ImageEditUsageTransaction,
@@ -10,7 +10,7 @@ import {
   RealtimeVoiceUsageTransaction,
   TextGenerationUsageTransaction,
   TransferCreditTransaction
-} from "./chunk-3OX632TE.js";
+} from "./chunk-DJPXSSP4.js";
 
 // ../../b4m-core/packages/services/dist/src/creditService/subtractCredits.js
 import { z } from "zod";

package/dist/{create-WIZBHGDO.js → create-ZDOTF7XD.js}

@@ -2,10 +2,10 @@
 import {
   createFabFile,
   createFabFileSchema
-} from "./chunk-J5CBHZGK.js";
-import "./chunk-T7NEJI2V.js";
+} from "./chunk-AQBZVAYO.js";
+import "./chunk-GCVIRGIN.js";
 import "./chunk-AMDXHL6S.js";
-import "./chunk-3OX632TE.js";
+import "./chunk-DJPXSSP4.js";
 import "./chunk-PDX44BCA.js";
 export {
   createFabFile,

package/dist/index.js

@@ -4,9 +4,9 @@ import {
   getEffectiveApiKey,
   getOpenWeatherKey,
   getSerperKey
-} from "./chunk-AKSB42HL.js";
-import "./chunk-OX65IHIA.js";
-import "./chunk-J5CBHZGK.js";
+} from "./chunk-GO75FMLY.js";
+import "./chunk-VZU4Z7WI.js";
+import "./chunk-AQBZVAYO.js";
 import {
   BFLImageService,
   BaseStorage,
@@ -15,7 +15,7 @@ import {
   OpenAIBackend,
   OpenAIImageService,
   XAIImageService
-} from "./chunk-T7NEJI2V.js";
+} from "./chunk-GCVIRGIN.js";
 import {
   Logger
 } from "./chunk-AMDXHL6S.js";
@@ -73,7 +73,7 @@ import {
   XAI_IMAGE_MODELS,
   b4mLLMTools,
   getMcpProviderMetadata
-} from "./chunk-3OX632TE.js";
+} from "./chunk-DJPXSSP4.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";
@@ -1523,7 +1523,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,7 +1532,7 @@ ${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,
@@ -1932,6 +1932,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 +1968,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 +2004,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 +2065,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 +2159,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 +2441,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,7 +3144,6 @@ ${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)) {
@@ -3162,21 +3176,16 @@ ${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] ", JSON.stringify(assistantContent, null, 2));
                     messages.push({
                       role: "assistant",
-                      content: assistantContent
+                      content: [
+                        {
+                          type: "tool_use",
+                          id: toolCallId2,
+                          name: toolUse.name,
+                          input: params
+                        }
+                      ]
                     });
                     messages.push({
                       role: "user",
@@ -4342,7 +4351,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(),
@@ -4463,7 +4472,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(),
@@ -5291,7 +5300,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";
@@ -5452,7 +5461,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];
@@ -5466,7 +5475,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;
   }));
@@ -6635,7 +6644,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];
@@ -6679,7 +6688,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;
 }
@@ -9656,7 +9665,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({
@@ -9677,7 +9686,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({
@@ -11125,7 +11134,6 @@ var ServerLlmBackend = class {
         let accumulatedText = "";
         let lastUsageInfo = {};
         let toolsUsed = [];
-        let thinkingBlocks = [];
         let receivedDone = false;
         const parser = createParser({
           onEvent: (event) => {
@@ -11139,12 +11147,9 @@ 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, thinking blocks: ${thinkingBlocks.length}`
-                );
+                logger.debug("[ServerLlmBackend] Calling callback with tools, will wait for completion");
                 callback([cleanedText], info).catch((err) => {
                   logger.error("[ServerLlmBackend] Callback error:", err);
                   reject(err);
@@ -11200,10 +11205,6 @@ 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,
@@ -11231,7 +11232,7 @@ var ServerLlmBackend = class {
           reject(error);
         });
       } catch (error) {
-        logger.error("LLM completion failed", error);
+        logger.debug(`LLM completion failed: ${error instanceof Error ? error.message : String(error)}`);
         if (isAxiosError(error)) {
           logger.debug(
             `[ServerLlmBackend] Axios error details: ${JSON.stringify({
@@ -11294,6 +11295,12 @@ var ServerLlmBackend = class {
             reject(new Error("Cannot connect to Bike4Mind server. Please check your internet connection."));
           } else if (error.message.includes("Rate limit exceeded")) {
             reject(error);
+          } else if (error.message.includes("socket hang up")) {
+            reject(
+              new Error(
+                "Connection to server was interrupted (socket hang up). This can happen due to server timeouts or network issues. Please try again."
+              )
+            );
           } else {
             reject(new Error(`Failed to complete LLM request: ${error.message}`));
           }
@@ -11526,7 +11533,7 @@ import { isAxiosError as isAxiosError2 } from "axios";
 // package.json
 var package_default = {
   name: "@bike4mind/cli",
-  version: "0.2.10-fix-extendend-thinking-with-tool-use.17269+e94200ce4",
+  version: "0.2.10-fix-cli-socket-hangup-error-handling.17310+c525c3233",
   type: "module",
   description: "Interactive CLI tool for Bike4Mind with ReAct agents",
   license: "UNLICENSED",
@@ -11630,10 +11637,10 @@ var package_default = {
   },
   devDependencies: {
     "@bike4mind/agents": "0.1.0",
-    "@bike4mind/common": "2.39.1-fix-extendend-thinking-with-tool-use.17269+e94200ce4",
-    "@bike4mind/mcp": "1.20.4-fix-extendend-thinking-with-tool-use.17269+e94200ce4",
-    "@bike4mind/services": "2.34.2-fix-extendend-thinking-with-tool-use.17269+e94200ce4",
-    "@bike4mind/utils": "2.1.4-fix-extendend-thinking-with-tool-use.17269+e94200ce4",
+    "@bike4mind/common": "2.39.1-fix-cli-socket-hangup-error-handling.17310+c525c3233",
+    "@bike4mind/mcp": "1.20.4-fix-cli-socket-hangup-error-handling.17310+c525c3233",
+    "@bike4mind/services": "2.34.2-fix-cli-socket-hangup-error-handling.17310+c525c3233",
+    "@bike4mind/utils": "2.1.4-fix-cli-socket-hangup-error-handling.17310+c525c3233",
     "@types/better-sqlite3": "^7.6.13",
     "@types/diff": "^5.0.9",
     "@types/jsonwebtoken": "^9.0.4",
@@ -11646,7 +11653,7 @@ var package_default = {
     typescript: "^5.9.3",
     vitest: "^3.2.4"
   },
-  gitHead: "e94200ce4e993f1a05a29c6df68d05697e922ca1"
+  gitHead: "c525c323364efcd1b2107413ac1aa8619f462124"
 };
 
 // src/config/constants.ts
@@ -11657,8 +11664,24 @@ 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
    *
@@ -11708,11 +11731,29 @@ var SubagentOrchestrator = class {
       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
-    });
+    let result;
+    try {
+      result = await subagent.run(task, {
+        maxIterations
+      });
+    } catch (error) {
+      const duration2 = Date.now() - startTime;
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      this.deps.logger.error(`Subagent failed after ${duration2}ms: ${errorMessage}`);
+      throw new Error(
+        `Subagent execution failed: ${errorMessage}
+
+This error occurred while running a ${type} subagent. The main conversation has been preserved, and you can retry or continue with other tasks.`
+      );
+    }
     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`
     );
@@ -11922,13 +11963,18 @@ function createSubagentDelegateTool(orchestrator, parentSessionId) {
       }
       const thoroughness = params.thoroughness || "medium";
       const type = params.type;
-      const result = await orchestrator.delegateToSubagent({
-        task: params.task,
-        type,
-        thoroughness,
-        parentSessionId
-      });
-      return result.summary;
+      try {
+        const result = await orchestrator.delegateToSubagent({
+          task: params.task,
+          type,
+          thoroughness,
+          parentSessionId
+        });
+        return result.summary;
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        throw new Error(`Failed to execute ${type} subagent: ${errorMessage}`);
+      }
     },
     toolSchema: {
       name: "subagent_delegate",
@@ -12109,7 +12155,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(),
@@ -12153,7 +12199,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(),
@@ -12326,6 +12372,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,
@@ -12399,11 +12466,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(),
@@ -12434,7 +12503,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(),
@@ -12525,6 +12597,15 @@ Remember: Use context from previous messages to understand follow-up questions.$
     }
     useCliStore.getState().setIsThinking(true);
     const currentSteps = [];
+    const pendingAssistantMessage = {
+      id: uuidv410(),
+      role: "assistant",
+      content: "...",
+      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+      metadata: {
+        steps: []
+      }
+    };
     const stepHandler = (step) => {
       currentSteps.push(step);
       const { pendingMessages, updatePendingMessage } = useCliStore.getState();
@@ -12549,18 +12630,11 @@ 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 = {
-        role: "assistant",
-        content: "...",
-        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-        metadata: {
-          steps: []
-        }
-      };
       const sessionWithUserMessage = {
         ...state.session,
         messages: [...state.session.messages, userMessage],
@@ -12583,6 +12657,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,
@@ -12612,15 +12688,48 @@ Remember: Use context from previous messages to understand follow-up questions.$
       setStoreSession(updatedSession);
       await state.sessionStore.save(updatedSession);
     } catch (error) {
-      useCliStore.getState().clearPendingMessages();
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      let displayMessage;
       if (error instanceof Error) {
         if (error.message.includes("Authentication failed") || error.message.includes("Authentication expired")) {
-          console.log("\n\u274C Authentication failed");
-          console.log("\u{1F4A1} Run /login to authenticate with your API environment.\n");
-          return;
+          displayMessage = "\u274C Authentication failed\n\n\u{1F4A1} Run /login to authenticate with your API environment.";
+        } else if (error.message.includes("socket hang up")) {
+          displayMessage = `\u26A0\uFE0F Connection Error
+
+${errorMessage}
+
+\u{1F4A1} This is usually a temporary issue. Please try your request again.`;
+        } else {
+          displayMessage = `\u274C Error
+
+${errorMessage}`;
+        }
+      } else {
+        displayMessage = `\u274C Error
+
+${errorMessage}`;
+      }
+      const errorAssistantMessage = {
+        id: pendingAssistantMessage.id,
+        role: "assistant",
+        content: displayMessage,
+        timestamp: pendingAssistantMessage.timestamp,
+        metadata: {
+          steps: currentSteps
+          // Include any steps that were completed before error
         }
+      };
+      useCliStore.getState().completePendingMessage(0, errorAssistantMessage);
+      const currentSession = useCliStore.getState().session;
+      if (currentSession) {
+        const updatedSession = {
+          ...currentSession,
+          updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+        };
+        setState((prev) => ({ ...prev, session: updatedSession }));
+        setStoreSession(updatedSession);
+        await state.sessionStore.save(updatedSession);
       }
-      console.error("Error processing message:", error);
     } finally {
       state.agent.off("action", stepHandler);
     }
@@ -12644,11 +12753,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)",
@@ -13059,7 +13170,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(),

package/dist/{llmMarkdownGenerator-LCCZ76BQ.js → llmMarkdownGenerator-LXUGJ7QH.js}

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

package/dist/{markdownGenerator-4OF7GEBT.js → markdownGenerator-IMDG6OX6.js}

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

package/dist/{mementoService-HIV6NL3N.js → mementoService-TURUS3OH.js}

@@ -2,10 +2,10 @@
 import {
   findMostSimilarMemento,
   getRelevantMementos
-} from "./chunk-AKSB42HL.js";
-import "./chunk-T7NEJI2V.js";
+} from "./chunk-GO75FMLY.js";
+import "./chunk-GCVIRGIN.js";
 import "./chunk-AMDXHL6S.js";
-import "./chunk-3OX632TE.js";
+import "./chunk-DJPXSSP4.js";
 import "./chunk-PDX44BCA.js";
 export {
   findMostSimilarMemento,

package/dist/{src-O6SLFQBP.js → src-6ZRXGE5J.js}

@@ -120,7 +120,7 @@ import {
   validateMermaidSyntax,
   warmUpSettingsCache,
   withRetry
-} from "./chunk-T7NEJI2V.js";
+} from "./chunk-GCVIRGIN.js";
 import {
   Logger,
   NotificationDeduplicator,
@@ -129,7 +129,7 @@ import {
   postLowCreditsNotificationToSlack,
   postMessageToSlack
 } from "./chunk-AMDXHL6S.js";
-import "./chunk-3OX632TE.js";
+import "./chunk-DJPXSSP4.js";
 import "./chunk-PDX44BCA.js";
 export {
   AWSBackend,

package/dist/{src-7UYCXFTE.js → src-YNY32ELR.js}

@@ -293,7 +293,7 @@ import {
   validateQuestMasterArtifactV2,
   validateReactArtifactV2,
   validateSvgArtifactV2
-} from "./chunk-3OX632TE.js";
+} from "./chunk-DJPXSSP4.js";
 import "./chunk-PDX44BCA.js";
 export {
   ALL_IMAGE_MODELS,

package/dist/{subtractCredits-Z2YGWJCB.js → subtractCredits-GOVKM3IR.js}

@@ -2,10 +2,10 @@
 import {
   SubtractCreditsSchema,
   subtractCredits
-} from "./chunk-OX65IHIA.js";
-import "./chunk-T7NEJI2V.js";
+} from "./chunk-VZU4Z7WI.js";
+import "./chunk-GCVIRGIN.js";
 import "./chunk-AMDXHL6S.js";
-import "./chunk-3OX632TE.js";
+import "./chunk-DJPXSSP4.js";
 import "./chunk-PDX44BCA.js";
 export {
   SubtractCreditsSchema,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bike4mind/cli",
-  "version": "0.2.10-fix-extendend-thinking-with-tool-use.17269+e94200ce4",
+  "version": "0.2.10-fix-cli-socket-hangup-error-handling.17310+c525c3233",
   "type": "module",
   "description": "Interactive CLI tool for Bike4Mind with ReAct agents",
   "license": "UNLICENSED",
@@ -104,10 +104,10 @@
   },
   "devDependencies": {
     "@bike4mind/agents": "0.1.0",
-    "@bike4mind/common": "2.39.1-fix-extendend-thinking-with-tool-use.17269+e94200ce4",
-    "@bike4mind/mcp": "1.20.4-fix-extendend-thinking-with-tool-use.17269+e94200ce4",
-    "@bike4mind/services": "2.34.2-fix-extendend-thinking-with-tool-use.17269+e94200ce4",
-    "@bike4mind/utils": "2.1.4-fix-extendend-thinking-with-tool-use.17269+e94200ce4",
+    "@bike4mind/common": "2.39.1-fix-cli-socket-hangup-error-handling.17310+c525c3233",
+    "@bike4mind/mcp": "1.20.4-fix-cli-socket-hangup-error-handling.17310+c525c3233",
+    "@bike4mind/services": "2.34.2-fix-cli-socket-hangup-error-handling.17310+c525c3233",
+    "@bike4mind/utils": "2.1.4-fix-cli-socket-hangup-error-handling.17310+c525c3233",
     "@types/better-sqlite3": "^7.6.13",
     "@types/diff": "^5.0.9",
     "@types/jsonwebtoken": "^9.0.4",
@@ -120,5 +120,5 @@
     "typescript": "^5.9.3",
     "vitest": "^3.2.4"
   },
-  "gitHead": "e94200ce4e993f1a05a29c6df68d05697e922ca1"
+  "gitHead": "c525c323364efcd1b2107413ac1aa8619f462124"
 }