claude-use 11.62.2 → 11.63.0

package/dist/index.mjs

@@ -3901,12 +3901,13 @@ function pruneDeadFrontDoorSessions(fs14, sessionsDir, listed, isRunning) {
   }
   return removed;
 }
-var FRONT_DOOR_PROTOCOL, FrontDoorSessionSchema, FrontDoorStateSchema, MAX_TCP_PORT, FrontDoorDirectRecordSchema, RECORD_TEMPORARY_FILE;
+var FRONT_DOOR_PROTOCOL, FRONT_DOOR_HANDOVER_PROTOCOL, FrontDoorSessionSchema, FrontDoorStateSchema, MAX_TCP_PORT, FrontDoorDirectRecordSchema, RECORD_TEMPORARY_FILE;
 var init_state = __esm({
   "src/frontdoor/state.ts"() {
     "use strict";
     init_schema();
-    FRONT_DOOR_PROTOCOL = 5;
+    FRONT_DOOR_PROTOCOL = 6;
+    FRONT_DOOR_HANDOVER_PROTOCOL = 6;
     FrontDoorSessionSchema = z5.strictObject({ pid: z5.number().int().positive(), startedAt: z5.number(), token: z5.string().min(1), supervisorPid: z5.number().int().positive().optional(), sessionId: z5.string().min(1).optional(), models: ModelsConfigSchema.optional() });
     FrontDoorStateSchema = z5.strictObject({
       /**
@@ -4003,18 +4004,24 @@ async function serveFrontDoor(idleShutdownMinutes, ports, options) {
     ...lastConnectPort === void 0 ? {} : { lastConnectPort },
     ...lastDirectPort === void 0 ? {} : { lastDirectPort }
   });
+  const { predecessor } = ports;
+  const sourceOf = (listener, preferredPort) => predecessor === void 0 ? { preferredPort } : { inherit: async () => await predecessor.take(listener) };
   const fail = (message) => {
     ports.closeRcStreamHub();
-    writeFrontDoorState(fs14, paths.frontdoorStateFile, { lastError: message, ...sticky() });
-    fs14.removeRecursive(paths.frontdoorLockFile);
+    if (predecessor === void 0) {
+      writeFrontDoorState(fs14, paths.frontdoorStateFile, { lastError: message, ...sticky() });
+      fs14.removeRecursive(paths.frontdoorLockFile);
+    }
     ports.log(`agent-shim frontdoor supervisor: ${message}`);
     return 1;
   };
-  writeFrontDoorState(fs14, paths.frontdoorStateFile, { supervisorPid: ports.ownPid, ...sticky() });
+  if (predecessor === void 0) {
+    writeFrontDoorState(fs14, paths.frontdoorStateFile, { supervisorPid: ports.ownPid, ...sticky() });
+  }
   const previousSticky = lastPort;
   let http3;
   try {
-    http3 = await ports.startProviderListener(lastPort);
+    http3 = await ports.startProviderListener(sourceOf("provider", lastPort));
   } catch (error) {
     ports.doorHealth.listenerFailed("provider", error instanceof Error ? error.message : String(error));
     return fail(`could not start the provider listener: ${error instanceof Error ? error.message : String(error)}`);
@@ -4026,7 +4033,7 @@ async function serveFrontDoor(idleShutdownMinutes, ports, options) {
   const previousStickyConnect = lastConnectPort;
   let connect3;
   try {
-    connect3 = await ports.startConnectListener(lastConnectPort);
+    connect3 = await ports.startConnectListener(sourceOf("connect", lastConnectPort));
   } catch (error) {
     await http3.close();
     ports.doorHealth.listenerFailed("connect", error instanceof Error ? error.message : String(error));
@@ -4039,7 +4046,7 @@ async function serveFrontDoor(idleShutdownMinutes, ports, options) {
   const previousStickyDirect = lastDirectPort;
   let direct;
   try {
-    direct = await ports.startDirectListener(lastDirectPort);
+    direct = await ports.startDirectListener(sourceOf("direct", lastDirectPort));
   } catch (error) {
     await connect3.close();
     await http3.close();
@@ -4053,8 +4060,12 @@ async function serveFrontDoor(idleShutdownMinutes, ports, options) {
   writeFrontDoorDirectRecord(fs14, paths.frontdoorDirectRecordsDir, { pid: ports.ownPid, directPort: direct.port });
   writeFrontDoorState(fs14, paths.frontdoorStateFile, { protocol: FRONT_DOOR_PROTOCOL, supervisorPid: ports.ownPid, port: http3.port, connectPort: connect3.port, directPort: direct.port, ...sticky() });
   ports.doorHealth.generation({ providerPort: http3.port, connectPort: connect3.port, directPort: direct.port });
-  fs14.removeRecursive(paths.frontdoorLockFile);
-  ports.log(`agent-shim frontdoor supervisor ${String(ports.ownPid)}: front door on 127.0.0.1:${String(http3.port)}, CONNECT surface on 127.0.0.1:${String(connect3.port)}`);
+  if (predecessor === void 0) {
+    fs14.removeRecursive(paths.frontdoorLockFile);
+  } else {
+    predecessor.serving();
+  }
+  ports.log(`agent-shim frontdoor supervisor ${String(ports.ownPid)}: front door on 127.0.0.1:${String(http3.port)}, CONNECT surface on 127.0.0.1:${String(connect3.port)}${predecessor === void 0 ? "" : ", taken over from the door it replaced"}`);
   const watchdog = ports.startWatchdog?.();
   let idleSince;
   let ticks = 0;
@@ -4074,14 +4085,16 @@ async function serveFrontDoor(idleShutdownMinutes, ports, options) {
         resolve();
       };
       ports.retire?.addEventListener("abort", wake, { once: true });
+      ports.handover?.requested.addEventListener("abort", wake, { once: true });
       void ports.sleep(FRONTDOOR_POLL_MS).then(() => {
         ports.retire?.removeEventListener("abort", wake);
+        ports.handover?.requested.removeEventListener("abort", wake);
         resolve();
       });
     });
   };
   const retireByDrain = async () => {
-    ports.log(`agent-shim frontdoor supervisor ${String(ports.ownPid)}: asked to exit; releasing the front door's addresses and finishing the connections it carries`);
+    ports.log(`agent-shim frontdoor supervisor ${String(ports.ownPid)}: releasing the front door's addresses and finishing the connections it carries`);
     watchdog?.stop();
     ports.stopBackgroundWork?.();
     const drained = [direct.drain(), connect3.drain(), http3.drain()];
@@ -4096,6 +4109,17 @@ async function serveFrontDoor(idleShutdownMinutes, ports, options) {
     ports.log(`agent-shim frontdoor supervisor ${String(ports.ownPid)}: the connections this door carried have ended; exiting`);
     return 0;
   };
+  const handOverThenDrain = async (run) => {
+    ports.log(`agent-shim frontdoor supervisor ${String(ports.ownPid)}: asked to hand the front door's listeners to a successor; accepting on them until it serves`);
+    const outcome = await run({ provider: http3.listening, connect: connect3.listening, direct: direct.listening });
+    if (outcome.ok) {
+      ports.log(`agent-shim frontdoor supervisor ${String(ports.ownPid)}: successor ${String(outcome.successorPid)} serves the front door's listeners`);
+      ports.doorHealth.superseded(outcome.successorPid);
+    } else {
+      ports.log(`agent-shim frontdoor supervisor ${String(ports.ownPid)}: the handover failed (${outcome.reason}); retiring by drain so a successor is started on the released addresses`);
+    }
+    return await retireByDrain();
+  };
   const closeServing = async () => {
     watchdog?.stop();
     await direct.close();
@@ -4112,10 +4136,13 @@ async function serveFrontDoor(idleShutdownMinutes, ports, options) {
     return 0;
   };
   for (; ; ) {
-    watchdog?.beat();
     if (ports.retire?.aborted === true) {
+      ports.log(`agent-shim frontdoor supervisor ${String(ports.ownPid)}: asked to exit`);
       return await retireByDrain();
     }
+    if (ports.handover?.requested.aborted === true && supersededBy === void 0) {
+      return await handOverThenDrain(ports.handover.run);
+    }
     if (options.tickLimit !== void 0 && ticks >= options.tickLimit) {
       watchdog?.stop();
       return FRONTDOOR_SUPERVISOR_STILL_RUNNING;
@@ -4253,8 +4280,10 @@ function caParses(ca) {
     return false;
   }
 }
-async function startConnectServer(config, effects, preferredPort) {
+async function startConnectServer(config, effects, source) {
   const tunnelTokens = /* @__PURE__ */ new WeakMap();
+  const ledger = createConnectionLedger(config.limits, config.isLiveCapability);
+  const lateSessionDeadlines = /* @__PURE__ */ new WeakMap();
   const onUpgrade = (host) => (request4, socket, head) => {
     config.capture?.upgrade(request4);
     if (head.length > 0) {
@@ -4276,6 +4305,12 @@ ${request4.rawHeaders.reduce((accumulated, value, index) => index % 2 === 0 ? `$
       return { host, serveSecure: serveSecure2, tlsAcceptor: tlsAcceptor2 };
     }
     const handleHostRequest = async (request4, response) => {
+      if (ledger.retiring()) {
+        clearTimeout(lateSessionDeadlines.get(request4.socket));
+        response.once("close", () => {
+          request4.socket.end();
+        });
+      }
       if (config.localSurface !== void 0 && await config.localSurface.serve(host, request4, response)) {
         return;
       }
@@ -4295,13 +4330,19 @@ ${request4.rawHeaders.reduce((accumulated, value, index) => index % 2 === 0 ? `$
     const httpSession = effects.createHttpSession(handler, onUpgrade(host));
     const serveSecure = (secure, capability) => {
       tunnelTokens.set(secure, capability);
+      if (ledger.retiring()) {
+        const deadline = setTimeout(() => {
+          secure.destroy();
+        }, config.limits.headDeadlineMs);
+        deadline.unref();
+        lateSessionDeadlines.set(secure, deadline);
+      }
       httpSession.serve(secure);
     };
     const tlsAcceptor = effects.createTlsAcceptor(config.leafFor(host), serveSecure);
     return { host, serveSecure, httpSession, tlsAcceptor };
   });
-  const ledger = createConnectionLedger(config.limits, config.isLiveCapability);
-  const listener = await effects.listenLoopback(preferredPort, (socket) => {
+  const listener = await effects.listenLoopback(source, (socket) => {
     handleConnect(socket, { config, effects, sessions, ledger });
   });
   const apiSession = sessions.find((session) => session.host === config.routedHost);
@@ -4314,7 +4355,7 @@ ${request4.rawHeaders.reduce((accumulated, value, index) => index % 2 === 0 ? `$
     }
     session.serveSecure(secure, config.transparentCapability ?? "");
   });
-  const transparent = config.transparentPort === void 0 || apiSession === void 0 ? void 0 : await effects.listenLoopback(config.transparentPort, (socket) => {
+  const transparent = config.transparentPort === void 0 || apiSession === void 0 ? void 0 : await effects.listenLoopback({ preferredPort: config.transparentPort }, (socket) => {
     sniAcceptor.accept(socket);
   });
   const closeSurface = async () => {
@@ -4329,6 +4370,7 @@ ${request4.rawHeaders.reduce((accumulated, value, index) => index % 2 === 0 ? `$
   };
   return {
     port: listener.port,
+    listening: listener.listening,
     ...transparent === void 0 ? {} : { transparentPort: transparent.port },
     openTunnels: ledger.openTunnels,
     drain: async () => {
@@ -4345,7 +4387,9 @@ function createConnectionLedger(limits, isLiveCapability2) {
   const authenticated = /* @__PURE__ */ new Map();
   let tunnels = 0;
   const blind = /* @__PURE__ */ new Set();
-  let onNoBlindTunnels;
+  const live = /* @__PURE__ */ new Set();
+  let retiring = false;
+  let onNoConnections;
   const leavePending = (socket) => {
     const deadline = pending.get(socket);
     if (deadline !== void 0) {
@@ -4377,20 +4421,19 @@ function createConnectionLedger(limits, isLiveCapability2) {
           refuse(socket, REFUSAL.requestTimeout);
         }, limits.headDeadlineMs)
       );
+      live.add(socket);
       socket.once("close", () => {
         leavePending(socket);
+        live.delete(socket);
+        if (live.size === 0) {
+          onNoConnections?.();
+        }
       });
     },
     headReceived: leavePending,
     openTunnels: () => tunnels,
     retire: async () => {
-      for (const socket of pending.keys()) {
-        socket.destroy();
-      }
-      for (const deadline of pending.values()) {
-        clearTimeout(deadline);
-      }
-      pending.clear();
+      retiring = true;
       for (const sockets of authenticated.values()) {
         for (const socket of sockets) {
           if (!blind.has(socket)) {
@@ -4398,12 +4441,13 @@ function createConnectionLedger(limits, isLiveCapability2) {
           }
         }
       }
-      if (blind.size > 0) {
+      if (live.size > 0) {
         await new Promise((resolve) => {
-          onNoBlindTunnels = resolve;
+          onNoConnections = resolve;
         });
       }
     },
+    retiring: () => retiring,
     establish: (socket, capability, kind) => {
       if (tunnels >= limits.maxTunnels) {
         return false;
@@ -4418,9 +4462,6 @@ function createConnectionLedger(limits, isLiveCapability2) {
       socket.once("close", () => {
         tunnels -= 1;
         blind.delete(socket);
-        if (blind.size === 0) {
-          onNoBlindTunnels?.();
-        }
         sockets.delete(socket);
         if (sockets.size === 0 && authenticated.get(capability) === sockets) {
           authenticated.delete(capability);
@@ -4628,7 +4669,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "claude-use",
-      version: "11.62.2",
+      version: "11.63.0",
       description: "A profile manager and launcher for Claude Code that lets one person run multiple logins from one machine while controlling what gets shared between them.",
       license: "MIT",
       author: "Joseph Mearman <joseph@mearman.co.uk>",
@@ -10155,7 +10196,8 @@ var init_replacement = __esm({
 import { randomUUID as randomUUID3 } from "node:crypto";
 function ensureFrontDoor(params) {
   const { paths, ports } = params;
-  const deadline = ports.now() + FRONTDOOR_START_TIMEOUT_MS;
+  const startedAt = ports.now();
+  let deadline = startedAt + FRONTDOOR_START_TIMEOUT_MS;
   let spawned = false;
   let replaced = false;
   const distrusted = /* @__PURE__ */ new Set();
@@ -10195,6 +10237,19 @@ function ensureFrontDoor(params) {
       ports.sleep(FRONTDOOR_LAUNCHER_POLL_MS);
     }
   };
+  const handOverAndAwait = (supervisorPid, doorProtocol, reason, request4) => {
+    recordReplacement(supervisorPid, doorProtocol, reason, "SIGUSR2");
+    request4(supervisorPid);
+    const waitEnds = ports.now() + FRONTDOOR_START_TIMEOUT_MS + FRONTDOOR_EXIT_GRACE_MS;
+    deadline += FRONTDOOR_START_TIMEOUT_MS + FRONTDOOR_EXIT_GRACE_MS;
+    while (ports.isRunning(supervisorPid) && readFrontDoorState(ports.fs, paths.frontdoorStateFile)?.supervisorPid === supervisorPid) {
+      if (ports.now() >= waitEnds) {
+        stopAndAwaitExit(supervisorPid, doorProtocol, reason, `the front door (pid ${String(supervisorPid)}) did not act on a request to hand its listeners over, and did not exit when asked to`);
+        return;
+      }
+      ports.sleep(FRONTDOOR_LAUNCHER_POLL_MS);
+    }
+  };
   for (; ; ) {
     const state = readFrontDoorState(ports.fs, paths.frontdoorStateFile);
     const supervisorPid = state?.supervisorPid;
@@ -10208,12 +10263,16 @@ function ensureFrontDoor(params) {
         const verdict = verifyWithRetry(state.port);
         const doorProtocol = state.protocol ?? 0;
         if (verdict.ok && !replaced && !spawned && (params.replace !== void 0 || doorProtocol < FRONT_DOOR_PROTOCOL)) {
-          stopAndAwaitExit(
-            supervisorPid,
-            doorProtocol,
-            params.replace ?? "protocol-older",
-            `the front door (pid ${String(supervisorPid)}, protocol ${String(doorProtocol)}; this launcher speaks protocol ${String(FRONT_DOOR_PROTOCOL)}) was asked to be replaced and did not exit`
-          );
+          if (params.replace !== void 0 && doorProtocol >= FRONT_DOOR_HANDOVER_PROTOCOL && ports.requestHandover !== void 0 && ports.isFrontDoorSupervisor(supervisorPid)) {
+            handOverAndAwait(supervisorPid, doorProtocol, params.replace, ports.requestHandover);
+          } else {
+            stopAndAwaitExit(
+              supervisorPid,
+              doorProtocol,
+              params.replace ?? "protocol-older",
+              `the front door (pid ${String(supervisorPid)}, protocol ${String(doorProtocol)}; this launcher speaks protocol ${String(FRONT_DOOR_PROTOCOL)}) was asked to be replaced and did not exit`
+            );
+          }
           replaced = true;
           continue;
         }
@@ -10265,7 +10324,7 @@ function ensureFrontDoor(params) {
     if (ports.now() >= deadline) {
       const lastError = state?.lastError;
       throw new FrontDoorStartError(
-        `the front door did not become ready within ${String(FRONTDOOR_START_TIMEOUT_MS)}ms` + (lastError === void 0 ? "" : ` (last error: ${lastError})`) + (lastRejection === void 0 ? "" : ` (${lastRejection})`) + (busyDoor === void 0 ? "" : `. It was not replaced because ${String(busyDoor.sessions)} live session(s) are using it and would lose their connections; run \`agent-shim frontdoor restart\` to replace it deliberately`) + `. Daemon log: ${paths.frontdoorLogPath}`
+        `the front door did not become ready within ${String(deadline - startedAt)}ms` + (lastError === void 0 ? "" : ` (last error: ${lastError})`) + (lastRejection === void 0 ? "" : ` (${lastRejection})`) + (busyDoor === void 0 ? "" : `. It was not replaced because ${String(busyDoor.sessions)} live session(s) are using it and would lose their connections; run \`agent-shim frontdoor restart\` to replace it deliberately`) + `. Daemon log: ${paths.frontdoorLogPath}`
       );
     }
     ports.sleep(FRONTDOOR_LAUNCHER_POLL_MS);
@@ -11908,6 +11967,12 @@ function realEnsurePorts(paths, spawnDaemon) {
     killSupervisor: (pid) => {
       process.kill(pid, "SIGKILL");
     },
+    // Windows has no user signals (Node refuses to send one), so a replacement there keeps the stop-and-start path.
+    ...process.platform === "win32" ? {} : {
+      requestHandover: (pid) => {
+        process.kill(pid, "SIGUSR2");
+      }
+    },
     // Read fresh for each probe: a replacement supervisor may have regenerated an unparseable CA, and the probe must trust exactly what the serving door's leaf chains to.
     verifyListener: (port) => probeFrontDoorSync(port, fs13.readFileSync(paths.frontdoorCaCertFile, "utf8"))
   };
@@ -14337,7 +14402,7 @@ function realRcStreamDial(target = { host: CONNECT_INTERCEPT_HOST, port: HTTPS_P
 function realConnectEffects(ports = DOOR_SOURCE_PORTS) {
   const plainAgent = new ExemptHttpAgent(ports);
   const tlsAgent = new ExemptTlsAgent(ports);
-  const listenOnce = async (port, onSocket) => await new Promise((resolve, reject) => {
+  const listenOnce = async (target, onSocket) => await new Promise((resolve, reject) => {
     const accepted = /* @__PURE__ */ new Set();
     const server = net2.createServer((socket) => {
       accepted.add(socket);
@@ -14347,7 +14412,7 @@ function realConnectEffects(ports = DOOR_SOURCE_PORTS) {
       onSocket(socket);
     });
     server.once("error", reject);
-    server.listen(port, "127.0.0.1", () => {
+    const onListening = () => {
       const address = server.address();
       const bound = typeof address === "object" && address !== null ? address.port : 0;
       if (bound === 0) {
@@ -14356,6 +14421,7 @@ function realConnectEffects(ports = DOOR_SOURCE_PORTS) {
       }
       resolve({
         port: bound,
+        listening: server,
         // The listening socket is released by `close` at once; the connections already accepted are untouched and keep the server's `close` callback pending until they end.
         stopAccepting: () => {
           server.close();
@@ -14371,10 +14437,19 @@ function realConnectEffects(ports = DOOR_SOURCE_PORTS) {
           });
         }
       });
-    });
+    };
+    if (typeof target === "number") {
+      server.listen(target, "127.0.0.1", onListening);
+    } else {
+      server.listen(target, onListening);
+    }
   });
   return {
-    listenLoopback: async (preferredPort, onSocket) => {
+    listenLoopback: async (source, onSocket) => {
+      if ("inherit" in source) {
+        return await listenOnce(await source.inherit(), onSocket);
+      }
+      const { preferredPort } = source;
       if (preferredPort !== void 0) {
         try {
           return await listenOnce(preferredPort, onSocket);