@bli-cockpit/cli 0.2.253 → 0.2.254

package/dist/commands/memory-install-codex.js

@@ -90,7 +90,7 @@ async function applyCodexMcpTable(options) {
     if (tableMatches(raw, options.config)) {
         return { target: "codex_mcp", status: "already", reason: "already_current", path: file };
     }
-    const next = upsertTomlTable(raw, MEMORY_TOML_PATH, renderMemoryTable(options.config));
+    const next = upsertTomlTable(raw, MEMORY_TOML_PATH, renderMemoryTable(options.config), "memory-install");
     if (options.dryRun) {
         return { target: "codex_mcp", status: "would_install", reason: "dry_run", path: file };
     }

package/dist/commands/memory-install-toml.js

@@ -58,6 +58,40 @@ export function readTomlTable(text, tablePath) {
         // caller reports a mismatch instead of pretending the field matched.
         out[key] = parseTomlValue(trimmed.slice(equals + 1).trim());
     }
+    // A sub-table spelling of a key we write inline (`[<path>.env]`) is the same
+    // value; the inline key wins when both exist, matching what the writer leaves.
+    for (const key of FOLDED_SUBTABLE_KEYS) {
+        if (key in out)
+            continue;
+        const folded = readFoldedSubtable(text, [...tablePath, key]);
+        if (folded)
+            out[key] = folded;
+    }
+    return out;
+}
+/**
+ * Sub-tables of our table that the renderer writes inline. Only these are
+ * absorbed; deeper or unrelated sub-tables (`.tools.x`) are never ours.
+ */
+const FOLDED_SUBTABLE_KEYS = ["env"];
+function readFoldedSubtable(text, path) {
+    const span = findTomlTableSpan(text, path);
+    if (!span)
+        return null;
+    const out = {};
+    for (const line of text.split("\n").slice(span.start_line + 1, span.end_line)) {
+        const trimmed = line.trim();
+        if (!trimmed || trimmed.startsWith("#"))
+            continue;
+        const equals = trimmed.indexOf("=");
+        if (equals <= 0)
+            continue;
+        const key = unquoteKey(trimmed.slice(0, equals).trim());
+        const value = parseTomlValue(trimmed.slice(equals + 1).trim());
+        if (!key || typeof value !== "string")
+            return null;
+        out[key] = value;
+    }
     return out;
 }
 /**
@@ -65,8 +99,19 @@ export function readTomlTable(text, tablePath) {
  * absent. Everything outside the span is untouched, including trailing
  * whitespace and comments.
  */
-export function upsertTomlTable(text, tablePath, renderedTable) {
+export function upsertTomlTable(text, tablePath, renderedTable, logTag) {
     const block = renderedTable.replace(/\n+$/u, "");
+    // Writing `env` inline while `[<path>.env]` exists is a duplicate key, which
+    // Codex refuses to load. Drop the sub-table; the inline key carries the value.
+    for (const key of FOLDED_SUBTABLE_KEYS) {
+        if (!new RegExp(`^${key}\\s*=`, "mu").test(block))
+            continue;
+        const sub = findTomlTableSpan(text, [...tablePath, key]);
+        if (!sub)
+            continue;
+        text = removeTomlTable(text, [...tablePath, key]);
+        console.error(`[${logTag ?? "toml-table"}] env_subtable_folded ${JSON.stringify({ key, lines: sub.end_line - sub.start_line })}`);
+    }
     const span = findTomlTableSpan(text, tablePath);
     if (!span) {
         if (!text.trim())

package/dist/commands/public-root.js

@@ -21,7 +21,7 @@ export async function runCockpitCli(argv, io) {
   }
 
   if (command === "--version" || command === "-V" || command === "version") {
-    writeLine(io?.stdout ?? process.stdout, "0.2.253");
+    writeLine(io?.stdout ?? process.stdout, "0.2.254");
     return 0;
   }
 

package/dist/commands/tower-mcp-codex.js

@@ -23,7 +23,7 @@ export async function installCodexTowerIntegration(options) {
     if (tableMatches(raw, options.config)) {
         return { target: "tower_codex_mcp", status: "already", reason: "already_current", path: file };
     }
-    const next = upsertTomlTable(raw, TOWER_TOML_PATH, renderTowerTable(options.config));
+    const next = upsertTomlTable(raw, TOWER_TOML_PATH, renderTowerTable(options.config), "tower-mcp");
     if (options.dryRun) {
         return { target: "tower_codex_mcp", status: "would_install", reason: "dry_run", path: file };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bli-cockpit/cli",
-  "version": "0.2.253",
+  "version": "0.2.254",
   "private": false,
   "type": "module",
   "bin": {