mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-20 15:19:16 +00:00
* 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>
427 lines
16 KiB
TypeScript
427 lines
16 KiB
TypeScript
import React, { useMemo, useState } from 'react';
|
|
import { parseSnippetVariables } from '../domain/snippetVariables';
|
|
import { Check, Clock, Keyboard, Loader2, Package, RotateCcw, Trash2 } from 'lucide-react';
|
|
import { cn } from '../lib/utils';
|
|
import SelectHostPanel from './SelectHostPanel';
|
|
import { AsidePanel, AsidePanelContent, AsidePanelFooter } from './ui/aside-panel';
|
|
import { Button } from './ui/button';
|
|
import { Card } from './ui/card';
|
|
import { Input } from './ui/input';
|
|
import { SnippetScriptEditor } from './snippets/SnippetScriptEditor';
|
|
import { SnippetTargetsSection } from './snippets/SnippetTargetsSection';
|
|
import { ScriptEditorPanel } from './scripts/ScriptEditorPanel';
|
|
import { ScriptEditorModal } from './scripts/ScriptEditorModal';
|
|
import { isScriptSnippet } from '../domain/snippetScript.ts';
|
|
import { Tooltip, TooltipContent, TooltipTrigger } from './ui/tooltip';
|
|
import { Combobox } from './ui/combobox';
|
|
import { HistoryItem } from './SnippetsHistoryItem';
|
|
import type { Snippet } from '@/domain/models';
|
|
import { getRunnableHostsForSnippet } from '@/domain/snippetTargets.ts';
|
|
import { STORAGE_KEY_SNIPPETS_PANEL_WIDTH } from '@/infrastructure/config/storageKeys.ts';
|
|
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
type SnippetsRightPanelProps = Record<string, any>;
|
|
|
|
export const SnippetsRightPanel: React.FC<SnippetsRightPanelProps> = ({
|
|
rightPanelMode,
|
|
hosts,
|
|
customGroups,
|
|
targetSelection,
|
|
setTargetSelection,
|
|
handleTargetSelect,
|
|
handleTargetPickerBack,
|
|
availableKeys,
|
|
proxyProfiles,
|
|
managedSources,
|
|
onSaveHost,
|
|
onCreateGroup,
|
|
t,
|
|
handleClosePanel,
|
|
editingSnippet,
|
|
onDelete,
|
|
handleSave,
|
|
handleSaveAndRun,
|
|
setEditingSnippet,
|
|
packageOptions,
|
|
selectedPackage,
|
|
packages,
|
|
onPackagesChange,
|
|
shortkeyError,
|
|
setShortkeyError,
|
|
isRecordingShortkey,
|
|
setIsRecordingShortkey,
|
|
openTargetPicker,
|
|
targetHosts,
|
|
shellHistory,
|
|
handleHistoryScroll,
|
|
historyScrollRef,
|
|
visibleHistory,
|
|
saveHistoryAsSnippet,
|
|
handleCopy,
|
|
copiedId,
|
|
hasMoreHistory,
|
|
isLoadingMore,
|
|
loadMoreHistory,
|
|
onRunSnippet,
|
|
}) => {
|
|
const detectedVariables = useMemo(
|
|
() => parseSnippetVariables(editingSnippet?.command || ''),
|
|
[editingSnippet?.command],
|
|
);
|
|
const [scriptEditorModalOpen, setScriptEditorModalOpen] = useState(false);
|
|
const isEditingScript = isScriptSnippet(editingSnippet as import('../types').Snippet);
|
|
const snippetsPanelResizeProps = {
|
|
resizable: true as const,
|
|
persistWidthStorageKey: STORAGE_KEY_SNIPPETS_PANEL_WIDTH,
|
|
resizeAriaLabel: t('snippets.panel.resizeWidth'),
|
|
};
|
|
|
|
const runnableEditingSnippet = useMemo(() => ({
|
|
...(editingSnippet as Snippet),
|
|
targets: editingSnippet.targetsAllHosts ? [] : targetSelection,
|
|
targetsAllHosts: editingSnippet.targetsAllHosts || undefined,
|
|
}), [editingSnippet, targetSelection]);
|
|
|
|
const runTargets = useMemo(
|
|
() => getRunnableHostsForSnippet(runnableEditingSnippet, hosts),
|
|
[hosts, runnableEditingSnippet],
|
|
);
|
|
|
|
const runEditingScript = () => {
|
|
if (runTargets.length === 0) return;
|
|
onRunSnippet?.(runnableEditingSnippet, runTargets);
|
|
};
|
|
|
|
const canRunEditingScript = Boolean(editingSnippet.command?.trim()) && runTargets.length > 0;
|
|
|
|
const handleTargetsAllHostsChange = (checked: boolean) => {
|
|
if (checked) {
|
|
setTargetSelection([]);
|
|
setEditingSnippet({
|
|
...editingSnippet,
|
|
targetsAllHosts: true,
|
|
targets: [],
|
|
});
|
|
return;
|
|
}
|
|
setEditingSnippet({
|
|
...editingSnippet,
|
|
targetsAllHosts: undefined,
|
|
});
|
|
};
|
|
|
|
if (rightPanelMode === 'select-targets') {
|
|
return (
|
|
<SelectHostPanel
|
|
hosts={hosts}
|
|
customGroups={customGroups}
|
|
selectedHostIds={targetSelection}
|
|
multiSelect={true}
|
|
onSelect={handleTargetSelect}
|
|
onBack={handleTargetPickerBack}
|
|
onContinue={handleTargetPickerBack}
|
|
availableKeys={availableKeys}
|
|
proxyProfiles={proxyProfiles}
|
|
managedSources={managedSources}
|
|
onSaveHost={onSaveHost}
|
|
onCreateGroup={onCreateGroup}
|
|
title={t('snippets.targets.add')}
|
|
layout="inline"
|
|
{...snippetsPanelResizeProps}
|
|
/>
|
|
);
|
|
}
|
|
|
|
if (rightPanelMode === 'edit-snippet') {
|
|
return (
|
|
<AsidePanel
|
|
open={true}
|
|
onClose={handleClosePanel}
|
|
title={isEditingScript
|
|
? t(editingSnippet.id ? 'snippets.panel.editAutomationTitle' : 'snippets.panel.newAutomationTitle')
|
|
: t(editingSnippet.id ? 'snippets.panel.editTitle' : 'snippets.panel.newTitle')}
|
|
layout="inline"
|
|
{...snippetsPanelResizeProps}
|
|
actions={
|
|
<>
|
|
{editingSnippet.id && (
|
|
<Tooltip>
|
|
<TooltipTrigger asChild>
|
|
<Button
|
|
variant="ghost"
|
|
size="icon"
|
|
className="h-8 w-8 text-destructive hover:text-destructive"
|
|
onClick={() => {
|
|
const id = editingSnippet.id;
|
|
if (!id) return;
|
|
onDelete(id);
|
|
handleClosePanel();
|
|
}}
|
|
aria-label={t('common.delete')}
|
|
>
|
|
<Trash2 size={16} />
|
|
</Button>
|
|
</TooltipTrigger>
|
|
<TooltipContent>{t('common.delete')}</TooltipContent>
|
|
</Tooltip>
|
|
)}
|
|
<Button
|
|
variant="ghost"
|
|
size="icon"
|
|
className="h-8 w-8"
|
|
onClick={handleSave}
|
|
disabled={!editingSnippet.label || !editingSnippet.command}
|
|
aria-label={t('common.save')}
|
|
>
|
|
<Check size={16} />
|
|
</Button>
|
|
</>
|
|
}
|
|
>
|
|
<AsidePanelContent>
|
|
{!isEditingScript ? (
|
|
<Card className="p-3 space-y-2 bg-card border-border/80">
|
|
<p className="text-xs font-semibold text-muted-foreground">{t('snippets.field.description')}</p>
|
|
<Input
|
|
placeholder={t('snippets.field.descriptionPlaceholder')}
|
|
value={editingSnippet.label || ''}
|
|
onChange={(e) => setEditingSnippet({ ...editingSnippet, label: e.target.value })}
|
|
className="h-10"
|
|
spellCheck={false}
|
|
/>
|
|
</Card>
|
|
) : null}
|
|
|
|
{/* Package */}
|
|
<Card className="p-3 space-y-2 bg-card border-border/80">
|
|
<p className="text-xs font-semibold text-muted-foreground">{t('snippets.field.package')}</p>
|
|
<Combobox
|
|
options={packageOptions}
|
|
value={editingSnippet.package || selectedPackage || ''}
|
|
onValueChange={(val) => {
|
|
setEditingSnippet({ ...editingSnippet, package: val });
|
|
// If selecting an implicit parent path, persist it to packages
|
|
if (val && !packages.includes(val)) {
|
|
onPackagesChange([...packages, val]);
|
|
}
|
|
}}
|
|
placeholder={t('snippets.field.packagePlaceholder')}
|
|
allowCreate={true}
|
|
onCreateNew={(val) => {
|
|
if (!packages.includes(val)) {
|
|
onPackagesChange([...packages, val]);
|
|
}
|
|
}}
|
|
createText={t('snippets.field.createPackage')}
|
|
icon={<Package size={16} />}
|
|
triggerClassName="h-10"
|
|
/>
|
|
</Card>
|
|
|
|
{/* Script / Snippet body */}
|
|
{isEditingScript ? (
|
|
<ScriptEditorPanel
|
|
snippet={editingSnippet as import('../types').Snippet}
|
|
onChange={setEditingSnippet}
|
|
canRun={canRunEditingScript}
|
|
onExpand={() => setScriptEditorModalOpen(true)}
|
|
onRun={canRunEditingScript ? runEditingScript : undefined}
|
|
/>
|
|
) : (
|
|
<Card className="p-3 space-y-2 bg-card border-border/80">
|
|
<SnippetScriptEditor
|
|
label={t('snippets.field.scriptRequired')}
|
|
placeholder="ls -l"
|
|
value={editingSnippet.command || ''}
|
|
onChange={(command) => setEditingSnippet({ ...editingSnippet, command })}
|
|
/>
|
|
<p className="text-[11px] text-muted-foreground leading-relaxed">
|
|
{t('snippets.field.variablesHelp')}
|
|
</p>
|
|
{detectedVariables.length > 0 && (
|
|
<div className="flex flex-wrap items-center gap-1.5 pt-0.5">
|
|
<span className="text-[10px] font-semibold text-muted-foreground shrink-0">
|
|
{t('snippets.field.variablesDetected')}:
|
|
</span>
|
|
{detectedVariables.map((variable) => (
|
|
<span
|
|
key={variable.name}
|
|
className="text-[10px] px-2 py-0.5 rounded-full bg-primary/10 text-primary font-mono"
|
|
>
|
|
{variable.name}
|
|
{variable.defaultValue !== undefined && (
|
|
<span className="text-muted-foreground font-sans ml-1">
|
|
({t('snippets.field.variableDefault', { value: variable.defaultValue })})
|
|
</span>
|
|
)}
|
|
</span>
|
|
))}
|
|
</div>
|
|
)}
|
|
</Card>
|
|
)}
|
|
|
|
<SnippetTargetsSection
|
|
t={t}
|
|
targetHosts={targetHosts}
|
|
onEditTargets={openTargetPicker}
|
|
hint={isEditingScript
|
|
? (editingSnippet.trigger === 'onConnect'
|
|
? t('scripts.targets.connectOrderHint')
|
|
: t('scripts.targets.hint'))
|
|
: undefined}
|
|
targetsAllHosts={Boolean(editingSnippet.targetsAllHosts)}
|
|
onTargetsAllHostsChange={handleTargetsAllHostsChange}
|
|
/>
|
|
|
|
{!isEditingScript ? (
|
|
<>
|
|
<label className="flex items-center gap-2 cursor-pointer px-1">
|
|
<input
|
|
type="checkbox"
|
|
checked={editingSnippet.noAutoRun ?? false}
|
|
onChange={(e) => setEditingSnippet({ ...editingSnippet, noAutoRun: e.target.checked || undefined })}
|
|
className="rounded border-input"
|
|
/>
|
|
<span className="text-xs text-muted-foreground">{t('snippets.field.noAutoRun')}</span>
|
|
</label>
|
|
|
|
{/* Shortkey */}
|
|
<Card className="p-3 space-y-2 bg-card border-border/80">
|
|
<div className="flex items-center justify-between">
|
|
<p className="text-xs font-semibold text-muted-foreground">{t('snippets.field.shortkey')}</p>
|
|
{editingSnippet.shortkey && (
|
|
<Tooltip>
|
|
<TooltipTrigger asChild>
|
|
<Button
|
|
variant="ghost"
|
|
size="sm"
|
|
className="h-6 px-2 text-xs"
|
|
onClick={() => {
|
|
setEditingSnippet(prev => ({ ...prev, shortkey: undefined }));
|
|
setShortkeyError(null);
|
|
}}
|
|
>
|
|
<RotateCcw size={12} />
|
|
</Button>
|
|
</TooltipTrigger>
|
|
<TooltipContent>{t('snippets.shortkey.clear')}</TooltipContent>
|
|
</Tooltip>
|
|
)}
|
|
</div>
|
|
<button
|
|
type="button"
|
|
onClick={(e) => {
|
|
e.stopPropagation();
|
|
setIsRecordingShortkey(true);
|
|
setShortkeyError(null);
|
|
}}
|
|
className={cn(
|
|
"w-full h-10 px-3 text-sm font-mono rounded-lg border transition-colors flex items-center justify-center gap-2",
|
|
isRecordingShortkey
|
|
? "border-primary bg-primary/10 animate-pulse"
|
|
: "border-border hover:border-primary/50 bg-background"
|
|
)}
|
|
>
|
|
<Keyboard size={14} className="text-muted-foreground" />
|
|
{isRecordingShortkey
|
|
? t('snippets.shortkey.recording')
|
|
: editingSnippet.shortkey || t('snippets.shortkey.placeholder')}
|
|
</button>
|
|
{shortkeyError && (
|
|
<p className="text-xs text-destructive">{shortkeyError}</p>
|
|
)}
|
|
<p className="text-[11px] text-muted-foreground">{t('snippets.shortkey.hint')}</p>
|
|
</Card>
|
|
</>
|
|
) : null}
|
|
</AsidePanelContent>
|
|
|
|
{/* Footer */}
|
|
<AsidePanelFooter>
|
|
<Button
|
|
className="w-full"
|
|
onClick={canRunEditingScript ? handleSaveAndRun : handleSave}
|
|
disabled={!editingSnippet.label || !editingSnippet.command}
|
|
>
|
|
{canRunEditingScript ? t('action.run') : t('common.save')}
|
|
</Button>
|
|
</AsidePanelFooter>
|
|
{isEditingScript ? (
|
|
<ScriptEditorModal
|
|
open={scriptEditorModalOpen}
|
|
onClose={() => setScriptEditorModalOpen(false)}
|
|
snippet={editingSnippet as import('../types').Snippet}
|
|
onChange={setEditingSnippet}
|
|
onSave={handleSave}
|
|
canRun={canRunEditingScript}
|
|
onRun={canRunEditingScript ? runEditingScript : undefined}
|
|
targetHosts={targetHosts}
|
|
hosts={hosts}
|
|
customGroups={customGroups}
|
|
selectedHostIds={targetSelection}
|
|
onSelectHost={handleTargetSelect}
|
|
targetsAllHosts={Boolean(editingSnippet.targetsAllHosts)}
|
|
onTargetsAllHostsChange={handleTargetsAllHostsChange}
|
|
/>
|
|
) : null}
|
|
</AsidePanel>
|
|
);
|
|
}
|
|
|
|
if (rightPanelMode === 'history') {
|
|
return (
|
|
<AsidePanel
|
|
open={true}
|
|
onClose={handleClosePanel}
|
|
title={t('snippets.history.title')}
|
|
subtitle={t('snippets.history.subtitle', { count: shellHistory.length })}
|
|
showBackButton={true}
|
|
onBack={handleClosePanel}
|
|
layout="inline"
|
|
{...snippetsPanelResizeProps}
|
|
>
|
|
{/* History List */}
|
|
<div
|
|
className="flex-1 overflow-y-auto p-3 space-y-2"
|
|
onScroll={handleHistoryScroll}
|
|
ref={historyScrollRef}
|
|
>
|
|
{visibleHistory.length === 0 ? (
|
|
<div className="text-center py-12 text-muted-foreground">
|
|
<Clock size={32} className="mx-auto mb-3 opacity-50" />
|
|
<p className="text-sm">{t('snippets.history.emptyTitle')}</p>
|
|
<p className="text-xs mt-1">{t('snippets.history.emptyDesc')}</p>
|
|
</div>
|
|
) : (
|
|
<>
|
|
{visibleHistory.map((entry) => (
|
|
<HistoryItem
|
|
key={entry.id}
|
|
entry={entry}
|
|
onSaveAsSnippet={saveHistoryAsSnippet}
|
|
onCopy={() => handleCopy(entry.id, entry.command)}
|
|
isCopied={copiedId === entry.id}
|
|
/>
|
|
))}
|
|
{hasMoreHistory && (
|
|
<div className="py-4 text-center">
|
|
{isLoadingMore ? (
|
|
<Loader2 size={20} className="animate-spin mx-auto text-muted-foreground" />
|
|
) : (
|
|
<Button variant="ghost" size="sm" onClick={loadMoreHistory}>
|
|
{t('snippets.history.loadMore')}
|
|
</Button>
|
|
)}
|
|
</div>
|
|
)}
|
|
</>
|
|
)}
|
|
</div>
|
|
</AsidePanel>
|
|
);
|
|
}
|
|
|
|
return null;
|
|
};
|