oh-my-codex 0.20.2 → 0.20.5

package/dist/team/__tests__/tmux-source-authority-realtmux.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=tmux-source-authority-realtmux.test.d.ts.map

package/dist/team/__tests__/tmux-source-authority-realtmux.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tmux-source-authority-realtmux.test.d.ts","sourceRoot":"","sources":["../../../src/team/__tests__/tmux-source-authority-realtmux.test.ts"],"names":[],"mappings":""}

package/dist/team/__tests__/tmux-source-authority-realtmux.test.js

@@ -0,0 +1,149 @@
+import assert from 'node:assert/strict';
+import { mkdir, mkdtemp, readFile, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { describe, it } from 'node:test';
+import { runSourceAuthorizedTmux } from '../tmux-session.js';
+import { isRealTmuxAvailable, withTempTmuxSession } from './tmux-test-fixture.js';
+const SOURCE_AUTHORITY_FORMAT = '#{session_name}\t#{session_id}\t#{session_created}\t#{window_index}\t#{window_id}\t#{pane_id}\t#{pane_pid}';
+const PANE_READY_TIMEOUT_MS = 1_000;
+const PANE_READY_INTERVAL_MS = 50;
+function skipUnlessPrivateRealTmux(t) {
+    if (isRealTmuxAvailable())
+        return true;
+    assert.equal(process.env.CI, undefined, 'CI must provide tmux for the private-server source-authority regression');
+    t.skip('tmux is not installed');
+    return false;
+}
+function quoteTmuxString(value) {
+    return `'${value.replaceAll("'", "'\\''")}'`;
+}
+function sourceAuthorityPredicate(source) {
+    return [
+        '#{==:#{pane_dead},0}',
+        `#{==:#{pane_id},${source.paneId}}`,
+        `#{==:#{pane_pid},${source.panePid}}`,
+        `#{==:#{session_id},${source.sessionId}}`,
+        `#{==:#{session_created},${source.sessionCreated}}`,
+        `#{==:#{window_id},${source.windowId}}`,
+        ...(source.teamPaneOwnerId ? [`#{==:#{@omx_team_pane_owner_id},${source.teamPaneOwnerId}}`] : []),
+    ].reduce((combined, condition) => `#{&&:${combined},${condition}}`);
+}
+function parseShimTmuxArgv(contents) {
+    return contents
+        .split('tmux argv:\n')
+        .slice(1)
+        .map((record) => record.split('\nend tmux argv')[0].split('\n').filter(Boolean));
+}
+function captureSourceAuthority(fixture, paneId) {
+    const fields = fixture.run(['display-message', '-p', '-t', paneId, SOURCE_AUTHORITY_FORMAT]).split('\t');
+    assert.equal(fields.length, 7, 'fixture must provide a complete source authority frame');
+    const [sessionName, sessionId, sessionCreated, windowIndex, windowId, capturedPaneId, panePid] = fields;
+    assert.equal(capturedPaneId, paneId, 'fixture source frame must belong to the tested pane');
+    assert.ok(sessionName && sessionId && sessionCreated && windowIndex && windowId && panePid, 'fixture source frame must not contain empty required fields');
+    const parsedPanePid = Number(panePid);
+    assert.ok(Number.isSafeInteger(parsedPanePid) && parsedPanePid > 0, 'fixture pane pid must be a positive safe integer');
+    return {
+        paneId,
+        panePid: parsedPanePid,
+        sessionName,
+        sessionId,
+        sessionCreated,
+        windowIndex,
+        windowId,
+        teamPaneOwnerId: null,
+    };
+}
+async function waitForPaneReady(fixture, paneId) {
+    const deadline = Date.now() + PANE_READY_TIMEOUT_MS;
+    let lastState = '';
+    while (Date.now() < deadline) {
+        lastState = fixture.run(['display-message', '-p', '-t', paneId, '#{pane_dead}']);
+        if (lastState === '0')
+            return;
+        await new Promise((resolve) => setTimeout(resolve, PANE_READY_INTERVAL_MS));
+    }
+    throw new Error(`timed out waiting for private tmux pane readiness: ${paneId} (${lastState})`);
+}
+function expectedIfShellArgv(source, effect, receipt) {
+    return [
+        'if-shell',
+        '-F',
+        '-t',
+        source.paneId,
+        sourceAuthorityPredicate(source),
+        `${effect} ; display-message -p ${quoteTmuxString(receipt)}`,
+        "display-message -p ''",
+    ];
+}
+describe('runSourceAuthorizedTmux real private-server argv boundary', () => {
+    it('uses a real tmux parser for guarded effects and records the exact product argv', async (t) => {
+        if (!skipUnlessPrivateRealTmux(t))
+            return;
+        const workDir = await mkdtemp(join(tmpdir(), 'omx-source-authority-realtmux-'));
+        const bin = join(workDir, 'bin');
+        const shimLogPath = join(workDir, 'tmux-argv.log');
+        const previousPath = process.env.PATH;
+        try {
+            await mkdir(bin, { recursive: true });
+            await withTempTmuxSession({ serverLog: true }, async (fixture) => {
+                await fixture.createPathShim(bin, shimLogPath);
+                process.env.PATH = `${bin}:${previousPath ?? ''}`;
+                try {
+                    await waitForPaneReady(fixture, fixture.leaderPaneId);
+                    const source = captureSourceAuthority(fixture, fixture.leaderPaneId);
+                    const expectedTransactions = [];
+                    const setOptionEffect = `set-option -p -t ${source.paneId} @omx_probe_3459 ${quoteTmuxString('ok')}`;
+                    const setOptionReceipt = 'omx_source_set_option_3459';
+                    expectedTransactions.push(expectedIfShellArgv(source, setOptionEffect, setOptionReceipt));
+                    assert.equal(runSourceAuthorizedTmux(source, setOptionEffect, setOptionReceipt), setOptionReceipt);
+                    assert.equal(fixture.run(['show-options', '-pv', '-t', source.paneId, '@omx_probe_3459']), 'ok');
+                    const workerPaneId = fixture.run(['split-window', '-d', '-h', '-P', '-F', '#{pane_id}', '-t', source.windowId]);
+                    assert.match(workerPaneId, /^%[0-9]+$/, 'private fixture must create a second pane for layout coverage');
+                    const selectLayoutEffect = `select-layout -t ${source.windowId} even-horizontal`;
+                    const selectLayoutReceipt = 'omx_source_select_layout_3459';
+                    expectedTransactions.push(expectedIfShellArgv(source, selectLayoutEffect, selectLayoutReceipt));
+                    assert.equal(runSourceAuthorizedTmux(source, selectLayoutEffect, selectLayoutReceipt), selectLayoutReceipt);
+                    const paneHeights = fixture.run(['list-panes', '-t', source.windowId, '-F', '#{pane_height}']).split('\n');
+                    assert.equal(paneHeights.length, 2, 'layout coverage requires both private fixture panes');
+                    assert.equal(new Set(paneHeights).size, 1, 'even-horizontal must assign equal heights');
+                    const sendKeysEffect = `send-keys -t ${source.paneId} C-l`;
+                    const sendKeysReceipt = 'omx_source_send_keys_3459';
+                    expectedTransactions.push(expectedIfShellArgv(source, sendKeysEffect, sendKeysReceipt));
+                    assert.equal(runSourceAuthorizedTmux(source, sendKeysEffect, sendKeysReceipt), sendKeysReceipt);
+                    const hostileValue = "literal; no-command 'still literal'";
+                    const hostileReceipt = `omx_source_hostile'; kill-session -t ${source.sessionName}; #`;
+                    const hostileEffect = `set-option -p -t ${source.paneId} @omx_hostile_3459 ${quoteTmuxString(hostileValue)}`;
+                    expectedTransactions.push(expectedIfShellArgv(source, hostileEffect, hostileReceipt));
+                    assert.equal(runSourceAuthorizedTmux(source, hostileEffect, hostileReceipt), hostileReceipt);
+                    assert.equal(fixture.run(['show-options', '-pv', '-t', source.paneId, '@omx_hostile_3459']), hostileValue);
+                    assert.equal(fixture.sessionExists(), true, 'hostile receipt text must not execute a second tmux command');
+                    const staleEffect = `set-option -p -t ${source.paneId} @omx_stale_3459 ${quoteTmuxString('unexpected')}`;
+                    const staleReceipt = 'omx_source_stale_3459';
+                    const staleSource = { ...source, panePid: source.panePid + 1 };
+                    expectedTransactions.push(expectedIfShellArgv(staleSource, staleEffect, staleReceipt));
+                    assert.throws(() => runSourceAuthorizedTmux(staleSource, staleEffect, staleReceipt), /tmux source authority changed before effect/);
+                    assert.equal(fixture.runResult(['show-options', '-pv', '-t', source.paneId, '@omx_stale_3459']).stdout.trim(), '', 'failed authority must not apply the guarded effect');
+                    const ifShellTransactions = parseShimTmuxArgv(await readFile(shimLogPath, 'utf-8'))
+                        .filter((argv) => argv[0] === 'if-shell');
+                    assert.deepEqual(ifShellTransactions, expectedTransactions, 'PATH shim must record exactly the product if-shell argv routed to the private server');
+                    assert.doesNotMatch(await fixture.readServerLog(), /too many arguments/i, 'real tmux must not fold the receipt command into the effect argv');
+                }
+                finally {
+                    if (typeof previousPath === 'string')
+                        process.env.PATH = previousPath;
+                    else
+                        delete process.env.PATH;
+                }
+            });
+        }
+        finally {
+            if (typeof previousPath === 'string')
+                process.env.PATH = previousPath;
+            else
+                delete process.env.PATH;
+            await rm(workDir, { recursive: true, force: true });
+        }
+    });
+});
+//# sourceMappingURL=tmux-source-authority-realtmux.test.js.map

package/dist/team/__tests__/tmux-source-authority-realtmux.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tmux-source-authority-realtmux.test.js","sourceRoot":"","sources":["../../../src/team/__tests__/tmux-source-authority-realtmux.test.ts"],"names":[],"mappings":"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"}

package/dist/team/__tests__/tmux-test-fixture.d.ts

@@ -10,11 +10,80 @@ export interface TempTmuxSessionFixture {
         TMUX_PANE: string;
     };
     sessionExists: (targetSessionName?: string) => boolean;
+    run: (args: string[]) => string;
+    runResult: (args: string[]) => {
+        status: number | null;
+        stdout: string;
+        stderr: string;
+        error: string;
+    };
+    runPtyResult: (command: string, options?: {
+        pollLimit?: number;
+    }) => {
+        status: number | null;
+        stdout: string;
+        stderr: string;
+        error: string;
+    };
+    createPathShim: (directory: string, commandLogPath?: string) => Promise<string>;
+    triggerClientResize: (targetSession: string, geometry?: {
+        rows?: number;
+        cols?: number;
+    }) => void;
+    serverLogPath: string | null;
+    readServerLog: () => Promise<string>;
 }
 export interface TempTmuxSessionOptions {
     useAmbientServer?: boolean;
+    serverLog?: boolean;
 }
 export declare function isRealTmuxAvailable(): boolean;
