commandmate 0.39.1 → 0.40.0

package/dist/server/src/lib/tmux/tmux.js

@@ -4,7 +4,7 @@
  * Provides functions to manage tmux sessions for Claude CLI integration
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.REPAINT_INVALIDATE_DELAY_MS = exports.NAVIGATION_KEY_VALUES = exports.SPECIAL_KEY_VALUES = void 0;
+exports.DIRECT_INPUT_TEXT_CHUNK_BYTES = exports.REPAINT_INVALIDATE_DELAY_MS = exports.NAVIGATION_KEY_VALUES = exports.SPECIAL_KEY_VALUES = void 0;
 exports.exactTarget = exactTarget;
 exports.reconcileSessionGeometry = reconcileSessionGeometry;
 exports.isTmuxAvailable = isTmuxAvailable;
@@ -25,6 +25,7 @@ exports.clearInputLine = clearInputLine;
 exports.clearComposerLine = clearComposerLine;
 exports.isAllowedSpecialKey = isAllowedSpecialKey;
 exports.sendSpecialKeysAndInvalidate = sendSpecialKeysAndInvalidate;
+exports.sendDirectInputAndInvalidate = sendDirectInputAndInvalidate;
 const child_process_1 = require("child_process");
 const util_1 = require("util");
 const tmux_capture_cache_1 = require("./tmux-capture-cache");
@@ -34,6 +35,7 @@ const tmux_pane_config_1 = require("../../config/tmux-pane-config");
 const logger_1 = require("../../lib/logger");
 const terminal_keys_1 = require("../../types/terminal-keys");
 Object.defineProperty(exports, "NAVIGATION_KEY_VALUES", { enumerable: true, get: function () { return terminal_keys_1.NAVIGATION_KEY_VALUES; } });
+const direct_input_1 = require("../../types/direct-input");
 const key_sequence_1 = require("./key-sequence");
 const execFileAsync = (0, util_1.promisify)(child_process_1.execFile);
 const logger = (0, logger_1.createLogger)('tmux');
@@ -381,11 +383,17 @@ async function sendKeys(sessionName, keys, sendEnter = true, options) {
     }
     // execFile() passes arguments directly without shell interpretation,
     // so no shell-level escaping is needed
+    //
+    // Issue #2769: tmux is NOT a shell, but it does read each argument, and a `;`
+    // at the end of one is its command separator. Unescaped, `go;` + `C-m` makes
+    // tmux run `send-keys go` and then a command called `C-m` — which fails, so
+    // the whole call throws and nothing reaches the pane.
+    const legacyKeys = (0, key_sequence_1.escapeTrailingSemicolon)(keys);
     const args = options?.literal
         ? (0, key_sequence_1.keySequenceArgs)(exactTarget(sessionName), { kind: 'literal', text: keys })
         : sendEnter
-            ? ['send-keys', '-t', exactTarget(sessionName), keys, 'C-m']
-            : ['send-keys', '-t', exactTarget(sessionName), keys];
+            ? ['send-keys', '-t', exactTarget(sessionName), legacyKeys, 'C-m']
+            : ['send-keys', '-t', exactTarget(sessionName), legacyKeys];
     try {
         await execFileAsync('tmux', args, { timeout: DEFAULT_TIMEOUT });
     }
@@ -494,6 +502,11 @@ const ALLOWED_SPECIAL_KEYS = new Set([
     // from user-controlled text.
     'C-x', 'C-p', 'C-t',
     'a', 'l', 'n', 't', 'm', 'g', 'u', 'r', 'c',
+    // Issue #2760: Command Code's plan review is approved with ctrl+a and with
+    // nothing else. Deliverable for every session, declared by Command Code alone
+    // (`COMMAND_CODE_NAVIGATION_KEY_VALUES`), so the route answers 400 for every
+    // other tool — the same arrangement as `s` above.
+    'C-a',
 ]);
 /**
  * Type guard for "sendSpecialKeys() will actually deliver this key" (Issue #2032).
@@ -890,3 +903,51 @@ async function sendSpecialKeysAndInvalidate(sessionName, keys) {
     (0, tmux_capture_cache_1.invalidateCache)(sessionName);
     scheduleRepaintInvalidation(sessionName);
 }
+/**
+ * Bytes of `text` per `send-keys -H` invocation (Issue #2765).
+ *
+ * `-H` takes one argv entry per byte, so a 4096-character paste sent as one
+ * command would be thousands of arguments. 256 keeps every invocation small and
+ * the number of invocations for the longest accepted paste in the dozens.
+ */
+exports.DIRECT_INPUT_TEXT_CHUNK_BYTES = 256;
+/**
+ * Deliver direct-input events to a pane, in order (Issue #2765).
+ *
+ * - a `key` event is a tmux key NAME from `DIRECT_INPUT_KEY_VALUES`, sent as
+ *   `send-keys -t <target> -- <name>` so tmux translates it for the pane's
+ *   current keypad / cursor mode;
+ * - a `text` event is sent as `send-keys -t <target> -H <hex bytes>`, NOT as
+ *   `-l`: measured on tmux 3.5a, `send-keys -l -- 'a;'` delivers `a` and drops
+ *   the trailing `;` (tmux takes it for a command separator), and `-l -- ';'`
+ *   delivers nothing at all. `-H` has no such rule and carries UTF-8 unchanged.
+ *
+ * Every event is re-validated here, so nothing unvalidated reaches `execFile`
+ * even if a caller forgot to: a key outside the vocabulary throws before any
+ * tmux process is started.
+ */
+async function sendDirectInputAndInvalidate(sessionName, events) {
+    for (const event of events) {
+        if (!(0, direct_input_1.isDirectInputEvent)(event)) {
+            throw new Error('Invalid direct input event');
+        }
+    }
+    const target = exactTarget(sessionName);
+    for (const event of events) {
+        if (event.type === 'key') {
+            await execFileAsync('tmux', ['send-keys', '-t', target, '--', event.key], {
+                timeout: DEFAULT_TIMEOUT,
+            });
+            continue;
+        }
+        const bytes = Buffer.from(event.text, 'utf8');
+        for (let offset = 0; offset < bytes.length; offset += exports.DIRECT_INPUT_TEXT_CHUNK_BYTES) {
+            const hex = Array.from(bytes.subarray(offset, offset + exports.DIRECT_INPUT_TEXT_CHUNK_BYTES), (byte) => byte.toString(16).padStart(2, '0'));
+            await execFileAsync('tmux', ['send-keys', '-t', target, '-H', ...hex], {
+                timeout: DEFAULT_TIMEOUT,
+            });
+        }
+    }
+    (0, tmux_capture_cache_1.invalidateCache)(sessionName);
+    scheduleRepaintInvalidation(sessionName);
+}

