@tickernelz/paperclip-pro-adapter-utils 2026.925.0

package/dist/workspace-restore-merge.test.js

@@ -0,0 +1,438 @@
+import { createHash } from "node:crypto";
+import { promises as fsPromises } from "node:fs";
+import { chmod, lstat, mkdir, mkdtemp, readFile, readdir, realpath, rm, stat, symlink, writeFile } from "node:fs/promises";
+import net from "node:net";
+import os from "node:os";
+import path from "node:path";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { resolvePaperclipInstanceRootForAdapter } from "./server-utils.js";
+import { captureDirectorySnapshot, directorySnapshotSha256, classifyWorkspaceRestoreFailure, describeWorkspaceRestoreFailure, mergeDirectoryWithBaseline, parseDirectorySnapshot, serializeDirectorySnapshot, withDirectoryMergeLock, WORKSPACE_RESTORE_LOCK_TIMEOUT_CODE, } from "./workspace-restore-merge.js";
+describe("workspace restore merge", () => {
+    const cleanupDirs = [];
+    afterEach(async () => {
+        while (cleanupDirs.length > 0) {
+            const dir = cleanupDirs.pop();
+            if (!dir)
+                continue;
+            await rm(dir, { recursive: true, force: true }).catch(() => undefined);
+        }
+    });
+    it("round-trips a deterministic durable snapshot and rejects traversal", async () => {
+        const rootDir = await mkdtemp(path.join(os.tmpdir(), "paperclip-snapshot-"));
+        cleanupDirs.push(rootDir);
+        await mkdir(path.join(rootDir, "nested"), { recursive: true });
+        await writeFile(path.join(rootDir, "b.txt"), "bravo\n", "utf8");
+        await writeFile(path.join(rootDir, "nested", "a.txt"), "alpha\n", "utf8");
+        const snapshot = await captureDirectorySnapshot(rootDir, { exclude: [] });
+        const serialized = serializeDirectorySnapshot(snapshot);
+        const restored = parseDirectorySnapshot(serialized);
+        expect(serialized.entries.map(([relativePath]) => relativePath)).toEqual([
+            "b.txt",
+            "nested",
+            "nested/a.txt",
+        ]);
+        expect(restored).not.toBeNull();
+        expect(directorySnapshotSha256(restored)).toBe(directorySnapshotSha256(snapshot));
+        expect(parseDirectorySnapshot({
+            ...serialized,
+            entries: [["../escape", serialized.entries[0][1]]],
+        })).toBeNull();
+    });
+    it("preserves sibling files when sequential stale-baseline restores create the same nested directory tree", async () => {
+        const rootDir = await mkdtemp(path.join(os.tmpdir(), "paperclip-restore-merge-"));
+        cleanupDirs.push(rootDir);
+        const targetDir = path.join(rootDir, "target");
+        const sourceADir = path.join(rootDir, "source-a");
+        const sourceBDir = path.join(rootDir, "source-b");
+        await mkdir(targetDir, { recursive: true });
+        await mkdir(path.join(sourceADir, "manual-qa", "environment-matrix", "ssh"), { recursive: true });
+        await mkdir(path.join(sourceBDir, "manual-qa", "environment-matrix", "ssh"), { recursive: true });
+        const baseline = await captureDirectorySnapshot(targetDir, { exclude: [] });
+        await writeFile(path.join(sourceADir, "manual-qa", "environment-matrix", "ssh", "claude_local.md"), "ssh claude\n", "utf8");
+        await writeFile(path.join(sourceBDir, "manual-qa", "environment-matrix", "ssh", "codex_local.md"), "ssh codex\n", "utf8");
+        await mergeDirectoryWithBaseline({
+            baseline,
+            sourceDir: sourceADir,
+            targetDir,
+        });
+        await mergeDirectoryWithBaseline({
+            baseline,
+            sourceDir: sourceBDir,
+            targetDir,
+        });
+        await expect(readFile(path.join(targetDir, "manual-qa", "environment-matrix", "ssh", "claude_local.md"), "utf8")).resolves.toBe("ssh claude\n");
+        await expect(readFile(path.join(targetDir, "manual-qa", "environment-matrix", "ssh", "codex_local.md"), "utf8")).resolves.toBe("ssh codex\n");
+    });
+    it("ignores non-file entries when capturing snapshots", async () => {
+        if (process.platform === "win32")
+            return;
+        const rootDir = await mkdtemp(path.join(os.tmpdir(), "paperclip-restore-merge-"));
+        cleanupDirs.push(rootDir);
+        const socketPath = path.join(rootDir, "runtime.sock");
+        const server = net.createServer();
+        try {
+            await new Promise((resolve, reject) => {
+                server.once("error", reject);
+                server.listen(socketPath, resolve);
+            });
+            const snapshot = await captureDirectorySnapshot(rootDir, { exclude: [] });
+            expect(snapshot.entries.has("runtime.sock")).toBe(false);
+        }
+        finally {
+            await new Promise((resolve) => server.close(() => resolve()));
+        }
+    });
+    describe("classifyWorkspaceRestoreFailure", () => {
+        it("maps an EACCES error to restore_permission_denied", () => {
+            const error = new Error("permission denied");
+            error.code = "EACCES";
+            expect(classifyWorkspaceRestoreFailure(error)).toBe("restore_permission_denied");
+        });
+        it("maps an EPERM error to restore_permission_denied", () => {
+            const error = new Error("operation not permitted");
+            error.code = "EPERM";
+            expect(classifyWorkspaceRestoreFailure(error)).toBe("restore_permission_denied");
+        });
+        it("maps the lock-timeout code to restore_lock_timeout", () => {
+            const error = new Error("Timed out waiting for workspace restore lock at /some/path");
+            error.code = WORKSPACE_RESTORE_LOCK_TIMEOUT_CODE;
+            expect(classifyWorkspaceRestoreFailure(error)).toBe("restore_lock_timeout");
+        });
+        it("maps an unrecognized error, a string, and null to the default restore_failed code", () => {
+            expect(classifyWorkspaceRestoreFailure(new Error("some other failure"))).toBe("restore_failed");
+            expect(classifyWorkspaceRestoreFailure("a plain string")).toBe("restore_failed");
+            expect(classifyWorkspaceRestoreFailure(null)).toBe("restore_failed");
+        });
+    });
+    describe("describeWorkspaceRestoreFailure", () => {
+        it("returns one fixed diagnostic line per allowlisted code, and no other text", () => {
+            expect(describeWorkspaceRestoreFailure("restore_permission_denied")).toBe("the restore could not write to the workspace (permission denied)");
+            expect(describeWorkspaceRestoreFailure("restore_lock_timeout")).toBe("the restore timed out waiting for the workspace merge lock");
+            expect(describeWorkspaceRestoreFailure("restore_failed")).toBe("the restore failed");
+        });
+        it("never reflects a sentinel host path or process id, however the caught error is classified", () => {
+            const sentinelPath = "/srv/telemetry-backend";
+            const sentinelPid = String(process.pid);
+            const error = new Error(`EACCES: permission denied, mkdir '${sentinelPath}.paperclip-restore.lock' (pid ${sentinelPid})`);
+            error.code = "EACCES";
+            const line = describeWorkspaceRestoreFailure(classifyWorkspaceRestoreFailure(error));
+            expect(line).not.toContain(sentinelPath);
+            expect(line).not.toContain(sentinelPid);
+            expect(line).not.toContain(error.message);
+        });
+    });
+    describe("instance-scoped directory merge lock", () => {
+        // Points PAPERCLIP_HOME (and, where noted, PAPERCLIP_INSTANCE_ID) at a
+        // temporary directory so the lock root never touches the real Paperclip
+        // instance, then restores the previous values. Mirrors the save-and-restore
+        // pattern in acpx-engine/execute.test.ts.
+        let previousHome;
+        let previousInstanceId;
+        function useTempPaperclipHome(homeDir, instanceId) {
+            previousHome = process.env.PAPERCLIP_HOME;
+            previousInstanceId = process.env.PAPERCLIP_INSTANCE_ID;
+            process.env.PAPERCLIP_HOME = homeDir;
+            process.env.PAPERCLIP_INSTANCE_ID = instanceId;
+        }
+        afterEach(() => {
+            if (previousHome === undefined)
+                delete process.env.PAPERCLIP_HOME;
+            else
+                process.env.PAPERCLIP_HOME = previousHome;
+            if (previousInstanceId === undefined)
+                delete process.env.PAPERCLIP_INSTANCE_ID;
+            else
+                process.env.PAPERCLIP_INSTANCE_ID = previousInstanceId;
+            previousHome = undefined;
+            previousInstanceId = undefined;
+        });
+        it.skipIf(process.platform === "win32")("restores successfully when the parent directory of the target is not writable", async () => {
+            const rootDir = await mkdtemp(path.join(os.tmpdir(), "paperclip-restore-merge-"));
+            cleanupDirs.push(rootDir);
+            useTempPaperclipHome(path.join(rootDir, "paperclip-home"), "test-instance");
+            // The old lock sat beside the target, so it needed mkdir rights in the
+            // target's parent. The new lock root lives under PAPERCLIP_HOME instead,
+            // so a read-only parent must no longer block a restore.
+            const readOnlyParent = path.join(rootDir, "read-only-parent");
+            const targetDir = path.join(readOnlyParent, "target");
+            const sourceDir = path.join(rootDir, "source");
+            await mkdir(targetDir, { recursive: true });
+            await mkdir(sourceDir, { recursive: true });
+            const baseline = await captureDirectorySnapshot(targetDir, { exclude: [] });
+            await writeFile(path.join(sourceDir, "new-file.md"), "new content\n", "utf8");
+            await chmod(readOnlyParent, 0o500);
+            try {
+                await mergeDirectoryWithBaseline({ baseline, sourceDir, targetDir });
+            }
+            finally {
+                // Restore write access so the outer afterEach can remove rootDir.
+                await chmod(readOnlyParent, 0o700).catch(() => undefined);
+            }
+            await expect(readFile(path.join(targetDir, "new-file.md"), "utf8")).resolves.toBe("new content\n");
+        });
+        it.skipIf(process.platform === "win32")("acquires the same lock for two alias paths that resolve to one canonical target", async () => {
+            const rootDir = await mkdtemp(path.join(os.tmpdir(), "paperclip-restore-merge-"));
+            cleanupDirs.push(rootDir);
+            const paperclipHome = path.join(rootDir, "paperclip-home");
+            useTempPaperclipHome(paperclipHome, "test-instance");
+            const targetDir = path.join(rootDir, "target");
+            const aliasDir = path.join(rootDir, "target-alias");
+            await mkdir(targetDir, { recursive: true });
+            await symlink(targetDir, aliasDir);
+            const lockRootDir = path.join(paperclipHome, "instances", "test-instance", "locks", "directory-merge");
+            let lockNameViaTarget = "";
+            await withDirectoryMergeLock(targetDir, async () => {
+                const entries = await readdir(lockRootDir);
+                lockNameViaTarget = entries[0] ?? "";
+            });
+            let lockNameViaAlias = "";
+            await withDirectoryMergeLock(aliasDir, async () => {
+                const entries = await readdir(lockRootDir);
+                lockNameViaAlias = entries[0] ?? "";
+            });
+            expect(lockNameViaTarget).not.toBe("");
+            expect(lockNameViaAlias).toBe(lockNameViaTarget);
+        });
+        it("rejects a lock root that already exists as a symlink", async () => {
+            const rootDir = await mkdtemp(path.join(os.tmpdir(), "paperclip-restore-merge-"));
+            cleanupDirs.push(rootDir);
+            const paperclipHome = path.join(rootDir, "paperclip-home");
+            useTempPaperclipHome(paperclipHome, "test-instance");
+            const locksDir = path.join(paperclipHome, "instances", "test-instance", "locks");
+            const decoyDir = path.join(rootDir, "decoy");
+            await mkdir(locksDir, { recursive: true });
+            await mkdir(decoyDir, { recursive: true });
+            await symlink(decoyDir, path.join(locksDir, "directory-merge"));
+            const targetDir = path.join(rootDir, "target");
+            await mkdir(targetDir, { recursive: true });
+            await expect(withDirectoryMergeLock(targetDir, async () => undefined)).rejects.toThrow(/not a plain directory/);
+        });
+        it("rejects a lock root that already exists as a non-directory", async () => {
+            const rootDir = await mkdtemp(path.join(os.tmpdir(), "paperclip-restore-merge-"));
+            cleanupDirs.push(rootDir);
+            const paperclipHome = path.join(rootDir, "paperclip-home");
+            useTempPaperclipHome(paperclipHome, "test-instance");
+            const locksDir = path.join(paperclipHome, "instances", "test-instance", "locks");
+            await mkdir(locksDir, { recursive: true });
+            await writeFile(path.join(locksDir, "directory-merge"), "not a directory\n", "utf8");
+            const targetDir = path.join(rootDir, "target");
+            await mkdir(targetDir, { recursive: true });
+            await expect(withDirectoryMergeLock(targetDir, async () => undefined)).rejects.toThrow(/not a plain directory/);
+        });
+        it("closes the create/validate TOCTOU window: rejects a lock root a racing writer swapped for a symlink during creation", async () => {
+            const rootDir = await mkdtemp(path.join(os.tmpdir(), "paperclip-restore-merge-"));
+            cleanupDirs.push(rootDir);
+            const paperclipHome = path.join(rootDir, "paperclip-home");
+            useTempPaperclipHome(paperclipHome, "test-instance");
+            const targetDir = path.join(rootDir, "target");
+            await mkdir(targetDir, { recursive: true });
+            const decoyDir = path.join(rootDir, "decoy");
+            await mkdir(decoyDir, { recursive: true });
+            // Pre-create the lock root's parent, so the mock below only has to
+            // reproduce what `fs.mkdir({ recursive: true })` does to the leaf path.
+            await mkdir(path.join(paperclipHome, "instances", "test-instance", "locks"), { recursive: true });
+            // Real `fs.mkdir({ recursive: true })` does not fail on a leaf that
+            // already exists as a symlink to a real directory. This stub reproduces
+            // exactly that: it plants a symlink to the attacker-controlled decoy
+            // directory in the window between the resolver's own "does the root
+            // exist yet" check and its own `mkdir` call, then resolves the way a
+            // real `mkdir` would (silently) — proving the resolver must validate
+            // what `mkdir` actually left behind, not trust that the call resolved.
+            const mkdirSpy = vi.spyOn(fsPromises, "mkdir").mockImplementationOnce(async (dirPath) => {
+                await symlink(decoyDir, dirPath);
+                return undefined;
+            });
+            try {
+                await expect(withDirectoryMergeLock(targetDir, async () => undefined)).rejects.toThrow(/not a plain directory/);
+            }
+            finally {
+                mkdirSpy.mockRestore();
+            }
+        });
+        it("creates the lock root at mode 0o700 and removes the lock directory after release", async () => {
+            const rootDir = await mkdtemp(path.join(os.tmpdir(), "paperclip-restore-merge-"));
+            cleanupDirs.push(rootDir);
+            const paperclipHome = path.join(rootDir, "paperclip-home");
+            useTempPaperclipHome(paperclipHome, "test-instance");
+            const targetDir = path.join(rootDir, "target");
+            await mkdir(targetDir, { recursive: true });
+            const lockRootDir = path.join(paperclipHome, "instances", "test-instance", "locks", "directory-merge");
+            let entriesDuringLock = [];
+            await withDirectoryMergeLock(targetDir, async () => {
+                entriesDuringLock = await readdir(lockRootDir);
+            });
+            expect((await stat(lockRootDir)).mode & 0o777).toBe(0o700);
+            expect(entriesDuringLock).toHaveLength(1);
+            await expect(readdir(lockRootDir)).resolves.toHaveLength(0);
+        });
+        it("classifies the real lock-timeout error by its stable code, never by the message text", async () => {
+            const rootDir = await mkdtemp(path.join(os.tmpdir(), "paperclip-restore-merge-"));
+            cleanupDirs.push(rootDir);
+            const paperclipHome = path.join(rootDir, "paperclip-home");
+            useTempPaperclipHome(paperclipHome, "test-instance");
+            const targetDir = path.join(rootDir, "target");
+            await mkdir(targetDir, { recursive: true });
+            // Pre-create the lock directory a live process holds, so `isLockStale`
+            // never reports it stale and the retry loop can only leave through the
+            // deadline check. The owner pid is this test process, which stays alive.
+            const canonicalTargetDir = await realpath(targetDir);
+            const lockKey = createHash("sha256").update(canonicalTargetDir).digest("hex");
+            const lockRootDir = path.join(paperclipHome, "instances", "test-instance", "locks", "directory-merge");
+            const heldLockDir = path.join(lockRootDir, `${lockKey}.lock`);
+            await mkdir(heldLockDir, { recursive: true });
+            await writeFile(path.join(heldLockDir, "owner.json"), `${JSON.stringify({ pid: process.pid, createdAt: new Date().toISOString() })}\n`, "utf8");
+            // Reach the real deadline without a real 30-second wait: the first
+            // `Date.now()` call computes the deadline (unchanged), and every call
+            // after reports a time far past it, so the retry loop's own deadline
+            // check — not a mocked message or a shortened constant — throws.
+            const realNow = Date.now();
+            const dateNowSpy = vi
+                .spyOn(Date, "now")
+                .mockImplementationOnce(() => realNow)
+                .mockImplementation(() => Number.MAX_SAFE_INTEGER);
+            let caughtError;
+            try {
+                await withDirectoryMergeLock(targetDir, async () => undefined);
+            }
+            catch (error) {
+                caughtError = error;
+            }
+            finally {
+                dateNowSpy.mockRestore();
+            }
+            expect(caughtError).toBeInstanceOf(Error);
+            expect(caughtError?.code).toBe(WORKSPACE_RESTORE_LOCK_TIMEOUT_CODE);
+            // The classifier reads only `code`; prove the message text carries no
+            // trace of the classified outcome, so a message-text match could not
+            // have produced this result.
+            expect(caughtError?.message).not.toContain("restore_lock_timeout");
+            expect(classifyWorkspaceRestoreFailure(caughtError)).toBe("restore_lock_timeout");
+        });
+        it.skipIf(process.platform === "win32")("serializes two concurrent writers that address one target through different aliases", async () => {
+            const rootDir = await mkdtemp(path.join(os.tmpdir(), "paperclip-restore-merge-"));
+            cleanupDirs.push(rootDir);
+            useTempPaperclipHome(path.join(rootDir, "paperclip-home"), "test-instance");
+            const targetDir = path.join(rootDir, "target");
+            const aliasDir = path.join(rootDir, "target-alias");
+            await mkdir(targetDir, { recursive: true });
+            await symlink(targetDir, aliasDir);
+            let active = false;
+            let overlapCount = 0;
+            let completedCount = 0;
+            const runWriter = (dir) => withDirectoryMergeLock(dir, async () => {
+                if (active)
+                    overlapCount += 1;
+                active = true;
+                await new Promise((resolve) => setTimeout(resolve, 30));
+                active = false;
+                completedCount += 1;
+            });
+            await Promise.all([runWriter(targetDir), runWriter(aliasDir)]);
+            expect(overlapCount).toBe(0);
+            expect(completedCount).toBe(2);
+        });
+    });
+    describe("caller-provided env for the lock root", () => {
+        // These tests never touch `process.env`. They prove `withDirectoryMergeLock`
+        // resolves the lock root from a caller's own `env` object — the shape every
+        // environment-parameterized Codex credential call site holds — instead of
+        // always reading `process.env`.
+        it("two callers that pass the same env with a temporary PAPERCLIP_HOME take the same lock under that home", async () => {
+            const rootDir = await mkdtemp(path.join(os.tmpdir(), "paperclip-restore-merge-"));
+            cleanupDirs.push(rootDir);
+            const explicitHome = path.join(rootDir, "explicit-home");
+            const env = { PAPERCLIP_HOME: explicitHome, PAPERCLIP_INSTANCE_ID: "test-instance" };
+            const targetDir = path.join(rootDir, "target");
+            await mkdir(targetDir, { recursive: true });
+            const lockRootDir = path.join(explicitHome, "instances", "test-instance", "locks", "directory-merge");
+            let lockNameFirstCaller = "";
+            await withDirectoryMergeLock(targetDir, async () => {
+                const entries = await readdir(lockRootDir);
+                lockNameFirstCaller = entries[0] ?? "";
+            }, env);
+            let lockNameSecondCaller = "";
+            await withDirectoryMergeLock(targetDir, async () => {
+                const entries = await readdir(lockRootDir);
+                lockNameSecondCaller = entries[0] ?? "";
+            }, env);
+            expect(lockNameFirstCaller).not.toBe("");
+            expect(lockNameSecondCaller).toBe(lockNameFirstCaller);
+            expect(lockRootDir.startsWith(explicitHome + path.sep)).toBe(true);
+        });
+        it("does not write a lock entry under process.env.PAPERCLIP_HOME when the caller passes its own env", async () => {
+            const rootDir = await mkdtemp(path.join(os.tmpdir(), "paperclip-restore-merge-"));
+            cleanupDirs.push(rootDir);
+            const explicitHome = path.join(rootDir, "explicit-home");
+            const env = { PAPERCLIP_HOME: explicitHome, PAPERCLIP_INSTANCE_ID: "test-instance" };
+            const targetDir = path.join(rootDir, "target");
+            await mkdir(targetDir, { recursive: true });
+            const canonicalTargetDir = await realpath(targetDir);
+            const lockKey = createHash("sha256").update(canonicalTargetDir).digest("hex");
+            // Resolved with no `env` argument, so it reads `process.env` exactly the way
+            // the real instance root does — unaffected by the explicit `env` above.
+            const realInstanceRoot = resolvePaperclipInstanceRootForAdapter();
+            const realLockPath = path.join(realInstanceRoot, "locks", "directory-merge", `${lockKey}.lock`);
+            await withDirectoryMergeLock(targetDir, async () => undefined, env);
+            await expect(lstat(realLockPath)).rejects.toThrow();
+            const explicitLockRootDir = path.join(explicitHome, "instances", "test-instance", "locks", "directory-merge");
+            await expect(stat(explicitLockRootDir)).resolves.toBeTruthy();
+        });
+        it("resolves the lock root under the default instance id when the caller env sets PAPERCLIP_HOME but not PAPERCLIP_INSTANCE_ID, ignoring process.env.PAPERCLIP_INSTANCE_ID", async () => {
+            const rootDir = await mkdtemp(path.join(os.tmpdir(), "paperclip-restore-merge-"));
+            cleanupDirs.push(rootDir);
+            const explicitHome = path.join(rootDir, "explicit-home");
+            const env = { PAPERCLIP_HOME: explicitHome };
+            const previousInstanceId = process.env.PAPERCLIP_INSTANCE_ID;
+            process.env.PAPERCLIP_INSTANCE_ID = "wrong-instance";
+            try {
+                const targetDir = path.join(rootDir, "target");
+                await mkdir(targetDir, { recursive: true });
+                // The independent, no-caller-env resolution of "PAPERCLIP_HOME set,
+                // PAPERCLIP_INSTANCE_ID unset" — the expected default instance id.
+                const expectedInstanceRoot = resolvePaperclipInstanceRootForAdapter({ homeDir: explicitHome, env: {} });
+                const expectedLockRootDir = path.join(expectedInstanceRoot, "locks", "directory-merge");
+                const wrongInstanceLockRootDir = path.join(explicitHome, "instances", "wrong-instance", "locks", "directory-merge");
+                await withDirectoryMergeLock(targetDir, async () => undefined, env);
+                await expect(stat(expectedLockRootDir)).resolves.toBeTruthy();
+                await expect(stat(wrongInstanceLockRootDir)).rejects.toThrow();
+            }
+            finally {
+                if (previousInstanceId === undefined)
+                    delete process.env.PAPERCLIP_INSTANCE_ID;
+                else
+                    process.env.PAPERCLIP_INSTANCE_ID = previousInstanceId;
+            }
+        });
+        it("does not read process.env.PAPERCLIP_HOME when the caller env sets neither variable", async () => {
+            const rootDir = await mkdtemp(path.join(os.tmpdir(), "paperclip-restore-merge-"));
+            cleanupDirs.push(rootDir);
+            const fakeProcessHome = path.join(rootDir, "process-home");
+            const fallbackOsHome = path.join(rootDir, "os-home");
+            await mkdir(fallbackOsHome, { recursive: true });
+            const previousHome = process.env.PAPERCLIP_HOME;
+            process.env.PAPERCLIP_HOME = fakeProcessHome;
+            // Stand in for the real host home directory, so the "no env at all"
+            // fallback lands under a temp dir instead of the real ~/.paperclip-pro.
+            const homedirSpy = vi.spyOn(os, "homedir").mockReturnValue(fallbackOsHome);
+            try {
+                const targetDir = path.join(rootDir, "target");
+                await mkdir(targetDir, { recursive: true });
+                // The independent, no-caller-env resolution of "neither variable set" —
+                // the expected fallback root under the mocked home directory.
+                const expectedInstanceRoot = resolvePaperclipInstanceRootForAdapter({ env: {} });
+                const expectedLockRootDir = path.join(expectedInstanceRoot, "locks", "directory-merge");
+                await withDirectoryMergeLock(targetDir, async () => undefined, {});
+                await expect(stat(fakeProcessHome)).rejects.toThrow();
+                await expect(stat(expectedLockRootDir)).resolves.toBeTruthy();
+            }
+            finally {
+                homedirSpy.mockRestore();
+                if (previousHome === undefined)
+                    delete process.env.PAPERCLIP_HOME;
+                else
+                    process.env.PAPERCLIP_HOME = previousHome;
+            }
+        });
+    });
+});
+//# sourceMappingURL=workspace-restore-merge.test.js.map

