commandmate 0.11.4 → 0.12.1

package/dist/server/src/config/git-status-config.js

@@ -0,0 +1,83 @@
+"use strict";
+/**
+ * Git status polling configuration
+ * Issue #779: git status API + GitPane Current Status (Phase 1/5)
+ *
+ * Semantic separation from file-polling-config: GitPane's Current Status
+ * section polls `GET /api/worktrees/[id]/git/status` on its own cadence.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GIT_PROGRESS_POLL_INTERVAL_MS = exports.GIT_PUSH_TIMEOUT_MS = exports.GIT_PULL_TIMEOUT_MS = exports.GIT_FETCH_TIMEOUT_MS = exports.MAX_STASH_INDEX = exports.MAX_COMMIT_MESSAGE_LENGTH = exports.MAX_GIT_FILES = exports.GIT_WRITE_TIMEOUT_MS = exports.GIT_STATUS_POLL_INTERVAL_MS = void 0;
+/**
+ * Polling interval (ms) for GitPane's Current Status section.
+ * Issue #779: drives `useFilePolling` in GitPane (visibilitychange-aware).
+ */
+exports.GIT_STATUS_POLL_INTERVAL_MS = 5000;
+// =============================================================================
+// Issue #780: stage / unstage / commit operations
+// =============================================================================
+/**
+ * Timeout (ms) for git WRITE operations (add / restore --staged / commit) and
+ * for the staged-status read used by those flows. Deliberately larger than the
+ * 1s `GIT_COMMAND_TIMEOUT_MS` used by getGitStatus (#779) because write ops can
+ * run pre-commit hooks and stage large numbers of files.
+ */
+exports.GIT_WRITE_TIMEOUT_MS = 30000;
+/**
+ * Maximum number of file paths accepted in a single stage / unstage request.
+ * Requests exceeding this are rejected with HTTP 400 to bound argv size and
+ * per-request work.
+ */
+exports.MAX_GIT_FILES = 1000;
+/**
+ * Maximum length (characters) of a commit message. Messages exceeding this are
+ * rejected with HTTP 400.
+ */
+exports.MAX_COMMIT_MESSAGE_LENGTH = 10000;
+// =============================================================================
+// Issue #782: stash + reset/revert (Phase 4/5 - Danger Zone)
+// =============================================================================
+/**
+ * Maximum accepted `index` for the stash pop/apply/drop routes (Issue #782).
+ * The index is validated to be `/^\d+$/` and <= this bound before it is
+ * embedded into the `stash@{N}` argv (DoS / absurd-index defense). Mirrors the
+ * MAX_GIT_FILES (#780) / MAX_BRANCH_REF_LENGTH (#781) bounding pattern.
+ */
+exports.MAX_STASH_INDEX = 1000;
+// =============================================================================
+// Issue #783: network operations (Phase 5/5 - push / pull / fetch)
+// =============================================================================
+/**
+ * Timeout (ms) for `git fetch`. Larger than the 1s `GIT_COMMAND_TIMEOUT_MS`
+ * (status read) and the 30s `GIT_WRITE_TIMEOUT_MS` line: a fetch contacts the
+ * remote and may run longer than a local index write. fetch is NOT serialized
+ * (§6.1) — it only updates remote-tracking refs / packed-refs.
+ */
+exports.GIT_FETCH_TIMEOUT_MS = 30000;
+/**
+ * Timeout (ms) for `git pull`. 60s because a pull does a fetch AND a merge/rebase
+ * over the working tree (slower than a bare fetch). Serialized per worktree.
+ */
+exports.GIT_PULL_TIMEOUT_MS = 60000;
+/**
+ * Timeout (ms) for `git push`. 60s because a push uploads objects to a remote
+ * over the network (the slowest network op). Serialized per worktree.
+ */
+exports.GIT_PUSH_TIMEOUT_MS = 60000;
+/**
+ * DR1-003: This is NOT a server progress-polling interval. There is NO server
+ * progress endpoint; the route holds the git process until completion and the
+ * awaited Promise is the only true state-transition source. This constant is an
+ * OPTIONAL client-side elapsed-time tick (zero server round-trips) used only to
+ * re-render the elapsed seconds while a network op is in-flight. A plain spinner
+ * is sufficient, so this may go unused. The name is kept for compatibility with
+ * the Issue body's "progress polling" wording (its true role is documented here).
+ */
+exports.GIT_PROGRESS_POLL_INTERVAL_MS = 1000; // optional elapsed-time tick (in-flight only; NOT server progress)
+// Issue #1277: the GitPane warning/guidance strings that used to live here
+// (CHECKOUT_*_WARNING / RESET_HARD_HISTORY_LOSS_WARNING /
+// DANGER_ZONE_RUNNING_SESSION_WARNING / PUSH_AUTH_FAILED_GUIDANCE /
+// PUSH_PROTECTED_BRANCH_WARNING) were hardcoded Japanese rendered to every
+// locale. They now live in the `worktree` dictionary under `git.*` and are
+// resolved with useTranslations at the render site. Do not reintroduce
+// user-facing prose in this config module.

