Files
Netcatty/components/systemManager/tmuxActionFocus.ts
T
陈大猫andCursor 8322a2aeb8 Fix tmux detach focus regression on Windows (#1587) (#1600)
* Fix tmux detach focus regression on Windows (#1587)

Replace native confirm with an in-app dialog and restore terminal cursor/focus after detach so sidebar tmux actions keep working.

Co-authored-by: Cursor <cursoragent@cursor.com>

* Skip terminal refocus while app dialogs are open

Avoid deferred tmux detach focus from stealing Radix modal focus when users open the new-session dialog immediately after detach.

Co-authored-by: Cursor <cursoragent@cursor.com>

---------

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-23 20:08:43 +08:00

70 lines
1.9 KiB
TypeScript

import type { TmuxManageAction } from '../../domain/systemManager/types';
type TmuxActionResult = {
success: boolean;
error?: string;
};
type TmuxActionPayload = { sessionId: string } & TmuxManageAction;
interface RunTmuxSessionActionOptions {
sessionId: string;
action: TmuxManageAction;
tmuxAction: (payload: TmuxActionPayload) => Promise<TmuxActionResult>;
onRefreshDetails?: () => Promise<void>;
onSessionsChanged: () => Promise<void>;
onRequestTerminalFocus?: () => void;
}
const shouldRequestTerminalFocusAfterAction = (action: TmuxManageAction): boolean =>
action.action === 'detachSession';
const DEFERRED_TERMINAL_FOCUS_DELAYS_MS = [0, 50, 150] as const;
export function scheduleDeferredTerminalFocus(onRequestTerminalFocus?: () => void): void {
if (!onRequestTerminalFocus) return;
const run = () => onRequestTerminalFocus();
const schedule = typeof globalThis.setTimeout === 'function'
? globalThis.setTimeout.bind(globalThis)
: (callback: () => void) => {
callback();
return 0;
};
const raf = typeof globalThis.requestAnimationFrame === 'function'
? globalThis.requestAnimationFrame.bind(globalThis)
: (callback: () => void) => {
callback();
return 0;
};
raf(() => {
for (const delayMs of DEFERRED_TERMINAL_FOCUS_DELAYS_MS) {
schedule(run, delayMs);
}
});
}
export async function runTmuxSessionAction({
sessionId,
action,
tmuxAction,
onRefreshDetails,
onSessionsChanged,
onRequestTerminalFocus,
}: RunTmuxSessionActionOptions): Promise<TmuxActionResult> {
const result = await tmuxAction({ sessionId, ...action });
if (!result.success) return result;
try {
await onRefreshDetails?.();
await onSessionsChanged();
} finally {
if (shouldRequestTerminalFocusAfterAction(action)) {
scheduleDeferredTerminalFocus(onRequestTerminalFocus);
}
}
return result;
}