commandmate 0.18.0 → 0.19.0

package/dist/cli/utils/pager.d.ts

@@ -0,0 +1,28 @@
+/**
+ * Terminal pager for CLI output (Issue #1623, 案B).
+ *
+ * `commandmate capture --pane` prints a whole transcript, which is unreadable if
+ * it just scrolls past. When stdout is a terminal the text goes through a pager;
+ * when it is a pipe or a file it must stay plain so `| grep` and `> file` behave.
+ */
+/**
+ * Resolve the pager command line.
+ *
+ * `CM_PAGER` wins so a user can page CommandMate output differently from the
+ * rest of their shell; `PAGER` is the conventional fallback. An explicitly empty
+ * value means "no pager" and is honoured rather than overridden.
+ *
+ * @returns argv for the pager, or undefined when paging is disabled
+ */
+export declare function resolvePagerCommand(): string[] | undefined;
+/**
+ * Print `text`, paging it when stdout is an interactive terminal.
+ *
+ * Falls back to plain stdout whenever paging is not possible or not wanted:
+ * non-TTY stdout, no pager configured, or a pager that could not be spawned (so
+ * a missing `less` degrades to readable output instead of an error).
+ *
+ * @param text - Content to display
+ */
+export declare function printMaybePaged(text: string): void;
+//# sourceMappingURL=pager.d.ts.map

package/dist/cli/utils/pager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pager.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/pager.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAOH;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,EAAE,GAAG,SAAS,CAI1D;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAsBlD"}

package/dist/cli/utils/pager.js

@@ -0,0 +1,57 @@
+"use strict";
+/**
+ * Terminal pager for CLI output (Issue #1623, 案B).
+ *
+ * `commandmate capture --pane` prints a whole transcript, which is unreadable if
+ * it just scrolls past. When stdout is a terminal the text goes through a pager;
+ * when it is a pipe or a file it must stay plain so `| grep` and `> file` behave.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolvePagerCommand = resolvePagerCommand;
+exports.printMaybePaged = printMaybePaged;
+const child_process_1 = require("child_process");
+/** Pager used when neither `CM_PAGER` nor `PAGER` is set. `-R` keeps ANSI colors. */
+const DEFAULT_PAGER = 'less -R';
+/**
+ * Resolve the pager command line.
+ *
+ * `CM_PAGER` wins so a user can page CommandMate output differently from the
+ * rest of their shell; `PAGER` is the conventional fallback. An explicitly empty
+ * value means "no pager" and is honoured rather than overridden.
+ *
+ * @returns argv for the pager, or undefined when paging is disabled
+ */
+function resolvePagerCommand() {
+    const configured = process.env.CM_PAGER ?? process.env.PAGER ?? DEFAULT_PAGER;
+    const argv = configured.trim().split(/\s+/).filter(Boolean);
+    return argv.length > 0 ? argv : undefined;
+}
+/**
+ * Print `text`, paging it when stdout is an interactive terminal.
+ *
+ * Falls back to plain stdout whenever paging is not possible or not wanted:
+ * non-TTY stdout, no pager configured, or a pager that could not be spawned (so
+ * a missing `less` degrades to readable output instead of an error).
+ *
+ * @param text - Content to display
+ */
+function printMaybePaged(text) {
+    if (!process.stdout.isTTY) {
+        console.log(text);
+        return;
+    }
+    const argv = resolvePagerCommand();
+    if (!argv) {
+        console.log(text);
+        return;
+    }
+    // The pager reads the keyboard from /dev/tty, exactly as in `cmd | less`, so
+    // piping the body in through stdin does not cost it its interactivity.
+    const result = (0, child_process_1.spawnSync)(argv[0], argv.slice(1), {
+        input: text.endsWith('\n') ? text : `${text}\n`,
+        stdio: ['pipe', 'inherit', 'inherit'],
+    });
+    if (result.error) {
+        console.log(text);
+    }
+}

package/dist/lib/detection/ansi.d.ts

