commandmate 0.42.2 → 0.43.0

package/dist/server/locales/ja/worktree.json

@@ -117,7 +117,10 @@
                 "command-code": "Command Code またはプロバイダーからログアウト",
                 "antigravity": "ログアウト"
             },
-            "quit": "Codex CLI を終了",
+            "quit": {
+                "codex": "Codex CLI を終了",
+                "opencode-v2": "OpenCode V2 を終了"
+            },
             "diff": "Git の差分を表示（未追跡ファイルを含む）",
             "mention": "次のやり取りにファイル/フォルダを添付",
             "mcp": "MCP サーバーと利用可能なツールを管理",
@@ -126,7 +129,8 @@
                 "claude": "リポジトリ向けの CLAUDE.md ガイドを生成",
                 "copilot": "このリポジトリ向けの Copilot 指示ファイルを初期化",
                 "opencode": "AGENTS.md のガイド付きセットアップを実行",
-                "command-code": "このプロジェクト向けの AGENTS.md を生成"
+                "command-code": "このプロジェクト向けの AGENTS.md を生成",
+                "opencode-v2": "AGENTS.md のガイド付きセットアップを実行"
             },
             "feedback": {
                 "codex": "Codex チームにフィードバックを送信",
@@ -149,7 +153,8 @@
                 "copilot": "機能を拡張するスキルを管理",
                 "opencode": "利用可能なスキルを一覧・実行",
                 "command-code": "エージェントスキルを一覧・表示",
-                "antigravity": "利用できるスキルを一覧表示"
+                "antigravity": "利用できるスキルを一覧表示",
+                "opencode-v2": "利用可能なスキルを一覧"
             },
             "hooks": "フック設定を確認・管理",
             "sessions": "会話履歴を閲覧",
@@ -160,7 +165,8 @@
                 "codex": "CLI を終了",
                 "copilot": "CLI を終了",
                 "command-code": "Command Code を終了",
-                "antigravity": "CLI を終了"
+                "antigravity": "CLI を終了",
+                "opencode-v2": "OpenCode V2 を終了"
             },
             "models": "AI モデルを切り替え",
             "agents": {
@@ -168,7 +174,8 @@
                 "claude": "サブエージェントの作成・管理を Claude に依頼するか .claude/agents/ を直接編集するよう促す案内を表示",
                 "codex": "稼働中のすべてのエージェントセッションを一覧・切り替え",
                 "command-code": "エージェント構成を管理",
-                "antigravity": "利用できるカスタムエージェントを一覧表示"
+                "antigravity": "利用できるカスタムエージェントを一覧表示",
+                "opencode-v2": "エージェントを切り替え"
             },
             "themes": "TUI のテーマを変更",
             "editor": "長文メッセージ用のエディタを開く",
@@ -182,7 +189,8 @@
             "bug": "バグを報告、または会話を共有",
             "cd": {
                 "claude": "このセッションの作業ディレクトリを変更",
-                "codex": "現在の作業ディレクトリを変更"
+                "codex": "現在の作業ディレクトリを変更",
+                "opencode-v2": "作業ディレクトリを変更"
             },
             "chrome": "Claude in Chrome の設定",
             "claude-api": "プロジェクトの言語向けの Claude API リファレンスと Managed Agents リファレンスを読み込み",
@@ -192,7 +200,8 @@
             "dataviz": "チャート・グラフ・ダッシュボードの設計ガイダンス",
             "debug": {
                 "claude": "デバッグログを有効化し、セッションのデバッグログを読んで問題を切り分け",
-                "opencode": "デバッグ情報を表示"
+                "opencode": "デバッグ情報を表示",
+                "opencode-v2": "デバッグ情報を表示"
             },
             "deep-research": "質問に対して web 検索を展開し、出典を突き合わせて引用付きレポートを作成",
             "design-login": "claude.ai アカウントで /design-sync のデザインシステムアクセスを認可",
@@ -320,7 +329,10 @@
             "rubber-duck": "現在の作業への独立した批評を取得",
             "search": "会話タイムラインを検索",
             "session": "セッションを表示・管理",
