fix(tmux): bind nested prefix before unbind so an empty table cannot abort the chain

A user tmux config that leaves the prefix table empty makes
unbind-key -a -T prefix fail and drop later commands in the \; chain,
including send-prefix and remain-on-exit failed. Bind C-q send-prefix,
clear the table, then bind it again.

Also accept macOS ttys in the TUI switch-guard test without reading
/proc, and describe the client_pid hook escape as defensive on tmux 3.4.

Co-authored-by: DDT <1786035110@qq.com>
This commit is contained in:
DDTandDDT committed 2026-10-23 09:08:48 +00:00
1 parent daeea54495
commit 9fc2773176
10 files changed
+106 -28

No files matched your search

+3 -2
View File
@@ -682,8 +682,9 @@ describe('TUI switch-key guard', () => {
expect(isTuiClientTty('/dev/pts/4; rm')).toBe(false);
expect(tuiSwitchGuard('/dev/pts/4')).toContain('#{client_tty},/dev/pts/4');
expect(tuiSwitchGuard('/dev/pts/4')).toContain('#{@codeman-tui-pid}');
// A bare #{client_pid} is expanded when the hook is stored, with no client
// attached, and the pid is then empty forever. The backslash defers it.
// Defensive. On tmux 3.4 a bare #{client_pid} is also stored verbatim and
// records the pid. The backslash stays so a tmux that expands formats while
// storing the hook cannot save an empty pid.
const hook = tuiSwitchAttachHook('/dev/pts/4');
expect(hook).toContain('/dev/pts/4');
expect(hook).toContain('\\#{client_pid}');
+21 -5
View File
@@ -11,7 +11,7 @@
*/
import { afterAll, describe, expect, it } from 'vitest';
import { execFileSync, execSync, spawn, type ChildProcess } from 'node:child_process';
import { readlinkSync, rmSync } from 'node:fs';
import { rmSync } from 'node:fs';
import { createInterface } from 'node:readline';
import * as pty from 'node-pty';
import { TuiClient } from '../../src/tui/tui-client.js';
@@ -70,6 +70,9 @@ except ChildProcessError:
os.close(master)
`;
/** Linux `/dev/pts/N` and macOS `/dev/ttysNNN`, the same ttys `isTuiClientTty` accepts. */
const CLIENT_TTY = /^\/dev\/(?:pts\/[0-9]+|ttys[0-9]+)$/;
describe.skipIf(!hasTmux)('TUI M-1..M-9 switch only the attaching client', () => {
const socket = `codeman-tui-switch-${process.pid}`;
const alpha = 'codeman-aaaa1111';
@@ -146,13 +149,14 @@ describe.skipIf(!hasTmux)('TUI M-1..M-9 switch only the attaching client', () =>
helper = spawn('python3', ['-c', PTY_HELPER, socket, alpha], { stdio: ['pipe', 'pipe', 'inherit'] });
createInterface({ input: helper.stdout! }).on('line', pushLine);
const tty = (await nextLine()).trim();
expect(tty).toMatch(/^\/dev\/pts\/[0-9]+$/);
expect(tty).toMatch(CLIENT_TTY);
expect(await client.armTuiSwitchGuard(tty)).toBe(true);
const hooks = run(['show-hooks', '-g']);
expect(hooks).toContain('client-attached[90]');
expect(hooks).toContain(tty);
// Expanded at set-hook time this is empty and the guard never matches.
// The stored hook still names the format. Expanding it while the hook is
// stored would save an empty pid (no client yet) and the guard would never match.
expect(hooks).toContain('#{client_pid}');
helper.stdin!.write('GO\n');
@@ -185,9 +189,21 @@ describe.skipIf(!hasTmux)('TUI M-1..M-9 switch only the attaching client', () =>
rows: 24,
env,
});
const otherTty = readlinkSync(`/proc/${other.pid}/fd/0`);
// list-clients is the portable tty: /proc/<pid>/fd/0 does not exist on macOS.
let otherTty = '';
expect(
await waitFor(() => {
for (const [candidate, info] of sessions()) {
if (candidate !== tty && info.session === alpha) {
otherTty = candidate;
return true;
}
}
return false;
})
).toBe(true);
expect(otherTty).toMatch(CLIENT_TTY);
expect(otherTty).not.toBe(tty);
expect(await waitFor(() => sessions().get(otherTty)?.session === alpha)).toBe(true);
other.write('\x1b2');
await new Promise((resolve) => setTimeout(resolve, 400));