@buildautomaton/cli 0.1.9 → 0.1.10

package/dist/cli.js

@@ -5232,7 +5232,7 @@ var require_websocket = __commonJS({
   "../../node_modules/.pnpm/ws@8.19.0/node_modules/ws/lib/websocket.js"(exports, module) {
     "use strict";
     var EventEmitter2 = __require("events");
-    var https3 = __require("https");
+    var https2 = __require("https");
     var http = __require("http");
     var net = __require("net");
     var tls = __require("tls");
@@ -5767,7 +5767,7 @@ var require_websocket = __commonJS({
       }
       const defaultPort = isSecure ? 443 : 80;
       const key = randomBytes(16).toString("base64");
-      const request = isSecure ? https3.request : http.request;
+      const request = isSecure ? https2.request : http.request;
       const protocolSet = /* @__PURE__ */ new Set();
       let perMessageDeflate;
       opts.createConnection = opts.createConnection || (isSecure ? tlsConnect : netConnect);
@@ -25177,9 +25177,6 @@ var import_websocket = __toESM(require_websocket(), 1);
 var import_websocket_server = __toESM(require_websocket_server(), 1);
 var wrapper_default = import_websocket.default;
 
-// src/bridge/connection/create-ws-bridge.ts
-import https from "node:https";
-
 // src/net/apply-cli-outbound-network-prefs.ts
 import dns from "node:dns";
 var applied = false;
@@ -25192,20 +25189,44 @@ function applyCliOutboundNetworkPreferences() {
   }
 }
 
+// src/bridge/connection/cli-ws-client.ts
+import https from "node:https";
+function buildCliWebSocketClientOptions(wsUrl) {
+  const wsOptions = { perMessageDeflate: false, family: 4 };
+  if (wsUrl.startsWith("wss://")) {
+    wsOptions.agent = new https.Agent({ rejectUnauthorized: false, family: 4 });
+  }
+  return wsOptions;
+}
+function logCliWebSocketError(log2, serviceLabel, err, detail) {
+  const mid = detail ? ` ${detail}` : "";
+  log2(`${serviceLabel} WebSocket error${mid}: ${err.message}`);
+}
+function safeCloseWebSocket(ws) {
+  try {
+    if (ws.readyState === wrapper_default.CLOSED) {
+      ws.removeAllListeners();
+      return;
+    }
+    ws.once("close", () => {
+      ws.removeAllListeners();
+    });
+    ws.close();
+  } catch {
+    try {
+      ws.removeAllListeners();
+    } catch {
+    }
+  }
+}
+
 // src/bridge/connection/create-ws-bridge.ts
 var BRIDGE_AUTH_ERROR_HEADER = "x-bridge-auth-error";
 var BRIDGE_AUTH_ERROR_TOKEN_INVALID = "token_invalid";
 function createWsBridge(options) {
   const { url: url2, onMessage, onOpen, onClose, onError: onError2, onAuthInvalid, clientPingIntervalMs } = options;
   applyCliOutboundNetworkPreferences();
-  const wsOptions = {
-    perMessageDeflate: false,
-    family: 4
-  };
-  if (url2.startsWith("wss://")) {
-    wsOptions.agent = new https.Agent({ rejectUnauthorized: false, family: 4 });
-  }
-  const ws = new wrapper_default(url2, wsOptions);
+  const ws = new wrapper_default(url2, buildCliWebSocketClientOptions(url2));
   let clientPingTimer = null;
   function clearClientPing() {
     if (clientPingTimer != null) {
@@ -25528,9 +25549,9 @@ function runPendingAuth(options) {
       keepaliveInterval = null;
     }
     if (ws) {
-      ws.removeAllListeners();
-      ws.close();
+      const w = ws;
       ws = null;
+      safeCloseWebSocket(w);
     }
   }
   function connect() {
@@ -25573,7 +25594,7 @@ function runPendingAuth(options) {
           connect();
         }, delay2);
       },
-      onError: (err) => logFn(`[Bridge service] WebSocket error while waiting for sign-in: ${err.message}`),
+      onError: (err) => logCliWebSocketError(logFn, "[Bridge service]", err, "while waiting for sign-in"),
       onMessage: (data) => {
         const msg = data;
         if (msg.type === "auth_token" && typeof msg.token === "string") {
@@ -32793,14 +32814,50 @@ async function removeSessionWorktrees(paths, log2) {
 }
 
 // src/git/working-tree-status.ts
-async function commitsAheadOfUpstream(repoDir) {
-  const g = simpleGit(repoDir);
+async function tryConfigGet(g, key) {
+  try {
+    const out = await g.raw(["config", "--get", key]);
+    const v = String(out).trim();
+    return v || null;
+  } catch {
+    return null;
+  }
+}
+async function resolveRemoteTrackingRefForAhead(g) {
   try {
     await g.raw(["rev-parse", "--verify", "@{u}"]);
+    return "@{u}";
   } catch {
-    return 0;
   }
-  const out = await g.raw(["rev-list", "--count", "@{u}..HEAD"]);
+  const branch = (await g.raw(["rev-parse", "--abbrev-ref", "HEAD"])).trim();
+  if (!branch || branch === "HEAD") return null;
+  const remote = await tryConfigGet(g, `branch.${branch}.remote`) ?? "origin";
+  const merge2 = await tryConfigGet(g, `branch.${branch}.merge`);
+  if (merge2) {
+    const upstreamBranch = merge2.replace(/^refs\/heads\//, "");
+    const ref = `refs/remotes/${remote}/${upstreamBranch}`;
+    try {
+      await g.raw(["rev-parse", "--verify", ref]);
+      return ref;
+    } catch {
+    }
+  }
+  const fallbackRef = `refs/remotes/${remote}/${branch}`;
+  try {
+    await g.raw(["rev-parse", "--verify", fallbackRef]);
+    return fallbackRef;
+  } catch {
+    return null;
+  }
+}
+async function commitsAheadOfRemoteTracking(repoDir) {
+  const g = simpleGit(repoDir);
+  const trackingRef = await resolveRemoteTrackingRefForAhead(g);
+  if (!trackingRef) return 0;
+  const localSha = (await g.raw(["rev-parse", "HEAD"])).trim();
+  const remoteSha = (await g.raw(["rev-parse", trackingRef])).trim();
+  if (localSha === remoteSha) return 0;
+  const out = await g.raw(["rev-list", "--count", `${trackingRef}..HEAD`]);
   const n = parseInt(String(out).trim(), 10);
   return Number.isNaN(n) ? 0 : n;
 }
@@ -32808,7 +32865,7 @@ async function getRepoWorkingTreeStatus(repoDir) {
   const g = simpleGit(repoDir);
   const st = await g.status();
   const hasUncommittedChanges = (st.files?.length ?? 0) > 0;
-  const ahead = await commitsAheadOfUpstream(repoDir);
+  const ahead = await commitsAheadOfRemoteTracking(repoDir);
   return { hasUncommittedChanges, hasUnpushedCommits: ahead > 0 };
 }
 async function aggregateSessionPathsWorkingTreeStatus(paths) {
@@ -32824,7 +32881,7 @@ async function aggregateSessionPathsWorkingTreeStatus(paths) {
 async function pushAheadOfUpstreamForPaths(paths) {
   for (const p of paths) {
     const g = simpleGit(p);
-    const ahead = await commitsAheadOfUpstream(p);
+    const ahead = await commitsAheadOfRemoteTracking(p);
     if (ahead <= 0) continue;
     await g.push();
   }
@@ -34099,9 +34156,6 @@ var DevServerManager = class {
   }
 };
 
-// src/firehose/connect-firehose.ts
-import https2 from "node:https";
-
 // src/firehose/proxy/local-proxy.ts
 var ALLOWED_HOSTS = ["localhost", "127.0.0.1", "::1"];
 function isAllowedHost(host) {
@@ -34348,11 +34402,7 @@ function connectFirehose(options) {
   const { firehoseServerUrl, workspaceId, bridgeName, proxyPorts, log: log2, devServerManager, onOpen, onClose } = options;
   const wsUrl = buildFirehoseCliWsUrl(firehoseServerUrl);
   applyCliOutboundNetworkPreferences();
-  const wsOptions = { perMessageDeflate: false, family: 4 };
-  if (wsUrl.startsWith("wss://")) {
-    wsOptions.agent = new https2.Agent({ rejectUnauthorized: false, family: 4 });
-  }
-  const ws = new wrapper_default(wsUrl, wsOptions);
+  const ws = new wrapper_default(wsUrl, buildCliWebSocketClientOptions(wsUrl));
   let clientPingTimer = null;
   function clearClientPing() {
     if (clientPingTimer != null) {
@@ -34403,17 +34453,13 @@ function connectFirehose(options) {
   });
   ws.on("error", (err) => {
     clearClientPing();
-    log2(`[Proxy and log service] WebSocket error: ${err.message}`);
+    logCliWebSocketError(log2, "[Proxy and log service]", err);
   });
   return {
     close() {
       clearClientPing();
       devServerManager.detachFirehose();
-      try {
-        ws.removeAllListeners();
-        ws.close();
-      } catch {
-      }
+      safeCloseWebSocket(ws);
     },
     isConnected: () => ws.readyState === wrapper_default.OPEN
   };
@@ -35824,6 +35870,11 @@ function createMainBridgeWebSocketLifecycle(params) {
     const prev = state.currentWs;
     if (prev) {
       prev.removeAllListeners();
+      prev.once("error", () => {
+      });
+      prev.once("close", () => {
+        prev.removeAllListeners();
+      });
       try {
         prev.close();
       } catch {
@@ -35869,7 +35920,7 @@ function createMainBridgeWebSocketLifecycle(params) {
       },
       onOpen: handleOpen,
       onClose: handleClose,
-      onError: (err) => logFn(`[Bridge service] WebSocket error: ${err.message}`),
+      onError: (err) => logCliWebSocketError(logFn, "[Bridge service]", err),
       onMessage: (data) => handleBridgeMessage(data, messageDeps)
     });
   }