package/dist/server/src/config/skill-security-config.js

@@ -0,0 +1,139 @@
+"use strict";
+/**
+ * Skill fetch/snapshot security policy (Issue #1229)
+ *
+ * Single source of truth for *where* CommandMate is allowed to fetch Skill
+ * documents from and *how much* it is allowed to keep on disk. Every value here
+ * is a hardcoded constant: none of it may be derived from environment
+ * variables, config files or client input, because that is exactly the SSRF
+ * lever this module exists to remove (OWASP A10:2021, same rule as
+ * `GITHUB_API_URL` in src/lib/version-checker.ts).
+ *
+ * Catalog JSON and release assets get *separate* policies: they are served by
+ * different origins with different media types, and a Catalog response must
+ * never be accepted where an artifact is expected (or vice versa).
+ *
+ * @module config/skill-security-config
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SKILL_PLAN_SWEEP_INTERVAL_MS = exports.SKILL_SNAPSHOT_ID_PATTERN = exports.SKILL_SNAPSHOT_ID_BYTES = exports.SKILL_SNAPSHOT_MAX_COUNT = exports.SKILL_SNAPSHOT_TOTAL_QUOTA_BYTES = exports.SKILL_SNAPSHOT_TTL_MS = exports.SKILL_SNAPSHOT_FILE_MODE = exports.SKILL_SNAPSHOT_DIR_MODE = exports.SKILL_SNAPSHOT_DIRNAME = exports.SKILL_FETCH_USER_AGENT_PREFIX = exports.SKILL_CREDENTIAL_HEADERS = exports.SKILL_FETCH_TOTAL_TIMEOUT_MS = exports.SKILL_FETCH_HEADER_TIMEOUT_MS = exports.SKILL_FETCH_MAX_REDIRECTS = exports.SKILL_SOURCE_POLICIES = exports.SKILL_CATALOG_MAX_SIZE = exports.SKILL_CATALOG_FILENAME = exports.SKILL_OFFICIAL_REPOSITORY = void 0;
+exports.buildSkillCatalogUrl = buildSkillCatalogUrl;
+const skills_1 = require("../lib/skills");
+// =============================================================================
+// Official source coordinates
+// =============================================================================
+/** The only repository Skills may be distributed from in schema_version 1. */
+exports.SKILL_OFFICIAL_REPOSITORY = 'Kewton/commandmate-skills';
+/** Catalog document filename at the repository root. */
+exports.SKILL_CATALOG_FILENAME = 'catalog.json';
+/** Catalog JSON is served by the raw content host, pinned to the official repo. */
+const CATALOG_HOSTS = [
+    { host: 'raw.githubusercontent.com', pathPrefix: `/${exports.SKILL_OFFICIAL_REPOSITORY}/` },
+];
+/** Release asset downloads always start at the release download path. */
+const ARTIFACT_ENTRY_HOSTS = [
+    { host: 'github.com', pathPrefix: `/${exports.SKILL_OFFICIAL_REPOSITORY}/releases/download/` },
+];
+/**
+ * Hosts a release asset download may be redirected to.
+ *
+ * GitHub hands release assets off to a storage CDN with an opaque, signed path,
+ * so no path prefix can be asserted on these hops. The artifact digest check is
+ * what makes that acceptable: a wrong body from an allowed host still fails.
+ */
+const ARTIFACT_REDIRECT_HOSTS = [
+    ...ARTIFACT_ENTRY_HOSTS,
+    { host: 'objects.githubusercontent.com' },
+    { host: 'release-assets.githubusercontent.com' },
+];
+/** Maximum Catalog document size in bytes (4 MiB). */
+exports.SKILL_CATALOG_MAX_SIZE = 4 * 1024 * 1024;
+/**
+ * `raw.githubusercontent.com` serves `.json` as `text/plain`, so the Catalog
+ * policy has to accept it. The document is parsed as JSON regardless of the
+ * declared type, and validated by `validateSkillCatalog` afterwards.
+ */
+const CATALOG_CONTENT_TYPES = ['application/json', 'text/plain'];
+exports.SKILL_SOURCE_POLICIES = {
+    catalog: {
+        kind: 'catalog',
+        entryHosts: CATALOG_HOSTS,
+        redirectHosts: CATALOG_HOSTS,
+        accept: 'application/json',
+        contentTypes: CATALOG_CONTENT_TYPES,
+        maxBytes: exports.SKILL_CATALOG_MAX_SIZE,
+    },
+    artifact: {
+        kind: 'artifact',
+        entryHosts: ARTIFACT_ENTRY_HOSTS,
+        redirectHosts: ARTIFACT_REDIRECT_HOSTS,
+        accept: skills_1.SKILL_ARTIFACT_CONTENT_TYPE,
+        contentTypes: [skills_1.SKILL_ARTIFACT_CONTENT_TYPE, 'application/octet-stream'],
+        maxBytes: skills_1.SKILL_ARTIFACT_MAX_SIZE,
+    },
+};
+// =============================================================================
+// Transport limits
+// =============================================================================
+/** Maximum number of redirect hops before a fetch fails closed. */
+exports.SKILL_FETCH_MAX_REDIRECTS = 5;
+/** Timeout for receiving response headers, in milliseconds. */
+exports.SKILL_FETCH_HEADER_TIMEOUT_MS = 10_000;
+/** Timeout for the whole request including body transfer, in milliseconds. */
+exports.SKILL_FETCH_TOTAL_TIMEOUT_MS = 120_000;
+/**
+ * Request headers dropped when a redirect crosses an origin.
+ *
+ * `fetch` with `redirect: 'manual'` gives us the hop, so credential forwarding
+ * is our responsibility: a signed CDN redirect must never carry a GitHub token.
+ */
+exports.SKILL_CREDENTIAL_HEADERS = [
+    'authorization',
+    'cookie',
+    'proxy-authorization',
+];
+/** Value sent as `User-Agent`, matching the version-checker convention. */
+exports.SKILL_FETCH_USER_AGENT_PREFIX = 'CommandMate';
+// =============================================================================
+// Snapshot store limits
+// =============================================================================
+/** Directory name of the snapshot store under the service-owned data root. */
+exports.SKILL_SNAPSHOT_DIRNAME = 'skill-snapshots';
+/** Snapshot directory mode: service-owned, not group/world readable. */
+exports.SKILL_SNAPSHOT_DIR_MODE = 0o700;
+/** Snapshot file mode: read-only for the owning service account. */
+exports.SKILL_SNAPSHOT_FILE_MODE = 0o400;
+/** Lifetime of an unreferenced snapshot before sweeping, in milliseconds. */
+exports.SKILL_SNAPSHOT_TTL_MS = 30 * 60 * 1000;
+/** Total bytes the snapshot store may hold (256 MiB). */
+exports.SKILL_SNAPSHOT_TOTAL_QUOTA_BYTES = 256 * 1024 * 1024;
+/** Maximum number of concurrently retained snapshots. */
+exports.SKILL_SNAPSHOT_MAX_COUNT = 64;
+/** Random bytes behind an opaque snapshot ID. */
+exports.SKILL_SNAPSHOT_ID_BYTES = 16;
+/** Opaque snapshot ID grammar: lowercase hex of {@link SKILL_SNAPSHOT_ID_BYTES}. */
+exports.SKILL_SNAPSHOT_ID_PATTERN = /^[0-9a-f]{32}$/;
+/**
+ * How often the background sweeper reclaims expired plans and snapshots.
+ *
+ * Short relative to both TTLs so an abandoned plan releases its snapshot within
+ * a minute of expiring, rather than waiting for the next plan to be created.
+ */
+exports.SKILL_PLAN_SWEEP_INTERVAL_MS = 60 * 1000;
+// =============================================================================
+// URL construction
+// =============================================================================
+/**
+ * Build the Catalog URL for an immutable commit.
+ *
+ * Takes a resolved 40-hex commit rather than a branch so the Catalog a user
+ * reviewed is the Catalog that gets installed. Callers never supply a URL.
+ *
+ * @throws Error when the commit is not a resolved 40-hex SHA
+ */
+function buildSkillCatalogUrl(commit) {
+    if (!skills_1.GIT_COMMIT_SHA_PATTERN.test(commit)) {
+        throw new Error('Skill catalog URL requires a resolved 40-hex commit SHA');
+    }
+    return `https://raw.githubusercontent.com/${exports.SKILL_OFFICIAL_REPOSITORY}/${commit}/${exports.SKILL_CATALOG_FILENAME}`;
+}

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