@@ -0,0 +1,30 @@
+/**
+ * Dependency-free ANSI escape-sequence primitives.
+ *
+ * These live in their own leaf module (no logger/db/server imports) so both
+ * server-side detection code (`cli-patterns.ts`, which re-exports them) and
+ * client components (the terminal display normalizer, Issue #1172) can share the
+ * exact same tested pattern without pulling Node-only modules into the browser
+ * bundle.
+ *
+ * Covers:
+ * - SGR sequences: ESC[Nm (colors, bold, underline, etc.)
+ * - OSC sequences: ESC]...BEL (window title, hyperlinks, etc.)
+ * - CSI sequences: ESC[...letter (cursor movement, erase, etc.)
+ *
+ * Known limitations (SEC-002): 8-bit CSI (0x9B), DEC private modes (ESC[?25h),
+ * character-set switching (ESC(0), and some RGB color forms may not match. In
+ * practice tmux capture-pane output rarely contains these.
+ */
+export declare const ANSI_PATTERN: RegExp;
+/** Remove all ANSI escape sequences from a string. */
+export declare function stripAnsi(str: string): string;
+/**
+ * Extract the ANSI escape sequences from a string, in order, discarding all
+ * other characters. Reuses the same tested pattern as {@link stripAnsi} so the
+ * two stay in lock-step. Used when collapsing blank layout rows for display
+ * (Issue #1172): the visible glyphs are dropped but any color/reset sequences
+ * that alter how subsequent rows render must be preserved.
+ */
+export declare function extractAnsiSequences(str: string): string;
+//# sourceMappingURL=ansi.d.ts.map

package/dist/lib/detection/ansi.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ansi.d.ts","sourceRoot":"","sources":["../../../src/lib/detection/ansi.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,eAAO,MAAM,YAAY,QAAyD,CAAC;AAEnF,sDAAsD;AACtD,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAGxD"}

package/dist/lib/detection/ansi.js

@@ -0,0 +1,39 @@
+"use strict";
+/**
+ * Dependency-free ANSI escape-sequence primitives.
+ *
+ * These live in their own leaf module (no logger/db/server imports) so both
+ * server-side detection code (`cli-patterns.ts`, which re-exports them) and
+ * client components (the terminal display normalizer, Issue #1172) can share the
+ * exact same tested pattern without pulling Node-only modules into the browser
+ * bundle.
+ *
+ * Covers:
+ * - SGR sequences: ESC[Nm (colors, bold, underline, etc.)
+ * - OSC sequences: ESC]...BEL (window title, hyperlinks, etc.)
+ * - CSI sequences: ESC[...letter (cursor movement, erase, etc.)
+ *
+ * Known limitations (SEC-002): 8-bit CSI (0x9B), DEC private modes (ESC[?25h),
+ * character-set switching (ESC(0), and some RGB color forms may not match. In
+ * practice tmux capture-pane output rarely contains these.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ANSI_PATTERN = void 0;
+exports.stripAnsi = stripAnsi;
+exports.extractAnsiSequences = extractAnsiSequences;
+exports.ANSI_PATTERN = /\x1b\[[0-9;]*[a-zA-Z]|\x1b\][^\x07]*\x07|\[[0-9;]*m/g;
+/** Remove all ANSI escape sequences from a string. */
+function stripAnsi(str) {
+    return str.replace(exports.ANSI_PATTERN, '');
+}
+/**
+ * Extract the ANSI escape sequences from a string, in order, discarding all
+ * other characters. Reuses the same tested pattern as {@link stripAnsi} so the
+ * two stay in lock-step. Used when collapsing blank layout rows for display
+ * (Issue #1172): the visible glyphs are dropped but any color/reset sequences
+ * that alter how subsequent rows render must be preserved.
+ */
+function extractAnsiSequences(str) {
+    const matches = str.match(exports.ANSI_PATTERN);
+    return matches ? matches.join('') : '';
+}

package/dist/lib/tmux/transcript-squeeze.d.ts