package/dist/server/src/types/direct-input.js

@@ -0,0 +1,113 @@
+"use strict";
+/**
+ * Direct terminal input vocabulary (Issue #2764).
+ *
+ * The "direct input" mode sends what the user types straight to an agent's tmux
+ * pane, without asking the detection layer what is on screen. It exists for the
+ * frames detection cannot read: an overlay that needs a key no button offers
+ * (Command Code's plan review wants `ctrl+a`) used to leave the session with no
+ * way forward from the browser.
+ *
+ * Values and pure functions only — no tmux, no DOM — so this module is safe to
+ * import from the server, the CLI and the browser bundle alike, the same
+ * property `terminal-keys.ts` keeps.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MAX_DIRECT_INPUT_TEXT_LENGTH = exports.MAX_DIRECT_INPUT_EVENTS = exports.DIRECT_INPUT_KEY_VALUES = exports.DIRECT_INPUT_CTRL_KEY_VALUES = exports.DIRECT_INPUT_NAMED_KEY_VALUES = void 0;
+exports.isDirectInputKey = isDirectInputKey;
+exports.isDirectInputEvent = isDirectInputEvent;
+exports.encodeKeyEvent = encodeKeyEvent;
+/** tmux key names direct input may send. Each one was measured on tmux 3.5a. */
+exports.DIRECT_INPUT_NAMED_KEY_VALUES = [
+    'Enter', 'Escape', 'Tab', 'BTab', 'BSpace', 'DC',
+    'Up', 'Down', 'Left', 'Right',
+    'Home', 'End', 'PageUp', 'PageDown',
+];
+/** `C-a` … `C-z`. tmux 3.5a delivers these as 0x01 … 0x1a. */
+exports.DIRECT_INPUT_CTRL_KEY_VALUES = [
+    'C-a', 'C-b', 'C-c', 'C-d', 'C-e', 'C-f', 'C-g', 'C-h', 'C-i', 'C-j', 'C-k', 'C-l', 'C-m',
+    'C-n', 'C-o', 'C-p', 'C-q', 'C-r', 'C-s', 'C-t', 'C-u', 'C-v', 'C-w', 'C-x', 'C-y', 'C-z',
+];
+exports.DIRECT_INPUT_KEY_VALUES = [
+    ...exports.DIRECT_INPUT_NAMED_KEY_VALUES,
+    ...exports.DIRECT_INPUT_CTRL_KEY_VALUES,
+];
+/** Most events one request may carry. */
+exports.MAX_DIRECT_INPUT_EVENTS = 32;
+/** Longest `text` one event may carry, in UTF-16 code units (a paste). */
+exports.MAX_DIRECT_INPUT_TEXT_LENGTH = 4096;
+function isDirectInputKey(value) {
+    return typeof value === 'string' && exports.DIRECT_INPUT_KEY_VALUES.includes(value);
+}
+function isDirectInputEvent(value) {
+    if (typeof value !== 'object' || value === null)
+        return false;
+    const event = value;
+    if (event.type === 'key')
+        return isDirectInputKey(event.key);
+    if (event.type === 'text') {
+        return (typeof event.text === 'string' &&
+            event.text.length > 0 &&
+            event.text.length <= exports.MAX_DIRECT_INPUT_TEXT_LENGTH);
+    }
+    return false;
+}
+/**
+ * The `keyCode` every browser gives a keydown the IME is handling. No physical
+ * key maps to it, so treating it as "not ours" costs ordinary typing nothing.
+ */
+const IME_PROCESS_KEY_CODE = 229;
+const NAMED_KEY_BY_DOM_KEY = {
+    Enter: 'Enter',
+    Escape: 'Escape',
+    Backspace: 'BSpace',
+    Delete: 'DC',
+    ArrowUp: 'Up',
+    ArrowDown: 'Down',
+    ArrowLeft: 'Left',
+    ArrowRight: 'Right',
+    Home: 'Home',
+    End: 'End',
+    PageUp: 'PageUp',
+    PageDown: 'PageDown',
+};
+/**
+ * Turn one keydown into the event to send, or `null` to leave it to the browser.
+ *
+ * `null` is an answer, not a failure: the caller must NOT `preventDefault()` on
+ * it, so Cmd+C / Cmd+V / Cmd+R, IME composition and function keys keep working.
+ *
+ * IME is checked twice because `isComposing` alone misses the key that matters
+ * most (Issue #2801). Safari before WebKit 310826@main fires the Enter that
+ * commits a composition AFTER `compositionend`, with `isComposing: false` — so
+ * the committed text would reach the pane followed by an Enter the user meant
+ * for the IME, submitting the composer or confirming a dialog's highlighted
+ * option. That keydown still carries `keyCode` 229, the same test
+ * `MessageInput` uses.
+ */
+function encodeKeyEvent(event) {
+    if (event.isComposing === true || event.keyCode === IME_PROCESS_KEY_CODE)
+        return null;
+    if (event.metaKey || event.altKey)
+        return null;
+    if (event.key === 'Tab') {
+        if (event.ctrlKey)
+            return null;
+        return { type: 'key', key: event.shiftKey ? 'BTab' : 'Tab' };
+    }
+    if (event.ctrlKey) {
+        if (event.key.length !== 1)
+            return null;
+        const candidate = `C-${event.key.toLowerCase()}`;
+        return isDirectInputKey(candidate) ? { type: 'key', key: candidate } : null;
+    }
+    const named = NAMED_KEY_BY_DOM_KEY[event.key];
+    if (named !== undefined)
+        return { type: 'key', key: named };
+    // A printable key: `KeyboardEvent.key` is the character itself, which is one
+    // code point (one or two UTF-16 units). `Dead`, `Shift`, `F5`, `Process`,
+    // `Unidentified` … are all longer than one code point and fall through.
+    if ([...event.key].length === 1)
+        return { type: 'text', text: event.key };
+    return null;
+}

