commandmate 0.42.1 → 0.43.0

package/dist/server/src/lib/verification/env-snapshot.js

@@ -23,6 +23,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ENV_SNAPSHOT_RETENTION_MS = exports.ENV_SNAPSHOT_DIR_NAME = exports.VOLATILE_ENTRY_PATTERNS = exports.MCBD_SESSION_PREFIX = exports.COMMANDMATE_PROCESS_PATTERN = exports.DEFAULT_ENV_PROBE_DEPS = exports.ENV_PROBE_LABELS = exports.ENV_PROBE_IDS = exports.ENV_SNAPSHOT_VERSION = void 0;
+exports.isCommandMateCommandLine = isCommandMateCommandLine;
 exports.probeListeners = probeListeners;
 exports.probeTmuxSessions = probeTmuxSessions;
 exports.probeHomeEntries = probeHomeEntries;
@@ -109,8 +110,71 @@ exports.DEFAULT_ENV_PROBE_DEPS = {
  * to "CommandMate 関連" for exactly that reason, so relevance is decided from
  * the owning process's command line rather than from the port number — a
  * developer's `commandmate start --port 3179` is as relevant as port 3000.
+ *
+ * This is only the vocabulary, and a cheap first filter. Matched against the
+ * whole command line it also hits a process that merely *mentions* a
+ * CommandMate path among its arguments — an editor's language server started
+ * with `--workspace_id …_commandmate_issue_2616` was recorded as a CommandMate
+ * listener and then read as "killed" when it exited (#2627). The decision is
+ * {@link isCommandMateCommandLine}'s, which looks only at the program.
  */
 exports.COMMANDMATE_PROCESS_PATTERN = /commandmate|dist\/server\/server\.js|next-server|next (dev|start)|server\.ts/i;
+/**
+ * Executables that run a script named by a later argument. CommandMate is
+ * never a native binary of its own: every shape it runs as is one of these
+ * with a CommandMate script, or a process title set by one of them.
+ */
+const SCRIPT_LAUNCHERS = new Set(['node', 'nodejs', 'bun', 'tsx', 'ts-node', 'npx', 'next']);
+/** Executables that are CommandMate by their own name (process title or bin). */
+const COMMANDMATE_EXECUTABLES = /^(commandmate(\.js)?|next-server)$/i;
+/** A script argument that is CommandMate's server or CLI, judged by its path's end. */
+function isCommandMateScript(token) {
+    const name = (0, path_1.basename)(token);
+    return (/(^|\/)dist\/server\/server\.js$/.test(token) ||
+        name === 'server.ts' ||
+        /^commandmate(\.js)?$/i.test(name));
+}
+/**
+ * Whether a `ps` command line is a CommandMate process (#2627).
+ *
+ * Judged on the program, never on free-form arguments:
+ *
+ *   - the executable itself (`next-server (v14…)`, a `commandmate` bin run
+ *     directly) — its basename, so a directory called `commandmate` in the
+ *     executable's *path* does not count either;
+ *   - or, when the executable is a script launcher (`node`, `tsx`, `next`, …),
+ *     its positional arguments matched as whole paths by their end:
+ *     `…/dist/server/server.js`, `server.ts`, a `commandmate` bin, or `next`
+ *     followed by `dev` / `start`.
+ *
+ * Flags are dropped before matching, `--workspace=/x/commandmate` included,
+ * and a positional counts only as a whole token: `/x/commandmate-issue-1` is a
+ * path that mentions CommandMate, not CommandMate. Any other executable —
+ * `language_server_macos_arm`, Chrome, postgres — is not CommandMate whatever
+ * its arguments say.
+ *
+ * Why not `ps -o comm=` (the executable alone): `node dist/server/server.js` is
+ * `node` there, indistinguishable from every other node process, so the
+ * production server itself would stop being recorded.
+ */
+function isCommandMateCommandLine(commandLine) {
+    if (!exports.COMMANDMATE_PROCESS_PATTERN.test(commandLine))
+        return false;
+    const [program, ...rest] = commandLine.trim().split(/\s+/);
+    if (!program)
+        return false;
+    const name = (0, path_1.basename)(program);
+    if (COMMANDMATE_EXECUTABLES.test(name))
+        return true;
+    if (!SCRIPT_LAUNCHERS.has(name.toLowerCase()))
+        return false;
+    const positionals = [name, ...rest.filter((token) => !token.startsWith('-'))];
+    return positionals.some((token, index) => {
+        if (index > 0 && isCommandMateScript(token))
+            return true;
+        return (0, path_1.basename)(token) === 'next' && /^(dev|start)$/.test(positionals[index + 1] ?? '');
+    });
+}
 /** `ps` line: leading pid, then the full command line. */
 function parseProcessTable(stdout) {
     const table = new Map();
@@ -213,7 +277,7 @@ async function probeListeners(deps) {
     const table = parseProcessTable(processes.stdout);
     const relevant = blocks.filter((block) => {
         const commandLine = table.get(block.pid);
-        return commandLine !== undefined && exports.COMMANDMATE_PROCESS_PATTERN.test(commandLine);
+        return commandLine !== undefined && isCommandMateCommandLine(commandLine);
     });
     if (relevant.length === 0)
         return ok([]);

package/dist/server/src/types/cli-tool-contracts.js

@@ -96,11 +96,18 @@ exports.GRACEFUL_EXIT_FAILURE_REASONS = ['graceful_exit_timeout', 'port_orphaned
  * | `manual`        | claude                           | `⏸ manual mode on`              |
  * | `auto`          | claude                           | `⏵⏵ auto mode on`               |
  * | `accept-edits`  | claude / Command Code / agy      | `⏵⏵ accept edits on`, `» accept edits on`, `accept-edits ·` |
- * | `plan`          | all five                         | `⏸ plan mode on`, `plan mode`, `Plan mode (shift+tab to cycle)`, `plan` |
+ * | `plan`          | all six                          | `⏸ plan mode on`, `plan mode`, `Plan mode (shift+tab to cycle)`, `plan`, `┃  Plan · <model>` |
  * | `autopilot`     | copilot                          | `autopilot` in the hint bar     |
  * | `bypass`        | Command Code (NOT in its cycle)  | `» permission bypass on`        |
  * | `dont-ask`      | Command Code (NOT in its cycle)  | `» don't-ask on`                |
  * | `default`       | Command Code                     | `? for shortcuts` (its own row) |
+ * | `build`         | OpenCode V2 (Issue #3038)        | `┃  Build · <model>` under the composer |
+ *
+ * `build` is OpenCode V2's AGENT, not a permission mode, and it is its own id
+ * rather than `default` on purpose: the chip says what the pane says (#2592).
+ * OpenCode V2's `shift+tab` toggles `Build` ⇄ `Plan` agents, and the button
+ * carries the `opencodeAgentSwitch` note so the "permission mode" wording of
+ * its aria label is not the whole story.
  *
  * `bypass` and `dont-ask` are declared even though `shift+tab` cannot REACH
  * them, and that is the point: a user who put Command Code in one of those from
@@ -118,6 +125,7 @@ exports.AGENT_MODE_IDS = [
     'autopilot',
     'bypass',
     'dont-ask',
+    'build',
 ];
 /**
  * The verdict for a frame nothing in {@link AgentModeSpec.indicators} matched.
@@ -146,4 +154,4 @@ function isAgentModeId(value) {
  * translated (`.eslintrc.json`'s i18n rule, Issue #1271), and because the tool
  * declaring it has no way to call `useTranslations()`.
  */
-exports.AGENT_MODE_NOTE_IDS = ['codexModelCoupled'];
+exports.AGENT_MODE_NOTE_IDS = ['codexModelCoupled', 'opencodeAgentSwitch'];

package/dist/types/cli-tool-contracts.d.ts

@@ -418,11 +418,18 @@ export type ToolLivenessVerdict = {
  * | `manual`        | claude                           | `⏸ manual mode on`              |
  * | `auto`          | claude                           | `⏵⏵ auto mode on`               |
  * | `accept-edits`  | claude / Command Code / agy      | `⏵⏵ accept edits on`, `» accept edits on`, `accept-edits ·` |
- * | `plan`          | all five                         | `⏸ plan mode on`, `plan mode`, `Plan mode (shift+tab to cycle)`, `plan` |
+ * | `plan`          | all six                          | `⏸ plan mode on`, `plan mode`, `Plan mode (shift+tab to cycle)`, `plan`, `┃  Plan · <model>` |
  * | `autopilot`     | copilot                          | `autopilot` in the hint bar     |
  * | `bypass`        | Command Code (NOT in its cycle)  | `» permission bypass on`        |
  * | `dont-ask`      | Command Code (NOT in its cycle)  | `» don't-ask on`                |
  * | `default`       | Command Code                     | `? for shortcuts` (its own row) |
+ * | `build`         | OpenCode V2 (Issue #3038)        | `┃  Build · <model>` under the composer |
+ *
+ * `build` is OpenCode V2's AGENT, not a permission mode, and it is its own id
+ * rather than `default` on purpose: the chip says what the pane says (#2592).
+ * OpenCode V2's `shift+tab` toggles `Build` ⇄ `Plan` agents, and the button
+ * carries the `opencodeAgentSwitch` note so the "permission mode" wording of
+ * its aria label is not the whole story.
  *
  * `bypass` and `dont-ask` are declared even though `shift+tab` cannot REACH
  * them, and that is the point: a user who put Command Code in one of those from
@@ -431,7 +438,7 @@ export type ToolLivenessVerdict = {
  * 1.53.1, where `? for shortcuts` is drawn in every mode, that fall-through is
  * a chip that says `default` while the agent bypasses permissions.
  */
-export declare const AGENT_MODE_IDS: readonly ["default", "manual", "accept-edits", "plan", "auto", "autopilot", "bypass", "dont-ask"];
+export declare const AGENT_MODE_IDS: readonly ["default", "manual", "accept-edits", "plan", "auto", "autopilot", "bypass", "dont-ask", "build"];
 /** One permission mode a supported CLI can be in. */
 export type AgentModeId = typeof AGENT_MODE_IDS[number];
 /**
@@ -482,7 +489,7 @@ export interface AgentModeIndicator {
  * translated (`.eslintrc.json`'s i18n rule, Issue #1271), and because the tool
  * declaring it has no way to call `useTranslations()`.
  */
-export declare const AGENT_MODE_NOTE_IDS: readonly ["codexModelCoupled"];
+export declare const AGENT_MODE_NOTE_IDS: readonly ["codexModelCoupled", "opencodeAgentSwitch"];
 /** Which caution one tool's mode button carries, if any. */
 export type AgentModeNoteId = typeof AGENT_MODE_NOTE_IDS[number];
 /**
@@ -516,7 +523,7 @@ export type AgentModeNoteId = typeof AGENT_MODE_NOTE_IDS[number];
  */
 export interface AgentModeSpec {
     /**
-     * The key that advances the cycle — `BTab` for all five declaring tools.
+     * The key that advances the cycle — `BTab` for all six declaring tools.
      *
      * Declared rather than hard-coded so the invariant above is checkable, and so
      * a tool that moves its binding changes one line.
@@ -554,10 +561,14 @@ export interface AgentModeSpec {
     /**
      * A caution this tool's button must carry, or `null`.
      *
-     * codex alone today: its modes are coupled to the model and reasoning effort
+     * codex: its modes are coupled to the model and reasoning effort
      * (`xhigh` ⇄ `medium`, measured 2026-09-16), so one press of a button labelled
      * "mode" also moves the model tier. Issue #2592 §「設計に効く事実」4 requires
      * that be visible rather than discovered.
+     *
+     * OpenCode V2 (Issue #3038): its `shift+tab` switches the AGENT (`Build`,
+     * which edits, ⇄ `Plan`, which only reads) rather than a permission mode, so
+     * the note says what the button actually switches.
      */
     readonly noteId: AgentModeNoteId | null;
 }

package/dist/types/cli-tool-contracts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli-tool-contracts.d.ts","sourceRoot":"","sources":["../../src/types/cli-tool-contracts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli-tool-contracts.d.ts","sourceRoot":"","sources":["../../src/types/cli-tool-contracts.ts"],"names":[],"mappings":"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"}

package/dist/types/cli-tool-contracts.js

@@ -96,11 +96,18 @@ exports.GRACEFUL_EXIT_FAILURE_REASONS = ['graceful_exit_timeout', 'port_orphaned
  * | `manual`        | claude                           | `⏸ manual mode on`              |
  * | `auto`          | claude                           | `⏵⏵ auto mode on`               |
  * | `accept-edits`  | claude / Command Code / agy      | `⏵⏵ accept edits on`, `» accept edits on`, `accept-edits ·` |
- * | `plan`          | all five                         | `⏸ plan mode on`, `plan mode`, `Plan mode (shift+tab to cycle)`, `plan` |
+ * | `plan`          | all six                          | `⏸ plan mode on`, `plan mode`, `Plan mode (shift+tab to cycle)`, `plan`, `┃  Plan · <model>` |
  * | `autopilot`     | copilot                          | `autopilot` in the hint bar     |
  * | `bypass`        | Command Code (NOT in its cycle)  | `» permission bypass on`        |
  * | `dont-ask`      | Command Code (NOT in its cycle)  | `» don't-ask on`                |
  * | `default`       | Command Code                     | `? for shortcuts` (its own row) |
+ * | `build`         | OpenCode V2 (Issue #3038)        | `┃  Build · <model>` under the composer |
+ *
+ * `build` is OpenCode V2's AGENT, not a permission mode, and it is its own id
+ * rather than `default` on purpose: the chip says what the pane says (#2592).
+ * OpenCode V2's `shift+tab` toggles `Build` ⇄ `Plan` agents, and the button
+ * carries the `opencodeAgentSwitch` note so the "permission mode" wording of
+ * its aria label is not the whole story.
  *
  * `bypass` and `dont-ask` are declared even though `shift+tab` cannot REACH
  * them, and that is the point: a user who put Command Code in one of those from
@@ -118,6 +125,7 @@ exports.AGENT_MODE_IDS = [
     'autopilot',
     'bypass',
     'dont-ask',
+    'build',
 ];
 /**
  * The verdict for a frame nothing in {@link AgentModeSpec.indicators} matched.
@@ -146,4 +154,4 @@ function isAgentModeId(value) {
  * translated (`.eslintrc.json`'s i18n rule, Issue #1271), and because the tool
  * declaring it has no way to call `useTranslations()`.
  */
-exports.AGENT_MODE_NOTE_IDS = ['codexModelCoupled'];
+exports.AGENT_MODE_NOTE_IDS = ['codexModelCoupled', 'opencodeAgentSwitch'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "commandmate",
-  "version": "0.42.1",
+  "version": "0.43.0",
   "description": "A local control plane for agent CLIs — orchestration and visibility for Claude Code, Codex, Gemini CLI, and more across Git worktrees",
   "keywords": [
     "claude-code",
@@ -33,6 +33,7 @@
     "!.next/cache",
     "public/",
     "scripts/hooks/",
+    "scripts/opencode-v2/",
     ".env.example",
     "release-notes/"
   ],

package/release-notes/0.42.2.json

@@ -0,0 +1,20 @@
+{
+  "version": "0.42.2",
+  "date": "2026-09-28",
+  "highlight": {
+    "ja": "ブランチごとに選んだ既定のエージェントが、同期のたびに Claude に戻ってしまう問題を直しました。",
+    "en": "Fixed the default agent chosen for a branch switching back to Claude every time branches were synced."
+  },
+  "added": [],
+  "improved": [],
+  "fixed": [
+    {
+      "ja": "ブランチごとに選んだ既定のエージェントが、同期のたびに Claude に戻ってしまう問題を直しました。",
+      "en": "Fixed the default agent chosen for a branch switching back to Claude every time branches were synced."
+    },
+    {
+      "ja": "commandmate verify でタスクを指定できるようになり、完了済みのタスクを検証し直せるようになりました。",
+      "en": "commandmate verify can now take a task, so a finished task can be verified again."
+    }
+  ]
+}

package/release-notes/0.43.0.json

@@ -0,0 +1,130 @@
+{
+  "version": "0.43.0",
+  "date": "2026-09-30",
+  "highlight": {
+    "ja": "OpenCode V2 をエージェントとして使えるようになりました。起動・状態表示・承認や質問への応答・スケジュールまで、これまでの OpenCode と同じ場所で扱えます。",
+    "en": "OpenCode V2 is now available as an agent. Launching, status, answering approvals and questions, and schedules all work in the same places as the existing OpenCode."
+  },
+  "added": [
+    {
+      "ja": "OpenCode V2 をエージェントとして選べるようになり、起動・終了と状態の表示ができるようになりました。",
+      "en": "You can now choose OpenCode V2 as an agent, start and stop it, and see its status."
+    },
+    {
+      "ja": "OpenCode V2 の承認と質問に、画面・スマホ・CLI・Auto-Yes から答えられるようになりました。",
+      "en": "You can now answer OpenCode V2 approvals and questions from the screen, your phone, the CLI, or Auto-Yes."
+    },
+    {
+      "ja": "OpenCode V2 の入力欄で「/」を打つと、スラッシュコマンドの候補が出るようになりました。",
+      "en": "Typing / in the OpenCode V2 input now shows slash command suggestions."
+    },
+    {
+      "ja": "OpenCode V2 で、実際に返答したモデル名が画面と capture に出るようになりました。",
+      "en": "OpenCode V2 now shows the model that actually replied, on screen and in capture."
+    },
+    {
+      "ja": "OpenCode V2 でも、エージェント切り替えやコマンドパレットのクイックキーが使えるようになりました。",
+      "en": "Quick keys such as agent switching and the command palette now work with OpenCode V2."
+    },
+    {
+      "ja": "OpenCode V2 のトークン・費用・コンテキストの使用量が、これまでの OpenCode と同じ場所に出るようになりました。",
+      "en": "OpenCode V2 token, cost, and context usage now appear in the same place as for the existing OpenCode."
+    },
+    {
+      "ja": "スケジュールで OpenCode V2 を指定でき、モデルやエージェントなどの実行オプションも渡せるようになりました。",
+      "en": "Schedules can now run OpenCode V2 and pass run options such as the model and agent."
+    },
+    {
+      "ja": "OpenCode V2 のダイアログカードに、モデルを切り替えるキーが出るようになりました。",
+      "en": "OpenCode V2 dialog cards now show the keys for switching models."
+    },
+    {
+      "ja": "日次確認の対象に OpenCode V2 が加わりました。",
+      "en": "The daily health check now covers OpenCode V2."
+    },
+    {
+      "ja": "新しい commandmate reply コマンドで、セッションの最新の返答を読めるようになりました。",
+      "en": "The new commandmate reply command reads a session's latest reply."
+    }
+  ],
+  "improved": [
+    {
+      "ja": "OpenCode V2 の Build と Plan の切り替えが入力欄の横のボタンになり、今のエージェントが表示されるようになりました。",
+      "en": "Switching between Build and Plan in OpenCode V2 is now a button next to the input, and it shows the current agent."
+    },
+    {
+      "ja": "Skill の互換表で、OpenCode V2 は Skill を足したあとに開始し直さなくてよいことを示すようにしました。",
+      "en": "The Skill compatibility table now shows that OpenCode V2 does not need a restart after a Skill is added."
+    },
+    {
+      "ja": "commandmate ask が、会話が長すぎてモデルの上限を超えたときに、完了ではなく失敗として返すようになりました。",
+      "en": "commandmate ask now reports a failure, not a completed turn, when the conversation is over the model's context limit."
+    },
+    {
+      "ja": "起動したばかりの Command Code にすぐ送ったとき、「起動中」として返すようになりました。",
+      "en": "Sending to a Command Code session that has only just started is now reported as still starting."
+    }
+  ],
+  "fixed": [
+    {
+      "ja": "新しいセッションを起動した直後の送信が、約 1 分待たされて失敗することがある問題を直しました。",
+      "en": "Fixed the first send to a new session sometimes waiting about a minute and then failing."
+    },
+    {
+      "ja": "起動直後の Claude で、使っているモデル名が表示されない問題を直しました。",
+      "en": "Fixed the model name not showing for a Claude session that had just started."
+    },
+    {
+      "ja": "Auto-Yes が飛ばした画面の警告が、同じ画面の間に何度も出る問題を直しました。",
+      "en": "Fixed the warning for a screen Auto-Yes skipped repeating while the same screen stayed up."
+    },
+    {
+      "ja": "OpenCode V2 の返答が履歴に記録されない問題を直しました。",
+      "en": "Fixed OpenCode V2 replies not being recorded in History."
+    },
+    {
+      "ja": "OpenCode V2 の返答に番号付きのリストがあると、応答待ちと誤って扱われ、Auto-Yes が番号を送ってしまう問題を直しました。",
+      "en": "Fixed numbered lists in OpenCode V2 replies being treated as a question, which made Auto-Yes send a number."
+    },
+    {
+      "ja": "OpenCode V2 でダイアログが開いたまま送信すると、本文が消える問題を直しました。",
+      "en": "Fixed the message being lost when sending while an OpenCode V2 dialog was open."
+    },
+    {
+      "ja": "OpenCode V2 で、引数なしのスラッシュコマンドが実行されない問題を直しました。",
+      "en": "Fixed OpenCode V2 slash commands without arguments not running."
+    },
+    {
+      "ja": "OpenCode V2 の承認の文言や、保留中の承認への Auto-Yes の応答を直しました。",
+      "en": "Fixed OpenCode V2 approval wording and Auto-Yes answers to pending approvals."
+    },
+    {
+      "ja": "OpenCode V2 の承認や質問を待つ間の注意文が、チャットに記録されてしまう問題を直しました。",
+      "en": "Fixed the notice shown while OpenCode V2 waits on an approval or question being recorded in the chat."
+    },
+    {
+      "ja": "OpenCode V2 を起動すると、プロジェクトの package.json が書き換えられる問題を直しました。",
+      "en": "Fixed starting OpenCode V2 writing to the project's package.json."
+    },
+    {
+      "ja": "OpenCode V2 を opencode という名前で入れている環境でも、正しく起動するようにしました。",
+      "en": "OpenCode V2 now starts correctly when it is installed under the name opencode."
+    },
+    {
+      "ja": "OpenCode と OpenCode V2 を取り違えることがある問題を直しました。",
+      "en": "Fixed OpenCode and OpenCode V2 sometimes being mixed up."
+    },
+    {
+      "ja": "OpenCode V2 のスケジュールが worktree で動くようにし、画面から作れてしまう不正なスケジュールを防ぎました。",
+      "en": "OpenCode V2 schedules now run in the worktree, and invalid schedules can no longer be created from the screen."
+    },
+    {
+      "ja": "日次確認で、codex の更新ダイアログや設定ファイル、OpenCode のモデル選択と入力履歴の扱いに関する問題を直しました。",
+      "en": "Fixed daily health check issues with the codex update dialog and config file, and with OpenCode model selection and input history."
+    },
+    {
+      "ja": "commandmate verify が、別の作業で一時的にできたファイルを自分の違反として数える問題を直しました。",
+      "en": "Fixed commandmate verify counting temporary files from other work as its own violations."
+    }
+  ]
+}

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

@@ -265,6 +265,20 @@ fi
 if [ -n "$DETAIL" ]; then
   BODY="$BODY,\"detail\":\"$(json_escape "$DETAIL")\""
 fi
+# Issue #2955. Claude names its model on `SessionStart` (`"model":
+# "claude-sonnet-5-5"`, measured on 2.1.284), and `SessionStart` is the one
+# Claude event that has to come through this script (http hooks are not
+# supported there). Before #2955 the value was dropped here, so the server's
+# model latch was never written for any claude session. Forwarded on
+# session_start only — other tools' payloads keep the body they had — and
+# omitted when the payload has none (`claude -p`, the `SessionStart` of
+# `/clear`), where an empty value would read as "the model is unknown".
+if [ "$EVENT" = "session_start" ] && [ -n "$HOOK_JSON" ]; then
+  MODEL="$(json_string_field "$HOOK_JSON" 'model')"
+  if [ -n "$MODEL" ]; then
+    BODY="$BODY,\"model\":\"$(json_escape "$MODEL")\""
+  fi
+fi
 BODY="$BODY}"
 
 # Token via --header rather than the command line of a subprocess: argv is world

package/scripts/opencode-v2/launch.sh

@@ -0,0 +1,226 @@
+#!/usr/bin/env bash
+#
+# launch.sh — run an OpenCode V2 (`opencode2`) server and its TUI in ONE tmux
+# pane, so the two live and die together (Issue #2934, Epic #2370 Phase 1).
+#
+# OpenCode 2's TUI does not host the API the way v1's does: the API is a
+# separate `opencode2 serve`, and the TUI attaches to it with `--server`. If
+# CommandMate started the server as a child of its own process, a CommandMate
+# restart would take every agent's server down with it; if the server were
+# started in the pane without a guard, closing the pane would leave the port
+# bound (the #1905 failure, which v1 only avoided because its TUI WAS the
+# server). So this wrapper owns both processes and a trap stops the server on
+# every way out: the TUI exiting, `tmux kill-session` (SIGHUP), Ctrl-C (SIGINT)
+# and SIGTERM.
+#
+# Usage:
+#   launch.sh --port <N> --password-file <path> --directory <path>
+#             [--executable <path>]
+#
+# The executable
+#   The OpenCode V2 binary to run for both the server and the TUI. CommandMate
+#   passes the absolute path it identified as OpenCode V2 by `--version`
+#   (Issue #2952), which may be named `opencode` as well as `opencode2`, and
+#   which the pane's own PATH might resolve differently. Omitted, it is
+#   `opencode2` looked up on PATH.
+#
+# The password
+#   CommandMate generates one per launch and writes it to a 0600 file under
+#   ~/.commandmate/opencode-v2/. It is read here and placed in the environment
+#   variable OPENCODE_SERVER_PASSWORD ONLY: it is never echoed, never passed as
+#   an argument (argv is readable by `ps`), and the readiness probe hands it to
+#   curl through `--config -` on stdin for the same reason. Accepted, and stated
+#   so nobody has to rediscover it: the serve and TUI processes carry it in their
+#   environment, and so does any shell tool the agent runs. The server listens on
+#   127.0.0.1 only, so what the password protects stays inside the same OS user.
+#
+# Environment (tests only):
+#   CM_OPENCODE_V2_READY_TIMEOUT   seconds to wait for the server (default 15)
+#
+# Exit codes: the TUI's own status when it exits; 64 usage error; 66 password
+# file unreadable or empty; 69 the server did not answer in time; 129/130/143
+# when stopped by SIGHUP / SIGINT / SIGTERM.
+#
+# Written for bash 3.2 (the macOS system bash): no associative arrays, no
+# `mapfile`, no `${var^^}`, no `wait -n`.
+
+set -u
+
+PROGRAM_NAME="launch.sh"
+READY_TIMEOUT_SECONDS="${CM_OPENCODE_V2_READY_TIMEOUT:-15}"
+STOP_GRACE_TICKS=30 # x 0.1 s before SIGKILL
+
+port=""
+password_file=""
+directory=""
+executable=""
+
+usage() {
+  echo "Usage: ${PROGRAM_NAME} --port <N> --password-file <path> --directory <path> [--executable <path>]" >&2
+}
+
+die() {
+  local code="$1"
+  shift
+  echo "${PROGRAM_NAME}: $*" >&2
+  exit "$code"
+}
+
+while [ $# -gt 0 ]; do
+  case "$1" in
+    --port)
+      [ $# -ge 2 ] || { usage; exit 64; }
+      port="$2"
+      shift 2
+      ;;
+    --password-file)
+      [ $# -ge 2 ] || { usage; exit 64; }
+      password_file="$2"
+      shift 2
+      ;;
+    --directory)
+      [ $# -ge 2 ] || { usage; exit 64; }
+      directory="$2"
+      shift 2
+      ;;
+    --executable)
+      [ $# -ge 2 ] || { usage; exit 64; }
+      executable="$2"
+      [ -n "$executable" ] || { usage; exit 64; }
+      shift 2
+      ;;
+    -h | --help)
+      usage
+      exit 0
+      ;;
+    *)
+      usage
+      die 64 "unknown argument: $1"
+      ;;
+  esac
+done
+
+if [ -z "$port" ] || [ -z "$password_file" ] || [ -z "$directory" ]; then
+  usage
+  exit 64
+fi
+case "$port" in
+  '' | *[!0-9]*) die 64 "--port must be a number: ${port}" ;;
+esac
+if [ "$port" -lt 1 ] || [ "$port" -gt 65535 ]; then
+  die 64 "--port out of range: ${port}"
+fi
+case "$READY_TIMEOUT_SECONDS" in
+  '' | *[!0-9]*) READY_TIMEOUT_SECONDS=15 ;;
+esac
+[ -d "$directory" ] || die 64 "--directory is not a directory: ${directory}"
+if [ -n "$executable" ]; then
+  { [ -f "$executable" ] && [ -x "$executable" ]; } ||
+    die 64 "--executable is not an executable file: ${executable}"
+else
+  executable="opencode2"
+fi
+[ -r "$password_file" ] || die 66 "password file is not readable: ${password_file}"
+
+# `read` returns non-zero on a file without a trailing newline even though it
+# filled the variable, so success is judged by the value, not the status.
+OPENCODE_SERVER_PASSWORD=""
+IFS= read -r OPENCODE_SERVER_PASSWORD <"$password_file" || true
+[ -n "$OPENCODE_SERVER_PASSWORD" ] || die 66 "password file is empty: ${password_file}"
+export OPENCODE_SERVER_PASSWORD
+
+# Keep the user's project untouched (Issue #2957). On start the TUI checks for
+# its own update by running `npm`/`pnpm`/`yarn`/`bun list -g` in the directory
+# it was started from; where `pnpm`/`yarn` are corepack shims, corepack then
+# writes a "packageManager" field into the nearest package.json (auto-pin).
+# Measured with opencode2 v2.0.18: OPENCODE_DISABLE_AUTOUPDATE=1 stops those
+# spawns altogether, and COREPACK_ENABLE_AUTO_PIN=0 keeps corepack from writing
+# should any package manager run anyway. CommandMate reports updates itself.
+export OPENCODE_DISABLE_AUTOUPDATE=1
+export COREPACK_ENABLE_AUTO_PIN=0
+
+server_url="http://127.0.0.1:${port}"
+serve_pid=""
+tui_pid=""
+
+# Stop one child: SIGTERM, a short grace period, then SIGKILL, then reap it so
+# the port is released before this script's own exit is observable.
+# shellcheck disable=SC2329 # invoked from the EXIT trap via cleanup
+stop_child() {
+  local pid="$1"
+  local ticks=0
+  [ -n "$pid" ] || return 0
+  kill -TERM "$pid" 2>/dev/null || true
+  while kill -0 "$pid" 2>/dev/null; do
+    if [ "$ticks" -ge "$STOP_GRACE_TICKS" ]; then
+      kill -KILL "$pid" 2>/dev/null || true
+      break
+    fi
+    sleep 0.1
+    ticks=$((ticks + 1))
+  done
+  wait "$pid" 2>/dev/null || true
+}
+
+# shellcheck disable=SC2329 # invoked by the EXIT trap
+cleanup() {
+  local tui="$tui_pid"
+  local serve="$serve_pid"
+  tui_pid=""
+  serve_pid=""
+  stop_child "$tui"
+  stop_child "$serve"
+}
+
+trap cleanup EXIT
+# Each signal becomes an ordinary exit, which runs the EXIT trap above exactly
+# once. The TUI is waited on with `wait` (below) rather than run as a
+# foreground command precisely so these fire immediately: bash defers a
+# trapped signal until a foreground child returns, and a TUI that ignores the
+# hangup would otherwise keep the server alive forever.
+trap 'exit 129' HUP
+trap 'exit 130' INT
+trap 'exit 143' TERM
+
+# The server's own output would only be painted over by the TUI's alternate
+# screen, and with OPENCODE_SERVER_PASSWORD set it prints no secret anyway.
+"$executable" serve --hostname 127.0.0.1 --port "$port" </dev/null >/dev/null 2>&1 &
+serve_pid=$!
+
+# Ready means `GET /openapi.json` answered 200 with our credentials. The
+# credentials go to curl on stdin (`--config -`), never on its command line.
+probe_ready() {
+  local code
+  code="$(printf 'user = "opencode:%s"\n' "$OPENCODE_SERVER_PASSWORD" |
+    curl --config - --silent --output /dev/null --write-out '%{http_code}' \
+      --max-time 1 "${server_url}/openapi.json" 2>/dev/null)" || true
+  [ "$code" = "200" ]
+}
+
+ready=0
+deadline=$((SECONDS + READY_TIMEOUT_SECONDS))
+while [ "$SECONDS" -lt "$deadline" ]; do
+  if ! kill -0 "$serve_pid" 2>/dev/null; then
+    die 69 "${executable} serve exited before answering on ${server_url}"
+  fi
+  if probe_ready; then
+    ready=1
+    break
+  fi
+  sleep 0.25
+done
+[ "$ready" -eq 1 ] || die 69 "${executable} serve did not answer on ${server_url} within ${READY_TIMEOUT_SECONDS}s"
+
+# Asynchronous commands in a non-interactive shell get /dev/null as stdin
+# unless they are given an explicit redirection, so the terminal is handed over
+# on fd 3. The TUI still shares this script's process group, which is the
+# pane's foreground group, so it keeps reading the terminal.
+exec 3<&0
+"$executable" --server "$server_url" "$directory" <&3 3<&- &
+tui_pid=$!
+exec 3<&-
+
+status=0
+wait "$tui_pid" || status=$?
+tui_pid=""
+exit "$status"