package/dist/workspace-restore-merge.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-restore-merge.test.js","sourceRoot":"","sources":["../src/workspace-restore-merge.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,QAAQ,IAAI,UAAU,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC3H,OAAO,GAAG,MAAM,UAAU,CAAC;AAC3B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE7D,OAAO,EAAE,sCAAsC,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EACL,wBAAwB,EACxB,uBAAuB,EACvB,+BAA+B,EAC/B,+BAA+B,EAC/B,0BAA0B,EAC1B,sBAAsB,EACtB,0BAA0B,EAC1B,sBAAsB,EACtB,mCAAmC,GACpC,MAAM,8BAA8B,CAAC;AAEtC,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACvC,MAAM,WAAW,GAAa,EAAE,CAAC;IAEjC,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,OAAO,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9B,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;YAC9B,IAAI,CAAC,GAAG;gBAAE,SAAS;YACnB,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACzE,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oEAAoE,EAAE,KAAK,IAAI,EAAE;QAClF,MAAM,OAAO,GAAG,MAAM,OAAO,CAC3B,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,qBAAqB,CAAC,CAC9C,CAAC;QACF,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1B,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/D,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAChE,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAE1E,MAAM,QAAQ,GAAG,MAAM,wBAAwB,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;QAC1E,MAAM,UAAU,GAAG,0BAA0B,CAAC,QAAQ,CAAC,CAAC;QACxD,MAAM,QAAQ,GAAG,sBAAsB,CAAC,UAAU,CAAC,CAAC;QAEpD,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC;YACvE,OAAO;YACP,QAAQ;YACR,cAAc;SACf,CAAC,CAAC;QACH,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;QAChC,MAAM,CAAC,uBAAuB,CAAC,QAAS,CAAC,CAAC,CAAC,IAAI,CAC7C,uBAAuB,CAAC,QAAQ,CAAC,CAClC,CAAC;QACF,MAAM,CACJ,sBAAsB,CAAC;YACrB,GAAG,UAAU;YACb,OAAO,EAAE,CAAC,CAAC,WAAW,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,CAAC,CAAC;SACpD,CAAC,CACH,CAAC,QAAQ,EAAE,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uGAAuG,EAAE,KAAK,IAAI,EAAE;QACrH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,0BAA0B,CAAC,CAAC,CAAC;QAClF,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE1B,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAClD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAClD,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5C,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,oBAAoB,EAAE,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAClG,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,oBAAoB,EAAE,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAElG,MAAM,QAAQ,GAAG,MAAM,wBAAwB,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;QAE5E,MAAM,SAAS,CACb,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,oBAAoB,EAAE,KAAK,EAAE,iBAAiB,CAAC,EAClF,cAAc,EACd,MAAM,CACP,CAAC;QACF,MAAM,SAAS,CACb,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,oBAAoB,EAAE,KAAK,EAAE,gBAAgB,CAAC,EACjF,aAAa,EACb,MAAM,CACP,CAAC;QAEF,MAAM,0BAA0B,CAAC;YAC/B,QAAQ;YACR,SAAS,EAAE,UAAU;YACrB,SAAS;SACV,CAAC,CAAC;QACH,MAAM,0BAA0B,CAAC;YAC/B,QAAQ;YACR,SAAS,EAAE,UAAU;YACrB,SAAS;SACV,CAAC,CAAC;QAEH,MAAM,MAAM,CACV,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE,oBAAoB,EAAE,KAAK,EAAE,iBAAiB,CAAC,EAAE,MAAM,CAAC,CACpG,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAChC,MAAM,MAAM,CACV,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE,oBAAoB,EAAE,KAAK,EAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC,CACnG,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;QACjE,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO;YAAE,OAAO;QAEzC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,0BAA0B,CAAC,CAAC,CAAC;QAClF,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC;QAElC,IAAI,CAAC;YACH,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC1C,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBAC7B,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YACrC,CAAC,CAAC,CAAC;YAEH,MAAM,QAAQ,GAAG,MAAM,wBAAwB,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;YAE1E,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3D,CAAC;gBAAS,CAAC;YACT,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACtE,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;QAC/C,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;YAC3D,MAAM,KAAK,GAA0B,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;YACpE,KAAK,CAAC,IAAI,GAAG,QAAQ,CAAC;YACtB,MAAM,CAAC,+BAA+B,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QACnF,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;YAC1D,MAAM,KAAK,GAA0B,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;YAC1E,KAAK,CAAC,IAAI,GAAG,OAAO,CAAC;YACrB,MAAM,CAAC,+BAA+B,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QACnF,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;YAC5D,MAAM,KAAK,GAA0B,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;YAC7G,KAAK,CAAC,IAAI,GAAG,mCAAmC,CAAC;YACjD,MAAM,CAAC,+BAA+B,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QAC9E,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mFAAmF,EAAE,GAAG,EAAE;YAC3F,MAAM,CAAC,+BAA+B,CAAC,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAChG,MAAM,CAAC,+BAA+B,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YACjF,MAAM,CAAC,+BAA+B,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;QAC/C,EAAE,CAAC,2EAA2E,EAAE,GAAG,EAAE;YACnF,MAAM,CAAC,+BAA+B,CAAC,2BAA2B,CAAC,CAAC,CAAC,IAAI,CACvE,kEAAkE,CACnE,CAAC;YACF,MAAM,CAAC,+BAA+B,CAAC,sBAAsB,CAAC,CAAC,CAAC,IAAI,CAClE,4DAA4D,CAC7D,CAAC;YACF,MAAM,CAAC,+BAA+B,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACvF,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2FAA2F,EAAE,GAAG,EAAE;YACnG,MAAM,YAAY,GAAG,wBAAwB,CAAC;YAC9C,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACxC,MAAM,KAAK,GAA0B,IAAI,KAAK,CAC5C,qCAAqC,YAAY,iCAAiC,WAAW,GAAG,CACjG,CAAC;YACF,KAAK,CAAC,IAAI,GAAG,QAAQ,CAAC;YAEtB,MAAM,IAAI,GAAG,+BAA+B,CAAC,+BAA+B,CAAC,KAAK,CAAC,CAAC,CAAC;YAErF,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;YACzC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;YACxC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,sCAAsC,EAAE,GAAG,EAAE;QACpD,uEAAuE;QACvE,wEAAwE;QACxE,4EAA4E;QAC5E,0CAA0C;QAC1C,IAAI,YAAgC,CAAC;QACrC,IAAI,kBAAsC,CAAC;QAE3C,SAAS,oBAAoB,CAAC,OAAe,EAAE,UAAkB;YAC/D,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;YAC1C,kBAAkB,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC;YACvD,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,OAAO,CAAC;YACrC,OAAO,CAAC,GAAG,CAAC,qBAAqB,GAAG,UAAU,CAAC;QACjD,CAAC;QAED,SAAS,CAAC,GAAG,EAAE;YACb,IAAI,YAAY,KAAK,SAAS;gBAAE,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;;gBAC7D,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,YAAY,CAAC;YAC/C,IAAI,kBAAkB,KAAK,SAAS;gBAAE,OAAO,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC;;gBAC1E,OAAO,CAAC,GAAG,CAAC,qBAAqB,GAAG,kBAAkB,CAAC;YAC5D,YAAY,GAAG,SAAS,CAAC;YACzB,kBAAkB,GAAG,SAAS,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CACrC,+EAA+E,EAC/E,KAAK,IAAI,EAAE;YACT,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,0BAA0B,CAAC,CAAC,CAAC;YAClF,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1B,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,EAAE,eAAe,CAAC,CAAC;YAE5E,uEAAuE;YACvE,yEAAyE;YACzE,wDAAwD;YACxD,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;YAC9D,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;YACtD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC/C,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5C,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAE5C,MAAM,QAAQ,GAAG,MAAM,wBAAwB,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;YAC5E,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,CAAC;YAE9E,MAAM,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;YACnC,IAAI,CAAC;gBACH,MAAM,0BAA0B,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;YACvE,CAAC;oBAAS,CAAC;gBACT,kEAAkE;gBAClE,MAAM,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YAC5D,CAAC;YAED,MAAM,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACrG,CAAC,CACF,CAAC;QAEF,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CACrC,iFAAiF,EACjF,KAAK,IAAI,EAAE;YACT,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,0BAA0B,CAAC,CAAC,CAAC;YAClF,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1B,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YAC3D,oBAAoB,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;YAErD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;YACpD,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5C,MAAM,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;YAEnC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,WAAW,EAAE,eAAe,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC;YAEvG,IAAI,iBAAiB,GAAG,EAAE,CAAC;YAC3B,MAAM,sBAAsB,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;gBACjD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;gBAC3C,iBAAiB,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACvC,CAAC,CAAC,CAAC;YAEH,IAAI,gBAAgB,GAAG,EAAE,CAAC;YAC1B,MAAM,sBAAsB,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;gBAChD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;gBAC3C,gBAAgB,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACtC,CAAC,CAAC,CAAC;YAEH,MAAM,CAAC,iBAAiB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACvC,MAAM,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACnD,CAAC,CACF,CAAC;QAEF,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;YACpE,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,0BAA0B,CAAC,CAAC,CAAC;YAClF,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1B,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YAC3D,oBAAoB,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;YAErD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,WAAW,EAAE,eAAe,EAAE,OAAO,CAAC,CAAC;YACjF,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC7C,MAAM,KAAK,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3C,MAAM,KAAK,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3C,MAAM,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC,CAAC;YAEhE,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC/C,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAE5C,MAAM,MAAM,CAAC,sBAAsB,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CACpF,uBAAuB,CACxB,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4DAA4D,EAAE,KAAK,IAAI,EAAE;YAC1E,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,0BAA0B,CAAC,CAAC,CAAC;YAClF,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1B,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YAC3D,oBAAoB,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;YAErD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,WAAW,EAAE,eAAe,EAAE,OAAO,CAAC,CAAC;YACjF,MAAM,KAAK,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3C,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,iBAAiB,CAAC,EAAE,mBAAmB,EAAE,MAAM,CAAC,CAAC;YAErF,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC/C,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAE5C,MAAM,MAAM,CAAC,sBAAsB,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CACpF,uBAAuB,CACxB,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qHAAqH,EAAE,KAAK,IAAI,EAAE;YACnI,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,0BAA0B,CAAC,CAAC,CAAC;YAClF,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1B,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YAC3D,oBAAoB,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;YAErD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC/C,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC7C,MAAM,KAAK,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3C,mEAAmE;YACnE,wEAAwE;YACxE,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,WAAW,EAAE,eAAe,EAAE,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAElG,oEAAoE;YACpE,wEAAwE;YACxE,qEAAqE;YACrE,oEAAoE;YACpE,qEAAqE;YACrE,qEAAqE;YACrE,uEAAuE;YACvE,MAAM,QAAQ,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,sBAAsB,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBACtF,MAAM,OAAO,CAAC,QAAQ,EAAE,OAAiB,CAAC,CAAC;gBAC3C,OAAO,SAAS,CAAC;YACnB,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC;gBACH,MAAM,MAAM,CAAC,sBAAsB,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CACpF,uBAAuB,CACxB,CAAC;YACJ,CAAC;oBAAS,CAAC;gBACT,QAAQ,CAAC,WAAW,EAAE,CAAC;YACzB,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kFAAkF,EAAE,KAAK,IAAI,EAAE;YAChG,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,0BAA0B,CAAC,CAAC,CAAC;YAClF,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1B,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YAC3D,oBAAoB,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;YAErD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC/C,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAE5C,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,WAAW,EAAE,eAAe,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC;YACvG,IAAI,iBAAiB,GAAa,EAAE,CAAC;YACrC,MAAM,sBAAsB,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;gBACjD,iBAAiB,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;YACjD,CAAC,CAAC,CAAC;YAEH,MAAM,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC3D,MAAM,CAAC,iBAAiB,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YAC1C,MAAM,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sFAAsF,EAAE,KAAK,IAAI,EAAE;YACpG,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,0BAA0B,CAAC,CAAC,CAAC;YAClF,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1B,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YAC3D,oBAAoB,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;YAErD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC/C,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAE5C,uEAAuE;YACvE,uEAAuE;YACvE,yEAAyE;YACzE,MAAM,kBAAkB,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,CAAC;YACrD,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC9E,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,WAAW,EAAE,eAAe,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC;YACvG,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,OAAO,OAAO,CAAC,CAAC;YAC9D,MAAM,KAAK,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC9C,MAAM,SAAS,CACb,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,EACpC,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,IAAI,EAChF,MAAM,CACP,CAAC;YAEF,mEAAmE;YACnE,sEAAsE;YACtE,qEAAqE;YACrE,iEAAiE;YACjE,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC3B,MAAM,UAAU,GAAG,EAAE;iBAClB,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC;iBAClB,sBAAsB,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC;iBACrC,kBAAkB,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;YACrD,IAAI,WAA8C,CAAC;YACnD,IAAI,CAAC;gBACH,MAAM,sBAAsB,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,SAAS,CAAC,CAAC;YACjE,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,WAAW,GAAG,KAA8B,CAAC;YAC/C,CAAC;oBAAS,CAAC;gBACT,UAAU,CAAC,WAAW,EAAE,CAAC;YAC3B,CAAC;YAED,MAAM,CAAC,WAAW,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YAC1C,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;YACpE,sEAAsE;YACtE,qEAAqE;YACrE,6BAA6B;YAC7B,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;YACnE,MAAM,CAAC,+BAA+B,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QACpF,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CACrC,qFAAqF,EACrF,KAAK,IAAI,EAAE;YACT,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,0BAA0B,CAAC,CAAC,CAAC;YAClF,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1B,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,EAAE,eAAe,CAAC,CAAC;YAE5E,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;YACpD,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5C,MAAM,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;YAEnC,IAAI,MAAM,GAAG,KAAK,CAAC;YACnB,IAAI,YAAY,GAAG,CAAC,CAAC;YACrB,IAAI,cAAc,GAAG,CAAC,CAAC;YACvB,MAAM,SAAS,GAAG,CAAC,GAAW,EAAE,EAAE,CAChC,sBAAsB,CAAC,GAAG,EAAE,KAAK,IAAI,EAAE;gBACrC,IAAI,MAAM;oBAAE,YAAY,IAAI,CAAC,CAAC;gBAC9B,MAAM,GAAG,IAAI,CAAC;gBACd,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;gBACxD,MAAM,GAAG,KAAK,CAAC;gBACf,cAAc,IAAI,CAAC,CAAC;YACtB,CAAC,CAAC,CAAC;YAEL,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAE/D,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC7B,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjC,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,uCAAuC,EAAE,GAAG,EAAE;QACrD,6EAA6E;QAC7E,4EAA4E;QAC5E,0EAA0E;QAC1E,gCAAgC;QAEhC,EAAE,CAAC,uGAAuG,EAAE,KAAK,IAAI,EAAE;YACrH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,0BAA0B,CAAC,CAAC,CAAC;YAClF,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1B,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;YACzD,MAAM,GAAG,GAAsB,EAAE,cAAc,EAAE,YAAY,EAAE,qBAAqB,EAAE,eAAe,EAAE,CAAC;YAExG,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC/C,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAE5C,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC;YAEtG,IAAI,mBAAmB,GAAG,EAAE,CAAC;YAC7B,MAAM,sBAAsB,CAC1B,SAAS,EACT,KAAK,IAAI,EAAE;gBACT,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;gBAC3C,mBAAmB,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACzC,CAAC,EACD,GAAG,CACJ,CAAC;YAEF,IAAI,oBAAoB,GAAG,EAAE,CAAC;YAC9B,MAAM,sBAAsB,CAC1B,SAAS,EACT,KAAK,IAAI,EAAE;gBACT,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;gBAC3C,oBAAoB,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAC1C,CAAC,EACD,GAAG,CACJ,CAAC;YAEF,MAAM,CAAC,mBAAmB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACzC,MAAM,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YACvD,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iGAAiG,EAAE,KAAK,IAAI,EAAE;YAC/G,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,0BAA0B,CAAC,CAAC,CAAC;YAClF,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1B,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;YACzD,MAAM,GAAG,GAAsB,EAAE,cAAc,EAAE,YAAY,EAAE,qBAAqB,EAAE,eAAe,EAAE,CAAC;YAExG,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC/C,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5C,MAAM,kBAAkB,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,CAAC;YACrD,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAE9E,6EAA6E;YAC7E,wEAAwE;YACxE,MAAM,gBAAgB,GAAG,sCAAsC,EAAE,CAAC;YAClE,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,EAAE,iBAAiB,EAAE,GAAG,OAAO,OAAO,CAAC,CAAC;YAEhG,MAAM,sBAAsB,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;YAEpE,MAAM,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YAEpD,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC;YAC9G,MAAM,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;QAChE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wKAAwK,EAAE,KAAK,IAAI,EAAE;YACtL,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,0BAA0B,CAAC,CAAC,CAAC;YAClF,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1B,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;YACzD,MAAM,GAAG,GAAsB,EAAE,cAAc,EAAE,YAAY,EAAE,CAAC;YAEhE,MAAM,kBAAkB,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC;YAC7D,OAAO,CAAC,GAAG,CAAC,qBAAqB,GAAG,gBAAgB,CAAC;YACrD,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAC/C,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBAE5C,oEAAoE;gBACpE,mEAAmE;gBACnE,MAAM,oBAAoB,GAAG,sCAAsC,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;gBACxG,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC;gBACxF,MAAM,wBAAwB,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,WAAW,EAAE,gBAAgB,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC;gBAEpH,MAAM,sBAAsB,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;gBAEpE,MAAM,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;gBAC9D,MAAM,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACjE,CAAC;oBAAS,CAAC;gBACT,IAAI,kBAAkB,KAAK,SAAS;oBAAE,OAAO,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC;;oBAC1E,OAAO,CAAC,GAAG,CAAC,qBAAqB,GAAG,kBAAkB,CAAC;YAC9D,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oFAAoF,EAAE,KAAK,IAAI,EAAE;YAClG,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,0BAA0B,CAAC,CAAC,CAAC;YAClF,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1B,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;YAC3D,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YACrD,MAAM,KAAK,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAEjD,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;YAChD,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,eAAe,CAAC;YAC7C,oEAAoE;YACpE,wEAAwE;YACxE,MAAM,UAAU,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;YAC3E,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAC/C,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBAE5C,wEAAwE;gBACxE,8DAA8D;gBAC9D,MAAM,oBAAoB,GAAG,sCAAsC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;gBACjF,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC;gBAExF,MAAM,sBAAsB,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;gBAEnE,MAAM,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;gBACtD,MAAM,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;YAChE,CAAC;oBAAS,CAAC;gBACT,UAAU,CAAC,WAAW,EAAE,CAAC;gBACzB,IAAI,YAAY,KAAK,SAAS;oBAAE,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;;oBAC7D,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,YAAY,CAAC;YACjD,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/workspace-restore-teardown.d.ts

