effect-agent 0.1.0-beta.96 → 0.1.0-beta.98

package/src/durable/internal/worker-host.ts

@@ -105,7 +105,6 @@ import {
 } from "../WorkerHost.ts";
 import {
   definitionDigestsEqual,
-  bindingSupports,
   resolveDefinitionBinding,
   type ResolvedBinding,
 } from "./agent-registration.ts";
@@ -381,6 +380,12 @@ export const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (
     };
   });
 
+  const currentBinding = (agentId: AgentId): ResolvedBinding | undefined => {
+    const matches = deps.bindings.filter((entry) => entry.agentId === agentId);
+
+    return matches.length === 1 ? matches[0] : undefined;
+  };
+
   const sourceAuthority = Effect.fn("WorkerHost.sourceAuthority")(function* (
     threadId: ThreadId,
     submissionId?: SubmissionId,
@@ -390,9 +395,7 @@ export const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (
 
     if (created?._tag !== "ThreadCreated") return yield* failure("start", "not-found");
 
-    const binding = deps.bindings.find(
-      (entry) => entry.agentId === created.agentId && bindingSupports(entry, created.definitions),
-    );
+    const binding = currentBinding(created.agentId);
 
     const worker = current.records.find(
       ({ record }) => record.payload._tag === "WorkerOriginRecorded",
@@ -434,10 +437,15 @@ export const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (
         return yield* failure("start", "denied");
     }
 
+    const ownerBinding =
+      ownerSubmission === undefined ? undefined : currentBinding(ownerSubmission.agentId);
+
+    const selectedBinding = ownerBinding ?? binding;
+
     if (worker?._tag === "WorkerOriginRecorded")
       return {
         current,
-        binding,
+        binding: selectedBinding,
         submission: ownerSubmission,
         policyOverride: Option.none<AgentPolicy>(),
         policy: worker.origin.policy,
@@ -456,7 +464,7 @@ export const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (
 
       return {
         current,
-        binding,
+        binding: selectedBinding,
         submission: ownerSubmission,
         policyOverride: Option.none<AgentPolicy>(),
         policy: attached.policy,
@@ -467,17 +475,6 @@ export const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (
       };
     }
 
-    const ownerBinding =
-      ownerSubmission === undefined
-        ? undefined
-        : deps.bindings.find(
-            (entry) =>
-              entry.agentId === ownerSubmission.agentId &&
-              bindingSupports(entry, ownerSubmission.agentDigests),
-          );
-
-    const selectedBinding = ownerBinding ?? binding;
-
     const changedRootAgent =
       ownerSubmission !== undefined && ownerSubmission.agentId !== created.agentId;
 
@@ -497,7 +494,9 @@ export const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (
       return yield* failure("start", "declaration-unavailable");
 
     const effectiveBinding =
-      Option.isSome(selected) || changedRootAgent ? selectedBinding : binding;
+      Option.isSome(selected) || changedRootAgent || binding === undefined
+        ? selectedBinding
+        : binding;
 
     if (effectiveBinding === undefined) return yield* failure("start", "declaration-unavailable");
 
@@ -718,6 +717,7 @@ export const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (
     inputDigest: Digest,
     input: PersistedJson,
     principal: Principal,
+    retainedFrameworkInput: boolean,
   ): Effect.fn.Return<void, WorkerError> {
     const origin = admission.origin;
     const id = `worker-input:${admission.messageId}`;
@@ -763,17 +763,16 @@ export const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (
 
       const sourceBinding = source.binding;
 
-      const targetBinding = deps.bindings.find(
-        (entry) =>
-          entry.agentId === origin.worker.targetAgentId &&
-          bindingSupports(entry, origin.targetDigests),
-      );
+      const targetBinding = currentBinding(origin.worker.targetAgentId);
 
       if (sourceBinding === undefined || targetBinding === undefined)
         return yield* failure("start", "declaration-unavailable");
-      yield* Schema.decodeEffect(Schema.toEncoded(targetBinding.definition.input))(input).pipe(
-        Effect.mapError(() => failure("start", "corrupt")),
-      );
+      // Standard reports and updates retain the owner's original input bytes. Their
+      // framework message carries the new information independently of the current input codec.
+      if (!retainedFrameworkInput)
+        yield* Schema.decodeEffect(Schema.toEncoded(targetBinding.definition.input))(input).pipe(
+          Effect.mapError(() => failure("start", "corrupt")),
+        );
 
       const targetRequest = {
         definition: targetBinding.definition,
@@ -1024,7 +1023,11 @@ export const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (
         admission.deliveryPrincipal !== options.principal)
     )
       return yield* failure("start", "worker-mismatch");
-    yield* reservation(admission, inputDigest, input, options.principal);
+    const retainedFrameworkInput = Schema.is(FrameworkMessage)(options.messageAdmission);
+
+    if (retainedFrameworkInput && admission.reportKind !== "update")
+      yield* validateCompletion(options.messageAdmission, options, agentId, inputDigest);
+    yield* reservation(admission, inputDigest, input, options.principal, retainedFrameworkInput);
 
     return admission;
   });
@@ -1038,17 +1041,26 @@ export const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (
       if (update.threadId !== submission.threadId || update.agentId !== origin.worker.targetAgentId)
         return yield* failure("followUp", "worker-mismatch");
 
-      const sourceBinding = deps.bindings.find(
-        (entry) =>
-          entry.agentId === origin.source.agentId && bindingSupports(entry, intent.sourceDigests),
+      const sourceHistory = yield* read(origin.source.threadId, "followUp");
+
+      const first = requests(sourceHistory.records).find(
+        (row) => row.admission.messageId === origin.firstMessageId,
       );
 
-      const targetBinding = deps.bindings.find(
-        (entry) =>
-          entry.agentId === origin.worker.targetAgentId &&
-          bindingSupports(entry, origin.targetDigests),
+      if (first === undefined || !sameOrigin(first.admission.origin, origin))
+        return yield* failure("followUp", "corrupt");
+
+      const source = yield* sourceAuthority(
+        origin.source.threadId,
+        first.admission.sourceSubmissionId,
       );
 
+      if (source.binding === undefined || source.submission === undefined)
+        return yield* failure("followUp", "declaration-unavailable");
+
+      const sourceBinding = currentBinding(origin.source.agentId);
+      const targetBinding = currentBinding(origin.worker.targetAgentId);
+
       const reports =
         sourceBinding?.reporting?.filter(
           (entry) => entry.delegationId === origin.worker.delegationId,
@@ -1063,26 +1075,6 @@ export const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (
         !definitionDigestsEqual(submission.agentDigests, origin.targetDigests)
       )
         return yield* failure("followUp", "declaration-unavailable");
-      const sourceHistory = yield* read(origin.source.threadId, "followUp");
-
-      const first = requests(sourceHistory.records).find(
-        (row) => row.admission.messageId === origin.firstMessageId,
-      );
-
-      if (first === undefined || !sameOrigin(first.admission.origin, origin))
-        return yield* failure("followUp", "corrupt");
-
-      const source = yield* sourceAuthority(
-        origin.source.threadId,
-        first.admission.sourceSubmissionId,
-      );
-
-      if (
-        source.binding === undefined ||
-        source.submission === undefined ||
-        !bindingSupports(source.binding, intent.sourceDigests)
-      )
-        return yield* failure("followUp", "declaration-unavailable");
 
       const recorded = source.current.records.find(
         ({ record }) => record.payload._tag === "WorkerOriginRecorded",
@@ -1101,14 +1093,7 @@ export const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (
       );
 
       if (now >= deadlineAtMillis) return yield* failure("followUp", "denied");
-      const sourceSubmission = source.submission;
-
-      const input = yield* Schema.decodeEffect(Schema.toEncoded(sourceBinding.definition.input))(
-        source.submission.inputPayload,
-      ).pipe(
-        Effect.flatMap(() => Schema.decodeEffect(PersistedJson)(sourceSubmission.inputPayload)),
-        Effect.mapError(() => failure("followUp", "corrupt")),
-      );
+      const input = source.submission.inputPayload;
 
       let workerAdmission: WorkerAdmission | undefined;
       let principal = submission.principal;
@@ -1229,39 +1214,6 @@ export const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (
       const refused = (reason: WorkerReportRefused["reason"]) =>
         WorkerReportRefused.make({ runId, messageId, reason });
 
-      const sourceBinding = deps.bindings.find(
-        (entry) =>
-          entry.agentId === origin.source.agentId && bindingSupports(entry, intent.sourceDigests),
-      );
-
-      const targetBinding = deps.bindings.find(
-        (entry) =>
-          entry.agentId === origin.worker.targetAgentId &&
-          bindingSupports(entry, origin.targetDigests),
-      );
-
-      const reports =
-        sourceBinding?.reporting?.filter(
-          (entry) => entry.delegationId === origin.worker.delegationId,
-        ) ?? [];
-
-      const descriptor = reports[0];
-
-      if (
-        sourceBinding === undefined ||
-        targetBinding === undefined ||
-        descriptor === undefined ||
-        reports.length !== 1 ||
-        !Object.is(descriptor.target, targetBinding.definition) ||
-        (descriptor.mode !== "standard" &&
-          !Object.is(descriptor.input, sourceBinding.definition.input)) ||
-        descriptor.mode !== intent.mode ||
-        descriptor.destination?.delegationId !== intent.destinationDelegationId ||
-        (descriptor.destination !== undefined &&
-          !Object.is(descriptor.destination.target, sourceBinding.definition))
-      )
-        return refused("declaration-unavailable");
-
       const selected = yield* deps.ledger
         .lookup(SubmissionLookupById.make({ submissionId: host.submissionId }))
         .pipe(Effect.mapError(storageFailure("inspect")));
@@ -1293,7 +1245,31 @@ export const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (
         firstInput.admission.sourceSubmissionId,
       );
 
-      if (source.binding === undefined || !bindingSupports(source.binding, intent.sourceDigests))
+      if (source.binding === undefined) return refused("declaration-unavailable");
+
+      const sourceBinding = currentBinding(origin.source.agentId);
+      const targetBinding = currentBinding(origin.worker.targetAgentId);
+
+      const reports =
+        sourceBinding?.reporting?.filter(
+          (entry) => entry.delegationId === origin.worker.delegationId,
+        ) ?? [];
+
+      const descriptor = reports[0];
+
+      if (
+        sourceBinding === undefined ||
+        targetBinding === undefined ||
+        descriptor === undefined ||
+        reports.length !== 1 ||
+        !Object.is(descriptor.target, targetBinding.definition) ||
+        (descriptor.mode !== "standard" &&
+          !Object.is(descriptor.input, sourceBinding.definition.input)) ||
+        descriptor.mode !== intent.mode ||
+        descriptor.destination?.delegationId !== intent.destinationDelegationId ||
+        (descriptor.destination !== undefined &&
+          !Object.is(descriptor.destination.target, sourceBinding.definition))
+      )
         return refused("declaration-unavailable");
 
       const sourceOriginRecord = source.current.records.find(
@@ -1388,12 +1364,13 @@ export const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (
           ? source.submission?.inputPayload
           : projection.value.encodedInput;
 
-      const validated = yield* Schema.decodeEffect(
-        Schema.toEncoded(sourceBinding.definition.input),
-      )(reportInput).pipe(
-        Effect.flatMap(() => Schema.decodeUnknownEffect(PersistedJson)(reportInput)),
-        Effect.option,
-      );
+      const validated = yield* (
+        descriptor.mode === "standard"
+          ? Schema.decodeUnknownEffect(PersistedJson)(reportInput)
+          : Schema.decodeEffect(Schema.toEncoded(sourceBinding.definition.input))(reportInput).pipe(
+              Effect.flatMap(() => Schema.decodeUnknownEffect(PersistedJson)(reportInput)),
+            )
+      ).pipe(Effect.option);
 
       if (Option.isNone(validated)) return refused("input");
       const input = validated.value;
@@ -1680,7 +1657,7 @@ export const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (
       target: Agent.AnyDefinition,
       operation: WorkerError["operation"],
     ) {
-      const resolved = yield* binding(target, operation);
+      yield* binding(target, operation);
 
       if (worker.targetAgentId !== target.id) return yield* failure(operation, "worker-mismatch");
       const source = yield* read(context.source.threadId, operation);
@@ -1690,10 +1667,7 @@ export const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (
       )?.admission.origin;
 
       if (origin === undefined) return yield* failure(operation, "not-found");
-      if (
-        origin.worker.delegationId !== worker.delegationId ||
-        !bindingSupports(resolved, origin.targetDigests)
-      )
+      if (origin.worker.delegationId !== worker.delegationId)
         return yield* failure(operation, "worker-mismatch");
 
       return origin;
@@ -2055,7 +2029,7 @@ export const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (
               threadId: Schema.decodeSync(ThreadId)(messageId),
             },
             source: existing?.envelope.workerAdmission?.origin.source ?? context.source,
-            targetDigests: resolved.digests,
+            targetDigests: previousOrigin?.targetDigests ?? resolved.digests,
             policy: request.policy,
             budget: request.budget,
             ...(request.budgetScope === undefined ? {} : { budgetScope: request.budgetScope }),
@@ -2398,9 +2372,12 @@ export const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (
 
     if (created?._tag !== "ThreadCreated") return yield* failure("context", "not-found");
 
-    const resolved = deps.bindings.find(
-      (entry) => entry.agentId === created.agentId && bindingSupports(entry, created.definitions),
-    );
+    const selected =
+      request.sourceSubmissionId === undefined
+        ? undefined
+        : yield* sourceAuthority(sourceThreadId, request.sourceSubmissionId);
+
+    const resolved = selected === undefined ? currentBinding(created.agentId) : selected.binding;
 
     if (resolved === undefined) return yield* failure("context", "declaration-unavailable");
 
@@ -2419,11 +2396,6 @@ export const makeWorkerRuntime = Effect.fn("WorkerHost.make")(function* (
           ? attached
           : undefined;
 
-    const selected =
-      request.sourceSubmissionId === undefined
-        ? undefined
-        : yield* sourceAuthority(sourceThreadId, request.sourceSubmissionId);
-
     return facet(
       {
         source: {

package/src/engine/RunOptions.ts

@@ -611,9 +611,9 @@ export interface RunDurabilityHook<Error = never, Requirements = never> {
 /**
  * `DefinitionDigests`-shaped digests of one child Agent Binding in plain
  * string form. The durable coordinator's thread-owned digest Schema never
- * crosses inward: the coordinator resolves these digests from the exact
- * registered target and stores and verifies them
- * byte-for-byte (SUB-023 exact-digest binding resolution).
+ * crosses inward: the coordinator captures these digests from the admitted target
+ * and verifies them byte-for-byte as immutable provenance. Current executable
+ * selection uses the stable Agent identity, independently of historical definitions.
  */
 export interface RunSubagentDigests {
   readonly agent: string;
@@ -829,6 +829,8 @@ export type RunResumeUsage = typeof RunResumeUsageSchema.Type;
  * proceeds through the normal continuation.
  */
 export interface RunTurnResume {
+  /** A successful settled call whose original operation contract still supports completion projection. */
+  readonly settledCompletion?: ToolCallId | undefined;
   /** Canonical rejection evidence, matched to the exact call; never permits handler execution. */
   readonly toolParameterRejections?: ReadonlyArray<ToolParameterRejection> | undefined;
   readonly toolExposure?: Snapshot | undefined;
@@ -919,6 +921,14 @@ export interface RunOptions<HookError = never, HookRequirements = never> {
   /** Host-validated worker message; application input still supplies instructions and policy context. */
   readonly frameworkMessage?: FrameworkMessage;
 
+  /**
+   * Original admitted JSON for a durable continuation or verified framework message. Static
+   * instructions can resume without decoding a future input Schema; input-dependent instructions
+   * still require that Schema. The original value remains the policy input, and a saved prompt
+   * is restored through `context` instead of rerendering the application's input prompt.
+   */
+  readonly retainedInput?: Schema.Json | undefined;
+
   /** Initial or canonically restored run-scoped native selection. */
   readonly toolSelection?: Selection | undefined;
   /**