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>
263 lines
7.8 KiB
TypeScript
263 lines
7.8 KiB
TypeScript
import { Check, Loader2, Pause, Play, Square, X } from 'lucide-react';
|
|
import React, { useEffect, 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';
|
|
|
|
export interface ScriptExecutionOverlayProps {
|
|
run: ScriptRun;
|
|
onPause: () => void;
|
|
onResume: () => void;
|
|
onStop: () => void;
|
|
onDismiss: () => void;
|
|
}
|
|
|
|
function formatElapsed(ms: number) {
|
|
const seconds = Math.max(0, Math.floor(ms / 1000));
|
|
const minutes = Math.floor(seconds / 60);
|
|
const rest = seconds % 60;
|
|
if (minutes > 0) {
|
|
return `${minutes}:${String(rest).padStart(2, '0')}`;
|
|
}
|
|
return `${rest}s`;
|
|
}
|
|
|
|
function resolveWaitingPattern(
|
|
run: ScriptRun,
|
|
t: (key: string, params?: Record<string, string | number>) => string,
|
|
) {
|
|
if (!run.waitingFor) return undefined;
|
|
if (run.waitingFor === 'shell prompt' || run.waitingFor.includes(' | ')) {
|
|
return t('scripts.running.waitingForShellPrompt');
|
|
}
|
|
return run.waitingFor;
|
|
}
|
|
|
|
function isLowValueActivityLabel(label?: string) {
|
|
if (!label) return true;
|
|
const normalized = label.trim().toLowerCase();
|
|
return normalized === 'log' || normalized.startsWith('sleep ');
|
|
}
|
|
|
|
function DotSeparator() {
|
|
return <span className="text-muted-foreground/35 px-0.5">·</span>;
|
|
}
|
|
|
|
function Muted({ children }: { children: React.ReactNode }) {
|
|
return <span className="text-muted-foreground">{children}</span>;
|
|
}
|
|
|
|
function Accent({ children, className }: { children: React.ReactNode; className?: string }) {
|
|
return (
|
|
<span className={cn('text-primary font-semibold tabular-nums', className)}>
|
|
{children}
|
|
</span>
|
|
);
|
|
}
|
|
|
|
function ScriptStatusIcon({ status }: { status: ScriptRun['status'] }) {
|
|
const iconClass = 'block';
|
|
const boxClass = 'inline-flex h-3.5 w-3.5 shrink-0 items-center justify-center';
|
|
if (status === 'completed') {
|
|
return (
|
|
<span className={boxClass} aria-hidden>
|
|
<Check size={14} className={cn(iconClass, 'text-emerald-500')} />
|
|
</span>
|
|
);
|
|
}
|
|
if (status === 'failed') {
|
|
return (
|
|
<span className={boxClass} aria-hidden>
|
|
<X size={14} className={cn(iconClass, 'text-destructive')} />
|
|
</span>
|
|
);
|
|
}
|
|
return (
|
|
<span className={boxClass} aria-hidden>
|
|
<Loader2 size={14} className={cn(iconClass, 'animate-spin text-primary')} />
|
|
</span>
|
|
);
|
|
}
|
|
|
|
function ScriptStatusLine({
|
|
run,
|
|
elapsedMs,
|
|
lastSent,
|
|
t,
|
|
}: {
|
|
run: ScriptRun;
|
|
elapsedMs: number;
|
|
lastSent?: string;
|
|
t: (key: string, params?: Record<string, string | number>) => string;
|
|
}) {
|
|
const label = run.scriptLabel || t('scripts.running.unnamed');
|
|
const opCount = run.stepIndex ?? 0;
|
|
const elapsed = formatElapsed(elapsedMs);
|
|
const waitingPattern = resolveWaitingPattern(run, t);
|
|
const isFinished = run.status === 'completed' || run.status === 'failed';
|
|
|
|
const opsSegment = (
|
|
<>
|
|
<Muted>{t('scripts.running.opsPrefix')}</Muted>
|
|
<Accent>{opCount}</Accent>
|
|
<Muted>{t('scripts.running.opsSuffix')}</Muted>
|
|
</>
|
|
);
|
|
|
|
const elapsedSegment = <Accent>{elapsed}</Accent>;
|
|
|
|
const activitySegment = !isLowValueActivityLabel(run.activityLabel) ? (
|
|
<>
|
|
<DotSeparator />
|
|
<span className="text-foreground/90">{run.activityLabel}</span>
|
|
</>
|
|
) : null;
|
|
|
|
const progressSegment = run.progressMode === 'determinate' && run.progressTotal ? (
|
|
<>
|
|
<DotSeparator />
|
|
<Muted>{run.progressLabel || t('scripts.running.progressFallback')}</Muted>
|
|
{' '}
|
|
<Accent>
|
|
{run.progressCurrent ?? 0}
|
|
/
|
|
{run.progressTotal}
|
|
</Accent>
|
|
</>
|
|
) : null;
|
|
|
|
const pausedSegment = run.status === 'paused' ? (
|
|
<>
|
|
<DotSeparator />
|
|
<span className="text-amber-500 font-medium">{t('scripts.running.status.paused')}</span>
|
|
</>
|
|
) : null;
|
|
|
|
const waitingSegment = waitingPattern ? (
|
|
<>
|
|
<DotSeparator />
|
|
<Muted>{t('scripts.running.waitingForLabel')}</Muted>
|
|
{' '}
|
|
<span className="text-amber-500 font-medium">{waitingPattern}</span>
|
|
</>
|
|
) : null;
|
|
|
|
const lastSentSegment = !waitingPattern && lastSent ? (
|
|
<>
|
|
<DotSeparator />
|
|
<Muted>{t('scripts.running.lastSentLabel')}</Muted>
|
|
{' '}
|
|
<span className="text-primary/90 font-mono">{lastSent}</span>
|
|
</>
|
|
) : null;
|
|
|
|
return (
|
|
<span className="flex min-w-0 flex-1 items-center gap-1.5 leading-none">
|
|
<ScriptStatusIcon status={run.status} />
|
|
<span className="shrink-0 whitespace-nowrap font-semibold text-foreground">{label}</span>
|
|
<span className="inline-flex min-w-0 flex-1 items-center truncate">
|
|
{(isFinished || opCount > 0) ? (
|
|
<>
|
|
<DotSeparator />
|
|
{opsSegment}
|
|
</>
|
|
) : null}
|
|
<DotSeparator />
|
|
{elapsedSegment}
|
|
{!isFinished ? (
|
|
<>
|
|
{progressSegment}
|
|
{activitySegment}
|
|
{pausedSegment}
|
|
{waitingSegment}
|
|
{lastSentSegment}
|
|
</>
|
|
) : null}
|
|
</span>
|
|
</span>
|
|
);
|
|
}
|
|
|
|
export const ScriptExecutionOverlay: React.FC<ScriptExecutionOverlayProps> = ({
|
|
run,
|
|
onPause,
|
|
onResume,
|
|
onStop,
|
|
onDismiss,
|
|
}) => {
|
|
const { t } = useI18n();
|
|
const [tick, setTick] = useState(0);
|
|
const isFinished = run.status === 'completed' || run.status === 'failed';
|
|
|
|
useEffect(() => {
|
|
if (isFinished) return undefined;
|
|
const timer = window.setInterval(() => setTick((value) => value + 1), 1000);
|
|
return () => window.clearInterval(timer);
|
|
}, [isFinished, run.runId]);
|
|
|
|
void tick;
|
|
|
|
const elapsedMs = run.elapsedMs
|
|
?? (run.endedAt ? run.endedAt - run.startedAt : Date.now() - run.startedAt);
|
|
const lastSent = [...(run.logs || [])].reverse().find((entry) => entry.message.startsWith('→ '))?.message.slice(2);
|
|
const errorMessage = run.status === 'failed' ? run.error : undefined;
|
|
|
|
const statusLine = useMemo(
|
|
() => (
|
|
<ScriptStatusLine run={run} elapsedMs={elapsedMs} lastSent={lastSent} t={t} />
|
|
),
|
|
[run, elapsedMs, lastSent, t],
|
|
);
|
|
|
|
return (
|
|
<div
|
|
className="absolute left-2 right-2 z-25 rounded-md border shadow-md backdrop-blur-md pointer-events-auto px-3 py-2"
|
|
style={{
|
|
top: 34,
|
|
backgroundColor: 'color-mix(in srgb, var(--terminal-ui-bg) 92%, transparent)',
|
|
borderColor: 'var(--terminal-ui-border)',
|
|
color: 'var(--terminal-ui-fg)',
|
|
}}
|
|
data-section="script-execution-overlay"
|
|
>
|
|
<div className="flex items-center gap-2 min-w-0">
|
|
<div className="min-w-0 flex flex-1 items-center text-[11px] leading-none">
|
|
{statusLine}
|
|
</div>
|
|
{errorMessage ? (
|
|
<div
|
|
className="min-w-0 max-w-[42%] shrink text-[11px] leading-none text-destructive truncate text-right"
|
|
title={errorMessage}
|
|
>
|
|
{errorMessage}
|
|
</div>
|
|
) : null}
|
|
<div className="flex items-center gap-1 shrink-0">
|
|
{isFinished ? (
|
|
<Button size="icon" variant="ghost" className="h-7 w-7" onClick={onDismiss} title={t('scripts.running.dismiss')}>
|
|
<X size={14} />
|
|
</Button>
|
|
) : (
|
|
<>
|
|
{run.status === 'running' ? (
|
|
<Button size="icon" variant="ghost" className="h-7 w-7" onClick={onPause}>
|
|
<Pause size={14} />
|
|
</Button>
|
|
) : null}
|
|
{run.status === 'paused' ? (
|
|
<Button size="icon" variant="ghost" className="h-7 w-7" onClick={onResume}>
|
|
<Play size={14} />
|
|
</Button>
|
|
) : null}
|
|
<Button size="icon" variant="ghost" className="h-7 w-7" onClick={onStop}>
|
|
<Square size={14} />
|
|
</Button>
|
|
</>
|
|
)}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
);
|
|
};
|