@openrig/cli 0.6.10 → 0.6.12

package/daemon/dist/domain/community-harness-presets.js

@@ -0,0 +1,155 @@
+// Community harnesses: another community harness runs in a seat from a small data preset the person installs, one YAML file
+// per harness under $OPENRIG_HOME/community-harnesses/<name>.yaml. A preset names the harness, the command that starts it in the seat's
+// pane, its maintainer and the limits it declares. OpenRig hasn't tested these harnesses: it shows them as community harnesses,
+// never confirms their identity, and reads their activity only from what the screen shows. Built-in runtime names are
+// reserved, so a preset can't replace one.
+import { existsSync, readFileSync, readdirSync } from "node:fs";
+import { basename, join } from "node:path";
+import { parse as parseYaml } from "yaml";
+import { getDefaultOpenRigPath } from "../openrig-compat.js";
+import { BUILT_IN_RUNTIMES, isCommunityHarnessRuntime } from "./built-in-runtimes.js";
+export { BUILT_IN_RUNTIMES, isCommunityHarnessRuntime };
+export const COMMUNITY_HARNESS_PRESET_FORMAT = 1;
+const FIELDS = ["format", "name", "command", "maintainer", "limits"];
+const NAME = /^[a-z0-9][a-z0-9-]{0,62}$/;
+export function communityHarnessesDir() {
+    return getDefaultOpenRigPath("community-harnesses");
+}
+function parsePreset(name, path, text) {
+    const bad = (reason) => ({ ok: false, kind: "incompatible", path,
+        message: `community harness "${name}": the preset at ${path} can't be used: ${reason}` });
+    let doc;
+    try {
+        doc = parseYaml(text);
+    }
+    catch {
+        return bad("it isn't valid YAML");
+    }
+    if (!doc || typeof doc !== "object" || Array.isArray(doc))
+        return bad("it isn't a YAML mapping");
+    const raw = doc;
+    if (raw.format !== COMMUNITY_HARNESS_PRESET_FORMAT) {
+        return bad(`it declares format ${JSON.stringify(raw.format ?? null)}; this OpenRig reads format ${COMMUNITY_HARNESS_PRESET_FORMAT}`);
+    }
+    const unknown = Object.keys(raw).filter(key => !FIELDS.includes(key));
+    if (unknown.length)
+        return bad(`unknown field${unknown.length > 1 ? "s" : ""} ${unknown.join(", ")} (format ${COMMUNITY_HARNESS_PRESET_FORMAT} has ${FIELDS.join(", ")})`);
+    if (raw.name !== name)
+        return bad(`its name is ${JSON.stringify(raw.name ?? null)}, not "${name}" (the file name)`);
+    for (const key of ["command", "maintainer"]) {
+        if (typeof raw[key] !== "string" || !raw[key].trim())
+            return bad(`${key} must be a non-empty string`);
+    }
+    const shell = shellSyntaxIn(raw.command);
+    if (shell) {
+        return bad(`command must be a single program and its arguments; shell syntax such as ${shell} isn't supported: put it in a script and name the script`);
+    }
+    const limits = raw.limits ?? [];
+    if (!Array.isArray(limits) || limits.some(limit => typeof limit !== "string" || !limit.trim())) {
+        return bad("limits must be a list of non-empty strings");
+    }
+    return { ok: true, preset: { name, command: raw.command, maintainer: raw.maintainer, limits: limits, path } };
+}
+/** The first shell construct in a preset command, or null when it's one program with its arguments. The command is
+ *  typed into the seat pane's shell as `/usr/bin/env K=V … <command>` (or staged into a script run by sh), so an
+ *  operator, redirection, substitution, history expansion or newline would act on that line outside the program, and an
+ *  alias isn't a program. Keeping to one program and its arguments keeps shell syntax out of the line; it doesn't
+ *  isolate the program from a shell (`sh -c '…'` is still a program and its arguments). Single and double quotes may
+ *  group an argument; a backslash or `!` is accepted only inside single quotes, where the shell reads it literally. */
+function shellSyntaxIn(command) {
+    let quote = null;
+    for (let i = 0; i < command.length; i++) {
+        const c = command[i];
+        const next = command[i + 1];
+        if (quote === "'") {
+            if (c === "'")
+                quote = null;
+            continue;
+        }
+        // The shell reads \" or \' as a literal quote, not a grouping one; a scan without escapes would misread what follows.
+        if (c === "\\")
+            return "a backslash escape";
+        if (c === "!")
+            return "! (history expansion)";
+        if (c === "\n" || c === "\r")
+            return "a newline";
+        if (c === "`")
+            return "`…` (command substitution)";
+        if (c === "$" && next === "(")
+            return "$(…) (command substitution)";
+        if (quote === '"') {
+            if (c === '"')
+                quote = null;
+            continue;
+        }
+        if (c === "'" || c === '"') {
+            quote = c;
+            continue;
+        }
+        if (c === "&" && next === "&")
+            return "&&";
+        if (c === "|" && next === "|")
+            return "||";
+        if (c === "|")
+            return "|";
+        if (c === "&")
+            return "&";
+        if (c === ";")
+            return ";";
+        if (c === "<" || c === ">")
+            return "a redirection (< or >)";
+        if (c === "(" || c === ")")
+            return "a subshell ( … )";
+    }
+    return quote ? "an unclosed quote" : null;
+}
+/** The installed preset for a community harness, or why there isn't a usable one. */
+export function loadCommunityHarnessPreset(name, dir = communityHarnessesDir()) {
+    const path = join(dir, `${name}.yaml`);
+    if (BUILT_IN_RUNTIMES.has(name)) {
+        return { ok: false, kind: "incompatible", path, message: `"${name}" is a built-in runtime; a community harness preset can't use that name` };
+    }
+    // The name check comes first: it keeps a runtime name from reaching outside the directory.
+    if (!NAME.test(name)) {
+        if (name === basename(name) && !name.startsWith(".") && existsSync(path)) {
+            return { ok: false, kind: "incompatible", path,
+                message: `community harness "${name}": the preset at ${path} can't be used: its name must be lowercase letters, digits and hyphens, starting with a letter or digit` };
+        }
+        return { ok: false, kind: "missing", path, message: `no community harness preset named "${name}" is installed (looked for ${path})` };
+    }
+    if (!existsSync(path)) {
+        return { ok: false, kind: "missing", path, message: `no community harness preset named "${name}" is installed (looked for ${path})` };
+    }
+    let text;
+    try {
+        text = readFileSync(path, "utf-8");
+    }
+    catch {
+        return { ok: false, kind: "incompatible", path, message: `community harness "${name}": the preset at ${path} couldn't be read` };
+    }
+    return parsePreset(name, path, text);
+}
+/** Every preset file in the directory, usable or not, sorted by name. */
+export function listCommunityHarnessPresets(dir = communityHarnessesDir()) {
+    if (!existsSync(dir))
+        return [];
+    let files;
+    try {
+        files = readdirSync(dir).filter(file => file.endsWith(".yaml")).sort();
+    }
+    catch {
+        return [];
+    }
+    return files.map(file => loadCommunityHarnessPreset(file.slice(0, -".yaml".length), dir));
+}
+export function communityHarnessLabel(runtime, dir = communityHarnessesDir()) {
+    const found = loadCommunityHarnessPreset(runtime, dir);
+    return {
+        harness: runtime, community: true, testedByOpenRig: false,
+        maintainer: found.ok ? found.preset.maintainer : null,
+        limits: found.ok ? found.preset.limits : [],
+        identity: "not confirmed", needsInput: "from the screen only: no harness prompt pattern",
+        ...(found.ok ? {} : { presetError: found.message }),
+    };
+}
+//# sourceMappingURL=community-harness-presets.js.map