@@ -0,0 +1,29 @@
+import type { RuntimeProgressSink } from "./runtime-progress.js";
+import { type WorkspaceRestoreOutcome } from "./workspace-restore-merge.js";
+/**
+ * The one staged-runtime capability the teardown factory needs: restore the
+ * sandbox workspace back onto the host.
+ */
+export interface WorkspaceRestoreTeardownRuntime {
+    restoreWorkspace(onProgress?: RuntimeProgressSink): Promise<void>;
+}
+/**
+ * Builds the shared ACP adapter teardown step. The Claude, Codex, and Gemini
+ * adapters run the same five steps at teardown and differ only in two log
+ * strings: the start message and the failure prefix. Give this factory the
+ * staged runtime, the `onLog` sink, and those two strings; it returns the
+ * teardown step.
+ *
+ * The returned step logs `startMessage` to `stdout`, restores the workspace,
+ * and on success returns `{ ok: true }`. On a caught error, it classifies the
+ * error into an allowlisted {@link WorkspaceRestoreOutcome} code, logs
+ * `failurePrefix` plus the allowlisted diagnostic to `stderr`, and returns
+ * `{ ok: false, code }`.
+ */
+export declare function createWorkspaceRestoreTeardown(input: {
+    stagedRuntime: WorkspaceRestoreTeardownRuntime;
+    onLog: (stream: "stdout" | "stderr", chunk: string) => Promise<void>;
+    startMessage: string;
+    failurePrefix: string;
+}): () => Promise<WorkspaceRestoreOutcome>;
+//# sourceMappingURL=workspace-restore-teardown.d.ts.map

