@praeviso/code-env-switch 0.1.8 → 0.1.10

package/bin/statusline/codex.js

@@ -2,24 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureCodexStatuslineConfig = ensureCodexStatuslineConfig;
 /**
- * Codex CLI status line integration
+ * 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");
-const DEFAULT_STATUSLINE_COMMAND = [
-    "codenv",
-    "statusline",
-    "--type",
-    "codex",
-    "--sync-usage",
-];
-const DEFAULT_SHOW_HINTS = false;
-const DEFAULT_UPDATE_INTERVAL_MS = 300;
-const DEFAULT_TIMEOUT_MS = 1000;
 function parseBooleanEnv(value) {
     if (value === undefined)
         return null;
@@ -30,19 +18,23 @@ function parseBooleanEnv(value) {
         return false;
     return null;
 }
-function resolveCodexConfigPath(config) {
+function resolveDesiredStatusLineItems(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;
+    const raw = (_a = config.codexStatusline) === null || _a === void 0 ? void 0 : _a.items;
+    if (!Array.isArray(raw))
+        return null;
+    return raw
+        .map((entry) => String(entry).trim())
+        .filter((entry) => entry);
+}
+function resolveDesiredStatusLineConfig(config) {
+    const statusLineItems = resolveDesiredStatusLineItems(config);
+    if (statusLineItems === null)
+        return null;
+    return {
+        statusLineItems,
+        configPath: (0, config_1.resolveCodexConfigPath)(config),
+    };
 }
 function readConfig(filePath) {
     if (!fs.existsSync(filePath))
@@ -73,88 +65,75 @@ function stripInlineComment(value) {
     }
     return value.trim();
 }
-function unquote(value) {
-    const trimmed = value.trim();
-    if ((trimmed.startsWith("\"") && trimmed.endsWith("\"")) ||
-        (trimmed.startsWith("'") && trimmed.endsWith("'"))) {
-        return trimmed.slice(1, -1);
-    }
-    return trimmed;
-}
-function parseCommandValue(raw) {
-    const trimmed = raw.trim();
-    if (!trimmed)
-        return null;
-    if (trimmed.startsWith("[")) {
-        const items = [];
-        const regex = /"((?:\\.|[^"\\])*)"/g;
-        let match = null;
-        while ((match = regex.exec(trimmed))) {
-            const item = match[1].replace(/\\"/g, "\"").replace(/\\\\/g, "\\");
-            items.push(item);
-        }
-        return items.length > 0 ? items : null;
-    }
-    return unquote(trimmed);
-}
-function tokenizeCommand(command) {
-    const tokens = [];
-    let current = "";
+function hasUnquotedClosingBracket(value) {
     let inSingle = false;
     let inDouble = false;
-    let escape = false;
-    for (let i = 0; i < command.length; i++) {
-        const ch = command[i];
-        if (escape) {
-            current += ch;
-            escape = false;
-            continue;
-        }
-        if (ch === "\\" && !inSingle) {
-            escape = true;
+    for (let i = 0; i < value.length; i++) {
+        const ch = value[i];
+        if (ch === "\"" && !inSingle && value[i - 1] !== "\\") {
+            inDouble = !inDouble;
             continue;
         }
-        if (ch === "'" && !inDouble) {
+        if (ch === "'" && !inDouble && value[i - 1] !== "\\") {
             inSingle = !inSingle;
             continue;
         }
-        if (ch === "\"" && !inSingle) {
-            inDouble = !inDouble;
-            continue;
-        }
-        if (!inSingle && !inDouble && /\s/.test(ch)) {
-            if (current) {
-                tokens.push(current);
-                current = "";
-            }
-            continue;
+        if (!inSingle && !inDouble && ch === "]") {
+            return true;
         }
-        current += ch;
     }
-    if (current)
-        tokens.push(current);
-    return tokens;
-}
-function parseBooleanValue(raw) {
-    const normalized = raw.trim().toLowerCase();
-    if (normalized === "true")
-        return true;
-    if (normalized === "false")
-        return false;
-    return null;
+    return false;
 }
-function parseNumberValue(raw) {
+function parseTomlStringArray(raw) {
     const trimmed = raw.trim();
-    if (!trimmed)
+    if (!trimmed.startsWith("[") || !hasUnquotedClosingBracket(trimmed)) {
         return null;
-    const parsed = Number(trimmed);
-    if (!Number.isFinite(parsed))
+    }
+    if (/^\[\s*\]$/.test(trimmed))
+        return [];
+    const items = [];
+    const regex = /"((?:\\.|[^"\\])*)"|'([^']*)'/g;
+    let match = null;
+    while ((match = regex.exec(trimmed))) {
+        if (match[0].startsWith("\"")) {
+            items.push(match[1].replace(/\\"/g, "\"").replace(/\\\\/g, "\\"));
+            continue;
+        }
+        items.push(match[2] || "");
+    }
+    if (items.length === 0)
         return null;
-    return Math.floor(parsed);
+    return items;
+}
+function parseStatusLineItems(sectionText) {
+    const lines = sectionText.split(/\r?\n/).slice(1);
+    for (let i = 0; i < lines.length; i++) {
+        const trimmed = lines[i].trim();
+        if (!trimmed || trimmed.startsWith("#") || trimmed.startsWith(";"))
+            continue;
+        const matchLine = /^status_line\s*=\s*(.*)$/.exec(trimmed);
+        if (!matchLine)
+            continue;
+        const value = stripInlineComment(matchLine[1]);
+        if (!value.startsWith("["))
+            return null;
+        const parts = [value];
+        if (!hasUnquotedClosingBracket(value)) {
+            for (let j = i + 1; j < lines.length; j++) {
+                const next = stripInlineComment(lines[j]);
+                if (!next)
+                    continue;
+                parts.push(next);
+                if (hasUnquotedClosingBracket(next))
+                    break;
+            }
+        }
+        return parseTomlStringArray(parts.join(" "));
+    }
+    return null;
 }
-function parseStatusLineSection(text) {
+function parseSectionByHeader(text, headerRegex) {
     var _a;
-    const headerRegex = /^\s*\[tui\.status_line\]\s*$/m;
     const match = headerRegex.exec(text);
     if (!match || match.index === undefined)
         return null;
@@ -165,132 +144,83 @@ function parseStatusLineSection(text) {
     const end = nextHeaderMatch
         ? afterHeader + ((_a = nextHeaderMatch.index) !== null && _a !== void 0 ? _a : rest.length)
         : text.length;
-    const sectionText = text.slice(start, end).trimEnd();
-    const lines = sectionText.split(/\r?\n/).slice(1);
-    const config = {
-        command: null,
-        showHints: null,
-        updateIntervalMs: null,
-        timeoutMs: null,
-    };
-    for (const line of lines) {
-        const trimmed = line.trim();
-        if (!trimmed)
-            continue;
-        if (trimmed.startsWith("#") || trimmed.startsWith(";"))
-            continue;
-        const matchLine = /^([A-Za-z0-9_]+)\s*=\s*(.+)$/.exec(trimmed);
-        if (!matchLine)
-            continue;
-        const key = matchLine[1];
-        const rawValue = stripInlineComment(matchLine[2]);
-        if (key === "command") {
-            config.command = parseCommandValue(rawValue);
-        }
-        else if (key === "show_hints") {
-            config.showHints = parseBooleanValue(rawValue);
-        }
-        else if (key === "update_interval_ms") {
-            config.updateIntervalMs = parseNumberValue(rawValue);
-        }
-        else if (key === "timeout_ms") {
-            config.timeoutMs = parseNumberValue(rawValue);
-        }
-    }
     return {
         start,
         end,
-        sectionText,
-        config,
+        sectionText: text.slice(start, end).trimEnd(),
     };
 }
-function commandToArray(value) {
-    if (!value)
+function parseTuiSection(text) {
+    const section = parseSectionByHeader(text, /^\s*\[tui\]\s*$/m);
+    if (!section)
         return null;
-    if (Array.isArray(value)) {
-        return value.map((entry) => String(entry));
-    }
-    const trimmed = value.trim();
-    if (!trimmed)
-        return null;
-    return tokenizeCommand(trimmed);
+    return {
+        start: section.start,
+        end: section.end,
+        sectionText: section.sectionText,
+        config: {
+            statusLineItems: parseStatusLineItems(section.sectionText),
+        },
+    };
 }
-function commandMatches(existing, desired) {
+function parseLegacyStatusLineSection(text) {
+    return parseSectionByHeader(text, /^\s*\[tui\.status_line\]\s*$/m);
+}
+function statusLineItemsMatch(existing, desired) {
     if (!existing)
         return false;
-    const existingTokens = commandToArray(existing);
-    const desiredTokens = commandToArray(desired);
-    if (existingTokens && desiredTokens) {
-        if (existingTokens.length !== desiredTokens.length)
+    if (existing.length !== desired.length)
+        return false;
+    for (let i = 0; i < desired.length; i++) {
+        if (existing[i] !== desired[i])
             return false;
-        for (let i = 0; i < desiredTokens.length; i++) {
-            if (existingTokens[i] !== desiredTokens[i])
-                return false;
-        }
-        return true;
     }
-    if (typeof existing === "string" && typeof desired === "string") {
-        return existing.trim() === desired.trim();
-    }
-    return false;
-}
-function configMatches(config, desired) {
-    if (!commandMatches(config.command, desired.command))
-        return false;
-    if (config.showHints !== desired.showHints)
-        return false;
-    if (config.updateIntervalMs !== desired.updateIntervalMs)
-        return false;
-    if (config.timeoutMs !== desired.timeoutMs)
-        return false;
     return true;
 }
-function resolveDesiredCommand(config) {
-    var _a;
-    const raw = (_a = config.codexStatusline) === null || _a === void 0 ? void 0 : _a.command;
-    if (typeof raw === "string") {
-        const trimmed = raw.trim();
-        if (trimmed)
-            return trimmed;
-    }
-    else if (Array.isArray(raw)) {
-        const cleaned = raw
-            .map((entry) => String(entry).trim())
-            .filter((entry) => entry);
-        if (cleaned.length > 0)
-            return cleaned;
-    }
-    return DEFAULT_STATUSLINE_COMMAND;
+function configMatches(config, desired) {
+    return statusLineItemsMatch(config.statusLineItems, desired.statusLineItems);
 }
-function resolveDesiredStatusLineConfig(config) {
-    var _a, _b, _c, _d, _e, _f;
-    const showHints = (_b = (_a = config.codexStatusline) === null || _a === void 0 ? void 0 : _a.showHints) !== null && _b !== void 0 ? _b : DEFAULT_SHOW_HINTS;
-    const updateIntervalMs = (_d = (_c = config.codexStatusline) === null || _c === void 0 ? void 0 : _c.updateIntervalMs) !== null && _d !== void 0 ? _d : DEFAULT_UPDATE_INTERVAL_MS;
-    const timeoutMs = (_f = (_e = config.codexStatusline) === null || _e === void 0 ? void 0 : _e.timeoutMs) !== null && _f !== void 0 ? _f : DEFAULT_TIMEOUT_MS;
-    const command = resolveDesiredCommand(config);
-    const configPath = resolveCodexConfigPath(config);
-    return {
-        command,
-        showHints,
-        updateIntervalMs,
-        timeoutMs,
-        configPath,
-    };
+function formatStatusLineItems(items) {
+    const parts = items.map((item) => JSON.stringify(item)).join(", ");
+    return `[${parts}]`;
 }
-function formatCommandValue(command) {
-    if (Array.isArray(command)) {
-        const parts = command.map((part) => JSON.stringify(part)).join(", ");
-        return `[${parts}]`;
+function removeStatusLineSettingLines(lines) {
+    const kept = [];
+    let inMultilineArray = false;
+    for (const line of lines) {
+        const trimmed = line.trim();
+        if (inMultilineArray) {
+            const value = stripInlineComment(trimmed);
+            if (hasUnquotedClosingBracket(value)) {
+                inMultilineArray = false;
+            }
+            continue;
+        }
+        const matchLine = /^status_line\s*=\s*(.*)$/.exec(trimmed);
+        if (!matchLine) {
+            kept.push(line);
+            continue;
+        }
+        const value = stripInlineComment(matchLine[1]);
+        if (value.startsWith("[") && !hasUnquotedClosingBracket(value)) {
+            inMultilineArray = true;
+        }
     }
-    return JSON.stringify(command);
+    return kept;
 }
-function buildStatusLineSection(desired) {
-    const commandText = formatCommandValue(desired.command);
-    return (`[tui.status_line]\n` +
-        `command = ${commandText}\n` +
-        `show_hints = ${desired.showHints ? "true" : "false"}\n` +
-        `update_interval_ms = ${desired.updateIntervalMs}\n` +
-        `timeout_ms = ${desired.timeoutMs}\n`);
+function buildTuiSection(section, desired) {
+    const statusLine = `status_line = ${formatStatusLineItems(desired.statusLineItems)}`;
+    if (!section) {
+        return `[tui]\n${statusLine}\n`;
+    }
+    const lines = section.sectionText.split(/\r?\n/);
+    const header = lines[0].trim() === "[tui]" ? lines[0] : "[tui]";
+    const body = removeStatusLineSettingLines(lines.slice(1));
+    while (body.length > 0 && body[body.length - 1].trim() === "") {
+        body.pop();
+    }
+    body.push(statusLine);
+    return `${header}\n${body.join("\n")}\n`;
 }
 function upsertSection(text, section, newSection) {
     if (!section) {
@@ -309,6 +239,15 @@ function upsertSection(text, section, newSection) {
         suffix = `\n${suffix}`;
     return `${prefix}${newSection}${suffix}`;
 }
+function removeSection(text, section) {
+    let prefix = text.slice(0, section.start);
+    let suffix = text.slice(section.end);
+    if (prefix && !prefix.endsWith("\n"))
+        prefix += "\n";
+    if (suffix && !suffix.startsWith("\n"))
+        suffix = `\n${suffix}`;
+    return `${prefix}${suffix}`;
+}
 function writeConfig(filePath, text) {
     try {
         fs.mkdirSync(path.dirname(filePath), { recursive: true });
@@ -324,22 +263,32 @@ async function ensureCodexStatuslineConfig(config, enabled) {
     if (!enabled || disabled)
         return false;
     const desired = resolveDesiredStatusLineConfig(config);
+    if (!desired)
+        return false;
     const configPath = desired.configPath;
     const raw = readConfig(configPath);
-    const section = parseStatusLineSection(raw);
+    const legacySection = parseLegacyStatusLineSection(raw);
+    const base = legacySection ? removeSection(raw, legacySection) : raw;
+    const section = parseTuiSection(base);
     if (section && configMatches(section.config, desired))
         return false;
     const force = parseBooleanEnv(process.env.CODE_ENV_CODEX_STATUSLINE_FORCE) === true;
-    if (section && !force) {
-        console.log(`codenv: existing Codex status_line config in ${configPath}:`);
-        console.log(section.sectionText);
+    const hasExistingStatusLine = Boolean((section && Array.isArray(section.config.statusLineItems)) || legacySection);
+    if (hasExistingStatusLine && !force) {
+        console.log(`codenv: existing Codex tui.status_line config in ${configPath}:`);
+        if (section && Array.isArray(section.config.statusLineItems)) {
+            console.log(section.sectionText);
+        }
+        else if (legacySection) {
+            console.log(legacySection.sectionText);
+        }
         if (!process.stdin.isTTY || !process.stdout.isTTY) {
-            console.warn("codenv: no TTY available to confirm status_line overwrite.");
+            console.warn("codenv: no TTY available to confirm tui.status_line overwrite.");
             return false;
         }
         const rl = (0, ui_1.createReadline)();
         try {
-            const confirm = await (0, ui_1.askConfirm)(rl, "Overwrite Codex status_line config? (y/N): ");
+            const confirm = await (0, ui_1.askConfirm)(rl, "Overwrite Codex tui.status_line config? (y/N): ");
             if (!confirm)
                 return false;
         }
@@ -347,9 +296,9 @@ async function ensureCodexStatuslineConfig(config, enabled) {
             rl.close();
         }
     }
-    const updated = upsertSection(raw, section, buildStatusLineSection(desired));
+    const updated = upsertSection(base, section, buildTuiSection(section, desired));
     if (!writeConfig(configPath, updated)) {
-        console.error("codenv: failed to write Codex config; status_line not updated.");
+        console.error("codenv: failed to write Codex config; tui.status_line not updated.");
         return false;
     }
     return true;

package/bin/statusline/index.js

@@ -19,8 +19,17 @@ function buildStatuslineResult(args, config, configPath) {
     }
     let type = (0, input_1.normalizeTypeValue)(typeCandidate);
     const envProfile = (0, input_1.resolveEnvProfile)(type);
-    const profileKey = (0, utils_1.firstNonEmpty)(args.profileKey, envProfile.key, inputProfile ? inputProfile.key : null);
+    let profileKey = (0, utils_1.firstNonEmpty)(args.profileKey, envProfile.key, inputProfile ? inputProfile.key : null);
     let profileName = (0, utils_1.firstNonEmpty)(args.profileName, envProfile.name, inputProfile ? inputProfile.name : null);
+    const terminalTag = process.env.CODE_ENV_TERMINAL_TAG || null;
+    if (!profileKey && !profileName) {
+        const fallback = (0, usage_1.resolveProfileFromLog)(config, configPath, (0, type_1.normalizeType)(type || ""), terminalTag);
+        if (fallback) {
+            profileKey = fallback.profileKey;
+            profileName = fallback.profileName;
+        }
+    }
+    const sessionId = (0, input_1.getSessionId)(stdinInput);
     if (profileKey && !profileName && config.profiles && config.profiles[profileKey]) {
         const profile = config.profiles[profileKey];
         profileName = (0, type_1.getProfileDisplayName)(profileKey, profile, type || undefined);
@@ -37,7 +46,6 @@ function buildStatuslineResult(args, config, configPath) {
             type = inferred;
     }
     const cwd = (0, utils_1.firstNonEmpty)(args.cwd, process.env.CODE_ENV_CWD, (0, input_1.getWorkspaceDir)(stdinInput), stdinInput ? stdinInput.cwd : null, process.cwd());
-    const sessionId = (0, input_1.getSessionId)(stdinInput);
     const usageType = (0, type_1.normalizeType)(type || "");
     const stdinUsageTotals = (0, usage_2.getUsageTotalsFromInput)(stdinInput, usageType);
     const shouldSyncUsageFromSessions = args.syncUsage && !stdinUsageTotals;