package/daemon/dist/domain/community-harness-presets.js.map

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

package/daemon/dist/domain/composer-prompts.d.ts

@@ -0,0 +1,118 @@
+/**
+ * One place for the composer/prompt glyphs and the shapes built from them.
+ *
+ * The send-readiness classifier, the staged-input inspector, the startup
+ * submission guard and the CLI's staged-at-prompt detector all have to agree on
+ * what a composer prompt looks like. They used to each carry their own copy:
+ * Claude Code draws `❯`, Codex draws `›`, and Codex 0.153 variants draw `»`
+ * (#79). A renderer change or a new glyph must land here once, so the send
+ * verify path and the staged-input check can never disagree.
+ */
+/** Every glyph a harness has been observed to draw as its composer prompt. */
+export declare const COMPOSER_PROMPT_CHARS: readonly ["❯", "›", "»"];
+/** Character-class fragment (without brackets) for the prompt glyphs. */
+export declare const COMPOSER_PROMPT_CLASS: string;
+/**
+ * The glyph set for one runtime. A Claude pane uses `❯`; a Codex pane uses `›`
+ * (and `»` on 0.153 variants). Only an unknown runtime takes the union, because
+ * a multi-line draft's continuation can itself start with another harness's
+ * glyph (a quoted Codex line inside a Claude draft, say), and taking the last
+ * such line as the composer would misread the staged text.
+ */
+export declare function composerPromptClassForRuntime(runtime: string | null | undefined): string;
+/** A numbered option line (`❯ 1. Yes`, `› 2. No`): a prompt selection, never staged input. */
+export declare const COMPOSER_SELECTION_PATTERN: RegExp;
+/** Same selection shape, matched line-wise across a multi-line scan window. */
+export declare const COMPOSER_SELECTION_SCAN_PATTERN: RegExp;
+/**
+ * The broader numbered-option exclusion the staged-input checks always had:
+ * number plus dot, with or without a space (`❯ 1.Yes` is still a selector). A
+ * compact option must never be confirmed or healed as staged text.
+ */
+export declare function composerSelectionPrefixPattern(promptClass?: string): RegExp;
+/**
+ * A numbered-option line with either separator (`❯ 1. Yes`, `› 1) No`, `» 2) Later`):
+ * a prompt selection, never the typed answer. The prompt-answer path accepts both
+ * `.` and `)` after the number, unlike the staged-input prefix exclusion above.
+ */
+export declare function composerNumberedChoicePattern(promptClass?: string): RegExp;
+/** Empty composer: prompt glyph, optional whitespace, end of line. */
+export declare const COMPOSER_EMPTY_PATTERN: RegExp;
+/** Codex renders a fixed placeholder in its empty composer (`›` or 0.153's `»`). */
+export declare const COMPOSER_EMPTY_CODEX_PLACEHOLDER_PATTERN: RegExp;
+/** Draft present: prompt glyph followed by non-whitespace text. */
+export declare const COMPOSER_DRAFT_PATTERN: RegExp;
+/** True when a line begins with any composer prompt glyph (union default). */
+export declare const COMPOSER_PROMPT_LINE_PATTERN: RegExp;
+/**
+ * Index of the last composer prompt line in a capture, or -1 when the capture
+ * carries none. Only the last one can be the current input; everything above it
+ * is transcript history and a bare Enter there could drive an old prompt.
+ * `promptClass` scopes the glyphs to a known runtime; the union is the default
+ * for callers that have no runtime (the advisory classifier and CLI detector).
+ */
+export declare function findComposerInputLineIndex(lines: string[], promptClass?: string): number;
+/** Strip a leading prompt glyph from a composer line. */
+export declare function stripComposerPromptGlyph(line: string, promptClass?: string): string;
+/** Read the prompt once for both advisory draft recognition and cursor-bound
+ * input checks. Keep the one prompt-space separate from authored whitespace.
+ */
+export declare function readComposerPromptLine(line: string, promptClass?: string): {
+    indent: string;
+    glyph: string;
+    text: string;
+    prefix: number;
+} | null;
+/**
+ * Distinct prompt glyphs in the capture up to and including `inputIndex`.
+ * The walk does not stop at a blank line or a rule: a multi-line draft can
+ * hold either, and the ambiguous unknown-runtime read has to see the
+ * unrelated first line that precedes them.
+ */
+export declare function composerGlyphKindsInBlock(lines: string[], inputIndex: number): Set<string>;
+/**
+ * True when an unknown-runtime read of this composer block is ambiguous: the
+ * block holds more than one prompt glyph kind, so there is no runtime to say
+ * which line is the live input. A caller must keep the union for unknown
+ * runtimes but fail closed here, exactly as the pre-shared-matcher check did.
+ */
+export declare function composerPromptIsAmbiguous(lines: string[], inputIndex: number, promptClass?: string): boolean;
+export interface ComposerSnapshot {
+    screen: string;
+    cursor: {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    };
+    inMode: boolean;
+}
+export interface ComposerOwnership {
+    text: string;
+    frame: string;
+}
+export interface ComposerInput {
+    state: "empty" | "text" | "unknown";
+    rows: string[];
+    columns: number;
+    frame?: string;
+    pasteMatchesExpected?: boolean;
+    cursorAtEnd: boolean;
+    collapsedPaste: string | null;
+    /** A proven display-only suffix, so readiness can reuse the same input read. */
+    ghost?: {
+        line: number;
+        offset: number;
+        continuationRows: number;
+    };
+}
+export declare const COMPOSER_COLLAPSED_PASTE_PATTERN: RegExp;
+/** Preserve characters and spaces within rows. Only a real line break, a full
+ * terminal row, or a word that cannot fit may explain a rendered row boundary.
+ */
+export declare function composerContainsOwnedText(input: ComposerInput, expected: string): boolean;
+/** An opaque label may be remembered only immediately after this lease pasted
+ * the text. Subsequent submission requires that same complete label and cursor.
+ */
+export declare function ownCollapsedPaste(input: ComposerInput, expected: string): string | null;
+//# sourceMappingURL=composer-prompts.d.ts.map

