@narumitw/pi-sync 0.51.1 → 0.52.1

package/src/snapshot/snapshot-transaction.ts

@@ -1,79 +1,292 @@
-import { randomUUID } from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
+import type { Stats } from "node:fs";
 import fs from "node:fs/promises";
 import path from "node:path";
-import { assertWithinRoot, isPathInside } from "../paths.js";
+import { withFileMutationQueue } from "@earendil-works/pi-coding-agent";
+import { assertWithinRoot, isDeniedPath, isPathInside } from "../paths.js";
+import { syncDirectory, writeJson } from "../state/json-file.js";
 import { withLock } from "../state/lock.js";
+import { syncMutationParents } from "../state/mutation-directory-sync.js";
 import { stateDir } from "../state/state-directory.js";
-import { agentDir } from "./session-paths.js";
+import { mergePathIdentity } from "../sync/file-merge-planner.js";
+import { agentDir, configuredSessionDir } from "./session-paths.js";
+import { caseReplacementSpelling, coalesceCaseReplacements, isCaseReplacement } from "./snapshot-case-replacement.js";
 import { sessionStorageRoot } from "./snapshot-paths.js";
+import {
+  prepareSessionRootTransition,
+  resolveTransitionSessionRoot,
+  type SessionRootTransition,
+  validateSessionRootTransition,
+} from "./snapshot-root-transition.js";
+import { fileImage, indexTransactionPlan } from "./snapshot-transaction-plan.js";
 import type { SnapshotApplyPlan } from "./snapshot-types.js";
 
-const JOURNAL_VERSION = 1;
-
+const JOURNAL_VERSION = 4;
 interface TransactionEntry {
   target: string;
+  /** Version 5: one physical file, original target spelling and intended installed spelling. */
+  afterTarget?: string;
   backupName: string;
   kind: "missing" | "file" | "directory" | "symlink";
   linkTarget?: string;
+  beforeImage?: string;
+  afterImage?: string;
+  postFiles?: { relative: string; image: string }[];
+  /** Durable intent permits only a missing intermediate image, never unknown bytes. */
+  removalPending?: boolean;
+  /** Published before materialization: absence/partial trees can no longer prove an unstarted replacement. */
+  replacementStarted?: boolean;
+  /** Published before copying to a transaction-derived sibling staging path. */
+  recoveryStaged?: boolean;
 }
-
 interface TransactionJournal {
   version: number;
+  /** Version 6: durable files are accepted; surviving evidence permits cleanup only. */
+  completed?: boolean;
   root: string;
   sessionRoot?: string;
+  /** Version 7: reviewed settings images authorize recovery from either transition root. */
+  sessionRootTransition?: SessionRootTransition;
   entries: TransactionEntry[];
 }
+interface TransactionOptions {
+  sessionDir?: string;
+  signal?: AbortSignal;
+  validateMutation?: () => void;
+  protectedTargets?: readonly string[];
+  /** Fresh apply authorization only; recovery remains bound to durable journal images. */
+  expectedPreimages?: ReadonlyMap<string, string>;
+  resolveConfiguredSessionDir?: boolean;
+}
 
