mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-17 13:01:24 +00:00
* feat(autocomplete): add snippet completion source * feat(autocomplete): merge snippets at the command position Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * test(autocomplete): place snippet tests where the test runner finds them The npm test glob covers components/terminal/*.test.ts but not the autocomplete/ subdirectory, so the snippet tests added in the previous two commits weren't actually running in the suite. Move them up to components/terminal/ (the existing convention for autocomplete tests) with corrected import paths; the engine snippet cases go in a separate completionEngineSnippets.test.ts to avoid colliding with the existing completionEngine.test.ts. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(autocomplete): snippet ghost-exclusion, preview skip, and accept path Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat(autocomplete): wire snippets into the terminal + preview snippet command * fix(autocomplete): show only label in snippet popup row; keep snippet over colliding history The popup row for a snippet now omits the inline command echo — the full command lives in the detail preview only, matching the "label-only row" design. The completion engine pushes snippet suggestions without the early seen-text skip so that when a snippet's label collides with a history entry's text, the higher-scored snippet survives the final dedup. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(autocomplete): broadcast snippet command so popup acceptance mirrors peers In broadcast mode, accepting a snippet from the autocomplete popup cleared peer input (the line-clear keystrokes flow through the broadcast-aware path) but never sent the command, since executeSnippetCommand wrote only to the active session. Broadcast the normalized snippet data (matching the snippet shortkey path) so peers receive both the clear and the command, keeping all sessions in sync. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(autocomplete): broadcast wrapped snippet bytes to preserve noAutoRun Broadcasting the raw normalized command sent un-wrapped newlines to peers, so a multi-line noAutoRun snippet was pasted-but-not-run on the active session yet executed line-by-line on broadcast peers (handleBroadcastInput writes bytes directly without re-wrapping). Broadcast the exact bytes the active session receives instead — bracketed-paste wrapping plus the auto-run \r — so peers mirror the active session and noAutoRun is preserved. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
119 lines
3.7 KiB
TypeScript
119 lines
3.7 KiB
TypeScript
import ReactDOM from "react-dom";
|
|
import type { ComponentProps, RefObject } from "react";
|
|
import type { Terminal as XTerm } from "@xterm/xterm";
|
|
import {
|
|
useTerminalAutocomplete,
|
|
AutocompletePopup,
|
|
type AutocompleteSettings,
|
|
} from "./autocomplete";
|
|
import type { Snippet } from "../../domain/models";
|
|
|
|
type PopupProps = ComponentProps<typeof AutocompletePopup>;
|
|
|
|
/** A mutable handler ref Terminal hands down for the xterm runtime to call. */
|
|
type HandlerRef<T> = { current: T | undefined };
|
|
|
|
interface TerminalAutocompleteProps {
|
|
termRef: RefObject<XTerm | null>;
|
|
sessionId: string;
|
|
hostId: string;
|
|
hostOs: "linux" | "windows" | "macos";
|
|
settings?: Partial<AutocompleteSettings>;
|
|
protocol?: string;
|
|
getCwd?: () => string | undefined;
|
|
onAcceptText: (text: string) => void;
|
|
snippets?: Snippet[];
|
|
onAcceptSnippet?: (snippet: Snippet) => void;
|
|
/** Whether this terminal tab is the visible one. */
|
|
visible: boolean;
|
|
themeColors: PopupProps["themeColors"];
|
|
containerRef: PopupProps["containerRef"];
|
|
searchBarOffset: number;
|
|
// Handlers exposed back to Terminal so createXTermRuntime can drive them.
|
|
keyEventRef: HandlerRef<(e: KeyboardEvent) => boolean>;
|
|
inputRef: HandlerRef<(data: string) => void>;
|
|
repositionRef: HandlerRef<() => void>;
|
|
closeRef: HandlerRef<() => void>;
|
|
}
|
|
|
|
/**
|
|
* Owns the terminal autocomplete hook and renders its popup.
|
|
*
|
|
* Kept as its own component so the frequent autocomplete state updates
|
|
* (suggestions, selection, live-preview navigation) re-render only this small
|
|
* subtree rather than the whole Terminal component. The hook's handlers are
|
|
* surfaced back to Terminal through refs so the xterm runtime can call them.
|
|
*
|
|
* Must be mounted unconditionally for the terminal session's lifetime: the hook
|
|
* records command history on Enter and intercepts completion keys even while no
|
|
* popup is visible. Visibility only gates the rendered popup, not the hook.
|
|
*/
|
|
export function TerminalAutocomplete({
|
|
termRef,
|
|
sessionId,
|
|
hostId,
|
|
hostOs,
|
|
settings,
|
|
protocol,
|
|
getCwd,
|
|
onAcceptText,
|
|
snippets,
|
|
onAcceptSnippet,
|
|
visible,
|
|
themeColors,
|
|
containerRef,
|
|
searchBarOffset,
|
|
keyEventRef,
|
|
inputRef,
|
|
repositionRef,
|
|
closeRef,
|
|
}: TerminalAutocompleteProps) {
|
|
const autocomplete = useTerminalAutocomplete({
|
|
termRef,
|
|
sessionId,
|
|
hostId,
|
|
hostOs,
|
|
settings,
|
|
onAcceptText,
|
|
snippets,
|
|
onAcceptSnippet,
|
|
protocol,
|
|
getCwd,
|
|
});
|
|
|
|
// Surface the handlers for runtime wiring. They have stable identities
|
|
// (useCallback over refs), so assigning during render is cheap and mirrors
|
|
// the wiring Terminal did inline before this was extracted.
|
|
keyEventRef.current = autocomplete.handleKeyEvent;
|
|
inputRef.current = autocomplete.handleInput;
|
|
repositionRef.current = autocomplete.repositionPopup;
|
|
closeRef.current = autocomplete.closePopup;
|
|
|
|
const { state } = autocomplete;
|
|
if (!visible || !state.popupVisible || state.suggestions.length === 0) {
|
|
return null;
|
|
}
|
|
|
|
// Portal to body so the popup escapes the terminal container's overflow.
|
|
return ReactDOM.createPortal(
|
|
<AutocompletePopup
|
|
suggestions={state.suggestions}
|
|
selectedIndex={state.selectedIndex}
|
|
position={state.popupPosition}
|
|
cursorLineTop={state.popupCursorLineTop}
|
|
cursorLineBottom={state.popupCursorLineBottom}
|
|
visible={state.popupVisible}
|
|
expandUpward={state.expandUpward}
|
|
themeColors={themeColors}
|
|
onSelect={autocomplete.selectSuggestion}
|
|
subDirPanels={state.subDirPanels}
|
|
subDirFocusLevel={state.subDirFocusLevel}
|
|
containerRef={containerRef}
|
|
onRequestReposition={autocomplete.repositionPopup}
|
|
searchBarOffset={searchBarOffset}
|
|
onDismiss={autocomplete.closePopup}
|
|
/>,
|
|
document.body,
|
|
);
|
|
}
|