@akms/mcp-ssh 0.1.8 → 0.2.0

package/lib/index.cjs

@@ -8,7 +8,6 @@ var child_process = require('child_process');
 var crypto = require('crypto');
 var stream = require('stream');
 var string_decoder = require('string_decoder');
-var ssh2 = require('ssh2');
 var timers = require('timers');
 var zod = require('zod');
 
@@ -17,7 +16,6 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 var fs2__default = /*#__PURE__*/_interopDefault(fs2);
 var os__default = /*#__PURE__*/_interopDefault(os);
 var path2__default = /*#__PURE__*/_interopDefault(path2);
-var ssh2__default = /*#__PURE__*/_interopDefault(ssh2);
 
 // src/server.ts
 
@@ -34,7 +32,7 @@ var SESSION_SWEEP_INTERVAL_MS = 6e4;
 var CWD_MARKER = "__AKMS_SSH_CWD__";
 var MAX_DIRECTORY_ENTRIES = 1e3;
 var SERVER_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(
@@ -1340,7 +1338,6 @@ var GuardRejectionError = class extends Error {
 };
 
 // src/modules/ssh/ssh-connection.ts
-var { Client } = ssh2__default.default;
 var OUTPUT_HARD_CAP_MULTIPLIER = 4;
 var PRIVATE_KEY_CACHE = /* @__PURE__ */ new Map();
 var WINDOWS_AGENT_PIPE = "\\\\.\\pipe\\openssh-ssh-agent";
@@ -1482,7 +1479,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 });
@@ -1547,7 +1544,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);
@@ -1556,7 +1553,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();
@@ -1620,6 +1617,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.
    *
@@ -1630,9 +1632,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;
     }
@@ -1651,12 +1651,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`);