+/**
+ * Test-only PTY invocation for GNU/util-linux `script(1)` vs. BSD/macOS `script(1)`.
+ *
+ * util-linux (Linux) accepts `-c command` and always requires a trailing log-file
+ * argument: `script -q -e -c <command> /dev/null`.
+ *
+ * BSD/macOS `script(1)` (shell_cmds) has no `-c` flag; the command is a trailing
+ * positional argument vector after the log file: `script [file [command ...]]`.
+ * Verified against Apple's shell_cmds script.1 source (apple-oss-distributions/shell_cmds):
+ * "-e: Accepted for compatibility with util-linux script. The child command exit
+ * status is always the exit status of script." — i.e. on BSD/macOS, `script`
+ * unconditionally propagates the child's exit status even without `-e`, so `-e`
+ * is redundant there and intentionally omitted. The command is passed as a single
+ * `/bin/sh -c <command>` argv triple (not a shell string) to keep the wrapped
+ * command as exactly one argument, matching the util-linux `-c` contract.
+ */
+export interface PtyScriptCommand {
+    executable: string;
+    args: string[];
+}
+export declare function buildPtyScriptCommand(command: string, platform?: NodeJS.Platform): PtyScriptCommand;
+export declare function isRealScriptAvailable(): boolean;
 export declare function tmuxSessionExists(sessionName: string, serverName?: string): boolean;
