@minniexcode/codex-switch 0.0.8 → 0.0.10

package/dist/app/run-doctor.js

@@ -46,6 +46,7 @@ const providers_1 = require("../domain/providers");
 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");
 /**
  * Performs consistency checks across config.toml, providers.json, and the local Codex CLI.
  */
@@ -101,7 +102,9 @@ async function runDoctor(args) {
             });
         }
     }
-    const authState = (0, auth_repo_1.readManagedAuthState)(args.authPath);
+    const authState = (0, auth_repo_1.readAuthFileState)(args.authPath);
+    const runtimeStateInspection = (0, runtime_state_repo_1.inspectCopilotBridgeState)();
+    const runtimeState = runtimeStateInspection.state;
     if (authState.exists && !authState.valid) {
         issues.push({
             code: "AUTH_JSON_INVALID",
@@ -109,34 +112,16 @@ async function runDoctor(args) {
             file: args.authPath,
         });
     }
+    if (runtimeStateInspection.exists && !runtimeStateInspection.valid) {
+        issues.push({
+            code: "BRIDGE_STATE_STALE",
+            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 (matches.length === 1) {
             const activeProvider = providers.providers[matches[0]];
-            const payload = authState.payload ?? {};
-            const actualKeys = authState.managedSecretKeys;
-            if (authState.authMode !== null && authState.authMode !== "apikey") {
-                issues.push({
-                    code: "AUTH_JSON_INVALID",
-                    message: `auth.json auth_mode must be "apikey", found "${authState.authMode}".`,
-                });
-            }
-            if (!actualKeys.includes(activeProvider.envKey) || actualKeys.length !== 1) {
-                issues.push({
-                    code: "AUTH_JSON_ENV_KEY_MISMATCH",
-                    message: `auth.json managed env key does not match active provider "${matches[0]}".`,
-                    provider: matches[0],
-                    expectedEnvKey: activeProvider.envKey,
-                    actualEnvKeys: actualKeys,
-                });
-            }
-            if (payload[activeProvider.envKey] !== activeProvider.apiKey) {
-                issues.push({
-                    code: "AUTH_JSON_APIKEY_MISMATCH",
-                    message: `auth.json secret value does not match active provider "${matches[0]}".`,
-                    provider: matches[0],
-                });
-            }
             if ((0, providers_1.isCopilotBridgeProvider)(activeProvider)) {
                 const installStatus = (0, copilot_installer_1.probeCopilotSdkInstall)();
                 if (!installStatus.installed) {
@@ -158,12 +143,10 @@ async function runDoctor(args) {
                         ...(normalized.details ?? {}),
                     });
                 }
-                const bridge = await (0, copilot_bridge_1.probeCopilotBridgeRuntime)(activeProvider);
+                const bridge = await (0, copilot_bridge_1.probeCopilotBridgeRuntime)(activeProvider, runtimeState);
                 if (!bridge.ok) {
                     issues.push({
-                        code: bridge.cause === "Copilot bridge state base URL does not match the provider runtime configuration."
-                            ? "PROVIDER_BASE_URL_MISMATCH"
-                            : "BRIDGE_HEALTHCHECK_FAILED",
+                        code: mapBridgeDiagnosticCode(bridge.cause),
                         message: bridge.cause,
                         ...(bridge.details ?? {}),
                     });
@@ -171,6 +154,26 @@ async function runDoctor(args) {
             }
         }
     }
+    if (runtimeState && providers) {
+        const runtimeProvider = providers.providers[runtimeState.provider] ?? null;
+        if (!runtimeProvider || !(0, providers_1.isCopilotBridgeProvider)(runtimeProvider)) {
+            issues.push({
+                code: "BRIDGE_STATE_STALE",
+                message: "Copilot bridge runtime state exists but no matching managed Copilot provider is available.",
+                ...runtimeState,
+            });
+        }
+        else if (!document?.activeProfile || runtimeProvider.profile !== document.activeProfile) {
+            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,
+                runtimeProvider: runtimeState.provider,
+                runtimeProfile: runtimeProvider.profile,
+                ...runtimeState,
+            });
+        }
+    }
     // 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)();
@@ -202,6 +205,18 @@ async function runDoctor(args) {
         warnings: issues.length === 0 ? [] : [`doctor found ${issues.length} issue(s)`],
     };
 }
+function mapBridgeDiagnosticCode(cause) {
+    if (cause === "Copilot bridge state manifest is missing.") {
+        return "BRIDGE_STATE_MISSING";
+    }
+    if (cause === "Copilot bridge runtime state exists but no active Copilot bridge provider is selected.") {
+        return "BRIDGE_STATE_STALE";
+    }
+    if (cause === "Copilot bridge state base URL does not match the provider runtime configuration.") {
+        return "PROVIDER_BASE_URL_MISMATCH";
+    }
+    return "BRIDGE_HEALTHCHECK_FAILED";
+}
 /**
  * Maps structured config consistency issues onto stable human-readable diagnostic text.
  */
@@ -223,18 +238,10 @@ function renderConfigIssueMessage(issue) {
             return `Model provider section "${issue.modelProvider}" for profile "${issue.profile}" 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.`;
-        case "MODEL_PROVIDER_ENV_KEY_MISSING":
-            return `Model provider section "${issue.modelProvider}" for profile "${issue.profile}" is missing env_key.`;
-        case "PROVIDER_ENV_KEY_MISMATCH":
-            return `Provider "${issue.provider}" envKey does not match runtime env_key for profile "${issue.profile}".`;
         case "ACTIVE_PROVIDER_UNRESOLVED":
-            return `Active profile "${issue.profile}" maps to multiple providers and cannot determine the current auth mirror owner.`;
+            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 "AUTH_JSON_ENV_KEY_MISMATCH":
-            return `auth.json managed env key does not match provider "${String(issue.provider ?? "")}".`;
-        case "AUTH_JSON_APIKEY_MISMATCH":
-            return `auth.json secret does not match provider "${String(issue.provider ?? "")}".`;
         case "DESTRUCTIVE_REMOVE_BLOCKED":
             return `Provider "${issue.provider}" cannot be removed while "${issue.activeProfile}" remains active.`;
         default:

package/dist/app/setup-codex.js

@@ -42,7 +42,6 @@ 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 auth_repo_1 = require("../storage/auth-repo");
 const run_doctor_1 = require("./run-doctor");
 const run_mutation_1 = require("./run-mutation");
 const MIN_CODEX_VERSION = "0.0.1";
@@ -70,30 +69,46 @@ async function migrateCodex(args) {
         });
     }
     const document = (0, config_repo_1.readStructuredConfig)(args.configPath);
