npm - commandmate - Versions diffs - 0.37.0 → 0.38.1 - Mend

commandmate 0.37.0 → 0.38.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (331) hide show

package/dist/server/src/lib/cmate-validator.js ADDED Viewed

@@ -0,0 +1,354 @@
+"use strict";
+/**
+ * CMATE.md Client-Side Validator
+ * Issue #294: Schedule execution feature
+ *
+ * Provides pure-function validation and template generation for CMATE.md files.
+ * Unlike cmate-parser.ts, this module has no fs dependency and can be used
+ * in client-side (browser) code.
+ *
+ * Validation rules mirror cmate-parser.ts but return errors instead of
+ * silently skipping invalid entries.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CMATE_TEMPLATE_CONTENT = exports.COMMAND_CODE_DIRECT_WRITE_TOOLS_DENIED = exports.COMMAND_CODE_PRINT_GATED_TOOLS = void 0;
+exports.parseCmateContent = parseCmateContent;
+exports.validateScheduleHeaders = validateScheduleHeaders;
+exports.validateSchedulesSection = validateSchedulesSection;
+exports.isCommandCodeDirectWriteToolsDenied = isCommandCodeDirectWriteToolsDenied;
+exports.collectScheduleWarnings = collectScheduleWarnings;
+exports.isScheduleEnabled = isScheduleEnabled;
+const cmate_constants_1 = require("../config/cmate-constants");
+const schedule_config_1 = require("../config/schedule-config");
+const cmate_cli_tool_parser_1 = require("../lib/cmate-cli-tool-parser");
+const types_1 = require("../lib/cli-tools/types");
+/**
+ * The tools `commandcode -p` rejects when the agent calls them directly and
+ * `--yolo` was not passed (Issue #2576; measured on the 1.53.1 bundle, where
+ * `resolvePrintHarnessMods` injects `print-permission-gate` unless
+ * `dangerouslySkipPermissions` is set).
+ */
+exports.COMMAND_CODE_PRINT_GATED_TOOLS = [
+    'edit_file',
+    'write_file',
+    'shell_command',
+    'monitor_command',
+    'kill_shell',
+];
+/** Reason code of the command-code print-gate warning (Issue #2576) */
+exports.COMMAND_CODE_DIRECT_WRITE_TOOLS_DENIED = 'command-code-direct-write-tools-denied';
+/** Required header columns for the Schedules table */
+const REQUIRED_SCHEDULE_HEADERS = ['Name', 'Cron', 'Message', 'CLI Tool', 'Enabled'];
+/** Optional header columns (validated only when present) */
+const OPTIONAL_SCHEDULE_HEADERS = ['Permission'];
+// =============================================================================
+// Template
+// =============================================================================
+/** Default CMATE.md template content */
+exports.CMATE_TEMPLATE_CONTENT = `## Schedules
+| Name | Cron | Message | CLI Tool | Enabled | Permission |
+|------|------|---------|----------|---------|------------|
+| example-task | 0 * * * * | README.mdを要約してください | claude | true | acceptEdits |
+| copilot-example | 0 9 * * * | コードをレビューしてください | copilot --model gpt-4.1 | true | allow-all-tools |
+`;
+// =============================================================================
+// Parser (client-side, no fs dependency)
+// =============================================================================
+/**
+ * Parse CMATE.md content into a generic structure.
+ * Client-side equivalent of parseCmateFile() from cmate-parser.ts.
+ *
+ * @param content - Raw CMATE.md file content
+ * @returns Map of section name to table rows
+ */
+function parseCmateContent(content) {
+    const result = new Map();
+    const lines = content.split('\n');
+    let currentSection = null;
+    let headerParsed = false;
+    let separatorParsed = false;
+    for (const line of lines) {
+        const trimmed = line.trim();
+        const headerMatch = trimmed.match(/^##\s+(.+)$/);
+        if (headerMatch) {
+            currentSection = headerMatch[1].trim();
+            headerParsed = false;
+            separatorParsed = false;
+            if (!result.has(currentSection)) {
+                result.set(currentSection, []);
+            }
+            continue;
+        }
+        if (!trimmed || !trimmed.startsWith('|') || !currentSection) {
+            continue;
+        }
+        if (!headerParsed) {
+            headerParsed = true;
+            continue;
+        }
+        if (!separatorParsed) {
+            if (trimmed.match(/^\|[\s-:|]+\|$/)) {
+                separatorParsed = true;
+                continue;
+            }
+            separatorParsed = true;
+        }
+        const cells = trimmed
+            .split('|')
+            .slice(1, -1)
+            .map((cell) => cell.trim());
+        if (cells.length > 0) {
+            result.get(currentSection).push(cells);
+        }
+    }
+    return result;
+}
+// =============================================================================
+// Validation
+// =============================================================================
+/**
+ * Validate that the Schedules section header row contains the expected columns.
+ *
+ * @param content - Raw CMATE.md file content
+ * @returns Array of validation errors (empty = headers valid)
+ */
+function validateScheduleHeaders(content) {
+    const errors = [];
+    const lines = content.split('\n');
+    let inSchedules = false;
+    for (const line of lines) {
+        const trimmed = line.trim();
+        const sectionMatch = trimmed.match(/^##\s+(.+)$/);
+        if (sectionMatch) {
+            inSchedules = sectionMatch[1].trim() === 'Schedules';
+            continue;
+        }
+        if (!inSchedules || !trimmed.startsWith('|')) {
+            continue;
+        }
+        // First table row in Schedules section = header row
+        const cells = trimmed
+            .split('|')
+            .slice(1, -1)
+            .map((cell) => cell.trim());
+        // Validate required headers
+        for (let i = 0; i < REQUIRED_SCHEDULE_HEADERS.length; i++) {
+            const expected = REQUIRED_SCHEDULE_HEADERS[i];
+            const actual = cells[i];
+            if (!actual || actual !== expected) {
+                errors.push({
+                    row: -1,
+                    message: `Header column ${i + 1}: expected "${expected}", got "${actual || '(missing)'}"`,
+                    field: 'header',
+                });
+            }
+        }
+        // Validate optional headers (only when present)
+        for (let j = 0; j < OPTIONAL_SCHEDULE_HEADERS.length; j++) {
+            const colIndex = REQUIRED_SCHEDULE_HEADERS.length + j;
+            const expected = OPTIONAL_SCHEDULE_HEADERS[j];
+            const actual = cells[colIndex];
+            if (actual !== undefined && actual !== expected) {
+                errors.push({
+                    row: -1,
+                    message: `Header column ${colIndex + 1}: expected "${expected}", got "${actual}"`,
+                    field: 'header',
+                });
+            }
+        }
+        break; // Only check the first table row (header)
+    }
+    return errors;
+}
+/**
+ * Validate rows from the Schedules section.
+ * Returns an array of validation errors (empty array = all valid).
+ *
+ * @param rows - Raw table rows from parseCmateContent() for the Schedules section
+ * @returns Array of validation errors
+ */
+function validateSchedulesSection(rows) {
+    const errors = [];
+    for (let i = 0; i < rows.length; i++) {
+        const row = rows[i];
+        // Minimum required columns: Name, Cron, Message
+        if (row.length < 3) {
+            errors.push({
+                row: i,
+                message: `Row ${i + 1}: insufficient columns (need at least 3, got ${row.length})`,
+                field: 'columns',
+            });
+            continue;
+        }
+        const [name, cronExpression, message] = row;
+        // Validate name
+        const sanitizedName = (0, cmate_constants_1.sanitizeContent)(name);
+        if (!cmate_constants_1.NAME_PATTERN.test(sanitizedName)) {
+            errors.push({
+                row: i,
+                message: `Row ${i + 1}: invalid name "${sanitizedName}"`,
+                field: 'name',
+            });
+        }
+        // Validate cron expression
+        if (!(0, cmate_constants_1.isValidCronExpression)(cronExpression)) {
+            errors.push({
+                row: i,
+                message: `Row ${i + 1}: invalid cron "${cronExpression}"`,
+                field: 'cron',
+            });
+        }
+        // Validate message
+        const sanitizedMessage = (0, cmate_constants_1.sanitizeContent)(message);
+        if (!sanitizedMessage.trim()) {
+            errors.push({
+                row: i,
+                message: `Row ${i + 1}: empty message`,
+                field: 'message',
+            });
+        }
+        // Validate CLI Tool column via shared pipeline (DR1-007)
+        const { result: parsed, errors: cliToolErrors } = (0, cmate_cli_tool_parser_1.parseAndValidateCliToolColumn)(row[3] || '');
+        for (const errMsg of cliToolErrors) {
+            errors.push({
+                row: i,
+                message: `Row ${i + 1}: ${errMsg}`,
+                field: errMsg.includes('Model') ? 'model' : 'cliTool',
+            });
+        }
+        // Validate cliToolId is a known tool (DR2-009)
+        if (parsed && !(0, types_1.isCliToolType)(parsed.cliToolId)) {
+            errors.push({
+                row: i,
+                message: `Row ${i + 1}: unknown CLI Tool "${parsed.cliToolId}"`,
+                field: 'cliTool',
+            });
+        }
+        // Validate permission (6th column)
+        // Empty/missing permission is allowed -- parser applies default per CLI tool
+        const permissionStr = row[5];
+        if (permissionStr !== undefined && permissionStr.trim() !== '') {
+            const trimmedPermission = permissionStr.trim();
+            const cliToolId = parsed.cliToolId;
+            // DR3-002: copilot separated from gemini/vibe-local to accept COPILOT_PERMISSIONS
+            // Issue #1914: the fallback is `[]`, not CLAUDE_PERMISSIONS. Every tool
+            // whose CLI has a permission flag is named explicitly; anything else --
+            // `opencode`, `gemini`, `vibe-local`, and any tool added to CLI_TOOL_IDS
+            // without a branch here -- has no flag, so a non-empty Permission cell is
+            // an error rather than something silently checked against Claude's list.
+            // Issue #2454: command-code's list is the six-value column vocabulary
+            // (`yolo` + the five `--permission-mode` choices), the same set the
+            // parser accepts and the dialog offers.
+            const allowedValues = cliToolId === 'claude' ? schedule_config_1.CLAUDE_PERMISSIONS
+                : cliToolId === 'codex' ? schedule_config_1.CODEX_SANDBOXES
+                    : cliToolId === 'copilot' ? schedule_config_1.COPILOT_PERMISSIONS
+                        : cliToolId === 'antigravity' ? schedule_config_1.ANTIGRAVITY_PERMISSIONS
+                            : cliToolId === 'command-code' ? schedule_config_1.COMMAND_CODE_SCHEDULE_PERMISSIONS
+                                : [];
+            if (!allowedValues.includes(trimmedPermission)) {
+                errors.push({
+                    row: i,
+                    message: `Row ${i + 1}: invalid permission "${trimmedPermission}" for ${cliToolId}`,
+                    field: 'permission',
+                });
+            }
+        }
+    }
+    return errors;
+}
+// =============================================================================
+// Warnings (Issue #2576)
+// =============================================================================
+/**
+ * Whether a schedule runs `commandcode -p` with its print gate still on.
+ *
+ * Shared by the parser's log line, {@link collectScheduleWarnings} and the
+ * ScheduleEditDialog note, so the three cannot disagree.
+ *
+ * The test is "one of the five `--permission-mode` values", not "anything but
+ * `yolo`", because that is what `buildCliArgs` does: `yolo` gets `--yolo`, the
+ * five modes get `--permission-mode <value>` and leave the gate on, and
+ * anything else (an empty cell, an out-of-vocabulary value) gets `--yolo` --
+ * which is also what the parser resolves those cells to. "Not `yolo`" flagged
+ * an empty cell that in fact runs with `--yolo`.
+ *
+ * What the gate rejects is the write tools the agent calls *directly*
+ * ({@link COMMAND_CODE_PRINT_GATED_TOOLS}); a write routed through a sub-agent
+ * can still land, so this does not mean the run is read-only.
+ *
+ * @param cliToolId - CLI tool id of the schedule
+ * @param permission - Permission cell or resolved permission
+ * @returns true when the directly-called write tools will be rejected
+ */
+function isCommandCodeDirectWriteToolsDenied(cliToolId, permission) {
+    return (cliToolId === 'command-code' &&
+        schedule_config_1.COMMAND_CODE_PERMISSIONS.includes(permission.trim()));
+}
+/**
+ * Collect non-blocking warnings from the Schedules section rows (Issue #2576).
+ *
+ * CMATE.md is edited by hand, and that path never shows the dialog note, so the
+ * judgment has to run on the file itself. Only rows that will actually run with
+ * the gate on are reported, mirroring `parseSchedulesSection`:
+ *
+ * - rows the parser skips (any validation error other than the permission) are
+ *   left out and do not count toward the limit;
+ * - rows past `MAX_SCHEDULE_ENTRIES` registered rows are left out -- the parser
+ *   stops there, and a row with an out-of-vocabulary permission *is* registered
+ *   (as `yolo`), so it counts;
+ * - rows with an out-of-vocabulary permission are left out -- they run as `yolo`;
+ * - disabled rows are left out -- they are registered but never run, and the
+ *   warning is about a schedule running unnoticed. Enabling one rewrites
+ *   CMATE.md, and the next read reports it.
+ *
+ * This never adds to {@link validateSchedulesSection}'s errors -- a warned row
+ * is still registered and still runs.
+ *
+ * @param rows - Raw table rows from parseCmateContent() for the Schedules section
+ * @returns Array of warnings (empty = nothing to flag)
+ */
+function collectScheduleWarnings(rows) {
+    const warnings = [];
+    let registered = 0;
+    for (let i = 0; i < rows.length; i++) {
+        const row = rows[i];
+        const errors = validateSchedulesSection([row]);
+        if (errors.some((error) => error.field !== 'permission'))
+            continue;
+        if (registered >= cmate_constants_1.MAX_SCHEDULE_ENTRIES)
+            break;
+        registered++;
+        if (errors.length > 0)
+            continue;
+        const [rawName, , , rawCliTool, enabledStr, permissionStr] = row;
+        if (!isScheduleEnabled(enabledStr))
+            continue;
+        const { result: parsed } = (0, cmate_cli_tool_parser_1.parseAndValidateCliToolColumn)(rawCliTool || '');
+        const permission = (permissionStr ?? '').trim();
+        if (!isCommandCodeDirectWriteToolsDenied(parsed.cliToolId, permission))
+            continue;
+        const name = (0, cmate_constants_1.sanitizeContent)(rawName);
+        warnings.push({
+            row: i,
+            name,
+            field: 'permission',
+            code: exports.COMMAND_CODE_DIRECT_WRITE_TOOLS_DENIED,
+            cliToolId: parsed.cliToolId,
+            permission,
+            message: `Row ${i + 1}: schedule "${name}" runs command-code with the --permission-mode value "${permission}", ` +
+                `so commandcode -p rejects the write tools the agent calls directly ` +
+                `(${exports.COMMAND_CODE_PRINT_GATED_TOOLS.join(', ')}). ` +
+                'This is a warning, not an error: the schedule still runs. Use "yolo" if it needs to write.',
+        });
+    }
+    return warnings;
+}
+/**
+ * Read the Enabled cell of a Schedules row: missing, empty or `true` (any case)
+ * means enabled. Shared with `parseSchedulesSection` so the parser and
+ * {@link collectScheduleWarnings} cannot disagree about which rows run.
+ */
+function isScheduleEnabled(enabledStr) {
+    return enabledStr === undefined || enabledStr === '' || enabledStr.toLowerCase() === 'true';
+}

package/dist/server/src/lib/detection/cli-patterns.js CHANGED Viewed

@@ -5,7 +5,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.COPILOT_TOOL_VERBS = exports.COPILOT_TRANSCRIPT_DIVIDER_PATTERN = exports.COPILOT_USER_ECHO_PATTERN = exports.COPILOT_REASONING_HEADER_PATTERN = exports.COPILOT_BOX_ROW_PATTERN = exports.COPILOT_SEPARATOR_PATTERN = exports.COPILOT_IDLE_STATUS_PATTERN = exports.COPILOT_WORKING_STATUS_PATTERN = exports.COPILOT_THINKING_PATTERN = exports.COPILOT_PROMPT_PATTERN = exports.OPENCODE_SKIP_PATTERNS = exports.OPENCODE_SEPARATOR_PATTERN = exports.CLAUDE_SELECTION_LIST_FOOTER = exports.CLAUDE_MODEL_OVERLAY_FOOTER_PATTERN = exports.OPENCODE_SELECTION_LIST_PATTERN = exports.OPENCODE_FOOTER_STATUS_PATTERN = exports.OPENCODE_USER_ECHO_PATTERN = exports.OPENCODE_GUTTER_ROW_PATTERN = exports.OPENCODE_COMPOSER_BOTTOM_BORDER = exports.OPENCODE_PROCESSING_INDICATOR = exports.OPENCODE_PERMISSION_PATTERN = exports.OPENCODE_TURN_COMPLETE_PATTERN = exports.OPENCODE_RESPONSE_COMPLETE = exports.OPENCODE_LOADING_PATTERN = exports.OPENCODE_THINKING_PATTERN = exports.OPENCODE_PROMPT_AFTER_RESPONSE = exports.OPENCODE_IDLE_COMPOSER_PATTERN = exports.OPENCODE_PROMPT_PATTERN = exports.GEMINI_THINKING_PATTERN = exports.GEMINI_PROMPT_PATTERN = exports.MAX_PASTED_TEXT_RETRIES = exports.PASTED_TEXT_DETECT_DELAY = exports.PASTED_TEXT_PATTERN = exports.CODEX_USER_ECHO_PATTERN = exports.CODEX_STATUS_BAR_PATTERN = exports.CODEX_PAGER_FOOTER_PATTERN = exports.CODEX_APPROVAL_FOOTER_PATTERN = exports.CODEX_SELECTION_LIST_PATTERN = exports.CODEX_SEPARATOR_PATTERN = exports.CODEX_HOOKS_REVIEW_ANCHORS = exports.CODEX_DIALOG_PATTERN = exports.CODEX_PROMPT_PATTERN = exports.CLAUDE_TRUST_DIALOG_PATTERN = exports.CLAUDE_SEPARATOR_PATTERN = exports.CLAUDE_PROMPT_PATTERN = exports.CODEX_INTERRUPT_HINT_PATTERN = exports.CODEX_THINKING_PATTERN = exports.CLAUDE_INTERRUPT_HINT_PATTERN = exports.CLAUDE_THINKING_PATTERN = exports.CLAUDE_SPINNER_CHARS = void 0;
-exports.CLAUDE_SESSION_ERROR_REGEX_PATTERNS = exports.CLAUDE_SESSION_ERROR_PATTERNS = exports.extractAnsiSequences = exports.stripAnsi = exports.COMMAND_CODE_SKIP_PATTERNS = exports.COMMAND_CODE_HOOK_NOTICE_PATTERN = exports.COMMAND_CODE_BANNER_PATTERNS = exports.COMMAND_CODE_MODE_INDICATOR_PATTERN = exports.COMMAND_CODE_COMPLETION_PATTERN = exports.COMMAND_CODE_RESPONSE_MARKER_PATTERN = exports.COMMAND_CODE_THINKING_PATTERN = exports.COMMAND_CODE_INTERRUPT_HINT_PATTERN = exports.COMMAND_CODE_SEPARATOR_PATTERN = exports.COMMAND_CODE_PROMPT_PATTERN = exports.COMMAND_CODE_SPINNER_CHARS = exports.ANTIGRAVITY_SKIP_PATTERNS = exports.ANTIGRAVITY_SURVEY_PATTERN = exports.ANTIGRAVITY_DIALOG_MAX_ROWS = exports.ANTIGRAVITY_DIALOG_BOUNDARY_PATTERN = exports.ANTIGRAVITY_SWITCH_MODEL_HEADER_PATTERN = exports.ANTIGRAVITY_NUMBERED_OPTION_PATTERN = exports.ANTIGRAVITY_NAVIGATE_FOOTER_PATTERN = exports.ANTIGRAVITY_SELECTION_LIST_PATTERN = exports.ANTIGRAVITY_SEPARATOR_PATTERN = exports.ANTIGRAVITY_THINKING_PATTERN = exports.ANTIGRAVITY_PROMPT_PATTERN = exports.VIBE_LOCAL_THINKING_PATTERN = exports.VIBE_LOCAL_PROMPT_PATTERN = exports.COPILOT_SKIP_PATTERNS = exports.COPILOT_FOLDER_TRUST_ANSWER_KEY = exports.COPILOT_FOLDER_TRUST_SESSION_OPTION_PATTERN = exports.COPILOT_FOLDER_TRUST_ANCHORS = exports.COPILOT_SELECTION_FOOTER_PATTERN = exports.COPILOT_BOOT_BANNER_ANCHORS = exports.COPILOT_TRANSCRIPT_CONTINUATION_PATTERN = exports.COPILOT_TOOL_ROW_PATTERN = void 0;
+exports.CLAUDE_SESSION_ERROR_REGEX_PATTERNS = exports.CLAUDE_SESSION_ERROR_PATTERNS = exports.extractAnsiSequences = exports.stripAnsi = exports.COMMAND_CODE_SKIP_PATTERNS = exports.COMMAND_CODE_HOOK_NOTICE_PATTERN = exports.COMMAND_CODE_BANNER_PATTERNS = exports.COMMAND_CODE_MODE_INDICATOR_PATTERN = exports.COMMAND_CODE_COMPLETION_PATTERN = exports.COMMAND_CODE_RESPONSE_MARKER_PATTERN = exports.COMMAND_CODE_THINKING_PATTERN = exports.COMMAND_CODE_INTERRUPT_HINT_PATTERN = exports.COMMAND_CODE_SEPARATOR_PATTERN = exports.COMMAND_CODE_PROMPT_PATTERN = exports.COMMAND_CODE_SPINNER_CHARS = exports.ANTIGRAVITY_SKIP_PATTERNS = exports.ANTIGRAVITY_SURVEY_PATTERN = exports.ANTIGRAVITY_DIALOG_MAX_ROWS = exports.ANTIGRAVITY_DIALOG_BOUNDARY_PATTERN = exports.ANTIGRAVITY_SWITCH_MODEL_HEADER_PATTERN = exports.ANTIGRAVITY_NUMBERED_OPTION_PATTERN = exports.ANTIGRAVITY_NAVIGATE_FOOTER_PATTERN = exports.ANTIGRAVITY_SELECTION_LIST_PATTERN = exports.ANTIGRAVITY_SEPARATOR_PATTERN = exports.ANTIGRAVITY_THINKING_PATTERN = exports.ANTIGRAVITY_PROMPT_PATTERN = exports.ANTIGRAVITY_COMPOSER_MODE_BANNER_PATTERN = exports.ANTIGRAVITY_COMPOSER_MODE_BANNER_SOURCE = exports.VIBE_LOCAL_THINKING_PATTERN = exports.VIBE_LOCAL_PROMPT_PATTERN = exports.COPILOT_SKIP_PATTERNS = exports.COPILOT_FOLDER_TRUST_ANSWER_KEY = exports.COPILOT_FOLDER_TRUST_SESSION_OPTION_PATTERN = exports.COPILOT_FOLDER_TRUST_ANCHORS = exports.COPILOT_SELECTION_FOOTER_PATTERN = exports.COPILOT_BOOT_BANNER_ANCHORS = exports.COPILOT_TRANSCRIPT_CONTINUATION_PATTERN = exports.COPILOT_TOOL_ROW_PATTERN = void 0;
 exports.isCodexTurnActive = isCodexTurnActive;
 exports.findClaudeChromeStart = findClaudeChromeStart;
 exports.isCodexPromptReady = isCodexPromptReady;
@@ -2020,14 +2020,52 @@ exports.VIBE_LOCAL_PROMPT_PATTERN = /ctx:\d+%\s*[>❯]/m;
  * Matches braille spinners, "Thinking", and tool execution indicators.
  */
 exports.VIBE_LOCAL_THINKING_PATTERN = /[\u2800-\u28FF]|Thinking|⠋|⠙|⠹|⠸|⠼|⠴|⠦|⠧|⠇|⠏|Running|Executing/;
+/**
+ * The banner agy paints INTO its empty input box while a non-default permission
+ * mode is on (Issue #2592).
+ *
+ * Measured on agy 1.2.4 in the #2592 UAT
+ * (`tests/fixtures/agent-mode-2592/antigravity-{accept-edits,plan}.txt`, row 18,
+ * between the box's two rules):
+ *
+ *   `> Accept-edits mode: file edits auto-approved (shift+tab to cycle)`
+ *   `> Plan mode: research & plan only (shift+tab to cycle)`
+ *
+ * It takes the place of the bare `>` an empty box shows in default — it is a
+ * placeholder, not typed text — so a reader that only accepts the bare glyph
+ * reads an idle accept-edits / plan pane as "no input box at all". Before this
+ * pattern existed that is exactly what happened: the status detector fell through
+ * to its `default` floor (`running` + `isUnclassifiedActive`), `commandmate ls`
+ * showed a resting agent as running, `wait` never completed, and
+ * `isAntigravityReady` refused every send. #2592 made those two modes one click
+ * away, so the hole had to close with it.
+ *
+ * The structure is matched rather than the two sentences: `<Name> mode: <text>
+ * (shift+tab to cycle)`, anchored on the key hint agy ends every banner with, so
+ * a third mode needs no edit here. What stays out is anything a user could have
+ * typed into the box — the trailing hint is the part nobody types.
+ *
+ * Whole-row, no `/g`, no nested quantifiers (`[^\n]*` is followed by a literal).
+ */
+exports.ANTIGRAVITY_COMPOSER_MODE_BANNER_SOURCE = '>[^\\S\\n]+[A-Z][A-Za-z-]*[^\\S\\n]mode:[^\\n]*\\(shift\\+tab to cycle\\)[^\\S\\n]*';
+/** {@link ANTIGRAVITY_COMPOSER_MODE_BANNER_SOURCE} as a single-row pattern. */
+exports.ANTIGRAVITY_COMPOSER_MODE_BANNER_PATTERN = new RegExp(`^${exports.ANTIGRAVITY_COMPOSER_MODE_BANNER_SOURCE}$`, 'm');
 /**
  * Antigravity (agy) interactive REPL prompt pattern (Issue #988)
  * agy shows a bare ">" input box line when waiting for user input. The input box
  * is always rendered (even while generating), so prompt presence alone does not
  * mean "ready" — running vs idle is resolved together with the thinking pattern /
  * footer status bar in status-detector.ts. (Confirmed on machine: line is "> ".)
+ *
+ * Issue #2592: or the mode banner that replaces the bare glyph in an EMPTY box
+ * while accept-edits / plan is on ({@link ANTIGRAVITY_COMPOSER_MODE_BANNER_PATTERN}).
+ * Every consumer of this pattern is asking "is agy's input box drawn and empty?"
+ * — the idle rule in `detection/tools/antigravity/detect.ts`, the survey guard
+ * beside it, `isAntigravityReady` (the send gate) and the liveness probe — and
+ * the answer does not depend on the permission mode, so the banner is folded in
+ * here once rather than at each of them.
  */
-exports.ANTIGRAVITY_PROMPT_PATTERN = /^>\s*$/m;
+exports.ANTIGRAVITY_PROMPT_PATTERN = new RegExp(`^(?:>\\s*|${exports.ANTIGRAVITY_COMPOSER_MODE_BANNER_SOURCE})$`, 'm');
 /**
  * Antigravity (agy) thinking/processing pattern (Issue #988)
  * While generating, agy shows a braille spinner with "Generating..." in the

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

@@ -34,6 +34,7 @@
  * | tool        | line                                                             |
  * |-------------|------------------------------------------------------------------|
  * | codex       | footer:  `gpt-5.6-sol xhigh · ~/share/work/…`                     |
+ * | codex       | footer:  `gpt-6-astra medium · ~/… · <thread title>   Plan mode (…)` (0.154, #2592) |
  * | claude      | banner:  `▝▜█████▛▘  Opus 5 (1M context) with xhigh effort · Claude Max` |
  * | claude      | switch:  `  ⎿  Set model to Sonnet 5 for this session only` (#2361)  |
  * | antigravity | footer:  `? for shortcuts …               Gemini 3.7 Flash · hig` |
@@ -61,7 +62,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_STARTUP_BANNER_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_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_STARTUP_BANNER_PATTERN = exports.CODEX_STATUS_BAR_WITH_TRAILER_PATTERN = exports.CODEX_FOOTER_MODEL_PATTERN = exports.REASONING_EFFORT_LEVELS = void 0;
 exports.resolveEffortToken = resolveEffortToken;
 exports.extractModelInfo = extractModelInfo;
 exports.deriveEffortFromModelId = deriveEffortFromModelId;
@@ -156,12 +157,48 @@ function resolveEffortToken(token, options = {}) {
  * `cli-patterns.ts` documents).
  */
 exports.CODEX_FOOTER_MODEL_PATTERN = /^\s*([^\s·]+)(?:\s+(minimal|low|medium|high|xhigh)\b)?/i;
+/**
+ * A codex status bar with something AFTER the path (Issue #2592).
+ *
+ * codex 0.154.0 appends two things to the bar the pattern above was written for,
+ * measured in the #2592 UAT (`tests/fixtures/agent-mode-2592/codex-*.txt`, row 40):
+ *
+ *   `  gpt-6-astra medium · ~/uat3-…/sandbox-repo · Reply with one word          Plan mode (shift+tab to cycle)`
+ *   `  gpt-6-astra xhigh · ~/uat3-…/sandbox-repo · Reply with one word`
+ *   `  gpt-6-astra medium · ~/uat3-…/sandbox-repo                                Plan mode (shift+tab to cycle)`
+ *
+ * — a `·` segment carrying the thread's title once the first turn has named it,
+ * and the right-aligned Plan-mode badge. `CODEX_STATUS_BAR_PATTERN` requires the
+ * row to END in the path, so every one of these read as "no status bar", and the
+ * model / effort latched from the one bar codex draws before the first turn
+ * (`xhigh`) stayed on screen for the rest of the session. That is how #2592's
+ * UAT found it: Plan mode moves codex to `medium`, the pane said so, and the UI
+ * kept saying `xhigh`.
+ *
+ * Deliberately a SECOND pattern here rather than a widened
+ * `CODEX_STATUS_BAR_PATTERN`. That one is the footer boundary the codex
+ * running/idle rules are windowed on (#1150), and the module docblock's rule —
+ * this module must never be the reason that boundary moves — stands. Widening a
+ * value reader cannot change a status verdict; widening the boundary can.
+ *
+ * The shape: head segment (`<model>[ <effort>]`), `·`, a path, then EITHER a
+ * further `·` segment OR a column gap (two spaces) before right-aligned text.
+ * The trailer must start at one of those two places, so a path followed by a
+ * single space and prose is still not a bar. {@link readCodexFooter}'s
+ * digit-or-effort check applies to rows matched either way.
+ *
+ * No /g. No nested quantifiers: `[^·]*` stops at the first `·`, and the two
+ * trailer alternatives each start with a literal or a fixed-width gap.
+ */
+exports.CODEX_STATUS_BAR_WITH_TRAILER_PATTERN = /^\s*\S[^·]*·\s*~?\/\S*(?:\s*·[^\n]*|[^\S\n]{2,}\S[^\n]*)$/;
 function readCodexFooter(line) {
     // Same "is this the status bar" question the detector asks, answered by the
     // same pattern (#1150). Imported read-only: this module must never be the
-    // reason that boundary moves.
-    if (!cli_patterns_1.CODEX_STATUS_BAR_PATTERN.test(line))
+    // reason that boundary moves. Issue #2592 adds the trailer-bearing shape as a
+    // second, extractor-local reading — see CODEX_STATUS_BAR_WITH_TRAILER_PATTERN.
+    if (!cli_patterns_1.CODEX_STATUS_BAR_PATTERN.test(line) && !exports.CODEX_STATUS_BAR_WITH_TRAILER_PATTERN.test(line)) {
         return null;
+    }
     const separator = line.indexOf('·');
     if (separator < 0)
         return null;

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

@@ -5,6 +5,7 @@ exports.APPROVAL_TARGET_MAX_LOOKBACK = void 0;
 exports.findClaudeTaskPanelLines = findClaudeTaskPanelLines;
 exports.findClaudeChrome = findClaudeChrome;
 exports.maskClaudeChrome = maskClaudeChrome;
+exports.isTypedTextFieldOption = isTypedTextFieldOption;
 exports.findApprovalContextStart = findApprovalContextStart;
 exports.joinApprovalTarget = joinApprovalTarget;
 exports.buildMultipleChoiceResult = buildMultipleChoiceResult;
@@ -410,6 +411,49 @@ 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
+ * 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`);
+ * `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));
+}
 // ============================================================================
 // Helper functions
 // ============================================================================

