sensorium-mcp 3.1.0-refactor.9 → 3.1.0

package/dist/services/process.service.d.ts

@@ -30,16 +30,45 @@ export declare const clearTaskConsumed: (threadId: number) => void;
 /** Delete a worker's pending-task mailbox (and any in-flight .processing temp)
  *  so a retired worker can never be re-fed a late append. */
 export declare function deletePendingTaskMailbox(threadId: number): void;
-/** @param spawnedAtMs when the caller knows the process's spawn time (pid-file
- *  startedAt), pass it: absence from a pid-table snapshot taken BEFORE the
- *  spawn proves nothing, so such a process is treated as alive until a fresher
- *  snapshot can actually testify. Without it, a freshly spawned child could be
- *  declared dead against a stale snapshot → duplicate spawn. */
-export declare function isProcessAlive(pid: number, spawnedAtMs?: number): boolean;
+/**
+ * Liveness + identity in one question: is `pid` alive AND (when `spawnedAtMs`
+ * is given) still the process we spawned?
+ *
+ * Two-step check, neither of which ever spawns a child process:
+ *   1. `process.kill(pid, 0)` — a plain syscall. ESRCH (any non-EPERM error) is
+ *      a definitive "dead" and needs no broker (this also keeps dev mode
+ *      without a supervisor fully functional for the common case).
+ *   2. Otherwise the answer is NOT trustworthy on Windows — kill(0) succeeds
+ *      for kernel-zombie PIDs held open by a lingering handle, and EPERM is
+ *      what a parent sees for its own terminated child. Ask the supervisor's
+ *      process broker, which answers from a native process snapshot and also
+ *      verifies creation-time identity (PID-reuse guard).
+ *
+ * Broker unreachable → "cannot confirm → treat alive", exactly the audited-safe
+ * degradation the deleted tasklist/Get-Process breakers had.
+ */
+export declare function isProcessAlive(pid: number, spawnedAtMs?: number): Promise<boolean>;
+/**
+ * Thread-scoped liveness — the correct question for a broker-spawned worker.
+ *
+ * On Windows claude.exe/copilot.exe are LAUNCHERS: they fork the real agent into
+ * the thread's Job Object under a NEW pid, then exit. ~20s later the launcher pid
+ * we recorded at spawn is gone, so a pid-first `isProcessAlive(launcherPid)`
+ * returns false and orphans the still-working child. The thread's JOB is the
+ * source of truth; ask the broker by threadId:
+ *   - null (unreachable)  → cannot confirm → treat ALIVE (never kill on unknown),
+ *                           exactly the audited-safe degradation contract.
+ *   - known:false (404)   → the broker has NEVER managed this thread (dev mode /
+ *                           pre-broker process) → fall back to the pid check.
+ *   - known:true          → use the job/registry verdict (kernel truth).
+ *
+ * Off Windows there is no launcher-fork indirection (the pid IS the real child),
+ * so defer straight to the pid check.
+ */
+export declare function isThreadAlive(threadId: number, fallbackPid?: number, spawnedAtMs?: number): Promise<boolean>;
 export declare function readPidFiles(): PidFileEntry[];
-export declare function findAliveThread(threadId: number): SpawnedThread | undefined;
-export declare const isThreadRunning: (threadId: number) => boolean;
-export declare function getActiveThreadIds(): number[];
+export declare function findAliveThread(threadId: number): Promise<SpawnedThread | undefined>;
+export declare function getActiveThreadIds(): Promise<number[]>;
 export declare function ensureDirs(): void;
 /** Thread transcripts (logs/threads/*.json) are append-only debug artifacts with
  *  one file per thread per day. Nothing consumes them at runtime except the
@@ -52,10 +81,15 @@ export declare function ensureDirs(): void;
 export declare function pruneOldThreadLogs(): void;
 /**
  * Check liveness of a thread directly via its PID file, bypassing the
- * spawnedThreads[] in-memory cache.  Returns the live PID, or undefined
- * if no PID file exists or the process is dead (stale file is deleted).
+ * spawnedThreads[] in-memory cache. Returns the live PID together with its
+ * recorded spawn identity (startedAt) so callers can make identity-checked
+ * kill/alive calls, or undefined if no PID file exists or the process is dead
+ * (stale file is deleted).
  */
-export declare function findAliveThreadViaPidFile(threadId: number): number | undefined;
+export declare function findAliveThreadViaPidFile(threadId: number): Promise<{
+    pid: number;
+    startedAt?: number;
+} | undefined>;
 /**
  * Reconcile in-memory state (spawnedThreads[]) with the two authoritative
  * sources of truth at startup:
@@ -64,58 +98,39 @@ export declare function findAliveThreadViaPidFile(threadId: number): number | un
  *
  * Replaces the old restoreFromPidFiles() + cleanupStalePidFiles() pair.
  */
