@buildautomaton/cli 0.1.79 → 0.1.81

package/dist/index.js

@@ -4208,8 +4208,8 @@ var init_parseUtil = __esm({
     init_errors();
     init_en();
     makeIssue = (params) => {
-      const { data, path: path84, errorMaps, issueData } = params;
-      const fullPath = [...path84, ...issueData.path || []];
+      const { data, path: path86, errorMaps, issueData } = params;
+      const fullPath = [...path86, ...issueData.path || []];
       const fullIssue = {
         ...issueData,
         path: fullPath
@@ -4517,11 +4517,11 @@ var init_types = __esm({
     init_parseUtil();
     init_util();
     ParseInputLazyPath = class {
-      constructor(parent, value, path84, key) {
+      constructor(parent, value, path86, key) {
         this._cachedPath = [];
         this.parent = parent;
         this.data = value;
-        this._path = path84;
+        this._path = path86;
         this._key = key;
       }
       get path() {
@@ -8182,10 +8182,10 @@ function assignProp(target, prop, value) {
     configurable: true
   });
 }
-function getElementAtPath(obj, path84) {
-  if (!path84)
+function getElementAtPath(obj, path86) {
+  if (!path86)
     return obj;
-  return path84.reduce((acc, key) => acc?.[key], obj);
+  return path86.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -8434,11 +8434,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path84, issues) {
+function prefixIssues(path86, issues) {
   return issues.map((iss) => {
     var _a2;
     (_a2 = iss).path ?? (_a2.path = []);
-    iss.path.unshift(path84);
+    iss.path.unshift(path86);
     return iss;
   });
 }
@@ -8627,7 +8627,7 @@ function treeifyError(error40, _mapper) {
     return issue2.message;
   };
   const result = { errors: [] };
-  const processError = (error41, path84 = []) => {
+  const processError = (error41, path86 = []) => {
     var _a2, _b;
     for (const issue2 of error41.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
@@ -8637,7 +8637,7 @@ function treeifyError(error40, _mapper) {
       } else if (issue2.code === "invalid_element") {
         processError({ issues: issue2.issues }, issue2.path);
       } else {
-        const fullpath = [...path84, ...issue2.path];
+        const fullpath = [...path86, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -8667,9 +8667,9 @@ function treeifyError(error40, _mapper) {
   processError(error40);
   return result;
 }
-function toDotPath(path84) {
+function toDotPath(path86) {
   const segs = [];
-  for (const seg of path84) {
+  for (const seg of path86) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -21132,8 +21132,8 @@ var init_acp = __esm({
         this.#requestHandler = requestHandler;
         this.#notificationHandler = notificationHandler;
         this.#stream = stream;
-        this.#closedPromise = new Promise((resolve35) => {
-          this.#abortController.signal.addEventListener("abort", () => resolve35());
+        this.#closedPromise = new Promise((resolve36) => {
+          this.#abortController.signal.addEventListener("abort", () => resolve36());
         });
         this.#receive();
       }
@@ -21282,8 +21282,8 @@ var init_acp = __esm({
       }
       async sendRequest(method, params) {
         const id = this.#nextRequestId++;
-        const responsePromise = new Promise((resolve35, reject) => {
-          this.#pendingResponses.set(id, { resolve: resolve35, reject });
+        const responsePromise = new Promise((resolve36, reject) => {
+          this.#pendingResponses.set(id, { resolve: resolve36, reject });
         });
         await this.#sendMessage({ jsonrpc: "2.0", id, method, params });
         return responsePromise;
@@ -21651,7 +21651,7 @@ var init_activity_tracker = __esm({
 
 // src/runtime/yield-to-event-loop.ts
 function yieldToEventLoop() {
-  return new Promise((resolve35) => setImmediate(resolve35));
+  return new Promise((resolve36) => setImmediate(resolve36));
 }
 var init_yield_to_event_loop = __esm({
   "src/runtime/yield-to-event-loop.ts"() {
@@ -21692,7 +21692,7 @@ async function yieldUntilFileBrowserReadsIdle(pollMs = 5) {
   while (getFileBrowserInFlightReadCount() > 0) {
     await yieldToEventLoop();
     if (getFileBrowserInFlightReadCount() > 0) {
-      await new Promise((resolve35) => setTimeout(resolve35, pollMs));
+      await new Promise((resolve36) => setTimeout(resolve36, pollMs));
     }
   }
 }
@@ -21702,7 +21702,7 @@ async function yieldUntilFileBrowserBrowseIdle(pollMs = 5) {
     const browseCooldownDone = lastActivityAt === 0 || Date.now() - lastActivityAt >= BROWSE_INDEX_COOLDOWN_MS;
     if (inFlightRequests2 === 0 && browseCooldownDone) return;
     await yieldToEventLoop();
-    await new Promise((resolve35) => setTimeout(resolve35, pollMs));
+    await new Promise((resolve36) => setTimeout(resolve36, pollMs));
   }
 }
 async function yieldUntilFileBrowserIdle(pollMs = 5) {
@@ -21879,8 +21879,8 @@ function createRequestId(prefix) {
 }
 function waitForWorkerReady() {
   if (workerReady) return Promise.resolve();
-  return new Promise((resolve35) => {
-    workerReadyWaiters.push(resolve35);
+  return new Promise((resolve36) => {
+    workerReadyWaiters.push(resolve36);
   });
 }
 function registerWorkerReadyListener(listener) {
@@ -21892,7 +21892,7 @@ function registerWorkerReadyListener(listener) {
 }
 function markWorkerReady() {
   workerReady = true;
-  for (const resolve35 of workerReadyWaiters) resolve35();
+  for (const resolve36 of workerReadyWaiters) resolve36();
   workerReadyWaiters = [];
   workerReadyListener?.();
 }
@@ -22039,7 +22039,7 @@ async function waitForOuterCodeNavCacheAccessAsync() {
     if (isCliImmediateShutdownRequested() || isSymbolIndexWorkerShutdownRequested()) {
       throw new CliSqliteInterrupted();
     }
-    await new Promise((resolve35) => setTimeout(resolve35, 5));
+    await new Promise((resolve36) => setTimeout(resolve36, 5));
     await yieldToEventLoop();
   }
 }
@@ -22376,7 +22376,7 @@ function readMigrationSql(filename, ...searchSubdirs) {
     join2(moduleDir, "..", sub, filename),
     join2(moduleDir, "..", "..", "dist", sub, filename)
   ]);
-  const resolved = candidates.find((path84) => existsSync(path84));
+  const resolved = candidates.find((path86) => existsSync(path86));
   if (!resolved) {
     throw new Error(`Missing SQLite migration SQL: ${filename} (searched ${searchSubdirs.join(", ")})`);
   }
@@ -23454,7 +23454,7 @@ var require_ignore = __commonJS({
       //   path matching.
       // - check `string` either `MODE_IGNORE` or `MODE_CHECK_IGNORE`
       // @returns {TestResult} true if a file is ignored
-      test(path84, checkUnignored, mode) {
+      test(path86, checkUnignored, mode) {
         let ignored = false;
         let unignored = false;
         let matchedRule;
@@ -23463,7 +23463,7 @@ var require_ignore = __commonJS({
           if (unignored === negative && ignored !== unignored || negative && !ignored && !unignored && !checkUnignored) {
             return;
           }
-          const matched = rule[mode].test(path84);
+          const matched = rule[mode].test(path86);
           if (!matched) {
             return;
           }
@@ -23484,17 +23484,17 @@ var require_ignore = __commonJS({
     var throwError = (message, Ctor) => {
       throw new Ctor(message);
     };
-    var checkPath = (path84, originalPath, doThrow) => {
-      if (!isString(path84)) {
+    var checkPath = (path86, originalPath, doThrow) => {
+      if (!isString(path86)) {
         return doThrow(
           `path must be a string, but got \`${originalPath}\``,
           TypeError
         );
       }
-      if (!path84) {
+      if (!path86) {
         return doThrow(`path must not be empty`, TypeError);
       }
-      if (checkPath.isNotRelative(path84)) {
+      if (checkPath.isNotRelative(path86)) {
         const r = "`path.relative()`d";
         return doThrow(
           `path should be a ${r} string, but got "${originalPath}"`,
@@ -23503,7 +23503,7 @@ var require_ignore = __commonJS({
       }
       return true;
     };
-    var isNotRelative = (path84) => REGEX_TEST_INVALID_PATH.test(path84);
+    var isNotRelative = (path86) => REGEX_TEST_INVALID_PATH.test(path86);
     checkPath.isNotRelative = isNotRelative;
     checkPath.convert = (p) => p;
     var Ignore = class {
@@ -23533,19 +23533,19 @@ var require_ignore = __commonJS({
       }
       // @returns {TestResult}
       _test(originalPath, cache2, checkUnignored, slices) {
-        const path84 = originalPath && checkPath.convert(originalPath);
+        const path86 = originalPath && checkPath.convert(originalPath);
         checkPath(
-          path84,
+          path86,
           originalPath,
           this._strictPathCheck ? throwError : RETURN_FALSE
         );
-        return this._t(path84, cache2, checkUnignored, slices);
+        return this._t(path86, cache2, checkUnignored, slices);
       }
-      checkIgnore(path84) {
-        if (!REGEX_TEST_TRAILING_SLASH.test(path84)) {
-          return this.test(path84);
+      checkIgnore(path86) {
+        if (!REGEX_TEST_TRAILING_SLASH.test(path86)) {
+          return this.test(path86);
         }
-        const slices = path84.split(SLASH).filter(Boolean);
+        const slices = path86.split(SLASH).filter(Boolean);
         slices.pop();
         if (slices.length) {
           const parent = this._t(
@@ -23558,18 +23558,18 @@ var require_ignore = __commonJS({
             return parent;
           }
         }
-        return this._rules.test(path84, false, MODE_CHECK_IGNORE);
+        return this._rules.test(path86, false, MODE_CHECK_IGNORE);
       }
-      _t(path84, cache2, checkUnignored, slices) {
-        if (path84 in cache2) {
-          return cache2[path84];
+      _t(path86, cache2, checkUnignored, slices) {
+        if (path86 in cache2) {
+          return cache2[path86];
         }
         if (!slices) {
-          slices = path84.split(SLASH).filter(Boolean);
+          slices = path86.split(SLASH).filter(Boolean);
         }
         slices.pop();
         if (!slices.length) {
-          return cache2[path84] = this._rules.test(path84, checkUnignored, MODE_IGNORE);
+          return cache2[path86] = this._rules.test(path86, checkUnignored, MODE_IGNORE);
         }
         const parent = this._t(
           slices.join(SLASH) + SLASH,
@@ -23577,29 +23577,29 @@ var require_ignore = __commonJS({
           checkUnignored,
           slices
         );
-        return cache2[path84] = parent.ignored ? parent : this._rules.test(path84, checkUnignored, MODE_IGNORE);
+        return cache2[path86] = parent.ignored ? parent : this._rules.test(path86, checkUnignored, MODE_IGNORE);
       }
-      ignores(path84) {
-        return this._test(path84, this._ignoreCache, false).ignored;
+      ignores(path86) {
+        return this._test(path86, this._ignoreCache, false).ignored;
       }
       createFilter() {
-        return (path84) => !this.ignores(path84);
+        return (path86) => !this.ignores(path86);
       }
       filter(paths) {
         return makeArray(paths).filter(this.createFilter());
       }
       // @returns {TestResult}
-      test(path84) {
-        return this._test(path84, this._testCache, true);
+      test(path86) {
+        return this._test(path86, this._testCache, true);
       }
     };
     var factory = (options) => new Ignore(options);
-    var isPathValid = (path84) => checkPath(path84 && checkPath.convert(path84), path84, RETURN_FALSE);
+    var isPathValid = (path86) => checkPath(path86 && checkPath.convert(path86), path86, RETURN_FALSE);
     var setupWindows = () => {
       const makePosix = (str) => /^\\\\\?\\/.test(str) || /["<>|\u0000-\u001F]+/u.test(str) ? str : str.replace(/\\/g, "/");
       checkPath.convert = makePosix;
       const REGEX_TEST_WINDOWS_PATH_ABSOLUTE = /^[a-z]:\//i;
-      checkPath.isNotRelative = (path84) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path84) || isNotRelative(path84);
+      checkPath.isNotRelative = (path86) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path86) || isNotRelative(path86);
     };
     if (
       // Detect `process` so that it can run in browsers.
@@ -26790,7 +26790,7 @@ var init_setup_handlers = __esm({
 // src/code-nav/symbol-index/worker/handle-message.ts
 async function waitForActiveWorkerHandlersIdle(pollMs = 10) {
   while (activeWorkerHandlers > 0) {
-    await new Promise((resolve35) => setTimeout(resolve35, pollMs));
+    await new Promise((resolve36) => setTimeout(resolve36, pollMs));
   }
 }
 async function handleRequestMessage(port, msg) {
@@ -27033,9 +27033,9 @@ async function requestWorker(message) {
   }
   ensureWorkerStarted();
   await ensureWorkerReadyForRequests();
-  return new Promise((resolve35, reject) => {
+  return new Promise((resolve36, reject) => {
     pendingRequests.set(message.requestId, {
-      resolve: (value) => resolve35(value),
+      resolve: (value) => resolve36(value),
       reject
     });
     postToWorker(message);
@@ -27061,37 +27061,37 @@ async function shutdownWorkerThread() {
   if (activeWorker != null) {
     setWorker(null);
     await Promise.race([
-      new Promise((resolve35) => {
+      new Promise((resolve36) => {
         const onMessage = (message) => {
           if (message.type !== "shutdownComplete") return;
           activeWorker.off("message", onMessage);
-          resolve35();
+          resolve36();
         };
         activeWorker.on("message", onMessage);
         try {
           activeWorker.postMessage({ type: "shutdown" });
         } catch {
           activeWorker.off("message", onMessage);
-          resolve35();
+          resolve36();
         }
       }),
-      new Promise((resolve35) => setTimeout(resolve35, WORKER_SHUTDOWN_GRACE_MS))
+      new Promise((resolve36) => setTimeout(resolve36, WORKER_SHUTDOWN_GRACE_MS))
     ]);
     await activeWorker.terminate();
   } else {
     const inProcess = getInProcessBridge();
     if (inProcess != null) {
       await Promise.race([
-        new Promise((resolve35) => {
+        new Promise((resolve36) => {
           const onMessage = (message) => {
             if (message.type !== "shutdownComplete") return;
             inProcess.off("message", onMessage);
-            resolve35();
+            resolve36();
           };
           inProcess.on("message", onMessage);
           inProcess.postMessage({ type: "shutdown" });
         }),
-        new Promise((resolve35) => setTimeout(resolve35, WORKER_SHUTDOWN_GRACE_MS))
+        new Promise((resolve36) => setTimeout(resolve36, WORKER_SHUTDOWN_GRACE_MS))
       ]);
     }
   }
@@ -27169,6 +27169,16 @@ async function awaitSymbolIndexWorkerShutdown() {
     await terminateSymbolIndexWorker2();
   }
 }
+async function clearCliImmediateShutdown() {
+  if (symbolIndexShutdownPromise != null) {
+    try {
+      await symbolIndexShutdownPromise;
+    } catch {
+    }
+  }
+  cliImmediateShutdownRequested = false;
+  symbolIndexShutdownPromise = null;
+}
 function resetCliImmediateShutdownForTests() {
   cliImmediateShutdownRequested = false;
   symbolIndexShutdownPromise = null;
@@ -27967,10 +27977,10 @@ var require_src2 = __commonJS({
     var fs_1 = __require("fs");
     var debug_1 = __importDefault(require_src());
     var log2 = debug_1.default("@kwsites/file-exists");
-    function check2(path84, isFile, isDirectory) {
-      log2(`checking %s`, path84);
+    function check2(path86, isFile, isDirectory) {
+      log2(`checking %s`, path86);
       try {
-        const stat2 = fs_1.statSync(path84);
+        const stat2 = fs_1.statSync(path86);
         if (stat2.isFile() && isFile) {
           log2(`[OK] path represents a file`);
           return true;
@@ -27990,8 +28000,8 @@ var require_src2 = __commonJS({
         throw e;
       }
     }
-    function exists2(path84, type = exports.READABLE) {
-      return check2(path84, (type & exports.FILE) > 0, (type & exports.FOLDER) > 0);
+    function exists2(path86, type = exports.READABLE) {
+      return check2(path86, (type & exports.FILE) > 0, (type & exports.FOLDER) > 0);
     }
     exports.exists = exists2;
     exports.FILE = 1;
@@ -28122,6 +28132,29 @@ function safeSendWebSocketBinary(ws, data) {
   }
 }
 
+// src/connection/create-ws-bridge-options.ts
+var BRIDGE_AUTH_ERROR_HEADER = "x-bridge-auth-error";
+var BRIDGE_AUTH_ERROR_TOKEN_INVALID = "token_invalid";
+
+// src/connection/dispatch-ws-inbound-message.ts
+function dispatchWsInboundMessage(raw, ws, onMessage, isActiveSocket) {
+  if (isActiveSocket && !isActiveSocket(ws)) return;
+  try {
+    let data;
+    if (typeof raw === "string") {
+      data = JSON.parse(raw);
+    } else if (Buffer.isBuffer(raw) || raw instanceof ArrayBuffer) {
+      const str = Buffer.isBuffer(raw) ? raw.toString("utf8") : Buffer.from(raw).toString("utf8");
+      data = JSON.parse(str);
+    } else {
+      data = raw;
+    }
+    onMessage?.(data, ws);
+  } catch {
+    onMessage?.(raw, ws);
+  }
+}
+
 // src/connection/parse-compact-heartbeat-ack.ts
 function tryParseCompactHeartbeatAck(raw) {
   let str = null;
@@ -28149,8 +28182,6 @@ function tryParseCompactHeartbeatAck(raw) {
 }
 
 // src/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,
@@ -28161,15 +28192,16 @@ function createWsBridge(options) {
     onAuthInvalid,
     clientPingIntervalMs,
     onCompactHeartbeatAck,
-    isActiveSocket
+    isActiveSocket,
+    deferInboundMessages = true
   } = options;
   const ws = new wrapper_default(url2, buildCliWebSocketClientOptions(url2));
   let clearClientPing = null;
-  function disposeClientPing() {
+  const disposeClientPing = () => {
     clearClientPing?.();
     clearClientPing = null;
-  }
-  ws.on("unexpected-response", (request, response) => {
+  };
+  ws.on("unexpected-response", (_request, response) => {
     const status = response?.statusCode ?? 0;
     const headers = response?.headers ?? {};
     const errCode = (headers[BRIDGE_AUTH_ERROR_HEADER] ?? headers["X-Bridge-Auth-Error"] ?? "").toLowerCase();
@@ -28190,23 +28222,11 @@ function createWsBridge(options) {
       onCompactHeartbeatAck?.(ackSeq);
       return;
     }
-    setImmediate(() => {
-      if (isActiveSocket && !isActiveSocket(ws)) return;
-      try {
-        let data;
-        if (typeof raw === "string") {
-          data = JSON.parse(raw);
-        } else if (Buffer.isBuffer(raw) || raw instanceof ArrayBuffer) {
-          const str = Buffer.isBuffer(raw) ? raw.toString("utf8") : Buffer.from(raw).toString("utf8");
-          data = JSON.parse(str);
-        } else {
-          data = raw;
-        }
-        onMessage?.(data, ws);
-      } catch {
-        onMessage?.(raw, ws);
-      }
-    });
+    if (deferInboundMessages) {
+      setImmediate(() => dispatchWsInboundMessage(raw, ws, onMessage, isActiveSocket));
+      return;
+    }
+    dispatchWsInboundMessage(raw, ws, onMessage, isActiveSocket);
   });
   ws.on("close", (code, reason) => {
     disposeClientPing();
@@ -28320,10 +28340,10 @@ async function killChildProcessTreeGracefully(child, graceMs = ACP_PROCESS_TREE_
   }
   await killProcessTree(pid, "SIGTERM");
   if (graceMs <= 0) return;
-  const exited = new Promise((resolve35) => {
-    child.once("exit", () => resolve35());
+  const exited = new Promise((resolve36) => {
+    child.once("exit", () => resolve36());
   });
-  await Promise.race([exited, new Promise((resolve35) => setTimeout(resolve35, graceMs))]);
+  await Promise.race([exited, new Promise((resolve36) => setTimeout(resolve36, graceMs))]);
   if (child.exitCode == null && child.signalCode == null) {
     await killProcessTree(pid, "SIGKILL");
   }
@@ -28340,8 +28360,8 @@ async function gracefulAcpSubprocessDisconnect(params) {
       await transport.closeSession?.(sessionId);
     } catch {
     }
-    await new Promise((resolve35) => {
-      const timer = setTimeout(resolve35, ACP_GRACEFUL_SESSION_CLOSE_WAIT_MS);
+    await new Promise((resolve36) => {
+      const timer = setTimeout(resolve36, ACP_GRACEFUL_SESSION_CLOSE_WAIT_MS);
       timer.unref?.();
     });
   }
@@ -29491,11 +29511,11 @@ function createSdkStdioExtNotificationHandler(options) {
 // src/agents/acp/clients/sdk/sdk-stdio-permission-request-handshake.ts
 function awaitSdkStdioPermissionRequestHandshake(params) {
   const { requestId, paramsRecord, pending: pending2, onRequest } = params;
-  return new Promise((resolve35) => {
-    pending2.set(requestId, { resolve: resolve35, params: paramsRecord });
+  return new Promise((resolve36) => {
+    pending2.set(requestId, { resolve: resolve36, params: paramsRecord });
     if (onRequest == null) {
       pending2.delete(requestId);
-      resolve35({ outcome: { outcome: "denied" } });
+      resolve36({ outcome: { outcome: "denied" } });
       return;
     }
     try {
@@ -30007,10 +30027,10 @@ function createSdkStdioInitSettle(child) {
       forceAcpSubprocessDisconnect(child);
       reject(err);
     },
-    settleResolve(resolve35, handle) {
+    settleResolve(resolve36, handle) {
       if (initSettled) return;
       initSettled = true;
-      resolve35(handle);
+      resolve36(handle);
     }
   };
 }
@@ -30099,7 +30119,7 @@ async function createSdkStdioAcpClient(options) {
     onFileChange,
     stderrCapture
   });
-  return new Promise((resolve35, reject) => {
+  return new Promise((resolve36, reject) => {
     const init = createSdkStdioInitSettle(child);
     child.on("error", (err) => {
       init.settleReject(reject, new Error(formatSpawnError(err, command[0])));
@@ -30124,7 +30144,7 @@ async function createSdkStdioAcpClient(options) {
           protocolVersion: PROTOCOL_VERSION2
         });
         init.settleResolve(
-          resolve35,
+          resolve36,
           createSdkStdioHandle({
             child,
             sessionId: established.sessionId,
@@ -30260,19 +30280,19 @@ function buildLocalHttpRequestOptions(built) {
 }
 function runLocalHttpRequestOnce(mod, built) {
   const opts = buildLocalHttpRequestOptions(built);
-  return new Promise((resolve35) => {
+  return new Promise((resolve36) => {
     const req = mod.request(opts, (res) => {
       const chunks = [];
       res.on("data", (chunk) => chunks.push(chunk));
       res.on("end", () => {
-        resolve35({
+        resolve36({
           statusCode: res.statusCode ?? 0,
           headers: incomingMessageHeaders(res),
           body: Buffer.concat(chunks)
         });
       });
       res.on("error", (err) => {
-        resolve35({
+        resolve36({
           statusCode: 0,
           headers: {},
           body: Buffer.alloc(0),
@@ -30284,7 +30304,7 @@ function runLocalHttpRequestOnce(mod, built) {
       req.destroy(new Error(`Local preview request timed out after ${LOCAL_PROXY_REQUEST_TIMEOUT_MS}ms`));
     });
     req.on("error", (err) => {
-      resolve35({
+      resolve36({
         statusCode: 0,
         headers: {},
         body: Buffer.alloc(0),
@@ -30340,14 +30360,14 @@ async function proxyToLocalStreaming(request, callbacks) {
   const isHttps = request.url.startsWith("https:");
   const mod = await loadHttpModule(isHttps);
   const opts = buildLocalHttpRequestOptions(built);
-  await new Promise((resolve35) => {
+  await new Promise((resolve36) => {
     const req = mod.request(opts, (res) => {
       try {
         callbacks.onStart(res.statusCode ?? 0, incomingMessageHeaders(res));
       } catch (err) {
         req.destroy();
         callbacks.onError(err instanceof Error ? err.message : String(err));
-        resolve35();
+        resolve36();
         return;
       }
       res.on("data", (chunk) => {
@@ -30360,11 +30380,11 @@ async function proxyToLocalStreaming(request, callbacks) {
       });
       res.on("end", () => {
         callbacks.onEnd();
-        resolve35();
+        resolve36();
       });
       res.on("error", (err) => {
         callbacks.onError(err.message);
-        resolve35();
+        resolve36();
       });
     });
     req.setTimeout(LOCAL_PROXY_REQUEST_TIMEOUT_MS, () => {
@@ -30372,7 +30392,7 @@ async function proxyToLocalStreaming(request, callbacks) {
     });
     req.on("error", (err) => {
       callbacks.onError(err.message);
-      resolve35();
+      resolve36();
     });
     if (built.sendingBody && built.body != null) {
       req.write(built.body);
@@ -30402,8 +30422,8 @@ function randomSecret() {
   }
   return Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
 }
-async function requestPreviewApi(port, secret, method, path84, body) {
-  const url2 = `http://127.0.0.1:${port}${path84}`;
+async function requestPreviewApi(port, secret, method, path86, body) {
+  const url2 = `http://127.0.0.1:${port}${path86}`;
   const headers = {
     [PREVIEW_SECRET_HEADER]: secret,
     "Content-Type": "application/json"
@@ -30415,7 +30435,7 @@ async function requestPreviewApi(port, secret, method, path84, body) {
   });
   const data = await res.json().catch(() => ({}));
   if (!res.ok) {
-    throw new Error(data?.error ?? `Preview API ${method} ${path84}: ${res.status}`);
+    throw new Error(data?.error ?? `Preview API ${method} ${path86}: ${res.status}`);
   }
   return data;
 }
@@ -30637,14 +30657,8 @@ function installBridgeProcessResilience() {
   });
 }
 
-// src/cli-version.ts
-var CLI_VERSION = "0.1.79".length > 0 ? "0.1.79" : "0.0.0-dev";
-
-// src/connection/heartbeat/constants.ts
-var BRIDGE_APP_HEARTBEAT_INTERVAL_MS = 1e4;
-var BRIDGE_HEARTBEAT_SEQ_MAX = 2147483646;
-var BRIDGE_HEARTBEAT_MISSED_ACKS_BEFORE_RECONNECT = 4;
-var BRIDGE_HEARTBEAT_RTT_SAMPLE_MAX = 5;
+// src/auth/pending/run-pending-auth.ts
+init_log();
 
 // ../../node_modules/.pnpm/open@10.2.0/node_modules/open/index.js
 import process7 from "node:process";
@@ -31079,14 +31093,14 @@ var baseOpen = async (options) => {
   }
   const subprocess = childProcess.spawn(command, cliArguments, childProcessOptions);
   if (options.wait) {
-    return new Promise((resolve35, reject) => {
+    return new Promise((resolve36, reject) => {
       subprocess.once("error", reject);
       subprocess.once("close", (exitCode) => {
         if (!options.allowNonzeroExitCode && exitCode > 0) {
           reject(new Error(`Exited with code ${exitCode}`));
           return;
         }
-        resolve35(subprocess);
+        resolve36(subprocess);
       });
     });
   }
@@ -31199,8 +31213,16 @@ async function openBrowser(connectionId, initialWorkspaceId, preferredBridgeName
   }
 }
 
-// src/auth/run-pending-auth.ts
-init_log();
+// src/auth/pending/constants.ts
+var PENDING_KEEPALIVE_MS = 25e3;
+var BROWSER_OPEN_FALLBACK_MS = 4e3;
+
+// src/auth/pending/build-pending-bridge-url.ts
+function buildPendingBridgeUrl(apiUrl, connectionId) {
+  const base = apiUrl.startsWith("https") ? apiUrl.replace(/^https/, "wss") : apiUrl.replace(/^http/, "ws");
+  const params = new URLSearchParams({ connectionId });
+  return `${base}/ws/bridge/pending?${params.toString()}`;
+}
 
 // src/connection/reconnect/constants.ts
 var RECONNECT_QUIET_MS = 2e3;
@@ -31531,6 +31553,12 @@ function scheduleMainBridgeReconnect(state, connect, log2, closeMeta) {
   });
 }
 
+// src/connection/heartbeat/constants.ts
+var BRIDGE_APP_HEARTBEAT_INTERVAL_MS = 1e4;
+var BRIDGE_HEARTBEAT_SEQ_MAX = 2147483646;
+var BRIDGE_HEARTBEAT_MISSED_ACKS_BEFORE_RECONNECT = 4;
+var BRIDGE_HEARTBEAT_RTT_SAMPLE_MAX = 5;
+
 // src/connection/reconnect/duplicate-bridge-connection-detect.ts
 var BRIDGE_SUPERSEDED_CLOSE_REASON_SNIPPET = "superseded";
 var DUPLICATE_BRIDGE_SHORT_SESSION_MS = 25e3;
@@ -31615,145 +31643,180 @@ function clearFirehoseReconnectQuietOnOpen(ctx, log2) {
   });
 }
 
-// src/auth/run-pending-auth.ts
-var PENDING_KEEPALIVE_MS = 25e3;
-var BROWSER_OPEN_FALLBACK_MS = 4e3;
-function buildPendingBridgeUrl(apiUrl, connectionId) {
-  const base = apiUrl.startsWith("https") ? apiUrl.replace(/^https/, "wss") : apiUrl.replace(/^http/, "ws");
-  const params = new URLSearchParams({ connectionId });
-  return `${base}/ws/bridge/pending?${params.toString()}`;
-}
-function runPendingAuth(options) {
-  const { apiUrl, initialWorkspaceId, preferredBridgeName, onAuth } = options;
-  const logFn = options.log ?? log;
-  let ws = null;
-  let reconnectTimeout = null;
-  let keepaliveInterval = null;
-  let browserFallback = null;
-  const connectionId = crypto.randomUUID();
-  let hasOpenedBrowser = false;
-  let resolved = false;
-  let resolveAuth;
-  const authPromise = new Promise((resolve35) => {
-    resolveAuth = resolve35;
-  });
-  let reconnectAttempt = 0;
-  const signInQuiet = createEmptyReconnectQuietSlot();
-  function clearQuietOnOpen() {
-    clearReconnectQuietOnSuccessfulConnection(
-      signInQuiet,
-      logFn,
-      "[Bridge service] Sign-in connection restored."
-    );
-    reconnectAttempt = 0;
-  }
-  function beginDeferredPendingCloseLog(code, reason) {
+// src/auth/pending/pending-auth-on-close.ts
+function createPendingAuthOnClose(params) {
+  const { session, log: log2, connect } = params;
+  return (code, reason) => {
+    if (session.keepaliveInterval) {
+      clearInterval(session.keepaliveInterval);
+      session.keepaliveInterval = null;
+    }
+    if (session.resolved) return;
     beginDeferredDisconnectForReconnect({
-      isClosedByUser: () => resolved,
-      quiet: signInQuiet,
+      isClosedByUser: () => session.resolved,
+      quiet: session.signInQuiet,
       code,
       reason,
       willReconnect: true,
-      log: logFn,
+      log: log2,
       serviceLabel: "[Bridge service]",
       shutdownDetail: "Not reconnecting (shutting down).",
       reconnectingDetail: "Waiting for browser sign-in; reconnecting\u2026",
-      shouldAbortQuietWindow: () => ws != null && ws.readyState === wrapper_default.OPEN
+      shouldAbortQuietWindow: () => session.ws != null && session.ws.readyState === wrapper_default.OPEN
     });
-  }
-  function cleanup() {
-    clearReconnectQuietTimer(signInQuiet);
-    if (reconnectTimeout) {
-      clearTimeout(reconnectTimeout);
-      reconnectTimeout = null;
-    }
-    if (browserFallback) {
-      clearTimeout(browserFallback);
-      browserFallback = null;
-    }
-    if (keepaliveInterval) {
-      clearInterval(keepaliveInterval);
-      keepaliveInterval = null;
-    }
-    if (ws) {
-      const w = ws;
-      ws = null;
-      safeCloseWebSocket(w);
+    const delay4 = pendingAuthReconnectDelayMs(session.reconnectAttempt);
+    session.reconnectAttempt += 1;
+    if (session.signInQuiet.verboseLogs) {
+      const delayLabel = formatReconnectDelayForLog(delay4);
+      log2(
+        `[Bridge service] Next sign-in connection attempt in ${delayLabel} (attempt ${session.reconnectAttempt}).`
+      );
     }
+    session.reconnectTimeout = setTimeout(() => {
+      session.reconnectTimeout = null;
+      connect();
+    }, delay4);
+  };
+}
+
+// src/auth/pending/pending-auth-session.ts
+function createPendingAuthSession() {
+  let resolveAuth;
+  const authPromise = new Promise((resolve36) => {
+    resolveAuth = resolve36;
+  });
+  return {
+    ws: null,
+    reconnectTimeout: null,
+    keepaliveInterval: null,
+    browserFallback: null,
+    connectionId: crypto.randomUUID(),
+    hasOpenedBrowser: false,
+    resolved: false,
+    resolveAuth,
+    reconnectAttempt: 0,
+    signInQuiet: createEmptyReconnectQuietSlot(),
+    authPromise
+  };
+}
+function cleanupPendingAuthSession(session) {
+  clearReconnectQuietTimer(session.signInQuiet);
+  if (session.reconnectTimeout) {
+    clearTimeout(session.reconnectTimeout);
+    session.reconnectTimeout = null;
   }
-  function connect() {
-    const url2 = buildPendingBridgeUrl(apiUrl, connectionId);
-    let pendingHbSeq = -1;
-    ws = createWsBridge({
-      url: url2,
-      onOpen: () => {
-        clearQuietOnOpen();
-        pendingHbSeq = -1;
-        sendWsMessage(ws, { type: "identify", role: "cli", cliVersion: CLI_VERSION });
-        keepaliveInterval = setInterval(() => {
-          if (resolved || !ws || ws.readyState !== 1) return;
-          pendingHbSeq = pendingHbSeq >= BRIDGE_HEARTBEAT_SEQ_MAX ? 0 : pendingHbSeq + 1;
-          const hb = { t: "h", s: pendingHbSeq };
-          sendWsMessage(ws, hb);
-        }, PENDING_KEEPALIVE_MS);
-        if (browserFallback) {
-          clearTimeout(browserFallback);
-          browserFallback = null;
-        }
-        if (!hasOpenedBrowser) {
-          hasOpenedBrowser = true;
-          void openBrowser(connectionId, initialWorkspaceId, preferredBridgeName, apiUrl, logFn);
-        }
-      },
-      onClose: (code, reason) => {
-        if (keepaliveInterval) {
-          clearInterval(keepaliveInterval);
-          keepaliveInterval = null;
-        }
-        if (resolved) return;
-        beginDeferredPendingCloseLog(code, reason);
-        const delay4 = pendingAuthReconnectDelayMs(reconnectAttempt);
-        reconnectAttempt += 1;
-        if (signInQuiet.verboseLogs) {
-          const delayLabel = formatReconnectDelayForLog(delay4);
-          logFn(
-            `[Bridge service] Next sign-in connection attempt in ${delayLabel} (attempt ${reconnectAttempt}).`
-          );
-        }
-        reconnectTimeout = setTimeout(() => {
-          reconnectTimeout = null;
-          connect();
-        }, delay4);
-      },
-      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") {
-          resolved = true;
-          const workspaceId = typeof msg.workspaceId === "string" ? msg.workspaceId : "";
-          cleanup();
-          const refreshToken = typeof msg.refreshToken === "string" ? msg.refreshToken : void 0;
-          const result = { workspaceId, token: msg.token, refreshToken };
-          resolveAuth(result);
-          onAuth(result);
-        }
-      }
-    });
+  if (session.browserFallback) {
+    clearTimeout(session.browserFallback);
+    session.browserFallback = null;
   }
-  browserFallback = setTimeout(() => {
-    browserFallback = null;
-    if (!hasOpenedBrowser) {
-      hasOpenedBrowser = true;
-      void openBrowser(connectionId, initialWorkspaceId, preferredBridgeName, apiUrl, logFn);
+  if (session.keepaliveInterval) {
+    clearInterval(session.keepaliveInterval);
+    session.keepaliveInterval = null;
+  }
+  if (session.ws) {
+    const w = session.ws;
+    session.ws = null;
+    safeCloseWebSocket(w);
+  }
+}
+
+// src/auth/pending/pending-auth-on-message.ts
+function createPendingAuthOnMessage(params) {
+  const { session, onAuth } = params;
+  return (data) => {
+    const msg = data;
+    if (msg.type !== "auth_token" || typeof msg.token !== "string") return;
+    session.resolved = true;
+    const workspaceId = typeof msg.workspaceId === "string" ? msg.workspaceId : "";
+    const refreshToken = typeof msg.refreshToken === "string" ? msg.refreshToken : void 0;
+    const result = { workspaceId, token: msg.token, refreshToken };
+    session.resolveAuth(result);
+    onAuth(result);
+    cleanupPendingAuthSession(session);
+  };
+}
+
+// src/cli-version.ts
+var CLI_VERSION = "0.1.81".length > 0 ? "0.1.81" : "0.0.0-dev";
+
+// src/auth/pending/pending-auth-on-open.ts
+function createPendingAuthOnOpen(params) {
+  const { session, apiUrl, initialWorkspaceId, preferredBridgeName, log: log2 } = params;
+  let pendingHbSeq = -1;
+  return () => {
+    clearReconnectQuietOnSuccessfulConnection(
+      session.signInQuiet,
+      log2,
+      "[Bridge service] Sign-in connection restored."
+    );
+    session.reconnectAttempt = 0;
+    pendingHbSeq = -1;
+    sendWsMessage(session.ws, { type: "identify", role: "cli", cliVersion: CLI_VERSION });
+    session.keepaliveInterval = setInterval(() => {
+      if (session.resolved || !session.ws || session.ws.readyState !== 1) return;
+      pendingHbSeq = pendingHbSeq >= BRIDGE_HEARTBEAT_SEQ_MAX ? 0 : pendingHbSeq + 1;
+      const hb = { t: "h", s: pendingHbSeq };
+      sendWsMessage(session.ws, hb);
+    }, PENDING_KEEPALIVE_MS);
+    if (session.browserFallback) {
+      clearTimeout(session.browserFallback);
+      session.browserFallback = null;
+    }
+    if (!session.hasOpenedBrowser) {
+      session.hasOpenedBrowser = true;
+      void openBrowser(session.connectionId, initialWorkspaceId, preferredBridgeName, apiUrl, log2);
+    }
+  };
+}
+
+// src/auth/pending/connect-pending-auth.ts
+function connectPendingAuth(params) {
+  const { session, apiUrl, initialWorkspaceId, preferredBridgeName, onAuth, log: log2 } = params;
+  const connect = () => {
+    session.ws = createWsBridge({
+      url: buildPendingBridgeUrl(apiUrl, session.connectionId),
+      deferInboundMessages: false,
+      onOpen: createPendingAuthOnOpen({
+        session,
+        apiUrl,
+        initialWorkspaceId,
+        preferredBridgeName,
+        log: log2
+      }),
+      onClose: createPendingAuthOnClose({ session, log: log2, connect }),
+      onError: (err) => logCliWebSocketError(log2, "[Bridge service]", err, "while waiting for sign-in"),
+      onMessage: createPendingAuthOnMessage({ session, onAuth })
+    });
+  };
+  connect();
+}
+
+// src/auth/pending/run-pending-auth.ts
+function runPendingAuth(options) {
+  const { apiUrl, initialWorkspaceId, preferredBridgeName, onAuth } = options;
+  const logFn = options.log ?? log;
+  const session = createPendingAuthSession();
+  session.browserFallback = setTimeout(() => {
+    session.browserFallback = null;
+    if (!session.hasOpenedBrowser) {
+      session.hasOpenedBrowser = true;
+      void openBrowser(session.connectionId, initialWorkspaceId, preferredBridgeName, apiUrl, logFn);
     }
   }, BROWSER_OPEN_FALLBACK_MS);
-  connect();
+  connectPendingAuth({
+    session,
+    apiUrl,
+    initialWorkspaceId,
+    preferredBridgeName,
+    onAuth,
+    log: logFn
+  });
   return {
     close: () => {
-      if (!resolved) resolveAuth(null);
-      cleanup();
+      if (!session.resolved) session.resolveAuth(null);
+      cleanupPendingAuthSession(session);
     },
-    authPromise
+    authPromise: session.authPromise
   };
 }
 
@@ -33712,7 +33775,7 @@ async function createCursorAcpClient(options) {
     onFileChange,
     stderrCapture
   });
-  return new Promise((resolve35, reject) => {
+  return new Promise((resolve36, reject) => {
     child.on("error", (err) => {
       killChildProcessTree(child, "SIGKILL");
       reject(new Error(formatSpawnError(err, command[0])));
@@ -33725,7 +33788,7 @@ async function createCursorAcpClient(options) {
           skipBrowserAuthenticate,
           incomingDeps: { dbgFs, sessionCtx, onSessionUpdate, onRequest }
         });
-        resolve35(
+        resolve36(
           createCursorAcpHandle({
             child,
             sessionId: established.sessionId,
@@ -35164,8 +35227,8 @@ async function runGitTask(fn) {
 }
 async function yieldToEventLoop2() {
   throwIfGitShutdownRequested();
-  await new Promise((resolve35) => {
-    setImmediate(resolve35);
+  await new Promise((resolve36) => {
+    setImmediate(resolve36);
   });
   throwIfGitShutdownRequested();
 }
@@ -35202,8 +35265,8 @@ async function execGitFile(args, options) {
 }
 
 // src/git/changes/parse/normalize-git-diff-path.ts
-function normalizeGitDiffPath(path84) {
-  return path84.replace(/\\/g, "/").replace(/\/ +/g, "/").trim();
+function normalizeGitDiffPath(path86) {
+  return path86.replace(/\\/g, "/").replace(/\/ +/g, "/").trim();
 }
 
 // src/git/changes/parse/parse-name-status-entries.ts
@@ -36692,11 +36755,11 @@ function isServerNotRunningError(err) {
 }
 function closeHttpServer(server) {
   if (!server) return Promise.resolve();
-  return new Promise((resolve35) => {
+  return new Promise((resolve36) => {
     server.close((err) => {
       if (err && !isServerNotRunningError(err)) {
       }
-      resolve35();
+      resolve36();
     });
   });
 }
@@ -36709,7 +36772,7 @@ var RequestBodyTooLargeError = class extends Error {
   }
 };
 function readJsonBody(req) {
-  return new Promise((resolve35, reject) => {
+  return new Promise((resolve36, reject) => {
     const chunks = [];
     let total = 0;
     let tooLarge = false;
@@ -36729,11 +36792,11 @@ function readJsonBody(req) {
       try {
         const raw = Buffer.concat(chunks).toString("utf8").trim();
         if (!raw) {
-          resolve35({});
+          resolve36({});
           return;
         }
         const parsed = JSON.parse(raw);
-        resolve35(parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {});
+        resolve36(parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {});
       } catch (e) {
         reject(e);
       }
@@ -36791,7 +36854,7 @@ function createBridgeAccessRequestHandler(registry2) {
 // src/mcp/bridge-access/start-server.ts
 function startBridgeAccessServer(registry2) {
   const server = http.createServer(createBridgeAccessRequestHandler(registry2));
-  return new Promise((resolve35, reject) => {
+  return new Promise((resolve36, reject) => {
     server.once("error", reject);
     server.listen(0, "127.0.0.1", () => {
       const addr = server.address();
@@ -36799,7 +36862,7 @@ function startBridgeAccessServer(registry2) {
         reject(new Error("Bridge access server did not bind"));
         return;
       }
-      resolve35({
+      resolve36({
         port: addr.port,
         close: () => closeHttpServer(server)
       });
@@ -39406,8 +39469,8 @@ function pathspec(...paths) {
   cache.set(key, paths);
   return key;
 }
-function isPathSpec(path84) {
-  return path84 instanceof String && cache.has(path84);
+function isPathSpec(path86) {
+  return path86 instanceof String && cache.has(path86);
 }
 function toPaths(pathSpec) {
   return cache.get(pathSpec) || [];
@@ -39496,8 +39559,8 @@ function toLinesWithContent(input = "", trimmed2 = true, separator = "\n") {
 function forEachLineWithContent(input, callback) {
   return toLinesWithContent(input, true).map((line) => callback(line));
 }
-function folderExists(path84) {
-  return (0, import_file_exists.exists)(path84, import_file_exists.FOLDER);
+function folderExists(path86) {
+  return (0, import_file_exists.exists)(path86, import_file_exists.FOLDER);
 }
 function append(target, item) {
   if (Array.isArray(target)) {
@@ -39901,8 +39964,8 @@ function checkIsRepoRootTask() {
     commands,
     format: "utf-8",
     onError,
-    parser(path84) {
-      return /^\.(git)?$/.test(path84.trim());
+    parser(path86) {
+      return /^\.(git)?$/.test(path86.trim());
     }
   };
 }
@@ -40336,11 +40399,11 @@ function parseGrep(grep) {
   const paths = /* @__PURE__ */ new Set();
   const results = {};
   forEachLineWithContent(grep, (input) => {
-    const [path84, line, preview] = input.split(NULL);
-    paths.add(path84);
-    (results[path84] = results[path84] || []).push({
+    const [path86, line, preview] = input.split(NULL);
+    paths.add(path86);
+    (results[path86] = results[path86] || []).push({
       line: asNumber(line),
-      path: path84,
+      path: path86,
       preview
     });
   });
@@ -41105,14 +41168,14 @@ var init_hash_object = __esm2({
     init_task();
   }
 });
-function parseInit(bare, path84, text) {
+function parseInit(bare, path86, text) {
   const response = String(text).trim();
   let result;
   if (result = initResponseRegex.exec(response)) {
-    return new InitSummary(bare, path84, false, result[1]);
+    return new InitSummary(bare, path86, false, result[1]);
   }
   if (result = reInitResponseRegex.exec(response)) {
-    return new InitSummary(bare, path84, true, result[1]);
+    return new InitSummary(bare, path86, true, result[1]);
   }
   let gitDir = "";
   const tokens = response.split(" ");
@@ -41123,7 +41186,7 @@ function parseInit(bare, path84, text) {
       break;
     }
   }
-  return new InitSummary(bare, path84, /^re/i.test(response), gitDir);
+  return new InitSummary(bare, path86, /^re/i.test(response), gitDir);
 }
 var InitSummary;
 var initResponseRegex;
@@ -41132,9 +41195,9 @@ var init_InitSummary = __esm2({
   "src/lib/responses/InitSummary.ts"() {
     "use strict";
     InitSummary = class {
-      constructor(bare, path84, existing, gitDir) {
+      constructor(bare, path86, existing, gitDir) {
         this.bare = bare;
-        this.path = path84;
+        this.path = path86;
         this.existing = existing;
         this.gitDir = gitDir;
       }
@@ -41146,7 +41209,7 @@ var init_InitSummary = __esm2({
 function hasBareCommand(command) {
   return command.includes(bareCommand);
 }
-function initTask(bare = false, path84, customArgs) {
+function initTask(bare = false, path86, customArgs) {
   const commands = ["init", ...customArgs];
   if (bare && !hasBareCommand(commands)) {
     commands.splice(1, 0, bareCommand);
@@ -41155,7 +41218,7 @@ function initTask(bare = false, path84, customArgs) {
     commands,
     format: "utf-8",
     parser(text) {
-      return parseInit(commands.includes("--bare"), path84, text);
+      return parseInit(commands.includes("--bare"), path86, text);
     }
   };
 }
@@ -41971,12 +42034,12 @@ var init_FileStatusSummary = __esm2({
     "use strict";
     fromPathRegex = /^(.+)\0(.+)$/;
     FileStatusSummary = class {
-      constructor(path84, index, working_dir) {
-        this.path = path84;
+      constructor(path86, index, working_dir) {
+        this.path = path86;
         this.index = index;
         this.working_dir = working_dir;
         if (index === "R" || working_dir === "R") {
-          const detail = fromPathRegex.exec(path84) || [null, path84, path84];
+          const detail = fromPathRegex.exec(path86) || [null, path86, path86];
           this.from = detail[2] || "";
           this.path = detail[1] || "";
         }
@@ -42007,14 +42070,14 @@ function splitLine(result, lineStr) {
     default:
       return;
   }
-  function data(index, workingDir, path84) {
+  function data(index, workingDir, path86) {
     const raw = `${index}${workingDir}`;
     const handler = parsers6.get(raw);
     if (handler) {
-      handler(result, path84);
+      handler(result, path86);
     }
     if (raw !== "##" && raw !== "!!") {
-      result.files.push(new FileStatusSummary(path84, index, workingDir));
+      result.files.push(new FileStatusSummary(path86, index, workingDir));
     }
   }
 }
@@ -42323,9 +42386,9 @@ var init_simple_git_api = __esm2({
           next
         );
       }
-      hashObject(path84, write) {
+      hashObject(path86, write) {
         return this._runTask(
-          hashObjectTask(path84, write === true),
+          hashObjectTask(path86, write === true),
           trailingFunctionArgument(arguments)
         );
       }
@@ -42678,8 +42741,8 @@ var init_branch = __esm2({
   }
 });
 function toPath(input) {
-  const path84 = input.trim().replace(/^["']|["']$/g, "");
-  return path84 && normalize3(path84);
+  const path86 = input.trim().replace(/^["']|["']$/g, "");
+  return path86 && normalize3(path86);
 }
 var parseCheckIgnore;
 var init_CheckIgnore = __esm2({
@@ -42993,8 +43056,8 @@ __export2(sub_module_exports, {
   subModuleTask: () => subModuleTask,
   updateSubModuleTask: () => updateSubModuleTask
 });
-function addSubModuleTask(repo, path84) {
-  return subModuleTask(["add", repo, path84]);
+function addSubModuleTask(repo, path86) {
+  return subModuleTask(["add", repo, path86]);
 }
 function initSubModuleTask(customArgs) {
   return subModuleTask(["init", ...customArgs]);
@@ -43327,8 +43390,8 @@ var require_git = __commonJS2({
       }
       return this._runTask(straightThroughStringTask2(command, this._trimmed), next);
     };
-    Git2.prototype.submoduleAdd = function(repo, path84, then) {
-      return this._runTask(addSubModuleTask2(repo, path84), trailingFunctionArgument2(arguments));
+    Git2.prototype.submoduleAdd = function(repo, path86, then) {
+      return this._runTask(addSubModuleTask2(repo, path86), trailingFunctionArgument2(arguments));
     };
     Git2.prototype.submoduleUpdate = function(args, then) {
       return this._runTask(
@@ -44067,8 +44130,8 @@ function parseNumstatEntries(lines) {
 }
 function parseNumstat(lines) {
   const m = /* @__PURE__ */ new Map();
-  for (const [path84, entry] of parseNumstatEntries(lines)) {
-    m.set(path84, { additions: entry.additions, deletions: entry.deletions });
+  for (const [path86, entry] of parseNumstatEntries(lines)) {
+    m.set(path86, { additions: entry.additions, deletions: entry.deletions });
   }
   return m;
 }
@@ -48156,7 +48219,7 @@ init_symbol_index_file_ready();
 var CODE_NAV_INDEX_READY_WAIT_MS = 75;
 var CODE_NAV_INDEX_READY_POLL_MS = 15;
 function delay2(ms) {
-  return new Promise((resolve35) => setTimeout(resolve35, ms));
+  return new Promise((resolve36) => setTimeout(resolve36, ms));
 }
 async function waitForSymbolIndexReady(sessionParentPath, reqPath, maxWaitMs = CODE_NAV_INDEX_READY_WAIT_MS) {
   const deadline = Date.now() + maxWaitMs;
@@ -48288,12 +48351,12 @@ function parseOptionalInt2(raw) {
   return Number.isInteger(parsed) ? parsed : void 0;
 }
 function parseCodeNavParams(url2) {
-  const path84 = url2.searchParams.get("path") ?? "";
+  const path86 = url2.searchParams.get("path") ?? "";
   const opRaw = url2.searchParams.get("op")?.trim();
   const op = opRaw === "references" ? "references" : opRaw === "symbols" ? "symbols" : opRaw === "definitions" ? "definitions" : "definition";
   const line = parseOptionalInt2(url2.searchParams.get("line")) ?? 1;
   const column = parseOptionalInt2(url2.searchParams.get("column")) ?? 0;
-  return { path: path84, op, line, column };
+  return { path: path86, op, line, column };
 }
 function parseCodeNavPath(url2) {
   const raw = url2.searchParams.get("path")?.trim();
@@ -48469,7 +48532,7 @@ function createLocalShortcutRequestHandler(ctx) {
 var RESTART_DELAY_MS = 250;
 var MAX_RESTART_ATTEMPTS = 5;
 function listenOnPort(server, port) {
-  return new Promise((resolve35, reject) => {
+  return new Promise((resolve36, reject) => {
     server.once("error", reject);
     server.listen(port, "127.0.0.1", () => {
       const addr = server.address();
@@ -48477,12 +48540,12 @@ function listenOnPort(server, port) {
         reject(new Error("Local shortcut server did not bind"));
         return;
       }
-      resolve35(addr.port);
+      resolve36(addr.port);
     });
   });
 }
 function delay3(ms) {
-  return new Promise((resolve35) => setTimeout(resolve35, ms));
+  return new Promise((resolve36) => setTimeout(resolve36, ms));
 }
 function startLocalShortcutServer(ctx) {
   let closed = false;
@@ -48682,7 +48745,8 @@ var API_TO_BRIDGE_MESSAGE_TYPES = [
   "install_agent",
   "refresh_local_skills",
   "bridge_git_context_request",
-  "list_repo_branches_request"
+  "list_repo_branches_request",
+  "bridge_git_checkout_request"
 ];
 var API_TO_BRIDGE_TYPE_SET = new Set(API_TO_BRIDGE_MESSAGE_TYPES);
 function parseApiToBridgeMessage(data, log2) {
@@ -49375,10 +49439,10 @@ async function awaitGitStatePreparation(options) {
   try {
     return await Promise.race([
       work,
-      new Promise((resolve35) => {
+      new Promise((resolve36) => {
         timer = setTimeout(() => {
           log2(`[Agent] ${label} exceeded ${timeoutMs}ms; continuing without it.`);
-          resolve35(fallback);
+          resolve36(fallback);
         }, timeoutMs);
         timer.unref?.();
       })
@@ -50037,7 +50101,7 @@ var handleInstallSkillsMessage = (msg, deps) => {
 import { spawn as spawn11 } from "node:child_process";
 import * as readline3 from "node:readline";
 function runStreamingCommand(command, args, options) {
-  return new Promise((resolve35, reject) => {
+  return new Promise((resolve36, reject) => {
     const child = spawn11(command, args, {
       env: options.env,
       stdio: ["ignore", "pipe", "pipe"]
@@ -50070,7 +50134,7 @@ function runStreamingCommand(command, args, options) {
       if (timer) clearTimeout(timer);
       if (!settled) {
         settled = true;
-        resolve35({ code, signal });
+        resolve36({ code, signal });
       }
     });
   });
@@ -50509,6 +50573,23 @@ async function listRepoBranchRefs(repoPath) {
   }
 }
 
+// src/git/checkout/pending-checkouts.ts
+var pendingByRelPath = /* @__PURE__ */ new Map();
+function beginPendingCheckout(row) {
+  const relPath = row.relPath.trim() || ".";
+  pendingByRelPath.set(relPath, {
+    relPath,
+    folderName: row.folderName.trim() || (relPath === "." ? "repo" : relPath),
+    remoteUrl: row.remoteUrl
+  });
+}
+function endPendingCheckout(relPath) {
+  pendingByRelPath.delete(relPath.trim() || ".");
+}
+function listPendingCheckouts() {
+  return [...pendingByRelPath.values()];
+}
+
 // src/git/bridge-git-context.ts
 function folderNameForRelPath(relPath, bridgeRoot) {
   if (relPath === "." || relPath === "") {
@@ -50545,7 +50626,23 @@ async function getBridgeGitContext(bridgeRoot = getBridgeRoot()) {
       relPath,
       folderName: folderNameForRelPath(relPath, bridgeResolved),
       currentBranch,
-      remoteUrl
+      remoteUrl,
+      cloning: false
+    });
+  }
+  const seen = new Set(rows.map((r) => r.relPath));
+  for (const pending2 of listPendingCheckouts()) {
+    if (seen.has(pending2.relPath)) {
+      const row = rows.find((r) => r.relPath === pending2.relPath);
+      if (row) row.cloning = true;
+      continue;
+    }
+    rows.push({
+      relPath: pending2.relPath,
+      folderName: pending2.folderName,
+      currentBranch: null,
+      remoteUrl: pending2.remoteUrl,
+      cloning: true
     });
   }
   rows.sort((a, b) => a.relPath.localeCompare(b.relPath));
@@ -50605,6 +50702,143 @@ function handleListRepoBranchesRequestMessage(msg, getWs) {
   })();
 }
 
+// src/git/checkout/bridge-git-checkout.ts
+import * as fs64 from "node:fs/promises";
+import * as path85 from "node:path";
+
+// src/git/checkout/normalize-clone-url.ts
+function normalizeCloneUrl(url2) {
+  const u = url2.trim();
+  if (!u.startsWith("http://") && !u.startsWith("https://")) {
+    throw new Error("Only http(s) git remote URLs are supported");
+  }
+  return u.endsWith(".git") ? u : `${u}.git`;
+}
+function cloneUrlWithHttpsAuth(url2, auth) {
+  const normalized = normalizeCloneUrl(url2);
+  if (!auth) return normalized;
+  const parsed = new URL(normalized);
+  parsed.username = auth.username;
+  parsed.password = auth.password;
+  return parsed.toString();
+}
+
+// src/git/checkout/resolve-checkout-target.ts
+import * as fs63 from "node:fs/promises";
+import * as path84 from "node:path";
+var FOLDER_NAME_RE = /^[A-Za-z0-9._-]+$/;
+async function pathExists(p) {
+  try {
+    await fs63.access(p);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function resolveCheckoutTarget(opts) {
+  const bridgeRoot = getBridgeRoot();
+  if (opts.layout === "monorepo") {
+    if (await isGitRepoDirectory(bridgeRoot)) {
+      throw new Error("Bridge root is already a git repository");
+    }
+    const entries = await fs63.readdir(bridgeRoot).catch(() => []);
+    if (entries.length > 0) {
+      throw new Error("Bridge root must be empty to initialize a monorepo checkout");
+    }
+    return { targetDir: bridgeRoot, relPath: "." };
+  }
+  const folder = (opts.folderName ?? "").trim();
+  if (!folder || folder === "." || folder === ".." || !FOLDER_NAME_RE.test(folder)) {
+    throw new Error("folderName must be a single path segment (letters, numbers, . _ -)");
+  }
+  if (await isGitRepoDirectory(bridgeRoot)) {
+    throw new Error("Cannot add a nested repo while the bridge root is itself a git repository");
+  }
+  const targetDir = path84.resolve(bridgeRoot, folder);
+  if (!targetDir.startsWith(bridgeRoot + path84.sep)) {
+    throw new Error("Invalid folderName");
+  }
+  if (await pathExists(targetDir)) {
+    throw new Error(`Folder already exists: ${folder}`);
+  }
+  return { targetDir, relPath: folder };
+}
+
+// src/git/checkout/bridge-git-checkout.ts
+async function bridgeGitCheckout(params) {
+  const cloneUrl = (params.cloneUrl ?? "").trim();
+  if (!cloneUrl) throw new Error("cloneUrl required");
+  const { targetDir, relPath } = await resolveCheckoutTarget({
+    layout: params.layout,
+    folderName: params.folderName
+  });
+  const folderName = relPath === "." ? "repo" : relPath;
+  beginPendingCheckout({ relPath, folderName, remoteUrl: cloneUrl });
+  const parent = path85.dirname(targetDir);
+  await fs64.mkdir(parent, { recursive: true });
+  if (relPath !== ".") {
+    await fs64.mkdir(targetDir, { recursive: true });
+  }
+  const url2 = cloneUrlWithHttpsAuth(cloneUrl, params.auth ?? null);
+  try {
+    await execGitFile(["clone", "--", url2, targetDir], {
+      cwd: parent,
+      env: { ...process.env, GIT_TERMINAL_PROMPT: "0" }
+    });
+    return { relPath, folderName };
+  } catch (e) {
+    if (relPath !== ".") {
+      await fs64.rm(targetDir, { recursive: true, force: true }).catch(() => void 0);
+    }
+    const msg = e instanceof Error ? e.message : String(e);
+    throw new Error(
+      msg.includes("Authentication") || msg.includes("403") || msg.includes("401") ? `Clone failed (auth?): ${msg}` : `Clone failed: ${msg}`
+    );
+  } finally {
+    endPendingCheckout(relPath);
+  }
+}
+
+// src/routing/handlers/bridge-git-checkout-messages.ts
+function handleBridgeGitCheckoutRequestMessage(msg, getWs) {
+  void (async () => {
+    const socket = getWs();
+    if (!socket) return;
+    const layout = msg.layout === "multi_repo" ? "multi_repo" : msg.layout === "monorepo" ? "monorepo" : null;
+    if (!layout) {
+      sendWsMessage(socket, {
+        type: "bridge_git_checkout_response",
+        id: msg.id,
+        error: "layout must be monorepo or multi_repo"
+      });
+      return;
+    }
+    try {
+      const user = typeof msg.authUsername === "string" ? msg.authUsername : "";
+      const pass = typeof msg.authPassword === "string" ? msg.authPassword : "";
+      const result = await bridgeGitCheckout({
+        layout,
+        folderName: msg.folderName,
+        cloneUrl: msg.cloneUrl ?? "",
+        auth: user && pass ? { username: user, password: pass } : null
+      });
+      sendWsMessage(socket, {
+        type: "bridge_git_checkout_response",
+        id: msg.id,
+        ok: true,
+        relPath: result.relPath,
+        folderName: result.folderName
+      });
+    } catch (e) {
+      sendWsMessage(socket, {
+        type: "bridge_git_checkout_response",
+        id: msg.id,
+        error: e instanceof Error ? e.message : String(e)
+      });
+    }
+  })();
+}
+
 // src/routing/dispatch/file-browser.ts
 function dispatchBridgeFileBrowserMessage(msg, deps) {
   switch (msg.type) {
@@ -50623,6 +50857,9 @@ function dispatchBridgeFileBrowserMessage(msg, deps) {
     case "list_repo_branches_request":
       handleListRepoBranchesRequestMessage(msg, deps.getWs);
       break;
+    case "bridge_git_checkout_request":
+      handleBridgeGitCheckoutRequestMessage(msg, deps.getWs);
+      break;
   }
 }
 
@@ -50663,6 +50900,7 @@ function dispatchBridgeMessage(msg, deps) {
     case "code_nav":
     case "bridge_git_context_request":
     case "list_repo_branches_request":
+    case "bridge_git_checkout_request":
       dispatchBridgeFileBrowserMessage(msg, deps);
       break;
   }
@@ -51046,32 +51284,42 @@ async function openE2eCertificateImportUrl({
   }
 }
 
-// src/run-bridge-connected.ts
+// src/run-bridge-e2ee-key-command.ts
+function installConnectedBridgeE2eeKeyCommand(params) {
+  let openingCertificate = false;
+  return installE2eCertificateKeyCommand({
+    log: params.log,
+    onInterrupt: params.onInterrupt,
+    onOpenCertificate: () => {
+      if (openingCertificate) return;
+      openingCertificate = true;
+      void openE2eCertificateImportUrl({
+        apiUrl: params.apiUrl,
+        workspaceId: params.workspaceId,
+        certificate: params.e2eCertificate,
+        log: params.log
+      }).finally(() => {
+        openingCertificate = false;
+      });
+    }
+  });
+}
+
+// src/run-bridge-connected-signals.ts
+init_log();
 init_cli_process_interrupt();
-init_cli_database();
-async function runConnectedBridge(options, restartWithoutAuth) {
-  const {
-    apiUrl,
-    workspaceId,
-    authToken,
-    refreshToken,
-    justAuthenticated,
-    worktreesRootPath,
-    e2eCertificate
-  } = options;
-  const firehoseServerUrl = options.firehoseServerUrl ?? options.proxyServerUrl;
-  let cleanupKeyCommand;
-  let bridgeClose = null;
+function installConnectedBridgeSignals(params) {
   let shutdownStarted = false;
   const onSignal = (kind) => {
     requestCliImmediateShutdown();
     abortActiveGitChildProcesses();
-    cleanupKeyCommand?.();
+    params.cleanupKeyCommand();
     if (shutdownStarted) return;
     shutdownStarted = true;
     logImmediate(
       kind === "interrupt" ? "Keyboard interrupt (Ctrl+C) \u2014 stopping\u2026" : "Stop requested \u2014 shutting down\u2026"
     );
+    const bridgeClose = params.getBridgeClose();
     if (bridgeClose) {
       void bridgeClose().finally(() => process.exit(0));
       return;
@@ -51082,9 +51330,56 @@ async function runConnectedBridge(options, restartWithoutAuth) {
   const onSigTerm = () => onSignal("stop");
   process.on("SIGINT", onSigInt);
   process.on("SIGTERM", onSigTerm);
-  let handle;
+  return {
+    onSigInt,
+    remove: () => {
+      process.off("SIGINT", onSigInt);
+      process.off("SIGTERM", onSigTerm);
+    }
+  };
+}
+
+// src/run-bridge-on-auth-invalid.ts
+init_cli_process_interrupt();
+async function closeBridgeForReauth(params) {
+  params.log("[Bridge service] Access token invalid or revoked; re-authenticating\u2026");
+  clearConfigForApi(params.apiUrl);
+  await params.close();
+  params.removeSignalHandlers();
+  await clearCliImmediateShutdown();
+  params.endConnectedSession();
+}
+
+// src/run-bridge-connected.ts
+init_cli_database();
+async function runConnectedBridge(options, restartWithoutAuth) {
+  const {
+    apiUrl,
+    workspaceId,
+    authToken,
+    refreshToken,
+    justAuthenticated,
+    worktreesRootPath,
+    e2eCertificate
+  } = options;
+  const firehoseServerUrl = options.firehoseServerUrl ?? options.proxyServerUrl;
+  let cleanupKeyCommand;
+  let bridgeClose = null;
+  let endConnectedSession;
+  const sessionDone = new Promise((resolve36) => {
+    endConnectedSession = resolve36;
+  });
+  let resolveHandleReady;
+  const handleReady = new Promise((resolve36) => {
+    resolveHandleReady = resolve36;
+  });
+  const handleRef = { current: null };
+  const signals = installConnectedBridgeSignals({
+    getBridgeClose: () => bridgeClose,
+    cleanupKeyCommand: () => cleanupKeyCommand?.()
+  });
   try {
-    handle = await createBridgeConnection({
+    const handle = await createBridgeConnection({
       apiUrl,
       workspaceId,
       authToken,
@@ -51103,41 +51398,40 @@ async function runConnectedBridge(options, restartWithoutAuth) {
       },
       onAuthInvalid: () => {
         cleanupKeyCommand?.();
-        log("[Bridge service] Access token invalid or revoked; re-authenticating\u2026");
-        clearConfigForApi(apiUrl);
-        void handle.close().then(() => {
-          void restartWithoutAuth({ apiUrl, firehoseServerUrl, worktreesRootPath, e2eCertificate });
-        });
+        void (async () => {
+          await handleReady;
+          await closeBridgeForReauth({
+            apiUrl,
+            log,
+            close: async () => {
+              if (handleRef.current) await handleRef.current.close();
+            },
+            removeSignalHandlers: signals.remove,
+            endConnectedSession
+          });
+        })();
       }
     });
-  } catch (e) {
-    process.off("SIGINT", onSigInt);
-    process.off("SIGTERM", onSigTerm);
-    if (e instanceof CliSqliteInterrupted) {
-      process.exit(0);
+    handleRef.current = handle;
+    bridgeClose = () => handle.close();
+    if (e2eCertificate) {
+      cleanupKeyCommand = installConnectedBridgeE2eeKeyCommand({
+        apiUrl,
+        workspaceId,
+        e2eCertificate,
+        log,
+        onInterrupt: signals.onSigInt
+      });
     }
+  } catch (e) {
+    signals.remove();
+    if (e instanceof CliSqliteInterrupted) process.exit(0);
     throw e;
+  } finally {
+    resolveHandleReady();
   }
-  bridgeClose = () => handle.close();
-  if (e2eCertificate) {
-    let openingCertificate = false;
-    cleanupKeyCommand = installE2eCertificateKeyCommand({
-      log,
-      onInterrupt: onSigInt,
-      onOpenCertificate: () => {
-        if (openingCertificate) return;
-        openingCertificate = true;
-        void openE2eCertificateImportUrl({
-          apiUrl,
-          workspaceId,
-          certificate: e2eCertificate,
-          log
-        }).finally(() => {
-          openingCertificate = false;
-        });
-      }
-    });
-  }
+  await sessionDone;
+  await restartWithoutAuth({ apiUrl, firehoseServerUrl, worktreesRootPath, e2eCertificate });
 }
 
 // src/run-bridge.ts
@@ -51181,12 +51475,16 @@ async function runBridge(options) {
     process.off("SIGINT", onSigInt);
     process.off("SIGTERM", onSigTerm);
     handle.close();
-    if (!auth) return;
+    if (!auth) {
+      log("Sign-in ended before a token was received.");
+      return;
+    }
     writeConfigForApi(apiUrl, {
       workspaceId: auth.workspaceId,
       token: auth.token,
       refreshToken: auth.refreshToken
     });
+    log("Link established. Connecting with the new token\u2026");
     await runBridge({
       apiUrl,
       workspaceId: auth.workspaceId,