@songsid/agend 2.1.6-beta.12 → 2.1.6-beta.13

package/README.md

@@ -123,6 +123,28 @@ graph LR
 | Antigravity CLI | `curl -fsSL https://antigravity.google/cli/install.sh \| bash` | `agy` (Google Sign-In) |
 | Grok Build | `curl -fsSL https://x.ai/cli/install.sh \| bash` | `grok` (x.ai OAuth device flow) |
 
+### Codex session upgrade note
+
+AgEnD now resumes Codex by an explicit, per-instance session ID. It never uses
+`codex resume --last`: that option can select another instance's conversation
+when worktrees or credential homes overlap. On the first restart after upgrading,
+an existing **live** Codex pane is linked to its exact open session when its
+rollout and writer lock can be verified. If a legacy pane was already stopped
+and has no instance-owned ID, the instance starts a new session and posts a
+one-time notice to its topic. Older rollout files remain on disk. A stored ID
+whose rollout cannot be verified is different: startup holds instead of
+silently opening a new conversation.
+
+To recover an older conversation, stop the instance, identify and verify its
+session UUID in your Codex session history, then run
+`agend fleet codex-resume <instance> <session-id>` and start the instance.
+The command refuses a different repository or a session with a live owner;
+it does not infer ownership from the newest session in a directory.
+If Codex keeps multiple rollout locks open after `/new`, AgEnD uses Codex's
+current-session footer to identify the new chat. Without that positive proof,
+automatic resume is held and the instance topic is notified; the existing
+conversation files remain available for an explicit manual attach.
+
 ## Requirements
 
 - Node.js >= 20

package/dist/backend/codex-session.d.ts

@@ -0,0 +1,45 @@
+export declare const CODEX_SESSION_ID: RegExp;
+export declare class CodexResumeConflictError extends Error {
+    readonly ownerPid: number | null;
+    constructor(ownerPid: number | null);
+}
+export declare class CodexResumeUnavailableError extends Error {
+    constructor(message?: string);
+}
+export declare class CodexResumeIdentityError extends CodexResumeUnavailableError {
+    constructor();
+}
+export interface CodexSessionRecord {
+    id: string;
+    /** Instance directory basename, never a credential/profile identifier. */
+    owner: string;
+    cwd: string;
+    rolloutPath: string;
+}
+/** Read only the first JSONL line. A rollout can contain private conversation text. */
+export declare function readCodexRolloutMeta(path: string): {
+    id: string;
+    cwd: string;
+} | null;
+/** Explicit/manual lookup; never infer ownership from the newest CWD row. */
+export declare function codexRolloutForId(home: string, id: string): {
+    id: string;
+    cwd: string;
+    rolloutPath: string;
+} | null;
+/** The first footer item is Codex's own `session-id`, not a guessed rollout order. */
+export declare function codexCurrentSessionFromPane(pane: string): string | null;
+/** A pane process group identifies candidates; `/new` can retain both locks. */
+export declare function codexSessionsForPane(panePid: number, sharedHome: string, procRoot?: string): Array<{
+    id: string;
+    cwd: string;
+    rolloutPath: string;
+}>;
+/** Compatibility helper: never choose among multiple open writer-lock pairs. */
+export declare function codexSessionForPane(panePid: number, sharedHome: string, procRoot?: string): {
+    id: string;
+    cwd: string;
+    rolloutPath: string;
+} | null;
+/** Any process holding this session's writer lock is a live competing owner. */
+export declare function codexSessionOwners(id: string, procRoot?: string): number[];

package/dist/backend/codex-session.js

