@abelxiaoxing/cadence 1.5.3 → 1.7.0

package/src/durable-contracts.ts

@@ -1,5 +1,8 @@
 import type { ArtifactStore } from "./artifact-store.ts";
-import type { StructuredVerificationContract } from "./contracts.ts";
+import type {
+  StructuredVerificationContract,
+  VerificationInputObservation,
+} from "./contracts.ts";
 import type { ImplementPlan, PlanTaskDraft } from "./delivery-compiler.ts";
 import type { RoutePolicy, WorkerRoutePolicy } from "./route-policy.ts";
 
@@ -15,6 +18,7 @@ import type {
   WorkflowContextRequest,
   WorkflowDeliverySource,
   WorkflowRecoveryFeedback,
+  WorkflowVerificationPrerequisite,
 } from "./workflow-policy.ts";
 
 import type { WorkspaceStore } from "./workspace-store.ts";
@@ -38,6 +42,7 @@ export type DurablePhaseVerificationResult =
       ok: false;
       kind: "paused" | "retryable" | "approval-needed";
       code: string;
+      inputObservation?: VerificationInputObservation;
     };
 
 export type DurableChangeVerificationResult =
@@ -60,6 +65,7 @@ export type DurableChangeVerificationResult =
       code: string;
       failureIdentities?: string[];
       attributionReliable?: boolean;
