feat: pick target terminals for snippets again

This commit is contained in:
LukeGus committed 2026-09-30 14:12:52 -05:00
1 parent 80f089268a
commit f2c9358ecf
4 files changed
+213 -2

No files matched your search

+5 -1
View File
@@ -227,5 +227,9 @@
"failed": "{{name}} failed",
"error": "Failed to execute {{name}}"
},
"paletteHintPaste": "Paste in the active terminal tab"
"paletteHintPaste": "Paste in the active terminal tab",
"targetTerminals": "Run in",
"targetTerminalsHint": "optional, else the active tab",
"selectAll": "All",
"selectNone": "None"
}
@@ -33,6 +33,11 @@ import {
} from "@termix/plugin-sdk/ui";
import { createSnippetsApi } from "./snippets-api";
import { useSnippetRunner, type TargetHost } from "./use-snippet-runner";
import {
TargetTerminals,
toRunTargets,
useOpenTerminals,
} from "./TargetTerminals";
import { SnippetShareView, type ShareTarget } from "./SnippetShareView";
import { SnippetEditor, type SnippetFormValues } from "./SnippetEditor";
import { SnippetSettings } from "./SnippetSettings";
@@ -83,10 +88,22 @@ export function SnippetsPanel({ active: _active }: PanelProps) {
const settings = useSettings("user");
const display = readSnippetSettings(settings.values);
const {
runSnippet,
runOnActive,
runOnHosts,
dialog: runnerDialog,
} = useSnippetRunner(display.confirmExecution);
const openTerminals = useOpenTerminals();
const [selectedTerminals, setSelectedTerminals] = useState<Set<string>>(
() => new Set(),
);
useEffect(() => {
setSelectedTerminals((prev) => {
const open = new Set(openTerminals.map((terminal) => terminal.id));
const next = new Set([...prev].filter((id) => open.has(id)));
return next.size === prev.size ? prev : next;
});
}, [openTerminals]);
const { hosts } = useHosts();
const { confirmWithToast } = useConfirmation();
@@ -254,7 +271,9 @@ export function SnippetsPanel({ active: _active }: PanelProps) {
function handleRun(snippet: Snippet) {
const targets = targetHostsOf(snippet);
if (targets.length > 0) runOnHosts(snippet, targets);
const terminalTargets = toRunTargets(openTerminals, selectedTerminals);
if (targets.length > 0 && !snippet.isNote) runOnHosts(snippet, targets);
else if (terminalTargets.length > 0) runSnippet(snippet, terminalTargets);
else runOnActive(snippet, null);
}
@@ -576,6 +595,12 @@ export function SnippetsPanel({ active: _active }: PanelProps) {
)}
</div>
<TargetTerminals
terminals={openTerminals}
selected={selectedTerminals}
onChange={setSelectedTerminals}
/>
<input
ref={fileInputRef}
type="file"
@@ -0,0 +1,148 @@
import { useEffect, useState } from "react";
import { Terminal } from "lucide-react";
import { invokeAction, useTranslation } from "@termix/plugin-sdk/frontend";
import type { RunTarget } from "./use-snippet-runner";
export interface OpenTerminal {
id: string;
label?: string;
hostName?: string;
ip?: string;
username?: string;
port?: number;
}
const POLL_MS = 1500;
/** The open terminal sessions, refreshed while the panel is on screen. */
export function useOpenTerminals(): OpenTerminal[] {
const [terminals, setTerminals] = useState<OpenTerminal[]>([]);
useEffect(() => {
let cancelled = false;
const load = () => {
void invokeAction("terminal.listSessions")
.then((result) => {
if (cancelled) return;
const next = Array.isArray(result) ? (result as OpenTerminal[]) : [];
setTerminals((prev) =>
prev.length === next.length &&
prev.every(
(item, i) =>
item.id === next[i].id && item.label === next[i].label,
)
? prev
: next,
);
})
.catch(() => {
if (!cancelled) setTerminals([]);
});
};
load();
const timer = setInterval(load, POLL_MS);
return () => {
cancelled = true;
clearInterval(timer);
};
}, []);
return terminals;
}
export function toRunTargets(
terminals: OpenTerminal[],
selected: Set<string>,
): RunTarget[] {
return terminals
.filter((terminal) => selected.has(terminal.id))
.map((terminal) => ({
sessionId: terminal.id,
host: {
name: terminal.hostName,
ip: terminal.ip,
username: terminal.username,
port: terminal.port,
},
}));
}
/** Pick terminals to run in; with none picked a snippet runs in the active one. */
export function TargetTerminals({
terminals,
selected,
onChange,
}: {
terminals: OpenTerminal[];
selected: Set<string>;
onChange: (next: Set<string>) => void;
}) {
const { t } = useTranslation();
if (terminals.length < 2) return null;
const toggle = (id: string) => {
const next = new Set(selected);
if (next.has(id)) next.delete(id);
else next.add(id);
onChange(next);
};
return (
<div className="flex flex-col gap-1">
<div className="flex items-center justify-between px-0.5">
<span className="text-[10px] font-semibold uppercase tracking-wider text-muted-foreground">
{t("targetTerminals")}{" "}
<span className="font-normal normal-case tracking-normal text-muted-foreground/60">
({t("targetTerminalsHint")})
</span>
</span>
<div className="flex items-center gap-2">
<button
type="button"
onClick={() => onChange(new Set(terminals.map((item) => item.id)))}
className="text-[10px] text-accent-brand hover:text-accent-brand/70"
>
{t("selectAll")}
</button>
<button
type="button"
onClick={() => onChange(new Set())}
className="text-[10px] text-accent-brand hover:text-accent-brand/70"
>
{t("selectNone")}
</button>
</div>
</div>
<div className="flex flex-col gap-0.5 max-h-32 overflow-y-auto thin-scrollbar">
{terminals.map((terminal) => {
const isSelected = selected.has(terminal.id);
return (
<button
type="button"
key={terminal.id}
aria-pressed={isSelected}
onClick={() => toggle(terminal.id)}
className={`flex items-center gap-2 px-2 py-1 border text-left transition-colors ${
isSelected
? "border-accent-brand/40 bg-accent-brand/10 text-accent-brand"
: "border-border text-muted-foreground hover:text-foreground"
}`}
>
<span
className={`size-3 border-2 flex items-center justify-center shrink-0 ${
isSelected
? "border-accent-brand bg-accent-brand"
: "border-border/60"
}`}
>
{isSelected && <span className="size-1.5 bg-background" />}
</span>
<Terminal className="size-3 shrink-0 opacity-60" />
<span className="text-xs truncate flex-1">
{terminal.label || terminal.hostName || terminal.id}
</span>
</button>
);
})}
</div>
</div>
);
}
@@ -210,3 +210,37 @@ describe("snippets panel", () => {
);
});
});
describe("snippet target terminals", () => {
it("runs a snippet in every picked terminal", async () => {
const sent: Array<[string, string]> = [];
rendered = await renderWithApp(plugin, {
manifest,
locales,
api: fakeApi([snippet({})]),
permissions: PERMISSIONS,
hosts: HOSTS as never,
});
rendered.app.registerAction("terminal.listSessions", () => [
{ id: "s1", label: "web-1", hostName: "web-1" },
{ id: "s2", label: "web-2", hostName: "web-2" },
]);
rendered.app.registerAction("terminal.sendToSession", ((
id: string,
text: string,
) => {
sent.push([id, text]);
return true;
}) as never);
rendered.renderPanel("snippets", { active: true });
fireEvent.click(await screen.findByText(locales.selectAll));
fireEvent.click(screen.getAllByTitle(locales.run)[0]);
await waitFor(() =>
expect(sent).toEqual([
["s1", "ls -la"],
["s2", "ls -la"],
]),
);
});
});