claudish 6.13.0 → 6.13.2

package/dist/index.js

@@ -17621,11 +17621,7 @@ var init_remote_provider_types = __esm(() => {
 // src/adapters/model-catalog.ts
 function lookupModel(modelId) {
   const lower = modelId.toLowerCase();
-  let unprefixed = lower;
-  if (lower.includes("@"))
-    unprefixed = lower.substring(lower.indexOf("@") + 1);
-  else if (lower.includes("/"))
-    unprefixed = lower.substring(lower.lastIndexOf("/") + 1);
+  const unprefixed = lower.includes("/") ? lower.substring(lower.lastIndexOf("/") + 1) : lower;
   for (const entry of MODEL_CATALOG) {
     if (unprefixed.includes(entry.pattern) || lower.includes(entry.pattern)) {
       return entry;
@@ -17975,7 +17971,7 @@ var init_openai_tools = __esm(() => {
 function matchesModelFamily(modelId, family) {
   const lower = modelId.toLowerCase();
   const fam = family.toLowerCase();
-  return lower.startsWith(fam) || lower.includes(`/${fam}`) || lower.includes(`@${fam}`);
+  return lower.startsWith(fam) || lower.includes(`/${fam}`);
 }
 
 class BaseAPIFormat {
@@ -22367,7 +22363,7 @@ var init_profile_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "6.13.0";
+var VERSION = "6.13.2";
 
 // src/telemetry.ts
 var exports_telemetry = {};
@@ -24115,29 +24111,34 @@ class ComposedHandler {
   middlewareManager;
   tokenTracker;
   targetModel;
+  bareModelName;
   options;
   isInteractive;
   pendingFallbackMeta;
   constructor(provider, targetModel, modelName, port, options = {}) {
+    if (modelName.includes("@")) {
+      throw new Error(`ComposedHandler: modelName must not contain '@' (got "${modelName}"). ` + `Strip the provider routing prefix before passing modelName. ` + `If you need the full routed form, pass it as targetModel.`);
+    }
     this.provider = provider;
     this.targetModel = targetModel;
+    this.bareModelName = modelName;
     this.options = options;
     this.explicitAdapter = options.adapter;
     this.isInteractive = options.isInteractive ?? false;
-    this.adapterManager = new DialectManager(targetModel);
+    this.adapterManager = new DialectManager(this.bareModelName);
     const resolvedModelAdapter = this.adapterManager.getAdapter();
     if (resolvedModelAdapter.getName() !== "DefaultAPIFormat") {
       this.modelAdapter = resolvedModelAdapter;
     }
     this.middlewareManager = new MiddlewareManager;
-    if (targetModel.includes("gemini") || targetModel.includes("google/")) {
+    if (this.bareModelName.includes("gemini") || this.bareModelName.includes("google/")) {
       this.middlewareManager.register(new GeminiThoughtSignatureMiddleware);
     }
-    this.middlewareManager.initialize().catch((err) => log(`[ComposedHandler:${targetModel}] Middleware init error: ${err}`));
+    this.middlewareManager.initialize().catch((err) => log(`[ComposedHandler:${this.bareModelName}] Middleware init error: ${err}`));
     this.tokenTracker = new TokenTracker(port, {
       contextWindow: this.getModelContextWindow(),
       providerName: provider.name,
-      modelName,
+      modelName: this.bareModelName,
       providerDisplayName: provider.displayName
     });
   }
@@ -24166,9 +24167,9 @@ class ComposedHandler {
       adapter.reset();
     const messages = adapter.convertMessages(claudeRequest, filterIdentity);
     let tools = adapter.convertTools(claudeRequest, this.options.summarizeTools);
-    const maxToolCount = lookupModel(this.targetModel)?.maxToolCount;
+    const maxToolCount = lookupModel(this.bareModelName)?.maxToolCount;
     if (maxToolCount && tools.length > maxToolCount) {
-      log(`[ComposedHandler] Truncating tools from ${tools.length} to ${maxToolCount} (model limit for ${this.targetModel})`);
+      log(`[ComposedHandler] Truncating tools from ${tools.length} to ${maxToolCount} (model limit for ${this.bareModelName})`);
       tools = tools.slice(0, maxToolCount);
     }
     if (!this.getModelSupportsVision()) {
@@ -24293,7 +24294,7 @@ class ComposedHandler {
       requestPayload = this.provider.transformPayload(requestPayload);
     }
     await this.middlewareManager.beforeRequest({
-      modelId: this.targetModel,
+      modelId: this.bareModelName,
       messages,
       tools,
       stream: true
@@ -24341,7 +24342,7 @@ class ComposedHandler {
             error_code,
             token_strategy: this.options.tokenStrategy ?? "standard",
             adapter_name: this.getActiveAdapterName(),
-            middleware_names: this.middlewareManager.getActiveNames(this.targetModel),
+            middleware_names: this.middlewareManager.getActiveNames(this.bareModelName),
             fallback_used: fallbackMeta !== undefined,
             fallback_chain: fallbackMeta?.chain,
             fallback_attempts: fallbackMeta?.attempts,
@@ -24403,7 +24404,7 @@ class ComposedHandler {
                 error_code,
                 token_strategy: this.options.tokenStrategy ?? "standard",
                 adapter_name: this.getActiveAdapterName(),
-                middleware_names: this.middlewareManager.getActiveNames(this.targetModel),
+                middleware_names: this.middlewareManager.getActiveNames(this.bareModelName),
                 fallback_used: fallbackMeta !== undefined,
                 fallback_chain: fallbackMeta?.chain,
                 fallback_attempts: fallbackMeta?.attempts,
@@ -24440,7 +24441,7 @@ class ComposedHandler {
               error_code,
               token_strategy: this.options.tokenStrategy ?? "standard",
               adapter_name: this.getActiveAdapterName(),
-              middleware_names: this.middlewareManager.getActiveNames(this.targetModel),
+              middleware_names: this.middlewareManager.getActiveNames(this.bareModelName),
               fallback_used: fallbackMeta !== undefined,
               fallback_chain: fallbackMeta?.chain,
               fallback_attempts: fallbackMeta?.attempts,
@@ -24487,7 +24488,7 @@ class ComposedHandler {
             error_code,
             token_strategy: this.options.tokenStrategy ?? "standard",
             adapter_name: this.getActiveAdapterName(),
-            middleware_names: this.middlewareManager.getActiveNames(this.targetModel),
+            middleware_names: this.middlewareManager.getActiveNames(this.bareModelName),
             fallback_used: fallbackMeta !== undefined,
             fallback_chain: fallbackMeta?.chain,
             fallback_attempts: fallbackMeta?.attempts,
@@ -24524,7 +24525,7 @@ class ComposedHandler {
           is_free_model: isFreeModel,
           token_strategy: this.options.tokenStrategy ?? "standard",
           adapter_name: this.getActiveAdapterName(),
-          middleware_names: this.middlewareManager.getActiveNames(this.targetModel),
+          middleware_names: this.middlewareManager.getActiveNames(this.bareModelName),
           fallback_used: fallbackMeta !== undefined,
           fallback_chain: fallbackMeta?.chain,
           fallback_attempts: fallbackMeta?.attempts,
@@ -24559,19 +24560,19 @@ class ComposedHandler {
         onComplete = undefined;
       }
     };
-    const streamFormat = this.provider.overrideStreamFormat?.() ?? this.modelAdapter?.getStreamFormat() ?? this.getAdapter().getStreamFormat();
+    const streamFormat = this.provider.overrideStreamFormat?.() ?? (this.explicitAdapter?.getStreamFormat() ?? this.modelAdapter?.getStreamFormat()) ?? this.getAdapter().getStreamFormat();
     switch (streamFormat) {
       case "openai-sse":
-        return createStreamingResponseHandler(c, response, adapter, this.targetModel, this.middlewareManager, onTokenUpdate, claudeRequest.tools, toolNameMap);
+        return createStreamingResponseHandler(c, response, adapter, this.bareModelName, this.middlewareManager, onTokenUpdate, claudeRequest.tools, toolNameMap);
       case "openai-responses-sse":
         return createResponsesStreamHandler(c, response, {
-          modelName: this.targetModel,
+          modelName: this.bareModelName,
           onTokenUpdate,
           toolNameMap: adapter.getToolNameMap()
         });
       case "anthropic-sse":
         return createAnthropicPassthroughStream(c, response, {
-          modelName: this.targetModel,
+          modelName: this.bareModelName,
           onTokenUpdate
         });
       case "gemini-sse": {
@@ -24581,7 +24582,7 @@ class ComposedHandler {
           }
         };
         return createGeminiSseStream(c, response, {
-          modelName: this.targetModel,
+          modelName: this.bareModelName,
           adapter,
           middlewareManager: this.middlewareManager,
           onTokenUpdate,
@@ -24591,7 +24592,7 @@ class ComposedHandler {
       }
       case "ollama-jsonl":
         return createOllamaJsonlStream(c, response, {
-          modelName: this.targetModel,
+          modelName: this.bareModelName,
           onTokenUpdate
         });
       default:
@@ -24606,8 +24607,7 @@ class ComposedHandler {
       const fn = this.provider.getQuotaRemaining;
       if (typeof fn !== "function")
         return;
-      const bareModel = this.targetModel.includes("@") ? this.targetModel.split("@")[1] : this.targetModel;
-      const remaining = await fn.call(this.provider, bareModel);
+      const remaining = await fn.call(this.provider, this.bareModelName);
       if (typeof remaining === "number") {
         this.tokenTracker.setQuotaRemaining(remaining);
         this.tokenTracker.rewrite();
@@ -24961,11 +24961,49 @@ var init_static_fallback = __esm(() => {
   };
 });
 
-// src/providers/catalog-resolvers/openrouter.ts
+// src/providers/all-models-cache.ts
 import { readFileSync as readFileSync6, existsSync as existsSync8, writeFileSync as writeFileSync8, mkdirSync as mkdirSync8 } from "fs";
-import { join as join10 } from "path";
+import { join as join10, dirname as dirname2 } from "path";
 import { homedir as homedir9 } from "os";
+function readAllModelsCache(path = ALL_MODELS_CACHE_PATH) {
+  if (!existsSync8(path))
+    return null;
+  let raw2;
+  try {
+    raw2 = JSON.parse(readFileSync6(path, "utf-8"));
+  } catch {
+    return null;
+  }
+  if (!raw2 || typeof raw2 !== "object")
+    return null;
+  const data = raw2;
+  const lastUpdated = typeof data.lastUpdated === "string" ? data.lastUpdated : new Date(0).toISOString();
+  const models = Array.isArray(data.models) ? data.models : [];
+  const entries = Array.isArray(data.entries) ? data.entries : [];
+  return {
+    version: 2,
+    lastUpdated,
+    entries,
+    models
+  };
+}
+function writeAllModelsCache(data, path = ALL_MODELS_CACHE_PATH) {
+  const existing = readAllModelsCache(path);
+  const merged = {
+    version: 2,
+    lastUpdated: data.lastUpdated ?? new Date().toISOString(),
+    entries: data.entries ?? existing?.entries ?? [],
+    models: data.models ?? existing?.models ?? []
+  };
+  mkdirSync8(dirname2(path), { recursive: true });
+  writeFileSync8(path, JSON.stringify(merged), "utf-8");
+}
+var ALL_MODELS_CACHE_PATH;
+var init_all_models_cache = __esm(() => {
+  ALL_MODELS_CACHE_PATH = join10(homedir9(), ".claudish", "all-models.json");
+});
 
+// src/providers/catalog-resolvers/openrouter.ts
 class OpenRouterCatalogResolver {
   provider = "openrouter";
   resolveSync(userInput) {
@@ -25051,22 +25089,20 @@ class OpenRouterCatalogResolver {
   _getEntries() {
     if (_memCache)
       return _memCache;
-    if (existsSync8(DISK_CACHE_PATH)) {
-      try {
-        const data = JSON.parse(readFileSync6(DISK_CACHE_PATH, "utf-8"));
-        if (data.version === 2 && Array.isArray(data.entries) && data.entries.length > 0) {
-          _memCache = data.entries;
-          return _memCache;
-        }
-        if (Array.isArray(data.models) && data.models.length > 0) {
-          _memCache = data.models.map((m) => ({
-            modelId: m.id.includes("/") ? m.id.split("/").slice(1).join("/") : m.id,
-            aliases: [],
-            sources: { "openrouter-api": { externalId: m.id } }
-          }));
-          return _memCache;
-        }
-      } catch {}
+    const cache = readAllModelsCache();
+    if (!cache)
+      return null;
+    if (cache.entries.length > 0) {
+      _memCache = cache.entries;
+      return _memCache;
+    }
+    if (cache.models.length > 0) {
+      _memCache = cache.models.map((m) => ({
+        modelId: m.id.includes("/") ? m.id.split("/").slice(1).join("/") : m.id,
+        aliases: [],
+        sources: { "openrouter-api": { externalId: m.id } }
+      }));
+      return _memCache;
     }
     return null;
   }
@@ -25089,22 +25125,17 @@ class OpenRouterCatalogResolver {
           backwardCompatModels.push({ id: orSource.externalId });
         }
       }
-      const cacheDir = join10(homedir9(), ".claudish");
-      mkdirSync8(cacheDir, { recursive: true });
-      const diskData = {
-        version: 2,
-        lastUpdated: new Date().toISOString(),
+      writeAllModelsCache({
         entries: data.models,
         models: backwardCompatModels
-      };
-      writeFileSync8(DISK_CACHE_PATH, JSON.stringify(diskData), "utf-8");
+      });
     } catch {}
   }
 }
-var FIREBASE_CATALOG_URL = "https://us-central1-claudish-6da10.cloudfunctions.net/queryModels?status=active&catalog=slim&limit=1000", DISK_CACHE_PATH, _memCache = null, _warmPromise = null;
+var FIREBASE_CATALOG_URL = "https://us-central1-claudish-6da10.cloudfunctions.net/queryModels?status=active&catalog=slim&limit=1000", _memCache = null, _warmPromise = null;
 var init_openrouter2 = __esm(() => {
   init_static_fallback();
-  DISK_CACHE_PATH = join10(homedir9(), ".claudish", "all-models.json");
+  init_all_models_cache();
 });
 
 // src/providers/catalog-resolvers/litellm.ts
@@ -29380,10 +29411,12 @@ var init_port_manager = () => {};
 // src/mcp-server.ts
 var exports_mcp_server = {};
 __export(exports_mcp_server, {
-  startMcpServer: () => startMcpServer
+  startMcpServer: () => startMcpServer,
+  runPromptViaProxy: () => runPromptViaProxy,
+  parseAnthropicSse: () => parseAnthropicSse
 });
 import { readFileSync as readFileSync18, existsSync as existsSync21, writeFileSync as writeFileSync10, mkdirSync as mkdirSync10, readdirSync as readdirSync3 } from "fs";
-import { join as join23, dirname as dirname2 } from "path";
+import { join as join23, dirname as dirname3 } from "path";
 import { homedir as homedir22 } from "os";
 import { fileURLToPath as fileURLToPath2 } from "url";
 function loadRecommendedModels() {
@@ -29424,9 +29457,9 @@ function parseCtx(s) {
   return parseInt(s) || 0;
 }
 async function loadAllModels(forceRefresh = false) {
-  if (!forceRefresh && existsSync21(ALL_MODELS_CACHE_PATH)) {
+  if (!forceRefresh && existsSync21(ALL_MODELS_CACHE_PATH2)) {
     try {
-      const cacheData = JSON.parse(readFileSync18(ALL_MODELS_CACHE_PATH, "utf-8"));
+      const cacheData = JSON.parse(readFileSync18(ALL_MODELS_CACHE_PATH2, "utf-8"));
       const lastUpdated = new Date(cacheData.lastUpdated);
       const ageInDays = (Date.now() - lastUpdated.getTime()) / (1000 * 60 * 60 * 24);
       if (ageInDays <= CACHE_MAX_AGE_DAYS) {
@@ -29441,11 +29474,11 @@ async function loadAllModels(forceRefresh = false) {
     const data = await response.json();
     const models = data.data || [];
     mkdirSync10(CLAUDISH_CACHE_DIR, { recursive: true });
-    writeFileSync10(ALL_MODELS_CACHE_PATH, JSON.stringify({ lastUpdated: new Date().toISOString(), models }), "utf-8");
+    writeFileSync10(ALL_MODELS_CACHE_PATH2, JSON.stringify({ lastUpdated: new Date().toISOString(), models }), "utf-8");
     return models;
   } catch {
-    if (existsSync21(ALL_MODELS_CACHE_PATH)) {
-      const cacheData = JSON.parse(readFileSync18(ALL_MODELS_CACHE_PATH, "utf-8"));
+    if (existsSync21(ALL_MODELS_CACHE_PATH2)) {
+      const cacheData = JSON.parse(readFileSync18(ALL_MODELS_CACHE_PATH2, "utf-8"));
       return cacheData.models || [];
     }
     return [];
@@ -30321,7 +30354,7 @@ function startMcpServer() {
     process.exit(1);
   });
 }
-var import_dotenv2, __filename3, __dirname3, RECOMMENDED_MODELS_PATH, CLAUDISH_CACHE_DIR, ALL_MODELS_CACHE_PATH, CACHE_MAX_AGE_DAYS = 2, INSTRUCTIONS = `Claudish MCP server provides access to external AI models (OpenRouter, Ollama, LM Studio, etc.) for coding tasks.
+var import_dotenv2, __filename3, __dirname3, RECOMMENDED_MODELS_PATH, CLAUDISH_CACHE_DIR, ALL_MODELS_CACHE_PATH2, CACHE_MAX_AGE_DAYS = 2, INSTRUCTIONS = `Claudish MCP server provides access to external AI models (OpenRouter, Ollama, LM Studio, etc.) for coding tasks.
 
 ## Channel Mode \u2014 External Model Sessions
 
@@ -30357,10 +30390,10 @@ var init_mcp_server = __esm(() => {
   import_dotenv2 = __toESM(require_main(), 1);
   import_dotenv2.config();
   __filename3 = fileURLToPath2(import.meta.url);
-  __dirname3 = dirname2(__filename3);
+  __dirname3 = dirname3(__filename3);
   RECOMMENDED_MODELS_PATH = join23(__dirname3, "../recommended-models.json");
   CLAUDISH_CACHE_DIR = join23(homedir22(), ".claudish");
-  ALL_MODELS_CACHE_PATH = join23(CLAUDISH_CACHE_DIR, "all-models.json");
+  ALL_MODELS_CACHE_PATH2 = join23(CLAUDISH_CACHE_DIR, "all-models.json");
 });
 
 // ../../node_modules/.bun/@inquirer+core@11.0.1+04f2146be16c61ef/node_modules/@inquirer/core/dist/lib/key.js
@@ -43540,7 +43573,7 @@ import { EventEmitter } from "events";
 import { Buffer as Buffer2 } from "buffer";
 import { Buffer as Buffer3 } from "buffer";
 import { EventEmitter as EventEmitter2 } from "events";
-import { resolve as resolve3, dirname as dirname3 } from "path";
+import { resolve as resolve3, dirname as dirname4 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import { resolve as resolve22, isAbsolute, parse as parse6 } from "path";
 import { existsSync as existsSync22 } from "fs";
@@ -45885,24 +45918,24 @@ function getParsers() {
       {
         filetype: "javascript",
         queries: {
-          highlights: [resolve3(dirname3(fileURLToPath3(import.meta.url)), highlights_default)]
+          highlights: [resolve3(dirname4(fileURLToPath3(import.meta.url)), highlights_default)]
         },
-        wasm: resolve3(dirname3(fileURLToPath3(import.meta.url)), tree_sitter_javascript_default)
+        wasm: resolve3(dirname4(fileURLToPath3(import.meta.url)), tree_sitter_javascript_default)
       },
       {
         filetype: "typescript",
         queries: {
-          highlights: [resolve3(dirname3(fileURLToPath3(import.meta.url)), highlights_default2)]
+          highlights: [resolve3(dirname4(fileURLToPath3(import.meta.url)), highlights_default2)]
         },
-        wasm: resolve3(dirname3(fileURLToPath3(import.meta.url)), tree_sitter_typescript_default)
+        wasm: resolve3(dirname4(fileURLToPath3(import.meta.url)), tree_sitter_typescript_default)
       },
       {
         filetype: "markdown",
         queries: {
-          highlights: [resolve3(dirname3(fileURLToPath3(import.meta.url)), highlights_default3)],
-          injections: [resolve3(dirname3(fileURLToPath3(import.meta.url)), injections_default)]
+          highlights: [resolve3(dirname4(fileURLToPath3(import.meta.url)), highlights_default3)],
+          injections: [resolve3(dirname4(fileURLToPath3(import.meta.url)), injections_default)]
         },
-        wasm: resolve3(dirname3(fileURLToPath3(import.meta.url)), tree_sitter_markdown_default),
+        wasm: resolve3(dirname4(fileURLToPath3(import.meta.url)), tree_sitter_markdown_default),
         injectionMapping: {
           nodeTypes: {
             inline: "markdown_inline",
@@ -45921,16 +45954,16 @@ function getParsers() {
       {
         filetype: "markdown_inline",
         queries: {
-          highlights: [resolve3(dirname3(fileURLToPath3(import.meta.url)), highlights_default4)]
+          highlights: [resolve3(dirname4(fileURLToPath3(import.meta.url)), highlights_default4)]
         },
-        wasm: resolve3(dirname3(fileURLToPath3(import.meta.url)), tree_sitter_markdown_inline_default)
+        wasm: resolve3(dirname4(fileURLToPath3(import.meta.url)), tree_sitter_markdown_inline_default)
       },
       {
         filetype: "zig",
         queries: {
-          highlights: [resolve3(dirname3(fileURLToPath3(import.meta.url)), highlights_default5)]
+          highlights: [resolve3(dirname4(fileURLToPath3(import.meta.url)), highlights_default5)]
         },
-        wasm: resolve3(dirname3(fileURLToPath3(import.meta.url)), tree_sitter_zig_default)
+        wasm: resolve3(dirname4(fileURLToPath3(import.meta.url)), tree_sitter_zig_default)
       }
     ];
   }
@@ -100237,7 +100270,7 @@ import {
   unlinkSync as unlinkSync7
 } from "fs";
 import { fileURLToPath as fileURLToPath4 } from "url";
-import { dirname as dirname4, join as join25 } from "path";
+import { dirname as dirname5, join as join25 } from "path";
 import { homedir as homedir23 } from "os";
 function getVersion3() {
   return VERSION;
@@ -102016,7 +102049,7 @@ var init_cli = __esm(async () => {
   init_provider_resolver();
   await init_probe_tui_runtime();
   __filename4 = fileURLToPath4(import.meta.url);
-  __dirname4 = dirname4(__filename4);
+  __dirname4 = dirname5(__filename4);
   CLAUDISH_CACHE_DIR2 = join25(homedir23(), ".claudish");
   BUNDLED_MODELS_PATH = join25(__dirname4, "../recommended-models.json");
   CACHED_MODELS_PATH = join25(CLAUDISH_CACHE_DIR2, "recommended-models.json");
@@ -102382,7 +102415,7 @@ __export(exports_model_selector, {
   confirmAction: () => confirmAction
 });
 import { readFileSync as readFileSync22, writeFileSync as writeFileSync15, existsSync as existsSync27, mkdirSync as mkdirSync13 } from "fs";
-import { join as join27, dirname as dirname5 } from "path";
+import { join as join27, dirname as dirname6 } from "path";
 import { homedir as homedir25 } from "os";
 import { fileURLToPath as fileURLToPath5 } from "url";
 function loadRecommendedModels2() {
@@ -103617,7 +103650,7 @@ var init_model_selector = __esm(() => {
   init_model_loader();
   init_provider_definitions();
   __filename5 = fileURLToPath5(import.meta.url);
-  __dirname5 = dirname5(__filename5);
+  __dirname5 = dirname6(__filename5);
   CLAUDISH_CACHE_DIR3 = join27(homedir25(), ".claudish");
   ALL_MODELS_JSON_PATH2 = join27(CLAUDISH_CACHE_DIR3, "all-models.json");
   RECOMMENDED_MODELS_JSON_PATH = join27(__dirname5, "../recommended-models.json");
@@ -107726,14 +107759,14 @@ __export(exports_team_grid, {
 import { spawn as spawn5 } from "child_process";
 import {
   existsSync as existsSync29,
-  mkdirSync as mkdirSync16,
   readFileSync as readFileSync24,
-  unlinkSync as unlinkSync11,
   writeFileSync as writeFileSync18
 } from "fs";
-import { dirname as dirname6, join as join30 } from "path";
+import { dirname as dirname7, join as join30 } from "path";
 import { fileURLToPath as fileURLToPath6 } from "url";
 import { execSync as execSync2 } from "child_process";
+import { connect as netConnect } from "net";
+import { setTimeout as wait } from "timers/promises";
 function resolveRouteInfo(modelId) {
   const parsed = parseModelSpec(modelId);
   if (parsed.isExplicitProvider) {
@@ -107787,21 +107820,22 @@ function resolveRouteInfo(modelId) {
     source: "auto"
   };
 }
-function buildPaneHeader(model, prompt) {
-  const route = resolveRouteInfo(model);
-  const esc2 = (s) => s.replace(/'/g, "'\\''");
-  const bgColors = [
-    "48;2;40;90;180",
-    "48;2;140;60;160",
-    "48;2;30;130;100",
-    "48;2;160;80;40",
-    "48;2;60;120;60",
-    "48;2;160;50;70"
-  ];
+function pickBannerColor(model, used) {
   let hash = 0;
   for (let i = 0;i < model.length; i++)
     hash = (hash << 5) - hash + model.charCodeAt(i) | 0;
-  const bg2 = bgColors[Math.abs(hash) % bgColors.length];
+  const start = Math.abs(hash) % BANNER_BG_COLORS.length;
+  let idx = start;
+  if (used.size < BANNER_BG_COLORS.length) {
+    while (used.has(idx))
+      idx = (idx + 1) % BANNER_BG_COLORS.length;
+  }
+  used.add(idx);
+  return BANNER_BG_COLORS[idx];
+}
+function buildPaneHeader(model, prompt, bg2) {
+  const route = resolveRouteInfo(model);
+  const esc2 = (s) => s.replace(/'/g, "'\\''");
   const chainStr = route.chain.join(" \u2192 ");
   const sourceLabel = route.sourceDetail ? `${route.source}: ${route.sourceDetail}` : route.source;
   const lines = [];
@@ -107815,7 +107849,7 @@ function buildPaneHeader(model, prompt) {
 }
 function findMagmuxBinary() {
   const thisFile = fileURLToPath6(import.meta.url);
-  const thisDir = dirname6(thisFile);
+  const thisDir = dirname7(thisFile);
   const pkgRoot = join30(thisDir, "..");
   const platform3 = process.platform;
   const arch = process.arch;
@@ -107829,7 +107863,7 @@ function findMagmuxBinary() {
       const candidate = join30(searchDir, "node_modules", pkgName, "bin", "magmux");
       if (existsSync29(candidate))
         return candidate;
-      const parent = dirname6(searchDir);
+      const parent = dirname7(searchDir);
       if (parent === searchDir)
         break;
       searchDir = parent;
@@ -107843,133 +107877,113 @@ function findMagmuxBinary() {
   throw new Error(`magmux not found. Install it:
   brew install MadAppGang/tap/magmux`);
 }
-function finalizeStatus(statusPath, sessionPath, anonIds, mode) {
-  const statusCache = JSON.parse(readFileSync24(statusPath, "utf-8"));
-  for (const anonId of anonIds) {
-    const current = statusCache.models[anonId];
-    if (current.state === "COMPLETED" || current.state === "FAILED")
-      continue;
-    const exitCodePath = join30(sessionPath, "work", anonId, ".exit-code");
-    if (existsSync29(exitCodePath)) {
-      const code = parseInt(readFileSync24(exitCodePath, "utf-8").trim(), 10);
-      statusCache.models[anonId] = {
-        ...current,
-        state: code === 0 ? "COMPLETED" : "FAILED",
-        exitCode: code,
-        startedAt: current.startedAt ?? statusCache.startedAt,
-        completedAt: new Date().toISOString()
-      };
-    } else if (mode === "interactive") {
-      statusCache.models[anonId] = {
-        ...current,
-        state: "COMPLETED",
-        exitCode: 0,
-        startedAt: current.startedAt ?? statusCache.startedAt,
-        completedAt: new Date().toISOString()
+async function subscribeToMagmux(sockPath, onEvent) {
+  let client = null;
+  for (let attempt = 0;attempt < 40; attempt++) {
+    if (existsSync29(sockPath)) {
+      try {
+        client = await new Promise((resolve4, reject) => {
+          const s = netConnect(sockPath);
+          s.once("connect", () => resolve4(s));
+          s.once("error", reject);
+        });
+        break;
+      } catch {}
+    }
+    await wait(50);
+  }
+  if (!client) {
+    return { results: null, client: null };
+  }
+  return await new Promise((resolve4) => {
+    let buf = "";
+    let finalResults = null;
+    client.on("data", (chunk) => {
+      buf += chunk.toString("utf-8");
+      let nl = buf.indexOf(`
+`);
+      while (nl >= 0) {
+        const line = buf.slice(0, nl).trim();
+        buf = buf.slice(nl + 1);
+        nl = buf.indexOf(`
+`);
+        if (!line)
+          continue;
+        try {
+          const evt = JSON.parse(line);
+          onEvent?.(evt);
+          if (evt.type === "results") {
+            finalResults = evt;
+          }
+        } catch {}
+      }
+    });
+    const done = () => resolve4({ results: finalResults, client });
+    client.once("end", done);
+    client.once("close", done);
+    client.once("error", done);
+  });
+}
+function buildTeamStatus(manifest, startedAt, results) {
+  const anonIds = Object.keys(manifest.models);
+  const models = {};
+  for (let i = 0;i < anonIds.length; i++) {
+    const anonId = anonIds[i];
+    const result = results?.find((r) => r.pane === i);
+    if (!result) {
+      models[anonId] = {
+        state: "TIMEOUT",
+        exitCode: null,
+        startedAt,
+        completedAt: null,
+        outputSize: 0
       };
-    } else {
-      statusCache.models[anonId] = { ...current, state: "TIMEOUT" };
+      continue;
     }
+    let state;
+    switch (result.state) {
+      case "completed":
+      case "awaiting_input":
+        state = "COMPLETED";
+        break;
+      case "failed":
+        state = "FAILED";
+        break;
+      default:
+        state = "TIMEOUT";
+    }
+    models[anonId] = {
+      state,
+      exitCode: result.exitCode,
+      startedAt: result.startedAt ?? startedAt,
+      completedAt: result.completedAt ?? new Date().toISOString(),
+      outputSize: result.response?.length ?? 0
+    };
   }
-  writeFileSync18(statusPath, JSON.stringify(statusCache, null, 2), "utf-8");
+  return { startedAt, models };
 }
 async function runWithGrid(sessionPath, models, input, opts) {
   const mode = opts?.mode ?? "default";
   const keep = opts?.keep ?? false;
   const manifest = setupSession(sessionPath, models, input);
-  mkdirSync16(join30(sessionPath, "errors"), { recursive: true });
-  for (const anonId of Object.keys(manifest.models)) {
-    const stale = join30(sessionPath, "work", anonId, ".exit-code");
-    try {
-      unlinkSync11(stale);
-    } catch {}
-  }
+  const startedAt = new Date().toISOString();
   const gridfilePath = join30(sessionPath, "gridfile.txt");
   const prompt = readFileSync24(join30(sessionPath, "input.md"), "utf-8").replace(/'/g, "'\\''").replace(/\n/g, " ");
-  const totalPanes = Object.keys(manifest.models).length;
-  const workDir = join30(sessionPath, "work");
-  const statusJsonAllDone = JSON.stringify({
-    cmd: "status",
-    text: `C: claudish team	G: ${totalPanes} done	G: complete	D: __TS__	D: ctrl-g q to quit`
-  });
-  const statusJsonWithFails = JSON.stringify({
-    cmd: "status",
-    text: `C: claudish team	G: __D__ done	R: __F__ failed	D: __TS__	D: ctrl-g q to quit`
-  });
-  const statusJsonRunning = JSON.stringify({
-    cmd: "status",
-    text: `C: claudish team	G: __D__ done	C: __R__ running	R: __F__ failed	D: __TS__`
-  });
-  const tplDir = join30(sessionPath, "status-tpl");
-  mkdirSync16(tplDir, { recursive: true });
-  writeFileSync18(join30(tplDir, "all-done.json"), statusJsonAllDone);
-  writeFileSync18(join30(tplDir, "with-fails.json"), statusJsonWithFails);
-  writeFileSync18(join30(tplDir, "running.json"), statusJsonRunning);
-  const statusFunc = [
-    `_update_bar() {`,
-    `_d=0; _f=0;`,
-    `for _ecf in $(find ${workDir} -name .exit-code 2>/dev/null); do`,
-    `_c=$(cat "$_ecf" 2>/dev/null);`,
-    `if [ "$_c" = "0" ]; then _d=$((_d+1)); else _f=$((_f+1)); fi;`,
-    `done;`,
-    `_r=$((${totalPanes}-_d-_f));`,
-    `_e=$SECONDS;`,
-    `if [ $_e -ge 60 ]; then _ts="$((_e/60))m $((_e%60))s"; else _ts="\${_e}s"; fi;`,
-    `if [ $_r -eq 0 ] && [ $_f -eq 0 ]; then`,
-    `sed "s/__TS__/\${_ts}/" ${tplDir}/all-done.json | nc -U "$MAGMUX_SOCK" -w 1 2>/dev/null;`,
-    `elif [ $_r -eq 0 ] && [ $_f -gt 0 ]; then`,
-    `sed -e "s/__D__/\${_d}/" -e "s/__F__/\${_f}/" -e "s/__TS__/\${_ts}/" ${tplDir}/with-fails.json | nc -U "$MAGMUX_SOCK" -w 1 2>/dev/null;`,
-    `else`,
-    `sed -e "s/__D__/\${_d}/" -e "s/__R__/\${_r}/" -e "s/__F__/\${_f}/" -e "s/__TS__/\${_ts}/" ${tplDir}/running.json | nc -U "$MAGMUX_SOCK" -w 1 2>/dev/null;`,
-    `fi;`,
-    `};`
-  ].join(" ");
   const rawPrompt = readFileSync24(join30(sessionPath, "input.md"), "utf-8");
+  const usedBannerColors = new Set;
   const gridLines = Object.entries(manifest.models).map(([anonId]) => {
-    const errorLog = join30(sessionPath, "errors", `${anonId}.log`);
-    const exitCodeFile = join30(sessionPath, "work", anonId, ".exit-code");
     const model = manifest.models[anonId].model;
-    const paneIndex = Object.keys(manifest.models).indexOf(anonId);
     if (mode === "interactive") {
-      const modelList = Object.values(manifest.models).map((m2) => m2.model).join(", ");
-      const interactiveJson = JSON.stringify({
-        cmd: "status",
-        text: `C: claudish team	W: ${modelList}	D: ctrl-g Tab switch	D: ctrl-g q quit`
-      });
-      const interactiveJsonFile = join30(tplDir, "interactive.json");
-      writeFileSync18(interactiveJsonFile, interactiveJson);
-      return [
-        `if [ -n "$MAGMUX_SOCK" ]; then cat ${interactiveJsonFile} | nc -U "$MAGMUX_SOCK" -w 1 2>/dev/null; fi;`,
-        `claudish --model ${model} -i --dangerously-skip-permissions '${prompt}' 2>${errorLog};`,
-        `_ec=$?; echo $_ec > ${exitCodeFile}`
-      ].join(" ");
+      return `claudish --model ${model} -i --dangerously-skip-permissions '${prompt}'`;
     }
-    const header = buildPaneHeader(model, rawPrompt);
-    return [
-      `${statusFunc}`,
-      `if [ -n "$MAGMUX_SOCK" ]; then _update_bar; fi;`,
-      `${header}`,
-      `claudish --model ${model} -y --quiet '${prompt}' 2>${errorLog};`,
-      `_ec=$?; echo $_ec > ${exitCodeFile};`,
-      `if [ -n "$MAGMUX_SOCK" ]; then`,
-      `  _update_bar;`,
-      `  if [ $_ec -eq 0 ]; then`,
-      `    echo '{"cmd":"tint","pane":${paneIndex},"color":"green"}' | nc -U "$MAGMUX_SOCK" -w 1 2>/dev/null;`,
-      `    echo '{"cmd":"overlay","pane":${paneIndex},"text":"DONE","color":"green"}' | nc -U "$MAGMUX_SOCK" -w 1 2>/dev/null;`,
-      `  else`,
-      `    echo '{"cmd":"tint","pane":${paneIndex},"color":"red"}' | nc -U "$MAGMUX_SOCK" -w 1 2>/dev/null;`,
-      `    echo '{"cmd":"overlay","pane":${paneIndex},"text":"FAIL","color":"red"}' | nc -U "$MAGMUX_SOCK" -w 1 2>/dev/null;`,
-      `  fi;`,
-      `fi;`,
-      `exec sleep 86400`
-    ].join(" ");
+    const bg2 = pickBannerColor(model, usedBannerColors);
+    const header = buildPaneHeader(model, rawPrompt, bg2);
+    return `${header} claudish --model ${model} -y --quiet '${prompt}'`;
   });
   writeFileSync18(gridfilePath, gridLines.join(`
 `) + `
 `, "utf-8");
   const magmuxPath = findMagmuxBinary();
-  const statusPath = join30(sessionPath, "status.json");
-  const anonIds = Object.keys(manifest.models);
   const spawnArgs = ["-g", gridfilePath];
   if (!keep && mode === "default") {
     spawnArgs.push("-w");
@@ -107978,19 +107992,33 @@ async function runWithGrid(sessionPath, models, input, opts) {
     stdio: "inherit",
     env: { ...process.env }
   });
-  await new Promise((resolve4) => {
+  const sockPath = `/tmp/magmux-${proc.pid}.sock`;
+  const subscription = subscribeToMagmux(sockPath);
+  const procExit = new Promise((resolve4) => {
     proc.on("exit", () => resolve4());
     proc.on("error", () => resolve4());
   });
-  finalizeStatus(statusPath, sessionPath, anonIds, mode);
-  return JSON.parse(readFileSync24(statusPath, "utf-8"));
+  const [{ results }] = await Promise.all([subscription, procExit]);
+  const status = buildTeamStatus(manifest, startedAt, results?.panes ?? null);
+  const statusPath = join30(sessionPath, "status.json");
+  writeFileSync18(statusPath, JSON.stringify(status, null, 2), "utf-8");
+  return status;
 }
+var BANNER_BG_COLORS;
 var init_team_grid = __esm(() => {
   init_team_orchestrator();
   init_model_parser();
   init_routing_rules();
   init_auto_route();
   init_profile_config();
+  BANNER_BG_COLORS = [
+    "48;2;40;90;180",
+    "48;2;140;60;160",
+    "48;2;30;130;100",
+    "48;2;160;80;40",
+    "48;2;60;120;60",
+    "48;2;160;50;70"
+  ];
 });
 
 // src/index.ts
@@ -108269,6 +108297,14 @@ Team Status`);
         }
       }
     }
+    if (cliConfig.interactive && !cliConfig.monitor && process.stdin.isTTY) {
+      if (typeof process.stdin.setRawMode === "function") {
+        process.stdin.setRawMode(false);
+      }
+      process.stdin.pause();
+      process.stdin.removeAllListeners("data");
+      process.stdin.removeAllListeners("keypress");
+    }
     if (!cliConfig.quiet) {
       const modelsToCheck = [
         cliConfig.model,

package/package.json

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

package/recommended-models.json

@@ -1,6 +1,6 @@
 {
   "version": "1.2.0",
-  "lastUpdated": "2026-04-14",
+  "lastUpdated": "2026-04-15",
   "source": "https://openrouter.ai/models?categories=programming&fmt=cards&order=top-weekly",
   "models": [
     {