-            "settings": "設定 UI を開く、または個別の値を表示・設定",
+            "settings": {
+                "copilot": "設定 UI を開く、または個別の値を表示・設定",
+                "opencode-v2": "設定を開く"
+            },
             "share": "セッションを Markdown ファイルや GitHub gist として共有",
             "undo": "直前のターンを巻き戻してファイル変更を取り消し",
             "update": "CLI を最新バージョンに更新",
@@ -351,7 +363,10 @@
             "plan-review": "このセッションの最新プランをレビュー表示で開く",
             "plans": "保存済みプランの閲覧・レビュー・注釈",
             "pr-comments": "現在のブランチの PR コメントをすべて取得",
-            "reload": "CLI を再起動してこのセッションを再開し、保留中の更新を適用",
+            "reload": {
+                "command-code": "CLI を再起動してこのセッションを再開し、保留中の更新を適用",
+                "opencode-v2": "設定を再読み込み"
+            },
             "session-file": "現在のセッション ID とセッションファイルのパスを表示",
             "taste": "taste 学習と利用状況を管理",
             "todos": "セッションの TODO リストを管理",
@@ -368,7 +383,10 @@
             "daemon": "ローカルのバックグラウンドサーバを管理",
             "warnings": "保持されている警告と診断情報を表示",
             "credits": "残りの G1 クレジットと購入リンクを表示",
-            "open": "ファイルを開く、または開いた・編集したファイルを表示",
+            "open": {
+                "antigravity": "ファイルを開く、または開いた・編集したファイルを表示",
+                "opencode-v2": "セッションまたはプロジェクトを開く"
+            },
             "schedule": "指示を定期実行、または一度きりのタイマーで実行",
             "browser": "ブラウザエージェントで Web 上の作業を実行",
             "grill-me": "計画をすり合わせるために質問してもらう",
@@ -379,7 +397,16 @@
             "automation": "定期実行するバックグラウンド自動処理を対話形式で作成",
             "migrate-workflows": "旧形式のワークフローをスキルへ移行",
             "artifact": "アーティファクトを表示・レビュー",
