@songsid/agend 2.3.5-alpha.3 → 2.3.5-alpha.5

package/dist/backend/codex.js

@@ -4,18 +4,21 @@ import { execFileSync } from "node:child_process";
 import { execFile } from "../child-process.js";
 import { promisify } from "node:util";
 import { basename, dirname, join, resolve } from "node:path";
+import { stripCodexPassiveHintRow, withCodexPassiveHintTail, CODEX_EMPTY_PASSIVE_COMPOSER, isCodexStatusAutocompleteComposer } from "./codex-footer-hints.js";
 import { codexPackageWarning } from "./codex-package.js";
 import { probeCliVersion, resolveBinary, shellQuote, validateModel, validateProvider, warnIfModelMismatch } from "./types.js";
 import { credentialHomeSpec, credentialProfileHome, prepareCredentialProfileHome, resolveCredentialProfile, } from "./credential-profile.js";
 import { getAgendHome } from "../paths.js";
 import { selectedGeneralHostSession } from "../general-binding.js";
 import { ResumeBlockedError } from "./types.js";
-import { CODEX_MODELS_CACHE_MAX_BYTES, codexShortHomeFor, readCodexEffortLevels, readCodexModelEffortLevels, resolveCodexLaunchModel } from "./codex-metadata.js";
+import { CODEX_MODELS_CACHE_MAX_BYTES, codexShortHomeFor, readCodexEffortLevels, readCodexModelEffortLevels, readCodexModelServiceTiers, resolveCodexLaunchModel } from "./codex-metadata.js";
 import { EFFORT_CAPABILITIES } from "./effort-metadata.js";
 import { codexEffort } from "./launch-effort.js";
+import { codexSpeed } from "./codex-speed.js";
 import { appendWithMarker, removeMarker } from "./marker-utils.js";
 import { checkResumeId, codexSiblingState, codexStateDbAbsent, codexThreadRowExists, cwdRolloutsProvenAbsent, findExactCwdCodexSession, planCodexResume, newestResumableRollout } from "./codex-session-lookup.js";
 import { t } from "../locale.js";
+import { snapshotCodexQuotaHistory, snapshotCodexSessionQuotaHistory } from "./codex-quota-history.js";
 import { quotaLine, quotaLowLine, quotaPausedLine } from "../quota-notice.js";
 import { parse as parseToml } from "smol-toml";
 import { selectionCard } from "../selection-card.js";
@@ -304,6 +307,11 @@ function setProjectTrusted(content, root) {
         throw new Error("Codex project trust is not effective");
     return updated;
 }
+/** A folder-trust prompt's cancel option, and the footer that must come with it. */
+const CODEX_TRUST_CANCEL_FOOTER = {
+    "Quit": /^\s*enter continue\s*·\s*esc quit\s*$/i,
+    "Back to Agent Command Center": /^\s*enter continue\s*·\s*esc back\s*$/i,
+};
 /** Only the bottom, live Codex 0.156 folder-access screen can own stdin. */
 function codexTrustPromptState(pane) {
     const noPrompt = { active: false, folder: null, root: null, rootNote: "absent", safeChoice: false, trustCursor: false };
@@ -347,21 +355,26 @@ function codexTrustPromptState(pane) {
     });
     // Unknown option orders, a moved cursor, a third option, or any different
     // footer are held for a human. Never guess where Enter would land.
+    // The cancel option and the footer come as a pair: "Quit" / "esc quit" (onboarding, and every codex before 0.167), or
+    // "Back to Agent Command Center" / "esc back" (0.167's startup trust screen, where Esc returns to the command center).
+    // Exactly one cancel option, and the footer that belongs to it.
+    const cancels = choices.filter(choice => Object.prototype.hasOwnProperty.call(CODEX_TRUST_CANCEL_FOOTER, choice.text));
+    const footerFits = cancels.length === 1 && CODEX_TRUST_CANCEL_FOOTER[cancels[0].text].test(rows[last]);
     const safeChoice = choices.length === 2
         && choices[0].row + 1 === choices[1].row
         && rows.slice(choices[1].row + 1, last).every(row => row.trim() === "")
         && choices[0].cursor === "›" && choices[0].number === "1" && choices[0].text === "Trust and continue"
