@praeviso/code-env-switch 0.1.8 → 0.1.10

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) => {