@@ -0,0 +1,76 @@
+/**
+ * Whitespace squeeze for the on-demand reading mode (Issue #1623).
+ *
+ * TUI sessions are pinned to a 200x1000 canvas (`src/config/tmux-pane-config.ts`)
+ * and the agent draws its transcript near the top and its composer at the very
+ * bottom, so a raw `capture-pane` is mostly layout-only blank rows. Measured on a
+ * live `mcbd-claude-*` session: 1000 rows, 480 truly empty, 7 more that LOOK empty
+ * but carry an SGR sequence (`ESC[49m`) and therefore survive a naive
+ * `grep -v '^$'` or `less -s`. Squeezing those runs is what makes `less +G` land
+ * on the composer instead of hundreds of rows below the last readable line.
+ *
+ * ## Relationship to the Web UI normalizer
+ *
+ * `src/lib/terminal/terminal-display-normalizer.ts` (Issue #1172) solves the same
+ * problem for the browser terminal and its rules are the ones reproduced here.
+ * This module exists as a separate entry point rather than importing that one
+ * because the CLI is compiled by `tsconfig.cli.json`, which sets `"paths": {}` —
+ * the normalizer's `@/lib/detection/ansi` import fails there with TS2307 (verified
+ * by adding the import and running `tsc --project tsconfig.cli.json`), while the
+ * relative import below resolves under every build. The two are held byte-identical
+ * by a conformance test over real captures
+ * (`tests/unit/lib/tmux/transcript-squeeze.test.ts`), so neither can drift.
+ *
+ * The transform is DISPLAY-ONLY. Nothing here touches the raw output that status
+ * detection, Auto-Yes, the response saver or the DB record consume — those keep
+ * full fidelity and full line counts.
+ */
+/**
+ * A line is visually blank when nothing printable remains after ANSI removal.
+ *
+ * `.trim()` is deliberate: ECMAScript's WhiteSpace includes U+00A0, which the
+ * Claude composer emits (`ESC[38;5;246m❯ ESC[39m`). That line still holds
+ * `❯`, so it is content either way, but a row of pure NBSP correctly reads blank.
+ */
+export declare function isVisuallyBlank(line: string): boolean;
+/** Options for {@link squeezeTranscript}. */
+export interface SqueezeOptions {
+    /**
+     * Keep only the last N lines OF THE SQUEEZED RESULT (Issue #1623 decision D5).
+     *
+     * Tailing after the squeeze rather than before it is what makes the number
+     * meaningful: `--tail 40` on a 1000-row canvas whose transcript ends at row 254
+     * would otherwise return 40 rows of blank padding. Undefined or <= 0 keeps
+     * everything.
+     */
+    tail?: number;
+}
+/** Outcome of a squeeze, including the counts callers report in `--json`. */
+export interface SqueezeResult {
+    /** Squeezed transcript, no trailing newline. */
+    text: string;
+    /** Line count of the input, before squeezing. */
+    rawLines: number;
+    /** Line count of {@link text}. */
+    lines: number;
+    /** True when {@link SqueezeOptions.tail} actually dropped leading lines. */
+    tailed: boolean;
+}
+/**
+ * Collapse layout-only blank rows in a `capture-pane` frame.
+ *
+ * Rules (identical to `normalizeTerminalOutputForDisplay`, Issue #1172):
+ * 1. Blankness is judged on `stripAnsi(line).trim()`.
+ * 2. Leading and trailing blank runs are removed entirely.
+ * 3. An internal blank run of 1-2 rows is kept verbatim (real paragraph spacing).
+ * 4. An internal blank run of 3+ rows collapses to ONE row carrying that run's
+ *    ANSI sequences in order, so a color/reset that spans the gap still applies
+ *    to the rows below it.
+ * 5. Non-blank lines are never altered — content, order and duplicates survive.
+ *
+ * @param raw - Raw `capture-pane -pe` output
+ * @param options - Tail limit
+ * @returns The squeezed text plus before/after line counts
+ */
+export declare function squeezeTranscript(raw: string, options?: SqueezeOptions): SqueezeResult;
+//# sourceMappingURL=transcript-squeeze.d.ts.map

package/dist/lib/tmux/transcript-squeeze.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transcript-squeeze.d.ts","sourceRoot":"","sources":["../../../src/lib/tmux/transcript-squeeze.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAIH;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAErD;AAED,6CAA6C;AAC7C,MAAM,WAAW,cAAc;IAC7B;;;;;;;OAOG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,6EAA6E;AAC7E,MAAM,WAAW,aAAa;IAC5B,gDAAgD;IAChD,IAAI,EAAE,MAAM,CAAC;IACb,iDAAiD;IACjD,QAAQ,EAAE,MAAM,CAAC;IACjB,kCAAkC;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,4EAA4E;IAC5E,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB,GAAG,aAAa,CAwC1F"}

package/dist/lib/tmux/transcript-squeeze.js