package/dist/workspace-restore-teardown.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-restore-teardown.d.ts","sourceRoot":"","sources":["../src/workspace-restore-teardown.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAGL,KAAK,uBAAuB,EAC7B,MAAM,8BAA8B,CAAC;AAEtC;;;GAGG;AACH,MAAM,WAAW,+BAA+B;IAC9C,gBAAgB,CAAC,UAAU,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,8BAA8B,CAAC,KAAK,EAAE;IACpD,aAAa,EAAE,+BAA+B,CAAC;IAC/C,KAAK,EAAE,CAAC,MAAM,EAAE,QAAQ,GAAG,QAAQ,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;CACvB,GAAG,MAAM,OAAO,CAAC,uBAAuB,CAAC,CAiBzC"}

package/dist/workspace-restore-teardown.js

@@ -0,0 +1,34 @@
+import { classifyWorkspaceRestoreFailure, describeWorkspaceRestoreFailure, } from "./workspace-restore-merge.js";
+/**
+ * Builds the shared ACP adapter teardown step. The Claude, Codex, and Gemini
+ * adapters run the same five steps at teardown and differ only in two log
+ * strings: the start message and the failure prefix. Give this factory the
+ * staged runtime, the `onLog` sink, and those two strings; it returns the
+ * teardown step.
+ *
+ * The returned step logs `startMessage` to `stdout`, restores the workspace,
+ * and on success returns `{ ok: true }`. On a caught error, it classifies the
+ * error into an allowlisted {@link WorkspaceRestoreOutcome} code, logs
+ * `failurePrefix` plus the allowlisted diagnostic to `stderr`, and returns
+ * `{ ok: false, code }`.
+ */
+export function createWorkspaceRestoreTeardown(input) {
+    const { stagedRuntime, onLog, startMessage, failurePrefix } = input;
+    return async () => {
+        try {
+            await onLog("stdout", startMessage);
+            await stagedRuntime.restoreWorkspace((line) => onLog("stdout", line));
+            return { ok: true };
+        }
+        catch (err) {
+            // The run log is readable by any same-company actor, so it must never
+            // carry the caught error's own message: that message can hold a host
+            // filesystem path or a process id. Log only the fixed, allowlisted
+            // diagnostic for the classified code.
+            const code = classifyWorkspaceRestoreFailure(err);
+            await onLog("stderr", `${failurePrefix}: ${describeWorkspaceRestoreFailure(code)}\n`);
+            return { ok: false, code };
+        }
+    };
+}
+//# sourceMappingURL=workspace-restore-teardown.js.map