-export async function applySnapshotTransaction(plan: SnapshotApplyPlan, options: { sessionDir?: string } = {}) {
-  await recoverPendingSnapshotTransactions();
-  const transaction = await prepareTransaction(plan, options.sessionDir);
-  try {
-    for (const target of plan.deletes) {
-      await fs.rm(target, { force: true, recursive: true });
+export async function applySnapshotTransaction(plan: SnapshotApplyPlan, options: TransactionOptions = {}) {
+  options.validateMutation?.();
+  await recoverPendingSnapshotTransactions(options);
+  const coalesced = await coalesceCaseReplacements(path.resolve(agentDir()), plan);
+  options.validateMutation?.();
+  options.signal?.throwIfAborted();
+  const targets = [...new Set([...coalesced.plan.deletes, ...coalesced.plan.writes.map((item) => item.target)])].sort();
+  if (targets.length > 16_384)
+    throw new Error("Snapshot transaction exceeds its target bound; review a smaller transfer.");
+  return withTargetQueues(targets, async () => {
+    options.signal?.throwIfAborted();
+    if (
+      targets.some((target) =>
+        options.protectedTargets?.some(
+          (protectedTarget) =>
+            mergePathIdentity(target) === mergePathIdentity(protectedTarget) ||
+            isPathInside(mergePathIdentity(target), mergePathIdentity(protectedTarget)),
+        ),
+      )
+    )
+      throw new Error("Snapshot transaction targets the current session; review is required.");
+    for (const [before, after] of coalesced.replacements) {
+      if ((await caseReplacementSpelling(before, after)) !== before)
+        throw new Error("Case replacement changed before preparation; review is required.");
+      options.validateMutation?.();
+      options.signal?.throwIfAborted();
+    }
+    const originalTargets = new Map([...coalesced.replacements].map(([before, after]) => [after, before]));
+    const expectedPreimages = new Map(
+      [...(options.expectedPreimages ?? [])].map(([target, expected]) => [
+        originalTargets.get(target) ?? target,
+        expected,
+      ]),
+    );
+    // A case-sensitive spelling replacement has two targets, unlike a coalesced physical alias.
+    // Bind both the source bytes and destination absence/bytes before capturing their backups.
+    for (const [target, expected] of options.expectedPreimages ?? []) {
+      if (originalTargets.has(target)) continue;
+      const variants = coalesced.plan.deletes.filter(
+        (candidate) =>
+          candidate !== target &&
+          path.dirname(candidate) === path.dirname(target) &&
+          mergePathIdentity(candidate) === mergePathIdentity(target),
+      );
+      if (variants.length > 1) throw new Error("Ambiguous reviewed file preimage spellings; review required.");
+      const original = variants[0];
+      if (!original) continue;
+      const destination = await image(target);
+      options.validateMutation?.();
+      options.signal?.throwIfAborted();
+      if (destination !== "missing" && destination !== expected)
+        throw new Error("Reviewed destination preimage changed before apply.");
+      expectedPreimages.set(original, expected);
+      expectedPreimages.set(target, destination);
     }
-    for (const item of plan.writes) {
-      await fs.mkdir(path.dirname(item.target), { recursive: true });
-      await fs.writeFile(item.target, item.content);
+    for (const [target, expected] of expectedPreimages) {
+      const current = await image(target);
+      options.validateMutation?.();
+      options.signal?.throwIfAborted();
+      if (current !== expected)
+        throw new Error("Reviewed file preimage changed before apply; snapshot installation refused.");
     }
-    await fs.rm(transaction.directory, { recursive: true, force: true });
-  } catch (error) {
+    const transaction = await prepareTransaction(
+      coalesced.plan,
+      targets,
+      { ...options, expectedPreimages },
+      coalesced.replacements,
+    );
+    const entriesByTarget = new Map(
+      transaction.journal.entries.flatMap((entry) => [
+        [entry.target, entry] as const,
+        ...(entry.afterTarget ? [[entry.afterTarget, entry] as const] : []),
+      ]),
+    );
     try {
-      await restoreTransaction(transaction.directory, transaction.journal);
-    } catch (recoveryError) {
-      throw new AggregateError(
-        [error, recoveryError],
-        `Snapshot apply failed and automatic recovery also failed. Transaction retained at ${transaction.directory}.`,
-      );
+      for (const target of transaction.deletes.sort((a, b) => a.length - b.length)) {
+        options.signal?.throwIfAborted();
+        const entry = entriesByTarget.get(target);
+        if (!entry) throw new Error("Unowned transaction target.");
+        await removeOwnedTarget(transaction.directory, entry, transaction.journal, options);
+        await syncDirectory(path.dirname(target));
+      }
+      await withCaseDestinationQueues([...coalesced.replacements], options, async () => {
+        await retireRemovalIntent(
+          transaction.directory,
+          transaction.journal,
+          transaction.journal.entries.filter(
+            (entry) => entry.removalPending && (entry.afterImage !== "missing" || (entry.postFiles?.length ?? 0) > 0),
+          ),
+          options,
+        );
+        // Only this uninterrupted call knows which deleted writes have not attempted installation yet.
+        const uninstalledWrites = new Set(transaction.deletedWrites);
+        for (const item of plan.writes) {
+          options.signal?.throwIfAborted();
+          const entry = entriesByTarget.get(item.target);
+          if (!entry) throw new Error("Unowned transaction target.");
+          const deletedByThisCall = uninstalledWrites.delete(entry.target);
+          await verifyTarget(transaction.directory, entry, transaction.journal, deletedByThisCall);
+          options.validateMutation?.();
+          options.signal?.throwIfAborted();
+          await fs.mkdir(path.dirname(item.target), { recursive: true });
+          options.validateMutation?.();
+          options.signal?.throwIfAborted();
+          const temp = path.join(path.dirname(item.target), `.pi-sync.json.${randomUUID()}.apply`);
+          try {
+            let mode = 0o600;
+            try {
+              const stat = await fs.lstat(item.target);
+              if (stat.isFile()) mode = stat.mode & 0o777;
+            } catch (error) {
+              if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error;
+            }
+            const handle = await fs.open(temp, "wx", mode);
+            try {
+              await handle.writeFile(item.content);
+              await handle.sync();
+            } finally {
+              await handle.close();
+            }
+            await verifyTarget(transaction.directory, entry, transaction.journal, deletedByThisCall);
+            options.signal?.throwIfAborted();
+            options.validateMutation?.();
+            await fs.rename(temp, item.target);
+            await syncDirectory(path.dirname(item.target));
+          } finally {
+            await fs.rm(temp, { force: true });
+          }
+        }
+        options.validateMutation?.();
+        options.signal?.throwIfAborted();
+        await syncMutationParents(
+          targets,
+          [transaction.journal.root, ...(transaction.journal.sessionRoot ? [transaction.journal.sessionRoot] : [])],
+          options,
+        );
+        options.validateMutation?.();
+        options.signal?.throwIfAborted();
+      });
+    } catch (error) {
+      // Aborted owners cannot roll back files after another session has replaced them.
+      if (options.signal?.aborted)
+        throw new Error("Snapshot apply cancelled; guarded transaction evidence retained for review.");
+      // Additional spelling queues have been released: do not start a case rollback
+      // under only the original key. Startup recovery reserves its own destination key.
+      if (coalesced.replacements.size)
+        throw new Error("Case replacement apply failed; guarded transaction evidence retained for review.", {
+          cause: error,
+        });
+      try {
+        await restoreTransaction(transaction.directory, transaction.journal, options);
+      } catch (recoveryError) {
+        throw new AggregateError(
+          [error, recoveryError],
+          "Snapshot apply failed and guarded recovery requires review. Transaction and backup retained; newer bytes were not restored over.",
+        );
+      }
+      throw error;
     }
-    throw error;
-  }
+    // Files are durably installed. Cleanup cannot roll back once it starts deleting evidence.
+    await completeTransaction(transaction.directory, transaction.journal);
+  });
 }
 
-export async function recoverSnapshotTransactionsOnStartup() {
+export async function recoverSnapshotTransactionsOnStartup(options: TransactionOptions = {}) {
   if (!(await pendingTransactionEntries()).some((entry) => entry.isDirectory())) return;
-  await withLock("recovery", recoverPendingSnapshotTransactions, { reclaimStale: true });
+  // A pending settings.json may itself be the interrupted postimage. Read each journal
+  // before consulting that file, and only consult it when a session target needs it.
+  options.validateMutation?.();
+  options.signal?.throwIfAborted();
+  await withLock(
+    "recovery",
+    () => recoverPendingSnapshotTransactions({ ...options, resolveConfiguredSessionDir: true }),
+    {
+      reclaimStale: true,
+    },
+  );
 }
 
-export async function recoverPendingSnapshotTransactions() {
-  const directory = transactionRoot();
-  const entries = await pendingTransactionEntries();
-  for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) {
+export async function recoverPendingSnapshotTransactions(options: TransactionOptions = {}) {
+  for (const entry of (await pendingTransactionEntries()).sort((a, b) => a.name.localeCompare(b.name))) {
     if (!entry.isDirectory()) continue;
-    const transactionDirectory = path.join(directory, entry.name);
-    const journalPath = path.join(transactionDirectory, "journal.json");
+    const directory = path.join(transactionRoot(), entry.name);
     let journal: TransactionJournal;
     try {
-      journal = JSON.parse(await fs.readFile(journalPath, "utf8")) as TransactionJournal;
+      const file = path.join(directory, "journal.json");
+      const stat = await fs.lstat(file);
+      if (!stat.isFile() || stat.size > 32 * 1024 * 1024) throw new Error("Invalid journal file.");
+      journal = JSON.parse(await fs.readFile(file, "utf8")) as TransactionJournal;
     } catch (error) {
-      if ((error as NodeJS.ErrnoException).code === "ENOENT") {
-        await fs.rm(transactionDirectory, { recursive: true, force: true });
-        continue;
-      }
-      throw new Error(`Cannot recover malformed pi-sync transaction: ${journalPath}`, {
-        cause: error,
-      });
+      // Unknown evidence is not disposable, including interrupted preparation directories.
+      if ((error as NodeJS.ErrnoException).code === "ENOENT") continue;
+      throw new Error("Cannot recover malformed pi-sync transaction; preserve private evidence for review.");
     }
-    await restoreTransaction(transactionDirectory, journal);
+    let sessionDir = options.sessionDir;
+    if (
+      sessionDir === undefined &&
+      options.resolveConfiguredSessionDir &&
+      !journal.completed &&
+      transactionHasSessionTargets(journal)
+    ) {
+      sessionDir = await configuredSessionDir();
+    }
+    options.validateMutation?.();
+    options.signal?.throwIfAborted();
+    if (journal.sessionRootTransition && !journal.completed) {
+      // Validate every path before consulting backup evidence under the recorded root.
+      validateJournal(directory, journal, journal.sessionRoot);
+      sessionDir = await resolveTransitionSessionRoot(
+        directory,
+        journal.root,
+        journal.sessionRoot as string,
+        journal.sessionRootTransition,
+        journal.entries,
+        path.resolve(sessionStorageRoot(journal.root, sessionDir)),
+        options,
+      );
+      options.validateMutation?.();
+      options.signal?.throwIfAborted();
+    }
+    validateJournal(directory, journal, sessionDir);
+    if (journal.completed) {
+      await removeTransaction(directory);
+      continue;
+    }
+    await withTargetQueues(journal.entries.map((entry) => entry.target).sort(), () =>
+      restoreTransaction(directory, journal, { ...options, sessionDir }),
+    );
   }
 }
 
@@ -86,119 +299,648 @@ async function pendingTransactionEntries() {
   }
 }
 
-async function prepareTransaction(plan: SnapshotApplyPlan, sessionDir?: string) {
+async function prepareTransaction(
+  plan: SnapshotApplyPlan,
+  targets: string[],
+  options: TransactionOptions,
+  replacements = new Map<string, string>(),
+) {
+  const { sessionDir } = options;
   const root = path.resolve(agentDir());
   const sessionRoot = sessionDir ? path.resolve(sessionStorageRoot(root, sessionDir)) : undefined;
+  const indexed = indexTransactionPlan(plan, targets);
   const directory = path.join(transactionRoot(), randomUUID());
   const backupDirectory = path.join(directory, "before");
   await fs.mkdir(backupDirectory, { recursive: true, mode: 0o700 });
-  const targets = [...new Set([...plan.deletes, ...plan.writes.map((item) => item.target)])].sort();
   const entries: TransactionEntry[] = [];
-  for (let index = 0; index < targets.length; index += 1) {
-    const target = targets[index];
-    if (!target) continue;
+  for (const [index, target] of targets.entries()) {
+    options.signal?.throwIfAborted();
+    options.validateMutation?.();
     assertAllowedTarget(root, sessionRoot, target);
-    const backupName = `${index}`;
-    const backupPath = path.join(backupDirectory, backupName);
+    await assertSafeParents(root, sessionRoot, target);
+    const entry: TransactionEntry = { target, backupName: `${index}`, kind: "missing" };
+    if (replacements.has(target)) entry.afterTarget = replacements.get(target);
+    const backup = path.join(backupDirectory, entry.backupName);
     try {
       const stat = await fs.lstat(target);
       if (stat.isSymbolicLink()) {
-        entries.push({
-          target,
-          backupName,
-          kind: "symlink",
-          linkTarget: await fs.readlink(target),
-        });
+        entry.kind = "symlink";
+        entry.linkTarget = await fs.readlink(target);
       } else if (stat.isDirectory()) {
-        await fs.cp(target, backupPath, {
+        entry.kind = "directory";
+        await fs.cp(target, backup, {
           recursive: true,
           dereference: false,
+          verbatimSymlinks: true,
           preserveTimestamps: true,
+          filter: () => {
+            options.signal?.throwIfAborted();
+            options.validateMutation?.();
+            return true;
+          },
         });
-        entries.push({ target, backupName, kind: "directory" });
       } else if (stat.isFile()) {
-        await fs.copyFile(target, backupPath);
-        await fs.chmod(backupPath, stat.mode);
-        entries.push({ target, backupName, kind: "file" });
-      } else {
-        throw new Error(`Unsupported existing snapshot target: ${target}`);
-      }
+        entry.kind = "file";
+        await fs.copyFile(target, backup);
+        await fs.chmod(backup, stat.mode);
+      } else throw new Error("Unsupported existing snapshot target.");
     } catch (error) {
       const code = (error as NodeJS.ErrnoException).code;
       if (code !== "ENOENT" && code !== "ENOTDIR") throw error;
-      entries.push({ target, backupName, kind: "missing" });
     }
+    entry.beforeImage =
+      entry.kind === "symlink"
+        ? `symlink:${entry.linkTarget}`
+        : entry.kind === "missing"
+          ? "missing"
+          : await image(backup, true);
+    options.validateMutation?.();
+    options.signal?.throwIfAborted();
+    const expected = options.expectedPreimages?.get(target);
+    if (expected !== undefined && entry.beforeImage !== expected)
+      throw new Error("Reviewed file preimage changed during backup; private preparation evidence retained.");
+    if (entry.afterTarget) {
+      if (entry.kind !== "file" || (await caseReplacementSpelling(target, entry.afterTarget)) !== target)
+        throw new Error("Case replacement preimage changed during backup; evidence retained for review.");
+      options.validateMutation?.();
+      options.signal?.throwIfAborted();
+    }
+    entry.afterImage = indexed.writeImages.get(target) ?? "missing";
+    entry.postFiles = indexed.postFiles.get(target) ?? [];
+    entries.push(entry);
   }
+  // File fsync does not persist the name linking each backup into this directory.
+  await syncDirectory(backupDirectory);
+  const effectiveRoot = sessionRoot ?? path.join(root, "sessions");
+  const sessionRootTransition = await prepareSessionRootTransition(
+    directory,
+    root,
+    effectiveRoot,
+    entries,
+    plan,
+    options,
+  );
   const journal: TransactionJournal = {
-    version: JOURNAL_VERSION,
+    version: sessionRootTransition ? 7 : replacements.size ? 5 : JOURNAL_VERSION,
     root,
-    sessionRoot,
+    sessionRoot: sessionRootTransition ? effectiveRoot : sessionRoot,
+    sessionRootTransition,
     entries,
   };
-  await fs.writeFile(path.join(directory, "journal.json"), `${JSON.stringify(journal, null, "\t")}\n`, {
-    mode: 0o600,
-  });
-  return { directory, journal };
+  options.signal?.throwIfAborted();
+  options.validateMutation?.();
+  await writeJson(path.join(directory, "journal.json"), journal, { maxBytes: 32 * 1024 * 1024 });
+  await syncDirectory(transactionRoot());
+  await syncDirectory(stateDir());
+  await syncDirectory(path.dirname(stateDir()));
+  return { directory, journal, deletes: indexed.deletes, deletedWrites: indexed.deletedWrites };
 }
 
-async function restoreTransaction(directory: string, journal: TransactionJournal) {
-  validateJournal(directory, journal);
-  for (const entry of [...journal.entries].sort((left, right) => right.target.length - left.target.length)) {
-    await fs.rm(entry.target, { recursive: true, force: true });
+async function restoreTransaction(directory: string, journal: TransactionJournal, options: TransactionOptions) {
+  validateJournal(directory, journal, options.sessionDir);
+  options.validateMutation?.();
+  options.signal?.throwIfAborted();
+  for (const entry of journal.entries) {
+    if (
+      options.protectedTargets?.some(
+        (target) =>
+          mergePathIdentity(target) === mergePathIdentity(entry.target) ||
+          isPathInside(mergePathIdentity(entry.target), mergePathIdentity(target)),
+      )
+    )
+      throw new Error(
+        "Pending transaction touches the current session; resume a different session before guarded recovery.",
+      );
+    await verifyTarget(directory, entry, journal);
   }
+  // Recover copies left by a process crash even when the target is already restored.
   for (const entry of journal.entries) {
-    if (entry.kind === "missing") continue;
-    await fs.mkdir(path.dirname(entry.target), { recursive: true });
-    const backupPath = path.join(directory, "before", entry.backupName);
-    assertWithinRoot(directory, backupPath);
-    if (entry.kind === "file") await fs.copyFile(backupPath, entry.target);
-    else if (entry.kind === "directory") {
-      await fs.cp(backupPath, entry.target, {
-        recursive: true,
-        dereference: false,
-        preserveTimestamps: true,
-      });
-    } else if (entry.kind === "symlink" && entry.linkTarget !== undefined) {
-      await fs.symlink(entry.linkTarget, entry.target);
+    if (!entry.recoveryStaged) continue;
+    options.validateMutation?.();
+    options.signal?.throwIfAborted();
+    await assertSafeParents(journal.root, journal.sessionRoot, entry.target);
+    options.validateMutation?.();
+    options.signal?.throwIfAborted();
+    await fs.rm(recoveryStagePath(directory, entry), { recursive: true, force: true });
+    options.validateMutation?.();
+    options.signal?.throwIfAborted();
+  }
+  // Verify the complete group before removing any path. Recheck each destructive boundary.
+  for (const entry of [...journal.entries].sort((a, b) => a.target.length - b.target.length)) {
+    const current = await verifyTarget(directory, entry, journal);
+    const before = await beforeImage(directory, entry);
+    const spellingMatches = async () =>
+      !entry.afterTarget || (await caseReplacementSpelling(entry.target, entry.afterTarget)) === entry.target;
+    if (current === before && (await spellingMatches())) continue;
+    options.signal?.throwIfAborted();
+    options.validateMutation?.();
+    if (entry.kind === "file") {
+      const temporary = await prepareRecoveryStage(directory, journal, entry, options);
+      try {
+        await fs.mkdir(path.dirname(entry.target), { recursive: true });
+        await fs.copyFile(path.join(directory, "before", entry.backupName), temporary);
+        const handle = await fs.open(temporary, "r");
+        try {
+          await handle.sync();
+        } finally {
+          await handle.close();
+        }
+        const verified = await verifyTarget(directory, entry, journal);
+        options.validateMutation?.();
+        options.signal?.throwIfAborted();
+        if (verified === before && (await spellingMatches())) continue;
+        const needsCaseQueue =
+          entry.afterTarget !== undefined &&
+          (await caseReplacementSpelling(entry.target, entry.afterTarget)) === entry.afterTarget;
+        if (needsCaseQueue) {
+          // Keep the installed-spelling queue while reserving the now-missing original spelling.
+          await removeOwnedTarget(directory, entry, journal, options);
+        } else if (
+          verified.startsWith("directory:") &&
+          !(await removeOwnedTarget(directory, entry, journal, options, before))
+        )
+          continue;
+        await withCaseDestinationQueues(
+          needsCaseQueue && entry.afterTarget ? [[entry.afterTarget, entry.target]] : [],
+          options,
+          async () => {
+            const atRename = await verifyTarget(directory, entry, journal);
+            options.validateMutation?.();
+            options.signal?.throwIfAborted();
+            if (atRename === before && (await spellingMatches())) return;
+            await retireRestorationIntent(directory, journal, entry, options);
+            const atInstall = await verifyTarget(directory, entry, journal, atRename === "missing");
+            options.validateMutation?.();
+            options.signal?.throwIfAborted();
+            if (atInstall === before && (await spellingMatches())) return;
+            await fs.rename(temporary, entry.target);
+            await syncDirectory(path.dirname(entry.target));
+          },
+        );
+      } finally {
+        await fs.rm(temporary, { force: true });
+      }
+      continue;
+    }
+    if (entry.kind === "missing") {
+      await removeOwnedTarget(directory, entry, journal, options, before);
+      continue;
+    }
+    const temporary = await prepareRecoveryStage(directory, journal, entry, options);
+    try {
+      await fs.mkdir(path.dirname(entry.target), { recursive: true });
+      await assertSafeParents(journal.root, journal.sessionRoot, entry.target);
+      if (entry.kind === "directory") {
+        await fs.cp(path.join(directory, "before", entry.backupName), temporary, {
+          recursive: true,
+          dereference: false,
+          verbatimSymlinks: true,
+          preserveTimestamps: true,
+          filter: () => {
+            options.validateMutation?.();
+            options.signal?.throwIfAborted();
+            return true;
+          },
+        });
+      } else if (entry.linkTarget !== undefined) await fs.symlink(entry.linkTarget, temporary);
+      if ((await image(temporary, true)) !== before)
+        throw new Error("Staged recovery image differs from the backup; evidence retained.");
+      options.validateMutation?.();
+      options.signal?.throwIfAborted();
+      if (!(await removeOwnedTarget(directory, entry, journal, options, before))) continue;
+      const atRename = await verifyTarget(directory, entry, journal);
+      options.validateMutation?.();
+      options.signal?.throwIfAborted();
+      if (atRename === before) continue;
+      await retireRestorationIntent(directory, journal, entry, options);
+      const atInstall = await verifyTarget(directory, entry, journal, atRename === "missing");
+      options.validateMutation?.();
+      options.signal?.throwIfAborted();
+      if (atInstall === before) continue;
+      await fs.rename(temporary, entry.target);
+      await syncDirectory(path.dirname(entry.target));
+    } finally {
+      await fs.rm(temporary, { recursive: true, force: true });
     }
   }
-  await fs.rm(directory, { recursive: true, force: true });
+  await syncMutationParents(
+    journal.entries.map((entry) => entry.target),
+    [journal.root, ...(journal.sessionRoot ? [journal.sessionRoot] : [])],
+    options,
+  );
+  options.validateMutation?.();
+  options.signal?.throwIfAborted();
+  await completeTransaction(directory, journal);
+}
+
+async function verifyTarget(
+  directory: string,
+  entry: TransactionEntry,
+  journal: TransactionJournal,
+  deletedByThisCall = false,
+) {
+  await assertSafeParents(journal.root, journal.sessionRoot, entry.target);
+  // Hash the potentially large backup before observing the live target, not after it.
+  const before = await beforeImage(directory, entry);
+  if (journal.version >= 2 && before !== entry.beforeImage)
+    throw new Error("Transaction backup changed; preserve evidence for review.");
+  if (entry.afterTarget) await caseReplacementSpelling(entry.target, entry.afterTarget);
+  const current = await image(entry.target);
+  if (current === before) return current;
+  if (current === "missing") {
+    if (deletedByThisCall || (journal.version >= 4 && entry.removalPending && !entry.replacementStarted))
+      return current;
+  } else if (
+    journal.version >= 2 &&
+    (current === entry.afterImage ||
+      (await ownedPostTree(
+        entry.target,
+        entry.postFiles ?? [],
+        journal.version < 4 || entry.replacementStarted === true || !entry.removalPending,
+      )))
+  )
+    return current;
+  throw new Error(
+    "Transaction target has unrecognized or newer bytes; automatic rollback refused. Preserve the transaction and review its backup with Pi closed.",
+  );
+}
+
+async function removeOwnedTarget(
+  directory: string,
+  entry: TransactionEntry,
+  journal: TransactionJournal,
+  options: TransactionOptions,
+  restoringBefore?: string,
+) {
+  const current = await verifyTarget(directory, entry, journal);
+  options.validateMutation?.();
+  options.signal?.throwIfAborted();
+  if (restoringBefore !== undefined && current === restoringBefore) return false;
+  // Persist intent before removal, including descendants affected by a recursive delete.
+  // Until replacement is armed, interrupted removal can recognize absence without accepting unknown bytes.
+  upgradeRemovalEvidence(journal);
+  for (const affected of journal.entries) {
+    if (affected.target === entry.target || isStrictlyInside(entry.target, affected.target)) {
+      affected.removalPending = true;
+      affected.replacementStarted = false;
+    }
+  }
+  await writeJson(path.join(directory, "journal.json"), journal, { maxBytes: 32 * 1024 * 1024 });
+  const verified = await verifyTarget(directory, entry, journal);
+  options.validateMutation?.();
+  options.signal?.throwIfAborted();
+  if (restoringBefore !== undefined && verified === restoringBefore) return false;
+  await fs.rm(entry.target, { recursive: true, force: true });
+  await syncDirectory(path.dirname(entry.target));
+  return true;
+}
+
+function upgradeRemovalEvidence(journal: TransactionJournal) {
+  if (journal.version < JOURNAL_VERSION) {
+    // Old pending markers may already have survived a committed replacement.
+    for (const entry of journal.entries) entry.removalPending = false;
+    journal.version = JOURNAL_VERSION;
+  }
+}
+
+async function retireRemovalIntent(
+  directory: string,
+  journal: TransactionJournal,
+  entries: TransactionEntry[],
+  options: TransactionOptions,
+) {
+  options.validateMutation?.();
+  options.signal?.throwIfAborted();
+  if (!entries.length) return;
+  upgradeRemovalEvidence(journal);
+  for (const entry of entries) {
+    entry.removalPending = false;
+    entry.replacementStarted = true;
+  }
+  await writeJson(path.join(directory, "journal.json"), journal, { maxBytes: 32 * 1024 * 1024 });
+  options.validateMutation?.();
+  options.signal?.throwIfAborted();
 }
 
-function validateJournal(directory: string, journal: TransactionJournal) {
-  if (journal.version !== JOURNAL_VERSION || !Array.isArray(journal.entries)) {
-    throw new Error(`Unsupported pi-sync transaction journal: ${directory}`);
+async function retireRestorationIntent(
+  directory: string,
+  journal: TransactionJournal,
+  entry: TransactionEntry,
+  options: TransactionOptions,
+) {
+  // Installing a complete parent preimage supersedes descendant replacement progress too.
+  for (const child of journal.entries) {
+    if (isStrictlyInside(entry.target, child.target)) {
+      child.removalPending = false;
+      child.replacementStarted = false;
+    }
+  }
+  await retireRemovalIntent(directory, journal, [entry], options);
+}
+
+function recoveryStagePath(directory: string, entry: TransactionEntry) {
+  const token = createHash("sha256").update(directory).update("\\0").update(entry.backupName).digest("hex");
+  return path.join(
+    path.dirname(entry.target),
+    `.pi-sync.json.${token}.${entry.kind === "file" ? "restore" : "restore-tree"}`,
+  );
+}
+
+async function prepareRecoveryStage(
+  directory: string,
+  journal: TransactionJournal,
+  entry: TransactionEntry,
+  options: TransactionOptions,
+) {
+  const temporary = recoveryStagePath(directory, entry);
+  if (!entry.recoveryStaged) {
+    try {
+      await fs.lstat(temporary);
+      throw new Error("Unowned recovery staging path; preserve evidence for review.");
+    } catch (error) {
+      if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error;
+    }
+    options.validateMutation?.();
+    options.signal?.throwIfAborted();
+    entry.recoveryStaged = true;
+    await writeJson(path.join(directory, "journal.json"), journal, { maxBytes: 32 * 1024 * 1024 });
+    options.validateMutation?.();
+    options.signal?.throwIfAborted();
+  }
+  return temporary;
+}
+
+async function beforeImage(directory: string, entry: TransactionEntry) {
+  if (entry.kind === "missing") return "missing";
+  if (entry.kind === "symlink") return `symlink:${entry.linkTarget}`;
+  const value = await image(path.join(directory, "before", entry.backupName));
+  if (value === "missing") throw new Error("Transaction backup is missing; preserve evidence for review.");
+  return value;
+}
+async function image(target: string, durable = false): Promise<string> {
+  let stat: Stats;
+  try {
+    stat = await fs.lstat(target);
+  } catch (error) {
+    const code = (error as NodeJS.ErrnoException).code;
+    if (code === "ENOENT" || code === "ENOTDIR") return "missing";
+    throw error;
+  }
+  if (stat.isSymbolicLink()) return `symlink:${await fs.readlink(target)}`;
+  if (stat.isFile()) {
+    const content = await fs.readFile(target);
+    if (durable) {
+      const handle = await fs.open(target, "r");
+      try {
+        await handle.sync();
+      } finally {
+        await handle.close();
+      }
+    }
+    return fileImage(content);
   }
-  const expectedRoot = path.resolve(agentDir());
-  if (path.resolve(journal.root) !== expectedRoot) {
-    throw new Error(`Transaction root no longer matches the Pi agent directory: ${directory}`);
+  if (!stat.isDirectory()) throw new Error("Unsupported transaction image.");
+  const entries = [];
+  for (const name of (await fs.readdir(target)).sort())
+    entries.push([name, await image(path.join(target, name), durable)]);
+  if (durable) await syncDirectory(target);
+  return `directory:${createHash("sha256").update(JSON.stringify(entries)).digest("hex")}`;
+}
+async function ownedPostTree(target: string, files: { relative: string; image: string }[], requireComplete: boolean) {
+  if (!files.length) return false;
+  const expected = new Map(files.map((file) => [mergePathIdentity(file.relative), file.image]));
+  const prefixes = new Set<string>();
+  for (const relative of expected.keys()) {
+    for (
+      let parent = path.dirname(relative);
+      parent !== "." && parent !== path.dirname(parent);
+      parent = path.dirname(parent)
+    )
+      prefixes.add(parent);
   }
+  const seen = new Set<string>();
+  async function visit(directory: string): Promise<boolean> {
+    let stat: Stats;
+    try {
+      stat = await fs.lstat(directory);
+    } catch {
+      return false;
+    }
+    if (!stat.isDirectory() || stat.isSymbolicLink()) return false;
+    for (const name of await fs.readdir(directory)) {
+      const child = path.join(directory, name);
+      const relative = mergePathIdentity(path.relative(target, child));
+      const stat = await fs.lstat(child);
+      if (stat.isDirectory() && !stat.isSymbolicLink()) {
+        if (!prefixes.has(relative) || !(await visit(child))) return false;
+      } else {
+        if (expected.get(relative) !== (await image(child))) return false;
+        seen.add(relative);
+      }
+    }
+    return true;
+  }
+  return (await visit(target)) && (!requireComplete || [...expected.keys()].every((key) => seen.has(key)));
+}
+
+function validateJournal(directory: string, journal: TransactionJournal, sessionDir?: string) {
+  if (
+    ![1, 2, 3, 4, 5, 6, 7].includes(journal.version) ||
+    !Array.isArray(journal.entries) ||
+    journal.entries.length > 16_384
+  )
+    throw new Error("Unsupported pi-sync transaction journal; preserve evidence for review.");
+  if (journal.completed !== undefined && (![6, 7].includes(journal.version) || journal.completed !== true))
+    throw new Error("Invalid transaction completion evidence.");
+  const root = path.resolve(agentDir());
+  if (typeof journal.root !== "string" || path.resolve(journal.root) !== root)
+    throw new Error("Transaction root no longer matches the Pi agent directory.");
+  if (journal.sessionRootTransition !== undefined) {
+    if (journal.version !== 7 || typeof journal.sessionRoot !== "string")
+      throw new Error("Invalid session root-transition version.");
+    validateSessionRootTransition(journal.sessionRootTransition);
+  } else if (journal.version === 7) throw new Error("Missing session root-transition evidence.");
+  const trustedSessionRoot = sessionDir
+    ? path.resolve(sessionStorageRoot(root, sessionDir))
+    : path.join(root, "sessions");
+  if (
+    journal.sessionRoot !== undefined &&
+    (typeof journal.sessionRoot !== "string" ||
+      !path.isAbsolute(journal.sessionRoot) ||
+      path.resolve(journal.sessionRoot) !== journal.sessionRoot ||
+      (!journal.completed && transactionHasSessionTargets(journal) && journal.sessionRoot !== trustedSessionRoot))
+  )
+    throw new Error("Transaction session root is not owned by this context; preserve evidence for review.");
   for (const entry of journal.entries) {
     if (
       !entry ||
       typeof entry.target !== "string" ||
+      !path.isAbsolute(entry.target) ||
+      path.resolve(entry.target) !== entry.target ||
       typeof entry.backupName !== "string" ||
-      !/^\d+$/u.test(entry.backupName)
-    ) {
-      throw new Error(`Invalid pi-sync transaction entry: ${directory}`);
+      !/^\d+$/u.test(entry.backupName) ||
+      !["missing", "file", "directory", "symlink"].includes(entry.kind)
+    )
+      throw new Error("Invalid pi-sync transaction entry.");
+    assertWithinRoot(directory, path.join(directory, "before", entry.backupName));
+    assertAllowedTarget(root, journal.sessionRoot, entry.target);
+    if (
+      entry.afterTarget !== undefined &&
+      (![5, 6, 7].includes(journal.version) ||
+        typeof entry.afterTarget !== "string" ||
+        !isCaseReplacement(root, entry.target, entry.afterTarget) ||
+        path.resolve(entry.afterTarget) !== entry.afterTarget ||
+        entry.kind !== "file")
+    )
+      throw new Error("Invalid transaction case replacement evidence.");
+    if (entry.afterTarget) assertAllowedTarget(root, journal.sessionRoot, entry.afterTarget);
+    if (
+      journal.version >= 2 &&
+      ((entry.beforeImage === undefined ? !journal.completed : typeof entry.beforeImage !== "string") ||
+        (entry.afterImage === undefined ? !journal.completed : typeof entry.afterImage !== "string") ||
+        (entry.postFiles === undefined ? !journal.completed : !Array.isArray(entry.postFiles)))
+    )
+      throw new Error("Invalid transaction postimage evidence.");
+    if (entry.recoveryStaged !== undefined && typeof entry.recoveryStaged !== "boolean")
+      throw new Error("Invalid recovery staging evidence.");
+    if (entry.removalPending !== undefined && (journal.version < 3 || typeof entry.removalPending !== "boolean"))
+      throw new Error("Invalid transaction removal evidence.");
+    if (
+      entry.replacementStarted !== undefined &&
+      (journal.version < 4 || typeof entry.replacementStarted !== "boolean")
+    )
+      throw new Error("Invalid transaction replacement evidence.");
+    if (entry.removalPending && entry.replacementStarted)
+      throw new Error("Conflicting transaction replacement evidence.");
+    for (const file of entry.postFiles ?? []) {
+      if (
+        typeof file.relative !== "string" ||
+        typeof file.image !== "string" ||
+        !isStrictlyInside(entry.target, path.resolve(entry.target, file.relative))
+      )
+        throw new Error("Invalid transaction subtree evidence.");
     }
-    assertAllowedTarget(journal.root, journal.sessionRoot, entry.target);
   }
 }
+function transactionHasSessionTargets(journal: TransactionJournal) {
+  const root = path.resolve(agentDir());
+  return (
+    Array.isArray(journal.entries) &&
+    journal.entries.some(
+      (entry) =>
+        typeof entry?.target === "string" &&
+        (!isPathInside(root, entry.target) ||
+          isPathInside(path.join(root, "sessions"), entry.target) ||
+          (typeof journal.sessionRoot === "string" && isPathInside(journal.sessionRoot, entry.target))),
+    )
+  );
+}
+function isStrictlyInside(root: string, target: string) {
+  return path.relative(path.resolve(root), path.resolve(target)) !== "" && isPathInside(root, target);
+}
 
 function assertAllowedTarget(root: string, sessionRoot: string | undefined, target: string) {
   const resolved = path.resolve(target);
-  if (isPathInside(root, resolved)) {
+  if (isStrictlyInside(root, resolved)) {
+    if (isDeniedPath(path.relative(root, resolved))) throw new Error("Transaction targets denied private storage.");
     assertWithinRoot(root, resolved);
     return;
   }
-  if (sessionRoot && isPathInside(sessionRoot, resolved)) {
+  if (sessionRoot && isStrictlyInside(sessionRoot, resolved)) {
+    if (isDeniedPath(`sessions/${path.relative(sessionRoot, resolved)}`))
+      throw new Error("Transaction targets denied session storage.");
     assertWithinRoot(sessionRoot, resolved);
     return;
   }
-  throw new Error(`Transaction target is outside configured roots: ${target}`);
+  throw new Error("Transaction target is outside configured roots.");
+}
+async function assertSafeParents(root: string, sessionRoot: string | undefined, target: string) {
+  assertAllowedTarget(root, sessionRoot, target);
+  const boundary = isPathInside(root, target) ? root : sessionRoot;
+  for (
+    let parent = path.dirname(target);
+    boundary && mergePathIdentity(parent) !== mergePathIdentity(boundary);
+    parent = path.dirname(parent)
+  ) {
+    if (path.dirname(parent) === parent) throw new Error("Transaction parent did not reach its owned boundary.");
+    try {
+      const stat = await fs.lstat(parent);
+      if ((!stat.isDirectory() && !stat.isFile()) || stat.isSymbolicLink())
+        throw new Error("Unsafe transaction parent.");
+    } catch (error) {
+      const code = (error as NodeJS.ErrnoException).code;
+      if (code !== "ENOENT" && code !== "ENOTDIR") throw error;
+    }
+  }
+}
+async function withTargetQueues<T>(targets: string[], action: () => Promise<T>) {
+  const keys = new Set<string>();
+  for (const target of targets) {
+    let key = path.resolve(target);
+    try {
+      key = await fs.realpath(target);
+    } catch (error) {
+      const code = (error as NodeJS.ErrnoException).code;
+      if (code !== "ENOENT" && code !== "ENOTDIR") throw error;
+    }
+    if (keys.has(key)) throw new Error("Transaction targets alias the same file.");
+    keys.add(key);
+  }
+  async function acquire(index: number): Promise<T> {
+    const target = targets[index];
+    return target ? withFileMutationQueue(target, () => acquire(index + 1)) : action();
+  }
+  return acquire(0);
+}
+async function withCaseDestinationQueues<T>(
+  spellings: readonly (readonly [string, string])[],
+  options: TransactionOptions,
+  action: () => Promise<T>,
+): Promise<T> {
+  if (!spellings.length) return action();
+  const requireAbsent = async () => {
+    for (const [before, after] of spellings) {
+      options.validateMutation?.();
+      options.signal?.throwIfAborted();
+      const spelling = await caseReplacementSpelling(before, after);
+      options.validateMutation?.();
+      options.signal?.throwIfAborted();
+      if (spelling !== undefined)
+        throw new Error("Case replacement changed before destination queue reservation; evidence retained.");
+    }
+  };
+  // Existing aliases share one non-reentrant realpath queue. Only after removal can
+  // we reserve the distinct missing spelling while retaining the original queue.
+  // Pi writers that registered in the gap finish before this callback; refuse their
+  // bytes, including recognizable pre/postimages, rather than treating them as ours.
+  await requireAbsent();
+  return withTargetQueues(
+    spellings.map(([, after]) => after),
+    async () => {
+      await requireAbsent();
+      return action();
+    },
+  );
+}
+async function completeTransaction(directory: string, journal: TransactionJournal) {
+  // Publish completion before deleting any backup. A surviving journal after power loss
+  // may only retry cleanup, never roll back already accepted files.
+  await writeJson(
+    path.join(directory, "journal.json"),
+    { ...journal, version: journal.sessionRootTransition ? 7 : 6, completed: true },
+    {
+      maxBytes: 32 * 1024 * 1024,
+    },
+  );
+  await removeTransaction(directory);
+}
+async function removeTransaction(directory: string) {
+  await fs.rm(directory, { recursive: true, force: true });
+  // After evidence deletion, failure cannot safely trigger rollback or withhold acceptance.
+  // A failed cleanup fsync may leave obsolete evidence after power loss; live file durability
+  // was established before cleanup; a surviving completed journal allows only cleanup.
+  await syncDirectory(transactionRoot()).catch(() => {});
 }
-
 function transactionRoot() {
   return path.join(stateDir(), "transactions");
 }