@minniexcode/codex-switch 0.0.8 → 0.0.10

package/dist/storage/auth-repo.js

@@ -34,15 +34,10 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readAuthFileIfExists = readAuthFileIfExists;
-exports.buildManagedAuthPayload = buildManagedAuthPayload;
-exports.buildManagedAuthJson = buildManagedAuthJson;
-exports.writeAuthFile = writeAuthFile;
-exports.extractManagedAuthFingerprint = extractManagedAuthFingerprint;
-exports.readManagedAuthState = readManagedAuthState;
+exports.readAuthFileState = readAuthFileState;
+exports.writeOpenAiApiKeyAuth = writeOpenAiApiKeyAuth;
 const fs = __importStar(require("node:fs"));
 const errors_1 = require("../domain/errors");
-const fs_utils_1 = require("./fs-utils");
-const LEGACY_MANAGED_SECRET_KEYS = new Set(["api_key"]);
 /**
  * Reads auth.json when it exists and returns null otherwise.
  */
@@ -61,84 +56,27 @@ function readAuthFileIfExists(authPath) {
     }
 }
 /**
- * Builds the stable managed auth payload for one provider.
+ * Reads auth.json into a neutral file-state summary for status and doctor.
  */
-function buildManagedAuthPayload(provider) {
-    return {
-        auth_mode: "apikey",
-        [provider.envKey]: provider.apiKey,
-    };
-}
-/**
- * Builds the next auth.json object while preserving unmanaged metadata.
- */
-function buildManagedAuthJson(provider, existingAuthJson) {
-    const nextManaged = buildManagedAuthPayload(provider);
-    const result = {};
-    if (existingAuthJson && typeof existingAuthJson === "object" && !Array.isArray(existingAuthJson)) {
-        for (const [key, value] of Object.entries(existingAuthJson)) {
-            if (key === "auth_mode" || LEGACY_MANAGED_SECRET_KEYS.has(key) || looksLikeManagedSecretKey(key)) {
-                continue;
-            }
-            result[key] = value;
-        }
-    }
-    result.auth_mode = nextManaged.auth_mode;
-    result[provider.envKey] = provider.apiKey;
-    return result;
-}
-/**
- * Writes auth.json atomically using the managed mirror strategy.
- */
-function writeAuthFile(authPath, provider, existingAuthJson) {
-    (0, fs_utils_1.writeTextFileAtomic)(authPath, `${JSON.stringify(buildManagedAuthJson(provider, existingAuthJson), null, 2)}\n`);
-}
-/**
- * Extracts a lightweight fingerprint used by doctor/status.
- */
-function extractManagedAuthFingerprint(input) {
-    if (!input || typeof input !== "object" || Array.isArray(input)) {
-        return {
-            authMode: null,
-            managedSecretKeys: [],
-            payload: null,
-        };
-    }
-    const payload = input;
-    const authMode = typeof payload.auth_mode === "string" ? payload.auth_mode : null;
-    const managedSecretKeys = Object.keys(payload)
-        .filter((key) => key !== "auth_mode" && looksLikeManagedSecretKey(key))
-        .sort();
-    return {
-        authMode,
-        managedSecretKeys,
-        payload,
-    };
-}
-/**
- * Reads auth.json into a doctor-friendly managed state summary.
- */
-function readManagedAuthState(authPath) {
+function readAuthFileState(authPath) {
     if (!fs.existsSync(authPath)) {
         return {
             exists: false,
             valid: false,
             parseError: null,
             authMode: null,
-            managedSecretKeys: [],
-            payload: null,
         };
     }
     try {
         const payload = readAuthFileIfExists(authPath);
-        const fingerprint = extractManagedAuthFingerprint(payload);
+        const authMode = payload && typeof payload === "object" && !Array.isArray(payload) && typeof payload.auth_mode === "string"
+            ? String(payload.auth_mode)
+            : null;
         return {
             exists: true,
-            valid: Boolean(fingerprint.payload),
+            valid: Boolean(payload && typeof payload === "object" && !Array.isArray(payload)),
             parseError: null,
-            authMode: fingerprint.authMode,
-            managedSecretKeys: fingerprint.managedSecretKeys,
-            payload: fingerprint.payload,
+            authMode,
         };
     }
     catch (error) {
@@ -147,14 +85,27 @@ function readManagedAuthState(authPath) {
             valid: false,
             parseError: (0, errors_1.normalizeError)(error).message,
             authMode: null,
-            managedSecretKeys: [],
-            payload: null,
         };
     }
 }
-function looksLikeManagedSecretKey(key) {
-    if (LEGACY_MANAGED_SECRET_KEYS.has(key)) {
-        return true;
+/**
+ * Writes the active direct-provider auth projection expected by Codex.
+ * Invalid or missing existing auth.json content is replaced with a minimal valid object.
+ */
+function writeOpenAiApiKeyAuth(authPath, apiKey) {
+    let next = {};
+    if (fs.existsSync(authPath)) {
+        try {
+            const payload = JSON.parse(fs.readFileSync(authPath, "utf8"));
+            if (payload && typeof payload === "object" && !Array.isArray(payload)) {
+                next = { ...payload };
+            }
+        }
+        catch {
+            next = {};
+        }
     }
-    return /^[A-Z0-9_]+$/.test(key);
+    next.auth_mode = "apikey";
+    next.OPENAI_API_KEY = apiKey;
+    fs.writeFileSync(authPath, `${JSON.stringify(next, null, 2)}\n`, "utf8");
 }

package/dist/storage/config-repo.js

@@ -40,7 +40,6 @@ exports.listConfigProfiles = listConfigProfiles;
 exports.ensureProfileExists = ensureProfileExists;
 exports.requireManagedProfileRuntime = requireManagedProfileRuntime;
 exports.requireModelProviderRuntimeSection = requireModelProviderRuntimeSection;
-exports.requireRuntimeEnvKey = requireRuntimeEnvKey;
 exports.resolveActiveProviderName = resolveActiveProviderName;
 exports.updateTopLevelProfile = updateTopLevelProfile;
 exports.createConfigMutationPlan = createConfigMutationPlan;
@@ -143,13 +142,6 @@ function requireManagedProfileRuntime(document, providers, profile) {
             missingFields: ["base_url"],
         });
     }
-    if (!modelProviderSection.envKey) {
-        throw (0, errors_1.cliError)("MODEL_PROVIDER_ENV_KEY_MISSING", `Model provider "${view.modelProvider}" requires env_key.`, {
-            profile,
-            modelProvider: view.modelProvider,
-            missingFields: ["env_key"],
-        });
-    }
     return view;
 }
 /**
@@ -170,33 +162,6 @@ function requireModelProviderRuntimeSection(document, profile) {
             missingFields: ["base_url"],
         });
     }
-    if (!modelProviderSection.envKey) {
-        throw (0, errors_1.cliError)("MODEL_PROVIDER_ENV_KEY_MISSING", `Model provider "${profile}" requires env_key.`, {
-            profile,
-            modelProvider: profile,
-            missingFields: ["env_key"],
-        });
-    }
-}
-/**
- * Returns the runtime env_key for one profile or throws a typed error.
- */
-function requireRuntimeEnvKey(document, profile) {
-    const modelProviderSection = document.modelProviders.find((entry) => entry.name === profile);
-    if (!modelProviderSection) {
-        throw (0, errors_1.cliError)("PROFILE_NOT_FOUND", `Model provider "${profile}" does not exist in config.toml.`, {
-            profile,
-            modelProvider: profile,
-        });
-    }
-    if (!modelProviderSection.envKey) {
-        throw (0, errors_1.cliError)("MODEL_PROVIDER_ENV_KEY_MISSING", `Model provider "${profile}" requires env_key.`, {
-            profile,
-            modelProvider: profile,
-            missingFields: ["env_key"],
-        });
-    }
-    return modelProviderSection.envKey;
 }
 /**
  * Resolves the current active provider and requires the mapping to be unique.
@@ -212,7 +177,7 @@ function resolveActiveProviderName(document, providers) {
         });
     }
     if (matches.length > 1) {
-        throw (0, errors_1.cliError)("ACTIVE_PROVIDER_UNRESOLVED", `Active profile "${document.activeProfile}" maps to multiple providers.`, {
+        throw (0, errors_1.cliError)("ACTIVE_PROVIDER_UNRESOLVED", `Active profile "${document.activeProfile}" maps to multiple providers, so the active managed provider is ambiguous.`, {
             profile: document.activeProfile,
             providers: matches,
         });

package/dist/storage/runtime-state-repo.js

@@ -35,11 +35,13 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCopilotBridgeStatePath = getCopilotBridgeStatePath;
 exports.readCopilotBridgeState = readCopilotBridgeState;
+exports.inspectCopilotBridgeState = inspectCopilotBridgeState;
 exports.writeCopilotBridgeState = writeCopilotBridgeState;
 exports.clearCopilotBridgeState = clearCopilotBridgeState;
 const fs = __importStar(require("node:fs"));
 const os = __importStar(require("node:os"));
 const path = __importStar(require("node:path"));
+const errors_1 = require("../domain/errors");
 const fs_utils_1 = require("./fs-utils");
 /**
  * Returns the user-level runtime state file used by Copilot bridge helpers.
@@ -61,6 +63,36 @@ function readCopilotBridgeState() {
     }
     return JSON.parse(fs.readFileSync(statePath, "utf8"));
 }
+/**
+ * Safely inspects the runtime-state file for status/doctor style read paths.
+ */
+function inspectCopilotBridgeState() {
+    const statePath = getCopilotBridgeStatePath();
+    if (!fs.existsSync(statePath)) {
+        return {
+            exists: false,
+            valid: false,
+            parseError: null,
+            state: null,
+        };
+    }
+    try {
+        return {
+            exists: true,
+            valid: true,
+            parseError: null,
+            state: readCopilotBridgeState(),
+        };
+    }
+    catch (error) {
+        return {
+            exists: true,
+            valid: false,
+            parseError: (0, errors_1.normalizeError)(error).message,
+            state: null,
+        };
+    }
+}
 /**
  * Persists the Copilot bridge state manifest.
  */