@wrongstack/acp 0.296.4 → 0.297.0

package/dist/index.js

@@ -916,6 +916,14 @@ var ClientTransport = class {
     ]);
     return new Promise((resolve3, reject) => {
       const timeout = setTimeout(() => {
+        const child2 = this.child;
+        this.child = null;
+        if (child2) {
+          try {
+            treeKill(child2);
+          } catch {
+          }
+        }
         reject(
           new Error(`ACP child process failed to start within ${this.opts.handshakeTimeoutMs}ms`)
         );
@@ -2014,7 +2022,12 @@ var WebSocketClientTransport = class {
     this.maxBufferedBytes = finitePositiveLimit(opts.maxBufferedBytes, 32 * 1024 * 1024);
     this.maxMessageChars = finitePositiveLimit(opts.maxMessageChars, 20 * 1024 * 1024);
   }
+  /** Pending start() promise resolve/reject — settled in stop() to avoid leaking. */
+  pendingStart = null;
   start() {
+    if (this.closed || this.ws !== null || this.pendingStart !== null) {
+      return Promise.reject(new Error("WebSocket transport has already been started or stopped"));
+    }
     const WS = globalThis.WebSocket;
     if (!WS) {
       return Promise.reject(
@@ -2025,35 +2038,45 @@ var WebSocketClientTransport = class {
     }
     const timeoutMs = this.opts.handshakeTimeoutMs ?? 3e4;
     return new Promise((resolve3, reject) => {
-      let settled = false;
       const ws = new WS(this.opts.url, this.opts.protocols);
       this.ws = ws;
       const timer = setTimeout(() => {
-        settled = true;
+        const pending = this.pendingStart;
+        if (pending === null) return;
+        this.pendingStart = null;
         try {
           ws.close();
         } catch {
         }
-        reject(new Error(`WebSocket failed to open within ${timeoutMs}ms`));
+        pending.reject(new Error(`WebSocket failed to open within ${timeoutMs}ms`));
       }, timeoutMs);
+      this.pendingStart = { resolve: resolve3, reject, timer };
       ws.addEventListener("open", () => {
-        if (settled) return;
-        settled = true;
-        clearTimeout(timer);
-        resolve3();
+        const pending = this.pendingStart;
+        if (pending === null) return;
+        this.pendingStart = null;
+        clearTimeout(pending.timer);
+        pending.resolve();
       });
       ws.addEventListener("error", (ev) => {
-        if (settled) {
+        const pending = this.pendingStart;
+        if (pending === null) {
           this.closed = true;
           return;
         }
-        settled = true;
-        clearTimeout(timer);
+        this.pendingStart = null;
+        clearTimeout(pending.timer);
         const message = ev && typeof ev === "object" && "message" in ev ? String(ev.message) : "WebSocket error";
-        reject(new Error(message));
+        pending.reject(new Error(message));
       });
       ws.addEventListener("close", () => {
         this.closed = true;
+        const pending = this.pendingStart;
+        if (pending !== null) {
+          this.pendingStart = null;
+          clearTimeout(pending.timer);
+          pending.reject(new Error("WebSocket closed before the connection opened"));
+        }
       });
       ws.addEventListener("message", (ev) => {
         this.onData(ev.data);
@@ -2083,6 +2106,15 @@ var WebSocketClientTransport = class {
   }
   stop() {
     this.closed = true;
+    if (this.pendingStart !== null) {
+      const pending = this.pendingStart;
+      this.pendingStart = null;
+      clearTimeout(pending.timer);
+      try {
+        pending.reject(new Error("WebSocket transport stopped while connecting"));
+      } catch {
+      }
+    }
     if (this.ws) {
       try {
         this.ws.close();
@@ -2495,7 +2527,15 @@ var ACPSession = class _ACPSession {
     if (opts.env !== void 0) transportOpts.env = opts.env;
     if (opts.cwd !== void 0) transportOpts.cwd = opts.cwd;
     const transport = new ClientTransport(transportOpts);
-    return _ACPSession.attach(opts, transport, `failed to spawn ${opts.command}`);
+    try {
+      return await _ACPSession.attach(opts, transport, `failed to spawn ${opts.command}`);
+    } catch (err) {
+      try {
+        transport.stop();
+      } catch {
+      }
+      throw err;
+    }
   }
   /**
    * Connect to a REMOTE ACP agent over a WebSocket instead of spawning a