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>
383 lines
13 KiB
TypeScript
383 lines
13 KiB
TypeScript
import {
|
|
Check,
|
|
ChevronRight,
|
|
LayoutGrid,
|
|
Plus,
|
|
Search,
|
|
} from 'lucide-react';
|
|
import React, { useEffect, useMemo, useState } from 'react';
|
|
import { cn } from '../lib/utils';
|
|
import { matchesHostSearchQuery, matchesSearchQuery } from '../lib/searchMatcher';
|
|
import { useI18n } from '../application/i18n/I18nProvider';
|
|
import { Host, ProxyProfile, SSHKey } from '../types';
|
|
import { ManagedSource } from '../domain/models';
|
|
import { DistroAvatar } from './DistroAvatar';
|
|
import HostDetailsPanel from './HostDetailsPanel';
|
|
import { Button } from './ui/button';
|
|
import { Input } from './ui/input';
|
|
import { ScrollArea } from './ui/scroll-area';
|
|
import { SortDropdown, SortMode } from './ui/sort-dropdown';
|
|
import { TagFilterDropdown } from './ui/tag-filter-dropdown';
|
|
import {
|
|
Tooltip,
|
|
TooltipContent,
|
|
TooltipProvider,
|
|
TooltipTrigger,
|
|
} from './ui/tooltip';
|
|
|
|
export interface SelectHostPanelContentProps {
|
|
hosts: Host[];
|
|
customGroups?: string[];
|
|
selectedHostIds: string[];
|
|
multiSelect?: boolean;
|
|
onSelect: (host: Host) => void;
|
|
onConfirm: () => void;
|
|
onNewHost?: () => void;
|
|
availableKeys?: SSHKey[];
|
|
identities?: import('../domain/models').Identity[];
|
|
proxyProfiles?: ProxyProfile[];
|
|
managedSources?: ManagedSource[];
|
|
onSaveHost?: (host: Host) => void;
|
|
onCreateGroup?: (groupPath: string) => void;
|
|
onNewHostPanelOpenChange?: (open: boolean) => void;
|
|
className?: string;
|
|
}
|
|
|
|
/** Shared host-picker body used by aside panel and dialog variants. */
|
|
export const SelectHostPanelContent: React.FC<SelectHostPanelContentProps> = ({
|
|
hosts,
|
|
customGroups = [],
|
|
selectedHostIds,
|
|
multiSelect = false,
|
|
onSelect,
|
|
onConfirm,
|
|
onNewHost,
|
|
availableKeys = [],
|
|
identities = [],
|
|
proxyProfiles = [],
|
|
managedSources = [],
|
|
onSaveHost,
|
|
onCreateGroup,
|
|
onNewHostPanelOpenChange,
|
|
className,
|
|
}) => {
|
|
const { t } = useI18n();
|
|
const [searchQuery, setSearchQuery] = useState('');
|
|
const [currentPath, setCurrentPath] = useState<string | null>(null);
|
|
const [sortMode, setSortMode] = useState<SortMode>('az');
|
|
const [selectedTags, setSelectedTags] = useState<string[]>([]);
|
|
const [showNewHostPanel, setShowNewHostPanel] = useState(false);
|
|
|
|
useEffect(() => {
|
|
onNewHostPanelOpenChange?.(showNewHostPanel);
|
|
}, [onNewHostPanelOpenChange, showNewHostPanel]);
|
|
|
|
const selectableHosts = useMemo(
|
|
() => hosts.filter((host) => host.protocol !== 'serial'),
|
|
[hosts],
|
|
);
|
|
const selectedHostIdSet = useMemo(
|
|
() => new Set(selectedHostIds),
|
|
[selectedHostIds],
|
|
);
|
|
|
|
const allTags = useMemo(() => {
|
|
const tagSet = new Set<string>();
|
|
selectableHosts.forEach((host) => {
|
|
host.tags?.forEach((tag) => tagSet.add(tag));
|
|
});
|
|
return Array.from(tagSet).sort();
|
|
}, [selectableHosts]);
|
|
|
|
const allGroupPaths = useMemo(() => {
|
|
const pathSet = new Set<string>();
|
|
selectableHosts.forEach((host) => {
|
|
if (host.group) {
|
|
const parts = host.group.split('/');
|
|
for (let i = 1; i <= parts.length; i += 1) {
|
|
pathSet.add(parts.slice(0, i).join('/'));
|
|
}
|
|
}
|
|
});
|
|
customGroups.forEach((group) => pathSet.add(group));
|
|
return Array.from(pathSet).sort();
|
|
}, [selectableHosts, customGroups]);
|
|
|
|
const groupHostCounts = useMemo(() => {
|
|
const counts = new Map<string, number>();
|
|
selectableHosts.forEach((host) => {
|
|
if (!host.group) return;
|
|
const parts = host.group.split('/');
|
|
for (let i = 1; i <= parts.length; i += 1) {
|
|
const path = parts.slice(0, i).join('/');
|
|
counts.set(path, (counts.get(path) ?? 0) + 1);
|
|
}
|
|
});
|
|
return counts;
|
|
}, [selectableHosts]);
|
|
|
|
const groupsWithCounts = useMemo(() => {
|
|
const prefix = currentPath ? `${currentPath}/` : '';
|
|
const groups: { path: string; name: string; count: number }[] = [];
|
|
const seen = new Set<string>();
|
|
|
|
allGroupPaths.forEach((path) => {
|
|
if (currentPath === null) {
|
|
const topLevel = path.split('/')[0];
|
|
if (!seen.has(topLevel)) {
|
|
seen.add(topLevel);
|
|
groups.push({ path: topLevel, name: topLevel, count: groupHostCounts.get(topLevel) ?? 0 });
|
|
}
|
|
} else if (path.startsWith(prefix) && path !== currentPath) {
|
|
const rest = path.slice(prefix.length);
|
|
const nextLevel = rest.split('/')[0];
|
|
const fullPath = `${prefix}${nextLevel}`;
|
|
if (!seen.has(fullPath)) {
|
|
seen.add(fullPath);
|
|
groups.push({ path: fullPath, name: nextLevel, count: groupHostCounts.get(fullPath) ?? 0 });
|
|
}
|
|
}
|
|
});
|
|
|
|
return groups;
|
|
}, [allGroupPaths, currentPath, groupHostCounts]);
|
|
|
|
const filteredHosts = useMemo(() => {
|
|
let result = selectableHosts;
|
|
|
|
if (currentPath) {
|
|
result = result.filter(
|
|
(host) => host.group === currentPath || host.group?.startsWith(`${currentPath}/`),
|
|
);
|
|
}
|
|
|
|
if (searchQuery) {
|
|
result = result.filter(
|
|
(host) =>
|
|
matchesHostSearchQuery(searchQuery, host)
|
|
|| matchesSearchQuery(searchQuery, host.username, host.notes),
|
|
);
|
|
}
|
|
|
|
if (selectedTags.length > 0) {
|
|
result = result.filter(
|
|
(host) => host.tags && selectedTags.some((tag) => host.tags.includes(tag)),
|
|
);
|
|
}
|
|
|
|
result = [...result].sort((a, b) => {
|
|
switch (sortMode) {
|
|
case 'az':
|
|
return a.label.localeCompare(b.label);
|
|
case 'za':
|
|
return b.label.localeCompare(a.label);
|
|
case 'newest':
|
|
return b.id.localeCompare(a.id);
|
|
case 'oldest':
|
|
return a.id.localeCompare(b.id);
|
|
default:
|
|
return 0;
|
|
}
|
|
});
|
|
|
|
return result;
|
|
}, [selectableHosts, currentPath, searchQuery, selectedTags, sortMode]);
|
|
|
|
const breadcrumbs = useMemo(() => {
|
|
if (!currentPath) return [];
|
|
const parts = currentPath.split('/');
|
|
return parts.map((part, index) => ({
|
|
name: part,
|
|
path: parts.slice(0, index + 1).join('/'),
|
|
}));
|
|
}, [currentPath]);
|
|
|
|
return (
|
|
<TooltipProvider delayDuration={300}>
|
|
<div className={cn('flex flex-col flex-1 min-h-0 min-w-0', className)}>
|
|
<div className="px-4 py-3 flex items-center gap-2 border-b border-border/60 shrink-0">
|
|
{(onNewHost || onSaveHost) ? (
|
|
<Button
|
|
variant="secondary"
|
|
size="sm"
|
|
className="h-8 gap-1.5"
|
|
onClick={() => {
|
|
if (onSaveHost) {
|
|
setShowNewHostPanel(true);
|
|
} else if (onNewHost) {
|
|
onNewHost();
|
|
}
|
|
}}
|
|
>
|
|
<Plus size={14} />
|
|
{t('selectHost.newHost')}
|
|
</Button>
|
|
) : null}
|
|
<div className="relative flex-1 max-w-xs">
|
|
<Search
|
|
size={14}
|
|
className="absolute left-3 top-1/2 -translate-y-1/2 text-muted-foreground"
|
|
/>
|
|
<Input
|
|
placeholder={t('common.searchPlaceholder')}
|
|
className="h-8 pl-8"
|
|
value={searchQuery}
|
|
onChange={(event) => setSearchQuery(event.target.value)}
|
|
/>
|
|
</div>
|
|
<div className="ml-auto flex items-center gap-1">
|
|
<TagFilterDropdown
|
|
allTags={allTags}
|
|
selectedTags={selectedTags}
|
|
onChange={setSelectedTags}
|
|
/>
|
|
<SortDropdown value={sortMode} onChange={setSortMode} />
|
|
</div>
|
|
</div>
|
|
|
|
<ScrollArea className="flex-1 min-h-0 min-w-0">
|
|
<div className="p-3 space-y-3">
|
|
{currentPath ? (
|
|
<div className="flex items-center gap-1 text-xs text-muted-foreground">
|
|
<button
|
|
type="button"
|
|
onClick={() => setCurrentPath(null)}
|
|
className="text-primary hover:underline"
|
|
>
|
|
{t('vault.hosts.allHosts')}
|
|
</button>
|
|
{breadcrumbs.map((crumb, index) => (
|
|
<React.Fragment key={crumb.path}>
|
|
<ChevronRight size={12} className="shrink-0 opacity-50" />
|
|
<button
|
|
type="button"
|
|
onClick={() => setCurrentPath(crumb.path)}
|
|
className={cn(
|
|
'hover:underline',
|
|
index === breadcrumbs.length - 1
|
|
? 'text-foreground font-medium'
|
|
: 'text-primary',
|
|
)}
|
|
>
|
|
{crumb.name}
|
|
</button>
|
|
</React.Fragment>
|
|
))}
|
|
</div>
|
|
) : null}
|
|
|
|
{groupsWithCounts.length > 0 ? (
|
|
<div>
|
|
<h4 className="text-xs font-semibold mb-2 text-muted-foreground">{t('vault.groups.title')}</h4>
|
|
<div className="space-y-1">
|
|
{groupsWithCounts.map((group) => (
|
|
<div
|
|
key={group.path}
|
|
className="flex items-center gap-2.5 px-2.5 py-2 rounded-lg hover:bg-muted/70 cursor-pointer transition-colors"
|
|
onClick={() => setCurrentPath(group.path)}
|
|
>
|
|
<div className="h-8 w-8 rounded-lg bg-primary/15 text-primary flex items-center justify-center shrink-0">
|
|
<LayoutGrid size={15} />
|
|
</div>
|
|
<div className="flex-1 min-w-0">
|
|
<div className="text-[13px] font-medium truncate">{group.name}</div>
|
|
<div className="text-[11px] text-muted-foreground">
|
|
{t('vault.groups.hostsCount', { count: group.count })}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
))}
|
|
</div>
|
|
</div>
|
|
) : null}
|
|
|
|
{filteredHosts.length > 0 ? (
|
|
<div>
|
|
<h4 className="text-xs font-semibold mb-2 text-muted-foreground">{t('vault.nav.hosts')}</h4>
|
|
<div className="space-y-1">
|
|
{filteredHosts.map((host) => {
|
|
const isSelected = selectedHostIdSet.has(host.id);
|
|
const connectionStr = `${host.username}@${host.hostname}:${host.port || 22}`;
|
|
|
|
return (
|
|
<div
|
|
key={host.id}
|
|
className={cn(
|
|
'flex items-center gap-2.5 px-2.5 py-2 rounded-lg cursor-pointer transition-colors',
|
|
isSelected ? 'bg-muted' : 'hover:bg-muted/70',
|
|
)}
|
|
onClick={() => onSelect(host)}
|
|
>
|
|
<DistroAvatar
|
|
host={host}
|
|
fallback={host.os[0].toUpperCase()}
|
|
size="md"
|
|
/>
|
|
<div className="flex-1 min-w-0">
|
|
<Tooltip>
|
|
<TooltipTrigger asChild>
|
|
<div className="text-[13px] font-medium truncate">{host.label}</div>
|
|
</TooltipTrigger>
|
|
<TooltipContent side="top" align="start">
|
|
<p>{host.label}</p>
|
|
</TooltipContent>
|
|
</Tooltip>
|
|
<Tooltip>
|
|
<TooltipTrigger asChild>
|
|
<div className="text-[11px] text-muted-foreground truncate">{connectionStr}</div>
|
|
</TooltipTrigger>
|
|
<TooltipContent side="top" align="start">
|
|
<p>{connectionStr}</p>
|
|
</TooltipContent>
|
|
</Tooltip>
|
|
</div>
|
|
{isSelected ? <Check size={14} className="text-primary shrink-0" /> : null}
|
|
</div>
|
|
);
|
|
})}
|
|
</div>
|
|
</div>
|
|
) : null}
|
|
|
|
{groupsWithCounts.length === 0 && filteredHosts.length === 0 ? (
|
|
<div className="text-center py-12 text-muted-foreground">
|
|
<p>{t('selectHost.noHostsFound')}</p>
|
|
</div>
|
|
) : null}
|
|
</div>
|
|
</ScrollArea>
|
|
|
|
<div className="px-4 py-3 border-t border-border/60 shrink-0">
|
|
<Button
|
|
className="w-full"
|
|
disabled={selectedHostIds.length === 0}
|
|
onClick={onConfirm}
|
|
>
|
|
{multiSelect
|
|
? t('selectHost.continueWithCount', { count: selectedHostIds.length })
|
|
: t('selectHost.continue')}
|
|
</Button>
|
|
</div>
|
|
|
|
{showNewHostPanel && onSaveHost ? (
|
|
<HostDetailsPanel
|
|
initialData={null}
|
|
availableKeys={availableKeys}
|
|
identities={identities}
|
|
proxyProfiles={proxyProfiles}
|
|
groups={customGroups}
|
|
managedSources={managedSources}
|
|
allHosts={hosts}
|
|
onSave={(host) => {
|
|
onSaveHost(host);
|
|
setShowNewHostPanel(false);
|
|
}}
|
|
onCancel={() => setShowNewHostPanel(false)}
|
|
onCreateGroup={onCreateGroup}
|
|
/>
|
|
) : null}
|
|
</div>
|
|
</TooltipProvider>
|
|
);
|
|
};
|