commandmate 0.46.1 → 0.47.2

package/dist/server/src/lib/ws-server.js

@@ -502,6 +502,7 @@ function setupWebSocket(server, options) {
             ws,
             worktreeIds: new Set(),
             terminalSubscription: null,
+            terminalSubscriptionSeq: 0,
             isAlive: true,
         };
         clients.set(ws, clientInfo);
@@ -733,6 +734,9 @@ function handleDisconnect(ws) {
             }
         }
     });
+    // Issue #3733: a subscribe still in flight finds this moved and releases
+    // what it obtains instead of registering it on a socket that is gone.
+    clientInfo.terminalSubscriptionSeq += 1;
     if (clientInfo.terminalSubscription) {
         void clientInfo.terminalSubscription.unsubscribe();
         clientInfo.terminalSubscription = null;
@@ -779,14 +783,25 @@ async function handleTerminalSubscribe(ws, message) {
         });
         return;
     }
-    if (clientInfo.terminalSubscription) {
-        await clientInfo.terminalSubscription.unsubscribe();
+    // Issue #3733: from here on this request is the one the socket wants; every
+    // await below is followed by a look at whether it still is.
+    const seq = ++clientInfo.terminalSubscriptionSeq;
+    const isCurrent = () => clients.get(ws) === clientInfo && clientInfo.terminalSubscriptionSeq === seq;
+    const previous = clientInfo.terminalSubscription;
+    if (previous) {
+        // Detached before the await, so a request arriving meanwhile neither
+        // releases it a second time nor has its own registration cleared by ours.
         clientInfo.terminalSubscription = null;
+        await previous.unsubscribe();
     }
+    if (!isCurrent())
+        return;
     const sessionName = (0, session_name_1.resolveSessionName)(cliToolId, worktreeId);
     // Issue #2865: never stream a same-named session another CommandMate server
     // created (its `#{session_path}` is not this worktree's directory).
     const ownership = await (0, session_ownership_1.checkSessionOwnership)(sessionName, worktree.path);
+    if (!isCurrent())
+        return;
     if (ownership.verdict === 'foreign') {
         sendTerminalEvent(ws, {
             type: 'terminal_error',
@@ -806,6 +821,8 @@ async function handleTerminalSubscribe(ws, message) {
     const startedAt = Date.now();
     const subscription = await transport.subscribe(sessionName, {
         onOutput: (data) => {
+            if (!isCurrent())
+                return;
             if (!firstOutputObserved) {
                 firstOutputObserved = true;
                 (0, tmux_control_mode_metrics_1.observeTmuxControlFirstOutputLatency)(Date.now() - startedAt);
@@ -813,6 +830,8 @@ async function handleTerminalSubscribe(ws, message) {
             sendTerminalEvent(ws, { type: 'terminal_output', data });
         },
         onExit: ({ exitCode }) => {
+            if (!isCurrent())
+                return;
             sendTerminalEvent(ws, { type: 'terminal_exit', exitCode });
         },
         onError: (error) => {
@@ -825,7 +844,9 @@ async function handleTerminalSubscribe(ws, message) {
                         const snapshot = await transport.captureSnapshot(sessionName, {
                             startLine: TERMINAL_FALLBACK_CAPTURE_LINES,
                         });
-                        if (snapshot.length > 0) {
+                        // Issue #3733: the reads above awaited; a subscription released
+                        // or replaced meanwhile has nothing left to say to this socket.
+                        if (snapshot.length > 0 && isCurrent()) {
                             sendTerminalEvent(ws, {
                                 type: 'terminal_output',
                                 data: snapshot,
@@ -837,6 +858,8 @@ async function handleTerminalSubscribe(ws, message) {
                 catch {
                     // Best-effort snapshot fallback. The original control-mode error is still reported.
                 }
+                if (!isCurrent())
+                    return;
                 sendTerminalEvent(ws, {
                     type: 'terminal_error',
                     error: error.message,
@@ -845,6 +868,17 @@ async function handleTerminalSubscribe(ws, message) {
             })();
         },
     });
+    if (!isCurrent()) {
+        // Disconnected, unsubscribed or superseded while subscribing: nobody else
+        // holds this handle, so release it now or the registry keeps it forever.
+        try {
+            await subscription.unsubscribe();
+        }
+        catch {
+            // Best-effort cleanup of a subscription nobody wants.
+        }
+        return;
+    }
     clientInfo.terminalSubscription = {
         worktreeId,
         cliToolId,
@@ -934,16 +968,23 @@ async function runTerminalResize(ws, message) {
 }
 async function handleTerminalUnsubscribe(ws) {
     const clientInfo = clients.get(ws);
-    if (!clientInfo?.terminalSubscription) {
+    if (!clientInfo)
+        return;
+    // Issue #3733: also withdraws a subscribe still in flight, which would
+    // otherwise register after this and keep streaming.
+    clientInfo.terminalSubscriptionSeq += 1;
+    const subscription = clientInfo.terminalSubscription;
+    if (!subscription) {
         return;
     }
+    // Detached before the await so a subscribe arriving meanwhile is not cleared.
+    clientInfo.terminalSubscription = null;
     try {
-        await clientInfo.terminalSubscription.unsubscribe();
+        await subscription.unsubscribe();
     }
     catch {
         // Best-effort cleanup during terminal unsubscribe.
     }
-    clientInfo.terminalSubscription = null;
     sendTerminalEvent(ws, { type: 'terminal_status', connected: false });
 }
 // ---------------------------------------------------------------------------
@@ -1281,6 +1322,7 @@ exports.__internal = {
             ws,
             worktreeIds: new Set(),
             terminalSubscription: null,
+            terminalSubscriptionSeq: 0,
             isAlive,
         });
     },

package/docs/en/user-guide/cli-setup-guide.md

@@ -404,6 +404,8 @@ commandmate status [options]
 | `-i, --issue <number>` | Show status for a specific issue worktree (Issue #136) |
 | `-a, --all` | Show status for all servers (main + worktrees) |
 
+For a running server (or one with a stale PID file) it also prints a `Log:` line with the file `start --daemon` writes the server's output to.
+
 ### commandmate update
 
 Update CommandMate to the latest version (stop -> `npm install -g commandmate@latest` -> restart).
@@ -532,10 +534,19 @@ commandmate status
 commandmate stop --force
 commandmate start --daemon
 
-# Check logs (in config directory)
+# Check logs (in config directory; commandmate status also prints the path on its Log: line)
 tail -f ~/.commandmate/logs/server.log
+# a parallel server started with --issue 135 has its own file
+tail -f ~/.commandmate/logs/server-135.log
 ```
 
+`commandmate start --daemon` (and `commandmate update`, which restarts through it) appends the server's stdout and stderr to `logs/server.log` in the config directory (`logs/server-<N>.log` for an `--issue <N>` server). The file is owner-only (0600), and so are the rotated `server.log.1` and later generations (an existing 0640 file written by `scripts/start.sh` is tightened to 0600 when the CLI daemon opens or rotates it). Each start writes a separator line (`=== <timestamp> commandmate start --daemon ... ===`).
+
+- **Rotation**: at start, a log of 10MB or more is moved to `server.log.1`, shifting older generations to `.2` and `.3` (three generations kept, the same approach as `scripts/build-and-start.sh`). It is not rotated while the server runs, so a long-running server's log can grow past 10MB.
+- If the log file cannot be opened (the directory cannot be created, a symbolic link is in the way, etc.), a warning is printed and the server starts with its output discarded.
+- `CM_LOG_DIR` does not move this file (`CM_LOG_DIR` is a separate setting, used by the server for conversation logs and by the CLI for its security log).
+- A foreground start (`commandmate start`) prints to the terminal only and does not write this file.
+
 ### Dependency Errors
 
 ```bash

package/docs/en/user-guide/webapp-guide.md

@@ -268,6 +268,7 @@ See [Agent event hooks](./agent-event-hooks.md) for the per-route technical deta
 - Important changes (file deletions, etc.) are also auto-approved, so use with caution
 - You can disable it by turning off the toggle
 - Auto Yes automatically turns OFF after the selected duration
+- **When the server restarts (`/rebuild`, `commandmate stop`, etc.), an active Auto Yes is turned OFF and does not come back.** The affected instance shows **"Released by restart"** (「再起動で解除」 in the Japanese UI). The label stays until the original grant's deadline, and disappears when you turn the toggle on again or turn it off manually (it is not shown after SIGKILL or a crash). A manual OFF or an expiry does not show it
 - **Security best practices**:
   - Select the **minimum time** needed for your work (1 hour recommended when in doubt)
   - Limit `CM_ROOT_DIR` to the target worktree directory
@@ -499,6 +500,7 @@ that kind of screen directly under it. You answer it without leaving chat.
 | A selection list is open | Arrow keys plus Enter / Esc. Depending on the screen, number keys or "This session only" / "Set as default" are added (see "The buttons a selection list gets" below) |
 | A screen nothing could classify | Arrows and Esc (Navigate) plus the digits 1-9, y / n and Enter |
 | Waiting, with options nobody could read | The digits 1-9, y / n and Enter |
+| Trust confirmation (agy) | The banner reads "Terminal action needed (trust confirmation). The agent will not continue until you answer whether to trust this folder, and Auto-Yes does not answer this screen. Pick with the arrows and press Enter, or answer it in the terminal." You can send the arrows and Enter from here |
 
 **Press the number or y/n while reading the card.** Enter confirms whatever the CLI has
 currently highlighted, so on a numbered dialog an Enter meant as "no" can land as an

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "commandmate",
-  "version": "0.46.1",
+  "version": "0.47.2",
   "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",
@@ -99,7 +99,7 @@
     "jsdom": "^28.1.0",
     "lucide-react": "^0.554.0",
     "mermaid": "^11.12.2",
-    "next": "^15.5.25",
+    "next": "^15.5.28",
     "next-intl": "^4.8.2",
     "next-themes": "^0.4.6",
     "postcss": "^8.5.6",

package/release-notes/0.47.0.json

@@ -0,0 +1,118 @@
+{
+  "version": "0.47.0",
+  "date": "2026-10-21",
+  "highlight": {
+    "ja": "Auto-Yes が答えずに止まった確認を、CLI から画面を確かめたうえで直接答えられるようになりました。あわせて、Auto-Yes が答えてはいけない画面に答えたり、答えずに止まったりする問題を多数直しました。",
+    "en": "You can now answer a prompt that Auto-Yes left waiting directly from the CLI, after checking the screen. Many issues where Auto-Yes answered the wrong screen or stopped without answering are also fixed."
+  },
+  "added": [
+    {
+      "ja": "止まっている画面を CLI から 1 回観測して、種類・質問・選択肢を確かめられる commandmate prompt を追加しました。",
+      "en": "Added commandmate prompt, which observes a waiting screen once so you can check its kind, question and choices from the CLI."
+    },
+    {
+      "ja": "観測した画面にだけ答える厳格な respond を追加しました。画面が変わっていれば何も送りません。",
+      "en": "Added a strict respond mode that answers only the screen you observed, and sends nothing if the screen has changed."
+    },
+    {
+      "ja": "直前の送信が「未送信・送信済み・不確定」のどれかを、prompt の出力と送信の失敗メッセージで確かめられるようになりました。",
+      "en": "The prompt output and send error messages now tell you whether the last message was not sent, sent, or indeterminate."
+    },
+    {
+      "ja": "Codex の /config をスラッシュコマンドの一覧に追加しました。",
+      "en": "Added Codex's /config to the slash command list."
+    }
+  ],
+  "improved": [
+    {
+      "ja": "サーバーの再起動で外れた Auto-Yes を「再起動で解除」と表示するようになりました。",
+      "en": "Auto-Yes that was turned off by a server restart is now shown as Released by restart."
+    },
+    {
+      "ja": "契約で Auto-Yes が止められているとき、有効化の時点と一覧・画面でそのことが分かるようになりました。",
+      "en": "When a contract stops Auto-Yes, this is now shown when you enable it and in the lists and screens."
+    },
+    {
+      "ja": "Antigravity の信頼の確認で止まっているとき、画面に「端末で操作が必要」と表示するようになりました。",
+      "en": "When Antigravity is waiting on its folder trust prompt, the screen now says the terminal needs your input."
+    },
+    {
+      "ja": "start --daemon で起動したサーバーの出力を logs/server.log に残すようになりました。",
+      "en": "A server started with start --daemon now keeps its output in logs/server.log."
+    }
+  ],
+  "fixed": [
+    {
+      "ja": "Antigravity のログイン方法の画面や、表示が切れた許可の画面に、Auto-Yes が番号で答えうる問題を直しました。",
+      "en": "Fixed Auto-Yes possibly answering Antigravity's login method screen, or a cut-off permission screen, with a number."
+    },
+    {
+      "ja": "Antigravity の確認に Auto-Yes が答えないまま長時間止まることがある問題を直しました。",
+      "en": "Fixed Auto-Yes sometimes leaving an Antigravity prompt unanswered for a long time."
+    },
+    {
+      "ja": "Antigravity で答えた確認が画面に残り続けたとき、Auto-Yes が理由を残さずに黙る問題を直しました。",
+      "en": "Fixed Auto-Yes going silent without a reason when an answered Antigravity prompt stayed on screen."
+    },
+    {
+      "ja": "厳格な respond で、Antigravity の許可の確認のカーソル以外の選択肢を選べるようになりました。",
+      "en": "Strict respond can now choose options other than the highlighted one on Antigravity's permission prompt."
+    },
+    {
+      "ja": "厳格な respond で信頼の確認に No, exit と答えたとき、終了を正しく読み取るようになりました。",
+      "en": "Strict respond now correctly reports the session ending after answering No, exit on the trust prompt."
+    },
+    {
+      "ja": "Antigravity のターミナル画面が黒く見える問題を直しました。",
+      "en": "Fixed the Antigravity terminal view appearing blank."
+    },
+    {
+      "ja": "Submit と Cancel の確認画面に、Auto-Yes が答えないようにしました。",
+      "en": "Auto-Yes no longer answers Submit and Cancel confirmation pages."
+    },
+    {
+      "ja": "Gemini と Antigravity の起動時の信頼の確認を、安全な選択肢のときだけ通し、Auto-Yes と二重に答えないようにしました。",
+      "en": "Gemini and Antigravity startup trust prompts are now confirmed only on the safe option, and never answered twice with Auto-Yes."
+    },
+    {
+      "ja": "Copilot の信頼の確認に、Auto-Yes の入力がメッセージとして送られることがある問題を直しました。",
+      "en": "Fixed Auto-Yes input sometimes being sent as a message on Copilot's folder trust prompt."
+    },
+    {
+      "ja": "Antigravity の起動の後に出た信頼の確認が処理されず、通知も出ない問題を直しました。",
+      "en": "Fixed an Antigravity trust prompt shown after startup going unhandled without a notification."
+    },
+    {
+      "ja": "Auto-Yes が答える前に、答えていないという通知が誤って出ることがある問題を直しました。",
+      "en": "Fixed a not-answered notification sometimes being shown before Auto-Yes had a chance to answer."
+    },
+    {
+      "ja": "契約が止めた確認について、hooks の設定が原因であるかのような案内が出る問題を直しました。",
+      "en": "Fixed a hint that blamed the hooks setup for a prompt that a contract had stopped."
+    },
+    {
+      "ja": "再起動で解除された Auto-Yes の表示が、消えるべきときに消えないなどの問題を直しました。",
+      "en": "Fixed the released-by-restart Auto-Yes label not clearing when it should, among other display issues."
+    },
+    {
+      "ja": "Command Code の plan review で送信が断られたとき、未送信と表示するようにしました。",
+      "en": "A message refused by Command Code's plan review is now shown as not sent."
+    },
+    {
+      "ja": "送信の直後に、送信前の古い画面が表示されることがある問題を直しました。",
+      "en": "Fixed the screen sometimes showing the old content from before a message was sent."
+    },
+    {
+      "ja": "取り消した返答の受け渡しが、依頼元に届いてしまうことがある問題を直しました。",
+      "en": "Fixed a cancelled reply relay sometimes still being delivered."
+    },
+    {
+      "ja": "削除した worktree やサーバー停止の後に、スケジュールが作り直されることがある問題を直しました。",
+      "en": "Fixed schedules sometimes being recreated after a worktree was removed or the server was stopped."
+    },
+    {
+      "ja": "ターミナルの購読が残り続け、上限に達することがある問題を直しました。",
+      "en": "Fixed terminal subscriptions sometimes piling up until the limit was reached."
+    }
+  ]
+}

package/release-notes/0.47.1.json

@@ -0,0 +1,20 @@
+{
+  "version": "0.47.1",
+  "date": "2026-10-23",
+  "highlight": {
+    "ja": "Auto-Yes が実行契約の制限を守らずに答えたり、危険なコマンドを見落としたりする問題を直しました。",
+    "en": "Fixed cases where Auto-Yes answered without honoring the execution contract's limits or missed a dangerous command."
+  },
+  "added": [],
+  "improved": [],
+  "fixed": [
+    {
+      "ja": "実行契約を一時的に読めなかったとき、Auto-Yes が契約の制限を無視して答えていた問題を直しました。読めない間は答えません。",
+      "en": "Fixed Auto-Yes answering without the contract's limits when the execution contract briefly could not be read. It now waits instead."
+    },
+    {
+      "ja": "承認を求めるコマンドの途中に「>」で始まる行があると、その上の危険なコマンドが拒否の判定から漏れていた問題を直しました。",
+      "en": "Fixed a dangerous command being missed by the deny check when the command awaiting approval contained a line starting with \">\"."
+    }
+  ]
+}

package/release-notes/0.47.2.json

@@ -0,0 +1,20 @@
+{
+  "version": "0.47.2",
+  "date": "2026-10-23",
+  "highlight": {
+    "ja": "依存パッケージの脆弱性を直しました。Next.js の重大な脆弱性への対応を含みます。",
+    "en": "Fixed vulnerabilities in dependencies, including a critical one in Next.js."
+  },
+  "added": [],
+  "improved": [],
+  "fixed": [
+    {
+      "ja": "Next.js を更新し、画像の最適化で外部からコードを実行されうる重大な脆弱性と、サービス停止の脆弱性を直しました。",
+      "en": "Updated Next.js to fix a critical vulnerability that could allow remote code execution through image optimization, and a denial-of-service issue."
+    },
+    {
+      "ja": "Markdown の表示に使うライブラリを更新し、高リスクの脆弱性を直しました。",
+      "en": "Updated libraries used to render Markdown to fix high-severity vulnerabilities."
+    }
+  ]
+}

package/scripts/hooks/cmate-agent-event.sh

@@ -71,6 +71,14 @@ json_string_field() {
     sed -n 's/.*"'"$2"'"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p'
 }
 
+# Extract a flat JSON non-negative integer field (digits only). A value that is
+# not a bare run of digits — a string, a negative or fractional number — yields
+# nothing. Text inside a string cannot produce the match: its quotes are escaped.
+json_integer_field() {
+  printf '%s' "$1" | tr -d '\n' |
+    sed -n 's/.*"'"$2"'"[[:space:]]*:[[:space:]]*\([0-9][0-9]*\)[[:space:]]*[,}].*/\1/p'
+}
+
 # Escape a value for embedding in a JSON string literal.
 json_escape() {
   printf '%s' "$1" | sed -e 's/\\/\\\\/g' -e 's/"/\\"/g'
@@ -317,6 +325,20 @@ if [ "$EVENT" = "stop" ] && [ "$TOOL" = "claude" ] && [ -n "$HOOK_JSON" ]; then
       ;;
   esac
 fi
+# Issue #3820 (design docs/design/auto-yes-measurement-3820.md §2.4). agy's
+# `PostToolUse` names its call by `stepIdx` (unique within a conversation; the
+# conversation is the `sessionId` above), and the server ties it to the
+# `PreToolUse` of the same call — which reaches the permission route directly,
+# not through here — to tell when the call ended. Forwarded as a number on
+# antigravity's post_tool_use only, so every other tool and event keeps the
+# body it had; omitted when the payload has none (an older agy), which the
+# server reads as before. Bounded to 15 digits so it stays a safe integer.
+if [ "$EVENT" = "post_tool_use" ] && [ "$TOOL" = "antigravity" ] && [ -n "$HOOK_JSON" ]; then
+  STEP_IDX="$(json_integer_field "$HOOK_JSON" 'stepIdx')"
+  if [ -n "$STEP_IDX" ] && [ "${#STEP_IDX}" -le 15 ]; then
+    BODY="$BODY,\"stepIdx\":$STEP_IDX"
+  fi
+fi
 BODY="$BODY}"
 
 # Token via --header rather than the command line of a subprocess: argv is world