commandmate 0.43.0 → 0.44.1

package/dist/lib/detection/status-reason.js

@@ -115,6 +115,23 @@ exports.STATUS_REASON = {
     OPENCODE_RESPONSE_COMPLETE: 'opencode_response_complete',
     INPUT_PROMPT: 'input_prompt',
     NO_RECENT_OUTPUT: 'no_recent_output',
+    /**
+     * Issue #3179: the agent's launch is still in progress.
+     *
+     * Published by `current-output-builder` and `worktree-status-helper` while
+     * `lib/session/session-starting-state` holds a record for the instance — from
+     * `beginAgentSession` until `startSession` returns or throws, bounded by the
+     * tool's readiness wait and released early by a dialog the launch does not
+     * answer. The frame underneath (a shell prompt and the launch line, or a trust
+     * dialog the launch is about to answer) is not read while it is up: the status
+     * is `running`, and `isUnclassifiedActive` / `isSelectionListActive` /
+     * `isPromptWaiting` are all false, so no pad, no answer sheet and no `wait`
+     * exit 10 is raised for a screen nobody has to drive.
+     *
+     * ADDITIVE in the sense {@link STATUS_REASON.EXITED} is: a reader that does not
+     * know the token sees a `running` session.
+     */
+    STARTING: 'starting',
     /**
      * Issue #2070: the tmux session is there, and the TOOL is not.
      *

package/dist/lib/security/pairing-code.d.ts

@@ -66,7 +66,8 @@ export interface PairingHandoff {
 export interface CreatedPairing {
     /**
      * Plaintext pairing code. NEVER persisted — the caller renders it as a QR
-     * code and drops it. Re-displaying it means running `remote` again.
+     * code and drops it. It cannot be displayed again; `remote pair` mints a
+     * replacement instead (Issue #3127, `src/cli/utils/remote-pairing.ts`).
      */
     code: string;
     /** Plaintext long-lived token (also written to the handoff file). */

package/dist/lib/security/pairing-code.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pairing-code.d.ts","sourceRoot":"","sources":["../../../src/lib/security/pairing-code.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAUH,wEAAwE;AACxE,eAAO,MAAM,oBAAoB,2BAA2B,CAAC;AAE7D,oFAAoF;AACpF,eAAO,MAAM,iBAAiB,wBAAwB,CAAC;AAEvD,qEAAqE;AACrE,eAAO,MAAM,iBAAiB,MAAQ,CAAC;AAEvC;;;GAGG;AACH,eAAO,MAAM,yBAAyB,qCAAqC,CAAC;AAE5E,iDAAiD;AACjD,eAAO,MAAM,iBAAiB,MAAM,CAAC;AAErC,+DAA+D;AAC/D,eAAO,MAAM,mBAAmB,KAAK,CAAC;AAEtC,wDAAwD;AACxD,eAAO,MAAM,sBAAsB,QAAiB,CAAC;AAErD;;;GAGG;AACH,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAE3C,yCAAyC;AACzC,MAAM,WAAW,cAAc;IAC7B,kFAAkF;IAClF,WAAW,EAAE,MAAM,CAAC;IACpB,6CAA6C;IAC7C,SAAS,EAAE,MAAM,CAAC;IAClB,qEAAqE;IACrE,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,qFAAqF;AACrF,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC;IACb,qEAAqE;IACrE,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,2BAA2B;IAC1C,qDAAqD;IACrD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kDAAkD;IAClD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,6CAA6C;IAC7C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kCAAkC;IAClC,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAmB3D;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAKzD;AAED;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAG5C;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,IAAI,MAAM,CAElD;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,IAAI,MAAM,GAAG,IAAI,CAGzD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI,CASnF;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,GAAE,2BAAgC,GAAG,cAAc,CAU9F;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CA0B1E;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAM5D;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,cAAc,EAAE,GAAG,GAAE,MAAmB,GAAG,OAAO,CAE3F;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAgB5E"}
+{"version":3,"file":"pairing-code.d.ts","sourceRoot":"","sources":["../../../src/lib/security/pairing-code.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAUH,wEAAwE;AACxE,eAAO,MAAM,oBAAoB,2BAA2B,CAAC;AAE7D,oFAAoF;AACpF,eAAO,MAAM,iBAAiB,wBAAwB,CAAC;AAEvD,qEAAqE;AACrE,eAAO,MAAM,iBAAiB,MAAQ,CAAC;AAEvC;;;GAGG;AACH,eAAO,MAAM,yBAAyB,qCAAqC,CAAC;AAE5E,iDAAiD;AACjD,eAAO,MAAM,iBAAiB,MAAM,CAAC;AAErC,+DAA+D;AAC/D,eAAO,MAAM,mBAAmB,KAAK,CAAC;AAEtC,wDAAwD;AACxD,eAAO,MAAM,sBAAsB,QAAiB,CAAC;AAErD;;;GAGG;AACH,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAE3C,yCAAyC;AACzC,MAAM,WAAW,cAAc;IAC7B,kFAAkF;IAClF,WAAW,EAAE,MAAM,CAAC;IACpB,6CAA6C;IAC7C,SAAS,EAAE,MAAM,CAAC;IAClB,qEAAqE;IACrE,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,qFAAqF;AACrF,MAAM,WAAW,cAAc;IAC7B;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IACb,qEAAqE;IACrE,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,2BAA2B;IAC1C,qDAAqD;IACrD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kDAAkD;IAClD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,6CAA6C;IAC7C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kCAAkC;IAClC,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAmB3D;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAKzD;AAED;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAG5C;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,IAAI,MAAM,CAElD;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,IAAI,MAAM,GAAG,IAAI,CAGzD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI,CASnF;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,GAAE,2BAAgC,GAAG,cAAc,CAU9F;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CA0B1E;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAM5D;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,cAAc,EAAE,GAAG,GAAE,MAAmB,GAAG,OAAO,CAE3F;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAgB5E"}

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

@@ -65,6 +65,10 @@
         "systemMessage": "System Message",
         "systemMessageLabel": "System message",
         "openFile": "Open file: {path}",
+        "imageLoading": "Loading image…",
+        "imageUnavailable": "Image unavailable",
+        "openImage": "Open image: {path}",
+        "videoLabel": "Video: {path}",
         "conversationLabel": "Conversation: {preview}",
         "filePathMissing": "That path is not in this worktree"
     },
@@ -406,7 +410,12 @@
             "stats": "Show usage statistics",
             "thinking": "Switch the model variant",
             "web": "Pair another device with this OpenCode",
-            "worktrees": "Manage workspaces"
+            "worktrees": "Manage workspaces",
+            "artifact-capabilities": "Load the reference for what a published artifact can use, such as connectors and file downloads",
+            "artifact-diagramming": "Load guidance for drawing diagrams in artifacts that stay legible in light and dark themes",
+            "claude-in-chrome": "Have Claude carry out a task in your browser through Claude in Chrome",
+            "plugin-authoring": "Load the reference Claude uses to write a mod",
+            "slides": "Make a new Claude Slides presentation from your brief"
         }
     },
     "session": {
@@ -491,7 +500,10 @@
         "buttonAriaLabel": "Update CommandMate to v{version}",
         "buttonReleaseAriaLabel": "Open the v{version} release page",
         "buttonUpdating": "Updating…",
-        "statusDialogTitle": "Update status"
+        "statusDialogTitle": "Update status",
+        "pendingLabel": "v{version} coming soon",
+        "pendingDescription": "v{version} is not on npm yet. You can update once it is published there.",
+        "notYetPublished": "The new version is not on npm yet. Please try again in a few minutes."
     },
     "terminal": {
         "historyLabel": "History",
@@ -549,6 +561,13 @@
         "dialogCardLabel": "Terminal screen",
         "unreadableHint": "Answer with the number shown on screen (1-9) or y/n. Enter confirms whatever the CLI has highlighted."
     },
