@pushary/agent-hooks 0.89.12 → 0.90.0

package/dist/bin/pushary-daemon.js

@@ -1,38 +1,46 @@
 #!/usr/bin/env node
 import {
   inspectConfiguredManagedProviders
-} from "../chunk-7HYJPOGG.js";
-import "../chunk-NBRM3FMD.js";
+} from "../chunk-BQBEH6TV.js";
+import "../chunk-H2QZRQR2.js";
 import {
   HEARTBEAT_INTERVAL_MS,
   sendHeartbeat
-} from "../chunk-DHR4F2CR.js";
-import "../chunk-NESKLV6R.js";
-import "../chunk-6V7ZDH3A.js";
-import "../chunk-KVHP5ZME.js";
-import "../chunk-VF3RTVWY.js";
+} from "../chunk-7TPQEWUZ.js";
+import "../chunk-DZDI62LY.js";
+import "../chunk-GL3FFM7A.js";
+import "../chunk-2LAHXHBR.js";
+import "../chunk-EZIEXHYM.js";
 import {
   DAEMON_LEASE_RENEW_INTERVAL_MS,
   acquireDaemonLease,
+  clearDaemonNeedsLogin,
   daemonServiceManagerAvailable,
+  describeDaemonLoginBlock,
   ensureDaemonRunning,
   hasDaemonServiceDefinition,
   manageDaemonService,
   parseDaemonAction,
+  readDaemonNeedsLogin,
   readDaemonStatus,
   replaceDaemonService,
   requestDaemonHandoff,
-  stopDaemonRunning
-} from "../chunk-PS7DQ2SU.js";
+  stopDaemonRunning,
+  writeDaemonNeedsLogin
+} from "../chunk-F2ICEWZL.js";
 import {
   detectProviderLiveCapabilities,
   hasSpawnProvider,
   resolveControlPolicy
 } from "../chunk-3OXHYPZG.js";
 import {
+  SESSION_REAP_SILENCE_MS,
+  describeIdleWindow,
   findLiveProcessBySpawnId,
-  ownsLiveProcess
-} from "../chunk-6GU55AQQ.js";
+  listProcessProofs,
+  ownsLiveProcess,
+  silentSpawnedProofs
+} from "../chunk-Y6BWPERV.js";
 import {
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
@@ -41,27 +49,30 @@ import {
 } from "../chunk-L4ZCFMWW.js";
 import {
   getMachineId
-} from "../chunk-5NDB3YOE.js";
-import "../chunk-OVEGEQSB.js";
+} from "../chunk-54ELC7D7.js";
+import "../chunk-KUZWXPUS.js";
+import {
+  writeHuman
+} from "../chunk-QCGNGEGE.js";
 import {
   exitOnHelpFlag
-} from "../chunk-OTPJ4FUR.js";
-import "../chunk-RLQWNEPM.js";
+} from "../chunk-BVBEURWJ.js";
+import "../chunk-43GMYSS4.js";
 import "../chunk-DINDL2CF.js";
 import {
   readControlMode
-} from "../chunk-RNKPLUWC.js";
+} from "../chunk-OSALSIUF.js";
 import "../chunk-BC3VCZ3E.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-XREW7RQ3.js";
+import "../chunk-JW4KO5AF.js";
 import "../chunk-4LL6LG5X.js";
 import {
   getApiKey,
   getBaseUrl
 } from "../chunk-2UMNXADU.js";
-import "../chunk-3MCEES6Z.js";
+import "../chunk-VNMKIJZB.js";
 
 // src/spawn-daemon.ts
 import { execFileSync, spawn } from "child_process";
@@ -119,6 +130,7 @@ var VERSION_CHECK_INTERVAL_MS = 2e3;
 var CONTROL_PROBE_INTERVAL_MS = 6e4;
 var MAX_TRACKED_PROCESSES = 100;
 var MAX_COMPLETED_STOPS = 20;