@@ -0,0 +1,202 @@
+import { closeSync, openSync, readFileSync, readlinkSync, readdirSync, readSync, realpathSync } from "node:fs";
+import { execFileSync } from "node:child_process";
+import { basename, isAbsolute, join, sep } from "node:path";
+export const CODEX_SESSION_ID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+export class CodexResumeConflictError extends Error {
+    ownerPid;
+    constructor(ownerPid) {
+        super(ownerPid
+            ? `Codex conversation is still open in process ${ownerPid}; no second resumer was started. Close that owner, then restart this instance.`
+            : "Codex conversation is locked by another owner; no second resumer was started. Close that owner, then restart this instance.");
+        this.ownerPid = ownerPid;
+        this.name = "CodexResumeConflictError";
+    }
+}
+export class CodexResumeUnavailableError extends Error {
+    constructor(message = "Codex could not resume the verified session. It was preserved; automatic restart is paused. Check the pane and restart this instance after resolving the cause.") {
+        super(message);
+        this.name = "CodexResumeUnavailableError";
+    }
+}
+export class CodexResumeIdentityError extends CodexResumeUnavailableError {
+    constructor() {
+        super("Stored Codex session identity could not be verified. Its record and rollout were preserved; no new session was started. Inspect the session ID and rollout before a manual restart.");
+        this.name = "CodexResumeIdentityError";
+    }
+}
+/** Read only the first JSONL line. A rollout can contain private conversation text. */
+export function readCodexRolloutMeta(path) {
+    let fd;
+    try {
+        fd = openSync(path, "r");
+        const buf = Buffer.alloc(65_536);
+        const bytes = readSync(fd, buf, 0, buf.length, 0);
+        const end = buf.subarray(0, bytes).indexOf(10);
+        if (end < 0)
+            return null;
+        const row = JSON.parse(buf.toString("utf8", 0, end));
+        const id = row?.payload?.id;
+        const cwd = row?.payload?.cwd;
+        return row?.type === "session_meta" && typeof id === "string" && CODEX_SESSION_ID.test(id)
+            && typeof cwd === "string" && isAbsolute(cwd) ? { id, cwd } : null;
+    }
+    catch {
+        return null;
+    }
+    finally {
+        if (fd !== undefined)
+            closeSync(fd);
+    }
+}
+function procGroup(pid, procRoot) {
+    try {
+        const stat = readFileSync(join(procRoot, String(pid), "stat"), "utf8");
+        const afterName = stat.slice(stat.lastIndexOf(")") + 2).trim().split(/\s+/);
+        const group = Number(afterName[2]); // field 5 (pgrp); afterName[0] is field 3
+        return Number.isSafeInteger(group) ? group : null;
+    }
+    catch {
+        return null;
+    }
+}
+function processIds(procRoot) {
+    try {
+        return readdirSync(procRoot).filter(name => /^\d+$/.test(name)).map(Number);
+    }
+    catch {
+        return [];
+    }
+}
+function macOutput(command, args) {
+    try {
+        return execFileSync(command, args, { encoding: "utf8", timeout: 2_000, maxBuffer: 2_000_000 });
+    }
+    catch {
+        return "";
+    }
+}
+function paneProcessIds(panePid, procRoot) {
+    if (process.platform !== "darwin" || procRoot !== "/proc") {
+        return processIds(procRoot).filter(pid => procGroup(pid, procRoot) === panePid);
+    }
+    return macOutput("ps", ["-axo", "pid=,pgid="]).split("\n").flatMap(row => {
+        const [pid, group] = row.trim().split(/\s+/).map(Number);
+        return group === panePid && Number.isSafeInteger(pid) ? [pid] : [];
+    });
+}
+function openPaths(pid, procRoot) {
+    if (process.platform === "darwin" && procRoot === "/proc") {
+        return macOutput("lsof", ["-Fn", "-p", String(pid)]).split("\n")
+            .filter(row => row.startsWith("n/")).map(row => row.slice(1));
+    }
+    const dir = join(procRoot, String(pid), "fd");
+    try {
+        return readdirSync(dir).flatMap(fd => {
+            try {
+                return [readlinkSync(join(dir, fd))];
+            }
+            catch {
+                return [];
+            }
+        });
+    }
+    catch {
+        return [];
+    }
+}
+function* rolloutFiles(dir, depth = 0) {
+    if (depth > 4)
+        return;
+    try {
+        for (const entry of readdirSync(dir, { withFileTypes: true })) {
+            const path = join(dir, entry.name);
+            if (entry.isDirectory())
+                yield* rolloutFiles(path, depth + 1);
+            else if (entry.isFile() && entry.name.endsWith(".jsonl"))
+                yield path;
+        }
+    }
+    catch { /* missing sessions dir is ordinary on first install */ }
+}
+/** Explicit/manual lookup; never infer ownership from the newest CWD row. */
+export function codexRolloutForId(home, id) {
+    if (!CODEX_SESSION_ID.test(id))
+        return null;
+    for (const path of rolloutFiles(join(home, "sessions"))) {
+        if (!basename(path).endsWith(`${id}.jsonl`))
+            continue;
+        const meta = readCodexRolloutMeta(path);
+        if (meta?.id === id)
+            return { ...meta, rolloutPath: realpathSync(path) };
+    }
+    return null;
+}
+/** The first footer item is Codex's own `session-id`, not a guessed rollout order. */
+export function codexCurrentSessionFromPane(pane) {
+    const rows = pane.replace(/\r/g, "").split("\n");
+    while (rows.length && !rows[rows.length - 1].trim())
+        rows.pop();
+    const footer = rows.at(-1)?.trim() ?? "";
+    const match = footer.match(/^([0-9a-f-]{36})\s+·\s+Context\b/i);
+    if (!match || !CODEX_SESSION_ID.test(match[1]))
+        return null;
+    rows.pop();
+    while (rows.length && !rows[rows.length - 1].trim())
+        rows.pop();
+    // A quoted UUID-shaped transcript line is not current-session evidence.
+    // Only Codex's live empty input followed by its status footer counts.
+    return /^[>›]\s+Ask Codex to do anything\s*$/.test(rows.at(-1) ?? "") ? match[1] : null;
+}
+/** A pane process group identifies candidates; `/new` can retain both locks. */
+export function codexSessionsForPane(panePid, sharedHome, procRoot = "/proc") {
+    if (!Number.isSafeInteger(panePid) || panePid <= 0)
+        return [];
+    let sessionsRoot;
+    try {
+        sessionsRoot = realpathSync(join(sharedHome, "sessions")) + sep;
+    }
+    catch {
+        return [];
+    }
+    const candidates = new Map();
+    for (const pid of paneProcessIds(panePid, procRoot)) {
+        const paths = openPaths(pid, procRoot);
+        const lockIds = new Set(paths.map(path => basename(path).match(/^([0-9a-f-]{36})\.lock$/i)?.[1]).filter((id) => !!id && CODEX_SESSION_ID.test(id)));
+        for (const path of paths) {
+            if (!path.endsWith(".jsonl") || !path.includes(`${sep}sessions${sep}`))
+                continue;
+            let actual;
+            try {
+                actual = realpathSync(path);
+            }
+            catch {
+                continue;
+            }
+            if (!actual.startsWith(sessionsRoot))
+                continue;
+            const meta = readCodexRolloutMeta(actual);
+            if (meta && lockIds.has(meta.id))
+                candidates.set(meta.id, { ...meta, rolloutPath: actual });
+        }
+    }
+    return [...candidates.values()];
+}
+/** Compatibility helper: never choose among multiple open writer-lock pairs. */
+export function codexSessionForPane(panePid, sharedHome, procRoot = "/proc") {
+    const candidates = codexSessionsForPane(panePid, sharedHome, procRoot);
+    return candidates.length === 1 ? candidates[0] : null;
+}
+/** Any process holding this session's writer lock is a live competing owner. */
+export function codexSessionOwners(id, procRoot = "/proc") {
+    if (!CODEX_SESSION_ID.test(id))
+        return [];
+    const name = `${id}.lock`;
+    const pids = process.platform === "darwin" && procRoot === "/proc"
+        ? macOutput("ps", ["-axo", "pid=,comm="]).split("\n").flatMap(row => {
+            const match = row.trim().match(/^(\d+)\s+(.+)$/);
+            return match && basename(match[2]) === "codex" ? [Number(match[1])] : [];
+        })
+        : processIds(procRoot);
+    return pids.filter(pid => openPaths(pid, procRoot).some(path => basename(path) === name));
+}
+//# sourceMappingURL=codex-session.js.map

