@ricsam/r5d-worker 0.0.131 → 0.0.133

package/dist/mjs/workspace-command-sync-policy.mjs

@@ -1,16 +1,20 @@
 import { WorkspaceMountHoldAbortedError } from "./workspace-mount-hold-fence.mjs";
-function requiresCurrentSyncBarrier(target) {
-  return target.type === "workspace" && target.rootProfile === "visible_projects";
+function requiresCurrentSyncBarrier(targets) {
+  return targets.some((target) => target.type === "workspace" && target.rootProfile === "visible_projects");
+}
+function asTargetList(target) {
+  return Array.isArray(target) ? target : [target];
 }
 async function reserveWorkspaceCommandAfterCurrentSync(target, coordinator, reserve, options = {}) {
+  const targets = asTargetList(target);
   while (true) {
-    if (requiresCurrentSyncBarrier(target)) {
+    if (requiresCurrentSyncBarrier(targets)) {
       const currentSync = coordinator.afterCurrent();
       await raceWithAbort(currentSync, options.signal);
       if (currentSync !== coordinator.afterCurrent()) continue;
     }
     if (options.signal?.aborted) throw new WorkspaceMountHoldAbortedError(abortReason(options.signal));
-    const hold = coordinator.mountHold(target, options.signal);
+    const hold = coordinator.mountHold(targets, options.signal);
     if (hold) {
       await hold;
       continue;

package/dist/mjs/workspace-command-targets.mjs

@@ -0,0 +1,37 @@
+function targetKey(target) {
+  return `${target.projectId}\0${target.branchName}`;
+}
+function normalizeCommandAdditionalTargets(primary, additional, validators) {
+  if (additional === void 0 || additional === null) return [];
+  if (!Array.isArray(additional)) throw new Error("Command additional targets must be a list of project branches");
+  const seen = new Set(primary.type === "project" ? [targetKey(primary)] : []);
+  const normalized = [];
+  for (const entry of additional) {
+    if (!entry || typeof entry !== "object" || entry.type !== "project") {
+      throw new Error("Command additional targets must be project branches");
+    }
+    const { projectId, branchName } = entry;
+    if (typeof projectId !== "string" || typeof branchName !== "string")
+      throw new Error("Command additional target is missing its project or branch");
+    validators.validateProjectId(projectId);
+    validators.validateBranchName(branchName);
+    const target = { type: "project", projectId, branchName };
+    const key = targetKey(target);
+    if (seen.has(key)) continue;
+    seen.add(key);
+    normalized.push(target);
+  }
+  return normalized;
+}
+function commandTargets(primary, additional) {
+  return [primary, ...additional];
+}
+function describeCommandAdditionalTargets(additional) {
+  if (additional.length === 0) return "";
+  return ` (also fencing ${additional.map((target) => `${target.projectId}/${target.branchName}`).join(", ")})`;
+}
+export {
+  commandTargets,
+  describeCommandAdditionalTargets,
+  normalizeCommandAdditionalTargets
+};

package/dist/mjs/workspace-filesystem-job-types.mjs

@@ -1,6 +1,8 @@
 const WORKSPACE_FILESYSTEM_JOB_KINDS = [
   "checkout_durability_recovery",
   "hydration_recovery",
+  "hydration_recovery_inspect",
+  "hydration_preserve_interrupted",
   "hydration_transaction",
   "hydration_raw",
   "checkout_transition_begin",
@@ -30,13 +32,19 @@ function describeWorkspaceFilesystemJob(kind, input) {
   switch (kind) {
     case "checkout_durability_recovery":
     case "hydration_recovery":
+    case "hydration_recovery_inspect":
     case "checkout_transition_begin":
     case "checkout_transition_complete":
     case "outer_checkout_fsync":
       return `${kind.replaceAll("_", " ")} of ${input.workspacePath}`;
+    case "hydration_preserve_interrupted": {
+      const recovery = input;
+      return `preservation of hydration transaction ${recovery.expectedTransactionId} in ${recovery.workspacePath}`;
+    }
     case "hydration_transaction": {
       const hydration = input;
-      return `hydration of ${summarizeIds(hydration.hydrationMounts.map(({ id }) => id))} (durability ${summarizeIds(hydration.advancedDurabilityMounts.map(({ id }) => id))})`;
+      const merged = Object.keys(hydration.mergeBases ?? {}).length;
+      return `hydration of ${summarizeIds(hydration.hydrationMounts.map(({ id }) => id))}${merged > 0 ? ` (${merged} merge-hydrated)` : ""} (durability ${summarizeIds(hydration.advancedDurabilityMounts.map(({ id }) => id))})`;
     }
     case "hydration_raw":
       return `pre-clone hydration of ${summarizeIds(input.mounts.map(({ id }) => id))}`;
@@ -77,6 +85,7 @@ function serializeWorkspaceFilesystemError(error, depth = 0) {
   if (typeof error.stack === "string") serialized.stack = error.stack;
   if (typeof record.code === "string") serialized.code = record.code;
   if (record.branchMayExist === true) serialized.branchMayExist = true;
+  if (record.hydrationRecovery) serialized.hydrationRecovery = structuredClone(record.hydrationRecovery);
   if (Array.isArray(record.cleanupFailures) && record.cleanupFailures.every((failure) => typeof failure === "string")) {
     serialized.cleanupFailures = [...record.cleanupFailures];
   }
@@ -95,6 +104,7 @@ function restoreWorkspaceFilesystemError(serialized) {
   if (serialized.code !== void 0) error.code = serialized.code;
   if (serialized.branchMayExist) error.branchMayExist = true;
   if (serialized.cleanupFailures) error.cleanupFailures = [...serialized.cleanupFailures];
+  if (serialized.hydrationRecovery) error.hydrationRecovery = structuredClone(serialized.hydrationRecovery);
   return error;
 }
 export {

package/dist/mjs/workspace-filesystem-jobs.mjs

@@ -12,6 +12,8 @@ import {
   runCheckoutTransitionCompleteJob,
   runHydrationRawJob,
   runHydrationRecoveryJob,
+  runHydrationRecoveryInspectJob,
+  runHydrationPreserveInterruptedJob,
   runHydrationTransactionJob,
   runOuterCheckoutFsyncJob,
   runProjectionMirrorJob,
@@ -23,6 +25,8 @@ import { preserveProjectCheckoutPathMove } from "./workspace-path-move.mjs";
 const workspaceFilesystemJobOperations = {
   checkout_durability_recovery: (input) => runCheckoutDurabilityRecoveryJob(input),
   hydration_recovery: (input) => runHydrationRecoveryJob(input),
+  hydration_recovery_inspect: (input) => runHydrationRecoveryInspectJob(input),
+  hydration_preserve_interrupted: (input) => runHydrationPreserveInterruptedJob(input),
   hydration_transaction: (input) => runHydrationTransactionJob(input),
   hydration_raw: (input) => runHydrationRawJob(input),
   checkout_transition_begin: (input) => runCheckoutTransitionBeginJob(input),