@proxysoul/soulforge 2.18.4 → 2.18.6

package/dist/index.js

@@ -3851,7 +3851,10 @@ function readJsonFile(path) {
       return null;
     }
     return JSON.parse(readFileSync5(path, "utf-8"));
-  } catch {
+  } catch (err2) {
+    const msg = err2 instanceof Error ? err2.message : String(err2);
+    process.stderr.write(`  Warning: invalid ${path} \u2014 ${msg}. Ignoring.
+`);
     return null;
   }
 }
@@ -5211,8 +5214,17 @@ function loadConfig() {
     try {
       userConfig = JSON.parse(readFileSync8(configFile, "utf-8"));
     } catch (err2) {
-      logBackgroundError("config", `Failed to parse ${configFile}: ${err2 instanceof Error ? err2.message : String(err2)} \u2014 using defaults`);
-      userConfig = {};
+      const msg = err2 instanceof Error ? err2.message : String(err2);
+      process.stderr.write(`
+  Error: invalid config.json \u2014 ${msg}
+
+` + `  Path: ${configFile}
+
+` + `  Fix the JSON syntax error and try again.
+` + `  (Your config was NOT overwritten.)
+
+`);
+      process.exit(1);
     }
   }
   let merged = { ...DEFAULT_CONFIG };
@@ -5260,7 +5272,13 @@ function loadProjectConfig(cwd) {
     const raw = readFileSync8(projectFile, "utf-8");
     return JSON.parse(raw);
   } catch (err2) {
-    logBackgroundError("config", `Failed to parse ${projectFile}: ${err2 instanceof Error ? err2.message : String(err2)} \u2014 ignoring project config`);
+    const msg = err2 instanceof Error ? err2.message : String(err2);
+    process.stderr.write(`
+  Warning: invalid project config.json \u2014 ${msg}
+` + `  Path: ${projectFile}
+` + `  Fix the JSON syntax error. Ignoring project config for now.
+
+`);
     return null;
   }
 }
