@praeviso/code-env-switch 0.1.9 → 0.1.10

package/README.md

@@ -1,6 +1,6 @@
 # code-env-switch
 
-A tiny CLI to switch between Claude Code and Codex environment variables.
+A tiny CLI to switch between Claude Code and Codex profiles.
 
 [中文说明](README_zh.md)
 
@@ -103,6 +103,12 @@ codenv add --type codex primary OPENAI_BASE_URL=https://api.example.com/v1 OPENA
 When `--type` is set, the profile name is kept as-is and `type` is stored separately.
 Profiles are keyed by an internal id; the human-facing name lives in `profile.name`.
 
+Codex profiles continue to store `OPENAI_BASE_URL` and `OPENAI_API_KEY` in the
+JSON config for backward compatibility. When a Codex profile is applied,
+`codenv` now unsets those shell variables, writes `~/.codex/config.toml` with
+`model_provider = "OpenAI"` plus a `[model_providers.OpenAI]` block, and writes
+`~/.codex/auth.json` with the matching API key.
+
 Interactive add (default):
 
 ```bash
@@ -146,6 +152,11 @@ This wrapper makes `codenv use` and `codenv unset` apply automatically in the
 current shell. To print the snippet without writing to rc, use
 `codenv init --print`.
 
+For Codex profiles, the generated shell snippet keeps reading the legacy
+`OPENAI_*` values from your `codenv` profile, but the applied runtime state now
+comes from `~/.codex/config.toml` and `~/.codex/auth.json` instead of exported
+`OPENAI_BASE_URL` / `OPENAI_API_KEY` variables.
+
 ### Auto-apply default profiles (per type)
 
 Set a default per type (codex/claude) and re-run `codenv init`:
@@ -189,6 +200,9 @@ codenv unset
 eval "$(codenv unset)"
 ```
 
+For Codex, `codenv unset` also restores the previous `~/.codex/config.toml` and
+`~/.codex/auth.json` state captured before the last `codenv`-managed switch.
+
 ### Fish shell
 
 ```fish

package/README_zh.md

@@ -1,6 +1,6 @@
 # code-env-switch
 
-一个轻量的 CLI，用于在 Claude Code 与 Codex 的环境变量之间快速切换。
+一个轻量的 CLI，用于在 Claude Code 与 Codex profile 之间快速切换。
 
 [English](README.md)
 
@@ -103,6 +103,12 @@ codenv add --type codex primary OPENAI_BASE_URL=https://api.example.com/v1 OPENA
 当设置 `--type` 时，名称保持不变，`type` 会单独存储。
 profiles 使用内部 key，展示名称存放在 `profile.name`。
 
+为了兼容旧配置，Codex profile 仍然在 JSON 里保存
+`OPENAI_BASE_URL` / `OPENAI_API_KEY`。但在实际应用 Codex profile 时，
+`codenv` 会先清理这些 shell 变量，再把对应值写入
+`~/.codex/config.toml` 的 `model_provider = "OpenAI"` 与
+`[model_providers.OpenAI]`，并同步写入 `~/.codex/auth.json`。
+
 交互式添加（默认）：
 
 ```bash
@@ -145,6 +151,10 @@ codenv init --shell zsh
 该包装函数会让 `codenv use` 和 `codenv unset` 在当前终端自动生效。
 如果只想打印片段而不写入，可用 `codenv init --print`。
 
+对于 Codex profile，新的应用方式仍然读取旧 profile 里的 `OPENAI_*`
+字段，但真正生效的是 `~/.codex/config.toml` 与 `~/.codex/auth.json`，
+而不是导出的 `OPENAI_BASE_URL` / `OPENAI_API_KEY` 环境变量。
+
 ### 默认 profile 自动生效（按 type）
 
 为不同 type 设置默认 profile，并重新执行一次 `codenv init`：
@@ -188,6 +198,9 @@ codenv unset
 eval "$(codenv unset)"
 ```
 
+对于 Codex，`codenv unset` 还会恢复 `codenv` 接管前备份的
+`~/.codex/config.toml` 与 `~/.codex/auth.json`。
+
 ### Fish shell
 
 ```fish

package/bin/cli/help.js

