commandmate 0.44.2 → 0.45.0

package/dist/server/src/lib/detection/idle-evidence-observation.js

@@ -20,8 +20,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.recordIdleEvidenceObservation = recordIdleEvidenceObservation;
 exports.getIdleEvidenceObservations = getIdleEvidenceObservations;
 exports.resetIdleEvidenceObservations = resetIdleEvidenceObservations;
-const observations = globalThis.__idleEvidenceObservations ??
-    (globalThis.__idleEvidenceObservations = new Map());
+const global_state_1 = require("../global-state");
+const observations = (0, global_state_1.getOrInitGlobal)('__idleEvidenceObservations', () => new Map());
 /**
  * Fold one frame's idle-evidence verdict into the tally for `tool`.
  *

package/dist/server/src/lib/detection/model-info-extractor.js

@@ -42,6 +42,7 @@
  * | copilot     | footer:  `← open sidebar · … · tab next tab      GPT-5 mini · Medium` |
  * | copilot     | notice:  `● Model changed from gpt-5.6-terra (xhigh) to gpt-5-mini (medium) for this session.` |
  * | opencode    | step:    `▣  Build · GPT-5.6 Luna · 3.1s`                          |
+ * | opencode2   | step:    `Build · Mistral Large 4 · 253ms` (no `▣`, 2.0.18, #3443)  |
  *
  * The copilot and opencode rows were added by Issue #1912 and read off the live
  * fixtures #1885 / #1895 / #1893 / #1896 recorded, not off a fresh capture.
@@ -62,7 +63,7 @@
  * @see Issue #1784, Phase 2 of the model/effort visibility series
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ANTIGRAVITY_MODEL_ID_EFFORT_PATTERN = exports.COMMAND_CODE_BANNER_MODELS_PATTERN = exports.OPENCODE_STEP_MODEL_PATTERN = exports.COPILOT_MODEL_CHANGE_PATTERN = exports.ANTIGRAVITY_BANNER_MODEL_PATTERN = exports.ANTIGRAVITY_STATUS_BAR_HINT_PATTERN = exports.CLAUDE_MODEL_SWITCH_PATTERN = exports.CLAUDE_EFFORT_ROW_PATTERN = exports.CLAUDE_STARTUP_BANNER_V2_1_28X_PATTERN = exports.CLAUDE_STARTUP_BANNER_PATTERN = exports.CODEX_STATUS_BAR_WITH_TRAILER_PATTERN = exports.CODEX_FOOTER_EFFORT_SLOT_PATTERN = exports.CODEX_FOOTER_MODEL_PATTERN = exports.REASONING_EFFORT_LEVELS = void 0;
+exports.ANTIGRAVITY_MODEL_ID_EFFORT_PATTERN = exports.COMMAND_CODE_BANNER_MODELS_PATTERN = exports.OPENCODE_V2_STEP_MODEL_PATTERN = exports.OPENCODE_STEP_MODEL_PATTERN = exports.COPILOT_MODEL_CHANGE_PATTERN = exports.ANTIGRAVITY_BANNER_MODEL_PATTERN = exports.ANTIGRAVITY_STATUS_BAR_HINT_PATTERN = exports.CLAUDE_MODEL_SWITCH_PATTERN = exports.CLAUDE_EFFORT_ROW_PATTERN = exports.CLAUDE_STARTUP_BANNER_V2_1_28X_PATTERN = exports.CLAUDE_STARTUP_BANNER_PATTERN = exports.CODEX_STATUS_BAR_WITH_TRAILER_PATTERN = exports.CODEX_FOOTER_EFFORT_SLOT_PATTERN = exports.CODEX_FOOTER_MODEL_PATTERN = exports.REASONING_EFFORT_LEVELS = void 0;
 exports.resolveEffortToken = resolveEffortToken;
 exports.extractModelInfo = extractModelInfo;
 exports.deriveEffortFromModelId = deriveEffortFromModelId;
@@ -684,6 +685,58 @@ function readOpencodeStepMarker(line) {
     const model = match[1].trim();
     return isPlausibleModelLabel(model) ? { model, effort: null } : null;
 }
+/**
+ * opencode2's step row (Issue #3443): v1's marker without the `▣`.
+ *
+ * Measured on opencode2 2.0.18 (`tests/fixtures/opencode-agent-health-3420/`):
+ *
+ *   `     Error: Unauthorized`
+ *   `     Build · Mistral Large 4 · 721ms`
+ *   `  ┃`                                   (the next user turn, or the composer)
+ *
+ * Without the `▣` the shape `<word> · <text> · <duration>` is ordinary prose, so
+ * it is only read under three guards, each of which a v1 step row also meets:
+ *
+ * - the duration is required (a row with two `·` and nothing timed is not one);
+ * - the row is transcript text, not inside a `┃` block — the user's own input
+ *   and shell output are drawn inside one, the composer bar too;
+ * - the next non-blank row opens a `┃` block (the next user turn or the
+ *   composer): the step row closes a reply, so a reply line that merely has the
+ *   shape is followed by more reply, or by the step row itself.
+ *
+ * No /g. No nested quantifiers: `[^·]+?` is bounded by literal `·`.
+ */
+exports.OPENCODE_V2_STEP_MODEL_PATTERN = /^\s*[A-Za-z][A-Za-z0-9-]*\s+·\s+([^·]+?)\s+·\s+[\d.]+\s?m?s\s*$/;
+/** A row that opens or continues opencode's `┃` block (a user turn or the composer). */
+const OPENCODE_BLOCK_ROW_PATTERN = /^\s*[┃╹]/;
+function readOpencodeV2StepRow(lines, index) {
+    const match = exports.OPENCODE_V2_STEP_MODEL_PATTERN.exec(lines[index]);
+    if (!match)
+        return null;
+    const model = match[1].trim();
+    if (!isPlausibleModelLabel(model))
+        return null;
+    for (let next = index + 1; next < lines.length; next++) {
+        if (lines[next].trim() === '')
+            continue;
+        return OPENCODE_BLOCK_ROW_PATTERN.test(lines[next]) ? { model, effort: null } : null;
+    }
+    return null;
+}
+/**
+ * The lowest opencode step row, `▣` (v1) or not (opencode2, #3443). Both tool
+ * ids read both shapes: `opencode` may be running a 2.x binary, and a v1 frame
+ * never draws a `▣`-less row that passes {@link readOpencodeV2StepRow}'s guards.
+ */
+function readOpencodeStepRow(captureText) {
+    const lines = captureText.split('\n').map((line) => (0, ansi_1.stripAnsi)(line));
+    for (let i = lines.length - 1; i >= 0; i--) {
+        const result = readOpencodeStepMarker(lines[i]) ?? readOpencodeV2StepRow(lines, i);
+        if (result)
+            return result;
+    }
+    return null;
+}
 // =============================================================================
 // Command Code (Issue #2358)
 // =============================================================================
