@bike4mind/cli 0.2.11-fix-number-option-recorded.17312 → 0.2.11-fix-tool-pairing-integrity.17312

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

@@ -2,7 +2,7 @@
 import {
   BadRequestError,
   secureParameters
-} from "./chunk-GCVIRGIN.js";
+} from "./chunk-TFONTTOE.js";
 import {
   GenericCreditDeductTransaction,
   ImageEditUsageTransaction,

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

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

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

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

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

@@ -6248,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];
@@ -6257,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-ZDOTF7XD.js → create-GE45KYWN.js}

@@ -2,8 +2,8 @@
 import {
   createFabFile,
   createFabFileSchema
-} from "./chunk-AQBZVAYO.js";
-import "./chunk-GCVIRGIN.js";
+} from "./chunk-CQW42LY2.js";
+import "./chunk-TFONTTOE.js";
 import "./chunk-AMDXHL6S.js";
 import "./chunk-DJPXSSP4.js";
 import "./chunk-PDX44BCA.js";

package/dist/index.js

@@ -4,9 +4,9 @@ import {
   getEffectiveApiKey,
   getOpenWeatherKey,
   getSerperKey
-} from "./chunk-GO75FMLY.js";
-import "./chunk-VZU4Z7WI.js";
-import "./chunk-AQBZVAYO.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-GCVIRGIN.js";
+} from "./chunk-TFONTTOE.js";
 import {
   Logger
 } from "./chunk-AMDXHL6S.js";
@@ -107,8 +107,7 @@ function CustomTextInput({
   onChange,
   onSubmit,
   placeholder = "",
-  showCursor = true,
-  disabled = false
+  showCursor = true
 }) {
   const [cursorOffset, setCursorOffset] = useState(value.length);
   useInput(
@@ -189,7 +188,7 @@ function CustomTextInput({
         setCursorOffset(cursorOffset + 1);
       }
     },
-    { isActive: !disabled }
+    { isActive: true }
   );
   const hasValue = value.length > 0;
   if (!hasValue) {
@@ -828,59 +827,56 @@ 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);
-          }
-          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);
+  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;
       }
-      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);
-          }
+    }
+    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]);
+        }
+      } 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);
@@ -974,8 +970,7 @@ function InputPrompt({
       onChange: handleChange,
       onSubmit: handleSubmit,
       placeholder: getPlaceholder(),
-      showCursor: !disabled,
-      disabled
+      showCursor: !disabled
     }
   )), shouldShowCommandAutocomplete && /* @__PURE__ */ React5.createElement(CommandAutocomplete, { commands: filteredCommands, selectedIndex }), fileAutocomplete?.active && /* @__PURE__ */ React5.createElement(FileAutocomplete, { files: filteredFiles, selectedIndex: fileSelectedIndex, query: fileAutocomplete.query }));
 }
@@ -1543,7 +1538,7 @@ ${errorBlock}`;
       onSubmit: handleSubmit,
       onBashCommand,
       onImageDetected,
-      disabled: isThinking || !!permissionPrompt,
+      disabled: isThinking,
       history: commandHistory,
       commands,
       prefillInput,
@@ -11532,7 +11527,7 @@ import { isAxiosError as isAxiosError2 } from "axios";
 // package.json
 var package_default = {
   name: "@bike4mind/cli",
-  version: "0.2.11-fix-number-option-recorded.17312+3ca5a7c3c",
+  version: "0.2.11-fix-tool-pairing-integrity.17312+7bfc5c80f",
   type: "module",
   description: "Interactive CLI tool for Bike4Mind with ReAct agents",
   license: "UNLICENSED",
@@ -11636,10 +11631,10 @@ var package_default = {
   },
   devDependencies: {
     "@bike4mind/agents": "0.1.0",
-    "@bike4mind/common": "2.40.1-fix-number-option-recorded.17312+3ca5a7c3c",
-    "@bike4mind/mcp": "1.20.5-fix-number-option-recorded.17312+3ca5a7c3c",
-    "@bike4mind/services": "2.35.1-fix-number-option-recorded.17312+3ca5a7c3c",
-    "@bike4mind/utils": "2.1.5-fix-number-option-recorded.17312+3ca5a7c3c",
+    "@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",
@@ -11652,7 +11647,7 @@ var package_default = {
     typescript: "^5.9.3",
     vitest: "^3.2.4"
   },
-  gitHead: "3ca5a7c3ca52c4cf2a785e465726baaf81bb9669"
+  gitHead: "7bfc5c80fed342996ecbfb0c7974795bdaa75132"
 };
 
 // src/config/constants.ts

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

@@ -2,8 +2,8 @@
 import {
   findMostSimilarMemento,
   getRelevantMementos
-} from "./chunk-GO75FMLY.js";
-import "./chunk-GCVIRGIN.js";
+} from "./chunk-MU4EEXAL.js";
+import "./chunk-TFONTTOE.js";
 import "./chunk-AMDXHL6S.js";
 import "./chunk-DJPXSSP4.js";
 import "./chunk-PDX44BCA.js";

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

@@ -120,7 +120,7 @@ import {
   validateMermaidSyntax,
   warmUpSettingsCache,
   withRetry
-} from "./chunk-GCVIRGIN.js";
+} from "./chunk-TFONTTOE.js";
 import {
   Logger,
   NotificationDeduplicator,

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

@@ -2,8 +2,8 @@
 import {
   SubtractCreditsSchema,
   subtractCredits
-} from "./chunk-VZU4Z7WI.js";
-import "./chunk-GCVIRGIN.js";
+} from "./chunk-A3VAT7TT.js";
+import "./chunk-TFONTTOE.js";
 import "./chunk-AMDXHL6S.js";
 import "./chunk-DJPXSSP4.js";
 import "./chunk-PDX44BCA.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bike4mind/cli",
-  "version": "0.2.11-fix-number-option-recorded.17312+3ca5a7c3c",
+  "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-number-option-recorded.17312+3ca5a7c3c",
-    "@bike4mind/mcp": "1.20.5-fix-number-option-recorded.17312+3ca5a7c3c",
-    "@bike4mind/services": "2.35.1-fix-number-option-recorded.17312+3ca5a7c3c",
-    "@bike4mind/utils": "2.1.5-fix-number-option-recorded.17312+3ca5a7c3c",
+    "@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": "3ca5a7c3ca52c4cf2a785e465726baaf81bb9669"
+  "gitHead": "7bfc5c80fed342996ecbfb0c7974795bdaa75132"
 }