package/daemon/dist/domain/composer-prompts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"composer-prompts.d.ts","sourceRoot":"","sources":["../../src/domain/composer-prompts.ts"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AAEH,8EAA8E;AAC9E,eAAO,MAAM,qBAAqB,0BAA2B,CAAC;AAE9D,yEAAyE;AACzE,eAAO,MAAM,qBAAqB,QAAiC,CAAC;AAIpE;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAIxF;AAOD,8FAA8F;AAC9F,eAAO,MAAM,0BAA0B,QAAyD,CAAC;AACjG,+EAA+E;AAC/E,eAAO,MAAM,+BAA+B,QAA8D,CAAC;AAC3G;;;;GAIG;AACH,wBAAgB,8BAA8B,CAAC,WAAW,GAAE,MAA8B,GAAG,MAAM,CAElG;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,WAAW,GAAE,MAA8B,GAAG,MAAM,CAEjG;AAED,sEAAsE;AACtE,eAAO,MAAM,sBAAsB,QAAgD,CAAC;AACpF,oFAAoF;AACpF,eAAO,MAAM,wCAAwC,QAAyC,CAAC;AAC/F,mEAAmE;AACnE,eAAO,MAAM,sBAAsB,QAAkD,CAAC;AACtF,8EAA8E;AAC9E,eAAO,MAAM,4BAA4B,QAA2C,CAAC;AAErF;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,WAAW,GAAE,MAA8B,GAAG,MAAM,CAM/G;AAED,yDAAyD;AACzD,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,GAAE,MAA8B,GAAG,MAAM,CAE1G;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,GAAE,MAA8B;;;;;SAM/F;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAO1F;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,GAAE,MAA8B,GAAG,OAAO,CAGnI;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAChE,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,iBAAiB;IAAG,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE;AAElE,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAAC;IACpC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,WAAW,EAAE,OAAO,CAAC;IACrB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,gFAAgF;IAChF,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,gBAAgB,EAAE,MAAM,CAAA;KAAE,CAAC;CACpE;AAED,eAAO,MAAM,gCAAgC,QAAyC,CAAC;AAEvF;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAsBzF;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAIvF"}

package/daemon/dist/domain/composer-prompts.js

@@ -0,0 +1,165 @@
+import stringWidth from "string-width";
+/**
+ * One place for the composer/prompt glyphs and the shapes built from them.
+ *
+ * The send-readiness classifier, the staged-input inspector, the startup
+ * submission guard and the CLI's staged-at-prompt detector all have to agree on
+ * what a composer prompt looks like. They used to each carry their own copy:
+ * Claude Code draws `❯`, Codex draws `›`, and Codex 0.153 variants draw `»`
+ * (#79). A renderer change or a new glyph must land here once, so the send
+ * verify path and the staged-input check can never disagree.
+ */
+/** Every glyph a harness has been observed to draw as its composer prompt. */
+export const COMPOSER_PROMPT_CHARS = ["❯", "›", "»"];
+/** Character-class fragment (without brackets) for the prompt glyphs. */
+export const COMPOSER_PROMPT_CLASS = COMPOSER_PROMPT_CHARS.join("");
+const promptChar = `[${COMPOSER_PROMPT_CLASS}]`;
+/**
+ * The glyph set for one runtime. A Claude pane uses `❯`; a Codex pane uses `›`
+ * (and `»` on 0.153 variants). Only an unknown runtime takes the union, because
+ * a multi-line draft's continuation can itself start with another harness's
+ * glyph (a quoted Codex line inside a Claude draft, say), and taking the last
+ * such line as the composer would misread the staged text.
+ */
+export function composerPromptClassForRuntime(runtime) {
+    if (runtime === "claude-code")
+        return "❯";
+    if (runtime === "codex")
+        return "›»";
+    return COMPOSER_PROMPT_CLASS;
+}
+/** Build a line-anchored pattern for one prompt-glyph set. */
+function promptPattern(promptClass, suffix, flags = "") {
+    return new RegExp(`^[${promptClass}]${suffix}`, flags);
+}
+/** A numbered option line (`❯ 1. Yes`, `› 2. No`): a prompt selection, never staged input. */
+export const COMPOSER_SELECTION_PATTERN = promptPattern(COMPOSER_PROMPT_CLASS, "\\s*\\d+\\.\\s");
+/** Same selection shape, matched line-wise across a multi-line scan window. */
+export const COMPOSER_SELECTION_SCAN_PATTERN = promptPattern(COMPOSER_PROMPT_CLASS, "\\s*\\d+\\.\\s", "m");
+/**
+ * The broader numbered-option exclusion the staged-input checks always had:
+ * number plus dot, with or without a space (`❯ 1.Yes` is still a selector). A
+ * compact option must never be confirmed or healed as staged text.
+ */
+export function composerSelectionPrefixPattern(promptClass = COMPOSER_PROMPT_CLASS) {
+    return promptPattern(promptClass, "\\s*\\d+\\.");
+}
+/**
+ * A numbered-option line with either separator (`❯ 1. Yes`, `› 1) No`, `» 2) Later`):
+ * a prompt selection, never the typed answer. The prompt-answer path accepts both
+ * `.` and `)` after the number, unlike the staged-input prefix exclusion above.
+ */
+export function composerNumberedChoicePattern(promptClass = COMPOSER_PROMPT_CLASS) {
+    return promptPattern(promptClass, "\\s*\\d+[.)]");
+}
+/** Empty composer: prompt glyph, optional whitespace, end of line. */
+export const COMPOSER_EMPTY_PATTERN = promptPattern(COMPOSER_PROMPT_CLASS, "\\s*$");
+/** Codex renders a fixed placeholder in its empty composer (`›` or 0.153's `»`). */
+export const COMPOSER_EMPTY_CODEX_PLACEHOLDER_PATTERN = /^[›»]\s+Ask Codex to do anything\s*$/;
+/** Draft present: prompt glyph followed by non-whitespace text. */
+export const COMPOSER_DRAFT_PATTERN = promptPattern(COMPOSER_PROMPT_CLASS, "\\s+\\S");
+/** True when a line begins with any composer prompt glyph (union default). */
+export const COMPOSER_PROMPT_LINE_PATTERN = promptPattern(COMPOSER_PROMPT_CLASS, "");
+/**
+ * Index of the last composer prompt line in a capture, or -1 when the capture
+ * carries none. Only the last one can be the current input; everything above it
+ * is transcript history and a bare Enter there could drive an old prompt.
+ * `promptClass` scopes the glyphs to a known runtime; the union is the default
+ * for callers that have no runtime (the advisory classifier and CLI detector).
+ */
+export function findComposerInputLineIndex(lines, promptClass = COMPOSER_PROMPT_CLASS) {
+    const pattern = promptPattern(promptClass, "");
+    for (let i = lines.length - 1; i >= 0; i--) {
+        if (pattern.test(lines[i].trimStart()))
+            return i;
+    }
+    return -1;
+}
+/** Strip a leading prompt glyph from a composer line. */
+export function stripComposerPromptGlyph(line, promptClass = COMPOSER_PROMPT_CLASS) {
+    return line.replace(promptPattern(promptClass, ""), "");
+}
+/** Read the prompt once for both advisory draft recognition and cursor-bound
+ * input checks. Keep the one prompt-space separate from authored whitespace.
+ */
+export function readComposerPromptLine(line, promptClass = COMPOSER_PROMPT_CLASS) {
+    const trimmed = line.trimStart();
+    const body = stripComposerPromptGlyph(trimmed, promptClass);
+    if (body === trimmed || (body !== "" && !/^\s/.test(body)))
+        return null;
+    const indent = line.slice(0, line.length - trimmed.length);
+    return { indent, glyph: trimmed[0], text: body.slice(1), prefix: indent.length + 2 };
+}
+/**
+ * Distinct prompt glyphs in the capture up to and including `inputIndex`.
+ * The walk does not stop at a blank line or a rule: a multi-line draft can
+ * hold either, and the ambiguous unknown-runtime read has to see the
+ * unrelated first line that precedes them.
+ */
+export function composerGlyphKindsInBlock(lines, inputIndex) {
+    const kinds = new Set();
+    for (let i = inputIndex; i >= 0; i--) {
+        const first = lines[i].trimStart()[0];
+        if (first !== undefined && COMPOSER_PROMPT_CHARS.includes(first))
+            kinds.add(first);
+    }
+    return kinds;
+}
+/**
+ * True when an unknown-runtime read of this composer block is ambiguous: the
+ * block holds more than one prompt glyph kind, so there is no runtime to say
+ * which line is the live input. A caller must keep the union for unknown
+ * runtimes but fail closed here, exactly as the pre-shared-matcher check did.
+ */
+export function composerPromptIsAmbiguous(lines, inputIndex, promptClass = COMPOSER_PROMPT_CLASS) {
+    if (promptClass !== COMPOSER_PROMPT_CLASS)
+        return false;
+    return composerGlyphKindsInBlock(lines, inputIndex).size > 1;
+}
+export const COMPOSER_COLLAPSED_PASTE_PATTERN = /^\[Pasted text #\d+ \+(\d+) lines\]$/;
+/** Preserve characters and spaces within rows. Only a real line break, a full
+ * terminal row, or a word that cannot fit may explain a rendered row boundary.
+ */
+export function composerContainsOwnedText(input, expected) {
+    if (input.state !== "text" || !input.cursorAtEnd || input.collapsedPaste || !input.rows.length)
+        return false;
+    const text = expected.replace(/\r\n/g, "\n");
+    let offsets = new Set([0]);
+    for (let index = 0; index < input.rows.length; index++) {
+        const row = input.rows[index];
+        const next = new Set();
+        for (const offset of offsets) {
+            if (!text.startsWith(row, offset))
+                continue;
+            const end = offset + row.length;
+            if (index === input.rows.length - 1) {
+                if (end === text.length)
+                    return true;
+                continue;
+            }
+            if (text[end] === "\n")
+                next.add(end + 1);
+            if (stringWidth(row) >= input.columns)
+                next.add(end);
+            if (text[end] === " ") {
+                const word = /^\S+/.exec(text.slice(end + 1))?.[0] ?? "";
+                if (word && stringWidth(row + " " + word) > input.columns)
+                    next.add(end + 1);
+            }
+        }
+        offsets = next;
+        if (!offsets.size)
+            return false;
+    }
+    return false;
+}
+/** An opaque label may be remembered only immediately after this lease pasted
+ * the text. Subsequent submission requires that same complete label and cursor.
+ */
+export function ownCollapsedPaste(input, expected) {
+    if (input.collapsedPaste && input.cursorAtEnd && input.pasteMatchesExpected)
+        return input.collapsedPaste;
+    const match = input.collapsedPaste && input.cursorAtEnd ? COMPOSER_COLLAPSED_PASTE_PATTERN.exec(input.collapsedPaste) : null;
+    return match && Number(match[1]) === expected.split("\n").length - 1 ? input.collapsedPaste : null;
+}
+//# sourceMappingURL=composer-prompts.js.map

package/daemon/dist/domain/composer-prompts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"composer-prompts.js","sourceRoot":"","sources":["../../src/domain/composer-prompts.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,cAAc,CAAC;AAEvC;;;;;;;;;GASG;AAEH,8EAA8E;AAC9E,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAU,CAAC;AAE9D,yEAAyE;AACzE,MAAM,CAAC,MAAM,qBAAqB,GAAG,qBAAqB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAEpE,MAAM,UAAU,GAAG,IAAI,qBAAqB,GAAG,CAAC;AAEhD;;;;;;GAMG;AACH,MAAM,UAAU,6BAA6B,CAAC,OAAkC;IAC9E,IAAI,OAAO,KAAK,aAAa;QAAE,OAAO,GAAG,CAAC;IAC1C,IAAI,OAAO,KAAK,OAAO;QAAE,OAAO,IAAI,CAAC;IACrC,OAAO,qBAAqB,CAAC;AAC/B,CAAC;AAED,8DAA8D;AAC9D,SAAS,aAAa,CAAC,WAAmB,EAAE,MAAc,EAAE,KAAK,GAAG,EAAE;IACpE,OAAO,IAAI,MAAM,CAAC,KAAK,WAAW,IAAI,MAAM,EAAE,EAAE,KAAK,CAAC,CAAC;AACzD,CAAC;AAED,8FAA8F;AAC9F,MAAM,CAAC,MAAM,0BAA0B,GAAG,aAAa,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,CAAC;AACjG,+EAA+E;AAC/E,MAAM,CAAC,MAAM,+BAA+B,GAAG,aAAa,CAAC,qBAAqB,EAAE,gBAAgB,EAAE,GAAG,CAAC,CAAC;AAC3G;;;;GAIG;AACH,MAAM,UAAU,8BAA8B,CAAC,cAAsB,qBAAqB;IACxF,OAAO,aAAa,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;AACnD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,6BAA6B,CAAC,cAAsB,qBAAqB;IACvF,OAAO,aAAa,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;AACpD,CAAC;AAED,sEAAsE;AACtE,MAAM,CAAC,MAAM,sBAAsB,GAAG,aAAa,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC;AACpF,oFAAoF;AACpF,MAAM,CAAC,MAAM,wCAAwC,GAAG,sCAAsC,CAAC;AAC/F,mEAAmE;AACnE,MAAM,CAAC,MAAM,sBAAsB,GAAG,aAAa,CAAC,qBAAqB,EAAE,SAAS,CAAC,CAAC;AACtF,8EAA8E;AAC9E,MAAM,CAAC,MAAM,4BAA4B,GAAG,aAAa,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAC;AAErF;;;;;;GAMG;AACH,MAAM,UAAU,0BAA0B,CAAC,KAAe,EAAE,cAAsB,qBAAqB;IACrG,MAAM,OAAO,GAAG,aAAa,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IAC/C,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3C,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,SAAS,EAAE,CAAC;YAAE,OAAO,CAAC,CAAC;IACpD,CAAC;IACD,OAAO,CAAC,CAAC,CAAC;AACZ,CAAC;AAED,yDAAyD;AACzD,MAAM,UAAU,wBAAwB,CAAC,IAAY,EAAE,cAAsB,qBAAqB;IAChG,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAC1D,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,sBAAsB,CAAC,IAAY,EAAE,cAAsB,qBAAqB;IAC9F,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;IACjC,MAAM,IAAI,GAAG,wBAAwB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC5D,IAAI,IAAI,KAAK,OAAO,IAAI,CAAC,IAAI,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IACxE,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3D,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAE,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;AACxF,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CAAC,KAAe,EAAE,UAAkB;IAC3E,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,KAAK,IAAI,CAAC,GAAG,UAAU,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;QACvC,IAAI,KAAK,KAAK,SAAS,IAAK,qBAA2C,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC5G,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CAAC,KAAe,EAAE,UAAkB,EAAE,cAAsB,qBAAqB;IACxH,IAAI,WAAW,KAAK,qBAAqB;QAAE,OAAO,KAAK,CAAC;IACxD,OAAO,yBAAyB,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC;AAC/D,CAAC;AAsBD,MAAM,CAAC,MAAM,gCAAgC,GAAG,sCAAsC,CAAC;AAEvF;;GAEG;AACH,MAAM,UAAU,yBAAyB,CAAC,KAAoB,EAAE,QAAgB;IAC9E,IAAI,KAAK,CAAC,KAAK,KAAK,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,cAAc,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAC7G,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC7C,IAAI,OAAO,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3B,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QACvD,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAE,CAAC;QAC/B,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;QAC/B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC;gBAAE,SAAS;YAC5C,MAAM,GAAG,GAAG,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;YAChC,IAAI,KAAK,KAAK,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAAC,IAAI,GAAG,KAAK,IAAI,CAAC,MAAM;oBAAE,OAAO,IAAI,CAAC;gBAAC,SAAS;YAAC,CAAC;YACxF,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI;gBAAE,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;YAC1C,IAAI,WAAW,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,OAAO;gBAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACrD,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC;gBACtB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBACzD,IAAI,IAAI,IAAI,WAAW,CAAC,GAAG,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,KAAK,CAAC,OAAO;oBAAE,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;YAC/E,CAAC;QACH,CAAC;QACD,OAAO,GAAG,IAAI,CAAC;QACf,IAAI,CAAC,OAAO,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;IAClC,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAAoB,EAAE,QAAgB;IACtE,IAAI,KAAK,CAAC,cAAc,IAAI,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,oBAAoB;QAAE,OAAO,KAAK,CAAC,cAAc,CAAC;IACzG,MAAM,KAAK,GAAG,KAAK,CAAC,cAAc,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,gCAAgC,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC7H,OAAO,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC;AACrG,CAAC"}

package/daemon/dist/domain/context-monitor.d.ts

@@ -54,6 +54,9 @@ export declare class ContextMonitor {
      * sample.
      */
     private maybeAutoCompact;
+    /** Readiness normalization changes these two fields itself; all other snapshot
+     * fields, including the launch event sequence, must still describe this seat. */
+    private isCurrentSession;
     /** Start polling at the given interval. Idempotent. */
     start(intervalMs?: number): void;
     /** Stop polling. Safe to call before start or multiple times. */

package/daemon/dist/domain/context-monitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context-monitor.d.ts","sourceRoot":"","sources":["../../src/domain/context-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAChF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,eAAe,EACrB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAI7F,4CAA4C;AAC5C,eAAO,MAAM,wBAAwB,QAAS,CAAC;AAY/C,UAAU,wBAAwB;IAChC,sBAAsB,CAAC,OAAO,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IAC5F,UAAU,CAAC,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CAC7D;AAED,UAAU,uBAAuB;IAC/B,UAAU,CAAC,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CAC7D;AAED;;;;;;;;;GASG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,EAAE,CAAoB;IAC9B,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,wBAAwB,CAAkC;IAClE,OAAO,CAAC,kBAAkB,CAAkC;IAC5D,OAAO,CAAC,iBAAiB,CAAsD;IAC/E,OAAO,CAAC,YAAY,CAAkC;IACtD,OAAO,CAAC,qBAAqB,CAAoD;IACjF,OAAO,CAAC,KAAK,CAA+C;IAC5D,OAAO,CAAC,UAAU,CAA8B;gBAG9C,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,KAAK,EAAE,iBAAiB,EACxB,wBAAwB,CAAC,EAAE,wBAAwB,EACnD,kBAAkB,CAAC,EAAE,wBAAwB,EAC7C,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,GAAG,SAAS,CAAC,EACvE,YAAY,CAAC,EAAE,iBAAiB,EAChC,qBAAqB,CAAC,EAAE,MAAM,yBAAyB,EAAE;IAc3D,4EAA4E;IACtE,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YAWjB,OAAO;IA6CrB;0FACsF;IACtF,OAAO,CAAC,0BAA0B;IAUlC;;;;;;;;;;OAUG;YACW,gBAAgB;IA+B9B,uDAAuD;IACvD,KAAK,CAAC,UAAU,GAAE,MAAiC,GAAG,IAAI;IAW1D,iEAAiE;IACjE,IAAI,IAAI,IAAI;IAOZ,wEAAwE;IACxE,OAAO,CAAC,mBAAmB;IAgC3B,OAAO,CAAC,gBAAgB;YAqBV,sBAAsB;CA0CrC"}
+{"version":3,"file":"context-monitor.d.ts","sourceRoot":"","sources":["../../src/domain/context-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAChF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,eAAe,EACrB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAI7F,4CAA4C;AAC5C,eAAO,MAAM,wBAAwB,QAAS,CAAC;AAqB/C,UAAU,wBAAwB;IAChC,sBAAsB,CAAC,OAAO,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IAC5F,UAAU,CAAC,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CAC7D;AAED,UAAU,uBAAuB;IAC/B,UAAU,CAAC,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CAC7D;AAED;;;;;;;;;GASG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,EAAE,CAAoB;IAC9B,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,wBAAwB,CAAkC;IAClE,OAAO,CAAC,kBAAkB,CAAkC;IAC5D,OAAO,CAAC,iBAAiB,CAAsD;IAC/E,OAAO,CAAC,YAAY,CAAkC;IACtD,OAAO,CAAC,qBAAqB,CAAoD;IACjF,OAAO,CAAC,KAAK,CAA+C;IAC5D,OAAO,CAAC,UAAU,CAA8B;gBAG9C,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,KAAK,EAAE,iBAAiB,EACxB,wBAAwB,CAAC,EAAE,wBAAwB,EACnD,kBAAkB,CAAC,EAAE,wBAAwB,EAC7C,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,GAAG,SAAS,CAAC,EACvE,YAAY,CAAC,EAAE,iBAAiB,EAChC,qBAAqB,CAAC,EAAE,MAAM,yBAAyB,EAAE;IAc3D,4EAA4E;IACtE,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YAWjB,OAAO;IAgDrB;0FACsF;IACtF,OAAO,CAAC,0BAA0B;IAUlC;;;;;;;;;;OAUG;YACW,gBAAgB;IAiC9B;qFACiF;IACjF,OAAO,CAAC,gBAAgB;IAMxB,uDAAuD;IACvD,KAAK,CAAC,UAAU,GAAE,MAAiC,GAAG,IAAI;IAW1D,iEAAiE;IACjE,IAAI,IAAI,IAAI;IAOZ,wEAAwE;IACxE,OAAO,CAAC,mBAAmB;IA4C3B,OAAO,CAAC,gBAAgB;YAqBV,sBAAsB;CAoDrC"}

package/daemon/dist/domain/context-monitor.js

@@ -1,5 +1,5 @@
 import { isAttentionRequiredReadinessCode, } from "./runtime-adapter.js";
-import { hasPendingFreshStartup } from "./startup-orchestrator.js";
+import { readPendingStartupContext } from "./startup-orchestrator.js";
 /** Default polling interval: 30 seconds. */
 export const DEFAULT_POLL_INTERVAL_MS = 30_000;
 /**
@@ -52,6 +52,8 @@ export class ContextMonitor {
         this.compactionEnforcer?.reconcilePreparations?.();
         const sessions = this.getEligibleSessions();
         for (const session of sessions) {
+            if (!this.isCurrentSession(session))
+                continue;
             let observed = null;
             const canReadContextUsage = session.runtime !== "codex" || !!session.resume_token;
             if (canReadContextUsage) {
@@ -72,6 +74,8 @@ export class ContextMonitor {
                                 totalInputTokens: observed.totalInputTokens,
                                 totalOutputTokens: observed.totalOutputTokens,
                                 usedPercentage: observed.usedPercentage,
+                                nativeSessionId: observed.sessionId,
+                                clientCostEstimateUsd: observed.clientCostEstimateUsd ?? null,
                             }, new Date().toISOString());
                         }
                         catch { /* series write must never break polling */ }
@@ -127,6 +131,7 @@ export class ContextMonitor {
                     usedPercentage: usage.usedPercentage,
                     transcriptPath: usage.transcriptPath,
                     sessionId: usage.sessionId,
+                    isObservationCurrent: () => this.isCurrentSession(session),
                 });
                 return;
             }
@@ -138,6 +143,7 @@ export class ContextMonitor {
                 runtime: session.runtime,
                 transcriptPath: usage?.transcriptPath ?? null,
                 sessionId: usage?.sessionId ?? null,
+                isObservationCurrent: () => this.isCurrentSession(session),
             });
         }
         catch {
@@ -145,6 +151,12 @@ export class ContextMonitor {
             // polling loop continues to make progress for remaining sessions.
         }
     }
