commandmate 0.49.1 → 0.49.3

package/dist/server/src/lib/detection/tools/vibe-local/readiness.js

@@ -0,0 +1,70 @@
+"use strict";
+/**
+ * Whether a vibe-local pane is ready to take a message body (Issue #4040).
+ *
+ * `VIBE_LOCAL_PROMPT_PATTERN` (`ctx:N% ❯` anywhere on the pane) is not that
+ * test: vibe-local draws the row once per prompt and leaves it in the
+ * scrollback with what was typed after it (`startup-screen.ts`), and a relaunch
+ * into the same pane keeps the dead process's transcript above the new one
+ * (#2070). A row somewhere above a loading screen therefore says nothing about
+ * the pane now.
+ *
+ * Measured on vibe-local 1.3.3 (`tests/fixtures/vibe-local-readiness-4040/`),
+ * the ready pane ends in the newest prompt row with nothing after the glyph,
+ * followed only by vibe-local's own footer — a `─` rule, the status bar
+ * (`✦ Ready │ ctx:4% │ <model>`) and `ESC: stop`. The status bar says `Ready`
+ * while a turn is being generated too, so it is chrome, not evidence.
+ *
+ * The one exception is a turn being generated: vibe-local takes input then as
+ * type-ahead (its banner says so), and the newest prompt row is the echo of the
+ * running turn. It is accepted only on the detector's own generation evidence
+ * (`isGeneratingStatus`) AND when output has been drawn below that row — a
+ * composer still holding typed text (`ctx:4% ❯ Thinking …`) is the last row
+ * itself, and is not ready whatever the detector reads in it.
+ *
+ * @module lib/detection/tools/vibe-local/readiness
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isVibeLocalComposerReady = isVibeLocalComposerReady;
+const ansi_1 = require("../../ansi");
+const status_detector_1 = require("../../status-detector");
+/** The prompt row at column 0, with or without text after the glyph. */
+const PROMPT_ROW = /^ctx:\d+%\s*[>❯]/;
+/** The prompt row with nothing after the glyph: the input line, empty. */
+const BARE_PROMPT_ROW = /^ctx:\d+%\s*[>❯]\s*$/;
+/**
+ * The rows vibe-local 1.3.3 draws under its prompt row: the rule, the status
+ * bar and the interrupt hint. Anything else below the newest prompt row is
+ * output (a banner, a loading line, a reply).
+ */
+const FOOTER_ROWS = [/^\s*─{3,}\s*$/, /^\s*✦\s.*│/, /^\s*ESC: stop\s*$/];
+function isFooterRow(line) {
+    return FOOTER_ROWS.some((pattern) => pattern.test(line));
+}
+/**
+ * @param output - Raw `capture-pane` output (ANSI escapes allowed)
+ * @returns true when the newest prompt row is empty and only the footer is
+ *   below it, or when a turn is being generated below the newest prompt row
+ */
+function isVibeLocalComposerReady(output) {
+    const lines = (0, ansi_1.stripAnsi)(output).split('\n');
+    let promptRow = -1;
+    for (let i = lines.length - 1; i >= 0; i--) {
+        if (PROMPT_ROW.test(lines[i])) {
+            promptRow = i;
+            break;
+        }
+    }
+    if (promptRow < 0)
+        return false;
+    const below = lines.slice(promptRow + 1).filter((line) => line.trim() !== '');
+    const outputBelow = below.some((line) => !isFooterRow(line));
+    if (BARE_PROMPT_ROW.test(lines[promptRow]) && !outputBelow)
+        return true;
+    // Generation: the newest prompt row is the running turn's echo, and the
+    // detector reads generation in what was drawn under it.
+    if (!outputBelow)
+        return false;
+    const status = (0, status_detector_1.detectSessionStatus)(output, 'vibe-local');
+    return !status.hasActivePrompt && (0, status_detector_1.isGeneratingStatus)(status);
+}

package/dist/server/src/lib/hooks/sources/copilot/hook-settings.js

@@ -868,9 +868,8 @@ function writeCopilotHookSettings(options = {}) {
  *
  * Applied to the launched process rather than through `tmux set-environment`:
  * the pane is created before the agent starts and the assignment then travels
- * with the one process that matters, out of reach of
- * `sanitizeSessionEnvironment` and of anything else that edits the session's
- * environment later.
+ * with the one process that matters, out of reach of anything that edits
+ * the session's environment later (claude's `unset CLAUDECODE` among them).
  *
  * Returned as a map since Issue #1846. It used to be a pre-quoted
  * `NAME=value NAME=value` string that the caller concatenated in front of the

package/dist/server/src/lib/prompt-answer-errors.js