-    const profileViews = (0, config_1.buildManagedProfileViews)(document, null);
-    // Migrate can only adopt unmanaged profiles that already contain enough runtime data to become managed.
-    const adoptableProfiles = profileViews
-        .filter((view) => view.source === "unmanaged" && view.model && view.modelProvider === view.name && view.baseUrl && view.envKey)
-        .map((view) => view.name)
-        .sort();
+    const currentProviders = (0, providers_repo_1.readProvidersFileIfExists)(args.providersPath);
+    const profileViews = (0, config_1.buildManagedProfileViews)(document, currentProviders);
+    const adoptability = (0, setup_1.collectMigrateAdoptability)(document, currentProviders);
     if (profileViews.length === 0) {
         throw (0, errors_1.cliError)("PROFILE_NOT_FOUND", "No profiles were found in config.toml.", {
             file: args.configPath,
         });
     }
-    const invalidAdoptProfiles = args.adoptProfiles.filter((profile) => !adoptableProfiles.includes(profile));
+    if (adoptability.adoptableProfiles.length === 0) {
+        throw (0, errors_1.cliError)("MIGRATE_NO_ADOPTABLE_PROFILES", "No adoptable profiles were found for migrate.", {
+            availableProfiles: adoptability.availableProfiles,
+            adoptableProfiles: adoptability.adoptableProfiles,
+            blockingReasonsByProfile: adoptability.blockingReasonsByProfile,
+        });
+    }
+    const invalidAdoptProfiles = args.adoptProfiles.filter((profile) => !adoptability.adoptableProfiles.includes(profile));
     if (invalidAdoptProfiles.length > 0) {
-        throw (0, errors_1.cliError)("INVALID_ARGUMENT", "migrate only adopts unmanaged profiles that already contain model, model_provider, and matching model_providers base_url/env_key.", {
+        throw (0, errors_1.cliError)("INVALID_ARGUMENT", "migrate only adopts unmanaged profiles that already contain model, model_provider, and matching model_providers base_url.", {
             invalidProfiles: invalidAdoptProfiles.sort(),
-            adoptableProfiles,
+            availableProfiles: adoptability.availableProfiles,
+            adoptableProfiles: adoptability.adoptableProfiles,
+            blockingReasonsByProfile: adoptability.blockingReasonsByProfile,
         });
     }
     if (args.adoptProfiles.length === 0) {
         throw (0, errors_1.cliError)("INVALID_ARGUMENT", "migrate requires at least one explicit profile to adopt.", {
-            adoptableProfiles,
+            availableProfiles: adoptability.availableProfiles,
+            adoptableProfiles: adoptability.adoptableProfiles,
+            blockingReasonsByProfile: adoptability.blockingReasonsByProfile,
         });
     }
-    const drafts = (0, setup_1.buildSetupDrafts)(args.adoptProfiles, args.providerDetailsByProfile);
+    const runtimeByProfile = profileViews.reduce((accumulator, view) => {
+        if (view.source === "unmanaged") {
+            accumulator[view.name] = {
+                baseUrl: view.baseUrl ?? undefined,
+            };
+        }
+        return accumulator;
+    }, {});
+    const drafts = (0, setup_1.buildSetupDrafts)(args.adoptProfiles, args.providerDetailsByProfile, runtimeByProfile);
     const incompleteProfiles = (0, setup_1.findIncompleteSetupProfiles)(drafts);
     if (incompleteProfiles.length > 0) {
         throw (0, errors_1.cliError)("INVALID_ARGUMENT", "migrate requires complete provider data for every selected profile.", {
@@ -101,7 +116,6 @@ async function migrateCodex(args) {
         });
     }
     (0, fs_utils_1.ensureDir)(args.codexDir);
-    const currentProviders = (0, providers_repo_1.readProvidersFileIfExists)(args.providersPath);
     const providersExists = fs.existsSync(args.providersPath);
     if (providersExists && args.strategy !== "merge" && args.strategy !== "overwrite") {
         throw (0, errors_1.cliError)("PROVIDERS_ALREADY_EXISTS", "providers.json already exists.", {
@@ -123,16 +137,12 @@ async function migrateCodex(args) {
         files: [
             { absolutePath: args.providersPath, relativePath: "providers.json" },
             { absolutePath: args.configPath, relativePath: "config.toml" },
-            { absolutePath: args.authPath, relativePath: "auth.json" },
         ],
         mutate: () => {
             // migrate currently preserves config structure and only asserts that the file remains writable inside the mutation flow.
             const configPlan = (0, config_repo_1.createConfigMutationPlan)(document, {});
             (0, providers_repo_1.writeProvidersFile)(args.providersPath, finalProviders);
             (0, config_repo_1.applyConfigMutation)(args.configPath, document, configPlan);
-            const activeProviderName = (0, config_repo_1.resolveActiveProviderName)(document, finalProviders);
-            const existingAuth = (0, auth_repo_1.readAuthFileIfExists)(args.authPath);
-            (0, auth_repo_1.writeAuthFile)(args.authPath, finalProviders.providers[activeProviderName], existingAuth ?? undefined);
             return {
                 codexDir: args.codexDir,
                 strategy: args.strategy,

package/dist/app/show-config.js

@@ -31,11 +31,7 @@ function showConfig(args) {
             selectedProfile,
             profiles: profiles.map((profile) => ({
                 ...profile,
-                managedProviderEnvKeys: (0, providers_1.findProvidersByProfile)(providers, profile.name).map((providerName) => ({
-                    providerName,
-                    envKey: providers.providers[providerName].envKey,
-                    matchesRuntime: providers.providers[providerName].envKey === profile.envKey,
-                })),
+                linkedProviderNames: (0, providers_1.findProvidersByProfile)(providers, profile.name),
             })),
         },
     };

package/dist/app/switch-provider.js

@@ -4,14 +4,14 @@ exports.switchProvider = switchProvider;
 const errors_1 = require("../domain/errors");
 const providers_1 = require("../domain/providers");
 const config_repo_1 = require("../storage/config-repo");
-const providers_repo_1 = require("../storage/providers-repo");
 const auth_repo_1 = require("../storage/auth-repo");
+const providers_repo_1 = require("../storage/providers-repo");
 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");
 /**
- * Switches the active Codex profile and rewrites auth.json for the target provider.
+ * Switches the active Codex profile to the target provider.
  */
 async function switchProvider(args) {
     const providers = (0, providers_repo_1.readProvidersFile)(args.providersPath);
@@ -22,15 +22,6 @@ async function switchProvider(args) {
         });
     }
     const document = (0, config_repo_1.ensureProfileExists)(args.configPath, provider.profile, args.providerName);
-    const envKey = (0, config_repo_1.requireRuntimeEnvKey)(document, provider.profile);
-    if (provider.envKey !== envKey) {
-        throw (0, errors_1.cliError)("PROVIDER_ENV_KEY_MISMATCH", `Provider "${args.providerName}" envKey does not match runtime env_key.`, {
-            provider: args.providerName,
-            profile: provider.profile,
-            providerEnvKey: provider.envKey,
-            runtimeEnvKey: envKey,
-        });
-    }
     if ((0, providers_1.isCopilotBridgeProvider)(provider)) {
         const installStatus = (0, copilot_installer_1.probeCopilotSdkInstall)();
         if (!installStatus.installed) {
@@ -41,6 +32,16 @@ async function switchProvider(args) {
         }
         await (0, copilot_adapter_1.readCopilotAuthState)();
         const bridge = await (0, copilot_bridge_1.ensureCopilotBridge)(args.providerName, provider);
+        const nextProvider = bridge.portChanged
+            ? (0, providers_1.cleanProviderRecord)({
+                ...provider,
+                baseUrl: bridge.baseUrl,
+                runtime: {
+                    ...provider.runtime,
+                    bridgePort: bridge.port,
+                },
+            })
+            : provider;
         try {
             return (0, run_mutation_1.runMutation)({
                 codexDir: args.codexDir,
@@ -48,20 +49,34 @@ async function switchProvider(args) {
                 latestBackupPath: args.latestBackupPath,
                 operation: "switch",
                 files: [
+                    { absolutePath: args.providersPath, relativePath: "providers.json" },
                     { absolutePath: args.configPath, relativePath: "config.toml" },
-                    { absolutePath: args.authPath, relativePath: "auth.json" },
                 ],
                 mutate: () => {
                     const configPlan = (0, config_repo_1.createConfigMutationPlan)(document, {
                         setActiveProfile: provider.profile,
+                        upsertModelProviders: bridge.portChanged
+                            ? {
+                                [provider.profile]: {
+                                    baseUrl: (0, providers_1.buildCopilotBridgeBaseUrl)(nextProvider.runtime),
+                                },
+                            }
+                            : undefined,
                     });
+                    if (bridge.portChanged) {
+                        (0, providers_repo_1.writeProvidersFile)(args.providersPath, {
+                            providers: {
+                                ...providers.providers,
+                                [args.providerName]: nextProvider,
+                            },
+                        });
+                    }
                     (0, config_repo_1.applyConfigMutation)(args.configPath, document, configPlan);
-                    const existingAuth = (0, auth_repo_1.readAuthFileIfExists)(args.authPath);
-                    (0, auth_repo_1.writeAuthFile)(args.authPath, provider, existingAuth ?? undefined);
                     return {
                         provider: args.providerName,
-                        profile: provider.profile,
-                        envKey: provider.envKey,
+                        profile: nextProvider.profile,
+                        portChanged: bridge.portChanged,
+                        bridgePort: bridge.port,
                     };
                 },
             });
@@ -79,20 +94,18 @@ async function switchProvider(args) {
         latestBackupPath: args.latestBackupPath,
         operation: "switch",
         files: [
-            { absolutePath: args.configPath, relativePath: "config.toml" },
             { absolutePath: args.authPath, relativePath: "auth.json" },
+            { absolutePath: args.configPath, relativePath: "config.toml" },
         ],
         mutate: () => {
             const configPlan = (0, config_repo_1.createConfigMutationPlan)(document, {
                 setActiveProfile: provider.profile,
             });
             (0, config_repo_1.applyConfigMutation)(args.configPath, document, configPlan);
-            const existingAuth = (0, auth_repo_1.readAuthFileIfExists)(args.authPath);
-            (0, auth_repo_1.writeAuthFile)(args.authPath, provider, existingAuth ?? undefined);
+            (0, auth_repo_1.writeOpenAiApiKeyAuth)(args.authPath, provider.apiKey);
             return {
                 provider: args.providerName,
                 profile: provider.profile,
-                envKey: provider.envKey,
             };
         },
     });

package/dist/cli/output.js

@@ -90,8 +90,7 @@ function renderHumanSuccess(command, data, warnings) {
                         ? ` tags=${provider.tags.join(",")}`
                         : "";
                     const note = provider.note ? ` note=${provider.note}` : "";
-                    const envKey = provider.envKey ? ` envKey=${provider.envKey}` : "";
-                    lines.push(`${provider.name} -> ${provider.profile}${envKey}${tags}${note}`);
+                    lines.push(`${provider.name} -> ${provider.profile}${tags}${note}`);
                 }
             }
             break;
@@ -101,7 +100,6 @@ function renderHumanSuccess(command, data, warnings) {
             lines.push(`Provider: ${String(data?.providerName ?? "")}`);
             lines.push(`profile: ${String(provider.profile ?? "")}`);
             lines.push(`apiKey: ${String(provider.apiKey ?? "")}`);
-            lines.push(`envKey: ${String(provider.envKey ?? "")}`);
             if (provider.baseUrl) {
                 lines.push(`baseUrl: ${String(provider.baseUrl)}`);
             }
@@ -125,14 +123,15 @@ function renderHumanSuccess(command, data, warnings) {
             lines.push(`activeProviderResolvable: ${String(data?.activeProviderResolvable ?? false)}`);
             const auth = data?.auth ?? {};
             lines.push(`authExists: ${String(auth.exists ?? false)}`);
-            lines.push(`authManagedKeys: ${Array.isArray(auth.managedSecretKeys) ? auth.managedSecretKeys.join(",") : ""}`);
+            lines.push(`authValid: ${String(auth.valid ?? false)}`);
+            lines.push(`authMode: ${String(auth.authMode ?? "")}`);
             lines.push(`issues: ${Array.isArray(data?.issues) ? (data?.issues).length : 0}`);
             break;
         case "config-show": {
             lines.push(`activeProfile: ${String(data?.activeProfile ?? "")}`);
             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 ?? "")} envKey=${String(profile.envKey ?? "")}`);
+                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 ?? "")}`);
             }
             break;
         }
@@ -145,7 +144,6 @@ function renderHumanSuccess(command, data, warnings) {
         }
         case "switch":
             lines.push(`Switched to provider ${String(data?.provider ?? "")} using profile ${String(data?.profile ?? "")}.`);
-            lines.push(`envKey: ${String(data?.envKey ?? "")}`);
             lines.push(`Backup: ${String(data?.backupPath ?? "")}`);
             break;
         case "import":

package/dist/cli.js

@@ -9,7 +9,7 @@ const args_1 = require("./commands/args");
 const help_1 = require("./commands/help");
 const errors_1 = require("./domain/errors");
 const output_1 = require("./cli/output");
-const VERSION = "0.0.8";
+const VERSION = require("../package.json").version ?? "0.0.0";
 /**
  * Prints the command help text to stdout.
  */