commandmate 0.46.0 → 0.47.0

package/dist/server/src/lib/detection/tools/claude/detect.js

@@ -10,6 +10,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.claudeStatusDetector = void 0;
 exports.findClaudeTranscriptTail = findClaudeTranscriptTail;
+exports.isClaudeAskUserQuestionConfirmPage = isClaudeAskUserQuestionConfirmPage;
 exports.readIdleEvidence = readIdleEvidence;
 const cli_patterns_1 = require("../../cli-patterns");
 const composer_text_1 = require("../../composer-text");
@@ -17,6 +18,7 @@ const prompt_detect_multiple_choice_1 = require("../../prompt-detect-multiple-ch
 const verdicts_1 = require("../verdicts");
 const status_reason_1 = require("../../status-reason");
 const prompt_1 = require("./prompt");
+const picker_chrome_1 = require("./picker-chrome");
 const frame_1 = require("../frame");
 const live_region_1 = require("./live-region");
 const run_detection_1 = require("../run-detection");
@@ -59,6 +61,64 @@ function findClaudeTranscriptTail(contentLines) {
     }
     return index;
 }
+/** The confirmation page's question, as the whole row (Issue #3748). */
+const CLAUDE_SUBMIT_CONFIRM_QUESTION_ROW = /^\s*Ready to submit your answers\?\s*$/;
+/** Its option 1, as the whole row, cursor or not. */
+const CLAUDE_SUBMIT_ANSWERS_OPTION_ROW = /^\s*(?:❯\s*)?1\.\s+Submit answers\s*$/;
+/** Its option 2, as the whole row, cursor or not. */
+const CLAUDE_SUBMIT_CANCEL_OPTION_ROW = /^\s*(?:❯\s*)?2\.\s+Cancel\s*$/;
+/** The multi-question tab bar's `✔ Submit` tab — only that bar leads to this page. */
+const CLAUDE_SUBMIT_TAB_PATTERN = /✔\s*Submit/;
+/**
+ * How far above the question the tab bar may sit: the page lists every
+ * question and answer (`● …` / `→ …`) between them, wrapped at the pane width.
+ */
+const CLAUDE_SUBMIT_CONFIRM_TAB_LOOKBACK = 200;
+/** The nearest non-blank row above `row`, or -1. */
+function previousNonBlankRow(lines, row) {
+    for (let i = row - 1; i >= 0; i--) {
+        if (lines[i].trim() !== '')
+            return i;
+    }
+    return -1;
+}
+/**
+ * Is this frame Claude's `AskUserQuestion` confirmation page? (Issue #3748)
+ *
+ * Read strictly, row by row, from the end of the transcript up — all of:
+ *
+ *  1. the transcript's last row ({@link findClaudeTranscriptTail}, which steps
+ *     over Claude's chrome) is `2. Cancel`, the row above it `1. Submit
+ *     answers`, and the cursor `❯` is on one of the two;
+ *  2. the nearest non-blank row above the options IS `Ready to submit your
+ *     answers?` — the whole row, not a row that contains it;
+ *  3. the multi-question tab bar (`←  ☒ …  ✔ Submit  →`) sits above that.
+ *
+ * Deliberately NOT `detectClaudeDialog`'s `ask_user` kind: that classifies by a
+ * substring of the four rows above the options, so a Bash approval whose command
+ * is `grep -rn "review your answers" src`, an Edit approval whose diff holds
+ * the phrase, or a question that asks it read as this page — and Auto-Yes then
+ * left an ordinary `1. Yes` to a human. The dialog gate's reading is unchanged.
+ *
+ * `Submit answers` picks nothing — it commits whatever stands as the answers —
+ * so Auto-Yes leaves this page to a human, as it does Command Code's (#3497).
+ */
+function isClaudeAskUserQuestionConfirmPage(frame) {
+    const lines = frame.contentLines;
+    const cancelRow = findClaudeTranscriptTail(lines);
+    if (cancelRow < 0 || !CLAUDE_SUBMIT_CANCEL_OPTION_ROW.test(lines[cancelRow]))
+        return false;
+    const submitRow = cancelRow - 1;
+    if (submitRow < 0 || !CLAUDE_SUBMIT_ANSWERS_OPTION_ROW.test(lines[submitRow]))
+        return false;
+    if (!lines[submitRow].includes('❯') && !lines[cancelRow].includes('❯'))
+        return false;
+    const questionRow = previousNonBlankRow(lines, submitRow);
+    if (questionRow < 0 || !CLAUDE_SUBMIT_CONFIRM_QUESTION_ROW.test(lines[questionRow]))
+        return false;
+    const tabRow = (0, picker_chrome_1.findAskUserQuestionTabRow)(lines, questionRow, CLAUDE_SUBMIT_CONFIRM_TAB_LOOKBACK);
+    return tabRow >= 0 && CLAUDE_SUBMIT_TAB_PATTERN.test(lines[tabRow]);
+}
 /**
  * §4 D1 決定 1: does this frame positively show that Claude's turn is over?
  *

package/dist/server/src/lib/detection/tools/command-code/selection-shape.js

@@ -17,6 +17,7 @@ exports.hasCommandCodePlanReviewFooterAtBottom = hasCommandCodePlanReviewFooterA
 exports.hasDismissablePanelFooter = hasDismissablePanelFooter;
 exports.isCommandCodeQuestionTabRow = isCommandCodeQuestionTabRow;
 exports.readCommandCodeReviewPage = readCommandCodeReviewPage;
+exports.isCommandCodeQuestionConfirmPage = isCommandCodeQuestionConfirmPage;
 const ansi_1 = require("../../ansi");
 const selection_shape_patterns_1 = require("../../selection-shape-patterns");
 /**
@@ -404,22 +405,13 @@ const COMMAND_CODE_REVIEW_BACK_HINT_PATTERN = /^[^\S\n]*\u2190[^\S\n]+to[^\S\n]+
  */
 const COMMAND_CODE_REVIEW_UNANSWERED_PATTERN = /have\s+not\s+answered\s+all\s+questions/i;
 /**
- * Read Command Code's `AskUserQuestion` Review page, if this frame is one
- * (Issue #2755 §7).
- *
- * The same region {@link readCommandCodeQuestionRegion} works on — last rule
- * row, tab strip as the first row under it — plus the three rows above. The
- * question-shaped conditions are deliberately NOT applied: this page has no
- * question body of its own on the `Submit`/`Cancel` spelling (the answers sit
- * where the question would), and it draws `1.` twice, so the strict reading
- * declines it for a numbering reason that says nothing about what it is.
- *
- * `null` for everything else, so no existing verdict moves except the two
- * captures this is about.
+ * The rows under the frame's LAST rule row, when the first of them that carries
+ * content is a question-screen tab strip (Issue #2755 §7, split out by Issue
+ * #3497 so the Review page reading and the confirm-page guard share one anchor).
  *
  * @param frame - a raw `capture-pane -p -e` frame, ANSI intact (CRLF tolerated)
  */
