@linxin666/dsh-ssh 0.4.4 → 0.4.6

package/src/tools.ts

@@ -91,8 +91,7 @@ function renderTunnel(tunnel: TunnelInfo): string {
 export function sshListTool(engine: SshEngine) {
   return defineTool({
     name: 'ssh_list',
-    description: 'List configured SSH hosts (alias, host, user, auth, environment, tags, description). Use ssh_exec etc. with the alias. ' +
-      'Triggers: SSH, remote server, server IP/hostname, connect/login, check server/status, deploy, upload/download, jump host, tunnel, port forward.',
+    description: 'List configured SSH hosts (alias, host, user, auth, environment, tags, description). Use ssh_exec etc. with the alias.',
     parameters: {
       query: { type: 'string', description: 'Optional fuzzy match against alias, description, host, and tags.' },
     },
@@ -129,6 +128,8 @@ export function sshListTool(engine: SshEngine) {
       },
       render: (_args, value: { hosts?: AgentHostRow[] }) => text(renderHosts(value.hosts ?? [])),
     },
+    // Reads the local host registry only: safe to overlap with sibling calls.
+    isConcurrencySafe: () => true,
     async execute(args) {
       return { hosts: engine.list(args.query).map(toAgentHostRow) }
     },
@@ -139,8 +140,7 @@ export function sshListTool(engine: SshEngine) {
 export function sshExecTool(engine: SshEngine) {
   return defineTool({
     name: 'ssh_exec',
-    description: 'Execute a shell command on a REMOTE SSH host by alias; the command runs on the remote host, never on this machine. For commands on this machine, use the local bash tool. Prefer combining independent read-only queries into one command. ' +
-      'Triggers: run command on server, deploy, check server/status, service control, view logs, any remote operation.',
+    description: 'Execute a shell command on a REMOTE SSH host by alias; the command runs on the remote host, never on this machine. For commands on this machine, use the local bash tool. Prefer combining independent read-only queries into one command.',
     parameters: {
       alias: { type: 'string', required: true, description: 'Host alias from ssh_list.' },
       command: { type: 'string', required: true, description: 'The shell command to run remotely.' },
@@ -162,9 +162,11 @@ export function sshExecTool(engine: SshEngine) {
       },
       render: (_args, value: ExecResult) => text(renderExec(value)),
     },
-    async execute(args) {
+    async execute(args, exec) {
       try {
-        return await engine.exec(args.alias, args.command, args.timeoutMs)
+        // Forward the caller's cancellation: aborting closes the remote channel
+        // instead of leaving the command running on the host.
+        return await engine.exec(args.alias, args.command, args.timeoutMs, exec.signal)
       } catch (error) {
         return {
           success: false,
@@ -184,8 +186,7 @@ export function sshExecTool(engine: SshEngine) {
 export function sshUploadTool(engine: SshEngine) {
   return defineTool({
     name: 'ssh_upload',
-    description: 'Transfer a file FROM this machine (the dsh host) TO a remote SSH host. Use this only when the file must be copied to the remote host. Files that stay on this machine are handled with the local file tools (read / write / edit), not ssh_upload. ' +
-      'Triggers: upload file to server, deploy artifact, copy config to server.',
+    description: 'Transfer a file FROM this machine (the dsh host) TO a remote SSH host. Use this only when the file must be copied to the remote host. Files that stay on this machine are handled with the local file tools (read / write / edit), not ssh_upload.',
     parameters: {
       alias: { type: 'string', required: true, description: 'Host alias from ssh_list.' },
       localPath: { type: 'string', required: true, description: 'Absolute path of the source file on THIS machine (the dsh host) — not a path on the remote host.' },
@@ -221,8 +222,7 @@ export function sshUploadTool(engine: SshEngine) {
 export function sshDownloadTool(engine: SshEngine) {
   return defineTool({
     name: 'ssh_download',
-    description: 'Copy a remote FILE from a configured SSH host to this machine (the dsh host). Use this only when the source is on the remote host; files already on this machine are read with the local file tools (read / write / edit), not ssh_download. Directory download is not supported — download files individually. ' +
-      'Triggers: download file from server, fetch remote log/artifact.',
+    description: 'Copy a remote FILE from a configured SSH host to this machine (the dsh host). Use this only when the source is on the remote host; files already on this machine are read with the local file tools (read / write / edit), not ssh_download. Directory download is not supported — download files individually.',
     parameters: {
       alias: { type: 'string', required: true, description: 'Host alias from ssh_list.' },
       remotePath: { type: 'string', required: true, description: 'Absolute path of the source file on the remote SSH host.' },
@@ -257,8 +257,7 @@ export function sshDownloadTool(engine: SshEngine) {
 export function sshTunnelTool(engine: SshEngine) {
   return defineTool({
     name: 'ssh_tunnel',
-    description: 'Manage local port-forward tunnels to a configured SSH host. Start a tunnel to reach a remote internal service (database, web UI, API) through 127.0.0.1 on this machine. ' +
-      'Triggers: tunnel, port forward, connect database, access internal service.',
+    description: 'Manage local port-forward tunnels to a configured SSH host. Start a tunnel to reach a remote internal service (database, web UI, API) through 127.0.0.1 on this machine.',
     parameters: {
       action: { type: 'string', required: true, enum: ['start', 'list', 'stop', 'stop-all'], description: 'start / list / stop / stop-all.' },
       alias: { type: 'string', description: 'Host alias (required for start, optional for stop-all).' },
@@ -357,8 +356,7 @@ export function sshTunnelTool(engine: SshEngine) {
 export function sshClusterTool(engine: SshEngine) {
   return defineTool({
     name: 'ssh_cluster',
-    description: 'Run one command concurrently across selected SSH hosts; at least one aliases, environment, or tags filter is required. ' +
-      'Triggers: run on selected servers, batch operation, production servers, cluster command.',
+    description: 'Run one command concurrently across selected SSH hosts; at least one aliases, environment, or tags filter is required.',
     parameters: {
       command: { type: 'string', required: true, description: 'The shell command to run on every matched host.' },
       aliases: { type: 'array', items: { type: 'string' }, description: 'Optional alias filter; at least one of aliases, environment, or tags is required.' },
@@ -394,12 +392,13 @@ export function sshClusterTool(engine: SshEngine) {
       },
       render: (_args, value: { results?: ClusterResult[] }) => text(renderCluster(value.results ?? [])),
     },
-    async execute(args) {
+    async execute(args, exec) {
       const hasSelector = (Array.isArray(args.aliases) && args.aliases.some((alias) => typeof alias === 'string' && alias.trim() !== '')) ||
         (typeof args.environment === 'string' && args.environment.trim() !== '') ||
         (Array.isArray(args.tags) && args.tags.some((tag) => typeof tag === 'string' && tag.trim() !== ''))
       if (!hasSelector) throw new Error('ssh_cluster requires aliases, environment, or tags to limit the target set')
-      return { results: await engine.cluster(args) }
+      // Cancellation reaches every host's in-flight command.
+      return { results: await engine.cluster({ ...args, signal: exec.signal }) }
     },
   })
 }

package/lib/invariant.js

@@ -1,6 +0,0 @@
-//#region src/invariant.ts
-/** Invariant companion plugin (no assertions — nothing to check at runtime). */
-/** Provides no assertions: the ssh plugin owns no cross-package runtime invariants. */
-function apply() {}
-//#endregion
-export { apply };

package/lib/types/invariant.d.ts

@@ -1,3 +0,0 @@
-/** Invariant companion plugin (no assertions — nothing to check at runtime). */
-/** Provides no assertions: the ssh plugin owns no cross-package runtime invariants. */
-export declare function apply(): void;

package/src/invariant.ts

@@ -1,4 +0,0 @@
-/** Invariant companion plugin (no assertions — nothing to check at runtime). */
-
-/** Provides no assertions: the ssh plugin owns no cross-package runtime invariants. */
-export function apply(): void {}