@abelxiaoxing/cadence 1.2.2 → 1.2.4

package/src/design-control.ts

@@ -15,6 +15,7 @@ import {
   compileImplementPlan,
   compileReadyReceipt,
   type DeliveryArtifactBinding,
+  DesignPlanValidationError,
   type GateApprovalProof,
   parseGateAReceipt,
   parseImplementPlan,
@@ -88,6 +89,10 @@ export type DesignControlRequest =
       operationId: string;
       gate: "gate-b";
     }
+  | {
+      operation: "validate-plan-draft";
+      runId: string;
+    }
   | {
       operation: "compile-plan";
       runId: string;
@@ -198,7 +203,10 @@ export function validateDesignControlRequest(
       ? { ok: true, value: structuredClone(value) as DesignControlRequest }
       : { ok: false, code: "invalid-design-control-request" };
   }
-  if (value.operation === "status") {
+  if (
+    value.operation === "status" ||
+    value.operation === "validate-plan-draft"
+  ) {
     return exactKeys(value, ["operation", "runId"]) &&
       typeof value.runId === "string" &&
       IDENTIFIER.test(value.runId)
@@ -448,12 +456,21 @@ export class DesignController {
   private constructor(options: DesignControllerOptions) {
     this.consumerRoot = path.resolve(options.consumerRoot);
     this.#runs = RunStore.open(options.stateRoot);
-    this.#journal = DesignJournal.open(options.stateRoot, {
-      ...(options.now ? { now: options.now } : {}),
-      ...(options.finalizationLeaseMs !== undefined
-        ? { finalizationLeaseMs: options.finalizationLeaseMs }
-        : {}),
-    });
+    try {
+      this.#journal = DesignJournal.open(options.stateRoot, {
+        ...(options.now ? { now: options.now } : {}),
+        ...(options.finalizationLeaseMs !== undefined
+          ? { finalizationLeaseMs: options.finalizationLeaseMs }
+          : {}),
+      });
+    } catch (error) {
+      try {
+        this.#runs.close();
+      } catch {
+        // The Design journal initialization failure remains authoritative.
+      }
+      throw error;
+    }
     this.#inspectOpenSpec = options.inspectOpenSpec;
   }
 
@@ -508,6 +525,8 @@ export class DesignController {
         return this.#journal.recordDecision(request);
       case "approve-gate":
         return this.#journal.approveGate(request);
+      case "validate-plan-draft":
+        return this.#validatePlanDraft(request);
       case "compile-plan":
         return this.#compilePlan(request);
       case "finalize-delivery":
@@ -539,7 +558,7 @@ export class DesignController {
     const canApproveGate =
       !design.gates.gateA.current ||
       (planReadyForGateB && !design.gates.gateB.current);
-    const legalActions = terminal
+    const legalOperations = terminal
       ? ["status"]
       : [
           "status",
@@ -549,7 +568,12 @@ export class DesignController {
             ? ["bind-change"]
             : []),
           ...(design.gates.gateA.current && design.change
-            ? ["write-artifact", "delete-artifact", "compile-plan"]
+            ? [
+                "write-artifact",
+                "delete-artifact",
+                "validate-plan-draft",
+                "compile-plan",
+              ]
             : []),
           ...(design.change &&
           design.plan &&
@@ -557,7 +581,6 @@ export class DesignController {
           design.gates.gateB.current
             ? ["finalize-delivery"]
             : []),
-          "finish",
         ];
     return {
       runId: run.runId,
@@ -566,25 +589,40 @@ export class DesignController {
       state: run.state,
       completed: run.state === "completed",
       ...(run.pauseCode ? { pause: { code: run.pauseCode } } : {}),
-      legalActions,
+      legalOperations,
+      packetActions: terminal ? [] : ["finish"],
       design,
     };
   }
 
   #start(request: Extract<DesignControlRequest, { operation: "start" }>) {
     const fromRequirement = "requirement" in request;
-    const run = this.#runs.startRun({
-      stage: "abel-design",
-      ...(fromRequirement
-        ? {
-            provisionalKey: transientHash(
-              "abel-design-requirement-v1",
-              request.requirement,
-            ),
-          }
-        : { change: request.change }),
-      operationId: request.operationId,
-    });
+    let run: ReturnType<RunStore["startRun"]>;
+    try {
+      run = this.#runs.startRun({
+        stage: "abel-design",
+        ...(fromRequirement
+          ? {
+              provisionalKey: transientHash(
+                "abel-design-requirement",
+                request.requirement,
+              ),
+              provisionalAliases: [
+                transientHash(
+                  "abel-design-requirement-v1",
+                  request.requirement,
+                ),
+              ],
+            }
+          : { change: request.change }),
+        operationId: request.operationId,
+      });
+    } catch (error) {
+      if (error instanceof Error && error.message === "operation-id-conflict") {
+        throw new Error("design-operation-conflict", { cause: error });
+      }
+      throw error;
+    }
     if (run.state === "created") {
       this.#runs.transition({
         runId: run.runId,
@@ -772,6 +810,51 @@ export class DesignController {
     }
   }
 
