commandmate 0.26.0 → 0.27.0

package/dist/server/src/lib/cli-tools/submit-verified-sender.js

@@ -38,16 +38,34 @@
  * behind (detonating on the next send). The decision is now three-valued —
  * submitted / pending / replaced — and a `replaced` verdict clears the input
  * line and THROWS instead of resending Enter (see classifySubmit).
+ *
+ * Issue #1880 closes the hole on the OTHER side of the send. Everything above
+ * verifies what happens after Enter; nothing looked at what was already in the
+ * composer before the body was typed. `sendKeys` injects the body as plain
+ * keystrokes at the TUI's CURRENT CURSOR POSITION, so residual text is spliced
+ * into the body instead of being replaced by it. #1878 measured four shapes of
+ * that damage: content mutation (`echo PREFILLED` + body), slash-command
+ * demotion (a `/cost` body typed after residual is no longer `/`-initial),
+ * order inversion when the cursor sat at column 0, and — worst — total loss of
+ * the body when the RESIDUAL started with `/` (`/costZZTOP…` is an
+ * `Unknown command`, so the message never reaches the model at all). All four
+ * reported `exit 0` / `Message sent.` / `sessionStatus: ready`, i.e. they were
+ * indistinguishable from a clean send by every signal a caller has. The
+ * composer is therefore emptied and read back BEFORE the body is typed — see
+ * {@link clearComposerBeforeSend}.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.classifySubmit = classifySubmit;
 exports.isSubmitted = isSubmitted;
+exports.clearComposerBeforeSend = clearComposerBeforeSend;
 exports.sendMessageWithSubmitVerification = sendMessageWithSubmitVerification;
 const tmux_1 = require("../tmux/tmux");
 const tmux_capture_cache_1 = require("../tmux/tmux-capture-cache");
+const composer_spec_1 = require("./composer-spec");
 const cli_patterns_1 = require("../detection/cli-patterns");
 const cli_tool_timing_config_1 = require("../../config/cli-tool-timing-config");
 const logger_1 = require("../../lib/logger");
+const composer_clear_1 = require("../../lib/session/composer-clear");
 const logger = (0, logger_1.createLogger)('cli-tools/submit-verified-sender');
 /**
  * Version-resilient pasted-text placeholder.
@@ -72,13 +90,77 @@ const PASTE_PLACEHOLDER_PATTERN = /\[Pasted text[\s#]/;
  */
 const REPLACEMENT_COMMAND_PATTERN = /^\/[A-Za-z]/;
 /**
- * Prompt input-line markers across the supported TUIs.
+ * Prompt input-line markers across the marker-drawing TUIs.
  * claude/gemini/copilot: `>` or `❯`; codex: `›`; antigravity: `>`;
  * vibe-local: `ctx:N% ❯`. Leading whitespace is tolerated (tmux padding).
+ *
+ * Issue #1906 scopes this to the tools whose {@link ComposerSpec.reader} is
+ * `input-line-marker`. opencode draws no marker at all, so applying it there was
+ * wrong in both directions — see {@link readComposer}.
  */
 const INPUT_LINE_MARKER = /^\s*(?:ctx:\d+%\s*)?[>❯›]/;
-/** Lines of pane tail to inspect when verifying submit. */
+/**
+ * Lines of pane tail to inspect for the "is the tool generating?" signal.
+ *
+ * Distinct from `ComposerSpec.verifyCaptureLines`, which sizes the tmux
+ * capture: the busy marker of every tool lives in a status bar pinned to the
+ * bottom of the pane, so it is read from a short tail even when the capture
+ * itself is opencode's whole 200-row frame. Widening it to that frame would
+ * match `esc interrupt` printed inside a reply.
+ */
 const VERIFY_WINDOW_LINES = 12;
