fix(doctor): clear stale runtime override pins

leno23 · leno23 · commit 94789d296944 · 2026-05-17T23:11:12.000+08:00
diff --git a/extensions/anthropic/doctor-contract-api.ts b/extensions/anthropic/doctor-contract-api.ts
@@ -1 +1,14 @@
+import type { DoctorSessionRouteStateOwner } from "openclaw/plugin-sdk/runtime-doctor";
+
 export const legacyConfigRules = [];
+
+export const sessionRouteStateOwners: DoctorSessionRouteStateOwner[] = [
+  {
+    id: "anthropic",
+    label: "Anthropic",
+    providerIds: ["anthropic", "claude-cli"],
+    runtimeIds: ["claude-cli"],
+    cliSessionKeys: ["claude-cli"],
+    authProfilePrefixes: ["anthropic:", "claude-cli:"],
+  },
+];
diff --git a/extensions/google/doctor-contract-api.ts b/extensions/google/doctor-contract-api.ts
@@ -0,0 +1,12 @@
+import type { DoctorSessionRouteStateOwner } from "openclaw/plugin-sdk/runtime-doctor";
+
+export const sessionRouteStateOwners: DoctorSessionRouteStateOwner[] = [
+  {
+    id: "google",
+    label: "Google",
+    providerIds: ["google", "google-gemini-cli", "google-vertex"],
+    runtimeIds: ["google-gemini-cli"],
+    cliSessionKeys: ["google-gemini-cli", "gemini-cli"],
+    authProfilePrefixes: ["google:", "google-gemini-cli:", "google-vertex:", "gemini-cli:"],
+  },
+];
diff --git a/src/commands/doctor-session-state-providers.test.ts b/src/commands/doctor-session-state-providers.test.ts
@@ -1,4 +1,5 @@
 import { describe, expect, it } from "vitest";