@@ -2,12 +2,17 @@
 /**
  * The refusals and failures `prompt-answer-sender` throws, with the reason
  * codes they carry (Issue #3965: moved out of `prompt-answer-sender`, which
- * re-exports every name here, so callers keep importing from it).
+ * re-exports every error and reason code here, so callers keep importing from it).
+ *
+ * Issue #3982: also how each of them is answered over HTTP
+ * ({@link promptAnswerErrorResponse}), in one table both answering routes read.
+ * That mapping is imported from this module directly.
  *
  * Type-only imports: this module must not import the sender back.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PromptAnswerAbortedError = exports.PromptAnswerInputLostError = exports.ANSWER_INPUT_LOST_REASON = exports.PromptAnswerNotDeliveredError = exports.ANSWER_NOT_DELIVERED_REASON = exports.MultiSelectAnswerRejectedError = exports.MULTI_SELECT_NOT_COMMITTED_REASON = exports.FreeTextAtChoiceOnlyPromptError = exports.FreeTextAnswerRejectedError = exports.FREE_TEXT_AT_MENU_ROW_REASON = exports.PromptAnswerRejectedError = exports.ANSWER_MODE_KEYS_REASON = void 0;
+exports.PROMPT_ANSWER_ERROR_RESPONSES = exports.PromptAnswerAbortedError = exports.ANSWER_ABORTED_REASON = exports.PromptAnswerInputLostError = exports.ANSWER_INPUT_LOST_REASON = exports.PromptAnswerNotDeliveredError = exports.ANSWER_NOT_DELIVERED_REASON = exports.MultiSelectAnswerRejectedError = exports.MULTI_SELECT_NOT_COMMITTED_REASON = exports.FreeTextAtChoiceOnlyPromptError = exports.FreeTextAnswerRejectedError = exports.FREE_TEXT_AT_MENU_ROW_REASON = exports.PromptAnswerRejectedError = exports.ANSWER_MODE_KEYS_REASON = void 0;
+exports.promptAnswerErrorResponse = promptAnswerErrorResponse;
 /**
  * The reason code a caller gets back when a digit meets a `keys`-mode dialog
  * (Issue #2033).
@@ -269,6 +274,12 @@ class PromptAnswerInputLostError extends Error {
     }
 }
 exports.PromptAnswerInputLostError = PromptAnswerInputLostError;
+/**
+ * The reason code of {@link PromptAnswerAbortedError} on the wire (Issue #3982).
+ * Neither answering route passes a `stillCurrent`, so neither is expected to
+ * see one; it has a code so that the mapping below has no hole.
+ */
+exports.ANSWER_ABORTED_REASON = 'answer_aborted';
 /**
  * The caller's `stillCurrent` said no after one of the send's waits
  * (Issue #3706): the keys not yet sent were not sent. Keys already typed cannot
@@ -286,3 +297,66 @@ class PromptAnswerAbortedError extends Error {
     }
 }
 exports.PromptAnswerAbortedError = PromptAnswerAbortedError;
+function row(errorClass, facts, status) {
+    return [errorClass, { facts: facts, status }];
+}
+/**
+ * Every error class this module exports, and how each route answers it
+ * (Issue #3982).
+ *
+ * Before this table each route had its own `instanceof` chain, and an error
+ * added to one was missing from the other: `/prompt-response` answered
+ * {@link PromptAnswerInputLostError} as a bare 500 with neither `reason` nor
+ * `keysSent`, so a caller could only find the reason by reading the message —
+ * which is also where a quoted answer lands. A unit test enumerates this
+ * module's exported classes and fails when one has no row here.
+ *
+ * `keysSent` is stated here for the refusals that never touch the pane rather
+ * than put on those errors: Auto-Yes reads `keysSent` off a thrown error to
+ * count its attempt, and that count is not this table's to change.
+ */
+exports.PROMPT_ANSWER_ERROR_RESPONSES = new Map([
+    row(PromptAnswerRejectedError, (e) => ({ reason: e.reason, keysSent: false }), { 'prompt-response': 200, respond: 500 }),
+    row(FreeTextAnswerRejectedError, (e) => ({ reason: e.reason, keysSent: false }), { 'prompt-response': 200, respond: 500 }),
+    row(FreeTextAtChoiceOnlyPromptError, (e) => ({ reason: e.reason, keysSent: false }), { 'prompt-response': 200, respond: 500 }),
+    row(MultiSelectAnswerRejectedError, (e) => ({ reason: e.reason, keysSent: e.keysSent }), { 'prompt-response': 200, respond: 500 }),
+    row(PromptAnswerNotDeliveredError, (e) => ({ reason: e.reason, keysSent: e.keysSent }), { 'prompt-response': 200, respond: 409 }),
+    // Keys reached the pane: a failure, not a refusal, on both routes (#3952 review P2).
+    row(PromptAnswerInputLostError, (e) => ({ reason: e.reason, keysSent: e.keysSent }), { 'prompt-response': 500, respond: 500 }),
+    row(PromptAnswerAbortedError, (e) => ({ reason: exports.ANSWER_ABORTED_REASON, keysSent: e.keysSent }), { 'prompt-response': 500, respond: 500 }),
+]);
+/** The mapping row for an error, or null when it is not one of this module's. */
+function mappingOf(error) {
+    if (!(error instanceof Error))
+        return null;
+    for (const [errorClass, mapping] of exports.PROMPT_ANSWER_ERROR_RESPONSES) {
+        if (error instanceof errorClass)
+            return mapping;
+    }
+    return null;
+}
+/**
+ * How `route` answers an error `sendPromptAnswer` threw (Issue #3982), or null
+ * for an error this module does not define (the route keeps its own 500).
+ *
+ * The body always carries `reason` and `keysSent`. Its other keys are the ones
+ * each status already had: `success: false` + `message` for a 200 refusal (the
+ * route adds `answer`), `error` for a 409, and `error` prefixed
+ * `Failed to send answer to tmux:` for a 500. That 500's `error` still quotes
+ * the message, so a CLI older than this table reads it as before.
+ */
+function promptAnswerErrorResponse(error, route) {
+    const mapping = mappingOf(error);
+    if (mapping === null)
+        return null;
+    const err = error;
+    const { reason, keysSent } = mapping.facts(err);
+    const status = mapping.status[route];
+    if (status === 200) {
+        return { status, body: { success: false, reason, message: err.message, keysSent } };
+    }
+    if (status >= 500) {
+        return { status, body: { error: `Failed to send answer to tmux: ${err.message}`, reason, keysSent } };
+    }
+    return { status, body: { error: err.message, reason, keysSent } };
+}

