feat(scripts): terminal script automation, recording, and side panel (#1763)

* 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>
This commit is contained in:
陈大猫andCursor authored and GitHub committed 2026-06-28 23:48:12 +08:00
1 parent 9d98853091
commit 6b9b71ac8a
112 files changed
+8776 -680

No files matched your search

+190 -7
View File
@@ -7,12 +7,17 @@
* list of matching snippets regardless of package nesting.
*/
import { ChevronRight, Edit2, FileCode, Package, Plus, Search, Trash2, Zap } from 'lucide-react';
import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { ChevronRight, Edit2, Layers, Package, Play, Plus, Search, Trash2, Zap } from 'lucide-react';
import React, { memo, useCallback, useEffect, useMemo, useRef, useState, useSyncExternalStore } from 'react';
import { useI18n } from '../application/i18n/I18nProvider';
import { getScriptRecordingSnapshot, subscribeScriptRecording } from '../application/state/scriptRecordingStore.ts';
import { reorderVaultItems, reorderVaultStrings, sortByVaultOrder } from '../domain/vaultOrder';
import { isScriptSnippet } from '../domain/snippetScript.ts';
import { cn } from '../lib/utils';
import { Snippet } from '../types';
import type { ScriptRun } from '../types/global/netcatty-bridge-script.d.ts';
import { ScriptRunList } from './scripts/ScriptRunList';
import { ScriptRecordingHelpDialog } from './scripts/ScriptRecordingHelpDialog';
import {
ContextMenu,
ContextMenuContent,
@@ -34,9 +39,17 @@ interface ScriptsSidePanelProps {
snippets: Snippet[];
packages: string[];
onSnippetClick: (snippet: Snippet) => void;
onRunScript?: (snippet: Snippet) => void;
onRunScriptOnWorkspace?: (snippet: Snippet, mode: 'sequential' | 'parallel') => void;
onSnippetsChange?: (snippets: Snippet[]) => void;
onPackagesChange?: (packages: string[]) => void;
isVisible?: boolean;
runs?: ScriptRun[];
onStopRun?: (runId: string) => void;
onPauseRun?: (runId: string) => void;
onResumeRun?: (runId: string) => void;
onStartRecording?: () => void;
focusedSessionId?: string;
}
type TreeRow =
@@ -221,14 +234,47 @@ const ScriptsSidePanelInner: React.FC<ScriptsSidePanelProps> = ({
snippets,
packages,
onSnippetClick,
onRunScript,
onRunScriptOnWorkspace,
onSnippetsChange,
onPackagesChange,
isVisible = true,
runs = [],
onStopRun,
onPauseRun,
onResumeRun,
onStartRecording,
focusedSessionId,
}) => {
const { t } = useI18n();
const [search, setSearch] = useState('');
const [subView, setSubView] = useState<'library' | 'running'>('library');
const [expandedPaths, setExpandedPaths] = useState<Set<string>>(new Set());
useEffect(() => {
const handler = (event: Event) => {
const detail = (event as CustomEvent<{ packagePath?: string }>).detail;
setSubView('library');
setSearch('');
if (detail?.packagePath) {
setExpandedPaths((prev) => {
const next = new Set(prev);
let path = detail.packagePath || '';
while (path) {
next.add(path);
const slash = path.lastIndexOf('/');
if (slash < 0) break;
path = path.slice(0, slash);
}
next.add('');
return next;
});
}
};
window.addEventListener('netcatty:scripts:saved', handler);
return () => window.removeEventListener('netcatty:scripts:saved', handler);
}, []);
// Normalize the package list + derive ancestor packages implied by each path
// (e.g. package "a/b/c" implies roots "a" and "a/b" even when not listed).
const normalizedPackages = useMemo(() => {
@@ -343,11 +389,39 @@ const ScriptsSidePanelInner: React.FC<ScriptsSidePanelProps> = ({
const handleSnippetClick = useCallback(
(snippet: Snippet) => {
if (isScriptSnippet(snippet)) {
onRunScript?.(snippet);
setSubView('running');
return;
}
onSnippetClick(snippet);
},
[onSnippetClick],
[onRunScript, onSnippetClick],
);
const sessionRuns = useMemo(() => {
if (!focusedSessionId) return runs;
return runs.filter((run) => run.sessionId === focusedSessionId);
}, [focusedSessionId, runs]);
const recordingState = useSyncExternalStore(
subscribeScriptRecording,
getScriptRecordingSnapshot,
getScriptRecordingSnapshot,
);
const isRecordingFocusedSession = Boolean(
focusedSessionId && recordingState.sessionId === focusedSessionId,
);
const canStartRecording = Boolean(onStartRecording && focusedSessionId);
const recordingDisabledReason = !onStartRecording
? 'unavailable'
: !focusedSessionId
? 'noSession'
: null;
const recordingButtonLabel = isRecordingFocusedSession
? t('scripts.recording.active')
: t('scripts.recording.start');
const moveSnippetToPackage = useCallback((snippetId: string, packagePath: string | null) => {
if (!onSnippetsChange) return;
const targetPackage = packagePath || '';
@@ -506,12 +580,13 @@ const ScriptsSidePanelInner: React.FC<ScriptsSidePanelProps> = ({
]);
const handleAddSnippet = useCallback(() => {
// Let the App shell listen and navigate to the Snippets section with
// the "add" panel pre-opened, so the user does not have to leave the
// terminal to jump back and click "New Snippet".
window.dispatchEvent(new CustomEvent('netcatty:snippets:add'));
}, []);
const handleAddScript = useCallback(() => {
window.dispatchEvent(new CustomEvent('netcatty:scripts:add'));
}, []);
const handleEditSnippet = useCallback((snippet: Snippet) => {
window.dispatchEvent(
new CustomEvent('netcatty:snippets:edit', { detail: { snippet } }),
@@ -534,6 +609,41 @@ const ScriptsSidePanelInner: React.FC<ScriptsSidePanelProps> = ({
className="h-full flex flex-col bg-background overflow-hidden"
data-section="snippets-panel"
>
{/* Sub view tabs */}
<div className="shrink-0 px-2 py-1 border-b border-border/50 flex items-center gap-1">
<button
type="button"
className={cn(
'flex-1 h-7 rounded-md text-xs',
subView === 'library' ? 'bg-accent text-foreground' : 'text-muted-foreground hover:bg-muted/50',
)}
onClick={() => setSubView('library')}
>
{t('scripts.sidePanel.library')}
</button>
<button
type="button"
className={cn(
'flex-1 h-7 rounded-md text-xs',
subView === 'running' ? 'bg-accent text-foreground' : 'text-muted-foreground hover:bg-muted/50',
)}
onClick={() => setSubView('running')}
>
{t('scripts.sidePanel.running')}
</button>
</div>
{subView === 'running' ? (
<div className="flex-1 min-h-0 overflow-auto">
<ScriptRunList
runs={sessionRuns}
onStop={onStopRun ?? (() => {})}
onPause={onPauseRun ?? (() => {})}
onResume={onResumeRun ?? (() => {})}
/>
</div>
) : (
<>
{/* Search + Add */}
<div className="shrink-0 px-2 py-1.5 border-b border-border/50 flex items-center gap-1.5">
<div className="relative flex-1 min-w-0">
@@ -623,6 +733,14 @@ const ScriptsSidePanelInner: React.FC<ScriptsSidePanelProps> = ({
onClick={() => handleSnippetClick(item.row.snippet)}
onEdit={() => handleEditSnippet(item.row.snippet)}
onDelete={() => handleDeleteSnippet(item.row.snippet.id)}
onRunParallel={isScriptSnippet(item.row.snippet) && onRunScriptOnWorkspace
? () => onRunScriptOnWorkspace(item.row.snippet, 'parallel')
: undefined}
onRunSequential={isScriptSnippet(item.row.snippet) && onRunScriptOnWorkspace
? () => onRunScriptOnWorkspace(item.row.snippet, 'sequential')
: undefined}
runParallelLabel={t('scripts.actions.runParallel')}
runSequentialLabel={t('scripts.actions.runSequential')}
editLabel={t('action.edit')}
deleteLabel={t('action.delete')}
/>
@@ -631,6 +749,49 @@ const ScriptsSidePanelInner: React.FC<ScriptsSidePanelProps> = ({
/>
)}
</div>
<div className="shrink-0 px-2 py-2 border-t border-border/50 flex items-center gap-2">
<button
type="button"
onClick={handleAddScript}
className="flex-1 h-8 rounded-md text-xs bg-secondary/60 hover:bg-secondary"
>
{t('scripts.sidePanel.newScript')}
</button>
<Tooltip>
<TooltipTrigger asChild>
<button
type="button"
onClick={onStartRecording}
disabled={!canStartRecording}
className={cn(
'flex-1 h-8 rounded-md text-xs disabled:opacity-50',
isRecordingFocusedSession
? 'bg-red-500/15 text-red-500 hover:bg-red-500/25'
: 'bg-secondary/60 hover:bg-secondary',
)}
>
{recordingButtonLabel}
</button>
</TooltipTrigger>
<TooltipContent side="top" className="max-w-[240px]">
{recordingDisabledReason === 'unavailable'
? t('scripts.recording.unavailableHint')
: recordingDisabledReason === 'noSession'
? t('scripts.recording.noSession')
: isRecordingFocusedSession
? t('scripts.recording.activeHint')
: t('scripts.recording.startHint')}
</TooltipContent>
</Tooltip>
<ScriptRecordingHelpDialog />
</div>
{isRecordingFocusedSession ? (
<p className="shrink-0 px-2 pb-2 text-[10px] text-muted-foreground leading-relaxed">
{t('scripts.recording.activeHint')}
</p>
) : null}
</>
)}
</div>
</TooltipProvider>
);
@@ -690,6 +851,10 @@ interface SnippetRowProps {
onClick: () => void;
onEdit: () => void;
onDelete: () => void;
onRunParallel?: () => void;
onRunSequential?: () => void;
runParallelLabel?: string;
runSequentialLabel?: string;
editLabel: string;
deleteLabel: string;
}
@@ -706,6 +871,10 @@ const SnippetRow = memo<SnippetRowProps>(({
onClick,
onEdit,
onDelete,
onRunParallel,
onRunSequential,
runParallelLabel,
runSequentialLabel,
editLabel,
deleteLabel,
}) => (
@@ -735,7 +904,11 @@ const SnippetRow = memo<SnippetRowProps>(({
{/* Hidden chevron column mirrors PackageRow's layout so the
snippet icon lines up exactly with the package icon above. */}
<ChevronRight size={12} className="shrink-0 opacity-0" aria-hidden />
<FileCode size={12} className="shrink-0 text-muted-foreground" />
{isScriptSnippet(snippet) ? (
<Play size={12} className="shrink-0 text-primary" />
) : (
<Zap size={12} className="shrink-0 text-muted-foreground" />
)}
<span className="flex-1 min-w-0 truncate text-xs font-medium">{snippet.label}</span>
{subtitle && (
<span className="shrink-0 max-w-[40%] truncate text-[10px] text-muted-foreground">
@@ -754,6 +927,16 @@ const SnippetRow = memo<SnippetRowProps>(({
</div>
</ContextMenuTrigger>
<ContextMenuContent>
{onRunParallel ? (
<ContextMenuItem onClick={onRunParallel}>
<Layers className="mr-2 h-4 w-4" /> {runParallelLabel}
</ContextMenuItem>
) : null}
{onRunSequential ? (
<ContextMenuItem onClick={onRunSequential}>
<Layers className="mr-2 h-4 w-4" /> {runSequentialLabel}
</ContextMenuItem>
) : null}
<ContextMenuItem onClick={onEdit}>
<Edit2 className="mr-2 h-4 w-4" /> {editLabel}
</ContextMenuItem>