@@ -792,7 +845,7 @@ function scanFromEnd(captureText, read) {
  * Pure and side-effect free. Never throws, and answers `{ model: null, effort:
  * null }` for every tool it has no rule for (gemini / vibe-local — neither
  * prints a model on its pane in any captured frame; copilot and opencode were
- * added by Issue #1912) and for every frame that does not show the chrome it
+ * added by Issue #1912, opencode-v2 by #3443) and for every frame that does not show the chrome it
  * looks for.
  *
  * **Answering null is a correct outcome, not a failure.** tmux keeps a
@@ -842,7 +895,8 @@ function extractModelInfo(cliToolId, captureText) {
             return sameModel(bar.model, notice.model) ? { model: bar.model, effort: notice.effort } : bar;
         }
         case 'opencode':
-            return scanFromEnd(captureText, readOpencodeStepMarker) ?? unknown();
+        case 'opencode-v2':
+            return readOpencodeStepRow(captureText) ?? unknown();
         case 'command-code':
             // Issue #2358. The banner is the only source — hooks carry no model — and
             // bottom-up is the same "last banner wins" rule Claude uses: a relaunch in

package/dist/server/src/lib/detection/prompt-detect-multiple-choice.js

@@ -12,6 +12,7 @@ exports.buildMultipleChoiceResult = buildMultipleChoiceResult;
 exports.detectMultipleChoicePrompt = detectMultipleChoicePrompt;
 const tui_detection_frame_1 = require("./tui-detection-frame");
 const cli_patterns_1 = require("./cli-patterns");
+const prompt_view_1 = require("../../lib/session/prompt-view");
 const picker_chrome_1 = require("./tools/claude/picker-chrome");
 // ============================================================================
 // Constants
@@ -411,48 +412,22 @@ const TEXT_INPUT_PATTERNS = [
     /custom/i,
     /differently/i,
 ];
-/**
- * Labels of the rows measured to BE a text field on screen (Issue #2573).
- *
- * `requiresTextInput` (from {@link TEXT_INPUT_PATTERNS}) reads the WORDS of a
- * label — "tell … what to do differently", "custom", "enter …" — and says the
- * option is about the user's own text. It does not say where typed characters
- * land, and for two rows it flags alike the measured answer is opposite:
- *
- * | row | on screen | free text + Enter |
- * |-----|-----------|-------------------|
- * | Command Code `AskUserQuestion` `Type something...` (#2522) | a `TextInput` | lands in the field — the answer |
- * | Command Code permission `No, tell Command Code what to do differently` | a menu row | ignored; the Enter confirms the highlighted `1. Yes` |
- *
- * The second is how a "No + reason" was delivered as an approval. The same
- * words sit on codex's and copilot's approval rows (codex's also name letter
- * hotkeys, `(y)` / `(p)`), and the generic patterns match inside the command an
- * approval row quotes (`… commands that start with 'npm run custom'`).
- *
- * So this is an allowlist of what was measured, not a denylist of what went
- * wrong: a flagged row is a field only when its label is one of these. Anchored
- * at the start so Command Code's folded description (`Type something... Give me
- * a branch name …`) still matches. Command Code's reader
- * (`tools/command-code/dialog.ts`) marks the same rows with the same expression.
- */
-const TYPED_TEXT_FIELD_LABEL_PATTERNS = [
-    /^[^\S\n]*type\s+something\b/i,
-];
 /**
  * Whether typed text reaches this option as its answer (Issue #2573).
  *
  * `true` only for a `requiresTextInput` row whose label is a measured text field
- * ({@link TYPED_TEXT_FIELD_LABEL_PATTERNS}). Every other flagged row is a menu
+ * (`TYPED_TEXT_FIELD_LABEL_PATTERNS` in `lib/session/prompt-view`, read through
+ * {@link optionTakesTypedText}). Every other flagged row is a menu
  * row: it is answered by its NUMBER, and free text sent at it is swallowed while
  * the Enter after it confirms whatever is highlighted.
  *
- * Pure, and restated in `components/worktree/PromptPanel.tsx` for the answer
- * panels, which cannot import this module (its graph reaches `lib/env`'s `fs`);
+ * Pure, and since Issue #3218 a call to `optionTakesTypedText`, which the answer
+ * panels read directly (through `hooks/usePromptAnswerState`) because they
+ * cannot import this module (its graph reaches `lib/env`'s `fs`);
  * `tests/unit/components/PromptPanel.test.tsx` asserts the two agree.
  */
 function isTypedTextFieldOption(option) {
-    return option.requiresTextInput === true
-        && TYPED_TEXT_FIELD_LABEL_PATTERNS.some((pattern) => pattern.test(option.label));
+    return (0, prompt_view_1.optionTakesTypedText)(option);
 }
 // ============================================================================
 // Helper functions

package/dist/server/src/lib/detection/prompt-detector.js

@@ -11,6 +11,7 @@ exports.resetDetectPromptCache = resetDetectPromptCache;
 const logger_1 = require("../../lib/logger");
 const prompt_detect_multiple_choice_1 = require("./prompt-detect-multiple-choice");
 const tui_detection_frame_1 = require("./tui-detection-frame");
+const truncate_raw_content_1 = require("./truncate-raw-content");
 const logger = (0, logger_1.createLogger)('prompt-detector');
 /**
  * Last output tail used for duplicate log suppression.
@@ -25,40 +26,6 @@ const logger = (0, logger_1.createLogger)('prompt-detector');
  * @internal
  */
 let lastOutputTail = null;
-/**
- * Maximum number of lines to retain in rawContent.
- * Tail lines are preserved (instruction text typically appears just before the prompt).
- * @see truncateRawContent
- */
-const RAW_CONTENT_MAX_LINES = 200;
-/**
- * Maximum number of characters to retain in rawContent.
- * Tail characters are preserved.
- * @see truncateRawContent
- */
-const RAW_CONTENT_MAX_CHARS = 5000;
-/**
- * Truncate raw content to fit within size limits.
- * Preserves the tail (end) of the content since instruction text
- * typically appears just before the prompt at the end of output.
- *
- * Security: No regular expressions used -- no ReDoS risk. [SF-S4-002]
- * String.split('\n') and String.slice() are literal string operations only.
- *
- * @param content - The content to truncate
- * @returns Truncated content (last RAW_CONTENT_MAX_LINES lines, max RAW_CONTENT_MAX_CHARS characters)
- */
-function truncateRawContent(content) {
-    const lines = content.split('\n');
-    const truncatedLines = lines.length > RAW_CONTENT_MAX_LINES
-        ? lines.slice(-RAW_CONTENT_MAX_LINES)
-        : lines;
-    let result = truncatedLines.join('\n');
-    if (result.length > RAW_CONTENT_MAX_CHARS) {
-        result = result.slice(-RAW_CONTENT_MAX_CHARS);
-    }
-    return result;
-}
 /**
  * Yes/no pattern definitions for data-driven matching.
  * Each entry defines a regex pattern and its associated default option.
@@ -190,7 +157,7 @@ function detectPrompt(output, options) {
     // ❯ 1. Yes
     //   2. No
     //   3. Cancel
-    const multipleChoiceResult = (0, prompt_detect_multiple_choice_1.detectMultipleChoicePrompt)(detectionOutput, options, truncateRawContent);
+    const multipleChoiceResult = (0, prompt_detect_multiple_choice_1.detectMultipleChoicePrompt)(detectionOutput, options, truncate_raw_content_1.truncateRawContent);
     if (multipleChoiceResult.isPrompt) {
         // D2-004: Suppress duplicate multipleChoice info log
         if (!isDuplicate) {

package/dist/server/src/lib/detection/selection-shape-patterns.js

@@ -0,0 +1,69 @@
+"use strict";
+/**
+ * Regexes shared by the shape reader and the Command Code block of
+ * `selection-shape.ts`. Split out first so the Command Code block can move
+ * without a cycle (Issue #3218). Imports nothing: this file is reached from
+ * browser-side modules too.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.COMMAND_CODE_PLAN_REVIEW_FOOTER = exports.FILTER_INPUT_PATTERN = void 0;
+/**
+ * A focused search/filter row inside the dialog.
+ *
+ * Three measured spellings, and nothing wider — this predicate SUPPRESSES a
+ * control, so a false positive costs the user their number buttons:
+ *  - `Type to search models...` / `type to search` (Command Code 1.40.1);
+ *  - `Search models…` (copilot 1.0.80's `/model`, recorded verbatim in
+ *    `cli-patterns.ts`'s `COPILOT_SELECTION_FOOTER_PATTERN` docblock);
+ *  - `/ search` (copilot's `/session` and `/settings` footers).
+ *
+ * Deliberately does NOT match claude's `/model` blurb ("Switch between Claude
+ * models…") or codex's ("Access legacy models by running codex -m…"), neither of
+ * which contains the word.
+ */
+exports.FILTER_INPUT_PATTERN = /\btype\s+to\s+search\b|\bsearch\s+\w+\s*(?:…|\.\.\.)|(?:^|·)\s*\/\s+search\b/im;
+/**
+ * The two footer rows of Command Code's plan review overlay (Issue #2761).
+ *
+ * Measured on 1.58.0 at 200x1000. The overlay is a rule, a `Plan review: <title>
+ * · <path> · v1` header, the plan with a line-number gutter, a second rule, a
+ * ` REVIEW ` badge and then, verbatim:
+ *
+ *     Approve ctrl+a   executes the plan
+ *     Cancel esc
+ *
+ * BOTH rows, adjacent, because each half alone is weak: `Cancel esc` is two
+ * words any picker might print, and `Approve` is a word an agent writes in a
+ * plan. Multi-line on purpose — it is tested against a joined tail
+ * (`NormalizedFrame.lastLines`, or the tail {@link readSelectionListShape}
+ * builds), never against a single row.
+ *
+ * Swept against every fixture in `tests/fixtures` and
+ * `tests/unit/lib/detection/fixtures` when this was written (300 files): the
+ * only match is the plan review capture itself.
+ *
+ * ## The `❯` either row may carry (Issue #2793)
+ *
+ * `↓` past the plan's last line moves the focus onto the ACTION list, and the
+ * focused action is drawn with a `❯ ` in front of it and two spaces before its
+ * key (`tests/fixtures/command-code-plan-review-2763/`, 1.58.0):
+ *
+ *     ❯ Approve  ctrl+a   executes the plan        ← `plan-review-action-focus-approve.txt`
+ *     Cancel esc
+ *
+ *     Approve ctrl+a   executes the plan · comments go along as notes
+ *     ❯ Cancel  esc                                ← `plan-review-long-scrolled-cancel-focused.txt`
+ *
+ * Without the optional `❯ ` this pattern missed both frames, and they went on to
+ * the composer check, where `COMMAND_CODE_PROMPT_PATTERN` (`^❯(\s*$|\s+\S)`)
+ * read the cursor row as the composer and published `ready` / `input_prompt`:
+ * `wait` exited 0 on a plan nobody had approved — #2754's `❯`-outside-the-list
+ * family. It is also the frame on which `Enter` EXECUTES the focused action, so
+ * missing it here would also have left the chat surface's `Enter` on screen
+ * (see {@link SelectionListShape.offersPlanApprove}). Only `❯`, and only as a
+ * prefix: `❯ ` + the row is the one measured spelling of a focused action.
+ * Re-swept over the same two directories with the widened pattern: every match
+ * is still a `command-code-plan-review-*` capture, which
+ * `command-code-plan-review-2793.test.ts` keeps pinned.
+ */
+exports.COMMAND_CODE_PLAN_REVIEW_FOOTER = /^\s*(?:❯ +)?Approve\s+ctrl\+a\b[^\n]*\n\s*(?:❯ +)?Cancel\s+esc\s*$/im;