@minniexcode/codex-switch 0.0.10 → 0.0.11

package/dist/app/bridge.js

@@ -22,13 +22,14 @@ async function startBridge(args) {
         requestedProviderName: args.providerName ?? null,
         providers,
         configPath: args.configPath,
+        runtimeDir: args.runtimeDir,
         runtime: args.runtime,
         json: args.json,
         commandName: "start",
         preferRuntimeState: false,
     });
-    await requireBridgeRuntimeReadiness();
-    const bridge = await (0, copilot_bridge_1.ensureCopilotBridge)(target.providerName, target.provider);
+    await requireBridgeRuntimeReadiness(args.runtimesDir);
+    const bridge = await (0, copilot_bridge_1.ensureCopilotBridge)(target.providerName, target.provider, args.runtimeDir);
     const nextProvider = bridge.portChanged ? rewriteBridgeProviderPort(target.provider, bridge.port) : target.provider;
     if (bridge.portChanged) {
         try {
@@ -43,7 +44,7 @@ async function startBridge(args) {
         }
         catch (error) {
             if (!bridge.reused) {
-                (0, copilot_bridge_1.stopCopilotBridge)();
+                (0, copilot_bridge_1.stopCopilotBridge)(args.runtimeDir);
             }
             throw error;
         }
@@ -66,7 +67,7 @@ async function startBridge(args) {
  */
 async function stopBridge(args) {
     const providers = (0, providers_repo_1.readProvidersFile)(args.providersPath);
-    const state = (0, runtime_state_repo_1.readCopilotBridgeState)();
+    const state = (0, runtime_state_repo_1.readCopilotBridgeState)(args.runtimeDir);
     if (!state && !args.providerName) {
         return {
             data: {
@@ -90,6 +91,7 @@ async function stopBridge(args) {
         requestedProviderName: args.providerName ?? null,
         providers,
         configPath: args.configPath,
+        runtimeDir: args.runtimeDir,
         runtime: args.runtime,
         json: args.json,
         commandName: "stop",
@@ -101,7 +103,7 @@ async function stopBridge(args) {
             requestedProvider: args.providerName,
         });
     }
-    (0, copilot_bridge_1.stopCopilotBridge)();
+    (0, copilot_bridge_1.stopCopilotBridge)(args.runtimeDir);
     return {
         data: {
             provider: target.providerName,
@@ -115,18 +117,19 @@ async function stopBridge(args) {
  */
 async function statusBridge(args) {
     const providers = (0, providers_repo_1.readProvidersFile)(args.providersPath);
-    const state = (0, runtime_state_repo_1.readCopilotBridgeState)();
+    const state = (0, runtime_state_repo_1.readCopilotBridgeState)(args.runtimeDir);
     const target = await resolveBridgeTarget({
         requestedProviderName: args.providerName ?? null,
         providers,
         configPath: args.configPath,
+        runtimeDir: args.runtimeDir,
         runtime: args.runtime,
         json: args.json,
         commandName: "status",
         preferRuntimeState: true,
     });
     const provider = target.provider;
-    const runtimeStatus = await (0, copilot_bridge_1.probeCopilotBridgeRuntime)(provider);
+    const runtimeStatus = await (0, copilot_bridge_1.probeCopilotBridgeRuntime)(provider, state, args.runtimeDir);
     const expectedBaseUrl = (0, providers_1.buildCopilotBridgeBaseUrl)(provider.runtime);
     if (args.providerName && state?.provider && state.provider !== args.providerName) {
         throw (0, errors_1.cliError)("BRIDGE_PROVIDER_MISMATCH", `Bridge runtime state belongs to "${state.provider}" not "${args.providerName}".`, {
@@ -154,7 +157,7 @@ async function resolveBridgeTarget(args) {
         return resolveNamedBridgeProvider(args.providers, args.requestedProviderName);
     }
     if (args.preferRuntimeState) {
-        const runtimeState = (0, runtime_state_repo_1.readCopilotBridgeState)();
+        const runtimeState = (0, runtime_state_repo_1.readCopilotBridgeState)(args.runtimeDir);
         if (runtimeState?.provider && args.providers.providers[runtimeState.provider]) {
             return resolveNamedBridgeProvider(args.providers, runtimeState.provider);
         }
@@ -238,15 +241,15 @@ async function promptForCopilotBridgeSelection(runtime, targets, commandName) {
 /**
  * Verifies that the local Copilot bridge prerequisites are available before startup.
  */
-async function requireBridgeRuntimeReadiness() {
-    const installStatus = (0, copilot_installer_1.probeCopilotSdkInstall)();
+async function requireBridgeRuntimeReadiness(runtimesDir) {
+    const installStatus = (0, copilot_installer_1.probeCopilotSdkInstall)(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)();
+    await (0, copilot_adapter_1.readCopilotAuthState)(runtimesDir);
 }
 /**
  * Rewrites one Copilot bridge provider record with a recovered runtime port.
@@ -281,9 +284,7 @@ function persistRecoveredBridgePort(args) {
         const document = (0, config_repo_1.readStructuredConfig)(args.configPath);
         const configPlan = (0, config_repo_1.createConfigMutationPlan)(document, {
             upsertModelProviders: {
-                [args.provider.profile]: {
-                    baseUrl: (0, providers_1.buildCopilotBridgeBaseUrl)(args.provider.runtime),
-                },
+                [args.provider.profile]: (0, providers_1.buildCopilotModelProviderProjection)(args.provider.runtime),
             },
         });
         (0, config_repo_1.applyConfigMutation)(args.configPath, document, configPlan);

package/dist/app/edit-provider.js

@@ -109,7 +109,7 @@ function editProvider(args) {
         switchToProfile: args.switchToProfile ?? null,
     });
     return (0, run_mutation_1.runMutation)({
-        codexDir: args.codexDir,
+        lockPath: args.lockPath,
         backupsDir: args.backupsDir,
         latestBackupPath: args.latestBackupPath,
         operation: "edit",

package/dist/app/get-status.js

@@ -48,7 +48,7 @@ const runtime_state_repo_1 = require("../storage/runtime-state-repo");
 /**
  * Reports the current on-disk runtime state and how it maps back to managed providers.
  */
-async function getStatus(codexDir, configPath, providersPath, authPath) {
+async function getStatus(codexDir, configPath, providersPath, authPath, options) {
     const configExists = fs.existsSync(configPath);
     const providersExists = fs.existsSync(providersPath);
     let currentProfile = null;
@@ -69,8 +69,8 @@ async function getStatus(codexDir, configPath, providersPath, authPath) {
     const liveState = (0, runtime_state_1.inspectLiveStateDrift)(currentProfile, providers);
     const activeProviderCandidates = currentProfile && providers ? (0, providers_1.findProvidersByProfile)(providers, currentProfile) : [];
     const activeProvider = activeProviderCandidates.length === 1 && providers ? providers.providers[activeProviderCandidates[0]] : null;
-    const copilotInstall = (0, copilot_installer_1.probeCopilotSdkInstall)();
-    const runtimeStateInspection = (0, runtime_state_repo_1.inspectCopilotBridgeState)();
+    const copilotInstall = (0, copilot_installer_1.probeCopilotSdkInstall)(options?.runtimesDir);
+    const runtimeStateInspection = (0, runtime_state_repo_1.inspectCopilotBridgeState)(options?.runtimeDir);
     const runtimeState = runtimeStateInspection.state;
     const runtimeStateProvider = runtimeState && providers ? providers.providers[runtimeState.provider] ?? null : null;
     const bridgeProbeTarget = activeProvider && (0, providers_1.isCopilotBridgeProvider)(activeProvider)
@@ -86,7 +86,7 @@ async function getStatus(codexDir, configPath, providersPath, authPath) {
             cause: runtimeStateInspection.parseError ?? "Failed to parse Copilot bridge runtime state.",
         }
         : bridgeProbeTarget
-            ? await (0, copilot_bridge_1.probeCopilotBridgeRuntime)(bridgeProbeTarget, runtimeState)
+            ? await (0, copilot_bridge_1.probeCopilotBridgeRuntime)(bridgeProbeTarget, runtimeState, options?.runtimeDir)
             : runtimeState
                 ? {
                     ok: false,
@@ -97,7 +97,7 @@ async function getStatus(codexDir, configPath, providersPath, authPath) {
                 }
                 : null;
     const copilotAuth = activeProvider && (0, providers_1.isCopilotBridgeProvider)(activeProvider)
-        ? await (0, copilot_adapter_1.readCopilotAuthState)().catch((error) => ({
+        ? await (0, copilot_adapter_1.readCopilotAuthState)(options?.runtimesDir).catch((error) => ({
             ready: false,
             source: "official-sdk",
             mode: "session",
@@ -115,7 +115,14 @@ async function getStatus(codexDir, configPath, providersPath, authPath) {
         warnings,
         data: {
             codexDir,
-            storage: (0, runtime_state_1.getStorageRoles)(),
+            storage: (0, runtime_state_1.getStorageRoles)({
+                codexDir,
+                providersPath,
+                configPath,
+                authPath,
+                runtimeDir: options?.runtimeDir,
+                runtimesDir: options?.runtimesDir,
+            }),
             configExists,
             providersExists,
             currentProfile,

package/dist/app/import-providers.js

@@ -62,7 +62,7 @@ function importProviders(args) {
     (0, fs_utils_1.ensureDir)(args.codexDir);
     const document = (0, config_repo_1.readStructuredConfig)(args.configPath);
     return (0, run_mutation_1.runMutation)({
-        codexDir: args.codexDir,
+        lockPath: args.lockPath,
         backupsDir: args.backupsDir,
         latestBackupPath: args.latestBackupPath,
         operation: "import",

package/dist/app/init-codex.js

@@ -35,34 +35,33 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initCodex = initCodex;
 const fs = __importStar(require("node:fs"));
-const errors_1 = require("../domain/errors");
 const fs_utils_1 = require("../storage/fs-utils");
 const providers_repo_1 = require("../storage/providers-repo");
+const tool_config_repo_1 = require("../storage/tool-config-repo");
 /**
- * Initializes a Codex directory for managed providers.json usage without requiring live Codex state.
+ * Initializes the codex-switch tool home without requiring target Codex runtime files.
  */
 function initCodex(args) {
-    const codexDirExists = fs.existsSync(args.codexDir);
-    if (!codexDirExists && !args.createCodexDir) {
-        throw (0, errors_1.cliError)("CODEX_DIR_NOT_FOUND", "The requested Codex directory does not exist.", {
-            codexDir: args.codexDir,
-        });
-    }
-    if (!codexDirExists) {
-        (0, fs_utils_1.ensureDir)(args.codexDir);
+    const toolHomeExists = fs.existsSync(args.toolHomeDir);
+    if (!toolHomeExists) {
+        (0, fs_utils_1.ensureDir)(args.toolHomeDir);
     }
+    const toolConfigExists = fs.existsSync(args.toolConfigPath);
+    const ensuredConfig = (0, tool_config_repo_1.ensureToolConfig)(args.toolConfigPath, args.version, args.defaultCodexDir ?? "");
     const providersExists = fs.existsSync(args.providersPath);
     if (!providersExists) {
         (0, providers_repo_1.writeProvidersFile)(args.providersPath, { providers: {} });
     }
     return {
         data: {
-            codexDir: args.codexDir,
-            createdCodexDir: !codexDirExists,
+            toolHomeDir: args.toolHomeDir,
+            toolConfigPath: args.toolConfigPath,
+            providersPath: args.providersPath,
+            createdToolHomeDir: !toolHomeExists,
+            createdToolConfigFile: ensuredConfig.created && !toolConfigExists,
             createdProvidersFile: !providersExists,
+            toolConfigAlreadyExisted: toolConfigExists,
             providersAlreadyExisted: providersExists,
-            configExists: fs.existsSync(args.configPath),
-            authExists: fs.existsSync(args.authPath),
         },
     };
 }

package/dist/app/remove-provider.js

@@ -34,7 +34,7 @@ function removeProvider(args) {
         switchToProfile: args.switchToProfile ?? null,
     });
     return (0, run_mutation_1.runMutation)({
-        codexDir: args.codexDir,
+        lockPath: args.lockPath,
         backupsDir: args.backupsDir,
         latestBackupPath: args.latestBackupPath,
         operation: "remove",

package/dist/app/run-doctor.js

@@ -103,7 +103,7 @@ async function runDoctor(args) {
         }
     }
     const authState = (0, auth_repo_1.readAuthFileState)(args.authPath);
-    const runtimeStateInspection = (0, runtime_state_repo_1.inspectCopilotBridgeState)();
+    const runtimeStateInspection = (0, runtime_state_repo_1.inspectCopilotBridgeState)(args.runtimeDir);
     const runtimeState = runtimeStateInspection.state;
     if (authState.exists && !authState.valid) {
         issues.push({
@@ -123,7 +123,7 @@ async function runDoctor(args) {
         if (matches.length === 1) {
             const activeProvider = providers.providers[matches[0]];
             if ((0, providers_1.isCopilotBridgeProvider)(activeProvider)) {
-                const installStatus = (0, copilot_installer_1.probeCopilotSdkInstall)();
+                const installStatus = (0, copilot_installer_1.probeCopilotSdkInstall)(args.runtimesDir);
                 if (!installStatus.installed) {
                     issues.push({
                         code: "COPILOT_SDK_MISSING",
@@ -133,7 +133,7 @@ async function runDoctor(args) {
                     });
                 }
                 try {
-                    await (0, copilot_adapter_1.readCopilotAuthState)();
+                    await (0, copilot_adapter_1.readCopilotAuthState)(args.runtimesDir);
                 }
                 catch (error) {
                     const normalized = (0, errors_1.normalizeError)(error);
@@ -143,7 +143,7 @@ async function runDoctor(args) {
                         ...(normalized.details ?? {}),
                     });
                 }
-                const bridge = await (0, copilot_bridge_1.probeCopilotBridgeRuntime)(activeProvider, runtimeState);
+                const bridge = await (0, copilot_bridge_1.probeCopilotBridgeRuntime)(activeProvider, runtimeState, args.runtimeDir);
                 if (!bridge.ok) {
                     issues.push({
                         code: mapBridgeDiagnosticCode(bridge.cause),
@@ -198,7 +198,14 @@ async function runDoctor(args) {
             healthy: issues.length === 0,
             issues,
             codexDir: args.codexDir,
-            storage: (0, runtime_state_1.getStorageRoles)(),
+            storage: (0, runtime_state_1.getStorageRoles)({
+                codexDir: args.codexDir,
+                providersPath: args.providersPath,
+                configPath: args.configPath,
+                authPath: args.authPath,
+                runtimeDir: args.runtimeDir,
+                runtimesDir: args.runtimesDir,
+            }),
             liveState: drift,
             auth: authState,
         },

package/dist/app/run-mutation.js

@@ -8,8 +8,9 @@ const lock_repo_1 = require("../storage/lock-repo");
  * Runs a write operation under a lock with automatic backup and rollback handling.
  */
 function runMutation(args) {
-    return (0, lock_repo_1.withCodexLock)(args.codexDir, args.operation, () => {
-        const backup = (0, backup_repo_1.createBackup)(args.codexDir, args.backupsDir, args.operation, args.files);
+    const lockPath = args.lockPath ?? require("node:path").join(args.codexDir ?? process.cwd(), ".codex-switch.lock");
+    return (0, lock_repo_1.withCodexLock)(lockPath, args.operation, () => {
+        const backup = (0, backup_repo_1.createBackup)(args.backupsDir, args.operation, args.files);
         try {
             const data = args.mutate({ backup });
             // Record the successful backup only after the mutation completes.

package/dist/app/setup-codex.js

@@ -130,7 +130,7 @@ 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",
@@ -163,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/switch-provider.js

@@ -23,15 +23,15 @@ async function switchProvider(args) {
     }
     const document = (0, config_repo_1.ensureProfileExists)(args.configPath, provider.profile, args.providerName);
     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,
@@ -44,24 +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.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),
-                                },
-                            }
-                            : undefined,
+                        upsertModelProviders: {
+                            [provider.profile]: (0, providers_1.buildCopilotModelProviderProjection)(nextProvider.runtime),
+                        },
                     });
                     if (bridge.portChanged) {
                         (0, providers_repo_1.writeProvidersFile)(args.providersPath, {
@@ -72,6 +69,7 @@ async function switchProvider(args) {
                         });
                     }
                     (0, config_repo_1.applyConfigMutation)(args.configPath, document, configPlan);
+                    (0, auth_repo_1.writeOpenAiApiKeyAuth)(args.authPath, provider.apiKey);
                     return {
                         provider: args.providerName,
                         profile: nextProvider.profile,
@@ -83,13 +81,13 @@ 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",

package/dist/cli.js

@@ -1,10 +1,42 @@
 #!/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");
@@ -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);
 }