+  #readCompiledDraft(runId: string) {
+    const status = this.#journal.status(runId);
+    if (!status.change) throw new Error("design-change-required");
+    if (!status.gates.gateA.current) throw new Error("design-gate-a-required");
+    const draftPath = safeRelative(status.change, "plan-draft.json");
+    const draftBytes = readSafeFile(this.consumerRoot, draftPath);
+    let draft: unknown;
+    try {
+      draft = JSON.parse(draftBytes.toString("utf8"));
+    } catch {
+      throw new DesignPlanValidationError("design-plan-draft-invalid", [
+        { code: "design-plan-draft-invalid", field: "plan-draft.json" },
+      ]);
+    }
+    const compiled = compileImplementPlan(draft, {
+      consumerRoot: this.consumerRoot,
+    });
+    if (compiled.plan.changeId !== status.change) {
+      throw new DesignPlanValidationError("design-plan-change-mismatch", [
+        { code: "design-plan-change-mismatch", field: "changeId" },
+      ]);
+    }
+    return { status, compiled };
+  }
+
+  #validatePlanDraft(
+    request: Extract<
+      DesignControlRequest,
+      { operation: "validate-plan-draft" }
+    >,
+  ) {
+    const { compiled } = this.#readCompiledDraft(request.runId);
+    return {
+      operation: request.operation,
+      runId: request.runId,
+      valid: true,
+      plan: {
+        taskCount: compiled.plan.tasks.length,
+        outputCount: compiled.plan.outputs.length,
+        rawSha256: compiled.rawSha256,
+        canonicalHash: compiled.planHash,
+      },
+    };
+  }
+
   #compilePlan(
     request: Extract<DesignControlRequest, { operation: "compile-plan" }>,
   ) {
@@ -787,32 +870,17 @@ export class DesignController {
     });
     try {
       this.#journal.assertNoPendingArtifactOperations(request.runId);
-      const status = this.#journal.status(request.runId);
-      if (!status.change) throw new Error("design-change-required");
-      if (!status.gates.gateA.current)
-        throw new Error("design-gate-a-required");
-      const readyPath = safeRelative(status.change, "ready.yaml");
-      const gateAPath = safeRelative(status.change, "gate-a.yaml");
+      const { status, compiled } = this.#readCompiledDraft(request.runId);
+      const change = status.change;
+      if (!change) throw new Error("design-change-required");
+      const readyPath = safeRelative(change, "ready.yaml");
+      const gateAPath = safeRelative(change, "gate-a.yaml");
       removeSafeFile(this.consumerRoot, readyPath);
       removeSafeFile(this.consumerRoot, gateAPath);
-      const draftPath = safeRelative(status.change, "plan-draft.json");
-      const draftBytes = readSafeFile(this.consumerRoot, draftPath);
-      let draft: unknown;
-      try {
-        draft = JSON.parse(draftBytes.toString("utf8"));
-      } catch {
-        throw new Error("design-plan-draft-invalid");
-      }
-      const compiled = compileImplementPlan(draft as never, {
-        consumerRoot: this.consumerRoot,
-      });
-      if (compiled.plan.changeId !== status.change) {
-        throw new Error("design-plan-change-mismatch");
-      }
       this.#journal.assertFinalizationLease(lease);
       atomicWrite(
         this.consumerRoot,
-        safeRelative(status.change, "implement-plan.json"),
+        safeRelative(change, "implement-plan.json"),
         compiled.bytes,
       );
       return this.#journal.recordCompiledPlan({

package/src/design-journal.ts

@@ -317,12 +317,21 @@ export class DesignJournal {
     }
     const stateRoot = prepareStateRoot(unresolved);
     const database = new DatabaseSync(stateRoot.databasePath);
-    database.exec("PRAGMA foreign_keys = ON");
-    database.exec("PRAGMA journal_mode = WAL");
-    database.exec("PRAGMA synchronous = FULL");
-    database.exec("PRAGMA busy_timeout = 5000");
-    database.exec(SCHEMA);
-    return new DesignJournal(stateRoot, database, options);
+    try {
+      database.exec("PRAGMA foreign_keys = ON");
+      database.exec("PRAGMA journal_mode = WAL");
+      database.exec("PRAGMA synchronous = FULL");
+      database.exec("PRAGMA busy_timeout = 5000");
+      database.exec(SCHEMA);
+      return new DesignJournal(stateRoot, database, options);
+    } catch (error) {
+      try {
+        database.close();
+      } catch {
+        // The Design journal initialization failure remains authoritative.
+      }
+      throw error;
+    }
   }
 
   #assertOpen(): void {
@@ -337,7 +346,11 @@ export class DesignJournal {
       this.#database.exec("COMMIT");
       return result;
     } catch (error) {
-      this.#database.exec("ROLLBACK");
+      try {
+        this.#database.exec("ROLLBACK");
+      } catch {
+        // The original operation or commit failure remains authoritative.
+      }
       throw error;
     }
   }
@@ -899,7 +912,7 @@ export class DesignJournal {
   }): Record<string, unknown> {
     requireIdentifier(input.decisionId, "design-decision-id");
     const decisionContractHash = contractHash(
-      "abel-design-decision-v1",
+      "abel-design-decision",
       input.contract,
     );
     if (input.category !== "behavior" && input.category !== "technical") {
@@ -1024,7 +1037,7 @@ export class DesignJournal {
     }
     const gateAContractHash =
       input.gate === "gate-a"
-        ? contractHash("abel-design-gate-a-v1", input.contract)
+        ? contractHash("abel-design-gate-a", input.contract)
         : undefined;
     return this.#transaction(() => {
       this.#run(input.runId, true);

package/src/file-snapshot.ts

@@ -56,7 +56,7 @@ function updateManifest(
 
 function recursiveDirectoryManifest(abs: string): string {
   const hash = createHash("sha256");
-  updateManifest(hash, "cadence-directory-manifest-v2");
+  updateManifest(hash, "cadence-directory-manifest");
   const visit = (directory: string, prefix: string): void => {
     const names = readdirSync(directory).sort();
     for (const name of names) {