fix(doctor): preserve explicit non-default agentRuntime pin during legacy model-ref migration

nxmxbbd · nex-dh · nxmxbbd · commit 6952ea7b650a · 2026-05-20T06:16:54.000+08:00
`maybeRepairCodexRoutes` migrates `openai-codex/*` model refs to their canonical `openai/*` form, then calls `ensureCodexRuntimePolicy` on each hit so the rewritten ref keeps Codex auth routing. When the user already had an explicit non-default pin on the legacy form (for example `models["openai-codex/gpt-5.4"].agentRuntime = { id: "pi" }` as a deliberate opt-out from the broken native Codex runtime), the previous sequence silently overwrote it: 1. The `AGENT_MODEL_CONFIG_KEYS` loop rewrote `model.primary`, then `preserveCodexRuntimePolicyForNewHits` synthesized `models["openai/gpt-5.4"].agentRuntime = { id: "codex" }` because that canonical entry did not yet exist. 2. `rewriteModelsMap` then renamed `openai-codex/gpt-5.4` → `openai/gpt-5.4`. Its spread merge `{ ...legacyRecord, ...canonicalRecord }` placed the synthesized `{ id: "codex" }` last, silently dropping the user's `{ id: "pi" }` pin. End state: the explicit PI runtime opt-out was gone, gateway fell back to the native Codex runtime, and per-request token usage grew 3-4x because the upstream Codex runtime issue still applies. Fix: in `ensureCodexRuntimePolicy`, skip synthesizing the default `{ id: "codex" }` pin when the user already has an explicit non-default pin on a legacy `openai-codex/*` form of the same canonical model ref. `rewriteModelsMap` then carries the legacy pin forward unmodified via its existing `canonicalEntry ?? legacyEntry` falsy branch. This narrow fix matches the existing behavior covered by `preserves explicit model-scoped runtime pins when repairing legacy model map keys` (only the models map, no `model.primary` slot to trigger synthesis) and `overwrites non-concrete model-scoped runtime pins when preserving Codex route intent` (auto/default pins still get codex applied). The combined-config path from #84038 was the previously uncovered regression. Fixes #84038. Co-Authored-By: Nex <nex@dbitstec.com>
diff --git a/src/commands/doctor/shared/codex-route-warnings.ts b/src/commands/doctor/shared/codex-route-warnings.ts
@@ -1997,6 +1997,27 @@ function maybeMigrateLegacyLosslessCompactionConfig(params: {
   return changes;
 }
 
+function legacyEntryHasExplicitNonDefaultRuntimePin(
+  models: MutableRecord,
+  canonicalModelRef: string,
+): boolean {
+  for (const ref of Object.keys(models)) {
+    if (ref === canonicalModelRef) {
+      continue;
+    }
+    if (toCanonicalOpenAIModelRef(ref) !== canonicalModelRef) {
+      continue;
+    }
+    const legacyEntry = asMutableRecord(models[ref]);
+    const legacyRuntime = asMutableRecord(legacyEntry?.agentRuntime);
+    const id = normalizeString(legacyRuntime?.id);
+    if (id && id !== "auto" && id !== "default") {
+      return true;
+    }
+  }
+  return false;
+}
+
 function ensureCodexRuntimePolicy(params: {
   cfg: OpenClawConfig;
   agent: MutableRecord;
@@ -2025,6 +2046,9 @@ function ensureCodexRuntimePolicy(params: {
   if (runtimeId && runtimeId !== "auto" && runtimeId !== "default") {
     return;
   }
+  if (legacyEntryHasExplicitNonDefaultRuntimePin(models, params.modelRef)) {
+    return;
+  }
   setModelRuntimePolicy({
     agent: params.agent,
     agentPath: params.agentPath,
