@ricsam/r5d-worker 0.0.58 → 0.0.60

package/dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.58",
+  "version": "0.0.60",
   "type": "commonjs"
 }

package/dist/cjs/workspace-convergence.cjs

@@ -0,0 +1,256 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var workspace_convergence_exports = {};
+__export(workspace_convergence_exports, {
+  ExplicitWorkspacePublicationQueue: () => ExplicitWorkspacePublicationQueue,
+  WORKSPACE_IDLE_SAFETY_SCAN_MS: () => WORKSPACE_IDLE_SAFETY_SCAN_MS,
+  WORKSPACE_PUBLICATION_QUIET_MS: () => WORKSPACE_PUBLICATION_QUIET_MS,
+  WorkspaceConvergenceState: () => WorkspaceConvergenceState,
+  WorkspaceManifestRevisionFence: () => WorkspaceManifestRevisionFence,
+  processWorkspaceConvergenceState: () => processWorkspaceConvergenceState,
+  readWorkspaceConvergenceState: () => readWorkspaceConvergenceState,
+  waitForWorkspacePublicationOnShutdown: () => waitForWorkspacePublicationOnShutdown,
+  workspacePublicationIncidentAction: () => workspacePublicationIncidentAction,
+  workspacePublicationTelemetry: () => workspacePublicationTelemetry
+});
+module.exports = __toCommonJS(workspace_convergence_exports);
+var import_node_fs = __toESM(require("node:fs"), 1);
+var import_node_path = __toESM(require("node:path"), 1);
+const WORKSPACE_PUBLICATION_QUIET_MS = 5e3;
+const WORKSPACE_IDLE_SAFETY_SCAN_MS = 6e4;
+const WORKSPACE_MANIFEST_REVISION_PATTERN = /^[0-9a-f]{64}$/;
+class WorkspaceManifestRevisionFence {
+  sequence = 0;
+  requestedRevision = null;
+  completedRevision = null;
+  begin(revision) {
+    if (!WORKSPACE_MANIFEST_REVISION_PATTERN.test(revision)) {
+      throw new Error("Workspace manifest revision must be a lowercase SHA-256 hash");
+    }
+    this.sequence += 1;
+    this.requestedRevision = revision;
+    this.completedRevision = null;
+    return { sequence: this.sequence, revision };
+  }
+  isCurrent(token) {
+    return token.sequence === this.sequence && token.revision === this.requestedRevision;
+  }
+  complete(token) {
+    if (!this.isCurrent(token)) return false;
+    this.completedRevision = token.revision;
+    return true;
+  }
+  readyRevision() {
+    return this.completedRevision === this.requestedRevision ? this.completedRevision : null;
+  }
+}
+function workspacePublicationTelemetry(input) {
+  return {
+    totalMs: Math.max(0, input.finishedAt - input.requestedAt),
+    queueMs: Math.max(0, input.prepareStartedAt - input.requestedAt),
+    prepareMs: Math.max(0, input.synchronizeStartedAt - input.prepareStartedAt),
+    synchronizeMs: Math.max(0, input.finishedAt - input.synchronizeStartedAt)
+  };
+}
+function workspacePublicationIncidentAction(requestId) {
+  return requestId ? "request_terminal_authority" : "defer_automatic";
+}
+class ExplicitWorkspacePublicationQueue {
+  scheduled;
+  queued = [];
+  schedule(publication, pendingRequestId) {
+    if (pendingRequestId === publication.requestId || this.scheduled?.requestId === publication.requestId || this.queued.some((queued) => queued.requestId === publication.requestId)) {
+      return false;
+    }
+    if (pendingRequestId || this.scheduled) {
+      this.queued.push(publication);
+      return false;
+    }
+    this.scheduled = publication;
+    return true;
+  }
+  hasScheduled() {
+    return this.scheduled !== void 0;
+  }
+  consumeScheduled(requestId) {
+    if (this.scheduled?.requestId === requestId) this.scheduled = void 0;
+  }
+  enqueue(publication, pendingRequestId) {
+    if (pendingRequestId === publication.requestId || this.scheduled?.requestId === publication.requestId || this.queued.some((queued) => queued.requestId === publication.requestId)) {
+      return;
+    }
+    this.queued.push(publication);
+  }
+  next() {
+    return this.queued.shift();
+  }
+}
+const EMPTY_STATE = {
+  localHead: null,
+  desiredCanonicalHead: null,
+  dirtyGeneration: 0,
+  publishedGeneration: 0
+};
+function validHead(value) {
+  return value === null || typeof value === "string" && /^[0-9a-f]{40,64}$/.test(value);
+}
+function validGeneration(value) {
+  return typeof value === "number" && Number.isSafeInteger(value) && value >= 0;
+}
+function readWorkspaceConvergenceState(statePath) {
+  try {
+    const parsed = JSON.parse(import_node_fs.default.readFileSync(statePath, "utf8"));
+    if (!validHead(parsed.localHead) || !validHead(parsed.desiredCanonicalHead) || !validGeneration(parsed.dirtyGeneration) || !validGeneration(parsed.publishedGeneration) || parsed.publishedGeneration > parsed.dirtyGeneration) {
+      return { ...EMPTY_STATE };
+    }
+    return {
+      localHead: parsed.localHead,
+      desiredCanonicalHead: parsed.desiredCanonicalHead,
+      dirtyGeneration: parsed.dirtyGeneration,
+      publishedGeneration: parsed.publishedGeneration
+    };
+  } catch {
+    return { ...EMPTY_STATE };
+  }
+}
+class WorkspaceConvergenceState {
+  constructor(statePath) {
+    this.statePath = statePath;
+    this.state = readWorkspaceConvergenceState(statePath);
+    this.publicationState = this.state.dirtyGeneration > this.state.publishedGeneration ? "scheduled" : "idle";
+  }
+  statePath;
+  state;
+  publicationState;
+  snapshot() {
+    return { ...this.state, publicationState: this.publicationState };
+  }
+  setLocalHead(localHead) {
+    if (!validHead(localHead)) throw new Error("Invalid local workspace head");
+    this.state.localHead = localHead;
+    this.persist();
+  }
+  observeCanonicalHead(canonicalHead) {
+    if (!validHead(canonicalHead)) throw new Error("Invalid canonical workspace head");
+    if (this.state.desiredCanonicalHead === canonicalHead) return false;
+    this.state.desiredCanonicalHead = canonicalHead;
+    this.persist();
+    return true;
+  }
+  markDirty() {
+    this.state.dirtyGeneration += 1;
+    if (this.publicationState === "idle") this.publicationState = "scheduled";
+    this.persist();
+    return this.state.dirtyGeneration;
+  }
+  schedule() {
+    if (this.publicationState === "idle") this.publicationState = "scheduled";
+  }
+  beginPreparing() {
+    if (this.publicationState === "preparing" || this.publicationState === "submitting") {
+      throw new Error("A workspace publication is already in flight");
+    }
+    this.publicationState = "preparing";
+  }
+  beginSubmitting() {
+    if (this.publicationState !== "preparing") throw new Error("Workspace publication authority was not prepared");
+    this.publicationState = "submitting";
+  }
+  defer() {
+    this.publicationState = "scheduled";
+  }
+  block() {
+    this.publicationState = "blocked";
+  }
+  releaseBlock() {
+    this.publicationState = this.state.dirtyGeneration > this.state.publishedGeneration ? "scheduled" : "idle";
+  }
+  observeIncidentState(blocked) {
+    if (this.publicationState === "preparing" || this.publicationState === "submitting") return;
+    if (blocked) this.block();
+    else this.releaseBlock();
+  }
+  resetTransientPublicationState() {
+    this.publicationState = this.state.dirtyGeneration > this.state.publishedGeneration ? "scheduled" : "idle";
+  }
+  complete(input) {
+    if (!validGeneration(input.generation) || input.generation > this.state.dirtyGeneration) {
+      throw new Error("Invalid completed workspace generation");
+    }
+    if (!validHead(input.canonicalHead)) throw new Error("Invalid completed canonical workspace head");
+    if (input.published) {
+      this.state.publishedGeneration = Math.max(this.state.publishedGeneration, input.generation);
+      this.state.localHead = input.canonicalHead;
+      this.state.desiredCanonicalHead = input.canonicalHead;
+    }
+    this.publicationState = this.state.dirtyGeneration > this.state.publishedGeneration ? "scheduled" : "idle";
+    this.persist();
+  }
+  persist() {
+    import_node_fs.default.mkdirSync(import_node_path.default.dirname(this.statePath), { recursive: true });
+    const temporaryPath = `${this.statePath}.${process.pid}.${crypto.randomUUID()}.tmp`;
+    import_node_fs.default.writeFileSync(temporaryPath, `${JSON.stringify(this.state)}
+`, { mode: 384 });
+    import_node_fs.default.renameSync(temporaryPath, this.statePath);
+  }
+}
+const PROCESS_WORKSPACE_CONVERGENCE_STATES = /* @__PURE__ */ new Map();
+function processWorkspaceConvergenceState(statePath) {
+  const key = import_node_path.default.resolve(statePath);
+  const existing = PROCESS_WORKSPACE_CONVERGENCE_STATES.get(key);
+  if (existing) return existing;
+  const created = new WorkspaceConvergenceState(key);
+  PROCESS_WORKSPACE_CONVERGENCE_STATES.set(key, created);
+  return created;
+}
+async function waitForWorkspacePublicationOnShutdown(input) {
+  input.forcePublication();
+  const deadline = Date.now() + (input.timeoutMs ?? 1e4);
+  const pollMs = input.pollMs ?? 50;
+  while (Date.now() < deadline) {
+    const snapshot = input.snapshot();
+    if (snapshot.publicationState === "blocked") return "blocked";
+    if (snapshot.publicationState === "idle" && snapshot.publishedGeneration >= snapshot.dirtyGeneration) return "settled";
+    await new Promise((resolve) => setTimeout(resolve, pollMs));
+  }
+  return "timed_out";
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ExplicitWorkspacePublicationQueue,
+  WORKSPACE_IDLE_SAFETY_SCAN_MS,
+  WORKSPACE_PUBLICATION_QUIET_MS,
+  WorkspaceConvergenceState,
+  WorkspaceManifestRevisionFence,
+  processWorkspaceConvergenceState,
+  readWorkspaceConvergenceState,
+  waitForWorkspacePublicationOnShutdown,
+  workspacePublicationIncidentAction,
+  workspacePublicationTelemetry
+});

