@astrosheep/keiyaku 4.6.4 → 4.6.7

package/build/src/verification/execution.js

@@ -28,7 +28,7 @@ function argvFor(declaration) {
     return [declaration.executor, ...args];
 }
 function processDiagnostic(declaration, index, outcome) {
-    if (outcome.code === 0 && outcome.stdout.length === 0 && outcome.stderr.length === 0 && !outcome.truncated) {
+    if (outcome.code === 0) {
         return null;
     }
     return [
@@ -118,7 +118,7 @@ async function materializeScratch(input) {
     observe(input, { kind: "phase", phase: "materialize", state: "started" });
     try {
         input.signal?.throwIfAborted();
-        const scratch = await input.materializeScratchCandidate(input.repository, input.candidate);
+        const scratch = await input.materializeScratchCandidate(input.repository, input.candidate, input.contractId);
         observe(input, { kind: "phase", phase: "materialize", state: "finished", cwd: scratch.cwd, outcome: "ok" });
         return scratch;
     }
@@ -174,7 +174,7 @@ async function runScratch(input, scratch) {
         };
     }
 }
-async function retireScratch(input, scratch, destroy) {
+async function retireScratch(input, scratch, destroy, outcome) {
     observe(input, { kind: "phase", phase: "cleanup", cwd: scratch.cwd, state: "started" });
     let cleanup;
     if (destroy !== undefined) {
@@ -190,13 +190,14 @@ async function retireScratch(input, scratch, destroy) {
         if (result.kind === "failed")
             cleanup = { phase: "destroy", name: result.name, detail: result.failure };
     }
-    const leak = await scratch.dispose();
+    const retain = outcome.kind === "terminal" ? outcome.verdict === "unsatisfied" : outcome.kind !== "cancelled";
+    const leak = await scratch.dispose(retain);
     observe(input, {
         kind: "phase",
         phase: "cleanup",
         cwd: scratch.cwd,
         state: "finished",
-        outcome: leak !== null || cleanup !== undefined ? "failed" : "ok",
+        outcome: cleanup !== undefined ? "failed" : retain ? "retained" : leak !== null ? "failed" : "ok",
     });
     return {
         ...(cleanup === undefined ? {} : { cleanup }),
@@ -209,5 +210,8 @@ export async function executeVerification(input) {
     if ("outcome" in materialized)
         return materialized;
     const prepared = await runScratch(input, materialized);
-    return { outcome: prepared.outcome, ...(await retireScratch(input, materialized, prepared.destroy)) };
+    return {
+        outcome: prepared.outcome,
+        ...(await retireScratch(input, materialized, prepared.destroy, prepared.outcome)),
+    };
 }

package/build/src/workspace-place.d.ts

@@ -34,7 +34,6 @@ export type PlaceAuthorityFence = Readonly<{
 }>;
 export declare function placeRegisterPath(repository: GitRepository): string;
 export declare function place(value: string): Place;
-export declare function nextPlace(current?: Place): Place;
 export declare function canonicalPlaceRegister(register: PlaceRegister): string;
 export declare function decodePlaceRegister(path: string, bytes: string): PlaceRegister;
 export declare function emptyPlaceRegister(): PlaceRegister;

package/build/src/workspace-place.js

@@ -221,17 +221,6 @@ export function place(value) {
         throw new TypeError(`Place is not canonical: ${value}`);
     return value;
 }
-export function nextPlace(current) {
-    if (current === undefined)
-        return place(CONTRACT_PLACES[0]);
-    const parsed = parsedPlace(current);
-    if (parsed === undefined)
-        throw new TypeError(`Place is not canonical: ${current}`);
-    const index = PLACE_INDEX.get(parsed.base);
-    return index + 1 < CONTRACT_PLACES.length
-        ? composePlace(CONTRACT_PLACES[index + 1], parsed.generation)
-        : composePlace(CONTRACT_PLACES[0], parsed.generation + 1n);
-}
 export function canonicalPlaceRegister(register) {
     const appointments = Object.fromEntries(register.appointments
         .slice()

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@astrosheep/keiyaku",
-  "version": "4.6.4",
+  "version": "4.6.7",
   "workspaces": [
-    "plugins/*"
+    "plugins/square"
   ],
   "files": [
     "build"
@@ -20,7 +20,8 @@
     }
   },
   "bin": {
-    "keiyaku": "build/src/cli/index.js"
+    "keiyaku": "build/src/cli/index.js",
+    "kei": "build/src/cli/index.js"
   },
   "type": "module",
   "engines": {
@@ -28,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",
@@ -55,7 +56,11 @@
     "test:compile": "node scripts/compile-tests.mjs",
     "test:e2e:built": "node scripts/run-tests.mjs tests/packaged-cli.e2e.ts tests/cli-akuma-packaged.e2e.ts"
   },
+  "peerDependencies": {
+    "@earendil-works/pi-coding-agent": "*"
+  },
   "devDependencies": {
+    "@earendil-works/pi-coding-agent": "^1.0.0",
     "@types/cross-spawn": "^6.0.6",
     "@types/node": "^25.0.0",
     "@typescript-eslint/parser": "^8.66.0",
@@ -68,9 +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",
-    "@earendil-works/pi-coding-agent": "^1.0.0",
+    "@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",
@@ -87,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"
-    ]
-  }
-}