package/dist/backend/codex-session.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codex-session.js","sourceRoot":"","sources":["../../src/backend/codex-session.ts"],"names":[],"mappings":"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"}

package/dist/backend/codex.d.ts

@@ -1,13 +1,37 @@
 import { type CliBackend, type CliBackendConfig, type ErrorPattern, type InputUnavailableTransient, type ModelOption, type RuntimeDialog, type StartupDialog } from "./types.js";
+type CodexResumeDirectoryPrompt = {
+    active: boolean;
+    sessionCwd: string | null;
+    currentCwd: string | null;
+    safeChoice: boolean;
+};
+/** Captured from Codex 0.156; only the live, bottom-of-pane four-choice menu. */
+export declare function codexResumeDirectoryPromptState(pane: string): CodexResumeDirectoryPrompt;
+/** Unknown variants still own stdin; only the exact canonical menu may be answered. */
+export declare function codexResumeDirectoryVisible(pane: string): boolean;
+/** Codex's concurrent-owner screen is a hold, never an invitation to press R. */
+export declare function codexResumeLockActive(pane: string): boolean;
+/** A changed lock-screen footer is still a hold, never a ready prompt. */
+export declare function codexResumeLockVisible(pane: string): boolean;
+/** macOS lockf and Linux flock both fail immediately with status 75 on contention. */
+export declare function codexResumeClaimCommand(platform: NodeJS.Platform, lockPath: string, launch: string): string;
+/** Explicit, stopped-instance recovery for an old conversation without an AgEnD owner record. */
+export declare function attachCodexSession(instanceDir: string, sharedHome: string, currentCwd: string, id: string): void;
 export declare class CodexBackend implements CliBackend {
     private instanceDir;
+    private readonly procRoot;
     readonly binaryName = "codex";
     private binaryPath;
     private readonly sharedCodexHome;
     private readonly isolatedCodexHome;
     /** Which subscription this instance runs on, or null for the shared login. */
     private credentialProfile;
-    constructor(instanceDir: string);
+    /** Set only after preTrust wrote and read back this instance's private config. */
+    private authorizedTrust;
+    private activePanePid;
+    private resumeRecord;
+    private get unconfirmedSessionPath();
+    constructor(instanceDir: string, procRoot?: string);
     supportsQueuedInput(): boolean;
     /**
      * Codex's input row, from live captures on codex-cli 0.153.4: `› Ask Codex to
@@ -26,6 +50,8 @@ export declare class CodexBackend implements CliBackend {
      * (updatePickerDialog) before any delivery path reads this pattern.
      */
     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. */
     getBusyPattern(): RegExp;
     /**
@@ -49,6 +75,15 @@ export declare class CodexBackend implements CliBackend {
      */
     getQueuedInputMarker(): RegExp | null;
     buildCommand(config: CliBackendConfig): string;
+    setActivePanePid(pid: number | null): void;
+    /** A fresh launch has no resume identity; it must not be counted as --resume. */
+    canResume(workingDirectory: string): boolean;
+    hasSessionIdentity(): boolean;
+    hasInvalidSessionIdentity(workingDirectory: string): boolean;
+    hasUnconfirmedSessionIdentity(): boolean;
+    /** Positive owner evidence, not merely a stale lock-file name on disk. */
+    resumeOwner(workingDirectory: string): number | null;
+    private validResumeRecord;
     writeConfig(config: CliBackendConfig): void;
     /**
      * Stop Codex opening its "Update available!" picker when an instance starts.
@@ -68,16 +103,10 @@ 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).
-     *   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.
+     * The first status-line item is Codex's own current session ID. Unlike fd
+     * order, this changes when /new switches chats while old writer locks stay
+     * open. Keep context too, then preserve all user-selected remaining items.
+     * If the footer is hidden/truncated, checkpointing fails closed instead.
      */
     private enableContextStatusLine;
     /** Null when the instance did not ask for a profile — today's behaviour. */
@@ -127,13 +156,19 @@ export declare class CodexBackend implements CliBackend {
      */
     private cleanSharedConfig;
     getReadyPattern(): RegExp;
+    /** A proxy reply filters chrome per line; whole-pane readiness is separate. */
+    isProxyReplyChromeLine(line: string): boolean;
     getErrorPatterns(): ErrorPattern[];
     getStartupDialogs(): StartupDialog[];
+    private trustHoldDialog;
+    private resumeDirectoryHoldDialog;
+    private resumeLockHoldDialog;
     private updatePickerDialog;
+    private unknownSelectionHoldDialog;
     getRuntimeDialogs(): RuntimeDialog[];
     getInputUnavailableTransients(): InputUnavailableTransient[];
     getContextUsage(): number | null;
-    getSessionId(): string | null;
+    getSessionId(pane?: string): string | null;
     getQuitCommand(): string;
     getCompactCommand(): string;
     getClearCommand(): string;
@@ -195,3 +230,4 @@ export declare class CodexBackend implements CliBackend {
     }>;
     cleanup(config: CliBackendConfig): void;
 }
+export {};