claudish 7.54.0 → 7.55.0

package/dist/index.js

@@ -729,7 +729,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "7.54.0";
+var VERSION = "7.55.0";
 
 // src/logger.ts
 var exports_logger = {};
@@ -35268,39 +35268,17 @@ var init_xiaomi_model_dialect = __esm(() => {
 // src/adapters/dialect-manager.ts
 var exports_dialect_manager = {};
 __export(exports_dialect_manager, {
-  DialectManager: () => DialectManager,
-  AdapterManager: () => DialectManager
+  resolveModelDialect: () => resolveModelDialect
 });
-
-class DialectManager {
-  adapters;
-  defaultAdapter;
-  constructor(modelId, wireFormat) {
-    this.adapters = [
-      new GrokModelDialect(modelId, wireFormat),
-      new GeminiAPIFormat(modelId, wireFormat),
-      new CodexAPIFormat(modelId, wireFormat),
-      new OpenAIAPIFormat(modelId, wireFormat),
-      new QwenModelDialect(modelId, wireFormat),
-      new MiniMaxModelDialect(modelId, wireFormat),
-      new DeepSeekModelDialect(modelId, wireFormat),
-      new GLMModelDialect(modelId, wireFormat),
-      new XiaomiModelDialect(modelId, wireFormat)
-    ];
-    this.defaultAdapter = new DefaultAPIFormat(modelId, wireFormat);
-  }
-  getAdapter() {
-    for (const adapter of this.adapters) {
-      if (adapter.shouldHandle(this.defaultAdapter.getModelId())) {
-        return adapter;
-      }
-    }
-    return this.defaultAdapter;
-  }
-  needsTransformation() {
-    return this.getAdapter() !== this.defaultAdapter;
+function resolveModelDialect(modelId, wireFormat) {
+  for (const make of DIALECT_FACTORIES) {
+    const dialect = make(modelId, wireFormat);
+    if (dialect.shouldHandle(modelId))
+      return dialect;
   }
+  return new DefaultAPIFormat(modelId, wireFormat);
 }
+var DIALECT_FACTORIES;
 var init_dialect_manager = __esm(() => {
   init_base_api_format();
   init_codex_api_format();
@@ -35312,6 +35290,17 @@ var init_dialect_manager = __esm(() => {
   init_openai_api_format();
   init_qwen_model_dialect();
   init_xiaomi_model_dialect();
+  DIALECT_FACTORIES = [
+    (m, w) => new GrokModelDialect(m, w),
+    (m, w) => new GeminiAPIFormat(m, w),
+    (m, w) => new CodexAPIFormat(m, w),
+    (m, w) => new OpenAIAPIFormat(m, w),
+    (m, w) => new QwenModelDialect(m, w),
+    (m, w) => new MiniMaxModelDialect(m, w),
+    (m, w) => new DeepSeekModelDialect(m, w),
+    (m, w) => new GLMModelDialect(m, w),
+    (m, w) => new XiaomiModelDialect(m, w)
+  ];
 });
 
 // src/auth/quota/types.ts
@@ -37534,6 +37523,9 @@ class OpenAIProviderTransport {
     }
     return `${this.provider.baseUrl}${this.provider.apiPath}`;
   }
+  overrideStreamFormat() {
+    return this.provider.streamFormatOverride;
+  }
   async getHeaders() {
     const headers = {};
     if (this.apiKey) {
@@ -39867,6 +39859,44 @@ data: {"type":"ping"}
         let insideThinkingBlock = false;
         let thinkingBlocksSuppressed = 0;
         let suppressedFrame = false;
+        let highestSeenIndex = -1;
+        const remappedBlocks = new Map;
+        const trackIndex = (idx) => {
+          if (idx > highestSeenIndex)
+            highestSeenIndex = idx;
+        };
+        const emitIndexed = (controller2, data, line) => {
+          if (typeof data.index !== "number") {
+            enqueueData(controller2, data, line);
+            return;
+          }
+          if (data.type === "content_block_start") {
+            const expected = highestSeenIndex + 1;
+            if (data.index !== expected) {
+              log(`[AnthropicSSE] content_block_start index ${data.index} remapped to ${expected} (model=${opts.modelName})`);
+              remappedBlocks.set(data.index, expected);
+              const remapped2 = { ...data, index: expected };
+              enqueueData(controller2, remapped2, `data: ${JSON.stringify(remapped2)}`);
+            } else {
+              enqueueData(controller2, data, line);
+            }
+            trackIndex(expected);
+            return;
+          }
+          const remapped = remappedBlocks.get(data.index);
+          if (data.type === "content_block_stop")
+            remappedBlocks.delete(data.index);
+          if (remapped !== undefined) {
+            const modified = { ...data, index: remapped };
+            enqueueData(controller2, modified, `data: ${JSON.stringify(modified)}`);
+          } else if (data.index > highestSeenIndex) {
+            log(`[AnthropicSSE] Dropping orphan ${data.type} at index ${data.index} (no open block \u2014 model=${opts.modelName})`);
+            pendingEventLine = null;
+            suppressedFrame = true;
+          } else {
+            enqueueData(controller2, data, line);
+          }
+        };
         while (true) {
           const { done, value } = await reader.read();
           if (done)
@@ -39921,18 +39951,7 @@ data: ${JSON.stringify({
                   suppressedFrame = true;
                   continue;
                 }
-                if (typeof data.index === "number" && thinkingBlocksSuppressed > 0) {
-                  const reindexed = data.index - thinkingBlocksSuppressed;
-                  const modifiedLine = `data: ${JSON.stringify({ ...data, index: reindexed })}`;
-                  if (!isClosed) {
-                    flushPendingEvent(controller);
-                    controller.enqueue(encoder.encode(`${modifiedLine}
-`));
-                    noteLifecycle(data, reindexed);
-                  }
-                } else {
-                  enqueueData(controller, data, line);
-                }
+                emitIndexed(controller, data, line);
               } catch {
                 if (!isClosed) {
                   flushPendingEvent(controller);
@@ -39964,47 +39983,44 @@ data: ${JSON.stringify({
                     }
                     return;
                   }
-                  enqueueData(controller, data, line);
-                  if (data.message?.usage) {
-                    inputTokens = data.message.usage.input_tokens || inputTokens;
-                    outputTokens = data.message.usage.output_tokens || outputTokens;
-                  }
-                  if (data.usage) {
-                    inputTokens = data.usage.input_tokens || inputTokens;
-                    outputTokens = data.usage.output_tokens || outputTokens;
-                  }
-                  if (data.type === "content_block_delta" && data.delta?.type === "text_delta") {
-                    const txt = data.delta.text || "";
-                    opts.onAssistantText?.(txt, "text");
-                    textChunks++;
-                    log(`[AnthropicSSE] Text chunk: "${txt.substring(0, 30).replace(/\n/g, "\\n")}" (${txt.length} chars)`);
-                  }
-                  if (data.type === "content_block_start" && data.content_block?.type === "tool_use") {
-                    toolUseBlocks++;
-                    opts.onToolCallObserved?.(data.content_block.name);
-                    log(`[AnthropicSSE] Tool use: ${data.content_block.name}`);
-                  }
-                  if (data.type === "message_delta" && data.delta?.stop_reason) {
-                    stopReason = data.delta.stop_reason;
-                  }
+                  emitIndexed(controller, data, line);
+                  try {
+                    if (data.message?.usage) {
+                      inputTokens = data.message.usage.input_tokens || inputTokens;
+                      outputTokens = data.message.usage.output_tokens || outputTokens;
+                    }
+                    if (data.usage) {
+                      inputTokens = data.usage.input_tokens || inputTokens;
+                      outputTokens = data.usage.output_tokens || outputTokens;
+                    }
+                    if (data.type === "content_block_delta" && data.delta?.type === "text_delta") {
+                      const txt = data.delta.text || "";
+                      opts.onAssistantText?.(txt, "text");
+                      textChunks++;
+                      log(`[AnthropicSSE] Text chunk: "${txt.substring(0, 30).replace(/\n/g, "\\n")}" (${txt.length} chars)`);
+                    }
+                    if (data.type === "content_block_start" && data.content_block?.type === "tool_use") {
+                      toolUseBlocks++;
+                      opts.onToolCallObserved?.(data.content_block.name);
+                      log(`[AnthropicSSE] Tool use: ${data.content_block.name}`);
+                    }
+                    if (data.type === "message_delta" && data.delta?.stop_reason) {
+                      stopReason = data.delta.stop_reason;
+                    }
+                  } catch {}
                 } catch {
                   if (!isClosed) {
                     controller.enqueue(encoder.encode(`${line}
 `));
                   }
                 }
-              } else if (filterThinking) {
+              } else {
                 if (line.startsWith("event:")) {
                   pendingEventLine = line;
                 } else if (line.trim() === "" && suppressedFrame) {
                   suppressedFrame = false;
                 } else if (!isClosed) {
                   controller.enqueue(encoder.encode(`${line}
-`));
-                }
-              } else {
-                if (!isClosed) {
-                  controller.enqueue(encoder.encode(`${line}
 `));
                 }
               }
@@ -41484,7 +41500,7 @@ function extractAuthHeaders(c) {
 
 class ComposedHandler {
   provider;
-  adapterManager;
+  resolvedDialect;
   explicitAdapter;
   modelAdapter;
   middlewareManager;
@@ -41506,8 +41522,8 @@ class ComposedHandler {
     this.options = options;
     this.explicitAdapter = options.adapter;
     this.isInteractive = options.isInteractive ?? false;
-    this.adapterManager = new DialectManager(this.bareModelName, this.explicitAdapter?.getStreamFormat());
-    const resolvedModelAdapter = this.adapterManager.getAdapter();
+    this.resolvedDialect = resolveModelDialect(this.bareModelName, this.explicitAdapter?.getStreamFormat());
+    const resolvedModelAdapter = this.resolvedDialect;
     if (resolvedModelAdapter.getName() !== "DefaultAPIFormat") {
       this.modelAdapter = resolvedModelAdapter;
     }
@@ -41525,7 +41541,7 @@ class ComposedHandler {
     });
   }
   getAdapter() {
-    return this.explicitAdapter || this.adapterManager.getAdapter();
+    return this.explicitAdapter || this.resolvedDialect;
   }
   getModelContextWindow() {
     return this.modelAdapter?.getContextWindow() ?? this.getAdapter().getContextWindow();
@@ -43484,6 +43500,9 @@ class AnthropicProviderTransport {
   getEndpoint() {
     return `${this.provider.baseUrl}${this.provider.apiPath}`;
   }
+  overrideStreamFormat() {
+    return this.provider.streamFormatOverride;
+  }
   async getHeaders() {
     const headers = {
       "anthropic-version": "2023-06-01"
@@ -43830,7 +43849,8 @@ function buildComplexHandler(ep, ctx, apiKey, baseUrl) {
         apiKeyEnvVar: ctx.provider.apiKeyEnvVar,
         prefixes: ctx.provider.prefixes ?? [],
         headers: ep.headers,
-        authScheme: ep.authScheme ?? "bearer"
+        authScheme: ep.authScheme ?? "bearer",
+        streamFormatOverride: ep.streamFormat
       };
       const transport = new OpenAIProviderTransport(remoteProvider, finalModel, apiKey);
       const adapter = new OpenAIAPIFormat(finalModel);
@@ -43848,7 +43868,8 @@ function buildComplexHandler(ep, ctx, apiKey, baseUrl) {
         apiKeyEnvVar: ctx.provider.apiKeyEnvVar,
         prefixes: ctx.provider.prefixes ?? [],
         headers: ep.headers,
-        authScheme: ep.authScheme ?? "x-api-key"
+        authScheme: ep.authScheme ?? "x-api-key",
+        streamFormatOverride: ep.streamFormat
       };
       const transport = new AnthropicProviderTransport(remoteProvider, apiKey);
       const adapter = new AnthropicAPIFormat(finalModel, ctx.provider.name);
@@ -48066,8 +48087,7 @@ var init_local_adapter = __esm(() => {
     constructor(modelId, providerName) {
       super(modelId);
       this.providerName = providerName;
-      const manager = new DialectManager(modelId);
-      this.innerAdapter = manager.getAdapter();
+      this.innerAdapter = resolveModelDialect(modelId);
     }
     processTextContent(textContent, accumulatedText) {
       return this.innerAdapter.processTextContent(textContent, accumulatedText);
@@ -48235,8 +48255,7 @@ var init_openrouter_api_format = __esm(() => {
     innerAdapter;
     constructor(modelId) {
       super(modelId);
-      const manager = new DialectManager(modelId);
-      this.innerAdapter = manager.getAdapter();
+      this.innerAdapter = resolveModelDialect(modelId);
     }
     modelSupportsReasoning() {
       const id = this.modelId.toLowerCase();
@@ -72075,9 +72094,8 @@ async function probeModelRouting(models, jsonOutput, options = { live: true, tim
       formatAdapterName = "OpenAIAPIFormat";
       declaredStreamFormat = "openai-sse";
     }
-    const { DialectManager: DialectManager2 } = await Promise.resolve().then(() => (init_dialect_manager(), exports_dialect_manager));
-    const adapterManager = new DialectManager2(modelName);
-    const modelTranslator = adapterManager.getAdapter();
+    const { resolveModelDialect: resolveModelDialect2 } = await Promise.resolve().then(() => (init_dialect_manager(), exports_dialect_manager));
+    const modelTranslator = resolveModelDialect2(modelName);
     const modelTranslatorName = modelTranslator.getName();
     const TRANSPORT_OVERRIDES = {
       litellm: "openai-sse",

package/package.json

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