@astrosheep/keiyaku 4.5.13 → 4.5.15

package/build/src/akuma/body.js

@@ -5,7 +5,7 @@ import { BodySupervisor } from "./body-supervisor.js";
 import { driveTurn, turnRecipe } from "./turn-drive.js";
 import { HeldAkumaLeash, breakBody, decidePendingTellDisposition, drainPendingTells, endTurn, failOpenBoundTurns, finishBodyIfIdle, heartExists, isHeartAbsent, probeLeash, projectTell, provePendingTellDispositionCustody, readHeart, readOpenPendingTellDisposition, readTell, readTurn, readNonterminalRequests, recordUndeliveredPendingTells, resolvePendingTellDisposition, } from "./heart/index.js";
 import { worldRootForAkumaPaths } from "./identity.js";
-import { pluginRuntime } from "../plugin/runtime.js";
+import { drainPluginRuntime, pluginRuntime } from "../plugin/runtime.js";
 import { World } from "../world.js";
 import { resolveProviderExecution } from "./providers/index.js";
 import { clearBodyRequestTransport, settleBodyRequests } from "./request-serve.js";
@@ -456,7 +456,9 @@ export async function spawnAkumaBody(launch) {
     return await spawnDetachedProcess(await bodyProcessInput(launch));
 }
 export async function runAkumaBody(launch, world, externalCommands) {
-    return await driveAkumaBody(launch, undefined, { world, externalCommands });
+    const result = await driveAkumaBody(launch, undefined, { world, externalCommands });
+    await drainPluginRuntime(world);
+    return result;
 }
 const DIRECT_TELL_WAKE = {
     spawn: async (paths) => await spawnAkumaBody({ paths, refuseIfHeld: true }),

package/build/src/plugin/runtime.d.ts

@@ -9,6 +9,8 @@ type PluginRuntimeInput = Readonly<{
 }>;
 export type PluginRuntime = Readonly<{
     emit(signal: PluginSignal, reportDiagnostic?: PluginDiagnostic): Promise<void>;
+    drain(): Promise<void>;
 }>;
 export declare function pluginRuntime(input: PluginRuntimeInput): Promise<PluginRuntime>;
+export declare function drainPluginRuntime(world: WorldRoot): Promise<void>;
 export {};

package/build/src/plugin/runtime.js

@@ -4,6 +4,7 @@ import { isAbsolute, join, posix, relative, sep } from "node:path";
 import { pathToFileURL } from "node:url";
 import { settings } from "../settings.js";
 const DIAGNOSTIC_LIMIT = 500;
+const PLUGIN_DRAIN_TIMEOUT_MS = 5_000;
 const PLUGIN_NAMESPACE = "plugins";
 const SQUARE_PLUGIN_PACKAGE = "@astrosheep/keiyaku-plugin-square";
 const BUILTIN_PLUGINS = Object.freeze([
@@ -283,6 +284,11 @@ export async function pluginRuntime(input) {
     }
     return await runtime;
 }
+export async function drainPluginRuntime(world) {
+    const runtime = PROCESS_RUNTIMES.get(world);
+    if (runtime !== undefined)
+        await (await runtime).drain();
+}
 async function createPluginRuntime(input) {
     const report = input.reportDiagnostic;
     const selected = selectedPlugins(input.settings ?? (await settings({ root: input.world })), report);
@@ -290,9 +296,13 @@ async function createPluginRuntime(input) {
     const registered = new Map();
     const settled = new Set();
     const pending = new Map();
+    const settledPromises = [];
+    const inFlight = new Set();
     const deliver = (entry, signal, reportDiagnostic) => {
         try {
-            void Promise.resolve(entry.handler(signal)).catch((error) => diagnostic(reportDiagnostic, entry.pluginId, "signal", error));
+            const delivery = Promise.resolve(entry.handler(signal)).catch((error) => diagnostic(reportDiagnostic, entry.pluginId, "signal", error));
+            inFlight.add(delivery);
+            void delivery.finally(() => inFlight.delete(delivery));
         }
         catch (error) {
             diagnostic(reportDiagnostic, entry.pluginId, "signal", error);
@@ -307,9 +317,13 @@ async function createPluginRuntime(input) {
     let previousStarted = Promise.resolve();
     for (const [index, entry] of selected.entries()) {
         let releaseStarted;
+        let releaseSettled;
         const started = new Promise((resolve) => {
             releaseStarted = resolve;
         });
+        settledPromises.push(new Promise((resolve) => {
+            releaseSettled = resolve;
+        }));
         void previousStarted.then(async () => {
             try {
                 const handlers = await activate(entry, input.world, activated, report, releaseStarted);
@@ -330,6 +344,7 @@ async function createPluginRuntime(input) {
             }
             finally {
                 releaseStarted();
+                releaseSettled();
             }
         });
         previousStarted = started;
@@ -353,5 +368,16 @@ async function createPluginRuntime(input) {
                 deliver(entry, signal, reportDiagnostic);
             return Promise.resolve();
         },
+        async drain() {
+            const settle = async () => {
+                await Promise.all(settledPromises);
+                while (inFlight.size > 0)
+                    await Promise.all([...inFlight]);
+            };
+            await Promise.race([
+                settle(),
+                new Promise((resolve) => setTimeout(resolve, PLUGIN_DRAIN_TIMEOUT_MS)),
+            ]);
+        },
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrosheep/keiyaku",
-  "version": "4.5.13",
+  "version": "4.5.15",
   "workspaces": [
     "plugins/*"
   ],
@@ -77,7 +77,7 @@
   "dependencies": {
     "@agentclientprotocol/sdk": "^1.3.0",
     "@anthropic-ai/claude-agent-sdk": "^0.3.226",
-    "@astrosheep/keiyaku-plugin-square": "0.1.1",
+    "@astrosheep/keiyaku-plugin-square": "0.1.3",
     "@earendil-works/pi-coding-agent": "0.80.10",
     "@opencode-ai/sdk": "1.18.3",
     "cross-spawn": "^7.0.6",