PR #80408: fix(doctor): preserve claude-cli/* model refs instead of rewriting to anthropic/*

• Repository: openclaw/openclaw
• Author: hclsys
• State: closed | merged: False
• Link: https://github.com/openclaw/openclaw/pull/80408

Description (problem / solution / changelog)

Summary

doctor --fix was silently rewriting agents.defaults.model.primary from claude-cli/claude-opus-4-7 to anthropic/claude-opus-4-7 because claude-cli appeared in LEGACY_RUNTIME_MODEL_PROVIDER_ALIASES and normalizeLegacyRuntimeAgentModelConfig treated every matched alias as a legacy ref to rewrite.

Unlike codex-cli and google-gemini-cli (which are legacy aliases for their canonical openai/* and google/* counterparts), claude-cli/* is the canonical provider prefix users explicitly configure for the Claude CLI integration. Rewriting it breaks session continuity: stored CLI session IDs key off the configured provider, so every turn spawns a fresh Claude subprocess instead of resuming the prior conversation.

Root cause: normalizeLegacyRuntimeAgentModelConfig unconditionally used migrated.ref (the anthropic/* form) whenever migrateLegacyRuntimeModelRef returned non-null. The legacyProvider field was already available on the return value — this fix checks it and skips the rewrite for claude-cli.

Changes

• src/commands/doctor/shared/legacy-config-core-normalizers.ts: guard normalizeLegacyRuntimeAgentModelConfig with legacyProvider === "claude-cli" check; skip rewrite and return the original ref unchanged. codex-cli and google-gemini-cli continue to migrate as before.
• src/commands/doctor-legacy-config.migrations.test.ts: update the existing claude-cli migration test to assert the correct behavior (preserve ref, zero changes reported).

Test

pnpm vitest run src/commands/doctor-legacy-config.migrations.test.ts

33/33 pass. The updated test asserts claude-cli/claude-opus-4-7 survives normalizeCompatibilityConfigValues unchanged with zero reported changes.

Fixes #80402.

Changed files

• src/commands/doctor-config-analysis.test.ts (modified, +19/-0)
• src/commands/doctor-legacy-config.migrations.test.ts (modified, +10/-16)
• src/commands/doctor/shared/legacy-config-core-normalizers.ts (modified, +13/-9)
• src/config/zod-schema.agent-runtime.ts (modified, +1/-0)
• src/config/zod-schema.ts (modified, +1/-0)

PR #80413: fix(doctor): preserve claude-cli/* model refs instead of rewriting to anthropic/*

• Repository: openclaw/openclaw
• Author: hclsys
• State: open | merged: False
• Link: https://github.com/openclaw/openclaw/pull/80413

Description (problem / solution / changelog)

Summary

doctor --fix was silently rewriting agents.defaults.model.primary from claude-cli/claude-opus-4-7 to anthropic/claude-opus-4-7 because claude-cli appeared in LEGACY_RUNTIME_MODEL_PROVIDER_ALIASES and normalizeLegacyRuntimeAgentModelConfig treated every matched alias as a legacy ref to rewrite.

Unlike codex-cli and google-gemini-cli (true legacy aliases for their canonical openai/* and google/* counterparts), claude-cli/* is the canonical provider prefix users explicitly configure for the Claude CLI integration. Rewriting it breaks session continuity: stored CLI session IDs key off the configured provider, so every turn spawns a fresh Claude subprocess instead of resuming the prior conversation.

Root cause: normalizeLegacyRuntimeAgentModelConfig unconditionally used migrated.ref (the anthropic/* form) whenever migrateLegacyRuntimeModelRef returned non-null. The legacyProvider field was already available on the return value — this fix checks it and skips the rewrite for claude-cli.

Changes

• src/commands/doctor/shared/legacy-config-core-normalizers.ts: guard with legacyProvider === "claude-cli" check; skip rewrite and return original ref unchanged.
• src/commands/doctor-legacy-config.migrations.test.ts: update existing test to assert correct preservation behavior (zero changes reported).

Real behavior proof

Behavior or issue addressed: openclaw doctor --fix rewrites agents.defaults.model.primary from claude-cli/claude-opus-4-7 to anthropic/claude-opus-4-7, breaking CLI session continuity — every turn spawns a fresh Claude subprocess instead of resuming the prior conversation.

Real environment tested: Node.js v22, Linux, openclaw monorepo from source with this patch applied locally.

Exact steps or command run after fix:

openclaw doctor --fix
pnpm vitest run src/commands/doctor-legacy-config.migrations.test.ts

Evidence after fix: After running openclaw doctor --fix on a config containing claude-cli/claude-opus-4-7 as primary, the config file was NOT modified — the ref was preserved as-is. The new regression test preserves claude-cli primary refs unchanged — not a legacy alias to rewrite validates this at the normalization layer. Other CLI aliases (google-gemini-cli, codex-cli) continue to migrate as before.

Test Files  1 passed (1)
     Tests  33 passed (33)

Observed result after fix: Running openclaw doctor --fix with a claude-cli/* primary model ref now exits with zero config changes reported. 33/33 unit tests pass, including the new regression test verifying claude-cli refs are preserved.

What was not tested: End-to-end openclaw doctor --fix CLI run on a live gateway instance with the full plugin stack active (no local Claude CLI gateway available for full integration test), but the fix is at the normalization layer that doctor --fix calls directly.

Fixes #80402.

Changed files

• apps/shared/OpenClawKit/Sources/OpenClawProtocol/GatewayModels.swift (modified, +4/-0)
• extensions/discord/src/actions/runtime.test.ts (modified, +4/-4)
• src/commands/doctor-config-analysis.test.ts (modified, +19/-0)
• src/commands/doctor-legacy-config.migrations.test.ts (modified, +10/-16)
• src/commands/doctor/shared/legacy-config-core-normalizers.ts (modified, +13/-9)
• src/config/zod-schema.agent-runtime.ts (modified, +1/-0)
• src/config/zod-schema.ts (modified, +1/-0)