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>
237 lines
9.0 KiB
TypeScript
237 lines
9.0 KiB
TypeScript
import { Globe, Link2, Play, Trash2 } from 'lucide-react';
|
|
import React, { useCallback, useMemo, useState, type DragEvent } from 'react';
|
|
import type { Host, Snippet } from '@/domain/models';
|
|
import {
|
|
appendHostConnectScript,
|
|
getGlobalConnectScripts,
|
|
getHostConnectScriptIds,
|
|
removeHostConnectScript,
|
|
reorderHostConnectScript,
|
|
} from '@/domain/hostConnectScripts.ts';
|
|
import { isScriptSnippet } from '@/domain/snippetScript.ts';
|
|
import { cn } from '@/lib/utils';
|
|
import { getVaultDropPosition } from '@/components/vault/vaultReorderDrag';
|
|
import {
|
|
VaultEntityIcon,
|
|
vaultAutomationScriptIconClass,
|
|
vaultEntityIconSmClass,
|
|
} from '@/components/vault/VaultEntityIcon';
|
|
import { HostDetailsSection } from '../host-details';
|
|
import { Button } from '../ui/button';
|
|
import { Combobox } from '../ui/combobox';
|
|
|
|
const CONNECT_QUEUE_DRAG_TYPE = 'application/x-netcatty-connect-script-id';
|
|
|
|
export interface HostDetailsScriptsSectionProps {
|
|
host: Host;
|
|
onHostChange: (host: Host) => void;
|
|
snippets: Snippet[];
|
|
t: (key: string, params?: Record<string, unknown>) => string;
|
|
}
|
|
|
|
function triggerLabel(
|
|
snippet: Snippet,
|
|
t: HostDetailsScriptsSectionProps['t'],
|
|
): string {
|
|
if (snippet.trigger === 'onConnect') return t('scripts.trigger.onConnect');
|
|
if (snippet.trigger === 'onOutput') return t('scripts.trigger.onOutput');
|
|
return t('scripts.trigger.manual');
|
|
}
|
|
|
|
function scriptById(snippets: Snippet[], scriptId: string): Snippet | undefined {
|
|
return snippets.find((snippet) => snippet.id === scriptId && isScriptSnippet(snippet));
|
|
}
|
|
|
|
export const HostDetailsScriptsSection: React.FC<HostDetailsScriptsSectionProps> = ({
|
|
host,
|
|
onHostChange,
|
|
snippets,
|
|
t,
|
|
}) => {
|
|
const [draggingScriptId, setDraggingScriptId] = useState<string | null>(null);
|
|
const [dropIndicator, setDropIndicator] = useState<{ scriptId: string; position: 'before' | 'after' } | null>(null);
|
|
|
|
const scripts = useMemo(
|
|
() => snippets.filter(isScriptSnippet),
|
|
[snippets],
|
|
);
|
|
const globalScripts = useMemo(
|
|
() => getGlobalConnectScripts(snippets),
|
|
[snippets],
|
|
);
|
|
const queueIds = useMemo(
|
|
() => getHostConnectScriptIds(host, snippets),
|
|
[host, snippets],
|
|
);
|
|
const queuedScripts = useMemo(
|
|
() => queueIds
|
|
.map((id) => scriptById(snippets, id))
|
|
.filter((snippet): snippet is Snippet => Boolean(snippet)),
|
|
[queueIds, snippets],
|
|
);
|
|
const linkableScripts = useMemo(
|
|
() => scripts.filter((script) => {
|
|
if (script.targetsAllHosts) return false;
|
|
if (script.id && queueIds.includes(script.id)) return false;
|
|
return true;
|
|
}),
|
|
[queueIds, scripts],
|
|
);
|
|
const linkOptions = useMemo(
|
|
() => linkableScripts.map((script) => ({
|
|
value: script.id,
|
|
label: script.label || t('scripts.running.unnamed'),
|
|
})),
|
|
[linkableScripts, t],
|
|
);
|
|
|
|
const clearDragState = useCallback(() => {
|
|
setDraggingScriptId(null);
|
|
setDropIndicator(null);
|
|
}, []);
|
|
|
|
if (scripts.length === 0) return null;
|
|
|
|
const handleAddToQueue = (scriptId: string) => {
|
|
if (!scriptId) return;
|
|
const snippet = scriptById(snippets, scriptId);
|
|
if (!snippet) return;
|
|
onHostChange(appendHostConnectScript(host, scriptId, snippets));
|
|
};
|
|
|
|
const handleRemoveFromQueue = (scriptId: string) => {
|
|
onHostChange(removeHostConnectScript(host, scriptId, snippets));
|
|
};
|
|
|
|
const handleDragStart = (event: DragEvent<HTMLDivElement>, scriptId: string) => {
|
|
event.dataTransfer.effectAllowed = 'move';
|
|
event.dataTransfer.setData(CONNECT_QUEUE_DRAG_TYPE, scriptId);
|
|
setDraggingScriptId(scriptId);
|
|
};
|
|
|
|
const handleDragOver = (event: DragEvent<HTMLDivElement>, scriptId: string) => {
|
|
if (!event.dataTransfer.types.includes(CONNECT_QUEUE_DRAG_TYPE)) return;
|
|
event.preventDefault();
|
|
event.dataTransfer.dropEffect = 'move';
|
|
const position = getVaultDropPosition(event.currentTarget, event.clientX, event.clientY, false);
|
|
setDropIndicator((prev) => (
|
|
prev?.scriptId === scriptId && prev.position === position
|
|
? prev
|
|
: { scriptId, position }
|
|
));
|
|
};
|
|
|
|
const handleDrop = (event: DragEvent<HTMLDivElement>, targetScriptId: string) => {
|
|
event.preventDefault();
|
|
const draggedScriptId = event.dataTransfer.getData(CONNECT_QUEUE_DRAG_TYPE);
|
|
if (!draggedScriptId || draggedScriptId === targetScriptId) {
|
|
clearDragState();
|
|
return;
|
|
}
|
|
const position = getVaultDropPosition(event.currentTarget, event.clientX, event.clientY, false);
|
|
onHostChange(reorderHostConnectScript(host, draggedScriptId, targetScriptId, position, snippets));
|
|
clearDragState();
|
|
};
|
|
|
|
return (
|
|
<HostDetailsSection
|
|
icon={<Play size={14} className="text-muted-foreground" />}
|
|
title={t('hostDetails.section.automation')}
|
|
hint={t('hostDetails.automation.queueHint')}
|
|
>
|
|
<div className="space-y-4">
|
|
{globalScripts.length > 0 ? (
|
|
<div className="space-y-2">
|
|
<div className="flex items-center gap-1.5">
|
|
<Globe size={12} className="text-muted-foreground shrink-0" />
|
|
<label className="text-xs text-muted-foreground">{t('hostDetails.automation.globalScripts')}</label>
|
|
</div>
|
|
<p className="text-[10px] text-muted-foreground leading-relaxed">
|
|
{t('hostDetails.automation.globalScriptsHint')}
|
|
</p>
|
|
<div className="space-y-1.5">
|
|
{globalScripts.map((script) => (
|
|
<div
|
|
key={script.id}
|
|
className="flex items-center gap-2.5 px-2.5 py-2 rounded-md border border-border/50 bg-muted/20"
|
|
>
|
|
<VaultEntityIcon
|
|
className={cn(vaultEntityIconSmClass, vaultAutomationScriptIconClass)}
|
|
icon={<Play size={14} />}
|
|
/>
|
|
<div className="min-w-0 flex-1">
|
|
<div className="text-sm font-medium truncate">{script.label || t('scripts.running.unnamed')}</div>
|
|
<div className="text-[10px] text-muted-foreground truncate">{triggerLabel(script, t)}</div>
|
|
</div>
|
|
</div>
|
|
))}
|
|
</div>
|
|
</div>
|
|
) : null}
|
|
|
|
<div className="space-y-2">
|
|
{queuedScripts.length === 0 ? (
|
|
<p className="text-[11px] text-muted-foreground">{t('hostDetails.automation.connectQueueEmpty')}</p>
|
|
) : (
|
|
<div className="space-y-1.5" onDragEnd={clearDragState}>
|
|
{queuedScripts.map((script) => {
|
|
const scriptId = script.id!;
|
|
const isDragging = draggingScriptId === scriptId;
|
|
const indicator = dropIndicator?.scriptId === scriptId ? dropIndicator.position : null;
|
|
|
|
return (
|
|
<div
|
|
key={scriptId}
|
|
draggable
|
|
data-vault-drop-position={indicator ?? undefined}
|
|
data-vault-drop-axis="y"
|
|
className={cn(
|
|
'vault-drop-indicator-row relative flex items-center gap-2.5 px-2.5 py-2 rounded-md border border-border/70 bg-background/60 transition-opacity cursor-grab active:cursor-grabbing',
|
|
isDragging && 'opacity-40',
|
|
)}
|
|
aria-label={t('hostDetails.automation.dragHandle')}
|
|
onDragStart={(event) => handleDragStart(event, scriptId)}
|
|
onDragOver={(event) => handleDragOver(event, scriptId)}
|
|
onDrop={(event) => handleDrop(event, scriptId)}
|
|
>
|
|
<VaultEntityIcon
|
|
className={cn(vaultEntityIconSmClass, vaultAutomationScriptIconClass)}
|
|
icon={<Play size={14} />}
|
|
/>
|
|
<div className="min-w-0 flex-1 select-none">
|
|
<div className="text-sm font-medium truncate">{script.label || t('scripts.running.unnamed')}</div>
|
|
<div className="text-[10px] text-muted-foreground truncate">{triggerLabel(script, t)}</div>
|
|
</div>
|
|
<Button
|
|
type="button"
|
|
variant="ghost"
|
|
size="icon"
|
|
className="h-7 w-7 shrink-0 text-muted-foreground hover:text-destructive"
|
|
onMouseDown={(event) => event.stopPropagation()}
|
|
onClick={() => handleRemoveFromQueue(scriptId)}
|
|
aria-label={t('hostDetails.automation.removeFromQueue')}
|
|
>
|
|
<Trash2 size={13} />
|
|
</Button>
|
|
</div>
|
|
);
|
|
})}
|
|
</div>
|
|
)}
|
|
|
|
{linkOptions.length > 0 ? (
|
|
<Combobox
|
|
options={linkOptions}
|
|
value=""
|
|
onValueChange={handleAddToQueue}
|
|
placeholder={t('hostDetails.automation.addToQueuePlaceholder')}
|
|
icon={<Link2 size={14} />}
|
|
triggerClassName="h-9"
|
|
/>
|
|
) : null}
|
|
</div>
|
|
</div>
|
|
</HostDetailsSection>
|
|
);
|
|
};
|