commandmate 0.49.0 → 0.49.2

package/dist/lib/verification/session-kill-ledger.d.ts

@@ -0,0 +1,110 @@
+/**
+ * Record of `mcbd-*` sessions stopped through CommandMate's kill (Issue #3993).
+ *
+ * The `env-clean` gate counts every vanished session of a sibling worktree as a
+ * violation, because a worker killing its neighbour is the #1624 failure. The
+ * orchestrator stops sibling sessions too — `commandmate instances <wt> kill`
+ * when it cleans a worktree up (worktree-cleanup Phase 3), the UI's kill
+ * button, the server's cleanup after sync or a repository removal — and the two
+ * snapshots cannot tell that apart from a worker's kill: on 2026-10-29 four
+ * verification runs of #3957 failed on `- mcbd-…-<another worktree> [other]`
+ * for a cleanup nobody in the worker's transcript had run.
+ *
+ * This ledger is the missing fact: one line per kill, naming the API, the
+ * tmux sessions it actually stopped, the worktree it was for and who asked
+ * (the caller's working directory and tmux session). The gate excuses as little
+ * as it can prove is not the worker's (`env-clean-gate.ts`, `findExternalKill`):
+ * a vanished sibling session is `external` only when a line inside the task's
+ * window names that exact session, was written by the CLI, and its caller is
+ * known to be someone else — a cwd in a sibling directory of the task's
+ * worktree (the primary checkout, another worktree) or a tmux session of
+ * another worktree. Everything else stays a violation, exactly as before:
+ * a worker's own kill, a caller that is nowhere in particular (`/tmp`, `$HOME`),
+ * the route's and the server's lines (a worker can reach the UI and trigger
+ * sync too), and any kill that bypassed CommandMate (`tmux kill-session`), which
+ * records nothing. Those lines are still shown next to the violation.
+ *
+ * Written by the CLI (with its caller), by the kill-session route and by
+ * `session-cleanup.ts`. A CLI kill is therefore recorded twice — the CLI's line
+ * and the route's `http` line — which changes no verdict: only the CLI's line
+ * can excuse anything.
+ *
+ * Machine-wide, like the gate mutex (`machine-lock.ts`): the CLI and the server
+ * write it and the server's gate reads it, so the path is derived from `$HOME` alone —
+ * `~/.commandmate/session-kills/<UTC date>.jsonl` — with an override for tests.
+ * The `commandmate-entries` probe ignores the directory, like `locks`.
+ *
+ * Node built-ins only: the CLI imports this module.
+ *
+ * @module lib/verification/session-kill-ledger
+ */
+/** Directory under `~/.commandmate`; exported for the `commandmate-entries` probe. */
+export declare const SESSION_KILL_LEDGER_DIR_NAME = "session-kills";
+/** Overrides the ledger directory (tests, isolated environments). */
+export declare const SESSION_KILL_LEDGER_ROOT_ENV = "CM_SESSION_KILL_LEDGER_ROOT";
+/** Bumped only when a line stops being readable by this module. */
+export declare const SESSION_KILL_LEDGER_VERSION = 1;
+/** Day files older than this are removed when a new line is written (same as env snapshots). */
+export declare const SESSION_KILL_LEDGER_RETENTION_MS: number;
+/**
+ * What stopped the session: the kill-session API (`POST /api/worktrees/:id/kill-session`,
+ * also behind `instances <wt> kill`), or the server's own cleanup of worktrees
+ * that sync or a repository removal dropped (`lib/session-cleanup.ts`).
+ */
+export type SessionKillApi = 'kill-session' | 'session-cleanup';
+/**
+ * Who wrote the record, which decides how much it says about the caller:
+ *
+ * - `cli` — `commandmate instances … kill`; callerCwd / callerSession are the CLI's own.
+ * - `browser` — the kill-session route, for a same-origin browser request (the UI).
+ * - `http` — the kill-session route, for any other request (the CLI's own POST,
+ *   curl). The caller is unknown, so callerCwd / callerSession are null.
+ * - `server` — the server's cleanup; no request is behind it.
+ *
+ * Only `cli` lines can excuse a removal. `browser` is judged from
+ * `Sec-Fetch-Site` alone, which a header names and a UI-driving worker sends;
+ * `server` cleanup runs after a `commandmate sync` a worker can issue. Both are
+ * kept so the report can say a kill was recorded, not to excuse it.
+ */
+export type SessionKillOrigin = 'cli' | 'browser' | 'http' | 'server';
+export interface SessionKillRecord {
+    version: number;
+    /** Epoch ms of the successful kill. */
+    at: number;
+    api: SessionKillApi;
+    origin: SessionKillOrigin;
+    /** Worktree whose session(s) were stopped. */
+    worktreeId: string;
+    /** Instance the kill was scoped to; null for a whole-worktree kill. */
+    instanceId: string | null;
+    /**
+     * tmux session names the kill actually stopped — the route's `killedSessions`.
+     * The gate matches a vanished session against these exactly, never by the
+     * worktree id (whose prefix another worktree's id can share). Empty when the
+     * writer could not tell, which excuses nothing.
+     */
+    sessionNames: string[];
+    /** Working directory of the process that asked; null when unreadable. */
+    callerCwd: string | null;
+    /** tmux session the caller ran inside; null outside tmux. */
+    callerSession: string | null;
+}
+export declare function defaultSessionKillLedgerRoot(): string;
+export declare function resolveSessionKillLedgerRoot(env?: Record<string, string | undefined>): string;
+/**
+ * Append one kill. Never throws: the kill already happened, and failing the
+ * command over its bookkeeping would only hide that.
+ *
+ * @returns true when the line was written
+ */
+export declare function appendSessionKillRecord(record: SessionKillRecord, root?: string): boolean;
+/** Whether a parsed line is a record this module can use; anything else is skipped. */
+export declare function isSessionKillRecord(value: unknown): value is SessionKillRecord;
+/**
+ * The kills recorded in `[since, until]` (epoch ms, inclusive).
+ *
+ * A missing directory, an unreadable day file and a malformed line all read as
+ * "no record", which only ever excuses less.
+ */
+export declare function readSessionKillRecords(since: number, until: number, root?: string): SessionKillRecord[];
+//# sourceMappingURL=session-kill-ledger.d.ts.map

