@camerontaylor/paseo-server 0.13.0-fork.1 → 0.13.0-fork.2

package/dist/server/server/agent/providers/acp-agent.js

@@ -167,6 +167,14 @@ const ACP_PROBE_CLOSE_TIMEOUT_MS = 2000;
 // request when the provider never answers, so these calls must be bounded
 // or the provider process is never terminated.
 const ACP_CLOSE_REQUEST_TIMEOUT_MS = 2000;
+// An ACP adapter can front a daemon shared by other sessions: every `jcode acp`
+// attaches to one setsid'd `jcode serve`, parented by whichever adapter started
+// it. Terminating that adapter must not take the shared daemon down with it.
+const ACP_PROVIDER_TERMINATION = {
+    gracefulTimeoutMs: 2000,
+    forceTimeoutMs: 2000,
+    spareDetachedOnForce: true,
+};
 const ACP_IMPORT_HISTORY_LOAD_TIMEOUT_MS = 30000;
 const ACP_IMPORT_HISTORY_BUDGET_MS = 60000;
 function summarizeMalformedACPStdoutError(error) {
@@ -1233,10 +1241,7 @@ export class ACPAgentSession {
     async releaseHistoryRuntime() {
         const child = this.child;
         if (child) {
-            const result = await this.terminateProcess(child, {
-                gracefulTimeoutMs: 2000,
-                forceTimeoutMs: 2000,
-            });
+            const result = await this.terminateProcess(child, ACP_PROVIDER_TERMINATION);
             if (result === "kill-timeout") {
                 // Keep the child registered so close() can retry the shutdown.
                 this.logger.warn("ACP history resume could not release the provider process");
@@ -2250,7 +2255,7 @@ export class ACPAgentSession {
         await Promise.all(terminalTerminations);
         this.terminalEntries.clear();
         if (this.child) {
-            await this.terminateProcess(this.child, { gracefulTimeoutMs: 2000, forceTimeoutMs: 2000 });
+            await this.terminateProcess(this.child, ACP_PROVIDER_TERMINATION);
         }
         this.subscribers.clear();
         this.connection = null;
@@ -3572,7 +3577,11 @@ function coerceSessionConfigMetadata(metadata) {
 }
 async function terminateChildProcess(child, timeoutMs, terminate) {
     try {
-        await terminate(child, { gracefulTimeoutMs: timeoutMs, forceTimeoutMs: timeoutMs });
+        await terminate(child, {
+            ...ACP_PROVIDER_TERMINATION,
+            gracefulTimeoutMs: timeoutMs,
+            forceTimeoutMs: timeoutMs,
+        });
     }
     finally {
         child.stdin.destroy();

package/dist/server/utils/tree-kill.d.ts

@@ -11,9 +11,26 @@ export interface TerminateWithTreeKillOptions {
     gracefulTimeoutMs: number;
     forceTimeoutMs?: number;
     onForceSignal?: () => void;
+    spareDetachedOnForce?: boolean;
 }
 export type TerminateWithTreeKillResult = "already-exited" | "terminated" | "killed" | "kill-timeout";
 export type ProcessTerminator = (child: TreeKillTarget, options: TerminateWithTreeKillOptions) => Promise<TerminateWithTreeKillResult>;
-export declare function terminateWithTreeKill(child: TreeKillTarget, options: TerminateWithTreeKillOptions): Promise<TerminateWithTreeKillResult>;
+export interface ProcessTableEntry {
+    pid: number;
+    ppid: number;
+    sessionLeader: boolean;
+}
+export type ProcessTableReader = () => Promise<ProcessTableEntry[] | null>;
+export interface TreeKillDependencies {
+    readProcessTable: ProcessTableReader;
+    signalPid: (pid: number, signal: NodeJS.Signals) => void;
+    signalTree: (child: TreeKillTarget, signal: NodeJS.Signals) => Promise<void>;
+}
+export declare function createTreeKillTerminator(dependencies?: Partial<TreeKillDependencies>): ProcessTerminator;
+export declare const terminateWithTreeKill: ProcessTerminator;
 export declare function signalProcessTree(child: TreeKillTarget, signal: NodeJS.Signals): Promise<void>;
+export declare function selectAttachedProcessTree(table: readonly ProcessTableEntry[], rootPid: number): number[];
+export declare function readProcessTable(): Promise<ProcessTableEntry[] | null>;
+export declare function parseProcStat(stat: string): ProcessTableEntry | null;
+export declare function parsePsProcessTable(output: string): ProcessTableEntry[];
 //# sourceMappingURL=tree-kill.d.ts.map

package/dist/server/utils/tree-kill.js

@@ -1,22 +1,38 @@
+import { execFile } from "node:child_process";
+import { readdir, readFile } from "node:fs/promises";
 import treeKill from "tree-kill";
-export async function terminateWithTreeKill(child, options) {
-    if (isProcessExited(child)) {
-        return "already-exited";
-    }
-    const exitPromise = waitForProcessExit(child);
-    await signalProcessTree(child, options.gracefulSignal ?? "SIGTERM");
-    if (await waitForExitOrTimeout(exitPromise, options.gracefulTimeoutMs)) {
-        return "terminated";
-    }
-    options.onForceSignal?.();
-    await signalProcessTree(child, options.forceSignal ?? "SIGKILL");
-    if (options.forceTimeoutMs === undefined) {
-        return "killed";
-    }
-    return (await waitForExitOrTimeout(exitPromise, options.forceTimeoutMs))
-        ? "killed"
-        : "kill-timeout";
+export function createTreeKillTerminator(dependencies = {}) {
+    const deps = {
+        readProcessTable: dependencies.readProcessTable ?? readProcessTable,
+        signalPid: dependencies.signalPid ?? ((pid, signal) => process.kill(pid, signal)),
+        signalTree: dependencies.signalTree ?? signalProcessTree,
+    };
+    return async (child, options) => {
+        if (isProcessExited(child)) {
+            return "already-exited";
+        }
+        const exitPromise = waitForProcessExit(child);
+        await signalAttachedProcessTree(child, options.gracefulSignal ?? "SIGTERM", deps);
+        if (await waitForExitOrTimeout(exitPromise, options.gracefulTimeoutMs)) {
+            return "terminated";
+        }
+        options.onForceSignal?.();
+        const forceSignal = options.forceSignal ?? "SIGKILL";
+        if (options.spareDetachedOnForce) {
+            await signalAttachedProcessTree(child, forceSignal, deps);
+        }
+        else {
+            await deps.signalTree(child, forceSignal);
+        }
+        if (options.forceTimeoutMs === undefined) {
+            return "killed";
+        }
+        return (await waitForExitOrTimeout(exitPromise, options.forceTimeoutMs))
+            ? "killed"
+            : "kill-timeout";
+    };
 }
+export const terminateWithTreeKill = createTreeKillTerminator();
 export function signalProcessTree(child, signal) {
     if (isProcessExited(child)) {
         return Promise.resolve();
@@ -35,6 +51,136 @@ export function signalProcessTree(child, signal) {
         });
     });
 }
+// The root plus every descendant still in its session. A descendant that leads
+// its own session called setsid() to detach (daemons, `spawn({ detached: true })`),
+// so it and its subtree are left out. Process groups are not the boundary: shell
+// job control gives each pipeline its own group inside the same session.
+export function selectAttachedProcessTree(table, rootPid) {
+    const childrenByParent = new Map();
+    for (const entry of table) {
+        if (entry.pid === rootPid)
+            continue;
+        const siblings = childrenByParent.get(entry.ppid);
+        if (siblings) {
+            siblings.push(entry);
+        }
+        else {
+            childrenByParent.set(entry.ppid, [entry]);
+        }
+    }
+    const attached = [rootPid];
+    const visited = new Set(attached);
+    for (let index = 0; index < attached.length; index += 1) {
+        for (const child of childrenByParent.get(attached[index]) ?? []) {
+            if (child.sessionLeader || visited.has(child.pid))
+                continue;
+            visited.add(child.pid);
+            attached.push(child.pid);
+        }
+    }
+    return attached;
+}
+async function signalAttachedProcessTree(child, signal, deps) {
+    if (isProcessExited(child)) {
+        return;
+    }
+    const pid = child.pid;
+    if (typeof pid !== "number" || pid <= 0) {
+        signalDirectChild(child, signal);
+        return;
+    }
+    const table = await deps.readProcessTable().catch(() => null);
+    if (!table) {
+        await deps.signalTree(child, signal);
+        return;
+    }
+    for (const target of selectAttachedProcessTree(table, pid)) {
+        try {
+            deps.signalPid(target, signal);
+        }
+        catch {
+            if (target === pid) {
+                signalDirectChild(child, signal);
+            }
+            // Descendants that exited since the snapshot are already gone.
+        }
+    }
+}
+export function readProcessTable() {
+    if (process.platform === "win32") {
+        // tree-kill's taskkill /T owns Windows; there is no session to detach into.
+        return Promise.resolve(null);
+    }
+    if (process.platform === "linux") {
+        return readLinuxProcessTable();
+    }
+    return readPsProcessTable();
+}
+async function readLinuxProcessTable() {
+    let names;
+    try {
+        names = await readdir("/proc");
+    }
+    catch {
+        return null;
+    }
+    const entries = await Promise.all(names
+        .filter((name) => /^\d+$/.test(name))
+        .map(async (name) => {
+        try {
+            return parseProcStat(await readFile(`/proc/${name}/stat`, "utf8"));
+        }
+        catch {
+            return null;
+        }
+    }));
+    const table = entries.filter((entry) => entry !== null);
+    return table.length > 0 ? table : null;
+}
+// /proc/<pid>/stat is "pid (comm) state ppid pgrp session ...". comm may itself
+// contain spaces and parentheses, so fields are read after the last ")".
+export function parseProcStat(stat) {
+    const commEnd = stat.lastIndexOf(")");
+    if (commEnd === -1)
+        return null;
+    const pid = Number.parseInt(stat, 10);
+    const fields = stat
+        .slice(commEnd + 1)
+        .trim()
+        .split(/\s+/);
+    const ppid = Number.parseInt(fields[1] ?? "", 10);
+    const session = Number.parseInt(fields[3] ?? "", 10);
+    if (!Number.isInteger(pid) || !Number.isInteger(ppid) || !Number.isInteger(session)) {
+        return null;
+    }
+    return { pid, ppid, sessionLeader: session === pid };
+}
+// BSD ps (macOS) reports no usable session id, but both BSD and procps flag a
+// session leader with "s" in STAT.
+function readPsProcessTable() {
+    return new Promise((resolve) => {
+        execFile("ps", ["-A", "-o", "pid=,ppid=,stat="], { timeout: 2000, maxBuffer: 16 * 1024 * 1024 }, (error, stdout) => {
+            if (error) {
+                resolve(null);
+                return;
+            }
+            const table = parsePsProcessTable(stdout);
+            resolve(table.length > 0 ? table : null);
+        });
+    });
+}
+export function parsePsProcessTable(output) {
+    const table = [];
+    for (const line of output.split("\n")) {
+        const [pidText, ppidText, stat = ""] = line.trim().split(/\s+/);
+        const pid = Number.parseInt(pidText ?? "", 10);
+        const ppid = Number.parseInt(ppidText ?? "", 10);
+        if (!Number.isInteger(pid) || !Number.isInteger(ppid))
+            continue;
+        table.push({ pid, ppid, sessionLeader: stat.includes("s") });
+    }
+    return table;
+}
 function signalDirectChild(child, signal) {
     try {
         child.kill(signal);

package/dist/src/utils/tree-kill.js

@@ -1,22 +1,38 @@
+import { execFile } from "node:child_process";
+import { readdir, readFile } from "node:fs/promises";
 import treeKill from "tree-kill";
-export async function terminateWithTreeKill(child, options) {
-    if (isProcessExited(child)) {
-        return "already-exited";
-    }
-    const exitPromise = waitForProcessExit(child);
-    await signalProcessTree(child, options.gracefulSignal ?? "SIGTERM");
-    if (await waitForExitOrTimeout(exitPromise, options.gracefulTimeoutMs)) {
-        return "terminated";
-    }
-    options.onForceSignal?.();
-    await signalProcessTree(child, options.forceSignal ?? "SIGKILL");
-    if (options.forceTimeoutMs === undefined) {
-        return "killed";
-    }
-    return (await waitForExitOrTimeout(exitPromise, options.forceTimeoutMs))
-        ? "killed"
-        : "kill-timeout";
+export function createTreeKillTerminator(dependencies = {}) {
+    const deps = {
+        readProcessTable: dependencies.readProcessTable ?? readProcessTable,
+        signalPid: dependencies.signalPid ?? ((pid, signal) => process.kill(pid, signal)),
+        signalTree: dependencies.signalTree ?? signalProcessTree,
+    };
+    return async (child, options) => {
+        if (isProcessExited(child)) {
+            return "already-exited";
+        }
+        const exitPromise = waitForProcessExit(child);
+        await signalAttachedProcessTree(child, options.gracefulSignal ?? "SIGTERM", deps);
+        if (await waitForExitOrTimeout(exitPromise, options.gracefulTimeoutMs)) {
+            return "terminated";
+        }
+        options.onForceSignal?.();
+        const forceSignal = options.forceSignal ?? "SIGKILL";
+        if (options.spareDetachedOnForce) {
+            await signalAttachedProcessTree(child, forceSignal, deps);
+        }
+        else {
+            await deps.signalTree(child, forceSignal);
+        }
+        if (options.forceTimeoutMs === undefined) {
+            return "killed";
+        }
+        return (await waitForExitOrTimeout(exitPromise, options.forceTimeoutMs))
+            ? "killed"
+            : "kill-timeout";
+    };
 }
+export const terminateWithTreeKill = createTreeKillTerminator();
 export function signalProcessTree(child, signal) {
     if (isProcessExited(child)) {
         return Promise.resolve();
@@ -35,6 +51,136 @@ export function signalProcessTree(child, signal) {
         });
     });
 }
+// The root plus every descendant still in its session. A descendant that leads
+// its own session called setsid() to detach (daemons, `spawn({ detached: true })`),
+// so it and its subtree are left out. Process groups are not the boundary: shell
+// job control gives each pipeline its own group inside the same session.
+export function selectAttachedProcessTree(table, rootPid) {
+    const childrenByParent = new Map();
+    for (const entry of table) {
+        if (entry.pid === rootPid)
+            continue;
+        const siblings = childrenByParent.get(entry.ppid);
+        if (siblings) {
+            siblings.push(entry);
+        }
+        else {
+            childrenByParent.set(entry.ppid, [entry]);
+        }
+    }
+    const attached = [rootPid];
+    const visited = new Set(attached);
+    for (let index = 0; index < attached.length; index += 1) {
+        for (const child of childrenByParent.get(attached[index]) ?? []) {
+            if (child.sessionLeader || visited.has(child.pid))
+                continue;
+            visited.add(child.pid);
+            attached.push(child.pid);
+        }
+    }
+    return attached;
+}
+async function signalAttachedProcessTree(child, signal, deps) {
+    if (isProcessExited(child)) {
+        return;
+    }
+    const pid = child.pid;
+    if (typeof pid !== "number" || pid <= 0) {
+        signalDirectChild(child, signal);
+        return;
+    }
+    const table = await deps.readProcessTable().catch(() => null);
+    if (!table) {
+        await deps.signalTree(child, signal);
+        return;
+    }
+    for (const target of selectAttachedProcessTree(table, pid)) {
+        try {
+            deps.signalPid(target, signal);
+        }
+        catch {
+            if (target === pid) {
+                signalDirectChild(child, signal);
+            }
+            // Descendants that exited since the snapshot are already gone.
+        }
+    }
+}
+export function readProcessTable() {
+    if (process.platform === "win32") {
+        // tree-kill's taskkill /T owns Windows; there is no session to detach into.
+        return Promise.resolve(null);
+    }
+    if (process.platform === "linux") {
+        return readLinuxProcessTable();
+    }
+    return readPsProcessTable();
+}
+async function readLinuxProcessTable() {
+    let names;
+    try {
+        names = await readdir("/proc");
+    }
+    catch {
+        return null;
+    }
+    const entries = await Promise.all(names
+        .filter((name) => /^\d+$/.test(name))
+        .map(async (name) => {
+        try {
+            return parseProcStat(await readFile(`/proc/${name}/stat`, "utf8"));
+        }
+        catch {
+            return null;
+        }
+    }));
+    const table = entries.filter((entry) => entry !== null);
+    return table.length > 0 ? table : null;
+}
+// /proc/<pid>/stat is "pid (comm) state ppid pgrp session ...". comm may itself
+// contain spaces and parentheses, so fields are read after the last ")".
+export function parseProcStat(stat) {
+    const commEnd = stat.lastIndexOf(")");
+    if (commEnd === -1)
+        return null;
+    const pid = Number.parseInt(stat, 10);
+    const fields = stat
+        .slice(commEnd + 1)
+        .trim()
+        .split(/\s+/);
+    const ppid = Number.parseInt(fields[1] ?? "", 10);
+    const session = Number.parseInt(fields[3] ?? "", 10);
+    if (!Number.isInteger(pid) || !Number.isInteger(ppid) || !Number.isInteger(session)) {
+        return null;
+    }
+    return { pid, ppid, sessionLeader: session === pid };
+}
+// BSD ps (macOS) reports no usable session id, but both BSD and procps flag a
+// session leader with "s" in STAT.
+function readPsProcessTable() {
+    return new Promise((resolve) => {
+        execFile("ps", ["-A", "-o", "pid=,ppid=,stat="], { timeout: 2000, maxBuffer: 16 * 1024 * 1024 }, (error, stdout) => {
+            if (error) {
+                resolve(null);
+                return;
+            }
+            const table = parsePsProcessTable(stdout);
+            resolve(table.length > 0 ? table : null);
+        });
+    });
+}
+export function parsePsProcessTable(output) {
+    const table = [];
+    for (const line of output.split("\n")) {
+        const [pidText, ppidText, stat = ""] = line.trim().split(/\s+/);
+        const pid = Number.parseInt(pidText ?? "", 10);
+        const ppid = Number.parseInt(ppidText ?? "", 10);
+        if (!Number.isInteger(pid) || !Number.isInteger(ppid))
+            continue;
+        table.push({ pid, ppid, sessionLeader: stat.includes("s") });
+    }
+    return table;
+}
 function signalDirectChild(child, signal) {
     try {
         child.kill(signal);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camerontaylor/paseo-server",
-  "version": "0.13.0-fork.1",
+  "version": "0.13.0-fork.2",
   "description": "Paseo backend server",
   "files": [
     "dist/server",
@@ -107,11 +107,11 @@
     "@agentclientprotocol/sdk": "^0.17.1",
     "@anthropic-ai/claude-agent-sdk": "0.3.246",
     "@anthropic-ai/sdk": "^0.104.2",
-    "@camerontaylor/paseo-client": "0.13.0-fork.1",
-    "@camerontaylor/paseo-highlight": "0.13.0-fork.1",
-    "@camerontaylor/paseo-plugin": "0.13.0-fork.1",
-    "@camerontaylor/paseo-protocol": "0.13.0-fork.1",
-    "@camerontaylor/paseo-relay": "0.13.0-fork.1",
+    "@camerontaylor/paseo-client": "0.13.0-fork.2",
+    "@camerontaylor/paseo-highlight": "0.13.0-fork.2",
+    "@camerontaylor/paseo-plugin": "0.13.0-fork.2",
+    "@camerontaylor/paseo-protocol": "0.13.0-fork.2",
+    "@camerontaylor/paseo-relay": "0.13.0-fork.2",
     "@isaacs/ttlcache": "^2.1.4",
     "@modelcontextprotocol/sdk": "1.29.0",
     "@opencode-ai/sdk": "1.14.46",