commandmate 0.49.0 → 0.49.1

package/dist/server/src/lib/session/send-attempt-state.js

@@ -129,11 +129,28 @@ function classifySendFailure(error) {
     // literal send IS the body (`Command failed: tmux send-keys -t =s: -l -- <body>`).
     // Whether any of the body reached the pane is unknown, and the body's own words
     // (`Explain prompt not ready.`) must not be read as a readiness refusal below.
+    // #3945: the re-read under the input lock failed before any key; it quotes the
+    // capture's own error (`Command failed: tmux capture-pane …`, no body), so it
+    // is matched before the transport wordings below.
+    if (/Could not re-read session \S+ before typing \(.*\); nothing was typed \(Issue #3945\)/s.test(message)) {
+        return { state: 'not-sent', reason: 'recheck-failed' };
+    }
     if (TMUX_TRANSPORT_FAILURE.test(message))
         return { state: 'indeterminate', reason: 'send-error' };
     // The readiness waits of every tool throw before typing anything.
     if (/prompt not ready/i.test(message))
         return { state: 'not-sent', reason: 'prompt-not-ready' };
+    // #3945: refused under (or before getting) the instance input lock, before any key.
+    if (/input lock not acquired, nothing was typed/.test(message)) {
+        return /was replaced while this send waited/.test(message)
+            ? { state: 'not-sent', reason: 'session-replaced' }
+            : { state: 'not-sent', reason: 'input-lock-timeout' };
+    }
+    if (/\(re-checked under the input lock\); nothing was typed/.test(message)) {
+        return { state: 'not-sent', reason: 'prompt-waiting' };
+    }
+    if (/input lock lost, nothing was typed/.test(message))
+        return { state: 'not-sent', reason: 'input-lock-lost' };
     // #1880: refused before the body, after only the clear keys (C-e / C-u, or C-e / BSpace
     // for a codex composer holding only a paste placeholder, #3937).
     if (/still holds unsent text after \d+ clear passes/.test(message)) {

package/dist/server/src/lib/session/send-attempt-types.js

@@ -9,9 +9,17 @@
  * @module lib/session/send-attempt-types
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PLAN_REVIEW_SEND_REFUSED_CODE = void 0;
+exports.INPUT_RECHECK_FAILED_CODE = exports.INPUT_RECHECK_PROMPT_WAITING_CODE = exports.PLAN_REVIEW_SEND_REFUSED_CODE = void 0;
 /**
  * `code` on the error a tool throws when a plan review overlay refuses the
  * send before any body is typed (Issue #3772). Matched by code, never by wording.
  */
 exports.PLAN_REVIEW_SEND_REFUSED_CODE = 'PLAN_REVIEW_SEND_REFUSED';
+/**
+ * `code` on the errors the input re-check throws before any key
+ * (`recheckComposerBeforeInput`, Issue #3952): a dialog was open, or the pane
+ * could not be read. Carried by copilot's `/model` switch, whose caller records
+ * the reason by code rather than by the wording around it.
+ */
+exports.INPUT_RECHECK_PROMPT_WAITING_CODE = 'INPUT_RECHECK_PROMPT_WAITING';
+exports.INPUT_RECHECK_FAILED_CODE = 'INPUT_RECHECK_FAILED';

package/dist/server/src/lib/session/send-user-message.js

@@ -31,7 +31,15 @@
  *
  * Every attempt that reaches the ownership check also records how it ended —
  * not-sent / sent / indeterminate — for `prompt --json`'s `lastSend` (Issue
- * #3759, `./send-attempt-state`). Nothing is resent on any outcome.
+ * #3759, `./send-attempt-state`). Nothing is resent on any outcome. The
+ * caller can also be handed its own attempt (`onAttempt`, Issue #3945), so it
+ * describes this send rather than whichever send to the instance recorded last.
+ *
+ * Issue #3945: for the tools whose composer is read after a failure (claude,
+ * codex), step 4 runs under the instance's input lock, the failure read
+ * included — a read made after the lock was released could be reading the next
+ * send's body. The tool's own sender joins that lock rather than queueing
+ * behind it (`instance-input-lock`).
  *
  * Out of scope (kept in the HTTP layer / caller): request/body validation,
  * content trimming/size limits, imagePath validation, CLI-tool availability
@@ -54,8 +62,10 @@ const prompt_waiting_guard_1 = require("../../lib/session/prompt-waiting-guard")
 const session_start_error_1 = require("../../lib/session/session-start-error");
 const cli_session_1 = require("../../lib/session/cli-session");
 const send_attempt_state_1 = require("../../lib/session/send-attempt-state");
+const send_attempt_types_1 = require("../../lib/session/send-attempt-types");
 const composer_text_1 = require("../../lib/detection/composer-text");
 const status_capture_config_1 = require("../../config/status-capture-config");
+const instance_input_lock_1 = require("../../lib/session/instance-input-lock");
 const opencode_1 = require("../../lib/cli-tools/opencode");
 const logger = (0, logger_1.createLogger)('session/send-user-message');
 function getErrorMessage(error) {
@@ -146,6 +156,7 @@ async function sendUserMessage(db, params) {
     // unchanged; recording never throws.
     const settle = (state, reason) => {
         (0, send_attempt_state_1.recordSendAttempt)({ worktreeId, cliToolId, instanceId: resolvedInstanceId }, { state, reason, content });
+        params.onAttempt?.({ state, reason });
     };
     // Issue #2865: the send route checks ownership itself, but the timer manager
     // and relay delivery reach tmux only through here. A session under this
@@ -232,7 +243,14 @@ async function sendUserMessage(db, params) {
         }
         catch (error) {
             logger.error('failed-to-send-model-command:', { error: getErrorMessage(error) });
-            settle('not-sent', 'model-switch-failed');
+            // Issue #3952: the re-check right before `/model` refused it. Read by
+            // code, not wording: the switch's other errors quote the pane's bottom row.
+            const code = error?.code;
+            if (code === send_attempt_types_1.INPUT_RECHECK_PROMPT_WAITING_CODE) {
+                settle('not-sent', 'prompt-waiting');
+                return { ok: false, stage: 'prompt_waiting', error: (0, prompt_waiting_guard_1.promptWaitingMessage)(worktreeId) };
+            }
+            settle('not-sent', code === send_attempt_types_1.INPUT_RECHECK_FAILED_CODE ? 'recheck-failed' : 'model-switch-failed');
             return { ok: false, stage: 'model', error: getErrorMessage(error) };
         }
         // Issue #2630: copilot is idle now, and if the previous turn ended during the
@@ -269,10 +287,16 @@ async function sendUserMessage(db, params) {
     // behind a dialog (refused by the prompt guard above), and returns at once
     // while a turn is running. A send without `--model` skips step 1, so its stamp
     // is read at the same point as before.
-    const userMessageTimestamp = new Date();
+    //
+    // Issue #3953: this is now the pending row's stamp, and the user row's only
+    // when the sender did not report when input started (see step 4). The waits
+    // between here and the first key — the input lock, a carried paste mark, the
+    // re-read and the clear — can last a minute, and a previous turn that ended
+    // inside them is not this send's.
+    const pendingResponseTimestamp = new Date();
     // 2. Save any pending assistant response before sending the new user message.
     try {
-        await (0, assistant_response_saver_1.savePendingAssistantResponse)(db, worktreeId, cliToolId, userMessageTimestamp, instanceId);
+        await (0, assistant_response_saver_1.savePendingAssistantResponse)(db, worktreeId, cliToolId, pendingResponseTimestamp, instanceId);
     }
     catch (error) {
         // Log but don't fail - user message should still be saved
@@ -318,8 +342,31 @@ async function sendUserMessage(db, params) {
         // Log but don't fail - cleanup candidate discovery is best-effort
         logger.error('failed-to-detect-orphaned-messages:', { error: getErrorMessage(error) });
     }
-    // 4. Send message to CLI tool.
-    try {
+    // 4. Send message to CLI tool (run below). Returns the failure, or when sent
+    // the moment the sender started typing the body (Issue #3953; null for a
+    // path that does not report it).
+    async function deliver() {
+        try {
+            const { inputStartedAt } = await (0, instance_input_lock_1.observeInputStart)(sendToTool, params.onInputStart, params.inputBoundary);
+            return { sent: true, inputStartedAt };
+        }
+        catch (error) {
+            logger.error('failed-to-send-message-to:', { error: getErrorMessage(error) });
+            // Issue #3957: the relay's boundary hook refused before the first key —
+            // nothing was typed because the reservation the body was going in under
+            // was gone. Issue #3992: its own reason, not `input-lock-lost`.
+            if ((0, instance_input_lock_1.isInputBoundaryRefusal)(error)) {
+                return { error, failure: { state: 'not-sent', reason: 'relay-reservation-lost' } };
+            }
+            // Issue #3759: not-sent only when the error says the body was never typed.
+            let failure = (0, send_attempt_state_1.classifySendFailure)(error);
+            if (failure.reason === 'submit-unconfirmed' && (await composerStillHolds(worktreeId, cliToolId, instanceId, content))) {
+                failure = { state: 'indeterminate', reason: 'composer-residue' };
+            }
+            return { error, failure };
+        }
+    }
+    async function sendToTool() {
         // Issue #474: Image-aware sending
         if (absoluteImagePath) {
             if ((0, types_1.isImageCapableCLITool)(cliTool)) {
@@ -351,20 +398,42 @@ async function sendUserMessage(db, params) {
             await cliTool.sendMessage(worktreeId, content, instanceId);
         }
     }
-    catch (error) {
-        logger.error('failed-to-send-message-to:', { error: getErrorMessage(error) });
-        // Issue #3759: not-sent only when the error says the body was never typed.
-        let failure = (0, send_attempt_state_1.classifySendFailure)(error);
-        if (failure.reason === 'submit-unconfirmed' && (await composerStillHolds(worktreeId, cliToolId, instanceId, content))) {
-            failure = { state: 'indeterminate', reason: 'composer-residue' };
-        }
+    // Issue #3945: under the input lock for the tools whose composer is read
+    // after a failure, so that read is of this send's composer. Not for the
+    // others — opencode's HTTP delivery never touches the composer, and holding
+    // the lock across it would stall a concurrent tmux send for nothing; their
+    // tmux path takes the lock inside the shared sender.
+    const delivery = composer_text_1.SUPPORTED_COMPOSER_TOOLS.has(cliToolId)
+        ? await (0, instance_input_lock_1.withInstanceInputLock)(sessionName, () => deliver()).catch((error) => ({
+            error,
+            failure: (0, send_attempt_state_1.classifySendFailure)(error),
+        }))
+        : await deliver();
+    if (!('sent' in delivery)) {
+        const { error, failure } = delivery;
         settle(failure.state, failure.reason);
+        // Issue #3945: a dialog found by the re-check under the lock is the prompt
+        // guard's refusal, found late — answered as that refusal (relay holds it).
+        if (failure.reason === 'prompt-waiting') {
+            return { ok: false, stage: 'prompt_waiting', error: (0, prompt_waiting_guard_1.promptWaitingMessage)(worktreeId) };
+        }
         if ((0, session_start_error_1.isSessionStartTimeoutError)(error)) {
             return { ok: false, stage: 'send', error: error.message, code: session_start_error_1.SESSION_STARTING_CODE };
         }
         return { ok: false, stage: 'send', error: getErrorMessage(error) };
     }
     settle('sent', 'submitted');
+    // Issue #3953: the user row, `updateLastUserMessage` and so `wait`'s #1975
+    // gate take the moment the body started going in — later than any turn that
+    // ended before it, earlier than the `stop` of the turn it starts (a stamp
+    // taken after the send could be later than a turn that ends at once). Never
+    // earlier than the pending row's stamp, which stays before it by
+    // ASSISTANT_TIMESTAMP_OFFSET_MS. A path that does not report input (opencode's
+    // HTTP delivery) keeps the stamp read before step 2, as before.
+    const inputStartedAt = delivery.inputStartedAt;
+    const userMessageTimestamp = inputStartedAt !== null && inputStartedAt.getTime() > pendingResponseTimestamp.getTime()
+        ? inputStartedAt
+        : pendingResponseTimestamp;
     // 5. Create user message in database (History source: chat_messages).
     const message = (0, db_1.createMessage)(db, {
         worktreeId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "commandmate",
-  "version": "0.49.0",
+  "version": "0.49.1",
   "description": "No long blocks of time? Run an AI team from your phone. Git worktree sessions, task contracts and verification gates for Claude Code, Codex, Gemini CLI, Copilot, OpenCode, Antigravity and Command Code.",
   "keywords": [
     "ai-agents",

package/release-notes/0.49.1.json

@@ -0,0 +1,66 @@
+{
+  "version": "0.49.1",
+  "date": "2026-10-30",
+  "highlight": {
+    "ja": "同じエージェントへの送信を 1 本ずつに調停し、別の依頼の返答が届く取り違えを防ぐようにしました。Command Code の計画レビューもスマホやターミナル表示から承認できます。",
+    "en": "Messages to the same agent are now sent one at a time, so a reply meant for another request is no longer delivered by mistake. Command Code plan reviews can now be approved from the phone and terminal views."
+  },
+  "added": [
+    {
+      "ja": "サイドバーの「Needs attention」やブランチ行から開くと、応答を待っているエージェントが選ばれた状態で開くようになりました。",
+      "en": "Opening a worktree from Needs attention or a branch row in the sidebar now selects the agent that is waiting for you."
+    },
+    {
+      "ja": "データベースの更新が必要なときは、更新の前にデータベースの複製を自動で保存するようになりました。",
+      "en": "Before the database is upgraded, a copy of it is now saved automatically."
+    }
+  ],
+  "improved": [
+    {
+      "ja": "Claude の /restart をスラッシュコマンドの一覧に追加しました。",
+      "en": "Added Claude's /restart to the slash command list."
+    }
+  ],
+  "fixed": [
+    {
+      "ja": "Command Code の計画レビューで、承認・取り消し・コメントのボタンが画面外に隠れて押せない問題を直しました。",
+      "en": "Fixed the approve, cancel and comment buttons of a Command Code plan review being cut off and unreachable."
+    },
+    {
+      "ja": "Command Code のターミナル表示が真っ黒に見えることがある問題を直しました。",
+      "en": "Fixed the Command Code terminal view sometimes appearing completely blank."
+    },
+    {
+      "ja": "同じエージェントへ続けて送った依頼で、別の依頼の返答が届くことがある問題を直しました。",
+      "en": "Fixed a reply to a different request sometimes being delivered when several requests were sent to the same agent."
+    },
+    {
+      "ja": "同じエージェントへの送信が重なったとき、入力欄に文字が残ったり混ざったりする問題を直しました。",
+      "en": "Fixed leftover or mixed-up text in the input box when several messages to the same agent overlapped."
+    },
+    {
+      "ja": "返信を待つ送信（--reply-to など）に失敗したとき、もう一度送ってよいか、先に画面を確かめるべきかを CLI が案内するようになりました。",
+      "en": "When a send that waits for a reply (such as --reply-to) fails, the CLI now tells you whether it is safe to send again or whether to check the screen first."
+    },
+    {
+      "ja": "wait が指定した時間を過ぎても終わらないことがある問題を直しました。",
+      "en": "Fixed wait sometimes running past its timeout."
+    },
+    {
+      "ja": "前の作業の完了を、今回の送信の完了と取り違えることがある問題を直しました。",
+      "en": "Fixed the end of an earlier turn sometimes being mistaken for the end of the current one."
+    },
+    {
+      "ja": "返答の中で引用したエラーの文字を、本物の障害と誤って判定する問題を直しました。",
+      "en": "Fixed quoted error text in a reply being mistaken for a real upstream error."
+    },
+    {
+      "ja": "入力欄のクリアに失敗したとき、その理由が画面に表示されるようになりました。",
+      "en": "When clearing the input box fails, the reason is now shown on screen."
+    },
+    {
+      "ja": "respond で、回答が届かなかったのか途中で止まったのかを分けて表示するようになりました。",
+      "en": "respond now tells apart an answer that never arrived from one that stopped partway."
+    }
+  ]
+}

package/.next/server/chunks/1210.js

@@ -1 +0,0 @@
-"use strict";exports.id=1210,exports.ids=[1210],exports.modules={71210:(a,b,c)=>{c.d(b,{notifyRelayPromptWaiting:()=>L,notifyRelayTurnCompleted:()=>K,runRelayMaintenanceTick:()=>O});var d=c(88807),e=c(64049),f=c(52660),g=c(81254),h=c(55233),i=c(39687),j=c(640),k=c(23854),l=c(8360),m=c(40964),n=c(34331),o=c(31990),p=c(95595),q=c(64501),r=c(34405),s=c(72626);let t=(0,s.h)("relay-readiness");async function u(a,b,c,d){try{let e=(0,m.mf)(b,a,c),f=await (0,n.L)(a,e,d);if(null===f||"foreign"===f.verdict)return"foreign_session";if("absent"===f.verdict)return"session_stopped";let g=l.CLIToolManager.getInstance().getTool(b);if(!await g.isRunning(a,c))return"session_stopped";let h=await (0,o.Wh)(a,b,r._,c);if((0,q.NV)(a,b,c,h))return"generating";let i=(0,p.WC)(h,b);return"running"===i.status?"generating":null}catch(d){return t.warn("relay-readiness-check-failed",{worktreeId:a,cliToolId:b,instanceId:c,error:d instanceof Error?d.message:String(d)}),null}}var v=c(49798),w=c(67164),x=c(85016),y=c(25539),z=c(36925);let A=(0,s.h)("relay-delivery"),B=/-turn:/,C=[f.RELAY_SYSTEM_REQUEST_ID_PREFIX,f.MODEL_CHANGE_REQUEST_ID_PREFIX],D={claude:!0,codex:!0,antigravity:!0,"command-code":!0,opencode:!0,copilot:!1,gemini:!1,"vibe-local":!1,"opencode-v2":!0},E=(0,z.v)("__relayDeliveryInFlight",()=>new Set);function F(a,b){let c=(0,v.S)(a,b.to);return{alias:c.alias,worktreeId:c.worktreeId}}function G(a,b,c){let d=(0,f.getMessages)(a,b.worktreeId,{limit:40,cliToolId:b.cliToolId,instanceId:b.instanceId,matchResolvedInstance:!0}),e=!0===D[b.cliToolId];for(let a of d){var g;if(!("assistant"!==a.role||"prompt"===a.messageType||function(a){return"string"==typeof a&&C.some(b=>a.startsWith(b))}(a.requestId))){if((!e||"string"==typeof(g=a.requestId)&&B.test(g))&&""!==a.content.trim())return a.timestamp.getTime()<c?null:a}}return null}function H(a,b,c){let d=(0,e.ix)(a,{worktreeId:b.worktreeId,instanceId:b.instanceId});if(0===d.length)return 0;let f=0;for(let g of d){let d=G(a,b,g.createdAt);if(!d)continue;let h=(0,j.z0)(F(a,g),d.content);(0,e.be)(a,g.id,"reply",h,c)&&(f+=1)}return f}function I(a){return new Promise(b=>{setTimeout(b,a)})}async function J(a,b){let c=Date.now()+15e3;for(;;){if(H(a,b,Date.now())>0)return void N();if(Date.now()>=c)break;await I(1e3)}A.info("relay-scrape-row-not-transcript-backed",{worktreeId:b.worktreeId,cliToolId:b.cliToolId,instanceId:b.instanceId,graceMs:15e3})}async function K(a,b){try{var c;let f=(0,d.getDbInstance)(),g=(0,e.ix)(f,{worktreeId:a.worktreeId,instanceId:a.instanceId});if(0===g.length)return;if(b.settled){H(f,a,Date.now())>0&&N();return}if(c=a.cliToolId,!0===D[c])return void await J(f,a);let h=null;for(let b=0;b<3;b+=1){let b=G(f,a,0);h=b?.id??null,await I(k.DZ);let c=G(f,a,0);if((c?.id??null)===h){H(f,a,Date.now())>0&&N();return}}A.info("relay-scrape-never-settled",{worktreeId:a.worktreeId,instanceId:a.instanceId,attempts:3})}catch(b){A.warn("relay-turn-completed-failed",{worktreeId:a.worktreeId,instanceId:a.instanceId,error:b instanceof Error?b.message:String(b)})}}function L(a){try{let b=(0,d.getDbInstance)(),c=(0,e.ix)(b,{worktreeId:a.worktreeId,instanceId:a.instanceId});if(0===c.length)return;let i=(0,f.getLatestOpenPromptMessage)(b,a.worktreeId,a.cliToolId,a.instanceId);if(!i)return;let k=(0,h.dV)(b),l=function(a){let b=a.promptData;return(0,g.XF)(b)?"yes_no"===b.type?b.options.map(a=>({key:a,label:a})):b.options.map(a=>({key:String(a.number),label:a.label})):[]}(i),m=(0,g.XF)(i.promptData)?i.promptData.question:i.promptData?.question??i.content,n=0;for(let a of c){if((0,e.GC)(b,a.id)===i.id)continue;let c=(0,j.Hr)(k,F(b,a),{question:m,options:l});(0,e.be)(b,a.id,"prompt",c)&&((0,e.UC)(b,a.id,i.id),n+=1)}n>0&&N()}catch(b){A.warn("relay-prompt-notify-failed",{worktreeId:a.worktreeId,instanceId:a.instanceId,error:b instanceof Error?b.message:String(b)})}}async function M(a,b,c,d){var g,h;let j=(0,e.Ip)(a,b);if(!j)return"skipped";let k=(0,v.S)(a,j.from),l=await u(k.worktreeId,k.cliToolId,k.instanceId,a);if(l)return A.debug("relay-delivery-held",{relayId:b,kind:c,reason:l}),"held";let m=(g=a,h=b,(0,e.uG)(g).find(a=>a.relay.id===h)??null);if(!m||m.kind!==c||m.body!==d)return A.info("relay-delivery-superseded",{relayId:b,kind:c}),"skipped";if("expired"!==c&&!(0,y.Lo)(m.relay.state))return A.info("relay-delivery-closed",{relayId:b,kind:c,state:m.relay.state}),"skipped";let n=m.relay,o=(0,v.S)(a,n.from);(0,x.o5)(b);try{let g=await (0,i.d)(a,{worktreeId:o.worktreeId,content:d,cliToolId:o.cliToolId,instanceId:o.instanceId,messageType:"relay",requestId:"reply"===c?(0,f.relayRequestId)(n.id):void 0});if(!g.ok)return A.info("relay-delivery-refused",{relayId:b,kind:c,stage:g.stage}),"prompt_waiting"===g.stage?"held":"failed";let h=Date.now();return"reply"===c?((0,e.Bf)(a,n.id,(0,f.relayRequestId)(n.id),h)||A.info("relay-already-closed-on-deliver",{relayId:b}),(0,w._)(a,n.id,"replied",o,(0,v.S)(a,n.to),h)):"prompt"===c&&(0,w._)(a,n.id,"waiting",o,(0,v.S)(a,n.to),h),(0,e.uJ)(a,n.id,h),A.info("relay-delivered",{relayId:b,kind:c,to:`${o.worktreeId}/${o.instanceId}`}),"delivered"}finally{(0,x.dJ)(b)}}async function N(){if(!globalThis.__relayPumpRunning){globalThis.__relayPumpRunning=!0;try{let a=(0,d.getDbInstance)();for(let b of(0,e.uG)(a))if(!E.has(b.relay.id)){E.add(b.relay.id);try{await M(a,b.relay.id,b.kind,b.body)}catch(a){A.warn("relay-delivery-failed",{relayId:b.relay.id,error:a instanceof Error?a.message:String(a)})}finally{E.delete(b.relay.id)}}}catch(a){A.warn("relay-pump-failed",{error:a instanceof Error?a.message:String(a)})}finally{globalThis.__relayPumpRunning=!1}}}async function O(){try{!function(a,b=Date.now()){for(let c of(0,e.s7)(a,b))if(!(0,x.p5)(c.id))try{let d=(0,h.dV)(a);(0,e.uJ)(a,c.id,b);let f=(0,j.KA)(d,F(a,c),c.expiresAt-c.createdAt),g=(0,e.be)(a,c.id,"expired",f,b);if(!(0,e.Cz)(a,c.id,b)){g&&(0,e.uJ)(a,c.id,b);continue}(0,w._)(a,c.id,"expired",(0,v.S)(a,c.from),(0,v.S)(a,c.to),b)}catch(a){A.warn("relay-expire-failed",{relayId:c.id,error:a instanceof Error?a.message:String(a)})}}((0,d.getDbInstance)())}catch(a){A.warn("relay-sweep-failed",{error:a instanceof Error?a.message:String(a)})}await N()}}};