-        && choices[1].cursor === "" && choices[1].number === "2" && choices[1].text === "Quit"
-        && /^\s*enter continue\s*·\s*esc quit\s*$/i.test(rows[last]);
-    const known = new Set(["Trust and continue", "Open restricted", "Quit"]);
-    // Exactly one selection marker, whichever form (› ❯ >), and it is on Trust; the footer is the one both 0.160 and 0.166
-    // show. Two markers, another footer mapping or an unknown option is held — never a guess where Enter lands (#2896 review).
+        && choices[1].cursor === "" && choices[1].number === "2" && cancels[0] === choices[1]
+        && footerFits;
+    const known = new Set(["Trust and continue", "Open restricted", ...Object.keys(CODEX_TRUST_CANCEL_FOOTER)]);
+    // Exactly one selection marker, whichever form (› ❯ >), and it is on Trust; the footer is the one its cancel option
+    // pairs with. Two markers, another footer mapping or an unknown option is held — never a guess where Enter lands (#2896 review).
     const atCursor = choices.filter(choice => choice.cursor !== "");
     const trustCursor = choices.length >= 2 && choices.every(choice => known.has(choice.text))
         && choices.every((choice, index) => index === 0 || choice.row === choices[index - 1].row + 1)
         && rows.slice(choices[choices.length - 1].row + 1, last).every(row => row.trim() === "")
         && atCursor.length === 1 && atCursor[0].cursor === "›" && atCursor[0].text === "Trust and continue"
-        && /^\s*enter continue\s*·\s*esc quit\s*$/i.test(rows[last]);
+        && footerFits;
     return { active: true, folder, root, rootNote, safeChoice, trustCursor };
 }
 /** Unknown/older trust layouts are still input-blocking, never auto-answered. */
