claudish 7.41.0 → 7.42.0

package/dist/index.js

@@ -729,7 +729,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "7.41.0";
+var VERSION = "7.42.0";
 
 // src/logger.ts
 var exports_logger = {};
@@ -33389,7 +33389,8 @@ function createStreamingState() {
     tools: new Map,
     toolIds: new Set,
     lastActivity: Date.now(),
-    accumulatedText: ""
+    accumulatedText: "",
+    finishReason: null
   };
 }
 function createStreamingResponseHandler(c, response, adapter, target, middlewareManager, onTokenUpdate, toolSchemas, toolNameMap, priorInputTokens, behavior) {
@@ -33547,7 +33548,12 @@ data: ${JSON.stringify(d)}
           send("error", { type: "error", error: { type: "api_error", message: err } });
         } else {
           const hasStructuredTools = Array.from(state.tools.values()).some((t) => t.started);
-          const stopReason = textToolCalls.length > 0 || hasStructuredTools ? "tool_use" : "end_turn";
+          const truncated = state.finishReason === "length";
+          const refused = state.finishReason === "content_filter";
+          const stopReason = refused ? "refusal" : truncated ? "max_tokens" : textToolCalls.length > 0 || hasStructuredTools ? "tool_use" : "end_turn";
+          if (truncated || refused) {
+            log(`[Streaming] Upstream finish_reason=${state.finishReason} \u2192 stop_reason=${stopReason} (${state.accumulatedText.length} chars produced)`);
+          }
           send("message_delta", {
             type: "message_delta",
             delta: { stop_reason: stopReason, stop_sequence: null },
@@ -33610,6 +33616,8 @@ data: ${JSON.stringify(d)}
               }
               const delta = chunk.choices?.[0]?.delta;
               const finishReason = chunk.choices?.[0]?.finish_reason;
+              if (finishReason)
+                state.finishReason = finishReason;
               if (delta?.content || finishReason) {
                 log(`[Streaming] Chunk: content=${delta?.content?.length || 0} chars, finish_reason=${finishReason || "null"}`);
               }
@@ -33622,8 +33630,9 @@ data: ${JSON.stringify(d)}
                     metadata: streamMetadata
                   });
                 }
