commandmate 0.49.1 → 0.49.3

package/dist/server/src/lib/cli-tools/copilot.js

@@ -17,7 +17,7 @@
  * [SEC4-001].
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CopilotTool = exports.COPILOT_EXIT_COMMAND = void 0;
+exports.CopilotTool = exports.COPILOT_EXIT_COMMAND = exports.COPILOT_DIALOG_CONFIRM_MS = void 0;
 exports.isCopilotStartupLoading = isCopilotStartupLoading;
 exports.readCopilotModelSwitchOutcomes = readCopilotModelSwitchOutcomes;
 exports.judgeCopilotModelSwitch = judgeCopilotModelSwitch;
@@ -25,7 +25,10 @@ const base_1 = require("./base");
 const tmux_1 = require("../tmux/tmux");
 const submit_verified_sender_1 = require("./submit-verified-sender");
 const composer_clear_1 = require("../../lib/session/composer-clear");
+const send_attempt_types_1 = require("../../lib/session/send-attempt-types");
+const prompt_wait_dialog_1 = require("./prompt-wait-dialog");
 const tmux_capture_cache_1 = require("../tmux/tmux-capture-cache");
+const status_detector_1 = require("../detection/status-detector");
 const cli_patterns_1 = require("../detection/cli-patterns");
 const copilot_executable_1 = require("./copilot-executable");
 const copilot_constants_1 = require("../../config/copilot-constants");
@@ -46,6 +49,19 @@ const COPILOT_POLL_INTERVAL_MS = 1000;
 const COPILOT_INIT_MAX_ATTEMPTS = 30;
 /** Timeout for waiting for prompt before sending a message */
 const COPILOT_PROMPT_WAIT_TIMEOUT_MS = 15000;
