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>
219 lines
7.4 KiB
TypeScript
219 lines
7.4 KiB
TypeScript
import type { Host, Snippet } from './models';
|
|
import { isScriptSnippet } from './snippetScript.ts';
|
|
import {
|
|
getScriptsLinkedToHost,
|
|
linkHostToScript,
|
|
snippetAppliesToHost,
|
|
} from './snippetTargets.ts';
|
|
import { sortByVaultOrder } from './vaultOrder.ts';
|
|
|
|
function isOnConnectScript(snippet: Snippet): boolean {
|
|
return isScriptSnippet(snippet) && snippet.trigger === 'onConnect' && Boolean(snippet.id);
|
|
}
|
|
|
|
function scriptById(snippets: Snippet[], scriptId: string): Snippet | undefined {
|
|
return snippets.find((snippet) => snippet.id === scriptId && isScriptSnippet(snippet));
|
|
}
|
|
|
|
function pruneConnectScriptIds(ids: string[], snippets: Snippet[]): string[] {
|
|
const seen = new Set<string>();
|
|
const result: string[] = [];
|
|
for (const id of ids) {
|
|
if (!id || seen.has(id)) continue;
|
|
const snippet = scriptById(snippets, id);
|
|
if (!snippet || !isOnConnectScript(snippet)) continue;
|
|
seen.add(id);
|
|
result.push(id);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/** Global onConnect scripts (targetsAllHosts), sorted by vault order. */
|
|
export function getGlobalConnectScripts(snippets: Snippet[]): Snippet[] {
|
|
return sortByVaultOrder(
|
|
snippets.filter(
|
|
(snippet) => isOnConnectScript(snippet) && Boolean(snippet.targetsAllHosts),
|
|
),
|
|
);
|
|
}
|
|
|
|
/** Derive initial connectScriptIds from legacy host + snippet bindings. */
|
|
export function migrateHostConnectScriptIds(host: Host, snippets: Snippet[]): string[] {
|
|
const ordered: string[] = [];
|
|
const seen = new Set<string>();
|
|
|
|
const push = (scriptId?: string) => {
|
|
if (!scriptId || seen.has(scriptId)) return;
|
|
const snippet = scriptById(snippets, scriptId);
|
|
if (!snippet || !isOnConnectScript(snippet)) return;
|
|
if (!snippetAppliesToHost(snippet, host.id) && !snippet.targetsAllHosts) return;
|
|
seen.add(scriptId);
|
|
ordered.push(scriptId);
|
|
};
|
|
|
|
push(host.loginScriptId);
|
|
|
|
for (const snippet of getScriptsLinkedToHost(snippets, host.id)) {
|
|
if (snippet.trigger === 'onConnect') {
|
|
push(snippet.id);
|
|
}
|
|
}
|
|
|
|
for (const snippet of sortByVaultOrder(snippets)) {
|
|
if (!isOnConnectScript(snippet)) continue;
|
|
if (snippet.targetsAllHosts) continue;
|
|
if (!snippetAppliesToHost(snippet, host.id)) continue;
|
|
push(snippet.id);
|
|
}
|
|
|
|
return ordered;
|
|
}
|
|
|
|
/** Effective ordered script IDs for a host (lazy migrate + prune). */
|
|
export function getHostConnectScriptIds(host: Host, snippets: Snippet[]): string[] {
|
|
if (host.connectScriptIds !== undefined) {
|
|
return pruneConnectScriptIds(host.connectScriptIds, snippets);
|
|
}
|
|
return migrateHostConnectScriptIds(host, snippets);
|
|
}
|
|
|
|
export function ensureHostConnectScriptIds(host: Host, snippets: Snippet[]): Host {
|
|
if (host.connectScriptIds !== undefined) {
|
|
const pruned = pruneConnectScriptIds(host.connectScriptIds, snippets);
|
|
if (pruned.length === host.connectScriptIds.length
|
|
&& pruned.every((id, index) => id === host.connectScriptIds![index])) {
|
|
return host;
|
|
}
|
|
return { ...host, connectScriptIds: pruned };
|
|
}
|
|
const migrated = migrateHostConnectScriptIds(host, snippets);
|
|
return migrated.length > 0 ? { ...host, connectScriptIds: migrated } : host;
|
|
}
|
|
|
|
/** True when host references connect scripts that are not present in snippets yet. */
|
|
export function hasUnresolvedConnectScriptBindings(host: Host, snippets: Snippet[]): boolean {
|
|
const candidateIds = new Set<string>();
|
|
if (host.loginScriptId) candidateIds.add(host.loginScriptId);
|
|
for (const id of host.connectScriptIds ?? []) {
|
|
if (id) candidateIds.add(id);
|
|
}
|
|
for (const id of candidateIds) {
|
|
if (!snippets.some((snippet) => snippet.id === id)) {
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/** Resolve full onConnect run list: global scripts first, then host queue; dedupe favors host queue. */
|
|
export function resolveConnectScriptsForHost(host: Host, snippets: Snippet[]): Snippet[] {
|
|
const hostIds = getHostConnectScriptIds(host, snippets);
|
|
const hostIdSet = new Set(hostIds);
|
|
const globals = getGlobalConnectScripts(snippets).filter(
|
|
(snippet) => snippet.id && !hostIdSet.has(snippet.id),
|
|
);
|
|
const hostScripts = hostIds
|
|
.map((id) => scriptById(snippets, id))
|
|
.filter((snippet): snippet is Snippet => Boolean(snippet));
|
|
return [...globals, ...hostScripts];
|
|
}
|
|
|
|
export function appendHostConnectScript(host: Host, scriptId: string, snippets: Snippet[]): Host {
|
|
const snippet = scriptById(snippets, scriptId);
|
|
if (!snippet) return host;
|
|
const current = getHostConnectScriptIds(host, snippets);
|
|
if (current.includes(scriptId)) {
|
|
return { ...host, connectScriptIds: current };
|
|
}
|
|
return { ...host, connectScriptIds: [...current, scriptId] };
|
|
}
|
|
|
|
export function removeHostConnectScript(host: Host, scriptId: string, snippets: Snippet[]): Host {
|
|
const current = getHostConnectScriptIds(host, snippets);
|
|
const next = current.filter((id) => id !== scriptId);
|
|
return { ...host, connectScriptIds: next };
|
|
}
|
|
|
|
export function moveHostConnectScript(
|
|
host: Host,
|
|
scriptId: string,
|
|
direction: 'up' | 'down',
|
|
snippets: Snippet[],
|
|
): Host {
|
|
const current = [...getHostConnectScriptIds(host, snippets)];
|
|
const index = current.indexOf(scriptId);
|
|
if (index === -1) return host;
|
|
const targetIndex = direction === 'up' ? index - 1 : index + 1;
|
|
if (targetIndex < 0 || targetIndex >= current.length) return host;
|
|
[current[index], current[targetIndex]] = [current[targetIndex], current[index]];
|
|
return { ...host, connectScriptIds: current };
|
|
}
|
|
|
|
export function reorderHostConnectScript(
|
|
host: Host,
|
|
draggedScriptId: string,
|
|
targetScriptId: string,
|
|
position: 'before' | 'after',
|
|
snippets: Snippet[],
|
|
): Host {
|
|
if (draggedScriptId === targetScriptId) return host;
|
|
const current = [...getHostConnectScriptIds(host, snippets)];
|
|
const fromIndex = current.indexOf(draggedScriptId);
|
|
const targetIndex = current.indexOf(targetScriptId);
|
|
if (fromIndex === -1 || targetIndex === -1) return host;
|
|
|
|
current.splice(fromIndex, 1);
|
|
let insertIndex = current.indexOf(targetScriptId);
|
|
if (insertIndex === -1) return host;
|
|
if (position === 'after') insertIndex += 1;
|
|
current.splice(insertIndex, 0, draggedScriptId);
|
|
return { ...host, connectScriptIds: current };
|
|
}
|
|
|
|
export function prepareSnippetForHostConnectQueue(snippet: Snippet, hostId: string): Snippet {
|
|
if (!isScriptSnippet(snippet)) return snippet;
|
|
return {
|
|
...linkHostToScript(snippet, hostId),
|
|
trigger: 'onConnect',
|
|
};
|
|
}
|
|
|
|
export function syncHostsForSnippetTargetChange(
|
|
hosts: Host[],
|
|
snippet: Snippet,
|
|
prevTargetIds: string[] | undefined,
|
|
snippets: Snippet[],
|
|
): Host[] {
|
|
if (!isScriptSnippet(snippet) || snippet.trigger !== 'onConnect' || !snippet.id) {
|
|
return hosts;
|
|
}
|
|
if (snippet.targetsAllHosts) {
|
|
return hosts.map((host) => removeHostConnectScript(host, snippet.id!, snippets));
|
|
}
|
|
|
|
const prev = new Set(prevTargetIds ?? []);
|
|
const next = new Set(snippet.targets ?? []);
|
|
const added = [...next].filter((id) => !prev.has(id));
|
|
const removed = [...prev].filter((id) => !next.has(id));
|
|
if (added.length === 0 && removed.length === 0) return hosts;
|
|
|
|
return hosts.map((host) => {
|
|
let updated = host;
|
|
if (added.includes(host.id)) {
|
|
updated = appendHostConnectScript(updated, snippet.id!, snippets);
|
|
}
|
|
if (removed.includes(host.id)) {
|
|
updated = removeHostConnectScript(updated, snippet.id!, snippets);
|
|
}
|
|
return updated;
|
|
});
|
|
}
|
|
|
|
export function connectScriptsForHostFromSnippets(
|
|
hostId: string,
|
|
snippets: Snippet[],
|
|
): Snippet[] {
|
|
const host = { id: hostId } as Host;
|
|
return resolveConnectScriptsForHost(host, snippets);
|
|
}
|