@astrosheep/keiyaku 4.6.6 → 4.6.7

package/build/src/plugin/runtime.js

@@ -18,7 +18,7 @@ function object(value) {
 function message(error) {
     return (error instanceof Error ? error.message : String(error)).slice(0, DIAGNOSTIC_LIMIT);
 }
-function diagnostic(report, subject, stage, error) {
+export function reportPluginDiagnostic(report, subject, stage, error) {
     if (report === undefined)
         return;
     try {
@@ -67,30 +67,30 @@ async function settleBefore(promise, cancellation) {
 }
 function selectedEntry(entry, report) {
     if (entry.name.trim().length === 0) {
-        diagnostic(report, "<unnamed>", "selection", new TypeError("plugin setting name must be nonblank"));
+        reportPluginDiagnostic(report, "<unnamed>", "selection", new TypeError("plugin setting name must be nonblank"));
         return null;
     }
     if (!object(entry.value)) {
-        diagnostic(report, entry.name, "selection", new TypeError("plugin setting must be an object"));
+        reportPluginDiagnostic(report, entry.name, "selection", new TypeError("plugin setting must be an object"));
         return null;
     }
     const names = Object.keys(entry.value);
     if (!names.includes("package") || names.some((name) => !["package", "enabled", "config"].includes(name))) {
-        diagnostic(report, entry.name, "selection", new TypeError("plugin setting has unknown or missing fields"));
+        reportPluginDiagnostic(report, entry.name, "selection", new TypeError("plugin setting has unknown or missing fields"));
         return null;
     }
     const packageName = entry.value.package;
     if (typeof packageName !== "string" || packageName.trim().length === 0) {
-        diagnostic(report, entry.name, "selection", new TypeError("plugin package must be a nonblank string"));
+        reportPluginDiagnostic(report, entry.name, "selection", new TypeError("plugin package must be a nonblank string"));
         return null;
     }
     if (packageName !== packageName.trim()) {
-        diagnostic(report, entry.name, "selection", new TypeError("plugin package must not have surrounding whitespace"));
+        reportPluginDiagnostic(report, entry.name, "selection", new TypeError("plugin package must not have surrounding whitespace"));
         return null;
     }
     const enabled = entry.value.enabled;
     if (enabled !== undefined && typeof enabled !== "boolean") {
-        diagnostic(report, entry.name, "selection", new TypeError("plugin enabled must be a boolean"));
+        reportPluginDiagnostic(report, entry.name, "selection", new TypeError("plugin enabled must be a boolean"));
         return null;
     }
     if (enabled === false)
@@ -101,7 +101,7 @@ function selectedPlugins(input, report) {
     const view = input.namespace(PLUGIN_NAMESPACE);
     if (view.kind === "failed") {
         for (const failure of view.failures)
-            diagnostic(report, "settings", failure.scope, failure.diagnostic);
+            reportPluginDiagnostic(report, "settings", failure.scope, failure.diagnostic);
         return BUILTIN_PLUGINS;
     }
     if (view.entries.length === 0)
@@ -197,6 +197,21 @@ async function writablePaths(world, declarations) {
     }
     return paths;
 }
+/**
+ * The runtime's acceptance vocabulary. The record is exhaustive over the public
+ * payload map, so adding a signal there fails compilation here until the same
+ * kind is accepted.
+ */
+const SIGNAL_KINDS = Object.freeze({
+    "akuma.initiating": true,
+    "akuma.called": true,
+    "akuma.outcome-observed": true,
+    "akuma.turn-outcome": true,
+    "akuma.body-ended": true,
+});
+function isSignalKind(kind) {
+    return Object.hasOwn(SIGNAL_KINDS, kind);
+}
 function handlers(pluginId, instance) {
     if (!object(instance))
         throw new TypeError("plugin activation must return an object");
@@ -208,12 +223,8 @@ function handlers(pluginId, instance) {
         throw new TypeError("plugin signals must be an object");
     const registered = [];
     for (const [kind, handler] of Object.entries(instance.signals)) {
-        if (kind !== "akuma.initiating" &&
-            kind !== "akuma.called" &&
-            kind !== "akuma.turn-outcome" &&
-            kind !== "akuma.body-ended") {
+        if (!isSignalKind(kind))
             throw new TypeError(`plugin signal is unknown: ${kind}`);
-        }
         if (typeof handler !== "function")
             throw new TypeError(`plugin signal handler is not a function: ${kind}`);
         registered.push({ pluginId, kind, handler });
@@ -270,7 +281,7 @@ async function activate(input) {
     }
     catch (error) {
         markStarted();
-        diagnostic(report, selected.id, "import", error);
+        reportPluginDiagnostic(report, selected.id, "import", error);
         return [];
     }
     if (cancellation.aborted) {
@@ -288,7 +299,7 @@ async function activate(input) {
     }
     catch (error) {
         markStarted();
-        diagnostic(report, selected.id, "validation", error);
+        reportPluginDiagnostic(report, selected.id, "validation", error);
         return [];
     }
     let context;
@@ -307,7 +318,7 @@ async function activate(input) {
     }
     catch (error) {
         markStarted();
-        diagnostic(report, selected.id, "validation", error);
+        reportPluginDiagnostic(report, selected.id, "validation", error);
         return [];
     }
     if (cancellation.aborted) {
@@ -324,16 +335,16 @@ async function activate(input) {
         return registered;
     }
     catch (error) {
-        diagnostic(report, selected.id, "activation", error);
+        reportPluginDiagnostic(report, selected.id, "activation", error);
         return [];
     }
 }
 async function deliver(entry, signal, reportDiagnostic, timeoutMs) {
     const result = await boundedAttempt((cancellation) => entry.handler(signal, cancellation), timeoutMs);
     if (result.kind === "timed-out")
-        diagnostic(reportDiagnostic, entry.pluginId, "signal", timeoutError());
+        reportPluginDiagnostic(reportDiagnostic, entry.pluginId, "signal", timeoutError());
     if (result.kind === "failed")
-        diagnostic(reportDiagnostic, entry.pluginId, "signal", result.error);
+        reportPluginDiagnostic(reportDiagnostic, entry.pluginId, "signal", result.error);
 }
 export async function pluginRuntime(input) {
     let runtime = PROCESS_RUNTIMES.get(input.world);
@@ -358,7 +369,7 @@ async function createPluginRuntime(input) {
             releaseStarted();
             if (result.kind === "settled")
                 return { handlers: result.value, timedOut: false };
-            diagnostic(report, entry.id, "activation", result.kind === "failed" ? result.error : timeoutError());
+            reportPluginDiagnostic(report, entry.id, "activation", result.kind === "failed" ? result.error : timeoutError());
             return { handlers: [], timedOut: result.kind === "timed-out" };
         });
         previousStarted = started;
@@ -372,16 +383,16 @@ async function createPluginRuntime(input) {
                     const activatedHandlers = await settleBefore(activation, cancellation);
                     if (activatedHandlers !== ABORTED) {
                         if (activatedHandlers.timedOut)
-                            diagnostic(reportDiagnostic, selected[index].id, "signal", timeoutError());
+                            reportPluginDiagnostic(reportDiagnostic, selected[index].id, "signal", timeoutError());
                         return activatedHandlers.handlers;
                     }
-                    diagnostic(reportDiagnostic, selected[index].id, "signal", timeoutError());
+                    reportPluginDiagnostic(reportDiagnostic, selected[index].id, "signal", timeoutError());
                     return [];
                 }));
                 return handlers.flat();
             });
             if (activated.kind === "failed") {
-                diagnostic(reportDiagnostic, "runtime", "signal", activated.error);
+                reportPluginDiagnostic(reportDiagnostic, "runtime", "signal", activated.error);
                 return;
             }
             if (activated.kind === "timed-out")

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@astrosheep/keiyaku",
-  "version": "4.6.6",
+  "version": "4.6.7",
   "workspaces": [
-    "plugins/*"
+    "plugins/square"
   ],
   "files": [
     "build"
@@ -29,7 +29,7 @@
   },
   "scripts": {
     "release": "npm run test:release && npm version patch && npm publish",
-    "build": "node --input-type=module -e \"import { rmSync } from 'node:fs'; rmSync('build', { recursive: true, force: true })\" && tsc -p tsconfig.json && npm run build --workspace @astrosheep/keiyaku-plugin-square && node scripts/copy-integrations.js && node scripts/build-windows-launcher.js && node --input-type=module -e \"import { chmodSync } from 'node:fs'; chmodSync('build/src/cli/index.js', 0o755)\"",
+    "build": "node --input-type=module -e \"import { rmSync } from 'node:fs'; rmSync('build', { recursive: true, force: true })\" && tsc -p tsconfig.json && npm run build --workspace @astrosheep/keiyaku-plugin-square && node scripts/copy-plugins.js && node scripts/build-windows-launcher.js && node --input-type=module -e \"import { chmodSync } from 'node:fs'; chmodSync('build/src/cli/index.js', 0o755)\"",
     "prepack": "node scripts/verify-package.js",
     "postpack": "node scripts/verify-package.js",
     "harness:version": "node scripts/update-harness-version.js",
@@ -73,8 +73,8 @@
   "dependencies": {
     "@agentclientprotocol/sdk": "^1.3.0",
     "@anthropic-ai/claude-agent-sdk": "^0.3.226",
-    "@astrosheep/keiyaku-plugin-square": "0.1.7",
-    "@astrosheep/square": "^0.3.63",
+    "@astrosheep/keiyaku-plugin-square": "0.1.8",
+    "@astrosheep/square": "^0.3.70",
     "@opencode-ai/sdk": "1.18.3",
     "cross-spawn": "^7.0.6",
     "diff": "^8.0.4",
@@ -91,10 +91,10 @@
   ],
   "pi": {
     "extensions": [
-      "./build/integrations/pi/keiyaku.ts"
+      "./build/plugins/pi/keiyaku.ts"
     ],
     "skills": [
-      "./build/integrations/marketplace/plugins/keiyaku/skills"
+      "./build/skills"
     ]
   },
   "author": "",

package/build/integrations/marketplace/.claude-plugin/marketplace.json

@@ -1,5 +0,0 @@
-{
-  "name": "keiyaku",
-  "owner": { "name": "Keiyaku" },
-  "plugins": [{ "name": "keiyaku", "source": "./plugins/keiyaku" }]
-}

package/build/integrations/marketplace/plugins/keiyaku/package.json

@@ -1,17 +0,0 @@
-{
-  "name": "keiyaku-harness",
-  "version": "4.5.28",
-  "type": "module",
-  "main": "./opencode.js",
-  "keywords": [
-    "pi-package"
-  ],
-  "pi": {
-    "extensions": [
-      "../../../pi/keiyaku.ts"
-    ],
-    "skills": [
-      "./skills"
-    ]
-  }
-}