-                if (delta.reasoning_content) {
-                  behavior?.onAssistantText?.(delta.reasoning_content, "reasoning");
+                const reasoningText = delta.reasoning_content || delta.reasoning;
+                if (reasoningText) {
+                  behavior?.onAssistantText?.(reasoningText, "reasoning");
                   state.lastActivity = Date.now();
                   if (!state.reasoningStarted) {
                     state.reasoningIdx = state.curIdx++;
@@ -33637,7 +33646,7 @@ data: ${JSON.stringify(d)}
                   send("content_block_delta", {
                     type: "content_block_delta",
                     index: state.reasoningIdx,
-                    delta: { type: "thinking_delta", thinking: delta.reasoning_content }
+                    delta: { type: "thinking_delta", thinking: reasoningText }
                   });
                 }
                 const txt = delta.content || "";
@@ -33906,54 +33915,14 @@ var init_openai_compat = __esm(() => {
 });
 
 // src/adapters/gemini-api-format.ts
-var REASONING_PATTERNS, REASONING_CONTINUATION_PATTERNS, GeminiAPIFormat;
+var GeminiAPIFormat;
 var init_gemini_api_format = __esm(() => {
   init_gemini_schema();
   init_openai_compat();
   init_logger();
   init_base_api_format();
-  REASONING_PATTERNS = [
-    /^Wait,?\s+I(?:'m|\s+am)\s+\w+ing\b/i,
-    /^Wait,?\s+(?:if|that|the|this|I\s+(?:need|should|will|have|already))/i,
-    /^Wait[.!]?\s*$/i,
-    /^Let\s+me\s+(think|check|verify|see|look|analyze|consider|first|start)/i,
-    /^Let's\s+(check|see|look|start|first|try|think|verify|examine|analyze)/i,
-    /^I\s+need\s+to\s+/i,
-    /^O[kK](?:ay)?[.,!]?\s*(?:so|let|I|now|first)?/i,
-    /^[Hh]mm+/,
-    /^So[,.]?\s+(?:I|let|first|now|the)/i,
-    /^(?:First|Next|Then|Now)[,.]?\s+(?:I|let|we)/i,
-    /^(?:Thinking\s+about|Considering)/i,
-    /^I(?:'ll|\s+will)\s+(?:first|now|start|begin|try|check|fix|look|examine|modify|create|update|read|investigate|adjust|improve|integrate|mark|also|verify|need|rethink|add|help|use|run|search|find|explore|analyze|review|test|implement|write|make|set|get|see|open|close|save|load|fetch|call|send|build|compile|execute|process|handle|parse|format|validate|clean|clear|remove|delete|move|copy|rename|install|configure|setup|initialize|prepare|work|continue|proceed|ensure|confirm)/i,
-    /^I\s+should\s+/i,
-    /^I\s+will\s+(?:first|now|start|verify|check|create|modify|look|need|also|add|help|use|run|search|find|explore|analyze|review|test|implement|write)/i,
-    /^(?:Debug|Checking|Verifying|Looking\s+at):/i,
-    /^I\s+also\s+(?:notice|need|see|want)/i,
-    /^The\s+(?:goal|issue|problem|idea|plan)\s+is/i,
-    /^In\s+the\s+(?:old|current|previous|new|existing)\s+/i,
-    /^`[^`]+`\s+(?:is|has|does|needs|should|will|doesn't|hasn't)/i
-  ];
-  REASONING_CONTINUATION_PATTERNS = [
-    /^And\s+(?:then|I|now|so)/i,
-    /^And\s+I(?:'ll|\s+will)/i,
-    /^But\s+(?:I|first|wait|actually|the|if)/i,
-    /^Actually[,.]?\s+/i,
-    /^Also[,.]?\s+(?:I|the|check|note)/i,
-    /^\d+\.\s+(?:I|First|Check|Run|Create|Update|Read|Modify|Add|Fix|Look)/i,
-    /^-\s+(?:I|First|Check|Run|Create|Update|Read|Modify|Add|Fix)/i,
-    /^Or\s+(?:I|just|we|maybe|perhaps)/i,
-    /^Since\s+(?:I|the|this|we|it)/i,
-    /^Because\s+(?:I|the|this|we|it)/i,
-    /^If\s+(?:I|the|this|we|it)\s+/i,
-    /^This\s+(?:is|means|requires|should|will|confirms|suggests)/i,
-    /^That\s+(?:means|is|should|will|explains|confirms)/i,
-    /^Lines?\s+\d+/i,
-    /^The\s+`[^`]+`\s+(?:is|has|contains|needs|should)/i
-  ];
   GeminiAPIFormat = class GeminiAPIFormat extends BaseAPIFormat {
     toolCallMap = new Map;
-    inReasoningBlock = false;
-    reasoningBlockDepth = 0;
     convertMessages(claudeRequest, _filterIdentityFn) {
       const messages = [];
       if (claudeRequest.messages) {
@@ -34163,58 +34132,12 @@ CRITICAL INSTRUCTION FOR OUTPUT FORMAT:
       }
     }
     processTextContent(textContent, _accumulatedText) {
-      if (!textContent || textContent.trim() === "") {
-        return { cleanedText: textContent, extractedToolCalls: [], wasTransformed: false };
-      }
-      const lines = textContent.split(`
-`);
-      const cleanedLines = [];
-      let wasFiltered = false;
-      for (const line of lines) {
-        const trimmed2 = line.trim();
-        if (!trimmed2) {
-          cleanedLines.push(line);
-          continue;
-        }
-        if (this.isReasoningLine(trimmed2)) {
-          log(`[GeminiAPIFormat] Filtered reasoning: "${trimmed2.substring(0, 50)}..."`);
-          wasFiltered = true;
-          this.inReasoningBlock = true;
-          this.reasoningBlockDepth++;
-          continue;
-        }
-        if (this.inReasoningBlock && this.isReasoningContinuation(trimmed2)) {
-          log(`[GeminiAPIFormat] Filtered reasoning continuation: "${trimmed2.substring(0, 50)}..."`);
-          wasFiltered = true;
-          continue;
-        }
-        if (this.inReasoningBlock && trimmed2.length > 20 && !this.isReasoningContinuation(trimmed2)) {
-          this.inReasoningBlock = false;
-          this.reasoningBlockDepth = 0;
-        }
-        cleanedLines.push(line);
-      }
-      const cleanedText = cleanedLines.join(`
-`);
-      return {
-        cleanedText: wasFiltered ? cleanedText : textContent,
-        extractedToolCalls: [],
-        wasTransformed: wasFiltered
-      };
-    }
-    isReasoningLine(line) {
-      return REASONING_PATTERNS.some((pattern) => pattern.test(line));
-    }
-    isReasoningContinuation(line) {
-      return REASONING_CONTINUATION_PATTERNS.some((pattern) => pattern.test(line));
+      return { cleanedText: textContent, extractedToolCalls: [], wasTransformed: false };
     }
     getStreamFormat() {
       return "gemini-sse";
     }
-    reset() {
-      this.inReasoningBlock = false;
-      this.reasoningBlockDepth = 0;
-    }
+    reset() {}
     getContextWindow() {
       return 1048576;
     }
@@ -39917,6 +39840,7 @@ data: ${JSON.stringify(data)}
       const toolCalls = new Map;
       let accumulatedText = "";
       let lastActivity = Date.now();
+      let truncated = false;
       send("message_start", {
         type: "message_start",
         message: {
@@ -39968,9 +39892,13 @@ data: ${JSON.stringify(data)}
           send("error", { type: "error", error: { type: "api_error", message: err } });
         } else {
           const hasToolCalls = toolCalls.size > 0;
+          const stopReason = truncated ? "max_tokens" : hasToolCalls ? "tool_use" : "end_turn";
+          if (truncated) {
+            log("[GeminiSSE] finishReason=MAX_TOKENS \u2192 stop_reason=max_tokens");
+          }
           send("message_delta", {
             type: "message_delta",
-            delta: { stop_reason: hasToolCalls ? "tool_use" : "end_turn", stop_sequence: null },
+            delta: { stop_reason: stopReason, stop_sequence: null },
             usage: {
               ...inputTokens > 0 ? { input_tokens: inputTokens } : {},
               output_tokens: outputTokens
@@ -40019,8 +39947,9 @@ data: ${JSON.stringify(data)}
               if (candidate?.content?.parts) {
                 for (const part of candidate.content.parts) {
                   lastActivity = Date.now();
-                  if (part.thought || part.thoughtText) {
-                    const thinkingContent = part.thought || part.thoughtText;
+                  const isThoughtPart = part.thought === true;
+                  const thinkingContent = isThoughtPart ? part.text ?? "" : part.thoughtText;
+                  if (thinkingContent) {
                     if (!thinkingStarted) {
                       thinkingIdx = curIdx++;
                       send("content_block_start", {
@@ -40036,7 +39965,7 @@ data: ${JSON.stringify(data)}
                       delta: { type: "thinking_delta", thinking: thinkingContent }
                     });
                   }
-                  if (part.text) {
+                  if (part.text && !isThoughtPart) {
                     if (thinkingStarted) {
                       send("content_block_stop", {
                         type: "content_block_stop",
@@ -40048,6 +39977,10 @@ data: ${JSON.stringify(data)}
                     if (opts.adapter) {
                       const res = opts.adapter.processTextContent(part.text, accumulatedText);
                       cleanedText = res.cleanedText || "";
+                      if (!cleanedText) {
+                        log(`[gemini-sse] adapter emptied ${part.text.length} chars of visible text \u2014 passing the original through`);
+                        cleanedText = part.text;
+                      }
                       accumulatedText += cleanedText;
                     } else {
                       accumulatedText += cleanedText;
@@ -40125,6 +40058,7 @@ data: ${JSON.stringify(data)}
               }
               if (candidate?.finishReason) {
                 if (candidate.finishReason === "STOP" || candidate.finishReason === "MAX_TOKENS") {
+                  truncated = candidate.finishReason === "MAX_TOKENS";
                   await finalize("done");
                   return;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudish",
-  "version": "7.41.0",
+  "version": "7.42.0",
   "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.41.0",
-    "@claudish/magmux-darwin-x64": "7.41.0",
-    "@claudish/magmux-linux-arm64": "7.41.0",
-    "@claudish/magmux-linux-x64": "7.41.0"
+    "@claudish/magmux-darwin-arm64": "7.42.0",
+    "@claudish/magmux-darwin-x64": "7.42.0",
+    "@claudish/magmux-linux-arm64": "7.42.0",
+    "@claudish/magmux-linux-x64": "7.42.0"
   },
   "author": "Jack Rudenko <i@madappgang.com>",
   "license": "MIT",