@@ -0,0 +1,96 @@
+"use strict";
+/**
+ * Whitespace squeeze for the on-demand reading mode (Issue #1623).
+ *
+ * TUI sessions are pinned to a 200x1000 canvas (`src/config/tmux-pane-config.ts`)
+ * and the agent draws its transcript near the top and its composer at the very
+ * bottom, so a raw `capture-pane` is mostly layout-only blank rows. Measured on a
+ * live `mcbd-claude-*` session: 1000 rows, 480 truly empty, 7 more that LOOK empty
+ * but carry an SGR sequence (`ESC[49m`) and therefore survive a naive
+ * `grep -v '^$'` or `less -s`. Squeezing those runs is what makes `less +G` land
+ * on the composer instead of hundreds of rows below the last readable line.
+ *
+ * ## Relationship to the Web UI normalizer
+ *
+ * `src/lib/terminal/terminal-display-normalizer.ts` (Issue #1172) solves the same
+ * problem for the browser terminal and its rules are the ones reproduced here.
+ * This module exists as a separate entry point rather than importing that one
+ * because the CLI is compiled by `tsconfig.cli.json`, which sets `"paths": {}` —
+ * the normalizer's `@/lib/detection/ansi` import fails there with TS2307 (verified
+ * by adding the import and running `tsc --project tsconfig.cli.json`), while the
+ * relative import below resolves under every build. The two are held byte-identical
+ * by a conformance test over real captures
+ * (`tests/unit/lib/tmux/transcript-squeeze.test.ts`), so neither can drift.
+ *
+ * The transform is DISPLAY-ONLY. Nothing here touches the raw output that status
+ * detection, Auto-Yes, the response saver or the DB record consume — those keep
+ * full fidelity and full line counts.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isVisuallyBlank = isVisuallyBlank;
+exports.squeezeTranscript = squeezeTranscript;
+const ansi_1 = require("../detection/ansi");
+/**
+ * A line is visually blank when nothing printable remains after ANSI removal.
+ *
+ * `.trim()` is deliberate: ECMAScript's WhiteSpace includes U+00A0, which the
+ * Claude composer emits (`ESC[38;5;246m❯ ESC[39m`). That line still holds
+ * `❯`, so it is content either way, but a row of pure NBSP correctly reads blank.
+ */
+function isVisuallyBlank(line) {
+    return (0, ansi_1.stripAnsi)(line).trim() === '';
+}
+/**
+ * Collapse layout-only blank rows in a `capture-pane` frame.
+ *
+ * Rules (identical to `normalizeTerminalOutputForDisplay`, Issue #1172):
+ * 1. Blankness is judged on `stripAnsi(line).trim()`.
+ * 2. Leading and trailing blank runs are removed entirely.
+ * 3. An internal blank run of 1-2 rows is kept verbatim (real paragraph spacing).
+ * 4. An internal blank run of 3+ rows collapses to ONE row carrying that run's
+ *    ANSI sequences in order, so a color/reset that spans the gap still applies
+ *    to the rows below it.
+ * 5. Non-blank lines are never altered — content, order and duplicates survive.
+ *
+ * @param raw - Raw `capture-pane -pe` output
+ * @param options - Tail limit
+ * @returns The squeezed text plus before/after line counts
+ */
+function squeezeTranscript(raw, options = {}) {
+    const lines = raw === '' ? [] : raw.split('\n');
+    const result = [];
+    let seenContent = false;
+    let i = 0;
+    while (i < lines.length) {
+        if (!isVisuallyBlank(lines[i])) {
+            result.push(lines[i]);
+            seenContent = true;
+            i++;
+            continue;
+        }
+        let j = i;
+        while (j < lines.length && isVisuallyBlank(lines[j]))
+            j++;
+        const isLeading = !seenContent;
+        const isTrailing = j >= lines.length;
+        if (!isLeading && !isTrailing) {
+            if (j - i <= 2) {
+                for (let k = i; k < j; k++)
+                    result.push(lines[k]);
+            }
+            else {
+                result.push((0, ansi_1.extractAnsiSequences)(lines.slice(i, j).join('')));
+            }
+        }
+        i = j;
+    }
+    const tail = options.tail;
+    const tailed = tail !== undefined && tail > 0 && result.length > tail;
+    const kept = tailed ? result.slice(result.length - tail) : result;
+    return {
+        text: kept.join('\n'),
+        rawLines: lines.length,
+        lines: kept.length,
+        tailed,
+    };
+}