+/**
+ * Read the composer out of a captured frame.
+ *
+ * Two readers, because the two families of TUI say "this is the input line" in
+ * incompatible ways:
+ *
+ * - **marker tools** (`reader: 'input-line-marker'`) draw a `>` / `❯` / `›` at
+ *   the start of the row. Scanned bottom-up over the tail window so a status bar
+ *   below the box does not hide it.
+ * - **opencode** draws a box with a gutter and no marker anywhere. Its buffer
+ *   rows are located structurally by {@link findOpenCodeComposerRows} (#1911's
+ *   chrome walk), and `Ask anything...` inside that box is opencode's own way of
+ *   saying the buffer is empty (#1883) rather than a row of text.
+ *
+ * Before this split, opencode went through the marker reader, which is wrong
+ * both ways round. It never matched opencode's composer, so EVERY opencode send
+ * was classified `submitted` without evidence — #1471's "the Enter was
+ * swallowed" recovery has never once run on opencode. And when a `>` did land in
+ * the window from somewhere else (a Markdown quote in a reply), the reader
+ * treated that row as the input line and answered from it.
+ *
+ * Issue #1933 turned "which reader" from a `cliToolId === 'opencode'` test plus
+ * a set membership test into {@link ComposerSpec.reader}, so the answer is one
+ * declaration the tool owns rather than two tables a new tool has to be added
+ * to. `unreadable` is the third arm, and it is the one #1906 found opencode
+ * silently occupying: it means every send is classified `submitted` without
+ * evidence, so it is a state to declare knowingly, never to fall into.
+ */
+function readComposer(reader, lines, windowLines) {
+    if (reader === 'opencode-box') {
+        const rows = (0, cli_patterns_1.findOpenCodeComposerRows)(lines);
+        if (rows === null)
+            return { kind: 'absent' };
+        // The placeholder is painted only while the buffer is empty, and only
+        // inside the box — hence matched on the raw, still-guttered row (#1883).
+        if (rows.some((row) => cli_patterns_1.OPENCODE_IDLE_COMPOSER_PATTERN.test(row)))
+            return { kind: 'empty' };
+        const first = rows.map(cli_patterns_1.stripOpenCodeGutter).find((row) => row.length > 0);
+        if (first === undefined)
+            return { kind: 'empty' };
+        return { kind: 'text', text: first, rows };
+    }
+    if (reader !== 'input-line-marker')
+        return { kind: 'absent' };
+    const inputLine = findInputLine(windowLines);
+    if (inputLine === null)
+        return { kind: 'absent' };
+    const stripped = stripInputMarker(inputLine);
+    if (stripped.length === 0)
+        return { kind: 'empty' };
+    return { kind: 'text', text: stripped, rows: [inputLine] };
+}
 /** Default bounded read-back attempts before giving up (throwing). */
 const DEFAULT_VERIFY_ATTEMPTS = 4;
 /**
@@ -136,47 +218,59 @@ function inputMatchesBody(strippedInput, message) {
  *
  * Version-independent by design — does NOT require the paste placeholder:
  *   A. The tool is generating a response              -> submitted.
- *   B. No input line, or the input line is empty       -> submitted.
- *   C. A paste placeholder is folded on the input line -> pending (Enter eaten).
- *   D. The body is still verbatim on the input line    -> pending (resend Enter).
- *   E. A DIFFERENT slash command is on the input line  -> replaced (TUI popup
+ *   B. No composer, or the composer is empty           -> submitted.
+ *   C. A paste placeholder is folded in the composer   -> pending (Enter eaten).
+ *   D. The body is still verbatim in the composer      -> pending (resend Enter).
+ *   E. A DIFFERENT slash command is in the composer    -> replaced (TUI popup
  *      autocompleted the command; clear the line and throw, never resend Enter).
  *   F. Any other non-empty text (idle placeholder/hint) -> submitted (unchanged
  *      pre-#1501 permissive default, so normal sends never spuriously fail).
  *
- * C–F are scoped to the input line only, so the user-message echo that a TUI
+ * C–F are scoped to the composer only, so the user-message echo that a TUI
  * prints into its history above the prompt never causes a false verdict.
+ *
+ * Issue #1906: "the composer" is read per tool by {@link readComposer} rather
+ * than by looking for a `>` in the last twelve rows. For opencode — which draws
+ * no marker — that read was unreachable, so every send reached F (in fact B) and
+ * this function has never returned anything but `submitted` for it.
+ *
+ * @param output - Captured pane, ANSI intact. For opencode this must be the
+ *   whole pane; {@link ComposerSpec.verifyCaptureLines} is what asks tmux for it.
+ * @param cliToolId - CLI tool id, for the "generating" detector
+ * @param message - The body that was typed
+ * @param composer - The tool's composer description (Issue #1933). Defaults to
+ *   the tool's own, so every existing three-argument caller is unchanged.
  */