-            "codesearch": "ワークスペース内のコードを検索"
+            "codesearch": "ワークスペース内のコードを検索",
+            "continue": "別のセッションに切り替え",
+            "pair": "この OpenCode に別のデバイスをペアリング",
+            "project": "セッションまたはプロジェクトを開く",
+            "projects": "セッションまたはプロジェクトを開く",
+            "q": "OpenCode V2 を終了",
+            "stats": "使用量の統計を表示",
+            "thinking": "モデルのバリアントを切り替え",
+            "web": "この OpenCode に別のデバイスをペアリング",
+            "worktrees": "ワークスペースを管理"
         }
     },
     "session": {
@@ -1203,10 +1230,12 @@
         "cycleAria": "エージェントの権限モードを切り替える (shift+tab)",
         "cycleFromAria": "エージェントの権限モードを切り替える。現在は {mode}。(shift+tab)",
         "note": {
-            "codexModelCoupled": "Codex はモードと連動してモデルと推論の強さも変わります。"
+            "codexModelCoupled": "Codex はモードと連動してモデルと推論の強さも変わります。",
+            "opencodeAgentSwitch": "OpenCode V2 では Build（編集あり）と Plan（読み取りのみ）のエージェントが切り替わります。"
         },
         "noteShort": {
-            "codexModelCoupled": "モデルも変わる"
+            "codexModelCoupled": "モデルも変わる",
+            "opencodeAgentSwitch": "エージェント切替"
         },
         "mode": {
             "default": "default",
@@ -1216,7 +1245,8 @@
             "auto": "auto",
             "autopilot": "autopilot",
             "bypass": "permission bypass",
-            "dont-ask": "don't-ask"
+            "dont-ask": "don't-ask",
+            "build": "build"
         }
     },
     "sessionNote": {

package/dist/server/server.js

@@ -717,6 +717,29 @@ app.prepare().then(() => {
         })();
         // Initialize worktrees after server starts
         await initializeWorktrees();
+        // Issue #2934: re-open the event streams of OpenCode V2 (`opencode-v2`)
+        // panes that outlived the last process — the counterpart of the Issue #2108
+        // block below for v1, whose TUI is its own server; OpenCode V2's is a
+        // separate `opencode2 serve` in the same pane. The sweep re-subscribes every
+        // instance whose tmux session is alive (port from
+        // `~/.commandmate/opencode-v2/ports.json`, password from the instance's
+        // `.pw` file) and deletes the password file and port entry of every instance
+        // whose session is gone. Same shape and reasons as the #2108 block: not
+        // awaited, fail-open, dynamic import, after `initializeWorktrees()`. The log
+        // line carries counts only — never a password or a file's content.
+        void (async () => {
+            try {
+                const { reattachOpencodeV2EventStreams } = await Promise.resolve().then(() => __importStar(require('./src/lib/hooks/sources/opencode-v2/reattach')));
+                const report = await reattachOpencodeV2EventStreams();
+                if (report.known > 0) {
+                    console.log(`opencode-v2 streams reattached: ${report.reattached}/${report.candidates} ` +
+                        `live pane(s) (known=${report.known} swept=${report.swept})`);
+                }
+            }
+            catch (error) {
+                console.error('Error reattaching opencode-v2 event streams:', error);
+            }
+        })();
         // Issue #2108: re-open the event streams of opencode panes that outlived
         // the last process. The port each one's server listens on is in
         // `~/.commandmate/opencode-ports.json`, and until this call nothing read it

package/dist/server/src/config/cli-tool-timing-config.js

@@ -20,7 +20,7 @@
  * All values are preserved from the original literals (no behavior change).
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LIVENESS_CONFIRM_DELAY_MS = exports.CLAUDE_RESTART_DELAY_MS = exports.CLAUDE_ENV_SANITIZE_WAIT_MS = exports.COMMAND_CODE_INIT_WAIT_MS = exports.VIBE_LOCAL_DOUBLE_ENTER_WAIT_MS = exports.COPILOT_EXIT_WAIT_MS = exports.OPENCODE_INTERRUPT_SECOND_ESCAPE_DELAY_MS = exports.OPENCODE_EXIT_WAIT_MS = exports.CODEX_DIALOG_SETTLE_MS = exports.TUI_EXIT_WAIT_MS = exports.TUI_INTERRUPT_SETTLE_MS = exports.TUI_MESSAGE_PROCESSED_WAIT_MS = exports.TUI_TEXT_INPUT_WAIT_MS = exports.TUI_SESSION_CREATE_WAIT_MS = void 0;
+exports.LIVENESS_CONFIRM_DELAY_MS = exports.CLAUDE_RESTART_DELAY_MS = exports.CLAUDE_ENV_SANITIZE_WAIT_MS = exports.OPENCODE_V2_COMPOSER_WAIT_MS = exports.OPENCODE_V2_EXIT_WAIT_MS = exports.COMMAND_CODE_INIT_WAIT_MS = exports.VIBE_LOCAL_DOUBLE_ENTER_WAIT_MS = exports.COPILOT_EXIT_WAIT_MS = exports.OPENCODE_INTERRUPT_SECOND_ESCAPE_DELAY_MS = exports.OPENCODE_EXIT_WAIT_MS = exports.CODEX_DIALOG_SETTLE_MS = exports.TUI_EXIT_WAIT_MS = exports.TUI_INTERRUPT_SETTLE_MS = exports.TUI_MESSAGE_PROCESSED_WAIT_MS = exports.TUI_TEXT_INPUT_WAIT_MS = exports.TUI_SESSION_CREATE_WAIT_MS = void 0;
 /**
  * Wait (ms) after `createSession()` before sending the first keys, giving tmux
  * time to spin up the session.
@@ -138,6 +138,24 @@ exports.VIBE_LOCAL_DOUBLE_ENTER_WAIT_MS = 200;
  * rows, then the rules).
  */
 exports.COMMAND_CODE_INIT_WAIT_MS = 3000;
+/**
+ * Wait (ms) after OpenCode V2's `/exit` before its postcondition is checked
+ * (Issue #2934).
+ *
+ * Longer than {@link OPENCODE_EXIT_WAIT_MS} because two processes go away, not
+ * one: the TUI quits, then `scripts/opencode-v2/launch.sh`'s trap stops the
+ * `opencode2 serve` it started (SIGTERM, then SIGKILL after 3 s). The
+ * postcondition that follows (`verifyGracefulExit`) still polls, so this only
+ * keeps the first probe from firing while the server is shutting down.
+ * Site: opencode-v2 killSession().
+ */
+exports.OPENCODE_V2_EXIT_WAIT_MS = 3000;
+/**
+ * Upper bound (ms) on waiting for OpenCode V2's composer before a send
+ * (Issue #2934, D6).
+ * Site: opencode-v2 sendMessage().
+ */
+exports.OPENCODE_V2_COMPOSER_WAIT_MS = 15000;
 /**
  * Wait (ms) for the `unset CLAUDECODE` command to reach the shell while
  * sanitizing the session environment (empirically determined).

package/dist/server/src/config/detection-evidence-config.js

@@ -79,6 +79,9 @@ exports.IDLE_EVIDENCE_DEFAULT_MODE = {
     // whatever this row says, and claiming `enforce` would state a rollout that
     // does not exist. Epic #2249 決定 3 pins the same value from the other side.
     'command-code': 'legacy',
+    // Issue #2934: OpenCode V2 Phase 1 declares no `readIdleEvidence` either, so
+    // `legacy` is the honest row; its state comes from the SSE stream.
+    'opencode-v2': 'legacy',
 };
 /**
  * The kill switch.

package/dist/server/src/config/schedule-config.js

@@ -10,7 +10,8 @@
  * [S4-014] UUID v4 format validation
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UUID_V4_PATTERN = exports.DEFAULT_PERMISSIONS = exports.NO_PERMISSION_FLAGS = exports.OPENCODE_PERMISSIONS = exports.VIBE_LOCAL_PERMISSIONS = exports.GEMINI_PERMISSIONS = exports.COMMAND_CODE_SCHEDULE_PERMISSIONS = exports.COMMAND_CODE_YOLO_PERMISSION = exports.COMMAND_CODE_PERMISSIONS = exports.ANTIGRAVITY_PERMISSIONS = exports.COPILOT_PERMISSIONS = exports.CODEX_SANDBOXES = exports.CLAUDE_PERMISSIONS = exports.MAX_SCHEDULE_CRON_LENGTH = exports.MAX_SCHEDULE_MESSAGE_LENGTH = exports.MAX_SCHEDULE_NAME_LENGTH = void 0;
+exports.UUID_V4_PATTERN = exports.SCHEDULE_UNSUPPORTED_CLI_TOOLS = exports.DEFAULT_PERMISSIONS = exports.NO_PERMISSION_FLAGS = exports.OPENCODE_V2_PERMISSIONS = exports.OPENCODE_V2_AUTO_PERMISSION = exports.OPENCODE_V2_DEFAULT_PERMISSION = exports.OPENCODE_PERMISSIONS = exports.VIBE_LOCAL_PERMISSIONS = exports.GEMINI_PERMISSIONS = exports.COMMAND_CODE_SCHEDULE_PERMISSIONS = exports.COMMAND_CODE_YOLO_PERMISSION = exports.COMMAND_CODE_PERMISSIONS = exports.ANTIGRAVITY_PERMISSIONS = exports.COPILOT_PERMISSIONS = exports.CODEX_SANDBOXES = exports.CLAUDE_PERMISSIONS = exports.MAX_SCHEDULE_CRON_LENGTH = exports.MAX_SCHEDULE_MESSAGE_LENGTH = exports.MAX_SCHEDULE_NAME_LENGTH = void 0;
+exports.isScheduleSupportedCliTool = isScheduleSupportedCliTool;
 exports.getPermissionOptionsForTool = getPermissionOptionsForTool;
 exports.isValidUuidV4 = isValidUuidV4;
 // =============================================================================
@@ -117,6 +118,38 @@ exports.VIBE_LOCAL_PERMISSIONS = [];
  * CommandMate does not pass it. Wiring it up is a separate decision.
  */
 exports.OPENCODE_PERMISSIONS = [];
+/** OpenCode V2 Permission value that passes no flag (Issue #2974). */
+exports.OPENCODE_V2_DEFAULT_PERMISSION = 'default';
+/** OpenCode V2 Permission value that passes `--auto` (Issue #2974). */
+exports.OPENCODE_V2_AUTO_PERMISSION = 'auto';
+/**
+ * Allowed permission values for OpenCode V2 (Issue #2934, #2974).
+ *
+ * `opencode2 run` has one permission switch, `--auto` ("auto-approve
+ * permissions that are not explicitly denied"). The column names both sides of
+ * it — `default` passes nothing, `auto` passes `--auto` — so the dropdown can
+ * offer the flag-less run as a choice rather than as a blank cell.
+ *
+ * Measured on 2.0.18 (isolated `HOME` / `XDG_*`,
+ * `tests/fixtures/opencode-v2-schedule-2974/`):
+ *
+ *  - with no `permission` config a write goes through without `--auto`;
+ *  - an `ask` rule is auto-rejected ("permission requested: edit (…);
+ *    auto-rejecting" on stderr), the stream ends in an `error` frame and the
+ *    process exits 1 — so the run fails loudly, it never "succeeds" having done
+ *    nothing (the #2454 failure mode);
+ *  - `--auto` approves the same `ask` rule and the run exits 0;
+ *  - `deny` is not a sandbox: with `edit: deny` / `write: deny` and `--auto`
+ *    the model wrote the file through the `shell` tool.
+ *
+ * So the default is `default`: an operator who wrote `ask` asked for a human,
+ * and without one the schedule is recorded as failed. `auto` is for an operator
+ * who wants those rules approved unattended.
+ */
+exports.OPENCODE_V2_PERMISSIONS = [
+    exports.OPENCODE_V2_DEFAULT_PERMISSION,
+    exports.OPENCODE_V2_AUTO_PERMISSION,
+];
 /**
  * What a CLI tool with no permission flag at all resolves to (Issue #1914).
  *
@@ -148,7 +181,25 @@ exports.DEFAULT_PERMISSIONS = {
     // run still reports success, so an unattended schedule that omits the column
     // would look like it worked and change nothing.
     'command-code': exports.COMMAND_CODE_YOLO_PERMISSION,
+    // Issue #2974: no `--auto` -- an `ask` rule then fails the run (exit 1)
+    // instead of being approved; see OPENCODE_V2_PERMISSIONS.
+    'opencode-v2': exports.OPENCODE_V2_DEFAULT_PERMISSION,
 };
+/**
+ * CLI tools that are registered but cannot be the CLI Tool of a CMATE.md
+ * schedule (Issue #2934).
+ *
+ * A tool listed here is a validation error in `cmate-validator`, a skipped row
+ * in `cmate-parser`, a rejected input in `cmate-writer` and absent from the
+ * schedule dialog. Empty since Issue #2974, which measured and wired OpenCode
+ * V2's headless path (`opencode2 run --standalone --format json`); kept as the
+ * one place a future tool without a measured headless path is listed.
+ */
+exports.SCHEDULE_UNSUPPORTED_CLI_TOOLS = [];
+/** Whether a CLI tool can be scheduled (see {@link SCHEDULE_UNSUPPORTED_CLI_TOOLS}). */
+function isScheduleSupportedCliTool(cliToolId) {
+    return !exports.SCHEDULE_UNSUPPORTED_CLI_TOOLS.includes(cliToolId);
+}
 /**
  * Resolve the allowed Permission dropdown options for a CLI tool (Issue #824).
  *
@@ -193,6 +244,9 @@ function getPermissionOptionsForTool(cliToolId) {
             return exports.VIBE_LOCAL_PERMISSIONS;
         case 'opencode':
             return exports.OPENCODE_PERMISSIONS;
+        case 'opencode-v2':
+            // Issue #2974: `default` (no flag) or `auto` (`--auto`).
+            return exports.OPENCODE_V2_PERMISSIONS;
         default:
             return exports.NO_PERMISSION_FLAGS;
     }

package/dist/server/src/lib/auto-yes-poller.js

@@ -206,6 +206,45 @@ function isDuplicatePrompt(pollerState, promptKey) {
         return false;
     return (Date.now() - pollerState.lastAnsweredAt) < auto_yes_state_1.DUPLICATE_RETRY_EXPIRY_MS;
 }
+/**
+ * Issue #2995: print a "did not answer" line as WARN once per frame.
+ *
+ * The poller re-reads a static pane every 2s, so a frame Auto-Yes leaves alone
+ * (a reply quoting `1. Yes / 2. No`, a launch dialog, a policy-withheld prompt,
+ * a foreign session) would otherwise print the same WARN on every tick. The
+ * first one stays WARN -- it is what tells a silently stalled worker apart --
+ * and repeats for the same frame drop to `debug`. The frame is identified by
+ * the event, `promptFrameKey()` and the event's own detail; a different
+ * prompt, a different reason, or a tick with no prompt / an answer sent (both
+ * clear the key) makes the next line WARN again.
+ * `recordPolicySuppression()` is not throttled: `capture --json` and `wait`
+ * read the latest record, not the log.
+ */
+/**
+ * Issue #2995: what makes two ticks "the same prompt" for `warnOncePerFrame`.
+ *
+ * `generatePromptKey` alone is type + question, and the question the detector
+ * extracts from an agent's reply is often a fixed line above the list, so two
+ * different lists would share it. The option rows (and where the cursor sits)
+ * plus `approvalTarget` -- the current prompt's own panel, which leaves out
+ * scrollback and footers that change while the prompt does not -- separate them.
+ * Not the whole pane: a status bar that ticks every second would defeat it.
+ */
+function promptFrameKey(promptData) {
+    const options = promptData.type === 'multiple_choice'
+        ? promptData.options.map((o) => `${o.isDefault ? '>' : ''}${o.number}.${o.label}`).join('\n')
+        : '';
+    return [(0, prompt_key_1.generatePromptKey)(promptData), options, promptData.approvalTarget ?? ''].join('\u0000');
+}
+function warnOncePerFrame(pollerState, frameKey, event, fields) {
+    const key = `${event}\u0000${frameKey}`;
+    if (pollerState.lastSkipWarnKey === key) {
+        logger.debug(event, { ...fields, repeated: true });
+        return;
+    }
+    pollerState.lastSkipWarnKey = key;
+    logger.warn(event, fields);
+}
 // =============================================================================
 // Extracted Functions for pollAutoYes (Issue #323: SRP decomposition)
 // =============================================================================
@@ -403,6 +442,7 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
         if (!promptDetection.isPrompt || !promptDetection.promptData) {
             pollerState.lastAnsweredPromptKey = null;
             pollerState.lastAnsweredAt = null;
+            pollerState.lastSkipWarnKey = null;
             if (cliToolId === 'antigravity' && !promptDetection.isPrompt) {
                 logIfWithheldForWantOfReceipt(worktreeId, instanceId, compositeKey, () => (0, response_checker_1.detectPromptOnCleanFrame)(cleanOutput, cliToolId, precomputedLines, rawOutput));
             }
@@ -410,6 +450,7 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
         }
         // 2. Check for duplicate prompt (Issue #306)
         const promptKey = (0, prompt_key_1.generatePromptKey)(promptDetection.promptData);
+        const frameKey = promptFrameKey(promptDetection.promptData);
         if (isDuplicatePrompt(pollerState, promptKey)) {
             return 'duplicate';
         }
@@ -440,7 +481,7 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
                 mode: null,
                 promptType: promptDetection.promptData.type,
             });
