dsh-gpt-adapter 0.2.2 → 0.2.4

package/lib/index.js

@@ -196,6 +196,84 @@ function createRequestBridge(provider) {
   };
 }
 
+// src/context-window.ts
+var officialModels = [
+  ["gpt-6-astra", 105e4],
+  ["gpt-6.1-sol", 105e4],
+  ["gpt-6.1-terra", 105e4],
+  ["gpt-6-luna", 105e4],
+  ["gpt-5.4", 105e4],
+  ["gpt-4.1", 1047576],
+  ["gpt-4o", 128e3],
+  ["gpt-5.4-2026-03-05", 105e4, "gpt-5.4"],
+  ["gpt-4.1-2025-04-14", 1047576, "gpt-4.1"],
+  ["gpt-4o-2024-08-06", 128e3, "gpt-4o"]
+];
+var OFFICIAL_CONTEXT_WINDOWS = Object.fromEntries(
+  officialModels.map(([id, tokens, page]) => [
+    id,
+    {
+      tokens,
+      url: `https://developers.openai.com/api/docs/models/${page ?? id}`,
+      verifiedAt: "2026-11-13"
+    }
+  ])
+);
+function validContextWindow(value) {
+  return typeof value === "number" && Number.isSafeInteger(value) && value > 0;
+}
+function contextWindowMode(tokens) {
+  return tokens === 516e3 ? "516k" : tokens === 1e6 ? "1m" : "custom";
+}
+function contextWindowTokens(mode, customTokens) {
+  if (!["default", "516k", "1m", "custom"].includes(mode))
+    throw new Error("\u8BF7\u9009\u62E9\u6709\u6548\u7684\u4E0A\u4E0B\u6587\u9884\u8BBE");
+  if (mode !== "custom" && customTokens !== void 0)
+    throw new Error("\u53EA\u6709\u81EA\u5B9A\u4E49\u9884\u8BBE\u63A5\u53D7\u7A97\u53E3\u6570\u503C");
+  if (mode === "custom") {
+    if (!validContextWindow(customTokens))
+      throw new Error("\u4E0A\u4E0B\u6587\u7A97\u53E3\u5FC5\u987B\u662F\u6B63\u7684\u5B89\u5168\u6574\u6570");
+    return customTokens;
+  }
+  return mode === "516k" ? 516e3 : mode === "1m" ? 1e6 : void 0;
+}
+function resolveContextWindow(options) {
+  const fallback = [
+    [options.providerDefault, "provider-default"],
+    [options.upstream, "upstream"],
+    [options.catalog, "capability-catalog"],
+    [
+      Object.hasOwn(OFFICIAL_CONTEXT_WINDOWS, options.modelId) ? OFFICIAL_CONTEXT_WINDOWS[options.modelId]?.tokens : void 0,
+      "official-preset"
+    ],
+    [options.nativeDefault, "native-default"],
+    [1e6, "native-default"]
+  ];
+  const [defaultTokens, source] = fallback.find(
+    ([tokens]) => validContextWindow(tokens)
+  );
+  for (const [tokens, manualSource] of [
+    [options.legacy, "legacy-override"],
+    [options.native, "native-user"]
+  ]) {
+    if (tokens === void 0) continue;
+    if (!validContextWindow(tokens))
+      throw new Error("\u4E0A\u4E0B\u6587\u7A97\u53E3\u5FC5\u987B\u662F\u6B63\u7684\u5B89\u5168\u6574\u6570");
+    return {
+      mode: contextWindowMode(tokens),
+      effectiveTokens: tokens,
+      defaultTokens,
+      source: manualSource
+    };
+  }
+  return {
+    mode: "default",
+    effectiveTokens: defaultTokens,
+    defaultTokens,
+    source
+  };
+}
+
 // src/sync.ts
 import { createHash } from "node:crypto";
 var MAX_RESPONSE_BYTES = 4 * 1024 * 1024;
@@ -373,7 +451,7 @@ function parseCapabilityHints(row, modelId) {
     ...typeof defaultReasoningValue === "string" ? { defaultReasoningId: defaultReasoningValue } : {},
     ...hasTierSignal ? { serviceTiers: tiers } : {},
     ...defaultTier ? { defaultServiceTier: defaultTier } : {},
-    ...typeof contextWindow === "number" && contextWindow > 0 ? { contextWindow } : {},
+    ...validContextWindow(contextWindow) ? { contextWindow } : {},
     ...typeof maxOutputTokens === "number" && maxOutputTokens > 0 ? { maxOutputTokens } : {}
   };
   return Object.keys(hints).length === 0 ? void 0 : hints;
@@ -735,6 +813,7 @@ import { PiAiAdapter } from "@deepseek-ai/dsh-llm-pi-ai";
 import { createRequire } from "node:module";
 import { readFileSync } from "node:fs";
 import { createHash as createHash6 } from "node:crypto";
