@minniexcode/codex-switch 0.0.10 → 0.0.11

package/dist/domain/config.js

@@ -117,8 +117,15 @@ function parseStructuredConfig(configContent) {
                 name: modelProviderHeaderMatch[1],
                 sectionStart: line.start,
                 sectionEnd: configContent.length,
+                managedFieldInsertIndex: configContent.length,
                 baseUrlValueRange: null,
                 baseUrl: null,
+                nameValueRange: null,
+                providerName: null,
+                requiresOpenAiAuthValueRange: null,
+                requiresOpenAiAuth: null,
+                wireApiValueRange: null,
+                wireApi: null,
             };
             modelProviders.push(currentModelProvider);
             inRoot = false;
@@ -173,6 +180,30 @@ function parseStructuredConfig(configContent) {
                     end: line.start + baseUrlMatch.valueEnd,
                 };
             }
+            const nameMatch = matchKeyValueLine(line.content, "name");
+            if (nameMatch) {
+                currentModelProvider.providerName = nameMatch.value;
+                currentModelProvider.nameValueRange = {
+                    start: line.start + nameMatch.valueStart,
+                    end: line.start + nameMatch.valueEnd,
+                };
+            }
+            const requiresOpenAiAuthMatch = matchBooleanKeyValueLine(line.content, "requires_openai_auth");
+            if (requiresOpenAiAuthMatch) {
+                currentModelProvider.requiresOpenAiAuth = requiresOpenAiAuthMatch.value;
+                currentModelProvider.requiresOpenAiAuthValueRange = {
+                    start: line.start + requiresOpenAiAuthMatch.valueStart,
+                    end: line.start + requiresOpenAiAuthMatch.valueEnd,
+                };
+            }
+            const wireApiMatch = matchKeyValueLine(line.content, "wire_api");
+            if (wireApiMatch) {
+                currentModelProvider.wireApi = wireApiMatch.value;
+                currentModelProvider.wireApiValueRange = {
+                    start: line.start + wireApiMatch.valueStart,
+                    end: line.start + wireApiMatch.valueEnd,
+                };
+            }
         }
     }
     return {
@@ -184,7 +215,10 @@ function parseStructuredConfig(configContent) {
             ...profile,
             managedFieldInsertIndex: findManagedFieldInsertIndex(configContent, profile.sectionStart, profile.sectionEnd),
         })),