-            logger.warn('poller:auto-yes-skipped-launch-dialog', {
+            warnOncePerFrame(pollerState, `${frameKey}\u0000${launchDialog}`, 'poller:auto-yes-skipped-launch-dialog', {
                 worktreeId,
                 cliToolId,
                 instanceId,
@@ -473,7 +514,7 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
                 mode: null,
                 promptType: promptDetection.promptData.type,
             });
-            logger.warn('poller:auto-yes-skipped-unclassified-frame', {
+            warnOncePerFrame(pollerState, `${frameKey}\u0000${dialogGate.dialog?.kind ?? ''}\u0000${dialogGate.mode}`, 'poller:auto-yes-skipped-unclassified-frame', {
                 worktreeId,
                 cliToolId,
                 instanceId,
@@ -502,7 +543,7 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
                 promptType: promptDetection.promptData.type,
                 pattern: resolution.pattern,
             });
-            logger.warn('poller:auto-yes-suppressed-by-policy', {
+            warnOncePerFrame(pollerState, `${frameKey}\u0000${resolution.suppressedBy}\u0000${policy?.mode ?? ''}\u0000${resolution.pattern ?? ''}`, 'poller:auto-yes-suppressed-by-policy', {
                 worktreeId,
                 cliToolId,
                 instanceId,
@@ -524,7 +565,7 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
         // server created. The poller keeps running; it just does not type.
         const ownership = await (0, worktree_session_ownership_1.checkWorktreeSessionOwnership)(worktreeId, sessionName);
         if (ownership === null || ownership.verdict === 'foreign') {
-            logger.warn('poller:auto-yes-skipped-foreign-session', {
+            warnOncePerFrame(pollerState, `${frameKey}\u0000${sessionName}\u0000${ownership ? 'foreign' : 'worktree_not_found'}`, 'poller:auto-yes-skipped-foreign-session', {
                 worktreeId,
                 cliToolId,
                 instanceId,
@@ -551,6 +592,7 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
         // 7. Record answered prompt key and timestamp
         pollerState.lastAnsweredPromptKey = promptKey;
         pollerState.lastAnsweredAt = Date.now();
+        pollerState.lastSkipWarnKey = null;
         logger.info('poller:response-sent', { worktreeId, cliToolId, instanceId });
         // Issue #1548: the prompt was answered without a human. Raised only after
         // the keys actually reached tmux, so a send that threw is not logged as an
@@ -736,6 +778,7 @@ function startAutoYesPolling(worktreeId, cliToolId, instanceId) {
         lastAnsweredPromptKey: null,
         lastAnsweredAt: null,
         stopCheckBaselineLength: -1,
+        lastSkipWarnKey: null,
     };
     autoYesPollerStates.set(compositeKey, pollerState);
     // A task may have been recorded moments ago; start from a fresh policy read.

package/dist/server/src/lib/cli-tools/agent-mode-spec.js

@@ -24,6 +24,7 @@
  * | gemini         | 0.58.0   | `app.cycleApprovalMode` (docs)   | **NOT MEASURED** — see below                  |
  * | opencode       | 1.18.30  | agent switch, not a mode         | — (already shipped as #2046's quick keys)     |
  * | vibe-local     | —        | nothing (5 presses, no change)   | — (`-y` AUTO-APPROVE is fixed)                |
+ * | opencode-v2    | 2.0.18   | agent switch (Build ⇄ Plan)      | build ⇄ plan (declared since #3038)           |
  *
  * ## The three tools this table deliberately leaves out
  *
@@ -32,6 +33,9 @@
  *    mode spec would put a second button on the same key with a different
  *    promise. The separation is a DECLARATION (no entry here), not a tool-id
  *    check in the UI.
+ *    (OpenCode V2 is NOT left out any more — see {@link OPENCODE_V2_MODE_SPEC}.
+ *    #2966 left it out for v1's reason; #3038 moved its `shift+tab` from the
+ *    quick keys to the mode button, so there is still one button per key.)
  *  - **vibe-local.** Five presses produced a byte-identical frame. There is no
  *    mode to cycle; the wrapper fixes `-y`.
  *  - **gemini.** Its bundled `docs/reference/keyboard-shortcuts.md` does bind
@@ -44,12 +48,13 @@
  *
  * ## Why the indicators are patterns on a windowed tail and not positions
  *
- * The five declaring tools put the mode in five structurally different places —
+ * The declaring tools put the mode in structurally different places —
  * a dedicated footer row (claude), an independent row above the shortcut hint
  * (Command Code 1.53.1) or *replacing* it (1.49.0), the right end of a status
  * bar (codex), a word spliced into a hint bar whose element count changes with
  * the mode (copilot), and a right-aligned footer segment plus a banner inside
- * the composer box (agy). No column index, no row offset and no "nth segment"
+ * the composer box (agy), and the agent row under the composer (OpenCode V2).
+ * No column index, no row offset and no "nth segment"
  * rule survives that set, so each tool declares what its row LOOKS like and the
  * reader scans a small window of non-blank tail rows for it.
  *
@@ -290,6 +295,52 @@ const ANTIGRAVITY_MODE_SPEC = {
     tailRows: 2,
     noteId: null,
 };
+/**
+ * OpenCode V2's agent row, directly under the composer (Issue #3038).
+ *
+ * `shift+tab` on 2.0.18 toggles the AGENT, not a permission mode — `Build`
+ * (edits allowed) ⇄ `Plan` (read only) — on the home screen and inside a session
+ * alike, and the composer's last row names it. Measured 2026-09-30 through
+ * `scripts/opencode-v2/launch.sh` on a private tmux socket, 80x200
+ * (`tests/fixtures/opencode-v2-agent-mode-3038/`):
+ *
+ *   `   ┃  Build · LongCat 2.5 Preview Free OpenCode Zen`   (home, 4th row up)
+ *   `  ┃  Plan · LongCat 2.5 Preview Free OpenCode Zen`     (session, 3rd row up)
+ *
+ * Two rows the patterns must NOT read, both on the same screen:
+ *
+ *  - the completion row a finished turn leaves in the transcript,
+ *    `     Build · LongCat 2.5 Preview Free · 4.9s · 8.1 tok/s`. On 2.0.18 it
+ *    has no gutter at all (v1 drew `▣` there); the required `┃` excludes it;
+ *  - the user's own message, drawn in the same `┃  <text>` gutter. It is above
+ *    the composer, so the tail window below cannot reach it on a frame where
+ *    the composer is drawn.
+ *
+ * Both agents are drawn, so unlike codex / copilot / agy there is no silent
+ * base mode here: a frame without the row (a permission or question dialog
+ * replaces the composer) reads `unknown`.
+ *
+ * `build` is its own id rather than `default` — the chip says what the pane
+ * says (#2592) — and the `opencodeAgentSwitch` note tells the user this button
+ * switches the agent, which its "permission mode" aria label does not.
+ *
+ * The same key was `OpencodeQuickKeys`' v2 `agentNext` until #3038. It was
+ * taken off the strip in the same change, so the key has one button.
+ */
+const OPENCODE_V2_MODE_SPEC = {
+    key: 'BTab',
+    cycle: ['build', 'plan'],
+    indicators: [
+        { mode: 'build', pattern: /^[^\S\n]*┃[^\S\n]+Build[^\S\n]·[^\S\n]/ },
+        { mode: 'plan', pattern: /^[^\S\n]*┃[^\S\n]+Plan[^\S\n]·[^\S\n]/ },
+    ],
+    // The home screen draws `2.0.18` under the footer, which puts the agent row
+    // 4th from the bottom; in a session it is 3rd (footer, `╹▀▀▀`, agent row).
+    // Four and no more: the fifth row up is the composer's own gutter, and above
+    // that is the transcript, where the user's `┃  …` message lives.
+    tailRows: 4,
+    noteId: 'opencodeAgentSwitch',
+};
 /**
  * The declarations, keyed by tool.
  *
@@ -304,6 +355,7 @@ const AGENT_MODE_SPECS = {
     codex: CODEX_MODE_SPEC,
     copilot: COPILOT_MODE_SPEC,
     antigravity: ANTIGRAVITY_MODE_SPEC,
+    'opencode-v2': OPENCODE_V2_MODE_SPEC,
 };
 /**
  * How one CLI cycles its permission mode, or `null` when it does not have one.

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

@@ -595,8 +595,10 @@ class BaseCLITool {
      * against `NAVIGATION_KEY_VALUES` anyway, because a future edit could still
      * add an override to one of them.
      *
-     * THREE tools override it now:
+     * FOUR tools override it now:
      *  - opencode, with its `ctrl+x` leader and chord letters (#2046);
+     *  - OpenCode V2, with the same leader and a narrower set measured on 2.0.18
+     *    (`OPENCODE_V2_NAVIGATION_KEY_VALUES`, #2966);
      *  - claude and Command Code, with `CLAUDE_NAVIGATION_KEY_VALUES` — the base
      *    pad plus `s`, the key claude's `/model` footer offers for "use this
      *    session only" while `Enter` on the same overlay rewrites the user's
@@ -611,8 +613,10 @@ class BaseCLITool {
      * Declare how this tool cycles its permission mode (Issue #2592).
      *
      * The default is `null` — "this tool has no mode on `shift+tab`" — and that is
-     * the answer for three of the eight: opencode (whose `BTab` switches AGENTS,
+     * the answer for four of the nine: opencode (whose `BTab` switches AGENTS,
      * and already has `OpencodeQuickKeys`' `agentPrev` button from #2046),
+     * OpenCode V2 (the same: `BTab` toggles Build ⇄ Plan on 2.0.18 and is its
+     * quick keys' `agentNext`, #2966),
      * vibe-local (measured: five presses, byte-identical frame) and gemini (its
      * own docs bind `app.cycleApprovalMode`, but sign-in refused the CLI and the
      * footer spelling was never measured — a button is a promise about what