@akms/mcp-ssh 0.1.8 → 0.2.0

package/lib/cli.js

@@ -7,7 +7,6 @@ import { spawnSync, spawn } from 'child_process';
 import { randomUUID, createHash } from 'crypto';
 import { Duplex } from 'stream';
 import { StringDecoder } from 'string_decoder';
-import ssh2 from 'ssh2';
 import { setInterval as setInterval$1, clearInterval as clearInterval$1 } from 'timers';
 import { isDeepStrictEqual } from 'util';
 import { parse, TomlError } from 'smol-toml';
@@ -29,7 +28,7 @@ var CWD_MARKER = "__AKMS_SSH_CWD__";
 var MAX_DIRECTORY_ENTRIES = 1e3;
 var SERVER_NAME = "akms-mcp-ssh";
 var PACKAGE_NAME = "@akms/mcp-ssh";
-var SERVER_VERSION = "0.1.8";
+var SERVER_VERSION = "0.2.0";
 
 // src/_defs/command-rules.ts
 var CRITICAL_PATH_PATTERN = new RegExp(
@@ -1353,7 +1352,6 @@ var GuardRejectionError = class extends Error {
 };
 
 // src/modules/ssh/ssh-connection.ts
-var { Client } = ssh2;
 var OUTPUT_HARD_CAP_MULTIPLIER = 4;
 var PRIVATE_KEY_CACHE = /* @__PURE__ */ new Map();
 var WINDOWS_AGENT_PIPE = "\\\\.\\pipe\\openssh-ssh-agent";
@@ -1495,7 +1493,7 @@ function openProxyCommand(profile, hop) {
     }
   };
 }
-function openJumpTransport(profile, jump, proxy, onHostKeySeen) {
+function openJumpTransport(profile, jump, proxy, onHostKeySeen, Client) {
   const label = `${profile.name} jump host`;
   const endpoint = `${jump.username}@${jump.host}:${jump.port}`;
   const _logger = $logger.child({ context: "openJumpTransport", profile: profile.name, jump_host: jump.host });
@@ -1560,7 +1558,7 @@ function openJumpTransport(profile, jump, proxy, onHostKeySeen) {
     jumpClient.connect(jumpConfig);
   });
 }
-async function openTransport(profile, onJumpHostKeySeen) {
+async function openTransport(profile, onJumpHostKeySeen, Client) {
   let proxy = null;
   if (profile.proxyCommand != null) {
     proxy = openProxyCommand(profile, profile.jump ?? profile);
@@ -1569,7 +1567,7 @@ async function openTransport(profile, onJumpHostKeySeen) {
     return proxy;
   }
   try {
-    const jumpTransport = await openJumpTransport(profile, profile.jump, proxy, onJumpHostKeySeen);
+    const jumpTransport = await openJumpTransport(profile, profile.jump, proxy, onJumpHostKeySeen, Client);
     return jumpTransport;
   } catch (ex) {
     proxy?.close();
@@ -1633,6 +1631,11 @@ var SshConnection = class {
   get wasDropped() {
     return this.droppedAfterReady;
   }
+  assertNotDisposed() {
+    if (this.disposed == true) {
+      throw new Error(`ssh connection for '${this.profile.name}' has been closed; open a new session`);
+    }
+  }
   /**
    * Opens the connection, or joins the in-flight attempt when one is already running.
    *
@@ -1643,9 +1646,7 @@ var SshConnection = class {
    *                 unreachable, the handshake times out, or the carrier cannot be opened.
    */
   async connect(onProgress) {
-    if (this.disposed == true) {
-      throw new Error(`ssh connection for '${this.profile.name}' has been closed; open a new session`);
-    }
+    this.assertNotDisposed();
     if (this.client != null) {
       return;
     }
@@ -1664,12 +1665,14 @@ var SshConnection = class {
       this.observedFingerprint = fingerprint;
     });
     this.connecting = (async () => {
+      const { default: { Client } } = await import('ssh2');
+      this.assertNotDisposed();
       if (this.profile.jump != null || this.profile.proxyCommand != null) {
         onProgress?.("transport");
       }
       const transport = await openTransport(this.profile, (fingerprint) => {
         this.observedJumpFingerprint = fingerprint;
-      });
+      }, Client);
       if (this.disposed == true) {
         transport?.close();
         throw new Error(`ssh connection for '${this.profile.name}' was closed during the handshake`);