@@ -13,7 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AntigravityTool = void 0;
 const base_1 = require("./base");
 const tmux_1 = require("../tmux/tmux");
-const pasted_text_helper_1 = require("../pasted-text-helper");
+const submit_verified_sender_1 = require("./submit-verified-sender");
 const tmux_capture_cache_1 = require("../tmux/tmux-capture-cache");
 const cli_patterns_1 = require("../detection/cli-patterns");
 const logger_1 = require("../../lib/logger");
@@ -217,18 +217,13 @@ class AntigravityTool extends base_1.BaseCLITool {
         try {
             // Verify agy is at a ready prompt before sending
             await this.waitForPrompt(sessionName);
-            // Send message text (without Enter)
-            await (0, tmux_1.sendKeys)(sessionName, message, false);
-            // Wait a moment for the text to be typed
-            await new Promise((resolve) => setTimeout(resolve, cli_tool_timing_config_1.TUI_TEXT_INPUT_WAIT_MS));
-            // Send Enter key separately
-            await (0, tmux_1.sendSpecialKey)(sessionName, 'C-m');
-            // Wait a moment for the message to be processed
-            await new Promise((resolve) => setTimeout(resolve, cli_tool_timing_config_1.TUI_MESSAGE_PROCESSED_WAIT_MS));
-            // Detect [Pasted text] and resend Enter for multi-line messages
-            if (message.includes('\n')) {
-                await (0, pasted_text_helper_1.detectAndResendIfPastedText)(sessionName);
-            }
+            // Issue #1471: Body/Enter separation + read-back submit verification via the
+            // shared helper (replaces the old type -> C-m -> `\n`-gated paste recovery).
+            await (0, submit_verified_sender_1.sendMessageWithSubmitVerification)({
+                sessionName,
+                message,
+                cliToolId: 'antigravity',
+            });
             // Invalidate cache after sending message (required so the poller re-reads)
             (0, tmux_capture_cache_1.invalidateCache)(sessionName);
             logger.info('sent-message-to-antigravity-session');

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

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CodexTool = void 0;
 const base_1 = require("./base");
 const tmux_1 = require("../tmux/tmux");
-const pasted_text_helper_1 = require("../pasted-text-helper");
+const submit_verified_sender_1 = require("./submit-verified-sender");
 const tmux_capture_cache_1 = require("../tmux/tmux-capture-cache");
 const cli_patterns_1 = require("../detection/cli-patterns");
 const logger_1 = require("../../lib/logger");
@@ -209,19 +209,13 @@ class CodexTool extends base_1.BaseCLITool {
         try {
             // Verify Codex is at prompt state before sending
             await this.waitForPrompt(sessionName);
-            // Send message to Codex (without Enter)
-            await (0, tmux_1.sendKeys)(sessionName, message, false);
-            // Wait a moment for the text to be typed
-            await new Promise((resolve) => setTimeout(resolve, cli_tool_timing_config_1.TUI_TEXT_INPUT_WAIT_MS));
-            // Send Enter key separately
-            await (0, tmux_1.sendSpecialKey)(sessionName, 'C-m');
-            // Wait a moment for the message to be processed
-            await new Promise((resolve) => setTimeout(resolve, cli_tool_timing_config_1.TUI_MESSAGE_PROCESSED_WAIT_MS));
-            // Issue #212: Detect [Pasted text] and resend Enter for multi-line messages
-            // MF-001: Single-line messages skip detection (+0ms overhead)
-            if (message.includes('\n')) {
-                await (0, pasted_text_helper_1.detectAndResendIfPastedText)(sessionName);
-            }
+            // Issue #1471: Body/Enter separation + read-back submit verification via the
+            // shared helper (replaces the old type -> C-m -> `\n`-gated paste recovery).
+            await (0, submit_verified_sender_1.sendMessageWithSubmitVerification)({
+                sessionName,
+                message,
+                cliToolId: 'codex',
+            });
             // Issue #405: Invalidate cache after sending message
             (0, tmux_capture_cache_1.invalidateCache)(sessionName);
             logger.info('sent-message-to-codex-session:sessionnam');

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

@@ -12,7 +12,7 @@ exports.CopilotTool = void 0;
 const child_process_1 = require("child_process");
 const base_1 = require("./base");
 const tmux_1 = require("../tmux/tmux");
-const pasted_text_helper_1 = require("../pasted-text-helper");
+const submit_verified_sender_1 = require("./submit-verified-sender");
 const tmux_capture_cache_1 = require("../tmux/tmux-capture-cache");
 const cli_patterns_1 = require("../detection/cli-patterns");
 const copilot_constants_1 = require("../../config/copilot-constants");
@@ -246,18 +246,17 @@ class CopilotTool extends base_1.BaseCLITool {
                 logger.info('sent-selection-list-command-to-copilot', { command: slashCmd });
                 return;
             }
-            // Send message to Copilot (without Enter)
-            await (0, tmux_1.sendKeys)(sessionName, message, false);
-            // Wait a moment for the text to be typed
-            await new Promise((resolve) => setTimeout(resolve, copilot_constants_1.COPILOT_TEXT_INPUT_DELAY_MS));
-            // Send Enter key separately
-            await (0, tmux_1.sendSpecialKey)(sessionName, 'C-m');
-            // Wait a moment for the message to be processed
-            await new Promise((resolve) => setTimeout(resolve, copilot_constants_1.COPILOT_SEND_ENTER_DELAY_MS));
-            // Detect [Pasted text] and resend Enter for multi-line messages
-            if (message.includes('\n')) {
-                await (0, pasted_text_helper_1.detectAndResendIfPastedText)(sessionName);
-            }
+            // Issue #1471: Body/Enter separation + read-back submit verification via the
+            // shared helper (replaces the old type -> C-m -> `\n`-gated paste recovery).
+            // Copilot's own text-input / post-Enter delays are preserved. The selection
+            // list slash-command branch above is intentionally NOT routed through here.
+            await (0, submit_verified_sender_1.sendMessageWithSubmitVerification)({
+                sessionName,
+                message,
+                cliToolId: 'copilot',
+                textInputWaitMs: copilot_constants_1.COPILOT_TEXT_INPUT_DELAY_MS,
+                verifyDelayMs: copilot_constants_1.COPILOT_SEND_ENTER_DELAY_MS,
+            });
             // Invalidate cache after sending message
             (0, tmux_capture_cache_1.invalidateCache)(sessionName);
             logger.info('sent-message-to-copilot-session');

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

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GeminiTool = exports.GEMINI_PANE_HEIGHT = void 0;
 const base_1 = require("./base");
 const tmux_1 = require("../tmux/tmux");
-const pasted_text_helper_1 = require("../pasted-text-helper");
+const submit_verified_sender_1 = require("./submit-verified-sender");
 const tmux_capture_cache_1 = require("../tmux/tmux-capture-cache");
 const cli_patterns_1 = require("../detection/cli-patterns");
 const logger_1 = require("../../lib/logger");
@@ -167,18 +167,13 @@ class GeminiTool extends base_1.BaseCLITool {
         try {
             // Verify Gemini is at prompt state before sending
             await this.waitForPrompt(sessionName);
-            // Send message to Gemini (without Enter)
-            await (0, tmux_1.sendKeys)(sessionName, message, false);
-            // Wait a moment for the text to be typed
-            await new Promise((resolve) => setTimeout(resolve, cli_tool_timing_config_1.TUI_TEXT_INPUT_WAIT_MS));
-            // Send Enter key separately
-            await (0, tmux_1.sendSpecialKey)(sessionName, 'C-m');
-            // Wait a moment for the message to be processed
-            await new Promise((resolve) => setTimeout(resolve, cli_tool_timing_config_1.TUI_MESSAGE_PROCESSED_WAIT_MS));
-            // Detect [Pasted text] and resend Enter for multi-line messages
-            if (message.includes('\n')) {
-                await (0, pasted_text_helper_1.detectAndResendIfPastedText)(sessionName);
-            }
+            // Issue #1471: Body/Enter separation + read-back submit verification via the
+            // shared helper (replaces the old type -> C-m -> `\n`-gated paste recovery).
+            await (0, submit_verified_sender_1.sendMessageWithSubmitVerification)({
+                sessionName,
+                message,
+                cliToolId: 'gemini',
+            });
             // Issue #405: Invalidate cache after sending message
             (0, tmux_capture_cache_1.invalidateCache)(sessionName);
             logger.info('sent-message-to-gemini-session:sessionna');

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

@@ -13,7 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenCodeTool = exports.OPENCODE_INIT_WAIT_MS = exports.OPENCODE_PANE_HEIGHT = exports.OPENCODE_EXIT_COMMAND = void 0;
 const base_1 = require("./base");
 const tmux_1 = require("../tmux/tmux");
-const pasted_text_helper_1 = require("../pasted-text-helper");
+const submit_verified_sender_1 = require("./submit-verified-sender");
 const tmux_capture_cache_1 = require("../tmux/tmux-capture-cache");
 const opencode_config_1 = require("./opencode-config");
 const child_process_1 = require("child_process");
@@ -134,18 +134,13 @@ class OpenCodeTool extends base_1.BaseCLITool {
             throw new Error(`OpenCode session ${sessionName} does not exist. Start the session first.`);
         }
         try {
-            // Send message to OpenCode (without Enter)
-            await (0, tmux_1.sendKeys)(sessionName, message, false);
-            // Wait a moment for the text to be typed
-            await new Promise((resolve) => setTimeout(resolve, cli_tool_timing_config_1.TUI_TEXT_INPUT_WAIT_MS));
-            // Send Enter key separately
-            await (0, tmux_1.sendSpecialKey)(sessionName, 'C-m');
-            // Wait a moment for the message to be processed
-            await new Promise((resolve) => setTimeout(resolve, cli_tool_timing_config_1.TUI_MESSAGE_PROCESSED_WAIT_MS));
-            // Detect [Pasted text] and resend Enter for multi-line messages
-            if (message.includes('\n')) {
-                await (0, pasted_text_helper_1.detectAndResendIfPastedText)(sessionName);
-            }
+            // Issue #1471: Body/Enter separation + read-back submit verification via the
+            // shared helper (replaces the old type -> C-m -> `\n`-gated paste recovery).
+            await (0, submit_verified_sender_1.sendMessageWithSubmitVerification)({
+                sessionName,
+                message,
+                cliToolId: 'opencode',
+            });
             // Issue #405: Invalidate cache after sending message
             (0, tmux_capture_cache_1.invalidateCache)(sessionName);
             logger.info('sent-message-to-opencode-session:session');

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

@@ -0,0 +1,174 @@
+"use strict";
+/**
+ * Submit-verified message sender (Issues #1469, #1470, #1471).
+ *
+ * A single shared helper that replaces the seven near-identical
+ * "type body -> press Enter -> maybe recover paste" sequences previously
+ * duplicated across session-key-sender.ts and every cli-tools/*.ts sendMessage(),
+ * plus the terminal API route's raw `sendKeys(command)` batch send.
+ *
+ * Why this exists (root cause):
+ *   tmux `send-keys <body> C-m` batches the body and Enter into a SINGLE command.
+ *   ink/React TUIs (Claude Code, Codex, ...) treat the injected body as a
+ *   bracketed paste and swallow the trailing C-m as a newline inside the paste
+ *   buffer, so the message is typed but never submitted. The recovery that used
+ *   to guard this was gated on `message.includes('\n')` (single-line messages
+ *   skipped entirely), keyed off Claude's version-specific `[Pasted text #\d+`
+ *   string, and never verified that submit actually happened (fire-and-forget).
+ *
+ * This helper fixes all three:
+ *   1. Body and Enter are ALWAYS sent as separate tmux commands with a delay
+ *      between them (never a single body+C-m batch).
+ *   2. Recovery + verification apply to EVERY message (no `\n` gate).
+ *   3. After submit it reads the pane back and confirms the message actually
+ *      left the input box (empty input line) or the tool began generating.
+ *      If it is still pending it resends Enter, bounded; if it can never be
+ *      confirmed it THROWS (callers must not report success on a stuck send).
+ *
+ * The verification is intentionally NOT keyed off the version-specific
+ * `[Pasted text #\d+` placeholder. That placeholder is used only as one
+ * "still pending" positive signal (broadened to be version-resilient); the
+ * primary decision is "is the message still sitting on the input line?".
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isSubmitted = isSubmitted;
+exports.sendMessageWithSubmitVerification = sendMessageWithSubmitVerification;
+const tmux_1 = require("../tmux/tmux");
+const tmux_capture_cache_1 = require("../tmux/tmux-capture-cache");
+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 logger = (0, logger_1.createLogger)('cli-tools/submit-verified-sender');
+/**
+ * Version-resilient pasted-text placeholder.
+ *
+ * Broader than PASTED_TEXT_PATTERN (`/\[Pasted text #\d+/`) so it still matches
+ * when a CLI version drops the `#N` and renders `[Pasted text +46 lines]`
+ * (Issue #1469 condition 2). Used ONLY as a positive "still in the input box"
+ * signal — never as the sole submit gate — so applying it to every tool is safe:
+ * a tool that never renders it simply never matches.
+ */
+const PASTE_PLACEHOLDER_PATTERN = /\[Pasted text[\s#]/;
+/**
+ * Prompt input-line markers across the supported TUIs.
+ * claude/gemini/copilot: `>` or `❯`; codex: `›`; antigravity: `>`;
+ * vibe-local: `ctx:N% ❯`. Leading whitespace is tolerated (tmux padding).
+ */
+const INPUT_LINE_MARKER = /^\s*(?:ctx:\d+%\s*)?[>❯›]/;
+/** Lines of pane tail to inspect when verifying submit. */
+const VERIFY_WINDOW_LINES = 12;
+/** Default bounded read-back attempts before giving up (throwing). */
+const DEFAULT_VERIFY_ATTEMPTS = 4;
+/** Minimum fragment length used to decide the body is still on the input line. */
+const MIN_FRAGMENT_LENGTH = 3;
+const MAX_FRAGMENT_LENGTH = 24;
+/**
+ * First non-blank fragment of the message, used to decide whether the body is
+ * still sitting on the input line. Only the first line matters because that is
+ * what a TUI shows on the prompt line before folding into a paste placeholder.
+ */
+function comparableFragment(message) {
+    const firstLine = message
+        .split('\n')
+        .map((l) => l.trim())
+        .find((l) => l.length > 0);
+    if (!firstLine)
+        return '';
+    return firstLine.slice(0, MAX_FRAGMENT_LENGTH);
+}
+/**
+ * Locate the active input line within the pane tail: the last line that begins
+ * with a prompt marker. Scanned bottom-up so a status-bar/footer line rendered
+ * BELOW the input box (antigravity's "? for shortcuts", vibe-local's status bar)
+ * does not hide the real input line above it.
+ */
+function findInputLine(windowLines) {
+    for (let i = windowLines.length - 1; i >= 0; i--) {
+        if (INPUT_LINE_MARKER.test(windowLines[i])) {
+            return windowLines[i];
+        }
+    }
+    return null;
+}
+/**
+ * Decide whether a captured pane shows the message as submitted.
+ *
+ * Version-independent by design — does NOT require the paste placeholder:
+ *   A. The tool is generating a response          -> submitted.
+ *   B. A paste placeholder is on the input line    -> NOT submitted (Enter eaten).
+ *   C. The body fragment is still on the input line -> NOT submitted.
+ *   D. Otherwise (empty input line / moved to history) -> submitted.
+ *
+ * B and C are scoped to the input line only, so the user-message echo that a
+ * TUI prints into its history above the prompt never causes a false "pending".
+ */
+function isSubmitted(output, cliToolId, message) {
+    const clean = (0, cli_patterns_1.stripAnsi)(output);
+    const windowLines = clean.split('\n').slice(-VERIFY_WINDOW_LINES);
+    const windowStr = windowLines.join('\n');
+    // A. Actively generating a response => the message was accepted.
+    if ((0, cli_patterns_1.detectThinking)(cliToolId, windowStr)) {
+        return true;
+    }
+    const inputLine = findInputLine(windowLines);
+    if (inputLine) {
+        // B. A paste placeholder is still folded on the input line => not submitted.
+        if (PASTE_PLACEHOLDER_PATTERN.test(inputLine)) {
+            return false;
+        }
+        // C. The typed body is still sitting on the input line => not submitted.
+        const fragment = comparableFragment(message);
+        if (fragment.length >= MIN_FRAGMENT_LENGTH && inputLine.includes(fragment)) {
+            return false;
+        }
+    }
+    // D. Input line is clear (or absent) and nothing is generating => submitted.
+    return true;
+}
+/**
+ * Type a message body and submit it, then verify the submit actually happened.
+ *
+ * The body and Enter are always separate tmux commands (never batched), so the
+ * TUI cannot swallow the Enter inside a bracketed-paste buffer. After the
+ * initial submit the pane is read back up to `verifyAttempts` times; each time
+ * it is still pending an extra Enter is sent. If submit can never be confirmed
+ * the function THROWS — callers must surface that as a failure, never as
+ * success (Issues #1469/#1470/#1471).
+ *
+ * @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;
+    // 1. Type the body only — never send Enter in the same tmux command.
+    await (0, tmux_1.sendKeys)(sessionName, message, false);
+    // 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).
+    for (let i = 0; i < Math.max(1, submitEnterCount); i++) {
+        await (0, tmux_1.sendSpecialKeys)(sessionName, ['Enter']);
+        if (i < submitEnterCount - 1) {
+            await new Promise((resolve) => setTimeout(resolve, interEnterWaitMs));
+        }
+    }
+    // 4. Read-back verification: confirm the message left the input box, resend
+    //    Enter while it is still pending, and throw if it never submits.
+    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 });
+        if (isSubmitted(output, cliToolId, message)) {
+            (0, tmux_capture_cache_1.invalidateCache)(sessionName);
+            return;
+        }
+        // Still typed-but-unsent — resend a single Enter and re-check.
+        logger.warn('submit-not-confirmed:resending-enter', {
+            sessionName,
+            cliToolId,
+            attempt,
+        });
+        await (0, tmux_1.sendSpecialKeys)(sessionName, ['Enter']);
+    }
+    (0, tmux_capture_cache_1.invalidateCache)(sessionName);
+    logger.error('submit-verification-failed', { sessionName, cliToolId, attempts });
+    throw new Error(`Message submit could not be confirmed for session ${sessionName} after ${attempts} attempts (typed but unsent)`);
+}

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

@@ -13,7 +13,7 @@ exports.VibeLocalTool = void 0;
 const base_1 = require("./base");
 const types_1 = require("./types");
 const tmux_1 = require("../tmux/tmux");
-const pasted_text_helper_1 = require("../pasted-text-helper");
+const submit_verified_sender_1 = require("./submit-verified-sender");
 const tmux_capture_cache_1 = require("../tmux/tmux-capture-cache");
 const db_instance_1 = require("../db/db-instance");
 const db_1 = require("../db");
@@ -121,22 +121,17 @@ class VibeLocalTool extends base_1.BaseCLITool {
             throw new Error(`Vibe Local session ${sessionName} does not exist. Start the session first.`);
         }
         try {
-            // Send message to vibe-local (without Enter)
-            await (0, tmux_1.sendKeys)(sessionName, message, false);
-            // Wait a moment for the text to be typed
-            await new Promise((resolve) => setTimeout(resolve, cli_tool_timing_config_1.TUI_TEXT_INPUT_WAIT_MS));
-            // vibe-local uses IME mode: first Enter creates a new line,
-            // second Enter on empty line submits the message.
-            // Send Enter twice with a short delay between.
-            await (0, tmux_1.sendSpecialKey)(sessionName, 'C-m');
-            await new Promise((resolve) => setTimeout(resolve, cli_tool_timing_config_1.VIBE_LOCAL_DOUBLE_ENTER_WAIT_MS));
-            await (0, tmux_1.sendSpecialKey)(sessionName, 'C-m');
-            // Wait a moment for the message to be processed
-            await new Promise((resolve) => setTimeout(resolve, cli_tool_timing_config_1.TUI_MESSAGE_PROCESSED_WAIT_MS));
-            // Detect [Pasted text] and resend Enter for multi-line messages
-            if (message.includes('\n')) {
-                await (0, pasted_text_helper_1.detectAndResendIfPastedText)(sessionName);
-            }
+            // Issue #1471: Body/Enter separation + read-back submit verification via the
+            // shared helper. vibe-local's IME mode needs TWO Enter presses (first Enter
+            // inserts a newline, the second submits), preserved via submitEnterCount: 2
+            // + the same inter-press wait (VIBE_LOCAL_DOUBLE_ENTER_WAIT_MS).
+            await (0, submit_verified_sender_1.sendMessageWithSubmitVerification)({
+                sessionName,
+                message,
+                cliToolId: 'vibe-local',
+                submitEnterCount: 2,
+                interEnterWaitMs: cli_tool_timing_config_1.VIBE_LOCAL_DOUBLE_ENTER_WAIT_MS,
+            });
             // Issue #405: Invalidate cache after sending message
             (0, tmux_capture_cache_1.invalidateCache)(sessionName);
             logger.info('sent-message-to-vibe-local-session:sessi');