@bike4mind/cli 0.2.49-fix-cli-stream-resilience.21034 → 0.2.49-fix-cli-stream-resilience.21035

package/dist/{chunk-F6IY547T.js → chunk-7VEI22BF.js}

@@ -6,7 +6,7 @@ import {
   getSettingsByNames,
   obfuscateApiKey,
   secureParameters
-} from "./chunk-M7QGYBN7.js";
+} from "./chunk-UDBM5N7V.js";
 import {
   ApiKeyType,
   MementoTier,

package/dist/{chunk-QJ47T42W.js → chunk-KE2DKWPR.js}

@@ -4,7 +4,7 @@ import {
   getOpenWeatherKey,
   getSerperKey,
   getWolframAlphaKey
-} from "./chunk-F6IY547T.js";
+} from "./chunk-7VEI22BF.js";
 import {
   BFLImageService,
   BaseStorage,
@@ -16,7 +16,7 @@ import {
   OpenAIBackend,
   OpenAIImageService,
   XAIImageService
-} from "./chunk-M7QGYBN7.js";
+} from "./chunk-UDBM5N7V.js";
 import {
   Logger
 } from "./chunk-PFBYGCOW.js";

package/dist/{chunk-OPFQTJGV.js → chunk-KR6Q7BEQ.js}