package/dist/cjs/workspace-incident-state.cjs

@@ -18,22 +18,51 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var workspace_incident_state_exports = {};
 __export(workspace_incident_state_exports, {
+  WorkspaceIncidentOrderingFence: () => WorkspaceIncidentOrderingFence,
   applyWorkspaceIncidentUpdate: () => applyWorkspaceIncidentUpdate,
   releasePendingWorkspaceHead: () => releasePendingWorkspaceHead
 });
 module.exports = __toCommonJS(workspace_incident_state_exports);
+const DEFAULT_TERMINAL_INCIDENT_HISTORY_LIMIT = 32;
+function isTerminalWorkspaceIncidentUpdate(update) {
+  return update.incidentId !== null && (update.status === "resolved" || update.status === "confirmed" || update.status === "reset");
+}
+class WorkspaceIncidentOrderingFence {
+  constructor(historyLimit = DEFAULT_TERMINAL_INCIDENT_HISTORY_LIMIT) {
+    this.historyLimit = historyLimit;
+    if (!Number.isSafeInteger(historyLimit) || historyLimit < 1) {
+      throw new Error("Workspace incident history limit must be a positive integer");
+    }
+  }
+  historyLimit;
+  terminalIncidentIds = /* @__PURE__ */ new Set();
+  terminalIncidentOrder = [];
+  observe(update) {
+    if (!isTerminalWorkspaceIncidentUpdate(update) || this.terminalIncidentIds.has(update.incidentId)) return;
+    this.terminalIncidentIds.add(update.incidentId);
+    this.terminalIncidentOrder.push(update.incidentId);
+    while (this.terminalIncidentOrder.length > this.historyLimit) {
+      const expired = this.terminalIncidentOrder.shift();
+      if (expired) this.terminalIncidentIds.delete(expired);
+    }
+  }
+  permitsBlockedResponse(incidentId) {
+    if (!incidentId) return false;
+    return !this.terminalIncidentIds.has(incidentId);
+  }
+}
 function applyWorkspaceIncidentUpdate(currentIncidentId, update) {
   if (update.status === "remediating" || update.status === "waiting_for_worker") return update.incidentId;
   if (currentIncidentId && update.incidentId && update.incidentId !== currentIncidentId) return currentIncidentId;
   return null;
 }
 function releasePendingWorkspaceHead(previousIncidentId, currentIncidentId, terminalIncidentId) {
-  if (!previousIncidentId || currentIncidentId) return { syncHead: null };
-  if (terminalIncidentId === previousIncidentId) return { syncHead: "authoritative" };
-  return { syncHead: null };
+  if (!previousIncidentId || currentIncidentId) return { fetchAuthoritativeHead: false };
+  return { fetchAuthoritativeHead: terminalIncidentId === previousIncidentId };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  WorkspaceIncidentOrderingFence,
   applyWorkspaceIncidentUpdate,
   releasePendingWorkspaceHead
 });