+    /** Readiness normalization changes these two fields itself; all other snapshot
+     * fields, including the launch event sequence, must still describe this seat. */
+    isCurrentSession(session) {
+        const current = this.getEligibleSessions(session.node_id)[0];
+        return current !== undefined && Object.entries(session).every(([key, value]) => key === "startup_status" || key === "startup_completed_at" || current[key] === value);
+    }
     /** Start polling at the given interval. Idempotent. */
     start(intervalMs = DEFAULT_POLL_INTERVAL_MS) {
         if (this.timer)
@@ -165,7 +177,7 @@ export class ContextMonitor {
         }
     }
     /** Query for managed runtime sessions with readable context sources. */
-    getEligibleSessions() {
+    getEligibleSessions(nodeId) {
         return this.db.prepare(`
       SELECT
         n.id as node_id,
@@ -174,7 +186,18 @@ export class ContextMonitor {
         n.runtime,
         s.resume_token,
         n.cwd,
-        s.startup_status
+        s.startup_status,
+        s.status,
+        s.startup_completed_at,
+        b.id AS binding_id,
+        b.tmux_session AS binding_session,
+        b.tmux_pane AS binding_pane,
+        b.tmux_window AS binding_window,
+        b.updated_at AS binding_updated_at,
+        (SELECT generation_uuid FROM occupant_tenures t WHERE t.node_id = n.id
+          ORDER BY generation_ordinal DESC LIMIT 1) AS generation_uuid,
+        (SELECT MAX(seq) FROM events e WHERE e.node_id = n.id
+          AND e.type IN ('node.startup_pending', 'node.startup_ready', 'node.startup_failed')) AS startup_event_seq
       FROM nodes n
       JOIN rigs r ON r.id = n.rig_id
       JOIN sessions s ON s.node_id = n.id
@@ -194,7 +217,8 @@ export class ContextMonitor {
         AND (r.archived_at IS NULL OR s.status = 'running')
         AND COALESCE(b.attachment_type, 'tmux') = 'tmux'
         AND COALESCE(b.tmux_session, s.session_name) IS NOT NULL
-    `).all();
+        ${nodeId === undefined ? "" : "AND n.id = ?"}
+    `).all(...(nodeId === undefined ? [] : [nodeId]));
     }
     readContextUsage(session) {
         if (session.runtime === "codex") {
@@ -221,7 +245,12 @@ export class ContextMonitor {
             return;
         if (session.startup_status !== "failed" && session.startup_status !== "attention_required")
             return;
+        // A poll snapshot is not a lease: lifecycle work can run before or during
+        // the probe. The event sequence also distinguishes same-status retries.
+        const isCurrent = () => JSON.stringify(this.getEligibleSessions(session.node_id)[0]) === JSON.stringify(session);
         try {
+            if (!isCurrent())
+                return;
             const readiness = await checker.checkReady({
                 id: `context-monitor:${session.session_id}`,
                 nodeId: session.node_id,
@@ -234,26 +263,33 @@ export class ContextMonitor {
                 updatedAt: "",
                 cwd: session.cwd ?? "",
             });
-            if (readiness.ready) {
-                // A live prompt does not deliver saved context. Check after the await:
-                // startup may have reached an attention gate while we were observing.
-                if (hasPendingFreshStartup(this.db, session.node_id, session.session_id))
+            // Hold no database lock while observing the runtime. Revalidation and
+            // the write share an immediate transaction, reserving the writer before the
+            // snapshot read so WAL contention cannot fail a later read-to-write upgrade.
+            this.db.transaction(() => {
+                if (!isCurrent())
                     return;
-                this.db.prepare(`
-          UPDATE sessions
-          SET startup_status = 'ready',
-              startup_completed_at = ?
-          WHERE id = ? AND startup_status IN ('failed', 'attention_required')
-        `).run(new Date().toISOString(), session.session_id);
-                return;
-            }
-            if (isAttentionRequiredReadinessCode(readiness.code)) {
-                this.db.prepare(`
-          UPDATE sessions
-          SET startup_status = 'attention_required'
-          WHERE id = ?
-        `).run(session.session_id);
-            }
+                if (readiness.ready) {
+                    // A live prompt does not deliver saved context. Check after the await:
+                    // startup may have reached an attention gate while we were observing.
+                    if (readPendingStartupContext(this.db, session.node_id, session.session_id))
+                        return;
+                    this.db.prepare(`
+            UPDATE sessions
+            SET startup_status = 'ready',
+                startup_completed_at = ?
+            WHERE id = ? AND startup_status IN ('failed', 'attention_required')
+          `).run(new Date().toISOString(), session.session_id);
+                    return;
+                }
+                if (isAttentionRequiredReadinessCode(readiness.code)) {
+                    this.db.prepare(`
+            UPDATE sessions
+            SET startup_status = 'attention_required'
+            WHERE id = ?
+          `).run(session.session_id);
+                }
+            }).immediate();
         }
         catch {
             // Best-effort normalization only; telemetry polling still succeeds.