@proxysoul/soulforge 2.18.5 → 2.18.6

package/dist/index.js

@@ -65784,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",
@@ -65822,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;
@@ -71776,7 +71782,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@proxysoul/soulforge",
-    version: "2.18.5",
+    version: "2.18.6",
     description: "Graph-powered code intelligence \u2014 multi-agent coding with codebase-aware AI",
     repository: {
       type: "git",
@@ -404475,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,
@@ -407294,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();
@@ -407346,8 +407382,10 @@ 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],
@@ -407370,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],
@@ -410619,6 +410658,7 @@ var init_providers = __esm(() => {
 var exports_models = {};
 __export(exports_models, {
   prewarmAllModels: () => prewarmAllModels,
+  matchesContextOverride: () => matchesContextOverride,
   invalidateProviderModelCache: () => invalidateProviderModelCache,
   getShortModelLabel: () => getShortModelLabel,
   getOpenRouterModelPricing: () => getOpenRouterModelPricing,
@@ -410633,6 +410673,7 @@ __export(exports_models, {
   fetchOpenRouterMetadata: () => fetchOpenRouterMetadata,
   fetchGroupedModels: () => fetchGroupedModels,
   ensureModelMetadata: () => ensureModelMetadata,
+  applyProviderContextOverride: () => applyProviderContextOverride,
   PROVIDER_CONFIGS: () => PROVIDER_CONFIGS
 });
 function buildProviderConfigs() {
@@ -410647,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) : "";
@@ -410659,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) {
@@ -410874,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}` };
@@ -411062,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 = {
@@ -444135,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);
@@ -444758,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;
@@ -446459,6 +446525,7 @@ var init_manager6 = __esm(() => {
     mentionedFiles = new Set;
     conversationTokens = 0;
     contextWindowTokens = DEFAULT_CONTEXT_WINDOW2;
+    lastInstructionsSize;
     repoMapCache = null;
     soulMapDiffChangedFiles = new Map;
     soulMapDiffSeq = 0;
@@ -446984,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);
@@ -447345,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;
@@ -474716,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(() => {
@@ -475286,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;
@@ -475721,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];
@@ -475748,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) {
@@ -475948,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;
@@ -477169,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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proxysoul/soulforge",
-  "version": "2.18.5",
+  "version": "2.18.6",
   "description": "Graph-powered code intelligence — multi-agent coding with codebase-aware AI",
   "repository": {
     "type": "git",