+    "sessionStarting": {
+        "title": "Starting {agent}…",
+        "titleWithElapsed": "Starting {agent}… {elapsed}",
+        "hint": "The terminal will appear once the agent is ready.",
+        "showTerminal": "Show terminal",
+        "label": "Agent starting"
+    },
     "chatTranscript": {
         "regionLabel": "Chat transcript",
         "loading": "Loading messages",
@@ -1097,11 +1116,26 @@
         "close": "Close (Esc)",
         "closeAria": "Close this screen (Esc)"
     },
-    "planApproveKeys": {
-        "toolbarLabel": "Approve this plan",
-        "approve": "Approve plan (Ctrl+A)",
-        "approveAria": "Approve this plan and run it (Ctrl+A)",
-        "note": "Approving runs the plan. Use Esc above to cancel instead."
+    "planReview": {
+        "groupLabel": "Plan review",
+        "commentLabel": "Comment on the plan",
+        "commentPlaceholder": "What should change? (Add comment → Submit review)",
+        "comment": "Add comment",
+        "submit": "Submit review (Ctrl+R)",
+        "approve": "Approve (Ctrl+A)",
+        "cancel": "Cancel (Esc)",
+        "approveConfirmLabel": "Confirm plan approval",
+        "approveConfirmText": "Approving runs the plan. Approve it?",
+        "approveConfirmYes": "Approve and run",
+        "approveConfirmNo": "Not now",
+        "refusal": {
+            "ambiguousAnswer": "Nothing was sent: a bare number or yes / no is not an answer here — the plan review has no numbered options. Approve or cancel, or rephrase it as a comment.",
+            "busy": "Nothing was sent: the plan review's focus is not on the plan. Move it back into the plan in the terminal, then retry.",
+            "nothingToSubmit": "There is no comment to submit. Add a comment first.",
+            "invalidRequest": "That action does not fit this screen. Nothing was sent.",
+            "notActive": "Nothing was sent: no plan review is on screen.",
+            "generic": "Could not send."
+        }
     },
     "selectionKeys": {
         "numbersToolbarLabel": "Option number keys",

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

@@ -65,6 +65,10 @@
         "systemMessage": "システムメッセージ",
         "systemMessageLabel": "システムメッセージ",
         "openFile": "ファイルを開く: {path}",
+        "imageLoading": "画像を読み込み中…",
+        "imageUnavailable": "画像を表示できません",
+        "openImage": "画像を開く: {path}",
+        "videoLabel": "動画: {path}",
         "conversationLabel": "会話: {preview}",
         "filePathMissing": "このパスは worktree にありません"
     },
@@ -406,7 +410,12 @@
             "stats": "使用量の統計を表示",
             "thinking": "モデルのバリアントを切り替え",
             "web": "この OpenCode に別のデバイスをペアリング",
-            "worktrees": "ワークスペースを管理"
+            "worktrees": "ワークスペースを管理",
+            "artifact-capabilities": "公開アーティファクトで使える機能（コネクタ・ファイルのダウンロードなど）のリファレンスを読み込み",
+            "artifact-diagramming": "アーティファクトにライト・ダーク両方で読める図を描くためのガイダンスを読み込み",
+            "claude-in-chrome": "Claude in Chrome 経由でブラウザ上の作業を Claude に依頼",
+            "plugin-authoring": "mod を書くときに Claude が使うリファレンスを読み込み",
+            "slides": "指示から Claude Slides のプレゼンテーションを作成"
         }
     },
     "session": {
@@ -491,7 +500,10 @@
         "buttonAriaLabel": "CommandMate を v{version} にアップデート",
         "buttonReleaseAriaLabel": "v{version} のリリースページを開く",
         "buttonUpdating": "更新中…",
-        "statusDialogTitle": "アップデートの状態"
+        "statusDialogTitle": "アップデートの状態",
+        "pendingLabel": "v{version} 公開準備中",
+        "pendingDescription": "v{version} は npm への反映待ちです。反映されると更新できるようになります。",
+        "notYetPublished": "npm への反映待ちです。しばらくしてから再度お試しください。"
     },
     "terminal": {
         "historyLabel": "履歴",
@@ -549,6 +561,13 @@
         "dialogCardLabel": "ターミナルの画面",
         "unreadableHint": "画面に出ている番号（1〜9）か y／n で答えてください。Enter は選択中の項目をそのまま確定します。"
     },
