mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-09-24 15:49:09 +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>
172 lines
6.0 KiB
TypeScript
172 lines
6.0 KiB
TypeScript
import { Check, FileText, Loader2, Pause, Play, Square, X } from 'lucide-react';
|
|
import React, { useMemo, useState } from 'react';
|
|
import { useI18n } from '@/application/i18n/I18nProvider';
|
|
import type { ScriptRun } from '@/types/global/netcatty-bridge-script.d.ts';
|
|
import { Button } from '@/components/ui/button';
|
|
import { cn } from '@/lib/utils.ts';
|
|
import { ScriptRunLogDialog } from './ScriptRunLogDialog';
|
|
|
|
export interface ScriptRunListProps {
|
|
runs: ScriptRun[];
|
|
onStop: (runId: string) => void;
|
|
onPause: (runId: string) => void;
|
|
onResume: (runId: string) => void;
|
|
}
|
|
|
|
function formatDuration(startedAt: number, endedAt?: number) {
|
|
const ms = (endedAt ?? Date.now()) - startedAt;
|
|
const seconds = Math.floor(ms / 1000);
|
|
const minutes = Math.floor(seconds / 60);
|
|
const rest = seconds % 60;
|
|
return `${String(minutes).padStart(2, '0')}:${String(rest).padStart(2, '0')}`;
|
|
}
|
|
|
|
function ScriptStatusIcon({ status }: { status: ScriptRun['status'] }) {
|
|
if (status === 'completed') {
|
|
return <Check size={14} className="text-emerald-500 shrink-0" aria-hidden />;
|
|
}
|
|
if (status === 'failed') {
|
|
return <X size={14} className="text-destructive shrink-0" aria-hidden />;
|
|
}
|
|
return <Loader2 size={14} className="animate-spin text-primary shrink-0" aria-hidden />;
|
|
}
|
|
|
|
function resolveRunMeta(run: ScriptRun, t: (key: string, params?: Record<string, string | number>) => string) {
|
|
const elapsed = formatDuration(run.startedAt, run.endedAt);
|
|
const parts: string[] = [t(`scripts.running.status.${run.status}`)];
|
|
|
|
if ((run.stepIndex ?? 0) > 0 || run.status === 'running' || run.status === 'paused') {
|
|
parts.push(t('scripts.running.operationsCount', { count: run.stepIndex ?? 0 }));
|
|
}
|
|
|
|
if (run.status === 'running' || run.status === 'paused') {
|
|
if (run.progressMode === 'determinate' && run.progressTotal) {
|
|
parts.push(t('scripts.running.determinateProgress', {
|
|
label: run.progressLabel || t('scripts.running.progressFallback'),
|
|
current: run.progressCurrent ?? 0,
|
|
total: run.progressTotal,
|
|
}));
|
|
} else if (run.activityLabel) {
|
|
parts.push(run.activityLabel);
|
|
} else if (run.waitingFor) {
|
|
parts.push(t('scripts.running.waitingFor', { pattern: run.waitingFor }));
|
|
}
|
|
}
|
|
|
|
parts.push(t('scripts.running.elapsed', { elapsed }));
|
|
return parts.join(' · ');
|
|
}
|
|
|
|
function sortRuns(runs: ScriptRun[]): ScriptRun[] {
|
|
const rank = (status: ScriptRun['status']) => {
|
|
if (status === 'running') return 0;
|
|
if (status === 'paused') return 1;
|
|
return 2;
|
|
};
|
|
return [...runs].sort((a, b) => {
|
|
const rankDiff = rank(a.status) - rank(b.status);
|
|
if (rankDiff !== 0) return rankDiff;
|
|
return b.startedAt - a.startedAt;
|
|
});
|
|
}
|
|
|
|
export const ScriptRunList: React.FC<ScriptRunListProps> = ({
|
|
runs,
|
|
onStop,
|
|
onPause,
|
|
onResume,
|
|
}) => {
|
|
const { t } = useI18n();
|
|
const [logRunId, setLogRunId] = useState<string | null>(null);
|
|
|
|
const sortedRuns = useMemo(() => sortRuns(runs), [runs]);
|
|
const logRun = sortedRuns.find((run) => run.runId === logRunId) ?? null;
|
|
|
|
if (runs.length === 0) {
|
|
return (
|
|
<div className="px-3 py-8 text-center text-sm text-muted-foreground">
|
|
{t('scripts.running.empty')}
|
|
</div>
|
|
);
|
|
}
|
|
|
|
return (
|
|
<>
|
|
<div className="py-1">
|
|
{sortedRuns.map((run) => {
|
|
const label = run.scriptLabel || run.scriptId || t('scripts.running.unnamed');
|
|
const isActive = run.status === 'running' || run.status === 'paused';
|
|
return (
|
|
<div
|
|
key={run.runId}
|
|
className="flex items-center gap-2 px-2 py-1.5 hover:bg-accent/40 transition-colors"
|
|
>
|
|
<ScriptStatusIcon status={run.status} />
|
|
<div className="min-w-0 flex-1">
|
|
<div className="truncate text-xs font-medium">{label}</div>
|
|
<div className="truncate text-[10px] text-muted-foreground">
|
|
{resolveRunMeta(run, t)}
|
|
</div>
|
|
{run.error ? (
|
|
<div className="truncate text-[10px] text-destructive">{run.error}</div>
|
|
) : null}
|
|
</div>
|
|
<div className="flex items-center gap-0.5 shrink-0">
|
|
<Button
|
|
size="icon"
|
|
variant="ghost"
|
|
className="h-7 w-7"
|
|
aria-label={t('scripts.running.viewLogs')}
|
|
onClick={() => setLogRunId(run.runId)}
|
|
>
|
|
<FileText size={14} />
|
|
</Button>
|
|
{run.status === 'running' ? (
|
|
<Button
|
|
size="icon"
|
|
variant="ghost"
|
|
className="h-7 w-7"
|
|
aria-label={t('scripts.running.pause')}
|
|
onClick={() => onPause(run.runId)}
|
|
>
|
|
<Pause size={14} />
|
|
</Button>
|
|
) : null}
|
|
{run.status === 'paused' ? (
|
|
<Button
|
|
size="icon"
|
|
variant="ghost"
|
|
className="h-7 w-7"
|
|
aria-label={t('scripts.running.resume')}
|
|
onClick={() => onResume(run.runId)}
|
|
>
|
|
<Play size={14} />
|
|
</Button>
|
|
) : null}
|
|
{isActive ? (
|
|
<Button
|
|
size="icon"
|
|
variant="ghost"
|
|
className={cn('h-7 w-7', isActive && 'text-destructive hover:text-destructive')}
|
|
aria-label={t('scripts.running.stop')}
|
|
onClick={() => onStop(run.runId)}
|
|
>
|
|
<Square size={14} />
|
|
</Button>
|
|
) : null}
|
|
</div>
|
|
</div>
|
|
);
|
|
})}
|
|
</div>
|
|
<ScriptRunLogDialog
|
|
run={logRun}
|
|
open={Boolean(logRun)}
|
|
onOpenChange={(open) => {
|
|
if (!open) setLogRunId(null);
|
|
}}
|
|
/>
|
|
</>
|
|
);
|
|
};
|