@minniexcode/codex-switch 0.0.5 → 0.0.7

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

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listConfigProfilesView = listConfigProfilesView;
 const config_1 = require("../domain/config");
-const config_repo_1 = require("../infra/config-repo");
-const providers_repo_1 = require("../infra/providers-repo");
+const config_repo_1 = require("../storage/config-repo");
+const providers_repo_1 = require("../storage/providers-repo");
 /**
  * Returns the lightweight config profile listing.
  */
@@ -16,6 +16,7 @@ function listConfigProfilesView(args) {
         isActive: profile.isActive,
         linkedProviders: profile.linkedProviders,
         model: profile.model,
+        modelProvider: profile.modelProvider,
         baseUrl: profile.baseUrl,
         source: profile.source,
     }));

package/dist/app/list-providers.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listProviders = listProviders;
-const providers_repo_1 = require("../infra/providers-repo");
+const providers_repo_1 = require("../storage/providers-repo");
 /**
  * Returns the sorted list of configured providers for display.
  */
@@ -11,6 +11,7 @@ function listProviders(providersPath) {
     const items = names.map((name) => ({
         name,
         profile: providers.providers[name].profile,
+        envKey: providers.providers[name].envKey,
         note: providers.providers[name].note ?? null,
         tags: providers.providers[name].tags ?? [],
     }));

package/dist/app/remove-provider.js

@@ -3,8 +3,8 @@ 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("../infra/config-repo");
-const providers_repo_1 = require("../infra/providers-repo");
+const config_repo_1 = require("../storage/config-repo");
+const providers_repo_1 = require("../storage/providers-repo");
 const run_mutation_1 = require("./run-mutation");
 /**
  * Removes a provider from the managed providers registry.

package/dist/app/rollback-backup.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rollbackBackup = rollbackBackup;
 const errors_1 = require("../domain/errors");
-const backup_repo_1 = require("../infra/backup-repo");
+const backup_repo_1 = require("../storage/backup-repo");
 /**
  * Restores either the latest backup or a specific historical backup by id.
  */

package/dist/app/rollback-latest.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rollbackLatest = rollbackLatest;
 const errors_1 = require("../domain/errors");
-const backup_repo_1 = require("../infra/backup-repo");
+const backup_repo_1 = require("../storage/backup-repo");
 /**
  * Restores the most recent mutation backup recorded by codex-switch.
  */

package/dist/app/run-doctor.js

@@ -37,10 +37,12 @@ exports.runDoctor = runDoctor;
 const fs = __importStar(require("node:fs"));
 const config_1 = require("../domain/config");
 const runtime_state_1 = require("../domain/runtime-state");
-const codex_cli_1 = require("../infra/codex-cli");
-const config_repo_1 = require("../infra/config-repo");
-const providers_repo_1 = require("../infra/providers-repo");
+const config_repo_1 = require("../storage/config-repo");
+const providers_repo_1 = require("../storage/providers-repo");
 const errors_1 = require("../domain/errors");
+const codex_probe_1 = require("../runtime/codex-probe");
+const auth_repo_1 = require("../storage/auth-repo");
+const providers_1 = require("../domain/providers");
 /**
  * Performs consistency checks across config.toml, providers.json, and the local Codex CLI.
  */
@@ -78,6 +80,7 @@ function runDoctor(args) {
         try {
             providers = (0, providers_repo_1.readProvidersFile)(args.providersPath);
             if (document) {
+                // Preserve domain issue codes while translating them into user-facing diagnostic messages.
                 for (const issue of (0, config_1.collectConfigConsistencyIssues)(document, providers)) {
                     issues.push({
                         ...issue,
@@ -95,12 +98,60 @@ function runDoctor(args) {
             });
         }
     }
+    const authState = (0, auth_repo_1.readManagedAuthState)(args.authPath);
+    if (authState.exists && !authState.valid) {
+        issues.push({
+            code: "AUTH_JSON_INVALID",
+            message: authState.parseError ?? "auth.json is invalid.",
+            file: args.authPath,
+        });
+    }
+    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],
+                });
+            }
+        }
+    }
+    // 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_cli_1.checkCodexAvailable)();
+    const codexCheck = (0, codex_probe_1.probeCodexRuntime)();
     if (!codexCheck.ok) {
+        const message = codexCheck.reason === "missing"
+            ? "codex CLI is not available on PATH."
+            : codexCheck.reason === "unsupported"
+                ? "codex CLI version is below the supported minimum."
+                : "codex CLI probe failed.";
         issues.push({
-            code: "CODEX_LOGIN_FAILED",
-            message: "codex CLI is not available.",
+            code: codexCheck.reason === "unsupported"
+                ? "CODEX_VERSION_UNSUPPORTED"
+                : codexCheck.reason === "missing"
+                    ? "CODEX_NOT_INSTALLED"
+                    : "CODEX_LOGIN_FAILED",
+            message,
             cause: codexCheck.cause,
         });
     }