package/dist/server/src/types/sidebar.js

@@ -5,9 +5,10 @@
  * Types for sidebar components and branch status display
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EXITED_STATUS_REASON = exports.deriveCliStatus = void 0;
+exports.UNCLASSIFIED_STATUS_WORD = exports.EXITED_STATUS_REASON = exports.isUnclassifiedCliStatus = exports.deriveCliStatus = void 0;
 exports.aggregateCliStatus = aggregateCliStatus;
 exports.formatCliStatusBreakdown = formatCliStatusBreakdown;
+exports.isBranchUnclassified = isBranchUnclassified;
 exports.deriveWorktreeWaitingDetail = deriveWorktreeWaitingDetail;
 exports.calculateHasUnread = calculateHasUnread;
 exports.toBranchItem = toBranchItem;
@@ -15,6 +16,7 @@ const types_1 = require("../lib/cli-tools/types");
 const default_agents_1 = require("../config/default-agents");
 const status_mapping_1 = require("../lib/session/status-mapping");
 Object.defineProperty(exports, "deriveCliStatus", { enumerable: true, get: function () { return status_mapping_1.deriveCliStatus; } });
+Object.defineProperty(exports, "isUnclassifiedCliStatus", { enumerable: true, get: function () { return status_mapping_1.isUnclassifiedCliStatus; } });
 const next_action_helper_1 = require("../lib/session/next-action-helper");
 /**
  * The `sessionStatusReason` token that means "the pane is there, the agent is
@@ -28,6 +30,18 @@ const next_action_helper_1 = require("../lib/session/next-action-helper");
  * restatement cannot drift.
  */
 exports.EXITED_STATUS_REASON = 'exited';
+/**
+ * The status word the breakdown tooltip prints for an instance whose frame no
+ * rule could classify (Issue #2775), in place of the `ready` its triple derives.
+ *
+ * Not a `BranchStatus` member, and deliberately so: a sixth value would ripple
+ * into the colours, the sort order (`STATUS_PRIORITY`) and the emphasis tiers,
+ * which is the cost #2070 declined for `exited` too. The instance keeps its
+ * `ready` in `cliStatus`; `unclassifiedInstanceIds` says which `ready` is a
+ * fallback. Raw English like the other words in the breakdown, which prints
+ * `BranchStatus` tokens verbatim.
+ */
+exports.UNCLASSIFIED_STATUS_WORD = 'unknown';
 /**
  * `BranchStatus` → `SessionStatus`, so the sidebar can reuse `getNextAction`
  * (Issue #1787) instead of growing a second next-action table.
@@ -93,19 +107,48 @@ function aggregateCliStatus(cliStatus) {
  *   because the word is user-facing and therefore localized, and this module
  *   runs on the server where `t()` cannot be called (the same rule
  *   `NEXT_ACTION_KEYS` follows).
+ * @param unclassifiedInstanceIds - Instances whose `ready` is a fallback for a
+ *   frame nothing could read (Issue #2775). Their status word becomes
+ *   {@link UNCLASSIFIED_STATUS_WORD} — `Codex: unknown` — because the `ready`
+ *   the entry carries is exactly what is not known. Only a `ready` entry is
+ *   rewritten, so a caller cannot relabel a real reading with it.
  * @returns Comma-separated "Label: status" string ('' when empty/absent)
  */
