@astrosheep/keiyaku 2.8.4 → 2.9.0

package/build/keiyaku.js

@@ -1,4 +1,6 @@
 import * as path from "path";
+import { ACTOR_IDENTITY, SETTINGS_PATH_SEGMENTS } from "./keiyaku-constants.js";
+export { ACTOR_IDENTITY } from "./keiyaku-constants.js";
 export const KEIYAKU_FILE = path.join(".keiyaku", "KEIYAKU.md");
 export const KEIYAKU_DRAFT_DIR = path.join(".keiyaku", "draft");
 export const RESPONSE_HISTORY_DIR = path.join(".keiyaku", "response");
@@ -13,7 +15,6 @@ export const TOOL_NAMES = {
     status: "status",
     help: "help",
 };
-export const ACTOR_IDENTITY = "Akuma";
 export const ACTOR_IDENTITY_PLURAL = `${ACTOR_IDENTITY}s`;
 function formatArtifactDirectory(directory) {
     return `\`${directory}/\``;
@@ -35,7 +36,7 @@ export const DRAFT_ARTIFACT_NOTICE = buildArtifactNotice(KEIYAKU_ARTIFACT_DIRS[0
 export const RESPONSE_ARTIFACT_NOTICE = buildArtifactNotice(KEIYAKU_ARTIFACT_DIRS[1]);
 export const KEIYAKU_BRANCH_PREFIX = "keiyaku/";
 export const BASE_RULES_FILE = path.join(".keiyaku", "base-rules.md");
-export const SETTINGS_FILE = path.join(".keiyaku", "settings.json");
+export const SETTINGS_FILE = path.join(...SETTINGS_PATH_SEGMENTS);
 export const SUBAGENT_PROVIDERS = [
     "codex-sdk",
     "codex-app-server",
@@ -50,7 +51,7 @@ export const CODEX_MODEL_REASONING_EFFORT_CONFIG_KEY = "model_reasoning_effort";
 export const BUILTIN_AGENT_NAMES = ["akuma-codex", "akuma-claude"];
 export const DEFAULT_AGENT_NAME = "akuma-codex";
 export const BUILTIN_AGENT_PROFILES = {
-    "akuma-codex": { provider: "codex-sdk", description: "Default Codex SDK Akuma." },
+    "akuma-codex": { provider: "codex-sdk", description: "Deprecated Codex SDK Akuma; use codex-app-server." },
     "akuma-claude": { provider: "claude-agent-sdk", description: "Default Claude Agent SDK Akuma." },
 };
 export const CLAUDE_PERMISSION_MODES = ["default", "acceptEdits", "bypassPermissions", "plan", "dontAsk", "auto"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrosheep/keiyaku",
-  "version": "2.8.4",
+  "version": "2.9.0",
   "description": "CLI for running iterative keiyaku workflows with Codex subagents.",
   "license": "MIT",
   "type": "module",
@@ -51,8 +51,9 @@
     "@earendil-works/pi-coding-agent": "^0.80.10",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "@openai/codex-sdk": "^0.113.0",
-    "@opencode-ai/sdk": "1.17.20",
+    "@opencode-ai/sdk": "1.18.3",
     "simple-git": "^3.21.0",
+    "yaml": "^2.9.0",
     "zod": "4.3.6"
   },
   "devDependencies": {

package/skills/keiyaku/SKILL.md

@@ -19,7 +19,7 @@ Akuma call/tell/wait/revive lifecycle is owned by the `keiyaku-akuma` skill. Loa
 
 ## Basic Flow
 
-For committed delivery work, bind the contract, open an arc before implementation, commit delivery work, amend when the governing contract changes, renew when the base drifts, and petition only after the delivery is ready for settlement. Opening another arc seals the current one; petition also seals an open arc, so no extra closing arc is needed.
+The small/default workflow is bind, commit delivery work, then petition. Bind supplies derived default intent a0. Arc is optional for multiple intent iterations: the first explicit arc seals a0, and a later arc seals the current explicit arc. Renew when the base drifts; renew and petition seal the current a0 or open explicit arc. After an explicit arc closes, loose commits require another arc before renew or petition. Amend when the governing contract changes.
 
 Use `status` to inspect the Kanshi board and `forfeit` to archive abandoned work. Consult command help for their syntax and flags.
 

package/skills/keiyaku-akuma/SKILL.md

@@ -7,7 +7,7 @@ allowed-tools: Bash(keiyaku *)
 # Keiyaku Akuma
 
 ```bash
-keiyaku akuma list
+keiyaku akuma ls
 keiyaku <command> --help
 ```
 
@@ -23,17 +23,22 @@ Contract work = `keiyaku` skill. This skill = helpers only.
 ## Daily path
 
 ```bash
-keiyaku call NAME "task..."                   # launch + foreground join (no CLI --timeout)
+keiyaku call NAME "task..."                   # required literal BODY; launch + foreground join
 keiyaku call NAME --detach "task..."          # return after launch; keep projection id
+keiyaku call NAME - < prompt.md               # only literal `-` opens stdin
 keiyaku wait <projection-id>                  # join until terminal; prints activity list
 keiyaku wait <projection-id> --timeout 5m     # bounded join; timeout keeps projection alive
-keiyaku tell <projection-id> "more..."        # mailbox only; does not wait
+keiyaku tell <projection-id> "more..."        # required literal BODY; mailbox only
+keiyaku tell <projection-id> - < direction.md # explicit stdin body; `-` is never delivered
+keiyaku tell <projection-id> --wait 5m "more..."  # no mandatory `--` before BODY
 keiyaku wait <projection-id> --timeout 10m    # after tell, rejoin to see progress/outcome
 keiyaku status                                # board + compact activity summary; rediscover ids
-keiyaku revive ARTIFACT_ID                    # new life from saved answer
+keiyaku revive ARTIFACT_ID                    # omit body → default continuation
+keiyaku revive ARTIFACT_ID "continue..."      # literal BODY
+keiyaku revive ARTIFACT_ID - < cont.md        # explicit `-` stdin; blank fails
 ```
 
-Long prompt: `keiyaku call NAME - < prompt.md`
+Long body: `keiyaku call NAME - < prompt.md` or `keiyaku tell PROJECTION - < direction.md`. Never omit call/tell body and hope for piped stdin.
 
 ## Timeouts (do not confuse)
 
@@ -72,4 +77,4 @@ Lost the outer handle → `status` to find projection id → `wait` for the list
 - `--bare` — skip contract attachment only (call only)
 - `--effort LEVEL` — override opaque provider-native effort value (call, revive, tell); must match profile allowlist when set
 
-Profiles: `keiyaku akuma list|show`; user `<KEIYAKU_HOME>/akuma/`, project `.keiyaku/akuma/`.
+Profiles: `keiyaku akuma ls|view`; user `<KEIYAKU_HOME>/akuma/`, project `.keiyaku/akuma/`.

package/build/agents/harness/pump.js

@@ -1,158 +0,0 @@
-import { claimAllInbox, claimFencedTells, listTellIds, markTellSubmitted, markTellConsumed, readTellSubmitted, readTellOriginal, isTellCausallyConsumed, appendGenerationEvent, } from "../../core/projection-core.js";
-import { prepareAgentEventForPersistence, } from "./execution-handle.js";
-const OPERATOR_PROMPT_MARKER = "[Operator prompt]\n";
-function frameTellBodies(projectionDirectory, tellIds) {
-    const originals = tellIds.map((tellId) => readTellOriginal(projectionDirectory, "inflight", tellId));
-    const frames = originals
-        .map((original, index) => `--- tell ${tellIds[index]} ---\n${original.text}`)
-        .join("\n\n");
-    const effort = originals.reduce((value, original) => original.effort ?? value, undefined);
-    return { frames, ...(effort ? { effort } : {}) };
-}
-function operatorBodyForContinuation(prompt, tellFrames, sessionContinuation) {
-    if (!sessionContinuation)
-        return `${prompt}\n\n${tellFrames}`;
-    const markerAt = prompt.indexOf(OPERATOR_PROMPT_MARKER);
-    if (markerAt >= 0) {
-        return `${prompt.slice(0, markerAt + OPERATOR_PROMPT_MARKER.length)}${tellFrames}`;
-    }
-    return tellFrames;
-}
-/** Tier-2 boundary snapshot. No tells leaves prompt byte-identical. */
-export function snapshotReplayPrompt(projectionDirectory, prompt, tellFence, executionId, options = {}) {
-    const tellIds = claimFencedTells(projectionDirectory, tellFence, executionId);
-    if (tellIds.length === 0)
-        return { prompt, tellIds };
-    const { frames, effort } = frameTellBodies(projectionDirectory, tellIds);
-    const nextPrompt = operatorBodyForContinuation(prompt, frames, options.sessionContinuation === true);
-    return { prompt: nextPrompt, tellIds, ...(effort ? { effort } : {}) };
-}
-/** Tier-2 has no steer acknowledgement: actual driver start is its ordinal-zero submission point. */
-export function markReplayStarted(projectionDirectory, executionId, tellIds) {
-    for (const tellId of tellIds) {
-        if (listTellIds(projectionDirectory, "inflight").includes(tellId)) {
-            markTellSubmitted(projectionDirectory, tellId, { executionId, fence: { kind: "ordinal", ordinal: 0 } });
-        }
-    }
-}
-/** A successful replay terminal is checkpoint ordinal one; failures intentionally do not consume. */
-export function markReplayCompleted(projectionDirectory, executionId) {
-    for (const tellId of listTellIds(projectionDirectory, "submitted")) {
-        const submitted = readTellSubmitted(projectionDirectory, tellId);
-        if (submitted.executionId === executionId && submitted.fence && isTellCausallyConsumed(submitted.fence, { kind: "ordinal", ordinal: 1 })) {
-            markTellConsumed(projectionDirectory, tellId);
-        }
-    }
-}
-/**
- * Tier-2's only submission acknowledgement. A created driver is deliberately
- * insufficient: observe the first provider event, or a successful completion
- * from a provider that emitted no events.
- */
-export function createReplayRunStartGate(projectionDirectory, executionId, tellIds) {
-    let started = false;
-    const start = () => {
-        if (started)
-            return;
-        markReplayStarted(projectionDirectory, executionId, tellIds);
-        started = true;
-    };
-    return { observeProviderEvent: start, observeSuccessfulCompletion: start };
-}
-/**
- * Supervisor pump: iterates handle.events, forwards to publicChannel,
- * persists public events and checks the tell ledger at checkpoints.
- */
-export async function pumpSupervisor(handle, projectionDirectory, executionId, publicChannel, callbacks = {}, dependencies = {}) {
-    let persistenceEnabled = true;
-    let persistenceDiagnosticQueued = false;
-    const pendingDiagnostics = [];
-    const appendEvent = dependencies.appendGenerationEvent ?? appendGenerationEvent;
-    const dispatch = (event, persist = true) => {
-        if (persist && persistenceEnabled) {
-            try {
-                appendEvent(projectionDirectory, executionId, prepareAgentEventForPersistence(event));
-            }
-            catch (error) {
-                persistenceEnabled = false;
-                if (!persistenceDiagnosticQueued) {
-                    persistenceDiagnosticQueued = true;
-                    pendingDiagnostics.push({
-                        text: `event persistence degraded: ${String(error)}`,
-                        persist: false,
-                    });
-                }
-            }
-        }
-        publicChannel.push(event);
-        callbacks.onEvent?.(event);
-    };
-    try {
-        for await (const event of handle.events) {
-            dispatch(event);
-        }
-    }
-    catch (error) {
-        if (error instanceof Error && error.code === "PROJECTION_STATE_ERROR") {
-            const event = handle.mintEvent({
-                type: "fail",
-                code: "PROJECTION_STATE_ERROR",
-                message: error.message,
-            });
-            if (event)
-                dispatch(event);
-        }
-        else {
-            const event = handle.mintEvent({
-                type: "diagnostic",
-                text: `pump error: ${String(error)}`,
-            });
-            if (event)
-                dispatch(event);
-        }
-    }
-    for (const pending of pendingDiagnostics) {
-        const event = handle.mintEvent({ type: "diagnostic", text: pending.text });
-        if (event)
-            dispatch(event, pending.persist);
-    }
-}
-/**
- * Build an onSyncCheckpoint callback that claims all inbox tells
- * and delivers them via the given SteerControl.
- * Intended for use inside adapter start() calls as the onSyncCheckpoint callback.
- */
-export function buildSyncCheckpointCallback(projectionDirectory, executionId) {
-    const submitting = new Set();
-    return (control, checkpoint) => {
-        claimAllInbox(projectionDirectory);
-        for (const tellId of listTellIds(projectionDirectory, "inflight")) {
-            if (submitting.has(tellId))
-                continue;
-            submitting.add(tellId);
-            const original = readTellOriginal(projectionDirectory, "inflight", tellId);
-            const originalText = original.text;
-            const tell = {
-                id: tellId,
-                text: `--- tell ${tellId} ---\n${originalText}`,
-                ...(original.effort ? { effort: original.effort } : {}),
-            };
-            void control.enqueue(tell)
-                .then((ack) => {
-                if (!ack)
-                    throw new Error("provider enqueue resolved without TellSubmitAck");
-                markTellSubmitted(projectionDirectory, tellId, { executionId, fence: ack.fence });
-            })
-                .catch(() => {
-                // Leave in inflight for the next checkpoint.
-            })
-                .finally(() => submitting.delete(tellId));
-        }
-        for (const tellId of listTellIds(projectionDirectory, "submitted")) {
-            const submitted = readTellSubmitted(projectionDirectory, tellId);
-            if (submitted.executionId === executionId && submitted.fence && isTellCausallyConsumed(submitted.fence, checkpoint.fence)) {
-                markTellConsumed(projectionDirectory, tellId);
-            }
-        }
-    };
-}