mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-10-09 15:58:34 +00:00
6b9b71ac8a
* feat(scripts): add terminal script automation, recording, and side panel Introduce nct script runtime in the main process with terminal-side recording, execution overlay, Monaco editor, connect-script queues, and scripts side panel integration. Fix recording to wire scriptRecorderRef into xterm, use waitForPrompt for root/user shells, and save recorded scripts through the global editor dialog. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(scripts): address Bugbot review findings for recording and side panel Refresh script run state in side panel memo, guard toolbar recording against multi-session conflicts, reset connect scripts on reconnect, resolve focused session via getActiveTerminalSessionId, and avoid wiping host edit form when snippets list updates. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(scripts): prevent pending script re-run and improve workspace run feedback Track one-shot pendingScript execution separately from onConnect queue so reconnects do not replay Run-now scripts. Fall back to focused session when running on all tabs outside a workspace, and toast when every tab is still connecting. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(scripts): consume connect-script window once and filter serial hosts Mark the onConnect script evaluation as consumed even when the queue is empty so later snippet/host edits do not rerun automation mid-session. Restore serial-host filtering in SelectHostPanel confirm handler. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(scripts): grace period before giving up on connect-script queue Only mark onConnect automation as consumed after scripts run or a short post-connect grace window expires, so late-loading snippets still trigger while mid-session Vault edits do not. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(scripts): gate connect-script consumption on vault hydration Replace the grace timer with vault-init and unresolved host script binding checks so late-loading snippets still run onConnect automation while mid-session edits stay suppressed. Clear pending script run state on disconnect so reconnect retries workspace pending scripts. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(scripts): honor run targets and retry failed connect automation Route QuickScriptEditorDialog Run through onRunSnippet for multi-host workspaces. Defer connect/pending script completion markers until each script succeeds and retry the queue after failures. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(scripts): stabilize pending runs and global connect queue sync Keep pending script run state across reconnects, run onConnect scripts before one-shot workspace pending scripts, and strip per-host queue entries when an onConnect script targets all hosts. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(scripts): defer host queue snippet sync and guard connect runs Persist snippet target links only when the host panel is saved, block duplicate connect-script scheduling while a batch is running, and require runnable hosts before showing Run in the snippets editor footer. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(scripts): retry connect failures and surface output-trigger errors Use a retry tick in connect-script effect deps, toast automation failures from output triggers, and require runnable hosts before QuickScript Run. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(scripts): track id-less pending runs and re-arm output triggers Remember anonymous pendingScript objects after first run and allow onOutput triggers to fire again when new terminal output arrives. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(scripts): unblock paused connect runs and pass session meta Resolve waitForScriptRun on pause, run workspace scripts per session with hostname context, defer output-trigger arming until runs start, and add noRunnableHosts i18n for QuickScript Run. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(scripts): serialize output triggers and defer empty connect finalize Fire at most one onOutput trigger per scan while a run is active, and only finalize an empty connect queue after vault snippets are loaded. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(scripts): guard output launch race and script run waits Block overlapping onOutput launches, timeout stuck waitForScriptRun promises, and disable vault Run when no connectable targets exist. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(scripts): match output triggers on new chunks only Scan onOutput patterns against recent terminal output instead of buffer length dedupe, and restore overflow-visible on SelectHostPanel new-host flow. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(scripts): await sequential workspace runs and output launch Wait for each tab script to finish in sequential workspace mode, and hold output-trigger launch guard until the session run becomes active. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(scripts): wait through pause and hold output trigger until done Keep connect and sequential workspace queues blocked until scripts complete or fail, and retain output-trigger guard until the launched run finishes. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(scripts): harden output trigger wait helpers Add explicit timeouts to output-trigger wait helpers and stop rescanning the buffer after script completion to avoid sticky-match rerun loops. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(scripts): allow empty connect queue and match output in new chunks Treat an empty connectScriptIds array as an explicit cleared queue instead of re-migrating from snippet targets, and only fire onOutput triggers when the latest terminal output contains the pattern. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(scripts): require fresh output overlap for onOutput triggers Only fire output-matched scripts when the regex match extends into the latest terminal chunk, preventing reruns from stale buffer text. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(scripts): promote manual scripts added to host connect queue Diff connect queue changes from raw connectScriptIds so saving a host updates manual scripts to onConnect when they are newly queued. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(scripts): dedupe output triggers by match position Track the buffer end offset of each output trigger match and ignore stale re-scans, with a longer wait for run registration before retry. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(scripts): record output trigger matches only after run starts Propagate automation launch failures to output triggers and commit match dedupe only once the session run is registered as active. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(scripts): address Codex review on wait cursor and sensitive codegen Track scan offset so waitFor/waitForAny only match output after the previous wait, and emit sendLine after sensitive prompt in recorded scripts. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(scripts): harden onOutput triggers against PTY echo and local input Filter server output before pattern matching so onOutput fires only after Enter on real stdout, not on keystroke/paste echo, OSC/SGR sequences, or alternate-screen apps. Add dev diagnostics and scope triggers to the active session when no explicit host targets are configured. Co-authored-by: Cursor <cursoragent@cursor.com> * chore(scripts): remove onOutput trigger debug logging Drop temporary diagnostics module and console traces now that PTY echo filtering is verified; keep the production trigger pipeline unchanged. Co-authored-by: Cursor <cursoragent@cursor.com> --------- Co-authored-by: Cursor <cursoragent@cursor.com>
241 lines
6.6 KiB
TypeScript
241 lines
6.6 KiB
TypeScript
import { ChevronRight, FileText, Folder, FolderOpen } from "lucide-react";
|
|
import React, { useEffect, useRef, useState } from "react";
|
|
|
|
import { cn } from "../../lib/utils";
|
|
|
|
type VaultTreeInlineRenameInputProps = {
|
|
initialName: string;
|
|
onCommit: (name: string) => void;
|
|
onCancel: () => void;
|
|
className?: string;
|
|
style?: React.CSSProperties;
|
|
};
|
|
|
|
export const VaultTreeInlineRenameInput: React.FC<VaultTreeInlineRenameInputProps> = ({
|
|
initialName,
|
|
onCommit,
|
|
onCancel,
|
|
className,
|
|
style,
|
|
}) => {
|
|
const inputRef = useRef<HTMLInputElement>(null);
|
|
const [value, setValue] = useState(initialName);
|
|
const committedRef = useRef(false);
|
|
|
|
useEffect(() => {
|
|
const input = inputRef.current;
|
|
if (!input) return;
|
|
input.focus();
|
|
input.select();
|
|
}, []);
|
|
|
|
const commit = () => {
|
|
if (committedRef.current) return;
|
|
committedRef.current = true;
|
|
onCommit(value);
|
|
};
|
|
|
|
const cancel = () => {
|
|
if (committedRef.current) return;
|
|
committedRef.current = true;
|
|
onCancel();
|
|
};
|
|
|
|
return (
|
|
<input
|
|
ref={inputRef}
|
|
data-vault-tree-inline-edit="true"
|
|
data-inline-group-edit="true"
|
|
value={value}
|
|
draggable={false}
|
|
onChange={(event) => setValue(event.target.value)}
|
|
onBlur={() => {
|
|
queueMicrotask(() => {
|
|
commit();
|
|
});
|
|
}}
|
|
onClick={(event) => event.stopPropagation()}
|
|
onDoubleClick={(event) => event.stopPropagation()}
|
|
onMouseDown={(event) => event.stopPropagation()}
|
|
onPointerDown={(event) => event.stopPropagation()}
|
|
onDragStart={(event) => {
|
|
event.preventDefault();
|
|
event.stopPropagation();
|
|
}}
|
|
onKeyDown={(event) => {
|
|
event.stopPropagation();
|
|
if (event.key === "Enter") {
|
|
event.preventDefault();
|
|
commit();
|
|
}
|
|
if (event.key === "Escape") {
|
|
event.preventDefault();
|
|
cancel();
|
|
}
|
|
}}
|
|
className={cn(
|
|
"min-w-0 flex-1 truncate select-text rounded-sm border border-primary/50 bg-background/80 px-1 py-0 text-sm font-medium outline-none ring-1 ring-primary/30",
|
|
className,
|
|
)}
|
|
style={style}
|
|
/>
|
|
);
|
|
};
|
|
|
|
type VaultTreeGroupRowProps = Omit<React.HTMLAttributes<HTMLDivElement>, "children"> & {
|
|
name: string;
|
|
depth: number;
|
|
expanded?: boolean;
|
|
selected?: boolean;
|
|
count?: number;
|
|
hasChildren?: boolean;
|
|
editing?: boolean;
|
|
editingInitialName?: string;
|
|
onRenameCommit?: (name: string) => void;
|
|
onRenameCancel?: () => void;
|
|
actions?: React.ReactNode;
|
|
icon?: React.ReactNode;
|
|
iconSize?: number;
|
|
meta?: React.ReactNode;
|
|
rowRef?: React.Ref<HTMLDivElement>;
|
|
onToggle?: () => void;
|
|
};
|
|
|
|
export const VaultTreeGroupRow: React.FC<VaultTreeGroupRowProps> = ({
|
|
name,
|
|
depth,
|
|
expanded = false,
|
|
selected = false,
|
|
count,
|
|
hasChildren,
|
|
editing = false,
|
|
editingInitialName,
|
|
onRenameCommit,
|
|
onRenameCancel,
|
|
actions,
|
|
icon,
|
|
iconSize = 18,
|
|
meta,
|
|
rowRef,
|
|
className,
|
|
style,
|
|
...props
|
|
}) => {
|
|
const canExpand = hasChildren ?? Boolean(count);
|
|
|
|
return (
|
|
<div
|
|
ref={rowRef}
|
|
className={cn(
|
|
"vault-drop-indicator-row group flex h-7 min-w-0 items-center px-2 text-sm font-medium cursor-pointer transition-colors select-none rounded-md",
|
|
selected
|
|
? "bg-secondary text-foreground"
|
|
: "hover:bg-secondary/60",
|
|
className,
|
|
)}
|
|
style={{ paddingLeft: depth * 16 + 4, ...style }}
|
|
data-vault-tree-row="group"
|
|
data-selected={selected ? "true" : "false"}
|
|
data-expanded={expanded ? "true" : "false"}
|
|
{...props}
|
|
>
|
|
<div className="mr-1 flex h-5 w-4 flex-shrink-0 items-center justify-center text-muted-foreground">
|
|
{canExpand && (
|
|
<div className={cn("transition-transform duration-200", expanded ? "rotate-90" : "")}>
|
|
<ChevronRight size={14} />
|
|
</div>
|
|
)}
|
|
</div>
|
|
<div className="mr-2 flex h-5 w-5 shrink-0 items-center justify-center text-current transition-colors">
|
|
{icon ?? (expanded ? (
|
|
<FolderOpen size={iconSize} strokeWidth={1.9} />
|
|
) : (
|
|
<Folder size={iconSize} strokeWidth={1.9} />
|
|
))}
|
|
</div>
|
|
{editing && onRenameCommit && onRenameCancel ? (
|
|
<VaultTreeInlineRenameInput
|
|
initialName={editingInitialName ?? name}
|
|
onCommit={onRenameCommit}
|
|
onCancel={onRenameCancel}
|
|
className="flex-1 font-semibold"
|
|
/>
|
|
) : (
|
|
<span className="flex h-5 min-w-0 flex-1 translate-y-px items-center truncate leading-none">{name}</span>
|
|
)}
|
|
{meta}
|
|
{typeof count === "number" && count > 0 && (
|
|
<span className="shrink-0 rounded-full border border-border bg-background/50 px-1.5 py-0 text-[10px] opacity-70">
|
|
{count}
|
|
</span>
|
|
)}
|
|
{actions}
|
|
</div>
|
|
);
|
|
};
|
|
|
|
type VaultTreeItemRowProps = Omit<React.HTMLAttributes<HTMLDivElement>, "children"> & {
|
|
label: string;
|
|
depth: number;
|
|
selected?: boolean;
|
|
icon?: React.ReactNode;
|
|
leading?: React.ReactNode;
|
|
detail?: React.ReactNode;
|
|
actions?: React.ReactNode;
|
|
editing?: boolean;
|
|
editingInitialName?: string;
|
|
onRenameCommit?: (name: string) => void;
|
|
onRenameCancel?: () => void;
|
|
content?: React.ReactNode;
|
|
};
|
|
|
|
export const VaultTreeItemRow: React.FC<VaultTreeItemRowProps> = ({
|
|
label,
|
|
depth,
|
|
selected = false,
|
|
icon,
|
|
leading,
|
|
detail,
|
|
actions,
|
|
editing = false,
|
|
editingInitialName,
|
|
onRenameCommit,
|
|
onRenameCancel,
|
|
content,
|
|
className,
|
|
style,
|
|
...props
|
|
}) => (
|
|
<div
|
|
className={cn(
|
|
"vault-drop-indicator-row group flex h-7 min-w-0 items-center px-2 text-sm cursor-pointer transition-colors select-none rounded-md",
|
|
selected
|
|
? "bg-secondary text-foreground"
|
|
: "hover:bg-secondary/40",
|
|
className,
|
|
)}
|
|
style={{ paddingLeft: depth * 16 + 4, ...style }}
|
|
data-vault-tree-row="item"
|
|
data-selected={selected ? "true" : "false"}
|
|
{...props}
|
|
>
|
|
{leading ?? <div className="mr-1 h-5 w-4 flex-shrink-0" />}
|
|
{icon ? <div className="mr-2 flex shrink-0 items-center self-center">{icon}</div> : <FileText size={14} className="mr-2 shrink-0 text-muted-foreground" />}
|
|
{content ?? (
|
|
<div className="min-w-0 flex-1">
|
|
{editing && onRenameCommit && onRenameCancel ? (
|
|
<VaultTreeInlineRenameInput
|
|
initialName={editingInitialName ?? label}
|
|
onCommit={onRenameCommit}
|
|
onCancel={onRenameCancel}
|
|
/>
|
|
) : (
|
|
<div className="flex min-w-0 items-center truncate leading-none">{label}</div>
|
|
)}
|
|
{detail && <div className="truncate text-xs text-muted-foreground">{detail}</div>}
|
|
</div>
|
|
)}
|
|
{actions}
|
|
</div>
|
|
);
|