@@ -5391,7 +5409,6 @@ var DEFAULT_CONFIG, _presetOverlay = null, NESTED_KEYS;
 var init_config2 = __esm(() => {
   init_platform();
   init_ensure_soulforge_dir();
-  init_errors();
   DEFAULT_CONFIG = {
     defaultModel: "none",
     routerRules: [],
@@ -46827,6 +46844,13 @@ function supportsTemperature(modelId) {
     return true;
   return v.major < 5 && (v.major < 4 || v.minor < 7);
 }
+function isAdaptiveOnly(modelId) {
+  const base = extractBaseModel(modelId);
+  const v = parseOpusVersion(base);
+  if (!v)
+    return false;
+  return v.major >= 5 || v.major === 4 && v.minor >= 7;
+}
 
 // src/utils/errors.ts
 function toErrorMessage(err2) {
@@ -51853,6 +51877,7 @@ var init_anthropic = __esm(() => {
       return result;
     },
     fallbackModels: [
+      { id: "claude-opus-4-8", name: "Claude Opus 4.8" },
       { id: "claude-opus-4-7", name: "Claude Opus 4.7" },
       { id: "claude-opus-4-6", name: "Claude Opus 4.6" },
       { id: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" },
@@ -51863,6 +51888,7 @@ var init_anthropic = __esm(() => {
       { id: "claude-haiku-4", name: "Claude Haiku 4" }
     ],
     contextWindows: [
+      ["claude-opus-4-8", 1e6],
       ["claude-opus-4-7", 1e6],
       ["claude-opus-4-6", 1e6],
       ["claude-sonnet-4-6", 1e6],
@@ -64231,6 +64257,7 @@ var init_bedrock = __esm(() => {
       return null;
     },
     fallbackModels: [
+      { id: "anthropic.claude-opus-4-8", name: "Claude Opus 4.8" },
       { id: "anthropic.claude-sonnet-4-20250514-v1:0", name: "Claude Sonnet 4" },
       { id: "anthropic.claude-haiku-4-5-20251001-v1:0", name: "Claude Haiku 4.5" },
       { id: "us.amazon.nova-pro-v1:0", name: "Amazon Nova Pro" },
@@ -64238,6 +64265,10 @@ var init_bedrock = __esm(() => {
       { id: "meta.llama3-1-70b-instruct-v1:0", name: "Llama 3.1 70B" }
     ],
     contextWindows: [
+      ["claude-opus-4-8", 1e6],
+      ["claude-opus-4-7", 1e6],
+      ["claude-opus-4-6", 1e6],
+      ["claude-sonnet-4-6", 1e6],
       ["claude-sonnet-4", 200000],
       ["claude-opus-4", 200000],
       ["claude-haiku-4", 200000],
@@ -65753,18 +65784,23 @@ var init_auth = __esm(() => {
 });
 
 // src/core/llm/providers/codex/index.ts
-var CODEX_FALLBACK_MODELS, CODEX_CONTEXT_WINDOWS, codex;
+var GPT_55_INPUT_CONTEXT = 272000, CODEX_FALLBACK_MODELS, CODEX_CONTEXT_WINDOWS, CODEX_CONTEXT_WINDOW_OVERRIDES, codex;
 var init_codex = __esm(() => {
   init_client();
   init_runner();
   CODEX_FALLBACK_MODELS = [
+    { id: "gpt-5.5", name: "GPT-5.5", contextWindow: GPT_55_INPUT_CONTEXT },
     { id: "gpt-5.4", name: "GPT-5.4", contextWindow: 1050000 },
     { id: "gpt-5.2-codex", name: "GPT-5.2-Codex", contextWindow: 400000 }
   ];
   CODEX_CONTEXT_WINDOWS = [
+    ["gpt-5.5", GPT_55_INPUT_CONTEXT],
     ["gpt-5.4", 1050000],
     ["gpt-5.2-codex", 400000]
   ];
+  CODEX_CONTEXT_WINDOW_OVERRIDES = [
+    ["gpt-5.5", GPT_55_INPUT_CONTEXT]
+  ];
   codex = {
     id: "codex",
     name: "Codex",
@@ -65791,6 +65827,7 @@ var init_codex = __esm(() => {
     },
     fallbackModels: CODEX_FALLBACK_MODELS,
     contextWindows: CODEX_CONTEXT_WINDOWS,
+    contextWindowOverrides: CODEX_CONTEXT_WINDOW_OVERRIDES,
     checkAvailability: async () => {
       const status = getCodexLoginStatus();
       return status.installed && status.loggedIn;
@@ -71745,7 +71782,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@proxysoul/soulforge",
-    version: "2.18.4",
+    version: "2.18.6",
     description: "Graph-powered code intelligence \u2014 multi-agent coding with codebase-aware AI",
     repository: {
       type: "git",
@@ -72261,6 +72298,9 @@ function getCompatReasoningBody(modelId, config2) {
     return {};
   const isClaude = base.startsWith("claude");
   if (isClaude && provider === "opencode-zen") {
+    if (isAdaptiveOnly(base)) {
+      return { thinking: { type: "adaptive" } };
+    }
     const explicitBudget = config2.thinking?.budgetTokens;
     const budget = explicitBudget ?? { low: 2048, medium: 5000, high: 1e4, xhigh: 20000 }[effort] ?? 5000;
     return { thinking: { type: "enabled", budget_tokens: budget } };
@@ -72467,8 +72507,10 @@ var init_copilot = __esm(() => {
       }
     },
     fallbackModels: [
-      { id: "claude-opus-4.6", name: "Claude Opus 4.6", contextWindow: 200000 },
-      { id: "claude-sonnet-4.6", name: "Claude Sonnet 4.6", contextWindow: 200000 },
+      { id: "claude-opus-4.8", name: "Claude Opus 4.8", contextWindow: 1e6 },
+      { id: "claude-opus-4.7", name: "Claude Opus 4.7", contextWindow: 1e6 },
+      { id: "claude-opus-4.6", name: "Claude Opus 4.6", contextWindow: 1e6 },
+      { id: "claude-sonnet-4.6", name: "Claude Sonnet 4.6", contextWindow: 1e6 },
       { id: "claude-sonnet-4", name: "Claude Sonnet 4", contextWindow: 128000 },
       { id: "claude-opus-4.5", name: "Claude Opus 4.5", contextWindow: 200000 },
       { id: "claude-sonnet-4.5", name: "Claude Sonnet 4.5", contextWindow: 200000 },
@@ -72483,8 +72525,10 @@ var init_copilot = __esm(() => {
       { id: "gemini-3.1-pro-preview", name: "Gemini 3.1 Pro", contextWindow: 1e6 }
     ],
     contextWindows: [
-      ["claude-opus-4.6", 200000],
-      ["claude-sonnet-4.6", 200000],
+      ["claude-opus-4.8", 1e6],
+      ["claude-opus-4.7", 1e6],
+      ["claude-opus-4.6", 1e6],
+      ["claude-sonnet-4.6", 1e6],
       ["claude-opus-4.5", 200000],
       ["claude-sonnet-4.5", 200000],
       ["claude-sonnet-4", 128000],
@@ -84716,6 +84760,7 @@ var init_llmgateway = __esm(() => {
       return null;
     },
     fallbackModels: [
+      { id: "claude-opus-4-8", name: "Claude Opus 4.8" },
       { id: "claude-opus-4-7", name: "Claude Opus 4.7" },
       { id: "claude-opus-4-6", name: "Claude Opus 4.6" },
       { id: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" },
@@ -84741,6 +84786,7 @@ var init_llmgateway = __esm(() => {
       ["glm-4", 128000]
     ],
     contextWindows: [
+      ["claude-opus-4-8", 1e6],
       ["claude-opus-4-7", 1e6],
       ["claude-opus-4-6", 1e6],
       ["claude-sonnet-4-6", 200000],
@@ -93981,6 +94027,73 @@ var init_mistral = __esm(() => {
   };
 });
 
+// src/core/llm/providers/nim.ts
+var BASE_URL2 = "https://integrate.api.nvidia.com/v1", nim;
+var init_nim = __esm(() => {
+  init_dist9();
+  init_config2();
+  init_secrets();
+  init_compat_reasoning();
+  nim = {
+    id: "nim",
+    name: "NVIDIA NIM",
+    envVar: "NVIDIA_API_KEY",
+    icon: "\uF0E7",
+    secretKey: "nvidia-api-key",
+    keyUrl: "build.nvidia.com",
+    asciiIcon: "N",
+    description: "NVIDIA-hosted open models",
+    createModel(modelId) {
+      const apiKey = getProviderApiKey("NVIDIA_API_KEY");
+      if (!apiKey) {
+        throw new Error("NVIDIA_API_KEY is not set");
+      }
+      const reasoningBody = getCompatReasoningBody(`nim/${modelId}`, loadConfig());
+      const reasoningFetch = createReasoningFetchWrapper(reasoningBody);
+      return createOpenAICompatible({
+        name: "nim",
+        baseURL: BASE_URL2,
+        apiKey,
+        ...reasoningFetch ? { fetch: reasoningFetch } : {}
+      })(modelId);
+    },
+    async fetchModels() {
+      const apiKey = getProviderApiKey("NVIDIA_API_KEY");
+      if (!apiKey)
+        return null;
+      const res = await fetch(`${BASE_URL2}/models`, {
+        headers: { Authorization: `Bearer ${apiKey}` }
+      });
+      if (!res.ok)
+        throw new Error(`NVIDIA NIM API ${String(res.status)}`);
+      const data = await res.json();
+      return data.data.map((m) => ({ id: m.id, name: m.id }));
+    },
+    fallbackModels: [
+      { id: "moonshotai/kimi-k2.6", name: "Kimi K2.6" },
+      { id: "deepseek-ai/deepseek-v4-flash", name: "DeepSeek V4 Flash" },
+      { id: "deepseek-ai/deepseek-v4-pro", name: "DeepSeek V4 Pro" },
+      { id: "zai/glm-5.1", name: "GLM-5.1" },
+      { id: "mistralai/mistral-medium-3.5", name: "Mistral Medium 3.5" },
+      { id: "mistralai/mistral-small-4", name: "Mistral Small 4" },
+      { id: "google/gemma-4-31b", name: "Gemma 4 31B" },
+      { id: "nvidia/nemotron-3-super-120b", name: "Nemotron 3 Super 120B" },
+      { id: "minimaxai/minimax-m2.7", name: "MiniMax M2.7" }
+    ],
+    contextWindows: [
+      ["kimi-k2.6", 256000],
+      ["deepseek-v4-flash", 1e6],
+      ["deepseek-v4-pro", 1e6],
+      ["glm-5.1", 200000],
+      ["mistral-medium-3.5", 131072],
+      ["mistral-small-4", 256000],
+      ["gemma-4-31b", 131072],
+      ["nemotron-3-super-120b", 1e6],
+      ["minimax-m2.7", 200000]
+    ]
+  };
+});
+
 // src/core/llm/providers/ollama.ts
 function getOllamaHost() {
   return (process.env.OLLAMA_HOST ?? "http://localhost:11434").replace(/\/+$/, "");
@@ -94150,7 +94263,7 @@ var init_openai = __esm(() => {
 });
 
 // src/core/llm/providers/opencode-go.ts
-var BASE_URL2 = "https://opencode.ai/zen/go/v1", opencodeGo;
+var BASE_URL3 = "https://opencode.ai/zen/go/v1", opencodeGo;
 var init_opencode_go = __esm(() => {
   init_dist9();
   init_config2();
@@ -94174,7 +94287,7 @@ var init_opencode_go = __esm(() => {
       const reasoningFetch = createReasoningFetchWrapper(reasoningBody);
       const provider = createOpenAICompatible({
         name: "opencode-go",
-        baseURL: BASE_URL2,
+        baseURL: BASE_URL3,
         apiKey,
         ...reasoningFetch ? { fetch: reasoningFetch } : {}
       });
@@ -94228,7 +94341,7 @@ var init_opencode_go = __esm(() => {
 });
 
 // src/core/llm/providers/opencode-zen.ts
-var BASE_URL3 = "https://opencode.ai/zen/v1", opencodeZen;
+var BASE_URL4 = "https://opencode.ai/zen/v1", opencodeZen;
 var init_opencode_zen = __esm(() => {
   init_dist9();
   init_config2();
@@ -94254,7 +94367,7 @@ var init_opencode_zen = __esm(() => {
       const reasoningFetch = createReasoningFetchWrapper(reasoningBody);
       const provider = createOpenAICompatible({
         name: "opencode-zen",
-        baseURL: BASE_URL3,
+        baseURL: BASE_URL4,
         apiKey,
         ...reasoningFetch ? { fetch: reasoningFetch } : {}
       });
@@ -94294,6 +94407,7 @@ var init_opencode_zen = __esm(() => {
       { id: "gpt-5", name: "GPT 5" },
       { id: "gpt-5-codex", name: "GPT 5 Codex" },
       { id: "gpt-5-nano", name: "GPT 5 Nano" },
+      { id: "claude-opus-4-8", name: "Claude Opus 4.8" },
       { id: "claude-opus-4-7", name: "Claude Opus 4.7" },
       { id: "claude-opus-4-6", name: "Claude Opus 4.6" },
       { id: "claude-opus-4-5", name: "Claude Opus 4.5" },
@@ -94352,6 +94466,7 @@ var init_opencode_zen = __esm(() => {
       ["gpt-5", 400000],
       ["gpt-5-codex", 400000],
       ["gpt-5-nano", 400000],
+      ["claude-opus-4-8", 1e6],
       ["claude-opus-4-7", 1e6],
       ["claude-opus-4-6", 1e6],
       ["claude-opus-4-5", 200000],
@@ -94360,6 +94475,7 @@ var init_opencode_zen = __esm(() => {
       ["claude-sonnet-4-5", 1e6],
       ["claude-sonnet-4", 200000],
       ["claude-haiku-4-5", 200000],
+      ["claude-opus-4.8", 1e6],
       ["claude-opus-4.6", 1e6],
       ["claude-sonnet-4.6", 1e6],
       ["claude-sonnet-4.5", 1e6],
@@ -99195,6 +99311,7 @@ var init_openrouter = __esm(() => {
       return null;
     },
     fallbackModels: [
+      { id: "anthropic/claude-opus-4.8", name: "Claude Opus 4.8" },
       { id: "anthropic/claude-opus-4.7", name: "Claude Opus 4.7" },
       { id: "anthropic/claude-opus-4.6", name: "Claude Opus 4.6" },
       { id: "anthropic/claude-sonnet-4.6", name: "Claude Sonnet 4.6" },
@@ -99228,6 +99345,8 @@ var init_openrouter = __esm(() => {
       ["glm-4", 128000]
     ],
     contextWindows: [
+      ["claude-opus-4.8", 1e6],
+      ["claude-opus-4.7", 1e6],
       ["claude-opus-4.6", 1e6],
       ["claude-sonnet-4.6", 1e6],
       ["claude-sonnet-4.5", 1e6],
@@ -401650,7 +401769,7 @@ function matchPricing(modelId) {
       return pricing;
   }
   if (id.includes("opus"))
-    return MODEL_PRICING["claude-opus-4-6"] ?? DEFAULT_PRICING;
+    return MODEL_PRICING["claude-opus-4-8"] ?? DEFAULT_PRICING;
   if (id.includes("sonnet"))
     return DEFAULT_PRICING;
   if (id.includes("haiku"))
@@ -401851,6 +401970,7 @@ var init_statusbar = __esm(() => {
   init_platform();
   init_lifecycle();
   MODEL_PRICING = {
+    "claude-opus-4-8": { input: 5, cacheWrite: 6.25, cacheRead: 0.5, output: 25 },
     "claude-opus-4-7": { input: 5, cacheWrite: 6.25, cacheRead: 0.5, output: 25 },
     "claude-opus-4-6": { input: 5, cacheWrite: 6.25, cacheRead: 0.5, output: 25 },
     "claude-opus-4-5": { input: 5, cacheWrite: 6.25, cacheRead: 0.5, output: 25 },
@@ -401947,8 +402067,11 @@ var init_statusbar = __esm(() => {
     "claude-opus-4.5": M3,
     "claude-opus-4.6": M3,
     "claude-opus-4.7": M75,
+    "claude-opus-4.8": M75,
     "gpt-5.5": M75,
-    "claude-opus-4.6-fast": M30
+    "claude-opus-4.8-fast": { input: 20, cacheWrite: 20, cacheRead: 2, output: 100 },
+    "claude-opus-4.6-fast": M30,
+    "claude-opus-4.7-fast": M30
   };
   LOCAL_PROVIDERS = new Set(["ollama", "lmstudio"]);
   ZERO_USAGE = {
@@ -404358,7 +404481,37 @@ function sanitizeMessages(messages) {
     dirty = true;
     return { ...msg, content };
   });
-  return dirty ? cleaned : messages;
+  const result = dirty ? cleaned : [...messages];
+  const allValidCallIds = new Set;
+  for (const msg of result) {
+    if (msg?.role !== "assistant" || !Array.isArray(msg.content))
+      continue;
+    for (const p of msg.content) {
+      const part = p;
+      if (part?.type === "tool-call" && typeof part.toolCallId === "string" && !part.providerExecuted) {
+        allValidCallIds.add(part.toolCallId);
+      }
+    }
+  }
+  for (let i2 = result.length - 1;i2 >= 0; i2--) {
+    const msg = result[i2];
+    if (!msg || msg.role !== "tool" || !Array.isArray(msg.content))
+      continue;
+    const filtered = msg.content.filter((p) => {
+      const part = p;
+      if (part?.type !== "tool-result")
+        return true;
+      return allValidCallIds.has(part.toolCallId);
+    });
+    if (filtered.length === 0) {
+      result.splice(i2, 1);
+      dirty = true;
+    } else if (filtered.length !== msg.content.length) {
+      result[i2] = { ...msg, content: filtered };
+      dirty = true;
+    }
+  }
+  return dirty ? result : messages;
 }
 function sanitizeToolInputsStep({
   messages,
@@ -407177,7 +407330,7 @@ var init_addons = __esm(() => {
 function isAnthropicModel(modelId) {
   return modelId.toLowerCase().startsWith("claude");
 }
-var baseURL, proxy2;
+var baseURL, GPT_55_INPUT_CONTEXT2 = 272000, proxy2;
 var init_proxy2 = __esm(() => {
   init_dist6();
   init_dist8();
@@ -407221,6 +407374,7 @@ var init_proxy2 = __esm(() => {
       stopProxy();
     },
     fallbackModels: [
+      { id: "claude-opus-4-8", name: "Claude Opus 4.8" },
       { id: "claude-opus-4-7", name: "Claude Opus 4.7" },
       { id: "claude-opus-4-6", name: "Claude Opus 4.6" },
       { id: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" },
@@ -407228,9 +407382,13 @@ var init_proxy2 = __esm(() => {
       { id: "claude-sonnet-4-5", name: "Claude Sonnet 4.5" },
       { id: "claude-sonnet-4-20250514", name: "Claude Sonnet 4" },
       { id: "claude-opus-4-20250514", name: "Claude Opus 4" },
-      { id: "claude-haiku-3-5-20241022", name: "Claude Haiku 3.5" }
+      { id: "claude-haiku-3-5-20241022", name: "Claude Haiku 3.5" },
+      { id: "gpt-5.5", name: "GPT-5.5", contextWindow: GPT_55_INPUT_CONTEXT2 }
     ],
+    contextWindowOverrides: [["gpt-5.5", GPT_55_INPUT_CONTEXT2]],
     contextWindows: [
+      ["claude-opus-4-8", 1e6],
+      ["claude-opus-4.8", 1e6],
       ["claude-opus-4-7", 1e6],
       ["claude-opus-4.7", 1e6],
       ["claude-opus-4-6", 1e6],
@@ -407250,6 +407408,7 @@ var init_proxy2 = __esm(() => {
       ["claude-3-5-sonnet", 200000],
       ["claude-3.5-haiku", 200000],
       ["claude-3-5-haiku", 200000],
+      ["gpt-5.5", GPT_55_INPUT_CONTEXT2],
       ["gpt-5-chat", 128000],
       ["gpt-4.1", 1048576],
       ["grok-4.1", 2000000],
@@ -410360,6 +410519,7 @@ __export(exports_providers, {
   openai: () => openai2,
   onProvidersChanged: () => onProvidersChanged,
   ollama: () => ollama,
+  nim: () => nim,
   mistral: () => mistral2,
   minimax: () => minimax2,
   lmstudio: () => lmstudio,
@@ -410433,6 +410593,7 @@ var init_providers = __esm(() => {
   init_lmstudio();
   init_minimax();
   init_mistral();
+  init_nim();
   init_ollama();
   init_openai();
   init_opencode_go();
@@ -410455,6 +410616,7 @@ var init_providers = __esm(() => {
   init_lmstudio();
   init_minimax();
   init_mistral();
+  init_nim();
   init_ollama();
   init_openai();
   init_opencode_go();
@@ -410477,6 +410639,7 @@ var init_providers = __esm(() => {
     bedrock2,
     fireworks2,
     minimax2,
+    nim,
     codex,
     copilot,
     githubModels,
@@ -410495,6 +410658,7 @@ var init_providers = __esm(() => {
 var exports_models = {};
 __export(exports_models, {
   prewarmAllModels: () => prewarmAllModels,
+  matchesContextOverride: () => matchesContextOverride,
   invalidateProviderModelCache: () => invalidateProviderModelCache,
   getShortModelLabel: () => getShortModelLabel,
   getOpenRouterModelPricing: () => getOpenRouterModelPricing,
@@ -410509,6 +410673,7 @@ __export(exports_models, {
   fetchOpenRouterMetadata: () => fetchOpenRouterMetadata,
   fetchGroupedModels: () => fetchGroupedModels,
   ensureModelMetadata: () => ensureModelMetadata,
+  applyProviderContextOverride: () => applyProviderContextOverride,
   PROVIDER_CONFIGS: () => PROVIDER_CONFIGS
 });
 function buildProviderConfigs() {
@@ -410523,6 +410688,26 @@ function buildProviderConfigs() {
     fallbackModels: p.fallbackModels
   }));
 }
+function matchesContextOverride(model, pattern) {
+  const lowerModel = model.toLowerCase();
+  const lowerPattern = pattern.toLowerCase();
+  const bareModel = lowerModel.split("/").pop() ?? lowerModel;
+  const barePattern = lowerPattern.split("/").pop() ?? lowerPattern;
+  return bareModel === barePattern || lowerModel === lowerPattern || lowerModel.endsWith(`/${lowerPattern}`);
+}
+function findContextOverride(provider, model) {
+  if (!provider?.contextWindowOverrides)
+    return;
+  for (const [pattern, tokens] of provider.contextWindowOverrides) {
+    if (matchesContextOverride(model, pattern))
+      return tokens;
+  }
+  return;
+}
+function applyProviderContextOverride(providerId, model) {
+  const tokens = findContextOverride(getProvider(providerId), model.id);
+  return tokens ? { ...model, contextWindow: tokens } : model;
+}
 function getModelContextInfoSync(modelId) {
   const slashIdx = modelId.indexOf("/");
   const providerId = slashIdx >= 0 ? modelId.slice(0, slashIdx) : "";
@@ -410535,12 +410720,9 @@ function getModelContextInfoSync(modelId) {
     }
   } catch {}
   const ownProvider = providerId ? getProvider(providerId) : null;
-  if (ownProvider?.contextWindowOverrides) {
-    for (const [pattern, tokens] of ownProvider.contextWindowOverrides) {
-      if (model.includes(pattern))
-        return { tokens, source: "fallback" };
-    }
-  }
+  const overrideTokens = providerId ? findContextOverride(ownProvider ?? undefined, model) : getAllProviders().map((provider) => findContextOverride(provider, model)).find((tokens) => tokens !== undefined);
+  if (overrideTokens)
+    return { tokens: overrideTokens, source: "override" };
   if (providerId && !ownProvider?.grouped) {
     const entry = modelCache.get(providerId);
     if (entry && Date.now() - entry.ts <= MODEL_CACHE_TTL) {
@@ -410750,10 +410932,13 @@ async function fetchProviderModels(providerId, { bypassCache = false } = {}) {
   try {
     const models = await provider.fetchModels();
     if (models) {
-      modelCache.set(providerId, { models, ts: Date.now() });
-      return { models };
+      const normalized = models.map((m2) => applyProviderContextOverride(providerId, m2));
+      modelCache.set(providerId, { models: normalized, ts: Date.now() });
+      return { models: normalized };
     }
-    return { models: provider.fallbackModels };
+    return {
+      models: provider.fallbackModels.map((m2) => applyProviderContextOverride(providerId, m2))
+    };
   } catch (err2) {
     const msg = toErrorMessage(err2);
     return { models: [], error: `API error: ${msg}` };
@@ -410938,11 +411123,11 @@ async function fetchProxyGrouped() {
       if (!grouped[group])
         grouped[group] = [];
       const ctxWindow = m2.context_length ?? anthropicCtx.get(m2.id) ?? findOpenRouterModel(m2.id)?.context_length;
-      grouped[group].push({
+      grouped[group].push(applyProviderContextOverride("proxy", {
         id: m2.id,
         name: m2.id,
         contextWindow: ctxWindow
-      });
+      }));
     }
     const subProviders = Object.keys(grouped).sort().map((id) => ({ id, name: GROUP_DISPLAY_NAMES[id] ?? titleCase(id) }));
     const result = {
@@ -411295,7 +411480,8 @@ async function buildAnthropicOptions(modelId, caps, config2) {
   let thinkingEnabled = false;
   if (caps.thinking) {
     const mode = config2.thinking?.mode ?? "off";
-    if (mode === "auto" || mode === "adaptive") {
+    const adaptiveOnly = isAdaptiveOnly2(modelId);
+    if (mode === "auto" || mode === "adaptive" || mode === "enabled" && adaptiveOnly) {
       if (caps.adaptiveThinking) {
         opts.thinking = { type: "adaptive" };
         thinkingEnabled = true;
@@ -411332,7 +411518,7 @@ async function buildAnthropicOptions(modelId, caps, config2) {
       opts.contextManagement = { edits };
     }
   }
-  if (thinkingEnabled && caps.interleavedThinking) {
+  if (thinkingEnabled && caps.interleavedThinking && opts.thinking?.type !== "adaptive") {
     headers["anthropic-beta"] = "interleaved-thinking-2025-05-14";
   }
   return { opts, headers, thinkingEnabled };
@@ -411452,7 +411638,7 @@ function degradeProviderOptions(modelId, level) {
   const caps = getEffectiveCaps(modelId);
   const providerOptions = {};
   if (caps.anthropicOptions && caps.thinking) {
-    const opts = { thinking: { type: "enabled", budgetTokens: 5000 } };
+    const opts = isAdaptiveOnly2(modelId) ? { thinking: { type: "adaptive" }, effort: "low" } : { thinking: { type: "enabled", budgetTokens: 5000 } };
     providerOptions.anthropic = opts;
   }
   if (caps.openaiOptions && caps.openaiReasoning) {
@@ -411471,9 +411657,7 @@ function degradeProviderOptions(modelId, level) {
     providerOptions.openrouter = { reasoning: { effort: "low" } };
   }
   if (caps.bedrockOptions && caps.thinking) {
-    providerOptions.bedrock = {
-      reasoningConfig: { type: "enabled", budgetTokens: 5000 }
-    };
+    providerOptions.bedrock = isAdaptiveOnly2(modelId) ? { reasoningConfig: { type: "adaptive", maxReasoningEffort: "low" } } : { reasoningConfig: { type: "enabled", budgetTokens: 5000 } };
   }
   return {
     providerOptions,
@@ -411628,11 +411812,12 @@ function buildGroqOptions(config2) {
 function isDeepSeekReasoner(base) {
   return base === "deepseek-reasoner" || base.includes("reasoner") || base.endsWith("-think");
 }
-var parseOpusVersion2, extractBaseModel2, getModelId2, supportsTemperature2, NO_SUPPORT, ANTHROPIC_FULL, OPENAI_FULL, GOOGLE_FULL, XAI_FULL, DEEPSEEK_FULL, OPENROUTER_FULL, GATEWAY_FULL, COMPAT_ONLY, PROVIDER_CONSTRAINTS, LEGACY_PREFIXES, CACHE_EPHEMERAL_5M, CACHE_EPHEMERAL_1H, EPHEMERAL_CACHE_5M, EPHEMERAL_CACHE_1H, EPHEMERAL_CACHE;
+var parseOpusVersion2, isAdaptiveOnly2, extractBaseModel2, getModelId2, supportsTemperature2, NO_SUPPORT, ANTHROPIC_FULL, OPENAI_FULL, GOOGLE_FULL, XAI_FULL, DEEPSEEK_FULL, OPENROUTER_FULL, GATEWAY_FULL, COMPAT_ONLY, PROVIDER_CONSTRAINTS, LEGACY_PREFIXES, CACHE_EPHEMERAL_5M, CACHE_EPHEMERAL_1H, EPHEMERAL_CACHE_5M, EPHEMERAL_CACHE_1H, EPHEMERAL_CACHE;
 var init_provider_options = __esm(() => {
   init_models();
   init_providers();
   parseOpusVersion2 = parseOpusVersion;
+  isAdaptiveOnly2 = isAdaptiveOnly;
   extractBaseModel2 = extractBaseModel;
   getModelId2 = getModelId;
   supportsTemperature2 = supportsTemperature;
@@ -444011,7 +444196,11 @@ Avoid these files. If you must edit one, your edit will still apply but may conf
             const task = tasks[0];
             const { doneResult, resultText } = await runAgentTask(task, models, bus, toolCallId, 1, abortSignal);
             if (!doneResult && !bus.getResult(task.agentId)?.success) {
-              throw new Error(resultText);
+              return {
+                reads: bus.getFileReadRecords(task.agentId),
+                filesEdited: [...bus.getEditedFiles(task.agentId).keys()],
+                output: `[Dispatch failed] ${resultText}`
+              };
             }
             const editedMap = bus.getEditedFiles(task.agentId);
             const desloppifyResult2 = await runDesloppify(bus, [task], models, toolCallId, abortSignal);
@@ -444634,6 +444823,7 @@ function buildInstructions(cm, modelId) {
   const text2 = parts2.join(`
 
 `);
+  cm.setInstructionsSize(text2.length);
   if (snapshot)
     instructionsCache.set(cm, { text: text2, key: key2 });
   return text2;
@@ -446335,6 +446525,7 @@ var init_manager6 = __esm(() => {
     mentionedFiles = new Set;
     conversationTokens = 0;
     contextWindowTokens = DEFAULT_CONTEXT_WINDOW2;
+    lastInstructionsSize;
     repoMapCache = null;
     soulMapDiffChangedFiles = new Map;
     soulMapDiffSeq = 0;
@@ -446860,6 +447051,12 @@ var init_manager6 = __esm(() => {
           this.startRepoMapScan();
       }
     }
+    setInstructionsSize(size) {
+      this.lastInstructionsSize = size;
+    }
+    getInstructionsSize() {
+      return this.lastInstructionsSize;
+    }
     async setSemanticSummaries(modeOrBool) {
       const mode = modeOrBool === true ? "synthetic" : modeOrBool === false ? "off" : modeOrBool === "on" ? "full" : modeOrBool;
       this.repoMap.setSemanticMode(mode);
@@ -447221,9 +447418,10 @@ ${s.signature ? `${s.signature}
     }
     getContextBreakdown() {
       const sections = [];
+      const cachedSize = this.getInstructionsSize();
       sections.push({
-        section: "Core + tool reference",
-        chars: 1800,
+        section: "System prompt + tools",
+        chars: cachedSize ?? 1800,
         active: true
       });
       const projectInfo = this.projectInfoCache?.info ?? null;
@@ -450125,7 +450323,7 @@ __export(exports_nim, {
   default: () => nim_default
 });
 var lang159, nim_default;
-var init_nim = __esm(() => {
+var init_nim2 = __esm(() => {
   init_c();
   init_html();
   init_xml();
@@ -452221,7 +452419,7 @@ var init_langs_bundle_full_YTHnHqaM = __esm(() => {
     {
       id: "nim",
       name: "Nim",
-      import: () => Promise.resolve().then(() => (init_nim(), exports_nim))
+      import: () => Promise.resolve().then(() => (init_nim2(), exports_nim))
     },
     {
       id: "nix",
@@ -474592,12 +474790,13 @@ function useChat({
   const prevSyncedModel = import_react46.useRef("");
   if (activeModel !== prevSyncedModel.current && activeModel !== "none") {
     prevSyncedModel.current = activeModel;
+    const { tokens: sync, source } = getModelContextInfoSync(activeModel);
     const cached3 = pinnedContextWindow.current.get(activeModel);
-    const sync = cached3 || getModelContextInfoSync(activeModel).tokens;
-    pinnedContextWindow.current.set(activeModel, sync);
-    contextManagerRef.current.setContextWindow(sync);
+    const next = source === "fallback" ? cached3 ?? sync : sync;
+    pinnedContextWindow.current.set(activeModel, next);
+    contextManagerRef.current.setContextWindow(next);
     if (visible)
-      useStatusBarStore.getState().setContextWindow(sync);
+      useStatusBarStore.getState().setContextWindow(next);
   }
   const activeModelForEffect = activeModel;
   import_react46.useEffect(() => {
@@ -475162,7 +475361,7 @@ INCLUDE the plan progress above VERBATIM in ## Current State so the agent knows
       const afterChars = systemChars + newCoreChars;
       const afterPct = Math.round(afterChars / charsPerToken / contextWindow * 100);
       const estimatedTokens = Math.ceil(afterChars / charsPerToken);
-      setContextTokens(0);
+      setContextTokens(estimatedTokens);
       setStreamingChars(0);
       setTokenUsage((prev) => {
         let bd = prev.modelBreakdown;
@@ -475597,7 +475796,7 @@ ${description}`,
       sanitized.push(m5);
       if (m5.role !== "assistant" || !Array.isArray(m5.content))
         continue;
-      const callParts = m5.content.filter((p3) => typeof p3 === "object" && ("type" in p3) && p3.type === "tool-call");
+      const callParts = m5.content.filter((p3) => typeof p3 === "object" && ("type" in p3) && p3.type === "tool-call" && !p3.providerExecuted);
       if (callParts.length === 0)
         continue;
       const next = sanitizedPre[i4 + 1];
@@ -475624,6 +475823,30 @@ ${description}`,
         sanitized.push({ role: "tool", content: synthetic });
       }
     }
+    for (let i4 = sanitized.length - 1;i4 >= 0; i4--) {
+      const msg = sanitized[i4];
+      if (!msg || msg.role !== "tool" || !Array.isArray(msg.content))
+        continue;
+      const prev = sanitized[i4 - 1];
+      const validCallIds = new Set;
+      if (prev?.role === "assistant" && Array.isArray(prev.content)) {
+        for (const p3 of prev.content) {
+          if (typeof p3 === "object" && "type" in p3 && p3.type === "tool-call" && !p3.providerExecuted) {
+            validCallIds.add(p3.toolCallId);
+          }
+        }
+      }
+      const filtered = msg.content.filter((p3) => {
+        if (typeof p3 !== "object" || !("type" in p3) || p3.type !== "tool-result")
+          return true;
+        return validCallIds.has(p3.toolCallId);
+      });
+      if (filtered.length === 0) {
+        sanitized.splice(i4, 1);
+      } else if (filtered.length !== msg.content.length) {
+        sanitized[i4] = { ...msg, content: filtered };
+      }
+    }
     const newCoreMessages = [...sanitized, userCoreMsg];
     setCoreMessages(newCoreMessages);
     if (workingStateRef.current) {
@@ -475824,6 +476047,9 @@ ${description}`,
       finalSegments.length = 0;
       subagentCumulative.clear();
       completedResultChars.clear();
+      stallTriggered = false;
+      stallAborted = false;
+      stallRetryPendingRef.current = false;
       try {
         setIsLoading(true);
         const modelId = activeModelRef.current;
@@ -477045,8 +477271,8 @@ ${errStack}` : `Error: ${displayErr}`);
           setLiveToolCalls([]);
           stallRetryPendingRef.current = true;
           const backoffMs = stallRetryCountRef.current === 1 ? 2000 : 5000;
-          setTimeout(() => handleSubmitRef.current("Continue."), backoffMs);
-          return;
+          await new Promise((resolve40) => setTimeout(resolve40, backoffMs));
+          continue;
         }
         const rawMsg = err2 instanceof Error ? err2.message : String(err2);
         const rawStack = err2 instanceof Error ? err2.stack : undefined;
@@ -485443,14 +485669,23 @@ var init_FinalResponseView = __esm(() => {
 
 `) : null;
     }, [segments, finalResponseCalled]);
-    const toolsRef = import_react62.useRef([]);
     const tools = import_react62.useMemo(() => {
-      const next = [];
-      for (const tc of liveToolCalls) {
-        if (!filterQuietTools(tc.toolName))
+      const ids = [];
+      for (const seg of segments) {
+        if (seg?.type === "tools")
+          ids.push(...seg.callIds);
+      }
+      const seen = new Set;
+      const out2 = [];
+      for (const id of ids) {
+        if (seen.has(id))
+          continue;
+        seen.add(id);
+        const tc = liveToolCalls.find((c) => c.id === id);
+        if (!tc || !filterQuietTools(tc.toolName))
           continue;
         const isDispatch = SUBAGENT_NAMES.has(tc.toolName);
-        next.push({
+        out2.push({
           id: tc.id,
           name: tc.toolName,
           done: tc.state !== "running",
@@ -485462,17 +485697,12 @@ var init_FinalResponseView = __esm(() => {
           imageArt: tc.imageArt
         });
       }
-      const prev = toolsRef.current;
-      if (prev.length === next.length && prev.every((p3, i4) => next[i4] !== undefined && p3.id === next[i4]?.id && p3.name === next[i4]?.name && p3.done === next[i4]?.done && p3.error === next[i4]?.error && p3.argStr === next[i4]?.argStr && !!p3.subtree === !!next[i4]?.subtree && p3.imageArt === next[i4]?.imageArt)) {
-        return prev;
-      }
-      toolsRef.current = next;
-      return next;
-    }, [liveToolCalls]);
+      return out2;
+    }, [segments, liveToolCalls]);
     const hasDispatch = import_react62.useMemo(() => liveToolCalls.some((tc) => SUBAGENT_NAMES.has(tc.toolName)), [liveToolCalls]);
     const hasEdits = import_react62.useMemo(() => liveToolCalls.some((tc) => FINAL_RESPONSE_EDIT_TOOLS.has(tc.toolName)), [liveToolCalls]);
-    const allToolsDone = tools.length > 0 && tools.every((t) => t.done);
     const dispatchActive = liveToolCalls.some((tc) => SUBAGENT_NAMES.has(tc.toolName) && tc.state === "running");
+    const allToolsDone = tools.length > 0 && tools.every((t) => t.done);
     const pendingNarration = allToolsDone && !dispatchActive && !trailingText;
     if (chatOnlyText) {
       return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {