@astrosheep/keiyaku 2.8.4 → 2.9.0

package/build/agents/{call-terms_v2.js → call-terms.js}

@@ -12,23 +12,24 @@ function maxCaptureCharsForProvider(provider) {
             return config.opencode.execMaxCaptureChars;
     }
 }
-export function buildCallTermsV2(snapshot, prompt, cwd, options) {
+export function buildCallTerms(snapshot, prompt, cwd, options) {
     const runtimeConfig = getConfig();
+    const body = snapshot.akuma.body;
+    const sessionContinuationPromptPrefix = body && (snapshot.provider.kind === "codex-sdk" || snapshot.provider.kind === "opencode-sdk")
+        ? `[Akuma system prompt]\n${body}\n\n[Operator prompt]\n`
+        : "";
+    const replayPrompt = sessionContinuationPromptPrefix
+        ? `${sessionContinuationPromptPrefix}${prompt}`
+        : prompt;
     const baseTerms = {
         workdir: cwd,
         prompt,
+        sessionContinuationPromptPrefix,
         idleTimeoutMs: options.idleTimeoutMs ?? runtimeConfig.subagent.execIdleTimeoutMs,
         maxCaptureChars: maxCaptureCharsForProvider(snapshot.provider.kind),
         signal: options.signal,
-        projectionDir: options.projectionDir,
-        projectionExecutionId: options.projectionExecutionId,
-        projectionTellFence: options.projectionTellFence,
         ...(options.initialTurn !== undefined ? { initialTurn: options.initialTurn } : {}),
     };
-    const body = snapshot.akuma.body;
-    const replayPrompt = body
-        ? `[Akuma system prompt]\n${body}\n\n[Operator prompt]\n${prompt}`
-        : prompt;
     switch (snapshot.provider.kind) {
         case "codex-sdk":
             return {
@@ -60,6 +61,7 @@ export function buildCallTermsV2(snapshot, prompt, cwd, options) {
                 ...(snapshot.provider.approvalPolicy !== undefined
                     ? { approvalPolicy: snapshot.provider.approvalPolicy }
                     : {}),
+                ...(snapshot.provider.env !== undefined ? { env: snapshot.provider.env } : {}),
                 developerInstructions: body || undefined,
                 onCheckpoint() { },
             };
@@ -78,6 +80,7 @@ export function buildCallTermsV2(snapshot, prompt, cwd, options) {
                 ...(snapshot.provider.disallowedTools !== undefined
                     ? { disallowedTools: snapshot.provider.disallowedTools }
                     : {}),
+                ...(snapshot.provider.env !== undefined ? { env: snapshot.provider.env } : {}),
                 systemPrompt: body
                     ? { type: "preset", preset: "claude_code", append: body }
                     : undefined,
@@ -91,6 +94,7 @@ export function buildCallTermsV2(snapshot, prompt, cwd, options) {
                 ...(snapshot.provider.model !== undefined ? { model: snapshot.provider.model } : {}),
                 ...(snapshot.provider.effort !== undefined ? { effort: snapshot.provider.effort } : {}),
                 ...(snapshot.provider.executable !== undefined ? { executable: snapshot.provider.executable } : {}),
+                ...(snapshot.provider.env !== undefined ? { env: snapshot.provider.env } : {}),
             };
         case "pi":
             return {

package/build/agents/harness/control-types.js

@@ -0,0 +1 @@
+export {};

package/build/agents/harness/execution-handle.js

@@ -63,8 +63,12 @@ function serializeUnknownPayload(value) {
 function normalizeBodyForPersistence(body) {
     switch (body.type) {
         case "message": {
+            const id = truncateText(body.id);
             const text = truncateText(body.text);
-            return { body: { ...body, text: text.value }, truncated: text.truncated };
+            return {
+                body: { ...body, id: id.value, text: text.value },
+                truncated: id.truncated || text.truncated,
+            };
         }
         case "unknown": {
             const provider = truncateText(body.provider);
@@ -151,6 +155,9 @@ function normalizeBodyForPersistence(body) {
             };
         }
         case "warning": {
+            if (body.warning.reason === "retry") {
+                return { body, truncated: false };
+            }
             const originalModel = body.warning.originalModel === undefined ? undefined : truncateText(body.warning.originalModel);
             const fallbackModel = body.warning.fallbackModel === undefined ? undefined : truncateText(body.warning.fallbackModel);
             const direction = body.warning.direction === undefined ? undefined : truncateText(body.warning.direction);
@@ -216,6 +223,8 @@ export function createProjectionDriver(input) {
     }
     const id = input.id ?? randomUUID();
     const abortController = new AbortController();
+    let gracefulAbort;
+    let forceAbort;
     let finishStarted = false;
     let nextSeq = 0;
     let turn = input.initialTurn ?? 0;
@@ -338,11 +347,22 @@ export function createProjectionDriver(input) {
         },
         ...(enqueue ? { enqueue } : {}),
         ...(input.clearQueue ? { clearQueue: input.clearQueue } : {}),
-        async abort() {
+        async abort(mode = "graceful") {
             if (!abortController.signal.aborted) {
                 abortController.abort();
             }
-            await input.abort?.();
+            if (mode === "force") {
+                forceAbort ??= (async () => {
+                    await input.abort?.("force");
+                    await runPromise;
+                })();
+                await forceAbort;
+                return;
+            }
+            gracefulAbort ??= (async () => {
+                await input.abort?.("graceful");
+            })();
+            await gracefulAbort;
         },
     };
 }