package/dist/lib/verification/session-kill-ledger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-kill-ledger.d.ts","sourceRoot":"","sources":["../../../src/lib/verification/session-kill-ledger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AAMH,sFAAsF;AACtF,eAAO,MAAM,4BAA4B,kBAAkB,CAAC;AAE5D,qEAAqE;AACrE,eAAO,MAAM,4BAA4B,gCAAgC,CAAC;AAE1E,mEAAmE;AACnE,eAAO,MAAM,2BAA2B,IAAI,CAAC;AAE7C,gGAAgG;AAChG,eAAO,MAAM,gCAAgC,QAA2B,CAAC;AAMzE;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG,cAAc,GAAG,iBAAiB,CAAC;AAEhE;;;;;;;;;;;;;GAaG;AACH,MAAM,MAAM,iBAAiB,GAAG,KAAK,GAAG,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC;AAKtE,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,uCAAuC;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,cAAc,CAAC;IACpB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,8CAA8C;IAC9C,UAAU,EAAE,MAAM,CAAC;IACnB,uEAAuE;IACvE,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B;;;;;OAKG;IACH,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,yEAAyE;IACzE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,6DAA6D;IAC7D,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,wBAAgB,4BAA4B,IAAI,MAAM,CAErD;AAED,wBAAgB,4BAA4B,CAC1C,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GACpD,MAAM,CAGR;AAyBD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,iBAAiB,EACzB,IAAI,GAAE,MAAuC,GAC5C,OAAO,CAaT;AAMD,uFAAuF;AACvF,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,iBAAiB,CAkB9E;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,IAAI,GAAE,MAAuC,GAC5C,iBAAiB,EAAE,CA0BrB"}

package/dist/lib/verification/session-kill-ledger.js

