@bike4mind/cli 0.2.11-fix-extendend-thinking-with-tool-use.17316 → 0.2.11-fix-tool-pairing-integrity.17312

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-7ORA6KGN.js → chunk-A3VAT7TT.js}

@@ -2,7 +2,7 @@
 import {
   BadRequestError,
   secureParameters
-} from "./chunk-JYH72REB.js";
+} from "./chunk-TFONTTOE.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/{chunk-HPYQM2B7.js → chunk-CQW42LY2.js}

@@ -7,11 +7,11 @@ import {
   getSettingsMap,
   getSettingsValue,
   secureParameters
-} from "./chunk-JYH72REB.js";
+} from "./chunk-TFONTTOE.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-7JR6VASX.js → chunk-MU4EEXAL.js}

@@ -6,12 +6,12 @@ import {
   getSettingsByNames,
   obfuscateApiKey,
   secureParameters
-} from "./chunk-JYH72REB.js";
+} from "./chunk-TFONTTOE.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-JYH72REB.js → chunk-TFONTTOE.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";
@@ -249,17 +249,6 @@ var AnthropicBackend = class {
     this._api = new Anthropic({ apiKey });
     this.logger = logger ?? new Logger();
   }
-  /**
-   * Get thinking blocks from the last assistant content.
-   * Filters to only include thinking/redacted_thinking blocks.
-   * Returns undefined if thinking is disabled or no blocks are present.
-   */
-  getThinkingBlocks() {
-    if (!this.isThinkingEnabled)
-      return void 0;
-    const blocks = this.lastAssistantContent.filter((block) => block?.type === "thinking" || block?.type === "redacted_thinking");
-    return blocks.length > 0 ? blocks : void 0;
-  }
   async getModelInfo() {
     return [
       {
@@ -712,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.getThinkingBlocks();
-            this.logger.debug(`[Tool Execution] executeTools=false, passing tool calls to callback with ${thinkingBlocks?.length || 0} thinking blocks`);
-            await cb([null], {
-              toolsUsed,
-              thinking: thinkingBlocks
-            });
+            this.logger.debug(`[Tool Execution] executeTools=false, passing tool calls to callback`);
+            await cb([null], { toolsUsed });
           }
           return;
         }
@@ -789,12 +774,8 @@ var AnthropicBackend = class {
               await this.complete(model, messages, { ...options, tools: void 0, _internal: void 0 }, cb, toolsUsed);
             }
           } else {
-            const thinkingBlocks = this.getThinkingBlocks();
-            this.logger.debug(`[Tool Execution] executeTools=false, passing tool calls to callback with ${thinkingBlocks?.length || 0} thinking blocks`);
-            await cb([null], {
-              toolsUsed,
-              thinking: thinkingBlocks
-            });
+            this.logger.debug(`[Tool Execution] executeTools=false, passing tool calls to callback`);
+            await cb([null], { toolsUsed });
           }
           return;
         }
@@ -6267,6 +6248,8 @@ var ensureToolPairingIntegrity = (messages, logger) => {
     return messages;
   }
   const toolUseIds = /* @__PURE__ */ new Set();
+  const toolResultIds = /* @__PURE__ */ new Set();
+  let hasToolUseBlocks = false;
   let hasToolResultBlocks = false;
   for (let i = 0; i < messages.length; i++) {
     const message = messages[i];
@@ -6276,65 +6259,111 @@ var ensureToolPairingIntegrity = (messages, logger) => {
         const block = content[j];
         if (block.type === "tool_use" && "id" in block) {
           toolUseIds.add(block.id);
+          hasToolUseBlocks = true;
         }
       }
     } else if (message.role === "user" && Array.isArray(message.content)) {
       const content = message.content;
       for (let j = 0; j < content.length; j++) {
-        if (content[j].type === "tool_result") {
+        const block = content[j];
+        if (block.type === "tool_result" && "tool_use_id" in block) {
+          toolResultIds.add(block.tool_use_id);
           hasToolResultBlocks = true;
-          break;
         }
       }
     }
   }