package/dist/cjs/workspace-manifest-admission.cjs

@@ -0,0 +1,64 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var workspace_manifest_admission_exports = {};
+__export(workspace_manifest_admission_exports, {
+  inspectWorkspaceManifestFilesystem: () => inspectWorkspaceManifestFilesystem
+});
+module.exports = __toCommonJS(workspace_manifest_admission_exports);
+var import_node_fs = __toESM(require("node:fs"), 1);
+var import_node_path = __toESM(require("node:path"), 1);
+var import_managed_paths = require("./managed-paths.cjs");
+function hasNormalGitDirectory(checkoutPath) {
+  const gitPath = import_node_path.default.join(checkoutPath, ".git");
+  return import_node_fs.default.existsSync(gitPath) && import_node_fs.default.statSync(gitPath).isDirectory();
+}
+function inspectWorkspaceManifestFilesystem(input) {
+  const firstBootstrap = !hasNormalGitDirectory(input.workspaceShadowRoot);
+  const missingCheckouts = [];
+  const migratedProjectIds = [];
+  for (const project of input.projects) {
+    const projectRoot = (0, import_managed_paths.managedProjectRoot)(input.projectsRoot, project.checkoutPathSegments);
+    const legacyRoot = import_node_path.default.join(input.projectsRoot, (0, import_managed_paths.legacyProjectSlug)(project.projectPath, project.projectId));
+    if (import_node_fs.default.existsSync(legacyRoot)) migratedProjectIds.push(project.projectId);
+    for (const branchName of project.branches) {
+      if (!hasNormalGitDirectory(import_node_path.default.join(projectRoot, branchName))) {
+        missingCheckouts.push({ projectId: project.projectId, branchName });
+      }
+    }
+  }
+  return {
+    firstBootstrap,
+    missingCheckouts,
+    migratedProjectIds
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  inspectWorkspaceManifestFilesystem
+});