+    "sessionStarting": {
+        "title": "{agent} を起動中…",
+        "titleWithElapsed": "{agent} を起動中… {elapsed}",
+        "hint": "起動が終わるとターミナルを表示します。",
+        "showTerminal": "ターミナルを見る",
+        "label": "エージェントの起動中"
+    },
     "chatTranscript": {
         "regionLabel": "チャット履歴",
         "loading": "メッセージを読み込み中",
@@ -1097,11 +1116,26 @@
         "close": "閉じる (Esc)",
         "closeAria": "この画面を閉じる (Esc)"
     },
-    "planApproveKeys": {
-        "toolbarLabel": "このプランを承認",
-        "approve": "プランを承認 (Ctrl+A)",
-        "approveAria": "このプランを承認して実行する (Ctrl+A)",
-        "note": "承認するとプランが実行されます。やめる場合は上の Esc を押してください。"
+    "planReview": {
+        "groupLabel": "プランのレビュー",
+        "commentLabel": "プランへのコメント",
+        "commentPlaceholder": "直してほしい点を書く（コメントを追加 → レビューを送信）",
+        "comment": "コメントを追加",
+        "submit": "レビューを送信 (Ctrl+R)",
+        "approve": "承認 (Ctrl+A)",
+        "cancel": "取り消し (Esc)",
+        "approveConfirmLabel": "プランの承認の確認",
+        "approveConfirmText": "承認するとプランが実行されます。承認しますか？",
+        "approveConfirmYes": "承認して実行",
+        "approveConfirmNo": "やめる",
+        "refusal": {
+            "ambiguousAnswer": "番号や yes / no だけの入力は送っていません。計画には番号付きの選択肢がありません。承認か取り消しを使うか、コメントとして書き直してください。",
+            "busy": "レビュー画面のフォーカスが本文以外にあるため、何も送っていません。ターミナルで本文にフォーカスを戻してから、もう一度送ってください。",
+            "nothingToSubmit": "送るコメントがありません。先にコメントを追加してください。",
+            "invalidRequest": "この画面では送れない操作です。何も送っていません。",
+            "notActive": "計画のレビュー画面が表示されていないため、何も送っていません。",
+            "generic": "送信できませんでした。"
+        }
     },
     "selectionKeys": {
         "numbersToolbarLabel": "選択肢の番号キー",

package/dist/server/src/config/image-extensions.js

@@ -228,6 +228,7 @@ function validateImageContent(extension, buffer) {
         return {
             valid: false,
             error: `File size exceeds ${exports.IMAGE_MAX_SIZE_BYTES / 1024 / 1024}MB limit`,
+            reason: 'too-large',
         };
     }
     const normalizedExt = normalizeExtension(extension);

package/dist/server/src/config/session-starting-config.js

@@ -0,0 +1,75 @@
+"use strict";
+/**
+ * How long a session may be shown as "starting" (Issue #3179).
+ *
+ * `lib/session/session-starting-state` records when an agent's launch began and
+ * clears the record when `BaseCLITool.startSession` returns or throws. These
+ * bounds are the escape hatches for the launches that do neither in time:
+ * several tools (antigravity, codex, gemini, copilot, Command Code) only LOG
+ * when their readiness wait runs out and carry on, so a launch that never
+ * became ready would otherwise be shown as starting for as long as the request
+ * lingered. Past the bound the screen falls back to what it showed before
+ * #3179 — the raw pane — so a human notices the stuck start.
+ *
+ * @module config/session-starting-config
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SESSION_STARTING_ELAPSED_THRESHOLD_MS = exports.SESSION_STARTING_PROMPT_GRACE_MS = exports.SESSION_STARTING_DEFAULT_WAIT_MS = exports.SESSION_STARTING_GRACE_MS = void 0;
+exports.getSessionStartingMaxMs = getSessionStartingMaxMs;
+exports.getSessionStartingMaxMsAcrossTools = getSessionStartingMaxMsAcrossTools;
+const types_1 = require("../lib/cli-tools/types");
+/**
+ * Slack added on top of a tool's own readiness wait, so the starting display
+ * outlives the wait it describes by a little rather than ending a beat before
+ * the launch reports.
+ */
+exports.SESSION_STARTING_GRACE_MS = 5_000;
+/**
+ * The default readiness wait a launch performs (antigravity / codex / gemini /
+ * copilot / opencode / Command Code are all measured at about 30 s, counting
+ * their initial settle delay and their prompt wait).
+ */
+exports.SESSION_STARTING_DEFAULT_WAIT_MS = 30_000;
+/**
+ * Per-tool readiness waits that differ from the default. Claude waits for its
+ * composer for up to `CLAUDE_INIT_TIMEOUT` (60 s); the literal is restated here
+ * rather than imported so this config module stays free of the session graph.
+ */
+const SESSION_STARTING_WAIT_MS = {
+    claude: 60_000,
+};
+/**
+ * The longest a launch of `cliToolId` is shown as starting, in ms.
+ *
+ * @param cliToolId - The tool being launched
+ * @returns Its readiness wait plus {@link SESSION_STARTING_GRACE_MS}
+ */
+function getSessionStartingMaxMs(cliToolId) {
+    return (SESSION_STARTING_WAIT_MS[cliToolId] ?? exports.SESSION_STARTING_DEFAULT_WAIT_MS)
+        + exports.SESSION_STARTING_GRACE_MS;
+}
+/**
+ * The longest {@link getSessionStartingMaxMs} over every tool, in ms.
+ *
+ * A send to a worktree with no session launches the agent inside the request,
+ * so the client must wait at least this long (Issue #3194).
+ */
+function getSessionStartingMaxMsAcrossTools() {
+    return Math.max(...types_1.CLI_TOOL_IDS.map(getSessionStartingMaxMs));
+}
+/**
+ * How long a dialog may stay on screen during a launch before it is treated as
+ * one the server will NOT answer (a login, an unknown dialog) and the starting
+ * display gives way to the raw pane.
+ *
+ * The dialogs the launch answers itself — the folder-trust screens of
+ * antigravity / codex / copilot / claude — are answered within one poll of the
+ * launch's readiness loop (≤ 1 s) plus the settle wait after the key, so they
+ * never reach this bound.
+ */
+exports.SESSION_STARTING_PROMPT_GRACE_MS = 5_000;
+/**
+ * After how long the client starts printing the elapsed time next to
+ * "<agent> を起動中…".
+ */
+exports.SESSION_STARTING_ELAPSED_THRESHOLD_MS = 5_000;

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

@@ -64,6 +64,7 @@ const response_checker_1 = require("./polling/response-checker");
 const antigravity_permission_receipts_1 = require("./polling/antigravity-permission-receipts");
 const auto_yes_resolver_1 = require("./polling/auto-yes-resolver");
 const auto_yes_policy_1 = require("./polling/auto-yes-policy");
+const detect_1 = require("./detection/tools/codex/detect");
 const auto_yes_suppression_state_1 = require("./polling/auto-yes-suppression-state");
 const auto_yes_dialog_gate_1 = require("./polling/auto-yes-dialog-gate");
 const task_transition_service_1 = require("./tasks/task-transition-service");
@@ -490,6 +491,27 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
             });
             return 'no_answer';
         }
