owlrunkit 0.19.1 → 0.19.2

package/scripts/runkit-contract/source-candidate.mjs

@@ -28,10 +28,15 @@ import {
   relativeToWorkspace,
   resolveExistingArtifact,
   safeIdentifier,
+  safeRelativePath,
   sha256,
   writeJsonAtomically,
   writeJsonExclusiveAtomically,
 } from "./provenance-common.mjs";
+
+export const SOURCE_CANDIDATE_V2_MAX_BYTES = 64 * 1024 * 1024;
+export const SOURCE_CANDIDATE_V2_MAX_NODES = 2_000_000;
+import { readWorkspaceJsonBounded } from "./onboarding-doctor.mjs";
 import { verifyDeliveryPacket } from "./source-fingerprint.mjs";
 
 function canonicalJson(value) {
@@ -51,6 +56,18 @@ function candidateHash(value) {
   return `sha256:${sha256(canonicalJson(value))}`;
 }
 
+function hasExactKeys(value, keys) {
+  return Boolean(value)
+    && typeof value === "object"
+    && !Array.isArray(value)
+    && canonicalJson(Object.keys(value).sort()) === canonicalJson([...keys].sort());
+}
+
+function validIdentifier(value) {
+  return typeof value === "string"
+    && /^[A-Za-z0-9][A-Za-z0-9._-]*$/u.test(value);
+}
+
 function repositoryActionsFalse() {
   return {
     worktreeCreated: false,
@@ -281,15 +298,56 @@ function sourceManifestV2({ workspaceRoot, ownedPaths }) {
   };
 }
 
-function freezePayloadV1({
+function sourceCandidateNodeCount(value) {
+  let count = 0;
+  const pending = [value];
+  while (pending.length > 0) {
+    const current = pending.pop();
+    count += 1;
+    if (Array.isArray(current)) {
+      pending.push(...current);
+    } else if (current !== null && typeof current === "object") {
+      pending.push(...Object.values(current));
+    }
+  }
+  return count;
+}
+
+export function validateSourceCandidateDocumentBoundsV2(value, {
+  maxBytes = SOURCE_CANDIDATE_V2_MAX_BYTES,
+  maxNodes = SOURCE_CANDIDATE_V2_MAX_NODES,
+} = {}) {
+  const bytes = Buffer.byteLength(`${JSON.stringify(value, null, 2)}\n`, "utf8");
+  const nodes = sourceCandidateNodeCount(value);
+  return {
+    valid: bytes <= maxBytes && nodes <= maxNodes,
+    bytes,
+    nodes,
+    maxBytes,
+    maxNodes,
+  };
+}
+
+function assertSourceCandidateDocumentBoundsV2(value) {
+  const result = validateSourceCandidateDocumentBoundsV2(value);
+  if (!result.valid) {
+    throw new Error(
+      "SourceCandidateV2 exceeds its supported serialized size or JSON node limit.",
+    );
+  }
+  return result;
+}
+
+function planPayloadV1({
   workspaceRoot,
   candidateRoot,
   candidateId,
   manifest,
 }) {
   const payloadRoot = path.join(candidateRoot, `${candidateId}.payload`);
-  mkdirSync(payloadRoot);
-  mkdirSync(path.join(payloadRoot, "sha256"));
+  if (existsSync(payloadRoot)) {
+    throw new Error(`source candidate payload already exists: ${candidateId}`);
+  }
   const payloadRootRelative = relativeToWorkspace(workspaceRoot, payloadRoot);
   const entries = [];
   const blobs = new Map();
@@ -308,13 +366,10 @@ function freezePayloadV1({
     }
     const payloadPath = path.join(payloadRoot, "sha256", digest);
     if (!blobs.has(digest)) {
-      writeFileSync(payloadPath, bytes, { flag: "wx", mode: 0o600 });
-      blobs.set(digest, bytes.length);
-    } else if (
-      lstatSync(payloadPath).isSymbolicLink()
-      || sha256(readFileSync(payloadPath)) !== digest
-    ) {
-      throw new Error(`Source payload blob drifted during freeze: ${digest}`);
+      blobs.set(digest, {
+        sourcePath,
+        sizeBytes: bytes.length,
+      });
     }
     entries.push({
       path: manifestEntry.path,
@@ -329,15 +384,46 @@ function freezePayloadV1({
     storage: "create_only_content_addressed_sha256",
     root: payloadRootRelative,
     blobCount: blobs.size,
-    totalBytes: [...blobs.values()].reduce((total, size) => total + size, 0),
+    totalBytes: [...blobs.values()]
+      .reduce((total, row) => total + row.sizeBytes, 0),
     entries,
   };
   return {
-    ...body,
-    sha256: candidateHash(body),
+    payload: {
+      ...body,
+      sha256: candidateHash(body),
+    },
+    blobs,
+    payloadRoot,
   };
 }
 
+function persistPayloadPlanV1({ candidateRoot, plan }) {
+  if (!existsSync(candidateRoot)) mkdirSync(candidateRoot);
+  const candidateRootStat = lstatSync(candidateRoot);
+  if (
+    candidateRootStat.isSymbolicLink()
+    || !candidateRootStat.isDirectory()
+    || realpathSync(candidateRoot) !== path.resolve(candidateRoot)
+  ) {
+    throw new Error("Source candidate directory must be a regular directory.");
+  }
+  mkdirSync(plan.payloadRoot);
+  const blobRoot = path.join(plan.payloadRoot, "sha256");
+  mkdirSync(blobRoot);
+  for (const [digest, row] of plan.blobs) {
+    const bytes = readFileSync(row.sourcePath);
+    if (bytes.length !== row.sizeBytes || sha256(bytes) !== digest) {
+      throw new Error(`Source changed while persisting payload: ${digest}`);
+    }
+    writeFileSync(path.join(blobRoot, digest), bytes, {
+      flag: "wx",
+      mode: 0o600,
+    });
+  }
+  return plan.payload;
+}
+
 function payloadContractIssues({
   workspaceRoot,
   candidatePath,
@@ -354,7 +440,16 @@ function payloadContractIssues({
     (entry) => entry.operation !== "deleted",
   );
   if (
-    payload?.schemaVersion !== "OwlCodaRunKitSourcePayloadV1"
+    !hasExactKeys(payload, [
+      "schemaVersion",
+      "storage",
+      "root",
+      "blobCount",
+      "totalBytes",
+      "entries",
+      "sha256",
+    ])
+    || payload?.schemaVersion !== "OwlCodaRunKitSourcePayloadV1"
     || payload.storage !== "create_only_content_addressed_sha256"
     || payload.root !== expectedRoot
     || !Number.isInteger(payload.blobCount)
@@ -376,7 +471,14 @@ function payloadContractIssues({
   for (const entry of payload.entries) {
     const manifestEntry = expectedByPath.get(entry?.path);
     if (
-      !manifestEntry
+      !hasExactKeys(entry, [
+        "path",
+        "payloadPath",
+        "sha256",
+        "sizeBytes",
+        "mode",
+      ])
+      || !manifestEntry
       || seenPaths.has(entry.path)
       || entry.sha256 !== manifestEntry.sha256
       || !Number.isInteger(entry.sizeBytes)
@@ -438,7 +540,14 @@ function activeLease({ workspaceRoot, executionRoot, workItemId }) {
 
 function manifestContractValid(manifest) {
   if (
-    manifest?.schemaVersion !== "OwlCodaRunKitDirtySourceManifestV2"
+    !hasExactKeys(manifest, [
+      "schemaVersion",
+      "statusMode",
+      "ownedPaths",
+      "entries",
+      "sha256",
+    ])
+    || manifest?.schemaVersion !== "OwlCodaRunKitDirtySourceManifestV2"
     || manifest.statusMode !== "porcelain-v1-z-untracked-all-runkit-excluded"
     || !Array.isArray(manifest.ownedPaths)
     || manifest.ownedPaths.length === 0
@@ -450,8 +559,14 @@ function manifestContractValid(manifest) {
     return false;
   }
   for (const entry of manifest.entries) {
+    const expectedEntryKeys = entry?.operation === "renamed"
+      ? ["operation", "status", "path", "previousPath", "sha256"]
+      : entry?.operation === "deleted"
+        ? ["operation", "status", "path"]
+        : ["operation", "status", "path", "sha256"];
     if (
       !entry
+      || !hasExactKeys(entry, expectedEntryKeys)
       || !["added", "deleted", "modified", "renamed"].includes(entry.operation)
       || typeof entry.status !== "string"
       || entry.status.length !== 2
@@ -513,18 +628,39 @@ function repositoryActionsAreFalse(actions) {
 function candidateV2ContractIssues(candidate) {
   const { candidateSha256, ...body } = candidate ?? {};
   if (
-    candidate?.schemaVersion !== "OwlCodaRunKitSourceCandidateV2"
+    !hasExactKeys(candidate, [
+      "schemaVersion",
+      "runId",
+      "candidateId",
+      "status",
+      "sourceMode",
+      "baseline",
+      "sourceManifest",
+      "sourceFingerprint",
+      "payload",
+      "discovery",
+      "repositoryActions",
+      "authorizationGranted",
+      "candidateSha256",
+    ])
+    || candidate?.schemaVersion !== "OwlCodaRunKitSourceCandidateV2"
     || candidate.status !== "frozen"
     || candidate.sourceMode !== "dirty_worktree_exact_manifest_v2"
     || candidate.authorizationGranted !== false
-    || typeof candidateSha256 !== "string"
+    || !/^sha256:[a-f0-9]{64}$/u.test(candidateSha256)
     || candidateSha256 !== candidateHash(body)
-    || typeof candidate.runId !== "string"
-    || typeof candidate.candidateId !== "string"
-    || typeof candidate.baseline?.branch !== "string"
-    || !/^(?:[a-f0-9]{40}|[a-f0-9]{64})$/u.test(candidate.baseline?.head)
-    || typeof candidate.discovery?.fromLease !== "string"
-    || typeof candidate.discovery?.leasePath !== "string"
+    || !validIdentifier(candidate.runId)
+    || !validIdentifier(candidate.candidateId)
+    || !hasExactKeys(candidate.baseline, ["branch", "head"])
+    || typeof candidate.baseline.branch !== "string"
+    || candidate.baseline.branch.length === 0
+    || !/^[a-f0-9]{40}$/u.test(candidate.baseline.head)
+    || !hasExactKeys(candidate.sourceFingerprint, ["sha256"])
+    || !/^[a-f0-9]{64}$/u.test(candidate.sourceFingerprint.sha256)
+    || !hasExactKeys(candidate.discovery, ["fromLease", "leasePath"])
+    || !validIdentifier(candidate.discovery.fromLease)
+    || typeof candidate.discovery.leasePath !== "string"
+    || candidate.discovery.leasePath.length === 0
     || !repositoryActionsAreFalse(candidate.repositoryActions)
     || !manifestContractValid(candidate.sourceManifest)
     || candidate.sourceFingerprint?.sha256
@@ -643,13 +779,14 @@ export function freezeSourceCandidateWithinControlTransactionV2({
   const { executionRoot, pinGate } = loadActiveExecution(root, runId);
   if (pinGate.status !== "valid") return { ...pinGate, authorizationGranted: false };
   const candidateRoot = path.join(executionRoot, "source-candidates");
-  if (!existsSync(candidateRoot)) mkdirSync(candidateRoot);
-  const candidateRootStat = lstatSync(candidateRoot);
-  if (candidateRootStat.isSymbolicLink() || !candidateRootStat.isDirectory()) {
-    throw new Error("Source candidate directory must be a regular directory.");
-  }
-  if (!within(realpathSync(executionRoot), realpathSync(candidateRoot))) {
-    throw new Error("Source candidate directory escapes its execution root.");
+  if (existsSync(candidateRoot)) {
+    const candidateRootStat = lstatSync(candidateRoot);
+    if (candidateRootStat.isSymbolicLink() || !candidateRootStat.isDirectory()) {
+      throw new Error("Source candidate directory must be a regular directory.");
+    }
+    if (!within(realpathSync(executionRoot), realpathSync(candidateRoot))) {
+      throw new Error("Source candidate directory escapes its execution root.");
+    }
   }
   const candidatePath = path.join(candidateRoot, `${candidateId}.json`);
   if (existsSync(candidatePath)) {
@@ -665,12 +802,43 @@ export function freezeSourceCandidateWithinControlTransactionV2({
     workspaceRoot: root,
     ownedPaths: lease.ownedPaths,
   });
-  const payload = freezePayloadV1({
+  const payloadPlan = planPayloadV1({
     workspaceRoot: root,
     candidateRoot,
     candidateId,
     manifest: statusBefore,
   });
+  const buildCandidate = ({ baseline, sourceManifest, payload }) => {
+    const body = {
+      schemaVersion: "OwlCodaRunKitSourceCandidateV2",
+      runId,
+      candidateId,
+      status: "frozen",
+      sourceMode: "dirty_worktree_exact_manifest_v2",
+      baseline,
+      sourceManifest,
+      sourceFingerprint: {
+        sha256: sourceManifest.sha256.slice("sha256:".length),
+      },
+      payload,
+      discovery: {
+        fromLease: workItemId,
+        leasePath: lease.leaseRelativePath,
+      },
+      repositoryActions: repositoryActionsFalse(),
+      authorizationGranted: false,
+    };
+    return {
+      ...body,
+      candidateSha256: candidateHash(body),
+    };
+  };
+  assertSourceCandidateDocumentBoundsV2(buildCandidate({
+    baseline: baselineBefore,
+    sourceManifest: statusBefore,
+    payload: payloadPlan.payload,
+  }));
+  const payload = persistPayloadPlanV1({ candidateRoot, plan: payloadPlan });
   const statusAfter = sourceManifestV2({
     workspaceRoot: root,
     ownedPaths: lease.ownedPaths,
@@ -682,29 +850,12 @@ export function freezeSourceCandidateWithinControlTransactionV2({
   ) {
     throw new Error("Owned workspace source changed during candidate freeze.");
   }
-  const body = {
-    schemaVersion: "OwlCodaRunKitSourceCandidateV2",
-    runId,
-    candidateId,
-    status: "frozen",
-    sourceMode: "dirty_worktree_exact_manifest_v2",
+  const candidate = buildCandidate({
     baseline: baselineAfter,
     sourceManifest: statusAfter,
-    sourceFingerprint: {
-      sha256: statusAfter.sha256.slice("sha256:".length),
-    },
     payload,
-    discovery: {
-      fromLease: workItemId,
-      leasePath: lease.leaseRelativePath,
-    },
-    repositoryActions: repositoryActionsFalse(),
-    authorizationGranted: false,
-  };
-  const candidate = {
-    ...body,
-    candidateSha256: candidateHash(body),
-  };
+  });
+  assertSourceCandidateDocumentBoundsV2(candidate);
   writeJsonExclusiveAtomically(candidatePath, candidate);
   return {
     status: "source_candidate_frozen",
@@ -721,6 +872,49 @@ export function freezeSourceCandidateWithinControlTransactionV2({
   };
 }
 
+export function previewSourceCandidateWithinControlTransactionV2({
+  workspaceRoot,
+  runId,
+  workItemId,
+}) {
+  const root = realpathSync(workspaceRoot);
+  const { executionRoot, pinGate } = loadActiveExecution(root, runId);
+  if (pinGate.status !== "valid") {
+    return { ...pinGate, authorizationGranted: false };
+  }
+  const lease = activeLease({
+    workspaceRoot: root,
+    executionRoot,
+    workItemId,
+  });
+  const baselineBefore = currentBaseline(root);
+  const manifestBefore = sourceManifestV2({
+    workspaceRoot: root,
+    ownedPaths: lease.ownedPaths,
+  });
+  const manifestAfter = sourceManifestV2({
+    workspaceRoot: root,
+    ownedPaths: lease.ownedPaths,
+  });
+  const baselineAfter = currentBaseline(root);
+  if (
+    manifestBefore.sha256 !== manifestAfter.sha256
+    || canonicalJson(baselineBefore) !== canonicalJson(baselineAfter)
+  ) {
+    throw new Error("Owned workspace source changed during candidate preview.");
+  }
+  return {
+    status: "source_candidate_previewed",
+    exitCode: 0,
+    runId,
+    workItemId,
+    baseline: baselineAfter,
+    sourceManifest: manifestAfter,
+    sourceFingerprint: manifestAfter.sha256.slice("sha256:".length),
+    authorizationGranted: false,
+  };
+}
+
 export function freezeSourceCandidateV2(options) {
   const workspaceRoot = realpathSync(options.workspaceRoot);
   return withControlTransaction(
@@ -732,31 +926,31 @@ export function freezeSourceCandidateV2(options) {
   );
 }
 
-export function verifySourceCandidateV2({
+export function verifySourceCandidateDetailsV2({
   workspaceRoot,
   candidatePath,
+  requireCurrentWorkspace = true,
 }) {
   const root = realpathSync(workspaceRoot);
   const issueCodes = [];
   let absoluteCandidatePath;
   let candidate;
   try {
-    absoluteCandidatePath = resolveExistingArtifact(
-      root,
-      candidatePath,
-      "candidatePath",
-    );
-    const stat = lstatSync(absoluteCandidatePath);
-    if (stat.isSymbolicLink() || !stat.isFile()) {
-      throw new Error("candidate is not a regular file");
-    }
-    candidate = readJson(absoluteCandidatePath);
+    const relativeCandidatePath = safeRelativePath(candidatePath, "candidatePath");
+    candidate = readWorkspaceJsonBounded(root, relativeCandidatePath, {
+      maxBytes: SOURCE_CANDIDATE_V2_MAX_BYTES,
+      maxNodes: SOURCE_CANDIDATE_V2_MAX_NODES,
+    });
+    absoluteCandidatePath = path.join(root, relativeCandidatePath);
   } catch {
     return {
-      status: "invalid",
-      exitCode: 2,
-      issueCodes: ["source_candidate_unreadable"],
-      authorizationGranted: false,
+      gate: {
+        status: "invalid",
+        exitCode: 2,
+        issueCodes: ["source_candidate_unreadable"],
+        authorizationGranted: false,
+      },
+      candidateDocument: null,
     };
   }
   const candidateSha256 = candidate.candidateSha256;
@@ -792,7 +986,7 @@ export function verifySourceCandidateV2({
       issueCodes.push("source_candidate_lease_unreadable");
     }
   }
-  if (issueCodes.length === 0) {
+  if (issueCodes.length === 0 && requireCurrentWorkspace) {
     try {
       const currentManifest = sourceManifestV2({
         workspaceRoot: root,
@@ -812,7 +1006,7 @@ export function verifySourceCandidateV2({
       issueCodes.push("source_candidate_baseline_drift");
     }
   }
-  return {
+  const gate = {
     status: issueCodes.length === 0 ? "valid" : "invalid",
     exitCode: issueCodes.length === 0 ? 0 : 2,
     candidatePath: relativeToWorkspace(root, absoluteCandidatePath),
@@ -821,6 +1015,14 @@ export function verifySourceCandidateV2({
     issueCodes: [...new Set(issueCodes)].sort(),
     authorizationGranted: false,
   };
+  return {
+    gate,
+    candidateDocument: gate.status === "valid" ? candidate : null,
+  };
+}
+
+export function verifySourceCandidateV2(options) {
+  return verifySourceCandidateDetailsV2(options).gate;
 }
 
 class SimulatedMaterializationInterruption extends Error {

package/scripts/runkit-contract/sync-release-identity.mjs

@@ -153,14 +153,49 @@ export function verifyReleaseIdentitySurfacesV1(input) {
     const matches = [...source.matchAll(pattern)];
     return matches.length === 1 && matches[0][1] === core.coreManifestSha256;
   };
+  const releasePolicy = input.releasePolicy ?? null;
+  const candidateUnpublished = releasePolicy?.status === "release_candidate_unpublished";
+  if (candidateUnpublished) {
+    requireSurface(
+      releasePolicy?.packageName === "owlrunkit"
+        && releasePolicy?.candidateVersion === core.coreVersion
+        && releasePolicy?.registryRelease === null
+        && releasePolicy?.currentPublishedRelease?.packageName === "owlrunkit"
+        && /^\d+\.\d+\.\d+$/u.test(
+          releasePolicy?.currentPublishedRelease?.version ?? "",
+        )
+        && releasePolicy.currentPublishedRelease.version !== core.coreVersion,
+      "release_policy",
+    );
+  }
   const skillExact = (markdown) => {
     if (typeof markdown !== "string") return false;
     const hashes = markdown.match(/sha256:[a-f0-9]{64}/gu) ?? [];
-    return hashes.length === 1
+    const identityExact = hashes.length === 1
       && hashes[0] === core.coreManifestSha256
-      && markdown.includes(`Bundled release: standalone \`owlrunkit@${core.coreVersion}\``)
-      && markdown.includes(`Core \`${core.coreVersion}\``)
-      && !/(?:It is not published|current published release remains)/iu.test(markdown);
+      && markdown.includes(`Core \`${core.coreVersion}\``);
+    if (!identityExact) return false;
+    if (!candidateUnpublished) {
+      return markdown.includes(
+        `Bundled release: standalone \`owlrunkit@${core.coreVersion}\``,
+      ) && !/(?:not published|current published release remains)/iu.test(markdown);
+    }
+    const prior = releasePolicy.currentPublishedRelease.version;
+    return markdown.includes(
+      `Bundled candidate: standalone \`owlrunkit@${core.coreVersion}\``,
+    )
+      && /candidate is not published/iu.test(markdown)
+      && new RegExp(
+        "current published release remains\\s+`owlrunkit@"
+          + escaped(prior)
+          + "`",
+        "iu",
+      ).test(markdown)
+      && !markdown.includes(
+        `Bundled release: standalone \`owlrunkit@${core.coreVersion}\``,
+      )
+      && !markdown.includes(`--exact owlrunkit@${core.coreVersion}`)
+      && !markdown.includes(`npm install --save-exact owlrunkit@${core.coreVersion}`);
   };
 
   requireSurface(packageExact(input.packageManifest), "package_manifest");

package/scripts/runkit-contract/team-project-successor.mjs

@@ -95,11 +95,14 @@ function nonEmptyString(value, label) {
 
 function validateTimestamp(value) {
   if (typeof value !== "string"
-    || !/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/u.test(value)
+    || !/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d{1,3})?Z$/u.test(value)
     || Number.isNaN(Date.parse(value))) {
-    throw new Error("Team project successor --at must be an ISO-8601 UTC timestamp.");
+    throw new Error(
+      "Team project successor --at must be an ISO-8601 UTC timestamp "
+      + "(YYYY-MM-DDTHH:mm:ssZ or YYYY-MM-DDTHH:mm:ss.sssZ).",
+    );
   }
-  return value;
+  return new Date(value).toISOString();
 }
 
 function assertHash(value, label) {
@@ -981,7 +984,7 @@ export function successorTeamProjectV1({
 }) {
   const root = assertWorkspaceRoot(workspaceRoot);
   safeIdentifier(transitionId, "transitionId");
-  validateTimestamp(occurredAt);
+  occurredAt = validateTimestamp(occurredAt);
   nonEmptyString(reason, "Team project successor reason");
   const runkitPath = path.join(root, RUNKIT_ROOT);
   assertRealDirectory(path.join(root, ".owlcoda"), "OwlCoda control directory");