-function formatCliStatusBreakdown(cliStatus, labels, exitedSuffix) {
+function formatCliStatusBreakdown(cliStatus, labels, exitedSuffix, unclassifiedInstanceIds) {
     if (!cliStatus)
         return '';
     return Object.entries(cliStatus)
         .map(([instanceId, status]) => {
         const label = labels?.[instanceId] ?? (0, types_1.getCliToolDisplayNameSafe)(instanceId, instanceId);
         const suffix = exitedSuffix?.(instanceId);
-        return `${label}: ${status ?? 'idle'}${suffix ? ` (${suffix})` : ''}`;
+        const word = status === 'ready' && unclassifiedInstanceIds?.has(instanceId)
+            ? exports.UNCLASSIFIED_STATUS_WORD
+            : (status ?? 'idle');
+        return `${label}: ${word}${suffix ? ` (${suffix})` : ''}`;
     })
         .join(', ');
 }
+/**
+ * Whether the sidebar's ONE aggregated dot should read "cannot tell"
+ * (Issue #2775).
+ *
+ * True when the aggregate is `ready` and at least one of the instances that
+ * made it `ready` is only `ready` because its frame could not be read. The
+ * precedence this gives is waiting > running/generating > cannot-tell > ready
+ * > idle: a reading of work in progress outranks a blind spot, but a blind spot
+ * outranks a sibling that is merely idle — the unreadable pane is the one a
+ * human should look at, and it may well be hiding a dialog.
+ *
+ * @param cliStatus - Per-instance status map (`SidebarBranchItem.cliStatus`)
+ * @param unclassifiedInstanceIds - `SidebarBranchItem.unclassifiedInstanceIds`
+ */
+function isBranchUnclassified(cliStatus, unclassifiedInstanceIds) {
+    if (!cliStatus || !unclassifiedInstanceIds || unclassifiedInstanceIds.length === 0)
+        return false;
+    if (aggregateCliStatus(cliStatus) !== 'ready')
+        return false;
+    return unclassifiedInstanceIds.some((id) => cliStatus[id] === 'ready');
+}
 /** Precedence for folding per-instance kinds: answerable-now wins (Issue #1786). */
 const WAITING_KIND_PRECEDENCE = [
     'prompt',
@@ -200,6 +243,7 @@ function deriveSidebarCliStatus(worktree) {
     const cliStatus = {};
     const cliStatusLabels = {};
     const exitedInstanceIds = [];
+    const unclassifiedInstanceIds = [];
     const byInstance = worktree.sessionStatusByInstance;
     // Legacy fallback: no per-instance data → key by selectedAgents / CLI tool.
     if (!byInstance) {
@@ -210,8 +254,11 @@ function deriveSidebarCliStatus(worktree) {
             if (worktree.sessionStatusByCli?.[agent]?.sessionStatusReason === exports.EXITED_STATUS_REASON) {
                 exitedInstanceIds.push(agent);
             }
+            if ((0, status_mapping_1.isUnclassifiedCliStatus)(worktree.sessionStatusByCli?.[agent])) {
+                unclassifiedInstanceIds.push(agent);
+            }
         }
-        return { cliStatus, cliStatusLabels, exitedInstanceIds };
+        return { cliStatus, cliStatusLabels, exitedInstanceIds, unclassifiedInstanceIds };
     }
     // Configured roster: explicit agentInstances, else primaries per selectedAgents.
     const roster = worktree.agentInstances && worktree.agentInstances.length > 0
@@ -225,6 +272,9 @@ function deriveSidebarCliStatus(worktree) {
         if (byInstance[instance.id]?.sessionStatusReason === exports.EXITED_STATUS_REASON) {
             exitedInstanceIds.push(instance.id);
         }
+        if ((0, status_mapping_1.isUnclassifiedCliStatus)(byInstance[instance.id])) {
+            unclassifiedInstanceIds.push(instance.id);
+        }
     }
     // Surface any RUNNING instance missing from the roster (e.g. a `claude`
     // session started even though claude is not in selectedAgents) so the
@@ -237,8 +287,11 @@ function deriveSidebarCliStatus(worktree) {
             continue;
         cliStatus[instanceId] = derived;
         cliStatusLabels[instanceId] = labelForUnknownInstance(instanceId);
+        if ((0, status_mapping_1.isUnclassifiedCliStatus)(status)) {
+            unclassifiedInstanceIds.push(instanceId);
+        }
     }
-    return { cliStatus, cliStatusLabels, exitedInstanceIds };
+    return { cliStatus, cliStatusLabels, exitedInstanceIds, unclassifiedInstanceIds };
 }
 /**
  * Convert Worktree to SidebarBranchItem for display
@@ -261,11 +314,15 @@ function toBranchItem(worktree) {
     // agentInstances) so instances outside selectedAgents and alias instances are
     // reflected. Falls back to the legacy selectedAgents path when no per-instance
     // data is present.
-    const { cliStatus, cliStatusLabels, exitedInstanceIds } = deriveSidebarCliStatus(worktree);
+    const { cliStatus, cliStatusLabels, exitedInstanceIds, unclassifiedInstanceIds } = deriveSidebarCliStatus(worktree);
     // Issue #1787: the row's emphasis and its "what do I do next" label both come
     // from the AGGREGATED status, matching the single dot the row renders.
     const aggregated = aggregateCliStatus(cliStatus);
     const { waitingKind, awaitingInstruction } = deriveWorktreeWaitingDetail(worktree);
+    // Issue #2775: when that dot reads "cannot tell", so does the next action.
+    // `getNextAction` would answer "Send message" for the `ready` underneath,
+    // which is advice about a state nobody observed.
+    const unclassified = isBranchUnclassified(cliStatus, unclassifiedInstanceIds);
     return {
         id: worktree.id,
         name: worktree.name,
@@ -277,6 +334,7 @@ function toBranchItem(worktree) {
         cliStatus,
         cliStatusLabels,
         exitedInstanceIds,
+        unclassifiedInstanceIds,
         worktreePath: worktree.path,
         waitingKind,
         awaitingInstruction,
@@ -287,6 +345,8 @@ function toBranchItem(worktree) {
         // would be a bug the user cannot explain. `isStalled` is server-only
         // (`isWorktreeStalled` needs the detector's timers), so the sidebar never
         // claims "Check stalled".
-        nextActionKey: (0, next_action_helper_1.getNextAction)(BRANCH_STATUS_TO_SESSION_STATUS[aggregated], aggregated === 'waiting' ? 'approval' : null, false),
+        nextActionKey: unclassified
+            ? undefined
+            : (0, next_action_helper_1.getNextAction)(BRANCH_STATUS_TO_SESSION_STATUS[aggregated], aggregated === 'waiting' ? 'approval' : null, false),
     };
 }

package/dist/server/src/types/terminal-keys.js

@@ -19,7 +19,7 @@
  * Values only — no tmux process access — so this module is safe from any layer.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TERMINAL_KEY_VALUES = exports.OPENCODE_NAVIGATION_KEY_VALUES = exports.OPENCODE_DIRECT_KEY_VALUES = exports.OPENCODE_LEADER_CHORD_VALUES = exports.OPENCODE_LEADER_KEY = exports.SESSION_SCOPE_KEY_TOOL_IDS = exports.CLAUDE_NAVIGATION_KEY_VALUES = exports.NAVIGATION_KEY_VALUES = exports.SESSION_SCOPE_KEY = exports.ANSWER_KEY_VALUES = void 0;
+exports.TERMINAL_KEY_VALUES = exports.OPENCODE_NAVIGATION_KEY_VALUES = exports.OPENCODE_DIRECT_KEY_VALUES = exports.OPENCODE_LEADER_CHORD_VALUES = exports.OPENCODE_LEADER_KEY = exports.PLAN_APPROVE_KEY_TOOL_IDS = exports.COMMAND_CODE_NAVIGATION_KEY_VALUES = exports.PLAN_APPROVE_KEY = exports.SESSION_SCOPE_KEY_TOOL_IDS = exports.CLAUDE_NAVIGATION_KEY_VALUES = exports.NAVIGATION_KEY_VALUES = exports.SESSION_SCOPE_KEY = exports.ANSWER_KEY_VALUES = void 0;
 /**
  * The characters a dialog is answered WITH rather than navigated by (Issue #2254).
  *
@@ -141,6 +141,36 @@ exports.CLAUDE_NAVIGATION_KEY_VALUES = [
  * the "values only, safe from any layer" property its header depends on.
  */
 exports.SESSION_SCOPE_KEY_TOOL_IDS = ['claude', 'command-code'];
+/**
+ * The key that approves Command Code's plan review (Issue #2760).
+ *
+ * That overlay ends in `Approve ctrl+a   executes the plan` / `Cancel esc`, and
+ * ctrl+a is the ONLY way to approve it (measured on 1.58.0 at 200x1000). A tmux
+ * key name, delivered as 0x01.
+ *
+ * In neither the shared pad nor the claude-family pad: on claude's composer
+ * ctrl+a is "move to the start of the line", so there is no screen of claude's
+ * that a button for it could serve.
+ */
+exports.PLAN_APPROVE_KEY = 'C-a';
+/**
+ * What a Command Code pane may be sent: the claude-family pad plus
+ * {@link PLAN_APPROVE_KEY}.
+ *
+ * Returned by `CommandCodeTool.navigationKeys()`. `CLAUDE_NAVIGATION_KEY_VALUES`
+ * itself is untouched, so claude's vocabulary does not widen by a single key.
+ */
+exports.COMMAND_CODE_NAVIGATION_KEY_VALUES = [
+    ...exports.CLAUDE_NAVIGATION_KEY_VALUES,
+    exports.PLAN_APPROVE_KEY,
+];
+/**
+ * The tool ids whose `navigationKeys()` carry {@link PLAN_APPROVE_KEY}.
+ *
+ * Read by the chat surface, which cannot call `navigationKeys()` — the same
+ * reason and the same shape as {@link SESSION_SCOPE_KEY_TOOL_IDS}.
+ */
+exports.PLAN_APPROVE_KEY_TOOL_IDS = ['command-code'];
 // ---------------------------------------------------------------------------
 // Per-tool vocabularies (Issue #2046)
 // ---------------------------------------------------------------------------
@@ -226,6 +256,8 @@ exports.TERMINAL_KEY_VALUES = [
     ...exports.NAVIGATION_KEY_VALUES,
     // Issue #2297: claude / Command Code declare it; nothing else does.
     exports.SESSION_SCOPE_KEY,
+    // Issue #2760: Command Code alone declares it.
+    exports.PLAN_APPROVE_KEY,
     exports.OPENCODE_LEADER_KEY,
     ...exports.OPENCODE_DIRECT_KEY_VALUES,
     // Issue #2254: `n` is in the base pad now — see OPENCODE_CHORD_ONLY_VALUES.

package/dist/types/terminal-keys.d.ts

@@ -128,6 +128,33 @@ export declare const CLAUDE_NAVIGATION_KEY_VALUES: readonly ["Up", "Down", "Left
  * the "values only, safe from any layer" property its header depends on.
  */
 export declare const SESSION_SCOPE_KEY_TOOL_IDS: readonly ["claude", "command-code"];
+/**
+ * The key that approves Command Code's plan review (Issue #2760).
+ *
+ * That overlay ends in `Approve ctrl+a   executes the plan` / `Cancel esc`, and
+ * ctrl+a is the ONLY way to approve it (measured on 1.58.0 at 200x1000). A tmux
+ * key name, delivered as 0x01.
+ *
+ * In neither the shared pad nor the claude-family pad: on claude's composer
+ * ctrl+a is "move to the start of the line", so there is no screen of claude's
+ * that a button for it could serve.
+ */
+export declare const PLAN_APPROVE_KEY = "C-a";
+/**
+ * What a Command Code pane may be sent: the claude-family pad plus
+ * {@link PLAN_APPROVE_KEY}.
+ *
+ * Returned by `CommandCodeTool.navigationKeys()`. `CLAUDE_NAVIGATION_KEY_VALUES`
+ * itself is untouched, so claude's vocabulary does not widen by a single key.
+ */
+export declare const COMMAND_CODE_NAVIGATION_KEY_VALUES: readonly ["Up", "Down", "Left", "Right", "Enter", "Escape", "Tab", "BTab", "PageUp", "PageDown", "Home", "End", "q", "1", "2", "3", "4", "5", "6", "7", "8", "9", "y", "n", "s", "C-a"];
+/**
+ * The tool ids whose `navigationKeys()` carry {@link PLAN_APPROVE_KEY}.
+ *
+ * Read by the chat surface, which cannot call `navigationKeys()` — the same
+ * reason and the same shape as {@link SESSION_SCOPE_KEY_TOOL_IDS}.
+ */
+export declare const PLAN_APPROVE_KEY_TOOL_IDS: readonly ["command-code"];
 /**
  * opencode's leader prefix — the first half of a two-step chord.
  *
@@ -180,7 +207,7 @@ export declare const OPENCODE_NAVIGATION_KEY_VALUES: readonly ["Up", "Down", "Le
  * `tests/unit/cli-tools/navigation-keys-declaration-2046.test.ts` pin both
  * halves.
  */
-export declare const TERMINAL_KEY_VALUES: readonly ["Up", "Down", "Left", "Right", "Enter", "Escape", "Tab", "BTab", "PageUp", "PageDown", "Home", "End", "q", "1", "2", "3", "4", "5", "6", "7", "8", "9", "y", "n", "s", "C-x", "C-p", "C-t", "a", "l", "t", "m", "g", "u", "r", "c"];
+export declare const TERMINAL_KEY_VALUES: readonly ["Up", "Down", "Left", "Right", "Enter", "Escape", "Tab", "BTab", "PageUp", "PageDown", "Home", "End", "q", "1", "2", "3", "4", "5", "6", "7", "8", "9", "y", "n", "s", "C-a", "C-x", "C-p", "C-t", "a", "l", "t", "m", "g", "u", "r", "c"];
 /** Any key name a tool may declare in its {@link NavigationKeySpec}. */
 export type TerminalKey = typeof TERMINAL_KEY_VALUES[number];
 //# sourceMappingURL=terminal-keys.d.ts.map

package/dist/types/terminal-keys.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-keys.d.ts","sourceRoot":"","sources":["../../src/types/terminal-keys.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,eAAO,MAAM,iBAAiB,kEAGpB,CAAC;AAEX;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,eAAO,MAAM,iBAAiB,MAAM,CAAC;AAErC;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,6KAQxB,CAAC;AAEX;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,OAAO,qBAAqB,CAAC,MAAM,CAAC,CAAC;AAEjE;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,4BAA4B,kLAG/B,CAAC;AAEX;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,0BAA0B,qCAAsC,CAAC;AAM9E;;;;;;;;GAQG;AACH,eAAO,MAAM,mBAAmB,QAAQ,CAAC;AAEzC;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,4BAA4B,wDAE/B,CAAC;AAEX;;;;;;GAMG;AACH,eAAO,MAAM,0BAA0B,yBAA0B,CAAC;AAsBlE;;;GAGG;AACH,eAAO,MAAM,8BAA8B,0OAKjC,CAAC;AAEX;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,mBAAmB,+OAQtB,CAAC;AAEX,wEAAwE;AACxE,MAAM,MAAM,WAAW,GAAG,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAC"}
+{"version":3,"file":"terminal-keys.d.ts","sourceRoot":"","sources":["../../src/types/terminal-keys.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,eAAO,MAAM,iBAAiB,kEAGpB,CAAC;AAEX;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,eAAO,MAAM,iBAAiB,MAAM,CAAC;AAErC;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,6KAQxB,CAAC;AAEX;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,OAAO,qBAAqB,CAAC,MAAM,CAAC,CAAC;AAEjE;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,4BAA4B,kLAG/B,CAAC;AAEX;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,0BAA0B,qCAAsC,CAAC;AAE9E;;;;;;;;;;GAUG;AACH,eAAO,MAAM,gBAAgB,QAAQ,CAAC;AAEtC;;;;;;GAMG;AACH,eAAO,MAAM,kCAAkC,yLAGrC,CAAC;AAEX;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,2BAA4B,CAAC;AAMnE;;;;;;;;GAQG;AACH,eAAO,MAAM,mBAAmB,QAAQ,CAAC;AAEzC;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,4BAA4B,wDAE/B,CAAC;AAEX;;;;;;GAMG;AACH,eAAO,MAAM,0BAA0B,yBAA0B,CAAC;AAsBlE;;;GAGG;AACH,eAAO,MAAM,8BAA8B,0OAKjC,CAAC;AAEX;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,mBAAmB,sPAUtB,CAAC;AAEX,wEAAwE;AACxE,MAAM,MAAM,WAAW,GAAG,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAC"}

package/dist/types/terminal-keys.js

@@ -19,7 +19,7 @@
  * Values only — no tmux process access — so this module is safe from any layer.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TERMINAL_KEY_VALUES = exports.OPENCODE_NAVIGATION_KEY_VALUES = exports.OPENCODE_DIRECT_KEY_VALUES = exports.OPENCODE_LEADER_CHORD_VALUES = exports.OPENCODE_LEADER_KEY = exports.SESSION_SCOPE_KEY_TOOL_IDS = exports.CLAUDE_NAVIGATION_KEY_VALUES = exports.NAVIGATION_KEY_VALUES = exports.SESSION_SCOPE_KEY = exports.ANSWER_KEY_VALUES = void 0;
+exports.TERMINAL_KEY_VALUES = exports.OPENCODE_NAVIGATION_KEY_VALUES = exports.OPENCODE_DIRECT_KEY_VALUES = exports.OPENCODE_LEADER_CHORD_VALUES = exports.OPENCODE_LEADER_KEY = exports.PLAN_APPROVE_KEY_TOOL_IDS = exports.COMMAND_CODE_NAVIGATION_KEY_VALUES = exports.PLAN_APPROVE_KEY = exports.SESSION_SCOPE_KEY_TOOL_IDS = exports.CLAUDE_NAVIGATION_KEY_VALUES = exports.NAVIGATION_KEY_VALUES = exports.SESSION_SCOPE_KEY = exports.ANSWER_KEY_VALUES = void 0;
 /**
  * The characters a dialog is answered WITH rather than navigated by (Issue #2254).
  *
@@ -141,6 +141,36 @@ exports.CLAUDE_NAVIGATION_KEY_VALUES = [
  * the "values only, safe from any layer" property its header depends on.
  */
 exports.SESSION_SCOPE_KEY_TOOL_IDS = ['claude', 'command-code'];
+/**
+ * The key that approves Command Code's plan review (Issue #2760).
+ *
+ * That overlay ends in `Approve ctrl+a   executes the plan` / `Cancel esc`, and
+ * ctrl+a is the ONLY way to approve it (measured on 1.58.0 at 200x1000). A tmux
+ * key name, delivered as 0x01.
+ *
+ * In neither the shared pad nor the claude-family pad: on claude's composer
+ * ctrl+a is "move to the start of the line", so there is no screen of claude's
+ * that a button for it could serve.
+ */
+exports.PLAN_APPROVE_KEY = 'C-a';
+/**
+ * What a Command Code pane may be sent: the claude-family pad plus
+ * {@link PLAN_APPROVE_KEY}.
+ *
+ * Returned by `CommandCodeTool.navigationKeys()`. `CLAUDE_NAVIGATION_KEY_VALUES`
+ * itself is untouched, so claude's vocabulary does not widen by a single key.
+ */
+exports.COMMAND_CODE_NAVIGATION_KEY_VALUES = [
+    ...exports.CLAUDE_NAVIGATION_KEY_VALUES,
+    exports.PLAN_APPROVE_KEY,
+];
+/**
+ * The tool ids whose `navigationKeys()` carry {@link PLAN_APPROVE_KEY}.
+ *
+ * Read by the chat surface, which cannot call `navigationKeys()` — the same
+ * reason and the same shape as {@link SESSION_SCOPE_KEY_TOOL_IDS}.
+ */
+exports.PLAN_APPROVE_KEY_TOOL_IDS = ['command-code'];
 // ---------------------------------------------------------------------------
 // Per-tool vocabularies (Issue #2046)
 // ---------------------------------------------------------------------------
@@ -226,6 +256,8 @@ exports.TERMINAL_KEY_VALUES = [
     ...exports.NAVIGATION_KEY_VALUES,
     // Issue #2297: claude / Command Code declare it; nothing else does.
     exports.SESSION_SCOPE_KEY,
+    // Issue #2760: Command Code alone declares it.
+    exports.PLAN_APPROVE_KEY,
     exports.OPENCODE_LEADER_KEY,
     ...exports.OPENCODE_DIRECT_KEY_VALUES,
     // Issue #2254: `n` is in the base pad now — see OPENCODE_CHORD_ONLY_VALUES.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "commandmate",
-  "version": "0.39.1",
+  "version": "0.40.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",

package/release-notes/0.40.0.json

@@ -0,0 +1,69 @@
+{
+  "version": "0.40.0",
+  "date": "2026-09-21",
+  "highlight": {
+    "ja": "エージェントの画面を読み取れないときでも、キー入力をそのまま届けられる「直接入力」をパソコンとスマートフォンに追加しました。状態を判別できないエージェントは「不明」と表示されます。",
+    "en": "Added Direct input on computers and phones, which sends your keys straight to the agent even when its screen cannot be read. Agents whose state cannot be determined are now shown as Unknown."
+  },
+  "added": [
+    {
+      "ja": "パソコンの分割ペインに、キー入力をそのままエージェントへ届ける「直接入力」モードを追加しました。",
+      "en": "Added a Direct input mode to split panes on a computer that sends your keystrokes straight to the agent."
+    },
+    {
+      "ja": "スマートフォンのターミナルで、画面内キーボードを使った「直接入力」ができるようになりました。",
+      "en": "On phones, you can now use Direct input in the terminal with an on-screen keyboard."
+    },
+    {
+      "ja": "スマートフォンのチャット画面で、ツール表示の切り替えボタンが画面切り替えボタンの隣に出るようになりました。",
+      "en": "On phones, the tool activity toggle in chat now appears next to the view switcher."
+    },
+    {
+      "ja": "Command Code のプラン確認画面に、プランを承認するボタンを追加しました。",
+      "en": "Added a button to approve the plan on the Command Code plan review screen."
+    },
+    {
+      "ja": "Command Code の複数選択の質問に、画面から回答できるようになりました。",
+      "en": "You can now answer Command Code multiple-choice questions from the screen."
+    },
+    {
+      "ja": "CLI の send コマンドで、Claude のモデルを指定できるようになりました。",
+      "en": "The CLI send command can now choose the model for Claude."
+    }
+  ],
+  "improved": [],
+  "fixed": [
+    {
+      "ja": "状態を判別できないエージェントが「処理中」や「準備完了」と表示される問題を直し、「不明」と表示するようにしました。",
+      "en": "Agents whose state cannot be determined are no longer shown as busy or ready; they are now shown as Unknown."
+    },
+    {
+      "ja": "チャット画面でツール表示をオンにすると、最新の返答が画面の外に押し出される問題を直しました。",
+      "en": "Fixed the latest reply being pushed off screen in chat when tool activity is shown."
+    },
+    {
+      "ja": "スマートフォンのチャット画面で検索ができない問題を直しました。",
+      "en": "Fixed search not working in the chat view on phones."
+    },
+    {
+      "ja": "Codex の作業が終わった後も、処理中や選択待ちのまま表示される問題を直しました。",
+      "en": "Fixed Codex still appearing busy or waiting for a choice after it had finished."
+    },
+    {
+      "ja": "Command Code のプラン確認画面が処理中や完了と誤って表示される問題を直し、誤ってプランを実行しうる Enter ボタンを出さないようにしました。",
+      "en": "Fixed the Command Code plan review screen being shown as busy or finished, and removed the Enter button that could run the plan by mistake."
+    },
+    {
+      "ja": "Command Code で回答済みのタブがあると、質問が正しく読み取れない問題を直しました。",
+      "en": "Fixed Command Code questions being misread when some tabs were already answered."
+    },
+    {
+      "ja": "会話の中にツールの操作案内の文言が含まれていると、エージェントが処理中のまま表示される問題を直しました。",
+      "en": "Fixed an agent staying busy when the conversation quoted text from the tool's on-screen hints."
+    },
+    {
+      "ja": "末尾がセミコロンのメッセージを送ると、セミコロンが消えたり送信に失敗したりする問題を直しました。",
+      "en": "Fixed messages ending with a semicolon losing it or failing to send."
+    }
+  ]
+}