@minniexcode/codex-switch 0.0.5 → 0.0.7

package/dist/domain/config.js

@@ -41,6 +41,7 @@ exports.parseStructuredConfig = parseStructuredConfig;
 exports.buildManagedProfileViews = buildManagedProfileViews;
 exports.collectConfigConsistencyIssues = collectConfigConsistencyIssues;
 exports.validateManagedProfileCreation = validateManagedProfileCreation;
+exports.buildManagedProfileEnvKey = buildManagedProfileEnvKey;
 exports.planProfileLifecycleOutcome = planProfileLifecycleOutcome;
 exports.planConfigMutation = planConfigMutation;
 exports.applyPatchOperations = applyPatchOperations;
@@ -74,7 +75,9 @@ function parseStructuredConfig(configContent) {
     let activeProfile = null;
     let activeProfileRange = null;
     const profiles = [];
+    const modelProviders = [];
     let currentProfile = null;
+    let currentModelProvider = null;
     let inRoot = true;
     for (const line of lines) {
         const trimmed = line.content.trim();
@@ -83,6 +86,10 @@ function parseStructuredConfig(configContent) {
             if (currentProfile) {
                 currentProfile.sectionEnd = line.start;
             }
+            if (currentModelProvider) {
+                currentModelProvider.sectionEnd = line.start;
+                currentModelProvider = null;
+            }
             currentProfile = {
                 name: headerMatch[1],
                 headerStart: line.start,
@@ -90,19 +97,45 @@ function parseStructuredConfig(configContent) {
                 sectionEnd: configContent.length,
                 managedFieldInsertIndex: configContent.length,
                 modelValueRange: null,
-                baseUrlValueRange: null,
+                modelProviderValueRange: null,
                 model: null,
-                baseUrl: null,
+                modelProvider: null,
             };
             profiles.push(currentProfile);
             inRoot = false;
             continue;
         }
+        const modelProviderHeaderMatch = trimmed.match(/^\[model_providers\.([^\]]+)\]$/);
+        if (modelProviderHeaderMatch) {
+            if (currentProfile) {
+                currentProfile.sectionEnd = line.start;
+                currentProfile = null;
+            }
+            if (currentModelProvider) {
+                currentModelProvider.sectionEnd = line.start;
+            }
+            currentModelProvider = {
+                name: modelProviderHeaderMatch[1],
+                sectionStart: line.start,
+                sectionEnd: configContent.length,
+                baseUrlValueRange: null,
+                baseUrl: null,
+                envKeyValueRange: null,
+                envKey: null,
+            };
+            modelProviders.push(currentModelProvider);
+            inRoot = false;
+            continue;
+        }
         if (trimmed.startsWith("[") && trimmed.endsWith("]")) {
             if (currentProfile) {
                 currentProfile.sectionEnd = line.start;
                 currentProfile = null;
             }
+            if (currentModelProvider) {
+                currentModelProvider.sectionEnd = line.start;
+                currentModelProvider = null;
+            }
             inRoot = false;
             continue;
         }
@@ -125,14 +158,32 @@ function parseStructuredConfig(configContent) {
                     end: line.start + modelMatch.valueEnd,
                 };
             }
+            const modelProviderMatch = matchKeyValueLine(line.content, "model_provider");
+            if (modelProviderMatch) {
+                currentProfile.modelProvider = modelProviderMatch.value;
+                currentProfile.modelProviderValueRange = {
+                    start: line.start + modelProviderMatch.valueStart,
+                    end: line.start + modelProviderMatch.valueEnd,
+                };
+            }
+        }
+        if (currentModelProvider) {
             const baseUrlMatch = matchKeyValueLine(line.content, "base_url");
             if (baseUrlMatch) {
-                currentProfile.baseUrl = baseUrlMatch.value;
-                currentProfile.baseUrlValueRange = {
+                currentModelProvider.baseUrl = baseUrlMatch.value;
+                currentModelProvider.baseUrlValueRange = {
                     start: line.start + baseUrlMatch.valueStart,
                     end: line.start + baseUrlMatch.valueEnd,
                 };
             }
+            const envKeyMatch = matchKeyValueLine(line.content, "env_key");
+            if (envKeyMatch) {
+                currentModelProvider.envKey = envKeyMatch.value;
+                currentModelProvider.envKeyValueRange = {
+                    start: line.start + envKeyMatch.valueStart,
+                    end: line.start + envKeyMatch.valueEnd,
+                };
+            }
         }
     }
     return {
@@ -144,6 +195,7 @@ function parseStructuredConfig(configContent) {
             ...profile,
             managedFieldInsertIndex: findManagedFieldInsertIndex(configContent, profile.sectionStart, profile.sectionEnd),
         })),