+export interface PtyCommandResult {
+    status: number | null;
+    stdout: string;
+    stderr: string;
+    error: string;
+}
+interface PtyCommandRunner {
+    run: (args: string[]) => string;
+    runResult: (args: string[]) => {
+        status: number | null;
+        stdout: string;
+        stderr: string;
+        error: string;
+    };
+    sleep?: () => void;
+}
+export declare function runPtyResult(command: string, options: PtyCommandRunner & {
+    platform?: NodeJS.Platform;
+    syntheticServer?: boolean;
+    sessionName: string;
+    pollLimit?: number;
+    statusMarker?: string;
+}): PtyCommandResult;
 export declare function withTempTmuxSession<T>(optionsOrFn: TempTmuxSessionOptions | ((fixture: TempTmuxSessionFixture) => Promise<T> | T), maybeFn?: (fixture: TempTmuxSessionFixture) => Promise<T> | T): Promise<T>;
+export {};
 //# sourceMappingURL=tmux-test-fixture.d.ts.map

package/dist/team/__tests__/tmux-test-fixture.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tmux-test-fixture.d.ts","sourceRoot":"","sources":["../../../src/team/__tests__/tmux-test-fixture.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,sBAAsB;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,SAAS,GAAG,WAAW,CAAC;IACpC,GAAG,EAAE;QACH,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,aAAa,EAAE,CAAC,iBAAiB,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;CACxD;AAED,MAAM,WAAW,sBAAsB;IACrC,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AA4CD,wBAAgB,mBAAmB,IAAI,OAAO,CAO7C;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAUnF;AAMD,wBAAsB,mBAAmB,CAAC,CAAC,EACzC,WAAW,EAAE,sBAAsB,GAAG,CAAC,CAAC,OAAO,EAAE,sBAAsB,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAC3F,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,sBAAsB,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GAC5D,OAAO,CAAC,CAAC,CAAC,CA8EZ"}
+{"version":3,"file":"tmux-test-fixture.d.ts","sourceRoot":"","sources":["../../../src/team/__tests__/tmux-test-fixture.ts"],"names":[],"mappings":"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"}