package/dist/server/src/lib/relay/relay-bound-reply.js

@@ -216,7 +216,7 @@ function stashReplyForOpenRelays(db, worker, now) {
         if (!reply)
             continue;
         const body = (0, relay_messages_1.buildRelayReplyMessage)(senderLabel(db, relay), reply.content);
-        if (stashReply(db, relay.id, { candidateId: reply.id, body, overlap: null, basis: 'legacy' }, now)) {
+        if (stashReply(db, relay.id, { candidateId: reply.id, body, overlap: null, basis: 'legacy' }, now) !== null) {
             stashed += 1;
         }
     }
@@ -232,6 +232,11 @@ function stashReplyForOpenRelays(db, worker, now) {
  * requester for nothing. The notice is being typed: the reply waits in the
  * second slot and is promoted once the notice is out. A reply already holds
  * it: nothing (two producers, one delivery).
+ *
+ * Issue #4082: when a reply already waits in the second slot (it finished
+ * while the notice was held, and the hold was retried), the replacement puts
+ * THAT reply first and drops this later one — the first reply to finish is
+ * the one kept, as the second slot always kept it.
  */
 function stashReply(db, relayId, reply, now) {
     const decided = { ...reply, payloadId: (0, crypto_1.randomUUID)() };
@@ -239,16 +244,21 @@ function stashReply(db, relayId, reply, now) {
         payloadId: decided.payloadId,
         overlap: decided.overlap ?? undefined,
     })) {
-        return true;
+        return 'stashed';
     }
     const current = (0, relay_db_1.getRelayPendingPayload)(db, relayId);
     if (!current || current.kind !== 'prompt')
-        return false;
+        return null;
     if (!(0, relay_delivery_claims_1.isRelayDeliveryClaimed)(relayId)) {
-        if ((0, relay_db_1.replaceRelayPromptWithReply)(db, relayId, current.payloadId, decided, now))
-            return true;
+        const replaced = (0, relay_db_1.replaceRelayPromptWithReply)(db, relayId, current.payloadId, decided, now);
+        if (replaced === 'reply')
+            return 'stashed';
+        if (replaced === 'waiting-reply') {
+            logger.info('relay-earlier-reply-kept', { relayId, laterCandidateId: reply.candidateId });
+            return 'earlier-reply';
+        }
     }
-    return (0, relay_db_1.setRelayPendingReply)(db, relayId, decided, now);
+    return (0, relay_db_1.setRelayPendingReply)(db, relayId, decided, now) ? 'stashed' : null;
 }
 /**
  * Whether the session's observation still matches the one the send recorded.
@@ -382,8 +392,8 @@ function stashBoundReply(db, worker, binding, reply, now) {
     const verdict = (0, relay_overlap_1.judgeRelayOverlap)(db, binding, worker, reply);
     const note = (0, relay_messages_1.buildRelayOverlapNote)((0, model_change_push_notifier_1.resolveReadersLocale)(db), verdict.overlap);
     const body = (0, relay_messages_1.buildRelayReplyMessage)(senderLabel(db, binding.relay), reply.content, note);
-    const stashed = stashReply(db, binding.relay.id, { candidateId: reply.id, body, overlap: verdict.overlap, basis: verdict.basis }, now);
-    if (stashed) {
+    const outcome = stashReply(db, binding.relay.id, { candidateId: reply.id, body, overlap: verdict.overlap, basis: verdict.basis }, now);
+    if (outcome === 'stashed') {
         logger.info('relay-reply-decided', {
             relayId: binding.relay.id,
             candidateId: reply.id,
@@ -391,7 +401,8 @@ function stashBoundReply(db, worker, binding, reply, now) {
             basis: verdict.basis,
         });
     }
-    return stashed;
+    // An earlier reply taking the slot is still a payload for the pump.
+    return outcome !== null;
 }
 /**
  * Whether a prompt row may be told to this relay's requester (Issue #3957).