package/dist/cjs/workspace-sync.cjs

@@ -32,11 +32,13 @@ __export(workspace_sync_exports, {
   WORKSPACE_BRANCH: () => WORKSPACE_BRANCH,
   WORKSPACE_INTENT_REF_PREFIX: () => WORKSPACE_INTENT_REF_PREFIX,
   WORKSPACE_NATIVE_PLANS_RELATIVE_PATH: () => WORKSPACE_NATIVE_PLANS_RELATIVE_PATH,
-  WORKSPACE_PERIODIC_SCAN_INTERVAL_MS: () => WORKSPACE_PERIODIC_SCAN_INTERVAL_MS,
+  WORKSPACE_PUBLICATION_REF_PREFIX: () => WORKSPACE_PUBLICATION_REF_PREFIX,
   WorkspaceSyncSingleFlight: () => WorkspaceSyncSingleFlight,
   assertCanonicalCheckoutIndexMatchesWorktree: () => assertCanonicalCheckoutIndexMatchesWorktree,
   assertWorkspaceQuarantineRef: () => assertWorkspaceQuarantineRef,
   calculateWorkspaceDiffFingerprint: () => calculateWorkspaceDiffFingerprint,
+  calculateWorkspaceLocalDiffFingerprint: () => calculateWorkspaceLocalDiffFingerprint,
+  convergeWorkspaceHead: () => convergeWorkspaceHead,
   encodeWorkspaceBranch: () => encodeWorkspaceBranch,
   mirrorShadowWorkspaceToVisible: () => mirrorShadowWorkspaceToVisible,
   mirrorVisibleWorkspaceToShadow: () => mirrorVisibleWorkspaceToShadow,
@@ -54,8 +56,8 @@ var import_managed_paths = require("./managed-paths.cjs");
 var import_workspace_mutation_gate = require("./workspace-mutation-gate.cjs");
 const WORKSPACE_BRANCH = "main";
 const WORKSPACE_INTENT_REF_PREFIX = "refs/r5d/workspace-intents/";
+const WORKSPACE_PUBLICATION_REF_PREFIX = "refs/r5d/workspace-publications/";
 const MAX_WORKSPACE_SYNC_DIFF_BYTES = 5 * 1024 * 1024;
-const WORKSPACE_PERIODIC_SCAN_INTERVAL_MS = 5e3;
 const MAX_REPORTED_WORKSPACE_PATHS = 2e3;
 const MAX_REPORTED_WORKSPACE_STATUS_BYTES = 256 * 1024;
 const MAX_MIRROR_COMPARISON_CACHE_ENTRIES = 2e5;
@@ -1754,9 +1756,10 @@ function commitMessage(input) {
   });
 }
 function assertWorkspaceQuarantineRef(quarantineRef) {
-  const suffix = quarantineRef.slice(WORKSPACE_INTENT_REF_PREFIX.length);
-  if (!quarantineRef.startsWith(WORKSPACE_INTENT_REF_PREFIX) || !/^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/.test(suffix)) {
-    throw new Error(`Workspace candidate ref must be below ${WORKSPACE_INTENT_REF_PREFIX}`);
+  const prefix = quarantineRef.startsWith(WORKSPACE_PUBLICATION_REF_PREFIX) ? WORKSPACE_PUBLICATION_REF_PREFIX : WORKSPACE_INTENT_REF_PREFIX;
+  const suffix = quarantineRef.slice(prefix.length);
+  if (!quarantineRef.startsWith(prefix) || !/^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/.test(suffix)) {
+    throw new Error(`Workspace candidate ref must be below ${WORKSPACE_PUBLICATION_REF_PREFIX} or ${WORKSPACE_INTENT_REF_PREFIX}`);
   }
   const result = Bun.spawnSync(["git", "check-ref-format", quarantineRef], {
     stdout: "pipe",
@@ -1876,6 +1879,36 @@ function preserveWorkspaceConflictCandidate(input, observed, options) {
     };
   }
 }
+function preserveLargeDiffCandidate(input, observed, error) {
+  try {
+    if (stagedPaths(input).length > 0) {
+      runGit(input, input.shadowRoot, ["commit", "-m", commitMessage(input)], "commit blocked workspace candidate");
+    }
+    const candidateHead = revParse(input, "HEAD");
+    if (!candidateHead) throw new Error("the blocked workspace candidate does not have a commit");
+    assertUnscopedCanonicalCheckoutSubtreesMatchRemote(input, candidateHead);
+    const upload = uploadWorkspaceCandidate(input, candidateHead);
+    if (upload.exitCode !== 0) {
+      throw new Error(upload.stderr || upload.stdout || "blocked workspace candidate upload failed");
+    }
+    return {
+      ...observed,
+      outcome: "large_diff_blocked",
+      expectedHead: revParse(input, `origin/${WORKSPACE_BRANCH}`),
+      candidateHead,
+      quarantineRef: input.quarantineRef,
+      error,
+      gitStatus: gitStatus(input)
+    };
+  } catch (candidateError) {
+    return {
+      ...observed,
+      outcome: "failed",
+      error: `Workspace safety guard blocked publication but could not preserve a durable candidate: ${candidateError instanceof Error ? candidateError.message : String(candidateError)}`,
+      gitStatus: gitStatus(input)
+    };
+  }
+}
 async function synchronizeWorkspace(rawInput) {
   let input = { ...rawInput, attemptId: rawInput.attemptId ?? crypto.randomUUID() };
   try {
@@ -1887,6 +1920,15 @@ async function synchronizeWorkspace(rawInput) {
     let hydrationPreimages = input.skipVisibleMirror ? hydrationPreimagesFromShadowRevision(input, shadowWasCreated ? null : revParse(input, "HEAD")) : /* @__PURE__ */ new Map();
     const remoteHeadAtStart = revParse(input, `origin/${WORKSPACE_BRANCH}`);
     const result = baseResult(input, remoteHeadAtStart);
+    if (input.expectedCanonicalHead !== void 0 && remoteHeadAtStart !== input.expectedCanonicalHead) {
+      return {
+        ...result,
+        outcome: "failed",
+        expectedHead: input.expectedCanonicalHead,
+        publishedHead: remoteHeadAtStart ?? void 0,
+        error: `canonical_head_advanced: expected ${input.expectedCanonicalHead ?? "unborn"}, fetched ${remoteHeadAtStart ?? "unborn"}`
+      };
+    }
     const inboundConflictsAtStart = input.skipVisibleMirror && !isCanonicalRemediationSync && remoteHeadAtStart ? visibleHydrationConflictPaths(input, hydrationPreimages, `origin/${WORKSPACE_BRANCH}`) : [];
     if (input.resetToCanonical) {
       if (input.trigger.canonicalCheckoutOnly) {
@@ -1935,18 +1977,14 @@ async function synchronizeWorkspace(rawInput) {
     const destructiveReductions = destructiveCheckoutReductions(input, baseRevision);
     if (destructiveReductions.length > 0 && !input.confirmedLargeDiff) {
       const summary = destructiveReductions.map(({ root, trackedBefore, trackedAfter }) => `${root} (${trackedBefore} -> ${trackedAfter} tracked files)`).join(", ");
-      return {
-        ...observed,
-        outcome: "large_diff_blocked",
-        error: `Workspace safety guard blocked a destructive checkout reduction: ${summary}`
-      };
+      return preserveLargeDiffCandidate(input, observed, `Workspace safety guard blocked a destructive checkout reduction: ${summary}`);
     }
     if (paths.length > 0 && diffSizeBytes > MAX_WORKSPACE_SYNC_DIFF_BYTES && !input.confirmedLargeDiff && !input.trigger.canonicalCheckoutOnly) {
-      return {
-        ...observed,
-        outcome: "large_diff_blocked",
-        error: `Workspace safety guard blocked a ${diffSizeBytes}-byte diff above the ${MAX_WORKSPACE_SYNC_DIFF_BYTES}-byte automatic publication limit.`
-      };
+      return preserveLargeDiffCandidate(
+        input,
+        observed,
+        `Workspace safety guard blocked a ${diffSizeBytes}-byte diff above the ${MAX_WORKSPACE_SYNC_DIFF_BYTES}-byte automatic publication limit.`
+      );
     }
     if (stagedWorkingPaths.length > 0) {
       runGit(input, input.shadowRoot, ["commit", "-m", commitMessage(input)], "commit workspace changes");
@@ -2111,6 +2149,79 @@ async function synchronizeWorkspace(rawInput) {
     };
   }
 }
+async function convergeWorkspaceHead(rawInput, options) {
+  const input = {
+    ...rawInput,
+    projects: workspaceProjectsForSync(rawInput.projects, rawInput.trigger)
+  };
+  if (input.trigger.canonicalCheckoutOnly) {
+    throw new Error("Ordinary inbound convergence cannot target a canonical resolver checkout");
+  }
+  ensureShadowWorkspace(input);
+  const fetchedLocalHead = revParse(input, "HEAD");
+  const fetchedCanonicalHead = revParse(input, `origin/${WORKSPACE_BRANCH}`);
+  if (!options.hydrateVisible) {
+    return {
+      localHead: fetchedLocalHead,
+      canonicalHead: fetchedCanonicalHead,
+      localChanges: false,
+      hydrated: false,
+      hydrationConflicts: []
+    };
+  }
+  resetUncommittedShadowSnapshot(input);
+  restoreUnscopedCanonicalCheckoutSubtrees(input);
+  const localHead = fetchedLocalHead;
+  const canonicalHead = fetchedCanonicalHead;
+  const projection = mirrorVisibleWorkspaceToShadow(input);
+  runGit(
+    input,
+    input.shadowRoot,
+    ["add", "-A", "--", ".", ...projection.opaqueRoots.map((root) => `:(exclude,literal)${root}`)],
+    "stage inbound workspace observation"
+  );
+  forceStageCanonicalCheckoutFiles(input, projection.entries, projection.opaqueRoots);
+  const stagedTree = runGit(input, input.shadowRoot, ["write-tree"], "write inbound workspace observation tree");
+  const headTree = localHead ? revParse(input, `${localHead}^{tree}`) : null;
+  const localChanges = stagedTree !== headTree;
+  if (!options.hydrateVisible || localChanges || !canonicalHead || localHead === canonicalHead) {
+    resetUncommittedShadowSnapshot(input);
+    return { localHead, canonicalHead, localChanges, hydrated: false, hydrationConflicts: [] };
+  }
+  const preimages = projection.visiblePreimages ?? hydrationPreimagesFromShadowRevision(input, localHead);
+  const hydrationConflicts = localHead ? hydrationConflictPaths(input, preimages, localHead, canonicalHead) : [];
+  if (hydrationConflicts.length > 0) {
+    resetUncommittedShadowSnapshot(input);
+    return { localHead, canonicalHead, localChanges: true, hydrated: false, hydrationConflicts };
+  }
+  runGit(input, input.shadowRoot, ["reset", "--hard", canonicalHead], "fast-forward workspace to available canonical head");
+  runGit(input, input.shadowRoot, ["clean", "-fd"], "clean fast-forwarded workspace");
+  mirrorShadowWorkspaceToVisible(input, projection.opaqueRoots, preimages);
+  return { localHead: canonicalHead, canonicalHead, localChanges: false, hydrated: true, hydrationConflicts: [] };
+}
+function calculateWorkspaceLocalDiffFingerprint(rawInput) {
+  const input = {
+    ...rawInput,
+    projects: workspaceProjectsForSync(rawInput.projects, rawInput.trigger)
+  };
+  if (!import_node_fs.default.existsSync(import_node_path.default.join(input.shadowRoot, ".git"))) {
+    throw new Error("Cannot inspect local workspace changes before first bootstrap");
+  }
+  resetUncommittedShadowSnapshot(input);
+  restoreUnscopedCanonicalCheckoutSubtrees(input);
+  const projection = mirrorVisibleWorkspaceToShadow(input);
+  runGit(
+    input,
+    input.shadowRoot,
+    ["add", "-A", "--", ".", ...projection.opaqueRoots.map((root) => `:(exclude,literal)${root}`)],
+    "stage local workspace fingerprint"
+  );
+  forceStageCanonicalCheckoutFiles(input, projection.entries, projection.opaqueRoots);
+  const stagedTree = runGit(input, input.shadowRoot, ["write-tree"], "write local workspace fingerprint tree");
+  const headTree = revParse(input, "HEAD^{tree}");
+  resetUncommittedShadowSnapshot(input);
+  return stagedTree === headTree ? (0, import_node_crypto.createHash)("sha256").update("").digest("hex") : (0, import_node_crypto.createHash)("sha256").update(stagedTree).digest("hex");
+}
 function calculateWorkspaceDiffFingerprint(rawInput) {
   const input = {
     ...rawInput,
@@ -2183,11 +2294,13 @@ class WorkspaceSyncSingleFlight {
   WORKSPACE_BRANCH,
   WORKSPACE_INTENT_REF_PREFIX,
   WORKSPACE_NATIVE_PLANS_RELATIVE_PATH,
-  WORKSPACE_PERIODIC_SCAN_INTERVAL_MS,
+  WORKSPACE_PUBLICATION_REF_PREFIX,
   WorkspaceSyncSingleFlight,
   assertCanonicalCheckoutIndexMatchesWorktree,
   assertWorkspaceQuarantineRef,
   calculateWorkspaceDiffFingerprint,
+  calculateWorkspaceLocalDiffFingerprint,
+  convergeWorkspaceHead,
   encodeWorkspaceBranch,
   mirrorShadowWorkspaceToVisible,
   mirrorVisibleWorkspaceToShadow,