package/dist/workspace-restore-teardown.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-restore-teardown.js","sourceRoot":"","sources":["../src/workspace-restore-teardown.ts"],"names":[],"mappings":"AACA,OAAO,EACL,+BAA+B,EAC/B,+BAA+B,GAEhC,MAAM,8BAA8B,CAAC;AAUtC;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,8BAA8B,CAAC,KAK9C;IACC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;IACpE,OAAO,KAAK,IAAI,EAAE;QAChB,IAAI,CAAC;YACH,MAAM,KAAK,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;YACpC,MAAM,aAAa,CAAC,gBAAgB,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;YACtE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;QACtB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,sEAAsE;YACtE,qEAAqE;YACrE,mEAAmE;YACnE,sCAAsC;YACtC,MAAM,IAAI,GAAG,+BAA+B,CAAC,GAAG,CAAC,CAAC;YAClD,MAAM,KAAK,CAAC,QAAQ,EAAE,GAAG,aAAa,KAAK,+BAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtF,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;QAC7B,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}

package/dist/workspace-restore-teardown.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=workspace-restore-teardown.test.d.ts.map

package/dist/workspace-restore-teardown.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-restore-teardown.test.d.ts","sourceRoot":"","sources":["../src/workspace-restore-teardown.test.ts"],"names":[],"mappings":""}