+      inputObservation?: VerificationInputObservation;
     };
 
 export interface DurableVerificationObservation {
@@ -68,6 +74,8 @@ export interface DurableVerificationObservation {
   failureIdentities: string[];
   code?: string;
   attributionReliable?: boolean;
+  /** Code-owned comparable verification obligation, excluding display identity. */
+  contractIdentity?: string;
 }
 
 export interface DurableVerificationBaseline {
@@ -89,7 +97,11 @@ export type DurableObservedVerification =
   | {
       ok: false;
       outcome:
-        | { kind: "paused"; code: string }
+        | {
+            kind: "paused";
+            code: string;
+            prerequisite?: WorkflowVerificationPrerequisite;
+          }
         | { kind: "approval-needed"; code: string }
         | { kind: "operation-cancelled"; code: "cancelled" };
     };
@@ -175,11 +187,15 @@ export interface DurableExecutionResources {
   artifacts: ArtifactStore;
   workspaces: WorkspaceStore;
   ledgers: Map<number, TaskLedger>;
+  /** Run-shared original-baseline observations, independent of delivery revision. */
+  baselineLedger?: TaskLedger;
   baselineRevisionId: string;
+  /** Root capture before any authorized boundary expansion; immutable evidence source. */
+  originalBaselineRevisionId?: string;
   currentRevisionId: string;
   mergeTail: Promise<void>;
   verificationFact?: object;
-  baselinePromises: Map<number, Promise<DurableBaselineResult>>;
+  baselinePromises: Map<string | number, Promise<DurableBaselineResult>>;
   environmentIdentity?: string;
 }
 

package/src/durable-workflow.ts

@@ -1,9 +1,4 @@
-import {
-  ChangeVerification,
-  parseVerificationBaseline,
-  sha256Bytes,
-  verificationBaselineFact,
-} from "./change-verification.ts";
+import { ChangeVerification, sha256Bytes } from "./change-verification.ts";
 import type {
   DurableExecutionResources,
   DurablePhaseFact,
@@ -358,7 +353,16 @@ class DurableWorkflowComposition
     const currentRevisionId = input.currentWorkspaceRevisionId;
     if (!baselineRevisionId || !currentRevisionId)
       throw new Error("workflow-workspace-revision-unavailable");
-    workspaces.getRevision(baselineRevisionId);
+    let originalBaseline = workspaces.getRevision(baselineRevisionId);
+    const ancestors = new Set<string>();
+    while (originalBaseline.parentRevisionId !== null) {
+      if (ancestors.has(originalBaseline.revisionId))
+        throw new Error("workflow-baseline-revision-conflict");
+      ancestors.add(originalBaseline.revisionId);
+      originalBaseline = workspaces.getRevision(
+        originalBaseline.parentRevisionId,
+      );
+    }
     workspaces.getRevision(currentRevisionId);
     let resources!: DurableRunResources;
     const transactions = new ApplyTransaction({
@@ -385,11 +389,13 @@ class DurableWorkflowComposition
       ledgers: new Map(),
       transactions,
       baselineRevisionId,
+      originalBaselineRevisionId: originalBaseline.revisionId,
       currentRevisionId,
       mergeTail: Promise.resolve(),
       baselinePromises: new Map(),
       closed: false,
     };
+    resources.baselineLedger = this.#ledger(resources, 1);
     this.#runs.set(input.runId, resources);
     return resources;
   }
@@ -729,37 +735,10 @@ class DurableWorkflowComposition
       }
       if (!grew) break;
     }
-    if (hasVerificationLifecycle(input.plan)) {
-      const retainedRevisions = new Set(
-        input.tasks
-          .filter((task) => !invalidated.has(task.taskId))
-          .map((task) => task.deliveryRevision),
-      );
-      for (const deliveryRevision of retainedRevisions) {
-        const ledger = this.#ledger(resources, deliveryRevision);
-        const stored = ledger.durableFact(
-          this.#verification.baselineFactKey(resources),
-        );
-        resources.baselinePromises.delete(deliveryRevision);
-        if (stored === undefined) continue;
-        const baseline = parseVerificationBaseline(stored, resources.artifacts);
-        if (baseline.revisionId === expandedBaseline.revisionId) continue;
-        if (baseline.revisionId !== input.baselineRevisionId) {
-          throw new Error("workflow-verification-baseline-conflict");
-        }
-        ledger.replaceDurableFact(
-          this.#verification.baselineFactKey(resources),
-          stored,
-          verificationBaselineFact(
-            {
-              ...baseline,
-              revisionId: expandedBaseline.revisionId,
-            },
-            resources.artifacts,
-          ),
-        );
-      }
-    }
+    // Boundary expansion changes candidate/apply inputs, never the root capture
+    // or its verification observations. Their contract-bound caches revalidate
+    // only the obligations changed by this delivery.
+    resources.baselinePromises.clear();
     resources.baselineRevisionId = expandedBaseline.revisionId;
     resources.currentRevisionId = rebuilt.revisionId;
     if (hasVerificationLifecycle(input.plan)) {
@@ -932,6 +911,36 @@ class DurableWorkflowComposition
   runAttempt(input: Parameters<WorkflowWorker["runAttempt"]>[0]) {
     return this.#phase.runAttempt(input);
   }
+
+  async prepareTask(input: Parameters<WorkflowWorker["runAttempt"]>[0]) {
+    const resources = await this.#prepareResources(input, input.signal);
+    const workspace = {
+      baselineRevisionId: resources.baselineRevisionId,
+      currentWorkspaceRevisionId: resources.currentRevisionId,
+    };
+    if (hasVerificationLifecycle(input.plan)) {
+      const captured = await this.#verification.ensureVerificationBaseline({
+        resources,
+        ledger: this.#ledger(resources, input.deliveryRevision),
+        taskId: input.taskId,
+        signal: input.signal,
+      });
+      if (!captured.ok)
+        return {
+          ...captured.outcome,
+          ...workspace,
+          ...(captured.outcome.kind === "paused"
+            ? {
+                verification: {
+                  scope: "baseline" as const,
+                  attribution: "environment" as const,
+                },
+              }
+            : {}),
+        };
+    }
+    return { kind: "prepared" as const, ...workspace };
+  }
   hasPendingVerification(input: Parameters<WorkflowWorker["runAttempt"]>[0]) {
     return this.#phase.hasPendingVerification(input);
   }