@@ -5,7 +5,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.printHelp = printHelp;
 function printHelp() {
-    const msg = `codenv - switch Claude/Codex env vars
+    const msg = `codenv - switch Claude/Codex profiles
 
 Usage:
   codenv list

package/bin/codex/config.js

@@ -0,0 +1,273 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveCodexConfigPath = resolveCodexConfigPath;
+exports.syncCodexProfile = syncCodexProfile;
+exports.clearManagedCodexProfile = clearManagedCodexProfile;
+exports.resolveCodexProfileFromEnv = resolveCodexProfileFromEnv;
+/**
+ * Codex provider configuration management
+ */
+const fs = require("fs");
+const os = require("os");
+const path = require("path");
+const constants_1 = require("../constants");
+const type_1 = require("../profile/type");
+const utils_1 = require("../shell/utils");
+const DEFAULT_CODEX_CONFIG_PATH = path.join(os.homedir(), ".codex", "config.toml");
+const CODEX_PROVIDER_NAME = "OpenAI";
+const CODEX_PROVIDER_WIRE_API = "responses";
+function normalizeEnvValue(value) {
+    if (value === null || value === undefined)
+        return null;
+    const normalized = String(value).trim();
+    return normalized ? normalized : null;
+}
+function readTextIfExists(filePath) {
+    if (!fs.existsSync(filePath))
+        return null;
+    try {
+        return fs.readFileSync(filePath, "utf8");
+    }
+    catch {
+        return null;
+    }
+}
+function writeText(filePath, text) {
+    const dir = path.dirname(filePath);
+    if (!fs.existsSync(dir)) {
+        fs.mkdirSync(dir, { recursive: true });
+    }
+    fs.writeFileSync(filePath, text, "utf8");
+}
+function removeFileIfExists(filePath) {
+    if (!fs.existsSync(filePath))
+        return;
+    try {
+        fs.unlinkSync(filePath);
+    }
+    catch {
+        // ignore cleanup failures
+    }
+}
+function getBackupPath(configPath) {
+    return `${configPath}.codenv-provider-backup.json`;
+}
+function readBackup(backupPath) {
+    const raw = readTextIfExists(backupPath);
+    if (!raw)
+        return null;
+    try {
+        const parsed = JSON.parse(raw);
+        return {
+            version: typeof parsed.version === "number" ? parsed.version : 1,
+            modelProviderLine: typeof parsed.modelProviderLine === "string"
+                ? parsed.modelProviderLine
+                : null,
+            providerSectionText: typeof parsed.providerSectionText === "string"
+                ? parsed.providerSectionText
+                : null,
+            authText: typeof parsed.authText === "string" ? parsed.authText : null,
+        };
+    }
+    catch {
+        return null;
+    }
+}
+function writeBackup(backupPath, backup) {
+    writeText(backupPath, `${JSON.stringify(backup, null, 2)}\n`);
+}
+function parseSectionByHeader(text, headerRegex) {
+    var _a;
+    const match = headerRegex.exec(text);
+    if (!match || match.index === undefined)
+        return null;
+    const start = match.index;
+    const afterHeader = start + match[0].length;
+    const rest = text.slice(afterHeader);
+    const nextHeaderMatch = rest.match(/^\s*\[.*?\]\s*$/m);
+    const end = nextHeaderMatch
+        ? afterHeader + ((_a = nextHeaderMatch.index) !== null && _a !== void 0 ? _a : rest.length)
+        : text.length;
+    return {
+        start,
+        end,
+        sectionText: text.slice(start, end).trimEnd(),
+    };
+}
+function getFirstSectionIndex(text) {
+    const match = text.match(/^\s*\[.*?\]\s*$/m);
+    if (!match || match.index === undefined)
+        return text.length;
+    return match.index;
+}
+function getRootText(text) {
+    const index = getFirstSectionIndex(text);
+    return {
+        root: text.slice(0, index),
+        rest: text.slice(index),
+    };
+}
+function readModelProviderLine(text) {
+    const { root } = getRootText(text);
+    const match = root.match(/^\s*model_provider\s*=.*$/m);
+    return match ? match[0].trimEnd() : null;
+}
+function removeModelProviderLine(text) {
+    const { root, rest } = getRootText(text);
+    const updatedRoot = root.replace(/^\s*model_provider\s*=.*(?:\r?\n)?/m, "");
+    return `${updatedRoot}${rest}`;
+}
+function insertRootLine(text, line) {
+    const { root, rest } = getRootText(text);
+    const trimmedRoot = root.trimEnd();
+    const trimmedRest = rest.trimStart();
+    if (!trimmedRoot) {
+        if (!trimmedRest)
+            return `${line}\n`;
+        return `${line}\n\n${trimmedRest}`;
+    }
+    if (!trimmedRest) {
+        return `${trimmedRoot}\n${line}\n`;
+    }
+    return `${trimmedRoot}\n${line}\n\n${trimmedRest}`;
+}
+function removeSection(text, headerRegex) {
+    const range = parseSectionByHeader(text, headerRegex);
+    if (!range)
+        return text;
+    const before = text.slice(0, range.start).trimEnd();
+    const after = text.slice(range.end).trimStart();
+    if (before && after)
+        return `${before}\n\n${after}`;
+    if (before)
+        return `${before}\n`;
+    if (after)
+        return `${after}\n`;
+    return "";
+}
+function appendSection(text, sectionText) {
+    const trimmed = text.trimEnd();
+    if (!trimmed)
+        return `${sectionText}\n`;
+    return `${trimmed}\n\n${sectionText}\n`;
+}
+function getProviderHeaderRegex() {
+    return /^\s*\[model_providers\.OpenAI\]\s*$/m;
+}
+function readProviderSectionText(text) {
+    const range = parseSectionByHeader(text, getProviderHeaderRegex());
+    return range ? range.sectionText : null;
+}
+function renderProviderSection(baseUrl) {
+    const lines = [
+        `[model_providers.${CODEX_PROVIDER_NAME}]`,
+        `name = ${JSON.stringify(CODEX_PROVIDER_NAME)}`,
+    ];
+    if (baseUrl) {
+        lines.push(`base_url = ${JSON.stringify(baseUrl)}`);
+    }
+    lines.push(`wire_api = ${JSON.stringify(CODEX_PROVIDER_WIRE_API)}`);
+    lines.push("requires_openai_auth = true");
+    return lines.join("\n");
+}
+function ensureBackup(configPath, currentConfigText) {
+    const backupPath = getBackupPath(configPath);
+    if (readBackup(backupPath))
+        return;
+    writeBackup(backupPath, {
+        version: 1,
+        modelProviderLine: readModelProviderLine(currentConfigText),
+        providerSectionText: readProviderSectionText(currentConfigText),
+        authText: readTextIfExists(constants_1.CODEX_AUTH_PATH),
+    });
+}
+function writeManagedConfig(configPath, baseUrl) {
+    const currentText = readTextIfExists(configPath) || "";
+    ensureBackup(configPath, currentText);
+    let updated = currentText;
+    updated = removeSection(updated, getProviderHeaderRegex());
+    updated = removeModelProviderLine(updated);
+    updated = insertRootLine(updated, `model_provider = ${JSON.stringify(CODEX_PROVIDER_NAME)}`);
+    updated = appendSection(updated, renderProviderSection(baseUrl));
+    writeText(configPath, updated);
+}
+function writeManagedAuth(apiKey) {
+    const authJson = apiKey === null
+        ? "null"
+        : JSON.stringify({ OPENAI_API_KEY: apiKey });
+    writeText(constants_1.CODEX_AUTH_PATH, `${authJson}\n`);
+}
+function restoreAuth(authText) {
+    if (authText === null) {
+        removeFileIfExists(constants_1.CODEX_AUTH_PATH);
+        return;
+    }
+    writeText(constants_1.CODEX_AUTH_PATH, authText);
+}
+function resolveCodexConfigPath(config) {
+    var _a;
+    const envOverride = process.env.CODE_ENV_CODEX_CONFIG_PATH;
+    if (envOverride && String(envOverride).trim()) {
+        const expanded = (0, utils_1.expandEnv)(String(envOverride).trim());
+        return (0, utils_1.resolvePath)(expanded) || DEFAULT_CODEX_CONFIG_PATH;
+    }
+    const configOverride = (_a = config.codexStatusline) === null || _a === void 0 ? void 0 : _a.configPath;
+    if (configOverride && String(configOverride).trim()) {
+        const expanded = (0, utils_1.expandEnv)(String(configOverride).trim());
+        return (0, utils_1.resolvePath)(expanded) || DEFAULT_CODEX_CONFIG_PATH;
+    }
+    return DEFAULT_CODEX_CONFIG_PATH;
+}
+function syncCodexProfile(config, profileName) {
+    const profile = config.profiles && config.profiles[profileName];
+    if (!profile) {
+        throw new Error(`Unknown profile: ${profileName}`);
+    }
+    const env = profile.env || {};
+    const baseUrl = normalizeEnvValue(env.OPENAI_BASE_URL);
+    const apiKey = normalizeEnvValue(env.OPENAI_API_KEY);
+    const configPath = resolveCodexConfigPath(config);
+    writeManagedConfig(configPath, baseUrl);
+    writeManagedAuth(apiKey);
+}
+function clearManagedCodexProfile(config) {
+    const configPath = resolveCodexConfigPath(config);
+    const backupPath = getBackupPath(configPath);
+    const backup = readBackup(backupPath);
+    if (!backup)
+        return;
+    let updated = readTextIfExists(configPath) || "";
+    updated = removeSection(updated, getProviderHeaderRegex());
+    updated = removeModelProviderLine(updated);
+    if (backup.modelProviderLine) {
+        updated = insertRootLine(updated, backup.modelProviderLine);
+    }
+    if (backup.providerSectionText) {
+        updated = appendSection(updated, backup.providerSectionText);
+    }
+    const trimmed = updated.trimEnd();
+    if (trimmed) {
+        writeText(configPath, `${trimmed}\n`);
+    }
+    else {
+        removeFileIfExists(configPath);
+    }
+    restoreAuth(backup.authText);
+    removeFileIfExists(backupPath);
+}
+function resolveCodexProfileFromEnv(config, profileKey, profileName) {
+    const profiles = config.profiles || {};
+    if (profileKey && profiles[profileKey])
+        return profileKey;
+    if (!profileName)
+        return null;
+    for (const [key, profile] of Object.entries(profiles)) {
+        if ((0, type_1.inferProfileType)(key, profile || {}, null) !== "codex")
+            continue;
+        const displayName = (0, type_1.getProfileDisplayName)(key, profile || {}, "codex");
+        if (displayName === profileName || key === profileName) {
+            return key;
+        }
+    }
+    return null;
+}

package/bin/commands/launch.js

@@ -7,11 +7,11 @@ exports.runLaunch = runLaunch;
 const fs = require("fs");
 const path = require("path");
 const child_process_1 = require("child_process");
-const constants_1 = require("../constants");
 const type_1 = require("../profile/type");
 const usage_1 = require("../usage");
 const claude_1 = require("../statusline/claude");
 const codex_1 = require("../statusline/codex");
+const config_1 = require("../codex/config");
 const SESSION_BINDING_POLL_MS = 1000;
 const SESSION_BINDING_START_GRACE_MS = 5000;
 function isRecord(value) {
@@ -184,24 +184,6 @@ function getProfileEnv(type) {
     const name = process.env[`CODE_ENV_PROFILE_NAME_${suffix}`] || key;
     return { key, name };
 }
-function writeCodexAuthFromEnv() {
-    const apiKey = process.env.OPENAI_API_KEY;
-    try {
-        fs.mkdirSync(path.dirname(constants_1.CODEX_AUTH_PATH), { recursive: true });
-    }
-    catch {
-        // ignore
-    }
-    const authJson = apiKey === null || apiKey === undefined || apiKey === ""
-        ? "null"
-        : JSON.stringify({ OPENAI_API_KEY: String(apiKey) });
-    try {
-        fs.writeFileSync(constants_1.CODEX_AUTH_PATH, `${authJson}\n`, "utf8");
-    }
-    catch {
-        // ignore
-    }
-}
 function parseBooleanEnv(value) {
     if (value === undefined)
         return null;
@@ -234,10 +216,13 @@ async function runLaunch(config, configPath, target, args) {
     if (!type) {
         throw new Error(`Unknown launch target: ${target}`);
     }
+    const { key: profileKey, name: profileName } = getProfileEnv(type);
     if (type === "codex") {
-        writeCodexAuthFromEnv();
+        const codexProfileKey = (0, config_1.resolveCodexProfileFromEnv)(config, profileKey, profileName);
+        if (codexProfileKey) {
+            (0, config_1.syncCodexProfile)(config, codexProfileKey);
+        }
     }
-    const { key: profileKey, name: profileName } = getProfileEnv(type);
     const terminalTag = process.env.CODE_ENV_TERMINAL_TAG || null;
     const cwd = process.cwd();
     const startMs = Date.now();

package/bin/commands/unset.js

@@ -13,8 +13,9 @@ function printUnset(config) {
         for (const key of (0, defaults_1.getTypeDefaultUnsetKeys)(type))
             keySet.add(key);
     }
-    if (keySet.size === 0)
-        return;
-    const lines = Array.from(keySet, (key) => `unset ${key}`);
+    const lines = ["command codenv __codex-clear"];
+    if (keySet.size > 0) {
+        lines.push(...Array.from(keySet, (key) => `unset ${key}`));
+    }
     console.log(lines.join("\n"));
 }

package/bin/commands/use.js

@@ -2,11 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildUseLines = buildUseLines;
 exports.printUse = printUse;
-/**
- * Use command - apply profile environment
- */
-const path = require("path");
-const constants_1 = require("../constants");
 const utils_1 = require("../shell/utils");
 const type_1 = require("../profile/type");
 const match_1 = require("../profile/match");
@@ -23,6 +18,9 @@ function buildUseLines(config, profileName, requestedType, includeGlobalUnset, c
     const unsetKeys = new Set();
     const activeType = (0, type_1.inferProfileType)(profileName, profile, requestedType);
     const effectiveEnv = (0, display_1.buildEffectiveEnv)(profile, activeType);
+    const managedCodexKeys = activeType === "codex"
+        ? new Set(["OPENAI_BASE_URL", "OPENAI_API_KEY"])
+        : new Set();
     const addUnset = (key) => {
         if (unsetKeys.has(key))
             return;
@@ -42,6 +40,13 @@ function buildUseLines(config, profileName, requestedType, includeGlobalUnset, c
         }
     }
     for (const key of Object.keys(effectiveEnv)) {
+        if (managedCodexKeys.has(key)) {
+            if (!unsetKeys.has(key)) {
+                unsetKeys.add(key);
+                unsetLines.push(`unset ${key}`);
+            }
+            continue;
+        }
         const value = effectiveEnv[key];
         if (value === null || value === undefined || value === "") {
             if (!unsetKeys.has(key)) {
@@ -63,13 +68,7 @@ function buildUseLines(config, profileName, requestedType, includeGlobalUnset, c
         exportLines.push(`export CODE_ENV_CONFIG_PATH=${(0, utils_1.shellEscape)(configPath)}`);
     }
     if ((0, match_1.shouldRemoveCodexAuth)(profileName, profile, requestedType)) {
-        const codexApiKey = effectiveEnv.OPENAI_API_KEY;
-        const authDir = path.dirname(constants_1.CODEX_AUTH_PATH);
-        const authJson = codexApiKey === null || codexApiKey === undefined || codexApiKey === ""
-            ? "null"
-            : JSON.stringify({ OPENAI_API_KEY: String(codexApiKey) });
-        postLines.push(`mkdir -p ${(0, utils_1.shellEscape)(authDir)}`);
-        postLines.push(`printf '%s\\n' ${(0, utils_1.shellEscape)(authJson)} > ${(0, utils_1.shellEscape)(constants_1.CODEX_AUTH_PATH)}`);
+        postLines.push("command codenv __codex-sync");
     }
     if (Array.isArray(profile.removeFiles)) {
         for (const p of profile.removeFiles) {

package/bin/index.js

@@ -2,7 +2,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 /**
- * codenv - switch Claude/Codex env vars
+ * codenv - switch Claude/Codex profiles
  * Main entry point
  */
 const fs = require("fs");
@@ -14,6 +14,7 @@ const profile_1 = require("./profile");
 const commands_1 = require("./commands");
 const usage_1 = require("./usage");
 const ui_1 = require("./ui");
+const config_2 = require("./codex/config");
 function getErrorMessage(err) {
     return err instanceof Error ? err.message : String(err);
 }
@@ -30,6 +31,23 @@ async function main() {
     }
     const cmd = args[0];
     try {
+        if (cmd === "__codex-sync") {
+            const configPath = process.env.CODE_ENV_CONFIG_PATH || (0, config_1.findConfigPath)(parsed.configPath);
+            const config = (0, config_1.readConfigIfExists)(configPath);
+            const profileKey = process.env.CODE_ENV_PROFILE_KEY_CODEX || null;
+            const profileName = process.env.CODE_ENV_PROFILE_NAME_CODEX || null;
+            const resolvedProfile = (0, config_2.resolveCodexProfileFromEnv)(config, profileKey, profileName);
+            if (!resolvedProfile)
+                return;
+            (0, config_2.syncCodexProfile)(config, resolvedProfile);
+            return;
+        }
+        if (cmd === "__codex-clear") {
+            const configPath = process.env.CODE_ENV_CONFIG_PATH || (0, config_1.findConfigPath)(parsed.configPath);
+            const config = (0, config_1.readConfigIfExists)(configPath);
+            (0, config_2.clearManagedCodexProfile)(config);
+            return;
+        }
         if (cmd === "init") {
             const initArgs = (0, cli_1.parseInitArgs)(args.slice(1));
             const shellName = (0, shell_1.detectShell)(initArgs.shell);

package/bin/profile/display.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isEnvValueUnset = isEnvValueUnset;
 exports.buildEffectiveEnv = buildEffectiveEnv;
 exports.envMatchesProfile = envMatchesProfile;
+exports.markerMatchesProfile = markerMatchesProfile;
 exports.buildListRows = buildListRows;
 const constants_1 = require("../constants");
 const type_1 = require("./type");
@@ -37,6 +38,18 @@ function envMatchesProfile(profile) {
     }
     return Object.keys(profile.env).length > 0;
 }
+function markerMatchesProfile(profileKey, profile, activeType) {
+    if (!activeType)
+        return false;
+    const suffix = activeType.toUpperCase();
+    const activeKey = process.env[`CODE_ENV_PROFILE_KEY_${suffix}`];
+    if (activeKey)
+        return activeKey === profileKey;
+    const activeName = process.env[`CODE_ENV_PROFILE_NAME_${suffix}`];
+    if (!activeName || !profile)
+        return false;
+    return activeName === (0, type_1.getProfileDisplayName)(profileKey, profile, activeType);
+}
 // Forward declaration to avoid circular dependency
 // getResolvedDefaultProfileKeys will be imported from config/defaults
 function buildListRows(config, getResolvedDefaultProfileKeys) {
@@ -62,7 +75,8 @@ function buildListRows(config, getResolvedDefaultProfileKeys) {
         if (note)
             noteParts.push(note);
         const noteText = noteParts.join(" | ");
-        const active = envMatchesProfile(safeProfile);
+        const active = markerMatchesProfile(key, safeProfile, usageType) ||
+            envMatchesProfile(safeProfile);
         return { key, name: displayName, type, note: noteText, active, usageType };
     });
     rows.sort((a, b) => {

package/bin/statusline/codex.js

@@ -5,11 +5,9 @@ exports.ensureCodexStatuslineConfig = ensureCodexStatuslineConfig;
  * Codex CLI status line integration (official schema)
  */
 const fs = require("fs");
-const os = require("os");
 const path = require("path");
-const utils_1 = require("../shell/utils");
+const config_1 = require("../codex/config");
 const ui_1 = require("../ui");
-const DEFAULT_CODEX_CONFIG_PATH = path.join(os.homedir(), ".codex", "config.toml");
 function parseBooleanEnv(value) {
     if (value === undefined)
         return null;
@@ -20,20 +18,6 @@ function parseBooleanEnv(value) {
         return false;
     return null;
 }
-function resolveCodexConfigPath(config) {
-    var _a;
-    const envOverride = process.env.CODE_ENV_CODEX_CONFIG_PATH;
-    if (envOverride && String(envOverride).trim()) {
-        const expanded = (0, utils_1.expandEnv)(String(envOverride).trim());
-        return (0, utils_1.resolvePath)(expanded) || DEFAULT_CODEX_CONFIG_PATH;
-    }
-    const configOverride = (_a = config.codexStatusline) === null || _a === void 0 ? void 0 : _a.configPath;
-    if (configOverride && String(configOverride).trim()) {
-        const expanded = (0, utils_1.expandEnv)(String(configOverride).trim());
-        return (0, utils_1.resolvePath)(expanded) || DEFAULT_CODEX_CONFIG_PATH;
-    }
-    return DEFAULT_CODEX_CONFIG_PATH;
-}
 function resolveDesiredStatusLineItems(config) {
     var _a;
     const raw = (_a = config.codexStatusline) === null || _a === void 0 ? void 0 : _a.items;
@@ -49,7 +33,7 @@ function resolveDesiredStatusLineConfig(config) {
         return null;
     return {
         statusLineItems,
-        configPath: resolveCodexConfigPath(config),
+        configPath: (0, config_1.resolveCodexConfigPath)(config),
     };
 }
 function readConfig(filePath) {

package/code-env.example.json

@@ -71,7 +71,7 @@
     "p_a1b2c3": {
       "name": "primary",
       "type": "codex",
-      "note": "Primary endpoint",
+      "note": "Primary endpoint (applied via ~/.codex/config.toml)",
       "env": {
         "OPENAI_BASE_URL": "https://api.example.com/v1",
         "OPENAI_API_KEY": "YOUR_API_KEY"
@@ -83,7 +83,7 @@
     "p_d4e5f6": {
       "name": "secondary",
       "type": "codex",
-      "note": "Secondary endpoint",
+      "note": "Secondary endpoint (applied via ~/.codex/config.toml)",
       "env": {
         "OPENAI_BASE_URL": "https://api.secondary.example.com/v1",
         "OPENAI_API_KEY": "YOUR_API_KEY"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@praeviso/code-env-switch",
-  "version": "0.1.9",
-  "description": "Switch between Claude Code and Codex environment variables from a single CLI",
+  "version": "0.1.10",
+  "description": "Switch between Claude Code and Codex profiles from a single CLI",
   "bin": {
     "codenv": "bin/index.js"
   },

package/src/cli/help.ts

@@ -3,7 +3,7 @@
  */
 
 export function printHelp(): void {
-    const msg = `codenv - switch Claude/Codex env vars
+    const msg = `codenv - switch Claude/Codex profiles
 
 Usage:
   codenv list

package/src/codex/config.ts

@@ -0,0 +1,309 @@
+/**
+ * Codex provider configuration management
+ */
+import * as fs from "fs";
+import * as os from "os";
+import * as path from "path";
+import type { Config, EnvValue } from "../types";
+import { CODEX_AUTH_PATH } from "../constants";
+import { getProfileDisplayName, inferProfileType } from "../profile/type";
+import { expandEnv, resolvePath } from "../shell/utils";
+
+const DEFAULT_CODEX_CONFIG_PATH = path.join(os.homedir(), ".codex", "config.toml");
+const CODEX_PROVIDER_NAME = "OpenAI";
+const CODEX_PROVIDER_WIRE_API = "responses";
+
+interface TomlSectionRange {
+    start: number;
+    end: number;
+    sectionText: string;
+}
+
+interface CodexProviderBackup {
+    version: number;
+    modelProviderLine: string | null;
+    providerSectionText: string | null;
+    authText: string | null;
+}
+
+function normalizeEnvValue(value: EnvValue): string | null {
+    if (value === null || value === undefined) return null;
+    const normalized = String(value).trim();
+    return normalized ? normalized : null;
+}
+
+function readTextIfExists(filePath: string): string | null {
+    if (!fs.existsSync(filePath)) return null;
+    try {
+        return fs.readFileSync(filePath, "utf8");
+    } catch {
+        return null;
+    }
+}
+
+function writeText(filePath: string, text: string): void {
+    const dir = path.dirname(filePath);
+    if (!fs.existsSync(dir)) {
+        fs.mkdirSync(dir, { recursive: true });
+    }
+    fs.writeFileSync(filePath, text, "utf8");
+}
+
+function removeFileIfExists(filePath: string): void {
+    if (!fs.existsSync(filePath)) return;
+    try {
+        fs.unlinkSync(filePath);
+    } catch {
+        // ignore cleanup failures
+    }
+}
+
+function getBackupPath(configPath: string): string {
+    return `${configPath}.codenv-provider-backup.json`;
+}
+
+function readBackup(backupPath: string): CodexProviderBackup | null {
+    const raw = readTextIfExists(backupPath);
+    if (!raw) return null;
+    try {
+        const parsed = JSON.parse(raw) as Partial<CodexProviderBackup>;
+        return {
+            version:
+                typeof parsed.version === "number" ? parsed.version : 1,
+            modelProviderLine:
+                typeof parsed.modelProviderLine === "string"
+                    ? parsed.modelProviderLine
+                    : null,
+            providerSectionText:
+                typeof parsed.providerSectionText === "string"
+                    ? parsed.providerSectionText
+                    : null,
+            authText: typeof parsed.authText === "string" ? parsed.authText : null,
+        };
+    } catch {
+        return null;
+    }
+}
+
+function writeBackup(backupPath: string, backup: CodexProviderBackup): void {
+    writeText(backupPath, `${JSON.stringify(backup, null, 2)}\n`);
+}
+
+function parseSectionByHeader(
+    text: string,
+    headerRegex: RegExp
+): TomlSectionRange | null {
+    const match = headerRegex.exec(text);
+    if (!match || match.index === undefined) return null;
+
+    const start = match.index;
+    const afterHeader = start + match[0].length;
+    const rest = text.slice(afterHeader);
+    const nextHeaderMatch = rest.match(/^\s*\[.*?\]\s*$/m);
+    const end = nextHeaderMatch
+        ? afterHeader + (nextHeaderMatch.index ?? rest.length)
+        : text.length;
+    return {
+        start,
+        end,
+        sectionText: text.slice(start, end).trimEnd(),
+    };
+}
+
+function getFirstSectionIndex(text: string): number {
+    const match = text.match(/^\s*\[.*?\]\s*$/m);
+    if (!match || match.index === undefined) return text.length;
+    return match.index;
+}
+
+function getRootText(text: string): { root: string; rest: string } {
+    const index = getFirstSectionIndex(text);
+    return {
+        root: text.slice(0, index),
+        rest: text.slice(index),
+    };
+}
+
+function readModelProviderLine(text: string): string | null {
+    const { root } = getRootText(text);
+    const match = root.match(/^\s*model_provider\s*=.*$/m);
+    return match ? match[0].trimEnd() : null;
+}
+
+function removeModelProviderLine(text: string): string {
+    const { root, rest } = getRootText(text);
+    const updatedRoot = root.replace(/^\s*model_provider\s*=.*(?:\r?\n)?/m, "");
+    return `${updatedRoot}${rest}`;
+}
+
+function insertRootLine(text: string, line: string): string {
+    const { root, rest } = getRootText(text);
+    const trimmedRoot = root.trimEnd();
+    const trimmedRest = rest.trimStart();
+
+    if (!trimmedRoot) {
+        if (!trimmedRest) return `${line}\n`;
+        return `${line}\n\n${trimmedRest}`;
+    }
+
+    if (!trimmedRest) {
+        return `${trimmedRoot}\n${line}\n`;
+    }
+
+    return `${trimmedRoot}\n${line}\n\n${trimmedRest}`;
+}
+
+function removeSection(text: string, headerRegex: RegExp): string {
+    const range = parseSectionByHeader(text, headerRegex);
+    if (!range) return text;
+    const before = text.slice(0, range.start).trimEnd();
+    const after = text.slice(range.end).trimStart();
+    if (before && after) return `${before}\n\n${after}`;
+    if (before) return `${before}\n`;
+    if (after) return `${after}\n`;
+    return "";
+}
+
+function appendSection(text: string, sectionText: string): string {
+    const trimmed = text.trimEnd();
+    if (!trimmed) return `${sectionText}\n`;
+    return `${trimmed}\n\n${sectionText}\n`;
+}
+
+function getProviderHeaderRegex(): RegExp {
+    return /^\s*\[model_providers\.OpenAI\]\s*$/m;
+}
+
+function readProviderSectionText(text: string): string | null {
+    const range = parseSectionByHeader(text, getProviderHeaderRegex());
+    return range ? range.sectionText : null;
+}
+
+function renderProviderSection(baseUrl: string | null): string {
+    const lines = [
+        `[model_providers.${CODEX_PROVIDER_NAME}]`,
+        `name = ${JSON.stringify(CODEX_PROVIDER_NAME)}`,
+    ];
+    if (baseUrl) {
+        lines.push(`base_url = ${JSON.stringify(baseUrl)}`);
+    }
+    lines.push(`wire_api = ${JSON.stringify(CODEX_PROVIDER_WIRE_API)}`);
+    lines.push("requires_openai_auth = true");
+    return lines.join("\n");
+}
+
+function ensureBackup(configPath: string, currentConfigText: string): void {
+    const backupPath = getBackupPath(configPath);
+    if (readBackup(backupPath)) return;
+    writeBackup(backupPath, {
+        version: 1,
+        modelProviderLine: readModelProviderLine(currentConfigText),
+        providerSectionText: readProviderSectionText(currentConfigText),
+        authText: readTextIfExists(CODEX_AUTH_PATH),
+    });
+}
+
+function writeManagedConfig(configPath: string, baseUrl: string | null): void {
+    const currentText = readTextIfExists(configPath) || "";
+    ensureBackup(configPath, currentText);
+
+    let updated = currentText;
+    updated = removeSection(updated, getProviderHeaderRegex());
+    updated = removeModelProviderLine(updated);
+    updated = insertRootLine(
+        updated,
+        `model_provider = ${JSON.stringify(CODEX_PROVIDER_NAME)}`
+    );
+    updated = appendSection(updated, renderProviderSection(baseUrl));
+    writeText(configPath, updated);
+}
+
+function writeManagedAuth(apiKey: string | null): void {
+    const authJson =
+        apiKey === null
+            ? "null"
+            : JSON.stringify({ OPENAI_API_KEY: apiKey });
+    writeText(CODEX_AUTH_PATH, `${authJson}\n`);
+}
+
+function restoreAuth(authText: string | null): void {
+    if (authText === null) {
+        removeFileIfExists(CODEX_AUTH_PATH);
+        return;
+    }
+    writeText(CODEX_AUTH_PATH, authText);
+}
+
+export function resolveCodexConfigPath(config: Config): string {
+    const envOverride = process.env.CODE_ENV_CODEX_CONFIG_PATH;
+    if (envOverride && String(envOverride).trim()) {
+        const expanded = expandEnv(String(envOverride).trim());
+        return resolvePath(expanded) || DEFAULT_CODEX_CONFIG_PATH;
+    }
+    const configOverride = config.codexStatusline?.configPath;
+    if (configOverride && String(configOverride).trim()) {
+        const expanded = expandEnv(String(configOverride).trim());
+        return resolvePath(expanded) || DEFAULT_CODEX_CONFIG_PATH;
+    }
+    return DEFAULT_CODEX_CONFIG_PATH;
+}
+
+export function syncCodexProfile(config: Config, profileName: string): void {
+    const profile = config.profiles && config.profiles[profileName];
+    if (!profile) {
+        throw new Error(`Unknown profile: ${profileName}`);
+    }
+    const env = profile.env || {};
+    const baseUrl = normalizeEnvValue(env.OPENAI_BASE_URL);
+    const apiKey = normalizeEnvValue(env.OPENAI_API_KEY);
+    const configPath = resolveCodexConfigPath(config);
+    writeManagedConfig(configPath, baseUrl);
+    writeManagedAuth(apiKey);
+}
+
+export function clearManagedCodexProfile(config: Config): void {
+    const configPath = resolveCodexConfigPath(config);
+    const backupPath = getBackupPath(configPath);
+    const backup = readBackup(backupPath);
+    if (!backup) return;
+
+    let updated = readTextIfExists(configPath) || "";
+    updated = removeSection(updated, getProviderHeaderRegex());
+    updated = removeModelProviderLine(updated);
+    if (backup.modelProviderLine) {
+        updated = insertRootLine(updated, backup.modelProviderLine);
+    }
+    if (backup.providerSectionText) {
+        updated = appendSection(updated, backup.providerSectionText);
+    }
+
+    const trimmed = updated.trimEnd();
+    if (trimmed) {
+        writeText(configPath, `${trimmed}\n`);
+    } else {
+        removeFileIfExists(configPath);
+    }
+
+    restoreAuth(backup.authText);
+    removeFileIfExists(backupPath);
+}
+
+export function resolveCodexProfileFromEnv(
+    config: Config,
+    profileKey: string | null,
+    profileName: string | null
+): string | null {
+    const profiles = config.profiles || {};
+    if (profileKey && profiles[profileKey]) return profileKey;
+    if (!profileName) return null;
+
+    for (const [key, profile] of Object.entries(profiles)) {
+        if (inferProfileType(key, profile || {}, null) !== "codex") continue;
+        const displayName = getProfileDisplayName(key, profile || {}, "codex");
+        if (displayName === profileName || key === profileName) {
+            return key;
+        }
+    }
+
+    return null;
+}

package/src/commands/launch.ts

@@ -5,7 +5,6 @@ import * as fs from "fs";
 import * as path from "path";
 import { spawn } from "child_process";
 import type { Config, ProfileType } from "../types";
-import { CODEX_AUTH_PATH } from "../constants";
 import { normalizeType } from "../profile/type";
 import {
     getCodexSessionsPath,
@@ -16,6 +15,7 @@ import {
 } from "../usage";
 import { ensureClaudeStatusline } from "../statusline/claude";
 import { ensureCodexStatuslineConfig } from "../statusline/codex";
+import { resolveCodexProfileFromEnv, syncCodexProfile } from "../codex/config";
 
 const SESSION_BINDING_POLL_MS = 1000;
 const SESSION_BINDING_START_GRACE_MS = 5000;
@@ -203,24 +203,6 @@ function getProfileEnv(type: ProfileType): { key: string | null; name: string |
     return { key, name };
 }
 
-function writeCodexAuthFromEnv(): void {
-    const apiKey = process.env.OPENAI_API_KEY;
-    try {
-        fs.mkdirSync(path.dirname(CODEX_AUTH_PATH), { recursive: true });
-    } catch {
-        // ignore
-    }
-    const authJson =
-        apiKey === null || apiKey === undefined || apiKey === ""
-            ? "null"
-            : JSON.stringify({ OPENAI_API_KEY: String(apiKey) });
-    try {
-        fs.writeFileSync(CODEX_AUTH_PATH, `${authJson}\n`, "utf8");
-    } catch {
-        // ignore
-    }
-}
-
 function parseBooleanEnv(value: string | undefined): boolean | null {
     if (value === undefined) return null;
     const normalized = String(value).trim().toLowerCase();
@@ -259,11 +241,18 @@ export async function runLaunch(
     if (!type) {
         throw new Error(`Unknown launch target: ${target}`);
     }
+    const { key: profileKey, name: profileName } = getProfileEnv(type);
     if (type === "codex") {
-        writeCodexAuthFromEnv();
+        const codexProfileKey = resolveCodexProfileFromEnv(
+            config,
+            profileKey,
+            profileName
+        );
+        if (codexProfileKey) {
+            syncCodexProfile(config, codexProfileKey);
+        }
     }
 
-    const { key: profileKey, name: profileName } = getProfileEnv(type);
     const terminalTag = process.env.CODE_ENV_TERMINAL_TAG || null;
     const cwd = process.cwd();
     const startMs = Date.now();

package/src/commands/unset.ts

@@ -13,7 +13,9 @@ export function printUnset(config: Config): void {
     for (const type of DEFAULT_PROFILE_TYPES) {
         for (const key of getTypeDefaultUnsetKeys(type)) keySet.add(key);
     }
-    if (keySet.size === 0) return;
-    const lines = Array.from(keySet, (key) => `unset ${key}`);
+    const lines: string[] = ["command codenv __codex-clear"];
+    if (keySet.size > 0) {
+        lines.push(...Array.from(keySet, (key) => `unset ${key}`));
+    }
     console.log(lines.join("\n"));
 }

package/src/commands/use.ts

@@ -1,9 +1,7 @@
 /**
  * Use command - apply profile environment
  */
-import * as path from "path";
 import type { Config, ProfileType } from "../types";
-import { CODEX_AUTH_PATH } from "../constants";
 import { shellEscape, expandEnv } from "../shell/utils";
 import { inferProfileType, getProfileDisplayName } from "../profile/type";
 import { shouldRemoveCodexAuth } from "../profile/match";
@@ -28,6 +26,10 @@ export function buildUseLines(
     const unsetKeys = new Set<string>();
     const activeType = inferProfileType(profileName, profile, requestedType);
     const effectiveEnv = buildEffectiveEnv(profile, activeType);
+    const managedCodexKeys =
+        activeType === "codex"
+            ? new Set(["OPENAI_BASE_URL", "OPENAI_API_KEY"])
+            : new Set<string>();
 
     const addUnset = (key: string) => {
         if (unsetKeys.has(key)) return;
@@ -49,6 +51,13 @@ export function buildUseLines(
     }
 
     for (const key of Object.keys(effectiveEnv)) {
+        if (managedCodexKeys.has(key)) {
+            if (!unsetKeys.has(key)) {
+                unsetKeys.add(key);
+                unsetLines.push(`unset ${key}`);
+            }
+            continue;
+        }
         const value = effectiveEnv[key];
         if (value === null || value === undefined || value === "") {
             if (!unsetKeys.has(key)) {
@@ -75,16 +84,7 @@ export function buildUseLines(
     }
 
     if (shouldRemoveCodexAuth(profileName, profile, requestedType)) {
-        const codexApiKey = effectiveEnv.OPENAI_API_KEY;
-        const authDir = path.dirname(CODEX_AUTH_PATH);
-        const authJson =
-            codexApiKey === null || codexApiKey === undefined || codexApiKey === ""
-                ? "null"
-                : JSON.stringify({ OPENAI_API_KEY: String(codexApiKey) });
-        postLines.push(`mkdir -p ${shellEscape(authDir)}`);
-        postLines.push(
-            `printf '%s\\n' ${shellEscape(authJson)} > ${shellEscape(CODEX_AUTH_PATH)}`
-        );
+        postLines.push("command codenv __codex-sync");
     }
 
     if (Array.isArray(profile.removeFiles)) {

package/src/index.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * codenv - switch Claude/Codex env vars
+ * codenv - switch Claude/Codex profiles
  * Main entry point
  */
 import * as fs from "fs";
@@ -38,6 +38,11 @@ import {
 } from "./commands";
 import { logProfileUse } from "./usage";
 import { createReadline, askConfirm, runInteractiveAdd, runInteractiveUse } from "./ui";
+import {
+    clearManagedCodexProfile,
+    resolveCodexProfileFromEnv,
+    syncCodexProfile,
+} from "./codex/config";
 
 function getErrorMessage(err: unknown): string {
     return err instanceof Error ? err.message : String(err);
@@ -59,6 +64,30 @@ async function main() {
 
     const cmd = args[0];
     try {
+        if (cmd === "__codex-sync") {
+            const configPath =
+                process.env.CODE_ENV_CONFIG_PATH || findConfigPath(parsed.configPath);
+            const config = readConfigIfExists(configPath);
+            const profileKey = process.env.CODE_ENV_PROFILE_KEY_CODEX || null;
+            const profileName = process.env.CODE_ENV_PROFILE_NAME_CODEX || null;
+            const resolvedProfile = resolveCodexProfileFromEnv(
+                config,
+                profileKey,
+                profileName
+            );
+            if (!resolvedProfile) return;
+            syncCodexProfile(config, resolvedProfile);
+            return;
+        }
+
+        if (cmd === "__codex-clear") {
+            const configPath =
+                process.env.CODE_ENV_CONFIG_PATH || findConfigPath(parsed.configPath);
+            const config = readConfigIfExists(configPath);
+            clearManagedCodexProfile(config);
+            return;
+        }
+
         if (cmd === "init") {
             const initArgs = parseInitArgs(args.slice(1));
             const shellName = detectShell(initArgs.shell);

package/src/profile/display.ts

@@ -36,6 +36,20 @@ export function envMatchesProfile(profile: Profile | undefined): boolean {
     return Object.keys(profile.env).length > 0;
 }
 
+export function markerMatchesProfile(
+    profileKey: string,
+    profile: Profile | undefined,
+    activeType: ProfileType | null
+): boolean {
+    if (!activeType) return false;
+    const suffix = activeType.toUpperCase();
+    const activeKey = process.env[`CODE_ENV_PROFILE_KEY_${suffix}`];
+    if (activeKey) return activeKey === profileKey;
+    const activeName = process.env[`CODE_ENV_PROFILE_NAME_${suffix}`];
+    if (!activeName || !profile) return false;
+    return activeName === getProfileDisplayName(profileKey, profile, activeType);
+}
+
 // Forward declaration to avoid circular dependency
 // getResolvedDefaultProfileKeys will be imported from config/defaults
 export function buildListRows(
@@ -63,7 +77,9 @@ export function buildListRows(
         if (defaultLabel) noteParts.push(defaultLabel);
         if (note) noteParts.push(note);
         const noteText = noteParts.join(" | ");
-        const active = envMatchesProfile(safeProfile);
+        const active =
+            markerMatchesProfile(key, safeProfile, usageType) ||
+            envMatchesProfile(safeProfile);
         return { key, name: displayName, type, note: noteText, active, usageType };
     });
     rows.sort((a, b) => {

package/src/statusline/codex.ts

@@ -2,14 +2,11 @@
  * Codex CLI status line integration (official schema)
  */
 import * as fs from "fs";
-import * as os from "os";
 import * as path from "path";
 import type { Config } from "../types";
-import { expandEnv, resolvePath } from "../shell/utils";
+import { resolveCodexConfigPath } from "../codex/config";
 import { askConfirm, createReadline } from "../ui";
 
-const DEFAULT_CODEX_CONFIG_PATH = path.join(os.homedir(), ".codex", "config.toml");
-
 interface ParsedTuiConfig {
     statusLineItems: string[] | null;
 }
@@ -40,20 +37,6 @@ function parseBooleanEnv(value: string | undefined): boolean | null {
     return null;
 }
 
-function resolveCodexConfigPath(config: Config): string {
-    const envOverride = process.env.CODE_ENV_CODEX_CONFIG_PATH;
-    if (envOverride && String(envOverride).trim()) {
-        const expanded = expandEnv(String(envOverride).trim());
-        return resolvePath(expanded) || DEFAULT_CODEX_CONFIG_PATH;
-    }
-    const configOverride = config.codexStatusline?.configPath;
-    if (configOverride && String(configOverride).trim()) {
-        const expanded = expandEnv(String(configOverride).trim());
-        return resolvePath(expanded) || DEFAULT_CODEX_CONFIG_PATH;
-    }
-    return DEFAULT_CODEX_CONFIG_PATH;
-}
-
 function resolveDesiredStatusLineItems(config: Config): string[] | null {
     const raw = config.codexStatusline?.items;
     if (!Array.isArray(raw)) return null;