@autohq/cli 0.1.400 → 0.1.401

package/dist/agent-bridge.js

@@ -30819,7 +30819,7 @@ Object.assign(lookup, {
 // package.json
 var package_default = {
   name: "@autohq/cli",
-  version: "0.1.400",
+  version: "0.1.401",
   license: "SEE LICENSE IN README.md",
   publishConfig: {
     access: "public"
@@ -30912,6 +30912,7 @@ var AgentBridgeOutputAckTimeoutError = class extends Error {
     this.name = "AgentBridgeOutputAckTimeoutError";
   }
 };
+var AGENT_BRIDGE_TERMINAL_AUTH_DRAIN_TIMEOUT_MS = 6e4;
 async function runAgentBridgeSocket(options) {
   const socket = lookup(`${options.bridgeUrl}${RUNTIME_BRIDGE_NAMESPACE}`, {
     auth: {
@@ -30923,6 +30924,13 @@ async function runAgentBridgeSocket(options) {
   });
   let handler = null;
   const reconnectLoop = createReconnectLoop(socket);
+  const terminalAuthDrain = createTerminalAuthDrainController({
+    socket,
+    token: options.token,
+    getHandler: () => handler,
+    writeOutput: options.writeOutput,
+    runtimeLogger: options.runtimeLogger
+  });
   let hasConnected = false;
   await new Promise((resolve2, reject) => {
     const shutdown = () => {
@@ -30934,15 +30942,23 @@ async function runAgentBridgeSocket(options) {
     process.once("SIGINT", shutdown);
     process.once("SIGTERM", shutdown);
     socket.on("connect_error", (error51) => {
+      if (terminalAuthDrain.handleConnectError(error51)) {
+        return;
+      }
       if (!hasConnected) {
         reject(error51);
         return;
       }
       if (isTerminalAuthError(error51)) {
         reconnectLoop.stop();
-        handler?.shutdown?.();
-        socket.disconnect();
-        reject(new AgentBridgeTerminalAuthError(error51.message));
+        void terminalAuthDrain.begin().catch((drainError) => {
+          options.writeOutput?.(
+            `agent_bridge_terminal_auth_drain_failed error=${errorMessage(drainError)}`
+          );
+        }).finally(() => {
+          socket.disconnect();
+          reject(new AgentBridgeTerminalAuthError(error51.message));
+        });
         return;
       }
       options.writeOutput?.(
@@ -30955,6 +30971,9 @@ async function runAgentBridgeSocket(options) {
         return;
       }
       options.writeOutput?.(`agent_bridge_disconnected reason=${reason}`);
+      if (terminalAuthDrain.suppressesReconnect()) {
+        return;
+      }
       reconnectLoop.start();
     });
     socket.on(
@@ -30993,6 +31012,9 @@ async function runAgentBridgeSocket(options) {
       })
     );
     socket.on(RUNTIME_BRIDGE_CONNECTED_EVENT, (rawContext) => {
+      if (terminalAuthDrain.handleConnected(rawContext)) {
+        return;
+      }
       const context = RuntimeBridgeConnectedPayloadSchema.parse(rawContext);
       if (!handler) {
         reject(new Error("Bridge connected before bootstrap completed"));
@@ -31237,6 +31259,113 @@ function createReconnectLoop(socket) {
   };
   return { start, stop };
 }
+function createTerminalAuthDrainController(input) {
+  let terminalAuthExit = false;
+  let state = null;
+  const settle = (callback) => {
+    const current = state;
+    if (!current) {
+      return;
+    }
+    clearTimeout(current.timeout);
+    state = null;
+    callback();
+  };
+  const begin = () => {
+    terminalAuthExit = true;
+    if (state) {
+      return state.promise;
+    }
+    const handler = input.getHandler();
+    handler?.shutdown?.();
+    if (!handler) {
+      input.writeOutput?.(
+        "agent_bridge_terminal_auth_drain_skipped reason=no_handler"
+      );
+      return Promise.resolve();
+    }
+    const startedAt = Date.now();
+    let resolveDrain = () => {
+    };
+    let rejectDrain = () => {
+    };
+    const promise2 = new Promise((resolve2, reject) => {
+      resolveDrain = resolve2;
+      rejectDrain = reject;
+    });
+    const timeout = setTimeout(() => {
+      settle(() => {
+        rejectDrain(
+          new Error(
+            `Timed out draining pending bridge output after terminal auth in ${AGENT_BRIDGE_TERMINAL_AUTH_DRAIN_TIMEOUT_MS}ms`
+          )
+        );
+      });
+    }, AGENT_BRIDGE_TERMINAL_AUTH_DRAIN_TIMEOUT_MS);
+    timeout.unref?.();
+    state = {
+      promise: promise2,
+      reject: rejectDrain,
+      resolve: resolveDrain,
+      startedAt,
+      timeout
+    };
+    input.writeOutput?.("agent_bridge_terminal_auth_drain_started");
+    input.runtimeLogger?.warn("agent_bridge_terminal_auth_drain_started");
+    input.socket.auth = { token: input.token, terminalDrain: true };
+    input.socket.connect();
+    return promise2;
+  };
+  const handleConnected = (rawContext) => {
+    const current = state;
+    if (!current) {
+      return false;
+    }
+    void (async () => {
+      const context = RuntimeBridgeConnectedPayloadSchema.parse(rawContext);
+      input.writeOutput?.(
+        `agent_bridge_terminal_auth_drain_connected session_id=${context.sessionId} runtime_id=${context.runtimeId} bridge_lease_id=${context.bridgeLeaseId}`
+      );
+      input.runtimeLogger?.warn("agent_bridge_terminal_auth_drain_connected", {
+        session_id: context.sessionId,
+        runtime_id: context.runtimeId,
+        bridge_lease_id: context.bridgeLeaseId
+      });
+      const handler = input.getHandler();
+      if (!handler) {
+        throw new Error("Terminal auth drain connected without a handler");
+      }
+      await handler.replayPendingOutputs();
+      settle(() => {
+        input.writeOutput?.(
+          `agent_bridge_terminal_auth_drain_completed duration_ms=${Date.now() - current.startedAt}`
+        );
+        input.runtimeLogger?.warn(
+          "agent_bridge_terminal_auth_drain_completed",
+          { duration_ms: Date.now() - current.startedAt }
+        );
+        current.resolve();
+      });
+    })().catch((error51) => {
+      settle(() => current.reject(error51));
+    });
+    return true;
+  };
+  const handleConnectError = (error51) => {
+    const current = state;
+    if (!current) {
+      return false;
+    }
+    settle(() => current.reject(error51));
+    return true;
+  };
+  return {
+    begin,
+    handleConnected,
+    handleConnectError,
+    suppressesReconnect: () => terminalAuthExit || state !== null
+  };
+}
 function bridgeForwardingHeaders(url3) {
   if (!isNgrokFreeUrl(url3)) {
     return {};

package/dist/index.js

@@ -35072,7 +35072,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@autohq/cli",
-      version: "0.1.400",
+      version: "0.1.401",
       license: "SEE LICENSE IN README.md",
       publishConfig: {
         access: "public"
@@ -45523,6 +45523,7 @@ var AgentBridgeOutputAckTimeoutError = class extends Error {
     this.name = "AgentBridgeOutputAckTimeoutError";
   }
 };
+var AGENT_BRIDGE_TERMINAL_AUTH_DRAIN_TIMEOUT_MS = 6e4;
 async function runAgentBridgeSocket(options) {
   const socket = io(`${options.bridgeUrl}${RUNTIME_BRIDGE_NAMESPACE}`, {
     auth: {
@@ -45534,6 +45535,13 @@ async function runAgentBridgeSocket(options) {
   });
   let handler = null;
   const reconnectLoop = createReconnectLoop(socket);
+  const terminalAuthDrain = createTerminalAuthDrainController({
+    socket,
+    token: options.token,
+    getHandler: () => handler,
+    writeOutput: options.writeOutput,
+    runtimeLogger: options.runtimeLogger
+  });
   let hasConnected = false;
   await new Promise((resolve4, reject) => {
     const shutdown = () => {
@@ -45545,15 +45553,23 @@ async function runAgentBridgeSocket(options) {
     process.once("SIGINT", shutdown);
     process.once("SIGTERM", shutdown);
     socket.on("connect_error", (error51) => {
+      if (terminalAuthDrain.handleConnectError(error51)) {
+        return;
+      }
       if (!hasConnected) {
         reject(error51);
         return;
       }
       if (isTerminalAuthError(error51)) {
         reconnectLoop.stop();
-        handler?.shutdown?.();
-        socket.disconnect();
-        reject(new AgentBridgeTerminalAuthError(error51.message));
+        void terminalAuthDrain.begin().catch((drainError) => {
+          options.writeOutput?.(
+            `agent_bridge_terminal_auth_drain_failed error=${errorMessage(drainError)}`
+          );
+        }).finally(() => {
+          socket.disconnect();
+          reject(new AgentBridgeTerminalAuthError(error51.message));
+        });
         return;
       }
       options.writeOutput?.(
@@ -45566,6 +45582,9 @@ async function runAgentBridgeSocket(options) {
         return;
       }
       options.writeOutput?.(`agent_bridge_disconnected reason=${reason}`);
+      if (terminalAuthDrain.suppressesReconnect()) {
+        return;
+      }
       reconnectLoop.start();
     });
     socket.on(
@@ -45604,6 +45623,9 @@ async function runAgentBridgeSocket(options) {
       })
     );
     socket.on(RUNTIME_BRIDGE_CONNECTED_EVENT, (rawContext) => {
+      if (terminalAuthDrain.handleConnected(rawContext)) {
+        return;
+      }
       const context = RuntimeBridgeConnectedPayloadSchema.parse(rawContext);
       if (!handler) {
         reject(new Error("Bridge connected before bootstrap completed"));
@@ -45848,6 +45870,113 @@ function createReconnectLoop(socket) {
   };
   return { start, stop };
 }
+function createTerminalAuthDrainController(input) {
+  let terminalAuthExit = false;
+  let state = null;
+  const settle = (callback) => {
+    const current = state;
+    if (!current) {
+      return;
+    }
+    clearTimeout(current.timeout);
+    state = null;
+    callback();
+  };
+  const begin = () => {
+    terminalAuthExit = true;
+    if (state) {
+      return state.promise;
+    }
+    const handler = input.getHandler();
+    handler?.shutdown?.();
+    if (!handler) {
+      input.writeOutput?.(
+        "agent_bridge_terminal_auth_drain_skipped reason=no_handler"
+      );
+      return Promise.resolve();
+    }
+    const startedAt = Date.now();
+    let resolveDrain = () => {
+    };
+    let rejectDrain = () => {
+    };
+    const promise2 = new Promise((resolve4, reject) => {
+      resolveDrain = resolve4;
+      rejectDrain = reject;
+    });
+    const timeout = setTimeout(() => {
+      settle(() => {
+        rejectDrain(
+          new Error(
+            `Timed out draining pending bridge output after terminal auth in ${AGENT_BRIDGE_TERMINAL_AUTH_DRAIN_TIMEOUT_MS}ms`
+          )
+        );
+      });
+    }, AGENT_BRIDGE_TERMINAL_AUTH_DRAIN_TIMEOUT_MS);
+    timeout.unref?.();
+    state = {
+      promise: promise2,
+      reject: rejectDrain,
+      resolve: resolveDrain,
+      startedAt,
+      timeout
+    };
+    input.writeOutput?.("agent_bridge_terminal_auth_drain_started");
+    input.runtimeLogger?.warn("agent_bridge_terminal_auth_drain_started");
+    input.socket.auth = { token: input.token, terminalDrain: true };
+    input.socket.connect();
+    return promise2;
+  };
+  const handleConnected = (rawContext) => {
+    const current = state;
+    if (!current) {
+      return false;
+    }
+    void (async () => {
+      const context = RuntimeBridgeConnectedPayloadSchema.parse(rawContext);
+      input.writeOutput?.(
+        `agent_bridge_terminal_auth_drain_connected session_id=${context.sessionId} runtime_id=${context.runtimeId} bridge_lease_id=${context.bridgeLeaseId}`
+      );
+      input.runtimeLogger?.warn("agent_bridge_terminal_auth_drain_connected", {
+        session_id: context.sessionId,
+        runtime_id: context.runtimeId,
+        bridge_lease_id: context.bridgeLeaseId
+      });
+      const handler = input.getHandler();
+      if (!handler) {
+        throw new Error("Terminal auth drain connected without a handler");
+      }
+      await handler.replayPendingOutputs();
+      settle(() => {
+        input.writeOutput?.(
+          `agent_bridge_terminal_auth_drain_completed duration_ms=${Date.now() - current.startedAt}`
+        );
+        input.runtimeLogger?.warn(
+          "agent_bridge_terminal_auth_drain_completed",
+          { duration_ms: Date.now() - current.startedAt }
+        );
+        current.resolve();
+      });
+    })().catch((error51) => {
+      settle(() => current.reject(error51));
+    });
+    return true;
+  };
+  const handleConnectError = (error51) => {
+    const current = state;
+    if (!current) {
+      return false;
+    }
+    settle(() => current.reject(error51));
+    return true;
+  };
+  return {
+    begin,
+    handleConnected,
+    handleConnectError,
+    suppressesReconnect: () => terminalAuthExit || state !== null
+  };
+}
 function bridgeForwardingHeaders(url2) {
   if (!isNgrokFreeUrl(url2)) {
     return {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autohq/cli",
-  "version": "0.1.400",
+  "version": "0.1.401",
   "license": "SEE LICENSE IN README.md",
   "publishConfig": {
     "access": "public"