package/dist/workspace-restore-teardown.test.js

@@ -0,0 +1,71 @@
+import { describe, expect, it } from "vitest";
+import { createWorkspaceRestoreTeardown } from "./workspace-restore-teardown.js";
+// One row per adapter's two message strings, taken verbatim from
+// claude-local, codex-local, and gemini-local. The factory's contract must
+// hold identically for each pair.
+const ADAPTER_MESSAGE_PAIRS = [
+    {
+        adapter: "claude-local",
+        startMessage: "[paperclip] Restoring workspace changes from the sandbox.\n",
+        failurePrefix: "[paperclip] Claude ACP teardown workspace restore failed",
+    },
+    {
+        adapter: "codex-local",
+        startMessage: "[paperclip] Restoring workspace changes and Codex auth from the sandbox.\n",
+        failurePrefix: "[paperclip] Codex ACP teardown restore/copy-back failed",
+    },
+    {
+        adapter: "gemini-local",
+        startMessage: "[paperclip] Restoring workspace changes from the sandbox.\n",
+        failurePrefix: "[paperclip] Gemini ACP teardown workspace restore failed",
+    },
+];
+describe.each(ADAPTER_MESSAGE_PAIRS)("createWorkspaceRestoreTeardown ($adapter)", ({ startMessage, failurePrefix }) => {
+    it("logs the start message to stdout and returns ok on a clean restore", async () => {
+        const logLines = [];
+        const teardown = createWorkspaceRestoreTeardown({
+            stagedRuntime: { restoreWorkspace: async () => { } },
+            onLog: async (stream, chunk) => {
+                logLines.push({ stream, chunk });
+            },
+            startMessage,
+            failurePrefix,
+        });
+        const outcome = await teardown();
+        expect(outcome).toEqual({ ok: true });
+        expect(logLines).toEqual([{ stream: "stdout", chunk: startMessage }]);
+    });
+    it("classifies a thrown EACCES error and sanitizes the stderr line", async () => {
+        const logLines = [];
+        // A host filesystem path that must never reach the run log.
+        const secretHostPath = "/home/host-user/.secret-project/workspace";
+        const thrown = new Error(`EACCES: permission denied, open '${secretHostPath}'`);
+        thrown.code = "EACCES";
+        const teardown = createWorkspaceRestoreTeardown({
+            stagedRuntime: {
+                restoreWorkspace: async () => {
+                    throw thrown;
+                },
+            },
+            onLog: async (stream, chunk) => {
+                logLines.push({ stream, chunk });
+            },
+            startMessage,
+            failurePrefix,
+        });
+        const outcome = await teardown();
+        expect(outcome).toEqual({ ok: false, code: "restore_permission_denied" });
+        const stderrLines = logLines.filter((line) => line.stream === "stderr");
+        expect(stderrLines).toEqual([
+            {
+                stream: "stderr",
+                chunk: `${failurePrefix}: the restore could not write to the workspace (permission denied)\n`,
+            },
+        ]);
+        for (const line of logLines) {
+            expect(line.chunk).not.toContain(secretHostPath);
+            expect(line.chunk).not.toContain(thrown.message);
+        }
+    });
+});
+//# sourceMappingURL=workspace-restore-teardown.test.js.map