-export declare function reconcileState(db: Database, threadLifecycle: ThreadLifecycleService): void;
-export interface ProcSnapshotEntry {
-    ppid: number;
-    startMs: number;
-}
-export type ProcSnapshot = Map<number, ProcSnapshotEntry>;
-interface OrphanLineageEntry {
-    ownerThreadId: number;
-    ownerPid: number;
-    ownerStartedAt?: number;
-    descendantStartMs: number;
-}
-export interface OrphanSweepTrackedThread {
-    threadId: number;
-    pid: number;
-    startedAt?: number;
-    alive: boolean;
-}
-export interface OrphanSweepResult {
-    /** Confirmed orphans that passed BOTH pid-reuse guards. */
-    orphans: {
-        pid: number;
-        ownerThreadId: number;
-        startMs: number;
-    }[];
-    /** Recorded descendants whose pid was recycled (start-time mismatch) — dropped, never killed. */
-    reusedPidsSkipped: number[];
-    /** Candidates rejected by the child-not-older-than-parent guard — never killed. */
-    olderThanParentSkipped: number[];
-    /** How many descendant lineage entries were (re)recorded this pass. */
-    recorded: number;
-}
+export declare function reconcileState(db: Database, threadLifecycle: ThreadLifecycleService): Promise<void>;
 /**
- * Pure core of the orphan sweep — no IO, no clock, fully deterministic so the
- * pid-reuse guard and the snapshot-unavailable path can be tested directly.
- * Mutates `lineage` in place (records new descendants, drops dead/recycled ones).
+ * Kill the process tree rooted at `pid` via the supervisor's broker (native
+ * TerminateProcess over the whole tree, identity-checked when `spawnedAtMs` is
+ * given, outcome recorded in the broker's on-disk registry). Never spawns a
+ * child process and never blocks the event loop.
+ *
+ * Broker unreachable → degraded best-effort: one native `process.kill(pid)`
+ * (root only — Node cannot enumerate a tree without shelling out, and that
+ * machinery is gone by design) followed by a conservative liveness re-check.
+ * A survived kill keeps the PID file so the keeper/cleanup policy loops retry
+ * and escalate — same contract as before.
  */
-export declare function computeOrphanSweep(params: {
-    snapshot: ProcSnapshot | null;
-    trackedThreads: OrphanSweepTrackedThread[];
-    lineage: Map<number, OrphanLineageEntry>;
-    protectedPids: Set<number>;
-    toleranceMs: number;
-}): OrphanSweepResult;
+export declare function killProcessTree(pid: number, threadId: number, caller?: string, spawnedAtMs?: number): Promise<void>;
 /**
- * Run one orphan-descendant sweep on the existing worker-cleanup cadence. Takes a
- * single process snapshot (no new timer, no second snapshot on the hot liveness
- * path), records lineage for live threads, and logs — or, when ORPHAN_SWEEP_KILL
- * is set, reaps — confirmed orphans. Best-effort and self-contained; any failure
- * degrades to doing nothing.
+ * Kill a worker by its THREAD, not by the pid we recorded at spawn.
+ *
+ * For a launcher-forked worker the recorded pid is the launcher, which has long
+ * since exited; `killProcessTree(launcherPid)` therefore routes to the broker's
+ * KillByPid, hits its "AlreadyDead" fast-path (the launcher pid is gone) and
+ * returns BEFORE the job-kill fallback — so the live forked child is never
+ * touched. Routing by threadId (pid omitted) takes the broker's KillByThread
+ * path instead: it terminates the whole Job Object (every live member), or, when
+ * the job assign failed (Avecto downgrade), the registry-identity survivor the
+ * broker adopted. This is the kill that actually reaches the real agent.
+ *
+ * Broker unreachable → degraded best-effort native kill of `fallbackPid` (self/
+ * server-guarded), and we NEVER remove the PID file or claim death: a later sweep
+ * retries against fresh evidence. `brokerKillTree` also returns null for an
+ * unknown/already-dead thread (HTTP 404); the degraded native kill of a dead pid
+ * is a harmless no-op there, and the caller's own `isThreadAlive` gate — not this
+ * function — decides teardown.
  */
-export declare function sweepOrphanDescendants(): Promise<OrphanSweepResult>;
-export declare function killProcessTree(pid: number, threadId: number, caller?: string, spawnedAtMs?: number): Promise<void>;
+export declare function killThreadTree(threadId: number, caller?: string, fallbackPid?: number, spawnedAtMs?: number): Promise<void>;
 export {};
 //# sourceMappingURL=process.service.d.ts.map

package/dist/services/process.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"process.service.d.ts","sourceRoot":"","sources":["../../src/services/process.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"process.service.d.ts","sourceRoot":"","sources":["../../src/services/process.service.ts"],"names":[],"mappings":"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"}