-function classifySubmit(output, cliToolId, message) {
+function classifySubmit(output, cliToolId, message, composerSpec = (0, composer_spec_1.resolveComposerSpec)(cliToolId)) {
     const clean = (0, cli_patterns_1.stripAnsi)(output);
-    const windowLines = clean.split('\n').slice(-VERIFY_WINDOW_LINES);
+    const lines = clean.split('\n');
+    const windowLines = lines.slice(-VERIFY_WINDOW_LINES);
     const windowStr = windowLines.join('\n');
-    // A. Actively generating a response => the message was accepted.
+    // A. Actively generating a response => the message was accepted. Read from the
+    //    tail window for every tool: each one's busy marker lives in a status bar
+    //    pinned to the bottom of the pane, and widening it to opencode's whole
+    //    frame would match `esc interrupt` printed inside a reply.
     if ((0, cli_patterns_1.detectThinking)(cliToolId, windowStr)) {
         return 'submitted';
     }
-    const inputLine = findInputLine(windowLines);
-    // B. No input line visible => the prompt scrolled off / moved on => submitted.
-    if (!inputLine) {
-        return 'submitted';
-    }
-    const strippedInput = stripInputMarker(inputLine);
-    // B. Empty input line => the message left the box => submitted.
-    if (strippedInput.length === 0) {
+    const composer = readComposer(composerSpec.reader, lines, windowLines);
+    // B. No composer visible (scrolled off / dialog / still starting), or the
+    //    composer is empty => the message left the box => submitted.
+    if (composer.kind !== 'text') {
         return 'submitted';
     }
-    // C. A paste placeholder is still folded on the input line => body is there.
-    if (PASTE_PLACEHOLDER_PATTERN.test(inputLine)) {
+    // C. A paste placeholder is still folded into the composer => body is there.
+    if (composer.rows.some((row) => PASTE_PLACEHOLDER_PATTERN.test(row))) {
         return 'pending';
     }
-    // D. The typed body is still sitting on the input line => resend Enter.
-    if (inputMatchesBody(strippedInput, message)) {
+    // D. The typed body is still sitting in the composer => resend Enter.
+    if (inputMatchesBody(composer.text, message)) {
         return 'pending';
     }
-    // E. A different slash command is on the input line => a completion popup
+    // E. A different slash command is in the composer => a completion popup
     //    replaced what we typed. (Scoped to `/…` so idle-prompt placeholders that
     //    some TUIs paint on an empty composer are never mistaken for this.)
-    if (REPLACEMENT_COMMAND_PATTERN.test(strippedInput)) {
+    if (REPLACEMENT_COMMAND_PATTERN.test(composer.text)) {
         return 'replaced';
     }
     // F. Non-empty, non-command steady-state text (idle placeholder / hint) =>
@@ -187,8 +281,84 @@ function classifySubmit(output, cliToolId, message) {
  * Backward-compatible boolean view of {@link classifySubmit}: submitted vs not.
  * A `replaced` verdict is NOT "submitted", so this returns false for it too.
  */
-function isSubmitted(output, cliToolId, message) {
-    return classifySubmit(output, cliToolId, message) === 'submitted';
+function isSubmitted(output, cliToolId, message, composerSpec = (0, composer_spec_1.resolveComposerSpec)(cliToolId)) {
+    return classifySubmit(output, cliToolId, message, composerSpec) === 'submitted';
+}
+/**
+ * Empty the composer before the body is typed into it (Issue #1880).
+ *
+ * Delegates the how to {@link clearComposer} (#1879), which already sends
+ * `C-e`+`C-u` — the `C-e` is what makes a column-0 cursor clearable — in a
+ * read-back-verified loop, so a multi-row residual is not left half-eaten and
+ * claude's dim ghost suggestions do not spin it to its cap. This function is the
+ * policy layer on top: which tools take part, and which outcomes are failures.
+ *
+ * Exactly one outcome is a failure: **a participating tool still reporting
+ * `content` after the pass cap**. That is a composer this code demonstrably
+ * could not empty, so typing into it would splice the body into whatever is
+ * there and then report success — the defect #1880 exists to remove. Everything
+ * else proceeds:
+ *
+ *   - `unsupported_tool` — never reached (a tool only enters this path when
+ *     its `ComposerSpec.clearBeforeSend` is true),
+ *     but it means "this layer cannot read that box", not "the box is dirty".
+ *   - `no_composer` — the input box is not on screen (a full-screen dialog, a
+ *     pager, a session still starting). Nothing was inspected and nothing was
+ *     sent; refusing here would invent a second way for sends to stall, on a
+ *     frame that carries no evidence of residual text. On codex this is also the
+ *     verdict for every dialog frame, which is what keeps a `C-e`+`C-u` volley
+ *     off an approval screen (Issue #1890).
+ *   - `empty` / `ghost` — verified clean, with or without passes.
+ *
+ * A throw from {@link clearComposer} itself is a tmux failure (`capture-pane` or
+ * `send-keys` returned non-zero) and is deliberately NOT caught: the very next
+ * thing this module does is drive the same tmux binary against the same session,
+ * and swallowing it would mean typing into a composer whose contents are
+ * unknown while still reporting success.
+ *
+ * Which tools take part is {@link ComposerSpec.clearBeforeSend} since Issue
+ * #1933. The gate is `extractComposerText`'s reach, not a preference: it
+ * short-circuits every unmeasured tool to `unsupported_tool`, so for
+ * gemini/copilot/opencode/vibe-local/antigravity {@link clearComposer} can never
+ * observe an empty box and always returns `cleared: false`. Reading that as "the
+ * clear failed" and refusing to send would take every one of those tools offline
+ * while claude kept working and the unit tests stayed green — so those tools do
+ * not enter the clear path at all: no read-back capture, no `C-e`+`C-u`, no new
+ * failure mode. Byte-for-byte the pre-#1880 send. codex joined in #1890, and the
+ * fix there was to measure codex's input box, not to relax the gate: adding the
+ * next tool means a live 200x1000 capture of its box, its idle placeholder and
+ * its dialogs, pinned as fixtures.
+ *
+ * @throws Error when the composer still holds text after the pass cap.
+ */
+async function clearComposerBeforeSend(sessionName, cliToolId, composerSpec = (0, composer_spec_1.resolveComposerSpec)(cliToolId)) {
+    if (!composerSpec.clearBeforeSend)
+        return;
+    const result = await (0, composer_clear_1.clearComposer)(sessionName, cliToolId);
+    if (result.state === 'content') {
+        logger.error('pre-send-composer-clear-failed', {
+            sessionName,
+            cliToolId,
+            passes: result.passes,
+            remainingLength: result.remainingText.length,
+            remainingText: result.remainingText,
+        });
+        throw new Error(`Composer for session ${sessionName} still holds unsent text after ${result.passes} clear passes; ` +
+            'refusing to type the message, which would be concatenated with it (Issue #1880).');
+    }
+    if (result.passes > 0) {
+        // The only record of what was thrown away. `remainingText` is the FINAL
+        // read and is empty on this path by definition, which is why clearComposer
+        // reports `discardedText` separately.
+        logger.warn('pre-send-composer-cleared', {
+            sessionName,
+            cliToolId,
+            passes: result.passes,
+            state: result.state,
+            discardedLength: result.discardedText.length,
+            discardedText: result.discardedText,
+        });
+    }
 }
 /**
  * Type a message body and submit it, then verify the submit actually happened.
@@ -203,9 +373,22 @@ function isSubmitted(output, cliToolId, message) {
  * @throws Error when submit cannot be confirmed within the bounded attempts.
  */
 async function sendMessageWithSubmitVerification(params) {
-    const { sessionName, message, cliToolId, textInputWaitMs = cli_tool_timing_config_1.TUI_TEXT_INPUT_WAIT_MS, submitEnterCount = 1, interEnterWaitMs = cli_tool_timing_config_1.TUI_TEXT_INPUT_WAIT_MS, verifyAttempts = DEFAULT_VERIFY_ATTEMPTS, verifyDelayMs = cli_tool_timing_config_1.TUI_MESSAGE_PROCESSED_WAIT_MS, } = params;
+    const { sessionName, message, cliToolId, composer = (0, composer_spec_1.resolveComposerSpec)(cliToolId), textInputWaitMs = cli_tool_timing_config_1.TUI_TEXT_INPUT_WAIT_MS, interEnterWaitMs = cli_tool_timing_config_1.TUI_TEXT_INPUT_WAIT_MS, verifyAttempts = DEFAULT_VERIFY_ATTEMPTS, verifyDelayMs = cli_tool_timing_config_1.TUI_MESSAGE_PROCESSED_WAIT_MS, } = params;
+    const submitEnterCount = params.submitEnterCount ?? composer.submitEnterCount;
+    // 0. Empty the composer first (Issue #1880). The body below is typed at the
+    //    TUI's current cursor position, so anything already in the box would be
+    //    spliced into it. Throws for a claude composer that could not be emptied.
+    await clearComposerBeforeSend(sessionName, cliToolId, composer);
     // 1. Type the body only — never send Enter in the same tmux command.
-    await (0, tmux_1.sendKeys)(sessionName, message, false);
+    //
+    //    `{ literal: true }` is Issue #1933 受入条件 S9 and it is not decoration.
+    //    `tmux send-keys` resolves its argument against the key table first, so
+    //    until this flag existed a message body of exactly `Escape` interrupted
+    //    the agent (`1b`), `Enter` submitted an empty composer (`0d`) and `C-c`
+    //    sent SIGINT — and a body starting with `-` was eaten by getopt and sent
+    //    nowhere at all, with `rc 0`. All four measured on tmux 3.5a; the argv is
+    //    built in `lib/tmux/key-sequence.ts`, which carries the table.
+    await (0, tmux_1.sendKeys)(sessionName, message, false, { literal: true });
     // 2. Let the TUI register the input before pressing Enter.
     await new Promise((resolve) => setTimeout(resolve, textInputWaitMs));
     // 3. Submit as a separate command (double Enter for vibe-local's IME mode).
@@ -220,8 +403,8 @@ async function sendMessageWithSubmitVerification(params) {
     const attempts = Math.max(1, verifyAttempts);
     for (let attempt = 0; attempt < attempts; attempt++) {
         await new Promise((resolve) => setTimeout(resolve, verifyDelayMs));
-        const output = await (0, tmux_1.capturePane)(sessionName, { startLine: -VERIFY_WINDOW_LINES });
-        const state = classifySubmit(output, cliToolId, message);
+        const output = await (0, tmux_1.capturePane)(sessionName, { startLine: -composer.verifyCaptureLines });
+        const state = classifySubmit(output, cliToolId, message, composer);
         if (state === 'submitted') {
             (0, tmux_capture_cache_1.invalidateCache)(sessionName);
             return;

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

@@ -5,6 +5,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OLLAMA_MODEL_PATTERN = exports.VIBE_LOCAL_CONTEXT_WINDOW_MAX = exports.VIBE_LOCAL_CONTEXT_WINDOW_MIN = exports.CLI_TOOL_DISPLAY_NAMES = exports.MAX_INSTANCE_ID_LENGTH = exports.INSTANCE_ID_PATTERN = exports.MAX_AGENT_ALIAS_LENGTH = exports.MAX_AGENT_INSTANCES = exports.CLI_TOOL_IDS = void 0;
 exports.usesAlternateScreen = usesAlternateScreen;
+exports.capturedLineCountIsCursor = capturedLineCountIsCursor;
 exports.isValidInstanceId = isValidInstanceId;
 exports.getPrimaryInstanceId = getPrimaryInstanceId;
 exports.isPrimaryInstance = isPrimaryInstance;
@@ -54,6 +55,46 @@ const ALTERNATE_SCREEN_CLI_TOOLS = new Set([
 function usesAlternateScreen(cliToolId) {
     return ALTERNATE_SCREEN_CLI_TOOLS.has(cliToolId);
 }
+/**
+ * Whether a stored `last_captured_line` still indexes into THIS capture, i.e.
+ * whether it may be used as a "how far have I read" cursor (Issue #1910).
+ *
+ * Two independent things pin a captured line count so it stops growing with the
+ * transcript, and a caller that slices at the stored cursor has to survive both:
+ *
+ *  - **the tool renders in the alternate screen** ({@link usesAlternateScreen}):
+ *    tmux keeps no scrollback, every capture returns exactly `pane_height` rows,
+ *    and the count is pinned there from the very first frame (Issue #1268);
+ *  - **the capture window saturated** (`isCaptureWindowSaturated` in
+ *    `lib/tmux/tmux-capture-cache.ts`): the pane outgrew the sliding window the
+ *    capture is taken through, so the count is pinned at the window size and the
+ *    window merely slides (Issue #1670).
+ *
+ * Either one makes a previously stored index denote a different line — or no
+ * line at all — so `lines.slice(cursor)` silently yields nothing. That is
+ * Issue #1910: `commandmate capture <id>` printed a single empty byte for every
+ * alternate-screen session that had taken one turn, because the poller had
+ * stored the pane height (1000 on copilot / claude, 200 on opencode) and the
+ * next frame is exactly that many rows.
+ *
+ * A caller that reads `false` must fall back to the WHOLE capture: repeating
+ * rows the reader has already seen is harmless, dropping new output is not.
+ *
+ * The two conditions are stated together here rather than at each call site
+ * because they are one rule — "is the count a cursor?" — reached from two
+ * sides, and #1670 fixed only the second one in
+ * `src/lib/session/current-output-builder.ts` while `src/lib/polling/
+ * response-checker.ts` (which spells the same expression inline as
+ * `lineCountIsCursor`) already had both. Folding that second copy in here is
+ * left to the next change that touches the poller.
+ *
+ * @param cliToolId - CLI tool the capture came from
+ * @param captureWindowSaturated - Whether this capture came back clipped by the window
+ * @returns True when the stored line count is still a usable cursor
+ */
+function capturedLineCountIsCursor(cliToolId, captureWindowSaturated) {
+    return !usesAlternateScreen(cliToolId) && !captureWindowSaturated;
+}
 // ============================================================================
 // Agent Instances (Issue #868: multi-session foundation)
 // ============================================================================

package/dist/server/src/lib/cli-tools/vibe-local.js

@@ -19,6 +19,7 @@ const db_instance_1 = require("../db/db-instance");
 const db_1 = require("../db");
 const logger_1 = require("../../lib/logger");
 const cli_tool_timing_config_1 = require("../../config/cli-tool-timing-config");
+const session_start_error_1 = require("../session/session-start-error");
 const logger = (0, logger_1.createLogger)('cli-tools/vibe-local');
 /**
  * Extract error message from unknown error type (DRY)
@@ -53,10 +54,10 @@ class VibeLocalTool extends base_1.BaseCLITool {
      * @param worktreeId - Worktree ID
      * @param worktreePath - Worktree path
      */
-    async startSession(worktreeId, worktreePath, instanceId) {
+    async launchSession(worktreeId, worktreePath, instanceId) {
         const vibeLocalAvailable = await this.isInstalled();
         if (!vibeLocalAvailable) {
-            throw new Error('vibe-local is not installed or not in PATH');
+            throw new session_start_error_1.SessionStartUnavailableError(this.name, 'vibe-local is not installed or not in PATH');
         }
         const sessionName = this.getSessionName(worktreeId, instanceId);
         const exists = await (0, tmux_1.hasSession)(sessionName);
@@ -129,7 +130,10 @@ class VibeLocalTool extends base_1.BaseCLITool {
                 sessionName,
                 message,
                 cliToolId: 'vibe-local',
-                submitEnterCount: 2,
+                // Issue #1933: the double Enter is `ComposerSpec.submitEnterCount`, so
+                // the IME quirk is declared once on the tool rather than re-passed by
+                // the one call site that knew about it.
+                composer: this.describeComposer(),
                 interEnterWaitMs: cli_tool_timing_config_1.VIBE_LOCAL_DOUBLE_ENTER_WAIT_MS,
             });
             // Issue #405: Invalidate cache after sending message

package/dist/server/src/lib/cmate-cli-tool-parser.js

@@ -29,8 +29,24 @@ const antigravity_constants_1 = require("../config/antigravity-constants");
  * This Set controls which tools accept the --model option in the CMATE.md schedule table.
  * vibe-local model is managed via DB (worktree.vibe_local_model), not CMATE.md.
  * To add CMATE.md --model support for a new tool, add it here (DR1-006).
+ *
+ * ## `opencode` (Issue #1914)
+ *
+ * `claude-executor.ts` has carried an `opencode run -m <model>` branch since
+ * Issue #379, and it had never once executed: the only caller that supplies a
+ * model for a schedule is `job-executor.resolveModelOption()`, which answered
+ * `undefined` for every tool but copilot and vibe-local, and the other reachable
+ * caller (`daily-summary-generator`) is gated by `SUMMARY_ALLOWED_TOOLS`, which
+ * has no opencode either. Adding the id here is one half of making that branch
+ * reachable; `resolveModelOption()` reads this Set for the other half, so the
+ * two cannot drift apart again.
+ *
+ * The value is passed through **verbatim** as `provider/model`, which is the
+ * format `opencode run --help` documents for `-m, --model` (measured on
+ * opencode 1.18.21). It is not prefixed with `ollama/` — see
+ * `buildCliArgs()` for why that prefix went away.
  */
-exports.TOOLS_WITH_MODEL_SUPPORT = new Set(['copilot']);
+exports.TOOLS_WITH_MODEL_SUPPORT = new Set(['copilot', 'opencode']);
 // =============================================================================
 // Parse Functions
 // =============================================================================
@@ -78,6 +94,18 @@ function parseCliToolColumn(raw) {
  * Validate a Copilot model name using the reject approach (no sanitization).
  * Shared between send API, CLI send, parser, and validator (DR1-003).
  *
+ * Issue #1914: this is also what validates an **opencode** `provider/model`
+ * value, and the pattern already fits — `MODEL_NAME_PATTERN` allows `/` and `:`
+ * and requires a leading alphanumeric, so `ollama/qwen3:8b` and
+ * `anthropic/claude-sonnet-4-5` pass while a leading `-` (the CLI-option
+ * injection case DR4-001 is about) does not. The name is kept because the export
+ * is reached from the send API and `commandmate send`, which are outside this
+ * Issue's scope; what is deliberately **not** added is a `provider/model` shape
+ * requirement. Two probes against opencode 1.18.21 in an isolated `HOME` — one
+ * with `-m totallynotaprovider/some-model`, one with `-m barewordmodel` — both
+ * exited 1 with the same opaque `UnknownError`, so the CLI gives no signal that
+ * would let this layer reject a bare name without guessing.
+ *
  * @param modelName - Model name to validate
  * @returns Validation result with optional reason for rejection
  */

package/dist/server/src/lib/cmate-parser.js

@@ -209,6 +209,9 @@ function parseSchedulesSection(rows) {
         // Validate permission against allowed values
         let allowedValues;
         switch (resolvedCliToolId) {
+            case 'claude':
+                allowedValues = schedule_config_1.CLAUDE_PERMISSIONS;
+                break;
             case 'codex':
                 allowedValues = schedule_config_1.CODEX_SANDBOXES;
                 break;
@@ -220,16 +223,21 @@ function parseSchedulesSection(rows) {
                 break;
             case 'gemini':
             case 'vibe-local':
-                // No permission flags for gemini/vibe-local; only empty string is valid
+            case 'opencode':
+            // Issue #1914: `default` sits with the no-flag tools, not with claude.
+            // It used to resolve to CLAUDE_PERMISSIONS, so `opencode` -- which has no
+            // permission flag at all -- accepted `acceptEdits`/`bypassPermissions`
+            // and handed them to a CLI that has no such option. A tool added to
+            // CLI_TOOL_IDS without its own case above now inherits "no permission
+            // flags" instead of Claude's --permission-mode vocabulary.
+            default:
+                // No permission flags for these tools; only empty string is valid
                 allowedValues = [];
                 if (permission) {
                     logger.warn('parse:permission-ignored', { name: sanitizedName, cliToolId: resolvedCliToolId, permission });
                     permission = '';
                 }
                 break;
-            default:
-                allowedValues = schedule_config_1.CLAUDE_PERMISSIONS;
-                break;
         }
         if (allowedValues.length > 0 && permission && !allowedValues.includes(permission)) {
             logger.warn('parse:invalid-permission', { name: sanitizedName, cliToolId: resolvedCliToolId, permission, defaultPermission });

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

@@ -12,7 +12,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setInProgressMessageId = exports.updateSessionState = exports.getSessionState = exports.getMessagesByDateRange = exports.ACTIVE_FILTER = exports.recordAnsweredPrompt = exports.markPendingPromptsAsAnswered = exports.updatePromptData = exports.getMessageById = exports.recomputeLastUserMessage = exports.clearLastUserMessage = exports.updateLastUserMessage = exports.deleteMessagesByInstance = exports.deleteMessagesByCliTool = exports.deleteMessageById = exports.deleteAllMessages = exports.getLastMessage = exports.getLastUserMessage = exports.getMessages = exports.updateMessageContent = exports.createMessage = exports.getLastAssistantMessageAt = exports.getAliasedWorktreeIds = exports.getAllWorktreeAliases = exports.getWorktreeAliases = exports.resolveWorktreeIdWithAlias = exports.recordWorktreeAlias = exports.deleteWorktreesByIds = exports.deleteRepositoryWorktrees = exports.migrateWorktreeIdPreservingChildren = exports.getAllWorktreePathIds = exports.getAllWorktreeIds = exports.getWorktreesByRepository = exports.getWorktreeIdsByRepository = exports.getInitialBranch = exports.saveInitialBranch = exports.updateVibeLocalContextWindow = exports.updateVibeLocalModel = exports.updateSelectedAgents = exports.updateCliToolId = exports.updateStatus = exports.updateFavorite = exports.updateLastViewedAt = exports.updateWorktreeLink = exports.updateWorktreeDescription = exports.upsertWorktree = exports.getWorktreeById = exports.getRepositories = exports.getWorktrees = exports.initDatabase = void 0;
 exports.createAssistantMessage = exports.updateAssistantConversation = exports.createAssistantConversation = exports.getAssistantConversationByRepositoryAndCliTool = exports.getAssistantConversationById = exports.updateDailyReportContent = exports.saveDailyReport = exports.getDailyReport = exports.recoverStuckSendingTimers = exports.clearTimerHistory = exports.cleanupOldTimers = exports.getPendingTimerCountByWorktree = exports.cancelTimersByWorktree = exports.cancelTimer = exports.updateTimerStatus = exports.getPendingTimers = exports.getTimerById = exports.getTimersByWorktree = exports.createTimer = exports.WORKTREE_TODO_STATUSES = exports.isWorktreeTodoStatus = exports.reorderWorktreeTodos = exports.deleteWorktreeTodo = exports.updateWorktreeTodo = exports.createWorktreeTodo = exports.getWorktreeTodoById = exports.getTodosByWorktreeId = exports.deleteTodo = exports.updateTodo = exports.createTodo = exports.getTodoById = exports.getAllTodos = exports.getTodosByRepositoryId = exports.MemoDbError = exports.reorderMemos = exports.deleteMemo = exports.updateMemo = exports.createMemo = exports.getMemoById = exports.getMemosByWorktreeId = exports.InvalidAgentInstanceError = exports.AgentInstanceLimitError = exports.removeAgentInstance = exports.addAgentInstance = exports.setAgentInstances = exports.countAgentInstances = exports.getAgentInstance = exports.getAgentInstances = exports.deleteSessionState = exports.clearInProgressMessageId = void 0;
-exports.listTaskEvents = exports.ACTIVE_TASK_STATUSES = exports.TERMINAL_TASK_STATUSES = exports.TASK_STATUSES = exports.isTerminalTaskStatus = exports.getActiveTaskForInstance = exports.getActiveTask = exports.listTasks = exports.getTask = exports.createTask = exports.VERIFICATION_GATE_SOURCES = exports.VERIFICATION_TRIGGERS = exports.MAX_RUN_HISTORY_DAYS = exports.MAX_RUN_HISTORY_LIMIT = exports.DEFAULT_RUN_HISTORY_LIMIT = exports.listVerificationRunsForPeriod = exports.listRunningVerificationRuns = exports.getRunningVerificationRun = exports.listVerificationRuns = exports.getVerificationRun = exports.finishGateResult = exports.createGateResult = exports.finishVerificationRun = exports.createVerificationRun = exports.deletePushSubscriptionByEndpoint = exports.updatePushSubscriptionPreferences = exports.getPushSubscriptionsForKind = exports.getAllPushSubscriptions = exports.getPushSubscriptionByEndpoint = exports.upsertPushSubscription = exports.deleteAssistantSessionState = exports.updateAssistantSessionState = exports.getAssistantSessionState = exports.listRunningAssistantExecutions = exports.getRunningAssistantExecutionByConversation = exports.getLatestAssistantExecutionByConversation = exports.getAssistantExecutionById = exports.updateAssistantExecution = exports.createAssistantExecution = exports.archiveAssistantMessagesFrom = exports.archiveAllAssistantMessages = exports.getAssistantMessageById = exports.getAssistantMessages = exports.updateAssistantMessageStatus = void 0;
+exports.listTaskEvents = exports.ACTIVE_TASK_STATUSES = exports.TERMINAL_TASK_STATUSES = exports.TASK_STATUSES = exports.isTerminalTaskStatus = exports.getActiveTaskForInstance = exports.getActiveTask = exports.listTasks = exports.getTask = exports.createTask = exports.VERIFICATION_GATE_SOURCES = exports.VERIFICATION_TRIGGERS = exports.MAX_RUN_HISTORY_DAYS = exports.MAX_RUN_HISTORY_LIMIT = exports.DEFAULT_RUN_HISTORY_LIMIT = exports.listVerificationRunsForPeriod = exports.listRunningVerificationRuns = exports.getRunningVerificationRun = exports.listVerificationRuns = exports.getVerificationRun = exports.finishGateResult = exports.createGateResult = exports.finishVerificationRun = exports.createVerificationRun = exports.NEW_SUBSCRIPTION_DEFAULTS = exports.deletePushSubscriptionByEndpoint = exports.updatePushSubscriptionPreferences = exports.countPushSubscriptionsForKind = exports.getPushSubscriptionsForKind = exports.getAllPushSubscriptions = exports.getPushSubscriptionByEndpoint = exports.upsertPushSubscription = exports.deleteAssistantSessionState = exports.updateAssistantSessionState = exports.getAssistantSessionState = exports.listRunningAssistantExecutions = exports.getRunningAssistantExecutionByConversation = exports.getLatestAssistantExecutionByConversation = exports.getAssistantExecutionById = exports.updateAssistantExecution = exports.createAssistantExecution = exports.archiveAssistantMessagesFrom = exports.archiveAllAssistantMessages = exports.getAssistantMessageById = exports.getAssistantMessages = exports.updateAssistantMessageStatus = void 0;
 // init-db
 var init_db_1 = require("./init-db");
 Object.defineProperty(exports, "initDatabase", { enumerable: true, get: function () { return init_db_1.initDatabase; } });
@@ -158,8 +158,12 @@ Object.defineProperty(exports, "upsertPushSubscription", { enumerable: true, get
 Object.defineProperty(exports, "getPushSubscriptionByEndpoint", { enumerable: true, get: function () { return push_subscriptions_db_1.getPushSubscriptionByEndpoint; } });
 Object.defineProperty(exports, "getAllPushSubscriptions", { enumerable: true, get: function () { return push_subscriptions_db_1.getAllPushSubscriptions; } });
 Object.defineProperty(exports, "getPushSubscriptionsForKind", { enumerable: true, get: function () { return push_subscriptions_db_1.getPushSubscriptionsForKind; } });
+// Issue #2001: how many devices are in the acting bucket, without reading them.
+Object.defineProperty(exports, "countPushSubscriptionsForKind", { enumerable: true, get: function () { return push_subscriptions_db_1.countPushSubscriptionsForKind; } });
 Object.defineProperty(exports, "updatePushSubscriptionPreferences", { enumerable: true, get: function () { return push_subscriptions_db_1.updatePushSubscriptionPreferences; } });
 Object.defineProperty(exports, "deletePushSubscriptionByEndpoint", { enumerable: true, get: function () { return push_subscriptions_db_1.deletePushSubscriptionByEndpoint; } });
+// Issue #2000: the per-kind state a *new* subscription is created with.
+Object.defineProperty(exports, "NEW_SUBSCRIPTION_DEFAULTS", { enumerable: true, get: function () { return push_subscriptions_db_1.NEW_SUBSCRIPTION_DEFAULTS; } });
 // verification-db (verification gate runs, Issue #1542)
 var verification_db_1 = require("./verification-db");
 Object.defineProperty(exports, "createVerificationRun", { enumerable: true, get: function () { return verification_db_1.createVerificationRun; } });

package/dist/server/src/lib/db/migrations/v41-push-subscriptions.js

@@ -5,6 +5,17 @@
  * One row per browser push subscription (device). `endpoint` is the natural key
  * (unique) used for upsert and for 410-Gone auto-removal. Per-type toggles let a
  * device opt in/out of "prompt waiting" and "completion" notifications independently.
+ *
+ * Issue #2000 — do not read `enabled_completion DEFAULT 1` as the product default.
+ * `upsertPushSubscription()` is the only INSERT into this table and it binds both
+ * toggle columns explicitly, so neither DEFAULT is ever applied. The live default
+ * for a new subscription is `NEW_SUBSCRIPTION_DEFAULTS` in
+ * `src/lib/db/push-subscriptions-db.ts`, which #2000 set to
+ * `enabledCompletion: false`. The declaration is left at 1 on purpose: SQLite
+ * cannot ALTER a column default, so changing it means rebuilding the table and
+ * copying every row — real risk to live subscriptions, bought for a value nothing
+ * reads. Changing it would also NOT have moved existing rows, which is what the
+ * adjudication on #2000 required.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.v41_migrations = void 0;

package/dist/server/src/lib/db/push-subscriptions-db.js

@@ -8,13 +8,54 @@
  * be logged — callers pass these straight through without logging.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.NEW_SUBSCRIPTION_DEFAULTS = void 0;
 exports.upsertPushSubscription = upsertPushSubscription;
 exports.getPushSubscriptionByEndpoint = getPushSubscriptionByEndpoint;
 exports.getAllPushSubscriptions = getAllPushSubscriptions;
 exports.getPushSubscriptionsForKind = getPushSubscriptionsForKind;
+exports.countPushSubscriptionsForKind = countPushSubscriptionsForKind;
 exports.updatePushSubscriptionPreferences = updatePushSubscriptionPreferences;
 exports.deletePushSubscriptionByEndpoint = deletePushSubscriptionByEndpoint;
 const crypto_1 = require("crypto");
+/**
+ * Which stored toggle governs each kind (Issue #2000).
+ *
+ * The table keeps two columns on purpose. The Issue's own proposal is two
+ * buckets — "you need to act" and "for information" — and a prompt waiting, a
+ * failed verification, an upstream fault and a session that could not start are
+ * all the first one. A third column would have to be migrated, surfaced in the
+ * UI and explained, to split a bucket nobody has asked to split. Written as an
+ * exhaustive Record so a new kind fails the type check here rather than
+ * silently landing in the completion bucket.
+ */
+const KIND_COLUMN = {
+    prompt: 'enabled_prompt',
+    failure: 'enabled_prompt',
+    completion: 'enabled_completion',
+};
+/**
+ * Per-kind state a **newly created** subscription starts in (Issue #2000).
+ *
+ * `enabledCompletion: false` is the whole of the Issue's default change. It is
+ * applied here, in the INSERT, and NOT as a schema DEFAULT or a migration:
+ *
+ *  - the INSERT below has always bound these two columns explicitly, so the
+ *    `DEFAULT 1` v41 declares is dead code on this path (measured: it is the
+ *    only INSERT into this table in `src/`);
+ *  - existing rows must not move. Turning a live subscriber's completions off
+ *    behind their back reads as "notifications broke", which is indistinguishable
+ *    from a genuine fault. The adjudication on Issue #2000 is explicit: new
+ *    subscriptions only, existing rows untouched.
+ *
+ * The `ON CONFLICT` clause below preserves per-type preferences, so a device
+ * that re-subscribes with the same endpoint keeps whatever it had — the new
+ * default reaches an existing reader only when their endpoint changes (another
+ * browser, another device, or a full unsubscribe/re-register).
+ */
+exports.NEW_SUBSCRIPTION_DEFAULTS = {
+    enabledPrompt: true,
+    enabledCompletion: false,
+};
 function mapRow(row) {
     return {
         id: row.id,
@@ -50,14 +91,14 @@ function upsertPushSubscription(db, input) {
       id, endpoint, p256dh, auth, device_label,
       enabled_prompt, enabled_completion, locale, created_at, updated_at
     )
-    VALUES (?, ?, ?, ?, ?, 1, 1, ?, ?, ?)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     ON CONFLICT(endpoint) DO UPDATE SET
       p256dh = excluded.p256dh,
       auth = excluded.auth,
       device_label = excluded.device_label,
       locale = COALESCE(excluded.locale, push_subscriptions.locale),
       updated_at = excluded.updated_at
-  `).run((0, crypto_1.randomUUID)(), input.endpoint, input.p256dh, input.auth, deviceLabel, locale, now, now);
+  `).run((0, crypto_1.randomUUID)(), input.endpoint, input.p256dh, input.auth, deviceLabel, exports.NEW_SUBSCRIPTION_DEFAULTS.enabledPrompt ? 1 : 0, exports.NEW_SUBSCRIPTION_DEFAULTS.enabledCompletion ? 1 : 0, locale, now, now);
     const record = getPushSubscriptionByEndpoint(db, input.endpoint);
     if (!record) {
         throw new Error('Failed to persist push subscription');
@@ -80,12 +121,28 @@ function getAllPushSubscriptions(db) {
 }
 /** Subscriptions that have opted into a given notification kind. */
 function getPushSubscriptionsForKind(db, kind) {
-    const column = kind === 'prompt' ? 'enabled_prompt' : 'enabled_completion';
+    const column = KIND_COLUMN[kind];
     const rows = db
         .prepare(`SELECT ${SELECT_COLUMNS} FROM push_subscriptions WHERE ${column} = 1 ORDER BY created_at ASC`)
         .all();
     return rows.map(mapRow);
 }
+/**
+ * How many subscriptions have opted into a given kind (Issue #2001).
+ *
+ * Separate from {@link getPushSubscriptionsForKind} because the cross-device
+ * dismissal asks a question about the *fleet*, not about the rows: "is there a
+ * second device that could still be holding a stale card?". Counting in SQL
+ * keeps that decision from materialising — and from logging the shape of — a
+ * table of endpoints and encryption keys it has no use for.
+ */
+function countPushSubscriptionsForKind(db, kind) {
+    const column = KIND_COLUMN[kind];
+    const row = db
+        .prepare(`SELECT COUNT(*) AS total FROM push_subscriptions WHERE ${column} = 1`)
+        .get();
+    return row.total;
+}
 /** Update per-type preferences for a subscription. Returns the updated record or null. */
 function updatePushSubscriptionPreferences(db, endpoint, prefs) {
     const assignments = ['updated_at = ?'];