+import { getBuiltinModels } from "@earendil-works/pi-ai/providers/all";
 
 // src/native-adapter.ts
 function installNativeAdapterBridge(prototype, capture) {
@@ -759,6 +838,12 @@ function installNativeAdapterBridge(prototype, capture) {
       });
     const models = new Proxy(snapshot.models, {
       get(target, key) {
+        if (key === "getModel" && typeof target.getModel === "function")
+          return (provider, modelId) => {
+            const model = target.getModel(provider, modelId);
+            const capacity = extension.model.context;
+            return model && provider === options.provider && modelId === options.model && capacity?.contextWindow ? { ...model, contextWindow: capacity.contextWindow } : model;
+          };
         if (key === "streamSimple")
           return (model, context, settings) => {
             const call = extension.prepare(options);
@@ -853,11 +938,12 @@ function installNativeAdapterBridge(prototype, capture) {
 // src/settings-overlay.ts
 import z from "@deepseek-ai/schemastery";
 import { symbols } from "@deepseek-ai/cordis";
-function projectModel(provider, model, resolve4, profile) {
+function projectModel(provider, model, resolve4, profile, includeContext = true) {
   const capability = resolve4(provider, model, profile);
   if (!capability) return model;
   return {
     ...model,
+    ...includeContext && validContextWindow(capability.contextWindow) ? { contextWindow: capability.contextWindow } : {},
     reasoningEfforts: capability.reasoning.status === "unsupported" ? false : Object.fromEntries(
       capability.reasoning.choices.map((choice) => [
         choice.id,
@@ -903,7 +989,7 @@ function projectSchema(json, preserveNativeLevels) {
   keys.list = offered.map((level) => z.const(level));
   return schema.toJSON();
 }
-function nativeWrite(next, current, resolve4) {
+function nativeWrite(next, current, resolve4, contextEdits) {
   if (!next.providers) return next;
   return {
     ...next,
@@ -932,6 +1018,21 @@ function nativeWrite(next, current, resolve4) {
                   "GPT \u601D\u8003\u7B49\u7EA7\u7531\u63D2\u4EF6\u9884\u8BBE\u7BA1\u7406\uFF1B\u8BF7\u5237\u65B0\u540E\u91CD\u8BD5\uFF0C\u6216\u5728\u6A21\u578B\u80FD\u529B\u8986\u76D6\u4E2D\u4FEE\u6539\uFF0C\u505C\u7528\u81EA\u52A8\u9002\u914D\u53EF\u6062\u590D\u539F\u751F\u7F16\u8F91\u3002"
                 );
               const restored = { ...model };
+              const projectedContext = original ? projectModel(provider, original, resolve4, ownershipProfile).contextWindow : void 0;
+              const editedContext = original ? model.contextWindow !== projectedContext : Object.hasOwn(model, "contextWindow");
+              if (!editedContext) {
+                if (original && Object.hasOwn(original, "contextWindow"))
+                  restored.contextWindow = original.contextWindow;
+                else delete restored.contextWindow;
+              } else {
+                if (model.contextWindow !== void 0 && !validContextWindow(model.contextWindow))
+                  throw new Error("\u4E0A\u4E0B\u6587\u7A97\u53E3\u5FC5\u987B\u662F\u6B63\u7684\u5B89\u5168\u6574\u6570");
+                contextEdits.push({
+                  provider,
+                  modelId: model.id,
+                  previousTokens: original?.contextWindow
+                });
+              }
               if (original && Object.hasOwn(original, "reasoningEfforts"))
                 restored.reasoningEfforts = structuredClone(
                   original.reasoningEfforts
@@ -945,10 +1046,11 @@ function nativeWrite(next, current, resolve4) {
     )
   };
 }
-function installSettingsOverlay(settings, resolve4) {
+function installSettingsOverlay(settings, resolve4, contextWrites) {
   settings = settings[symbols.original] ?? settings;
   const originalDescribe = settings.describe;
   const originalWrite = settings.write;
+  let viewRevision;
   function describe(options) {
     return originalDescribe.call(this, options).map((row) => {
       if (row.ns !== "llm-pi-ai") return row;
@@ -960,18 +1062,46 @@ function installSettingsOverlay(settings, resolve4) {
         for (const model of profile.models ?? [])
           if (resolve4(provider, model, profile)) managed = true;
           else other = true;
-      if (!managed) return row;
+      const value = managed ? projectConfiguration(row.value, resolve4) : row.value;
+      const contexts = JSON.stringify(
+        Object.entries(value?.providers ?? {}).map(([provider, profile]) => [
+          provider,
+          profile.models?.map((model) => [
+            model.id,
+            model.contextWindow
+          ])
+        ])
+      );
+      if (typeof row.revision === "number") {
+        if (!viewRevision)
+          viewRevision = {
+            native: row.revision,
+            contexts,
+            revision: row.revision
+          };
+        else if (viewRevision.native !== row.revision || viewRevision.contexts !== contexts)
+          viewRevision = {
+            native: row.revision,
+            contexts,
+            revision: Math.max(row.revision, viewRevision.revision + 1)
+          };
+      }
       return {
         ...row,
-        schema: projectSchema(row.schema, other),
-        value: projectConfiguration(row.value, resolve4),
-        base: projectConfiguration(row.base, resolve4),
-        user: projectConfiguration(row.user, resolve4)
+        ...managed ? {
+          schema: projectSchema(row.schema, other),
+          value,
+          base: projectConfiguration(row.base, resolve4),
+          user: projectConfiguration(row.user, resolve4)
+        } : {},
+        ...typeof row.revision === "number" ? { revision: viewRevision.revision } : {}
       };
     });
   }
   async function write(ns, change, expected, paths) {
-    return originalWrite.call(
+    const edits = [];
+    const legacyRevision = contextWrites?.revision();
+    await originalWrite.call(
       this,
       ns,
       ns !== "llm-pi-ai" ? change : (current, base, schema) => nativeWrite(
@@ -981,19 +1111,88 @@ function installSettingsOverlay(settings, resolve4) {
           schema
         ),
         current,
-        resolve4
+        resolve4,
+        edits
       ),
       expected,
       paths
     );
+    await finishContextWrite.call(this, ns, edits, legacyRevision, paths);
+  }
+  async function finishContextWrite(ns, edits, legacyRevision, paths) {
+    if (ns !== "llm-pi-ai" || !edits.length || !contextWrites) return;
+    const committedRevision = describe.call(this).find((row) => row.ns === ns)?.revision;
+    try {
+      await contextWrites.saved(edits, legacyRevision);
+    } catch (error) {
+      try {
+        await originalWrite.call(
+          this,
+          ns,
+          (current) => {
+            const restored = structuredClone(current);
+            for (const edit of edits) {
+              const row = restored.providers?.[edit.provider]?.models?.find(
+                (model) => model.id === edit.modelId
+              );
+              if (!row) continue;
+              if (edit.previousTokens === void 0) delete row.contextWindow;
+              else row.contextWindow = edit.previousTokens;
+            }
+            return restored;
+          },
+          committedRevision,
+          paths
+        );
+      } catch (rollbackError) {
+        throw new AggregateError(
+          [error, rollbackError],
+          "\u4E0A\u4E0B\u6587\u4FDD\u5B58\u672A\u5B8C\u6210\uFF0C\u6062\u590D\u5931\u8D25\uFF1B\u8BF7\u5237\u65B0\u67E5\u770B\u5F53\u524D\u8BBE\u7F6E"
+        );
+      }
+      throw error;
+    }
   }
   settings.describe = describe;
   if (originalWrite) settings.write = write;
-  return () => {
+  const dispose = () => {
     if (settings.describe === describe) settings.describe = originalDescribe;
     if (originalWrite && settings.write === write)
       settings.write = originalWrite;
   };
+  const setContextWindow = async (provider, modelId, tokens, expected) => {
+    if (!originalWrite) throw new Error("\u4E0A\u4E0B\u6587\u8BBE\u7F6E\u6682\u4E0D\u53EF\u7528");
+    if (tokens !== void 0 && !validContextWindow(tokens))
+      throw new Error("\u4E0A\u4E0B\u6587\u7A97\u53E3\u5FC5\u987B\u662F\u6B63\u7684\u5B89\u5168\u6574\u6570");
+    const edits = [];
+    const legacyRevision = contextWrites?.revision();
+    const paths = [["providers", provider, "models"]];
+    await originalWrite.call(
+      settings,
+      "llm-pi-ai",
+      (current) => {
+        const next = structuredClone(current);
+        const model = next.providers?.[provider]?.models?.find(
+          (row) => row.id === modelId
+        );
+        if (!model) throw new Error("\u6A21\u578B\u5DF2\u53D8\u66F4\uFF0C\u8BF7\u5237\u65B0\u540E\u91CD\u8BD5");
+        edits.push({ provider, modelId, previousTokens: model.contextWindow });
+        if (tokens === void 0) delete model.contextWindow;
+        else model.contextWindow = tokens;
+        return next;
+      },
+      expected,
+      paths
+    );
+    await finishContextWrite.call(
+      settings,
+      "llm-pi-ai",
+      edits,
+      legacyRevision,
+      paths
+    );
+  };
+  return Object.assign(dispose, { setContextWindow });
 }
 
 // src/codex.ts
@@ -1082,7 +1281,7 @@ function serverName(name2) {
   const hash = createHash3("sha256").update(name2).digest("hex").slice(0, 8);
   return `${name2.replace(/[^A-Za-z0-9_-]/g, "-").slice(0, 23)}-${hash}`;
 }
-function normalizeCodexMcp(name2, value, source, base, environment = process.env) {
+function normalizeCodexMcp(name2, value, source, base, environment = process.env, defaultCwd = base) {
   const raw = object(value);
   if (raw.enabled === false) return void 0;
   const headers = record2(raw.http_headers ?? raw.headers);
@@ -1131,8 +1330,8 @@ function normalizeCodexMcp(name2, value, source, base, environment = process.env
     if (environment[variable] !== void 0 && env[variable] === void 0)
       env[variable] = environment[variable];
   }
-  const cwd = typeof raw.cwd === "string" ? resolve(base, raw.cwd) : base;
-  const command = raw.command.includes("/") && !isAbsolute(raw.command) ? resolve(cwd, raw.command) : raw.command;
+  const cwd = typeof raw.cwd === "string" ? resolve(base, raw.cwd) : defaultCwd;
+  const command = raw.command.includes("/") && !isAbsolute(raw.command) ? resolve(typeof raw.cwd === "string" ? cwd : base, raw.command) : raw.command;
   return {
     ...common,
     transport: "stdio",
@@ -1151,9 +1350,29 @@ async function directories(path) {
   }
 }
 async function manifestAt(root) {
+  const text = await optionalText(join2(root, "plugin.json"));
+  if (text !== void 0) {
+    const manifest = object(JSON.parse(text));
+    if (manifest.$schema === "https://agent-plugins.org/schemas/1.0.0/plugin.schema.json") {
+      const inline = manifest.extensions?.["com.openai"];
+      const overlay = inline !== null && typeof inline === "object" && !Array.isArray(inline) ? inline : object(
+        JSON.parse(
+          await optionalText(
+            join2(root, ".codex-plugin", "plugin.json")
+          ) ?? "{}"
+        )
+      );
+      return {
+        root,
+        manifest: { ...manifest, ...overlay, name: manifest.name },
+        portable: true
+      };
+    }
+  }
   for (const name2 of [".codex-plugin", ".claude-plugin"]) {
-    const text = await optionalText(join2(root, name2, "plugin.json"));
-    if (text !== void 0) return { root, manifest: object(JSON.parse(text)) };
+    const text2 = await optionalText(join2(root, name2, "plugin.json"));
+    if (text2 !== void 0)
+      return { root, manifest: object(JSON.parse(text2)), portable: false };
   }
   return void 0;
 }
@@ -1182,7 +1401,7 @@ async function resolvePlugin(home, id, config) {
 }
 function expandPlugin(value, root, home) {
   if (typeof value === "string")
-    return value.replaceAll("${CLAUDE_PLUGIN_ROOT}", root).replaceAll("${CODEX_PLUGIN_ROOT}", root).replaceAll("${CODEX_HOME}", home);
+    return value.replaceAll("${PLUGIN_ROOT}", root).replaceAll("${CLAUDE_PLUGIN_ROOT}", root).replaceAll("${CODEX_PLUGIN_ROOT}", root).replaceAll("${CODEX_HOME}", home);
   if (Array.isArray(value)) return value.map((v) => expandPlugin(v, root, home));
   if (value && typeof value === "object")
     return Object.fromEntries(
@@ -1190,6 +1409,22 @@ function expandPlugin(value, root, home) {
     );
   return value;
 }
+function restrictMcpFallback(entry, policy) {
+  if (policy.enabled === false) return void 0;
+  const requested = Array.isArray(policy.enabled_tools) ? strings(policy.enabled_tools) : void 0;
+  const enabledTools = requested && entry.enabledTools ? entry.enabledTools.filter((name2) => requested.includes(name2)) : requested ?? entry.enabledTools;
+  return {
+    ...entry,
+    ...enabledTools ? { enabledTools } : {},
+    disabledTools: [
+      .../* @__PURE__ */ new Set([
+        ...entry.disabledTools,
+        ...strings(policy.disabled_tools),
+        ...Object.entries(object(policy.tools)).filter(([, tool]) => object(tool).enabled === false).map(([name2]) => name2)
+      ])
+    ]
+  };
+}
 async function discoverCodexSnapshot(home, options, context = {}) {
   const config = await readCodexConfig(
     home,
@@ -1207,24 +1442,38 @@ async function discoverCodexSnapshot(home, options, context = {}) {
     items: []
   };
   const names = /* @__PURE__ */ new Set();
-  const addServers = (servers, source, base, plugin = "") => {
-    for (const [name2, raw] of Object.entries(servers)) {
+  const addServers = (servers, source, base, plugin = "", policies = {}) => {
+    for (const [name2, declaration] of Object.entries(servers)) {
+      const policy = Object.fromEntries(
+        Object.entries(object(policies[name2])).filter(
+          ([key]) => ["enabled", "enabled_tools", "disabled_tools", "tools"].includes(key)
+        )
+      );
+      const raw = mergeConfig(object(declaration), policy);
       const publicName = plugin ? `${plugin}-${name2}` : name2;
       if (object(raw).enabled === false || options.mcpAllowlist.length && !options.mcpAllowlist.includes(name2)) {
         result.items.push({ name: publicName, kind: "mcp", state: "disabled" });
         continue;
       }
       try {
-        const value = normalizeCodexMcp(publicName, raw, source, base);
+        const value = normalizeCodexMcp(
+          publicName,
+          raw,
+          source,
+          base,
+          process.env,
+          context.cwd ?? base
+        );
         if (!value) continue;
         if (names.has(value.serverName)) throw new Error("namespace-conflict");
         names.add(value.serverName);
-        result.mcp.push(value);
+        result.mcp.push({ ...value, originalName: name2 });
       } catch (error) {
         const previous = context.previous?.mcp.find(
           (entry) => entry.serverName === serverName(publicName)
         );
-        if (previous) result.mcp.push(previous);
+        const retained = previous && restrictMcpFallback(previous, raw);
+        if (retained) result.mcp.push(retained);
         const reason = [
           "missing-environment",
           "unsupported-transport",
@@ -1258,9 +1507,9 @@ async function discoverCodexSnapshot(home, options, context = {}) {
           });
           continue;
         }
-        const { root, manifest } = plugin;
+        const { root, manifest, portable } = plugin;
         const name2 = String(manifest.name ?? id.split("@")[0]);
-        const declared = manifest.skills ?? "./skills";
+        const declared = portable ? "./skills" : manifest.skills ?? "./skills";
         const skillRoots = [];
         for (const entry of Array.isArray(declared) ? declared : [declared]) {
           if (typeof entry === "string")
@@ -1271,7 +1520,10 @@ async function discoverCodexSnapshot(home, options, context = {}) {
             });
         }
         let servers = manifest.mcpServers;
-        if (typeof servers === "string") {
+        if (portable) {
+          const text = await optionalText(join2(root, "mcp.json"));
+          servers = text === void 0 ? void 0 : JSON.parse(text);
+        } else if (typeof servers === "string") {
           const text = await optionalText(resolve(root, servers));
           if (text === void 0) throw new Error("missing-plugin-mcp-file");
           servers = JSON.parse(text);
@@ -1285,7 +1537,13 @@ async function discoverCodexSnapshot(home, options, context = {}) {
           home
         );
         result.skillRoots.push(...skillRoots);
-        addServers(object(expanded), `plugin:${id}`, root, name2);
+        addServers(
+          object(expanded),
+          `plugin:${id}`,
+          root,
+          name2,
+          object(object(setting).mcp_servers)
+        );
         result.items.push({ name: id, kind: "plugin", state: "loaded" });
         for (const field of ["hooks", "apps", "commands"]) {
           if (manifest[field])
@@ -1297,11 +1555,16 @@ async function discoverCodexSnapshot(home, options, context = {}) {
             });
         }
       } catch {
-        result.mcp.push(
-          ...context.previous?.mcp.filter(
-            (entry) => entry.source === `plugin:${id}`
-          ) ?? []
-        );
+        const policies = object(object(setting).mcp_servers);
+        for (const entry of context.previous?.mcp ?? []) {
+          if (entry.source !== `plugin:${id}`) continue;
+          if (!entry.originalName && Object.keys(policies).length) continue;
+          const retained = restrictMcpFallback(
+            entry,
+            object(policies[entry.originalName ?? ""])
+          );
+          if (retained) result.mcp.push(retained);
+        }
         result.skillRoots.push(
           ...context.previous?.skillRoots.filter(
             (entry) => entry.pluginId === id
@@ -1548,6 +1811,49 @@ function installCodexInstructions(ctx, home) {
   );
 }
 
+// src/codex-mcp-metadata.ts
+import { AsyncLocalStorage } from "node:async_hooks";
+import { Client } from "@modelcontextprotocol/client";
+var scope = new AsyncLocalStorage();
+var users = 0;
+var restore;
+function installCodexMcpMetadata() {
+  if (users++ === 0) {
+    const original = Client.prototype.callTool;
+    const callTool = function(params, options) {
+      const call = scope.getStore();
+      const metadata = call?.active() ? call.metadata : void 0;
+      return original.call(
+        this,
+        metadata ? {
+          ...params,
+          _meta: { ...params._meta, "x-codex-turn-metadata": metadata }
+        } : params,
+        options
+      );
+    };
+    Client.prototype.callTool = callTool;
+    restore = () => {
+      if (Client.prototype.callTool === callTool)
+        Client.prototype.callTool = original;
+    };
+  }
+  let active = true;
+  return {
+    run(metadata, operation) {
+      return scope.run({ active: () => active, metadata }, operation);
+    },
+    dispose() {
+      if (!active) return;
+      active = false;
+      if (--users === 0) {
+        restore?.();
+        restore = void 0;
+      }
+    }
+  };
+}
+
 // src/codex.ts
 var fingerprint = (v) => createHash5("sha256").update(JSON.stringify(v)).digest("hex");
 function publicToolName(server, name2) {
@@ -1629,6 +1935,7 @@ function installCodexCompatibility(ctx, config) {
       dispose: async () => {
       }
     };
+  const metadata = config.importMcpServers ? installCodexMcpMetadata() : void 0;
   const scopedSnapshot = async (cwd, signal, fallback) => {
     const key = resolve3(cwd);
     const previous = scopedSnapshots.get(key) ?? fallback ?? latest;
@@ -1841,7 +2148,22 @@ function installCodexCompatibility(ctx, config) {
                 if (enabledTools && !enabledTools.includes(definition.name) || disabledTools.includes(definition.name))
                   return () => {
                   };
-                return target.register(definition);
+                return target.register({
+                  ...definition,
+                  execute(args, execution) {
+                    const agent = execution.agent ?? owner.agent;
+                    const boundary = agent.session ? child.agents.turnBoundaryOf?.(agent.session) : void 0;
+                    const turn = boundary?.openTurnStartSeq;
+                    const turnMetadata = typeof agent.id === "string" && agent.id && turn != null ? {
+                      session_id: agent.id,
+                      turn_id: `${agent.id}:${turn}`
+                    } : void 0;
+                    return metadata.run(
+                      turnMetadata,
+                      () => definition.execute(args, execution)
+                    );
+                  }
+                });
               };
             const value = Reflect.get(target, key);
             return typeof value === "function" ? value.bind(target) : value;
@@ -1984,9 +2306,15 @@ function installCodexCompatibility(ctx, config) {
     agents.delete(agent);
     await owner.tail.catch(() => {
     });
-    await Promise.all(
-      [...owner.clients.values()].map((client) => client.fiber.dispose())
+    const results = await Promise.allSettled(
+      [...owner.clients.values()].map(async (client) => client.fiber.dispose())
+    );
+    const errors = results.flatMap(
+      (result) => result.status === "rejected" ? [result.reason] : []
     );
+    if (errors.length === 1) throw errors[0];
+    if (errors.length > 1)
+      throw new AggregateError(errors, "Codex MCP client cleanup failed");
   };
   const reconcile = async () => {
     if (closed) return;
@@ -2082,11 +2410,25 @@ function installCodexCompatibility(ctx, config) {
   const dispose = () => stopping ??= (async () => {
     closed = true;
     if (timer) clearInterval(timer);
-    await Promise.all(injections.map((fiber) => fiber.dispose()));
-    await tail;
-    await Promise.all([...agents.keys()].map(disposeAgent));
-    skillDispose?.();
-    await Promise.all(skills.map((s) => s.dispose()));
+    const errors = [];
+    const settle = async (actions) => {
+      const results = await Promise.allSettled(
+        actions.map(async (action) => action())
+      );
+      for (const result of results)
+        if (result.status === "rejected") errors.push(result.reason);
+    };
+    await settle(injections.map((fiber) => () => fiber.dispose()));
+    await settle([() => tail]);
+    await settle([...agents.keys()].map((agent) => () => disposeAgent(agent)));
+    await settle([
+      () => metadata?.dispose(),
+      () => skillDispose?.(),
+      ...skills.map((provider) => () => provider.dispose())
+    ]);
+    if (errors.length === 1) throw errors[0];
+    if (errors.length > 1)
+      throw new AggregateError(errors, "Codex compatibility cleanup failed");
   })();
   ctx.effect(() => dispose, "codex-compatibility");
   return {
@@ -2156,14 +2498,15 @@ var Config2 = z2.object({
     mcpAllowlist: z2.array(String).default([])
   }).default({})
 });
-var _speed_dec, _setSpeed_dec, _removeStale_dec, _refresh_dec, _updateOptions_dec, _configure_dec, _status_dec, _refreshCodex_dec, _codexStatus_dec, _a, _init;
-var GptModels = class extends (_a = Service, _codexStatus_dec = [Remote], _refreshCodex_dec = [Remote], _status_dec = [Remote], _configure_dec = [Remote], _updateOptions_dec = [Remote], _refresh_dec = [Remote], _removeStale_dec = [Remote], _setSpeed_dec = [Remote({ resources: { session: (sessionId) => sessionId } })], _speed_dec = [Remote({ resources: { session: (sessionId) => sessionId } })], _a) {
+var _speed_dec, _setSpeed_dec, _setContextWindow_dec, _removeStale_dec, _refresh_dec, _updateOptions_dec, _configure_dec, _status_dec, _refreshCodex_dec, _codexStatus_dec, _a, _init;
+var GptModels = class extends (_a = Service, _codexStatus_dec = [Remote], _refreshCodex_dec = [Remote], _status_dec = [Remote], _configure_dec = [Remote], _updateOptions_dec = [Remote], _refresh_dec = [Remote], _removeStale_dec = [Remote], _setContextWindow_dec = [Remote], _setSpeed_dec = [Remote({ resources: { session: (sessionId) => sessionId } })], _speed_dec = [Remote({ resources: { session: (sessionId) => sessionId } })], _a) {
   constructor(ctx, options, settingsNs) {
     super(ctx, "gptModels");
     this.options = options;
     this.settingsNs = settingsNs;
     __runInitializers(_init, 5, this);
     __publicField(this, "codex");
+    __publicField(this, "contextWriter");
     __publicField(this, "typertRemote");
     __publicField(this, "runners", /* @__PURE__ */ new Map());
     __publicField(this, "snapshots", /* @__PURE__ */ new Map());
@@ -2291,11 +2634,11 @@ var GptModels = class extends (_a = Service, _codexStatus_dec = [Remote], _refre
   }
   async publish(provider, snapshot) {
     if (this.closed) return;
-    const { descriptor, profile } = this.profile(provider);
+    const { profile } = this.profile(provider);
     const existing = profile.models ?? [];
     const ids = new Set(existing.map((model) => model.id));
     const added = snapshot.models.filter((model) => !model.stale && !ids.has(model.id)).map((model) => ({ id: model.id, name: model.displayName ?? model.id }));
-    if (added.length) {
+    if (added.length && !Object.keys(profile.modelOverrides ?? {}).length) {
       await this.ctx.settings.mutate(
         "llm-pi-ai",
         [
@@ -2306,12 +2649,14 @@ var GptModels = class extends (_a = Service, _codexStatus_dec = [Remote], _refre
               (model) => projectModel(
                 provider,
                 model,
-                (route, row) => this.capability(route, row.id, row.name)
+                (route, row) => this.capability(route, row.id, row.name),
+                void 0,
+                ids.has(model.id)
               )
             )
           }
         ],
-        descriptor.revision
+        this.modelsRevision()
       );
     }
     if (this.closed) return;
@@ -2347,6 +2692,15 @@ var GptModels = class extends (_a = Service, _codexStatus_dec = [Remote], _refre
         stale: model.stale ?? false
       })) ?? [],
       capabilities,
+      contextWindows: Object.fromEntries(
+        this.routeOptions(provider)?.enabled ? (this.profile(provider).profile.models ?? []).filter(
+          (model) => this.capability(provider, model.id) !== void 0
+        ).map((model) => [
+          model.id,
+          this.contextWindow(provider, model.id)
+        ]) : []
+      ),
+      contextRevision: this.modelsRevision(),
       options: this.routeOptions(provider) ?? {
         enabled: false,
         refreshIntervalMs: 18e5,
@@ -2387,6 +2741,10 @@ var GptModels = class extends (_a = Service, _codexStatus_dec = [Remote], _refre
     const overrides = JSON.parse(overridesJSON);
     if (!overrides || typeof overrides !== "object" || Array.isArray(overrides))
       throw new Error("\u6A21\u578B\u8986\u76D6\u9700\u8981\u662F JSON \u5BF9\u8C61");
+    for (const entry of Object.values(overrides)) {
+      if (entry && typeof entry === "object" && "contextWindow" in entry && !validContextWindow(entry.contextWindow))
+        throw new Error("\u4E0A\u4E0B\u6587\u7A97\u53E3\u5FC5\u987B\u662F\u6B63\u7684\u5B89\u5168\u6574\u6570");
+    }
     const descriptor = this.ctx.settings.describe().find((entry) => entry.ns === this.settingsNs);
     if (!descriptor) throw new Error("GPT plugin settings unavailable");
     await this.ctx.settings.mutate(
@@ -2416,7 +2774,7 @@ var GptModels = class extends (_a = Service, _codexStatus_dec = [Remote], _refre
     const runner = this.runners.get(provider);
     if (!runner) throw new Error("Enable GPT adaptation first");
     const staleIds = runner.current()?.models.filter((model) => model.stale).map((model) => model.id) ?? [];
-    const { descriptor, profile } = this.profile(provider);
+    const { profile } = this.profile(provider);
     const nextModels = profile.models?.filter(
       (model) => !staleIds.includes(model.id)
     );
@@ -2431,15 +2789,101 @@ var GptModels = class extends (_a = Service, _codexStatus_dec = [Remote], _refre
               (model) => projectModel(
                 provider,
                 model,
-                (route, row) => this.capability(route, row.id, row.name)
+                (route, row) => this.capability(route, row.id, row.name),
+                void 0
               )
             )
           }
         ],
-        descriptor.revision
+        this.modelsRevision()
       );
     await runner.removeStale(staleIds);
   }
+  /** Resolve raw metadata separately from merged capabilities and cached overrides. */
+  contextWindow(provider, modelId, nativeDefault) {
+    const { descriptor, profile } = this.profile(provider);
+    const overrides = JSON.parse(
+      this.routeOptions(provider, profile)?.overridesJSON ?? "{}"
+    );
+    const row = profile.models?.length ? profile.models.find((model) => model.id === modelId) : profile.modelOverrides?.[modelId];
+    const snapshot = this.snapshots.get(provider);
+    const raw = snapshot?.models.find((model) => model.id === modelId);
+    const userProfile = descriptor.user?.providers?.[provider];
+    const providerDefault = userProfile?.defaultContextWindow ?? (profile.defaultContextWindow !== 1e6 || descriptor.base === void 0 && descriptor.user === void 0 ? profile.defaultContextWindow : void 0);
+    const catalogModel = getBuiltinModels(provider).find(
+      (model) => model.id === modelId
+    );
+    return resolveContextWindow({
+      modelId,
+      legacy: overrides[modelId]?.contextWindow,
+      native: row?.contextWindow,
+      providerDefault,
+      upstream: raw?.capabilities?.contextWindow,
+      catalog: snapshot?.catalog?.models[modelId]?.contextWindow,
+      nativeDefault: nativeDefault ?? catalogModel?.contextWindow ?? profile.defaultContextWindow
+    });
+  }
+  contextWriteRevision() {
+    return this.nativeDescribe().find((row) => row.ns === this.settingsNs)?.revision;
+  }
+  /** Public form revisions also cover changes to projected model capacities. */
+  modelsRevision() {
+    const descriptor = this.ctx.settings.describe().find((row) => row.ns === "llm-pi-ai");
+    if (!descriptor) throw new Error("\u6A21\u578B\u8BBE\u7F6E\u6682\u4E0D\u53EF\u7528");
+    return descriptor.revision;
+  }
+  /** Remove only legacy context fields after the matching native save commits. */
+  async clearLegacyContext(edits, expected) {
+    const operations = [];
+    for (const provider of new Set(edits.map((edit) => edit.provider))) {
+      const text = this.options.routes[provider]?.overridesJSON;
+      if (!text) continue;
+      const overrides = JSON.parse(text);
+      let changed = false;
+      for (const edit of edits.filter((entry) => entry.provider === provider)) {
+        if (overrides[edit.modelId] && Object.hasOwn(overrides[edit.modelId], "contextWindow")) {
+          delete overrides[edit.modelId].contextWindow;
+          changed = true;
+        }
+      }
+      if (changed)
+        operations.push({
+          op: "set",
+          path: ["routes", provider, "overridesJSON"],
+          value: JSON.stringify(overrides)
+        });
+    }
+    if (operations.length)
+      await this.ctx.settings.mutate(this.settingsNs, operations, expected);
+  }
+  async setContextWindow(provider, modelId, mode, customTokens, expectedRevision) {
+    const tokens = contextWindowTokens(mode, customTokens);
+    const { profile } = this.profile(provider);
+    if (!this.capability(provider, modelId))
+      throw new Error("\u8BF7\u5148\u542F\u7528\u8BE5 GPT \u6A21\u578B\u7684\u81EA\u52A8\u9002\u914D");
+    const index = profile.models?.findIndex((model) => model.id === modelId) ?? -1;
+    if (index < 0) throw new Error("\u6A21\u578B\u5DF2\u53D8\u66F4\uFF0C\u8BF7\u5237\u65B0\u540E\u91CD\u8BD5");
+    const effective = tokens ?? this.contextWindow(provider, modelId).defaultTokens;
+    const row = profile.models[index];
+    const compaction = this.nativeDescribe().find(
+      (entry) => entry.ns === "compaction-basic"
+    )?.value;
+    const policy = compaction?.modelPolicies?.find(
+      (entry) => entry.provider === provider && entry.model === modelId
+    );
+    const headroom = policy?.headroomTokens ?? compaction?.headroomTokens ?? 0;
+    const output = validContextWindow(row.maxTokens) ? row.maxTokens : 0;
+    if (effective <= output + headroom)
+      throw new Error("\u4E0A\u4E0B\u6587\u7A97\u53E3\u5FC5\u987B\u5927\u4E8E\u5F53\u524D\u6700\u5927\u8F93\u51FA\u548C\u538B\u7F29\u9884\u7559\u7684\u603B\u548C");
+    if (!this.contextWriter) throw new Error("\u4E0A\u4E0B\u6587\u8BBE\u7F6E\u6682\u4E0D\u53EF\u7528");
+    await this.contextWriter(
+      provider,
+      modelId,
+      tokens,
+      expectedRevision ?? this.modelsRevision()
+    );
+    this.ctx.emit("llm/models-updated", provider);
+  }
   async setSpeed(sessionId, provider, modelId, tier) {
     const capability = this.capability(provider, modelId);
     if (!capability?.serviceTiers.some((choice) => choice.id === tier))
@@ -2476,11 +2920,15 @@ var GptModels = class extends (_a = Service, _codexStatus_dec = [Remote], _refre
       ...overrides[modelId]
     };
     const current = this.snapshots.get(provider)?.capabilities[modelId];
-    return current ? mergeCapabilities(current, override, current.capabilityRevision) : resolveCapabilities(
+    const result = current ? mergeCapabilities(current, override, current.capabilityRevision) : resolveCapabilities(
       { id: modelId, ...displayName ? { displayName } : {} },
       "gpt-preset",
       override
     );
+    return {
+      ...result,
+      contextWindow: this.contextWindow(provider, modelId).effectiveTokens
+    };
   }
   /** Capture request controls for the version-checked native runtime extension. */
   capture(provider, modelId, base) {
@@ -2493,6 +2941,14 @@ var GptModels = class extends (_a = Service, _codexStatus_dec = [Remote], _refre
     const protocol = profile.api ?? "openai-responses";
     const model = {
       ...base,
+      context: {
+        ...base.context ?? {},
+        contextWindow: this.contextWindow(
+          provider,
+          modelId,
+          base.context?.contextWindow
+        ).effectiveTokens
+      },
       name: capabilities.displayName === modelId ? base.name : capabilities.displayName
     };
     if (!preserveReasoning) delete model.reasoning;
@@ -2543,6 +2999,7 @@ __decorateElement(_init, 1, "configure", _configure_dec, GptModels);
 __decorateElement(_init, 1, "updateOptions", _updateOptions_dec, GptModels);
 __decorateElement(_init, 1, "refresh", _refresh_dec, GptModels);
 __decorateElement(_init, 1, "removeStale", _removeStale_dec, GptModels);
+__decorateElement(_init, 1, "setContextWindow", _setContextWindow_dec, GptModels);
 __decorateElement(_init, 1, "setSpeed", _setSpeed_dec, GptModels);
 __decorateElement(_init, 1, "speed", _speed_dec, GptModels);
 __decoratorMetadata(_init, GptModels);
@@ -2582,9 +3039,15 @@ async function apply2(ctx, config) {
     const providers = service.enabledProviders();
     const dispose = installSettingsOverlay(
       ctx.settings,
-      (provider, model, profile) => typeof model.id === "string" ? service.capability(provider, model.id, model.name, profile) : void 0
+      (provider, model, profile) => typeof model.id === "string" ? service.capability(provider, model.id, model.name, profile) : void 0,
+      {
+        revision: () => service.contextWriteRevision(),
+        saved: (edits, revision) => service.clearLegacyContext(edits, revision)
+      }
     );
+    service.contextWriter = dispose.setContextWindow;
     return () => {
+      service.contextWriter = void 0;
       dispose();
       for (const provider of providers) ctx.emit("llm/models-updated", provider);
     };