@minniexcode/codex-switch 0.1.0 → 0.1.1

package/dist/app/get-current-profile.js

@@ -2,13 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCurrentProfile = getCurrentProfile;
 const config_repo_1 = require("../storage/config-repo");
+const providers_repo_1 = require("../storage/providers-repo");
 /**
- * Returns the currently active top-level Codex profile.
+ * Returns the currently active top-level Codex route.
  */
-function getCurrentProfile(configPath) {
+function getCurrentProfile(configPath, providersPath) {
+    const document = (0, config_repo_1.readStructuredConfig)(configPath);
+    const providers = providersPath ? (0, providers_repo_1.readProvidersFileIfExists)(providersPath) : null;
+    const providerCandidates = document.currentModelProvider && providers
+        ? Object.entries(providers.providers)
+            .filter(([, provider]) => provider.profile === document.currentModelProvider)
+            .map(([name]) => name)
+            .sort()
+        : [];
     return {
         data: {
-            profile: (0, config_repo_1.readCurrentProfile)(configPath),
+            model: document.currentModel,
+            modelProvider: document.currentModelProvider,
+            provider: providerCandidates.length === 1 ? providerCandidates[0] : null,
+            profile: document.currentModelProvider,
         },
     };
 }

package/dist/app/get-status.js

@@ -51,7 +51,8 @@ const runtime_state_repo_1 = require("../storage/runtime-state-repo");
 async function getStatus(codexDir, configPath, providersPath, authPath, options) {
     const configExists = fs.existsSync(configPath);
     const providersExists = fs.existsSync(providersPath);
-    let currentProfile = null;
+    let currentModelProvider = null;
+    let currentModel = null;
     const warnings = [];
     const providers = providersExists ? (0, providers_repo_1.readProvidersFile)(providersPath) : null;
     let configViews = [];
@@ -59,14 +60,15 @@ async function getStatus(codexDir, configPath, providersPath, authPath, options)
     const authState = (0, auth_repo_1.readAuthFileState)(authPath);
     if (configExists) {
         const document = (0, config_repo_1.readStructuredConfig)(configPath);
-        currentProfile = document.activeProfile;
+        currentModel = document.currentModel;
+        currentModelProvider = document.currentModelProvider;
         configViews = (0, config_1.buildManagedProfileViews)(document, providers);
         consistencyIssues = (0, config_1.collectConfigConsistencyIssues)(document, providers);
-        if (!currentProfile) {
-            warnings.push("config.toml exists but has no top-level profile.");
+        if (!currentModelProvider) {
+            warnings.push("config.toml exists but has no top-level model_provider.");
         }
     }
-    const liveState = (0, runtime_state_1.inspectLiveStateDrift)(currentProfile, providers);
+    const liveState = (0, runtime_state_1.inspectLiveStateDrift)(currentModelProvider, providers);
     const activeProviderCandidates = liveState.mappedProviders;
     const activeProvider = liveState.providerResolvable && providers && liveState.mappedProvider
         ? providers.providers[liveState.mappedProvider]
@@ -111,7 +113,7 @@ async function getStatus(codexDir, configPath, providersPath, authPath, options)
         warnings.push("Current config profile is not mapped in providers.json. Backfill would be required before treating live state as managed.");
     }
     if (liveState.reason === "shared-profile") {
-        warnings.push(`Current config profile "${currentProfile}" is shared by multiple providers in providers.json, so the active provider cannot be resolved uniquely.`);
+        warnings.push(`Current model provider "${currentModelProvider}" is shared by multiple providers in providers.json, so the active provider cannot be resolved uniquely.`);
     }
     if (runtimeStateInspection.exists && !runtimeStateInspection.valid) {
         warnings.push(`Copilot bridge runtime state is unreadable: ${runtimeStateInspection.parseError ?? "unknown parse failure"}`);
@@ -130,8 +132,9 @@ async function getStatus(codexDir, configPath, providersPath, authPath, options)
             }),
             configExists,
             providersExists,
-            currentProfile,
-            currentProfileMapped: liveState.profileMapped,
+            currentModelProvider,
+            currentModelProviderMapped: liveState.modelProviderMapped,
+            currentModel,
             provider: liveState.mappedProvider,
             activeProviderResolvable: liveState.providerResolvable,
             activeProviderCandidates,

package/dist/app/list-config-profiles.js

@@ -22,7 +22,9 @@ function listConfigProfilesView(args) {
     }));
     return {
         data: {
-            activeProfile: document.activeProfile,
+            currentModel: document.currentModel,
+            currentModelProvider: document.currentModelProvider,
+            legacyProfile: document.legacyProfile,
             profiles,
             count: profiles.length,
         },

package/dist/app/list-providers.js

@@ -45,13 +45,18 @@ const providers_repo_1 = require("../storage/providers-repo");
 function listProviders(providersPath, configPath) {
     const providers = (0, providers_repo_1.readProvidersFile)(providersPath);
     const names = Object.keys(providers.providers).sort();
-    const currentProfile = configPath && fs.existsSync(configPath)
-        ? (0, config_repo_1.readStructuredConfig)(configPath).activeProfile
+    const currentModelProvider = configPath && fs.existsSync(configPath)
+        ? (0, config_repo_1.readStructuredConfig)(configPath).currentModelProvider
         : null;
-    const liveState = (0, runtime_state_1.inspectLiveStateDrift)(currentProfile, providers);
+    const currentModel = configPath && fs.existsSync(configPath)
+        ? (0, config_repo_1.readStructuredConfig)(configPath).currentModel
+        : null;
+    const liveState = (0, runtime_state_1.inspectLiveStateDrift)(currentModelProvider, providers);
     const items = names.map((name) => ({
         name,
         profile: providers.providers[name].profile,
+        modelProvider: providers.providers[name].profile,
+        model: providers.providers[name].model ?? null,
         providerType: (0, providers_1.isCopilotBridgeProvider)(providers.providers[name]) ? "copilot" : "direct",
         isActive: liveState.providerResolvable && liveState.mappedProvider === name,
         note: providers.providers[name].note ?? null,
@@ -61,7 +66,8 @@ function listProviders(providersPath, configPath) {
         data: {
             providers: items,
             count: items.length,
-            currentProfile,
+            currentModel,
+            currentModelProvider,
             activeProvider: liveState.mappedProvider,
             activeProviderResolvable: liveState.providerResolvable,
             activeProviderCandidates: liveState.mappedProviders,

package/dist/app/remove-provider.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeProvider = removeProvider;
 const errors_1 = require("../domain/errors");
-const config_1 = require("../domain/config");
 const config_repo_1 = require("../storage/config-repo");
 const providers_repo_1 = require("../storage/providers-repo");
+const providers_1 = require("../domain/providers");
 const run_mutation_1 = require("./run-mutation");
 /**
  * Removes a provider from the managed providers registry.
@@ -17,22 +17,48 @@ function removeProvider(args) {
         throw (0, errors_1.cliError)("PROVIDER_NOT_FOUND", `Provider "${args.providerName}" was not found.`);
     }
     const nextProviders = { ...providers.providers };
-    // Delete against a copied object so the original parsed state stays untouched.
     delete nextProviders[args.providerName];
-    const remainingLinksByProfile = new Map();
-    for (const [name, provider] of Object.entries(nextProviders)) {
-        const list = remainingLinksByProfile.get(provider.profile) ?? [];
-        list.push(name);
-        remainingLinksByProfile.set(provider.profile, list);
+    const activeModelProvider = document.currentModelProvider;
+    const linkedProviders = Object.entries(providers.providers)
+        .filter(([, provider]) => provider.profile === activeModelProvider)
+        .map(([name]) => name)
+        .sort();
+    const removingActiveProvider = activeModelProvider === current.profile && linkedProviders.length === 1;
+    const switchTargetName = args.switchToProvider ?? null;
+    const switchTarget = switchTargetName ? nextProviders[switchTargetName] ?? null : null;
+    if (removingActiveProvider && !switchTargetName) {
+        throw (0, errors_1.cliError)("PROFILE_IN_USE", `Provider "${args.providerName}" is the active route and requires --switch-to <provider-name>.`, {
+            provider: args.providerName,
+            activeModelProvider,
+            linkedProviders,
+        });
+    }
+    if (switchTargetName && !switchTarget) {
+        throw (0, errors_1.cliError)("PROVIDER_NOT_FOUND", `Provider "${switchTargetName}" was not found.`, {
+            provider: switchTargetName,
+            availableProviders: Object.keys(nextProviders).sort(),
+        });
+    }
+    const switchTargetModel = switchTarget?.model ?? document.currentModel ?? null;
+    if (switchTargetName && !switchTargetModel) {
+        throw (0, errors_1.cliError)("MANAGED_PROFILE_FIELDS_MISSING", `Provider "${switchTargetName}" has no model to switch with.`, {
+            provider: switchTargetName,
+            suggestion: "Run `codexs edit <provider> --model <name>` first.",
+        });
+    }
+    const switchTargetProjection = switchTarget
+        ? (0, providers_1.isCopilotBridgeProvider)(switchTarget)
+            ? (0, providers_1.buildCopilotModelProviderProjection)(switchTarget.runtime)
+            : switchTarget.baseUrl
+                ? (0, providers_1.buildDirectModelProviderProjection)(switchTarget.profile, switchTarget.baseUrl)
+                : null
+        : null;
+    if (switchTargetName && !switchTargetProjection) {
+        throw (0, errors_1.cliError)("MANAGED_PROFILE_FIELDS_MISSING", `Provider "${switchTargetName}" requires base_url before it can become active.`, {
+            provider: switchTargetName,
+            suggestion: "Run `codexs edit <provider> --base-url <url>` first.",
+        });
     }
-    const lifecycle = (0, config_1.planProfileLifecycleOutcome)({
-        providerName: args.providerName,
-        oldProfile: current.profile,
-        newProfile: null,
-        activeProfile: document.activeProfile,
-        remainingLinksByProfile,
-        switchToProfile: args.switchToProfile ?? null,
-    });
     return (0, run_mutation_1.runMutation)({
         lockPath: args.lockPath,
         backupsDir: args.backupsDir,
@@ -44,17 +70,24 @@ function removeProvider(args) {
         ],
         mutate: () => {
             const configPlan = (0, config_repo_1.createConfigMutationPlan)(document, {
-                deleteProfiles: lifecycle.deletedProfileSections,
-                setActiveProfile: lifecycle.nextActiveProfile,
+                setCurrentModel: switchTarget ? switchTargetModel : undefined,
+                setCurrentModelProvider: switchTarget ? switchTarget.profile : undefined,
+                upsertModelProviders: switchTarget && switchTargetProjection
+                    ? { [switchTarget.profile]: switchTargetProjection }
+                    : undefined,
+                deleteLegacyProfile: Boolean(switchTarget),
+                deleteLegacyProfilesByName: switchTarget ? [switchTarget.profile] : [],
+                scrubModelProviderEnvKeys: switchTarget ? [switchTarget.profile] : [],
             });
             (0, providers_repo_1.writeProvidersFile)(args.providersPath, { providers: nextProviders });
             (0, config_repo_1.applyConfigMutation)(args.configPath, document, configPlan);
             return {
                 provider: args.providerName,
+                switchedTo: switchTargetName,
                 createdProfileSections: configPlan.createdProfileSections,
                 deletedProfileSections: configPlan.deletedProfileSections,
-                keptSharedProfiles: lifecycle.keptSharedProfiles,
-                switchedActiveProfile: lifecycle.switchedActiveProfile,
+                keptSharedProfiles: [],
+                switchedActiveProfile: Boolean(switchTarget),
                 adoptedProfiles: [],
                 repairedProfiles: [],
             };

package/dist/app/run-doctor.js

@@ -47,12 +47,13 @@ const copilot_installer_1 = require("../runtime/copilot-installer");
 const copilot_bridge_1 = require("../runtime/copilot-bridge");
 const copilot_adapter_1 = require("../runtime/copilot-adapter");
 const runtime_state_repo_1 = require("../storage/runtime-state-repo");
+const codex_version_1 = require("../runtime/codex-version");
 /**
  * Performs consistency checks across config.toml, providers.json, and the local Codex CLI.
  */
 async function runDoctor(args) {
     const issues = [];
-    let currentProfile = null;
+    let currentModelProvider = null;
     let providers = null;
     let document = null;
     if (!fs.existsSync(args.configPath)) {
@@ -64,11 +65,11 @@ async function runDoctor(args) {
     }
     else {
         document = (0, config_repo_1.readStructuredConfig)(args.configPath);
-        currentProfile = document.activeProfile;
-        if (!currentProfile) {
+        currentModelProvider = document.currentModelProvider;
+        if (!currentModelProvider) {
             issues.push({
-                code: "PROFILE_NOT_FOUND",
-                message: "config.toml has no top-level profile.",
+                code: "MODEL_PROVIDER_MISSING",
+                message: "config.toml has no top-level model_provider.",
                 file: args.configPath,
             });
         }
@@ -118,8 +119,8 @@ async function runDoctor(args) {
             message: `Copilot bridge runtime state is unreadable: ${runtimeStateInspection.parseError ?? "unknown parse failure"}`,
         });
     }
-    if (document?.activeProfile && providers) {
-        const matches = (0, providers_1.findProvidersByProfile)(providers, document.activeProfile);
+    if (document?.currentModelProvider && providers) {
+        const matches = (0, providers_1.findProvidersByProfile)(providers, document.currentModelProvider);
         if (matches.length === 1) {
             const activeProvider = providers.providers[matches[0]];
             if ((0, providers_1.isCopilotBridgeProvider)(activeProvider)) {
@@ -163,11 +164,11 @@ async function runDoctor(args) {
                 ...runtimeState,
             });
         }
-        else if (!document?.activeProfile || runtimeProvider.profile !== document.activeProfile) {
+        else if (!document?.currentModelProvider || runtimeProvider.profile !== document.currentModelProvider) {
             issues.push({
                 code: "BRIDGE_STATE_STALE",
-                message: "Copilot bridge runtime state exists for a provider that is not the current active profile.",
-                activeProfile: document?.activeProfile ?? null,
+                message: "Copilot bridge runtime state exists for a provider that is not the current active model_provider.",
+                activeModelProvider: document?.currentModelProvider ?? null,
                 runtimeProvider: runtimeState.provider,
                 runtimeProfile: runtimeProvider.profile,
                 ...runtimeState,
@@ -175,8 +176,8 @@ async function runDoctor(args) {
         }
     }
     // Drift inspection still runs when files are missing so status output can explain partial state.
-    const drift = (0, runtime_state_1.inspectLiveStateDrift)(currentProfile, providers);
-    const codexCheck = (0, codex_probe_1.probeCodexRuntime)();
+    const drift = (0, runtime_state_1.inspectLiveStateDrift)(currentModelProvider, providers);
+    const codexCheck = (0, codex_probe_1.probeCodexRuntime)(codex_version_1.MIN_SUPPORTED_CODEX_VERSION);
     if (!codexCheck.ok) {
         const message = codexCheck.reason === "missing"
             ? "codex CLI is not available on PATH."
@@ -229,32 +230,28 @@ function mapBridgeDiagnosticCode(cause) {
  */
 function renderConfigIssueMessage(issue) {
     switch (issue.code) {
-        case "ORPHANED_PROFILE_REFERENCE":
-            return `Profile "${issue.profile}" is referenced by providers but missing from config.toml.`;
-        case "UNMANAGED_ACTIVE_PROFILE":
-            return `Active profile "${issue.profile}" is not mapped by providers.json.`;
-        case "SHARED_PROFILE_REFERENCE":
-            return `Profile "${issue.profile}" is shared by multiple providers.`;
-        case "ORPHANED_PROFILE_SECTION":
-            return `Profile section "${issue.profile}" is not linked to any provider.`;
+        case "MODEL_MISSING":
+            return "Top-level model is missing from config.toml.";
         case "MODEL_PROVIDER_MISSING":
-            return `Profile "${issue.profile}" is missing model_provider.`;
-        case "MODEL_PROVIDER_NAME_MISMATCH":
-            return `Profile "${issue.profile}" must use matching model_provider name "${issue.profile}", found "${issue.modelProvider}".`;
+            return "Top-level model_provider is missing from config.toml.";
         case "MODEL_PROVIDER_SECTION_MISSING":
-            return `Model provider section "${issue.modelProvider}" for profile "${issue.profile}" is missing from config.toml.`;
+            return `Model provider section "${issue.modelProvider}" is missing from config.toml.`;
         case "MODEL_PROVIDER_BASE_URL_MISSING":
-            return `Model provider section "${issue.modelProvider}" for profile "${issue.profile}" is missing base_url.`;
+            return `Model provider section "${issue.modelProvider}" is missing base_url.`;
+        case "LEGACY_PROFILE_SELECTOR":
+            return `Legacy top-level profile selector "${issue.profile}" is still present.`;
+        case "LEGACY_PROFILE_SECTION":
+            return `Legacy profile section "${issue.profile}" is still present.`;
+        case "LEGACY_MODEL_PROVIDER_ENV_KEY":
+            return `Model provider "${issue.modelProvider}" still contains legacy env_key wiring.`;
         case "PROVIDER_BASE_URL_MISMATCH":
             return issue.providerType === "direct"
-                ? `Direct provider "${issue.provider}" baseUrl does not match config.toml model provider "${issue.profile}" base_url.`
+                ? `Direct provider "${issue.provider}" baseUrl does not match config.toml model provider "${issue.modelProvider}" base_url.`
                 : String(issue.code ?? "UNKNOWN_ISSUE");
-        case "ACTIVE_PROVIDER_UNRESOLVED":
-            return `Active profile "${issue.profile}" maps to multiple providers, so the active managed provider cannot be resolved uniquely.`;
         case "AUTH_JSON_INVALID":
             return String(issue.message ?? issue.reason ?? "auth.json is invalid.");
         case "DESTRUCTIVE_REMOVE_BLOCKED":
-            return `Provider "${issue.provider}" cannot be removed while "${issue.activeProfile}" remains active.`;
+            return `Provider "${issue.provider}" cannot be removed while "${issue.activeModelProvider}" remains active.`;
         default:
             return String(issue.code ?? "UNKNOWN_ISSUE");
     }

package/dist/app/setup-codex.js

@@ -42,9 +42,9 @@ const codex_cli_1 = require("../runtime/codex-cli");
 const config_repo_1 = require("../storage/config-repo");
 const fs_utils_1 = require("../storage/fs-utils");
 const providers_repo_1 = require("../storage/providers-repo");
+const codex_version_1 = require("../runtime/codex-version");
 const run_doctor_1 = require("./run-doctor");
 const run_mutation_1 = require("./run-mutation");
-const MIN_CODEX_VERSION = "0.0.1";
 /**
  * Migrates unmanaged Codex config profiles into a managed providers.json registry.
  */
@@ -55,10 +55,10 @@ async function migrateCodex(args) {
             cause: available.cause,
         });
     }
-    const version = (0, codex_cli_1.checkCodexVersion)(MIN_CODEX_VERSION);
+    const version = (0, codex_cli_1.checkCodexVersion)(codex_version_1.MIN_SUPPORTED_CODEX_VERSION);
     if (!version.ok) {
         throw (0, errors_1.cliError)("CODEX_VERSION_UNSUPPORTED", "codex CLI version is below the supported minimum.", {
-            minimumVersion: MIN_CODEX_VERSION,
+            minimumVersion: codex_version_1.MIN_SUPPORTED_CODEX_VERSION,
             currentVersion: version.currentVersion ?? null,
             cause: version.cause,
         });

package/dist/app/show-config.js

@@ -27,7 +27,9 @@ function showConfig(args) {
     }
     return {
         data: {
-            activeProfile: document.activeProfile,
+            currentModel: document.currentModel,
+            currentModelProvider: document.currentModelProvider,
+            legacyProfile: document.legacyProfile,
             selectedProfile,
             profiles: profiles.map((profile) => ({
                 ...profile,

package/dist/app/switch-provider.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.switchProvider = switchProvider;
 const errors_1 = require("../domain/errors");
-const providers_1 = require("../domain/providers");
 const config_repo_1 = require("../storage/config-repo");
 const auth_repo_1 = require("../storage/auth-repo");
 const providers_repo_1 = require("../storage/providers-repo");
@@ -10,8 +9,9 @@ const copilot_bridge_1 = require("../runtime/copilot-bridge");
 const copilot_installer_1 = require("../runtime/copilot-installer");
 const copilot_adapter_1 = require("../runtime/copilot-adapter");
 const run_mutation_1 = require("./run-mutation");
+const providers_1 = require("../domain/providers");
 /**
- * Switches the active Codex profile to the target provider.
+ * Switches the active Codex route to the target provider.
  */
 async function switchProvider(args) {
     const providers = (0, providers_repo_1.readProvidersFile)(args.providersPath);
@@ -21,7 +21,15 @@ async function switchProvider(args) {
             availableProviders: Object.keys(providers.providers).sort(),
         });
     }
-    const document = (0, config_repo_1.ensureProfileExists)(args.configPath, provider.profile, args.providerName);
+    const document = (0, config_repo_1.readStructuredConfig)(args.configPath);
+    const resolvedModel = provider.model ?? document.currentModel;
+    if (!resolvedModel) {
+        throw (0, errors_1.cliError)("MANAGED_PROFILE_FIELDS_MISSING", `Provider "${args.providerName}" has no model to switch with.`, {
+            provider: args.providerName,
+            modelProvider: provider.profile,
+            suggestion: "Run `codexs edit <provider> --model <name>` or `codexs add <provider> --model <name>`.",
+        });
+    }
     if ((0, providers_1.isCopilotBridgeProvider)(provider)) {
         const installStatus = (0, copilot_installer_1.probeCopilotSdkInstall)(args.runtimesDir);
         if (!installStatus.installed) {
@@ -55,10 +63,14 @@ async function switchProvider(args) {
                 ],
                 mutate: () => {
                     const configPlan = (0, config_repo_1.createConfigMutationPlan)(document, {
-                        setActiveProfile: provider.profile,
+                        setCurrentModel: resolvedModel,
+                        setCurrentModelProvider: provider.profile,
                         upsertModelProviders: {
                             [provider.profile]: (0, providers_1.buildCopilotModelProviderProjection)(nextProvider.runtime),
                         },
+                        deleteLegacyProfile: true,
+                        deleteLegacyProfilesByName: [provider.profile],
+                        scrubModelProviderEnvKeys: [provider.profile],
                     });
                     if (bridge.portChanged) {
                         (0, providers_repo_1.writeProvidersFile)(args.providersPath, {
@@ -72,6 +84,8 @@ async function switchProvider(args) {
                     (0, auth_repo_1.writeOpenAiApiKeyAuth)(args.authPath, provider.apiKey);
                     return {
                         provider: args.providerName,
+                        model: resolvedModel,
+                        modelProvider: nextProvider.profile,
                         profile: nextProvider.profile,
                         portChanged: bridge.portChanged,
                         bridgePort: bridge.port,
@@ -96,13 +110,30 @@ async function switchProvider(args) {
             { absolutePath: args.configPath, relativePath: "config.toml" },
         ],
         mutate: () => {
+            const directBaseUrl = provider.baseUrl?.trim() ?? "";
+            if (!directBaseUrl) {
+                throw (0, errors_1.cliError)("MANAGED_PROFILE_FIELDS_MISSING", `Provider "${args.providerName}" requires base_url before switching.`, {
+                    provider: args.providerName,
+                    modelProvider: provider.profile,
+                    suggestion: "Run `codexs edit <provider> --base-url <url>`.",
+                });
+            }
             const configPlan = (0, config_repo_1.createConfigMutationPlan)(document, {
-                setActiveProfile: provider.profile,
+                setCurrentModel: resolvedModel,
+                setCurrentModelProvider: provider.profile,
+                upsertModelProviders: {
+                    [provider.profile]: (0, providers_1.buildDirectModelProviderProjection)(provider.profile, directBaseUrl),
+                },
+                deleteLegacyProfile: true,
+                deleteLegacyProfilesByName: [provider.profile],
+                scrubModelProviderEnvKeys: [provider.profile],
             });
             (0, config_repo_1.applyConfigMutation)(args.configPath, document, configPlan);
             (0, auth_repo_1.writeOpenAiApiKeyAuth)(args.authPath, provider.apiKey);
             return {
                 provider: args.providerName,
+                model: resolvedModel,
+                modelProvider: provider.profile,
                 profile: provider.profile,
             };
         },

package/dist/cli/output.js

@@ -85,11 +85,15 @@ function renderHumanSuccess(command, data, warnings) {
                 lines.push("No providers configured.");
             }
             else {
-                const currentProfile = typeof data?.currentProfile === "string" ? data.currentProfile : null;
+                const currentModel = typeof data?.currentModel === "string" ? data.currentModel : null;
+                const currentModelProvider = typeof data?.currentModelProvider === "string" ? data.currentModelProvider : null;
                 const activeProviderResolvable = data?.activeProviderResolvable !== false;
                 const activeCandidates = Array.isArray(data?.activeProviderCandidates) ? data?.activeProviderCandidates : [];
-                if (currentProfile) {
-                    lines.push(`Current profile: ${currentProfile}`);
+                if (currentModel) {
+                    lines.push(`Current model: ${currentModel}`);
+                }
+                if (currentModelProvider) {
+                    lines.push(`Current model provider: ${currentModelProvider}`);
                     if (!activeProviderResolvable && activeCandidates.length > 1) {
                         lines.push(`Current provider: ambiguous (${activeCandidates.join(", ")})`);
                     }
@@ -103,7 +107,7 @@ function renderHumanSuccess(command, data, warnings) {
                         : "";
                     const note = provider.note ? ` note=${provider.note}` : "";
                     const current = provider.isActive ? " current" : "";
-                    lines.push(`${provider.name} [${String(provider.providerType ?? "direct")}]${current} -> ${provider.profile}${tags}${note}`);
+                    lines.push(`${provider.name} [${String(provider.providerType ?? "direct")}]${current} -> ${provider.modelProvider}${provider.model ? ` model=${provider.model}` : ""}${tags}${note}`);
                 }
             }
             break;
@@ -125,13 +129,18 @@ function renderHumanSuccess(command, data, warnings) {
             break;
         }
         case "current":
-            lines.push(`Current profile: ${String(data?.profile ?? "")}`);
+            lines.push(`Current model: ${String(data?.model ?? "")}`);
+            lines.push(`Current model provider: ${String(data?.modelProvider ?? "")}`);
+            if (data?.provider) {
+                lines.push(`Managed provider: ${String(data.provider)}`);
+            }
             break;
         case "status":
             lines.push("Status summary:");
             lines.push(`  target runtime: ${String(data?.codexDir ?? "")}`);
             lines.push(`  tool home: ${String(data?.storage?.toolHome?.root ?? "")}`);
-            lines.push(`  current profile: ${String(data?.currentProfile ?? "(none)")}`);
+            lines.push(`  current model: ${String(data?.currentModel ?? "(none)")}`);
+            lines.push(`  current model provider: ${String(data?.currentModelProvider ?? "(none)")}`);
             lines.push(`  mapped provider: ${renderStatusMappedProvider(data)}`);
             lines.push(`  provider path: ${renderStatusProviderPath(data)}`);
             lines.push(`  runtime health: ${renderStatusHealth(data)}`);
@@ -139,7 +148,9 @@ function renderHumanSuccess(command, data, warnings) {
             lines.push(`  next step: ${renderStatusNextStep(data, warnings)}`);
             break;
         case "config-show": {
-            lines.push(`activeProfile: ${String(data?.activeProfile ?? "")}`);
+            lines.push(`currentModel: ${String(data?.currentModel ?? "")}`);
+            lines.push(`currentModelProvider: ${String(data?.currentModelProvider ?? "")}`);
+            lines.push(`legacyProfile: ${String(data?.legacyProfile ?? "")}`);
             const profiles = data?.profiles ?? [];
             for (const profile of profiles) {
                 lines.push(`${String(profile.name)} managed=${String(profile.managed)} active=${String(profile.isActive)} source=${String(profile.source)} model=${String(profile.model ?? "")} modelProvider=${String(profile.modelProvider ?? "")} baseUrl=${String(profile.baseUrl ?? "")}`);
@@ -154,7 +165,8 @@ function renderHumanSuccess(command, data, warnings) {
             break;
         }
         case "switch":
-            lines.push(`Switched to provider ${String(data?.provider ?? "")} using profile ${String(data?.profile ?? "")}.`);
+            lines.push(`Switched to provider ${String(data?.provider ?? "")} using model provider ${String(data?.modelProvider ?? data?.profile ?? "")}.`);
+            lines.push(`Model: ${String(data?.model ?? "")}`);
             lines.push(`Backup: ${String(data?.backupPath ?? "")}`);
             break;
         case "import":
@@ -183,7 +195,7 @@ function renderHumanSuccess(command, data, warnings) {
             }
             lines.push(`login launched: ${String(data?.loginLaunched ?? false)}`);
             lines.push(`auth ready: ${String(data?.authReady ?? false)}`);
-            lines.push("next step: run `codexs add <provider> --copilot --profile <name>` and then `codexs switch <provider>`.");
+            lines.push("next step: run `codexs add <provider> --copilot --profile <model-provider-id>` and then `codexs switch <provider>`.");
             break;
         case "migrate":
             lines.push(`Migrated providers in ${String(data?.codexDir ?? "")} using ${String(data?.strategy ?? "")}.`);
@@ -262,12 +274,6 @@ function renderStatusHealth(data) {
     if (!activeProviderResolvable || liveState.reason === "shared-profile") {
         return "active provider ambiguous";
     }
-    if (issues.some((issue) => issue.code === "UNMANAGED_ACTIVE_PROFILE")) {
-        return "active profile unmanaged";
-    }
-    if (issues.some((issue) => issue.code === "ACTIVE_PROVIDER_UNRESOLVED")) {
-        return "active provider ambiguous";
-    }
     if (issues.some((issue) => issue.code === "PROVIDER_BASE_URL_MISMATCH")) {
         return "provider projection drift";
     }
@@ -317,6 +323,9 @@ function renderStatusNextStep(data, warnings) {
     if (!data?.provider) {
         return "run `codexs switch <provider>` after adding or adopting a managed provider";
     }
+    if (Array.isArray(data?.issues) && (data?.issues).some((issue) => issue.code === "LEGACY_PROFILE_SELECTOR" || issue.code === "LEGACY_PROFILE_SECTION" || issue.code === "LEGACY_MODEL_PROVIDER_ENV_KEY")) {
+        return "run `codexs switch <provider>` to reproject the active route and clean legacy fields";
+    }
     return "run `codexs doctor` if you need a deeper diagnostic pass";
 }
 /**
@@ -337,10 +346,11 @@ function renderDoctorIssueNextStep(issue) {
         case "BRIDGE_HEALTHCHECK_FAILED":
             return "reselect the provider with `codexs switch <provider>` or inspect bridge state";
         case "UNMANAGED_ACTIVE_PROFILE":
-            return "switch to a managed provider or adopt the active profile with `codexs migrate`";
-        case "ACTIVE_PROVIDER_UNRESOLVED":
-        case "SHARED_PROFILE_REFERENCE":
-            return "make provider-to-profile mappings unique before relying on current-provider detection";
+            return "switch to a managed provider or adopt the active route with `codexs migrate`";
+        case "LEGACY_PROFILE_SELECTOR":
+        case "LEGACY_PROFILE_SECTION":
+        case "LEGACY_MODEL_PROVIDER_ENV_KEY":
+            return "rerun `codexs switch <provider>` to project top-level model/model_provider and remove legacy fields";
         case "PROVIDER_BASE_URL_MISMATCH":
             return "rerun `codexs edit <provider> --base-url <url>` or `codexs switch <provider>` to repair the runtime projection";
         default:

package/dist/commands/handlers.js

@@ -95,7 +95,7 @@ async function handleRegisteredCommand(ctx, parsed, runtime = (0, prompt_1.creat
             });
         }
         case "current":
-            return (0, get_current_profile_1.getCurrentProfile)(paths.configPath);
+            return (0, get_current_profile_1.getCurrentProfile)(paths.configPath, paths.providersPath);
         case "status":
             return (0, get_status_1.getStatus)(paths.codexDir, paths.configPath, paths.providersPath, paths.authPath, {
                 runtimeDir: paths.runtimeDir,
@@ -495,7 +495,7 @@ async function handleRegisteredCommand(ctx, parsed, runtime = (0, prompt_1.creat
                 providersPath: paths.providersPath,
                 configPath: paths.configPath,
                 providerName,
-                switchToProfile,
+                switchToProvider: switchToProfile,
             });
         }
         case "doctor":

package/dist/commands/help.js

@@ -29,7 +29,7 @@ function buildHelpText(commandName) {
         return [
             "codex-switch",
             "",
-            "Manage and switch local Codex provider/profile configuration safely.",
+            "Manage and switch local Codex provider/model-provider routing safely.",
             "Primary workflows: direct providers use init -> add -> switch -> status -> doctor.",
             "Primary workflows: Copilot providers use init -> login copilot -> add --copilot -> switch -> status -> doctor.",
             "Advanced adopt flows use migrate only when you already have Codex runtime state to import.",
@@ -65,12 +65,12 @@ function buildHelpText(commandName) {
             "",
             "Examples:",
             "  codexs init",
-            "  codexs add packycode --profile packycode --api-key sk-xxx",
+            "  codexs add packycode --profile packycode --model gpt-5 --api-key sk-xxx --base-url https://api.example/v1",
             "  codexs switch packycode",
             "  codexs status",
             "  codexs doctor",
             "  codexs login copilot",
-            "  codexs add copilot-main --copilot --profile copilot-main",
+            "  codexs add copilot-main --copilot --profile copilot-main --model gpt-5",
             "  codexs migrate",
             "  codexs config show",
             "  codexs backups list",