+        // 3.2. Issue #3062: codex's `/model` picker (both stages) is not ours to
+        // answer. A digit there is an immediate decision, so the base rules'
+        // default would choose the model and effort for the operator. Judged by the
+        // picker's own footer, not by `kind: picker`, which the hooks screens share.
+        // The tool's `detectPrompt` still reports the prompt, so `/prompt-response`
+        // (the human's answer) is unaffected. Reuses `unclassified-frame`: the tool
+        // recognised the frame and deliberately declined it.
+        if (cliToolId === 'codex' && (0, detect_1.isCodexModelPickerFrame)(cleanOutput)) {
+            (0, auto_yes_suppression_state_1.recordPolicySuppression)(worktreeId, cliToolId, instanceId, {
+                reason: 'unclassified-frame',
+                mode: null,
+                promptType: promptDetection.promptData.type,
+            });
+            warnOncePerFrame(pollerState, `${frameKey}\u0000codex-model-picker`, 'poller:auto-yes-skipped-model-picker', {
+                worktreeId,
+                cliToolId,
+                instanceId,
+                promptType: promptDetection.promptData.type,
+            });
+            return 'no_answer';
+        }
         // 3.5. Issue #1928 (§4 D1 decision 4): the generic numbered-list inference is
         // not enough to send an answer. The detection above judges the ROWS, and the
         // rows of an agent's own reply can be indistinguishable from a dialog's --

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