@@ -1044,6 +1057,8 @@ export class CodexPaneDetectors {
     }
     /** Observed on real Codex 0.156.0: the live input row precedes its footer. */
     isDeliveryInputReadyPane(pane) {
+        if (this.nativeContextlessEmpty(pane))
+            return true;
         const frame = this.composerFrame(pane);
         if (!frame)
             return false;
@@ -1075,7 +1090,41 @@ export class CodexPaneDetectors {
      */
     ownsComposerRows(pane) {
         const frame = this.composerFrame(pane);
-        return !!frame?.contextFooter && ownedComposerRow(frame.rows) >= 0;
+        if (frame?.contextFooter)
+            return ownedComposerRow(frame.rows) >= 0;
+        // A paste owns its wrapped rows, not a new-paste readiness verdict. The native caller still proves its
+        // exact payload/operation and current sequence before Enter; a passive footer alone never grants input.
+        const rows = this.nativeContextlessRows(pane);
+        return rows !== null && ownedComposerRow(rows) >= 0;
+    }
+    // Codex 0.165 can restore a limit-only session before any Context value exists. This is the known native
+    // empty-composer/passive-footer layout, only for a resumed launch with our context-only status configuration.
+    // Other layouts retain their existing guard; this is not native's unknown-layout stability fallback.
+    nativeContextlessPattern() {
+        if (!this.paneDetectorContext?.windowsConpty || this.paneDetectorContext.contextlessResume !== true)
+            return null;
+        const items = this.readConfiguredStatusLineItems();
+        return items?.length === 1 && items[0] === "context-remaining" ? CODEX_EMPTY_PASSIVE_COMPOSER : null;
+    }
+    nativeContextlessEmpty(pane) {
+        return !!this.nativeContextlessPattern()?.test(pane) && !codexAppServerDisconnected(pane) && !this.getBusyPattern().test(pane)
+            && ![...this.getStartupDialogs(), ...this.getRuntimeDialogs()].some(dialog => dialog.pattern.test(pane) && (!dialog.isActive || dialog.isActive(pane)));
+    }
+    nativeContextlessRows(pane) {
+        if (!this.nativeContextlessPattern() || codexAppServerDisconnected(pane))
+            return null;
+        const rows = pane.replace(/\r/g, "").split("\n");
+        while (rows.length && !rows.at(-1).trim())
+            rows.pop();
+        if (isCodexStatusAutocompleteComposer(pane))
+            return rows;
+        const before = rows.length;
+        stripCodexPassiveHintRow(rows);
+        if (rows.length === before)
+            return null;
+        const remaining = [...rows];
+        stripCodexPassiveHintRow(remaining);
+        return remaining.length === rows.length ? rows : null;
     }
     /**
      * The screen above Codex's footer, shared by both readers: null when the footer is not a Codex footer at all or the
@@ -1088,11 +1137,7 @@ export class CodexPaneDetectors {
         const rows = pane.replace(/\r/g, "").split("\n");
         while (rows.length && !rows[rows.length - 1].trim())
             rows.pop();
-        if (this.paneDetectorContext?.windowsConpty && /^[ \t]*\? for shortcuts[ \t]*$/.test(rows.at(-1) ?? "")) {
-            rows.pop();
-            while (rows.length && !rows[rows.length - 1].trim())
-                rows.pop();
-        }
+        stripCodexPassiveHintRow(rows);
         const footer = rows.pop() ?? "";
         // Codex preserves other configured status-line items after the context
         // meter (observed on 0.156.0: "Context 100% left · GPT-6-Astra"). They
@@ -1141,10 +1186,15 @@ export class CodexPaneDetectors {
     isPeriodicRedrawIdlePane(pane) {
         if (codexAppServerDisconnected(pane))
             return false;
+        if (this.nativeContextlessEmpty(pane))
+            return true;
         // Astra's 0.154 theme animates U+22C6 star points across otherwise-stable
         // idle chrome.  Remove only that observed decorative glyph; broader
         // punctuation stripping could turn real tool output into a false prompt.
         const rows = pane.replace(/\r/g, "").split("\n").map(row => row.replace(/⋆/gu, ""));
+        while (rows.length && !rows.at(-1).trim())
+            rows.pop();
+        stripCodexPassiveHintRow(rows);
         let prompt = -1;
         for (let i = rows.length - 1; i >= 0; i--) {
             if (/^[>›]\s*Ask Codex to do anything\s*$/.test(rows[i])) {
@@ -1183,9 +1233,7 @@ export class CodexPaneDetectors {
         // U+22C6 is Codex's observed cosmetic starfield; it can be drawn in the
         // prompt, between prompt/footer, and below the footer. A drafted composer
         // is also idle once this same bottom footer proves it owns the screen.
-        const nativeTail = (pattern) => this.paneDetectorContext?.windowsConpty
-            ? new RegExp(pattern.source.slice(0, -1) + String.raw `(?:\r?\n[ \t]*\? for shortcuts[ \t]*)?(?:\r?\n[ \t⋆]*)*$`, pattern.flags) : pattern;
-        const contextReady = nativeTail(/(?:^|\n)[>›][ \t⋆]+(?!\d+\.)\S[^\r\n]*\r?\n(?:[ \t⋆]*\r?\n){0,3}[ \t⋆]+(?:[0-9a-f-]{36}[ \t]+·[ \t]+)?Context[ \t]+(?:\d+%[ \t]+(?:left|used)|\d+…|…)[^\r\n]*(?:\r?\n[ \t⋆]*)*$/i);
+        const contextReady = withCodexPassiveHintTail(/(?:^|\n)[>›][ \t⋆]+(?!\d+\.)\S[^\r\n]*\r?\n(?:[ \t⋆]*\r?\n){0,3}[ \t⋆]+(?:[0-9a-f-]{36}[ \t]+·[ \t]+)?Context[ \t]+(?:\d+%[ \t]+(?:left|used)|\d+…|…)[^\r\n]*(?:\r?\n[ \t⋆]*)*$/i);
         const footerPattern = this.configuredStatusLineFooterPattern();
         if (!footerPattern)
             return contextReady;
@@ -1194,15 +1242,15 @@ export class CodexPaneDetectors {
         // configured, that value must specifically be Ready. This is positive
         // structural proof, never a deny-list of known dialogs.
         const footerSource = footerPattern.source.slice(1, -1);
-        const noContextReady = nativeTail(new RegExp(String.raw `(?:^|\n)[>›][ \t⋆]*Ask Codex to do anything[ \t⋆]*\r?\n(?:[ \t⋆]*\r?\n){0,3}${footerSource}(?:\r?\n[ \t⋆]*)*$`, "iu"));
+        const noContextReady = withCodexPassiveHintTail(new RegExp(String.raw `(?:^|\n)[>›][ \t⋆]*Ask Codex to do anything[ \t⋆]*\r?\n(?:[ \t⋆]*\r?\n){0,3}${footerSource}(?:\r?\n[ \t⋆]*)*$`, "iu"));
         // #978: a configured footer that carries a Context item in any position
         // is the Context footer: same drafted-composer rule as Context-first. The
         // whole row must match the configured item grammar, so an arbitrary
         // indented line that merely contains `Context N% left` cannot pass.
         const configuredContextReady = this.configuredHasContextItem()
-            ? nativeTail(new RegExp(String.raw `(?:^|\n)[>›][ \t⋆]+(?!\d+\.)\S[^\r\n]*\r?\n(?:[ \t⋆]*\r?\n){0,3}(?=[^\r\n]*${CODEX_CONTEXT_ITEM})${footerSource}(?:\r?\n[ \t⋆]*)*$`, "iu"))
+            ? withCodexPassiveHintTail(new RegExp(String.raw `(?:^|\n)[>›][ \t⋆]+(?!\d+\.)\S[^\r\n]*\r?\n(?:[ \t⋆]*\r?\n){0,3}(?=[^\r\n]*${CODEX_CONTEXT_ITEM})${footerSource}(?:\r?\n[ \t⋆]*)*$`, "iu"))
             : null;
-        return new RegExp([contextReady.source, noContextReady.source, configuredContextReady?.source]
+        return new RegExp([contextReady.source, noContextReady.source, configuredContextReady?.source, this.nativeContextlessPattern()?.source]
             .filter((source) => !!source)
             .map(source => `(?:${source})`)
             .join("|"), "iu");
@@ -1697,6 +1745,8 @@ export class CodexBackend extends CodexPaneDetectors {
     authorizedTrust = null;
     /** Set by buildCommand when the resume plan fell back; read once by the daemon. */
     launchWarning = null;
+    quotaReplay = null;
+    quotaReplayHistory() { return this.quotaReplay; }
     /** Set by writeConfig when the status_line could not be made verifiable (#931). */
     statusLineWarning = null;
     /** #2357: set by buildCommand when the codex being launched lacks a package companion (codex-code-mode-host). */
@@ -1829,6 +1879,7 @@ export class CodexBackend extends CodexPaneDetectors {
         let cmd;
         this.launchWarning = null;
         this.lastLaunchResumes = false;
+        this.quotaReplay = null;
         // #2357: read-only (codex is never run here); a launch is not held for it — the operator is told once per launch.
         this.packageWarning = codexPackageWarning(this.binaryPath);
         const retainedGeneral = selectedGeneralHostSession(this.instanceDir, config.instanceName, "codex", config.workingDirectory);
@@ -1837,14 +1888,16 @@ export class CodexBackend extends CodexPaneDetectors {
             if (!check.ok)
                 throw new ResumeBlockedError(t("general_location.start_failed"), t("general_location.start_failed"));
             this.lastLaunchResumes = true;
+            this.quotaReplay = snapshotCodexQuotaHistory(check.rollout.path);
             cmd = `${this.binaryPath} resume ${shellQuote(retainedGeneral)} ${approvalFlag}`;
         }
         else if (config.skipResume) {
             cmd = `${this.binaryPath} ${approvalFlag}`;
         }
         else {
-            const resumeBy = (id, why, bytes) => {
+            const resumeBy = (id, why, bytes, path) => {
                 this.lastLaunchResumes = true;
+                this.quotaReplay = snapshotCodexQuotaHistory(path);
                 this.writeResumeAttempt(id);
                 const large = bytes !== null && bytes > CODEX_RESUME_LARGE_BYTES ? ` ${t("codex.resume_large", String(Math.round(bytes / (1024 * 1024))))}` : "";
                 this.launchWarning = why + large;
@@ -1868,7 +1921,7 @@ export class CodexBackend extends CodexPaneDetectors {
                 // M-2266: validated when it was asked for (restart_instance); checked again now, as the rollout may have moved.
                 const check = checkResumeId(sessionsDir, config.workingDirectory, oneShot);
                 if (check.ok)
-                    cmd = resumeBy(check.rollout.id, t("codex.resume_oneshot", config.workingDirectory, check.rollout.id), check.rollout.bytes);
+                    cmd = resumeBy(check.rollout.id, t("codex.resume_oneshot", config.workingDirectory, check.rollout.id), check.rollout.bytes, check.rollout.path);
                 else {
                     cmd = this.plannedCommand(config, approvalFlag, sessionsDir, resumeBy);
                     this.launchWarning = [t("codex.resume_oneshot_invalid", config.workingDirectory, oneShot, check.reason), this.launchWarning].filter(Boolean).join("\n");
@@ -1898,7 +1951,13 @@ export class CodexBackend extends CodexPaneDetectors {
             : { model: runs.model, levels: null, unproven: true });
         if (effort.arg)
             cmd += effort.arg;
-        this.quietLaunchNotes = effort.note ? [effort.note] : [];
+        // M-2446: the per-agent speed (codex-speed.ts) — Fast only where the running model's catalog entry offers it.
+        const speed = codexSpeed(config.backendOptions?.speed, runs.proven
+            ? readCodexModelServiceTiers({ isolatedHome: this.isolatedCodexHome, sharedHome: this.sharedCodexHome, model: runs.model })
+            : { model: runs.model, tiers: null, unproven: true });
+        if (speed.arg)
+            cmd += speed.arg;
+        this.quietLaunchNotes = [effort.note, speed.note].filter((n) => !!n);
         // AgEnD instances are unattended processes: an interactive self-update
         // picker blocks delivery and must never be enabled by a copied global or
         // managed config layer. Keep this last so the CLI override is authoritative.
@@ -2477,8 +2536,10 @@ export class CodexBackend extends CodexPaneDetectors {
     plannedCommand(config, approvalFlag, sessionsDir, resumeBy) {
         const plan = this.planResume(config);
         this.lastLaunchResumes = plan.mode === "resume" || plan.mode === "last";
-        if (plan.mode === "resume")
+        if (plan.mode === "resume") {
+            this.quotaReplay = snapshotCodexSessionQuotaHistory(this.stateDbPath(), config.workingDirectory, plan.id);
             return `${this.binaryPath} resume ${shellQuote(plan.id)} ${approvalFlag}`;
+        }
         if (plan.mode === "last") {
             this.launchWarning = t("codex.resume_db_unreadable_last", plan.cause);
             return `${this.binaryPath} resume --last ${approvalFlag}`;
@@ -2492,7 +2553,7 @@ export class CodexBackend extends CodexPaneDetectors {
         // there — `codex resume <id>` reads it.
         const found = newestResumableRollout(sessionsDir, config.workingDirectory, undefined, this.failedResumes());
         if (found)
-            return resumeBy(found.id, t("codex.resume_auto", config.workingDirectory, found.id), found.bytes);
+            return resumeBy(found.id, t("codex.resume_auto", config.workingDirectory, found.id), found.bytes, found.path);
         return `${this.binaryPath} ${approvalFlag}`;
     }
     /** The database this instance's codex writes (see planResume). */