fix(agy): harden self-migration across settings load/update paths

src/cliproxy/config/env-builder.ts

@@ -559,6 +559,17 @@ export function ensureProviderSettings(provider: CLIProxyProvider): void {
     }
   }
 
+  // Canonicalize provider-specific model aliases (e.g., AGY Sonnet 4.6 thinking legacy IDs).
+  for (const key of MODEL_ENV_VAR_KEYS) {
+    const current = mergedEnv[key];
+    if (typeof current !== 'string' || current.trim().length === 0) continue;
+    const canonical = normalizeModelIdForProvider(current, provider);
+    if (canonical !== current) {
+      mergedEnv[key] = canonical;
+      mutated = true;
+    }
+  }
+
   if (!mutated) {
     return;
   }

src/cliproxy/model-config.ts

@@ -13,6 +13,7 @@ import { getProviderSettingsPath, getClaudeEnvVars } from './config-generator';
 import { CLIProxyProvider } from './types';
 import { initUI, color, bold, dim, ok, info, header } from '../utils/ui';
 import { getCcsDir } from '../utils/config-manager';
+import { normalizeModelIdForProvider } from './model-id-normalizer';
 
 const CODEX_EFFORT_SUFFIX_REGEX = /-(xhigh|high|medium)$/i;
 
@@ -21,9 +22,9 @@ function stripCodexEffortSuffix(model: string, provider: CLIProxyProvider): stri
   return model.replace(CODEX_EFFORT_SUFFIX_REGEX, '');
 }
 
-function normalizeCodexTierModel(provider: CLIProxyProvider, model: string): string {
-  if (provider !== 'codex') return model;
-  return stripCodexEffortSuffix(model, provider);
+function canonicalizeModelForProvider(provider: CLIProxyProvider, model: string): string {
+  const withoutCodexSuffix = stripCodexEffortSuffix(model, provider);
+  return normalizeModelIdForProvider(withoutCodexSuffix, provider);
 }
 
 /**
@@ -50,7 +51,8 @@ export function getCurrentModel(
 
   try {
     const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf8'));
-    return settings.env?.ANTHROPIC_MODEL;
+    const model = settings.env?.ANTHROPIC_MODEL;
+    return typeof model === 'string' ? canonicalizeModelForProvider(provider, model) : model;
   } catch {
     return undefined;
   }
@@ -134,7 +136,7 @@ export async function configureProviderModel(
   // Find default index - use current model if configured, otherwise catalog default
   const currentModel = getCurrentModel(provider, customSettingsPath);
   const targetModel = currentModel
-    ? stripCodexEffortSuffix(currentModel, provider)
+    ? canonicalizeModelForProvider(provider, currentModel)
     : catalog.defaultModel;
   const defaultIdx = catalog.models.findIndex((m) => m.id === targetModel);
   const safeDefaultIdx = defaultIdx >= 0 ? defaultIdx : 0;
@@ -157,10 +159,10 @@ export async function configureProviderModel(
 
   // Get base env vars for defaults
   const baseEnv = getClaudeEnvVars(provider);
-  const selectedDefaultModel = normalizeCodexTierModel(provider, selectedModel);
-  const selectedOpusModel = normalizeCodexTierModel(provider, selectedModel);
-  const selectedSonnetModel = normalizeCodexTierModel(provider, selectedModel);
-  const selectedHaikuModel = normalizeCodexTierModel(
+  const selectedDefaultModel = canonicalizeModelForProvider(provider, selectedModel);
+  const selectedOpusModel = canonicalizeModelForProvider(provider, selectedModel);
+  const selectedSonnetModel = canonicalizeModelForProvider(provider, selectedModel);
+  const selectedHaikuModel = canonicalizeModelForProvider(
     provider,
     baseEnv.ANTHROPIC_DEFAULT_HAIKU_MODEL || selectedModel
   );
@@ -251,7 +253,7 @@ export async function showCurrentConfig(provider: CLIProxyProvider): Promise<voi
   const currentModel = getCurrentModel(provider);
   const settingsPath = getProviderSettingsPath(provider);
   const normalizedCurrentModel = currentModel
-    ? stripCodexEffortSuffix(currentModel, provider)
+    ? canonicalizeModelForProvider(provider, currentModel)
     : undefined;
 
   console.error('');

src/cliproxy/services/variant-settings.ts

@@ -18,6 +18,7 @@ import { ensureProfileHooks } from '../../utils/websearch/profile-hook-injector'
 import { ensureProfileHooks as ensureImageAnalyzerHooks } from '../../utils/hooks/image-analyzer-profile-hook-injector';
 import { getEffectiveApiKey } from '../auth-token-manager';
 import { warn } from '../../utils/ui';
+import { normalizeModelIdForProvider } from '../model-id-normalizer';
 
 /** Environment settings structure */
 interface SettingsEnv {
@@ -41,8 +42,10 @@ function canonicalizeModelForProvider(
   provider: CLIProxyProfileName | undefined,
   model: string
 ): string {
-  if (provider !== 'codex') return model;
-  return model.replace(CODEX_EFFORT_SUFFIX_REGEX, '');
+  const withoutCodexSuffix =
+    provider === 'codex' ? model.replace(CODEX_EFFORT_SUFFIX_REGEX, '') : model;
+  if (!provider) return withoutCodexSuffix;
+  return normalizeModelIdForProvider(withoutCodexSuffix, provider);
 }
 
 /**