crewly 1.20.200 → 1.20.201

package/dist/cli/backend/src/services/session/session-command-helper.d.ts

@@ -31,16 +31,36 @@ export declare class SessionCommandHelper {
     private logger;
     private backend;
     /**
-     * Per session: the collapsed paste marker ("[Pasted text #1 +29 lines]",
-     * "[Pasted Content 1234 chars]") the runtime showed right after the
-     * harness pasted `message`. Proof that a marker still in the box later is
-     * ours, so a lost Enter can be recovered. Shared across helper instances.
-     */
-    private static readonly ownPasteMarkers;
-    /** Clock for the marker record (tests). */
+     * Per session: the harness's own latest paste into a box it had proven
+     * empty. While the box keeps showing it (the collapsed marker "[Pasted
+     * text #4 +5 lines]" / "[Pasted Content 1234 chars]", or the text itself)
+     * it is ours — whatever message is sent next — so a lost or never-pressed
+     * Enter can be recovered. Written by every paste path; shared across
+     * helper instances.
+     *
+     * - `pending`: pasted, not yet seen in the box (a busy Claude Code renders
+     *   a paste seconds late). The first readable box that is not empty must
+     *   show the paste's shape, or the record ends; it also ends unseen after
+     *   OWN_PASTE_PENDING_MAX_MS.
+     * - `seen`: the box showed `shown`. Every readable box since must show
+     *   exactly that; the first that does not ends the record. Unreadable
+     *   screens (a dialog) do not count as seen: unseen for
+     *   OWN_PASTE_UNSEEN_MAX_MS ends it too. While busy the watcher re-reads
+     *   the box, so a long turn keeps it alive.
+     *
+     * Also ended by our one Enter on it, and by session/runtime (re)start.
+     */
+    private static readonly ownPastes;
+    /** Sessions a sendMessage is typing into right now (the watcher keeps off) */
+    private static readonly inFlight;
+    /** The watcher re-reading boxes that hold a paste of ours */
+    private static watchTimer;
+    /** Clock for the paste record (tests). */
     static now: () => number;
+    /** How long sendMessage waits for a late paste to render (tests shorten it). */
+    static pasteRenderMaxWaitMs: number;
     /**
-     * Forget the recorded paste marker of a session: its runtime is being
+     * Forget the recorded paste of a session: its runtime is being
      * (re)started, a shell line is typed, or the session is created/killed —
      * Claude Code's paste counter restarts at #1, and Codex markers carry only
      * a character count, so an old record could match the owner's paste.
@@ -49,13 +69,58 @@ export declare class SessionCommandHelper {
      */
     static forgetOwnPaste(sessionName: string): void;
     /**
-     * The recorded marker, while it may still be ours: at most
-     * OWN_MARKER_TTL_MS after our paste.
+     * Whether a paste of ours is on record for a session (tests, diagnostics).
+     *
+     * @param sessionName - The session
+     * @returns True while the record stands
+     */
+    static hasOwnPaste(sessionName: string): boolean;
+    /**
+     * Record our paste of `message` into a box proven empty.
+     *
+     * @param sessionName - The session
+     * @param message - What was pasted
+     */
+    private recordOwnPaste;
+    /** Whether recording a paste starts the timed watcher (tests drive it by hand). */
+    static autoWatch: boolean;
+    /** Start the watcher (no-op when running). */
+    private static startWatching;
+    /** Stop the watcher once no paste is on record. */
+    private static stopWatchingIfIdle;
+    /**
+     * One watcher pass: re-read every box holding a paste of ours (keeping
+     * the "seen continuously" record alive through a long turn, ending it the
+     * moment the box shows anything else), and once the agent is idle with
+     * our paste still sitting there, press Enter on it once.
+     *
+     * @returns Resolves when every session was looked at
+     */
+    static watchOwnPastes(): Promise<void>;
+    /** Pause between screen samples when checking that a busy screen repaints (tests shorten it). */
+    static repaintSampleMs: number;
+    /**
+     * Whether the agent in a session is mid-turn. All three must hold:
+     * - a turn signal where the runtime paints it (see readTurnSignals): the
+     *   busy bar in the footer below the box, or the spinner line directly
+     *   above it — never text in the transcript;
+     * - the screen is repainting: it changes within a few short samples (a
+     *   live spinner animates its glyph and counter several times a second);
+     * - the PTY produced output within BUSY_FROZEN_MS: a screen that stopped
+     *   repainting is frozen, not busy, and a held message must go out.
      *
      * @param sessionName - The session
-     * @returns The marker, or undefined
+     * @returns True when busy
      */
-    private static ownMarkerFor;
+    isAgentBusy(sessionName: string): Promise<boolean>;
+    /**
+     * Whether the agent in a session is resting: not busy (see
+     * {@link isAgentBusy}) and no meaningful output for a few seconds.
+     *
+     * @param sessionName - The session
+     * @returns True when idle
+     */
+    isAgentIdle(sessionName: string): Promise<boolean>;
     constructor(backend: ISessionBackend);
     /**
      * Get a session by name, throwing an error if it doesn't exist.
@@ -90,6 +155,11 @@ export declare class SessionCommandHelper {
      *    submitted and nothing is cleared: text we cannot prove is ours is
      *    never wiped.
      *
+     * Every paste is recorded (see `ownPastes`): if its Enter is lost, or it
+     * renders only after we stopped looking (a busy Claude Code), it stays
+     * ours while the box keeps showing it, and is submitted once the agent
+     * is idle — by the next delivery or by the watcher.
+     *
      * A refusal throws `TuiInputGuardError`; agent delivery keeps the message
      * queued and retries (AgentRegistrationService). Shell command lines
      * typed before a runtime starts use {@link sendShellLine} instead.
@@ -99,9 +169,14 @@ export declare class SessionCommandHelper {
      * @throws Error if session does not exist
      * @throws TuiInputGuardError when the box is unreadable or not ours
      */
-    sendMessage(sessionName: string, message: string, options?: {
-        recordPasteMarker?: boolean;
-    }): Promise<void>;
+    sendMessage(sessionName: string, message: string): Promise<void>;
+    /**
+     * The body of {@link sendMessage}, run while the watcher keeps off.
+     *
+     * @param sessionName - The session to send to
+     * @param message - The message to send
+     */
+    private sendMessageGuarded;
     /**
      * After a delivery: if the box still holds the collapsed marker of our
      * own paste, the Enter was lost — press Enter once and look again. Runs
@@ -143,6 +218,25 @@ export declare class SessionCommandHelper {
      * @returns The reading
      */
     readInputBox(sessionName: string, message: string, stage?: TuiInputStage): TuiInputReading;
+    /**
+     * What the box showed for our recorded paste, while the record stands.
+     * Ends the record when it has gone unseen too long.
+     *
+     * @param sessionName - The session
+     * @returns The text the box showed, or undefined (none seen / no record)
+     */
+    private ownPasteShown;
+    /**
+     * Keep the paste record in step with a reading: the record stands only
+     * while every readable box shows our paste. A pending paste (not seen
+     * yet) is adopted when the box first shows its shape; an empty box keeps
+     * it pending; anything else ends it.
+     *
+     * @param sessionName - The session
+     * @param reading - The classification just made
+     * @returns The reading, marked `ownPasteMarker` when the box shows our paste
+     */
+    private applyOwnPaste;
     /**
      * Empty the input box — only call it for text proven to be the harness's
      * own. Sends Ctrl+U then Backspace (clear the line, join the empty line to

package/dist/cli/backend/src/services/session/session-command-helper.d.ts.map

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

package/dist/cli/backend/src/services/session/session-command-helper.js

@@ -21,7 +21,7 @@ import { delay } from '../../utils/async.utils.js';
 import { assertNotSecretEnvKey } from '../../utils/secret-env.js';
 import { quietShellLine } from '../../utils/shell-history.js';
 import { PtyActivityTrackerService } from '../agent/pty-activity-tracker.service.js';
-import { classifyTuiInput, isPasteMarker, TuiInputGuardError } from './tui-input-guard.js';
+import { classifyTuiInput, pasteShowsAs, screenShowsTurnInProgress, TuiInputGuardError } from './tui-input-guard.js';
 import { noteHarnessWrite } from '../trace/turn-origin.js';
 /**
  * Key code mappings for special keys
@@ -69,16 +69,36 @@ export class SessionCommandHelper {
     logger;
     backend;
     /**
-     * Per session: the collapsed paste marker ("[Pasted text #1 +29 lines]",
-     * "[Pasted Content 1234 chars]") the runtime showed right after the
-     * harness pasted `message`. Proof that a marker still in the box later is
-     * ours, so a lost Enter can be recovered. Shared across helper instances.
-     */
-    static ownPasteMarkers = new Map();
-    /** Clock for the marker record (tests). */
+     * Per session: the harness's own latest paste into a box it had proven
+     * empty. While the box keeps showing it (the collapsed marker "[Pasted
+     * text #4 +5 lines]" / "[Pasted Content 1234 chars]", or the text itself)
+     * it is ours — whatever message is sent next — so a lost or never-pressed
+     * Enter can be recovered. Written by every paste path; shared across
+     * helper instances.
+     *
+     * - `pending`: pasted, not yet seen in the box (a busy Claude Code renders
+     *   a paste seconds late). The first readable box that is not empty must
+     *   show the paste's shape, or the record ends; it also ends unseen after
+     *   OWN_PASTE_PENDING_MAX_MS.
+     * - `seen`: the box showed `shown`. Every readable box since must show
+     *   exactly that; the first that does not ends the record. Unreadable
+     *   screens (a dialog) do not count as seen: unseen for
+     *   OWN_PASTE_UNSEEN_MAX_MS ends it too. While busy the watcher re-reads
+     *   the box, so a long turn keeps it alive.
+     *
+     * Also ended by our one Enter on it, and by session/runtime (re)start.
+     */
+    static ownPastes = new Map();
+    /** Sessions a sendMessage is typing into right now (the watcher keeps off) */
+    static inFlight = new Set();
+    /** The watcher re-reading boxes that hold a paste of ours */
+    static watchTimer = null;
+    /** Clock for the paste record (tests). */
     static now = Date.now;
+    /** How long sendMessage waits for a late paste to render (tests shorten it). */
+    static pasteRenderMaxWaitMs = TUI_INPUT_GUARD.PASTE_RENDER_MAX_WAIT_MS;
     /**
-     * Forget the recorded paste marker of a session: its runtime is being
+     * Forget the recorded paste of a session: its runtime is being
      * (re)started, a shell line is typed, or the session is created/killed —
      * Claude Code's paste counter restarts at #1, and Codex markers carry only
      * a character count, so an old record could match the owner's paste.
@@ -86,24 +106,129 @@ export class SessionCommandHelper {
      * @param sessionName - The session
      */
     static forgetOwnPaste(sessionName) {
-        SessionCommandHelper.ownPasteMarkers.delete(sessionName);
+        SessionCommandHelper.ownPastes.delete(sessionName);
+        SessionCommandHelper.stopWatchingIfIdle();
     }
     /**
-     * The recorded marker, while it may still be ours: at most
-     * OWN_MARKER_TTL_MS after our paste.
+     * Whether a paste of ours is on record for a session (tests, diagnostics).
      *
      * @param sessionName - The session
-     * @returns The marker, or undefined
+     * @returns True while the record stands
      */
-    static ownMarkerFor(sessionName) {
-        const rec = SessionCommandHelper.ownPasteMarkers.get(sessionName);
-        if (!rec)
-            return undefined;
-        if (SessionCommandHelper.now() - rec.at > TUI_INPUT_GUARD.OWN_MARKER_TTL_MS) {
-            SessionCommandHelper.ownPasteMarkers.delete(sessionName);
-            return undefined;
+    static hasOwnPaste(sessionName) {
+        return SessionCommandHelper.ownPastes.has(sessionName);
+    }
+    /**
+     * Record our paste of `message` into a box proven empty.
+     *
+     * @param sessionName - The session
+     * @param message - What was pasted
+     */
+    recordOwnPaste(sessionName, message) {
+        SessionCommandHelper.ownPastes.set(sessionName, { message, pastedAt: SessionCommandHelper.now(), helper: this });
+        SessionCommandHelper.startWatching();
+    }
+    /** Whether recording a paste starts the timed watcher (tests drive it by hand). */
+    static autoWatch = true;
+    /** Start the watcher (no-op when running). */
+    static startWatching() {
+        if (SessionCommandHelper.watchTimer || !SessionCommandHelper.autoWatch)
+            return;
+        SessionCommandHelper.watchTimer = setInterval(() => {
+            void SessionCommandHelper.watchOwnPastes();
+        }, TUI_INPUT_GUARD.OWN_PASTE_WATCH_MS);
+        SessionCommandHelper.watchTimer.unref?.();
+    }
+    /** Stop the watcher once no paste is on record. */
+    static stopWatchingIfIdle() {
+        if (SessionCommandHelper.ownPastes.size > 0 || !SessionCommandHelper.watchTimer)
+            return;
+        clearInterval(SessionCommandHelper.watchTimer);
+        SessionCommandHelper.watchTimer = null;
+    }
+    /**
+     * One watcher pass: re-read every box holding a paste of ours (keeping
+     * the "seen continuously" record alive through a long turn, ending it the
+     * moment the box shows anything else), and once the agent is idle with
+     * our paste still sitting there, press Enter on it once.
+     *
+     * @returns Resolves when every session was looked at
+     */
+    static async watchOwnPastes() {
+        for (const [sessionName, rec] of [...SessionCommandHelper.ownPastes]) {
+            if (SessionCommandHelper.inFlight.has(sessionName))
+                continue;
+            try {
+                if (!rec.helper.backend.sessionExists(sessionName)) {
+                    SessionCommandHelper.ownPastes.delete(sessionName);
+                    continue;
+                }
+                const reading = rec.helper.readInputBox(sessionName, '', 'recovery');
+                if (reading.ownPasteMarker && await rec.helper.isAgentIdle(sessionName)) {
+                    const outcome = await rec.helper.ensureOwnPasteSubmitted(sessionName);
+                    rec.helper.logger.warn('Our earlier paste was still in the input box of an idle agent — pressed Enter on it once', { sessionName, outcome });
+                }
+            }
+            catch {
+                // A session that vanished mid-pass: the next pass drops it.
+            }
         }
-        return rec.marker;
+        SessionCommandHelper.stopWatchingIfIdle();
+    }
+    /** Pause between screen samples when checking that a busy screen repaints (tests shorten it). */
+    static repaintSampleMs = TUI_INPUT_GUARD.BUSY_REPAINT_SAMPLE_MS;
+    /**
+     * Whether the agent in a session is mid-turn. All three must hold:
+     * - a turn signal where the runtime paints it (see readTurnSignals): the
+     *   busy bar in the footer below the box, or the spinner line directly
+     *   above it — never text in the transcript;
+     * - the screen is repainting: it changes within a few short samples (a
+     *   live spinner animates its glyph and counter several times a second);
+     * - the PTY produced output within BUSY_FROZEN_MS: a screen that stopped
+     *   repainting is frozen, not busy, and a held message must go out.
+     *
+     * @param sessionName - The session
+     * @returns True when busy
+     */
+    async isAgentBusy(sessionName) {
+        const read = () => {
+            try {
+                return this.backend.captureOutput(sessionName, TUI_INPUT_GUARD.BUSY_BAR_TAIL_LINES) ?? '';
+            }
+            catch {
+                return '';
+            }
+        };
+        const first = read();
+        if (!screenShowsTurnInProgress(first))
+            return false;
+        const tracker = PtyActivityTrackerService.getInstance();
+        const quietMs = typeof tracker.getRawOutputIdleMs === 'function' ? tracker.getRawOutputIdleMs(sessionName) : null;
+        if (quietMs !== null && quietMs >= TUI_INPUT_GUARD.BUSY_FROZEN_MS) {
+            this.logger.warn('Screen shows a turn but the PTY has been silent — treating the agent as idle', { sessionName, quietMs });
+            return false;
+        }
+        for (let i = 0; i < TUI_INPUT_GUARD.BUSY_REPAINT_SAMPLES; i++) {
+            await delay(SessionCommandHelper.repaintSampleMs);
+            const next = read();
+            if (!screenShowsTurnInProgress(next))
+                return false;
+            if (next !== first)
+                return true;
+        }
+        return false;
+    }
+    /**
+     * Whether the agent in a session is resting: not busy (see
+     * {@link isAgentBusy}) and no meaningful output for a few seconds.
+     *
+     * @param sessionName - The session
+     * @returns True when idle
+     */
+    async isAgentIdle(sessionName) {
+        if (await this.isAgentBusy(sessionName))
+            return false;
+        return PtyActivityTrackerService.getInstance().getIdleTimeMs(sessionName) >= SESSION_COMMAND_DELAYS.AGENT_BUSY_IDLE_THRESHOLD_MS;
     }
     constructor(backend) {
         this.logger = LoggerService.getInstance().createComponentLogger('SessionCommandHelper');
@@ -152,6 +277,11 @@ export class SessionCommandHelper {
      *    submitted and nothing is cleared: text we cannot prove is ours is
      *    never wiped.
      *
+     * Every paste is recorded (see `ownPastes`): if its Enter is lost, or it
+     * renders only after we stopped looking (a busy Claude Code), it stays
+     * ours while the box keeps showing it, and is submitted once the agent
+     * is idle — by the next delivery or by the watcher.
+     *
      * A refusal throws `TuiInputGuardError`; agent delivery keeps the message
      * queued and retries (AgentRegistrationService). Shell command lines
      * typed before a runtime starts use {@link sendShellLine} instead.
@@ -161,7 +291,22 @@ export class SessionCommandHelper {
      * @throws Error if session does not exist
      * @throws TuiInputGuardError when the box is unreadable or not ours
      */
-    async sendMessage(sessionName, message, options = {}) {
+    async sendMessage(sessionName, message) {
+        SessionCommandHelper.inFlight.add(sessionName);
+        try {
+            await this.sendMessageGuarded(sessionName, message);
+        }
+        finally {
+            SessionCommandHelper.inFlight.delete(sessionName);
+        }
+    }
+    /**
+     * The body of {@link sendMessage}, run while the watcher keeps off.
+     *
+     * @param sessionName - The session to send to
+     * @param message - The message to send
+     */
+    async sendMessageGuarded(sessionName, message) {
         const session = this.getSessionOrThrow(sessionName);
         this.logger.debug('Sending message to session', {
             sessionName,
@@ -171,10 +316,14 @@ export class SessionCommandHelper {
         // Step 1: the box must be readable and empty before we type.
         let before = this.readInputBox(sessionName, message, 'before-write');
         if (before.ownPasteMarker) {
-            // An earlier delivery of ours is still in the box (its Enter was
-            // lost): submit it first, then deliver this one.
-            this.logger.warn('An earlier paste of ours is still in the input box — submitting it before this message', { sessionName });
-            await this.ensureOwnPasteSubmitted(sessionName);
+            // An earlier paste of ours is still in the box (its Enter was lost,
+            // or it rendered late): submit it first. When it is this very
+            // message, submitting it IS this delivery — never paste it twice.
+            const sameMessage = SessionCommandHelper.ownPastes.get(sessionName)?.message === message;
+            this.logger.warn('An earlier paste of ours is still in the input box — submitting it', { sessionName, sameMessage });
+            const outcome = await this.ensureOwnPasteSubmitted(sessionName);
+            if (sameMessage && outcome === 'submitted')
+                return;
             before = this.readInputBox(sessionName, message, 'before-write');
         }
         if (before.state === 'ours' && !before.ownPasteMarker) {
@@ -196,6 +345,7 @@ export class SessionCommandHelper {
         // Without this, special characters like (), $, `, and " can trigger
         // shell mode or be read as key sequences in Gemini CLI (#292, #293).
         session.write(`\x1b[200~${message}\x1b[201~`);
+        this.recordOwnPaste(sessionName, message);
         // Scale delay based on message size: large prompts (e.g. 409-line registration
         // prompts) need more time for Claude Code to process the bracketed paste.
         // Base delay + 1ms per 10 characters, capped at 5 seconds.
@@ -209,11 +359,13 @@ export class SessionCommandHelper {
             await delay(waitMs); // the paste may not have rendered yet
             after = this.readInputBox(sessionName, message, 'after-paste');
         }
-        // Remember the collapsed marker only for callers that check the box
-        // after delivery (sendMessageWithRetry → ensureOwnPasteSubmitted);
-        // other paths leave no record that could outlive the paste.
-        if (options.recordPasteMarker && after.state === 'ours' && isPasteMarker(after.text)) {
-            SessionCommandHelper.ownPasteMarkers.set(sessionName, { marker: after.text.trim(), message, at: SessionCommandHelper.now() });
+        // A busy agent renders a paste late (Claude Code: ~10 s mid-turn,
+        // 2026-10-03 Ella). Keep looking a while before giving up; if it shows
+        // up later anyway, the record makes it ours and it is submitted then.
+        const renderDeadline = SessionCommandHelper.now() + SessionCommandHelper.pasteRenderMaxWaitMs;
+        while (after.state === 'empty' && SessionCommandHelper.now() < renderDeadline) {
+            await delay(TUI_INPUT_GUARD.PASTE_RENDER_POLL_MS);
+            after = this.readInputBox(sessionName, message, 'after-paste');
         }
         if (after.state !== 'ours') {
             this.logger.warn('Input box does not hold exactly our text after the paste — not pressing Enter, not clearing', {
@@ -260,7 +412,7 @@ export class SessionCommandHelper {
         const after = this.readInputBox(sessionName, '', 'recovery');
         // One Enter on it, whatever happened: never press Enter on that marker
         // again from this record.
-        SessionCommandHelper.ownPasteMarkers.delete(sessionName);
+        SessionCommandHelper.forgetOwnPaste(sessionName);
         if (after.ownPasteMarker || (after.state === 'foreign' && after.text.trim() === reading.text.trim())) {
             this.logger.warn('Our pasted message is still in the input box after Enter — not delivered', { sessionName });
             return 'stuck';
@@ -272,7 +424,9 @@ export class SessionCommandHelper {
      * Forget recorded paste markers (tests).
      */
     static resetOwnPasteMarkersForTesting() {
-        SessionCommandHelper.ownPasteMarkers.clear();
+        SessionCommandHelper.ownPastes.clear();
+        SessionCommandHelper.inFlight.clear();
+        SessionCommandHelper.stopWatchingIfIdle();
     }
     /**
      * Type a command line into a plain shell and run it (paste + Enter).
@@ -308,6 +462,9 @@ export class SessionCommandHelper {
      * @returns The reading
      */
     readInputBox(sessionName, message, stage = 'recovery') {
+        // First: a paste record that has gone unseen too long ends here, even
+        // when the box cannot be read now.
+        const shown = this.ownPasteShown(sessionName);
         const capture = this.backend.captureInputView;
         if (typeof capture !== 'function')
             return { state: 'unknown', text: '', lineCount: 0 };
@@ -315,19 +472,65 @@ export class SessionCommandHelper {
             const view = capture.call(this.backend, sessionName);
             if (!view)
                 return { state: 'unknown', text: '', lineCount: 0 };
-            // The marker of our own recent paste is ours whatever we send next —
-            // and the record ends the moment the box shows anything else.
-            const own = SessionCommandHelper.ownMarkerFor(sessionName);
-            const reading = classifyTuiInput(view, message, stage, own);
-            if (own && reading.state !== 'unknown' && !reading.ownPasteMarker) {
-                SessionCommandHelper.ownPasteMarkers.delete(sessionName);
-            }
-            return reading;
+            return this.applyOwnPaste(sessionName, classifyTuiInput(view, message, stage, shown));
         }
         catch {
             return { state: 'unknown', text: '', lineCount: 0 };
         }
     }
+    /**
+     * What the box showed for our recorded paste, while the record stands.
+     * Ends the record when it has gone unseen too long.
+     *
+     * @param sessionName - The session
+     * @returns The text the box showed, or undefined (none seen / no record)
+     */
+    ownPasteShown(sessionName) {
+        const rec = SessionCommandHelper.ownPastes.get(sessionName);
+        if (!rec)
+            return undefined;
+        const now = SessionCommandHelper.now();
+        const unseenFor = now - (rec.lastSeenAt ?? rec.pastedAt);
+        const limit = rec.shown === undefined ? TUI_INPUT_GUARD.OWN_PASTE_PENDING_MAX_MS : TUI_INPUT_GUARD.OWN_PASTE_UNSEEN_MAX_MS;
+        if (unseenFor > limit) {
+            SessionCommandHelper.forgetOwnPaste(sessionName);
+            return undefined;
+        }
+        return rec.shown;
+    }
+    /**
+     * Keep the paste record in step with a reading: the record stands only
+     * while every readable box shows our paste. A pending paste (not seen
+     * yet) is adopted when the box first shows its shape; an empty box keeps
+     * it pending; anything else ends it.
+     *
+     * @param sessionName - The session
+     * @param reading - The classification just made
+     * @returns The reading, marked `ownPasteMarker` when the box shows our paste
+     */
+    applyOwnPaste(sessionName, reading) {
+        const rec = SessionCommandHelper.ownPastes.get(sessionName);
+        if (!rec || reading.state === 'unknown')
+            return reading;
+        const now = SessionCommandHelper.now();
+        if (rec.shown !== undefined) {
+            if (reading.ownPasteMarker) {
+                rec.lastSeenAt = now;
+                return reading;
+            }
+            SessionCommandHelper.forgetOwnPaste(sessionName);
+            return reading;
+        }
+        if (reading.state === 'empty')
+            return reading; // not rendered yet
+        if (pasteShowsAs(reading.text, rec.message)) {
+            rec.shown = reading.text.trim();
+            rec.lastSeenAt = now;
+            return { ...reading, state: 'ours', ownPasteMarker: true };
+        }
+        SessionCommandHelper.forgetOwnPaste(sessionName);
+        return reading;
+    }
     /**
      * Empty the input box — only call it for text proven to be the harness's
      * own. Sends Ctrl+U then Backspace (clear the line, join the empty line to