fix doctor stale session runtime pins

pashpashpash · pashpashpash · commit fe2dd61cef3f · 2026-05-07T23:53:49.000-07:00
diff --git a/src/commands/doctor/shared/codex-route-warnings.test.ts b/src/commands/doctor/shared/codex-route-warnings.test.ts
@@ -239,7 +239,7 @@ describe("collectCodexRouteWarnings", () => {
     expect(result.changes.join("\n")).not.toContain("agentRuntime.id");
   });
 
-  it("repairs persisted session route refs and preserves existing runtime and auth pins", () => {
+  it("repairs persisted session route refs, clears runtime pins, and preserves auth pins", () => {
     const store: Record<string, SessionEntry> = {
       main: {
         sessionId: "s1",
@@ -278,12 +278,12 @@ describe("collectCodexRouteWarnings", () => {
       providerOverride: "openai",
       modelOverride: "gpt-5.4",
       modelOverrideSource: "auto",
-      agentHarnessId: "codex",
-      agentRuntimeOverride: "codex",
       authProfileOverride: "openai-codex:default",
       authProfileOverrideSource: "auto",
       authProfileOverrideCompactionCount: 2,
     });
+    expect(store.main.agentHarnessId).toBeUndefined();
+    expect(store.main.agentRuntimeOverride).toBeUndefined();
     expect(store.main.fallbackNoticeSelectedModel).toBeUndefined();
     expect(store.main.fallbackNoticeActiveModel).toBeUndefined();
     expect(store.main.fallbackNoticeReason).toBeUndefined();
diff --git a/src/commands/doctor/shared/codex-route-warnings.ts b/src/commands/doctor/shared/codex-route-warnings.ts
@@ -625,6 +625,19 @@ function clearStaleCodexFallbackNotice(entry: SessionEntry): boolean {
   return true;
 }
 
+function clearStaleSessionRuntimePins(entry: SessionEntry): boolean {
+  let changed = false;
+  if (entry.agentHarnessId !== undefined) {
+    delete entry.agentHarnessId;
+    changed = true;
+  }
+  if (entry.agentRuntimeOverride !== undefined) {
+    delete entry.agentRuntimeOverride;
+    changed = true;
+  }
+  return changed;
+}
+
 export function repairCodexSessionStoreRoutes(params: {
   store: Record<string, SessionEntry>;
   now?: number;
@@ -647,7 +660,9 @@ export function repairCodexSessionStoreRoutes(params: {
     });
     const changedModelRoute = changedRuntimeModelRoute || changedOverrideModelRoute;
     const changedFallbackNotice = clearStaleCodexFallbackNotice(entry);
-    if (!changedModelRoute && !changedFallbackNotice) {
+    const changedRuntimePins =
+      changedModelRoute || changedFallbackNotice ? clearStaleSessionRuntimePins(entry) : false;
+    if (!changedModelRoute && !changedFallbackNotice && !changedRuntimePins) {
       continue;
     }
     entry.updatedAt = now;
