@minniexcode/codex-switch 0.0.9 → 0.0.11

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.", {
@@ -116,23 +130,19 @@ async function migrateCodex(args) {
     };
     const finalProviders = args.strategy === "merge" ? (0, providers_repo_1.mergeProviders)(currentProviders, nextProviders) : nextProviders;
     const result = (0, run_mutation_1.runMutation)({
-        codexDir: args.codexDir,
+        lockPath: args.lockPath,
         backupsDir: args.backupsDir,
         latestBackupPath: args.latestBackupPath,
         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,
@@ -153,6 +163,8 @@ async function migrateCodex(args) {
         configPath: args.configPath,
         providersPath: args.providersPath,
         authPath: args.authPath,
+        runtimeDir: args.runtimeDir,
+        runtimesDir: args.runtimesDir,
     });
     return {
         data: {

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,25 +22,16 @@ 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)();
+        const installStatus = (0, copilot_installer_1.probeCopilotSdkInstall)(args.runtimesDir);
         if (!installStatus.installed) {
             throw (0, errors_1.cliError)("COPILOT_SDK_MISSING", "The optional Copilot SDK runtime is not installed.", {
                 installDir: installStatus.installDir,
                 packageName: installStatus.packageName,
             });
         }
-        await (0, copilot_adapter_1.readCopilotAuthState)();
-        const bridge = await (0, copilot_bridge_1.ensureCopilotBridge)(args.providerName, provider);
+        await (0, copilot_adapter_1.readCopilotAuthState)(args.runtimesDir);
+        const bridge = await (0, copilot_bridge_1.ensureCopilotBridge)(args.providerName, provider, args.runtimeDir);
         const nextProvider = bridge.portChanged
             ? (0, providers_1.cleanProviderRecord)({
                 ...provider,
@@ -53,25 +44,21 @@ async function switchProvider(args) {
             : provider;
         try {
             return (0, run_mutation_1.runMutation)({
-                codexDir: args.codexDir,
+                lockPath: args.lockPath,
                 backupsDir: args.backupsDir,
                 latestBackupPath: args.latestBackupPath,
                 operation: "switch",
                 files: [
-                    { absolutePath: args.configPath, relativePath: "config.toml" },
                     { absolutePath: args.authPath, relativePath: "auth.json" },
+                    { absolutePath: args.providersPath, relativePath: "providers.json" },
+                    { absolutePath: args.configPath, relativePath: "config.toml" },
                 ],
                 mutate: () => {
                     const configPlan = (0, config_repo_1.createConfigMutationPlan)(document, {
                         setActiveProfile: provider.profile,
-                        upsertModelProviders: bridge.portChanged
-                            ? {
-                                [provider.profile]: {
-                                    baseUrl: (0, providers_1.buildCopilotBridgeBaseUrl)(nextProvider.runtime),
-                                    envKey,
-                                },
-                            }
-                            : undefined,
+                        upsertModelProviders: {
+                            [provider.profile]: (0, providers_1.buildCopilotModelProviderProjection)(nextProvider.runtime),
+                        },
                     });
                     if (bridge.portChanged) {
                         (0, providers_repo_1.writeProvidersFile)(args.providersPath, {
@@ -82,12 +69,10 @@ async function switchProvider(args) {
                         });
                     }
                     (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, nextProvider, existingAuth ?? undefined);
+                    (0, auth_repo_1.writeOpenAiApiKeyAuth)(args.authPath, provider.apiKey);
                     return {
                         provider: args.providerName,
                         profile: nextProvider.profile,
-                        envKey: nextProvider.envKey,
                         portChanged: bridge.portChanged,
                         bridgePort: bridge.port,
                     };
@@ -96,31 +81,29 @@ async function switchProvider(args) {
         }
         catch (error) {
             if (!bridge.reused) {
-                (0, copilot_bridge_1.stopCopilotBridge)();
+                (0, copilot_bridge_1.stopCopilotBridge)(args.runtimeDir);
             }
             throw error;
         }
     }
     return (0, run_mutation_1.runMutation)({
-        codexDir: args.codexDir,
+        lockPath: args.lockPath,
         backupsDir: args.backupsDir,
         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

@@ -1,15 +1,47 @@
 #!/usr/bin/env node
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.printHelp = printHelp;
 exports.printVersion = printVersion;
 exports.main = main;
-const dispatch_1 = require("./commands/dispatch");
 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.
  */
@@ -49,7 +81,7 @@ function main() {
         command: parsed.command,
         options: parsed.globalOptions,
     };
-    (0, dispatch_1.executeCommand)(ctx, parsed)
+    Promise.resolve().then(() => __importStar(require("./commands/dispatch"))).then(({ executeCommand }) => executeCommand(ctx, parsed))
         .then((result) => {
         (0, output_1.outputSuccess)(ctx, result);
     })

package/dist/commands/args.js

@@ -11,7 +11,7 @@ const registry_1 = require("./registry");
  */
 function parseArgs(argv) {
     let json = false;
-    let codexDir = (0, codex_paths_1.resolveCodexDir)();
+    let codexDir = null;
     let codexDirExplicit = false;
     const remaining = [];
     for (let index = 0; index < argv.length; index += 1) {
@@ -105,7 +105,7 @@ function defaultParsed(command, overrides) {
         positionals: [],
         globalOptions: {
             json: overrides?.json ?? false,
-            codexDir: overrides?.codexDir ?? (0, codex_paths_1.resolveCodexDir)(),
+            codexDir: overrides?.codexDir ?? null,
             codexDirExplicit: false,
         },
         commandOptions: new Map(),

package/dist/commands/dispatch.js

@@ -1,8 +1,44 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeCommand = executeCommand;
+const path = __importStar(require("node:path"));
 const errors_1 = require("../domain/errors");
 const prompt_1 = require("../interaction/prompt");
+const codex_paths_1 = require("../storage/codex-paths");
+const tool_config_repo_1 = require("../storage/tool-config-repo");
 const registry_1 = require("./registry");
 /**
  * Resolves the shared command definition and executes its registered handler.
@@ -12,5 +48,9 @@ async function executeCommand(ctx, parsed, runtime = (0, prompt_1.createPromptRu
     if (!definition) {
         throw (0, errors_1.cliError)("UNKNOWN_COMMAND", `Unknown command: ${ctx.command}`);
     }
+    const toolHomeDir = (0, codex_paths_1.resolveCodexSwitchHome)();
+    const toolConfigPath = path.join(toolHomeDir, "codex-switch.json");
+    const toolConfig = (0, tool_config_repo_1.readToolConfigIfExists)(toolConfigPath);
+    ctx.options.codexDir = (0, codex_paths_1.resolveCodexDir)(ctx.options.codexDir ?? undefined, toolConfig);
     return definition.handler(ctx, parsed, runtime);
 }