@astrosheep/keiyaku 2.9.11 → 2.9.13

package/build/core/call/execution.js

@@ -2,15 +2,24 @@ import { buildCallTerms } from "../../agents/call-terms.js";
 import { createAbortError, restoreOutcome, SubagentFailure, } from "../../agents/harness/index.js";
 import { resolveAkumaLaunchSnapshot } from "../../agents/launch-snapshot/resolve.js";
 import { selectSubagent } from "../../agents/selector.js";
+import { assertSettingsKnobUsable } from "../../config/settings/disease.js";
+import { loadKeiyakuSettings } from "../../config/settings/loader.js";
+import { resolveProjectionAdoptionTimeoutMs } from "../../config/settings/knobs.js";
 import { FlowError } from "../../flow-error.js";
 import { assertProjectionAlias, moveProjectionAlias } from "../projection/index.js";
 import { projectionDir } from "../projection/index.js";
-import { createProjectionExecutionId } from "../projection/index.js";
-import { PROJECTION_ADOPTION_TIMEOUT_MS, startProjectionGeneration } from "../projection/index.js";
-import { openProjectionGenerationStore, openProjectionGenerationStoreReadOnly, acquireProjectionRunnerLock, } from "../projection/index.js";
+import { createProjectionExecutionId, projectionRunnerLeasePath } from "../projection/index.js";
+import { startProjectionGeneration } from "../projection/index.js";
+import { openProjectionGenerationStore, openProjectionGenerationStoreReadOnly, } from "../projection/index.js";
+import { acquireRunnerLease } from "../run-control/runner-lease.js";
 import { observeProjectionLife } from "../projection/index.js";
 import { mintProjection, mintRepositoryProjection } from "../projection/index.js";
 import { waitForProjection } from "../projection/index.js";