+        modelProviders,
     };
 }
 /**
@@ -151,10 +203,12 @@ function parseStructuredConfig(configContent) {
  */
 function buildManagedProfileViews(document, providers) {
     const linkMap = buildProfileLinkMap(providers);
+    const modelProviderMap = new Map(document.modelProviders.map((provider) => [provider.name, provider]));
     const views = [];
     const seen = new Set();
     for (const section of document.profiles) {
         const linkInfo = linkMap.get(section.name) ?? { linkedProviders: [], managed: false };
+        const modelProviderSection = section.modelProvider ? modelProviderMap.get(section.modelProvider) ?? null : null;
         seen.add(section.name);
         views.push({
             name: section.name,
@@ -162,8 +216,10 @@ function buildManagedProfileViews(document, providers) {
             isActive: document.activeProfile === section.name,
             linkedProviders: [...linkInfo.linkedProviders].sort(),
             model: section.model,
-            baseUrl: section.baseUrl,
-            managedFields: collectManagedFields(section.model, section.baseUrl),
+            modelProvider: section.modelProvider,
+            baseUrl: modelProviderSection?.baseUrl ?? null,
+            envKey: modelProviderSection?.envKey ?? null,
+            managedFields: collectManagedFields(section.model, section.modelProvider),
             source: linkInfo.managed ? "managed" : "unmanaged",
         });
     }
@@ -177,7 +233,9 @@ function buildManagedProfileViews(document, providers) {
             isActive: document.activeProfile === profile,
             linkedProviders: [...linkInfo.linkedProviders].sort(),
             model: null,
+            modelProvider: null,
             baseUrl: null,
+            envKey: null,
             managedFields: [],
             source: "orphaned-reference",
         });
@@ -210,6 +268,60 @@ function collectConfigConsistencyIssues(document, providers) {
                 providers: [...view.linkedProviders],
             });
         }
+        if (view.source !== "orphaned-reference") {
+            if (!view.modelProvider) {
+                issues.push({
+                    code: "MODEL_PROVIDER_MISSING",
+                    profile: view.name,
+                });
+            }
+            else {
+                if (view.modelProvider !== view.name) {
+                    issues.push({
+                        code: "MODEL_PROVIDER_NAME_MISMATCH",
+                        profile: view.name,
+                        modelProvider: view.modelProvider,
+                    });
+                }
+                const modelProviderSection = document.modelProviders.find((entry) => entry.name === view.modelProvider);
+                if (!modelProviderSection) {
+                    issues.push({
+                        code: "MODEL_PROVIDER_SECTION_MISSING",
+                        profile: view.name,
+                        modelProvider: view.modelProvider,
+                    });
+                }
+                else if (!modelProviderSection.baseUrl) {
+                    issues.push({
+                        code: "MODEL_PROVIDER_BASE_URL_MISSING",
+                        profile: view.name,
+                        modelProvider: view.modelProvider,
+                    });
+                }
+                else if (!modelProviderSection.envKey) {
+                    issues.push({
+                        code: "MODEL_PROVIDER_ENV_KEY_MISSING",
+                        profile: view.name,
+                        modelProvider: view.modelProvider,
+                    });
+                }
+            }
+            for (const providerName of view.linkedProviders) {
+                const provider = providers?.providers[providerName];
+                if (!provider) {
+                    continue;
+                }
+                if (provider.envKey !== view.envKey) {
+                    issues.push({
+                        code: "PROVIDER_ENV_KEY_MISMATCH",
+                        provider: providerName,
+                        profile: view.name,
+                        providerEnvKey: provider.envKey,
+                        runtimeEnvKey: view.envKey,
+                    });
+                }
+            }
+        }
     }
     if (document.activeProfile) {
         const activeLinkInfo = buildProfileLinkMap(providers).get(document.activeProfile);
@@ -219,6 +331,13 @@ function collectConfigConsistencyIssues(document, providers) {
                 profile: document.activeProfile,
             });
         }