+var SESSION_REAP_INTERVAL_MS = 6e4;
 var controlProbeDue = (lastProbeAt, at = Date.now()) => lastProbeAt === 0 || at - lastProbeAt >= CONTROL_PROBE_INTERVAL_MS;
 var parseControlProbe = (value) => {
   if (typeof value !== "object" || value === null) return null;
@@ -256,6 +268,28 @@ var spawnRateAllows = (timestamps, now, maxPerWindow = MAX_SPAWNS_PER_WINDOW, wi
 var stderr = (msg) => {
   process.stderr.write(msg);
 };
+var log = (message) => {
+  writeHuman(`${(/* @__PURE__ */ new Date()).toISOString()} ${message}
+`);
+};
+var errMsg = (err) => err instanceof Error ? err.message : String(err);
+var trackFailureStreak = (name, sinks) => {
+  let failing = false;
+  let lastDetail = "";
+  return {
+    fail(detail) {
+      sinks.recordError(`${name}: ${detail}`);
+      if (!failing || detail !== lastDetail) sinks.log(`${name} failing: ${detail}`);
+      failing = true;
+      lastDetail = detail;
+    },
+    recover() {
+      if (failing) sinks.log(`${name} recovered`);
+      failing = false;
+      lastDetail = "";
+    }
+  };
+};
 var runSpawnDaemon = async () => {
   let apiKey;
   try {
@@ -264,6 +298,13 @@ var runSpawnDaemon = async () => {
     stderr("[pushary] daemon needs an API key. Run `npx @pushary/agent-hooks setup`.\n");
     return 1;
   }
+  const loginBlock = readDaemonNeedsLogin();
+  if (loginBlock.kind === "blocked") {
+    stderr(`[pushary] daemon not starting: ${describeDaemonLoginBlock(loginBlock.record)}
+`);
+    return 0;
+  }
+  if (loginBlock.kind === "stale") clearDaemonNeedsLogin();
   const machineId = getMachineId();
   const baseUrl = getBaseUrl();
   const pusharyBin = resolveBinary("pushary") ?? "pushary";
@@ -298,6 +339,9 @@ var runSpawnDaemon = async () => {
     return 1;
   }
   const daemonLease = lifecycle.lease;
+  const sinks = { log, recordError: (message) => daemonLease.recordError(message) };
+  const drainHealth = trackFailureStreak("drain", sinks);
+  const heartbeatHealth = trackFailureStreak("heartbeat", sinks);
   let stopped = false;
   let idleTicks = 0;
   let errorStreak = 0;
@@ -307,12 +351,14 @@ var runSpawnDaemon = async () => {
   const completedStops = /* @__PURE__ */ new Map();
   let timer;
   let inflight;
-  let fatalCode = null;
   let finish = () => {
   };
   let heartbeat;
   let versionWatch;
   let leaseRenewal;
+  let sessionReaper;
+  let reaping = false;
+  let rateCapped = false;
   const launch = (req) => {
     if (launchedProcesses.size >= MAX_TRACKED_PROCESSES) {
       return Promise.reject(new Error("This daemon is already tracking 100 active sessions"));
@@ -364,8 +410,10 @@ var runSpawnDaemon = async () => {
         let started = false;
         child.once("error", (err) => {
           if (!started) reject(err);
-          else stderr(`[pushary] launched session reported an error: ${err.message}
-`);
+          else {
+            log(`spawn ${req.id}: launched session reported an error: ${err.message}`);
+            daemonLease.recordError(`spawn ${req.id}: ${err.message}`);
+          }
         });
         child.once("spawn", () => {
           started = true;
@@ -374,8 +422,7 @@ var runSpawnDaemon = async () => {
             child.once("close", () => launchedProcesses.delete(child.pid));
           }
           child.unref();
-          stderr(`[pushary] launched a phone-requested ${plan.agent} session in ${basename(cwd)}
-`);
+          log(`spawn ${req.id}: launched a phone-requested ${plan.agent} session in ${basename(cwd)} (pid ${child.pid ?? "unknown"})`);
           resolve(typeof child.pid === "number" ? child.pid : null);
         });
       } catch (err) {
@@ -383,10 +430,45 @@ var runSpawnDaemon = async () => {
       }
     });
   };
+  const kill = process.platform === "win32" ? (pid) => {
+    execFileSync("taskkill", windowsTaskkillArgs(pid), { stdio: "ignore" });
+  } : process.kill.bind(process);
+  const stopDeps = {
+    kill,
+    ownsProcess: (request) => {
+      const launched = request.spawnId ? launchedProcesses.get(request.pid) === request.spawnId : !request.id && launchedProcesses.has(request.pid);
+      return launched || ownsLiveProcess(request);
+    },
+    selfPid: process.pid,
+    sleep: (ms) => new Promise((resolve) => setTimeout(resolve, ms)),
+    isAlive: (pid) => {
+      try {
+        process.kill(pid, 0);
+        return true;
+      } catch (err) {
+        return err.code === "EPERM";
+      }
+    }
+  };
+  const reapSilentSessions = async () => {
+    if (stopped || reaping) return;
+    reaping = true;
+    try {
+      const now = Date.now();
+      const silent = silentSpawnedProofs(listProcessProofs({ reapDead: true }), now, SESSION_REAP_SILENCE_MS);
+      for (const proof of silent) {
+        if (stopped) return;
+        const outcome = await applyStopAndVerify(
+          { sessionId: proof.sessionId, pid: proof.pid, spawnId: proof.spawnId },
+          stopDeps
+        );
+        log(`session ${proof.sessionId} (pid ${proof.pid}) was silent for ${describeIdleWindow(now - proof.lastSeenAt)}: ${outcome}`);
+      }
+    } finally {
+      reaping = false;
+    }
+  };
   const runStop = async (stop) => {
-    const kill = process.platform === "win32" ? (pid) => {
-      execFileSync("taskkill", windowsTaskkillArgs(pid), { stdio: "ignore" });
-    } : process.kill.bind(process);
     const outcome = stop.id ? completedStops.get(stop.id) ?? await apply() : await apply();
     if (stop.id && !completedStops.has(stop.id)) {
       if (completedStops.size === MAX_COMPLETED_STOPS) {
@@ -402,8 +484,7 @@ var runSpawnDaemon = async () => {
       refused: `could not stop session ${stop.sessionId}, the system refused the signal`,
       skipped_self: `refused to stop session ${stop.sessionId}: that pid is this daemon`
     };
-    stderr(`[pushary] ${said[outcome]}
-`);
+    log(said[outcome]);
     const acknowledgement = stopAcknowledgement(stop, machineId, outcome);
     if (acknowledgement) {
       for (let attempt = 0; attempt < 3 && !stopped; attempt++) {
@@ -421,23 +502,7 @@ var runSpawnDaemon = async () => {
       }
     }
     async function apply() {
-      return applyStopAndVerify(stop, {
-        kill,
-        ownsProcess: (request) => {
-          const launched = request.spawnId ? launchedProcesses.get(request.pid) === request.spawnId : !request.id && launchedProcesses.has(request.pid);
-          return launched || ownsLiveProcess(request);
-        },
-        selfPid: process.pid,
-        sleep: (ms) => new Promise((resolve) => setTimeout(resolve, ms)),
-        isAlive: (pid) => {
-          try {
-            process.kill(pid, 0);
-            return true;
-          } catch (err) {
-            return err.code === "EPERM";
-          }
-        }
-      });
+      return applyStopAndVerify(stop, stopDeps);
     }
   };
   const acknowledgeControlProbe = async (probeId) => {
@@ -491,20 +556,20 @@ var runSpawnDaemon = async () => {
           signal: controller.signal
         });
         if (response.ok) return;
-        const error = new Error(`spawn acknowledgement failed (${response.status})`);
+        const error = new Error(`spawn ${body.spawnId} acknowledgement failed (${response.status})`);
         if (response.status < 500) {
           lastError = error;
           break;
         }
         lastError = error;
       } catch (err) {
-        lastError = err;
+        lastError = new Error(`spawn ${body.spawnId} acknowledgement failed: ${errMsg(err)}`);
       } finally {
         clearTimeout(timeout);
         if (inflight === controller) inflight = void 0;
       }
     }
-    throw lastError ?? new Error("spawn acknowledgement stopped");
+    throw lastError ?? new Error(`spawn ${body.spawnId} acknowledgement stopped`);
   };
   const launchClaim = (request) => launchSpawnClaim(request, {
     machineId,
@@ -516,8 +581,10 @@ var runSpawnDaemon = async () => {
     },
     launch,
     acknowledge,
-    reportLaunchError: (message) => stderr(`[pushary] could not launch session: ${message}
-`)
+    reportLaunchError: (message) => {
+      log(`spawn ${request.id}: could not launch session: ${message}`);
+      daemonLease.recordError(`spawn ${request.id}: ${message}`);
+    }
   });
   const nextDelay = () => {
     if (errorStreak > 0) return Math.min(SLOW_POLL_MS * 2 ** (errorStreak - 1), MAX_ERROR_BACKOFF_MS);
@@ -531,9 +598,12 @@ var runSpawnDaemon = async () => {
       return;
     }
     if (!spawnRateAllows(spawnTimestamps, Date.now())) {
+      if (!rateCapped) log(`spawn rate cap reached (${MAX_SPAWNS_PER_WINDOW} in ${SPAWN_WINDOW_MS / 1e3}s); leaving the queue until the window frees`);
+      rateCapped = true;
       timer = setTimeout(tick, jitter(nextDelay()));
       return;
     }
+    rateCapped = false;
     const controller = new AbortController();
     inflight = controller;
     const timeout = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
@@ -544,6 +614,7 @@ var runSpawnDaemon = async () => {
         return;
       }
       errorStreak = 0;
+      drainHealth.recover();
       if (drained.request) {
         idleTicks = 0;
         await launchClaim(drained.request);
@@ -557,14 +628,15 @@ var runSpawnDaemon = async () => {
     } catch (err) {
       if (isAuthFailure(err)) {
         const status = err.status;
-        fatalCode = EXIT.UNAUTHENTICATED;
-        stderr(
-          status === 401 ? "[pushary] daemon stopping: this machine's key was rejected. Run `pushary login` to sign in again.\n" : "[pushary] daemon stopping: this workspace has no active plan, so the queue is closed. Pick one at pushary.com/dashboard/settings?tab=billing\n"
+        writeDaemonNeedsLogin(status === 401 ? "key_rejected" : "plan_inactive");
+        log(
+          status === 401 ? "daemon stopping: this machine's key was rejected. Run `pushary login` to sign in again." : "daemon stopping: this workspace has no active plan, so the queue is closed. Pick one at pushary.com/dashboard/settings?tab=billing"
         );
         finish();
         return;
       }
       errorStreak = Math.min(errorStreak + 1, MAX_ERROR_STREAK);
+      drainHealth.fail(errMsg(err));
     } finally {
       clearTimeout(timeout);
       inflight = void 0;
@@ -578,12 +650,12 @@ var runSpawnDaemon = async () => {
     if (heartbeat) clearInterval(heartbeat);
     if (versionWatch) clearInterval(versionWatch);
     if (leaseRenewal) clearInterval(leaseRenewal);
+    if (sessionReaper) clearInterval(sessionReaper);
     inflight?.abort();
     try {
       daemonLease.release();
     } catch (err) {
-      stderr(`[pushary] daemon could not release its local lease: ${err instanceof Error ? err.message : String(err)}
-`);
+      log(`daemon could not release its local lease: ${errMsg(err)}`);
     }
   };
   const beat = async () => {
@@ -601,10 +673,14 @@ var runSpawnDaemon = async () => {
         ...providerCapabilities
       ]
     });
-    if (result.kind === "ok") daemonLease.recordSuccessfulHeartbeat();
+    if (result.kind === "ok") {
+      daemonLease.recordSuccessfulHeartbeat();
+      heartbeatHealth.recover();
+    }
+    if (result.kind === "failed") heartbeatHealth.fail(result.detail);
     if (result.kind === "unauthorized" && !stopped) {
-      fatalCode = EXIT.UNAUTHENTICATED;
-      stderr("[pushary] daemon stopping: this machine's key was rejected. Run `pushary login` to sign in again.\n");
+      writeDaemonNeedsLogin("key_rejected");
+      log("daemon stopping: this machine's key was rejected. Run `pushary login` to sign in again.");
       finish();
     }
   };
@@ -614,9 +690,8 @@ var runSpawnDaemon = async () => {
   versionWatch = setInterval(() => {
     if (daemonLease.shouldYield()) finish();
   }, VERSION_CHECK_INTERVAL_MS);
-  stderr(hasSpawnProvider(providerCapabilities) ? `[pushary] daemon online \u2014 this machine (${machineId}) can now be sent a new session from your phone. Ctrl-C to stop.
-` : `[pushary] daemon online \u2014 no supported Claude, Codex, or Gemini CLI was found, so phone-start is unavailable. Ctrl-C to stop.
-`);
+  sessionReaper = setInterval(() => void reapSilentSessions(), SESSION_REAP_INTERVAL_MS);
+  log(hasSpawnProvider(providerCapabilities) ? `daemon online (pid ${process.pid}): this machine (${machineId}) can now be sent a new session from your phone. Ctrl-C to stop.` : `daemon online (pid ${process.pid}): no supported Claude, Codex, or Gemini CLI was found, so phone-start is unavailable. Ctrl-C to stop.`);
   timer = setTimeout(tick, 0);
   const signals = daemonSignals();
   await new Promise((resolve) => {
@@ -628,7 +703,51 @@ var runSpawnDaemon = async () => {
       resolve();
     };
   });
-  return fatalCode ?? 0;
+  return 0;
+};
+
+// src/daemon-sessions.ts
+import { execFileSync as execFileSync2 } from "child_process";
+var readResidentSetKb = (pid) => {
+  if (process.platform === "win32") return null;
+  try {
+    const output = execFileSync2("ps", ["-o", "rss=", "-p", String(pid)], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"]
+    });
+    const kb = Number.parseInt(output.trim(), 10);
+    return Number.isFinite(kb) ? kb : null;
+  } catch {
+    return null;
+  }
+};
+var formatAge = (ms) => {
+  const totalSeconds = Math.max(0, Math.floor(ms / 1e3));
+  const hours = Math.floor(totalSeconds / 3600);
+  const minutes = Math.floor(totalSeconds % 3600 / 60);
+  if (hours > 0) return `${hours}h${String(minutes).padStart(2, "0")}m`;
+  if (minutes > 0) return `${minutes}m`;
+  return `${totalSeconds}s`;
+};
+var formatMemory = (kb) => kb === null ? "n/a" : kb >= 1024 ? `${Math.round(kb / 1024)} MB` : `${kb} KB`;
+var describeSessionProof = (entry, now, rssKb) => [
+  entry.sessionId,
+  `pid ${entry.pid}`,
+  entry.alive ? "alive" : "dead, reaped",
+  `age ${formatAge(now - entry.startedAt)}`,
+  `seen ${formatAge(now - entry.lastSeenAt)} ago`,
+  `rss ${formatMemory(rssKb)}`,
+  ...entry.spawnId ? [`spawn ${entry.spawnId}`] : []
+].join("  ");
+var describeSessionProofs = (entries, now, residentSet) => {
+  const live = entries.filter((entry) => entry.alive).length;
+  const reaped = entries.length - live;
+  if (entries.length === 0) return ["Sessions: none"];
+  const header = `Sessions: ${live} live${reaped > 0 ? `, ${reaped} dead proof${reaped === 1 ? "" : "s"} reaped` : ""}`;
+  return [
+    header,
+    ...entries.map((entry) => `  ${describeSessionProof(entry, now, entry.alive ? residentSet(entry.pid) : null)}`)
+  ];
 };
 
 // bin/pushary-daemon.ts
@@ -650,6 +769,11 @@ var main = async () => {
   if (action === "status") {
     const status = readDaemonStatus();
     process.stdout.write(`Pushary daemon: ${status.kind}${status.pid ? ` (pid ${status.pid})` : ""}
+`);
+    if (status.lastError) process.stdout.write(`Last error: ${status.lastError.message} at ${status.lastError.at}
+`);
+    const sessions = describeSessionProofs(listProcessProofs({ reapDead: true }), Date.now(), readResidentSetKb);
+    process.stdout.write(`${sessions.join("\n")}
 `);
     return status.kind === "running" ? EXIT.OK : EXIT.UNREACHABLE;
   }

package/dist/bin/pushary-disconnect.js

@@ -8,16 +8,16 @@ import {
   openCodePluginDir,
   openCodePluginFile,
   removeOpenCodeMcpServer
-} from "../chunk-7DK3ZH3N.js";
+} from "../chunk-CELX75MW.js";
 import {
   isClaudeMcpSnapshot,
   removeClaudeMcpServers,
   removeGeminiSettings,
   removePusharySettings,
   restoreClaudeMcpServer
-} from "../chunk-6V7ZDH3A.js";
-import "../chunk-KVHP5ZME.js";
-import "../chunk-VF3RTVWY.js";
+} from "../chunk-GL3FFM7A.js";
+import "../chunk-2LAHXHBR.js";
+import "../chunk-EZIEXHYM.js";
 import "../chunk-L4ZCFMWW.js";
 import {
   claudeJson,
@@ -32,14 +32,14 @@ import {
   geminiSettings,
   removeCodexHooks,
   removeCodexSettings
-} from "../chunk-OVEGEQSB.js";
+} from "../chunk-KUZWXPUS.js";
 import {
   exitOnHelpFlag
-} from "../chunk-OTPJ4FUR.js";
-import "../chunk-RLQWNEPM.js";
+} from "../chunk-BVBEURWJ.js";
+import "../chunk-43GMYSS4.js";
 import "../chunk-DINDL2CF.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-3MCEES6Z.js";
+import "../chunk-VNMKIJZB.js";
 
 // bin/pushary-disconnect.ts
 import { readdirSync, readFileSync, rmSync, writeFileSync } from "fs";