@@ -3,7 +3,7 @@
 // package.json
 var package_default = {
   name: "@bike4mind/cli",
-  version: "0.2.49-fix-cli-stream-resilience.21034+388f30f58",
+  version: "0.2.49-fix-cli-stream-resilience.21035+55211284e",
   type: "module",
   description: "Interactive CLI tool for Bike4Mind with ReAct agents",
   license: "UNLICENSED",
@@ -118,10 +118,10 @@ var package_default = {
   },
   devDependencies: {
     "@bike4mind/agents": "0.1.0",
-    "@bike4mind/common": "2.67.1-fix-cli-stream-resilience.21034+388f30f58",
-    "@bike4mind/mcp": "1.33.11-fix-cli-stream-resilience.21034+388f30f58",
-    "@bike4mind/services": "2.63.1-fix-cli-stream-resilience.21034+388f30f58",
-    "@bike4mind/utils": "2.15.4-fix-cli-stream-resilience.21034+388f30f58",
+    "@bike4mind/common": "2.67.1-fix-cli-stream-resilience.21035+55211284e",
+    "@bike4mind/mcp": "1.33.11-fix-cli-stream-resilience.21035+55211284e",
+    "@bike4mind/services": "2.63.1-fix-cli-stream-resilience.21035+55211284e",
+    "@bike4mind/utils": "2.15.4-fix-cli-stream-resilience.21035+55211284e",
     "@types/better-sqlite3": "^7.6.13",
     "@types/diff": "^5.0.9",
     "@types/jsonwebtoken": "^9.0.4",
@@ -140,7 +140,7 @@ var package_default = {
   optionalDependencies: {
     "@vscode/ripgrep": "^1.17.0"
   },
-  gitHead: "388f30f585b055f7cb133fd507e90c8138fed006"
+  gitHead: "55211284e57c3ff385fd9fa37c2cbb8f5292a531"
 };
 
 // src/utils/updateChecker.ts

package/dist/{chunk-WKPO5JDF.js → chunk-MP3FYWMR.js}

@@ -7,7 +7,7 @@ import {
   getSettingsMap,
   getSettingsValue,
   secureParameters
-} from "./chunk-M7QGYBN7.js";
+} from "./chunk-UDBM5N7V.js";
 import {
   KnowledgeType,
   SupportedFabFileMimeTypes

package/dist/{chunk-M7QGYBN7.js → chunk-UDBM5N7V.js}

@@ -6578,6 +6578,57 @@ var GeminiBackend = class {
 // ../../b4m-core/packages/utils/dist/src/llm/ollamaBackend.js
 import { Ollama } from "ollama";
 import { Agent as Agent2 } from "undici";
+
+// ../../b4m-core/packages/utils/dist/src/llm/messageFormatConverter.js
+function convertMessageToOpenAIFormat(msg) {
+  if (msg.role === "assistant" && msg.tool_calls) {
+    return [
+      {
+        ...msg,
+        content: null,
+        tool_calls: msg.tool_calls
+      }
+    ];
+  }
+  if (msg.role === "assistant" && Array.isArray(msg.content)) {
+    const contentBlocks = msg.content;
+    const toolUseBlocks = contentBlocks.filter((b) => b.type === "tool_use");
+    if (toolUseBlocks.length > 0) {
+      const textParts = contentBlocks.filter((b) => b.type === "text").map((b) => b.text).filter(Boolean);
+      return [
+        {
+          role: "assistant",
+          content: textParts.length > 0 ? textParts.join("\n") : null,
+          tool_calls: toolUseBlocks.map((b) => ({
+            id: b.id,
+            type: "function",
+            function: {
+              name: b.name,
+              arguments: typeof b.input === "string" ? b.input : JSON.stringify(b.input)
+            }
+          }))
+        }
+      ];
+    }
+  }
+  if (msg.role === "user" && Array.isArray(msg.content)) {
+    const contentBlocks = msg.content;
+    const toolResultBlocks = contentBlocks.filter((b) => b.type === "tool_result");
+    if (toolResultBlocks.length > 0) {
+      return toolResultBlocks.map((b) => ({
+        role: "tool",
+        content: typeof b.content === "string" ? b.content : JSON.stringify(b.content),
+        tool_call_id: b.tool_use_id
+      }));
+    }
+  }
+  return [msg];
+}
+function convertMessagesToOpenAIFormat(messages) {
+  return messages.flatMap(convertMessageToOpenAIFormat);
+}
+
+// ../../b4m-core/packages/utils/dist/src/llm/ollamaBackend.js
 var OllamaBackend = class {
   _host;
   _api;
@@ -6741,9 +6792,12 @@ var OllamaBackend = class {
   /**
    * Map IMessage[] to Ollama's Message[], preserving tool_calls for multi-turn
    * tool conversations (added by pushToolMessages).
+   * First converts B4M standard format (tool_use/tool_result) to OpenAI-compatible
+   * format since Ollama uses the same tool_calls/role:tool convention.
    */
   buildMessages(messages) {
-    return messages.map((msg) => {
+    const converted = convertMessagesToOpenAIFormat(messages);
+    return converted.map((msg) => {
       const raw = msg;
       const mapped = {
         role: msg.role,
@@ -7837,16 +7891,8 @@ Only when someone asks, remember that you are specifically the ${model} model.`;
       role: "system",
       content: systemContent
     };
-    const formattedMessages = filteredMessages.map((msg) => {
-      if (msg.role === "assistant" && msg.tool_calls) {
-        return {
-          ...msg,
-          content: null,
-          tool_calls: msg.tool_calls
-        };
-      }
-      return msg;
-    });
+    const convertedMessages = convertMessagesToOpenAIFormat(filteredMessages);
+    const formattedMessages = convertedMessages;
     return isO1Model ? formattedMessages : [systemMessage, ...formattedMessages];
   }
   pushToolMessages(messages, tool, result, _thinkingBlocks) {
@@ -8369,17 +8415,7 @@ var XAIBackend = class {
     }
   }
   formatMessages(messages) {
-    const formattedMessages = messages.map((msg) => {
-      if (msg.role === "assistant" && msg.tool_calls) {
-        return {
-          ...msg,
-          content: null,
-          tool_calls: msg.tool_calls
-        };
-      }
-      return msg;
-    });
-    return formattedMessages;
+    return convertMessagesToOpenAIFormat(messages);
   }
   formatTools(tools = []) {
     return tools.map((tool) => ({

package/dist/{chunk-OFKZXY6L.js → chunk-X26VCD3A.js}

@@ -2,7 +2,7 @@
 import {
   BadRequestError,
   secureParameters
-} from "./chunk-M7QGYBN7.js";
+} from "./chunk-UDBM5N7V.js";
 import {
   CompletionApiUsageTransaction,
   GenericCreditDeductTransaction,

package/dist/commands/doctorCommand.js

@@ -3,7 +3,7 @@ import {
   fetchLatestVersion,
   forceCheckForUpdate,
   package_default
-} from "../chunk-OPFQTJGV.js";
+} from "../chunk-KR6Q7BEQ.js";
 
 // src/commands/doctorCommand.ts
 import { execSync } from "child_process";

package/dist/commands/headlessCommand.js

@@ -36,13 +36,13 @@ import {
   isReadOnlyTool,
   loadContextFiles,
   setWebSocketToolExecutor
-} from "../chunk-QJ47T42W.js";
+} from "../chunk-KE2DKWPR.js";
 import "../chunk-BDQBOLYG.js";
-import "../chunk-F6IY547T.js";
+import "../chunk-7VEI22BF.js";
 import "../chunk-GQGOWACU.js";
-import "../chunk-OFKZXY6L.js";
-import "../chunk-WKPO5JDF.js";
-import "../chunk-M7QGYBN7.js";
+import "../chunk-X26VCD3A.js";
+import "../chunk-MP3FYWMR.js";
+import "../chunk-UDBM5N7V.js";
 import "../chunk-PFBYGCOW.js";
 import "../chunk-BPFEGDC7.js";
 import {

package/dist/commands/updateCommand.js

@@ -2,7 +2,7 @@
 import {
   forceCheckForUpdate,
   package_default
-} from "../chunk-OPFQTJGV.js";
+} from "../chunk-KR6Q7BEQ.js";
 
 // src/commands/updateCommand.ts
 import { execSync } from "child_process";

package/dist/{create-6Z46TX3C.js → create-PA2DIVCF.js}

@@ -2,8 +2,8 @@
 import {
   createFabFile,
   createFabFileSchema
-} from "./chunk-WKPO5JDF.js";
-import "./chunk-M7QGYBN7.js";
+} from "./chunk-MP3FYWMR.js";
+import "./chunk-UDBM5N7V.js";
 import "./chunk-PFBYGCOW.js";
 import "./chunk-QLY3LGPA.js";
 export {

package/dist/index.js

@@ -46,15 +46,15 @@ import {
   setWebSocketToolExecutor,
   substituteArguments,
   warmFileCache
-} from "./chunk-QJ47T42W.js";
+} from "./chunk-KE2DKWPR.js";
 import "./chunk-BDQBOLYG.js";
-import "./chunk-F6IY547T.js";
+import "./chunk-7VEI22BF.js";
 import "./chunk-GQGOWACU.js";
-import "./chunk-OFKZXY6L.js";
-import "./chunk-WKPO5JDF.js";
+import "./chunk-X26VCD3A.js";
+import "./chunk-MP3FYWMR.js";
 import {
   OllamaBackend
-} from "./chunk-M7QGYBN7.js";
+} from "./chunk-UDBM5N7V.js";
 import "./chunk-PFBYGCOW.js";
 import "./chunk-BPFEGDC7.js";
 import {
@@ -64,7 +64,7 @@ import {
 import {
   checkForUpdate,
   package_default
-} from "./chunk-OPFQTJGV.js";
+} from "./chunk-KR6Q7BEQ.js";
 import {
   selectActiveBackgroundAgents,
   useCliStore

package/dist/{mementoService-XAAA3Q54.js → mementoService-W76KVRGE.js}

@@ -2,8 +2,8 @@
 import {
   findMostSimilarMemento,
   getRelevantMementos
-} from "./chunk-F6IY547T.js";
-import "./chunk-M7QGYBN7.js";
+} from "./chunk-7VEI22BF.js";
+import "./chunk-UDBM5N7V.js";
 import "./chunk-PFBYGCOW.js";
 import "./chunk-QLY3LGPA.js";
 export {

package/dist/{src-FDPAPWTO.js → src-XUTQ6N2T.js}

@@ -143,7 +143,7 @@ import {
   validateUrlForFetch,
   warmUpSettingsCache,
   withRetry
-} from "./chunk-M7QGYBN7.js";
+} from "./chunk-UDBM5N7V.js";
 import {
   Logger,
   NotificationDeduplicator,

package/dist/{subtractCredits-7SHS6DXL.js → subtractCredits-3V5REXEH.js}

@@ -2,8 +2,8 @@
 import {
   SubtractCreditsSchema,
   subtractCredits
-} from "./chunk-OFKZXY6L.js";
-import "./chunk-M7QGYBN7.js";
+} from "./chunk-X26VCD3A.js";
+import "./chunk-UDBM5N7V.js";
 import "./chunk-PFBYGCOW.js";
 import "./chunk-QLY3LGPA.js";
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bike4mind/cli",
-  "version": "0.2.49-fix-cli-stream-resilience.21034+388f30f58",
+  "version": "0.2.49-fix-cli-stream-resilience.21035+55211284e",
   "type": "module",
   "description": "Interactive CLI tool for Bike4Mind with ReAct agents",
   "license": "UNLICENSED",
@@ -115,10 +115,10 @@
   },
   "devDependencies": {
     "@bike4mind/agents": "0.1.0",
-    "@bike4mind/common": "2.67.1-fix-cli-stream-resilience.21034+388f30f58",
-    "@bike4mind/mcp": "1.33.11-fix-cli-stream-resilience.21034+388f30f58",
-    "@bike4mind/services": "2.63.1-fix-cli-stream-resilience.21034+388f30f58",
-    "@bike4mind/utils": "2.15.4-fix-cli-stream-resilience.21034+388f30f58",
+    "@bike4mind/common": "2.67.1-fix-cli-stream-resilience.21035+55211284e",
+    "@bike4mind/mcp": "1.33.11-fix-cli-stream-resilience.21035+55211284e",
+    "@bike4mind/services": "2.63.1-fix-cli-stream-resilience.21035+55211284e",
+    "@bike4mind/utils": "2.15.4-fix-cli-stream-resilience.21035+55211284e",
     "@types/better-sqlite3": "^7.6.13",
     "@types/diff": "^5.0.9",
     "@types/jsonwebtoken": "^9.0.4",
@@ -137,5 +137,5 @@
   "optionalDependencies": {
     "@vscode/ripgrep": "^1.17.0"
   },
-  "gitHead": "388f30f585b055f7cb133fd507e90c8138fed006"
+  "gitHead": "55211284e57c3ff385fd9fa37c2cbb8f5292a531"
 }