+async function readProjectionAdoptionTimeoutMs(cwd) {
+    const settings = await loadKeiyakuSettings(cwd);
+    assertSettingsKnobUsable(settings, "projectionAdoptionTimeoutMs");
+    return resolveProjectionAdoptionTimeoutMs(settings.knobs);
+}
 export function readCurrentGenerationOrThrow(projectionDirectory) {
     const store = openProjectionGenerationStoreReadOnly(projectionDirectory);
     try {
@@ -60,11 +69,12 @@ export function outcomeFromGeneration(current) {
     return restoreOutcome(record);
 }
 export async function executeSubagent(agentName, prompt, cwd, options) {
+    const adoptionTimeoutMs = await readProjectionAdoptionTimeoutMs(cwd);
     const { projection: projectionCoordinate, launchSnapshot, launchFacts } = await buildCallConfig(agentName, prompt, cwd, options);
     if (!projectionCoordinate) {
         throw new FlowError("INTERNAL_STATE", "durable execution requires a projection coordinate");
     }
-    const launchOwnership = acquireProjectionRunnerLock(projectionCoordinate.dir);
+    const launchOwnership = acquireRunnerLease(projectionRunnerLeasePath(projectionCoordinate.dir));
     const launched = await startProjectionGeneration(projectionCoordinate.dir, projectionCoordinate.executionId, {
         commitLaunch: () => {
             const store = openProjectionGenerationStore(projectionCoordinate.dir);
@@ -76,6 +86,7 @@ export async function executeSubagent(agentName, prompt, cwd, options) {
             }
         },
         launchOwnership,
+        adoptionTimeoutMs,
     });
     launchOwnership.close();
     if (launched.status !== "adopted") {
@@ -127,11 +138,12 @@ export async function executeSubagent(agentName, prompt, cwd, options) {
     throw new FlowError("INTERNAL_STATE", "Unhandled subagent outcome state.");
 }
 export async function launchSubagentGeneration(agentName, prompt, cwd, options) {
+    const adoptionTimeoutMs = await readProjectionAdoptionTimeoutMs(cwd);
     const { projection, launchSnapshot, launchFacts } = await buildCallConfig(agentName, prompt, cwd, options);
     if (!projection) {
         throw new FlowError("INTERNAL_STATE", "durable launch requires a projection coordinate");
     }
-    const launchOwnership = acquireProjectionRunnerLock(projection.dir);
+    const launchOwnership = acquireRunnerLease(projectionRunnerLeasePath(projection.dir));
     const launched = await startProjectionGeneration(projection.dir, projection.executionId, {
         commitLaunch: () => {
             const store = openProjectionGenerationStore(projection.dir);
@@ -143,6 +155,7 @@ export async function launchSubagentGeneration(agentName, prompt, cwd, options)
             }
         },
         launchOwnership,
+        adoptionTimeoutMs,
     });
     launchOwnership.close();
     if (launched.status !== "adopted") {
@@ -162,6 +175,7 @@ export async function buildCallConfig(agentName, prompt, cwd, options) {
     const resolvedTerms = buildCallTerms(launchSnapshot, prompt, cwd, {
         signal: options.signal,
         idleTimeoutMs: options.idleTimeoutMs,
+        carrier: options.carrier,
     });
     // Mint projection directory for supervisor pump.
     const slug = launchSnapshot.akuma.name;
@@ -196,6 +210,7 @@ export async function buildCallConfig(agentName, prompt, cwd, options) {
                 ...(options.evidenceCwd !== undefined ? { evidenceCwd: options.evidenceCwd } : {}),
                 ...(options.title !== undefined ? { title: options.title } : {}),
                 ...(options.context !== undefined ? { context: options.context } : {}),
+                ...(options.carrier !== undefined ? { carrier: options.carrier } : {}),
                 persistProjectionResponse: options.persistProjectionResponse ?? false,
                 ...(options.continuation ? {
                     session: options.continuation.session,
@@ -210,7 +225,7 @@ export async function buildCallConfig(agentName, prompt, cwd, options) {
         let previousAliasTargetStillRunning;
         if (previousAliasTarget !== undefined) {
             try {
-                const phase = observeProjectionLife(await projectionDir(options.projectionCwd ?? cwd, previousAliasTarget), { nowMs: Date.now(), startupTimeoutMs: PROJECTION_ADOPTION_TIMEOUT_MS }).phase;
+                const phase = observeProjectionLife(await projectionDir(options.projectionCwd ?? cwd, previousAliasTarget), { nowMs: Date.now() }).phase;
                 if (phase === "minting" || phase === "active" || phase === "quiescent") {
                     previousAliasTargetStillRunning = previousAliasTarget;
                 }

package/build/core/call/prompt.js

@@ -7,52 +7,21 @@ const COMMISSIONED_DELIVERY_BOUNDARY = [
 ].join(" ");
 export function buildCallPrompt(input) {
     const references = [...new Set((input.referenceFiles ?? []).map((file) => file.trim()).filter(Boolean))];
-    if (input.currentIntent?.source === "arc") {
-        const arc = input.currentIntent;
+    if (!input.commissioned) {
         return [
-            `You are a called ${ACTOR_IDENTITY} working inside open arc a${arc.arc}.`,
-            "Stay within the arc scope and do the requested work directly.",
-            `Title: ${arc.title}`,
-            `Objective: ${arc.objective}`,
-            `Brief:\n${arc.brief}`,
-            COMMISSIONED_DELIVERY_BOUNDARY,
-            "",
-            `Task:\n${input.task}`,
-            `Context:\n${input.context?.trim() || "(none provided)"}`,
+            input.task,
+            input.context?.trim() ?? "",
             references.length > 0 ? `Reference files:\n${references.map((file) => `- ${file}`).join("\n")}` : "",
-            "Provide the final result for the caller/main agent.",
-        ].filter(Boolean).join("\n\n");
-    }
-    if (input.currentIntent?.source === "bind") {
-        const bind = input.currentIntent;
-        const trimmedContext = input.context?.trim() ?? "";
-        const extensionsBlock = bind.extensions.length > 0
-            ? `Extensions:\n${bind.extensions.map((extension) => `## ${extension.title}\n${extension.content}`).join("\n\n")}`
-            : "";
-        return [
-            `You are a called ${ACTOR_IDENTITY} working inside derived default arc a0.`,
-            "Stay within the contract scope and do the requested work directly.",
-            `Contract: ${bind.title}`,
-            `Context:\n${bind.context}`,
-            `Objective:\n${bind.objective}`,
-            `Design:\n${bind.design}`,
-            `Scope:\n${bind.scope.map((value) => `- ${value}`).join("\n")}`,
-            `Criteria:\n${bind.criteria.map((value) => `- ${value}`).join("\n")}`,
-            `Verification:\n${bind.verification.map((value) => `- ${value}`).join("\n")}`,
-            extensionsBlock,
-            COMMISSIONED_DELIVERY_BOUNDARY,
-            `Task:\n${input.task}`,
-            trimmedContext ? `Context:\n${trimmedContext}` : "",
-            references.length > 0 ? `Reference files:\n${references.map((file) => `- ${file}`).join("\n")}` : "",
-            "Provide the final result for the caller/main agent.",
         ].filter(Boolean).join("\n\n");
     }
     return [
-        input.task,
-        input.context?.trim() ?? "",
-        input.commissioned ? COMMISSIONED_DELIVERY_BOUNDARY : "",
+        `You are a called ${ACTOR_IDENTITY} working in the commissioned contract worktree.`,
+        input.worktree ? `Worktree: ${input.worktree}` : "",
+        "Before work, read .keiyaku/KEIYAKU.md. It is the sole contract body for this dispatch.",
+        COMMISSIONED_DELIVERY_BOUNDARY,
+        `Task:\n${input.task}`,
+        input.context?.trim() ? `Context:\n${input.context.trim()}` : "",
         references.length > 0 ? `Reference files:\n${references.map((file) => `- ${file}`).join("\n")}` : "",
-    ]
-        .filter(Boolean)
-        .join("\n\n");
+        "Provide the final result for the caller/main agent.",
+    ].filter(Boolean).join("\n\n");
 }