@astrosheep/keiyaku 4.1.5 → 4.2.0

package/build/src/akuma/akuma-product.d.ts

@@ -1,10 +1,9 @@
-import type { SquareRoute } from "@astrosheep/square";
 import { AkumaHandle } from "./akuma-handle.js";
-import type { AkumaCallContext, AkumaCallInput, AkumaConfiguration, AkumaList, AkumaListInput } from "./akuma.js";
+import type { AkumaCallContext, AkumaCallInput, AkumaConfiguration, AkumaList, AkumaListInput, ResultRoute } from "./akuma.js";
 import { CALL_WITH_CONTEXT } from "./akuma-product-symbols.js";
 import type { WorldRoot } from "../world.js";
 type AkumaCallLaunchInput = AkumaCallInput & Readonly<{
-    resultRoute?: SquareRoute;
+    resultRoute?: ResultRoute;
 }>;
 export declare class Akuma {
     private readonly path;

package/build/src/akuma/akuma.d.ts

@@ -57,6 +57,8 @@ export type AkumaCallInput = Readonly<{
     readonly?: true;
     allowed?: readonly AllowedAction[];
 }>;
+/** Opaque, serializable caller result address carried across the Body process. */
+export type ResultRoute = Readonly<unknown>;
 export type AkumaCallContext = Readonly<{
     initiatorCwd?: string;
     cwdCanonical?: true;

package/build/src/akuma/body.d.ts

@@ -1,7 +1,7 @@
-import type { SquareRoute } from "@astrosheep/square";
 import { type SessionFact, type Soul } from "./heart/index.js";
 import type { AkumaPaths } from "./identity.js";
 import type { ProviderAdapter } from "./provider.js";
+import type { ResultRoute } from "./akuma.js";
 import { type UpstreamExecutionPort, type RequestChildLaunch } from "./request-serve.js";
 import { type OwnedProcess, type RunLogReference } from "../runtime/proc/run.js";
 export declare const LEASH_HELD_EXIT = 75;
@@ -12,7 +12,7 @@ export type BodyLaunch = Readonly<{
     birthSession?: Omit<SessionFact, "sequence">;
     initialBody?: string;
     refuseIfHeld?: boolean;
-    resultRoute?: SquareRoute;
+    resultRoute?: ResultRoute;
 }>;
 export type TellWake = Readonly<{
     kind: "told";
@@ -45,7 +45,7 @@ type BodyRuntime = Readonly<{
     now(): string;
     spawnChild?(launch: RequestChildLaunch): Promise<void>;
     spawnBody?(launch: BodyLaunch): Promise<OwnedProcess>;
-    express?(route: SquareRoute, options: Readonly<{
+    express?(route: ResultRoute, options: Readonly<{
         as: string;
         body: string;
     }>): Promise<unknown>;

package/build/src/akuma/body.js

@@ -59,21 +59,22 @@ async function launchCwd(launch) {
     return (await turnRecipe(launch.paths, soul)).cwd;
 }
 async function persistTurn(paths, turnSequence, result, completedAt) {
-    await endTurn(paths, {
-        turnSequence,
-        outcome: result.kind === "answered" && result.session !== undefined
-            ? {
+    if (result.kind === "answered" && result.session !== undefined) {
+        await endTurn(paths, {
+            turnSequence,
+            outcome: {
                 kind: "answered",
                 session: result.session,
                 answer: result.answer,
                 ...(result.historyId === undefined ? {} : { historyId: result.historyId }),
-            }
-            : result.kind === "answered"
-                ? { kind: "failed", diagnostic: "Provider answered without a resumable session" }
-                : { kind: "failed", diagnostic: result.diagnostic },
-        completedAt,
-    });
-    return result.kind === "answered" && result.session === undefined ? "failed" : result.kind;
+            },
+            completedAt,
+        });
+        return { outcome: "answered", answer: result.answer };
+    }
+    const diagnostic = result.kind === "answered" ? "Provider answered without a resumable session" : result.diagnostic;
+    await endTurn(paths, { turnSequence, outcome: { kind: "failed", diagnostic }, completedAt });
+    return { outcome: "failed", diagnostic };
 }
 function boundedDiagnostic(error) {
     const text = diagnostic(error);
@@ -86,7 +87,7 @@ async function expressInitialOutcome(launch, soul, outcome, runtime) {
         const express = runtime.express ?? (await import("@astrosheep/square")).express;
         await express(launch.resultRoute, {
             as: "keiyaku",
-            body: JSON.stringify({ akuma: soul.id, outcome }),
+            body: JSON.stringify({ akuma: soul.id, ...outcome }),
         });
     }
     catch (error) {
@@ -204,7 +205,7 @@ async function runBodyTurns(input) {
         const outcome = await persistTurn(launch.paths, result.turnSequence, result, runtime.now());
         if (initial !== undefined)
             await expressInitialOutcome(launch, soul, outcome, runtime);
-        if (outcome === "failed") {
+        if (outcome.outcome === "failed") {
             await breakBody(launch.paths, { sequence: bodySequence, end: "broke-off", at: runtime.now() });
             return;
         }

package/build/src/akuma/index.d.ts

@@ -1,7 +1,7 @@
 import { type AkuId } from "./identity.js";
 import type { WorldRoot } from "../world.js";
 export { Akuma, AkumaHandle, AkumaNotBornError, defaultWaitComplete } from "./akuma.js";
-export type { AkumaCallInput } from "./akuma.js";
+export type { AkumaCallInput, ResultRoute } from "./akuma.js";
 export { ALLOWED_ACTIONS } from "./allowed.js";
 export type { AllowedAction, AllowedActions } from "./allowed.js";
 export type { WorldRoot } from "../world.js";

package/build/src/cli/commands/akuma-invoke.d.ts

@@ -1,5 +1,5 @@
-import type { SquareRoute } from "@astrosheep/square";
 import { type AkuId, type ActivityHistory } from "../../akuma/index.js";
+import type { ResultRoute } from "../../akuma/akuma.js";
 import { Keiyaku, type AkumaKillResult, type AkumaHistoryResult, type AkumaObservation, type AkumaTellResult, type AkumaWaitResult, type CallResult, type ForkResult, type Keiyaku as KeiyakuContract, type Repo } from "../../index.js";
 import type { Settings } from "../../settings.js";
 import type { WorldRoot } from "../../world.js";
@@ -73,7 +73,7 @@ type InvokeInput = Readonly<{
     settings?: Settings;
     contract?: KeiyakuContract;
     repo?: Repo;
-    resultRoute?: SquareRoute;
+    resultRoute?: ResultRoute;
     readStdin(): Promise<string>;
 }>;
 export declare function invokeAkuma(command: InvokedAkumaCommand, input: InvokeInput): Promise<AkumaInvocationResult>;

package/build/src/library/akuma-creation.d.ts

@@ -1,6 +1,5 @@
-import type { SquareRoute } from "@astrosheep/square";
 import { type AliasBinding } from "../alias/index.js";
-import { type AkumaStatus, type ForkReceipt, type ReadonlyRestraint } from "../akuma/akuma.js";
+import { type AkumaStatus, type ForkReceipt, type ReadonlyRestraint, type ResultRoute } from "../akuma/akuma.js";
 import type { AkuId } from "../akuma/identity.js";
 import { type Dispatch, type DispatchFailure } from "../dispatch/index.js";
 import { type AkumaAlias } from "../identity/selector.js";
@@ -49,7 +48,7 @@ export type CallInput = Readonly<{
     contract?: Keiyaku;
     alias?: AkumaAlias;
     allowed?: readonly AllowedAction[];
-    resultRoute?: SquareRoute;
+    resultRoute?: ResultRoute;
 }>;
 export type CallObservation = Readonly<{
     kind: "detached";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrosheep/keiyaku",
-  "version": "4.1.5",
+  "version": "4.2.0",
   "files": [
     "build"
   ],
@@ -59,7 +59,7 @@
   "dependencies": {
     "@agentclientprotocol/sdk": "^1.3.0",
     "@anthropic-ai/claude-agent-sdk": "^0.3.226",
-    "@astrosheep/square": "file:../square/.keiyaku/wt/garage",
+    "@astrosheep/square": "0.3.13",
     "@earendil-works/pi-coding-agent": "0.80.10",
     "@opencode-ai/sdk": "1.18.3",
     "cross-spawn": "^7.0.6",