+        else if (activeLinkInfo.linkedProviders.length > 1) {
+            issues.push({
+                code: "ACTIVE_PROVIDER_UNRESOLVED",
+                profile: document.activeProfile,
+                providers: [...activeLinkInfo.linkedProviders],
+            });
+        }
     }
     return issues.sort((left, right) => {
         if (left.profile === right.profile) {
@@ -232,21 +351,32 @@ function collectConfigConsistencyIssues(document, providers) {
  */
 function validateManagedProfileCreation(profile, fields) {
     const model = fields.model?.trim() ?? "";
-    const baseUrl = fields.baseUrl?.trim() ?? "";
-    if (!model || !baseUrl) {
-        throw (0, errors_1.cliError)("MANAGED_PROFILE_FIELDS_MISSING", `Managed profile "${profile}" requires both model and base_url.`, {
+    const modelProvider = fields.modelProvider?.trim() ?? "";
+    if (!model || !modelProvider) {
+        throw (0, errors_1.cliError)("MANAGED_PROFILE_FIELDS_MISSING", `Managed profile "${profile}" requires both model and model_provider.`, {
             profile,
             missingFields: [
                 !model ? "model" : null,
-                !baseUrl ? "base_url" : null,
+                !modelProvider ? "model_provider" : null,
             ].filter((value) => Boolean(value)),
         });
     }
     return {
         model,
-        baseUrl,
+        modelProvider,
     };
 }
+/**
+ * Normalizes a profile name into the default env_key used for generated runtime sections.
+ */
+function buildManagedProfileEnvKey(profile) {
+    const normalized = profile
+        .trim()
+        .replace(/[^A-Za-z0-9]+/g, "_")
+        .replace(/^_+|_+$/g, "")
+        .toUpperCase();
+    return `${normalized || "PROVIDER"}_API_KEY`;
+}
 /**
  * Computes keep/delete/switch outcomes when a provider leaves or changes profiles.
  */
@@ -297,9 +427,12 @@ function planProfileLifecycleOutcome(args) {
 function planConfigMutation(document, args) {
     const operations = [];
     const createdProfileSections = [];
+    const createdModelProviderSections = [];
     const deletedProfileSections = [];
     const updatedProfiles = [];
+    const updatedModelProviders = [];
     const sectionMap = new Map(document.profiles.map((profile) => [profile.name, profile]));
+    const modelProviderSectionMap = new Map(document.modelProviders.map((entry) => [entry.name, entry]));
     if (args.setActiveProfile && args.setActiveProfile !== document.activeProfile) {
         const quoted = `"${args.setActiveProfile}"`;
         if (document.activeProfileRange) {
@@ -344,7 +477,7 @@ function planConfigMutation(document, args) {
                 index: document.rawText.length,
                 text: `${prefix}[profiles.${profileName}]${document.lineEnding}` +
                     `model = ${JSON.stringify(requiredFields.model)}${document.lineEnding}` +
-                    `base_url = ${JSON.stringify(requiredFields.baseUrl)}${document.lineEnding}`,
+                    `model_provider = ${JSON.stringify(requiredFields.modelProvider)}${document.lineEnding}`,
             });
             createdProfileSections.push(profileName);
             continue;
@@ -354,11 +487,46 @@ function planConfigMutation(document, args) {
             updatedProfiles.push(profileName);
         }
     }
+    for (const [profileName, fields] of Object.entries(args.upsertModelProviders ?? {}).sort(([left], [right]) => left.localeCompare(right))) {
+        const section = modelProviderSectionMap.get(profileName);
+        if (!section) {
+            const baseUrl = fields.baseUrl?.trim() ?? "";
+            const envKey = fields.envKey?.trim() ?? "";
+            if (!baseUrl || !envKey) {
+                throw (0, errors_1.cliError)("MANAGED_PROFILE_FIELDS_MISSING", `Model provider "${profileName}" requires both base_url and env_key.`, {
+                    profile: profileName,
+                    modelProvider: profileName,
+                    missingFields: [
+                        !baseUrl ? "base_url" : null,
+                        !envKey ? "env_key" : null,
+                    ].filter((value) => Boolean(value)),
+                });
+            }
+            const prefix = document.rawText.length > 0 && !document.rawText.endsWith(document.lineEnding)
+                ? document.lineEnding
+                : "";
+            operations.push({
+                kind: "insert-at",
+                index: document.rawText.length,
+                text: `${prefix}[model_providers.${profileName}]${document.lineEnding}` +
+                    `base_url = ${JSON.stringify(baseUrl)}${document.lineEnding}` +
+                    `env_key = ${JSON.stringify(envKey)}${document.lineEnding}`,
+            });
+            createdModelProviderSections.push(profileName);
+            continue;
+        }
+        const sectionUpdated = planModelProviderFieldMutation(section, fields, operations);
+        if (sectionUpdated) {
+            updatedModelProviders.push(profileName);
+        }
+    }
     return {
         operations,
         createdProfileSections,
+        createdModelProviderSections,
         deletedProfileSections,
         updatedProfiles,
+        updatedModelProviders,
         switchedActiveProfile: Boolean(args.setActiveProfile && args.setActiveProfile !== document.activeProfile),
     };
 }
@@ -384,7 +552,7 @@ function applyPatchOperations(rawText, operations) {
 function planSectionFieldMutation(document, section, fields, operations) {
     let updated = false;
     const modelText = fields.model !== undefined ? JSON.stringify(fields.model) : null;
-    const baseUrlText = fields.baseUrl !== undefined ? JSON.stringify(fields.baseUrl) : null;
+    const modelProviderText = fields.modelProvider !== undefined ? JSON.stringify(fields.modelProvider) : null;
     const inserts = [];
     if (modelText !== null && section.modelValueRange) {
         if (section.model !== fields.model) {
@@ -401,6 +569,38 @@ function planSectionFieldMutation(document, section, fields, operations) {
         inserts.push(`model = ${modelText}${document.lineEnding}`);
         updated = true;
     }
+    if (modelProviderText !== null && section.modelProviderValueRange) {
+        if (section.modelProvider !== fields.modelProvider) {
+            operations.push({
+                kind: "replace-range",
+                start: section.modelProviderValueRange.start,
+                end: section.modelProviderValueRange.end,
+                text: modelProviderText,
+            });
+            updated = true;
+        }
+    }
+    else if (modelProviderText !== null && !section.modelProviderValueRange) {
+        inserts.push(`model_provider = ${modelProviderText}${document.lineEnding}`);
+        updated = true;
+    }
+    if (inserts.length > 0) {
+        operations.push({
+            kind: "insert-at",
+            index: section.managedFieldInsertIndex,
+            text: inserts.join(""),
+        });
+    }
+    return updated;
+}
+/**
+ * Plans base_url/env_key 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 envKeyText = fields.envKey !== undefined ? JSON.stringify(fields.envKey) : null;
+    const inserts = [];
     if (baseUrlText !== null && section.baseUrlValueRange) {
         if (section.baseUrl !== fields.baseUrl) {
             operations.push({
@@ -412,16 +612,30 @@ function planSectionFieldMutation(document, section, fields, operations) {
             updated = true;
         }
     }
-    else if (baseUrlText !== null && !section.baseUrlValueRange) {
-        inserts.push(`base_url = ${baseUrlText}${document.lineEnding}`);
-        updated = true;
+    else if (baseUrlText !== null) {
+        inserts.push(`base_url = ${baseUrlText}`);
+    }
+    if (envKeyText !== null && section.envKeyValueRange) {
+        if (section.envKey !== fields.envKey) {
+            operations.push({
+                kind: "replace-range",
+                start: section.envKeyValueRange.start,
+                end: section.envKeyValueRange.end,
+                text: envKeyText,
+            });
+            updated = true;
+        }
+    }
+    else if (envKeyText !== null) {
+        inserts.push(`env_key = ${envKeyText}`);
     }
     if (inserts.length > 0) {
         operations.push({
             kind: "insert-at",
-            index: section.managedFieldInsertIndex,
-            text: inserts.join(""),
+            index: section.sectionEnd,
+            text: `${inserts.join("\n")}\n`,
         });
+        updated = true;
     }
     return updated;
 }
@@ -483,13 +697,13 @@ function findManagedFieldInsertIndex(rawText, sectionStart, sectionEnd) {
     }
     return sectionStart + lines[lastMeaningfulIndex].end;
 }
-function collectManagedFields(model, baseUrl) {
+function collectManagedFields(model, modelProvider) {
     const fields = [];
     if (model !== null) {
         fields.push("model");
     }
-    if (baseUrl !== null) {
-        fields.push("base_url");
+    if (modelProvider !== null) {
+        fields.push("model_provider");
     }
     return fields;
 }

package/dist/domain/providers.js

@@ -4,6 +4,7 @@ exports.validateProvidersShape = validateProvidersShape;
 exports.cleanProviderRecord = cleanProviderRecord;
 exports.sortProviders = sortProviders;
 exports.findProviderByProfile = findProviderByProfile;
+exports.findProvidersByProfile = findProvidersByProfile;
 exports.maskSecret = maskSecret;
 /**
  * Validates and normalizes unknown JSON into the providers.json domain model.
@@ -28,6 +29,9 @@ function validateProvidersShape(input) {
         if (typeof provider.apiKey !== "string" || provider.apiKey.trim() === "") {
             throw new Error(`Provider "${name}" is missing a valid apiKey.`);
         }
+        if (typeof provider.envKey !== "string" || provider.envKey.trim() === "") {
+            throw new Error(`Provider "${name}" is missing a valid envKey.`);
+        }
         if (provider.baseUrl !== undefined && typeof provider.baseUrl !== "string") {
             throw new Error(`Provider "${name}" has an invalid baseUrl.`);
         }
@@ -42,6 +46,7 @@ function validateProvidersShape(input) {
         providers[name] = cleanProviderRecord({
             profile: provider.profile,
             apiKey: provider.apiKey,
+            envKey: provider.envKey,
             baseUrl: provider.baseUrl,
             note: provider.note,
             tags: provider.tags,
@@ -56,6 +61,7 @@ function cleanProviderRecord(record) {
     const next = {
         profile: record.profile.trim(),
         apiKey: record.apiKey.trim(),
+        envKey: record.envKey.trim(),
     };
     if (record.baseUrl && record.baseUrl.trim() !== "") {
         next.baseUrl = record.baseUrl.trim();
@@ -84,12 +90,20 @@ function sortProviders(providers) {
  * Finds the provider name associated with a given Codex profile.
  */
 function findProviderByProfile(providers, profile) {
+    const matches = findProvidersByProfile(providers, profile);
+    return matches.length > 0 ? matches[0] : null;
+}
+/**
+ * Returns all provider names associated with a given Codex profile.
+ */
+function findProvidersByProfile(providers, profile) {
+    const matches = [];
     for (const [name, provider] of Object.entries(providers.providers)) {
         if (provider.profile === profile) {
-            return name;
+            matches.push(name);
         }
     }
-    return null;
+    return matches.sort();
 }
 /**
  * Masks a secret for human-readable output while preserving a short fingerprint.

package/dist/domain/setup.js

@@ -15,6 +15,7 @@ function buildSetupDrafts(profiles, detailsByProfile) {
             record: (0, providers_1.cleanProviderRecord)({
                 profile,
                 apiKey: detail.apiKey ?? "",
+                envKey: detail.envKey ?? "",
                 baseUrl: detail.baseUrl,
                 note: detail.note,
                 tags: detail.tags,