+import type { SessionEntry } from "../config/sessions.js";
 import {
   applySessionRouteStateRepair,
   resolveConfiguredDoctorSessionStateRoute,
@@ -15,6 +16,15 @@ const codexOwner = {
   authProfilePrefixes: ["codex:", "codex-cli:", "openai-codex:"],
 };
 
+const anthropicOwner = {
+  id: "anthropic",
+  label: "Anthropic",
+  providerIds: ["anthropic", "claude-cli"],
+  runtimeIds: ["claude-cli"],
+  cliSessionKeys: ["claude-cli"],
+  authProfilePrefixes: ["anthropic:", "claude-cli:"],
+};
+
 describe("doctor session state provider routes", () => {
   it("skips plugin route-state scans for unrelated recovery metadata", () => {
     expect(
@@ -103,6 +113,7 @@ describe("doctor session state provider routes", () => {
       fallbackNoticeActiveModel: "openai-codex/gpt-5.4",
       fallbackNoticeReason: "rate-limit",
       agentHarnessId: "codex",
+      agentRuntimeOverride: "codex-cli",
       authProfileOverride: "openai-codex:default",
       authProfileOverrideSource: "auto",
       authProfileOverrideCompactionCount: 2,
@@ -162,6 +173,7 @@ describe("doctor session state provider routes", () => {
     expect(entry.contextTokens).toBeUndefined();
     expect(entry.systemPromptReport).toBeUndefined();
     expect(entry.agentHarnessId).toBeUndefined();
+    expect(entry.agentRuntimeOverride).toBeUndefined();
     expect(entry.authProfileOverride).toBeUndefined();
     expect(entry.authProfileOverrideSource).toBeUndefined();
     expect(entry.authProfileOverrideCompactionCount).toBeUndefined();
@@ -263,4 +275,70 @@ describe("doctor session state provider routes", () => {
 
     expect(scan).toEqual({ repairs: [], manualReview: [] });
   });
+
+  it("clears stale runtime override-only pins when the owner is no longer configured", () => {
+    const sessionKey = "agent:main:telegram:direct:claude-stale";
+    const entry: SessionEntry & Record<string, unknown> = {
+      sessionId: "sess-stale-claude-cli",
+      updatedAt: 1,
+      agentRuntimeOverride: "claude-cli",
+    };
+
+    expect(storeMayContainPluginSessionRouteState({ [sessionKey]: entry })).toBe(true);
+
+    const scan = scanSessionRouteStateOwners({
+      owners: [anthropicOwner],
+      store: { [sessionKey]: entry },
+      routes: {
+        [sessionKey]: {
+          defaultProvider: "openai",
+          configuredModelRefs: ["openai/gpt-5.5"],
+          runtime: "pi",
+        },
+      },
+    });
+
+    expect(scan).toEqual({
+      manualReview: [],
+      repairs: [
+        {
+          key: sessionKey,
+          ownerId: "anthropic",
+          ownerLabel: "Anthropic",
+          cliSessionKeys: ["claude-cli"],
+          reasons: ["pinned runtime"],
+        },
+      ],
+    });
+
+    expect(applySessionRouteStateRepair({ entry, repair: scan.repairs[0], now: 456 })).toBe(true);
+    expect(entry).toStrictEqual({
+      sessionId: "sess-stale-claude-cli",
+      updatedAt: 456,
+    });
+  });
+
+  it("keeps runtime override-only pins when the owner runtime is still configured", () => {
+    const sessionKey = "agent:main:telegram:direct:claude-current";
+    const entry: Record<string, unknown> = {
+      sessionId: "sess-current-claude-cli",
+      updatedAt: 1,
+      agentRuntimeOverride: "claude-cli",
+    };
+
+    const scan = scanSessionRouteStateOwners({
+      owners: [anthropicOwner],
+      store: { [sessionKey]: entry },
+      routes: {
+        [sessionKey]: {
+          defaultProvider: "anthropic",
+          configuredModelRefs: ["anthropic/claude-sonnet-4-6"],
+          runtime: "claude-cli",
+        },
+      },
+    });
+
+    expect(scan).toEqual({ repairs: [], manualReview: [] });
+    expect(entry.agentRuntimeOverride).toBe("claude-cli");
+  });
 });
diff --git a/src/commands/doctor-session-state-providers.ts b/src/commands/doctor-session-state-providers.ts
@@ -114,6 +114,7 @@ function entryMayContainPluginSessionRouteState(entry: SessionEntry): boolean {
     normalizeString(record.modelProvider) !== undefined ||
     normalizeString(record.model) !== undefined ||
     normalizeString(record.agentHarnessId) !== undefined ||
+    normalizeString(record.agentRuntimeOverride) !== undefined ||
     record.cliSessionBindings !== undefined ||
     record.cliSessionIds !== undefined ||
     normalizeString(record.authProfileOverride) !== undefined ||
@@ -285,7 +286,11 @@ function scanEntryForOwner(params: {
       addReason(reasons, "runtime model state");
     }
     const harnessId = normalizeString(params.entry.agentHarnessId);
-    if (harnessId && runtimeIds.has(normalizeProviderId(harnessId))) {
+    const runtimeOverride = normalizeString(params.entry.agentRuntimeOverride);
+    if (
+      (harnessId && runtimeIds.has(normalizeProviderId(harnessId))) ||
+      (runtimeOverride && runtimeIds.has(normalizeProviderId(runtimeOverride)))
+    ) {
       addReason(reasons, "pinned runtime");
     }
     if (hasOwnedCliSession({ entry: params.entry, cliSessionKeys })) {
@@ -397,6 +402,7 @@ export function applySessionRouteStateRepair(params: {
   }
   if (params.repair.reasons.includes("pinned runtime")) {
     clear("agentHarnessId");
+    clear("agentRuntimeOverride");
   }
   if (params.repair.reasons.includes("CLI session binding")) {
     changed =