package/dist/server/src/lib/detection/tools/antigravity/detect.js CHANGED Viewed

@@ -163,6 +163,15 @@ exports.antigravityStatusDetector = (0, run_detection_1.createToolStatusDetector
             };
         }
         // Idle: bare "> " input prompt visible and the response has completed.
+        //
+        // Issue #2592: "bare" includes the permission-mode banner agy paints into
+        // an EMPTY box while accept-edits / plan is on (`> Plan mode: research &
+        // plan only (shift+tab to cycle)`) — `promptPattern` accepts it, see
+        // ANTIGRAVITY_COMPOSER_MODE_BANNER_PATTERN. Without that, a resting pane in
+        // either mode reached the `default` floor as `running` + unclassified, and
+        // the mode button (which refuses unclassified frames) could switch INTO
+        // accept-edits once and never back out. The thinking check above still runs
+        // first, so a generating pane in those modes is still `running`.
         const { promptPattern } = (0, cli_patterns_1.getCliToolPatterns)('antigravity');
         if (promptPattern.test(frame.lastLines)) {
             return {

package/dist/server/src/lib/detection/tools/command-code/detect.js CHANGED Viewed

@@ -51,9 +51,14 @@
  * branch below publishes `'positive'` outright rather than through
  * `resolveIdleEvidence`, so a rule added without changing that would never run.
  *
- * No `detectDialog` either: Epic #2249 決定 3 keeps Auto-Yes on the legacy
- * numbered-response path, because Command Code fires `PreToolUse` AFTER the
- * dialog is answered, so a hook-driven permission decision cannot dismiss it.
+ * Epic #2249 決定 3 keeps Auto-Yes on the legacy numbered-response path,
+ * because Command Code fires `PreToolUse` AFTER the dialog is answered, so a
+ * hook-driven permission decision cannot dismiss it. That is why this module
+ * had no `detectDialog` until Issue #2574 — and why the one it has now does not
+ * touch that decision. `./permission.ts` declares how the permission dialog
+ * takes an answer (`numbered`, and a digit that commits without an Enter), which
+ * is what `sendPromptAnswer` reads; the Auto-Yes gate still does not judge this
+ * tool, because its rollout row stays `legacy`.
  *
  * Issue #2369 added a second `afterPrompt` branch for the other screen the
  * shared chain could not read: the `/usage` panel, whose last row is
@@ -123,6 +128,7 @@ exports.commandCodeStatusDetector = exports.VERIFIED_AGAINST = void 0;
 const cli_patterns_1 = require("../../cli-patterns");
 const selection_shape_1 = require("../../selection-shape");
 const dialog_1 = require("./dialog");
+const permission_1 = require("./permission");
 const status_reason_1 = require("../../status-reason");
 const run_detection_1 = require("../run-detection");
 const verified_against_1 = require("../verified-against");
@@ -257,6 +263,11 @@ exports.commandCodeStatusDetector = (0, run_detection_1.createToolStatusDetector
         }
         return null;
     },
+    // Issue #2574: the permission dialog's answer mode, for the sender. Not an
+    // Auto-Yes gate — see the module docblock and `./permission.ts`.
+    detectDialog(frame) {
+        return (0, permission_1.detectCommandCodePermissionDialog)(frame);
+    },
     afterThinking(frame) {
         // The composer is drawn throughout a turn, so "running" has to be resolved
         // before the generic composer check can say "ready". Widened window; see the