@@ -0,0 +1,174 @@
+"use strict";
+/**
+ * Record of `mcbd-*` sessions stopped through CommandMate's kill (Issue #3993).
+ *
+ * The `env-clean` gate counts every vanished session of a sibling worktree as a
+ * violation, because a worker killing its neighbour is the #1624 failure. The
+ * orchestrator stops sibling sessions too — `commandmate instances <wt> kill`
+ * when it cleans a worktree up (worktree-cleanup Phase 3), the UI's kill
+ * button, the server's cleanup after sync or a repository removal — and the two
+ * snapshots cannot tell that apart from a worker's kill: on 2026-10-29 four
+ * verification runs of #3957 failed on `- mcbd-…-<another worktree> [other]`
+ * for a cleanup nobody in the worker's transcript had run.
+ *
+ * This ledger is the missing fact: one line per kill, naming the API, the
+ * tmux sessions it actually stopped, the worktree it was for and who asked
+ * (the caller's working directory and tmux session). The gate excuses as little
+ * as it can prove is not the worker's (`env-clean-gate.ts`, `findExternalKill`):
+ * a vanished sibling session is `external` only when a line inside the task's
+ * window names that exact session, was written by the CLI, and its caller is
+ * known to be someone else — a cwd in a sibling directory of the task's
+ * worktree (the primary checkout, another worktree) or a tmux session of
+ * another worktree. Everything else stays a violation, exactly as before:
+ * a worker's own kill, a caller that is nowhere in particular (`/tmp`, `$HOME`),
+ * the route's and the server's lines (a worker can reach the UI and trigger
+ * sync too), and any kill that bypassed CommandMate (`tmux kill-session`), which
+ * records nothing. Those lines are still shown next to the violation.
+ *
+ * Written by the CLI (with its caller), by the kill-session route and by
+ * `session-cleanup.ts`. A CLI kill is therefore recorded twice — the CLI's line
+ * and the route's `http` line — which changes no verdict: only the CLI's line
+ * can excuse anything.
+ *
+ * Machine-wide, like the gate mutex (`machine-lock.ts`): the CLI and the server
+ * write it and the server's gate reads it, so the path is derived from `$HOME` alone —
+ * `~/.commandmate/session-kills/<UTC date>.jsonl` — with an override for tests.
+ * The `commandmate-entries` probe ignores the directory, like `locks`.
+ *
+ * Node built-ins only: the CLI imports this module.
+ *
+ * @module lib/verification/session-kill-ledger
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SESSION_KILL_LEDGER_RETENTION_MS = exports.SESSION_KILL_LEDGER_VERSION = exports.SESSION_KILL_LEDGER_ROOT_ENV = exports.SESSION_KILL_LEDGER_DIR_NAME = void 0;
+exports.defaultSessionKillLedgerRoot = defaultSessionKillLedgerRoot;
+exports.resolveSessionKillLedgerRoot = resolveSessionKillLedgerRoot;
+exports.appendSessionKillRecord = appendSessionKillRecord;
+exports.isSessionKillRecord = isSessionKillRecord;
+exports.readSessionKillRecords = readSessionKillRecords;
+const fs_1 = require("fs");
+const os_1 = require("os");
+const path_1 = require("path");
+/** Directory under `~/.commandmate`; exported for the `commandmate-entries` probe. */
+exports.SESSION_KILL_LEDGER_DIR_NAME = 'session-kills';
+/** Overrides the ledger directory (tests, isolated environments). */
+exports.SESSION_KILL_LEDGER_ROOT_ENV = 'CM_SESSION_KILL_LEDGER_ROOT';
+/** Bumped only when a line stops being readable by this module. */
+exports.SESSION_KILL_LEDGER_VERSION = 1;
+/** Day files older than this are removed when a new line is written (same as env snapshots). */
+exports.SESSION_KILL_LEDGER_RETENTION_MS = 30 * 24 * 60 * 60 * 1000;
+const DAY_MS = 24 * 60 * 60 * 1000;
+const DAY_FILE_PATTERN = /^(\d{4}-\d{2}-\d{2})\.jsonl$/;
+const SESSION_KILL_APIS = ['kill-session', 'session-cleanup'];
+const SESSION_KILL_ORIGINS = ['cli', 'browser', 'http', 'server'];
+function defaultSessionKillLedgerRoot() {
+    return (0, path_1.join)((0, os_1.homedir)(), '.commandmate', exports.SESSION_KILL_LEDGER_DIR_NAME);
+}
+function resolveSessionKillLedgerRoot(env = process.env) {
+    const override = env[exports.SESSION_KILL_LEDGER_ROOT_ENV];
+    return override && override.trim() !== '' ? override : defaultSessionKillLedgerRoot();
+}
+function dayOf(epochMs) {
+    return new Date(epochMs).toISOString().slice(0, 10);
+}
+function pruneOldDays(root, now) {
+    const oldest = dayOf(now - exports.SESSION_KILL_LEDGER_RETENTION_MS);
+    let names;
+    try {
+        names = (0, fs_1.readdirSync)(root);
+    }
+    catch {
+        return;
+    }
+    for (const name of names) {
+        const day = DAY_FILE_PATTERN.exec(name)?.[1];
+        if (day === undefined || day >= oldest)
+            continue;
+        try {
+            (0, fs_1.rmSync)((0, path_1.join)(root, name), { force: true });
+        }
+        catch {
+            // A day file that cannot be removed is disk use, not a reason to fail a kill.
+        }
+    }
+}
+/**
+ * Append one kill. Never throws: the kill already happened, and failing the
+ * command over its bookkeeping would only hide that.
+ *
+ * @returns true when the line was written
+ */
+function appendSessionKillRecord(record, root = resolveSessionKillLedgerRoot()) {
+    try {
+        (0, fs_1.mkdirSync)(root, { recursive: true, mode: 0o700 });
+        // One short line per append; O_APPEND keeps concurrent writers' lines whole.
+        (0, fs_1.appendFileSync)((0, path_1.join)(root, `${dayOf(record.at)}.jsonl`), `${JSON.stringify(record)}\n`, {
+            encoding: 'utf8',
+            mode: 0o600,
+        });
+        pruneOldDays(root, record.at);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function isNullableString(value) {
+    return value === null || typeof value === 'string';
+}
+/** Whether a parsed line is a record this module can use; anything else is skipped. */
+function isSessionKillRecord(value) {
+    if (typeof value !== 'object' || value === null)
+        return false;
+    const record = value;
+    return (record.version === exports.SESSION_KILL_LEDGER_VERSION &&
+        typeof record.at === 'number' &&
+        typeof record.api === 'string' &&
+        SESSION_KILL_APIS.includes(record.api) &&
+        typeof record.origin === 'string' &&
+        SESSION_KILL_ORIGINS.includes(record.origin) &&
+        typeof record.worktreeId === 'string' &&
+        record.worktreeId !== '' &&
+        isNullableString(record.instanceId) &&
+        Array.isArray(record.sessionNames) &&
+        record.sessionNames.every((name) => typeof name === 'string') &&
+        isNullableString(record.callerCwd) &&
+        isNullableString(record.callerSession));
+}
+/**
+ * The kills recorded in `[since, until]` (epoch ms, inclusive).
+ *
+ * A missing directory, an unreadable day file and a malformed line all read as
+ * "no record", which only ever excuses less.
+ */
+function readSessionKillRecords(since, until, root = resolveSessionKillLedgerRoot()) {
+    if (!(since <= until))
+        return [];
+    // Nothing older than the retention survives, so a stale baseline costs no extra reads.
+    since = Math.max(since, until - exports.SESSION_KILL_LEDGER_RETENTION_MS - DAY_MS);
+    const records = [];
+    for (let day = Date.parse(`${dayOf(since)}T00:00:00.000Z`); day <= until; day += DAY_MS) {
+        let text;
+        try {
+            text = (0, fs_1.readFileSync)((0, path_1.join)(root, `${dayOf(day)}.jsonl`), 'utf8');
+        }
+        catch {
+            continue;
+        }
+        for (const line of text.split('\n')) {
+            if (line.trim() === '')
+                continue;
+            let parsed;
+            try {
+                parsed = JSON.parse(line);
+            }
+            catch {
+                continue;
+            }
+            if (isSessionKillRecord(parsed) && parsed.at >= since && parsed.at <= until) {
+                records.push(parsed);
+            }
+        }
+    }
+    return records;
+}

package/dist/server/locales/en/worktree.json

@@ -334,7 +334,10 @@
             "remote": "Toggle remote control from GitHub web and mobile",
             "research": "Run a deep research investigation",
             "reset-allowed-tools": "Reset the list of allowed tools",
-            "restart": "Restart the CLI, preserving the current session",
+            "restart": {
+                "copilot": "Restart the CLI, preserving the current session",
+                "claude": "Restart Claude Code and resume this session, which applies an installed update"
+            },
             "rubber-duck": "Get an independent critique of the current work",
             "search": "Search the conversation timeline",
             "session": "View and manage sessions",
@@ -695,7 +698,14 @@
         "regionLabel": "Unsent input",
         "label": "Unsent input:",
         "run": "Run",
-        "clear": "Clear"
+        "clear": "Clear",
+        "clearError": {
+            "dismiss": "Dismiss",
+            "otherServer": "Could not clear: this session is owned by another server.",
+            "busy": "Could not clear: a send is in progress. Wait a moment and try again.",
+            "notCleared": "The text is still in the input box; it could not be cleared.",
+            "failed": "Failed to clear. Please try again."
+        }
     },
     "todo": {
         "addPlaceholder": "Add a todo…",
@@ -1128,6 +1138,7 @@
     "promptResponse": {
         "refused": "Your answer was not sent because the dialog has changed. Please check the screen.",
         "failed": "Could not send the answer. Please try again.",
+        "partial": "The answer stopped part-way: some of its keys may have reached the agent. Check the screen before answering again.",
         "stuckHint": "If sending does not work, operate the terminal in direct input mode.",
         "stuckHintLink": "Switch to direct input",
         "unanswerable": "CommandMate cannot operate this screen. Use direct input mode instead.",
@@ -1144,8 +1155,11 @@
         "commentPlaceholder": "What should change? (Add comment → Submit review)",
         "comment": "Add comment",
         "submit": "Submit review (Ctrl+R)",
+        "submitCompact": "Submit review",
         "approve": "Approve (Ctrl+A)",
+        "approveCompact": "Approve",
         "cancel": "Cancel (Esc)",
+        "cancelCompact": "Cancel",
         "approveConfirmLabel": "Confirm plan approval",
         "approveConfirmText": "Approving runs the plan. Approve it?",
         "approveConfirmYes": "Approve and run",
@@ -1156,8 +1170,11 @@
             "nothingToSubmit": "There is no comment to submit. Add a comment first.",
             "invalidRequest": "That action does not fit this screen. Nothing was sent.",
             "notActive": "Nothing was sent: no plan review is on screen.",
+            "inputLost": "Stopped part-way: some keys may have reached the agent. Check the screen before trying again.",
             "generic": "Could not send."
-        }
+        },
+        "composerNotice": "The plan is waiting for your review — approve, cancel or comment.",
+        "composerGoto": "Go to the controls"
     },
     "selectionKeys": {
         "numbersToolbarLabel": "Option number keys",

package/dist/server/locales/ja/worktree.json

@@ -334,7 +334,10 @@
             "remote": "GitHub の Web・モバイルからのリモート操作を切り替え",
             "research": "ディープリサーチ調査を実行",
             "reset-allowed-tools": "許可済みツールの一覧をリセット",
-            "restart": "現在のセッションを保ったまま CLI を再起動",
+            "restart": {
+                "copilot": "現在のセッションを保ったまま CLI を再起動",
+                "claude": "Claude Code を再起動してこのセッションを再開し、インストール済みの更新を適用"
+            },
             "rubber-duck": "現在の作業への独立した批評を取得",
             "search": "会話タイムラインを検索",
             "session": "セッションを表示・管理",
@@ -695,7 +698,14 @@
         "regionLabel": "未送信の入力",
         "label": "未送信の入力:",
         "run": "実行",
-        "clear": "クリア"
+        "clear": "クリア",
+        "clearError": {
+            "dismiss": "閉じる",
+            "otherServer": "別のサーバーが管理しているセッションのため、クリアできませんでした。",
+            "busy": "送信中のため、クリアできませんでした。少し待ってからもう一度お試しください。",
+            "notCleared": "入力欄に文字が残っています。クリアできませんでした。",
+            "failed": "クリアに失敗しました。もう一度お試しください。"
+        }
     },
     "todo": {
         "addPlaceholder": "ToDoを追加…",
@@ -1128,6 +1138,7 @@
     "promptResponse": {
         "refused": "ダイアログの状態が変わったため送信できませんでした。画面を確認してください。",
         "failed": "送信に失敗しました。もう一度お試しください。",
+        "partial": "回答の途中で止まりました。一部のキーが届いた可能性があります。画面を確認してから答え直してください。",
         "stuckHint": "送信がうまくいかない場合は、直接入力モードで操作してください。",
         "stuckHintLink": "直接入力に切り替える",
         "unanswerable": "この画面は CommandMate から操作できません。直接入力モードで操作してください。",
@@ -1144,8 +1155,11 @@
         "commentPlaceholder": "直してほしい点を書く（コメントを追加 → レビューを送信）",
         "comment": "コメントを追加",
         "submit": "レビューを送信 (Ctrl+R)",
+        "submitCompact": "レビューを送信",
         "approve": "承認 (Ctrl+A)",
+        "approveCompact": "承認",
         "cancel": "取り消し (Esc)",
+        "cancelCompact": "取り消し",
         "approveConfirmLabel": "プランの承認の確認",
         "approveConfirmText": "承認するとプランが実行されます。承認しますか？",
         "approveConfirmYes": "承認して実行",
@@ -1156,8 +1170,11 @@
             "nothingToSubmit": "送るコメントがありません。先にコメントを追加してください。",
             "invalidRequest": "この画面では送れない操作です。何も送っていません。",
             "notActive": "計画のレビュー画面が表示されていないため、何も送っていません。",
+            "inputLost": "途中で止まりました。一部のキーが届いた可能性があります。画面を確認してから操作し直してください。",
             "generic": "送信できませんでした。"
-        }
+        },
+        "composerNotice": "計画の確認待ちです。承認・取り消し・コメントを選んでください",
+        "composerGoto": "操作へ"
     },
     "selectionKeys": {
         "numbersToolbarLabel": "選択肢の番号キー",

package/dist/server/src/config/cli-tool-timing-config.js

@@ -20,7 +20,7 @@
  * All values are preserved from the original literals (no behavior change).
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LIVENESS_CONFIRM_DELAY_MS = exports.CLAUDE_ENV_SANITIZE_WAIT_MS = exports.OPENCODE_V2_COMPOSER_WAIT_MS = exports.OPENCODE_V2_EXIT_WAIT_MS = exports.COMMAND_CODE_INIT_WAIT_MS = exports.VIBE_LOCAL_DOUBLE_ENTER_WAIT_MS = exports.COPILOT_EXIT_WAIT_MS = exports.OPENCODE_INTERRUPT_SECOND_ESCAPE_DELAY_MS = exports.OPENCODE_EXIT_WAIT_MS = exports.CODEX_DIALOG_SETTLE_MS = exports.TUI_EXIT_WAIT_MS = exports.TUI_INTERRUPT_SETTLE_MS = exports.TUI_MESSAGE_PROCESSED_WAIT_MS = exports.TUI_TEXT_INPUT_WAIT_MS = exports.TUI_SESSION_CREATE_WAIT_MS = void 0;
+exports.LIVENESS_CONFIRM_DELAY_MS = exports.OPENCODE_V2_COMPOSER_WAIT_MS = exports.OPENCODE_V2_EXIT_WAIT_MS = exports.COMMAND_CODE_INIT_WAIT_MS = exports.VIBE_LOCAL_DOUBLE_ENTER_WAIT_MS = exports.COPILOT_EXIT_WAIT_MS = exports.OPENCODE_INTERRUPT_SECOND_ESCAPE_DELAY_MS = exports.OPENCODE_EXIT_WAIT_MS = exports.CODEX_DIALOG_SETTLE_MS = exports.TUI_EXIT_WAIT_MS = exports.TUI_INTERRUPT_SETTLE_MS = exports.TUI_MESSAGE_PROCESSED_WAIT_MS = exports.TUI_TEXT_INPUT_WAIT_MS = exports.TUI_SESSION_CREATE_WAIT_MS = void 0;
 /**
  * Wait (ms) after `createSession()` before sending the first keys, giving tmux
  * time to spin up the session.
@@ -156,12 +156,6 @@ exports.OPENCODE_V2_EXIT_WAIT_MS = 3000;
  * Site: opencode-v2 sendMessage().
  */
 exports.OPENCODE_V2_COMPOSER_WAIT_MS = 15000;
-/**
- * Wait (ms) for the `unset CLAUDECODE` command to reach the shell while
- * sanitizing the session environment (empirically determined).
- * Site: session-key-sender sanitizeSessionEnvironment().
- */
-exports.CLAUDE_ENV_SANITIZE_WAIT_MS = 100;
 /**
  * Wait (ms) between the two liveness readings that must agree before a reuse
  * path re-sends a launch command (Issue #2070).

package/dist/server/src/lib/auto-yes-poller.js

@@ -10,7 +10,11 @@
  * Dependencies: auto-yes-state.ts (composite keys / state), polling/* (prompt
  * detection, resolver, policy, dialog gate, session epoch, poller state,
  * decision record), cli-tools/*, session/cli-session.ts, tmux/*, detection/*,
- * db/*, tasks/*.
+ * db/*, tasks/*. Split out of this file (Issue #3893): auto-yes-poller-tick.ts
+ * (tick reading / no-prompt bookkeeping / decision recorder),
+ * auto-yes-poller-answer-target.ts (answer target), auto-yes-poller-session-presence.ts
+ * (whether a failed capture's session is gone) and auto-yes-poller-keys.ts
+ * (which composite keys have a poller entry).
  *
  * Issue #3821: this poller (with the hook / API adjudication) is what answers
  * automatically. The browser no longer answers, and the Enter sent to a choice
@@ -71,6 +75,7 @@ const db_instance_1 = require("./db/db-instance");
 const chat_db_1 = require("./db/chat-db");
 const worktree_session_ownership_1 = require("./cli-tools/worktree-session-ownership");
 const prompt_answer_sender_1 = require("./prompt-answer-sender");
+const instance_input_lock_1 = require("../lib/session/instance-input-lock");
 const session_created_signal_1 = require("./tmux/session-created-signal");
 const manager_1 = require("./cli-tools/manager");
 const cli_patterns_1 = require("./detection/cli-patterns");
@@ -401,6 +406,24 @@ function settleFailedTick(error, tick) {
         logger.info('poller:auto-yes-answer-abandoned', { worktreeId, cliToolId, instanceId, keysSent, delivery });
         return 'no_answer';
     }
+    // Issue #3952: the answer waited for a send holding the session's input and
+    // was then not typed — the prompt moved, or the wait ran out. Nothing is on
+    // the pane and the poller did nothing wrong: the next tick reads the screen
+    // afresh and decides again, without counting an error. By name, as the
+    // transport's errors are read: test doubles of the sender need not export it.
+    if (error instanceof Error && error.name === 'PromptAnswerNotDeliveredError') {
+        if (attempt !== null)
+            (0, auto_yes_poller_state_1.settleSendAttempt)(attempt, false);
+        if (sendInFlight)
+            (0, auto_yes_poller_receipt_log_1.noteAnswerSent)(cliToolId, worktreeId, instanceId, true, receiptEpisode);
+        logger.info('poller:auto-yes-answer-not-delivered', {
+            worktreeId,
+            cliToolId,
+            instanceId,
+            skip: error.skip,
+        });
+        return 'no_answer';
+    }
     // Issue #3839: a failure with keys already on the pane is held the same way —
     // the next tick must not type the answer again over them (step 2.5); the
     // screen leaving or changing forgets it (`forgetPartialAnswer`). Issue #3880:
@@ -445,10 +468,14 @@ function settleFailedTick(error, tick) {
  *   dropped rows from the top of what tmux returned, as the capture layer said
  *   ({@link capturePollerFrame}'s `headCut`). At a window of the pane's height
  *   the row count cannot tell. Omitted, judged from the row count as before.
+ * @param inputReadMark - Issue #3952: `instanceInputReadMark()` taken before the
+ *   tick's capture. Omitted, it is taken when this function is called.
  * @returns 'responded' | 'no_prompt' | 'duplicate' | 'no_answer' | 'error'
  */
-async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, cleanOutput, precomputedLines, instanceId, rawOutput, generation, observation, captureWindowLines, captureHeadCut) {
+async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, cleanOutput, precomputedLines, instanceId, rawOutput, generation, observation, captureWindowLines, captureHeadCut, inputReadMark) {
     const compositeKey = (0, auto_yes_state_1.buildCompositeKey)(worktreeId, cliToolId, instanceId);
+    // Issue #3952: where the session's input order stood when the frame was read.
+    const readMark = inputReadMark ?? (0, instance_input_lock_1.instanceInputReadMark)();
     const captureExtent = captureWindowLines === undefined ? undefined : { windowLines: captureWindowLines, headCut: captureHeadCut };
     const tickObservation = observation ?? {
         start: (0, waiting_episode_binding_1.startWaitingObservation)(worktreeId, cliToolId, instanceId),
@@ -690,15 +717,28 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
         // Issue #3798: the wait this answer goes to, fixed as the send begins.
         const answerTarget = (0, auto_yes_poller_answer_target_1.fixAnswerTarget)(worktreeId, cliToolId, instanceId);
         sendInFlight = true;
+        const answerParams = {
+            sessionName,
+            answer,
+            cliToolId,
+            promptData: promptDetection.promptData,
+            // Issue #3706: asked after each wait inside the send.
+            ...(generation !== undefined ? { stillCurrent: () => (0, auto_yes_poller_generation_1.isTickCurrent)(generation) } : {}),
+            // Issue #3952: an answer that had to wait for a send is read again.
+            readMark,
+        };
+        // Issue #3952 review P1-2: and step 5.5's last look is taken again after
+        // that wait, right before the first key — the contract or the grant may
+        // have changed while the answer waited for the input. Not enumerable: the
+        // params stay the plain record of what was answered (as the ledger's
+        // fault-injection test compares them across runs); the sender reads it as
+        // the field it is.
+        Object.defineProperty(answerParams, 'stillAllowedAtSend', {
+            value: () => !(0, auto_yes_poller_steps_1.withheldAtSend)(judged, generation !== undefined),
+            enumerable: false,
+        });
         try {
-            await (0, prompt_answer_sender_1.sendPromptAnswer)({
-                sessionName,
-                answer,
-                cliToolId,
-                promptData: promptDetection.promptData,
-                // Issue #3706: asked after each wait inside the send.
-                ...(generation !== undefined ? { stillCurrent: () => (0, auto_yes_poller_generation_1.isTickCurrent)(generation) } : {}),
-            });
+            await (0, prompt_answer_sender_1.sendPromptAnswer)(answerParams);
         }
         finally {
             (0, tmux_capture_cache_1.invalidateCache)(sessionName);
@@ -788,6 +828,9 @@ async function pollAutoYes(worktreeId, cliToolId, instanceId, owner) {
     // Issue #3798: the waiting episode as this tick found it, before its first wait.
     const observationStart = (0, waiting_episode_binding_1.startWaitingObservation)(worktreeId, cliToolId, instanceId);
     try {
+        // Issue #3952: taken before the capture, so a send admitted after it makes
+        // an answer from this frame read the screen again.
+        const inputReadMark = (0, instance_input_lock_1.instanceInputReadMark)();
         // 2. Capture and clean output
         const captureLines = grant.stopPattern
             ? auto_yes_config_1.FULL_CAPTURE_LINES
@@ -819,7 +862,7 @@ async function pollAutoYes(worktreeId, cliToolId, instanceId, owner) {
         const result = await detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, cleanOutput, lines, instanceId, rawOutput, generation, { start: observationStart, frameTime }, 
         // Issue #3881 (review P2-1): the window this capture was taken with,
         // and (third review N4) whether it cut the pane's top.
-        captureLines, headCut);
+        captureLines, headCut, inputReadMark);
         if (!(0, auto_yes_poller_generation_1.isTickCurrent)(generation)) {
             endStaleTick(generation);
             return;