@abelxiaoxing/cadence 1.2.2 → 1.2.4

package/src/workflow-engine.ts

@@ -30,7 +30,6 @@ import {
 import type { GateApprovalProof } from "./delivery-compiler.ts";
 import {
   DeliveryValidationError,
-  IMPLEMENT_PLAN_SCHEMA_VERSION,
   type ImplementPlan,
   type PlanTaskDraft,
 } from "./delivery-compiler.ts";
@@ -76,11 +75,72 @@ const LOCKFILES = new Set([
   "pnpm-lock.yaml",
   "yarn.lock",
 ]);
-const IMPLEMENTATION_ROUTE_REQUIREMENTS = Object.freeze({
-  minContextWindow: 128_000,
-  minOutputTokens: 64_000,
+const IMPLEMENTATION_ROUTE_LIMITS = Object.freeze({
+  preferredContextWindow: 128_000,
+  preferredOutputTokens: 64_000,
+  minimumContextWindow: 16_000,
+  minimumOutputTokens: 8_000,
 });
 
+function implementationRouteRequirements(
+  input: {
+    task?: PlanTaskDraft;
+    artifactCorrection?: RedArtifactCorrection;
+    repair?: { failureIdentities: string[] };
+  } = {},
+) {
+  if (!input.task) {
+    return {
+      minContextWindow: IMPLEMENTATION_ROUTE_LIMITS.minimumContextWindow,
+      minOutputTokens: IMPLEMENTATION_ROUTE_LIMITS.minimumOutputTokens,
+    };
+  }
+  const serializedBytes = Buffer.byteLength(canonicalJson(input.task), "utf8");
+  const pathCount = Object.values(input.task.phases).reduce(
+    (total, phase) =>
+      total + phase.read.length + phase.write.length + phase.delete.length,
+    0,
+  );
+  const complexity =
+    serializedBytes +
+    pathCount * 512 +
+    (input.artifactCorrection ? 16_384 : 0) +
+    (input.repair ? input.repair.failureIdentities.length * 256 + 16_384 : 0);
+  return {
+    minContextWindow: Math.min(
+      IMPLEMENTATION_ROUTE_LIMITS.preferredContextWindow,
+      Math.max(
+        IMPLEMENTATION_ROUTE_LIMITS.minimumContextWindow,
+        16_384 + complexity * 2,
+      ),
+    ),
+    minOutputTokens: Math.min(
+      IMPLEMENTATION_ROUTE_LIMITS.preferredOutputTokens,
+      Math.max(
+        IMPLEMENTATION_ROUTE_LIMITS.minimumOutputTokens,
+        8_192 + Math.ceil(complexity / 2),
+      ),
+    ),
+  };
+}
+
+const SEMANTIC_ROUTE_FAILURE_CODES = new Set([
+  "child-no-structural-submit",
+  "invalid-structural-result",
+  "structural-identity-mismatch",
+  "invalid-diff",
+  "candidate-diff-invalid",
+]);
+
+function semanticRouteFailure(
+  value: DurableCandidateProposal,
+): string | undefined {
+  return (value.kind === "retryable" || value.kind === "paused") &&
+    SEMANTIC_ROUTE_FAILURE_CODES.has(value.code)
+    ? value.code
+    : undefined;
+}
+
 function isCancellationException(error: unknown, signal: AbortSignal): boolean {
   if (!signal.aborted) return false;
   if (error === signal.reason) return true;
@@ -137,6 +197,7 @@ const ENGINE_SCHEMA = `
     phase TEXT NOT NULL,
     pause_code TEXT,
     context_request_json TEXT,
+    attempt_diagnostic_json TEXT,
     route_id TEXT,
     route_fingerprint TEXT,
     queue_position INTEGER,
@@ -290,7 +351,9 @@ export type WorkflowAttemptOutcome = (
   | { kind: "operation-cancelled"; code: "cancelled" }
 ) &
   WorkflowWorkspaceFacts &
-  WorkflowRouteFacts;
+  WorkflowRouteFacts & {
+    attemptDiagnostic?: SafeAttemptDiagnostic;
+  };
 
 export interface WorkflowWorker {
   runAttempt(input: {
@@ -310,6 +373,7 @@ export interface WorkflowWorker {
       failureIdentities: string[];
     };
     artifactCorrection?: RedArtifactCorrection;
+    contextRequest?: WorkflowContextRequest;
     signal: AbortSignal;
     onActivity?: (
       event: Pick<
@@ -321,6 +385,7 @@ export interface WorkflowWorker {
   rebind(input: {
     runId: string;
     taskId: string;
+    task: PlanTaskDraft;
     role: "implementation-worker";
     routeId: string;
   }):
@@ -354,7 +419,6 @@ export interface WorkflowWorker {
 }
 
 export interface WorkflowDelivery {
-  version: 2;
   gate: "gate-a" | "gate-b";
   revision: number;
   receiptHash: string;
@@ -494,11 +558,22 @@ interface EngineTaskRow {
   phase: "red" | "green" | "refactor";
   pause_code: string | null;
   context_request_json: string | null;
+  attempt_diagnostic_json: string | null;
   route_id: string | null;
   route_fingerprint: string | null;
   queue_position: number | null;
 }
 
+interface SafeAttemptDiagnostic {
+  fingerprint?: string;
+  finalCategory?: string;
+  submitAttempts?: number;
+  schema?: string;
+  identityMismatch?: string[];
+  sameFailureCount?: number;
+  action?: "rebind-or-revise-delivery";
+}
+
 interface EngineOperationRow {
   command: string;
   state: string;
@@ -970,7 +1045,6 @@ function parsePlan(value: string): ImplementPlan {
 function assertPlan(value: unknown): asserts value is ImplementPlan {
   if (
     !isRecord(value) ||
-    value.schemaVersion !== IMPLEMENT_PLAN_SCHEMA_VERSION ||
     typeof value.changeId !== "string" ||
     !Array.isArray(value.tasks) ||
     !Array.isArray(value.outputs) ||
@@ -1016,7 +1090,6 @@ function assertDelivery(
 ): asserts value is WorkflowDelivery {
   if (
     !isRecord(value) ||
-    value.version !== 2 ||
     (value.gate !== "gate-a" && value.gate !== "gate-b") ||
     !Number.isSafeInteger(value.revision) ||
     (value.revision as number) < 1 ||
@@ -1217,6 +1290,7 @@ function ensureEngineColumns(database: DatabaseSync): void {
   ensure("workflow_engine_tasks", [
     ["route_fingerprint", "TEXT"],
     ["context_request_json", "TEXT"],
+    ["attempt_diagnostic_json", "TEXT"],
   ]);
 }
 
@@ -1233,6 +1307,7 @@ export type DurableCandidateProposal =
       kind: "paused" | "retryable" | "approval-needed";
       code: string;
       contextRequest?: WorkflowContextRequest;
+      attemptDiagnostic?: SafeAttemptDiagnostic;
     }
   | { kind: "operation-cancelled"; code: "cancelled" };
 
@@ -1286,7 +1361,6 @@ interface DurableVerificationObservation {
 }
 
 interface DurableVerificationBaseline {
-  version: 1;
   revisionId: string;
   targetContracts: Array<{
     taskId: string;
@@ -1345,6 +1419,7 @@ export interface DurableWorkflowEngineOptions {
       failureIdentities: string[];
     };
     artifactCorrection?: RedArtifactCorrection;
+    contextRequest?: WorkflowContextRequest;
     signal: AbortSignal;
     onHeaders(): void;
     onProgress(): void;
@@ -1634,7 +1709,7 @@ function verificationIdentities(
     return [...new Set(supplied)].sort();
   }
   if (result.ok) return [];
-  return [hash("verification-failure-v1", scope, verification.id, result.code)];
+  return [hash("verification-failure", scope, verification.id, result.code)];
 }
 
 function parseVerificationBaseline(
@@ -1642,7 +1717,6 @@ function parseVerificationBaseline(
 ): DurableVerificationBaseline {
   if (
     !isRecord(value) ||
-    value.version !== 1 ||
     typeof value.revisionId !== "string" ||
     !SHA256.test(value.revisionId) ||
     !Array.isArray(value.targetContracts) ||
@@ -2101,7 +2175,6 @@ class DurableWorkflowComposition
     });
     if (!fullSuite.ok) return fullSuite;
     const baseline: DurableVerificationBaseline = {
-      version: 1,
       revisionId: input.resources.baselineRevisionId,
       targetContracts: plan.tasks.map((task) => ({
         taskId: task.taskId,
@@ -2932,7 +3005,13 @@ class DurableWorkflowComposition
           ...(request.routeFingerprint
             ? { expectedFingerprint: request.routeFingerprint }
             : {}),
-          requirements: IMPLEMENTATION_ROUTE_REQUIREMENTS,
+          requirements: implementationRouteRequirements({
+            task: request.task,
+            ...(request.artifactCorrection
+              ? { artifactCorrection: request.artifactCorrection }
+              : {}),
+            repair: { failureIdentities: input.failureIdentities },
+          }),
         });
         if (!rebound.ok) return { kind: "paused", code: rebound.code };
       }
@@ -2951,9 +3030,16 @@ class DurableWorkflowComposition
         runId: request.runId,
         operationId: `${request.operationId}:${request.taskId}:repair:${input.repairAttempt}`,
         role: "implementation-worker",
-        requirements: IMPLEMENTATION_ROUTE_REQUIREMENTS,
+        requirements: implementationRouteRequirements({
+          task: request.task,
+          ...(request.artifactCorrection
+            ? { artifactCorrection: request.artifactCorrection }
+            : {}),
+          repair: { failureIdentities: input.failureIdentities },
+        }),
         signal: request.signal,
         ...(request.onActivity ? { onActivity: request.onActivity } : {}),
+        classifyResult: semanticRouteFailure,
         execute: (attempt) => {
           identity = {
             candidateId: `candidate-${randomUUID()}`,
@@ -2994,6 +3080,9 @@ class DurableWorkflowComposition
             ...(request.artifactCorrection
               ? { artifactCorrection: request.artifactCorrection }
               : {}),
+            ...(request.contextRequest
+              ? { contextRequest: request.contextRequest }
+              : {}),
             signal: attempt.signal,
             onHeaders: attempt.onHeaders,
             onProgress: attempt.onProgress,
@@ -4007,7 +4096,13 @@ class DurableWorkflowComposition
           ...(input.routeFingerprint
             ? { expectedFingerprint: input.routeFingerprint }
             : {}),
-          requirements: IMPLEMENTATION_ROUTE_REQUIREMENTS,
+          requirements: implementationRouteRequirements({
+            task: input.task,
+            ...(input.artifactCorrection
+              ? { artifactCorrection: input.artifactCorrection }
+              : {}),
+            ...(input.repair ? { repair: input.repair } : {}),
+          }),
         });
         if (!rebound.ok) {
           return retained({ kind: "paused", code: rebound.code });
@@ -4023,9 +4118,16 @@ class DurableWorkflowComposition
         runId: input.runId,
         operationId: `${input.operationId}:${input.taskId}:${input.phase}`,
         role: "implementation-worker",
-        requirements: IMPLEMENTATION_ROUTE_REQUIREMENTS,
+        requirements: implementationRouteRequirements({
+          task: input.task,
+          ...(input.artifactCorrection
+            ? { artifactCorrection: input.artifactCorrection }
+            : {}),
+          ...(input.repair ? { repair: input.repair } : {}),
+        }),
         signal: input.signal,
         ...(input.onActivity ? { onActivity: input.onActivity } : {}),
+        classifyResult: semanticRouteFailure,
         execute: (attempt) => {
           identity = {
             candidateId: `candidate-${randomUUID()}`,
@@ -4062,6 +4164,9 @@ class DurableWorkflowComposition
               deletePaths: phase.delete,
             },
             route: attempt.route,
+            ...(input.contextRequest
+              ? { contextRequest: input.contextRequest }
+              : {}),
             signal: attempt.signal,
             onHeaders: attempt.onHeaders,
             onProgress: attempt.onProgress,
@@ -4641,7 +4746,7 @@ class DurableWorkflowComposition
       runId: input.runId,
       role: input.role,
       routeId: input.routeId,
-      requirements: IMPLEMENTATION_ROUTE_REQUIREMENTS,
+      requirements: implementationRouteRequirements({ task: input.task }),
     });
     return rebound.ok
       ? {
@@ -5528,8 +5633,8 @@ export class WorkflowEngine {
     return this.#database
       .prepare(
         `SELECT task_id, task_order, delivery_revision, plan_json, state,
-                phase, pause_code, context_request_json, route_id,
-                route_fingerprint, queue_position
+                phase, pause_code, context_request_json, attempt_diagnostic_json,
+                route_id, route_fingerprint, queue_position
          FROM workflow_engine_tasks WHERE run_id = ? ORDER BY task_order`,
       )
       .all(runId) as unknown as EngineTaskRow[];
@@ -5826,7 +5931,8 @@ export class WorkflowEngine {
             `UPDATE workflow_engine_tasks
              SET task_order = ?, delivery_revision = ?, plan_json = ?,
                  state = 'pending', phase = 'red', pause_code = NULL,
-                 context_request_json = NULL, queue_position = NULL
+                 context_request_json = NULL, attempt_diagnostic_json = NULL,
+                 queue_position = NULL
              WHERE run_id = ? AND task_id = ?`,
           )
           .run(taskOrder, delivery.revision, taskJson, runId, task.taskId);
@@ -5883,6 +5989,7 @@ export class WorkflowEngine {
       phase?: "red" | "green" | "refactor";
       pauseCode?: string | null;
       contextRequest?: WorkflowContextRequest | null;
+      attemptDiagnostic?: SafeAttemptDiagnostic | null;
       routeId?: string | null;
       routeFingerprint?: string | null;
       queuePosition?: number | null;
@@ -5913,6 +6020,14 @@ export class WorkflowEngine {
             ),
       );
     }
+    if (values.attemptDiagnostic !== undefined) {
+      assignments.push("attempt_diagnostic_json = ?");
+      parameters.push(
+        values.attemptDiagnostic === null
+          ? null
+          : JSON.stringify(values.attemptDiagnostic),
+      );
+    }
     if (values.routeId !== undefined) {
       assignments.push("route_id = ?");
       parameters.push(values.routeId);
@@ -6133,6 +6248,7 @@ export class WorkflowEngine {
       row.phase === "green" &&
       (row.pause_code === "red-artifact-constraint" ||
         persistedRedArtifactCorrection);
+    let requestedContext = persistedContextRequest;
     let correctionContextRequest = redArtifactCorrection
       ? persistedContextRequest
       : undefined;
@@ -6194,7 +6310,8 @@ export class WorkflowEngine {
           state: "phase-running",
           phase,
           pauseCode: artifactCorrection?.code ?? null,
-          contextRequest: correctionContextRequest ?? null,
+          contextRequest: requestedContext ?? null,
+          attemptDiagnostic: null,
           queuePosition: null,
         },
         lease,
@@ -6230,6 +6347,7 @@ export class WorkflowEngine {
             : {}),
           ...(repair ? { repair } : {}),
           ...(artifactCorrection ? { artifactCorrection } : {}),
+          ...(requestedContext ? { contextRequest: requestedContext } : {}),
           signal,
           onActivity: (event) => {
             const projection = this.#runStore.status(runId);
@@ -6268,12 +6386,51 @@ export class WorkflowEngine {
       ) {
         this.#setVerificationStatus(runId, outcome.verification, lease);
       }
+      if (
+        outcome.kind !== "phase-committed" &&
+        outcome.kind !== "operation-cancelled" &&
+        outcome.contextRequest
+      ) {
+        requestedContext = normalizeWorkflowContextRequest(
+          outcome.contextRequest,
+        );
+      }
+      if (
+        outcome.kind !== "phase-committed" &&
+        outcome.kind !== "operation-cancelled" &&
+        outcome.attemptDiagnostic
+      ) {
+        const previous = row.attempt_diagnostic_json
+          ? (JSON.parse(row.attempt_diagnostic_json) as SafeAttemptDiagnostic)
+          : undefined;
+        const fingerprint = hash(
+          outcome.code,
+          outcome.attemptDiagnostic.finalCategory ?? "unknown",
+          outcome.attemptDiagnostic.schema ?? "unknown",
+          JSON.stringify(outcome.attemptDiagnostic.identityMismatch ?? []),
+        ).slice(0, 16);
+        const sameFailure = previous?.fingerprint === fingerprint;
+        const sameFailureCount = sameFailure
+          ? (previous?.sameFailureCount ?? 1) + 1
+          : 1;
+        const attemptDiagnostic = {
+          ...outcome.attemptDiagnostic,
+          fingerprint,
+          sameFailureCount,
+          ...(sameFailureCount > 1
+            ? { action: "rebind-or-revise-delivery" as const }
+            : {}),
+        };
+        this.#setTask(runId, row.task_id, { attemptDiagnostic }, lease);
+        row.attempt_diagnostic_json = JSON.stringify(attemptDiagnostic);
+      }
       if (outcome.kind === "retryable" && outcome.retryPolicy === "artifact") {
         if (outcome.code === "red-artifact-constraint") {
           redArtifactCorrection = true;
           correctionContextRequest = outcome.contextRequest
             ? normalizeWorkflowContextRequest(outcome.contextRequest)
             : correctionContextRequest;
+          requestedContext = correctionContextRequest ?? requestedContext;
         }
         artifactAttempts += 1;
         const maxAttempts = plan.verification.artifactCorrection.maxAttempts;
@@ -6287,7 +6444,7 @@ export class WorkflowEngine {
               pauseCode: redArtifactCorrection
                 ? "red-artifact-constraint"
                 : outcome.code,
-              contextRequest: correctionContextRequest ?? null,
+              contextRequest: requestedContext ?? null,
               queuePosition: null,
             },
             lease,
@@ -6328,6 +6485,7 @@ export class WorkflowEngine {
               phase,
               pauseCode: null,
               contextRequest: null,
+              attemptDiagnostic: null,
               queuePosition: null,
             },
             lease,
@@ -6336,6 +6494,7 @@ export class WorkflowEngine {
         }
         artifactAttempts = 0;
         redArtifactCorrection = false;
+        requestedContext = undefined;
         correctionContextRequest = undefined;
         phaseIndex += 1;
         if (phaseIndex >= orderedPhases.length) {
@@ -6347,6 +6506,7 @@ export class WorkflowEngine {
               phase,
               pauseCode: null,
               contextRequest: null,
+              attemptDiagnostic: null,
               queuePosition: null,
             },
             lease,
@@ -6361,6 +6521,7 @@ export class WorkflowEngine {
             phase: orderedPhases[phaseIndex],
             pauseCode: null,
             contextRequest: null,
+            attemptDiagnostic: null,
             queuePosition: null,
           },
           lease,
@@ -6402,10 +6563,9 @@ export class WorkflowEngine {
             pauseCode: approvalCodeInvalid
               ? "approval-code-invalid"
               : outcome.code,
-            contextRequest:
-              !approvalCodeInvalid && outcome.contextRequest
-                ? normalizeWorkflowContextRequest(outcome.contextRequest)
-                : (correctionContextRequest ?? null),
+            contextRequest: approvalCodeInvalid
+              ? null
+              : (requestedContext ?? null),
             queuePosition: null,
           },
           lease,
@@ -7103,6 +7263,21 @@ export class WorkflowEngine {
     return this.#statusByRun(runId);
   }
 
+  #safeAttemptDiagnostic(
+    _runId: string,
+    row: EngineTaskRow | undefined,
+  ): SafeAttemptDiagnostic | undefined {
+    if (!row) return undefined;
+    if (row.attempt_diagnostic_json) {
+      try {
+        return JSON.parse(row.attempt_diagnostic_json) as SafeAttemptDiagnostic;
+      } catch {
+        return undefined;
+      }
+    }
+    return undefined;
+  }
+
   #statusByRun(runId: string): Record<string, unknown> {
     const projection = this.#runStore.status(runId);
     const rows = this.#tasks(runId);
@@ -7135,9 +7310,9 @@ export class WorkflowEngine {
       projection.state === "approval-needed"
         ? approvalRequirement(pauseCode, contextRequest)
         : undefined;
+    const attemptDiagnostic = this.#safeAttemptDiagnostic(runId, firstPaused);
     const currentRevision = projection.deliveryRevision ?? 0;
     return {
-      version: 2,
       runId: projection.runId,
       stage: projection.stage,
       ...(projection.change ? { change: projection.change } : {}),
@@ -7154,6 +7329,7 @@ export class WorkflowEngine {
         ? {
             pause: {
               code: pauseCode,
+              ...(attemptDiagnostic ? { diagnostic: attemptDiagnostic } : {}),
             },
           }
         : {}),
@@ -7637,6 +7813,7 @@ export class WorkflowEngine {
     const rebound = this.#worker.rebind({
       runId,
       taskId: task.task_id,
+      task: structuredClone(this.#taskPlan(task)),
       role: "implementation-worker",
       routeId: command.routeId,
     });
@@ -7875,7 +8052,18 @@ export class WorkflowEngine {
         );
       case "status": {
         const runId = this.#lookupRun(command.stage, command.change);
-        if (!runId) throw new Error("run-not-found");
+        if (!runId) {
+          return {
+            stage: command.stage,
+            change: command.change,
+            state: "not-started",
+            durable: true,
+            completed: false,
+            legalCommands: ["start"],
+            tasks: [],
+            queue: [],
+          };
+        }
         this.#recoverLegacyContextApproval(runId);
         return this.#withAvailableDelivery(this.#statusByRun(runId));
       }
@@ -7941,7 +8129,7 @@ export class WorkflowEngine {
         outcome.handoffId === existing.handoff_id &&
         outcome.runId === existing.owner_run_id &&
         outcome.receiptHash === existing.receipt_hash &&
-        outcome.selectorBeforeCutover === "v1-bootstrap" &&
+        outcome.selectorBeforeCutover === "bootstrap" &&
         existing.state === "prepared" &&
         outcome.state === "prepared" &&
         outcome.selectorCasPending === true;
@@ -7962,7 +8150,7 @@ export class WorkflowEngine {
       if (
         existing.state !== "prepared" ||
         outcome.state !== "prepared" ||
-        outcome.selectorBeforeCutover !== "v1-bootstrap" ||
+        outcome.selectorBeforeCutover !== "bootstrap" ||
         outcome.selectorCasPending !== true ||
         acceptanceFacts === undefined ||
         workspaceManifestHash === undefined
@@ -8019,7 +8207,7 @@ export class WorkflowEngine {
       acceptanceHash: input.acceptanceHash,
       ...(acceptanceFacts ? { acceptanceFacts } : {}),
       ...(workspaceManifestHash ? { workspaceManifestHash } : {}),
-      selectorBeforeCutover: "v1-bootstrap",
+      selectorBeforeCutover: "bootstrap",
       selectorCasPending: true,
     };
     const preparedRows = this.#database

package/src/workspace-store.ts

@@ -20,7 +20,6 @@ import { isValidRelativePath } from "./contracts.ts";
 import { observeSafePath } from "./safe-path.ts";
 
 const SHA256 = /^[a-f0-9]{64}$/u;
-const REVISION_VERSION = 2 as const;
 
 export interface WorkspaceFileEntry {
   kind: "file";
@@ -37,7 +36,6 @@ export type WorkspaceEntry = WorkspaceFileEntry | WorkspaceAbsentEntry;
 export type WorkspaceEntries = Record<string, WorkspaceEntry>;
 
 export interface WorkspaceRevision {
-  version: typeof REVISION_VERSION;
   revisionId: string;
   parentRevisionId: string | null;
   manifestHash: string;
@@ -89,17 +87,13 @@ function stableEntries(entries: WorkspaceEntries): WorkspaceEntries {
 
 function manifestHash(entries: WorkspaceEntries): string {
   return hash(
-    "cadence-workspace-manifest-v2",
+    "cadence-workspace-manifest",
     JSON.stringify(stableEntries(entries)),
   );
 }
 
 function revisionId(parentRevisionId: string | null, manifest: string): string {
-  return hash(
-    "cadence-workspace-revision-v2",
-    parentRevisionId ?? "",
-    manifest,
-  );
+  return hash("cadence-workspace-revision", parentRevisionId ?? "", manifest);
 }
 
 function ensureDirectory(directory: string): void {
@@ -219,7 +213,6 @@ function requireRevisionShape(value: unknown): WorkspaceRevision {
   }
   const candidate = value as Partial<WorkspaceRevision>;
   if (
-    candidate.version !== REVISION_VERSION ||
     typeof candidate.revisionId !== "string" ||
     !SHA256.test(candidate.revisionId) ||
     (candidate.parentRevisionId !== null &&
@@ -287,7 +280,6 @@ export class WorkspaceStore {
     const manifest = manifestHash(entries);
     const id = revisionId(parentRevisionId, manifest);
     const revision: WorkspaceRevision = {
-      version: REVISION_VERSION,
       revisionId: id,
       parentRevisionId,
       manifestHash: manifest,