+/**
+ * How long a dialog has to stay up in {@link CopilotTool.waitForPrompt} before
+ * the wait gives up on it (Issue #4067), on {@link PROMPT_WAIT_DIALOG_CONFIRM_READS}
+ * reads in a row.
+ *
+ * A dialog waits for a person, so waiting out the 15 s (or `/model`'s 30 s)
+ * window behind it only delays the refusal — and the picker and `/model` wait
+ * holding the instance's input lock, so Auto-Yes and other writers wait too.
+ * Both thresholds must hold, so a frame caught mid-paint that reads as a
+ * dialog once does not refuse a send. The count is shared with opencode's and
+ * vibe-local's waits (Issue #4084, {@link createDialogConfirmation}).
+ */
+exports.COPILOT_DIALOG_CONFIRM_MS = prompt_wait_dialog_1.PROMPT_WAIT_DIALOG_CONFIRM_MS;
 /**
  * Copilot CLI slash commands that open a picker.
  *
@@ -263,6 +279,36 @@ function describeBottomRow(output) {
     }
     return 'an empty pane';
 }
+/**
+ * Re-read the pane and throw `recheckComposerBeforeInput`'s `prompt-waiting`
+ * refusal when a dialog is open (Issue #4040). Any other outcome — no dialog,
+ * or a re-read that failed — returns, so the caller's own refusal stands.
+ */
+async function rethrowIfDialogOpen(sessionName) {
+    try {
+        await (0, composer_clear_1.recheckComposerBeforeInput)(sessionName, 'copilot');
+    }
+    catch (error) {
+        if (error.code === send_attempt_types_1.INPUT_RECHECK_PROMPT_WAITING_CODE)
+            throw error;
+    }
+}
+/**
+ * Refuse as `prompt-waiting` after {@link CopilotTool.waitForPrompt} saw a
+ * dialog stay up for {@link COPILOT_DIALOG_CONFIRM_MS} (Issue #4067), with the
+ * re-check's `code` and the wording `classifySendFailure` reads as
+ * `prompt-waiting`. Nothing has been typed.
+ *
+ * Refused on the wait's own reads, without reading the pane once more: those
+ * reads already confirmed the dialog, and another capture (tmux's own time-out
+ * is 5 s) would keep the picker and `/model` holding the instance's input lock
+ * past the confirmation time (review of #4067).
+ */
+function refuseConfirmedDialog(sessionName) {
+    logger.warn('input-recheck-prompt-waiting', { sessionName, cliToolId: 'copilot', confirmedMs: exports.COPILOT_DIALOG_CONFIRM_MS });
+    throw Object.assign(new Error(`A prompt dialog stayed open in session ${sessionName} for ${exports.COPILOT_DIALOG_CONFIRM_MS}ms ` +
+        'while the copilot composer was awaited (re-checked under the input lock); nothing was typed (Issue #4067).'), { code: send_attempt_types_1.INPUT_RECHECK_PROMPT_WAITING_CODE });
+}
 /**
  * Copilot CLI tool implementation
  * Manages GitHub Copilot interactive sessions using tmux
@@ -380,8 +426,9 @@ class CopilotTool extends base_1.BaseCLITool {
             // leaves it (`cli-tools/launch-window`).
             (0, launch_window_1.beginLaunchWindow)(sessionName);
             try {
-                // Start Copilot CLI in interactive mode
-                await (0, tmux_1.sendKeys)(sessionName, (0, launch_screen_1.withLaunchScreenCleared)(launchCommand), true);
+                // Start Copilot CLI in interactive mode. Issue #3981: in one writer's
+                // turn of the input lock; the readiness wait below stays outside it.
+                await this.typeLaunchLines(sessionName, [(0, launch_screen_1.withLaunchScreenCleared)(launchCommand)]);
                 // Issue #1907: no blind sleep before this. The 4-second one that used to
                 // sit here was a guess at how long copilot takes to paint (measured on
                 // 1.0.80: banner at ~1.3 s, folder-trust dialog at ~2.5 s), and it was
@@ -547,17 +594,18 @@ class CopilotTool extends base_1.BaseCLITool {
      *   `❯` at column 0 while it is Working, the loop captures BEFORE its first
      *   sleep, and `COPILOT_PROMPT_PATTERN` matches immediately. A whole
      *   `sendMessage` measured 338 ms end to end, verification included.
-     * - **Composer gone — a dialog is up: the full 15 s, then it sends anyway.**
-     *   Measured against a session parked on copilot's own `Asked user …` question:
-     *   the window expired and the body was typed into the QUESTION's input line,
-     *   which is single-line, so a four-line message arrived as
-     *   `ping oneping twoping three…`.
+     * - **Composer gone — a dialog is up: the full 15 s.** Measured against a
+     *   session parked on copilot's own `Asked user …` question: until Issue #4040
+     *   the send then went ahead, and the body was typed into the QUESTION's input
+     *   line, which is single-line, so a four-line message arrived as
+     *   `ping oneping twoping three…`. Now the window expiring refuses the send.
      *
      * That second case is #559's objection, and it is real — but it is not a
      * reason to skip this method, because skipping it is what produced the same
-     * outcome in 0 ms instead of 15 s. What keeps it out of production is the layer
-     * above: `sendUserMessage` and the terminal route both consult
-     * `isPromptWaiting` (#1708/#1737) and refuse before reaching here.
+     * outcome in 0 ms instead of 15 s. The layer above refuses most dialogs
+     * first: `sendUserMessage` and the terminal route both consult
+     * `isPromptWaiting` (#1708/#1737), and the shared sender re-reads the pane
+     * under the input lock (#3945).
      *
      * Issue #2623 adds a third case, measured on 1.0.85: **composer on screen,
      * copilot still starting — until loading ends (3–4.5 s).** The composer is drawn
@@ -566,23 +614,44 @@ class CopilotTool extends base_1.BaseCLITool {
      * used to end this wait in 0 ms right there, which is how `send --model` on a
      * session it had just started typed a body that never ran.
      *
-     * Timing out still only logs and lets the send proceed, as before; the caller
-     * that must not proceed ({@link sendModelCommand}) reads the result.
+     * Timing out logs and returns `ready: false`; every caller reads it and types
+     * nothing then — the normal send since Issue #4040 (it used to drop the result
+     * and send anyway), the selection-list branch and {@link sendModelCommand}.
+     *
+     * Issue #4067: a dialog does not wait out the window. A frame the shared
+     * sender's re-check would refuse (`detectSessionStatus().hasActivePrompt`,
+     * {@link recheckComposerBeforeInput}) on {@link PROMPT_WAIT_DIALOG_CONFIRM_READS}
+     * reads in a row spanning {@link COPILOT_DIALOG_CONFIRM_MS} returns
+     * `ready: false, dialog: true`, and every caller refuses it as
+     * `prompt-waiting`. Not counted: the folder-trust dialog (answered above,
+     * #1886), and a frame with the composer drawn — `idle` waits through a
+     * Working turn, which keeps `❯` on screen, and that is not a dialog.
+     *
+     * Issue #4084: no capture is waited for past `timeoutMs` ({@link readBeforeDeadline}):
+     * one still running then, or one that answers after it, is not used.
      *
      * @param sessionName - tmux session name
      * @param timeoutMs - Optional timeout in ms (default: COPILOT_PROMPT_WAIT_TIMEOUT_MS)
      * @param until - What counts as ready (Issue #2623, default `composer`)
-     * @returns Whether the pane got there, and the last frame read (ANSI stripped)
+     * @returns Whether the pane got there, the last frame read (ANSI stripped),
+     *   and whether it gave up on a dialog (Issue #4067)
      */
     async waitForPrompt(sessionName, timeoutMs = COPILOT_PROMPT_WAIT_TIMEOUT_MS, until = 'composer') {
-        const startTime = Date.now();
+        // Issue #4084: one deadline for the whole wait — a capture still running at
+        // it is not waited for, and a frame it returns past it is not used.
+        const deadline = Date.now() + timeoutMs;
         const pollInterval = 500;
         let trustDialogHandled = false;
         let output = '';
-        while (Date.now() - startTime < timeoutMs) {
+        // Issue #4067: the current run of reads that showed a dialog (counted by
+        // the helper opencode and vibe-local share, Issue #4084).
+        const dialog = (0, prompt_wait_dialog_1.createDialogConfirmation)();
+        while (Date.now() < deadline) {
             try {
                 const readMark = (0, instance_input_lock_1.instanceInputReadMark)();
-                const rawOutput = await (0, tmux_1.capturePane)(sessionName, 50);
+                const rawOutput = await (0, prompt_wait_dialog_1.readBeforeDeadline)(() => (0, tmux_1.capturePane)(sessionName, 50), deadline);
+                if (rawOutput === null)
+                    break;
                 output = (0, cli_patterns_1.stripAnsi)(rawOutput);
                 if (this.isReadyFor(until, output)) {
                     return { ready: true, output };
@@ -590,20 +659,28 @@ class CopilotTool extends base_1.BaseCLITool {
                 // Issue #1886: `startSession` returns early for a session that already
                 // exists, so a pane adopted from outside CommandMate -- or one whose
                 // trust dialog nobody answered -- arrives here still sitting on it.
-                // Unlike codex's, this method only logs on timeout and lets the send
-                // proceed, which types the message body INTO the dialog; the body's
-                // digits are option selections there, so a message containing `2` picks
-                // "Yes, and remember this folder" and writes the operator's
-                // machine-global ~/.copilot/config.json. Answer it here for the same
-                // reason the launch path does, rather than leaving the worse outcome.
+                // Until Issue #4040 the normal send went ahead on a timeout, which
+                // typed the message body INTO the dialog; the body's digits are option
+                // selections there, so a message containing `2` picks "Yes, and
+                // remember this folder" and writes the operator's machine-global
+                // ~/.copilot/config.json. The send now refuses instead, but answering
+                // it here (as the launch path does) is what lets that send go through.
                 if (!trustDialogHandled && (await this.answerFolderTrustDialog(sessionName, output, readMark))) {
                     trustDialogHandled = true;
                 }
+                if (dialog.observe(this.isRefusableDialog(rawOutput, output))) {
+                    logger.info('copilot-prompt-wait-dialog', { until, reads: dialog.reads, bottomRow: describeBottomRow(output) });
+                    return { ready: false, output, dialog: true };
+                }
             }
             catch {
-                // Capture may fail - continue polling
+                // Capture may fail - continue polling. Not a dialog read: the run restarts.
+                dialog.reset();
             }
-            await new Promise((resolve) => setTimeout(resolve, pollInterval));
+            const remaining = deadline - Date.now();
+            if (remaining <= 0)
+                break;
+            await new Promise((resolve) => setTimeout(resolve, Math.min(pollInterval, remaining)));
         }
         logger.info('copilot-prompt-not-detected', { until, bottomRow: describeBottomRow(output) });
         return { ready: false, output };
@@ -619,6 +696,32 @@ class CopilotTool extends base_1.BaseCLITool {
      * @param until - What counts as ready
      * @param output - ANSI-stripped pane capture
      */
+    /**
+     * {@link isReadyFor}`('composer')` for the shared sender's read under the
+     * input lock (Issue #4040). Not `idle`: copilot draws `❯` while Working and
+     * takes a body then, as it always has.
+     */
+    inputReadiness = {
+        label: 'copilot',
+        isReady: (frame) => this.isReadyFor('composer', (0, cli_patterns_1.stripAnsi)(frame)),
+    };
+    /**
+     * Whether {@link waitForPrompt} counts this frame towards giving up on a
+     * dialog (Issue #4067): the shared sender's re-check would refuse it
+     * (`hasActivePrompt`), it is not the folder-trust dialog `waitForPrompt`
+     * answers itself (#1886), and no composer is drawn — a Working turn keeps
+     * `❯` up and is waited through, not refused.
+     *
+     * @param rawOutput - The capture as read (ANSI allowed), for the detector
+     * @param output - The same capture, ANSI stripped
+     */
+    isRefusableDialog(rawOutput, output) {
+        if ((0, cli_patterns_1.isCopilotFolderTrustDialog)(output))
+            return false;
+        if (this.isReadyFor('composer', output))
+            return false;
+        return (0, status_detector_1.detectSessionStatus)(rawOutput, 'copilot').hasActivePrompt;
+    }
     isReadyFor(until, output) {
         if (!cli_patterns_1.COPILOT_PROMPT_PATTERN.test(output))
             return false;
@@ -699,6 +802,10 @@ class CopilotTool extends base_1.BaseCLITool {
                     // then refuses on the same terms right before the keys: a dialog is
                     // `prompt-waiting`, a pane that cannot be read `recheck-failed`.
                     const prompt = await this.waitForPrompt(sessionName);
+                    // Issue #4067: a dialog that stayed up is refused at once — the lock
+                    // is not held for the rest of the window behind it.
+                    if (prompt.dialog)
+                        refuseConfirmedDialog(sessionName);
                     await (0, composer_clear_1.recheckComposerBeforeInput)(sessionName, 'copilot');
                     if (!prompt.ready) {
                         // review-3: neither the request nor the pane goes into the message.
@@ -722,8 +829,25 @@ class CopilotTool extends base_1.BaseCLITool {
                 logger.info('sent-selection-list-command-to-copilot', { command: slashCmd });
                 return;
             }
-            // Verify Copilot is at prompt state before sending
-            await this.waitForPrompt(sessionName);
+            // Verify Copilot is at prompt state before sending. Issue #4040: a
+            // composer that never came up is not typed into — refused as the
+            // selection-list branch refuses (review-3: neither the body nor the pane
+            // goes into the message, which `classifySendFailure` reads).
+            const prompt = await this.waitForPrompt(sessionName);
+            if (!prompt.ready) {
+                // Issue #4067: the wait gave up on a dialog after its confirmation time
+                // rather than the whole 15 s window.
+                if (prompt.dialog)
+                    refuseConfirmedDialog(sessionName);
+                // A dialog that opened during the wait and is still up is refused as
+                // the shared sender's re-check refuses it — `prompt-waiting` (409
+                // PROMPT_WAITING), not `prompt-not-ready`. A re-read that fails is
+                // left to the refusal below.
+                await rethrowIfDialogOpen(sessionName);
+                logger.warn('copilot-message-not-sent:prompt-not-ready', { bottomRow: describeBottomRow(prompt.output) });
+                throw new Error(`copilot prompt not ready within ${COPILOT_PROMPT_WAIT_TIMEOUT_MS}ms, ` +
+                    'so the message was not sent; nothing was typed');
+            }
             // Issue #1471: Body/Enter separation + read-back submit verification via the
             // shared helper (replaces the old type -> C-m -> `\n`-gated paste recovery).
             // Copilot's own text-input / post-Enter delays are preserved. The selection
@@ -735,6 +859,8 @@ class CopilotTool extends base_1.BaseCLITool {
                 composer: this.describeComposer(),
                 textInputWaitMs: copilot_constants_1.COPILOT_TEXT_INPUT_DELAY_MS,
                 verifyDelayMs: copilot_constants_1.COPILOT_SEND_ENTER_DELAY_MS,
+                // Issue #4040: the same test, of the newest frame read under the lock.
+                readiness: this.inputReadiness,
             });
             // Invalidate cache after sending message
             (0, tmux_capture_cache_1.invalidateCache)(sessionName);
@@ -742,7 +868,8 @@ class CopilotTool extends base_1.BaseCLITool {
         }
         catch (error) {
             const errorMessage = (0, errors_1.getErrorMessage)(error);
-            throw new Error(`Failed to send message to Copilot: ${errorMessage}`);
+            // Issue #4031: the cause keeps a failed `load-buffer`'s code (`classifySendFailure`).
+            throw new Error(`Failed to send message to Copilot: ${errorMessage}`, { cause: error });
         }
     }
     /**
@@ -820,6 +947,10 @@ class CopilotTool extends base_1.BaseCLITool {
         await (0, instance_input_lock_1.waitOutCarriedPasteMark)(ticket);
         const idle = await this.waitForPrompt(sessionName, copilot_constants_1.COPILOT_MODEL_SWITCH_TIMEOUT_MS, 'idle');
         if (!idle.ready) {
+            // Issue #4067: a dialog is refused after its confirmation time, not after
+            // the 30 s window under the lock.
+            if (idle.dialog)
+                refuseConfirmedDialog(sessionName);
             // The pane's text goes to the log, not the message: the message is read by
             // `classifySendFailure`, which a screen quoting its keywords would steer (#3954).
             logger.warn('copilot-model-switch-not-idle', { model: modelName, bottomRow: describeBottomRow(idle.output) });

package/dist/server/src/lib/cli-tools/gemini.js

@@ -111,7 +111,8 @@ class GeminiTool extends base_1.BaseCLITool {
                 // already in the pane is not run as part of it. Only the keys: the
                 // waits below stay outside the lock, where a send waiting for the
                 // prompt cannot be held behind them.
-                await (0, instance_input_lock_1.withInstanceInputLock)(sessionName, () => (0, tmux_1.sendKeys)(sessionName, (0, launch_screen_1.withLaunchScreenCleared)(launchCommand), true));
+                // Issue #3981: through the one launch-key writer every tool shares.
+                await this.typeLaunchLines(sessionName, [(0, launch_screen_1.withLaunchScreenCleared)(launchCommand)]);
                 // Wait for Gemini to initialize (minimum wait for banner/auth)
                 await new Promise((resolve) => setTimeout(resolve, GEMINI_INIT_WAIT_MS));
                 // Poll until Gemini interactive prompt is ready
@@ -207,6 +208,9 @@ class GeminiTool extends base_1.BaseCLITool {
     /**
      * Wait for Gemini prompt before sending a message.
      * Used by sendMessage to ensure Gemini is ready to accept input.
+     *
+     * @throws Error (`Gemini prompt not ready`) when the prompt did not appear
+     *   within {@link GEMINI_PROMPT_WAIT_TIMEOUT_MS}; nothing was typed
      */
     async waitForPrompt(sessionName) {
         const startTime = Date.now();
@@ -225,7 +229,10 @@ class GeminiTool extends base_1.BaseCLITool {
             }
             await new Promise((resolve) => setTimeout(resolve, pollInterval));
         }
+        // Issue #3981: give up without typing, as codex does. Sending anyway put the
+        // body into whatever held the pane (a dialog, a slow start, a shell).
         logger.info('gemini-prompt-not-detected');
+        throw new Error('Gemini prompt not ready: timed out waiting for the input prompt before sending');
     }
     /**
      * Send a message to Gemini interactive session
@@ -258,7 +265,8 @@ class GeminiTool extends base_1.BaseCLITool {
         }
         catch (error) {
             const errorMessage = (0, errors_1.getErrorMessage)(error);
-            throw new Error(`Failed to send message to Gemini: ${errorMessage}`);
+            // Issue #4031: the cause keeps a failed `load-buffer`'s code (`classifySendFailure`).
+            throw new Error(`Failed to send message to Gemini: ${errorMessage}`, { cause: error });
         }
     }
     /**

package/dist/server/src/lib/cli-tools/launch-keys.js

@@ -0,0 +1,39 @@
+"use strict";
+/**
+ * The keys a launch types into its pane, in one writer's turn (Issue #3981).
+ *
+ * #3975 put gemini's and claude's launch lines under the instance input lock;
+ * the other seven launch sites, and claude's `unset CLAUDECODE` before its
+ * line, still typed with no lock, so a send holding the composer could have
+ * them land in the middle of its body, paste or Enter. Every launch now types
+ * through {@link typeLaunchLines}: one `exclusive` turn for all of its lines
+ * (R2 of `session-launch-flight`), joined when the launcher already holds the
+ * lock (codex relaunching inside a send). The init polls and readiness waits
+ * that follow stay outside (#3975), so a send waiting for the prompt is never
+ * held behind them.
+ *
+ * @module lib/cli-tools/launch-keys
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.typeLaunchLines = typeLaunchLines;
+const tmux_1 = require("../tmux/tmux");
+const instance_input_lock_1 = require("../session/instance-input-lock");
+/**
+ * Type `steps` into `sessionName` as one `exclusive` writer, in order.
+ *
+ * @param sessionName - tmux session name
+ * @param steps - Lines (typed with Enter) and self-typing steps
+ * @throws Whatever `withInstanceInputLock` throws when not admitted; nothing was typed then
+ */
+async function typeLaunchLines(sessionName, steps) {
+    await (0, instance_input_lock_1.withInstanceInputLock)(sessionName, async () => {
+        for (const step of steps) {
+            if (typeof step === 'string') {
+                await (0, tmux_1.sendKeys)(sessionName, step, true);
+            }
+            else {
+                await step();
+            }
+        }
+    });
+}

package/dist/server/src/lib/cli-tools/opencode-v2.js

@@ -235,7 +235,10 @@ class OpenCodeV2Tool extends base_1.BaseCLITool {
             if (port === null) {
                 logger.warn('opencode-v2-launch-without-server', { worktreeId, instanceId });
             }
-            await (0, tmux_1.sendKeys)(sessionName, (0, launch_screen_1.withLaunchScreenCleared)((0, agent_session_lifecycle_1.buildAgentLaunchCommandLine)({ target, executablePath: executable.path, worktreePath })), true);
+            // Issue #3981: in one writer's turn of the input lock; the readiness
+            // wait below stays outside it.
+            const launchCommand = (0, agent_session_lifecycle_1.buildAgentLaunchCommandLine)({ target, executablePath: executable.path, worktreePath });
+            await this.typeLaunchLines(sessionName, [(0, launch_screen_1.withLaunchScreenCleared)(launchCommand)]);
             await this.waitForReady(sessionName);
             await (0, runtime_1.attachOpencodeV2EventStream)(target);
             logger.info('started-opencode-v2-session');
@@ -313,7 +316,8 @@ class OpenCodeV2Tool extends base_1.BaseCLITool {
             logger.info('sent-message-to-opencode-v2-session');
         }
         catch (error) {
-            throw new Error(`Failed to send message to OpenCode V2: ${(0, errors_1.getErrorMessage)(error)}`);
+            // Issue #4031: the cause keeps a failed `load-buffer`'s code (`classifySendFailure`).
+            throw new Error(`Failed to send message to OpenCode V2: ${(0, errors_1.getErrorMessage)(error)}`, { cause: error });
         }
     }
     /**