package/dist/team/__tests__/tmux-test-fixture.js

@@ -1,7 +1,8 @@
 import { spawnSync } from 'node:child_process';
-import { mkdtemp, rm } from 'node:fs/promises';
+import { chmod, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
+import { existsSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { join } from 'node:path';
+import { delimiter, join } from 'node:path';
 const TMUX_COMMAND_TIMEOUT_MS = 5_000;
 const NULL_TMUX_CONFIG = process.platform === 'win32' ? 'NUL' : '/dev/null';
 function snapshotTmuxEnv(source = process.env) {
@@ -20,12 +21,13 @@ function applyTmuxEnv(snapshot) {
     else
         delete process.env.TMUX_PANE;
 }
-function runTmux(args, options = {}) {
+function runTmuxResult(args, options = {}) {
     const env = options.env
         ?? (options.ignoreTmuxEnv ? { ...process.env, TMUX: undefined, TMUX_PANE: undefined } : process.env);
     const argv = [
         ...(options.configFile ? ['-f', options.configFile] : []),
         ...(options.serverName ? ['-L', options.serverName] : []),
+        ...(options.verbose ? ['-vv'] : []),
         ...args,
     ];
     const result = spawnSync('tmux', argv, {
@@ -34,23 +36,62 @@ function runTmux(args, options = {}) {
         stdio: ['ignore', 'pipe', 'pipe'],
         timeout: TMUX_COMMAND_TIMEOUT_MS,
         killSignal: 'SIGKILL',
+        cwd: options.cwd,
     });
+    return {
+        status: result.status,
+        stdout: result.stdout || '',
+        stderr: result.stderr || '',
+        error: result.error?.message || '',
+    };
+}
+function runTmux(args, options = {}) {
+    const result = runTmuxResult(args, options);
     if (result.error) {
+        throw new Error(result.error);
+    }
+    if (result.status !== 0) {
+        throw new Error(result.stderr.trim() || `tmux exited ${result.status}`);
+    }
+    return result.stdout.trim();
+}
+export function isRealTmuxAvailable() {
+    const result = spawnSync('tmux', ['-V'], {
+        encoding: 'utf-8',
+        env: { ...process.env, TMUX: undefined, TMUX_PANE: undefined },
+        stdio: ['ignore', 'pipe', 'pipe'],
+        timeout: TMUX_COMMAND_TIMEOUT_MS,
+        killSignal: 'SIGKILL',
+    });
+    if (result.error) {
+        if (result.error.code === 'ENOENT')
+            return false;
         throw result.error;
     }
     if (result.status !== 0) {
         throw new Error((result.stderr || '').trim() || `tmux exited ${result.status}`);
     }
-    return (result.stdout || '').trim();
+    return true;
 }
-export function isRealTmuxAvailable() {
-    try {
-        runTmux(['-V'], { ignoreTmuxEnv: true });
-        return true;
+export function buildPtyScriptCommand(command, platform = process.platform) {
+    if (platform === 'darwin') {
+        return { executable: 'script', args: ['-q', '/dev/null', '/bin/sh', '-c', command] };
     }
-    catch {
-        return false;
+    return { executable: 'script', args: ['-q', '-e', '-c', command, '/dev/null'] };
+}
+export function isRealScriptAvailable() {
+    const result = spawnSync('/bin/sh', ['-c', 'command -v script'], {
+        encoding: 'utf-8',
+        stdio: ['ignore', 'pipe', 'pipe'],
+        timeout: TMUX_COMMAND_TIMEOUT_MS,
+        killSignal: 'SIGKILL',
+    });
+    if (result.error) {
+        if (result.error.code === 'ENOENT')
+            return false;
+        throw result.error;
     }
+    return result.status === 0;
 }
 export function tmuxSessionExists(sessionName, serverName) {
     try {
@@ -64,9 +105,89 @@ export function tmuxSessionExists(sessionName, serverName) {
         return false;
     }
 }
+function resolveTmuxExecutable() {
+    for (const directory of (process.env.PATH ?? '').split(delimiter)) {
+        const candidate = join(directory || '.', 'tmux');
+        if (existsSync(candidate))
+            return candidate;
+    }
+    throw new Error('tmux executable disappeared after availability probe');
+}
 function uniqueTmuxIdentifier(prefix) {
     return `${prefix}-${process.pid}-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
 }
+function shellQuote(value) {
+    return `'${value.replaceAll("'", `'\\''`)}'`;
+}
+function ptyRunnerFailure(label, result) {
+    if (result.status === 0 && result.error === '')
+        return '';
+    const detail = result.error || result.stderr;
+    if (result.status !== 0) {
+        return `${label} failed with status ${String(result.status)}${detail === '' ? '' : `: ${detail}`}`;
+    }
+    return `${label} failed${detail === '' ? '' : `: ${detail}`}`;
+}
+export function runPtyResult(command, options) {
+    if ((options.platform ?? process.platform) !== 'darwin') {
+        throw new Error('runPtyResult is only supported on Darwin');
+    }
+    if (options.syntheticServer !== true) {
+        throw new Error('runPtyResult requires a private synthetic tmux server');
+    }
+    options.run(['set-option', '-g', 'remain-on-exit', 'on']);
+    // A tmux pane already supplies the controlling PTY. Run the requested command
+    // in an inner shell so the outer shell can report its status even when the
+    // pane command wrapper itself exits differently on BSD tmux.
+    const statusMarker = options.statusMarker ?? `__omx_pty_exit_${process.pid}_${Date.now().toString(36)}__`;
+    const wrappedCommand = `/bin/sh -c ${shellQuote(command)}; status=$?; printf '\\n${statusMarker}:%s\\n' "$status"; exit "$status"`;
+    const shellCommand = ['/bin/sh', '-c', wrappedCommand].map(shellQuote).join(' ');
+    const paneId = options.run([
+        'new-window',
+        '-d',
+        '-P',
+        '-F',
+        '#{pane_id}',
+        '-t',
+        options.sessionName,
+        shellCommand,
+    ]);
+    let status = null;
+    let state = '';
+    for (let attempt = 0; attempt < (options.pollLimit ?? 1_200); attempt += 1) {
+        state = options.run(['display-message', '-p', '-t', paneId, '#{pane_dead} #{pane_dead_status}']);
+        const [dead, exitStatus] = state.split(/\s+/, 2);
+        if (dead === '1') {
+            status = /^-?\d+$/.test(exitStatus ?? '') ? Number(exitStatus) : null;
+            break;
+        }
+        options.sleep?.();
+    }
+    const outputResult = options.runResult(['capture-pane', '-p', '-t', paneId, '-S', '-']);
+    for (const line of outputResult.stdout.split(/\r?\n/)) {
+        if (!line.startsWith(`${statusMarker}:`))
+            continue;
+        const explicitStatus = line.slice(statusMarker.length + 1);
+        if (/^\d+$/.test(explicitStatus))
+            status = Number(explicitStatus);
+    }
+    const cleanupResult = options.runResult(['kill-pane', '-t', paneId]);
+    const errors = [ptyRunnerFailure('capture-pane', outputResult), ptyRunnerFailure('kill-pane', cleanupResult)].filter(Boolean).join('; ');
+    if (status === null) {
+        return {
+            status: null,
+            stdout: outputResult.stdout,
+            stderr: outputResult.stderr || cleanupResult.stderr,
+            error: [`PTY command did not exit: ${state}`, errors].filter(Boolean).join('; '),
+        };
+    }
+    return {
+        status,
+        stdout: outputResult.stdout,
+        stderr: outputResult.stderr || cleanupResult.stderr,
+        error: errors,
+    };
+}
 export async function withTempTmuxSession(optionsOrFn, maybeFn) {
     if (!isRealTmuxAvailable()) {
         throw new Error('tmux is not available');
@@ -76,6 +197,9 @@ export async function withTempTmuxSession(optionsOrFn, maybeFn) {
     if (!fn) {
         throw new Error('withTempTmuxSession requires a callback');
     }
+    if (options.serverLog && options.useAmbientServer) {
+        throw new Error('server logging requires a private synthetic tmux server');
+    }
     const previousEnv = snapshotTmuxEnv(process.env);
     const fixtureCwd = await mkdtemp(join(tmpdir(), 'omx-tmux-fixture-'));
     const sessionName = uniqueTmuxIdentifier('omx-test');
@@ -86,6 +210,68 @@ export async function withTempTmuxSession(optionsOrFn, maybeFn) {
         serverName: serverName || undefined,
         configFile: serverKind === 'synthetic' ? NULL_TMUX_CONFIG : undefined,
     };
+    const tmuxExecutable = resolveTmuxExecutable();
+    const createPathShim = async (directory, commandLogPath) => {
+        if (serverKind !== 'synthetic')
+            throw new Error('private tmux PATH shim requires a synthetic server');
+        const shimPath = join(directory, 'tmux');
+        const logCommand = commandLogPath ? `printf '%s\\n' 'tmux argv:' >> ${JSON.stringify(commandLogPath)}\nfor argument do printf '%s\\n' "$argument"; done >> ${JSON.stringify(commandLogPath)}\nprintf '%s\\n' 'end tmux argv' >> ${JSON.stringify(commandLogPath)}\n` : '';
+        await writeFile(shimPath, `#!/bin/sh\n${logCommand}exec ${JSON.stringify(tmuxExecutable)} -f ${JSON.stringify(NULL_TMUX_CONFIG)} -L ${JSON.stringify(serverName)} "$@"\n`);
+        await chmod(shimPath, 0o755);
+        runTmux(['set-environment', '-g', 'PATH', `${directory}${delimiter}${process.env.PATH ?? ''}`], tmuxOptions);
+        return shimPath;
+    };
+    const runPtyCommandResult = (command, options = {}) => runPtyResult(command, {
+        platform: process.platform,
+        syntheticServer: serverKind === 'synthetic',
+        sessionName,
+        pollLimit: options.pollLimit,
+        run: (args) => runTmux(args, tmuxOptions),
+        runResult: (args) => runTmuxResult(args, tmuxOptions),
+        sleep: () => spawnSync('sleep', ['0.05'], { stdio: 'ignore' }),
+    });
+    const triggerClientResize = (targetSession, geometry = {}) => {
+        const rows = geometry.rows === undefined ? 41 : geometry.rows;
+        const cols = geometry.cols === undefined ? 121 : geometry.cols;
+        if (!Number.isSafeInteger(rows) || rows < 4 || rows > 500) {
+            throw new Error(`invalid trigger rows: ${rows}`);
+        }
+        if (!Number.isSafeInteger(cols) || cols < 20 || cols > 500) {
+            throw new Error(`invalid trigger cols: ${cols}`);
+        }
+        const tmuxAttachCommand = [
+            shellQuote(tmuxExecutable),
+            '-f',
+            shellQuote(NULL_TMUX_CONFIG),
+            '-L',
+            shellQuote(serverName),
+            'attach-session',
+            '-t',
+            shellQuote(targetSession),
+        ].join(' ');
+        const watchdog = [
+            `const { spawn } = require('node:child_process');`,
+            `const child = spawn(process.argv[1], process.argv.slice(2), { stdio: 'inherit', env: { ...process.env, TERM: 'xterm' } });`,
+            `let timedOut = false; let forceKillTimer;`,
+            `const timer = setTimeout(() => { timedOut = true; child.kill('SIGTERM'); forceKillTimer = setTimeout(() => child.kill('SIGKILL'), 250); }, 1000);`,
+            `child.once('error', (error) => { clearTimeout(timer); clearTimeout(forceKillTimer); console.error(error.message); process.exit(127); });`,
+            `child.once('exit', (code, signal) => { clearTimeout(timer); clearTimeout(forceKillTimer); process.exit(timedOut ? 124 : (code ?? (signal ? 1 : 0))); });`,
+        ].join('');
+        const script = `(sleep 0.1; stty rows ${rows} cols ${cols}) & exec ${shellQuote(process.execPath)} -e ${shellQuote(watchdog)} -- ${tmuxAttachCommand}`;
+        const ptyCommand = buildPtyScriptCommand(script);
+        const result = spawnSync(ptyCommand.executable, ptyCommand.args, {
+            encoding: 'utf-8',
+            env: { ...process.env, TMUX: undefined, TMUX_PANE: undefined },
+            stdio: ['ignore', 'pipe', 'pipe'],
+            timeout: TMUX_COMMAND_TIMEOUT_MS,
+            killSignal: 'SIGKILL',
+        });
+        if (result.error)
+            throw result.error;
+        if (result.status !== 124) {
+            throw new Error(`client resize trigger result: ${JSON.stringify({ status: result.status, stdout: result.stdout || '', stderr: result.stderr || '', error: '' })}`);
+        }
+    };
     const created = runTmux([
         'new-session',
         '-d',
@@ -97,7 +283,7 @@ export async function withTempTmuxSession(optionsOrFn, maybeFn) {
         '-c',
         fixtureCwd,
         'sleep 300',
-    ], tmuxOptions);
+    ], options.serverLog ? { ...tmuxOptions, verbose: true, cwd: fixtureCwd } : tmuxOptions);
     const [windowTarget = '', leaderPaneId = ''] = created.split(/\s+/, 2);
     if (windowTarget === '' || leaderPaneId === '') {
         try {
@@ -112,6 +298,9 @@ export async function withTempTmuxSession(optionsOrFn, maybeFn) {
         await rm(fixtureCwd, { recursive: true, force: true });
         throw new Error(`failed to create temporary tmux fixture: ${created}`);
     }
+    const serverLogPath = options.serverLog
+        ? join(fixtureCwd, `tmux-server-${runTmux(['display-message', '-p', '#{pid}'], tmuxOptions)}.log`)
+        : null;
     const socketPath = runTmux(['display-message', '-p', '-t', leaderPaneId, '#{socket_path}'], tmuxOptions);
     process.env.TMUX = `${socketPath},${process.pid},0`;
     process.env.TMUX_PANE = leaderPaneId;
@@ -127,20 +316,58 @@ export async function withTempTmuxSession(optionsOrFn, maybeFn) {
             TMUX_PANE: leaderPaneId,
         },
         sessionExists: (targetSessionName = sessionName) => tmuxSessionExists(targetSessionName, serverName || undefined),
+        run: (args) => runTmux(args, tmuxOptions),
+        runResult: (args) => runTmuxResult(args, tmuxOptions),
+        runPtyResult: runPtyCommandResult,
+        createPathShim,
+        triggerClientResize,
+        serverLogPath,
+        readServerLog: async () => {
+            if (serverLogPath === null) {
+                throw new Error('server logging was not enabled');
+            }
+            return readFile(serverLogPath, 'utf-8').catch((error) => {
+                if (error.code === 'ENOENT')
+                    return '';
+                throw error;
+            });
+        },
     };
     try {
         return await fn(fixture);
     }
     finally {
-        try {
-            if (serverKind === 'synthetic') {
+        if (serverKind === 'synthetic') {
+            try {
                 runTmux(['kill-server'], tmuxOptions);
             }
-            else {
+            catch { }
+            const expectedNoServerMessages = [
+                `no server running on ${socketPath}`,
+                `error connecting to ${socketPath} (No such file or directory)`,
+            ];
+            let probe = runTmuxResult(['list-sessions'], tmuxOptions);
+            for (let attempt = 0; attempt < 10 && !(probe.status === 1
+                && probe.stdout === ''
+                && expectedNoServerMessages.includes(probe.stderr.trim())); attempt += 1) {
+                await new Promise((resolve) => setTimeout(resolve, 50));
+                probe = runTmuxResult(['list-sessions'], tmuxOptions);
+            }
+            if (probe.error
+                || probe.status !== 1
+                || probe.stdout !== ''
+                || !expectedNoServerMessages.includes(probe.stderr.trim())) {
+                applyTmuxEnv(previousEnv);
+                await rm(fixtureCwd, { recursive: true, force: true });
+                throw new Error(`private tmux fixture cleanup did not prove private server termination: ${serverName}; ${JSON.stringify(probe)}`);
+            }
+        }
+        else {
+            try {
                 runTmux(['kill-session', '-t', sessionName], tmuxOptions);
             }
+            catch { }
         }
-        catch { }
         applyTmuxEnv(previousEnv);
         await rm(fixtureCwd, { recursive: true, force: true });
     }