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>
239 lines
8.4 KiB
TypeScript
239 lines
8.4 KiB
TypeScript
/**
|
|
* QuickAddSnippetDialog — lightweight "new snippet" modal mounted at the
|
|
* App root and triggered by the `netcatty:snippets:add` window event.
|
|
*
|
|
* Intentionally minimal: label + command + package only. Advanced fields
|
|
* (target hosts, shortkey, tags) can be set later via the full Snippets
|
|
* manager. This keeps the user in their terminal context instead of
|
|
* navigating to the Vault view just to add a command.
|
|
*/
|
|
|
|
import { Package } from 'lucide-react';
|
|
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
|
import { useI18n } from '../application/i18n/I18nProvider';
|
|
import type { Snippet } from '../domain/models';
|
|
import { isScriptSnippet } from '../domain/snippetScript.ts';
|
|
import { Button } from './ui/button';
|
|
import { Combobox } from './ui/combobox';
|
|
import {
|
|
Dialog,
|
|
DialogContent,
|
|
DialogDescription,
|
|
DialogFooter,
|
|
DialogHeader,
|
|
DialogTitle,
|
|
} from './ui/dialog';
|
|
import { Input } from './ui/input';
|
|
import { Label } from './ui/label';
|
|
import { SnippetScriptEditor } from './snippets/SnippetScriptEditor';
|
|
|
|
export interface QuickAddSnippetDialogProps {
|
|
snippets: Snippet[];
|
|
packages: string[];
|
|
onCreateSnippet: (snippet: Snippet) => void;
|
|
onUpdateSnippet?: (snippet: Snippet) => void;
|
|
onCreatePackage?: (packagePath: string) => void;
|
|
}
|
|
|
|
export function getQuickAddSnippetInitialCommand(event: Event): string {
|
|
const detail = (event as CustomEvent<{ command?: unknown }>).detail;
|
|
return typeof detail?.command === 'string' ? detail.command : '';
|
|
}
|
|
|
|
export const QuickAddSnippetDialog: React.FC<QuickAddSnippetDialogProps> = ({
|
|
snippets,
|
|
packages,
|
|
onCreateSnippet,
|
|
onUpdateSnippet,
|
|
onCreatePackage,
|
|
}) => {
|
|
const { t } = useI18n();
|
|
const [open, setOpen] = useState(false);
|
|
const [label, setLabel] = useState('');
|
|
const [command, setCommand] = useState('');
|
|
const [packagePath, setPackagePath] = useState('');
|
|
const [noAutoRun, setNoAutoRun] = useState(false);
|
|
const [editing, setEditing] = useState<Snippet | null>(null);
|
|
const labelInputRef = useRef<HTMLInputElement>(null);
|
|
|
|
// Listen for the global "add snippet" request dispatched by the
|
|
// terminal-side ScriptsSidePanel + button. We reset form state on
|
|
// every open so stale input from a previous cancel does not leak.
|
|
useEffect(() => {
|
|
const handler = (event: Event) => {
|
|
setEditing(null);
|
|
setLabel('');
|
|
setCommand(getQuickAddSnippetInitialCommand(event));
|
|
setPackagePath('');
|
|
setNoAutoRun(false);
|
|
setOpen(true);
|
|
};
|
|
window.addEventListener('netcatty:snippets:add', handler);
|
|
return () => window.removeEventListener('netcatty:snippets:add', handler);
|
|
}, []);
|
|
|
|
// Sibling event for editing an existing snippet from the ScriptsSidePanel
|
|
// context menu. Prefills the form and flips the dialog into update mode.
|
|
useEffect(() => {
|
|
const handler = (e: Event) => {
|
|
const detail = (e as CustomEvent<{ snippet?: Snippet }>).detail;
|
|
const snippet = detail?.snippet;
|
|
if (!snippet || isScriptSnippet(snippet)) return;
|
|
setEditing(snippet);
|
|
setLabel(snippet.label ?? '');
|
|
setCommand(snippet.command ?? '');
|
|
setPackagePath(snippet.package ?? '');
|
|
setNoAutoRun(snippet.noAutoRun ?? false);
|
|
setOpen(true);
|
|
};
|
|
window.addEventListener('netcatty:snippets:edit', handler);
|
|
return () => window.removeEventListener('netcatty:snippets:edit', handler);
|
|
}, []);
|
|
|
|
// Auto-focus the label input once the dialog renders, so the user can
|
|
// start typing immediately after clicking the + button.
|
|
useEffect(() => {
|
|
if (!open) return;
|
|
const id = window.setTimeout(() => labelInputRef.current?.focus(), 50);
|
|
return () => window.clearTimeout(id);
|
|
}, [open]);
|
|
|
|
// Derive combobox options from the union of existing packages (from
|
|
// props) and any package path referenced by an existing snippet, so
|
|
// the user can reuse anything they see in the main snippets view.
|
|
const packageOptions = useMemo(() => {
|
|
const set = new Set<string>();
|
|
for (const p of packages) {
|
|
if (p) set.add(p);
|
|
}
|
|
for (const s of snippets) {
|
|
if (s.package) set.add(s.package);
|
|
}
|
|
return Array.from(set).sort().map((value) => ({ value, label: value }));
|
|
}, [packages, snippets]);
|
|
|
|
const canSave = label.trim().length > 0 && command.trim().length > 0;
|
|
|
|
const handleSave = useCallback(() => {
|
|
if (!canSave) return;
|
|
const trimmedPackage = packagePath.trim();
|
|
// If the user typed a brand new package name, surface it to the parent
|
|
// so it can be added to the user's package list alongside the snippet.
|
|
if (trimmedPackage && !packages.includes(trimmedPackage)) {
|
|
onCreatePackage?.(trimmedPackage);
|
|
}
|
|
if (editing && onUpdateSnippet) {
|
|
// Preserve tags/targets/shortkey/noAutoRun etc. that this lightweight
|
|
// dialog does not expose — only the three quick-edit fields change.
|
|
onUpdateSnippet({
|
|
...editing,
|
|
label: label.trim(),
|
|
command,
|
|
package: trimmedPackage || '',
|
|
noAutoRun: noAutoRun || undefined,
|
|
});
|
|
} else {
|
|
onCreateSnippet({
|
|
id: crypto.randomUUID(),
|
|
label: label.trim(),
|
|
command, // preserve whitespace in multi-line commands
|
|
tags: [],
|
|
package: trimmedPackage || '',
|
|
targets: [],
|
|
noAutoRun: noAutoRun || undefined,
|
|
});
|
|
}
|
|
setOpen(false);
|
|
}, [canSave, packagePath, packages, onCreatePackage, onCreateSnippet, onUpdateSnippet, editing, label, command, noAutoRun]);
|
|
|
|
const handleKeyDown = useCallback(
|
|
(e: React.KeyboardEvent) => {
|
|
// Cmd/Ctrl+Enter from anywhere in the dialog saves the snippet.
|
|
if ((e.metaKey || e.ctrlKey) && e.key === 'Enter' && canSave) {
|
|
e.preventDefault();
|
|
handleSave();
|
|
}
|
|
},
|
|
[canSave, handleSave],
|
|
);
|
|
|
|
return (
|
|
<Dialog open={open} onOpenChange={setOpen}>
|
|
<DialogContent
|
|
className="max-w-md max-h-[min(90vh,720px)] flex flex-col overflow-hidden"
|
|
onKeyDown={handleKeyDown}
|
|
>
|
|
<DialogHeader className="shrink-0">
|
|
<DialogTitle>
|
|
{t(editing ? 'snippets.panel.editTitle' : 'snippets.panel.newTitle')}
|
|
</DialogTitle>
|
|
<DialogDescription>
|
|
{t('snippets.empty.desc')}
|
|
</DialogDescription>
|
|
</DialogHeader>
|
|
|
|
<div className="min-h-0 space-y-3 overflow-y-auto pr-1">
|
|
<div className="space-y-1.5">
|
|
<Label htmlFor="quick-add-snippet-label" className="text-xs">
|
|
{t('snippets.field.description')}
|
|
</Label>
|
|
<Input
|
|
id="quick-add-snippet-label"
|
|
ref={labelInputRef}
|
|
value={label}
|
|
onChange={(e) => setLabel(e.target.value)}
|
|
placeholder={t('snippets.field.descriptionPlaceholder')}
|
|
className="h-9"
|
|
spellCheck={false}
|
|
/>
|
|
</div>
|
|
|
|
<SnippetScriptEditor
|
|
id="quick-add-snippet-command"
|
|
label={t('snippets.field.scriptRequired')}
|
|
value={command}
|
|
onChange={setCommand}
|
|
placeholder="echo hello"
|
|
/>
|
|
|
|
<div className="space-y-1.5">
|
|
<Label className="text-xs flex items-center gap-1.5">
|
|
<Package size={12} /> {t('snippets.field.package')}
|
|
</Label>
|
|
<Combobox
|
|
value={packagePath}
|
|
onValueChange={setPackagePath}
|
|
options={packageOptions}
|
|
placeholder={t('snippets.field.packagePlaceholder')}
|
|
allowCreate
|
|
onCreateNew={setPackagePath}
|
|
createText={t('snippets.field.createPackage')}
|
|
/>
|
|
</div>
|
|
|
|
<label className="flex items-center gap-2 cursor-pointer px-1">
|
|
<input
|
|
type="checkbox"
|
|
checked={noAutoRun}
|
|
onChange={(e) => setNoAutoRun(e.target.checked)}
|
|
className="rounded border-input"
|
|
/>
|
|
<span className="text-xs text-muted-foreground">{t('snippets.field.noAutoRun')}</span>
|
|
</label>
|
|
</div>
|
|
|
|
<DialogFooter className="shrink-0">
|
|
<Button variant="outline" onClick={() => setOpen(false)}>
|
|
{t('common.cancel')}
|
|
</Button>
|
|
<Button onClick={handleSave} disabled={!canSave}>
|
|
{t('common.save')}
|
|
</Button>
|
|
</DialogFooter>
|
|
</DialogContent>
|
|
</Dialog>
|
|
);
|
|
};
|
|
|
|
export default QuickAddSnippetDialog;
|