yam-flow 2.6.0 → 2.8.0

package/dist/lib/skill-installation.js

@@ -1,4 +1,5 @@
 import { createHash, randomUUID } from 'node:crypto';
+import { constants as fsConstants } from 'node:fs';
 import fsp from 'node:fs/promises';
 import path from 'node:path';
 import { compareStableText } from './stable-order.js';
@@ -6,6 +7,7 @@ export const INSTALL_RECEIPT_NAME = '.yam-flow-install-receipt.json';
 export const INSTALL_LOCK_NAME = '.yam-flow-install.lock';
 export const INSTALL_RECEIPT_SCHEMA = 'yam.install-receipt.v1';
 export const INSTALL_TRANSACTION_PREFIX = '.yam-flow-install-';
+const TRANSACTION_OWNER_MARKER = '.yam-flow-transaction-owner';
 function message(error) {
     return error instanceof Error ? error.message : String(error);
 }
@@ -37,6 +39,169 @@ async function exists(target) {
         return false;
     }
 }
+function pathWithinBoundary(boundary, target) {
+    const relative = path.relative(boundary, target);
+    return relative === '' || (!relative.startsWith(`..${path.sep}`) && relative !== '..' && !path.isAbsolute(relative));
+}
+async function captureRegularParentPath(boundaryValue, targetValue, label) {
+    const boundary = path.resolve(boundaryValue);
+    const target = path.resolve(targetValue);
+    if (!pathWithinBoundary(boundary, target)) {
+        throw new Error(`${label} escapes its trusted path boundary: ${target}`);
+    }
+    const targetParent = target === boundary ? boundary : path.dirname(target);
+    const relativeParent = path.relative(boundary, targetParent);
+    const candidates = [boundary];
+    if (relativeParent) {
+        let current = boundary;
+        for (const segment of relativeParent.split(path.sep)) {
+            current = path.join(current, segment);
+            candidates.push(current);
+        }
+    }
+    const identities = [];
+    for (const candidate of candidates) {
+        const stat = await fsp.lstat(candidate);
+        if (stat.isSymbolicLink()) {
+            throw new Error(`${label} has a symlinked parent path segment: ${candidate}`);
+        }
+        if (!stat.isDirectory()) {
+            throw new Error(`${label} parent path segment must be a regular directory: ${candidate}`);
+        }
+        identities.push({ path: candidate, dev: stat.dev, ino: stat.ino });
+    }
+    return identities;
+}
+async function revalidateRegularParentPath(identities, label) {
+    for (const identity of identities) {
+        const stat = await fsp.lstat(identity.path);
+        if (stat.isSymbolicLink()
+            || !stat.isDirectory()
+            || stat.dev !== identity.dev
+            || stat.ino !== identity.ino) {
+            throw new Error(`${label} parent path changed identity: ${identity.path}`);
+        }
+    }
+}
+async function captureRegularDirectoryPath(boundaryValue, directoryValue, label) {
+    const boundary = path.resolve(boundaryValue);
+    const directory = path.resolve(directoryValue);
+    if (boundary === directory) {
+        const stat = await fsp.lstat(directory);
+        if (!stat.isDirectory() || stat.isSymbolicLink()) {
+            throw new Error(`${label} must be a regular directory: ${directory}`);
+        }
+        return [{ path: directory, dev: stat.dev, ino: stat.ino }];
+    }
+    const identities = await captureRegularParentPath(boundary, directory, label);
+    const stat = await fsp.lstat(directory);
+    if (!stat.isDirectory() || stat.isSymbolicLink()) {
+        throw new Error(`${label} must be a regular directory: ${directory}`);
+    }
+    identities.push({ path: directory, dev: stat.dev, ino: stat.ino });
+    return identities;
+}
+function readOnlyNoFollowFlags() {
+    const noFollow = process.platform !== 'win32' && typeof fsConstants.O_NOFOLLOW === 'number'
+        ? fsConstants.O_NOFOLLOW
+        : 0;
+    return fsConstants.O_RDONLY | noFollow;
+}
+async function confirmWindowsPathForHandle(target, opened, before, label) {
+    if (before.birthtimeNs <= 0n) {
+        throw new Error(`${label} requires a positive birthtime on Windows: ${target}`);
+    }
+    let pathHandle;
+    try {
+        pathHandle = await fsp.open(target, fsConstants.O_RDONLY);
+        const pathOpened = await pathHandle.stat({ bigint: true });
+        const confirmed = await fsp.lstat(target, { bigint: true });
+        if (!opened.isFile()
+            || !pathOpened.isFile()
+            || pathOpened.dev !== opened.dev
+            || pathOpened.ino !== opened.ino
+            || confirmed.isSymbolicLink()
+            || !confirmed.isFile()
+            || confirmed.dev !== before.dev
+            || confirmed.ino !== before.ino
+            || confirmed.birthtimeNs !== before.birthtimeNs) {
+            throw new Error(`${label} changed identity while confirming Windows path ownership: ${target}`);
+        }
+        return confirmed;
+    }
+    finally {
+        if (pathHandle)
+            await pathHandle.close();
+    }
+}
+async function captureRegularFile(file, boundary = path.dirname(file)) {
+    const parents = await captureRegularParentPath(boundary, file, 'regular file read');
+    const before = await fsp.lstat(file, { bigint: true });
+    if (!before.isFile() || before.isSymbolicLink())
+        throw new Error(`expected a regular file: ${file}`);
+    const handle = await fsp.open(file, readOnlyNoFollowFlags());
+    try {
+        const opened = await handle.stat({ bigint: true });
+        if (!opened.isFile())
+            throw new Error(`expected a regular file: ${file}`);
+        const bytes = await handle.readFile();
+        const afterOpened = await handle.stat({ bigint: true });
+        const after = process.platform === 'win32'
+            ? await confirmWindowsPathForHandle(file, opened, before, 'regular file')
+            : await fsp.lstat(file, { bigint: true });
+        await revalidateRegularParentPath(parents, 'regular file read');
+        if (!after.isFile()
+            || after.isSymbolicLink()
+            || afterOpened.dev !== opened.dev
+            || afterOpened.ino !== opened.ino
+            || (process.platform !== 'win32' && (before.dev !== opened.dev
+                || before.ino !== opened.ino
+                || after.dev !== opened.dev
+                || after.ino !== opened.ino))) {
+            throw new Error(`regular file changed identity while being captured: ${file}`);
+        }
+        return { bytes, mode: Number(opened.mode & 511n) };
+    }
+    finally {
+        await handle.close();
+    }
+}
+async function readRegularFileBytes(file, boundary = path.dirname(file)) {
+    return (await captureRegularFile(file, boundary)).bytes;
+}
+async function copyRegularFile(source, target, sourceBoundary, targetBoundary) {
+    const sourceFile = await captureRegularFile(source, sourceBoundary);
+    const targetParents = await captureRegularParentPath(targetBoundary, target, 'install copy target');
+    const noFollow = process.platform !== 'win32' && typeof fsConstants.O_NOFOLLOW === 'number'
+        ? fsConstants.O_NOFOLLOW
+        : 0;
+    const handle = await fsp.open(target, fsConstants.O_WRONLY | fsConstants.O_CREAT | fsConstants.O_EXCL | noFollow, sourceFile.mode);
+    try {
+        await handle.writeFile(sourceFile.bytes);
+        const opened = await handle.stat({ bigint: true });
+        if (!opened.isFile())
+            throw new Error(`install copy target must be a regular file: ${target}`);
+        const openedIdentity = { dev: opened.dev, ino: opened.ino };
+        const afterOpened = await handle.stat({ bigint: true });
+        if (afterOpened.dev !== openedIdentity.dev || afterOpened.ino !== openedIdentity.ino) {
+            throw new Error(`install copy target changed descriptor identity: ${target}`);
+        }
+        await revalidateRegularParentPath(targetParents, 'install copy target');
+        const beforeInstalled = await fsp.lstat(target, { bigint: true });
+        const installed = process.platform === 'win32'
+            ? await confirmWindowsPathForHandle(target, opened, beforeInstalled, 'install copy target')
+            : beforeInstalled;
+        if (!installed.isFile()
+            || installed.isSymbolicLink()
+            || (process.platform !== 'win32' && (installed.dev !== openedIdentity.dev
+                || installed.ino !== openedIdentity.ino))) {
+            throw new Error(`install copy target changed path identity: ${target}`);
+        }
+    }
+    finally {
+        await handle.close();
+    }
+}
 export async function findInstallRecoveryArtifacts(root) {
     try {
         const entries = await fsp.readdir(root, { withFileTypes: true });
@@ -51,25 +216,23 @@ export async function findInstallRecoveryArtifacts(root) {
         throw error;
     }
 }
-async function digestFile(file, relativePath) {
+async function digestFile(file, relativePath, boundary = path.dirname(file)) {
     const stat = await fsp.lstat(file);
     if (!stat.isFile() || stat.isSymbolicLink()) {
         throw new Error(`install source must be a regular file: ${file}`);
     }
-    const contents = await fsp.readFile(file);
+    const contents = await readRegularFileBytes(file, boundary);
     return {
         path: relativePath.split(path.sep).join('/'),
         bytes: contents.byteLength,
         sha256: createHash('sha256').update(contents).digest('hex')
     };
 }
-async function collectTreeManifest(root, prefix = '') {
-    const stat = await fsp.lstat(root);
-    if (!stat.isDirectory() || stat.isSymbolicLink()) {
-        throw new Error(`install tree must be a regular directory: ${root}`);
-    }
+async function collectTreeManifest(root, prefix = '', boundary = root) {
+    const rootIdentity = await captureRegularDirectoryPath(boundary, root, 'install tree');
     const files = [];
     async function walk(current, relative) {
+        const directoryIdentity = await captureRegularDirectoryPath(boundary, current, 'install tree');
         const entries = await fsp.readdir(current, { withFileTypes: true });
         entries.sort((left, right) => compareStableText(left.name, right.name));
         for (const entry of entries) {
@@ -79,33 +242,41 @@ async function collectTreeManifest(root, prefix = '') {
                 await walk(absolute, nextRelative);
             }
             else if (entry.isFile()) {
-                files.push(await digestFile(absolute, path.join(prefix, nextRelative)));
+                files.push(await digestFile(absolute, path.join(prefix, nextRelative), boundary));
             }
             else {
                 throw new Error(`unsupported install tree entry: ${absolute}`);
             }
         }
+        await revalidateRegularParentPath(directoryIdentity, 'install tree');
     }
     await walk(root, '');
+    await revalidateRegularParentPath(rootIdentity, 'install tree');
     return files.sort((left, right) => compareStableText(left.path, right.path));
 }
 async function expectedInstallManifest(sourceRoot, skills) {
+    const sourceIdentity = await captureRegularDirectoryPath(sourceRoot, sourceRoot, 'install source root');
     const referencesRoot = path.join(sourceRoot, 'references');
-    const referenceFiles = await collectTreeManifest(referencesRoot);
+    const referenceFiles = await collectTreeManifest(referencesRoot, '', sourceRoot);
     if (referenceFiles.length === 0)
         throw new Error(`no reference files found: ${referencesRoot}`);
     const files = [];
     for (const skill of skills) {
         const skillFile = path.join(sourceRoot, 'skills', skill, 'SKILL.md');
-        const skillText = await fsp.readFile(skillFile, 'utf8');
-        const frontmatter = skillText.match(/^---\n([\s\S]*?)\n---/);
-        const name = frontmatter?.[1].match(/^name:\s*([^\n]+)\s*$/m)?.[1]
+        const skillBytes = await readRegularFileBytes(skillFile, sourceRoot);
+        const skillText = skillBytes.toString('utf8');
+        const frontmatter = skillText.match(/^---\r?\n([\s\S]*?)\r?\n---(?:\r?\n|$)/);
+        const name = frontmatter?.[1].match(/^name:\s*([^\r\n]+)\s*$/m)?.[1]
             ?.trim()
             .replace(/^["']|["']$/g, '');
         if (name !== skill) {
             throw new Error(`skill source frontmatter mismatch for ${skill}: ${name || 'missing'}`);
         }
-        files.push(await digestFile(skillFile, path.join(skill, 'SKILL.md')));
+        files.push({
+            path: path.join(skill, 'SKILL.md').split(path.sep).join('/'),
+            bytes: skillBytes.byteLength,
+            sha256: createHash('sha256').update(skillBytes).digest('hex')
+        });
         for (const reference of referenceFiles) {
             files.push({
                 ...reference,
@@ -113,29 +284,107 @@ async function expectedInstallManifest(sourceRoot, skills) {
             });
         }
     }
+    await revalidateRegularParentPath(sourceIdentity, 'install source root');
     return files.sort((left, right) => compareStableText(left.path, right.path));
 }
-async function copyTree(source, target) {
-    const stat = await fsp.lstat(source);
-    if (!stat.isDirectory() || stat.isSymbolicLink()) {
-        throw new Error(`install source must be a regular directory: ${source}`);
-    }
+async function copyTree(source, target, sourceBoundary = source, targetBoundary = target) {
+    const sourceIdentity = await captureRegularDirectoryPath(sourceBoundary, source, 'install source tree');
+    const targetParents = await captureRegularParentPath(targetBoundary, target, 'install target tree');
     await fsp.mkdir(target, { recursive: true });
+    const targetIdentity = await captureRegularDirectoryPath(targetBoundary, target, 'install target tree');
+    await revalidateRegularParentPath(sourceIdentity, 'install source tree');
+    await revalidateRegularParentPath(targetParents, 'install target tree');
     const entries = await fsp.readdir(source, { withFileTypes: true });
     entries.sort((left, right) => left.name.localeCompare(right.name));
     for (const entry of entries) {
         const from = path.join(source, entry.name);
         const to = path.join(target, entry.name);
         if (entry.isDirectory()) {
-            await copyTree(from, to);
+            await copyTree(from, to, sourceBoundary, targetBoundary);
         }
         else if (entry.isFile()) {
-            await fsp.copyFile(from, to);
+            await copyRegularFile(from, to, sourceBoundary, targetBoundary);
         }
         else {
             throw new Error(`unsupported install source entry: ${from}`);
         }
     }
+    await revalidateRegularParentPath(sourceIdentity, 'install source tree');
+    await revalidateRegularParentPath(targetIdentity, 'install target tree');
+}
+async function moveRegularDirectory(source, target, sourceBoundary, targetBoundary, label, onMoved, identityOwner) {
+    const sourceParents = await captureRegularParentPath(sourceBoundary, source, `${label} source`);
+    const sourceStat = await fsp.lstat(source);
+    if (!sourceStat.isDirectory() || sourceStat.isSymbolicLink()) {
+        throw new Error(`${label} source must be a regular directory: ${source}`);
+    }
+    const targetParents = await captureRegularParentPath(targetBoundary, target, `${label} target`);
+    if (await exists(target))
+        throw new Error(`${label} target unexpectedly exists: ${target}`);
+    const recorded = identityOwner ? await captureRecordedEntry(source, 'directory', label) : undefined;
+    let identityTransferred = false;
+    try {
+        await fsp.rename(source, target);
+        if (!recorded)
+            onMoved?.();
+        if (recorded) {
+            recorded.path = target;
+            identityOwner?.push(recorded);
+            identityTransferred = true;
+        }
+        await revalidateRegularParentPath(sourceParents, `${label} source`);
+        await revalidateRegularParentPath(targetParents, `${label} target`);
+        const targetStat = await fsp.lstat(target);
+        if (!targetStat.isDirectory()
+            || targetStat.isSymbolicLink()
+            || targetStat.dev !== sourceStat.dev
+            || targetStat.ino !== sourceStat.ino) {
+            throw new Error(`${label} directory changed identity while being moved: ${target}`);
+        }
+        return recorded;
+    }
+    catch (error) {
+        if (recorded && !identityTransferred)
+            await closeRecordedEntry(recorded);
+        throw error;
+    }
+}
+async function moveRegularFile(source, target, sourceBoundary, targetBoundary, label, onMoved, identityOwner) {
+    const sourceParents = await captureRegularParentPath(sourceBoundary, source, `${label} source`);
+    const sourceStat = await fsp.lstat(source);
+    if (!sourceStat.isFile() || sourceStat.isSymbolicLink()) {
+        throw new Error(`${label} source must be a regular file: ${source}`);
+    }
+    const targetParents = await captureRegularParentPath(targetBoundary, target, `${label} target`);
+    if (await exists(target))
+        throw new Error(`${label} target unexpectedly exists: ${target}`);
+    const recorded = identityOwner ? await captureRecordedEntry(source, 'file', label) : undefined;
+    let identityTransferred = false;
+    try {
+        await fsp.rename(source, target);
+        if (!recorded)
+            onMoved?.();
+        if (recorded) {
+            recorded.path = target;
+            identityOwner?.push(recorded);
+            identityTransferred = true;
+        }
+        await revalidateRegularParentPath(sourceParents, `${label} source`);
+        await revalidateRegularParentPath(targetParents, `${label} target`);
+        const targetStat = await fsp.lstat(target);
+        if (!targetStat.isFile()
+            || targetStat.isSymbolicLink()
+            || targetStat.dev !== sourceStat.dev
+            || targetStat.ino !== sourceStat.ino) {
+            throw new Error(`${label} file changed identity while being moved: ${target}`);
+        }
+        return recorded;
+    }
+    catch (error) {
+        if (recorded && !identityTransferred)
+            await closeRecordedEntry(recorded);
+        throw error;
+    }
 }
 function manifestDigest(files) {
     return digestManifestFiles([...files].sort((left, right) => compareStableText(left.path, right.path)));
@@ -282,7 +531,7 @@ async function readOwnershipReceipt(destination, packageName) {
         if (!stat.isFile() || stat.isSymbolicLink()) {
             return { exists: true, issues: [`install receipt must be a regular file: ${receiptPath}`] };
         }
-        const parsed = JSON.parse(await fsp.readFile(receiptPath, 'utf8'));
+        const parsed = JSON.parse((await readRegularFileBytes(receiptPath, destination)).toString('utf8'));
         const issues = ownershipReceiptIssues(parsed, packageName, destination);
         return issues.length
             ? { exists: true, issues }
@@ -306,7 +555,7 @@ async function verifyReceiptOwnedSkill(root, skill, receipt) {
     if (!await exists(target))
         return [`receipt-owned skill is missing: ${skill}`];
     try {
-        const actual = await collectTreeManifest(target, skill);
+        const actual = await collectTreeManifest(target, skill, root);
         return manifestIssues(expected, actual, `installed ${skill}`);
     }
     catch (error) {
@@ -382,36 +631,11 @@ async function preflightSafeUninstallOwnership(destination, packageName, skills)
     }
     return receipt;
 }
-async function readRegularFileBytes(file) {
-    const before = await fsp.lstat(file);
-    if (!before.isFile() || before.isSymbolicLink())
-        throw new Error(`expected a regular file: ${file}`);
-    const handle = await fsp.open(file, 'r');
-    try {
-        const opened = await handle.stat();
-        if (!opened.isFile())
-            throw new Error(`expected a regular file: ${file}`);
-        const bytes = await handle.readFile();
-        const after = await fsp.lstat(file);
-        if (!after.isFile()
-            || after.isSymbolicLink()
-            || before.dev !== opened.dev
-            || before.ino !== opened.ino
-            || after.dev !== opened.dev
-            || after.ino !== opened.ino) {
-            throw new Error(`regular file changed identity while being captured: ${file}`);
-        }
-        return bytes;
-    }
-    finally {
-        await handle.close();
-    }
-}
 async function captureReceiptMutationSnapshot(destination, packageName) {
     const receiptPath = path.join(destination, INSTALL_RECEIPT_NAME);
     let bytes;
     try {
-        bytes = await readRegularFileBytes(receiptPath);
+        bytes = await readRegularFileBytes(receiptPath, destination);
     }
     catch (error) {
         if (error.code === 'ENOENT')
@@ -440,7 +664,7 @@ async function captureMutationSnapshot(destination, packageName, names, explicit
     const receipt = await captureReceiptMutationSnapshot(destination, packageName);
     const trees = [];
     for (const name of names) {
-        const files = await collectTreeManifest(path.join(destination, name), name);
+        const files = await collectTreeManifest(path.join(destination, name), name, destination);
         if (!explicitReplacements.includes(name)) {
             if (!receipt.exists) {
                 throw new Error(`cannot capture receipt-owned skill without an install receipt: ${name}`);
@@ -468,7 +692,7 @@ async function verifyMovedMutationSnapshot(destination, snapshot, moved, receipt
             continue;
         }
         try {
-            const actual = await collectTreeManifest(movedEntry.backup, tree.name);
+            const actual = await collectTreeManifest(movedEntry.backup, tree.name, path.dirname(movedEntry.backup));
             issues.push(...manifestIssues(tree.files, actual, `moved backup ${tree.name}`));
         }
         catch (error) {
@@ -482,7 +706,7 @@ async function verifyMovedMutationSnapshot(destination, snapshot, moved, receipt
     }
     else if (snapshot.receipt.exists && receiptBackedUp) {
         try {
-            const bytes = await readRegularFileBytes(receiptBackupPath);
+            const bytes = await readRegularFileBytes(receiptBackupPath, path.dirname(receiptBackupPath));
             const sha256 = createHash('sha256').update(bytes).digest('hex');
             if (sha256 !== snapshot.receipt.sha256 || !bytes.equals(snapshot.receipt.bytes)) {
                 issues.push('moved install receipt differs from the captured bytes');
@@ -556,7 +780,7 @@ export async function inspectSkillInstallation(options) {
             continue;
         }
         try {
-            const installed = (await collectTreeManifest(target, skill));
+            const installed = (await collectTreeManifest(target, skill, destination));
             const skillIssues = manifestIssues(expectedForSkill, installed, `installed ${skill}`);
             skillStatuses.push({ skill, status: skillIssues.length ? 'drift' : 'ok', issues: skillIssues });
             issues.push(...skillIssues);
@@ -574,7 +798,7 @@ export async function inspectSkillInstallation(options) {
     }
     else {
         try {
-            const parsed = JSON.parse(await fsp.readFile(receiptPath, 'utf8'));
+            const parsed = JSON.parse((await readRegularFileBytes(receiptPath, destination)).toString('utf8'));
             const problems = receiptIssues(parsed, options, destination, expected);
             if (problems.length) {
                 receiptStatus = 'drift';
@@ -604,6 +828,7 @@ export async function inspectSkillInstallation(options) {
 }
 async function acquireInstallLock(destination) {
     const lockPath = path.join(destination, INSTALL_LOCK_NAME);
+    const destinationIdentity = await captureRegularDirectoryPath(destination, destination, 'skill destination');
     let handle;
     try {
         handle = await fsp.open(lockPath, 'wx', 0o600);
@@ -614,25 +839,64 @@ async function acquireInstallLock(destination) {
         }
         throw error;
     }
+    let lockIdentity;
     try {
-        await handle.writeFile(JSON.stringify({ pid: process.pid, started_at: new Date().toISOString() }, null, 2));
+        const lockContents = JSON.stringify({ pid: process.pid, started_at: new Date().toISOString() }, null, 2);
+        await handle.writeFile(lockContents);
+        const opened = await handle.stat({ bigint: true });
+        if (!opened.isFile())
+            throw new Error(`install lock must be a regular file: ${lockPath}`);
+        lockIdentity = await captureLockIdentity(lockPath, opened);
+        lockIdentity.contentsSha256 = createHash('sha256').update(lockContents).digest('hex');
+        await revalidateRegularParentPath(destinationIdentity, 'skill destination');
+        const current = await fsp.lstat(lockPath, { bigint: true });
+        if (current.isSymbolicLink()
+            || !current.isFile()
+            || current.dev !== lockIdentity.dev
+            || current.ino !== lockIdentity.ino
+            || (lockIdentity.birthtimeNs !== undefined && current.birthtimeNs !== lockIdentity.birthtimeNs)) {
+            throw new Error(`install lock changed identity while being acquired: ${lockPath}`);
+        }
     }
     catch (error) {
-        await handle.close().catch(() => undefined);
-        await fsp.rm(lockPath, { force: true }).catch(() => undefined);
+        const cleanupErrors = [];
+        cleanupErrors.push(...await closeFileHandle(handle, lockPath));
+        try {
+            await revalidateRegularParentPath(destinationIdentity, 'skill destination');
+            if (!lockIdentity)
+                throw new Error(`install lock identity was not captured: ${lockPath}`);
+            await removeRecordedEntry(lockIdentity, 'install lock');
+        }
+        catch (cleanupError) {
+            cleanupErrors.push(message(cleanupError));
+        }
+        finally {
+            const closeErrors = lockIdentity
+                ? await closeRecordedEntries([lockIdentity])
+                : [];
+            cleanupErrors.push(...closeErrors);
+        }
+        if (cleanupErrors.length) {
+            throw new Error(`${message(error)}. Install lock cleanup failed: ${cleanupErrors.join('; ')}`);
+        }
         throw error;
     }
-    return { handle, lockPath };
+    return { handle, lockPath, lockIdentity, destinationIdentity };
 }
 async function moveExistingEntries(root, names, backupRoot, moved) {
     await fsp.mkdir(backupRoot, { recursive: true });
+    const backupBoundary = path.dirname(backupRoot);
     for (const name of names) {
         const original = path.join(root, name);
         if (!await exists(original))
             continue;
         const backup = path.join(backupRoot, name);
-        await fsp.rename(original, backup);
-        moved.push({ original, backup });
+        await moveRegularDirectory(original, backup, root, backupBoundary, 'managed install backup', () => moved.push({
+            original,
+            backup,
+            originalBoundary: root,
+            backupBoundary
+        }));
     }
 }
 async function restoreMovedEntries(entries) {
@@ -643,7 +907,7 @@ async function restoreMovedEntries(entries) {
                 throw new Error(`rollback target unexpectedly exists: ${entry.original}`);
             }
             await fsp.mkdir(path.dirname(entry.original), { recursive: true });
-            await fsp.rename(entry.backup, entry.original);
+            await moveRegularDirectory(entry.backup, entry.original, entry.backupBoundary, entry.originalBoundary, 'managed install rollback');
         }
         catch (error) {
             errors.push(message(error));
@@ -655,14 +919,349 @@ async function removeInstalledEntries(entries) {
     const errors = [];
     for (const entry of [...entries].reverse()) {
         try {
-            await fsp.rm(entry, { recursive: true, force: true });
+            await removeRecordedEntry(entry, 'rollback removal');
         }
         catch (error) {
-            errors.push(`could not remove new install ${entry}: ${message(error)}`);
+            errors.push(`could not remove new install ${entry.path}: ${message(error)}`);
         }
     }
     return errors;
 }
+async function captureRecordedEntry(target, kind, label, ownershipMarker) {
+    const noFollow = process.platform !== 'win32' && typeof fsConstants.O_NOFOLLOW === 'number'
+        ? fsConstants.O_NOFOLLOW
+        : 0;
+    const directoryOnly = kind === 'directory'
+        && process.platform !== 'win32'
+        && typeof fsConstants.O_DIRECTORY === 'number'
+        ? fsConstants.O_DIRECTORY
+        : 0;
+    let handle;
+    try {
+        if (process.platform !== 'win32') {
+            handle = await fsp.open(target, fsConstants.O_RDONLY | noFollow | directoryOnly);
+        }
+        if (handle)
+            return await captureRecordedEntryFromHandle(target, kind, label, handle);
+        const stat = await fsp.lstat(target, { bigint: true });
+        const typeMatches = kind === 'directory'
+            ? stat.isDirectory() && !stat.isSymbolicLink()
+            : stat.isFile() && !stat.isSymbolicLink();
+        if (!typeMatches || stat.birthtimeNs <= 0n) {
+            throw new Error(`${label} must be one stable regular ${kind} with a positive birthtime: ${target}`);
+        }
+        const entry = {
+            path: target,
+            dev: stat.dev,
+            ino: stat.ino,
+            kind,
+            birthtimeNs: stat.birthtimeNs,
+            ownershipMarker
+        };
+        if (kind === 'file') {
+            const bytes = await readRegularFileBytes(target, path.dirname(target));
+            entry.contentsSha256 = createHash('sha256').update(bytes).digest('hex');
+        }
+        else if (!ownershipMarker) {
+            entry.treeDigest = manifestDigest(await collectTreeManifest(target));
+        }
+        return entry;
+    }
+    catch (error) {
+        if (handle)
+            await handle.close().catch(() => { });
+        throw error;
+    }
+}
+async function captureRecordedEntryFromHandle(target, kind, label, handle) {
+    const opened = await handle.stat({ bigint: true });
+    const current = await fsp.lstat(target, { bigint: true });
+    const typeMatches = kind === 'directory'
+        ? opened.isDirectory() && current.isDirectory() && !current.isSymbolicLink()
+        : opened.isFile() && current.isFile() && !current.isSymbolicLink();
+    const birthtimeAvailable = opened.birthtimeNs > 0n && current.birthtimeNs > 0n;
+    if (!typeMatches
+        || opened.dev !== current.dev
+        || opened.ino !== current.ino
+        || (birthtimeAvailable && opened.birthtimeNs !== current.birthtimeNs)) {
+        throw new Error(`${label} must be one stable regular ${kind}: ${target}`);
+    }
+    return {
+        path: target,
+        dev: opened.dev,
+        ino: opened.ino,
+        kind,
+        birthtimeNs: birthtimeAvailable ? opened.birthtimeNs : undefined,
+        handle
+    };
+}
+async function captureLockIdentity(target, created) {
+    const current = await fsp.lstat(target, { bigint: true });
+    if (!created.isFile()
+        || current.isSymbolicLink()
+        || !current.isFile()
+        || (process.platform !== 'win32' && (created.dev !== current.dev
+            || created.ino !== current.ino))) {
+        throw new Error(`install lock changed identity after exclusive creation: ${target}`);
+    }
+    let pinHandle;
+    try {
+        if (process.platform !== 'win32') {
+            const noFollow = typeof fsConstants.O_NOFOLLOW === 'number' ? fsConstants.O_NOFOLLOW : 0;
+            pinHandle = await fsp.open(target, fsConstants.O_RDONLY | noFollow);
+            const pinned = await pinHandle.stat({ bigint: true });
+            if (!pinned.isFile()
+                || pinned.dev !== created.dev
+                || pinned.ino !== created.ino) {
+                throw new Error(`install lock pin descriptor does not match exclusive creation: ${target}`);
+            }
+        }
+        else {
+            const confirmed = await confirmWindowsPathForHandle(target, created, current, 'install lock');
+            return {
+                path: target,
+                dev: confirmed.dev,
+                ino: confirmed.ino,
+                kind: 'file',
+                birthtimeNs: confirmed.birthtimeNs
+            };
+        }
+        return {
+            path: target,
+            dev: created.dev,
+            ino: created.ino,
+            kind: 'file',
+            handle: pinHandle
+        };
+    }
+    catch (error) {
+        if (pinHandle)
+            await pinHandle.close().catch(() => { });
+        throw error;
+    }
+}
+async function removeRecordedEntry(entry, label) {
+    try {
+        let current;
+        try {
+            current = await fsp.lstat(entry.path, { bigint: true });
+        }
+        catch (error) {
+            if (error.code === 'ENOENT')
+                return;
+            throw error;
+        }
+        const opened = entry.handle ? await entry.handle.stat({ bigint: true }) : undefined;
+        const typeMatches = entry.kind === 'directory'
+            ? current.isDirectory() && !current.isSymbolicLink()
+            : current.isFile() && !current.isSymbolicLink();
+        if (!typeMatches
+            || current.dev !== entry.dev
+            || current.ino !== entry.ino
+            || (entry.birthtimeNs !== undefined && current.birthtimeNs !== entry.birthtimeNs)
+            || (opened && (opened.dev !== current.dev
+                || opened.ino !== current.ino
+                || (entry.birthtimeNs !== undefined && opened.birthtimeNs !== current.birthtimeNs)))) {
+            throw new Error(`${label} identity mismatch; preserved current path: ${entry.path}`);
+        }
+        if (entry.contentsSha256) {
+            try {
+                const bytes = await readRegularFileBytes(entry.path, path.dirname(entry.path));
+                const currentSha256 = createHash('sha256').update(bytes).digest('hex');
+                if (currentSha256 !== entry.contentsSha256)
+                    throw new Error('content digest changed');
+            }
+            catch (error) {
+                throw new Error(`${label} identity mismatch (content: ${message(error)}); preserved current path: ${entry.path}`);
+            }
+        }
+        if (entry.treeDigest) {
+            try {
+                const currentTreeDigest = manifestDigest(await collectTreeManifest(entry.path));
+                if (currentTreeDigest !== entry.treeDigest)
+                    throw new Error('tree digest changed');
+            }
+            catch (error) {
+                throw new Error(`${label} identity mismatch (tree: ${message(error)}); preserved current path: ${entry.path}`);
+            }
+        }
+        if (entry.ownershipMarker) {
+            try {
+                const markerPath = path.join(entry.path, entry.ownershipMarker.name);
+                const markerBytes = await readRegularFileBytes(markerPath, entry.path);
+                const markerSha256 = createHash('sha256').update(markerBytes).digest('hex');
+                if (markerSha256 !== entry.ownershipMarker.sha256)
+                    throw new Error('ownership marker digest changed');
+            }
+            catch (error) {
+                throw new Error(`${label} identity mismatch (ownership marker: ${message(error)}); preserved current path: ${entry.path}`);
+            }
+        }
+        await fsp.rm(entry.path, { recursive: entry.kind === 'directory', force: entry.kind === 'file' });
+    }
+    finally {
+        await closeRecordedEntry(entry);
+    }
+}
+async function captureTransactionRoot(target, label) {
+    const markerContents = `${randomUUID()}\n`;
+    const markerPath = path.join(target, TRANSACTION_OWNER_MARKER);
+    await fsp.writeFile(markerPath, markerContents, { flag: 'wx', mode: 0o600 });
+    return captureRecordedEntry(target, 'directory', label, {
+        name: TRANSACTION_OWNER_MARKER,
+        sha256: createHash('sha256').update(markerContents).digest('hex')
+    });
+}
+async function closeRecordedEntry(entry) {
+    const handle = entry.handle;
+    entry.handle = undefined;
+    if (handle)
+        await handle.close();
+}
+async function closeRecordedEntries(entries) {
+    const errors = [];
+    for (const entry of entries) {
+        if (!entry)
+            continue;
+        try {
+            await closeRecordedEntry(entry);
+        }
+        catch (error) {
+            errors.push(`${entry.path}: ${message(error)}`);
+        }
+    }
+    return errors;
+}
+async function closeFileHandle(handle, pathLabel) {
+    try {
+        await handle.close();
+        return [];
+    }
+    catch (error) {
+        return [`${pathLabel}: ${message(error)}`];
+    }
+}
+export async function planSkillSetInstallation(options) {
+    const sourceRoot = path.resolve(options.sourceRoot);
+    const destination = safeRoot(options.destination, 'skill destination');
+    const codexMirror = options.codexMirror ? safeRoot(options.codexMirror, 'Codex mirror') : '';
+    const skills = unique(options.skills);
+    const cleanupCandidates = unique([...(options.legacySkills || []), ...(options.retiredSkills || [])]);
+    const replaceSkills = unique(options.replaceSkills || []);
+    validateManagedNames([...skills, ...cleanupCandidates, ...replaceSkills]);
+    const expected = await expectedInstallManifest(sourceRoot, skills);
+    const sourceDigest = manifestDigest(expected);
+    const receiptPath = path.join(destination, INSTALL_RECEIPT_NAME);
+    const operations = [];
+    const blockers = await nonMutatingInstallGateBlockers(destination);
+    let ownership;
+    try {
+        if (blockers.length)
+            throw new Error(blockers[0]);
+        ownership = await preflightInstallOwnership(destination, options.packageName, skills, cleanupCandidates, replaceSkills);
+    }
+    catch (error) {
+        if (!blockers.length)
+            blockers.push(message(error));
+    }
+    if (ownership) {
+        const replaceNames = new Set(ownership.replaceNames);
+        for (const skill of skills) {
+            const target = path.join(destination, skill);
+            const existing = await exists(target);
+            operations.push({
+                action: !existing
+                    ? 'create'
+                    : replaceSkills.includes(skill)
+                        ? 'replace_explicitly_authorized'
+                        : 'replace_managed',
+                skill,
+                path: target,
+                reason: !existing
+                    ? 'active skill is not installed'
+                    : replaceSkills.includes(skill)
+                        ? 'operator supplied an explicit per-skill replacement override'
+                        : 'existing skill ownership and complete content integrity match the yam receipt'
+            });
+        }
+        for (const skill of cleanupCandidates) {
+            if (!replaceNames.has(skill) || skills.includes(skill))
+                continue;
+            operations.push({
+                action: 'remove_retired',
+                skill,
+                path: path.join(destination, skill),
+                reason: 'retired or legacy skill is still proven yam-owned by the current receipt'
+            });
+        }
+        operations.push({
+            action: 'write_receipt',
+            skill: '',
+            path: receiptPath,
+            reason: ownership.receipt ? 'replace the verified yam ownership receipt' : 'create the yam ownership receipt'
+        });
+    }
+    const preservedPaths = codexMirror && codexMirror !== destination ? [codexMirror] : [];
+    const replaceNames = new Set(ownership?.replaceNames || []);
+    for (const skill of cleanupCandidates) {
+        if (replaceNames.has(skill) || !await exists(path.join(destination, skill)))
+            continue;
+        preservedPaths.push(path.join(destination, skill));
+    }
+    preservedPaths.sort(compareStableText);
+    const planBasis = {
+        package: { name: options.packageName, version: options.version },
+        source: { root: sourceRoot, digest: sourceDigest, file_count: expected.length },
+        destination,
+        receipt_path: receiptPath,
+        operations,
+        preserved_paths: preservedPaths,
+        blockers
+    };
+    const planDigest = createHash('sha256').update(JSON.stringify(planBasis)).digest('hex');
+    const ready = blockers.length === 0;
+    return {
+        schema: 'yam.install-plan.v1',
+        generated_at: (options.now || (() => new Date()))().toISOString(),
+        mutation_authorized: false,
+        ...planBasis,
+        ready,
+        truth_status: ready ? 'verified' : 'blocked',
+        plan_digest: planDigest,
+        next_action: ready
+            ? 'review this non-mutating plan, then run `yam install` without --dry-run to authorize the transaction'
+            : 'resolve the listed lock, recovery, destination, or ownership blocker without deleting unreviewed state, then regenerate the plan'
+    };
+}
+async function nonMutatingInstallGateBlockers(destination) {
+    let stat;
+    try {
+        stat = await fsp.lstat(destination);
+    }
+    catch (error) {
+        if (error.code === 'ENOENT')
+            return [];
+        return [`skill destination cannot be inspected: ${message(error)}`];
+    }
+    if (!stat.isDirectory() || stat.isSymbolicLink()) {
+        return [`skill destination must be a regular physical directory: ${destination}`];
+    }
+    const blockers = [];
+    const lockPath = path.join(destination, INSTALL_LOCK_NAME);
+    if (await exists(lockPath)) {
+        blockers.push(`another yam install may be active; lock exists at ${lockPath}`);
+    }
+    try {
+        const recoveryArtifacts = await findInstallRecoveryArtifacts(destination);
+        if (recoveryArtifacts.length) {
+            blockers.push(`unfinished yam install transaction requires inspection: ${recoveryArtifacts.join(', ')}`);
+        }
+    }
+    catch (error) {
+        blockers.push(`install recovery state cannot be inspected: ${message(error)}`);
+    }
+    return blockers;
+}
 export async function installSkillSetTransactional(options) {
     const sourceRoot = path.resolve(options.sourceRoot);
     const destination = safeRoot(options.destination, 'skill destination');
@@ -678,6 +1277,7 @@ export async function installSkillSetTransactional(options) {
     let result;
     let primaryError;
     try {
+        await revalidateRegularParentPath(lock.destinationIdentity, 'skill destination');
         const recoveryArtifacts = await findInstallRecoveryArtifacts(destination);
         if (recoveryArtifacts.length) {
             throw new Error(`unfinished yam install transaction found: ${recoveryArtifacts.join(', ')}. `
@@ -687,23 +1287,25 @@ export async function installSkillSetTransactional(options) {
         const expected = await expectedInstallManifest(sourceRoot, skills);
         const transactionId = options.transactionId || randomUUID();
         const transactionRoot = await fsp.mkdtemp(path.join(destination, '.yam-flow-install-'));
+        const transactionEntry = await captureTransactionRoot(transactionRoot, 'install transaction root');
         const stagedRoot = path.join(transactionRoot, 'staged');
         const backupRoot = path.join(transactionRoot, 'backup');
         const stagedReceiptPath = path.join(transactionRoot, 'receipt.json');
         const destinationReceiptPath = path.join(destination, INSTALL_RECEIPT_NAME);
         const receiptBackupPath = path.join(transactionRoot, 'receipt.backup');
         const installedEntries = [];
+        const receiptInstalledEntries = [];
         let destinationBackups = [];
         let receiptBackedUp = false;
-        let receiptInstalled = false;
+        let receiptInstalled;
         let mutationStarted = false;
         try {
             await fsp.mkdir(stagedRoot, { recursive: true });
             for (const skill of skills) {
                 const stagedSkill = path.join(stagedRoot, skill);
                 await fsp.mkdir(stagedSkill, { recursive: true });
-                await fsp.copyFile(path.join(sourceRoot, 'skills', skill, 'SKILL.md'), path.join(stagedSkill, 'SKILL.md'));
-                await copyTree(path.join(sourceRoot, 'references'), path.join(stagedSkill, 'references'));
+                await copyRegularFile(path.join(sourceRoot, 'skills', skill, 'SKILL.md'), path.join(stagedSkill, 'SKILL.md'), sourceRoot, stagedRoot);
+                await copyTree(path.join(sourceRoot, 'references'), path.join(stagedSkill, 'references'), sourceRoot, stagedRoot);
             }
             const stagedManifest = await collectTreeManifest(stagedRoot);
             const stagedIssues = manifestIssues(expected, stagedManifest, 'staged install');
@@ -729,24 +1331,31 @@ export async function installSkillSetTransactional(options) {
             const mutationOwnership = await preflightInstallOwnership(destination, options.packageName, skills, cleanupCandidates, replaceSkills);
             const mutationSnapshot = await captureMutationSnapshot(destination, options.packageName, mutationOwnership.replaceNames, replaceSkills);
             await options.failpoint?.({ phase: 'before-mutation' });
+            await revalidateRegularParentPath(lock.destinationIdentity, 'skill destination');
             mutationStarted = true;
             await moveExistingEntries(destination, mutationOwnership.replaceNames, backupRoot, destinationBackups);
             if (await exists(destinationReceiptPath)) {
-                await fsp.rename(destinationReceiptPath, receiptBackupPath);
-                receiptBackedUp = true;
+                await moveRegularFile(destinationReceiptPath, receiptBackupPath, destination, transactionRoot, 'install receipt backup', () => { receiptBackedUp = true; });
             }
             await verifyMovedMutationSnapshot(destination, mutationSnapshot, destinationBackups, receiptBackedUp, receiptBackupPath);
             await options.failpoint?.({ phase: 'after-backup' });
+            await revalidateRegularParentPath(lock.destinationIdentity, 'skill destination');
             for (const skill of skills) {
+                await revalidateRegularParentPath(lock.destinationIdentity, 'skill destination');
                 const target = path.join(destination, skill);
-                await fsp.rename(path.join(stagedRoot, skill), target);
-                installedEntries.push(target);
+                const installedEntry = await moveRegularDirectory(path.join(stagedRoot, skill), target, stagedRoot, destination, 'staged skill install', undefined, installedEntries);
+                if (!installedEntry)
+                    throw new Error(`staged skill install identity was not recorded: ${target}`);
                 await options.failpoint?.({ phase: 'skill-installed', skill });
             }
-            await fsp.rename(stagedReceiptPath, destinationReceiptPath);
-            receiptInstalled = true;
+            await revalidateRegularParentPath(lock.destinationIdentity, 'skill destination');
+            receiptInstalled = await moveRegularFile(stagedReceiptPath, destinationReceiptPath, transactionRoot, destination, 'staged install receipt', undefined, receiptInstalledEntries);
+            if (!receiptInstalled) {
+                throw new Error(`staged install receipt identity was not recorded: ${destinationReceiptPath}`);
+            }
             await options.failpoint?.({ phase: 'receipt-installed' });
             await options.failpoint?.({ phase: 'before-verify' });
+            await revalidateRegularParentPath(lock.destinationIdentity, 'skill destination');
             const inspection = await inspectSkillInstallation({
                 sourceRoot,
                 destination,
@@ -757,15 +1366,15 @@ export async function installSkillSetTransactional(options) {
             });
             if (!inspection.ok)
                 throw new Error(`post-install verification failed: ${inspection.issues.join('; ')}`);
-            for (const cleanup of [transactionRoot]) {
-                if (!cleanup)
-                    continue;
-                try {
-                    await fsp.rm(cleanup, { recursive: true, force: true });
-                }
-                catch (error) {
-                    cleanupWarnings.push(`verified install retained cleanup artifact ${cleanup}: ${message(error)}`);
-                }
+            const ownershipHandleErrors = await closeRecordedEntries([receiptInstalled, ...installedEntries]);
+            if (ownershipHandleErrors.length) {
+                cleanupWarnings.push(`verified install identity handle cleanup failed: ${ownershipHandleErrors.join('; ')}`);
+            }
+            try {
+                await removeRecordedEntry(transactionEntry, 'install transaction cleanup');
+            }
+            catch (error) {
+                cleanupWarnings.push(`verified install retained cleanup artifact ${transactionRoot}: ${message(error)}`);
             }
             result = {
                 receipt,
@@ -777,16 +1386,25 @@ export async function installSkillSetTransactional(options) {
         }
         catch (error) {
             const rollbackErrors = [];
-            if (mutationStarted) {
+            receiptInstalled ||= receiptInstalledEntries[0];
+            let destinationStillOwned = true;
+            try {
+                await revalidateRegularParentPath(lock.destinationIdentity, 'skill destination');
+            }
+            catch (identityError) {
+                destinationStillOwned = false;
+                rollbackErrors.push(`skill destination identity changed; path-based rollback was not attempted: ${message(identityError)}`);
+            }
+            if (mutationStarted && destinationStillOwned) {
                 if (receiptInstalled)
-                    rollbackErrors.push(...await removeInstalledEntries([destinationReceiptPath]));
+                    rollbackErrors.push(...await removeInstalledEntries([receiptInstalled]));
                 rollbackErrors.push(...await removeInstalledEntries(installedEntries));
                 rollbackErrors.push(...await restoreMovedEntries(destinationBackups));
                 if (receiptBackedUp) {
                     try {
                         if (await exists(destinationReceiptPath))
                             throw new Error(`rollback target unexpectedly exists: ${destinationReceiptPath}`);
-                        await fsp.rename(receiptBackupPath, destinationReceiptPath);
+                        await moveRegularFile(receiptBackupPath, destinationReceiptPath, transactionRoot, destination, 'install receipt rollback');
                     }
                     catch (receiptError) {
                         rollbackErrors.push(message(receiptError));
@@ -795,15 +1413,11 @@ export async function installSkillSetTransactional(options) {
             }
             if (rollbackErrors.length === 0) {
                 const cleanupErrors = [];
-                for (const cleanup of [transactionRoot]) {
-                    if (!cleanup)
-                        continue;
-                    try {
-                        await fsp.rm(cleanup, { recursive: true, force: true });
-                    }
-                    catch (cleanupError) {
-                        cleanupErrors.push(`${cleanup}: ${message(cleanupError)}`);
-                    }
+                try {
+                    await removeRecordedEntry(transactionEntry, 'install transaction cleanup');
+                }
+                catch (cleanupError) {
+                    cleanupErrors.push(`${transactionRoot}: ${message(cleanupError)}`);
                 }
                 if (cleanupErrors.length) {
                     throw new Error(`yam install failed; previous installation state restored, but transaction cleanup is incomplete: ${message(error)}. `
@@ -811,6 +1425,8 @@ export async function installSkillSetTransactional(options) {
                 }
                 throw new Error(`yam install failed; previous installation state restored: ${message(error)}`);
             }
+            const retainedHandleErrors = await closeRecordedEntries([transactionEntry, receiptInstalled, ...installedEntries]);
+            rollbackErrors.push(...retainedHandleErrors.map((item) => `identity handle cleanup failed: ${item}`));
             throw new Error(`yam install failed and rollback is incomplete: ${message(error)}. `
                 + `Recovery artifacts were kept at ${transactionRoot}. `
                 + `Rollback errors: ${rollbackErrors.join('; ')}`);
@@ -820,17 +1436,16 @@ export async function installSkillSetTransactional(options) {
         primaryError = error;
     }
     const lockCleanupErrors = [];
+    lockCleanupErrors.push(...await closeFileHandle(lock.handle, lock.lockPath));
     try {
-        await lock.handle.close();
+        await revalidateRegularParentPath(lock.destinationIdentity, 'skill destination');
+        await removeRecordedEntry(lock.lockIdentity, 'install lock cleanup');
     }
     catch (error) {
         lockCleanupErrors.push(message(error));
     }
-    try {
-        await fsp.rm(lock.lockPath, { force: true });
-    }
-    catch (error) {
-        lockCleanupErrors.push(message(error));
+    finally {
+        lockCleanupErrors.push(...await closeRecordedEntries([lock.lockIdentity]));
     }
     if (lockCleanupErrors.length) {
         const warning = `install lock cleanup failed at ${lock.lockPath}: ${lockCleanupErrors.join('; ')}`;
@@ -860,6 +1475,7 @@ export async function uninstallSkillSetSafely(options) {
     let result;
     let primaryError;
     try {
+        await revalidateRegularParentPath(lock.destinationIdentity, 'skill destination');
         const recoveryArtifacts = await findInstallRecoveryArtifacts(destination);
         if (recoveryArtifacts.length) {
             throw new Error(`unfinished yam install transaction found: ${recoveryArtifacts.join(', ')}. `
@@ -867,6 +1483,7 @@ export async function uninstallSkillSetSafely(options) {
         }
         await preflightSafeUninstallOwnership(destination, options.packageName, skills);
         const transactionRoot = await fsp.mkdtemp(path.join(destination, '.yam-flow-install-uninstall-'));
+        const transactionEntry = await captureTransactionRoot(transactionRoot, 'uninstall transaction root');
         const backupRoot = path.join(transactionRoot, 'backup');
         const receiptPath = path.join(destination, INSTALL_RECEIPT_NAME);
         const receiptBackup = path.join(transactionRoot, INSTALL_RECEIPT_NAME);
@@ -877,13 +1494,15 @@ export async function uninstallSkillSetSafely(options) {
             await preflightSafeUninstallOwnership(destination, options.packageName, skills);
             const mutationSnapshot = await captureMutationSnapshot(destination, options.packageName, skills, []);
             await options.failpoint?.({ phase: 'before-mutation' });
+            await revalidateRegularParentPath(lock.destinationIdentity, 'skill destination');
             mutationStarted = true;
             await moveExistingEntries(destination, skills, backupRoot, moved);
-            await fsp.rename(receiptPath, receiptBackup);
-            receiptMoved = true;
+            await moveRegularFile(receiptPath, receiptBackup, destination, transactionRoot, 'uninstall receipt backup', () => { receiptMoved = true; });
             await verifyMovedMutationSnapshot(destination, mutationSnapshot, moved, receiptMoved, receiptBackup);
             await options.failpoint?.({ phase: 'after-backup' });
+            await revalidateRegularParentPath(lock.destinationIdentity, 'skill destination');
             await options.failpoint?.({ phase: 'before-verify' });
+            await revalidateRegularParentPath(lock.destinationIdentity, 'skill destination');
             const remaining = [];
             for (const skill of skills) {
                 if (await exists(path.join(destination, skill)))
@@ -895,7 +1514,7 @@ export async function uninstallSkillSetSafely(options) {
                 throw new Error(`post-uninstall verification found active entries: ${remaining.join(', ')}`);
             }
             try {
-                await fsp.rm(transactionRoot, { recursive: true, force: true });
+                await removeRecordedEntry(transactionEntry, 'uninstall transaction cleanup');
             }
             catch (error) {
                 cleanupWarnings.push(`verified uninstall retained cleanup artifact ${transactionRoot}: ${message(error)}`);
@@ -908,12 +1527,20 @@ export async function uninstallSkillSetSafely(options) {
         }
         catch (error) {
             const rollbackErrors = [];
-            if (mutationStarted) {
+            let destinationStillOwned = true;
+            try {
+                await revalidateRegularParentPath(lock.destinationIdentity, 'skill destination');
+            }
+            catch (identityError) {
+                destinationStillOwned = false;
+                rollbackErrors.push(`skill destination identity changed; path-based rollback was not attempted: ${message(identityError)}`);
+            }
+            if (mutationStarted && destinationStillOwned) {
                 if (receiptMoved) {
                     try {
                         if (await exists(receiptPath))
                             throw new Error(`rollback target unexpectedly exists: ${receiptPath}`);
-                        await fsp.rename(receiptBackup, receiptPath);
+                        await moveRegularFile(receiptBackup, receiptPath, transactionRoot, destination, 'uninstall receipt rollback');
                     }
                     catch (receiptError) {
                         rollbackErrors.push(message(receiptError));
@@ -923,7 +1550,7 @@ export async function uninstallSkillSetSafely(options) {
             }
             if (rollbackErrors.length === 0) {
                 try {
-                    await fsp.rm(transactionRoot, { recursive: true, force: true });
+                    await removeRecordedEntry(transactionEntry, 'uninstall transaction cleanup');
                 }
                 catch (cleanupError) {
                     throw new Error(`yam uninstall failed; previous installation state restored, but transaction cleanup is incomplete: ${message(error)}. `
@@ -931,6 +1558,8 @@ export async function uninstallSkillSetSafely(options) {
                 }
                 throw new Error(`yam uninstall failed; previous installation state restored: ${message(error)}`);
             }
+            const retainedHandleErrors = await closeRecordedEntries([transactionEntry]);
+            rollbackErrors.push(...retainedHandleErrors.map((item) => `identity handle cleanup failed: ${item}`));
             throw new Error(`yam uninstall failed and rollback is incomplete: ${message(error)}. `
                 + `Recovery artifacts were kept at ${transactionRoot}. Rollback errors: ${rollbackErrors.join('; ')}`);
         }
@@ -939,17 +1568,16 @@ export async function uninstallSkillSetSafely(options) {
         primaryError = error;
     }
     const lockCleanupErrors = [];
+    lockCleanupErrors.push(...await closeFileHandle(lock.handle, lock.lockPath));
     try {
-        await lock.handle.close();
+        await revalidateRegularParentPath(lock.destinationIdentity, 'skill destination');
+        await removeRecordedEntry(lock.lockIdentity, 'install lock cleanup');
     }
     catch (error) {
         lockCleanupErrors.push(message(error));
     }
-    try {
-        await fsp.rm(lock.lockPath, { force: true });
-    }
-    catch (error) {
-        lockCleanupErrors.push(message(error));
+    finally {
+        lockCleanupErrors.push(...await closeRecordedEntries([lock.lockIdentity]));
     }
     if (lockCleanupErrors.length) {
         const warning = `install lock cleanup failed at ${lock.lockPath}: ${lockCleanupErrors.join('; ')}`;