-  if (!hasToolResultBlocks) {
+  if (!hasToolUseBlocks && !hasToolResultBlocks) {
     return messages;
   }
-  let orphanedCount = 0;
+  let orphanedToolResultCount = 0;
+  let orphanedToolUseCount = 0;
   const result = [];
   for (let i = 0; i < messages.length; i++) {
     const message = messages[i];
-    if (message.role !== "user" || !Array.isArray(message.content)) {
-      result.push(message);
-      continue;
-    }
-    const content = message.content;
-    let hasOrphans = false;
-    for (let j = 0; j < content.length; j++) {
-      const block = content[j];
-      if (block.type === "tool_result" && "tool_use_id" in block) {
-        if (!toolUseIds.has(block.tool_use_id)) {
-          hasOrphans = true;
-          break;
+    if (message.role === "assistant" && Array.isArray(message.content)) {
+      const content = message.content;
+      let hasOrphanedToolUse = false;
+      for (let j = 0; j < content.length; j++) {
+        const block = content[j];
+        if (block.type === "tool_use" && "id" in block) {
+          if (!toolResultIds.has(block.id)) {
+            hasOrphanedToolUse = true;
+            break;
+          }
         }
       }
-    }
-    if (!hasOrphans) {
-      result.push(message);
+      if (!hasOrphanedToolUse) {
+        result.push(message);
+        continue;
+      }
+      const filteredContent = [];
+      for (let j = 0; j < content.length; j++) {
+        const block = content[j];
+        if (block.type === "tool_use" && "id" in block) {
+          const toolId = block.id;
+          if (!toolResultIds.has(toolId)) {
+            orphanedToolUseCount++;
+            if (logger) {
+              logger.warn(`Removing orphaned tool_use block with id: ${toolId} (no matching tool_result)`);
+            }
+            continue;
+          }
+        }
+        filteredContent.push(block);
+      }
+      if (filteredContent.length > 0) {
+        result.push({ ...message, content: filteredContent });
+      }
       continue;
     }
-    const filteredContent = [];
-    for (let j = 0; j < content.length; j++) {
-      const block = content[j];
-      if (block.type === "tool_result" && "tool_use_id" in block) {
-        const toolUseId = block.tool_use_id;
-        if (!toolUseIds.has(toolUseId)) {
-          orphanedCount++;
-          if (logger) {
-            logger.warn(`Removing orphaned tool_result block referencing missing tool_use_id: ${toolUseId}`);
+    if (message.role === "user" && Array.isArray(message.content)) {
+      const content = message.content;
+      let hasOrphanedToolResult = false;
+      for (let j = 0; j < content.length; j++) {
+        const block = content[j];
+        if (block.type === "tool_result" && "tool_use_id" in block) {
+          if (!toolUseIds.has(block.tool_use_id)) {
+            hasOrphanedToolResult = true;
+            break;
           }
-          continue;
         }
       }
-      filteredContent.push(block);
-    }
-    if (filteredContent.length > 0) {
-      result.push({ ...message, content: filteredContent });
+      if (!hasOrphanedToolResult) {
+        result.push(message);
+        continue;
+      }
+      const filteredContent = [];
+      for (let j = 0; j < content.length; j++) {
+        const block = content[j];
+        if (block.type === "tool_result" && "tool_use_id" in block) {
+          const toolUseId = block.tool_use_id;
+          if (!toolUseIds.has(toolUseId)) {
+            orphanedToolResultCount++;
+            if (logger) {
+              logger.warn(`Removing orphaned tool_result block referencing missing tool_use_id: ${toolUseId}`);
+            }
+            continue;
+          }
+        }
+        filteredContent.push(block);
+      }
+      if (filteredContent.length > 0) {
+        result.push({ ...message, content: filteredContent });
+      }
+      continue;
     }
+    result.push(message);
   }
-  if (orphanedCount > 0 && logger) {
-    logger.log(`Tool pairing integrity: removed ${orphanedCount} orphaned tool_result block(s) after truncation`);
+  if ((orphanedToolResultCount > 0 || orphanedToolUseCount > 0) && logger) {
+    const parts = [];
+    if (orphanedToolResultCount > 0) {
+      parts.push(`${orphanedToolResultCount} orphaned tool_result block(s)`);
+    }
+    if (orphanedToolUseCount > 0) {
+      parts.push(`${orphanedToolUseCount} orphaned tool_use block(s)`);
+    }
+    logger.log(`Tool pairing integrity: removed ${parts.join(" and ")} after truncation`);
   }
   return result;
 };

package/dist/{create-MSSVWSVO.js → create-GE45KYWN.js}

@@ -2,10 +2,10 @@
 import {
   createFabFile,
   createFabFileSchema
-} from "./chunk-HPYQM2B7.js";
-import "./chunk-JYH72REB.js";
+} from "./chunk-CQW42LY2.js";
+import "./chunk-TFONTTOE.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-7JR6VASX.js";
-import "./chunk-7ORA6KGN.js";
-import "./chunk-HPYQM2B7.js";
+} from "./chunk-MU4EEXAL.js";
+import "./chunk-A3VAT7TT.js";
+import "./chunk-CQW42LY2.js";
 import {
   BFLImageService,
   BaseStorage,
@@ -15,7 +15,7 @@ import {
   OpenAIBackend,
   OpenAIImageService,
   XAIImageService
-} from "./chunk-JYH72REB.js";
+} from "./chunk-TFONTTOE.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";
@@ -3144,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)) {
@@ -3177,23 +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] ${assistantContent.length} blocks (${thinkingBlocks.length} thinking, 1 tool_use)`
-                    );
                     messages.push({
                       role: "assistant",
-                      content: assistantContent
+                      content: [
+                        {
+                          type: "tool_use",
+                          id: toolCallId2,
+                          name: toolUse.name,
+                          input: params
+                        }
+                      ]
                     });
                     messages.push({
                       role: "user",
@@ -11142,7 +11134,6 @@ var ServerLlmBackend = class {
         let accumulatedText = "";
         let lastUsageInfo = {};
         let toolsUsed = [];
-        let thinkingBlocks = [];
         let receivedDone = false;
         const parser = createParser({
           onEvent: (event) => {
@@ -11156,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);
@@ -11217,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,
@@ -11543,7 +11527,7 @@ import { isAxiosError as isAxiosError2 } from "axios";
 // package.json
 var package_default = {
   name: "@bike4mind/cli",
-  version: "0.2.11-fix-extendend-thinking-with-tool-use.17316+abc8cdb0e",
+  version: "0.2.11-fix-tool-pairing-integrity.17312+7bfc5c80f",
   type: "module",
   description: "Interactive CLI tool for Bike4Mind with ReAct agents",
   license: "UNLICENSED",
@@ -11647,10 +11631,10 @@ var package_default = {
   },
   devDependencies: {
     "@bike4mind/agents": "0.1.0",
-    "@bike4mind/common": "2.40.1-fix-extendend-thinking-with-tool-use.17316+abc8cdb0e",
-    "@bike4mind/mcp": "1.20.5-fix-extendend-thinking-with-tool-use.17316+abc8cdb0e",
-    "@bike4mind/services": "2.35.1-fix-extendend-thinking-with-tool-use.17316+abc8cdb0e",
-    "@bike4mind/utils": "2.1.5-fix-extendend-thinking-with-tool-use.17316+abc8cdb0e",
+    "@bike4mind/common": "2.40.1-fix-tool-pairing-integrity.17312+7bfc5c80f",
+    "@bike4mind/mcp": "1.20.5-fix-tool-pairing-integrity.17312+7bfc5c80f",
+    "@bike4mind/services": "2.35.1-fix-tool-pairing-integrity.17312+7bfc5c80f",
+    "@bike4mind/utils": "2.1.5-fix-tool-pairing-integrity.17312+7bfc5c80f",
     "@types/better-sqlite3": "^7.6.13",
     "@types/diff": "^5.0.9",
     "@types/jsonwebtoken": "^9.0.4",
@@ -11663,7 +11647,7 @@ var package_default = {
     typescript: "^5.9.3",
     vitest: "^3.2.4"
   },
-  gitHead: "abc8cdb0e7f31a4b7bc948b332e6d130be260378"
+  gitHead: "7bfc5c80fed342996ecbfb0c7974795bdaa75132"
 };
 
 // src/config/constants.ts
@@ -12048,8 +12032,7 @@ function CliApp() {
     permissionPrompt: null,
     trustLocationSelector: null,
     rewindSelector: null,
-    sessionSelector: null,
-    orchestrator: null
+    sessionSelector: null
   });
   const [isInitialized, setIsInitialized] = useState8(false);
   const [initError, setInitError] = useState8(null);
@@ -12395,10 +12378,8 @@ 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);

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-A6UR5AZY.js → mementoService-GIDVVHNG.js}

@@ -2,10 +2,10 @@
 import {
   findMostSimilarMemento,
   getRelevantMementos
-} from "./chunk-7JR6VASX.js";
-import "./chunk-JYH72REB.js";
+} from "./chunk-MU4EEXAL.js";
+import "./chunk-TFONTTOE.js";
 import "./chunk-AMDXHL6S.js";
-import "./chunk-3OX632TE.js";
+import "./chunk-DJPXSSP4.js";
 import "./chunk-PDX44BCA.js";
 export {
   findMostSimilarMemento,

package/dist/{src-GFWGZLJE.js → src-XCR4PATL.js}

@@ -120,7 +120,7 @@ import {
   validateMermaidSyntax,
   warmUpSettingsCache,
   withRetry
-} from "./chunk-JYH72REB.js";
+} from "./chunk-TFONTTOE.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-L52DZ3SP.js → subtractCredits-HDHG6FFY.js}

@@ -2,10 +2,10 @@
 import {
   SubtractCreditsSchema,
   subtractCredits
-} from "./chunk-7ORA6KGN.js";
-import "./chunk-JYH72REB.js";
+} from "./chunk-A3VAT7TT.js";
+import "./chunk-TFONTTOE.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.11-fix-extendend-thinking-with-tool-use.17316+abc8cdb0e",
+  "version": "0.2.11-fix-tool-pairing-integrity.17312+7bfc5c80f",
   "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.40.1-fix-extendend-thinking-with-tool-use.17316+abc8cdb0e",
-    "@bike4mind/mcp": "1.20.5-fix-extendend-thinking-with-tool-use.17316+abc8cdb0e",
-    "@bike4mind/services": "2.35.1-fix-extendend-thinking-with-tool-use.17316+abc8cdb0e",
-    "@bike4mind/utils": "2.1.5-fix-extendend-thinking-with-tool-use.17316+abc8cdb0e",
+    "@bike4mind/common": "2.40.1-fix-tool-pairing-integrity.17312+7bfc5c80f",
+    "@bike4mind/mcp": "1.20.5-fix-tool-pairing-integrity.17312+7bfc5c80f",
+    "@bike4mind/services": "2.35.1-fix-tool-pairing-integrity.17312+7bfc5c80f",
+    "@bike4mind/utils": "2.1.5-fix-tool-pairing-integrity.17312+7bfc5c80f",
     "@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": "abc8cdb0e7f31a4b7bc948b332e6d130be260378"
+  "gitHead": "7bfc5c80fed342996ecbfb0c7974795bdaa75132"
 }