-function readCommandCodeReviewPage(frame) {
+function readQuestionTabRegion(frame) {
     if (!frame)
         return null;
     const lines = frame.replace(/\r\n/g, '\n').split('\n').map(ansi_1.stripAnsi);
@@ -446,6 +438,28 @@ function readCommandCodeReviewPage(frame) {
         return null;
     if (!isCommandCodeQuestionTabRow(region[tabOffset]))
         return null;
+    return region;
+}
+/**
+ * Read Command Code's `AskUserQuestion` Review page, if this frame is one
+ * (Issue #2755 §7).
+ *
+ * The same region {@link readCommandCodeQuestionRegion} works on — last rule
+ * row, tab strip as the first row under it — plus the three rows above. The
+ * question-shaped conditions are deliberately NOT applied: this page has no
+ * question body of its own on the `Submit`/`Cancel` spelling (the answers sit
+ * where the question would), and it draws `1.` twice, so the strict reading
+ * declines it for a numbering reason that says nothing about what it is.
+ *
+ * `null` for everything else, so no existing verdict moves except the two
+ * captures this is about.
+ *
+ * @param frame - a raw `capture-pane -p -e` frame, ANSI intact (CRLF tolerated)
+ */
+function readCommandCodeReviewPage(frame) {
+    const region = readQuestionTabRegion(frame);
+    if (region === null)
+        return null;
     const body = region.join('\n');
     if (!COMMAND_CODE_REVIEW_SUBMIT_ROW_PATTERN.test(body))
         return null;
@@ -459,3 +473,39 @@ function readCommandCodeReviewPage(frame) {
         cursorOnSubmit: submitRow !== undefined && submitRow.includes(exports.COMMAND_CODE_CURSOR_GLYPH),
     };
 }
+/**
+ * Is this frame an `AskUserQuestion` CONFIRM page — `❯ 1. Submit` / `2. Cancel`
+ * under the question screen's tab strip — whatever else it draws? (Issue #3497)
+ *
+ * {@link readCommandCodeReviewPage} needs all three of its rows, the back hint
+ * included, and on a frame without `← to go back and edit` it answers `null`.
+ * The question region declines that page too (it draws `1.` twice), so the
+ * GENERIC parser reads it; and a free-text question drawn with the pair as its
+ * only options is read by the question reader itself. Either way the payload is
+ * a two-option `multiple_choice` whose default is `Submit`, which Auto-Yes
+ * answered `1` — committing the worker's own proposal as the human's answer
+ * (Kewton/Musunest#283).
+ *
+ * This is the wider reading Auto-Yes declines on, and deliberately NOT a change
+ * to the Review page reading: the status path and the answer panels keep what
+ * they publish for these frames, so a human is still shown the question. True
+ * when the tab strip sits directly under the last rule row and the region
+ * carries the confirm pair — `1. Submit` and `2. Cancel`, the `❯` on either —
+ * with or without the back hint, and whichever tab is current (the incident's
+ * page was a free-text question drawn with the same pair).
+ *
+ * The question screens themselves (#2521 / #2522 / #2753 / #2754) never carry
+ * the pair: their `Submit` / `Next` confirm row has no number, and the Review
+ * TAB showing a diff (`◯ Dispatch | ● Review` over `1 +` gutter rows) has no
+ * `Submit` row at all.
+ *
+ * @param frame - a raw capture with its box drawing intact (ANSI optional)
+ */
+function isCommandCodeQuestionConfirmPage(frame) {
+    const region = readQuestionTabRegion(frame);
+    if (region === null)
+        return false;
+    const body = region.join('\n');
+    return (COMMAND_CODE_REVIEW_SUBMIT_ROW_PATTERN.test(body) &&
+        COMMAND_CODE_REVIEW_CANCEL_ROW_PATTERN.test(body));
+}

package/dist/server/src/lib/detection/tools/copilot/patterns.js

@@ -4,7 +4,7 @@
  * (Issue #3217). `cli-patterns.ts` re-exports every public name.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.COPILOT_SKIP_PATTERNS = exports.COPILOT_FOLDER_TRUST_ANSWER_KEY = exports.COPILOT_FOLDER_TRUST_SESSION_OPTION_PATTERN = exports.COPILOT_FOLDER_TRUST_ANCHORS = exports.COPILOT_SELECTION_FOOTER_PATTERN = exports.COPILOT_BOOT_BANNER_ANCHORS = exports.COPILOT_TRANSCRIPT_CONTINUATION_PATTERN = exports.COPILOT_TOOL_ROW_PATTERN = exports.COPILOT_TOOL_VERBS = exports.COPILOT_TRANSCRIPT_DIVIDER_PATTERN = exports.COPILOT_USER_ECHO_PATTERN = exports.COPILOT_REASONING_HEADER_PATTERN = exports.COPILOT_BOX_ROW_PATTERN = exports.COPILOT_SEPARATOR_PATTERN = exports.COPILOT_IDLE_STATUS_PATTERN = exports.COPILOT_WORKING_STATUS_PATTERN = exports.COPILOT_THINKING_PATTERN = exports.COPILOT_PROMPT_PATTERN = void 0;
+exports.COPILOT_SKIP_PATTERNS = exports.COPILOT_FOLDER_TRUST_ANSWER_KEY = exports.COPILOT_FOLDER_TRUST_OPTION_LABEL_PATTERN = exports.COPILOT_FOLDER_TRUST_SESSION_OPTION_PATTERN = exports.COPILOT_FOLDER_TRUST_ANCHORS = exports.COPILOT_SELECTION_FOOTER_PATTERN = exports.COPILOT_BOOT_BANNER_ANCHORS = exports.COPILOT_TRANSCRIPT_CONTINUATION_PATTERN = exports.COPILOT_TOOL_ROW_PATTERN = exports.COPILOT_TOOL_VERBS = exports.COPILOT_TRANSCRIPT_DIVIDER_PATTERN = exports.COPILOT_USER_ECHO_PATTERN = exports.COPILOT_REASONING_HEADER_PATTERN = exports.COPILOT_BOX_ROW_PATTERN = exports.COPILOT_SEPARATOR_PATTERN = exports.COPILOT_IDLE_STATUS_PATTERN = exports.COPILOT_WORKING_STATUS_PATTERN = exports.COPILOT_THINKING_PATTERN = exports.COPILOT_PROMPT_PATTERN = void 0;
 exports.readCopilotStatusBar = readCopilotStatusBar;
 exports.findCopilotChromeStart = findCopilotChromeStart;
 exports.isCopilotSelectionFrame = isCopilotSelectionFrame;
@@ -559,6 +559,12 @@ exports.COPILOT_FOLDER_TRUST_ANCHORS = [
  * line and accept `1. Yes, and remember ...`.
  */
 exports.COPILOT_FOLDER_TRUST_SESSION_OPTION_PATTERN = /^[ \t]*(?:[>❯][ \t]*)?1\.[ \t]+Yes[ \t]*$/m;
+/**
+ * The folder-trust dialog's option labels as the prompt parser reads them
+ * (`1. Yes` -> `Yes`), for the Auto-Yes poller to tell the dialog itself from
+ * another prompt under a reply that quotes its question (Issue #3790).
+ */
+exports.COPILOT_FOLDER_TRUST_OPTION_LABEL_PATTERN = /^(?:Yes|Yes, and remember this folder for future sessions|No \(Esc\))$/;
 /**
  * Key that selects {@link COPILOT_FOLDER_TRUST_SESSION_OPTION_PATTERN}.
  * Measured on 1.0.80: the digit confirms on its own — sending a trailing Enter

package/dist/server/src/lib/history/user-turn-recorder.js

@@ -101,6 +101,7 @@ exports.USER_TURN_ADOPTION_WINDOW_MS = void 0;
 exports.normalizeUserTurnContent = normalizeUserTurnContent;
 exports.recordUserTurn = recordUserTurn;
 const logger_1 = require("../../lib/logger");
+const poller_owner_1 = require("../../lib/polling/poller-owner");
 const logger = (0, logger_1.createLogger)('lib/history/user-turn-recorder');
 /**
  * How far from the agent's own clock a `/send` row may sit and still be the
@@ -182,6 +183,19 @@ async function recordUserTurn(target, key, content, timestampMs, options = {}) {
                 timestampMs: existing.timestamp.getTime(),
             };
         }
+        // Issue #3705: the last `await` is behind us, and from here the recorder
+        // writes — a key onto an existing `/send` row, or a new row — with none
+        // between. A retired tick does neither under the instance it lost: both are
+        // keyed by `request_id`, which stops the same row being written twice and
+        // says nothing about who may write it.
+        if (!(0, poller_owner_1.mayActForAgentInstance)(target)) {
+            logger.info('user-turn-record-refused', {
+                ...describe(target),
+                requestId: key,
+                generation: (0, poller_owner_1.currentPollerOwner)()?.generation,
+            });
+            return { outcome: 'refused', messageId: null, timestampMs: null };
+        }
         const at = timestampMs > 0 ? timestampMs : Date.now();
         const adopted = adoptExistingRow(chatDb, db, target, instanceId, key, normalized, at, options);
         if (adopted)

package/dist/server/src/lib/hooks/sources/antigravity/history.js

@@ -524,6 +524,10 @@ async function captureAntigravityTranscriptTurn(target, capture = {}, report) {
         // what the promotion to "final" rests on.
         const instanceKey = keyOf(target);
         const stopAt = await resolveAntigravityStopAt(target);
+        // Issue #3705: the follow list below is this instance's, and a tick retired
+        // while the reads above ran no longer speaks for it. Nothing is written yet.
+        if (!(0, transcript_history_1.mayReaderWrite)(target, logger, 'antigravity-transcript-write-refused', 'follow-list'))
+            return false;
         const completions = new Map();
         for (const turn of built.turns) {
             completions.set(turn.stepIndex, (0, transcript_1.resolveAntigravityTurnCompletion)(turn, stopAt));
@@ -546,6 +550,9 @@ async function captureAntigravityTranscriptTurn(target, capture = {}, report) {
             });
         }
         const pending = await selectUnwrittenAntigravityTurns(target, built.turns);
+        // Issue #3705: `unsettledStepsFor` below may drop the follow list.
+        if (!(0, transcript_history_1.mayReaderWrite)(target, logger, 'antigravity-transcript-write-refused', 'follow-list'))
+            return false;
         const writtenTurns = built.turns.slice(0, built.turns.length - pending.turns.length);
         // Before anything is written: the rows that are already there (#2438). This
         // is deliberately ahead of the early return below, because "the newest turn
@@ -598,6 +605,11 @@ async function captureAntigravityTranscriptTurn(target, capture = {}, report) {
             // An unconfirmed one joins the follow list so that its conclusion is still
             // picked up once three later turns have pushed it out of #2438's window.
             if (captured) {
+                // Issue #3705: after the write's own `await`. The row is there (it was
+                // written while the tick still owned the key), so the answer is true;
+                // the follow list and the cursor are no longer this tick's to move.
+                if (!(0, transcript_history_1.mayReaderWrite)(target, logger, 'antigravity-transcript-write-refused', 'follow-list'))
+                    return captured;
                 noteUnsettledAntigravityTurn(target, instanceKey, turn, completions.get(turn.stepIndex) ?? (0, transcript_1.resolveAntigravityTurnCompletion)(turn, stopAt));
             }
         }
@@ -810,6 +822,10 @@ async function growAntigravityTurnRow(target, existing, rendered, path) {
         Promise.resolve().then(() => __importStar(require('../../../../lib/db'))),
         Promise.resolve().then(() => __importStar(require('../../../../lib/ws-server'))),
     ]);
+    // Issue #3705: by row id, so a retired tick would grow a row the successor —
+    // or the migration — has since taken over.
+    if (!(0, transcript_history_1.mayReaderWrite)(target, logger, 'antigravity-transcript-write-refused', 'grow'))
+        return false;
     updateMessageContent(getDbInstance(), existing.id, rendered.body);
     broadcastMessage('message_updated', {
         worktreeId: target.worktreeId,
@@ -866,6 +882,11 @@ async function refreshAntigravityTurnRows(target, candidates, path, follow) {
     const db = getDbInstance();
     let updated = 0;
     for (const turn of candidates) {
+        // Issue #3705: asked at the top of every pass — the first comes after the
+        // imports, every later one after the previous turn's grow — because both
+        // follow-list writes below come before this pass's own `await`.
+        if (!(0, transcript_history_1.mayReaderWrite)(target, logger, 'antigravity-transcript-write-refused', 'follow-list'))
+            break;
         // Issue #2443: the row lookup moved ahead of the writable check, because
         // the follow list is a statement about ROWS. A turn that is open again has a
         // row whose body is provisional by definition and must stay followed, and a
@@ -1067,6 +1088,13 @@ async function writeAntigravityTurn(target, turn, rendered, timestampMs, path, r
         await growAntigravityTurnRow(target, existing, rendered, path);
         return true;
     }
+    // Issue #3705: the last `await` (the imports) is behind us and the row and its
+    // broadcast follow with none between. A tick retired meanwhile writes no row
+    // under the instance it lost — the request id only stops the SAME row being
+    // written twice — and answers false: History does not hold the turn.
+    if (!(0, transcript_history_1.mayReaderWrite)(target, logger, 'antigravity-transcript-write-refused', 'reply-row')) {
+        return false;
+    }
     const message = createMessage(db, {
         worktreeId: target.worktreeId,
         role: 'assistant',

package/dist/server/src/lib/hooks/sources/claude/history.js

@@ -1238,6 +1238,13 @@ async function writeClaudeTurn(target, turn, rendered, timestampMs, path, report
         await growClaudeTurnRow(target, existing, rendered, path);
         return true;
     }
+    // Issue #3705: the last `await` (the imports) is behind us and the row and its
+    // broadcast follow with none between. A tick retired meanwhile writes no row
+    // under the instance it lost — the request id only stops the SAME row being
+    // written twice — and answers false: History does not hold the turn.
+    if (!(0, transcript_history_1.mayReaderWrite)(target, logger, 'claude-transcript-write-refused', 'reply-row')) {
+        return false;
+    }
     const message = createMessage(db, {
         worktreeId: target.worktreeId,
         role: 'assistant',

package/dist/server/src/lib/hooks/sources/codex/history.js

@@ -729,6 +729,13 @@ async function writeCodexTurn(target, turn, rendered, timestampMs, windowFacts,
             itemsInWindow: turn.items.length,
         });
     }
+    // Issue #3705: the last `await` (the imports) is behind us and the row and its
+    // broadcast follow with none between. A tick retired meanwhile writes no row
+    // under the instance it lost — the request id only stops the SAME row being
+    // written twice — and answers false: History does not hold the turn.
+    if (!(0, transcript_history_1.mayReaderWrite)(target, logger, 'codex-transcript-write-refused', 'reply-row')) {
+        return false;
+    }
     const message = createMessage(db, {
         worktreeId: target.worktreeId,
         role: 'assistant',

package/dist/server/src/lib/hooks/sources/command-code/history.js

@@ -765,6 +765,13 @@ async function writeCommandCodeTurn(target, turn, rendered, timestampMs, path, r
         await growCommandCodeTurnRow(target, existing, rendered, path);
         return true;
     }
+    // Issue #3705: the last `await` (the imports) is behind us and the row and its
+    // broadcast follow with none between. A tick retired meanwhile writes no row
+    // under the instance it lost — the request id only stops the SAME row being
+    // written twice — and answers false: History does not hold the turn.
+    if (!(0, transcript_history_1.mayReaderWrite)(target, logger, 'command-code-transcript-write-refused', 'reply-row')) {
+        return false;
+    }
     const message = createMessage(db, {
         worktreeId: target.worktreeId,
         role: 'assistant',

package/dist/server/src/lib/hooks/sources/opencode-v2/history.js

@@ -367,9 +367,13 @@ async function writeOpencodeV2Turn(target, rendered, timestampMs) {
  * @param target - The instance the stream belongs to
  * @param port - Its server
  * @param sessionId - `ses_…` from the end-of-turn frame
+ * @param isCurrent - Whether the subscription that asked is still the
+ *   instance's (Issue #3733); checked after the read, right before the model
+ *   is latched. False skips only the latch: the rows are still written (the
+ *   turn did happen, and `requestId` keeps a later sync from doubling them)
  * @returns How many rows were written
  */
-function syncOpencodeV2History(target, port, sessionId) {
+function syncOpencodeV2History(target, port, sessionId, isCurrent = () => true) {
     return serialize((0, secrets_1.opencodeV2KeyOf)(target), async () => {
         const instanceId = target.instanceId ?? target.cliToolId;
         try {
@@ -395,7 +399,12 @@ function syncOpencodeV2History(target, port, sessionId) {
             }
             // Issue #2964: the model that answered, onto the hook latch the UI and
             // `capture --json` read. Before the rows, so a failed write cannot cost it.
-            (0, agent_event_state_1.recordAgentReportedModel)(target.worktreeId, tool_id_1.OPENCODE_V2_CLI_TOOL_ID, target.instanceId ?? tool_id_1.OPENCODE_V2_CLI_TOOL_ID, readLatestOpencodeV2AssistantModel(entries));
+            // Issue #3733: not for a subscription closed or replaced during the read —
+            // a restarted or stopped session would show the old model, and its change
+            // broadcast and Push (#2357) would fire for a session that is not there.
+            if (isCurrent()) {
+                (0, agent_event_state_1.recordAgentReportedModel)(target.worktreeId, tool_id_1.OPENCODE_V2_CLI_TOOL_ID, target.instanceId ?? tool_id_1.OPENCODE_V2_CLI_TOOL_ID, readLatestOpencodeV2AssistantModel(entries));
+            }
             const closed = buildOpencodeV2TurnsFromMessages(entries, sessionId).filter((turn) => turn.closed);
             const kept = closed.slice(-exports.MAX_OPENCODE_V2_SYNCED_TURNS);
             let written = 0;

package/dist/server/src/lib/hooks/sources/opencode-v2/subscription.js

@@ -386,7 +386,7 @@ function deliver(state, frame) {
             error: error instanceof Error ? error.message : String(error),
         });
     }
-    void recordOpencodeV2TurnEnd(state.target, state.port, frame);
+    void recordOpencodeV2TurnEnd(state.target, state.port, frame, () => isCurrentSubscription(state));
     void refreshOpencodeV2UsageOnFrame(state.target, state.port, frame, () => isCurrentSubscription(state));
 }
 function isCurrentSubscription(state) {
@@ -429,16 +429,18 @@ function refreshOpencodeV2UsageOnFrame(target, port, frame, isCurrent = () => tr
  *
  * Exported for the tests, which drive frames through the path the stream does.
  *
+ * @param isCurrent - Handed to `syncOpencodeV2History`, which skips the model
+ *   latch when it is false after the read (Issue #3733)
  * @returns The sync, or null when the frame ends no turn
  */
-function recordOpencodeV2TurnEnd(target, port, frame) {
+function recordOpencodeV2TurnEnd(target, port, frame, isCurrent = () => true) {
     try {
         if (!(0, history_1.isOpencodeV2TurnEndEventType)((0, mappers_1.frameType)(frame)))
             return null;
         const sessionId = (0, mappers_1.frameSessionId)(frame);
         if (sessionId === null)
             return null;
-        return (0, history_1.syncOpencodeV2History)(target, port, sessionId);
+        return (0, history_1.syncOpencodeV2History)(target, port, sessionId, isCurrent);
     }
     catch (error) {
         logger.warn('opencode-v2-history-trigger-failed', {

package/dist/server/src/lib/hooks/sources/transcript-history.js

@@ -41,6 +41,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.mayReaderWrite = mayReaderWrite;
 exports.resolveAssistantTimestampMs = resolveAssistantTimestampMs;
 exports.nextTurnOpensAt = nextTurnOpensAt;
 exports.isReadableFile = isReadableFile;
@@ -51,6 +52,35 @@ exports.growTurnRowTo = growTurnRowTo;
 exports.refreshTurnRowsTo = refreshTurnRowsTo;
 const promises_1 = require("fs/promises");
 const path_1 = require("path");
+const poller_owner_1 = require("../../../lib/polling/poller-owner");
+/**
+ * Whether the reader may still write for `target` now, logging the refusal when
+ * it may not (Issue #3705).
+ *
+ * Asked by every reader write — a reply row, its growth, a user row, its key,
+ * the follow list — after the last `await` before it and with none between it
+ * and the write. The question is the poller's (`mayActForAgentInstance`): only
+ * a response-poller tick whose chain was stopped (a stop, a restart past
+ * `STALLED_TICK_TIMEOUT`, a worktree-ID migration) and that is reading for its
+ * own instance is turned away. The Stop hook, a route and a tick reading for
+ * another instance write as before. Answering false writes nothing — the
+ * request id of a row makes a write idempotent, it does not make a retired
+ * tick's write right, and a grow or a key is not idempotent at all.
+ *
+ * @param refusedEvent - The tool's own log event for the refusal
+ * @param write - What was about to be written, for the log line
+ */
+function mayReaderWrite(target, logger, refusedEvent, write) {
+    if ((0, poller_owner_1.mayActForAgentInstance)(target))
+        return true;
+    logger.info(refusedEvent, {
+        worktreeId: target.worktreeId,
+        instanceId: target.instanceId ?? target.cliToolId,
+        generation: (0, poller_owner_1.currentPollerOwner)()?.generation,
+        write,
+    });
+    return false;
+}
 /**
  * When the assistant row for this turn is dated.
  *
@@ -213,6 +243,10 @@ async function growTurnRowTo(target, existing, rendered, path, logger, updatedEv
         Promise.resolve().then(() => __importStar(require('../../../lib/db'))),
         Promise.resolve().then(() => __importStar(require('../../../lib/ws-server'))),
     ]);
+    // Issue #3705: by row id, so a retired tick would grow a row the successor —
+    // or the migration — has since taken over.
+    if (!mayReaderWrite(target, logger, 'transcript-write-refused', 'grow'))
+        return false;
     updateMessageContent(getDbInstance(), existing.id, rendered.body);
     broadcastMessage('message_updated', {
         worktreeId: target.worktreeId,

package/dist/server/src/lib/log-manager.js

@@ -69,7 +69,8 @@ function getLogFilePath(worktreeId, cliToolId = 'claude') {
  * @param userMessage - User's message
  * @param claudeResponse - Claude's response
  * @param cliToolId - CLI tool ID (claude, codex, gemini)
- * @returns Path to the created log file
+ * @param options - See {@link CreateLogOptions}
+ * @returns Path to the created log file, or null when `options.mayWrite` refused it
  *
  * @example
  * ```typescript
@@ -81,7 +82,7 @@ function getLogFilePath(worktreeId, cliToolId = 'claude') {
  * );
  * ```
  */
-async function createLog(worktreeId, userMessage, claudeResponse, cliToolId = 'claude') {
+async function createLog(worktreeId, userMessage, claudeResponse, cliToolId = 'claude', options = {}) {
     await ensureLogDirectory(cliToolId);
     const logPath = getLogFilePath(worktreeId, cliToolId);
     const timestamp = (0, date_fns_1.format)(new Date(), 'yyyy-MM-dd HH:mm:ss');
@@ -105,6 +106,10 @@ async function createLog(worktreeId, userMessage, claudeResponse, cliToolId = 'c
     logContent += `### ${displayName}\n\n`;
     logContent += `${claudeResponse}\n\n`;
     logContent += `---\n\n`;
+    // Issue #3705: after the two awaits above and right before the write — the
+    // only place the caller's question can still be answered for this entry.
+    if (options.mayWrite && !options.mayWrite())
+        return null;
     await promises_1.default.writeFile(logPath, logContent, 'utf-8');
     return logPath;
 }

package/dist/server/src/lib/polling/antigravity-permission-receipts.js

@@ -41,6 +41,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ANTIGRAVITY_PERMISSION_RECEIPT_WINDOW_MS = void 0;
 exports.recordAntigravityPermissionReceipt = recordAntigravityPermissionReceipt;
 exports.hasRecentAntigravityPermissionReceipt = hasRecentAntigravityPermissionReceipt;
+exports.getAntigravityPermissionReceiptAt = getAntigravityPermissionReceiptAt;
 exports.resetAntigravityPermissionReceiptsForTests = resetAntigravityPermissionReceiptsForTests;
 const auto_yes_state_1 = require("../../lib/auto-yes-state");
 const global_state_1 = require("../global-state");
@@ -69,6 +70,12 @@ function pruneExpiredReceipts(now) {
             receipts.delete(key);
     }
 }
+/**
+ * Per-instance episode state of the poller's reads (Issue #3767); the logic is in
+ * `antigravity-receipt-episodes.ts`. The Map lives here only so that
+ * {@link resetAntigravityPermissionReceiptsForTests} empties both records.
+ */
+const observations = (0, global_state_1.getOrInitGlobal)('__antigravityReceiptObservations', () => new Map());
 /**
  * Record that agy asked CommandMate about a tool call.
  *
@@ -107,7 +114,15 @@ function hasRecentAntigravityPermissionReceipt(worktreeId, cliToolId, instanceId
         return false;
     return now - receipt.at <= exports.ANTIGRAVITY_PERMISSION_RECEIPT_WINDOW_MS;
 }
+/**
+ * The latest question's arrival time for this instance, kept past the window
+ * (Issue #3767), or null when none was ever received.
+ */
+function getAntigravityPermissionReceiptAt(worktreeId, cliToolId, instanceId) {
+    return receipts.get((0, auto_yes_state_1.buildCompositeKey)(worktreeId, cliToolId, instanceId))?.at ?? null;
+}
 /** Empty the record. Tests only: production entries age out on their own. */
 function resetAntigravityPermissionReceiptsForTests() {
     receipts.clear();
+    observations.clear();
 }