package/dist/server/server.js

@@ -319,6 +319,24 @@ app.prepare().then(() => {
         console.log(`> WebSocket server ready`);
         // Initialize worktrees after server starts
         await initializeWorktrees();
+        // Issue #1623: reconcile the `prefix+g` reading-mode binding on the user's
+        // tmux server. Fail-open in its own try/catch — a convenience key must never
+        // be able to stop the server from serving.
+        //
+        // Dynamic import, NOT a top-level static import, for the same reason as the
+        // reconcilers above: adding a module graph to server.ts's eval-time graph
+        // perturbs Next's AsyncLocalStorage bootstrap under `tsx server.ts`, and the
+        // first request that compiles middleware then dies. Do not hoist this.
+        try {
+            const { initReadMode } = await Promise.resolve().then(() => __importStar(require('./src/lib/tmux/read-mode')));
+            const readMode = await initReadMode();
+            if (readMode.installed) {
+                console.log(`Reading mode ready: press prefix+${readMode.key} in an attached CommandMate session`);
+            }
+        }
+        catch (error) {
+            console.error('Error initializing tmux reading mode:', error);
+        }
         // [S3-010] Initialize schedule manager AFTER worktrees are ready
         (0, schedule_manager_1.initScheduleManager)();
         // Issue #534: Initialize timer manager AFTER schedule manager

package/dist/server/src/config/tmux-pane-config.js

@@ -17,8 +17,40 @@
  * so `capture-pane` cost / render load stays reasonable.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TUI_PANE_WIDTH = exports.TUI_PANE_HEIGHT = void 0;
+exports.TMUX_HISTORY_LIMIT = exports.TUI_PANE_WIDTH = exports.TUI_PANE_HEIGHT = void 0;
 /** Fixed pane height (rows) for TUI sessions. Large enough to retain useful history. */
 exports.TUI_PANE_HEIGHT = 1000;
 /** Fixed pane width (columns) for TUI sessions. Matches the historical default. */
 exports.TUI_PANE_WIDTH = 200;
+/**
+ * Scrollback lines retained per pane (`history-limit`), Issue #1624.
+ *
+ * Only NON-alternate-screen tools (codex / gemini / vibe-local / antigravity)
+ * consume this: the alternate-screen tools in `ALTERNATE_SCREEN_CLI_TOOLS`
+ * (claude / opencode / copilot) keep `history_size` at 0, so scrollback depth is
+ * irrelevant to them. See `usesAlternateScreen` in lib/cli-tools/types.ts.
+ *
+ * WHY 20000 and not the 50000 this used to request — measured on tmux 3.5a with
+ * a 200-column pane full of realistic, heavily-SGR-coloured agent output
+ * (274 bytes/line as re-emitted by `capture-pane -e`):
+ *
+ * 1. `capturePane` runs tmux under `execFile` with `maxBuffer: 10 MB`. A full
+ *    50000-line capture extrapolates to ~13 MB of escape-laden text, which
+ *    OVERFLOWS that buffer and makes `capturePane` THROW rather than return a
+ *    truncated string — i.e. the deepest part of a 50000-line buffer was never
+ *    readable by this app in the first place. 20000 lines is ~5.2 MB, leaving
+ *    roughly 2x headroom.
+ * 2. Nothing in the app reads deeper than 10000 lines by default (`capturePane`'s
+ *    options-path default is `-S -10000`; every other call site asks for 1000 or
+ *    fewer). 20000 keeps a 2x margin over the deepest default read.
+ * 3. Memory is charged per line ACTUALLY emitted, not preallocated from the
+ *    limit: a fresh session cost ~0.3 MB of tmux-server RSS, growing to ~34 MB
+ *    only after 45000 lines had scrolled (~0.68 KB/line). At 20000 a saturated
+ *    pane costs ~14 MB, so 20 concurrent sessions cap out near 270 MB instead of
+ *    the ~680 MB implied by 50000.
+ *
+ * This is still a 10x increase over tmux's built-in 2000, which is what sessions
+ * were actually getting before #1624 (a `mcbd-codex-*` session was observed at
+ * 1977/2000 lines used, i.e. actively losing transcript).
+ */
+exports.TMUX_HISTORY_LIMIT = 20000;

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

@@ -119,10 +119,11 @@ class AntigravityTool extends base_1.BaseCLITool {
         try {
             // Create tmux session with large history buffer for agy output
             // (agy is inline-rendered and retains scrollback, like Codex)
+            // Scrollback depth comes from the shared TMUX_HISTORY_LIMIT default
+            // (Issue #1624) — do not re-hardcode it here.
             await (0, tmux_1.createSession)({
                 sessionName,
                 workingDirectory: worktreePath,
-                historyLimit: 50000,
             });
             // Wait a moment for the session to be created
             await new Promise((resolve) => setTimeout(resolve, cli_tool_timing_config_1.TUI_SESSION_CREATE_WAIT_MS));

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

@@ -67,11 +67,12 @@ class CodexTool extends base_1.BaseCLITool {
             return;
         }
         try {
-            // Create tmux session with large history buffer for Codex output
+            // Create tmux session. Codex is inline-rendered, so its transcript lives in
+            // the pane scrollback — depth comes from the shared TMUX_HISTORY_LIMIT
+            // default (Issue #1624), do not re-hardcode it here.
             await (0, tmux_1.createSession)({
                 sessionName,
                 workingDirectory: worktreePath,
-                historyLimit: 50000,
             });
             // Wait a moment for the session to be created
             await new Promise((resolve) => setTimeout(resolve, cli_tool_timing_config_1.TUI_SESSION_CREATE_WAIT_MS));

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

@@ -113,11 +113,11 @@ class CopilotTool extends base_1.BaseCLITool {
             return;
         }
         try {
-            // Create tmux session with large history buffer
+            // Create tmux session. Scrollback depth comes from the shared
+            // TMUX_HISTORY_LIMIT default (Issue #1624) — do not re-hardcode it here.
             await (0, tmux_1.createSession)({
                 sessionName,
                 workingDirectory: worktreePath,
-                historyLimit: 50000,
             });
             // Wait a moment for the session to be created
             await new Promise((resolve) => setTimeout(resolve, cli_tool_timing_config_1.TUI_SESSION_CREATE_WAIT_MS));

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

@@ -74,11 +74,11 @@ class GeminiTool extends base_1.BaseCLITool {
             return;
         }
         try {
-            // Create tmux session with large history buffer
+            // Create tmux session. Scrollback depth comes from the shared
+            // TMUX_HISTORY_LIMIT default (Issue #1624) — do not re-hardcode it here.
             await (0, tmux_1.createSession)({
                 sessionName,
                 workingDirectory: worktreePath,
-                historyLimit: 50000,
             });
             // Wait a moment for the session to be created
             await new Promise((resolve) => setTimeout(resolve, cli_tool_timing_config_1.TUI_SESSION_CREATE_WAIT_MS));

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

@@ -89,11 +89,11 @@ class OpenCodeTool extends base_1.BaseCLITool {
         try {
             // Generate opencode.json if not present (non-fatal on failure)
             await (0, opencode_config_1.ensureOpencodeConfig)(worktreePath);
-            // Create tmux session with large history buffer
+            // Create tmux session. Scrollback depth comes from the shared
+            // TMUX_HISTORY_LIMIT default (Issue #1624) — do not re-hardcode it here.
             await (0, tmux_1.createSession)({
                 sessionName,
                 workingDirectory: worktreePath,
-                historyLimit: 50000,
             });
             // Wait a moment for the session to be created
             await new Promise((resolve) => setTimeout(resolve, cli_tool_timing_config_1.TUI_SESSION_CREATE_WAIT_MS));

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

@@ -66,11 +66,11 @@ class VibeLocalTool extends base_1.BaseCLITool {
             return;
         }
         try {
-            // Create tmux session with large history buffer
+            // Create tmux session. Scrollback depth comes from the shared
+            // TMUX_HISTORY_LIMIT default (Issue #1624) — do not re-hardcode it here.
             await (0, tmux_1.createSession)({
                 sessionName,
                 workingDirectory: worktreePath,
-                historyLimit: 50000,
             });
             // Wait a moment for the session to be created
             await new Promise((resolve) => setTimeout(resolve, cli_tool_timing_config_1.TUI_SESSION_CREATE_WAIT_MS));

package/dist/server/src/lib/db/agent-instances-db.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InvalidAgentInstanceError = exports.AgentInstanceLimitError = void 0;
 exports.getAgentInstances = getAgentInstances;
 exports.getAgentInstance = getAgentInstance;
+exports.resolveInstanceCliTool = resolveInstanceCliTool;
 exports.countAgentInstances = countAgentInstances;
 exports.setAgentInstances = setAgentInstances;
 exports.addAgentInstance = addAgentInstance;
@@ -103,6 +104,58 @@ function getAgentInstance(db, worktreeId, instanceId) {
   `).get(worktreeId, instanceId);
     return row ? mapAgentInstance(row) : null;
 }
+/**
+ * Resolve which CLI tool backs a targeted agent instance (Issue #1629).
+ *
+ * The CLI tool id is part of the tmux session name, so getting it wrong starts
+ * (or looks for) the wrong agent under a session name that claims otherwise:
+ * `--instance codex` used to start Claude in `mcbd-claude-<wt>-codex`.
+ *
+ * Resolution order:
+ *   1. the roster entry for `instanceId` — the roster is what declares that
+ *      `codex` is a codex instance, so it wins over the worktree default
+ *   2. `requestedCliTool`, for an instance the roster does not know about
+ *      (the ad-hoc `send --instance <new-id>` / `--register` flow)
+ *   3. `instanceId` when it is itself a CLI tool id — that is how the primary
+ *      instance is anchored (Issue #868), and holds without a roster row
+ *   4. no signal (`cliToolId: null`) — the caller falls back to its default
+ *
+ * An explicit `requestedCliTool` that contradicts the roster is reported as a
+ * conflict rather than silently overriding it: the roster is user-maintained
+ * and a mismatch means one of the two is wrong. Callers surface it as an error.
+ *
+ * @param db - Database instance
+ * @param worktreeId - Worktree ID
+ * @param instanceId - Targeted agent instance ID (omitted for the primary instance)
+ * @param requestedCliTool - CLI tool explicitly named by the caller, if any
+ */
+function resolveInstanceCliTool(db, worktreeId, instanceId, requestedCliTool) {
+    if (!instanceId) {
+        return { ok: true, cliToolId: requestedCliTool ?? null };
+    }
+    const registered = getAgentInstance(db, worktreeId, instanceId);
+    if (registered && (0, types_1.isCliToolType)(registered.cliTool)) {
+        if (requestedCliTool && requestedCliTool !== registered.cliTool) {
+            return {
+                ok: false,
+                instanceId,
+                rosterCliTool: registered.cliTool,
+                requestedCliTool,
+            };
+        }
+        return { ok: true, cliToolId: registered.cliTool };
+    }
+    // Not registered: an instance id that names a CLI tool is that tool's primary
+    // instance by definition, which outranks the worktree default but not an
+    // explicit request.
+    if (requestedCliTool) {
+        return { ok: true, cliToolId: requestedCliTool };
+    }
+    if ((0, types_1.isCliToolType)(instanceId)) {
+        return { ok: true, cliToolId: instanceId };
+    }
+    return { ok: true, cliToolId: null };
+}
 /**
  * Count agent instances for a worktree.
  */

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

@@ -35,6 +35,7 @@ const v48_skill_operations_audit_index_1 = require("./v48-skill-operations-audit
 const v49_verification_runs_1 = require("./v49-verification-runs");
 const v50_tasks_1 = require("./v50-tasks");
 const v51_task_events_1 = require("./v51-task-events");
+const v52_orphaned_worktree_children_1 = require("./v52-orphaned-worktree-children");
 /**
  * Complete ordered list of all migrations.
  * Used internally by the barrel file (db-migrations.ts); NOT exported from the barrel (DR2-004).
@@ -73,4 +74,5 @@ exports.migrations = [
     ...v49_verification_runs_1.v49_migrations,
     ...v50_tasks_1.v50_migrations,
     ...v51_task_events_1.v51_migrations,
+    ...v52_orphaned_worktree_children_1.v52_migrations,
 ];

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

@@ -17,7 +17,7 @@ const path_1 = __importDefault(require("path"));
  * Current schema version
  * Increment this when adding new migrations
  */
-exports.CURRENT_SCHEMA_VERSION = 51;
+exports.CURRENT_SCHEMA_VERSION = 52;
 /**
  * Get current schema version from database
  */