agent-shim 11.21.0 → 11.22.0

package/dist/cli.cjs

@@ -34181,7 +34181,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.21.0",
+      version: "11.22.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>",
@@ -114729,11 +114729,12 @@ function watchedInstallEntry(resolvedOwnExecutablePath, siblingExists) {
   return siblingExists(sibling) ? sibling : resolvedOwnExecutablePath;
 }
 var AWAIT_PID_POLL_MS = 50;
-async function awaitPidExit(pid, boundMs, ports) {
-  const deadline = ports.now() + boundMs;
-  while (ports.isRunning(pid) && ports.now() < deadline) {
+async function awaitPidExit(pid, ports) {
+  const startedAt = ports.now();
+  while (ports.isRunning(pid)) {
     await ports.sleep(AWAIT_PID_POLL_MS);
   }
+  return ports.now() - startedAt;
 }
 var FRONTDOOR_SUPERVISOR_STILL_RUNNING = -1;
 var FRONTDOOR_POLL_MS = 1e3;
@@ -132915,6 +132916,8 @@ var DOOR_WATCHDOG_CHECK_MS = PROBE_TIMEOUT_MS / CHECKS_PER_PROBE_DEADLINE;
 var WATCHDOG_SOURCE = `
 const { workerData, parentPort } = require("node:worker_threads");
 const fs = require("node:fs");
+const os = require("node:os");
+const inspector = require("node:inspector");
 const { shared, boundMs, checkEveryMs, stateFile, ownPid, action, logFile, respawn, respawnAfterServingMs, awaitPidEnv } = workerData;
 const startedAt = Date.now();
 const counter = new Int32Array(shared);
@@ -132941,6 +132944,45 @@ const log = (line) => {
     // Nowhere left to report a failed log write to; the process still has to end.
   }
 };
+// Enough of the stack to read the caller chain from the timer or socket callback down to the call that held the loop.
+const STACK_FRAMES_LOGGED = 12;
+// Asks the main thread where it is, through the inspector: a pause request interrupts JavaScript that is running (a loop, or a synchronous call that can be interrupted), so the top frames name what held the loop. A main thread that cannot be paused within the wait is not at such a point (it is idle in the event loop, which means it was not scheduled, or blocked inside a native call), and the answer says so rather than guessing. \`resume\` lets a thread that is not about to be killed run on again.
+const describeMainThread = (waitMs, resume) => new Promise((resolve) => {
+  let session;
+  let settled = false;
+  const finish = (text) => {
+    if (settled) return;
+    settled = true;
+    clearTimeout(timeout);
+    try {
+      session.disconnect();
+    } catch (error) {
+      // Never connected; there is nothing to release.
+    }
+    resolve(text);
+  };
+  const timeout = setTimeout(() => finish("the main thread could not be paused within " + String(waitMs) + "ms, so it was idle in the event loop or blocked inside a native call"), waitMs);
+  try {
+    session = new inspector.Session();
+    session.connectToMainThread();
+    session.on("Debugger.paused", (event) => {
+      if (settled) return;
+      const frames = event.params.callFrames.slice(0, STACK_FRAMES_LOGGED).map((frame) => (frame.functionName === "" ? "(anonymous)" : frame.functionName) + " " + frame.url + ":" + String(frame.location.lineNumber + 1));
+      const text = "the main thread was in " + frames.join(" <- ");
+      if (resume) {
+        session.post("Debugger.resume", () => finish(text));
+      } else {
+        finish(text);
+      }
+    });
+    session.post("Debugger.enable", () => {
+      // The wait may have run out while the main thread was too stalled to answer the enable; the session is gone then.
+      if (!settled) session.post("Debugger.pause");
+    });
+  } catch (error) {
+    finish("the main thread could not be inspected: " + (error instanceof Error ? error.message : String(error)));
+  }
+});
 const spawnReplacement = () => {
   if (respawn === undefined || logFile === undefined) return;
   const servedMs = Date.now() - startedAt;
@@ -132971,16 +133013,21 @@ const timer = setInterval(() => {
   }
   if (now - lastChangeAt >= boundMs) {
     const message = "the front door's event loop did not run for " + String(now - lastChangeAt) + "ms; its watchdog ended the process so the next launch starts a fresh door on the same ports";
+    stopped = true;
+    clearInterval(timer);
     record(message);
     log(message);
+    const [oneMinute, fiveMinutes, fifteenMinutes] = os.loadavg();
+    log("machine load at the stall: " + oneMinute.toFixed(1) + " (1m), " + fiveMinutes.toFixed(1) + " (5m), " + fifteenMinutes.toFixed(1) + " (15m) across " + String(os.cpus().length) + " cpus");
     spawnReplacement();
-    stopped = true;
-    clearInterval(timer);
-    if (action === "kill-process") {
-      process.kill(ownPid, "SIGKILL");
-    } else {
-      parentPort.postMessage({ stalled: true, message });
-    }
+    describeMainThread(checkEveryMs, action !== "kill-process").then((where) => {
+      log(where);
+      if (action === "kill-process") {
+        process.kill(ownPid, "SIGKILL");
+      } else {
+        parentPort.postMessage({ stalled: true, message });
+      }
+    });
   }
 }, checkEveryMs);
 parentPort.on("message", (message) => {
@@ -133592,7 +133639,8 @@ function registerFrontDoorCommand(program2, deps) {
     const awaited = Number(process.env[DOOR_AWAIT_PID_ENV]);
     Reflect.deleteProperty(process.env, DOOR_AWAIT_PID_ENV);
     if (Number.isInteger(awaited) && awaited > 0) {
-      await awaitPidExit(awaited, DOOR_STALL_BOUND_MS, supervisorPorts);
+      const waitedMs = await awaitPidExit(awaited, supervisorPorts);
+      supervisorPorts.log(`frontdoor ${String(ownPid)}: stalled door ${String(awaited)} released the sticky ports after ${String(waitedMs)}ms`);
     }
     declareThisProcessTheFrontDoor();
     deps.exit(await runFrontDoorSupervisor(idleShutdownMinutes, supervisorPorts));

package/dist/index.cjs

@@ -2928,7 +2928,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.21.0",
+      version: "11.22.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>",

package/dist/index.mjs

@@ -2904,7 +2904,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.21.0",
+      version: "11.22.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>",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-shim",
-  "version": "11.21.0",
+  "version": "11.22.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>",