@agimon-ai/po-runner 0.0.0-alpha.20 → 0.0.0-alpha.21

package/dist/extensions/server.mjs

@@ -5,14 +5,15 @@ import { n as stopRunnerProcess, t as reconcileActiveRunners } from "../reconcil
 import { t as SystemClock } from "../clock-Cv2pddgo.mjs";
 import { t as activeRunnerRecovery } from "../compaction-nNlE6e5I.mjs";
 import { t as RmuxBackend } from "../rmuxBackend-rjrVTG6K.mjs";
-import { n as TmuxBackend, r as PtyBackendChain, t as createRunnerDependencies } from "../runnerDependencies-B0Vj8ZEc.mjs";
+import { n as TERM_GRACE_MS } from "../launcher-CCYsFBM9.mjs";
+import { n as TmuxBackend, r as PtyBackendChain, t as createRunnerDependencies } from "../runnerDependencies-7h_cxOva.mjs";
 import { n as resolveRunnerStoreDirectory, r as runnerStateDirFor, t as RunnerPaths } from "../runnerPaths-Dibbvyx_.mjs";
 import { a as formatRunnerStatus, i as formatRunnerFinishedNotice, n as createDefaultProcessRegistry, o as isRunnerRecord, r as formatRunnerFinished } from "../runnerRegistry-BgaR5O86.mjs";
 import fs from "node:fs";
 import path from "node:path";
 import { resolveRootSessionId } from "@agimon-ai/po-core/childProcess";
 import { composeServerProviderOverrides, defineServerPlugin, packageResourcePath, readPackageResource } from "@agimon-ai/po-core/serverPlugin";
-import { composeRootHooks, composeRootInjects, defineChannel, defineHook, defineResource, defineRoot, defineRoute, defineServerCommand, defineServerTool } from "@agimon-ai/po-core/extensionFile";
+import { composeRootHooks, composeRootInjects, defineChannel, defineHook, defineResource, defineRoot, defineRoute, defineServerCommand, defineServerTool, runCleanups } from "@agimon-ai/po-core/extensionFile";
 import { PO_BACKGROUND_WORK_SERVICE, readPoBackgroundWorkService } from "@agimon-ai/po-core/backgroundWork";
 import { createPoTelemetry } from "@agimon-ai/po-telemetry";
 import { CONFIG_DIR_NAME } from "@earendil-works/pi-coding-agent";
@@ -274,36 +275,36 @@ function createRunnerServerRuntime(container, host, directEvents, wakeAgent, exe
 			await supervision?.catch((error) => process.emitWarning(`Could not initialize headless runner supervision: ${String(error)}`));
 			const ownedSessionId = sessionId;
 			if (ownedSessionId === void 0) return;
-			const records = await container.runnerRegistry.listBySession(ownedSessionId).catch(() => []);
-			await Promise.all(records.map(async (record) => {
-				try {
-					if (!await stopRunnerProcess(record, container.launcher, container.rmuxBackend, {
-						registry: container.runnerRegistry,
-						intent: {
+			await runCleanups([
+				async () => {
+					const records = await container.runnerRegistry.listBySession(ownedSessionId);
+					const errors = (await Promise.allSettled(records.map(async (record) => {
+						await stopRunnerProcess(record, container.launcher, container.rmuxBackend, {
+							registry: container.runnerRegistry,
+							intent: {
+								reason: "stopped",
+								terminationReason: "parent_session_cleanup",
+								stopReason: "session ended"
+							}
+						});
+						const deadline = container.clock.now() + TERM_GRACE_MS;
+						while (container.processControl.isAlive(record.pid)) {
+							if (container.clock.now() >= deadline) throw new Error(`Could not stop runner ${record.id} during session shutdown`);
+							await new Promise((resolve) => container.clock.after(100, resolve));
+						}
+						await container.runnerRegistry.complete(record.id, {
 							reason: "stopped",
-							terminationReason: "parent_session_cleanup",
+							code: null,
+							signal: null,
 							stopReason: "session ended"
-						}
-					}) && container.processControl.isAlive(record.pid)) {
-						process.emitWarning(`Could not stop runner ${record.id} during session shutdown`);
-						return;
-					}
-					await container.runnerRegistry.complete(record.id, {
-						reason: "stopped",
-						code: null,
-						signal: null,
-						stopReason: "session ended"
-					}, ownedSessionId);
-				} catch (error) {
-					process.emitWarning(`Could not clean up runner ${record.id}: ${String(error)}`);
-				}
-			}));
-			try {
-				await container.ptyHost.disposeAll();
-			} finally {
-				container.lifeline.dispose();
-				container.runnerRegistry.close();
-			}
+						}, ownedSessionId);
+					}))).filter((result) => result.status === "rejected").map((result) => result.reason);
+					if (errors.length) throw new AggregateError(errors, "Runner process cleanup failed.");
+				},
+				() => container.ptyHost.disposeAll(),
+				() => container.lifeline.dispose(),
+				() => container.runnerRegistry.close()
+			], "Runner runtime cleanup failed.");
 		})();
 		return runtimeDisposal;
 	};
@@ -505,9 +506,11 @@ function createRunnerServerRuntime(container, host, directEvents, wakeAgent, exe
 				} catch (error) {
 					process.emitWarning(`Could not clear runner status: ${String(error)}`);
 				}
-				await disposeRuntime();
-				await telemetry?.recordEvent("po_runner.session_finished", { outcome: "stopped" });
-				await telemetry?.shutdown();
+				await runCleanups([
+					disposeRuntime,
+					() => telemetry?.recordEvent("po_runner.session_finished", { outcome: "stopped" }),
+					() => telemetry?.shutdown()
+				], "Runner shutdown failed.");
 			})();
 			return disposal;
 		}