@@ -26,6 +26,7 @@ const agent_session_lifecycle_1 = require("../../lib/session/agent-session-lifec
 const logger_1 = require("../../lib/logger");
 const cli_tool_timing_config_1 = require("../../config/cli-tool-timing-config");
 const install_hints_1 = require("./install-hints");
+const launch_screen_1 = require("../../lib/session/launch-screen");
 const logger = (0, logger_1.createLogger)('cli-tools/antigravity');
 /**
  * Extract error message from unknown error type (DRY).
@@ -254,7 +255,7 @@ class AntigravityTool extends base_1.BaseCLITool {
                 worktreePath,
             });
             const launchCommand = model ? `${base} --model ${shellSingleQuote(model)}` : base;
-            await (0, tmux_1.sendKeys)(sessionName, launchCommand, true);
+            await (0, tmux_1.sendKeys)(sessionName, (0, launch_screen_1.withLaunchScreenCleared)(launchCommand), true);
             // Wait for agy to initialize
             await new Promise((resolve) => setTimeout(resolve, ANTIGRAVITY_INIT_WAIT_MS));
             // Poll until the interactive prompt is ready (handles the trust dialog)

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

@@ -28,6 +28,7 @@ const logger_1 = require("../logger");
 const terminal_keys_1 = require("../../types/terminal-keys");
 const cli_tool_timing_config_1 = require("../../config/cli-tool-timing-config");
 const tmux_pane_config_1 = require("../../config/tmux-pane-config");
+const session_starting_state_1 = require("../session/session-starting-state");
 const execAsync = (0, util_1.promisify)(child_process_1.exec);
 const logger = (0, logger_1.createLogger)('cli-tools/base');
 /**
@@ -213,8 +214,12 @@ class BaseCLITool {
      * @throws Whatever {@link launchSession} threw — unchanged, after reporting
      */
     async startSession(worktreeId, worktreePath, instanceId, model) {
+        // Issue #3195: this launch's "starting" record is written under this token
+        // (see `session-starting-state`), so the `finally` below clears this
+        // launch's record and never a later launch's of the same instance.
+        const startingToken = (0, session_starting_state_1.issueSessionStartingToken)();
         try {
-            await this.launchSession(worktreeId, worktreePath, instanceId, model);
+            await (0, session_starting_state_1.runWithSessionStartingToken)(startingToken, () => this.launchSession(worktreeId, worktreePath, instanceId, model));
         }
         catch (error) {
             // Issue #2429: a launch that threw is reported as a failed start and as
@@ -229,6 +234,15 @@ class BaseCLITool {
             }, error);
             throw error;
         }
+        finally {
+            // Issue #3179: the launch is over, returned or thrown, so the screen
+            // stops showing it as starting. `beginAgentSession` wrote the record on
+            // the creation path; a reused pane never had one, and this is a no-op for
+            // it. `relaunchIfToolExited` comes through here too. Issue #3195: only
+            // under this launch's token — a launch killed and started again has a
+            // newer record under this key, and it is not this launch's to end.
+            (0, session_starting_state_1.clearSessionStarting)(worktreeId, this.id, instanceId, startingToken);
+        }
         const adopted = this.takeAdoptionMark(worktreeId, instanceId);
         if (adopted !== null)
             await this.warnIfHookUrlIsStale(worktreeId, adopted, instanceId);

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

@@ -20,6 +20,7 @@ const hooks_config_1 = require("../../lib/hooks/sources/codex/hooks-config");
 const agent_session_lifecycle_1 = require("../../lib/session/agent-session-lifecycle");
 const cli_tool_timing_config_1 = require("../../config/cli-tool-timing-config");
 const install_hints_1 = require("./install-hints");
+const launch_screen_1 = require("../../lib/session/launch-screen");
 const logger = (0, logger_1.createLogger)('cli-tools/codex');
 /**
  * Extract error message from unknown error type (DRY)
@@ -268,11 +269,11 @@ class CodexTool extends base_1.BaseCLITool {
             // as the new one's.
             const relaunchIntoSamePane = async () => {
                 (0, agent_session_lifecycle_1.beginAgentSession)({ worktreeId, cliToolId: sources_1.CODEX_CLI_TOOL_ID, instanceId });
-                await (0, tmux_1.sendKeys)(sessionName, launchCommand, true);
+                await (0, tmux_1.sendKeys)(sessionName, (0, launch_screen_1.withLaunchScreenCleared)(launchCommand), true);
                 await new Promise((resolve) => setTimeout(resolve, CODEX_INIT_WAIT_MS));
             };
             // Start Codex CLI in interactive mode
-            await (0, tmux_1.sendKeys)(sessionName, launchCommand, true);
+            await (0, tmux_1.sendKeys)(sessionName, (0, launch_screen_1.withLaunchScreenCleared)(launchCommand), true);
             // Wait for Codex to initialize
             await new Promise((resolve) => setTimeout(resolve, CODEX_INIT_WAIT_MS));
             // Poll until Codex interactive prompt is ready

package/dist/server/src/lib/cli-tools/command-code-plan-review.js

@@ -0,0 +1,175 @@
+"use strict";
+/**
+ * Answering Command Code's plan review overlay from the CLI / API (Issue #3125).
+ *
+ * The overlay (`REVIEW` — `Approve ctrl+a` / `Cancel esc` / `type + enter to
+ * comment`) is not a dialog with options and not the composer, so neither
+ * `respond` (options) nor `send` (composer) could reach it. This module is the
+ * one place its keys are decided:
+ *
+ * | action    | keys                                   | allowed on phase              |
+ * |-----------|----------------------------------------|-------------------------------|
+ * | `comment` | `Enter`, the text (`-l`), `Enter`      | `body`                        |
+ * | `submit`  | [the comment keys], `C-r`              | `body` (needs ≥1 comment)     |
+ * | `approve` | `C-a` — or `Enter` on the radio        | `body`, `approve-choice`      |
+ * | `cancel`  | `Escape`                               | `body`, `approve-choice`      |
+ *
+ * Why the comment opens the box with `Enter` first instead of just typing: `?`
+ * `x` `!` are one-key quick comments on this screen (measured on 1.58.0), so a
+ * comment that begins with one of them would pin a canned sentence instead.
+ * An empty `Enter` with the cursor in the plan body only opens the box
+ * (measured, #2763 §1 問い 4), and inside the box every key is text.
+ *
+ * Everything else is refused with nothing sent:
+ *  - `action-focus`: `Enter` RUNS the focused action there (#2763 approved a
+ *    plan that way), and what the shortcuts and letters do with the focus on
+ *    the list was not measured;
+ *  - `comment-box`: someone is typing a comment in the pane, and `Escape` there
+ *    discards it rather than cancelling the review;
+ *  - `unknown`: a hint bar this module has not seen.
+ *
+ * Approval is only ever the explicit `approve` action. Nothing here is reached
+ * by Auto-Yes: the detector publishes this screen with `hasActivePrompt: false`.
+ *
+ * @module lib/cli-tools/command-code-plan-review
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PLAN_REVIEW_STEP_DELAY_MS = exports.PLAN_REVIEW_REFUSAL = exports.PLAN_REVIEW_ACTIONS = void 0;
+exports.isPlanReviewAction = isPlanReviewAction;
+exports.planCommandCodePlanReviewKeys = planCommandCodePlanReviewKeys;
+exports.sendCommandCodePlanReviewKeys = sendCommandCodePlanReviewKeys;
+const tmux_1 = require("../tmux/tmux");
+const tmux_capture_cache_1 = require("../tmux/tmux-capture-cache");
+exports.PLAN_REVIEW_ACTIONS = ['comment', 'submit', 'approve', 'cancel'];
+function isPlanReviewAction(value) {
+    return typeof value === 'string' && exports.PLAN_REVIEW_ACTIONS.includes(value);
+}
+/** Refusal reason codes. All of them mean "nothing was sent". */
+exports.PLAN_REVIEW_REFUSAL = {
+    /** The overlay is up, but its focus is somewhere these keys are unsafe. */
+    BUSY: 'plan_review_busy',
+    /** `submit` with no comment given and none pending. */
+    NOTHING_TO_SUBMIT: 'plan_review_nothing_to_submit',
+    /** A bare number / yes / no, which would otherwise become a comment. */
+    AMBIGUOUS_ANSWER: 'plan_review_ambiguous_answer',
+    /** The request does not fit this screen (no text for a comment, `--default`). */
+    INVALID_REQUEST: 'plan_review_invalid_request',
+};
+/**
+ * A comment the caller did not label as one, that is really an answer meant
+ * for an options dialog. Typed as a comment it would land on the plan.
+ */
+const DIALOG_ANSWER_LIKE = /^(?:\d+(?:\s*,\s*\d+)*|y|yes|n|no)$/i;
+/** One line: a newline inside the box would pin the comment half-typed. */
+function normalizeComment(text) {
+    return text.replace(/\s*[\r\n]+\s*/g, ' ').trim();
+}
+const PHASE_REFUSALS = {
+    'action-focus': 'The plan review has its focus on the action list (`↑/↓ choose · enter to run`), where Enter runs the ' +
+        'focused action, so no key was sent. Move the focus back into the plan (↑) in the terminal, then retry.',
+    'comment-box': 'A comment is being typed in the plan review (`enter to pin · esc discard`), so no key was sent. ' +
+        'Pin or discard it in the terminal, then retry.',
+    unknown: 'The plan review is up, but its hint bar is not one this version knows, so no key was sent. ' +
+        'Answer it in the terminal.',
+};
+/**
+ * Decide the keys for a request against the screen as it is now. Pure.
+ *
+ * @param state - `readCommandCodePlanReviewState` of the frame about to be answered
+ * @param request - what the caller asked for
+ */
+function planCommandCodePlanReviewKeys(state, request) {
+    const comment = request.text === undefined ? '' : normalizeComment(request.text);
+    const action = request.action ?? 'comment';
+    if (request.useDefault) {
+        return {
+            ok: false,
+            reason: exports.PLAN_REVIEW_REFUSAL.INVALID_REQUEST,
+            message: 'The plan review has no default option. Comment with text, or choose ' +
+                '--plan-review submit | approve | cancel.',
+        };
+    }
+    if ((action === 'approve' || action === 'cancel') && comment) {
+        return {
+            ok: false,
+            reason: exports.PLAN_REVIEW_REFUSAL.INVALID_REQUEST,
+            message: `--plan-review ${action} takes no text. Comment first, then ${action}.`,
+        };
+    }
+    if (action === 'comment' && !comment) {
+        return {
+            ok: false,
+            reason: exports.PLAN_REVIEW_REFUSAL.INVALID_REQUEST,
+            message: 'A plan review comment needs text.',
+        };
+    }
+    if (request.action === undefined && DIALOG_ANSWER_LIKE.test(comment)) {
+        return {
+            ok: false,
+            reason: exports.PLAN_REVIEW_REFUSAL.AMBIGUOUS_ANSWER,
+            message: `The plan review has no numbered options, and "${comment}" would be pinned to the plan as a ` +
+                'comment, so no key was sent. Approve or cancel with --plan-review approve | cancel; to really ' +
+                'comment this text, add --plan-review comment.',
+        };
+    }
+    if (state.phase === 'approve-choice') {
+        // The radio `ctrl+a` opens when comments are pending (1.58.0): `enter
+        // confirm · esc back`. Enter confirms whichever side is `(•)`.
+        if (action === 'approve')
+            return { ok: true, action, steps: [{ kind: 'key', key: 'Enter' }], comment: null };
+        if (action === 'cancel')
+            return { ok: true, action, steps: [{ kind: 'key', key: 'Escape' }], comment: null };
+        return {
+            ok: false,
+            reason: exports.PLAN_REVIEW_REFUSAL.BUSY,
+            message: 'The plan review is asking how to approve (`←/→ choose · enter confirm · esc back`), so no key was ' +
+                'sent. Confirm with --plan-review approve, or go back with --plan-review cancel.',
+        };
+    }
+    if (state.phase !== 'body') {
+        return { ok: false, reason: exports.PLAN_REVIEW_REFUSAL.BUSY, message: PHASE_REFUSALS[state.phase] };
+    }
+    const commentSteps = comment
+        ? [{ kind: 'key', key: 'Enter' }, { kind: 'text', text: comment }, { kind: 'key', key: 'Enter' }]
+        : [];
+    switch (action) {
+        case 'comment':
+            return { ok: true, action, steps: commentSteps, comment };
+        case 'submit':
+            if (!comment && state.pendingComments === 0) {
+                return {
+                    ok: false,
+                    reason: exports.PLAN_REVIEW_REFUSAL.NOTHING_TO_SUBMIT,
+                    message: 'The plan review has no pending comment to submit, so no key was sent. Give the comment text ' +
+                        'with --plan-review submit, or approve / cancel the plan.',
+                };
+            }
+            return { ok: true, action, steps: [...commentSteps, { kind: 'key', key: 'C-r' }], comment: comment || null };
+        case 'approve':
+            return { ok: true, action, steps: [{ kind: 'key', key: 'C-a' }], comment: null };
+        case 'cancel':
+            return { ok: true, action, steps: [{ kind: 'key', key: 'Escape' }], comment: null };
+    }
+}
+/** Pause between steps, so the TUI handles each one as its own input event. */
+exports.PLAN_REVIEW_STEP_DELAY_MS = 300;
+/**
+ * Send the planned steps, one tmux invocation each.
+ *
+ * Key steps (including `C-r`) go through `sendSpecialKeys`; the comment text
+ * goes through `-l` so it is never resolved as a key name.
+ */
+async function sendCommandCodePlanReviewKeys(sessionName, steps, sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms))) {
+    for (let i = 0; i < steps.length; i++) {
+        const step = steps[i];
+        if (step.kind === 'text') {
+            await (0, tmux_1.sendKeys)(sessionName, step.text, false, { literal: true });
+        }
+        else {
+            await (0, tmux_1.sendSpecialKeys)(sessionName, [step.key]);
+        }
+        if (i < steps.length - 1)
+            await sleep(exports.PLAN_REVIEW_STEP_DELAY_MS);
+    }
+    (0, tmux_capture_cache_1.invalidateCache)(sessionName);
+}