claudish 7.67.0 → 7.67.1

package/dist/index.js

@@ -731,7 +731,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "7.67.0";
+var VERSION = "7.67.1";
 
 // src/logger.ts
 var exports_logger = {};
@@ -28268,8 +28268,10 @@ function truncateToolName(name, maxLength) {
   log(`[ToolName] Truncated: "${name}" -> "${truncated}" (${name.length} -> ${truncated.length} chars)`);
   return truncated;
 }
+var TOOL_NAME_SOURCE = "[A-Za-z_][A-Za-z0-9_.-]{0,63}", TOOL_NAME_SHAPE;
 var init_tool_name_utils = __esm(() => {
   init_logger();
+  TOOL_NAME_SHAPE = new RegExp(`^${TOOL_NAME_SOURCE}$`);
 });
 
 // src/handlers/shared/format/openai-messages.ts
@@ -29589,9 +29591,32 @@ function filterIdentity(content) {
 }
 
 // src/handlers/shared/tool-call-recovery.ts
-function extractToolCallsFromText(text) {
+function hasExtractableFunctionTag(text) {
+  return FUNCTION_TAG_PRESENT.test(text);
+}
+function keepOnlyRealTools(extracted, knownToolNames) {
+  const kept = [];
+  for (const call of extracted) {
+    if (!TOOL_NAME_SHAPE.test(call.name)) {
+      log(`[ToolRecovery] Dropped extracted call: name is not an identifier: ${JSON.stringify(call.name.slice(0, 120))}`);
+      continue;
+    }
+    if (!knownToolNames || knownToolNames.length === 0) {
+      kept.push(call);
+      continue;
+    }
+    const canonical = knownToolNames.find((t) => t.toLowerCase() === call.name.toLowerCase());
+    if (!canonical) {
+      log(`[ToolRecovery] Dropped extracted call for unadvertised tool: ${call.name}`);
+      continue;
+    }
+    kept.push(canonical === call.name ? call : { ...call, name: canonical });
+  }
+  return kept;
+}
+function extractToolCallsFromText(text, knownToolNames) {
   const extracted = [];
-  const qwenPattern = /<function=([^>]+)>([\s\S]*?)(?=<function=|$)/gi;
+  const qwenPattern = new RegExp(FUNCTION_TAG_SOURCE, "gi");
   let match;
   while ((match = qwenPattern.exec(text)) !== null) {
     const funcName = match[1];
@@ -29685,7 +29710,7 @@ function extractToolCallsFromText(text) {
       }
     } catch (e) {}
   }
-  const knownTools = [
+  const knownTools = knownToolNames && knownToolNames.length > 0 ? knownToolNames : [
     "Task",
     "Read",
     "Write",
@@ -29793,7 +29818,7 @@ function extractToolCallsFromText(text) {
       }
     }
   }
-  return extracted;
+  return keepOnlyRealTools(extracted, knownToolNames);
 }
 function inferMissingParameters(toolName2, args, missingParams, context) {
   const inferred = { ...args };
@@ -29958,8 +29983,12 @@ function validateAndRepairToolCall(toolName2, argsStr, toolSchemas, textContent)
   }
   return { valid: false, args: repairedArgs, repaired: false, missingParams: stillMissing };
 }
+var FUNCTION_TAG_SOURCE, FUNCTION_TAG_PRESENT;
 var init_tool_call_recovery = __esm(() => {
+  init_tool_name_utils();
   init_logger();
+  FUNCTION_TAG_SOURCE = `<function=(${TOOL_NAME_SOURCE})>([\\s\\S]*?)(?=<function=|$)`;
+  FUNCTION_TAG_PRESENT = new RegExp(`<function=${TOOL_NAME_SOURCE}>`);
 });
 
 // src/handlers/shared/web-search-detector.ts
@@ -30102,7 +30131,10 @@ data: ${JSON.stringify(d)}
             const preview = state.accumulatedText.slice(0, 500).replace(/\n/g, "\\n");
             log(`[Streaming] Accumulated text (${state.accumulatedText.length} chars): ${preview}...`);
           }
-          const textToolCalls = extractToolCallsFromText(state.accumulatedText);
+          const textToolCalls = state.tools.size > 0 ? [] : extractToolCallsFromText(state.accumulatedText, toolSchemas?.map((t) => t?.name).filter((n) => !!n));
+          if (state.tools.size > 0 && state.accumulatedText.length > 0) {
+            log(`[Streaming] Skipping text-based tool extraction: ${state.tools.size} structured tool call(s) already present`);
+          }
           log(`[Streaming] Text-based tool calls found: ${textToolCalls.length}`);
           if (textToolCalls.length > 0) {
             log(`[Streaming] Found ${textToolCalls.length} text-based tool call(s), converting to structured format`);
@@ -30309,7 +30341,7 @@ data: ${JSON.stringify(d)}
                   }
                   if (res.cleanedText) {
                     state.accumulatedText += res.cleanedText;
-                    const hasStructuredToolPattern = /<function=[^>]+>/.test(state.accumulatedText) || /\{\s*"(?:name|tool)"\s*:\s*"(?:Task|Read|Write|Edit|Bash|Grep|Glob)"/i.test(state.accumulatedText) || /<tool_call>/.test(state.accumulatedText);
+                    const hasStructuredToolPattern = hasExtractableFunctionTag(state.accumulatedText) || /\{\s*"(?:name|tool)"\s*:\s*"(?:Task|Read|Write|Edit|Bash|Grep|Glob)"/i.test(state.accumulatedText) || /<tool_call>/.test(state.accumulatedText);
                     const shouldHoldBack = hasStructuredToolPattern && state.accumulatedText.length < 1000;
                     if (shouldHoldBack) {
                       log(`[Streaming] Text held back (structured tool pattern): ${state.accumulatedText.length} chars accumulated`);
@@ -43030,7 +43062,8 @@ class TokenTracker {
     this.config = config2;
   }
   recordToolUse(name) {
-    const key = name.trim() || "unknown";
+    const trimmed2 = name.trim();
+    const key = !trimmed2 ? "unknown" : TOOL_NAME_SHAPE.test(trimmed2) ? trimmed2 : "malformed";
     this.toolCallsByName.set(key, (this.toolCallsByName.get(key) ?? 0) + 1);
   }
   getToolCallCount() {
@@ -43203,6 +43236,7 @@ class TokenTracker {
   }
 }
 var init_token_tracker = __esm(() => {
+  init_tool_name_utils();
   init_types2();
   init_logger();
   init_remote_provider_types();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudish",
-  "version": "7.67.0",
+  "version": "7.67.1",
   "description": "Run Claude Code with any model - OpenRouter, Ollama, LM Studio & local models",
   "type": "module",
   "main": "./dist/index.js",
@@ -60,10 +60,10 @@
     "ai"
   ],
   "optionalDependencies": {
-    "@claudish/magmux-darwin-arm64": "7.67.0",
-    "@claudish/magmux-darwin-x64": "7.67.0",
-    "@claudish/magmux-linux-arm64": "7.67.0",
-    "@claudish/magmux-linux-x64": "7.67.0"
+    "@claudish/magmux-darwin-arm64": "7.67.1",
+    "@claudish/magmux-darwin-x64": "7.67.1",
+    "@claudish/magmux-linux-arm64": "7.67.1",
+    "@claudish/magmux-linux-x64": "7.67.1"
   },
   "author": "Jack Rudenko <i@madappgang.com>",
   "license": "MIT",