78609c005e
* feat(terminal): add touch-scroll helper for xterm scrollback Pure helper that translates single-finger vertical drags into `terminal.scrollLines(n)` calls. Handles threshold gating so taps still reach xterm, ignores multi-touch, yields to horizontal-dominant drags. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * feat(terminal): wire mobile touch scrollback into passthrough terminal Adds an `enableTouchScroll` prop on PassthroughTerminal and a thin hook that calls `attachTouchScroll` while the terminal is mounted. The two mobile mount points (terminal panel + chat-panel passthrough embed) opt in; desktop callers are unaffected. Fixes the bug where xterm.js's canvas absorbed touch gestures and left the scrollback unreachable. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * test(terminal): mobile e2e for passthrough touch-scroll Pixel 5-emulated Playwright spec: produce 200 lines of output, simulate a single-finger down-swipe, assert `terminal.buffer.active.viewportY` moved into the scrollback, then swipe back to return. Extends the e2e buffer reader to expose viewportY alongside `__xtermReadBuffer`. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * test(terminal): relax mobile swipe-back assertion against late shell output Replace the exact `.toBe(bottomViewportY)` check with `.toBeGreaterThanOrEqual` so the test doesn't flake if shell echo arrives between the snapshot and the post-swipe read. xterm clamps at the buffer boundary, so overshooting back-to-bottom is impossible. Addresses PR #1046 Claude review thread 3293258085. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * docs(terminal): document useTouchScroll's isTerminalReady invariant Adds a comment next to the eslint-disable explaining why the deps array can safely omit terminalRef/xtermRef: useTerminalInit only flips isTerminalReady false→true once per mount. A future refactor that recreates the terminal mid-mount must add a new dep. Addresses PR #1046 Claude review thread 3293258175. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * chore(terminal): clear all exposed buffer-reader fields on dispose clearBufferReader now nulls `__xtermGetFontFamily` and `__xtermGetFontSize` alongside the buffer readers. The two predated this PR and were never cleaned up; keeping the teardown symmetric with exposeBufferReader prevents stale references if the container is ever reused. Addresses PR #1046 Claude review thread 3293274674. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * test(terminal): reset document.body between touch-scroll cases Adds an afterEach to wipe jsdom's body so orphan divs from one test don't bleed into the next. Avoids cross-test pollution if a future case queries document.body for containers. Addresses PR #1046 Claude review thread 3293274769. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> --------- Co-authored-by: Kandev Agent <agent@kandev.dev> Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
315 lines
11 KiB
TypeScript
315 lines
11 KiB
TypeScript
"use client";
|
|
|
|
import React, { useRef, useCallback, useEffect, useMemo, useState } from "react";
|
|
import { Terminal } from "@xterm/xterm";
|
|
import { FitAddon } from "@xterm/addon-fit";
|
|
import { AttachAddon } from "@xterm/addon-attach";
|
|
import { WebglAddon } from "@xterm/addon-webgl";
|
|
import "@xterm/xterm/css/xterm.css";
|
|
import { GridSpinner } from "@/components/grid-spinner";
|
|
import { useAppStore } from "@/components/state-provider";
|
|
import { useSession } from "@/hooks/domains/session/use-session";
|
|
import { useSessionAgentctl } from "@/hooks/domains/session/use-session-agentctl";
|
|
import { getBackendConfig } from "@/lib/config";
|
|
import { useTerminalLinkHandler } from "@/hooks/use-terminal-link-handler";
|
|
import { buildTerminalFontFamily } from "@/lib/terminal/terminal-font";
|
|
import {
|
|
MIN_WIDTH,
|
|
MIN_HEIGHT,
|
|
useTerminalInit,
|
|
useWebSocketConnection,
|
|
useSendResize,
|
|
useSendInput,
|
|
useFitAndResize,
|
|
} from "./use-passthrough-terminal";
|
|
import { useTouchScroll } from "./use-touch-scroll";
|
|
import { useEnvironmentSessionId } from "@/hooks/use-environment-session-id";
|
|
import { useTerminalSearch } from "./use-terminal-search";
|
|
import { TerminalSearchBar } from "./terminal-search-bar";
|
|
import { usePanelSearch } from "@/hooks/use-panel-search";
|
|
|
|
type BaseProps = {
|
|
autoFocus?: boolean;
|
|
pendingCommand?: string | null;
|
|
onCommandSent?: () => void;
|
|
/** Called once the xterm instance is created. Mobile uses this to register
|
|
* the active key-bar input target. Desktop ignores. */
|
|
onXtermReady?: (xterm: Terminal) => void;
|
|
/** Skip the WebGL renderer addon and use xterm's canvas renderer instead.
|
|
* WebGL miscomputes glyph atlas scaling on mobile (notably after a
|
|
* desktop→mobile responsive switch) and renders text at multiples of the
|
|
* intended font size. Mobile callers should pass true. */
|
|
disableWebgl?: boolean;
|
|
/** When true, the AttachAddon is configured receive-only — incoming PTY
|
|
* data still flows to the terminal display, but the consumer is responsible
|
|
* for forwarding xterm.onData to the WebSocket. Mobile sets this so the
|
|
* key-bar's modifier transforms can run before bytes go on the wire. */
|
|
manualInputRouting?: boolean;
|
|
/** Fires when the dedicated terminal WebSocket reaches the OPEN state.
|
|
* Mobile uses this to register a key-bar sender that writes raw bytes
|
|
* directly to this terminal's socket. */
|
|
onWsReady?: (ws: WebSocket) => void;
|
|
/** Translate single-finger touch swipes on the terminal area into xterm
|
|
* scrollback navigation. Mobile callers set this so the xterm canvas no
|
|
* longer silently absorbs touch gestures. */
|
|
enableTouchScroll?: boolean;
|
|
};
|
|
type AgentTerminalProps = BaseProps & { mode: "agent"; sessionId?: string | null; label?: string };
|
|
type ShellTerminalProps = BaseProps & {
|
|
mode: "shell";
|
|
environmentId: string | null | undefined;
|
|
terminalId: string;
|
|
label?: string;
|
|
};
|
|
type PassthroughTerminalProps = AgentTerminalProps | ShellTerminalProps;
|
|
|
|
/**
|
|
* PassthroughTerminal provides direct terminal interaction with an agent CLI.
|
|
*
|
|
* Design: Dedicated Binary WebSocket + AttachAddon
|
|
* - Uses dedicated WebSocket routes for session-scoped agent terminals and env-scoped shells
|
|
* - Raw binary frames bypass JSON encoding/decoding latency
|
|
* - AttachAddon (official xterm.js addon) handles the bridging
|
|
* - Unicode11Addon enables proper unicode character support
|
|
* - Resize commands sent via binary protocol: [0x01][JSON {cols, rows}]
|
|
*/
|
|
function useTerminalRefs() {
|
|
return {
|
|
terminalRef: useRef<HTMLDivElement>(null),
|
|
xtermRef: useRef<Terminal | null>(null),
|
|
fitAddonRef: useRef<FitAddon | null>(null),
|
|
wsRef: useRef<WebSocket | null>(null),
|
|
attachAddonRef: useRef<AttachAddon | null>(null),
|
|
isInitializedRef: useRef(false),
|
|
lastDimensionsRef: useRef({ cols: 0, rows: 0 }),
|
|
resizeTimeoutRef: useRef<ReturnType<typeof setTimeout> | null>(null),
|
|
webglAddonRef: useRef<WebglAddon | null>(null),
|
|
};
|
|
}
|
|
|
|
function useXtermSearchIntegration(
|
|
xtermRef: React.RefObject<Terminal | null>,
|
|
isTerminalReady: boolean,
|
|
containerRef: React.RefObject<HTMLDivElement | null>,
|
|
) {
|
|
const search = useTerminalSearch({ xtermRef, isTerminalReady });
|
|
const onFindInPanelRef = useRef<(() => void) | undefined>(search.open);
|
|
useEffect(() => {
|
|
onFindInPanelRef.current = search.open;
|
|
}, [search.open]);
|
|
usePanelSearch({
|
|
containerRef,
|
|
isOpen: search.isOpen,
|
|
onOpen: search.open,
|
|
onClose: search.close,
|
|
});
|
|
return { search, onFindInPanelRef };
|
|
}
|
|
|
|
const WS_BASE_URL_FALLBACK = "ws://localhost:38429";
|
|
function useWsBaseUrl() {
|
|
return useMemo(() => {
|
|
try {
|
|
const url = new URL(getBackendConfig().apiBaseUrl);
|
|
return `${url.protocol === "https:" ? "wss:" : "ws:"}//${url.host}`;
|
|
} catch {
|
|
return WS_BASE_URL_FALLBACK;
|
|
}
|
|
}, []);
|
|
}
|
|
|
|
/**
|
|
* Decide whether the WS effect should attempt to open a terminal connection.
|
|
*
|
|
* Agent terminals require agentctl readiness — the agent process must be
|
|
* subscribed before passthrough I/O is meaningful.
|
|
*
|
|
* Shell terminals route by env on the backend; the env handler lazy-creates
|
|
* the execution and waits for remote readiness server-side, so the client
|
|
* only needs the env id. No session involvement.
|
|
*/
|
|
function computeCanConnect(
|
|
mode: "agent" | "shell",
|
|
connectionID: string | null | undefined,
|
|
sessionId: string | null | undefined,
|
|
isAgentctlReady: boolean,
|
|
): boolean {
|
|
if (!connectionID) return false;
|
|
if (mode === "agent") return Boolean(sessionId) && isAgentctlReady;
|
|
return true;
|
|
}
|
|
|
|
// eslint-disable-next-line max-lines-per-function -- wires many hooks + refs; each block is already its own hook
|
|
export function PassthroughTerminal(props: PassthroughTerminalProps) {
|
|
const {
|
|
mode,
|
|
label,
|
|
autoFocus,
|
|
pendingCommand,
|
|
onCommandSent,
|
|
onXtermReady,
|
|
disableWebgl,
|
|
manualInputRouting,
|
|
onWsReady,
|
|
enableTouchScroll,
|
|
} = props;
|
|
const terminalId = mode === "shell" ? props.terminalId : undefined;
|
|
const environmentId = mode === "shell" ? props.environmentId : undefined;
|
|
const refs = useTerminalRefs();
|
|
const { terminalRef, xtermRef, fitAddonRef, wsRef, attachAddonRef } = refs;
|
|
|
|
const storeSessionId = useAppStore((state) => state.tasks.activeSessionId);
|
|
const environmentSessionId = useEnvironmentSessionId();
|
|
const sessionId = mode === "agent" ? (props.sessionId ?? storeSessionId) : environmentSessionId;
|
|
|
|
const { session } = useSession(sessionId);
|
|
const agentctlStatus = useSessionAgentctl(sessionId);
|
|
const taskId = session?.task_id ?? null;
|
|
const connectionID = mode === "agent" ? sessionId : environmentId;
|
|
const canConnect = computeCanConnect(mode, connectionID, sessionId, agentctlStatus.isReady);
|
|
const wsBaseUrl = useWsBaseUrl();
|
|
|
|
const [isTerminalReady, setIsTerminalReady] = useState(false);
|
|
const onTerminalReady = useCallback(() => {
|
|
setIsTerminalReady(true);
|
|
if (xtermRef.current) onXtermReady?.(xtermRef.current);
|
|
}, [onXtermReady, xtermRef]);
|
|
|
|
// Track which terminal target has an active WebSocket connection. The loading
|
|
// overlay resets on target switches without needing a separate setState effect.
|
|
const [connectedTargetId, setConnectedTargetId] = useState<string | null>(null);
|
|
const isConnected = connectionID != null && connectedTargetId === connectionID;
|
|
const onConnected = useCallback(() => {
|
|
setConnectedTargetId(connectionID ?? null);
|
|
if (autoFocus) refs.xtermRef.current?.textarea?.focus({ preventScroll: true });
|
|
}, [connectionID, autoFocus, refs.xtermRef]);
|
|
const onDisconnected = useCallback(() => {
|
|
const disconnectedTargetId = connectionID ?? null;
|
|
setConnectedTargetId((current) => (current === disconnectedTargetId ? null : current));
|
|
}, [connectionID]);
|
|
|
|
const linkHandler = useTerminalLinkHandler();
|
|
const terminalFontFamily = useAppStore((s) => s.userSettings.terminalFontFamily);
|
|
const terminalFontSize = useAppStore((s) => s.userSettings.terminalFontSize);
|
|
const sendResize = useSendResize(wsRef);
|
|
const fitAndResize = useFitAndResize({
|
|
xtermRef: refs.xtermRef,
|
|
fitAddonRef: refs.fitAddonRef,
|
|
terminalRef: refs.terminalRef,
|
|
lastDimensionsRef: refs.lastDimensionsRef,
|
|
sendResize,
|
|
});
|
|
|
|
const sendInput = useSendInput(wsRef);
|
|
const toggleBottomTerminal = useAppStore((s) => s.toggleBottomTerminal);
|
|
const keyboardShortcuts = useAppStore((s) => s.userSettings.keyboardShortcuts);
|
|
const keyboardShortcutsRef = useRef(keyboardShortcuts);
|
|
useEffect(() => {
|
|
keyboardShortcutsRef.current = keyboardShortcuts;
|
|
}, [keyboardShortcuts]);
|
|
const containerRef = useRef<HTMLDivElement>(null);
|
|
const { search, onFindInPanelRef } = useXtermSearchIntegration(
|
|
xtermRef,
|
|
isTerminalReady,
|
|
containerRef,
|
|
);
|
|
useTerminalInit({
|
|
terminalRef: refs.terminalRef,
|
|
xtermRef: refs.xtermRef,
|
|
fitAddonRef: refs.fitAddonRef,
|
|
isInitializedRef: refs.isInitializedRef,
|
|
lastDimensionsRef: refs.lastDimensionsRef,
|
|
resizeTimeoutRef: refs.resizeTimeoutRef,
|
|
webglAddonRef: refs.webglAddonRef,
|
|
fitAndResize,
|
|
onReady: onTerminalReady,
|
|
linkHandler,
|
|
fontFamily: buildTerminalFontFamily(terminalFontFamily),
|
|
fontSize: terminalFontSize ?? undefined,
|
|
disableWebgl,
|
|
onToggleBottomTerminal: toggleBottomTerminal,
|
|
sendInput,
|
|
keyboardShortcutsRef,
|
|
onFindInPanelRef,
|
|
});
|
|
|
|
useTouchScroll({
|
|
terminalRef: refs.terminalRef,
|
|
xtermRef: refs.xtermRef,
|
|
enabled: !!enableTouchScroll,
|
|
isTerminalReady,
|
|
});
|
|
|
|
useWebSocketConnection({
|
|
taskId,
|
|
sessionId,
|
|
environmentId,
|
|
canConnect,
|
|
isTerminalReady,
|
|
fitAndResize,
|
|
wsBaseUrl,
|
|
mode,
|
|
terminalId,
|
|
label,
|
|
xtermRef,
|
|
fitAddonRef,
|
|
wsRef,
|
|
attachAddonRef,
|
|
onConnected,
|
|
onDisconnected,
|
|
manualInputRouting,
|
|
onWsReady,
|
|
});
|
|
|
|
usePendingCommand(pendingCommand, isConnected, wsRef, onCommandSent);
|
|
|
|
return (
|
|
<div
|
|
ref={containerRef}
|
|
tabIndex={-1}
|
|
data-testid={mode === "agent" ? "passthrough-terminal" : undefined}
|
|
data-panel-kind="terminal"
|
|
className="relative h-full w-full overflow-hidden bg-background outline-none"
|
|
style={{ minWidth: MIN_WIDTH, minHeight: MIN_HEIGHT }}
|
|
>
|
|
<div className="h-full w-full p-2 pb-3">
|
|
<div ref={terminalRef} className="h-full w-full" />
|
|
</div>
|
|
<TerminalSearchBar search={search} />
|
|
{!isConnected && (
|
|
<div
|
|
data-testid="passthrough-loading"
|
|
className="absolute inset-0 flex items-start justify-center pt-12 bg-background"
|
|
>
|
|
<div className="flex flex-col items-center gap-3 text-muted-foreground">
|
|
<GridSpinner />
|
|
<span className="text-sm">
|
|
{mode === "agent" ? "Preparing workspace..." : "Connecting terminal..."}
|
|
</span>
|
|
</div>
|
|
</div>
|
|
)}
|
|
</div>
|
|
);
|
|
}
|
|
|
|
/** Sends a pending command to the terminal WS once connected. */
|
|
function usePendingCommand(
|
|
pendingCommand: string | null | undefined,
|
|
isConnected: boolean,
|
|
wsRef: React.RefObject<WebSocket | null>,
|
|
onCommandSent?: () => void,
|
|
) {
|
|
React.useEffect(() => {
|
|
if (!pendingCommand || !isConnected) return;
|
|
const ws = wsRef.current;
|
|
if (!ws || ws.readyState !== WebSocket.OPEN) return;
|
|
// Small delay to ensure the shell prompt is ready after WS connect.
|
|
const timer = setTimeout(() => {
|
|
ws.send(new TextEncoder().encode(pendingCommand));
|
|
onCommandSent?.();
|
|
}, 300);
|
|
return () => clearTimeout(timer);
|
|
}, [pendingCommand, isConnected, wsRef, onCommandSent]);
|
|
}
|