-        modelProviders,
+        modelProviders: modelProviders.map((provider) => ({
+            ...provider,
+            managedFieldInsertIndex: findManagedFieldInsertIndex(configContent, provider.sectionStart, provider.sectionEnd),
+        })),
     };
 }
 /**
@@ -445,6 +479,7 @@ function planConfigMutation(document, args) {
         const section = modelProviderSectionMap.get(profileName);
         if (!section) {
             const baseUrl = fields.baseUrl?.trim() ?? "";
+            const providerName = fields.name?.trim() ?? "";
             if (!baseUrl) {
                 throw (0, errors_1.cliError)("MANAGED_PROFILE_FIELDS_MISSING", `Model provider "${profileName}" requires base_url.`, {
                     profile: profileName,
@@ -457,11 +492,16 @@ function planConfigMutation(document, args) {
             const prefix = document.rawText.length > 0 && !document.rawText.endsWith(document.lineEnding)
                 ? document.lineEnding
                 : "";
+            const requiresOpenAiAuth = fields.requiresOpenAiAuth;
+            const wireApi = fields.wireApi?.trim() ?? "";
             operations.push({
                 kind: "insert-at",
                 index: document.rawText.length,
                 text: `${prefix}[model_providers.${profileName}]${document.lineEnding}` +
-                    `base_url = ${JSON.stringify(baseUrl)}${document.lineEnding}`,
+                    `base_url = ${JSON.stringify(baseUrl)}${document.lineEnding}` +
+                    (providerName ? `name = ${JSON.stringify(providerName)}${document.lineEnding}` : "") +
+                    (requiresOpenAiAuth !== undefined ? `requires_openai_auth = ${String(requiresOpenAiAuth)}${document.lineEnding}` : "") +
+                    (wireApi ? `wire_api = ${JSON.stringify(wireApi)}${document.lineEnding}` : ""),
             });
             createdModelProviderSections.push(profileName);
             continue;
@@ -545,11 +585,14 @@ function planSectionFieldMutation(document, section, fields, operations) {
     return updated;
 }
 /**
- * Plans base_url updates for one model_providers section.
+ * Plans managed field updates for one model_providers section.
  */
 function planModelProviderFieldMutation(section, fields, operations) {
     let updated = false;
     const baseUrlText = fields.baseUrl !== undefined ? JSON.stringify(fields.baseUrl) : null;
+    const nameText = fields.name !== undefined ? JSON.stringify(fields.name) : null;
+    const requiresOpenAiAuthText = fields.requiresOpenAiAuth !== undefined ? String(fields.requiresOpenAiAuth) : null;
+    const wireApiText = fields.wireApi !== undefined ? JSON.stringify(fields.wireApi) : null;
     const inserts = [];
     if (baseUrlText !== null && section.baseUrlValueRange) {
         if (section.baseUrl !== fields.baseUrl) {
@@ -564,14 +607,59 @@ function planModelProviderFieldMutation(section, fields, operations) {
     }
     else if (baseUrlText !== null) {
         inserts.push(`base_url = ${baseUrlText}`);
+        updated = true;
+    }
+    if (nameText !== null && section.nameValueRange) {
+        if (section.providerName !== fields.name) {
+            operations.push({
+                kind: "replace-range",
+                start: section.nameValueRange.start,
+                end: section.nameValueRange.end,
+                text: nameText,
+            });
+            updated = true;
+        }
+    }
+    else if (nameText !== null) {
+        inserts.push(`name = ${nameText}`);
+        updated = true;
+    }
+    if (requiresOpenAiAuthText !== null && section.requiresOpenAiAuthValueRange) {
+        if (section.requiresOpenAiAuth !== fields.requiresOpenAiAuth) {
+            operations.push({
+                kind: "replace-range",
+                start: section.requiresOpenAiAuthValueRange.start,
+                end: section.requiresOpenAiAuthValueRange.end,
+                text: requiresOpenAiAuthText,
+            });
+            updated = true;
+        }
+    }
+    else if (requiresOpenAiAuthText !== null) {
+        inserts.push(`requires_openai_auth = ${requiresOpenAiAuthText}`);
+        updated = true;
+    }
+    if (wireApiText !== null && section.wireApiValueRange) {
+        if (section.wireApi !== fields.wireApi) {
+            operations.push({
+                kind: "replace-range",
+                start: section.wireApiValueRange.start,
+                end: section.wireApiValueRange.end,
+                text: wireApiText,
+            });
+            updated = true;
+        }
+    }
+    else if (wireApiText !== null) {
+        inserts.push(`wire_api = ${wireApiText}`);
+        updated = true;
     }
     if (inserts.length > 0) {
         operations.push({
             kind: "insert-at",
-            index: section.sectionEnd,
+            index: section.managedFieldInsertIndex,
             text: `${inserts.join("\n")}\n`,
         });
-        updated = true;
     }
     return updated;
 }
@@ -616,6 +704,23 @@ function matchKeyValueLine(line, key) {
         valueEnd,
     };
 }
+function matchBooleanKeyValueLine(line, key) {
+    const match = line.match(new RegExp(`^\\s*${escapeRegExp(key)}\\s*=\\s*(true|false)\\s*(#.*)?$`));
+    if (!match || match.index === undefined) {
+        return null;
+    }
+    const value = match[1] === "true";
+    const valueStart = line.indexOf(match[1], match.index);
+    if (valueStart === -1) {
+        return null;
+    }
+    const valueEnd = valueStart + match[1].length;
+    return {
+        value,
+        valueStart,
+        valueEnd,
+    };
+}
 function findManagedFieldInsertIndex(rawText, sectionStart, sectionEnd) {
     const sectionText = rawText.slice(sectionStart, sectionEnd);
     const lines = splitWithOffsets(sectionText);

package/dist/domain/providers.js

@@ -9,6 +9,7 @@ exports.maskSecret = maskSecret;
 exports.isRuntimeBackedProvider = isRuntimeBackedProvider;
 exports.isCopilotBridgeProvider = isCopilotBridgeProvider;
 exports.buildCopilotBridgeBaseUrl = buildCopilotBridgeBaseUrl;
+exports.buildCopilotModelProviderProjection = buildCopilotModelProviderProjection;
 /**
  * Validates and normalizes unknown JSON into the providers.json domain model.
  */
@@ -150,6 +151,17 @@ function isCopilotBridgeProvider(provider) {
 function buildCopilotBridgeBaseUrl(runtime) {
     return `http://${runtime.bridgeHost}:${runtime.bridgePort}${runtime.bridgePath}`;
 }
+/**
+ * Builds the Codex-facing custom model_provider projection for the managed Copilot bridge.
+ */
+function buildCopilotModelProviderProjection(runtime) {
+    return {
+        baseUrl: buildCopilotBridgeBaseUrl(runtime),
+        name: "copilot",
+        requiresOpenAiAuth: true,
+        wireApi: "responses",
+    };
+}
 /**
  * Validates one runtime-backed provider block.
  */

package/dist/domain/runtime-state.js

@@ -1,16 +1,92 @@
 "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.getStorageRoles = getStorageRoles;
 exports.inspectLiveStateDrift = inspectLiveStateDrift;
+const path = __importStar(require("node:path"));
 /**
  * Returns the stable storage contract used by the CLI.
  */
-function getStorageRoles() {
+function getStorageRoles(args) {
+    const toolHomeDir = path.dirname(path.resolve(args.providersPath));
+    const backupsDir = path.join(toolHomeDir, "backups");
+    const runtimeDir = args.runtimeDir ? path.resolve(args.runtimeDir) : path.join(toolHomeDir, "runtime");
+    const runtimesDir = args.runtimesDir ? path.resolve(args.runtimesDir) : path.join(toolHomeDir, "runtimes");
     return {
-        managementSSOT: "providers.json",
-        runtimeMirrors: ["config.toml"],
-        authStateFile: "auth.json",
-        rollbackState: "backups/latest.json",
+        toolHome: {
+            root: toolHomeDir,
+            toolConfig: path.join(toolHomeDir, "codex-switch.json"),
+            providers: path.resolve(args.providersPath),
+            backupsDir,
+            latestBackup: path.join(backupsDir, "latest.json"),
+            runtimeStateDir: runtimeDir,
+            runtimeInstallDir: runtimesDir,
+        },
+        targetRuntime: {
+            root: path.resolve(args.codexDir),
+            config: path.resolve(args.configPath),
+            auth: path.resolve(args.authPath),
+        },
+        managementSSOT: {
+            scope: "toolHome",
+            path: path.resolve(args.providersPath),
+        },
+        runtimeMirrors: [
+            {
+                scope: "targetRuntime",
+                path: path.resolve(args.configPath),
+            },
+        ],
+        authStateFile: {
+            scope: "targetRuntime",
+            path: path.resolve(args.authPath),
+        },
+        rollbackState: {
+            scope: "toolHome",
+            path: path.join(backupsDir, "latest.json"),
+        },
+        runtimeState: {
+            scope: "toolHome",
+            path: runtimeDir,
+            managedBackup: false,
+        },
+        runtimeInstall: {
+            scope: "toolHome",
+            path: runtimesDir,
+            managedBackup: false,
+        },
     };
 }
 /**

package/dist/runtime/copilot-adapter.js

@@ -10,8 +10,8 @@ const copilot_installer_1 = require("./copilot-installer");
 /**
  * Probes whether the optional Copilot SDK runtime is installed and loadable.
  */
-function probeCopilotSdkRuntime() {
-    const status = (0, copilot_installer_1.probeCopilotSdkInstall)();
+function probeCopilotSdkRuntime(runtimesDir) {
+    const status = (0, copilot_installer_1.probeCopilotSdkInstall)(runtimesDir);
     if (!status.installed) {
         return {
             ok: false,
@@ -37,18 +37,18 @@ function probeCopilotSdkRuntime() {
 /**
  * Loads the lazily installed Copilot SDK and returns the module.
  */
-async function requireCopilotSdk() {
-    return (0, copilot_sdk_loader_1.loadCopilotSdk)();
+async function requireCopilotSdk(runtimesDir) {
+    return (0, copilot_sdk_loader_1.loadCopilotSdk)(runtimesDir);
 }
 /**
  * Probes whether the lazily installed Copilot SDK can create a usable session.
  */
-async function readCopilotAuthState() {
-    const runtime = probeCopilotSdkRuntime();
+async function readCopilotAuthState(runtimesDir) {
+    const runtime = probeCopilotSdkRuntime(runtimesDir);
     if (!runtime.ok) {
         throw (0, errors_1.cliError)("COPILOT_SDK_MISSING", "The optional Copilot SDK runtime is not installed.", runtime.details);
     }
-    const { client, session } = await createCopilotSession();
+    const { client, session } = await createCopilotSession(runtimesDir);
     await stopCopilotClient(client);
     return {
         ready: Boolean(session),
@@ -60,7 +60,7 @@ async function readCopilotAuthState() {
  * Executes a single chat-completions style request through the optional Copilot SDK when available.
  */
 async function sendCopilotChatCompletion(args) {
-    const { client, session, sdk } = await createCopilotSession();
+    const { client, session, sdk } = await createCopilotSession(args.runtimesDir);
     try {
         const sendAndWait = resolveCallable(session, "sendAndWait") ?? resolveCallable(sdk, "sendAndWait");
         if (!sendAndWait) {
@@ -106,8 +106,8 @@ async function sendCopilotChatCompletion(args) {
         await stopCopilotClient(client);
     }
 }
-async function createCopilotSession() {
-    const sdk = (await requireCopilotSdk());
+async function createCopilotSession(runtimesDir) {
+    const sdk = (await requireCopilotSdk(runtimesDir));
     const client = createCopilotClient(sdk);
     const createSession = resolveCallable(client ? client : null, "createSession") ?? resolveCallable(sdk, "createSession");
     if (!createSession) {
@@ -181,11 +181,11 @@ function resolveCallable(target, name) {
     }
     const direct = target[name];
     if (typeof direct === "function") {
-        return direct;
+        return direct.bind(target);
     }
     const nestedDefault = target.default;
     if (nestedDefault && typeof nestedDefault[name] === "function") {
-        return nestedDefault[name];
+        return nestedDefault[name].bind(nestedDefault);
     }
     return null;
 }