commandmate 0.48.0 → 0.49.1

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

@@ -78,6 +78,7 @@ const opencode_executable_1 = require("./opencode-executable");
 const log_diagnosis_1 = require("../../lib/hooks/sources/opencode/log-diagnosis");
 const launch_screen_1 = require("../../lib/session/launch-screen");
 const errors_1 = require("../../lib/errors");
+const instance_input_lock_1 = require("../../lib/session/instance-input-lock");
 const logger = (0, logger_1.createLogger)('cli-tools/opencode');
 const execFileAsync = (0, util_1.promisify)(child_process_1.execFile);
 /** OpenCode TUI graceful exit command [D1-006] */
@@ -478,17 +479,42 @@ class OpenCodeTool extends base_1.BaseCLITool {
      * and it is logged as `opencode-send-unverified` so it is visible rather than
      * inferred.
      *
+     * ## Issue #3957: the dispatch boundary
+     *
+     * This path types no key, so it reports no input start. Right before the
+     * POST it notes a `dispatch` boundary instead (`noteDispatchStart`), which a
+     * relay-bound send records as its lower bound — and which can refuse, in
+     * which case nothing is posted and the refusal propagates past the catch
+     * below. When the POST does not end delivered, the caller is told whether
+     * nothing exists (`not_sent`: a POST the server refused — Issue #3992 — or a
+     * `404` on the read-back) or it cannot be said (`unknown`: a POST that got no
+     * answer or an unexpected 2xx, a body that read back different, an exhausted
+     * ladder), BEFORE the keyboard fallback runs.
+     *
      * @param target - The instance
      * @param message - The body, sent verbatim
      * @param imagePath - Absolute path to an attachment, if there is one
      * @returns Whether the message was posted **and** read back
      */
     async trySendViaServer(target, message, imagePath) {
+        const outcome = await this.dispatchViaServer(target, message, imagePath);
+        if (outcome === 'delivered')
+            return true;
+        if (outcome !== 'skipped')
+            (0, instance_input_lock_1.noteDispatchFailed)(outcome);
+        return false;
+    }
+    /**
+     * {@link trySendViaServer}'s body, telling apart a route that was never tried
+     * (`skipped`) from a dispatch that did not deliver (Issue #3957).
+     */
+    async dispatchViaServer(target, message, imagePath) {
         const instanceId = target.instanceId ?? target.cliToolId;
+        let dispatched = false;
         try {
             const port = (0, ports_1.getAssignedOpencodePort)(target);
             if (port === null)
-                return false;
+                return 'skipped';
             // The same three preconditions the abort path checks (#2034): a port with
             // a live subscription behind it, and a session this instance owns. The
             // liveness check is what keeps a squatter on a remembered port from being
@@ -501,7 +527,7 @@ class OpenCodeTool extends base_1.BaseCLITool {
                     port,
                     liveness: liveness.state,
                 });
-                return false;
+                return 'skipped';
             }
             // Null on a pane that has not run a turn yet — the gate learns the session
             // from the first frame that names it. That first send goes over the
@@ -513,7 +539,7 @@ class OpenCodeTool extends base_1.BaseCLITool {
                     instanceId,
                     port,
                 });
-                return false;
+                return 'skipped';
             }
             const parts = [{ type: 'text', text: message }];
             if (imagePath !== undefined) {
@@ -535,10 +561,20 @@ class OpenCodeTool extends base_1.BaseCLITool {
             // §20.5). Null when nothing is configured, and the request body is then
             // byte-identical to the pre-#2048 one.
             const selection = (0, launch_settings_1.opencodePromptSelection)((0, launch_settings_1.getOpencodeLaunchSettings)(target));
-            if (!(await (0, client_1.sendOpencodePrompt)(port, sessionId, messageId, parts, selection)))
-                return false;
+            // Issue #3957: the boundary, right before the POST. A refusal throws and
+            // nothing is posted.
+            (0, instance_input_lock_1.noteDispatchStart)();
+            dispatched = true;
+            // Issue #3992: a POST the server refused (a non-2xx, an unknown route's
+            // `200 text/html`) sent nothing. One that got no answer, or an unexpected
+            // 2xx, may still have created the message, so it stays unknown.
+            const dispatch = await (0, client_1.sendOpencodePrompt)(port, sessionId, messageId, parts, selection);
+            if (dispatch === 'rejected')
+                return 'not_sent';
+            if (dispatch === 'unknown')
+                return 'unknown';
             const verified = await this.verifyPostedMessage(port, sessionId, messageId, message);
-            if (!verified) {
+            if (verified !== 'found') {
                 logger.warn('opencode-send-unverified', {
                     worktreeId: target.worktreeId,
                     instanceId,
@@ -547,7 +583,7 @@ class OpenCodeTool extends base_1.BaseCLITool {
                     messageId,
                     hasImage: imagePath !== undefined,
                 });
-                return false;
+                return verified === 'missing' ? 'not_sent' : 'unknown';
             }
             logger.info('opencode-send-delivered-via-api', {
                 worktreeId: target.worktreeId,
@@ -557,9 +593,13 @@ class OpenCodeTool extends base_1.BaseCLITool {
                 messageId,
                 hasImage: imagePath !== undefined,
             });
-            return true;
+            return 'delivered';
         }
         catch (error) {
+            // Issue #3957: the relay refused the boundary — nothing was posted, and
+            // nothing may be typed either.
+            if ((0, instance_input_lock_1.isInputBoundaryRefusal)(error))
+                throw error;
             // Nothing above is allowed to take the send down: the keystroke route is
             // still there and is what runs when this answers false.
             logger.warn('opencode-send-api-failed', {
@@ -567,7 +607,7 @@ class OpenCodeTool extends base_1.BaseCLITool {
                 instanceId,
                 error: (0, errors_1.getErrorMessage)(error),
             });
-            return false;
+            return dispatched ? 'unknown' : 'skipped';
         }
     }
     /**
@@ -581,7 +621,9 @@ class OpenCodeTool extends base_1.BaseCLITool {
      * — so the check is that the sent body is *among* the text parts, not that it
      * is the only one.
      *
-     * @returns True once the body was found; false on a `404` or after the ladder
+     * @returns `found` once the body was found; `missing` on a `404`; `mismatch`
+     *   when a message exists under the id with other text; `unknown` after the
+     *   ladder (Issue #3957 tells the last three apart)
      */
     async verifyPostedMessage(port, sessionId, messageId, message) {
         for (const waitMs of exports.OPENCODE_SEND_READBACK_DELAYS_MS) {
@@ -589,14 +631,14 @@ class OpenCodeTool extends base_1.BaseCLITool {
                 await new Promise((resolve) => setTimeout(resolve, waitMs));
             const readback = await (0, client_1.readOpencodeUserMessage)(port, sessionId, messageId);
             if (readback.kind === 'found')
-                return readback.texts.includes(message);
+                return readback.texts.includes(message) ? 'found' : 'mismatch';
             // A `404` is the server saying the message does not exist, which does not
             // become truer by asking again — the measured cause is a part the server
             // could not resolve, and it discards the whole message when that happens.
             if (readback.kind === 'missing')
-                return false;
+                return 'missing';
         }
-        return false;
+        return 'unknown';
     }
     /**
      * Send a message to OpenCode interactive session