@@ -111,10 +162,14 @@ function runDoctor(args) {
             codexDir: args.codexDir,
             storage: (0, runtime_state_1.getStorageRoles)(),
             liveState: drift,
+            auth: authState,
         },
         warnings: issues.length === 0 ? [] : [`doctor found ${issues.length} issue(s)`],
     };
 }
+/**
+ * Maps structured config consistency issues onto stable human-readable diagnostic text.
+ */
 function renderConfigIssueMessage(issue) {
     switch (issue.code) {
         case "ORPHANED_PROFILE_REFERENCE":
@@ -125,7 +180,29 @@ function renderConfigIssueMessage(issue) {
             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_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}".`;
+        case "MODEL_PROVIDER_SECTION_MISSING":
+            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.`;
+        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:
+            return String(issue.code ?? "UNKNOWN_ISSUE");
     }
 }

package/dist/app/run-mutation.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runMutation = runMutation;
 const errors_1 = require("../domain/errors");
-const backup_repo_1 = require("../infra/backup-repo");
-const lock_repo_1 = require("../infra/lock-repo");
+const backup_repo_1 = require("../storage/backup-repo");
+const lock_repo_1 = require("../storage/lock-repo");
 /**
  * Runs a write operation under a lock with automatic backup and rollback handling.
  */

package/dist/app/setup-codex.js

@@ -33,22 +33,23 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupCodex = setupCodex;
+exports.migrateCodex = migrateCodex;
 const fs = __importStar(require("node:fs"));
 const setup_1 = require("../domain/setup");
 const errors_1 = require("../domain/errors");
 const config_1 = require("../domain/config");
-const codex_cli_1 = require("../infra/codex-cli");
-const config_repo_1 = require("../infra/config-repo");
-const fs_utils_1 = require("../infra/fs-utils");
-const providers_repo_1 = require("../infra/providers-repo");
+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";
 /**
- * Bootstraps a managed providers.json from the existing Codex directory.
+ * Migrates unmanaged Codex config profiles into a managed providers.json registry.
  */
-function setupCodex(args) {
+function migrateCodex(args) {
     const available = (0, codex_cli_1.checkCodexAvailable)();
     if (!available.ok) {
         throw (0, errors_1.cliError)("CODEX_NOT_INSTALLED", "codex CLI is not available.", {
@@ -70,8 +71,9 @@ function setupCodex(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.baseUrl)
+        .filter((view) => view.source === "unmanaged" && view.model && view.modelProvider === view.name && view.baseUrl && view.envKey)
         .map((view) => view.name)
         .sort();
     if (profileViews.length === 0) {
@@ -81,20 +83,20 @@ function setupCodex(args) {
     }
     const invalidAdoptProfiles = args.adoptProfiles.filter((profile) => !adoptableProfiles.includes(profile));
     if (invalidAdoptProfiles.length > 0) {
-        throw (0, errors_1.cliError)("INVALID_ARGUMENT", "setup only adopts unmanaged profiles that already contain model and base_url.", {
+        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.", {
             invalidProfiles: invalidAdoptProfiles.sort(),
             adoptableProfiles,
         });
     }
     if (args.adoptProfiles.length === 0) {
-        throw (0, errors_1.cliError)("INVALID_ARGUMENT", "setup requires at least one explicit profile to adopt.", {
+        throw (0, errors_1.cliError)("INVALID_ARGUMENT", "migrate requires at least one explicit profile to adopt.", {
             adoptableProfiles,
         });
     }
     const drafts = (0, setup_1.buildSetupDrafts)(args.adoptProfiles, args.providerDetailsByProfile);
     const incompleteProfiles = (0, setup_1.findIncompleteSetupProfiles)(drafts);
     if (incompleteProfiles.length > 0) {
-        throw (0, errors_1.cliError)("INVALID_ARGUMENT", "setup requires complete provider data for every selected profile.", {
+        throw (0, errors_1.cliError)("INVALID_ARGUMENT", "migrate requires complete provider data for every selected profile.", {
             incompleteProfiles,
         });
     }
@@ -117,15 +119,20 @@ function setupCodex(args) {
         codexDir: args.codexDir,
         backupsDir: args.backupsDir,
         latestBackupPath: args.latestBackupPath,
-        operation: "setup",
+        operation: "migrate",
         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,
@@ -140,10 +147,12 @@ function setupCodex(args) {
             };
         },
     });
+    // Re-run doctor on the final state so migrate returns immediate post-migration diagnostics.
     const doctor = (0, run_doctor_1.runDoctor)({
         codexDir: args.codexDir,
         configPath: args.configPath,
         providersPath: args.providersPath,
+        authPath: args.authPath,
     });
     return {
         data: {

package/dist/app/show-config.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.showConfig = showConfig;
 const config_1 = require("../domain/config");
 const errors_1 = require("../domain/errors");
-const config_repo_1 = require("../infra/config-repo");
-const providers_repo_1 = require("../infra/providers-repo");
+const providers_1 = require("../domain/providers");
+const config_repo_1 = require("../storage/config-repo");
+const providers_repo_1 = require("../storage/providers-repo");
 /**
  * Returns the structured config view, optionally filtered to one profile.
  */
@@ -28,7 +29,14 @@ function showConfig(args) {
         data: {
             activeProfile: document.activeProfile,
             selectedProfile,
-            profiles,
+            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,
+                })),
+            })),
         },
     };
 }

package/dist/app/show-provider.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.showProvider = showProvider;
 const providers_1 = require("../domain/providers");
-const providers_repo_1 = require("../infra/providers-repo");
+const providers_repo_1 = require("../storage/providers-repo");
 /**
  * Returns a single provider record, with text-mode callers able to use a masked preview.
  */

package/dist/app/switch-provider.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.switchProvider = switchProvider;
 const errors_1 = require("../domain/errors");
-const config_repo_1 = require("../infra/config-repo");
-const codex_cli_1 = require("../infra/codex-cli");
-const providers_repo_1 = require("../infra/providers-repo");
+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 run_mutation_1 = require("./run-mutation");
 /**
- * Switches the active Codex profile and optionally refreshes the CLI login session.
+ * Switches the active Codex profile and rewrites auth.json for the target provider.
  */
 function switchProvider(args) {
     const providers = (0, providers_repo_1.readProvidersFile)(args.providersPath);
@@ -18,6 +18,15 @@ 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,
+        });
+    }
     return (0, run_mutation_1.runMutation)({
         codexDir: args.codexDir,
         backupsDir: args.backupsDir,
@@ -31,15 +40,13 @@ function switchProvider(args) {
             const configPlan = (0, config_repo_1.createConfigMutationPlan)(document, {
                 setActiveProfile: provider.profile,
             });
-            // Update the runtime profile first so any subsequent login is associated with the new target.
             (0, config_repo_1.applyConfigMutation)(args.configPath, document, configPlan);
-            if (!args.noLogin) {
-                (0, codex_cli_1.runCodexLogin)(provider.apiKey, args.codexDir);
-            }
+            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,
-                loginPerformed: !args.noLogin,
+                envKey: provider.envKey,
             };
         },
     });

package/dist/cli/add-interactive.js

@@ -1,108 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.COMMON_TAG_CHOICES = void 0;
-exports.collectAddInput = collectAddInput;
-exports.createNonInteractiveAddError = createNonInteractiveAddError;
-exports.promptTags = promptTags;
-exports.parseTags = parseTags;
-const errors_1 = require("../domain/errors");
-exports.COMMON_TAG_CHOICES = ["free", "paid", "daily", "backup"];
+exports.promptTags = exports.createNonInteractiveAddError = exports.COMMON_TAG_CHOICES = exports.collectAddInput = void 0;
 /**
- * Collects add command inputs interactively when required values are missing.
+ * Compatibility facade that re-exports interactive add helpers for older imports.
  */
-async function collectAddInput(runtime, defaults, providerExists) {
-    runtime.writeLine("Interactive add mode");
-    runtime.writeLine("Provide the missing required fields. Press Enter to skip optional fields.");
-    const providerName = defaults.providerName
-        ? normalizeRequiredValue(defaults.providerName)
-        : await promptProviderName(runtime, providerExists);
-    const profile = defaults.profile ? normalizeRequiredValue(defaults.profile) : await promptRequiredValue(runtime, "Profile");
-    const apiKey = defaults.apiKey
-        ? normalizeRequiredValue(defaults.apiKey)
-        : await promptConfirmedSecret(runtime, "API key", "Confirm API key");
-    const baseUrl = defaults.baseUrl ?? normalizeOptionalValue(await runtime.inputText("Base URL (optional)"));
-    const note = defaults.note ?? normalizeOptionalValue(await runtime.inputText("Note (optional)"));
-    const tags = defaults.tags.length > 0 ? defaults.tags : await promptTags(runtime);
-    return {
-        providerName,
-        profile,
-        apiKey,
-        baseUrl,
-        note,
-        tags,
-    };
-}
-/**
- * Throws a consistent error when interactive add is unavailable.
- */
-function createNonInteractiveAddError() {
-    return (0, errors_1.cliError)("INVALID_ARGUMENT", "add requires <provider>, --profile, and --api-key when running without an interactive TTY.", {
-        suggestion: "Run in a terminal TTY or pass all required values explicitly.",
-    });
-}
-async function promptProviderName(runtime, providerExists) {
-    while (true) {
-        const providerName = await promptRequiredValue(runtime, "Provider name");
-        if (providerExists(providerName)) {
-            runtime.writeLine(`Provider "${providerName}" already exists. Choose a different name.`);
-            continue;
-        }
-        return providerName;
-    }
-}
-async function promptRequiredValue(runtime, label) {
-    while (true) {
-        const value = normalizeRequiredValue(await runtime.inputText(label));
-        if (value.length > 0) {
-            return value;
-        }
-        runtime.writeLine(`${label} is required.`);
-    }
-}
-async function promptConfirmedSecret(runtime, label, confirmationLabel) {
-    while (true) {
-        const first = normalizeRequiredValue(await runtime.inputSecret(label));
-        if (first.length === 0) {
-            runtime.writeLine(`${label} is required.`);
-            continue;
-        }
-        const second = normalizeRequiredValue(await runtime.inputSecret(confirmationLabel));
-        if (second.length === 0) {
-            runtime.writeLine(`${confirmationLabel} is required.`);
-            continue;
-        }
-        if (first !== second) {
-            runtime.writeLine("API key entries did not match. Try again.");
-            continue;
-        }
-        return first;
-    }
-}
-function normalizeRequiredValue(value) {
-    return value.trim();
-}
-function normalizeOptionalValue(value) {
-    const normalized = value.trim();
-    return normalized === "" ? null : normalized;
-}
-async function promptTags(runtime, defaults = []) {
-    const defaultPresetTags = defaults.filter(isCommonTag);
-    const defaultCustomTags = defaults.filter((tag) => !isCommonTag(tag));
-    const presetTags = await runtime.selectMany("Select tags (optional)", exports.COMMON_TAG_CHOICES.map((tag) => ({ value: tag, label: tag })), { defaultValues: defaultPresetTags });
-    const customTags = parseTags(await runtime.inputText("Custom tags (optional, comma-separated)", {
-        defaultValue: defaultCustomTags.join(", "),
-    }));
-    return dedupeTags([...presetTags, ...customTags]);
-}
-function parseTags(value) {
-    return dedupeTags(value
-        .split(",")
-        .map((tag) => tag.trim())
-        .filter((tag) => tag.length > 0));
-}
-function isCommonTag(tag) {
-    return exports.COMMON_TAG_CHOICES.includes(tag);
-}
-function dedupeTags(tags) {
-    return Array.from(new Set(tags));
-}
+var add_interactive_1 = require("../interaction/add-interactive");
+Object.defineProperty(exports, "collectAddInput", { enumerable: true, get: function () { return add_interactive_1.collectAddInput; } });
+Object.defineProperty(exports, "COMMON_TAG_CHOICES", { enumerable: true, get: function () { return add_interactive_1.COMMON_TAG_CHOICES; } });
+Object.defineProperty(exports, "createNonInteractiveAddError", { enumerable: true, get: function () { return add_interactive_1.createNonInteractiveAddError; } });
+Object.defineProperty(exports, "promptTags", { enumerable: true, get: function () { return add_interactive_1.promptTags; } });