claudish 9.3.0 → 9.3.2

package/dist/index.js

@@ -715,7 +715,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "9.3.0";
+var VERSION = "9.3.2";
 
 // src/logger.ts
 import { appendFile, existsSync as existsSync2, mkdirSync, readdirSync, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
@@ -34445,7 +34445,7 @@ class ComposedHandler {
       requestPayload = this.provider.transformPayload(requestPayload, claudeRequest);
     }
     const endpoint = this.provider.getEndpoint(this.targetModel);
-    const headers = await this.provider.getHeaders();
+    const headers = await this.provider.getHeaders(payload);
     const serialized = this.provider.serializeBody?.(requestPayload);
     headers["Content-Type"] = serialized?.contentType ?? "application/json";
     log(`[${this.provider.displayName}] Calling API: ${endpoint}`);
@@ -34515,7 +34515,7 @@ class ComposedHandler {
           log(`[${this.provider.displayName}] Parameter rejected \u2014 retrying: ${recovery.note}`);
           requestPayload = recovery.payload;
           const retrySerialized = this.provider.serializeBody?.(requestPayload);
-          const retryHeaders = await this.provider.getHeaders();
+          const retryHeaders = await this.provider.getHeaders(payload);
           retryHeaders["Content-Type"] = retrySerialized?.contentType ?? "application/json";
           const retryResp = await fetch(endpoint, {
             method: "POST",
@@ -34536,7 +34536,7 @@ class ComposedHandler {
         log(`[${this.provider.displayName}] Got 401, forcing auth refresh and retrying`);
         try {
           await this.provider.forceRefreshAuth();
-          const retryHeaders = await this.provider.getHeaders();
+          const retryHeaders = await this.provider.getHeaders(payload);
           retryHeaders["Content-Type"] = serialized?.contentType ?? "application/json";
           const retryInit = this.provider.getRequestInit?.() || {};
           const retryResp = await fetch(endpoint, {
@@ -35695,21 +35695,31 @@ var init_ollamacloud = __esm(() => {
   init_probe_discovery();
 });
 
-// src/providers/transport/openai-codex.ts
+// src/providers/transport/conversation-key.ts
 import { createHash as createHash5, randomBytes as randomBytes6 } from "crypto";
-var FALLBACK_CONVERSATION_KEY, OpenAICodexTransport;
+function conversationKey(claudeRequest) {
+  const sessionId = extractSessionId(claudeRequest);
+  if (!sessionId)
+    return `claudish_${FALLBACK_CONVERSATION_KEY}`;
+  return `claudish_${createHash5("sha256").update(sessionId).digest("hex").slice(0, 32)}`;
+}
+var FALLBACK_CONVERSATION_KEY;
+var init_conversation_key = __esm(() => {
+  init_harness();
+  FALLBACK_CONVERSATION_KEY = randomBytes6(16).toString("hex");
+});
+
+// src/providers/transport/openai-codex.ts
+var OpenAICodexTransport;
 var init_openai_codex = __esm(() => {
   init_codex_api_format();
   init_model_catalog();
   init_authority();
   init_billing_probe();
-  init_harness();
+  init_conversation_key();
   init_openai();
-  FALLBACK_CONVERSATION_KEY = randomBytes6(16).toString("hex");
   OpenAICodexTransport = class OpenAICodexTransport extends OpenAIProviderTransport {
     cachedAuth = null;
-    cachedCacheKeyFor;
-    cachedCacheKey = "";
     async refreshAuth() {
       try {
         this.cachedAuth = await credentials.getRequestAuth("openai-codex", { model: "" });
@@ -35744,14 +35754,7 @@ var init_openai_codex = __esm(() => {
       return this.cachedAuth?.transformPayload?.(normalizedPayload) ?? normalizedPayload;
     }
     resolvePromptCacheKey(claudeRequest) {
-      const sessionId = extractSessionId(claudeRequest);
-      if (!sessionId)
-        return `claudish_${FALLBACK_CONVERSATION_KEY}`;
-      if (this.cachedCacheKeyFor !== sessionId) {
-        this.cachedCacheKeyFor = sessionId;
-        this.cachedCacheKey = `claudish_${createHash5("sha256").update(sessionId).digest("hex").slice(0, 32)}`;
-      }
-      return this.cachedCacheKey;
+      return conversationKey(claudeRequest);
     }
     getContextWindow() {
       return lookupModelForProvider(this.modelName, this.name) ?? 0;
@@ -35759,6 +35762,21 @@ var init_openai_codex = __esm(() => {
   };
 });
 
+// src/providers/transport/opencode-zen.ts
+var OpenCodeZenTransport;
+var init_opencode_zen = __esm(() => {
+  init_conversation_key();
+  init_openai();
+  OpenCodeZenTransport = class OpenCodeZenTransport extends OpenAIProviderTransport {
+    async getHeaders(claudeRequest) {
+      return {
+        ...await super.getHeaders(),
+        "x-opencode-session": conversationKey(claudeRequest)
+      };
+    }
+  };
+});
+
 // src/providers/transport/vertex-oauth.ts
 function parseVertexModel(modelId) {
   const parts = modelId.split("/");
@@ -35899,6 +35917,7 @@ var init_provider_profiles = __esm(() => {
   init_ollamacloud();
   init_openai_codex();
   init_openai();
+  init_opencode_zen();
   init_vertex_oauth();
   geminiProfile = {
     createHandler(ctx) {
@@ -36020,7 +36039,7 @@ var init_provider_profiles = __esm(() => {
       const isGoProvider = ctx.provider.name === "opencode-zen-go";
       if (ctx.modelName.toLowerCase().startsWith("gpt-")) {
         const responsesProvider = { ...ctx.provider, apiPath: "/v1/responses" };
-        const transport = new OpenAIProviderTransport(responsesProvider, ctx.modelName, zenApiKey);
+        const transport = new OpenCodeZenTransport(responsesProvider, ctx.modelName, zenApiKey);
         const adapter = new CodexAPIFormat(ctx.modelName);
         const handler = new ComposedHandler(transport, ctx.targetModel, ctx.modelName, ctx.port, {
           adapter,
@@ -36030,7 +36049,7 @@ var init_provider_profiles = __esm(() => {
         log(`[Proxy] Created OpenCode Zen${isGoProvider ? " Go" : ""} (Responses API composed): ${ctx.modelName}`);
         return handler;
       }
-      const transport = new OpenAIProviderTransport(ctx.provider, ctx.modelName, zenApiKey);
+      const transport = new OpenCodeZenTransport(ctx.provider, ctx.modelName, zenApiKey);
       const adapter = new OpenAIAPIFormat(ctx.modelName);
       const handler = new ComposedHandler(transport, ctx.targetModel, ctx.modelName, ctx.port, {
         adapter,
@@ -40394,6 +40413,8 @@ function teamSlotIdleSeconds(teamSessionId) {
     return null;
   const out = {};
   for (const slotId of run.processes.keys()) {
+    if (!run.isRunning(slotId))
+      continue;
     const idle = run.idleMsFor(slotId);
     if (idle !== null)
       out[slotId] = Math.round(idle / 1000);
@@ -40406,6 +40427,8 @@ function teamSlotActivity(teamSessionId) {
     return null;
   const out = {};
   for (const slotId of run.processes.keys()) {
+    if (!run.isRunning(slotId))
+      continue;
     const activity = run.activityFor(slotId);
     if (activity !== null)
       out[slotId] = activity;
@@ -40418,6 +40441,8 @@ function teamSlotLiveBytes(teamSessionId) {
     return null;
   const out = {};
   for (const slotId of run.processes.keys()) {
+    if (!run.isRunning(slotId))
+      continue;
     const bytes = run.liveBytesFor(slotId);
     if (bytes !== null)
       out[slotId] = bytes;
@@ -40730,7 +40755,6 @@ async function startModels(sessionPath, opts = {}) {
           return;
         captureFinalized = true;
         absorb(slotReducer.end());
-        slotReducer.dispose();
         outputStream.end();
       };
       proc.stdout?.on("end", finalizeCapture);
@@ -40762,12 +40786,21 @@ async function startModels(sessionPath, opts = {}) {
     const completionPromise = new Promise((resolve) => {
       let exitCode = null;
       let resolved = false;
+      const settleReducer = () => {
+        if (!reducer)
+          return;
+        const state = statusCache.models[anonId]?.state;
+        const failed = state === "FAILED" || state === "EMPTY";
+        reducer.settle(failed && cancelledSlots.has(anonId) ? "cancelled" : state === "COMPLETED" ? "completed" : state === "TIMEOUT" ? "timeout" : "failed");
+        reducer.dispose();
+      };
       const finish = () => {
         if (resolved)
           return;
         if (statusCache.models[anonId].state === "TIMEOUT") {
           resolved = true;
           reconcileTimedOutOutput(anonId, byteCount, stdoutTail, stderr);
+          settleReducer();
           resolve();
           return;
         }
@@ -40822,6 +40855,7 @@ async function startModels(sessionPath, opts = {}) {
             error: undefined
           });
         }
+        settleReducer();
         opts.onStatusChange?.(anonId, statusCache.models[anonId]);
         resolve();
       };
@@ -40877,6 +40911,7 @@ async function startModels(sessionPath, opts = {}) {
     idleMsFor: (slotId) => runtimes.get(slotId)?.getIdleMs() ?? null,
     activityFor: (slotId) => runtimes.get(slotId)?.getActivity() ?? null,
     liveBytesFor: (slotId) => runtimes.get(slotId)?.getByteCount() ?? null,
+    isRunning: (slotId) => statusCache.models[slotId]?.state === "RUNNING",
     cancelledSlots
   });
   const done = (async () => {

package/package.json

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