claudish 7.30.0 → 7.32.0

package/dist/index.js

@@ -651,7 +651,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "7.30.0";
+var VERSION = "7.32.0";
 
 // src/logger.ts
 var exports_logger = {};
@@ -28218,6 +28218,25 @@ var init_provider_definitions = __esm(() => {
       isDirectApi: true,
       description: "Sakana Fugu Subscription (sc@)"
     },
+    {
+      name: "qwen-cloud",
+      displayName: "Qwen Plan",
+      transport: "anthropic",
+      baseUrl: "https://token-plan.ap-southeast-1.maas.aliyuncs.com",
+      baseUrlEnvVars: ["QWEN_CLOUD_PLAN_BASE_URL"],
+      apiPath: "/apps/anthropic/v1/messages",
+      apiKeyEnvVar: "QWEN_CLOUD_PLAN_API_KEY",
+      apiKeyDescription: "Qwen Plan API Key",
+      apiKeyUrl: "https://www.alibabacloud.com/help/en/model-studio/claude-code",
+      authScheme: "bearer",
+      shortcuts: ["qc"],
+      shortestPrefix: "qc",
+      legacyPrefixes: [{ prefix: "qc/", stripPrefix: true }],
+      nativeModelPatterns: [{ pattern: /^qwen3\.\d/i }],
+      modelDiscovery: { path: "/compatible-mode/v1/models", format: "openai-models-list" },
+      isDirectApi: true,
+      description: "Qwen Plan (qc@)"
+    },
     {
       name: "qwen",
       displayName: "Qwen",
@@ -31500,6 +31519,7 @@ var init_routing_hints = __esm(() => {
     deepseek: { apiKeyEnvVar: "DEEPSEEK_API_KEY" },
     sakana: { apiKeyEnvVar: "SAKANA_API_KEY" },
     "sakana-subscription": { apiKeyEnvVar: "SAKANA_SUBSCRIPTION_API_KEY" },
+    "qwen-cloud": { apiKeyEnvVar: "QWEN_CLOUD_PLAN_API_KEY" },
     ollamacloud: { apiKeyEnvVar: "OLLAMA_API_KEY" },
     "native-anthropic": { apiKeyEnvVar: "ANTHROPIC_API_KEY" },
     openrouter: { apiKeyEnvVar: "OPENROUTER_API_KEY" },
@@ -31559,9 +31579,13 @@ function lookupModel(modelId, cachePath) {
   return {
     modelId: entry.modelId,
     contextWindow: entry.contextWindow,
-    supportsVision: entry.supportsVision
+    supportsVision: entry.supportsVision,
+    releaseDate: entry.releaseDate
   };
 }
+function lookupModelReasoning(modelId, cachePath) {
+  return findCacheEntry(modelId, cachePath)?.reasoning;
+}
 function lookupModelForProvider(modelId, provider, cachePath) {
   const entry = findCacheEntry(modelId, cachePath);
   if (!entry)
@@ -31668,6 +31692,7 @@ var init_default_routing_rules = __esm(() => {
     "k3*": ["kimi-coding", "kimi", "openrouter"],
     "minimax-*": ["minimax-coding", "minimax", "openrouter"],
     "glm-*": ["glm-coding", "glm", "openrouter"],
+    "qwen3.*": ["qwen-cloud", "openrouter"],
     "z-ai-*": ["z-ai", "openrouter"],
     "deepseek-*": ["deepseek", "openrouter"],
     fugu: ["sakana-subscription", "sakana"],
@@ -32917,18 +32942,80 @@ var init_cache_ttl = __esm(() => {
   FIREBASE_CACHE_TTL_MS = FIREBASE_CACHE_TTL_HOURS * 60 * 60 * 1000;
 });
 
+// src/providers/model-ordering.ts
+function extractVersionParts(modelId) {
+  const tokens = modelId.toLowerCase().split(/[\/_-]+/);
+  let started = false;
+  const parts = [];
+  for (const token of tokens) {
+    const match = token.match(/\d+(?:\.\d+)*/);
+    if (!match) {
+      if (started)
+        break;
+      continue;
+    }
+    if (!started) {
+      started = true;
+      for (const part of match[0].split(".")) {
+        parts.push(Number.parseInt(part, 10));
+      }
+      if (!/^\d+(?:\.\d+)*$/.test(token)) {
+        break;
+      }
+      continue;
+    }
+    if (!/^\d{1,2}(?:\.\d+)?$/.test(token)) {
+      break;
+    }
+    for (const part of token.split(".")) {
+      parts.push(Number.parseInt(part, 10));
+    }
+  }
+  return parts;
+}
+function compareVersionPartsDesc(a, b) {
+  const maxLength = Math.max(a.length, b.length);
+  for (let i = 0;i < maxLength; i++) {
+    const aPart = a[i] ?? -1;
+    const bPart = b[i] ?? -1;
+    if (aPart !== bPart) {
+      return bPart - aPart;
+    }
+  }
+  return 0;
+}
+function compareByReleaseDateDesc(a, b) {
+  const aReleaseRaw = a.releaseDate ? Date.parse(a.releaseDate) : 0;
+  const bReleaseRaw = b.releaseDate ? Date.parse(b.releaseDate) : 0;
+  const aRelease = Number.isNaN(aReleaseRaw) ? 0 : aReleaseRaw;
+  const bRelease = Number.isNaN(bReleaseRaw) ? 0 : bReleaseRaw;
+  if (aRelease !== bRelease) {
+    return bRelease - aRelease;
+  }
+  const aId = a.id ?? a.modelId ?? "";
+  const bId = b.id ?? b.modelId ?? "";
+  const versionCompare = compareVersionPartsDesc(extractVersionParts(aId), extractVersionParts(bId));
+  if (versionCompare !== 0) {
+    return versionCompare;
+  }
+  return aId.localeCompare(bId);
+}
+
 // src/model-loader.ts
 import { existsSync as existsSync14, mkdirSync as mkdirSync8, readFileSync as readFileSync11, writeFileSync as writeFileSync8 } from "fs";
 import { homedir as homedir17 } from "os";
 import { join as join17 } from "path";
 function groupRecommendedModels(entries) {
   const byId = new Map;
+  const categoryOrder = new Map;
   for (const entry of entries) {
     const list = byId.get(entry.id);
     if (list)
       list.push(entry);
     else
       byId.set(entry.id, [entry]);
+    if (!categoryOrder.has(entry.category))
+      categoryOrder.set(entry.category, categoryOrder.size);
   }
   const flagship = [];
   const fast = [];
@@ -32942,6 +33029,17 @@ function groupRecommendedModels(entries) {
     else
       fast.push(group);
   }
+  const byCuratedPriorityThenFreshness = (a, b) => {
+    const aCat = categoryOrder.get(a.primary.category) ?? Number.MAX_SAFE_INTEGER;
+    const bCat = categoryOrder.get(b.primary.category) ?? Number.MAX_SAFE_INTEGER;
+    if (aCat !== bCat)
+      return aCat - bCat;
+    if (a.primary.priority !== b.primary.priority)
+      return a.primary.priority - b.primary.priority;
+    return compareByReleaseDateDesc(a.primary, b.primary);
+  };
+  flagship.sort(byCuratedPriorityThenFreshness);
+  fast.sort(byCuratedPriorityThenFreshness);
   return { flagship, fast };
 }
 function collectRoutingPrefixes(group, getNativePrefix) {
@@ -34932,6 +35030,9 @@ var cors = (options) => {
 var init_cors = () => {};
 
 // src/handlers/shared/remote-provider-types.ts
+function isSubscriptionProvider(provider) {
+  return SUBSCRIPTION_PROVIDERS.has(provider.toLowerCase());
+}
 function registerDynamicPricingLookup(fn) {
   _dynamicLookup = fn;
 }
@@ -34940,7 +35041,7 @@ function getModelPricing(provider, modelName) {
   if (FREE_PROVIDERS.has(p)) {
     return { inputCostPer1M: 0, outputCostPer1M: 0, isFree: true };
   }
-  if (SUBSCRIPTION_PROVIDERS.has(p)) {
+  if (isSubscriptionProvider(p)) {
     return { inputCostPer1M: 0, outputCostPer1M: 0, isSubscription: true };
   }
   if (_dynamicLookup) {
@@ -34962,7 +35063,12 @@ var init_remote_provider_types = __esm(() => {
     ollamacloud: { inputCostPer1M: 1, outputCostPer1M: 4, isEstimate: true }
   };
   FREE_PROVIDERS = new Set(["opencode-zen", "zen"]);
-  SUBSCRIPTION_PROVIDERS = new Set(["minimax-coding", "kimi-coding", "glm-coding"]);
+  SUBSCRIPTION_PROVIDERS = new Set([
+    "minimax-coding",
+    "kimi-coding",
+    "glm-coding",
+    "qwen-cloud"
+  ]);
   PROVIDER_ALIAS = {
     google: "gemini",
     oai: "openai",
@@ -35326,16 +35432,24 @@ function matchesModelFamily(modelId, family) {
   const fam = family.toLowerCase();
   return lower.startsWith(fam) || lower.includes(`/${fam}`);
 }
+function isEffortLevel(value) {
+  return typeof value === "string" && EFFORT_ORDER.includes(value);
+}
 
 class BaseAPIFormat {
   modelId;
+  wireFormat;
   toolNameMap = new Map;
-  constructor(modelId) {
+  constructor(modelId, wireFormat) {
     this.modelId = modelId;
+    this.wireFormat = wireFormat;
   }
   getModelId() {
     return this.modelId;
   }
+  getWireFormat() {
+    return this.wireFormat;
+  }
   getToolNameLimit() {
     return null;
   }
@@ -35348,9 +35462,114 @@ class BaseAPIFormat {
   restoreToolName(name) {
     return this.toolNameMap.get(name) || name;
   }
-  prepareRequest(request, _originalRequest) {
+  prepareRequest(request, originalRequest) {
+    const prepared = this.prepareRequestCommon(request, originalRequest) ?? request;
+    if (!this.isAnthropicWire()) {
+      return this.applyNativeReasoning(prepared, originalRequest) ?? prepared;
+    }
+    this.stripNonAnthropicReasoningFields(prepared);
+    return this.applyAnthropicWireReasoning(prepared, originalRequest) ?? prepared;
+  }
+  prepareRequestCommon(request, _originalRequest) {
+    return request;
+  }
+  applyNativeReasoning(request, _originalRequest) {
+    return request;
+  }
+  isAnthropicWire() {
+    return this.wireFormat === "anthropic-sse";
+  }
+  stripNonAnthropicReasoningFields(request) {
+    if (!request)
+      return;
+    for (const field of NON_ANTHROPIC_REASONING_FIELDS) {
+      if (request[field] !== undefined)
+        delete request[field];
+    }
+  }
+  applyAnthropicWireReasoning(request, originalRequest) {
+    const reasoning = this.lookupReasoningCapability();
+    if (reasoning?.supported === false) {
+      request.thinking = { type: "disabled" };
+      log(`[${this.getName()}] ${this.modelId} reports no reasoning support -> thinking: disabled`);
+      return request;
+    }
+    const effort = this.resolveEffortLevel(originalRequest);
+    if (!effort)
+      return request;
+    if (effort === "none" || effort === "minimal") {
+      request.thinking = { type: "disabled" };
+      log(`[${this.getName()}] effort ${effort} -> thinking.type: disabled for ${this.modelId}`);
+      return request;
+    }
+    if (reasoning && (reasoning.control === "budget" || reasoning.supportsBudgetTokens)) {
+      return this.enableAnthropicThinkingWithBudget(request, effort, "catalog: budget-controlled");
+    }
+    const advertised = reasoning?.efforts?.length ? reasoning : undefined;
+    if (advertised) {
+      const level = this.clampToAdvertisedEffort(effort, advertised);
+      request.thinking = { type: "enabled" };
+      if (level) {
+        request.output_config = { ...request.output_config ?? {}, effort: level };
+      }
+      log(`[${this.getName()}] effort ${effort} -> thinking: enabled, output_config.effort: ${level ?? "(none advertised)"} for ${this.modelId} (advertised: ${advertised.efforts?.join("/")})`);
+      return request;
+    }
+    if (reasoning) {
+      request.thinking = { type: "enabled" };
+      log(`[${this.getName()}] effort ${effort} -> thinking: enabled (no depth knob; catalog control=${reasoning.control ?? "unknown"}) for ${this.modelId}`);
+      return request;
+    }
+    return this.enableAnthropicThinkingWithBudget(request, effort, "no catalog entry");
+  }
+  enableAnthropicThinkingWithBudget(request, effort, why) {
+    const budget = this.effortToThinkingTokenBudget(effort);
+    request.thinking = budget === undefined ? { type: "enabled" } : { type: "enabled", budget_tokens: budget };
+    log(`[${this.getName()}] effort ${effort} -> thinking: enabled, budget_tokens: ${budget ?? "(model max)"} for ${this.modelId} (${why})`);
     return request;
   }
+  clampToAdvertisedEffort(requested, reasoning) {
+    const advertised = (reasoning.efforts ?? []).filter(isEffortLevel);
+    if (advertised.length === 0) {
+      return isEffortLevel(reasoning.defaultEffort) ? reasoning.defaultEffort : undefined;
+    }
+    if (advertised.includes(requested))
+      return requested;
+    const target = EFFORT_ORDER.indexOf(requested);
+    let best = advertised[0];
+    let bestDistance = Number.POSITIVE_INFINITY;
+    for (const candidate of advertised) {
+      const distance = Math.abs(EFFORT_ORDER.indexOf(candidate) - target);
+      if (distance < bestDistance || distance === bestDistance && EFFORT_ORDER.indexOf(candidate) > EFFORT_ORDER.indexOf(best)) {
+        best = candidate;
+        bestDistance = distance;
+      }
+    }
+    return best;
+  }
+  lookupReasoningCapability() {
+    try {
+      return lookupModelReasoning(this.modelId);
+    } catch {
+      return;
+    }
+  }
+  effortToThinkingTokenBudget(effort) {
+    switch (effort) {
+      case "low":
+        return 2048;
+      case "medium":
+        return 8192;
+      case "high":
+        return 24576;
+      case "xhigh":
+        return 38912;
+      case "max":
+        return;
+      default:
+        return 8192;
+    }
+  }
   resolveEffortLevel(originalRequest) {
     const lvl = originalRequest?.output_config?.effort;
     if (typeof lvl === "string") {
@@ -35412,7 +35631,7 @@ class BaseAPIFormat {
     return true;
   }
   shouldFilterThinking() {
-    return false;
+    return this.isAnthropicWire();
   }
   truncateToolNames(request) {
     const limit = this.getToolNameLimit();
@@ -35451,13 +35670,19 @@ class BaseAPIFormat {
     }
   }
 }
-var EFFORT_ORDER, DefaultAPIFormat;
+var EFFORT_ORDER, NON_ANTHROPIC_REASONING_FIELDS, DefaultAPIFormat;
 var init_base_api_format = __esm(() => {
   init_remote_provider_types();
+  init_logger();
   init_model_catalog();
   init_tool_name_utils();
   init_openai_tools();
   EFFORT_ORDER = ["none", "minimal", "low", "medium", "high", "xhigh", "max"];
+  NON_ANTHROPIC_REASONING_FIELDS = [
+    "reasoning_effort",
+    "enable_thinking",
+    "thinking_budget"
+  ];
   DefaultAPIFormat = class DefaultAPIFormat extends BaseAPIFormat {
     processTextContent(textContent, _accumulatedText) {
       return {
@@ -35707,7 +35932,7 @@ var init_deepseek_model_dialect = __esm(() => {
         wasTransformed: false
       };
     }
-    prepareRequest(request, originalRequest) {
+    applyNativeReasoning(request, originalRequest) {
       const effort = this.resolveEffortLevel(originalRequest);
       if (effort && this.isV4Model()) {
         if (effort === "none" || effort === "minimal") {
@@ -36426,6 +36651,7 @@ data: ${JSON.stringify(d)}
               output_tokens: state.usage?.completion_tokens || 0
             }
           });
+          behavior?.onTurnEnd?.();
           send("message_stop", { type: "message_stop" });
         }
         if (onTokenUpdate) {
@@ -36492,6 +36718,7 @@ data: ${JSON.stringify(d)}
                   });
                 }
                 if (delta.reasoning_content) {
+                  behavior?.onAssistantText?.(delta.reasoning_content, "reasoning");
                   state.lastActivity = Date.now();
                   if (!state.reasoningStarted) {
                     state.reasoningIdx = state.curIdx++;
@@ -36509,6 +36736,8 @@ data: ${JSON.stringify(d)}
                   });
                 }
                 const txt = delta.content || "";
+                if (txt)
+                  behavior?.onAssistantText?.(txt, "text");
                 log(`[Streaming] Text chunk: "${txt.substring(0, 30).replace(/\n/g, "\\n")}" (${txt.length} chars)`);
                 if (txt) {
                   state.lastActivity = Date.now();
@@ -37136,7 +37365,7 @@ var init_glm_model_dialect = __esm(() => {
         wasTransformed: false
       };
     }
-    prepareRequest(request, originalRequest) {
+    applyNativeReasoning(request, originalRequest) {
       const effort = this.resolveEffortLevel(originalRequest);
       if (effort && this.isHybridThinkingModel()) {
         const type = effort === "none" || effort === "minimal" ? "disabled" : "enabled";
@@ -37218,7 +37447,7 @@ var init_grok_model_dialect = __esm(() => {
         wasTransformed: true
       };
     }
-    prepareRequest(request, originalRequest) {
+    applyNativeReasoning(request, originalRequest) {
       const effort = this.resolveEffortLevel(originalRequest);
       if (effort) {
         const value = this.effortToReasoningEffort(effort);
@@ -37310,7 +37539,7 @@ var init_minimax_model_dialect = __esm(() => {
         wasTransformed: false
       };
     }
-    prepareRequest(request, originalRequest) {
+    prepareRequestCommon(request, _originalRequest) {
       if (request.temperature !== undefined) {
         if (request.temperature < TEMPERATURE_RANGE.min) {
           log(`[MiniMaxModelDialect] Clamping temperature ${request.temperature} \u2192 ${TEMPERATURE_RANGE.min} (MiniMax requires >= ${TEMPERATURE_RANGE.min})`);
@@ -37320,6 +37549,9 @@ var init_minimax_model_dialect = __esm(() => {
           request.temperature = TEMPERATURE_RANGE.max;
         }
       }
+      return request;
+    }
+    applyMiniMaxThinking(request, originalRequest) {
       const effort = this.resolveEffortLevel(originalRequest);
       if (effort) {
         const type = effort === "none" ? "disabled" : "adaptive";
@@ -37328,6 +37560,12 @@ var init_minimax_model_dialect = __esm(() => {
       }
       return request;
     }
+    applyNativeReasoning(request, originalRequest) {
+      return this.applyMiniMaxThinking(request, originalRequest);
+    }
+    applyAnthropicWireReasoning(request, originalRequest) {
+      return this.applyMiniMaxThinking(request, originalRequest);
+    }
     getContextWindow() {
       return lookupModel(this.modelId)?.contextWindow ?? 0;
     }
@@ -37365,7 +37603,14 @@ var init_openai_api_format = __esm(() => {
     getMaxToolCount() {
       return 128;
     }
-    prepareRequest(request, originalRequest) {
+    prepareRequestCommon(request, _originalRequest) {
+      this.truncateToolNames(request);
+      if (request.messages) {
+        this.truncateToolNamesInMessages(request.messages);
+      }
+      return request;
+    }
+    applyNativeReasoning(request, originalRequest) {
       if (this.supportsReasoningEffort() && request.reasoning_effort === undefined) {
         const effort = this.resolveReasoningEffort(originalRequest);
         if (effort) {
@@ -37375,10 +37620,6 @@ var init_openai_api_format = __esm(() => {
       }
       if (request.thinking)
         delete request.thinking;
-      this.truncateToolNames(request);
-      if (request.messages) {
-        this.truncateToolNamesInMessages(request.messages);
-      }
       return request;
     }
     shouldHandle(modelId) {
@@ -37536,41 +37777,25 @@ var init_qwen_model_dialect = __esm(() => {
         wasTransformed
       };
     }
-    prepareRequest(request, originalRequest) {
+    applyNativeReasoning(request, originalRequest) {
       const effort = this.resolveEffortLevel(originalRequest);
-      if (effort) {
-        if (effort === "none" || effort === "minimal") {
-          request.enable_thinking = false;
-          log(`[QwenModelDialect] effort ${effort} -> enable_thinking: false for ${this.modelId}`);
-        } else {
-          request.enable_thinking = true;
-          const budget = this.effortToThinkingBudget(effort);
-          if (budget !== undefined) {
-            request.thinking_budget = budget;
-          }
-          log(`[QwenModelDialect] effort ${effort} -> enable_thinking: true, thinking_budget: ${budget ?? "(model max)"} for ${this.modelId}`);
+      if (!effort)
+        return request;
+      if (effort === "none" || effort === "minimal") {
+        request.enable_thinking = false;
+        log(`[QwenModelDialect] effort ${effort} -> enable_thinking: false for ${this.modelId}`);
+      } else {
+        request.enable_thinking = true;
+        const budget = this.effortToThinkingTokenBudget(effort);
+        if (budget !== undefined) {
+          request.thinking_budget = budget;
         }
-        if (originalRequest.thinking)
-          delete request.thinking;
+        log(`[QwenModelDialect] effort ${effort} -> enable_thinking: true, thinking_budget: ${budget ?? "(model max)"} for ${this.modelId}`);
       }
+      if (originalRequest.thinking)
+        delete request.thinking;
       return request;
     }
-    effortToThinkingBudget(effort) {
-      switch (effort) {
-        case "low":
-          return 2048;
-        case "medium":
-          return 8192;
-        case "high":
-          return 24576;
-        case "xhigh":
-          return 38912;
-        case "max":
-          return;
-        default:
-          return 8192;
-      }
-    }
     shouldHandle(modelId) {
       return matchesModelFamily(modelId, "qwen") || matchesModelFamily(modelId, "alibaba");
     }
@@ -37596,17 +37821,20 @@ var init_xiaomi_model_dialect = __esm(() => {
     getToolNameLimit() {
       return 64;
     }
-    prepareRequest(request, originalRequest) {
-      if (originalRequest.thinking) {
-        log("[XiaomiModelDialect] Stripping thinking object (not supported by Xiaomi API)");
-        delete request.thinking;
-      }
+    prepareRequestCommon(request, _originalRequest) {
       this.truncateToolNames(request);
       if (request.messages) {
         this.truncateToolNamesInMessages(request.messages);
       }
       return request;
     }
+    applyNativeReasoning(request, originalRequest) {
+      if (originalRequest.thinking) {
+        log("[XiaomiModelDialect] Stripping thinking object (not supported by Xiaomi API)");
+        delete request.thinking;
+      }
+      return request;
+    }
     shouldHandle(modelId) {
       return matchesModelFamily(modelId, "xiaomi") || matchesModelFamily(modelId, "mimo");
     }
@@ -37626,19 +37854,19 @@ __export(exports_dialect_manager, {
 class DialectManager {
   adapters;
   defaultAdapter;
-  constructor(modelId) {
+  constructor(modelId, wireFormat) {
     this.adapters = [
-      new GrokModelDialect(modelId),
-      new GeminiAPIFormat(modelId),
-      new CodexAPIFormat(modelId),
-      new OpenAIAPIFormat(modelId),
-      new QwenModelDialect(modelId),
-      new MiniMaxModelDialect(modelId),
-      new DeepSeekModelDialect(modelId),
-      new GLMModelDialect(modelId),
-      new XiaomiModelDialect(modelId)
+      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);
+    this.defaultAdapter = new DefaultAPIFormat(modelId, wireFormat);
   }
   getAdapter() {
     for (const adapter of this.adapters) {
@@ -37745,7 +37973,7 @@ ${messages[0].content}`;
       }
       return payload;
     }
-    prepareRequest(request, originalRequest) {
+    prepareRequestCommon(request, originalRequest) {
       this.innerAdapter.prepareRequest(request, originalRequest);
       for (const [k, v] of this.innerAdapter.getToolNameMap()) {
         this.toolNameMap.set(k, v);
@@ -37931,7 +38159,7 @@ ${text}`;
       }
       return payload;
     }
-    prepareRequest(request, originalRequest) {
+    prepareRequestCommon(request, originalRequest) {
       return this.innerAdapter.prepareRequest(request, originalRequest);
     }
     getToolNameMap() {
@@ -37967,24 +38195,44 @@ function parseBehaviorConfig(raw2) {
   }
   return result.data;
 }
-function resolveSeverity(ruleId, defaultSeverity, config2) {
+function resolveSeverity(ruleId, defaultSeverity, config2, modelId) {
   const rules = config2.rules;
   if (!rules)
     return defaultSeverity;
-  const exact = rules[ruleId];
-  if (exact)
-    return exact;
+  if (modelId) {
+    const scoped = bestMatch(rules, ruleId, modelId);
+    if (scoped)
+      return scoped;
+  }
+  return bestMatch(rules, ruleId, undefined) ?? defaultSeverity;
+}
+function bestMatch(rules, ruleId, modelId) {
   let best = null;
-  for (const [pattern, severity] of Object.entries(rules)) {
-    if (!pattern.includes("*"))
+  for (const [key, severity] of Object.entries(rules)) {
+    const { model: keyModel, rule: keyRule } = parseRuleKey(key);
+    if (!scopeMatches(keyModel, modelId))
       continue;
-    if (!globMatches(pattern, ruleId))
+    if (!globMatches(keyRule, ruleId))
       continue;
-    const len = pattern.replace(/\*/g, "").length;
-    if (!best || len > best.len)
-      best = { len, severity };
+    const score = specificity(keyRule);
+    if (!best || score > best.score)
+      best = { score, severity };
   }
-  return best ? best.severity : defaultSeverity;
+  return best ? best.severity : null;
+}
+function parseRuleKey(key) {
+  const sep = key.indexOf(":");
+  if (sep <= 0 || key.startsWith("hook:"))
+    return { rule: key };
+  return { model: key.slice(0, sep), rule: key.slice(sep + 1) };
+}
+function scopeMatches(keyModel, modelId) {
+  if (modelId === undefined)
+    return keyModel === undefined;
+  return keyModel !== undefined && globMatches(keyModel, modelId);
+}
+function specificity(pattern) {
+  return pattern.includes("*") ? pattern.replace(/\*/g, "").length : Number.MAX_SAFE_INTEGER;
 }
 function globMatches(pattern, value) {
   const escaped = pattern.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*");
@@ -38011,6 +38259,41 @@ var init_config = __esm(() => {
 });
 
 // src/behavior/harness.ts
+function extractAvailableSkills(systemText) {
+  if (!systemText)
+    return [];
+  const start = SKILL_SECTION.exec(systemText);
+  if (!start)
+    return [];
+  const out = [];
+  const body = systemText.slice(start.index + start[0].length);
+  for (const line of body.split(`
+`)) {
+    const trimmed = line.trim();
+    if (!trimmed)
+      continue;
+    const m = SKILL_LINE.exec(trimmed);
+    if (!m) {
+      if (out.length > 0)
+        break;
+      continue;
+    }
+    out.push({ name: m[1], description: m[2].trim() });
+  }
+  return out;
+}
+function extractSessionId(claudeRequest) {
+  const raw2 = claudeRequest?.metadata?.user_id;
+  if (typeof raw2 !== "string")
+    return;
+  try {
+    const parsed = JSON.parse(raw2);
+    const id = parsed?.session_id;
+    return typeof id === "string" && id.length > 0 ? id : undefined;
+  } catch {
+    return;
+  }
+}
 function textOf(value) {
   if (!value)
     return "";
@@ -38062,7 +38345,7 @@ function detectHarnessFacts(claudeRequest) {
   }
   return facts;
 }
-var PLAN_PATH_PATTERNS, PLAN_MODE_HINT;
+var PLAN_PATH_PATTERNS, PLAN_MODE_HINT, SKILL_SECTION, SKILL_LINE;
 var init_harness = __esm(() => {
   PLAN_PATH_PATTERNS = [
     /You should create your plan at\s+(\S+?\.md)/,
@@ -38070,10 +38353,12 @@ var init_harness = __esm(() => {
     /Read-only except plan file\s*\(([^)]+\.md)\)/
   ];
   PLAN_MODE_HINT = /plan file|create your plan at|Plan mode is active|Plan mode still active/i;
+  SKILL_SECTION = /The following skills are available[^\n]*\n/;
+  SKILL_LINE = /^-\s+([a-z0-9][a-z0-9:_-]*):\s*(.+)$/i;
 });
 
 // src/behavior/journal.ts
-import { appendFile as appendFile2, mkdir, stat } from "fs/promises";
+import { appendFile as appendFile2, mkdir, readFile, rename, stat, writeFile } from "fs/promises";
 import { homedir as homedir18 } from "os";
 import { dirname as dirname6, join as join18 } from "path";
 function classifyPath(observed, expected) {
@@ -38089,28 +38374,46 @@ function classifyPath(observed, expected) {
 function journalPath() {
   return join18(homedir18(), ".claudish", "behavior-journal.jsonl");
 }
+async function prune(path) {
+  const content = await readFile(path, "utf8");
+  const lines = content.split(`
+`).filter(Boolean);
+  let kept = 0;
+  let firstKept = lines.length;
+  for (let i = lines.length - 1;i >= 0; i--) {
+    const cost = Buffer.byteLength(lines[i]) + 1;
+    if (kept + cost > PRUNE_TO_BYTES)
+      break;
+    kept += cost;
+    firstKept = i;
+  }
+  const survivors = lines.slice(firstKept);
+  const tmp = `${path}.pruning`;
+  await writeFile(tmp, survivors.length ? `${survivors.join(`
+`)}
+` : "");
+  await rename(tmp, path);
+  log(`[behavior:journal] pruned ${lines.length - survivors.length} of ${lines.length} entries ` + `to stay under ${Math.round(MAX_JOURNAL_BYTES / 1e6)}MB`);
+}
 async function recordDecision(entry, path = journalPath()) {
   try {
     const size = await stat(path).then((s) => s.size, () => 0);
-    if (size > MAX_JOURNAL_BYTES) {
-      if (!capWarned) {
-        capWarned = true;
-        log(`[behavior:journal] ${path} exceeded ${Math.round(MAX_JOURNAL_BYTES / 1e6)}MB \u2014 ` + "no longer recording. Archive or delete it to resume.");
-      }
-      return;
-    }
     if (size === 0)
       await mkdir(dirname6(path), { recursive: true }).catch(() => {});
+    if (size > MAX_JOURNAL_BYTES) {
+      await prune(path).catch((err) => log(`[behavior:journal] prune failed: ${err}`));
+    }
     await appendFile2(path, `${JSON.stringify(entry)}
 `);
   } catch (err) {
     log(`[behavior:journal] could not record: ${err}`);
   }
 }
-var MAX_JOURNAL_BYTES, capWarned = false;
+var MAX_JOURNAL_BYTES, PRUNE_TO_BYTES;
 var init_journal = __esm(() => {
   init_logger();
   MAX_JOURNAL_BYTES = 32 * 1024 * 1024;
+  PRUNE_TO_BYTES = Math.floor(MAX_JOURNAL_BYTES * 0.6);
 });
 
 // src/behavior/observer/digest.ts
@@ -38327,13 +38630,23 @@ class BehaviorSession {
   modelId;
   providerName;
   config;
+  engine;
   facts = { planModeActive: false };
   bufferedTools = new Set;
-  constructor(active, modelId, providerName, config2 = {}) {
+  textBuf = "";
+  reasoningBuf = "";
+  toolsCalled = [];
+  sessionId;
+  systemText = "";
+  get watchesOutput() {
+    return this.active.some((a) => typeof a.rule.onModelOutput === "function");
+  }
+  constructor(active, modelId, providerName, config2 = {}, engine = { queueCorrection() {}, drainCorrections: () => [] }) {
     this.active = active;
     this.modelId = modelId;
     this.providerName = providerName;
     this.config = config2;
+    this.engine = engine;
   }
   get observerOn() {
     return this.config.observer?.enabled === true && (this.config.observer.mode ?? "suggest") !== "off";
@@ -38367,7 +38680,26 @@ class BehaviorSession {
     if (this.active.length === 0)
       return;
     this.facts = detectHarnessFacts(claudeRequest);
+    this.sessionId = extractSessionId(claudeRequest);
+    this.systemText = typeof claudeRequest?.system === "string" ? claudeRequest.system : String(claudeRequest?.system ?? "");
+    this.facts.sessionId = this.sessionId;
+    this.facts.skills = extractAvailableSkills(this.systemText);
     this.armBuffering();
+    if (this.sessionId) {
+      for (const text of this.engine.drainCorrections(this.sessionId)) {
+        this.applyAction("behavior/pending-correction", "fix", { type: "injectSystemNote", text }, {
+          modelId: this.modelId,
+          providerName: this.providerName,
+          isNativeAnthropic: false,
+          claudeRequest,
+          claudeTools,
+          tools,
+          messages,
+          systemText: this.systemText,
+          harness: this.facts
+        });
+      }
+    }
     const ctx = {
       modelId: this.modelId,
       providerName: this.providerName,
@@ -38376,6 +38708,7 @@ class BehaviorSession {
       claudeTools,
       tools,
       messages,
+      systemText: this.systemText,
       harness: this.facts
     };
     for (const { rule, severity } of this.active) {
@@ -38395,6 +38728,66 @@ class BehaviorSession {
   interceptsTool(toolName) {
     return this.bufferedTools.has(toolName);
   }
+  observeText(text, kind = "text") {
+    if (!this.watchesOutput || !text)
+      return;
+    const buf = kind === "reasoning" ? this.reasoningBuf : this.textBuf;
+    if (buf.length >= MAX_OBSERVED_CHARS)
+      return;
+    if (kind === "reasoning")
+      this.reasoningBuf += text;
+    else
+      this.textBuf += text;
+  }
+  observeToolCall(toolName) {
+    if (!this.watchesOutput)
+      return;
+    if (this.toolsCalled.length < MAX_OBSERVED_TOOLS)
+      this.toolsCalled.push(toolName);
+  }
+  finishTurn() {
+    if (!this.watchesOutput)
+      return;
+    const ctx = {
+      modelId: this.modelId,
+      providerName: this.providerName,
+      text: this.textBuf,
+      reasoning: this.reasoningBuf,
+      toolsCalled: this.toolsCalled,
+      harness: this.facts
+    };
+    for (const { rule, severity } of this.active) {
+      if (!rule.onModelOutput)
+        continue;
+      let actions = [];
+      try {
+        actions = rule.onModelOutput(ctx) ?? [];
+      } catch (err) {
+        log(`[behavior] rule ${rule.id} onModelOutput threw: ${err}`);
+        continue;
+      }
+      for (const action of actions) {
+        if (action.type === "warn") {
+          log(`[behavior] ${rule.id} (output): ${action.message}`);
+          this.journal("model_output", "warned", { ruleId: rule.id, note: action.message });
+          continue;
+        }
+        if (action.type !== "injectSystemNote")
+          continue;
+        if (severity !== "fix") {
+          this.journal("model_output", "warned", { ruleId: rule.id, note: "correction withheld" });
+          continue;
+        }
+        if (this.sessionId)
+          this.engine.queueCorrection(this.sessionId, action.text);
+        this.journal("model_output", "matched", { ruleId: rule.id, note: "correction queued" });
+        log(`[behavior] ${rule.id} queued a correction for the next request`);
+      }
+    }
+    this.textBuf = "";
+    this.reasoningBuf = "";
+    this.toolsCalled = [];
+  }
   repairToolCall(toolName, rawArgs) {
     if (!this.bufferedTools.has(toolName))
       return null;
@@ -38562,15 +38955,32 @@ ${action.text}`;
 class BehaviorEngine {
   config;
   rules;
+  corrections = new Map;
   constructor(config2, rules) {
     this.config = config2;
     this.rules = rules;
   }
+  queueCorrection(key, text) {
+    const list = this.corrections.get(key) ?? [];
+    list.push(text);
+    this.corrections.set(key, list);
+    while (this.corrections.size > MAX_TRACKED_CONVERSATIONS) {
+      const oldest = this.corrections.keys().next().value;
+      if (oldest === undefined)
+        break;
+      this.corrections.delete(oldest);
+    }
+  }
+  drainCorrections(key) {
+    const list = this.corrections.get(key) ?? [];
+    this.corrections.delete(key);
+    return list;
+  }
   startSession(params) {
     const active = [];
     if (!params.isNativeAnthropic) {
       for (const rule of this.rules) {
-        const severity = resolveSeverity(rule.id, rule.defaultSeverity, this.config);
+        const severity = resolveSeverity(rule.id, rule.defaultSeverity, this.config, params.modelId);
         if (severity === "off")
           continue;
         let applies = false;
@@ -38587,14 +38997,16 @@ class BehaviorEngine {
     if (active.length > 0) {
       log(`[behavior] ${active.length} rule(s) active for ${params.modelId}: ` + active.map((a) => `${a.rule.id}=${a.severity}`).join(", "));
     }
-    return new BehaviorSession(active, params.modelId, params.providerName, this.config);
+    return new BehaviorSession(active, params.modelId, params.providerName, this.config, this);
   }
 }
+var MAX_OBSERVED_CHARS, MAX_OBSERVED_TOOLS = 200, MAX_TRACKED_CONVERSATIONS = 64;
 var init_engine = __esm(() => {
   init_logger();
   init_config();
   init_harness();
   init_journal();
+  MAX_OBSERVED_CHARS = 64 * 1024;
 });
 
 // src/behavior/rules/plan-mode.ts
@@ -40104,7 +40516,8 @@ var init_telemetry = __esm(() => {
     "x-ai",
     "minimax-coding",
     "kimi-coding",
-    "glm-coding"
+    "glm-coding",
+    "qwen-cloud"
   ]);
 });
 
@@ -40602,6 +41015,60 @@ var init_connection_error = __esm(() => {
   BUN_CONNECT_MESSAGE = /unable to connect\. is the computer able to access the url\?/i;
 });
 
+// src/handlers/shared/context-window-fallback.ts
+function isDisabled() {
+  if (process.env.CLAUDISH_NO_CATALOG_FALLBACK)
+    return true;
+  return false;
+}
+function resolveCatalogContextWindow(modelId) {
+  if (!modelId || isDisabled())
+    return Promise.resolve(null);
+  const cached2 = results.get(modelId);
+  if (cached2 !== undefined)
+    return Promise.resolve(cached2);
+  const pending = inFlight2.get(modelId);
+  if (pending)
+    return pending;
+  const promise3 = fetcher(modelId).then((cw) => {
+    const value = typeof cw === "number" && cw > 0 ? cw : null;
+    results.set(modelId, value);
+    return value;
+  }).catch((err) => {
+    results.set(modelId, null);
+    log(`[ContextWindow] Catalog lookup failed for ${modelId}: ${err}`);
+    return null;
+  }).finally(() => {
+    inFlight2.delete(modelId);
+  });
+  inFlight2.set(modelId, promise3);
+  return promise3;
+}
+function requestCatalogContextWindow(modelId, apply) {
+  resolveCatalogContextWindow(modelId).then((cw) => {
+    if (cw === null)
+      return;
+    try {
+      apply(cw);
+      log(`[ContextWindow] Resolved ${modelId} = ${cw} tokens from the cloud catalog`);
+    } catch (err) {
+      log(`[ContextWindow] Failed to apply catalog window for ${modelId}: ${err}`);
+    }
+  });
+}
+var defaultFetcher = async (modelId) => {
+  const doc2 = await getModelByIdFromFirebase(modelId);
+  const cw = doc2?.contextWindow;
+  return typeof cw === "number" && cw > 0 ? cw : null;
+}, fetcher, results, inFlight2;
+var init_context_window_fallback = __esm(() => {
+  init_logger();
+  init_model_loader();
+  fetcher = defaultFetcher;
+  results = new Map;
+  inFlight2 = new Map;
+});
+
 // src/handlers/shared/stream-head-sniffer.ts
 function isRetryableStreamError(code, type, message) {
   if (RETRYABLE_ERROR_CODES.has(code))
@@ -40737,6 +41204,12 @@ var init_stream_head_sniffer = __esm(() => {
 });
 
 // src/handlers/shared/stream-parsers/anthropic-sse.ts
+function sseDataPayload(line) {
+  if (!line.startsWith("data:"))
+    return null;
+  const rest = line.slice(5);
+  return rest.startsWith(" ") ? rest.slice(1) : rest;
+}
 function createToolRepairInterceptor(opts) {
   const heldTools = new Map;
   const flush = (index, stopFrame) => {
@@ -40809,12 +41282,24 @@ function createAnthropicPassthroughStream(c, response, opts) {
   let pingInterval = null;
   const filterThinking = opts.adapter?.shouldFilterThinking() ?? false;
   const interceptToolFrame = createToolRepairInterceptor(opts);
+  let pendingEventLine = null;
+  const flushPendingEvent = (controller) => {
+    if (pendingEventLine !== null && !isClosed) {
+      controller.enqueue(encoder.encode(`${pendingEventLine}
+`));
+    }
+    pendingEventLine = null;
+  };
   const enqueueData = (controller, data, line) => {
     if (isClosed)
       return;
     const out = interceptToolFrame(data, line);
-    if (out !== null)
-      controller.enqueue(encoder.encode(out));
+    if (out === null) {
+      pendingEventLine = null;
+      return;
+    }
+    flushPendingEvent(controller);
+    controller.enqueue(encoder.encode(out));
   };
   return c.body(new ReadableStream({
     async start(controller) {
@@ -40843,6 +41328,7 @@ data: {"type":"ping"}
         let stopReason = null;
         let insideThinkingBlock = false;
         let thinkingBlocksSuppressed = 0;
+        let suppressedFrame = false;
         while (true) {
           const { done, value } = await reader.read();
           if (done)
@@ -40854,9 +41340,10 @@ data: {"type":"ping"}
           buffer = lines.pop() || "";
           for (const line of lines) {
             totalLines++;
-            if (filterThinking && line.startsWith("data: ")) {
+            const payload = sseDataPayload(line);
+            if (filterThinking && payload !== null) {
               try {
-                const data = JSON.parse(line.slice(6));
+                const data = JSON.parse(payload);
                 if (data.error) {
                   const errMsg = data.error.message || JSON.stringify(data.error);
                   log(`[AnthropicSSE] In-stream error detected: ${errMsg}`);
@@ -40881,19 +41368,26 @@ data: ${JSON.stringify({
                   insideThinkingBlock = true;
                   thinkingBlocksSuppressed++;
                   log(`[AnthropicSSE] Filtering thinking block at index ${data.index}`);
+                  pendingEventLine = null;
+                  suppressedFrame = true;
                   continue;
                 }
                 if (insideThinkingBlock && data.type === "content_block_stop") {
                   insideThinkingBlock = false;
+                  pendingEventLine = null;
+                  suppressedFrame = true;
                   continue;
                 }
                 if (insideThinkingBlock) {
+                  pendingEventLine = null;
+                  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}
 `));
                   }
@@ -40902,14 +41396,15 @@ data: ${JSON.stringify({
                 }
               } catch {
                 if (!isClosed) {
+                  flushPendingEvent(controller);
                   controller.enqueue(encoder.encode(`${line}
 `));
                 }
               }
             } else {
-              if (!filterThinking && line.startsWith("data: ")) {
+              if (!filterThinking && payload !== null) {
                 try {
-                  const data = JSON.parse(line.slice(6));
+                  const data = JSON.parse(payload);
                   if (data.error) {
                     const errMsg = data.error.message || JSON.stringify(data.error);
                     log(`[AnthropicSSE] In-stream error detected: ${errMsg}`);
@@ -40941,11 +41436,13 @@ data: ${JSON.stringify({
                   }
                   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) {
@@ -40957,6 +41454,15 @@ data: ${JSON.stringify({
 `));
                   }
                 }
+              } else if (filterThinking) {
+                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}
@@ -40964,9 +41470,9 @@ data: ${JSON.stringify({
                 }
               }
             }
-            if (filterThinking && line.startsWith("data: ")) {
+            if (filterThinking && payload !== null) {
               try {
-                const data = JSON.parse(line.slice(6));
+                const data = JSON.parse(payload);
                 if (data.message?.usage) {
                   inputTokens = data.message.usage.input_tokens || inputTokens;
                   outputTokens = data.message.usage.output_tokens || outputTokens;
@@ -40976,10 +41482,12 @@ data: ${JSON.stringify({
                   outputTokens = data.usage.output_tokens || outputTokens;
                 }
                 if (data.type === "content_block_delta" && data.delta?.type === "text_delta") {
+                  opts.onAssistantText?.(data.delta.text || "", "text");
                   textChunks++;
                 }
                 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) {
@@ -40990,6 +41498,7 @@ data: ${JSON.stringify({
           }
         }
         log(`[AnthropicSSE] Stream complete for ${opts.modelName}: ${totalLines} lines, ${textChunks} text chunks, ${toolUseBlocks} tool_use blocks, stop_reason=${stopReason}${filterThinking ? `, filtered ${thinkingBlocksSuppressed} thinking blocks` : ""}`);
+        opts.onTurnEnd?.();
         if (opts.onTokenUpdate) {
           opts.onTokenUpdate(inputTokens, outputTokens);
         }
@@ -41118,6 +41627,7 @@ data: ${JSON.stringify(data)}
               output_tokens: outputTokens
             }
           });
+          opts.onTurnEnd?.();
           send("message_stop", { type: "message_stop" });
         }
         if (!isClosed) {
@@ -41225,6 +41735,7 @@ data: ${JSON.stringify(data)}
                     const toolIdx = toolCalls.size;
                     const toolId = `toolu_${Date.now()}_${toolIdx}`;
                     const blockIndex = curIdx++;
+                    opts.onToolCallObserved?.(part.functionCall.name);
                     let args = JSON.stringify(part.functionCall.args || {});
                     if (opts.repairToolArgs) {
                       try {
@@ -41563,6 +42074,7 @@ data: ${JSON.stringify(data)}
                 log(`[ResponsesSSE] Event: ${event.type}`);
               }
               if (event.type === "response.output_text.delta") {
+                opts.onAssistantText?.(event.delta ?? "", "text");
                 closeReasoning();
                 if (textIdx < 0) {
                   textIdx = curIdx++;
@@ -41598,6 +42110,7 @@ data: ${JSON.stringify(data)}
                     functionCalls.set(itemId, fnCallData);
                   }
                   openToolBlocks.add(fnCallData);
+                  opts.onToolCallObserved?.(fnName);
                   if (pendingReasoning.length > 0) {
                     rememberReasoningForCall(callId, pendingReasoning);
                     pendingReasoning = [];
@@ -41610,6 +42123,7 @@ data: ${JSON.stringify(data)}
                   hasToolUse = true;
                 }
               } else if (event.type === "response.reasoning_summary_text.delta") {
+                opts.onAssistantText?.(event.delta ?? "", "reasoning");
                 const summaryIndex = typeof event.summary_index === "number" ? event.summary_index : 0;
                 if (reasoningIdx < 0) {
                   closeText();
@@ -41772,6 +42286,7 @@ data: ${JSON.stringify(data)}
         if (opts.middlewareManager) {
           await opts.middlewareManager.afterStreamComplete(opts.modelName, streamMetadata);
         }
+        opts.onTurnEnd?.();
         safeClose();
       } catch (error46) {
         if (pingInterval) {
@@ -41838,6 +42353,10 @@ var init_openai_responses_sse = __esm(() => {
 import { mkdirSync as mkdirSync10, writeFileSync as writeFileSync10 } from "fs";
 import { homedir as homedir22 } from "os";
 import { dirname as dirname7, join as join22 } from "path";
+function stripProviderPrefix(name) {
+  const at = name.indexOf("@");
+  return at === -1 ? name : name.slice(at + 1);
+}
 
 class TokenTracker {
   port;
@@ -41928,6 +42447,9 @@ class TokenTracker {
   setContextWindow(contextWindow) {
     this.config.contextWindow = contextWindow;
   }
+  getContextWindow() {
+    return this.config.contextWindow;
+  }
   getTotalCost() {
     return this.sessionTotalCost;
   }
@@ -41974,8 +42496,9 @@ class TokenTracker {
         is_free: isFreeModel,
         is_estimated: isEstimate || false
       };
-      if (this.modelNameOverride) {
-        data.model_name = this.modelNameOverride;
+      const displayModel = stripProviderPrefix(this.modelNameOverride || this.config.modelName || "");
+      if (displayModel) {
+        data.model_name = displayModel;
       }
       if (this.quotaRemaining !== undefined) {
         data.quota_remaining = this.quotaRemaining;
@@ -42026,7 +42549,7 @@ class ComposedHandler {
     this.options = options;
     this.explicitAdapter = options.adapter;
     this.isInteractive = options.isInteractive ?? false;
-    this.adapterManager = new DialectManager(this.bareModelName);
+    this.adapterManager = new DialectManager(this.bareModelName, this.explicitAdapter?.getStreamFormat());
     const resolvedModelAdapter = this.adapterManager.getAdapter();
     if (resolvedModelAdapter.getName() !== "DefaultAPIFormat") {
       this.modelAdapter = resolvedModelAdapter;
@@ -42209,7 +42732,13 @@ class ComposedHandler {
       }
     }
     if (this.provider.getContextWindow) {
-      this.tokenTracker.setContextWindow(this.provider.getContextWindow());
+      const providerWindow = this.provider.getContextWindow();
+      if (providerWindow > 0) {
+        this.tokenTracker.setContextWindow(providerWindow);
+      }
+    }
+    if (this.tokenTracker.getContextWindow() <= 0) {
+      requestCatalogContextWindow(this.bareModelName, (cw) => this.tokenTracker.setContextWindow(cw));
     }
     if (this.provider.transformPayload) {
       requestPayload = this.provider.transformPayload(requestPayload);
@@ -42574,7 +43103,10 @@ class ComposedHandler {
       case "openai-sse":
         return createStreamingResponseHandler(c, response, adapter, this.bareModelName, this.middlewareManager, onTokenUpdate, claudeRequest.tools, toolNameMap, priorInputTokens, behaviorSession && {
           shouldBufferTool: (name) => behaviorSession.interceptsTool(name),
-          onToolCall: (name, argsJson) => behaviorSession.repairToolCall(name, argsJson)
+          onToolCall: (name, argsJson) => behaviorSession.repairToolCall(name, argsJson),
+          onAssistantText: (text, kind) => behaviorSession.observeText(text, kind),
+          onToolCallObserved: (name) => behaviorSession.observeToolCall(name),
+          onTurnEnd: () => behaviorSession.finishTurn()
         });
       case "openai-responses-sse":
         return createResponsesStreamHandler(c, response, {
@@ -42586,15 +43118,21 @@ class ComposedHandler {
           priorInputTokens,
           middlewareManager: this.middlewareManager,
           shouldBufferTool: (name) => behaviorSession?.interceptsTool(name) ?? false,
-          onToolCall: (name, argsJson) => behaviorSession?.repairToolCall(name, argsJson) ?? null
+          onToolCall: (name, argsJson) => behaviorSession?.repairToolCall(name, argsJson) ?? null,
+          onAssistantText: (text, kind) => behaviorSession?.observeText(text, kind),
+          onToolCallObserved: (name) => behaviorSession?.observeToolCall(name),
+          onTurnEnd: () => behaviorSession?.finishTurn()
         });
       case "anthropic-sse":
         return createAnthropicPassthroughStream(c, response, {
           modelName: this.bareModelName,
           onTokenUpdate,
-          adapter,
+          adapter: this.modelAdapter ?? adapter,
           shouldBufferTool: (name) => behaviorSession?.interceptsTool(name) ?? false,
-          repairToolArgs: (name, argsJson) => behaviorSession?.repairToolCall(name, argsJson) ?? null
+          repairToolArgs: (name, argsJson) => behaviorSession?.repairToolCall(name, argsJson) ?? null,
+          onAssistantText: (text, kind) => behaviorSession?.observeText(text, kind),
+          onToolCallObserved: (name) => behaviorSession?.observeToolCall(name),
+          onTurnEnd: () => behaviorSession?.finishTurn()
         });
       case "gemini-sse": {
         const onToolCall = (toolId, name, thoughtSignature) => {
@@ -42609,6 +43147,9 @@ class ComposedHandler {
           onTokenUpdate,
           onToolCall,
           repairToolArgs: (name, argsJson) => behaviorSession?.repairToolCall(name, argsJson) ?? null,
+          onAssistantText: (text, kind) => behaviorSession?.observeText(text, kind),
+          onToolCallObserved: (name) => behaviorSession?.observeToolCall(name),
+          onTurnEnd: () => behaviorSession?.finishTurn(),
           unwrapResponse: this.options.unwrapGeminiResponse,
           priorInputTokens
         });
@@ -42694,6 +43235,7 @@ var init_composed_handler = __esm(() => {
   init_transform();
   init_anthropic_error();
   init_connection_error();
+  init_context_window_fallback();
   init_openai_compat();
   init_stream_head_sniffer();
   init_anthropic_sse();
@@ -43151,11 +43693,11 @@ ${a.text}`).join(`
   }
 }
 async function fetchMultiModelAdvice(_toolUseId, messages, models, collector, apiKeys) {
-  const results = await Promise.allSettled(models.map((model) => callAdvisorModel(model, messages, apiKeys)));
+  const results2 = await Promise.allSettled(models.map((model) => callAdvisorModel(model, messages, apiKeys)));
   const sections = [];
   const successfulAdvice = [];
   for (let i = 0;i < models.length; i++) {
-    const result = results[i];
+    const result = results2[i];
     if (result.status === "fulfilled") {
       sections.push(`## ${models[i]}
 ${result.value}`);
@@ -43474,6 +44016,7 @@ var init_api_key_map = __esm(() => {
       envVar: "SAKANA_SUBSCRIPTION_API_KEY",
       aliases: ["SAKANA_CODING_API_KEY"]
     },
+    "qwen-cloud": { envVar: "QWEN_CLOUD_PLAN_API_KEY" },
     ollamacloud: { envVar: "OLLAMA_API_KEY" },
     "opencode-zen": { envVar: "OPENCODE_API_KEY" },
     "opencode-zen-go": { envVar: "OPENCODE_API_KEY" },
@@ -43699,90 +44242,127 @@ var init_config_schema = __esm(() => {
   DefaultProviderSchema = exports_external.union([BuiltinDefaultProviderSchema, exports_external.string().min(1)]);
 });
 
-// src/providers/transport/anthropic-compat.ts
-class AnthropicProviderTransport {
-  name;
-  displayName;
-  streamFormat = "anthropic-sse";
-  provider;
-  apiKey;
-  constructor(provider, apiKey) {
-    this.provider = provider;
-    this.apiKey = apiKey;
-    this.name = provider.name;
-    this.displayName = AnthropicProviderTransport.formatDisplayName(provider.name);
+// src/providers/model-discovery.ts
+function resolveBaseUrl2(catalogName) {
+  const def = getProviderByName(catalogName);
+  if (!def)
+    return null;
+  for (const envVar of def.baseUrlEnvVars ?? []) {
+    const v = process.env[envVar];
+    if (v)
+      return v.replace(/\/+$/, "");
   }
-  getEndpoint() {
-    return `${this.provider.baseUrl}${this.provider.apiPath}`;
+  return (def.baseUrl || "").replace(/\/+$/, "") || null;
+}
+function readContextWindow(row) {
+  for (const field of ["context_length", "context_window", "max_context_length"]) {
+    const v = row[field];
+    if (typeof v === "number" && Number.isFinite(v) && v > 0)
+      return v;
   }
-  async getHeaders() {
-    const headers = {
-      "anthropic-version": "2023-06-01"
-    };
-    if (this.provider.authScheme === "bearer") {
-      headers.Authorization = `Bearer ${this.apiKey}`;
-    } else {
-      headers["x-api-key"] = this.apiKey;
-    }
-    if (this.provider.headers) {
-      Object.assign(headers, this.provider.headers);
-    }
-    if (this.provider.name === "kimi-coding") {
-      try {
-        const auth = await credentials.getRequestAuth("kimi-coding", { model: "" });
-        if (auth.headers.Authorization) {
-          delete headers["x-api-key"];
-        }
-        Object.assign(headers, auth.headers);
-      } catch (e) {
-        log(`[${this.displayName}] OAuth path failed, falling back to API key: ${e.message}`);
-      }
-    }
-    return headers;
+  return;
+}
+function readCreatedDate(row) {
+  const raw2 = row.created;
+  const seconds = typeof raw2 === "number" ? raw2 : typeof raw2 === "string" ? Number(raw2) : NaN;
+  if (!Number.isFinite(seconds))
+    return;
+  if (seconds < MIN_CREATED_SECONDS || seconds > MAX_CREATED_SECONDS)
+    return;
+  const iso = new Date(seconds * 1000).toISOString();
+  return iso.slice(0, 10);
+}
+function parseOpenAIModelsList(body) {
+  const data = body?.data;
+  if (!Array.isArray(data))
+    return [];
+  const models = [];
+  for (const raw2 of data) {
+    if (!raw2 || typeof raw2 !== "object")
+      continue;
+    const row = raw2;
+    const id = row.id;
+    if (typeof id !== "string" || id.trim().length === 0)
+      continue;
+    const displayName = typeof row.display_name === "string" ? row.display_name : undefined;
+    models.push({
+      id,
+      displayName,
+      contextWindow: readContextWindow(row),
+      releaseDate: readCreatedDate(row)
+    });
   }
-  async enqueueRequest(fetchFn) {
-    const maxRetries = 2;
-    let lastResponse = null;
-    for (let attempt = 0;attempt <= maxRetries; attempt++) {
-      const response = await fetchFn();
-      if (response.status === 429 && attempt < maxRetries) {
-        const bodyText = await response.clone().text().catch(() => "");
-        if (isTerminal429(bodyText)) {
-          log(`[${this.displayName}] 429 is terminal (billing/quota), not retrying`);
-          return response;
-        }
-        lastResponse = response;
-        const retryAfter = response.headers.get("Retry-After");
-        let delayMs;
-        if (retryAfter && !Number.isNaN(Number(retryAfter))) {
-          delayMs = Math.min(Number(retryAfter) * 1000, 2000);
-        } else {
-          delayMs = 500 * (attempt + 1);
-        }
-        log(`[${this.displayName}] 429 rate limited, retry ${attempt + 1}/${maxRetries} in ${(delayMs / 1000).toFixed(1)}s`);
-        await new Promise((resolve2) => setTimeout(resolve2, delayMs));
-        continue;
-      }
-      return response;
-    }
-    return lastResponse;
+  return models;
+}
+async function discoverProviderModels(providerName) {
+  const cached2 = _cache.get(providerName);
+  if (cached2 && cached2.expiresAt > Date.now())
+    return cached2.models;
+  const def = getProviderByName(providerName);
+  const descriptor = def?.modelDiscovery;
+  if (!def || !descriptor)
+    return [];
+  const baseUrl = resolveBaseUrl2(providerName);
+  if (!baseUrl)
+    return [];
+  const endpoint = `${baseUrl}${descriptor.path}`;
+  let headers = {};
+  try {
+    const auth = await credentials.getRequestAuth(providerName, { model: "" });
+    headers = { ...auth.headers };
+  } catch (e) {
+    log(`[model-discovery:${providerName}] no credentials, skipping: ${e?.message}`);
+    return [];
   }
-  static formatDisplayName(name) {
-    const map3 = {
-      minimax: "MiniMax",
-      "minimax-coding": "MiniMax Coding",
-      kimi: "Kimi",
-      "kimi-coding": "Kimi Coding",
-      moonshot: "Kimi",
-      "z-ai": "Z.AI"
-    };
-    return map3[name.toLowerCase()] || name.charAt(0).toUpperCase() + name.slice(1);
+  let response;
+  try {
+    response = await fetch(endpoint, {
+      method: "GET",
+      headers,
+      signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
+    });
+  } catch (e) {
+    log(`[model-discovery:${providerName}] fetch failed: ${e?.message}`);
+    return [];
+  }
+  if (!response.ok) {
+    log(`[model-discovery:${providerName}] HTTP ${response.status} from ${endpoint}`);
+    return [];
   }
+  let body;
+  try {
+    body = await response.json();
+  } catch {
+    log(`[model-discovery:${providerName}] response was not JSON`);
+    return [];
+  }
+  const models = parseOpenAIModelsList(body);
+  if (models.length === 0) {
+    log(`[model-discovery:${providerName}] endpoint reachable but listed no models`);
+    return [];
+  }
+  log(`[model-discovery:${providerName}] discovered ${models.length} models: ` + models.map((m) => `${m.id}(${m.contextWindow ?? "?"})`).join(", "));
+  _cache.set(providerName, { models, expiresAt: Date.now() + CACHE_TTL_MS });
+  return models;
 }
-var init_anthropic_compat = __esm(() => {
+async function discoverContextWindow(providerName, modelId) {
+  const models = await discoverProviderModels(providerName);
+  const match2 = models.find((m) => m.id.toLowerCase() === modelId.toLowerCase());
+  return match2?.contextWindow;
+}
+function rankDiscoveredModels(models) {
+  return [...models].sort((a, b) => {
+    const diff = (b.contextWindow ?? 0) - (a.contextWindow ?? 0);
+    return diff !== 0 ? diff : a.id.localeCompare(b.id);
+  });
+}
+var CACHE_TTL_MS, FETCH_TIMEOUT_MS = 5000, _cache, MIN_CREATED_SECONDS = 946684800, MAX_CREATED_SECONDS = 4102444800;
+var init_model_discovery = __esm(() => {
   init_authority();
   init_logger();
-  init_openai();
+  init_provider_definitions();
+  CACHE_TTL_MS = 5 * 60 * 1000;
+  _cache = new Map;
 });
 
 // src/providers/transport/probe-discovery.ts
@@ -43813,11 +44393,11 @@ function rankProbeCandidates(names) {
   });
 }
 function cacheGet(key, exclude = new Set) {
-  const hit = _cache.get(key);
+  const hit = _cache2.get(key);
   if (!hit)
     return;
   if (Date.now() > hit.expiresAt) {
-    _cache.delete(key);
+    _cache2.delete(key);
     return;
   }
   if (hit.ranked.length === 0) {
@@ -43833,10 +44413,10 @@ function cacheGet(key, exclude = new Set) {
   return { model: pick2 };
 }
 function cacheSetFailure(key, reason) {
-  _cache.set(key, { ranked: [], reason, expiresAt: Date.now() + CACHE_TTL_MS });
+  _cache2.set(key, { ranked: [], reason, expiresAt: Date.now() + CACHE_TTL_MS2 });
 }
 function cacheSetRanked(key, ranked) {
-  _cache.set(key, { ranked, expiresAt: Date.now() + CACHE_TTL_MS });
+  _cache2.set(key, { ranked, expiresAt: Date.now() + CACHE_TTL_MS2 });
 }
 async function discoverViaOpenAIModels(endpoint, headers, cacheKey) {
   const cached2 = cacheGet(cacheKey.key, cacheKey.exclude);
@@ -43847,7 +44427,7 @@ async function discoverViaOpenAIModels(endpoint, headers, cacheKey) {
     response = await fetch(endpoint, {
       method: "GET",
       headers,
-      signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
+      signal: AbortSignal.timeout(FETCH_TIMEOUT_MS2)
     });
   } catch (e) {
     const reason = classifyFetchError(e, endpoint);
@@ -43901,7 +44481,7 @@ function classifyFetchError(e, endpoint) {
   const host = url2?.host ?? endpoint;
   const isLocal = !!url2 && /^(localhost|127\.0\.0\.1|0\.0\.0\.0|::1)$/i.test(url2.hostname);
   if (name === "TimeoutError" || name === "AbortError" || /timeout/i.test(msg)) {
-    return `${host} unresponsive (>${FETCH_TIMEOUT_MS / 1000}s) \u2014 check if the server is overloaded`;
+    return `${host} unresponsive (>${FETCH_TIMEOUT_MS2 / 1000}s) \u2014 check if the server is overloaded`;
   }
   if (code === "ENOTFOUND" || code === "EAI_AGAIN") {
     return `cannot resolve host ${url2?.hostname ?? endpoint} \u2014 check the URL`;
@@ -43984,7 +44564,7 @@ async function discoverViaLMStudio(baseUrl, headers, cacheKey) {
     response = await fetch(`${baseUrl}/api/v0/models`, {
       method: "GET",
       headers,
-      signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
+      signal: AbortSignal.timeout(FETCH_TIMEOUT_MS2)
     });
   } catch (e) {
     return discoverViaOpenAIModels(`${baseUrl}/v1/models`, headers, cacheKey);
@@ -44056,7 +44636,7 @@ function extractLMStudioModels(body) {
 async function fetchOllamaModels2(url2) {
   const response = await fetch(url2, {
     method: "GET",
-    signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
+    signal: AbortSignal.timeout(FETCH_TIMEOUT_MS2)
   });
   if (!response.ok)
     return [];
@@ -44069,17 +44649,17 @@ async function fetchOllamaModels2(url2) {
   })).filter((m) => m.name.length > 0);
 }
 function invalidateProbeDiscovery(providerSlug) {
-  for (const key of _cache.keys()) {
+  for (const key of _cache2.keys()) {
     if (key.startsWith(`${providerSlug}:`)) {
-      _cache.delete(key);
+      _cache2.delete(key);
     }
   }
 }
-var _cache, CACHE_TTL_MS, FETCH_TIMEOUT_MS = 5000, SMALL_MODEL_PATTERNS, NON_CHAT_PATTERNS, STANDARD_VENDOR_PREFIXES;
+var _cache2, CACHE_TTL_MS2, FETCH_TIMEOUT_MS2 = 5000, SMALL_MODEL_PATTERNS, NON_CHAT_PATTERNS, STANDARD_VENDOR_PREFIXES;
 var init_probe_discovery = __esm(() => {
   init_logger();
-  _cache = new Map;
-  CACHE_TTL_MS = 5 * 60 * 1000;
+  _cache2 = new Map;
+  CACHE_TTL_MS2 = 5 * 60 * 1000;
   SMALL_MODEL_PATTERNS = [
     /\bmini\b/i,
     /\bnano\b/i,
@@ -44127,6 +44707,127 @@ var init_probe_discovery = __esm(() => {
   ];
 });
 
+// src/providers/transport/anthropic-compat.ts
+class AnthropicProviderTransport {
+  name;
+  displayName;
+  streamFormat = "anthropic-sse";
+  provider;
+  apiKey;
+  constructor(provider, apiKey) {
+    this.provider = provider;
+    this.apiKey = apiKey;
+    this.name = provider.name;
+    this.displayName = AnthropicProviderTransport.formatDisplayName(provider.name);
+  }
+  getEndpoint() {
+    return `${this.provider.baseUrl}${this.provider.apiPath}`;
+  }
+  async getHeaders() {
+    const headers = {
+      "anthropic-version": "2023-06-01"
+    };
+    if (this.provider.authScheme === "bearer") {
+      headers.Authorization = `Bearer ${this.apiKey}`;
+    } else {
+      headers["x-api-key"] = this.apiKey;
+    }
+    if (this.provider.headers) {
+      Object.assign(headers, this.provider.headers);
+    }
+    if (this.provider.name === "kimi-coding") {
+      try {
+        const auth = await credentials.getRequestAuth("kimi-coding", { model: "" });
+        if (auth.headers.Authorization) {
+          delete headers["x-api-key"];
+        }
+        Object.assign(headers, auth.headers);
+      } catch (e) {
+        log(`[${this.displayName}] OAuth path failed, falling back to API key: ${e.message}`);
+      }
+    }
+    return headers;
+  }
+  async discoverProbeModel(exclude) {
+    const def = getProviderByName(this.provider.name);
+    if (!def?.modelDiscovery) {
+      return {
+        model: null,
+        reason: `${this.displayName} publishes no live model list (no modelDiscovery endpoint) \u2014 its probe model must come from the cloud catalog`
+      };
+    }
+    const discovered = await discoverProviderModels(this.provider.name);
+    if (discovered.length === 0) {
+      return {
+        model: null,
+        reason: `${this.displayName} listed no models at ${def.modelDiscovery.path} \u2014 check the API key and that the subscription is active`
+      };
+    }
+    const ranked = rankDiscoveredModels(discovered).map((m) => m.id).filter(isChatCapable);
+    if (ranked.length === 0) {
+      return {
+        model: null,
+        reason: `no chat-capable model among the ${discovered.length} listed by ${this.displayName}`
+      };
+    }
+    const pick2 = ranked.find((m) => !exclude?.has(m));
+    if (!pick2) {
+      return {
+        model: null,
+        reason: `all ${ranked.length} candidate model(s) already tried`
+      };
+    }
+    return { model: pick2 };
+  }
+  async enqueueRequest(fetchFn) {
+    const maxRetries = 2;
+    let lastResponse = null;
+    for (let attempt = 0;attempt <= maxRetries; attempt++) {
+      const response = await fetchFn();
+      if (response.status === 429 && attempt < maxRetries) {
+        const bodyText = await response.clone().text().catch(() => "");
+        if (isTerminal429(bodyText)) {
+          log(`[${this.displayName}] 429 is terminal (billing/quota), not retrying`);
+          return response;
+        }
+        lastResponse = response;
+        const retryAfter = response.headers.get("Retry-After");
+        let delayMs;
+        if (retryAfter && !Number.isNaN(Number(retryAfter))) {
+          delayMs = Math.min(Number(retryAfter) * 1000, 2000);
+        } else {
+          delayMs = 500 * (attempt + 1);
+        }
+        log(`[${this.displayName}] 429 rate limited, retry ${attempt + 1}/${maxRetries} in ${(delayMs / 1000).toFixed(1)}s`);
+        await new Promise((resolve2) => setTimeout(resolve2, delayMs));
+        continue;
+      }
+      return response;
+    }
+    return lastResponse;
+  }
+  static formatDisplayName(name) {
+    const map3 = {
+      minimax: "MiniMax",
+      "minimax-coding": "MiniMax Coding",
+      kimi: "Kimi",
+      "kimi-coding": "Kimi Coding",
+      "qwen-cloud": "Qwen Plan",
+      moonshot: "Kimi",
+      "z-ai": "Z.AI"
+    };
+    return map3[name.toLowerCase()] || name.charAt(0).toUpperCase() + name.slice(1);
+  }
+}
+var init_anthropic_compat = __esm(() => {
+  init_authority();
+  init_logger();
+  init_model_discovery();
+  init_provider_definitions();
+  init_openai();
+  init_probe_discovery();
+});
+
 // src/providers/transport/litellm.ts
 class LiteLLMProviderTransport {
   name = "litellm";
@@ -44549,14 +45250,14 @@ function resolveApiKeyProvenance(envVar, aliases) {
   }
   return {
     envVar: runtimeVar,
-    effectiveValue: runtimeValue,
+    hasValue: !!runtimeValue,
     effectiveMasked: maskKey(runtimeValue),
     effectiveSource,
     layers
   };
 }
 function formatProvenanceLog(p) {
-  if (!p.effectiveValue) {
+  if (!p.hasValue) {
     return `${p.envVar}=(not set)`;
   }
   return `${p.envVar}=${p.effectiveMasked} [from: ${p.effectiveSource}]`;
@@ -45324,6 +46025,7 @@ var init_provider_profiles = __esm(() => {
     "minimax-coding": anthropicCompatProfile,
     kimi: anthropicCompatProfile,
     "kimi-coding": anthropicCompatProfile,
+    "qwen-cloud": anthropicCompatProfile,
     "z-ai": anthropicCompatProfile,
     glm: glmProfile,
     "glm-coding": glmProfile,
@@ -46097,7 +46799,7 @@ function loadDiskCache() {
       return false;
     const stat2 = statSync4(CACHE_FILE);
     const age = Date.now() - stat2.mtimeMs;
-    const isFresh = age < CACHE_TTL_MS2;
+    const isFresh = age < CACHE_TTL_MS3;
     const raw2 = readFileSync15(CACHE_FILE, "utf-8");
     const data = JSON.parse(raw2);
     for (const [key, pricing] of Object.entries(data)) {
@@ -46108,7 +46810,7 @@ function loadDiskCache() {
     return false;
   }
 }
-var pricingMap, CACHE_DIR, CACHE_FILE, CACHE_TTL_MS2, cacheWarmed = false;
+var pricingMap, CACHE_DIR, CACHE_FILE, CACHE_TTL_MS3, cacheWarmed = false;
 var init_pricing_cache = __esm(() => {
   init_remote_provider_types();
   init_logger();
@@ -46116,7 +46818,7 @@ var init_pricing_cache = __esm(() => {
   pricingMap = new Map;
   CACHE_DIR = join24(homedir24(), ".claudish");
   CACHE_FILE = join24(CACHE_DIR, "pricing-cache.json");
-  CACHE_TTL_MS2 = 24 * 60 * 60 * 1000;
+  CACHE_TTL_MS3 = 24 * 60 * 60 * 1000;
 });
 
 // src/proxy-server.ts
@@ -47407,6 +48109,10 @@ function fuzzyScore(text, query) {
   }
   return queryIndex === lowerQuery.length ? score / lowerText.length : 0;
 }
+function orderingKey(model) {
+  const releaseDate = typeof model?.releaseDate === "string" ? model.releaseDate : typeof model?.created === "number" && Number.isFinite(model.created) ? new Date(model.created * 1000).toISOString() : undefined;
+  return { releaseDate, id: typeof model?.id === "string" ? model.id : "" };
+}
 function fmtSize(n) {
   if (n <= 0)
     return "0B";
@@ -47634,13 +48340,17 @@ Tokens: ${result.usage.input} input, ${result.usage.output} output`;
           isError: true
         };
       }
-      const results = allModels.map((model) => {
+      const results2 = allModels.map((model) => {
         const nameScore = fuzzyScore(model.name || "", query);
         const idScore = fuzzyScore(model.id || "", query);
         const descScore = fuzzyScore(model.description || "", query) * 0.5;
         return { model, score: Math.max(nameScore, idScore, descScore) };
-      }).filter((item) => item.score > 0.2).sort((a, b) => b.score - a.score).slice(0, maxResults);
-      if (results.length === 0) {
+      }).filter((item) => item.score > 0.2).sort((a, b) => {
+        if (Math.abs(a.score - b.score) > SCORE_TIE_EPSILON)
+          return b.score - a.score;
+        return compareByReleaseDateDesc(orderingKey(a.model), orderingKey(b.model));
+      }).slice(0, maxResults);
+      if (results2.length === 0) {
         return {
           content: [{ type: "text", text: `No models found matching "${query}"` }]
         };
@@ -47652,7 +48362,7 @@ Tokens: ${result.usage.input} input, ${result.usage.output} output`;
 `;
       output += `|-------|----------|---------|----------|
 `;
-      for (const { model } of results) {
+      for (const { model } of results2) {
         const provider = model.id.split("/")[0];
         const promptPrice = Number.parseFloat(model.pricing?.prompt || "0") * 1e6;
         const completionPrice = Number.parseFloat(model.pricing?.completion || "0") * 1e6;
@@ -47663,7 +48373,7 @@ Tokens: ${result.usage.input} input, ${result.usage.output} output`;
 `;
       }
       output += `
-Use with: run_prompt(model="${results[0].model.id}", prompt="your prompt")`;
+Use with: run_prompt(model="${results2[0].model.id}", prompt="your prompt")`;
       return { content: [{ type: "text", text: output }] };
     }
   });
@@ -47693,13 +48403,13 @@ Use with: run_prompt(model="${results[0].model.id}", prompt="your prompt")`;
       const prompt = args.prompt;
       const systemPrompt = args.system_prompt;
       const maxTokens = args.max_tokens;
-      const results = [];
+      const results2 = [];
       for (const model of modelIds) {
         try {
           const result = await runPromptViaProxy(model, prompt, systemPrompt, maxTokens);
-          results.push({ model, response: result.content, tokens: result.usage });
+          results2.push({ model, response: result.content, tokens: result.usage });
         } catch (error46) {
-          results.push({
+          results2.push({
             model,
             response: "",
             error: error46 instanceof Error ? error46.message : String(error46)
@@ -47712,7 +48422,7 @@ Use with: run_prompt(model="${results[0].model.id}", prompt="your prompt")`;
       output += `**Prompt:** ${prompt.slice(0, 100)}${prompt.length > 100 ? "..." : ""}
 
 `;
-      for (const result of results) {
+      for (const result of results2) {
         output += `## ${result.model}
 
 `;
@@ -47734,7 +48444,7 @@ Use with: run_prompt(model="${results[0].model.id}", prompt="your prompt")`;
 
 `;
       }
-      const failed = results.filter((r) => r.error);
+      const failed = results2.filter((r) => r.error);
       if (failed.length > 0) {
         output += '---\n**To report failed model(s)**, use the `report_error` tool with `error_type: "provider_failure"` and the model ID(s) above.\n';
       }
@@ -48296,7 +49006,7 @@ When channel mode is active, you receive <channel source="claudish" ...> notific
 5. Use list_sessions to see all active/completed sessions.
 6. Use cancel_session to stop a running session.
 
-The session_id in the channel tag's meta attributes is the key for all tool calls.`, proxyInstance = null, proxyStarting = null, NEXT_STEP, sanitize, EVENT_TO_TASK_STATUS;
+The session_id in the channel tag's meta attributes is the key for all tool calls.`, proxyInstance = null, proxyStarting = null, SCORE_TIE_EPSILON = 0.000001, NEXT_STEP, sanitize, EVENT_TO_TASK_STATUS;
 var init_mcp_server = __esm(() => {
   init_server2();
   init_stdio2();
@@ -48482,6 +49192,28 @@ Behavior rules
     console.log(`  ${dim2(`observer model: ${obs.model}`)}`);
   console.log();
 }
+function printByModel(records) {
+  const byModel = new Map;
+  for (const r of records) {
+    const m = r.model ?? "unknown";
+    const e = byModel.get(m) ?? { ok: 0, degraded: 0 };
+    if (r.outcome === "degraded")
+      e.degraded++;
+    else
+      e.ok++;
+    byModel.set(m, e);
+  }
+  if (byModel.size === 0)
+    return;
+  console.log(bold2(`  by model (degraded / ok)
+`));
+  const ranked = [...byModel.entries()].sort((a, b) => b[1].degraded - a[1].degraded || b[1].ok - a[1].ok);
+  for (const [model, v] of ranked) {
+    const flag = v.degraded > 0 ? yellow(String(v.degraded)) : dim2(String(v.degraded));
+    console.log(`    ${model.padEnd(26)} ${flag} / ${v.ok}`);
+  }
+  console.log();
+}
 function showCorpus(write, json2) {
   const result = buildCorpus({ write });
   if (json2) {
@@ -48500,25 +49232,7 @@ Behavior divergence corpus
   console.log(`  ${yellow("degraded (no plan)")}  : ${degraded.length}`);
   console.log(`  of those, a rule would have fired on ${catchable.length}
 `);
-  const byModel = new Map;
-  for (const r of result.records) {
-    const m = r.model ?? "unknown";
-    const e = byModel.get(m) ?? { ok: 0, degraded: 0 };
-    if (r.outcome === "degraded")
-      e.degraded++;
-    else
-      e.ok++;
-    byModel.set(m, e);
-  }
-  if (byModel.size > 0) {
-    console.log(bold2(`  by model (degraded / ok)
-`));
-    for (const [model, v] of [...byModel.entries()].sort((a, b) => b[1].degraded - a[1].degraded || b[1].ok - a[1].ok)) {
-      const flag = v.degraded > 0 ? yellow(String(v.degraded)) : dim2("0");
-      console.log(`    ${model.padEnd(26)} ${flag} / ${v.ok}`);
-    }
-    console.log();
-  }
+  printByModel(result.records);
   if (result.outputPath) {
     console.log(dim2(`  appended to ${result.outputPath}
 `));
@@ -48544,9 +49258,9 @@ async function behaviorCommand(argv) {
     default:
       console.error(`Unknown action "${action}".
 
-` + `Usage:
-` + `  claudish behavior rules  [--json]
-` + `  claudish behavior corpus [--write] [--json]
+Usage:
+  claudish behavior rules  [--json]
+  claudish behavior corpus [--write] [--json]
 `);
       process.exit(1);
   }
@@ -60761,13 +61475,13 @@ var init_dist14 = __esm(() => {
       setSearchError(undefined);
       const fetchResults = async () => {
         try {
-          const results = await config3.source(searchTerm || undefined, {
+          const results2 = await config3.source(searchTerm || undefined, {
             signal: controller.signal
           });
           if (!controller.signal.aborted) {
             setActive(undefined);
             setSearchError(undefined);
-            setSearchResults(normalizeChoices4(results));
+            setSearchResults(normalizeChoices4(results2));
             setStatus("idle");
           }
         } catch (error47) {
@@ -61475,6 +62189,8 @@ var init_config2 = __esm(() => {
     CLAUDISH_MODEL: "CLAUDISH_MODEL",
     CLAUDISH_PORT: "CLAUDISH_PORT",
     CLAUDISH_ACTIVE_MODEL_NAME: "CLAUDISH_ACTIVE_MODEL_NAME",
+    CLAUDISH_TOKEN_FILE: "CLAUDISH_TOKEN_FILE",
+    CLAUDISH_PROVIDER_NAME: "CLAUDISH_PROVIDER_NAME",
     ANTHROPIC_MODEL: "ANTHROPIC_MODEL",
     ANTHROPIC_SMALL_FAST_MODEL: "ANTHROPIC_SMALL_FAST_MODEL",
     CLAUDISH_MODEL_OPUS: "CLAUDISH_MODEL_OPUS",
@@ -61655,114 +62371,6 @@ var init_model_catalog2 = __esm(() => {
   NO_CATALOG_VENDOR_SLUGS = new Set(["litellm", "ollama", "lmstudio", "lm-studio"]);
 });
 
-// src/providers/model-discovery.ts
-function resolveBaseUrl2(catalogName) {
-  const def = getProviderByName(catalogName);
-  if (!def)
-    return null;
-  for (const envVar of def.baseUrlEnvVars ?? []) {
-    const v = process.env[envVar];
-    if (v)
-      return v.replace(/\/+$/, "");
-  }
-  return (def.baseUrl || "").replace(/\/+$/, "") || null;
-}
-function readContextWindow(row) {
-  for (const field of ["context_length", "context_window", "max_context_length"]) {
-    const v = row[field];
-    if (typeof v === "number" && Number.isFinite(v) && v > 0)
-      return v;
-  }
-  return;
-}
-function parseOpenAIModelsList(body) {
-  const data = body?.data;
-  if (!Array.isArray(data))
-    return [];
-  const models = [];
-  for (const raw2 of data) {
-    if (!raw2 || typeof raw2 !== "object")
-      continue;
-    const row = raw2;
-    const id = row.id;
-    if (typeof id !== "string" || id.trim().length === 0)
-      continue;
-    const displayName = typeof row.display_name === "string" ? row.display_name : undefined;
-    models.push({ id, displayName, contextWindow: readContextWindow(row) });
-  }
-  return models;
-}
-async function discoverProviderModels(providerName) {
-  const cached2 = _cache2.get(providerName);
-  if (cached2 && cached2.expiresAt > Date.now())
-    return cached2.models;
-  const def = getProviderByName(providerName);
-  const descriptor = def?.modelDiscovery;
-  if (!def || !descriptor)
-    return [];
-  const baseUrl = resolveBaseUrl2(providerName);
-  if (!baseUrl)
-    return [];
-  const endpoint = `${baseUrl}${descriptor.path}`;
-  let headers = {};
-  try {
-    const auth = await credentials.getRequestAuth(providerName, { model: "" });
-    headers = { ...auth.headers };
-  } catch (e) {
-    log(`[model-discovery:${providerName}] no credentials, skipping: ${e?.message}`);
-    return [];
-  }
-  let response;
-  try {
-    response = await fetch(endpoint, {
-      method: "GET",
-      headers,
-      signal: AbortSignal.timeout(FETCH_TIMEOUT_MS2)
-    });
-  } catch (e) {
-    log(`[model-discovery:${providerName}] fetch failed: ${e?.message}`);
-    return [];
-  }
-  if (!response.ok) {
-    log(`[model-discovery:${providerName}] HTTP ${response.status} from ${endpoint}`);
-    return [];
-  }
-  let body;
-  try {
-    body = await response.json();
-  } catch {
-    log(`[model-discovery:${providerName}] response was not JSON`);
-    return [];
-  }
-  const models = parseOpenAIModelsList(body);
-  if (models.length === 0) {
-    log(`[model-discovery:${providerName}] endpoint reachable but listed no models`);
-    return [];
-  }
-  log(`[model-discovery:${providerName}] discovered ${models.length} models: ` + models.map((m) => `${m.id}(${m.contextWindow ?? "?"})`).join(", "));
-  _cache2.set(providerName, { models, expiresAt: Date.now() + CACHE_TTL_MS3 });
-  return models;
-}
-async function discoverContextWindow(providerName, modelId) {
-  const models = await discoverProviderModels(providerName);
-  const match2 = models.find((m) => m.id.toLowerCase() === modelId.toLowerCase());
-  return match2?.contextWindow;
-}
-function rankDiscoveredModels(models) {
-  return [...models].sort((a, b) => {
-    const diff = (b.contextWindow ?? 0) - (a.contextWindow ?? 0);
-    return diff !== 0 ? diff : a.id.localeCompare(b.id);
-  });
-}
-var CACHE_TTL_MS3, FETCH_TIMEOUT_MS2 = 5000, _cache2;
-var init_model_discovery = __esm(() => {
-  init_authority();
-  init_logger();
-  init_provider_definitions();
-  CACHE_TTL_MS3 = 5 * 60 * 1000;
-  _cache2 = new Map;
-});
-
 // src/model-selector.ts
 var exports_model_selector = {};
 __export(exports_model_selector, {
@@ -61778,7 +62386,8 @@ __export(exports_model_selector, {
   isUserDeployedProvider: () => isUserDeployedProvider,
   confirmAction: () => confirmAction,
   compareByReleaseDateDesc: () => compareByReleaseDateDesc,
-  buildExplicitModelSpec: () => buildExplicitModelSpec
+  buildExplicitModelSpec: () => buildExplicitModelSpec,
+  buildDiscoveredModelRows: () => buildDiscoveredModelRows
 });
 function isUserDeployedProvider(value) {
   return LOCAL_OR_USER_DEPLOYED.has(value);
@@ -61810,7 +62419,7 @@ function formatFirebaseProviderLabel(slug) {
 async function loadRecommendedModels(forceRefresh = false) {
   try {
     const doc2 = await getRecommendedModels({ forceRefresh });
-    return doc2.models.map((model) => ({
+    return sortModelsNewestFirst(doc2.models.map((model) => ({
       id: model.id,
       name: model.name,
       description: model.description,
@@ -61823,7 +62432,7 @@ async function loadRecommendedModels(forceRefresh = false) {
       supportsReasoning: model.supportsReasoning,
       supportsVision: model.supportsVision,
       source: formatFirebaseProviderLabel(model.provider)
-    }));
+    })));
   } catch {
     return [];
   }
@@ -61867,6 +62476,48 @@ function formatAveragePricing(pricing) {
     average: avg === 0 ? "FREE" : `$${avg.toFixed(2)}/1M`
   };
 }
+function resolveDiscoveredContextLength(m) {
+  if (typeof m.contextWindow === "number" && m.contextWindow > 0)
+    return m.contextWindow;
+  try {
+    return lookupModel(m.id)?.contextWindow ?? 0;
+  } catch {
+    return 0;
+  }
+}
+function resolveDiscoveredReleaseDate(m) {
+  try {
+    const catalogDate = lookupModel(m.id)?.releaseDate;
+    if (catalogDate)
+      return catalogDate;
+  } catch {}
+  return m.releaseDate;
+}
+async function resolveMissingContextWindows(ids, timeoutMs = DISCOVERY_CONTEXT_LOOKUP_TIMEOUT_MS) {
+  const resolved = new Map;
+  if (ids.length === 0)
+    return resolved;
+  let timer;
+  const budget = new Promise((resolve4) => {
+    timer = setTimeout(() => resolve4(null), timeoutMs);
+    timer.unref?.();
+  });
+  try {
+    const lookups = Promise.all(ids.map(async (id) => [id, await resolveCatalogContextWindow(id)]));
+    const settled = await Promise.race([lookups, budget]);
+    if (settled) {
+      for (const [id, contextWindow] of settled) {
+        if (typeof contextWindow === "number" && contextWindow > 0) {
+          resolved.set(id, contextWindow);
+        }
+      }
+    }
+  } catch {} finally {
+    if (timer)
+      clearTimeout(timer);
+  }
+  return resolved;
+}
 function modelDocToModelInfo(model) {
   const providerLabel = formatFirebaseProviderLabel(model.provider || "unknown");
   const contextLength = model.contextWindow || 0;
@@ -61918,63 +62569,6 @@ function dedupeModels(models) {
   }
   return deduped;
 }
-function extractVersionParts(modelId) {
-  const tokens = modelId.toLowerCase().split(/[\/_-]+/);
-  let started = false;
-  const parts = [];
-  for (const token of tokens) {
-    const match2 = token.match(/\d+(?:\.\d+)*/);
-    if (!match2) {
-      if (started)
-        break;
-      continue;
-    }
-    if (!started) {
-      started = true;
-      for (const part of match2[0].split(".")) {
-        parts.push(Number.parseInt(part, 10));
-      }
-      if (!/^\d+(?:\.\d+)*$/.test(token)) {
-        break;
-      }
-      continue;
-    }
-    if (!/^\d{1,2}(?:\.\d+)?$/.test(token)) {
-      break;
-    }
-    for (const part of token.split(".")) {
-      parts.push(Number.parseInt(part, 10));
-    }
-  }
-  return parts;
-}
-function compareVersionPartsDesc(a, b) {
-  const maxLength = Math.max(a.length, b.length);
-  for (let i = 0;i < maxLength; i++) {
-    const aPart = a[i] ?? -1;
-    const bPart = b[i] ?? -1;
-    if (aPart !== bPart) {
-      return bPart - aPart;
-    }
-  }
-  return 0;
-}
-function compareByReleaseDateDesc(a, b) {
-  const aReleaseRaw = a.releaseDate ? Date.parse(a.releaseDate) : 0;
-  const bReleaseRaw = b.releaseDate ? Date.parse(b.releaseDate) : 0;
-  const aRelease = Number.isNaN(aReleaseRaw) ? 0 : aReleaseRaw;
-  const bRelease = Number.isNaN(bReleaseRaw) ? 0 : bReleaseRaw;
-  if (aRelease !== bRelease) {
-    return bRelease - aRelease;
-  }
-  const aId = a.id ?? a.modelId ?? "";
-  const bId = b.id ?? b.modelId ?? "";
-  const versionCompare = compareVersionPartsDesc(extractVersionParts(aId), extractVersionParts(bId));
-  if (versionCompare !== 0) {
-    return versionCompare;
-  }
-  return aId.localeCompare(bId);
-}
 function sortModelsNewestFirst(models) {
   return [...models].sort(compareByReleaseDateDesc);
 }
@@ -62272,22 +62866,42 @@ async function pickModelFromList(provider, displayName, tierName, models) {
   });
   return selected === CUSTOM_VALUE ? null : selected;
 }
+async function buildDiscoveredModelRows(provider, displayName, catalog) {
+  const discovered = rankDiscoveredModels(await discoverProviderModels(provider)).filter((m) => isChatCapable(m.id));
+  if (discovered.length === 0)
+    return [];
+  const subscription = isSubscriptionProvider(provider);
+  const pricingById = subscription ? new Map : new Map((await loadModelsForPickerProvider(provider, catalog)).map((m) => [
+    m.id.toLowerCase(),
+    m.pricing
+  ]));
+  const offlineContext = new Map(discovered.map((m) => [m.id, resolveDiscoveredContextLength(m)]));
+  const cloudContext = await resolveMissingContextWindows(discovered.filter((m) => !offlineContext.get(m.id)).map((m) => m.id));
+  const rows = discovered.map((m) => {
+    const contextLength = offlineContext.get(m.id) || cloudContext.get(m.id) || 0;
+    return {
+      id: m.id,
+      name: m.displayName || m.id,
+      description: contextLength ? `${m.displayName ?? m.id} \xB7 ${Math.round(contextLength / 1024)}K context` : m.displayName ?? m.id,
+      provider: displayName,
+      releaseDate: resolveDiscoveredReleaseDate(m),
+      pricing: subscription ? SUBSCRIPTION_PRICING : pricingById.get(m.id.toLowerCase()),
+      context: formatContextLength(contextLength),
+      contextLength,
+      supportsTools: true,
+      isFree: subscription,
+      source: displayName
+    };
+  });
+  return sortModelsNewestFirst(rows);
+}
 async function selectModelFromProvider(provider, tierName, recommendedModels, _forceUpdate, catalog) {
   const prefix = PROVIDER_MODEL_PREFIX[provider] || `${provider}@`;
   const displayName = getPickerDisplayName(provider);
   const def = getProviderByName(provider);
   if (def?.modelDiscovery) {
-    const discovered = rankDiscoveredModels(await discoverProviderModels(provider));
-    if (discovered.length > 0) {
-      const discoveredModels = discovered.map((m) => ({
-        id: m.id,
-        name: m.displayName || m.id,
-        description: m.contextWindow ? `${m.displayName ?? m.id} \xB7 ${Math.round(m.contextWindow / 1024)}K context` : m.displayName ?? m.id,
-        provider: displayName,
-        supportsTools: true,
-        isFree: true,
-        source: displayName
-      }));
+    const discoveredModels = await buildDiscoveredModelRows(provider, displayName, catalog);
+    if (discoveredModels.length > 0) {
       const picked = await pickModelFromList(provider, displayName, tierName, discoveredModels);
       if (picked)
         return picked;
@@ -62295,7 +62909,7 @@ async function selectModelFromProvider(provider, tierName, recommendedModels, _f
   }
   if (provider === "ollama") {
     const ollamaModels = await fetchOllamaModels({ enrichCapabilities: false });
-    const chatModels = ollamaModels.map((m) => ({
+    const chatModels = sortModelsNewestFirst(ollamaModels.map((m) => ({
       id: m.name,
       name: m.name,
       description: m.description,
@@ -62303,7 +62917,7 @@ async function selectModelFromProvider(provider, tierName, recommendedModels, _f
       supportsTools: m.supportsTools,
       isFree: true,
       source: displayName
-    }));
+    })));
     if (chatModels.length > 0) {
       const picked = await pickModelFromList(provider, displayName, tierName, chatModels);
       if (picked)
@@ -62464,14 +63078,18 @@ async function selectProfile(profiles) {
 async function confirmAction(message) {
   return dist_default4({ message, default: false });
 }
-var pickerProviderToFirebaseSlug, LOCAL_OR_USER_DEPLOYED, PROVIDER_FILTER_ALIASES, ALL_PROVIDER_CHOICES, PROVIDER_MODEL_PREFIX;
+var pickerProviderToFirebaseSlug, LOCAL_OR_USER_DEPLOYED, SUBSCRIPTION_PRICING, DISCOVERY_CONTEXT_LOOKUP_TIMEOUT_MS = 1500, PROVIDER_FILTER_ALIASES, ALL_PROVIDER_CHOICES, PROVIDER_MODEL_PREFIX;
 var init_model_selector = __esm(() => {
   init_dist16();
+  init_model_catalog();
   init_authority();
+  init_context_window_fallback();
+  init_remote_provider_types();
   init_model_loader();
   init_model_catalog2();
   init_model_discovery();
   init_provider_definitions();
+  init_probe_discovery();
   pickerProviderToFirebaseSlug = {
     openrouter: "openrouter",
     google: "google",
@@ -62495,6 +63113,11 @@ var init_model_selector = __esm(() => {
     ollamacloud: "ollamacloud"
   };
   LOCAL_OR_USER_DEPLOYED = new Set(["litellm", "ollama", "lmstudio"]);
+  SUBSCRIPTION_PRICING = {
+    input: "SUB",
+    output: "SUB",
+    average: "SUB"
+  };
   PROVIDER_FILTER_ALIASES = {
     openrouter: "openrouter",
     or: "openrouter",
@@ -62531,7 +63154,9 @@ var init_model_selector = __esm(() => {
     sakana: "sakana",
     fugu: "sakana",
     "sakana-subscription": "sakana-subscription",
-    sc: "sakana-subscription"
+    sc: "sakana-subscription",
+    "qwen-cloud": "qwen-cloud",
+    qc: "qwen-cloud"
   };
   ALL_PROVIDER_CHOICES = [
     {
@@ -62582,6 +63207,12 @@ var init_model_selector = __esm(() => {
       description: "Coding subscription",
       provider: "kimi-coding"
     },
+    {
+      name: "Qwen Plan",
+      value: "qwen-cloud",
+      description: "Alibaba Model Studio subscription",
+      provider: "qwen-cloud"
+    },
     { name: "GLM / Zhipu", value: "glm", description: "Direct API", provider: "glm" },
     {
       name: "GLM Coding Plan",
@@ -62628,6 +63259,7 @@ var init_model_selector = __esm(() => {
     kimi: "kimi@",
     "minimax-coding": "mmc@",
     "kimi-coding": "kc@",
+    "qwen-cloud": "qc@",
     glm: "glm@",
     "glm-coding": "gc@",
     "z-ai": "z-ai@",
@@ -63251,7 +63883,7 @@ function wordWrap(text, maxWidth) {
     lines.push(current);
   return lines;
 }
-function computeBarScales(results) {
+function computeBarScales(results2) {
   let maxTokPerSec = 1;
   const liveTotals = [];
   const consider = (probe) => {
@@ -63264,7 +63896,7 @@ function computeBarScales(results) {
     if (scaledTps > maxTokPerSec)
       maxTokPerSec = scaledTps;
   };
-  for (const r of results) {
+  for (const r of results2) {
     consider(r.directProbe);
     for (const c of r.chain ?? [])
       consider(c.probe);
@@ -63564,7 +64196,7 @@ function formatContextWindow(ctx) {
 function buildKeyLine(activeEntry, directKeyVar) {
   if (activeEntry?.provenance) {
     const p = activeEntry.provenance;
-    if (p.effectiveValue) {
+    if (p.hasValue) {
       return `${pc.bold}Key${pc.reset}  $${p.envVar}  ${pc.dim}(${p.effectiveSource})${pc.reset}`;
     }
     return `${pc.bold}Key${pc.reset}  $${p.envVar}  ${pc.dim}(not set)${pc.reset}`;
@@ -63720,8 +64352,8 @@ function pickRepresentative(result) {
   }
   return { model: result.model, provider: result.nativeProvider };
 }
-function renderLeaderboard(results, scales, maxWidth, w) {
-  const reps = results.map(pickRepresentative);
+function renderLeaderboard(results2, scales, maxWidth, w) {
+  const reps = results2.map(pickRepresentative);
   const live = reps.filter((r) => r.timing).sort((a, b) => a.timing.totalMs - b.timing.totalMs);
   const unavailable = reps.filter((r) => !r.timing);
   if (live.length === 0)
@@ -63822,16 +64454,16 @@ function renderLeaderboard(results, scales, maxWidth, w) {
   w(`
 `);
 }
-function printProbeResults(results, isLiveProbe) {
+function printProbeResults(results2, isLiveProbe) {
   const w = process.stderr.write.bind(process.stderr);
   w(`
 `);
-  const scales = computeBarScales(results);
-  const anyTimedLive = results.some((r) => r.directProbe?.state === "live" && r.directProbe.timing !== undefined) || results.some((r) => (r.chain ?? []).some((c) => c.probe?.state === "live" && c.probe.timing !== undefined));
+  const scales = computeBarScales(results2);
+  const anyTimedLive = results2.some((r) => r.directProbe?.state === "live" && r.directProbe.timing !== undefined) || results2.some((r) => (r.chain ?? []).some((c) => c.probe?.state === "live" && c.probe.timing !== undefined));
   if (isLiveProbe && anyTimedLive) {
     renderLegend(w);
   }
-  const requiredWidths = results.map((r) => computeRequiredWidth(r, isLiveProbe));
+  const requiredWidths = results2.map((r) => computeRequiredWidth(r, isLiveProbe));
   const termCols = process.stderr.columns ?? process.stdout.columns ?? 100;
   const maxAllowed = Math.max(MIN_CARD_WIDTH, termCols - 4);
   let globalWidth = requiredWidths.reduce((a, b) => Math.max(a, b), MIN_CARD_WIDTH);
@@ -63839,14 +64471,14 @@ function printProbeResults(results, isLiveProbe) {
     globalWidth = maxAllowed;
   const showedLeaderboard = isLiveProbe && anyTimedLive;
   if (showedLeaderboard) {
-    renderLeaderboard(results, scales, maxAllowed, w);
+    renderLeaderboard(results2, scales, maxAllowed, w);
   }
   if (showedLeaderboard) {
     w(`  ${pc.bold}${pc.cyan}Details${pc.reset}${pc.dim} \u2014 per-model routing chains${pc.reset}
 
 `);
   }
-  for (const result of results) {
+  for (const result of results2) {
     renderCard(result, isLiveProbe, w, globalWidth, scales);
     w(`
 `);
@@ -63898,8 +64530,8 @@ class ProbeStore {
     for (const fn of this.listeners)
       fn();
   }
-  setResults(results) {
-    this.setState((prev) => ({ ...prev, results, phase: "done" }));
+  setResults(results2) {
+    this.setState((prev) => ({ ...prev, results: results2, phase: "done" }));
   }
   setActiveTab(tab) {
     this.setState((prev) => ({ ...prev, activeTab: tab }));
@@ -64740,24 +65372,24 @@ function DetailModel({
   }, undefined, true, undefined, this);
 }
 function DetailsView({
-  results,
+  results: results2,
   layout,
   termWidth,
   maxTotalMs,
   maxTokPerSec
 }) {
-  const provW = Math.min(22, Math.max(8, ...results.flatMap((r) => r.links.map((l) => l.displayName.length))));
+  const provW = Math.min(22, Math.max(8, ...results2.flatMap((r) => r.links.map((l) => l.displayName.length))));
   const headerW = Math.max(24, Math.min(detailRowWidth(provW, layout), (termWidth || 100) - 3));
   return /* @__PURE__ */ jsxDEV("box", {
     flexDirection: "column",
-    children: results.map((r, idx) => /* @__PURE__ */ jsxDEV(DetailModel, {
+    children: results2.map((r, idx) => /* @__PURE__ */ jsxDEV(DetailModel, {
       result: r,
       provW,
       headerW,
       layout,
       maxTotalMs,
       maxTokPerSec,
-      isLast: idx === results.length - 1
+      isLast: idx === results2.length - 1
     }, r.model, false, undefined, this))
   }, undefined, false, undefined, this);
 }
@@ -64931,12 +65563,12 @@ function LeaderLiveRow({
   }, undefined, true, undefined, this);
 }
 function LeaderboardView({
-  results,
+  results: results2,
   layout,
   maxTotalMs,
   maxTokPerSec
 }) {
-  const reps = results.map(pickRepresentativeLink);
+  const reps = results2.map(pickRepresentativeLink);
   const live = reps.filter((r) => r.timing).sort((a, b) => a.timing.totalMs - b.timing.totalMs);
   const unavailable = reps.filter((r) => !r.timing);
   const nameW = Math.min(28, Math.max(5, ...reps.map((r) => r.model.length)));
@@ -65785,16 +66417,16 @@ function formatModelDocCaps(caps) {
   return parts.length > 0 ? parts.join("") : "\xB7";
 }
 async function searchAndPrintModels(query, jsonOutput) {
-  let results;
+  let results2;
   try {
     console.error(`\uD83D\uDD04 Searching Firebase catalog for "${query}"...`);
-    results = await searchModels(query, 50);
+    results2 = await searchModels(query, 50);
   } catch (error46) {
     console.error(`\u274C Failed to reach Firebase model catalog: ${error46 instanceof Error ? error46.message : String(error46)}`);
     console.error("   Check your network connection.");
     process.exit(1);
   }
-  if (results.length === 0) {
+  if (results2.length === 0) {
     if (jsonOutput) {
       console.log(JSON.stringify({ query, count: 0, models: [] }, null, 2));
     } else {
@@ -65805,8 +66437,8 @@ async function searchAndPrintModels(query, jsonOutput) {
   if (jsonOutput) {
     console.log(JSON.stringify({
       query,
-      count: results.length,
-      models: results.map((m) => ({
+      count: results2.length,
+      models: results2.map((m) => ({
         id: m.modelId,
         provider: m.provider,
         contextWindow: m.contextWindow,
@@ -65819,9 +66451,9 @@ async function searchAndPrintModels(query, jsonOutput) {
     return;
   }
   console.log(`
-Found ${results.length} matching models:
+Found ${results2.length} matching models:
 `);
-  const sorted = [...results].sort(compareByReleaseDateDesc);
+  const sorted = [...results2].sort(compareByReleaseDateDesc);
   renderModelDocTable(sorted, false);
   console.log("");
   console.log("Caps: T = tools  R = reasoning  V = vision");
@@ -66112,7 +66744,7 @@ async function probeModelRouting(models, jsonOutput, options = { live: true, tim
         hasCredentials = true;
       } else {
         provenance = resolveApiKeyProvenance(keyInfo.envVar, keyInfo.aliases);
-        hasCredentials = !!provenance.effectiveValue;
+        hasCredentials = provenance.hasValue;
         if (!hasCredentials && keyInfo.aliases) {
           hasCredentials = keyInfo.aliases.some((a) => !!process.env[a]);
         }
@@ -66185,7 +66817,14 @@ async function probeModelRouting(models, jsonOutput, options = { live: true, tim
     const modelName = resolvedSpec?.modelName || parsedModel;
     let formatAdapterName = "OpenAIAPIFormat";
     let declaredStreamFormat = "openai-sse";
-    const anthropicCompatProviders = ["minimax", "minimax-coding", "kimi", "kimi-coding", "z-ai"];
+    const anthropicCompatProviders = [
+      "minimax",
+      "minimax-coding",
+      "kimi",
+      "kimi-coding",
+      "qwen-cloud",
+      "z-ai"
+    ];
     const isMinimaxModel = modelName.toLowerCase().includes("minimax");
     if (anthropicCompatProviders.includes(providerName)) {
       formatAdapterName = "AnthropicAPIFormat";
@@ -66246,7 +66885,7 @@ async function probeModelRouting(models, jsonOutput, options = { live: true, tim
       }
     }
     try {
-      const results = [];
+      const results2 = [];
       for (const modelInput of models) {
         const { parsed, chain, chainDetails } = buildModelChain(modelInput);
         let directProbeResult;
@@ -66284,7 +66923,7 @@ async function probeModelRouting(models, jsonOutput, options = { live: true, tim
           }
         }
         const wiring = await computeWiring(chainDetails, parsed.model);
-        results.push({
+        results2.push({
           model: modelInput,
           nativeProvider: parsed.provider,
           isExplicit: parsed.isExplicitProvider,
@@ -66295,7 +66934,7 @@ async function probeModelRouting(models, jsonOutput, options = { live: true, tim
           wiring
         });
       }
-      console.log(JSON.stringify(results, null, 2));
+      console.log(JSON.stringify(results2, null, 2));
     } finally {
       if (liveProxy2) {
         try {
@@ -66439,7 +67078,7 @@ async function probeModelRouting(models, jsonOutput, options = { live: true, tim
     }
     const isLiveProbe = !!liveProxy;
     const printable = [];
-    const results = [];
+    const results2 = [];
     for (const { modelInput, parsed, chain, chainDetails } of modelChains) {
       const wiring = await computeWiring(chainDetails, parsed.model);
       const directProbe = directProbeResults.get(modelInput);
@@ -66461,7 +67100,7 @@ async function probeModelRouting(models, jsonOutput, options = { live: true, tim
         directProbe,
         wiring
       });
-      results.push({
+      results2.push({
         model: modelInput,
         nativeProvider: parsed.provider,
         isExplicit: parsed.isExplicitProvider,
@@ -66480,7 +67119,7 @@ async function probeModelRouting(models, jsonOutput, options = { live: true, tim
         } catch {}
         liveProxy = null;
       }
-      tui.store.setResults(results);
+      tui.store.setResults(results2);
       await tui.waitForQuit();
       await tui.shutdown();
     } else {
@@ -67856,8 +68495,8 @@ async function pingLocalProvider(catalogName, timeoutMs = PING_TIMEOUT_MS) {
   }
 }
 async function pingLocalProviders(catalogNames, timeoutMs = PING_TIMEOUT_MS) {
-  const results = await Promise.all(catalogNames.map(async (name) => [name, await pingLocalProvider(name, timeoutMs)]));
-  return Object.fromEntries(results);
+  const results2 = await Promise.all(catalogNames.map(async (name) => [name, await pingLocalProvider(name, timeoutMs)]));
+  return Object.fromEntries(results2);
 }
 var PING_TIMEOUT_MS = 2000, HEALTH_PATH;
 var init_local_liveness = __esm(() => {
@@ -71764,6 +72403,7 @@ var init_RoutingContent = __esm(() => {
     "minimax-coding": "MiniMax Coding Plan",
     glm: "Native GLM API",
     "glm-coding": "GLM Coding Plan",
+    "qwen-cloud": "Qwen Plan",
     google: "Direct Gemini API",
     openai: "Direct OpenAI API",
     "openai-codex": "OpenAI Codex (Responses API)",
@@ -74334,13 +74974,20 @@ __export(exports_claude_runner, {
   resolveContextWindowEnv: () => resolveContextWindowEnv,
   managedSettingsForcesClaudeAi: () => managedSettingsForcesClaudeAi,
   isProxyAuthMode: () => isProxyAuthMode,
+  initializeTokenFile: () => initializeTokenFile,
+  discoverUserStatusLineCommand: () => discoverUserStatusLineCommand,
   createTempSettingsFile: () => createTempSettingsFile,
   createStatusLineScript: () => createStatusLineScript,
   computeMainThreadContextWindow: () => computeMainThreadContextWindow,
+  cleanupStaleTokenFiles: () => cleanupStaleTokenFiles,
   checkClaudeInstalled: () => checkClaudeInstalled,
   buildClaudishSettingsOverlay: () => buildClaudishSettingsOverlay,
+  buildChainedStatusCommand: () => buildChainedStatusCommand,
+  USER_STATUS_LINE_TIMEOUT_SECONDS: () => USER_STATUS_LINE_TIMEOUT_SECONDS,
+  STALE_TOKEN_FILE_MS: () => STALE_TOKEN_FILE_MS,
   MIN_AUTO_COMPACT_WINDOW: () => MIN_AUTO_COMPACT_WINDOW,
-  CLAUDE_CODE_DEFAULT_MAX_CONTEXT: () => CLAUDE_CODE_DEFAULT_MAX_CONTEXT
+  CLAUDE_CODE_DEFAULT_MAX_CONTEXT: () => CLAUDE_CODE_DEFAULT_MAX_CONTEXT,
+  CATALOG_WINDOW_TIMEOUT_MS: () => CATALOG_WINDOW_TIMEOUT_MS
 });
 import { spawn as spawn4 } from "child_process";
 import {
@@ -74349,11 +74996,13 @@ import {
   mkdirSync as mkdirSync16,
   openSync as openSync5,
   readFileSync as readFileSync24,
+  readdirSync as readdirSync6,
+  statSync as statSync5,
   unlinkSync as unlinkSync9,
   writeFileSync as writeFileSync18
 } from "fs";
 import { homedir as homedir29, tmpdir as tmpdir2 } from "os";
-import { join as join31 } from "path";
+import { dirname as dirname11, join as join31 } from "path";
 import { isatty } from "tty";
 function releaseTerminalIsolation() {
   if (!restoreTerminal)
@@ -74395,9 +75044,9 @@ function managedSettingsPath() {
   }
   return "/etc/claude-code/managed-settings.json";
 }
-function managedSettingsForcesClaudeAi(readFile = readFileSync24) {
+function managedSettingsForcesClaudeAi(readFile2 = readFileSync24) {
   try {
-    const raw2 = readFile(managedSettingsPath(), "utf-8");
+    const raw2 = readFile2(managedSettingsPath(), "utf-8");
     const parsed = JSON.parse(raw2);
     return parsed.forceLoginMethod === "claudeai";
   } catch {
@@ -74532,7 +75181,111 @@ process.stdin.on('end', () => {
   writeFileSync18(scriptPath, script, "utf-8");
   return scriptPath;
 }
-function createTempSettingsFile(_modelDisplay, port, proxyAuthMode) {
+function initializeTokenFile(tokenFilePath) {
+  try {
+    mkdirSync16(dirname11(tokenFilePath), { recursive: true });
+    writeFileSync18(tokenFilePath, JSON.stringify({
+      input_tokens: 0,
+      output_tokens: 0,
+      total_tokens: 0,
+      total_cost: 0,
+      context_window: "unknown",
+      context_left_percent: -1,
+      updated_at: Date.now(),
+      is_free: false,
+      is_estimated: false
+    }), "utf-8");
+  } catch (e) {
+    log(`[claude-runner] Could not initialize token file ${tokenFilePath}: ${e}`);
+  }
+}
+function cleanupStaleTokenFiles(dir, now = Date.now(), maxAgeMs = STALE_TOKEN_FILE_MS) {
+  let removed = 0;
+  let entries;
+  try {
+    entries = readdirSync6(dir);
+  } catch {
+    return 0;
+  }
+  const cutoff = now - maxAgeMs;
+  let scanned = 0;
+  for (const name of entries) {
+    if (scanned >= MAX_TOKEN_FILES_SCANNED)
+      break;
+    if (!name.startsWith("tokens-") || !name.endsWith(".json"))
+      continue;
+    scanned++;
+    const full = join31(dir, name);
+    try {
+      if (statSync5(full).mtimeMs >= cutoff)
+        continue;
+      unlinkSync9(full);
+      removed++;
+    } catch {}
+  }
+  if (removed > 0) {
+    log(`[claude-runner] Removed ${removed} stale token file(s) from ${dir}`);
+  }
+  return removed;
+}
+function parseSettingsArg(value) {
+  if (value.trimStart().startsWith("{")) {
+    return JSON.parse(value);
+  }
+  return JSON.parse(readFileSync24(value, "utf-8"));
+}
+function parseSettingsArgSafe(value) {
+  try {
+    const parsed = parseSettingsArg(value);
+    return parsed && typeof parsed === "object" ? parsed : null;
+  } catch {
+    return null;
+  }
+}
+function userSettingsFileCandidates(cwd) {
+  return [
+    join31(homedir29(), ".claude", "settings.json"),
+    join31(cwd, ".claude", "settings.json"),
+    join31(cwd, ".claude", "settings.local.json")
+  ];
+}
+function discoverUserStatusLineCommand(claudeArgs = [], cwd = process.cwd()) {
+  const sources = userSettingsFileCandidates(cwd).filter((file2) => existsSync25(file2));
+  const idx = claudeArgs.indexOf("--settings");
+  const settingsArg = idx === -1 ? undefined : claudeArgs[idx + 1];
+  if (settingsArg)
+    sources.push(settingsArg);
+  let effective;
+  for (const source of sources) {
+    const layer = parseSettingsArgSafe(source);
+    if (layer && "statusLine" in layer)
+      effective = layer.statusLine;
+  }
+  return chainableCommandOf(effective);
+}
+function chainableCommandOf(statusLine) {
+  if (!statusLine || typeof statusLine !== "object")
+    return null;
+  const { type, command } = statusLine;
+  if (type !== "command" || typeof command !== "string")
+    return null;
+  const trimmed = command.trim();
+  if (!trimmed)
+    return null;
+  if (trimmed.includes("CLAUDISH_ACTIVE_MODEL_NAME") || trimmed.includes("CLAUDISH_IS_LOCAL")) {
+    return null;
+  }
+  return trimmed;
+}
+function buildChainedStatusCommand(userCommand, claudishBody, claudishSegment) {
+  const quotedUser = `'${userCommand.replace(/'/g, `'\\''`)}'`;
+  const ESC2 = "\x1B";
+  const separator = `SEP=' ${ESC2}[2m\u2022${ESC2}[0m '`;
+  const runUser = `if command -v timeout >/dev/null 2>&1; then _CT="timeout ${USER_STATUS_LINE_TIMEOUT_SECONDS}"; elif command -v gtimeout >/dev/null 2>&1; then _CT="gtimeout ${USER_STATUS_LINE_TIMEOUT_SECONDS}"; else _CT=""; fi; USER_OUT=$(printf '%s' "$JSON" | $_CT bash -c ${quotedUser} 2>/dev/null)`;
+  const emit2 = `if [ -n "$USER_OUT" ]; then LAST="\${USER_OUT##*$'\\n'}"; if [ "$LAST" = "$USER_OUT" ]; then printf '%s%s%s\\n' "$USER_OUT" "$SEP" "$SEG"; else printf '%s\\n%s%s%s\\n' "\${USER_OUT%$'\\n'*}" "$LAST" "$SEP" "$SEG"; fi; else printf '%s\\n' "$SEG"; fi`;
+  return `JSON=$(cat); ${runUser}; ${claudishBody}; SEG=$(${claudishSegment}); ${separator}; ${emit2}`;
+}
+function createTempSettingsFile(_modelDisplay, port, proxyAuthMode, userStatusLineCommand) {
   const homeDir = process.env.HOME || process.env.USERPROFILE || tmpdir2();
   const claudishDir = join31(homeDir, ".claudish");
   try {
@@ -74541,6 +75294,8 @@ function createTempSettingsFile(_modelDisplay, port, proxyAuthMode) {
   const timestamp = Date.now();
   const tempPath = join31(claudishDir, `settings-${timestamp}.json`);
   const tokenFilePath = join31(claudishDir, `tokens-${port}.json`);
+  cleanupStaleTokenFiles(claudishDir);
+  initializeTokenFile(tokenFilePath);
   let statusCommand;
   if (isWindows2()) {
     const scriptPath = createStatusLineScript(tokenFilePath);
@@ -74555,7 +75310,13 @@ function createTempSettingsFile(_modelDisplay, port, proxyAuthMode) {
     const BOLD4 = "\\033[1m";
     const formatTokensBash = `fmt_tok() { local n=\${1:-0}; if [ "$n" -ge 1000000 ]; then echo "$((n/1000000))M"; elif [ "$n" -ge 1000 ]; then echo "$((n/1000))k"; else echo "$n"; fi; }`;
     const effWinBash = `eff_win() { local w=\${1:-0}; local m=\${CLAUDE_CODE_MAX_CONTEXT_TOKENS:-}; local a=\${CLAUDE_CODE_AUTO_COMPACT_WINDOW:-}; case "$m" in ''|*[!0-9]*) m=${CLAUDE_CODE_DEFAULT_MAX_CONTEXT};; esac; case "$a" in ''|*[!0-9]*) a=0;; esac; case "$w" in ''|*[!0-9]*) w=0;; esac; if [ "$w" -gt 0 ]; then if [ "$m" -gt 0 ] && [ "$m" -lt "$w" ]; then w=$m; fi; if [ "$a" -gt 0 ] && [ "$a" -lt "$w" ]; then w=$a; fi; fi; echo "$w"; }`;
-    statusCommand = `JSON=$(cat) && DIR=$(basename "$(pwd)") && [ \${#DIR} -gt 15 ] && DIR="\${DIR:0:12}..." || true && CTX=-1 && COST="0" && IS_FREE="false" && IS_EST="false" && PROVIDER="" && TOKEN_MODEL="" && IN_TOK=0 && CTX_WIN=0 && ${formatTokensBash} && ${effWinBash} && if [ -f "${tokenFilePath}" ]; then TOKENS=$(cat "${tokenFilePath}" 2>/dev/null | tr -d ' \\n') && REAL_CTX=$(echo "$TOKENS" | grep -o '"context_left_percent":-\\?[0-9]*' | grep -o '\\-\\?[0-9]*') && if [ ! -z "$REAL_CTX" ]; then CTX="$REAL_CTX"; fi && REAL_COST=$(echo "$TOKENS" | grep -o '"total_cost":[0-9.]*' | cut -d: -f2) && if [ ! -z "$REAL_COST" ]; then COST="$REAL_COST"; fi && IN_TOK=$(echo "$TOKENS" | grep -o '"input_tokens":[0-9]*' | grep -o '[0-9]*') && CTX_WIN=$(echo "$TOKENS" | grep -o '"context_window":[0-9]*' | grep -o '[0-9]*') && IS_FREE=$(echo "$TOKENS" | grep -o '"is_free":[a-z]*' | cut -d: -f2) && IS_EST=$(echo "$TOKENS" | grep -o '"is_estimated":[a-z]*' | cut -d: -f2) && PROVIDER=$(echo "$TOKENS" | grep -o '"provider_name":"[^"]*"' | cut -d'"' -f4) && TOKEN_MODEL=$(echo "$TOKENS" | grep -o '"model_name":"[^"]*"' | cut -d'"' -f4); fi && if [ "$CLAUDISH_IS_LOCAL" = "true" ]; then COST_DISPLAY="LOCAL"; elif [ "$IS_FREE" = "true" ]; then COST_DISPLAY="FREE"; elif [ "$IS_EST" = "true" ]; then COST_DISPLAY=$(printf "~\\$%.3f" "$COST"); else COST_DISPLAY=$(printf "\\$%.3f" "$COST"); fi && MODEL_DISPLAY="\${TOKEN_MODEL:-$CLAUDISH_ACTIVE_MODEL_NAME}" && if [ ! -z "$PROVIDER" ]; then MODEL_DISPLAY="$PROVIDER $MODEL_DISPLAY"; fi && EFF_WIN=$(eff_win $CTX_WIN) && if [ "$EFF_WIN" -gt 0 ] 2>/dev/null && [ "$IN_TOK" -gt 0 ] 2>/dev/null; then CTX=$(( ((EFF_WIN - IN_TOK) * 200 / EFF_WIN + 1) / 2 )); if [ "$CTX" -lt 0 ]; then CTX=0; fi; fi && if [ "$CTX" -lt 0 ] 2>/dev/null || [ "$EFF_WIN" -le 0 ] 2>/dev/null; then if [ "$IN_TOK" -gt 0 ] 2>/dev/null; then CTX_DISPLAY="$(fmt_tok $IN_TOK) tokens"; else CTX_DISPLAY="N/A"; fi; elif [ "$IN_TOK" -gt 0 ] 2>/dev/null; then if [ "$EFF_WIN" -lt "$CTX_WIN" ] 2>/dev/null; then CTX_DISPLAY="$CTX% ($(fmt_tok $IN_TOK)/$(fmt_tok $EFF_WIN) of $(fmt_tok $CTX_WIN))"; else CTX_DISPLAY="$CTX% ($(fmt_tok $IN_TOK)/$(fmt_tok $EFF_WIN))"; fi; else CTX_DISPLAY="$CTX%"; fi && printf "${CYAN4}${BOLD4}%s${RESET4} ${DIM4}\u2022${RESET4} ${YELLOW3}%s${RESET4} ${DIM4}\u2022${RESET4} ${GREEN4}%s${RESET4} ${DIM4}\u2022${RESET4} ${MAGENTA3}%s${RESET4}\\n" "$DIR" "$MODEL_DISPLAY" "$COST_DISPLAY" "$CTX_DISPLAY"`;
+    const dirPrelude = `DIR=$(basename "$(pwd)"); [ \${#DIR} -gt 15 ] && DIR="\${DIR:0:12}..." || true; `;
+    const readState = `CTX=-1; COST="0"; IS_FREE="false"; IS_EST="false"; PROVIDER=""; TOKEN_MODEL=""; IN_TOK=0; CTX_WIN=0; ${formatTokensBash}; ${effWinBash}; if [ -f "${tokenFilePath}" ]; then TOKENS=$(cat "${tokenFilePath}" 2>/dev/null | tr -d '\\n\\r'); V=$(echo "$TOKENS" | grep -o '"context_left_percent": *-\\?[0-9]*' | grep -o '\\-\\?[0-9]*'); [ -n "$V" ] && CTX="$V"; V=$(echo "$TOKENS" | grep -o '"total_cost": *[0-9.]*' | cut -d: -f2 | tr -d ' '); [ -n "$V" ] && COST="$V"; V=$(echo "$TOKENS" | grep -o '"input_tokens": *[0-9]*' | grep -o '[0-9]*'); [ -n "$V" ] && IN_TOK="$V"; V=$(echo "$TOKENS" | grep -o '"context_window": *[0-9]*' | grep -o '[0-9]*'); [ -n "$V" ] && CTX_WIN="$V"; V=$(echo "$TOKENS" | grep -o '"is_free": *[a-z]*' | cut -d: -f2 | tr -d ' '); [ -n "$V" ] && IS_FREE="$V"; V=$(echo "$TOKENS" | grep -o '"is_estimated": *[a-z]*' | cut -d: -f2 | tr -d ' '); [ -n "$V" ] && IS_EST="$V"; V=$(echo "$TOKENS" | grep -o '"provider_name": *"[^"]*"' | cut -d'"' -f4); [ -n "$V" ] && PROVIDER="$V"; V=$(echo "$TOKENS" | grep -o '"model_name": *"[^"]*"' | cut -d'"' -f4); [ -n "$V" ] && TOKEN_MODEL="$V"; fi; if [ "$CLAUDISH_IS_LOCAL" = "true" ]; then COST_DISPLAY="LOCAL"; elif [ "$IS_FREE" = "true" ]; then COST_DISPLAY="FREE"; elif [ "$IS_EST" = "true" ]; then COST_DISPLAY=$(printf "~\\$%.3f" "$COST"); else COST_DISPLAY=$(printf "\\$%.3f" "$COST"); fi; MODEL_DISPLAY="\${TOKEN_MODEL:-$CLAUDISH_ACTIVE_MODEL_NAME}"; if [ -n "$PROVIDER" ]; then MODEL_DISPLAY="$PROVIDER $MODEL_DISPLAY"; fi; EFF_WIN=$(eff_win $CTX_WIN); if [ "$EFF_WIN" -gt 0 ] 2>/dev/null && [ "$IN_TOK" -gt 0 ] 2>/dev/null; then CTX=$(( ((EFF_WIN - IN_TOK) * 200 / EFF_WIN + 1) / 2 )); if [ "$CTX" -lt 0 ]; then CTX=0; fi; fi; if [ "$CTX" -lt 0 ] 2>/dev/null || [ "$EFF_WIN" -le 0 ] 2>/dev/null; then if [ "$IN_TOK" -gt 0 ] 2>/dev/null; then CTX_DISPLAY="$(fmt_tok $IN_TOK) tokens"; else CTX_DISPLAY="N/A"; fi; elif [ "$IN_TOK" -gt 0 ] 2>/dev/null; then if [ "$EFF_WIN" -lt "$CTX_WIN" ] 2>/dev/null; then CTX_DISPLAY="$CTX% ($(fmt_tok $IN_TOK)/$(fmt_tok $EFF_WIN) of $(fmt_tok $CTX_WIN))"; else CTX_DISPLAY="$CTX% ($(fmt_tok $IN_TOK)/$(fmt_tok $EFF_WIN))"; fi; else CTX_DISPLAY="$CTX%"; fi`;
+    const segmentWithDir = `printf "${CYAN4}${BOLD4}%s${RESET4} ${DIM4}\u2022${RESET4} ${YELLOW3}%s${RESET4} ${DIM4}\u2022${RESET4} ${GREEN4}%s${RESET4} ${DIM4}\u2022${RESET4} ${MAGENTA3}%s${RESET4}\\n" "$DIR" "$MODEL_DISPLAY" "$COST_DISPLAY" "$CTX_DISPLAY"`;
+    const segmentNoDirWithProvider = `printf "${YELLOW3}%s${RESET4} ${DIM4}\u2022${RESET4} ${GREEN4}%s${RESET4} ${DIM4}\u2022${RESET4} ${MAGENTA3}%s${RESET4}\\n" "$PROVIDER" "$COST_DISPLAY" "$CTX_DISPLAY"`;
+    const segmentNoDirNoProvider = `printf "${GREEN4}%s${RESET4} ${DIM4}\u2022${RESET4} ${MAGENTA3}%s${RESET4}\\n" "$COST_DISPLAY" "$CTX_DISPLAY"`;
+    const segmentNoDir = `if [ -n "$PROVIDER" ]; then ${segmentNoDirWithProvider}; else ${segmentNoDirNoProvider}; fi`;
+    statusCommand = userStatusLineCommand ? buildChainedStatusCommand(userStatusLineCommand, readState, segmentNoDir) : `JSON=$(cat); ${dirPrelude}${readState}; ${segmentWithDir}`;
   }
   const statusLine = {
     type: "command",
@@ -74564,7 +75325,7 @@ function createTempSettingsFile(_modelDisplay, port, proxyAuthMode) {
   };
   const settings = buildClaudishSettingsOverlay(statusLine, proxyAuthMode);
   writeFileSync18(tempPath, JSON.stringify(settings, null, 2), "utf-8");
-  return { path: tempPath, statusLine };
+  return { path: tempPath, statusLine, tokenFilePath };
 }
 function buildClaudishSettingsOverlay(statusLine, proxyAuthMode) {
   const settings = { statusLine, disableClaudeAiConnectors: true };
@@ -74580,13 +75341,7 @@ function mergeUserSettingsIfPresent(config3, tempSettingsPath, statusLine, proxy
   }
   const userSettingsValue = config3.claudeArgs[idx + 1];
   try {
-    let userSettings;
-    if (userSettingsValue.trimStart().startsWith("{")) {
-      userSettings = JSON.parse(userSettingsValue);
-    } else {
-      const rawUserSettings = readFileSync24(userSettingsValue, "utf-8");
-      userSettings = JSON.parse(rawUserSettings);
-    }
+    const userSettings = parseSettingsArg(userSettingsValue);
     userSettings.statusLine = statusLine;
     if (!("disableClaudeAiConnectors" in userSettings)) {
       userSettings.disableClaudeAiConnectors = true;
@@ -74602,27 +75357,64 @@ function mergeUserSettingsIfPresent(config3, tempSettingsPath, statusLine, proxy
   }
   config3.claudeArgs.splice(idx, 2);
 }
+function withDeadline(promise3, ms) {
+  return new Promise((resolve4) => {
+    const timer = setTimeout(() => resolve4(null), ms);
+    timer.unref?.();
+    promise3.then((value) => {
+      clearTimeout(timer);
+      resolve4(value);
+    }).catch(() => {
+      clearTimeout(timer);
+      resolve4(null);
+    });
+  });
+}
+async function resolveLocalContextWindow(spec, cachePath) {
+  const parsed = parseModelSpec(spec);
+  let provider = parsed.provider;
+  if (!parsed.isExplicitProvider) {
+    const plan = await route(spec);
+    if (plan.kind !== "ok")
+      return null;
+    provider = plan.primary.provider;
+  }
+  const win = await discoverContextWindow(provider, parsed.model) ?? lookupModelForProvider(parsed.model, provider, cachePath);
+  return {
+    modelId: parsed.model,
+    window: typeof win === "number" && win > 0 ? win : null
+  };
+}
+async function catalogWindowMin(modelIds) {
+  const misses = [...new Set(modelIds)];
+  if (misses.length === 0)
+    return Number.POSITIVE_INFINITY;
+  const windows = await withDeadline(Promise.all(misses.map((id) => resolveCatalogContextWindow(id).catch(() => null))), CATALOG_WINDOW_TIMEOUT_MS);
+  let min = Number.POSITIVE_INFINITY;
+  for (const win of windows ?? []) {
+    if (typeof win === "number" && win > 0)
+      min = Math.min(min, win);
+  }
+  return min;
+}
 async function computeMainThreadContextWindow(config3, cachePath) {
   const specs = [config3.model, config3.modelOpus, config3.modelSonnet].filter((s) => typeof s === "string" && s.length > 0);
   if (specs.length === 0)
     return 0;
   let min = Number.POSITIVE_INFINITY;
+  const unresolved = [];
   for (const spec of specs) {
     try {
-      const parsed = parseModelSpec(spec);
-      let provider = parsed.provider;
-      if (!parsed.isExplicitProvider) {
-        const plan = await route(spec);
-        if (plan.kind !== "ok")
-          continue;
-        provider = plan.primary.provider;
-      }
-      const win = await discoverContextWindow(provider, parsed.model) ?? lookupModelForProvider(parsed.model, provider, cachePath);
-      if (typeof win === "number" && win > 0) {
-        min = Math.min(min, win);
-      }
+      const resolved = await resolveLocalContextWindow(spec, cachePath);
+      if (!resolved)
+        continue;
+      if (resolved.window !== null)
+        min = Math.min(min, resolved.window);
+      else
+        unresolved.push(resolved.modelId);
     } catch {}
   }
+  min = Math.min(min, await catalogWindowMin(unresolved));
   return Number.isFinite(min) ? min : 0;
 }
 function resolveContextWindowEnv(realWindow, processEnv = process.env) {
@@ -74659,7 +75451,12 @@ async function runClaudeWithProxy(config3, proxyUrl, onCleanup) {
     onCleanup?.();
     return 1;
   }
-  const { path: tempSettingsPath, statusLine } = createTempSettingsFile(modelId ?? "default", port, proxyAuthMode);
+  const userStatusLineCommand = discoverUserStatusLineCommand(config3.claudeArgs);
+  const {
+    path: tempSettingsPath,
+    statusLine,
+    tokenFilePath
+  } = createTempSettingsFile(modelId ?? "default", port, proxyAuthMode, userStatusLineCommand);
   mergeUserSettingsIfPresent(config3, tempSettingsPath, statusLine, proxyAuthMode);
   const claudeArgs = [];
   claudeArgs.push("--settings", tempSettingsPath);
@@ -74692,8 +75489,16 @@ async function runClaudeWithProxy(config3, proxyUrl, onCleanup) {
     ...process.env,
     ANTHROPIC_BASE_URL: proxyUrl,
     [ENV.CLAUDISH_ACTIVE_MODEL_NAME]: modelDisplayName,
-    CLAUDISH_IS_LOCAL: isLocalModel2 ? "true" : "false"
+    CLAUDISH_IS_LOCAL: isLocalModel2 ? "true" : "false",
+    [ENV.CLAUDISH_TOKEN_FILE]: tokenFilePath
   };
+  if (modelId) {
+    const parsedSpec = parseModelSpec(modelId);
+    const providerDisplayName = parsedSpec.isExplicitProvider ? getProviderByName(parsedSpec.provider)?.displayName : undefined;
+    if (providerDisplayName) {
+      env[ENV.CLAUDISH_PROVIDER_NAME] = providerDisplayName;
+    }
+  }
   let hidAnthropicApiKey = false;
   delete env.CLAUDECODE;
   if (config3.monitor) {
@@ -74904,17 +75709,20 @@ async function checkClaudeInstalled() {
   const binary = await findClaudeBinary();
   return binary !== null;
 }
-var restoreTerminal = null, CLAUDE_CODE_DEFAULT_MAX_CONTEXT = 200000, MIN_AUTO_COMPACT_WINDOW = 200000;
+var restoreTerminal = null, STALE_TOKEN_FILE_MS, MAX_TOKEN_FILES_SCANNED = 4000, CLAUDE_CODE_DEFAULT_MAX_CONTEXT = 200000, USER_STATUS_LINE_TIMEOUT_SECONDS = 3, MIN_AUTO_COMPACT_WINDOW = 200000, CATALOG_WINDOW_TIMEOUT_MS = 1500;
 var init_claude_runner = __esm(() => {
   init_model_catalog();
   init_config2();
+  init_context_window_fallback();
   init_logger();
   init_profile_config();
   init_model_discovery();
   init_model_parser();
+  init_provider_definitions();
   init_routing_rules();
   init_telemetry();
   init_terminal_isolation();
+  STALE_TOKEN_FILE_MS = 7 * 24 * 60 * 60 * 1000;
 });
 
 // src/diag-output.ts
@@ -75148,7 +75956,7 @@ import { spawn as spawn5 } from "child_process";
 import { execSync as execSync2 } from "child_process";
 import { existsSync as existsSync26, readFileSync as readFileSync25, writeFileSync as writeFileSync20 } from "fs";
 import { connect as netConnect } from "net";
-import { dirname as dirname11, join as join33 } from "path";
+import { dirname as dirname12, join as join33 } from "path";
 import { setTimeout as wait } from "timers/promises";
 import { fileURLToPath as fileURLToPath3 } from "url";
 function resolveRouteInfo(modelId) {
@@ -75241,7 +76049,7 @@ function buildPaneHeader(model, prompt, bg) {
 }
 function findMagmuxBinary() {
   const thisFile = fileURLToPath3(import.meta.url);
-  const thisDir = dirname11(thisFile);
+  const thisDir = dirname12(thisFile);
   const pkgRoot = join33(thisDir, "..");
   const platform3 = process.platform;
   const arch = process.arch;
@@ -75255,7 +76063,7 @@ function findMagmuxBinary() {
       const candidate = join33(searchDir, "node_modules", pkgName, "bin", "magmux");
       if (existsSync26(candidate))
         return candidate;
-      const parent = dirname11(searchDir);
+      const parent = dirname12(searchDir);
       if (parent === searchDir)
         break;
       searchDir = parent;
@@ -75316,12 +76124,12 @@ async function subscribeToMagmux(sockPath, onEvent) {
     client.once("error", done);
   });
 }
-function buildTeamStatus(manifest, startedAt, results) {
+function buildTeamStatus(manifest, startedAt, results2) {
   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);
+    const result = results2?.find((r) => r.pane === i);
     if (!result) {
       models[anonId] = {
         state: "TIMEOUT",
@@ -75390,8 +76198,8 @@ async function runWithGrid(sessionPath, models, input, opts) {
     proc.on("exit", () => resolve4());
     proc.on("error", () => resolve4());
   });
-  const [{ results }] = await Promise.all([subscription, procExit]);
-  const status = buildTeamStatus(manifest, startedAt, results?.panes ?? null);
+  const [{ results: results2 }] = await Promise.all([subscription, procExit]);
+  const status = buildTeamStatus(manifest, startedAt, results2?.panes ?? null);
   const statusPath = join33(sessionPath, "status.json");
   writeFileSync20(statusPath, JSON.stringify(status, null, 2), "utf-8");
   return status;