@songsid/agend 2.1.7-beta.5 → 2.1.7-beta.7

package/dist/backend/codex.d.ts

@@ -13,6 +13,8 @@ export declare class CodexBackend implements CliBackend {
     private configuredStatusLinePattern;
     /** Set by buildCommand when the resume plan fell back; read once by the daemon. */
     private launchWarning;
+    /** Set by writeConfig when the status_line could not be made verifiable (#931). */
+    private statusLineWarning;
     constructor(instanceDir: string);
     /**
      * Compute and (on first call for an existing instance) migrate to a SHORT
@@ -60,7 +62,18 @@ export declare class CodexBackend implements CliBackend {
     getBottomReadyPattern(): RegExp | null;
     /** Observed on real Codex 0.156.0: the live input row precedes its footer. */
     isDeliveryInputReadyPane(pane: string): boolean;
-    /** Live status chrome that must veto the broad prompt/context ready match. */
+    /**
+     * Live status chrome that must veto the broad prompt/context ready match.
+     *
+     * #964: Codex relabels the live status row with the reasoning title
+     * (`• Planning the edit (12s • esc to interrupt)`), so "Working" is only one
+     * of its titles. Match the row's shape instead, as observed on 0.156/0.157:
+     * a column-zero bullet, any title, then the `(… esc to interrupt)`
+     * affordance with an optional elapsed time (`12s`, `2m 05s`, `·` or `•`
+     * separator), optionally followed by ` · N background terminal(s) …`.
+     * Anchoring on the whole row, not on the phrase, keeps an agent reply that
+     * merely mentions "esc to interrupt" from pinning the pane as busy.
+     */
     getBusyPattern(): RegExp;
     /**
      * Codex 0.154's Astra theme can keep animating a star field around the input
@@ -101,16 +114,28 @@ export declare class CodexBackend implements CliBackend {
      */
     private disableStartupUpdateCheck;
     /**
-     * Ensure Codex's TUI status line shows context usage so /ctx can scrape it.
-     * Rules (never overwrites the user's status_line):
-     *   1. status_line already has a context item (context-remaining / -usage /
-     *      -used) → leave the whole config untouched (they already show context).
+     * Suppress Codex's rate-limit model-switch reminder for unattended instances.
+     * Codex documents this as `notice.hide_rate_limit_model_nudge` (a boolean in
+     * the `[notice]` table). This changes only the per-instance config; the
+     * runtime holdOnly dialog remains as defense-in-depth for older or changed
+     * CLI behavior. No model option is selected automatically.
+     */
+    private hideRateLimitModelNudge;
+    /**
+     * Ensure Codex's TUI status line shows context usage: the Context item is
+     * both what /ctx scrapes and the footer AgEnD's readiness proofs rely on.
+     * Rules (never drops or reorders the user's items):
+     *   1. the effective `tui.status_line` already has a context item
+     *      (context-remaining / -usage / -used) → leave the config untouched.
      *   2. no context item:
      *        - no status_line at all → write status_line = ["context-remaining"]
-     *        - status_line exists     → append "context-remaining" to it
-     * If a user's own status_line is long and truncates at 80 cols, that's their
-     * config — /ctx just reports context unavailable. Best-effort string edit of
-     * ~/.codex/config.toml (no toml dependency); other settings untouched.
+     *        - status_line exists     → prepend "context-remaining" to it
+     * Best-effort string edit (no TOML writer), but every candidate edit is
+     * parsed back and kept only if the effective `tui.status_line` becomes
+     * `["context-remaining", ...the user's items]`. A `status_line` key in some
+     * other table is not the TUI's and must not be the one edited (#931). If no
+     * edit can be verified, the launch warns the operator instead of leaving the
+     * pane silently unready.
      */
     private enableContextStatusLine;
     /** Null when the instance did not ask for a profile — today's behaviour. */

package/dist/backend/codex.js

@@ -109,6 +109,100 @@ function tomlTable(value) {
     return value !== null && typeof value === "object" && !Array.isArray(value) && !(value instanceof Date)
         ? value : null;
 }
+/**
+ * Set one boolean inside a TOML table while leaving unrelated config text
+ * intact. Existing tables keep their layout; when the table isn't declared,
+ * use the equivalent dotted key in the root table. Table headers embedded in
+ * multiline strings are ignored.
+ */
+function setTomlTableBoolean(content, table, key) {
+    const lines = content.split(/(?<=\n)/);
+    let multiline = null;
+    const headers = [];
+    for (let index = 0; index < lines.length; index++) {
+        const line = lines[index];
+        if (!multiline) {
+            const header = line.match(/^\s*(?:\[([^\[\]]+)\]|\[\[([^\[\]]+)\]\])\s*(?:#.*)?(?:\r?\n)?$/);
+            if (header)
+                headers.push({ index, name: (header[1] ?? header[2]).trim(), isArray: header[2] !== undefined });
+        }
+        for (const delimiter of ['"""', "'''"]) {
+            if (multiline && multiline !== delimiter)
+                continue;
+            let count = 0;
+            let pos = 0;
+            while ((pos = line.indexOf(delimiter, pos)) !== -1) {
+                if (delimiter === "'''" || pos === 0 || line[pos - 1] !== "\\")
+                    count++;
+                pos += delimiter.length;
+            }
+            if (count % 2 === 1)
+                multiline = multiline === delimiter ? null : delimiter;
+        }
+    }
+    const assignment = new RegExp(`^(\\s*${key}\\s*=\\s*)(?:true|false)(\\s*(?:#.*)?)(\\r?\\n?)$`);
+    const tableIndex = headers.findIndex(header => header.name === table && !header.isArray);
+    if (tableIndex >= 0) {
+        const start = headers[tableIndex].index + 1;
+        const end = headers[tableIndex + 1]?.index ?? lines.length;
+        for (let index = start; index < end; index++) {
+            const existing = lines[index].match(assignment);
+            if (existing) {
+                lines[index] = `${existing[1]}true${existing[2]}${existing[3]}`;
+                return lines.join("");
+            }
+        }
+        if (end > 0 && !lines[end - 1].endsWith("\n"))
+            lines[end - 1] += "\n";
+        lines.splice(end, 0, `${key} = true\n`);
+        return lines.join("");
+    }
+    // Inline tables cannot be extended with dotted keys, so update the simple
+    // root-level `notice = { ... }` form in place when it is present.
+    const rootEnd = headers[0]?.index ?? lines.length;
+    const dottedAssignment = new RegExp(`^(\\s*${table}\\s*\\.\\s*${key}\\s*=\\s*)(?:true|false)(\\s*(?:#.*)?)(\\r?\\n?)$`);
+    for (let index = 0; index < rootEnd; index++) {
+        const existing = lines[index].match(dottedAssignment);
+        if (existing) {
+            lines[index] = `${existing[1]}true${existing[2]}${existing[3]}`;
+            return lines.join("");
+        }
+        const inline = lines[index].match(new RegExp(`^(\\s*${table}\\s*=\\s*\\{)(.*)(\\})(\\s*(?:#.*)?)(\\r?\\n?)$`));
+        if (inline) {
+            const option = new RegExp(`(${key}\\s*=\\s*)(?:true|false)`);
+            const body = option.test(inline[2])
+                ? inline[2].replace(option, "$1true")
+                : `${inline[2].trim().length > 0 ? `${inline[2]}, ` : inline[2]}${key} = true`;
+            lines[index] = `${inline[1]}${body}${inline[3]}${inline[4]}${inline[5]}`;
+            return lines.join("");
+        }
+    }
+    // A dotted assignment is valid in the root table and can extend an implicit
+    // parent table created by `[notice.child]` without duplicating `[notice]`.
+    const line = `${table}.${key} = true\n`;
+    if (rootEnd === 0)
+        lines.unshift(line);
+    else if (lines[rootEnd - 1].endsWith("\n"))
+        lines.splice(rootEnd, 0, line);
+    else {
+        lines[rootEnd - 1] += "\n";
+        lines.splice(rootEnd, 0, line);
+    }
+    return lines.join("");
+}
+const CODEX_CONTEXT_STATUS_ITEM_RE = /^context-(?:remaining|usage|used)$/;
+/** The TUI's effective status_line items: null when unset, "invalid" when unusable. */
+function effectiveTuiStatusLine(content) {
+    try {
+        const items = tomlTable(tomlTable(parseToml(content))?.tui)?.status_line;
+        if (items === undefined)
+            return null;
+        return Array.isArray(items) && items.every(item => typeof item === "string") ? items : "invalid";
+    }
+    catch {
+        return "invalid";
+    }
+}
 function projectTrustTable(config, root) {
     const projects = tomlTable(tomlTable(config)?.projects);
     return projects ? tomlTable(projects[root]) : null;
@@ -493,6 +587,8 @@ const CODEX_FALLBACK_MODELS = [
     { id: "gpt-5.6-terra", label: "GPT-5.6 Terra", description: "balanced agentic coding" },
     { id: "gpt-5.6-luna", label: "GPT-5.6 Luna", description: "fast, efficient agentic coding" },
 ];
+/** A live Codex status row, whatever its title (#964); see getBusyPattern. */
+const CODEX_LIVE_STATUS_ROW = /(?:^|\n)•[ \t]+\S[^\r\n]*?\((?:(?:\d+[hms][ \t]+)+[•·][ \t]+)?esc to interrupt\)(?:[ \t]+·[ \t][^\r\n]*)?[ \t]*(?=\r?\n|$)/i;
 const CODEX_RUN_STATE_STATUS_ITEMS = new Set(["run-state", "status"]);
 // Deliberately small allow-list of built-in Codex status_line values. These
 // patterns identify positive rendered chrome; unknown/custom items fail closed.
@@ -545,6 +641,8 @@ export class CodexBackend {
     configuredStatusLinePattern;
     /** Set by buildCommand when the resume plan fell back; read once by the daemon. */
     launchWarning = null;
+    /** Set by writeConfig when the status_line could not be made verifiable (#931). */
+    statusLineWarning = null;
     constructor(instanceDir) {
         this.instanceDir = instanceDir;
         this.binaryPath = resolveBinary("codex");
@@ -706,9 +804,20 @@ export class CodexBackend {
         }
         return false;
     }
-    /** Live status chrome that must veto the broad prompt/context ready match. */
+    /**
+     * Live status chrome that must veto the broad prompt/context ready match.
+     *
+     * #964: Codex relabels the live status row with the reasoning title
+     * (`• Planning the edit (12s • esc to interrupt)`), so "Working" is only one
+     * of its titles. Match the row's shape instead, as observed on 0.156/0.157:
+     * a column-zero bullet, any title, then the `(… esc to interrupt)`
+     * affordance with an optional elapsed time (`12s`, `2m 05s`, `·` or `•`
+     * separator), optionally followed by ` · N background terminal(s) …`.
+     * Anchoring on the whole row, not on the phrase, keeps an agent reply that
+     * merely mentions "esc to interrupt" from pinning the pane as busy.
+     */
     getBusyPattern() {
-        return /(?:^|\n)•\s+Working\b[^\n]*\besc to interrupt\b/i;
+        return CODEX_LIVE_STATUS_ROW;
     }
     /**
      * Codex 0.154's Astra theme can keep animating a star field around the input
@@ -839,6 +948,7 @@ export class CodexBackend {
         atomicWritePrivate(join(this.isolatedCodexHome, "config.toml"), content);
         this.enableContextStatusLine();
         this.disableStartupUpdateCheck();
+        this.hideRateLimitModelNudge();
         // Write fleet instructions into AGENTS.md (additive via marker block)
         if (config.instructions) {
             try {
@@ -903,59 +1013,112 @@ export class CodexBackend {
         catch { /* best effort */ }
     }
     /**
-     * Ensure Codex's TUI status line shows context usage so /ctx can scrape it.
-     * Rules (never overwrites the user's status_line):
-     *   1. status_line already has a context item (context-remaining / -usage /
-     *      -used) → leave the whole config untouched (they already show context).
+     * Suppress Codex's rate-limit model-switch reminder for unattended instances.
+     * Codex documents this as `notice.hide_rate_limit_model_nudge` (a boolean in
+     * the `[notice]` table). This changes only the per-instance config; the
+     * runtime holdOnly dialog remains as defense-in-depth for older or changed
+     * CLI behavior. No model option is selected automatically.
+     */
+    hideRateLimitModelNudge() {
+        const configPath = join(this.isolatedCodexHome, "config.toml");
+        let content = "";
+        try {
+            content = readFileSync(configPath, "utf-8");
+        }
+        catch {
+            return;
+        }
+        const updated = setTomlTableBoolean(content, "notice", "hide_rate_limit_model_nudge");
+        if (updated !== content) {
+            try {
+                atomicWritePrivate(configPath, updated);
+            }
+            catch { /* best effort */ }
+        }
+    }
+    /**
+     * Ensure Codex's TUI status line shows context usage: the Context item is
+     * both what /ctx scrapes and the footer AgEnD's readiness proofs rely on.
+     * Rules (never drops or reorders the user's items):
+     *   1. the effective `tui.status_line` already has a context item
+     *      (context-remaining / -usage / -used) → leave the config untouched.
      *   2. no context item:
      *        - no status_line at all → write status_line = ["context-remaining"]
-     *        - status_line exists     → append "context-remaining" to it
-     * If a user's own status_line is long and truncates at 80 cols, that's their
-     * config — /ctx just reports context unavailable. Best-effort string edit of
-     * ~/.codex/config.toml (no toml dependency); other settings untouched.
+     *        - status_line exists     → prepend "context-remaining" to it
+     * Best-effort string edit (no TOML writer), but every candidate edit is
+     * parsed back and kept only if the effective `tui.status_line` becomes
+     * `["context-remaining", ...the user's items]`. A `status_line` key in some
+     * other table is not the TUI's and must not be the one edited (#931). If no
+     * edit can be verified, the launch warns the operator instead of leaving the
+     * pane silently unready.
      */
     enableContextStatusLine() {
         this.configuredStatusLineItems = undefined;
         this.configuredStatusLinePattern = undefined;
+        this.statusLineWarning = null;
         const configPath = join(this.isolatedCodexHome, "config.toml");
+        // The private copy is rebuilt from the shared one at every launch, so the
+        // operator must be pointed at the file their status_line actually lives in.
+        const sharedConfigPath = join(this.sharedCodexHome, "config.toml");
         let content = "";
         try {
             content = readFileSync(configPath, "utf-8");
         }
         catch { /* no file yet */ }
-        // TOML allows quoted keys: `"status_line" = [...]` and `['tui']` are both
-        // legal. The regexes below accept an optional surrounding quote pair so that
-        // users who write their config with quoted keys still get context-remaining
-        // injected correctly. Both single and double TOML quotes are accepted.
-        // Rule 1: any existing context item → don't touch anything.
-        if (/["']?status_line["']?\s*=\s*\[[^\]]*context-(remaining|usage|used)[^\]]*\]/.test(content))
-            return;
         const ITEM = "context-remaining";
-        const arr = content.match(/["']?status_line["']?\s*=\s*\[([^\]]*)\]/);
-        if (arr) {
+        const current = effectiveTuiStatusLine(content);
+        if (current === "invalid") {
+            this.statusLineWarning = t("codex.status_line_unverifiable", "tui.status_line is not a list of item names, or config.toml does not parse", sharedConfigPath);
+            return;
+        }
+        // Rule 1: the TUI already shows a context item → don't touch anything.
+        if (current?.some(item => CODEX_CONTEXT_STATUS_ITEM_RE.test(item)))
+            return;
+        // TOML allows quoted keys: `"status_line" = [...]`, `"tui"."status_line"`,
+        // `['tui']`. Every textual candidate is tried; parsing decides.
+        const candidates = [];
+        if (current) {
             // Rule 2b: prepend our item to the user's existing array (don't overwrite).
             // First position keeps "Context N% left" at the far left of the footer so a
             // long cwd/other items can't push it past 80 cols and truncate it.
-            const inner = arr[1].trim().replace(/^,\s*/, "").replace(/,\s*$/, "");
-            const newInner = inner.length ? `"${ITEM}", ${inner}` : `"${ITEM}"`;
-            content = content.replace(arr[0], `status_line = [${newInner}]`);
+            for (const m of content.matchAll(/["']?status_line["']?\s*=\s*\[([^\]]*)\]/g)) {
+                const inner = m[1].trim().replace(/^,\s*/, "").replace(/,\s*$/, "");
+                const newInner = inner.length ? `"${ITEM}", ${inner}` : `"${ITEM}"`;
+                candidates.push(`${content.slice(0, m.index)}status_line = [${newInner}]${content.slice(m.index + m[0].length)}`);
+            }
         }
         else {
             // Rule 2a: no status_line at all → add a minimal one.
-            if (content.length && !content.endsWith("\n"))
-                content += "\n";
+            const base = content.length && !content.endsWith("\n") ? `${content}\n` : content;
             // Also recognise quoted section headers: `["tui"]` and `['tui']`.
-            if (/^\[["']?tui["']?\]/m.test(content)) {
-                content = content.replace(/^\[["']?tui["']?\][^\n]*\n/m, h => `${h}status_line = ["${ITEM}"]\n`);
-            }
-            else {
-                content += `\n[tui]\nstatus_line = ["${ITEM}"]\n`;
+            if (/^\[["']?tui["']?\][^\n]*\n/m.test(base)) {
+                candidates.push(base.replace(/^\[["']?tui["']?\][^\n]*\n/m, h => `${h}status_line = ["${ITEM}"]\n`));
             }
+            candidates.push(`${base}\n[tui]\nstatus_line = ["${ITEM}"]\n`);
+            // A config that defines tui with dotted keys cannot take a [tui] table.
+            candidates.push(`tui.status_line = ["${ITEM}"]\n${base}`);
+            // Nor can an inline `tui = { … }` table: the item goes inside it.
+            candidates.push(base.replace(/^([ \t]*["']?tui["']?[ \t]*=[ \t]*\{)[ \t]*\}/m, `$1 status_line = ["${ITEM}"] }`));
+            candidates.push(base.replace(/^([ \t]*["']?tui["']?[ \t]*=[ \t]*\{)/m, `$1 status_line = ["${ITEM}"],`));
+        }
+        const wanted = [ITEM, ...(current ?? [])];
+        const fixed = candidates.find(candidate => {
+            const items = effectiveTuiStatusLine(candidate);
+            return Array.isArray(items) && items.length === wanted.length && items.every((item, i) => item === wanted[i]);
+        });
+        if (!fixed) {
+            this.statusLineWarning = t("codex.status_line_unverifiable", "no edit of tui.status_line could be verified", sharedConfigPath);
+            return;
         }
         try {
-            atomicWritePrivate(configPath, content);
+            atomicWritePrivate(configPath, fixed);
+        }
+        catch (err) {
+            // Never block launch on statusline config — but a verified edit that
+            // could not be written leaves the pane as unready as an unfixable one.
+            const reason = `the verified edit could not be written: ${err.code ?? "write failed"}`;
+            this.statusLineWarning = t("codex.status_line_unverifiable", reason, sharedConfigPath);
         }
-        catch { /* best effort — never block launch on statusline config */ }
     }
     /** Null when the instance did not ask for a profile — today's behaviour. */
     readProfile(config) {
@@ -1670,9 +1833,10 @@ export class CodexBackend {
         });
     }
     consumeLaunchWarning() {
-        const warning = this.launchWarning;
+        const warnings = [this.statusLineWarning, this.launchWarning].filter((w) => !!w);
+        this.statusLineWarning = null;
         this.launchWarning = null;
-        return warning;
+        return warnings.length ? warnings.join("\n") : null;
     }
     getQuitCommand() { return "/quit"; }
     getCompactCommand() { return "/compact"; }