@intentius/chant 0.124.25 → 0.124.26

package/src/workspace/trust/gate-seal.ts

@@ -37,9 +37,42 @@ export interface SealedGateApproval {
   /** Who relayed the approval for `resolvedBy` (#3402), when someone did. */
   relayedBy?: string;
   timestamp: string;
+  /** The checkpoint the approval lets a run resume from (#3947), when it carries one. */
+  checkpointDigest?: string;
+  /** The line a carried approval came from (#3949): the names and time its seal was made under. */
+  carriedFrom?: { op: string; gate: string; timestamp: string; checkpointDigest?: string };
   seal?: unknown;
 }
 
+/**
+ * The approval as it was sealed (#3949). A carried approval is recorded
+ * under a gate's new name and the time it was carried, and its seal was
+ * made over the line it came from, so its op, gate, time and checkpoint
+ * digest are read off `carriedFrom`. Any other approval is returned as it is.
+ */
+export function sealedFieldsOf(a: SealedGateApproval): SealedGateApproval {
+  const from = a.carriedFrom;
+  if (from === undefined) return a;
+  const { carriedFrom: _from, checkpointDigest: _checkpoint, ...rest } = a;
+  return {
+    ...rest,
+    op: from.op,
+    gate: from.gate,
+    timestamp: from.timestamp,
+    ...(from.checkpointDigest !== undefined ? { checkpointDigest: from.checkpointDigest } : {}),
+  };
+}
+
+/**
+ * The version of a seal over `a` (#3947): 2 when the approval carries a
+ * checkpoint digest, which the payload signs, and 1 otherwise. `chant approve
+ * --sign` records 2 on the seal; a seal records no version for 1.
+ */
+export function gateSealVersion(a: Pick<SealedGateApproval, "checkpointDigest" | "carriedFrom">): 1 | 2 {
+  const checkpoint = a.carriedFrom !== undefined ? a.carriedFrom.checkpointDigest : a.checkpointDigest;
+  return checkpoint !== undefined ? 2 : 1;
+}
+
 /**
  * The bytes a gate approval's seal signs (#3163): the op (or component), the
  * gate, the environment, the plan digest, the approver and the time, joined
@@ -48,10 +81,21 @@ export interface SealedGateApproval {
  * `relayed-by <principal>`, so the relay can't be added, changed or removed
  * after sealing; an approval nobody relayed signs the six lines it always did,
  * so seals made before #3402 still verify.
+ *
+ * Seal version 2 (#3947) adds the checkpoint a resumed run carries its step
+ * outputs from: an approval with a `checkpointDigest` signs one more line,
+ * `checkpoint <digest>`, last. The values the steps after the gate read are
+ * then covered by the seal too, and removing or swapping the digest stops it
+ * verifying. An approval with none signs what a version 1 seal signed.
+ *
+ * A carried approval (#3949) signs what the line it came from signed: see
+ * {@link sealedFieldsOf}.
  */
-export function gateSealPayload(a: SealedGateApproval): Buffer {
+export function gateSealPayload(approval: SealedGateApproval): Buffer {
+  const a = sealedFieldsOf(approval);
   const relay = a.relayedBy !== undefined ? `\nrelayed-by ${a.relayedBy}` : "";
-  return Buffer.from(`${a.op}\n${a.gate}\n${a.environment ?? ""}\n${a.planDigest ?? ""}\n${a.resolvedBy}\n${a.timestamp}${relay}`, "utf-8");
+  const checkpoint = gateSealVersion(a) === 2 ? `\ncheckpoint ${a.checkpointDigest}` : "";
+  return Buffer.from(`${a.op}\n${a.gate}\n${a.environment ?? ""}\n${a.planDigest ?? ""}\n${a.resolvedBy}\n${a.timestamp}${relay}${checkpoint}`, "utf-8");
 }
 
 // ── SSHSIG ───────────────────────────────────────────────────────────────

package/src/workspace/trust/seal.ts

@@ -32,7 +32,7 @@ import type { Signer } from "./trust-files";
 import { sshKeygen, verifySshSignature } from "./ssh-commit";
 import { GATE_SEAL_NAMESPACE, gateSealPayload, namespaceAllowed, sshSignatureKey, verifySshSignatureWith, type SealedGateApproval } from "./gate-seal";
 
-export { GATE_SEAL_NAMESPACE, gateSealPayload, type SealedGateApproval } from "./gate-seal";
+export { GATE_SEAL_NAMESPACE, gateSealPayload, gateSealVersion, sealedFieldsOf, type SealedGateApproval } from "./gate-seal";
 
 /** The ssh signature namespace of a verdict seal. */
 export const REVIEW_SEAL_NAMESPACE = "chant-review";