@loucompanion/forge-bridge 0.1.3-dev.9d8f2e7e5241 → 0.1.3-dev.a58d7cd1092f

package/dist/worktree/dependency-warmer.js

@@ -1,10 +1,13 @@
+import { createHash, randomUUID } from "node:crypto";
 import { existsSync, realpathSync } from "node:fs";
 import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
+import { RepositoryCoordinatorLock } from "../sandbox/repository-lock.js";
 import { NodeProcessRunner } from "../shared/process/process.js";
 import { buildWindowsCmdLaunch } from "../shared/process/windows-launch.js";
 import { isSubPath } from "../shared/path/path.js";
+import { defaultWorktreeCoordinatorStateRoot } from "./worktree-paths.js";
 const SKIP_DIR_NAMES = new Set([
     ".git",
     "node_modules",
@@ -23,6 +26,10 @@ const NATIVE_MODULE_HINTS = [
     "better-sqlite3",
     "@swc/core"
 ];
+const MAX_COMMAND_FAILURE_OUTPUT_LENGTH = 8_000;
+const DEPENDENCY_RECEIPT_SCHEMA_VERSION = 1;
+const DEPENDENCY_PREPARATION_CONTRACT = "managed-worktree-isolated-v1";
+const dependencyPreparationCoordinator = new RepositoryCoordinatorLock(defaultWorktreeCoordinatorStateRoot());
 export async function detectWarmPaths(repoRoot, warmPathOverrides = []) {
     const entries = new Map();
     await collectDetectedPaths(repoRoot, repoRoot, entries, 0);
@@ -50,15 +57,51 @@ export async function warmWorktreeDependencies(request, executor = defaultComman
     const linked = [];
     const skipped = [];
     const fallbacks = [];
+    const receipts = [];
+    const restoredDotNetRoots = new Set();
+    const installedNodeRoots = new Set();
     for (const entry of warmPaths) {
         const sourcePath = path.join(baseCheckoutPath, entry.relativePath);
         const targetPath = path.join(worktreePath, entry.relativePath);
         assertWithinRoot(allowedRoot, targetPath, "Warm target");
+        if (entry.ecosystem === "node" && path.basename(entry.relativePath) === "node_modules") {
+            await removeLegacyDirectoryLink(targetPath, allowedRoot);
+            const installPackageRoot = await resolveNodeInstallPackageRoot(worktreePath, entry.packageRoot);
+            const packageRoot = path.resolve(worktreePath, installPackageRoot === "." ? "" : installPackageRoot);
+            const packageKey = process.platform === "win32" ? packageRoot.toLowerCase() : packageRoot;
+            if (installedNodeRoots.has(packageKey)) {
+                skipped.push(entry.relativePath);
+                continue;
+            }
+            installedNodeRoots.add(packageKey);
+            const preparation = await ensureInstallFallback({ ...entry, packageRoot: installPackageRoot }, worktreePath, "Managed worktrees require isolated Node dependencies.", executor, request.preparationPolicy);
+            receipts.push(preparation.receipt);
+            if (preparation.install)
+                fallbacks.push(preparation.install);
+            continue;
+        }
+        if (entry.ecosystem === "dotnet") {
+            await removeLegacyDirectoryLink(targetPath, allowedRoot);
+            const packageRoot = path.resolve(worktreePath, entry.packageRoot === "." ? "" : entry.packageRoot);
+            const packageKey = process.platform === "win32" ? packageRoot.toLowerCase() : packageRoot;
+            if (restoredDotNetRoots.has(packageKey)) {
+                skipped.push(entry.relativePath);
+                continue;
+            }
+            restoredDotNetRoots.add(packageKey);
+            const preparation = await ensureInstallFallback(entry, worktreePath, "Managed worktrees require isolated .NET build outputs.", executor, request.preparationPolicy);
+            receipts.push(preparation.receipt);
+            if (preparation.install)
+                fallbacks.push(preparation.install);
+            continue;
+        }
         const sourceExists = await directoryExists(sourcePath);
         const fallbackReason = await resolveFallbackReason(entry, baseCheckoutPath, worktreePath, sourceExists);
         if (fallbackReason) {
-            const install = await runInstallFallback(entry, worktreePath, fallbackReason, executor);
-            fallbacks.push(install);
+            const preparation = await ensureInstallFallback(entry, worktreePath, fallbackReason, executor, request.preparationPolicy);
+            receipts.push(preparation.receipt);
+            if (preparation.install)
+                fallbacks.push(preparation.install);
             continue;
         }
         if (!sourceExists) {
@@ -68,7 +111,17 @@ export async function warmWorktreeDependencies(request, executor = defaultComman
         await createDirectoryLink(sourcePath, targetPath, allowedRoot);
         linked.push(entry.relativePath);
     }
-    return { linked, skipped, fallbacks };
+    return { linked, skipped, fallbacks, receipts };
+}
+async function removeLegacyDirectoryLink(targetPath, allowedRoot) {
+    const resolvedTarget = path.resolve(targetPath);
+    const resolvedRoot = path.resolve(allowedRoot);
+    assertWithinRoot(resolvedRoot, resolvedTarget, "Legacy warm target");
+    const stat = await fs.lstat(resolvedTarget).catch(() => null);
+    if (!stat?.isSymbolicLink()) {
+        return;
+    }
+    await fs.rm(resolvedTarget, { force: true });
 }
 export async function createDirectoryLink(sourcePath, targetPath, allowedRoot) {
     const resolvedSource = path.resolve(sourcePath);
@@ -81,7 +134,10 @@ export async function createDirectoryLink(sourcePath, targetPath, allowedRoot) {
     if (!stat?.isDirectory()) {
         throw new Error(`Link source must be an existing directory: ${resolvedSource}`);
     }
-    await fs.rm(resolvedTarget, { recursive: true, force: true });
+    const existingTarget = await fs.lstat(resolvedTarget).catch(() => null);
+    await fs.rm(resolvedTarget, existingTarget?.isSymbolicLink()
+        ? { force: true }
+        : { recursive: true, force: true });
     await fs.mkdir(path.dirname(resolvedTarget), { recursive: true });
     if (process.platform === "win32") {
         await fs.symlink(resolvedSource, resolvedTarget, "junction");
@@ -182,13 +238,217 @@ export async function lockfilesDiffer(baseCheckoutPath, worktreePath, packageRoo
     }
     return false;
 }
+async function ensureInstallFallback(entry, worktreePath, reason, executor, policy) {
+    const startedAt = performance.now();
+    const cwd = path.resolve(worktreePath, entry.packageRoot === "." ? "" : entry.packageRoot);
+    assertWithinRoot(path.resolve(worktreePath), cwd, "Dependency package root");
+    const command = await installFallbackCommand(entry, cwd);
+    const outputMarker = dependencyOutputMarker(entry.ecosystem, cwd);
+    const receiptPath = path.join(outputMarker, ".forge-dependency-preparation.json");
+    const fingerprint = await dependencyPreparationFingerprint(entry, worktreePath, cwd, command, policy);
+    return await dependencyPreparationCoordinator.withLock(receiptPath, async () => {
+        const existing = await readDependencyPreparationReceipt(receiptPath);
+        if (existing?.fingerprint === fingerprint
+            && existing.ecosystem === entry.ecosystem
+            && existing.packageRoot === entry.packageRoot
+            && existing.command === command
+            && await directoryExists(outputMarker)) {
+            return {
+                install: null,
+                receipt: {
+                    ecosystem: entry.ecosystem,
+                    packageRoot: entry.packageRoot,
+                    command,
+                    cacheHit: true,
+                    fingerprint,
+                    receiptPath,
+                    durationMs: elapsedMilliseconds(startedAt),
+                },
+            };
+        }
+        const install = await runInstallFallback(entry, worktreePath, reason, executor);
+        // npm is allowed to omit node_modules when the package graph is empty. Keep
+        // an isolated, ignored output directory so the durable receipt still has a
+        // concrete marker whose removal invalidates reuse.
+        if (entry.ecosystem === "node") {
+            await fs.mkdir(outputMarker, { recursive: true });
+        }
+        if (!(await directoryExists(outputMarker))) {
+            throw new Error(`dependency_preparation_output_missing: ${install.command} succeeded without creating ${outputMarker}.`);
+        }
+        const receipt = {
+            schemaVersion: DEPENDENCY_RECEIPT_SCHEMA_VERSION,
+            fingerprint,
+            ecosystem: entry.ecosystem,
+            packageRoot: entry.packageRoot,
+            command,
+            outputMarker: path.relative(cwd, outputMarker).replaceAll("\\", "/"),
+            completedAt: new Date().toISOString(),
+        };
+        await persistDependencyPreparationReceipt(receiptPath, receipt);
+        return {
+            install,
+            receipt: {
+                ecosystem: entry.ecosystem,
+                packageRoot: entry.packageRoot,
+                command,
+                cacheHit: false,
+                fingerprint,
+                receiptPath,
+                durationMs: elapsedMilliseconds(startedAt),
+            },
+        };
+    });
+}
+function elapsedMilliseconds(startedAt) {
+    return Math.max(0, Math.round((performance.now() - startedAt) * 1000) / 1000);
+}
+async function installFallbackCommand(entry, cwd) {
+    if (entry.ecosystem === "node") {
+        if (await pathExists(path.join(cwd, "pnpm-lock.yaml")))
+            return "pnpm install --frozen-lockfile";
+        return await pathExists(path.join(cwd, "package-lock.json")) ? "npm ci" : "npm install";
+    }
+    if (entry.ecosystem === "python") {
+        return await pathExists(path.join(cwd, "requirements.txt"))
+            ? "python -m venv .venv && pip install -r requirements.txt"
+            : "python -m venv .venv";
+    }
+    return "dotnet restore";
+}
+function dependencyOutputMarker(ecosystem, cwd) {
+    if (ecosystem === "node")
+        return path.join(cwd, "node_modules");
+    if (ecosystem === "python")
+        return path.join(cwd, ".venv");
+    return path.join(cwd, "obj");
+}
+async function dependencyPreparationFingerprint(entry, worktreePath, cwd, command, policy) {
+    const inputFiles = await dependencyInputFiles(entry.ecosystem, worktreePath, cwd);
+    const inputDigests = await Promise.all(inputFiles.map(async (file) => ({
+        path: path.relative(worktreePath, file).replaceAll("\\", "/"),
+        digest: await sha256File(file),
+    })));
+    const toolchainVersion = await dependencyToolchainVersion(entry.ecosystem, cwd, policy);
+    const trustDomain = policy?.trustDomain ?? process.env.FORGE_TRUST_DOMAIN_ID ?? "default";
+    const invalidationEpoch = policy?.invalidationEpoch ?? process.env.FORGE_DEPENDENCY_CACHE_EPOCH ?? "default";
+    const contract = {
+        schemaVersion: DEPENDENCY_RECEIPT_SCHEMA_VERSION,
+        preparationContract: DEPENDENCY_PREPARATION_CONTRACT,
+        ecosystem: entry.ecosystem,
+        packageRoot: entry.packageRoot.replaceAll("\\", "/"),
+        command,
+        inputDigests,
+        toolchainVersion,
+        nodeRuntime: process.version,
+        platform: process.platform,
+        architecture: process.arch,
+        osRelease: os.release(),
+        isolation: policy?.isolation ?? process.env.FORGE_RUNTIME_MODE ?? "managed_host_process",
+        trustDomainFingerprint: sha256Text(trustDomain),
+        invalidationEpochFingerprint: sha256Text(invalidationEpoch),
+    };
+    return `sha256:${sha256Text(JSON.stringify(contract))}`;
+}
+async function dependencyInputFiles(ecosystem, worktreePath, cwd) {
+    const result = new Set();
+    const directNames = ecosystem === "node"
+        ? ["package.json", "package-lock.json", "npm-shrinkwrap.json", "pnpm-lock.yaml", "pnpm-workspace.yaml", "yarn.lock", ".npmrc", ".yarnrc", ".yarnrc.yml", ".nvmrc", ".node-version"]
+        : ecosystem === "python"
+            ? ["pyproject.toml", "requirements.txt", "requirements-dev.txt", "poetry.lock", "Pipfile", "Pipfile.lock", "uv.lock", "pip.conf", "pyvenv.cfg"]
+            : ["global.json", "NuGet.Config", "nuget.config", "Directory.Build.props", "Directory.Build.targets", "Directory.Packages.props", "packages.lock.json"];
+    let current = cwd;
+    const root = path.resolve(worktreePath);
+    while (isSubPath(root, current)) {
+        for (const name of directNames) {
+            const candidate = path.join(current, name);
+            if (await pathExists(candidate))
+                result.add(candidate);
+        }
+        if (ecosystem === "dotnet" && current === cwd) {
+            const entries = await fs.readdir(current, { withFileTypes: true }).catch(() => []);
+            for (const item of entries) {
+                if (item.isFile() && (/\.(?:csproj|fsproj|vbproj|sln|slnx)$/iu.test(item.name))) {
+                    result.add(path.join(current, item.name));
+                }
+            }
+        }
+        if (current === root)
+            break;
+        current = path.dirname(current);
+    }
+    return [...result].sort((left, right) => left.localeCompare(right));
+}
+async function dependencyToolchainVersion(ecosystem, cwd, policy) {
+    if (ecosystem === "node") {
+        const manager = await pathExists(path.join(cwd, "pnpm-lock.yaml")) ? "pnpm" : "npm";
+        const override = policy?.toolchainVersions?.[manager];
+        if (override)
+            return `${manager}@${override};node@${process.version}`;
+        const launch = manager === "pnpm" ? resolvePnpmLaunch(["--version"]) : resolveNpmLaunch(["--version"]);
+        return `${manager}@${await readToolVersion(cwd, launch.command, launch.args)};node@${process.version}`;
+    }
+    const override = policy?.toolchainVersions?.[ecosystem];
+    if (override)
+        return `${ecosystem}@${override}`;
+    const launch = ecosystem === "dotnet"
+        ? { command: "dotnet", args: ["--version"] }
+        : { command: "python", args: ["--version"] };
+    return `${ecosystem}@${await readToolVersion(cwd, launch.command, launch.args)}`;
+}
+async function readToolVersion(cwd, command, args) {
+    return await defaultProcessRunner.run({ command, cwd, args })
+        .then(result => result.exitCode === 0
+        ? (result.stdout.trim() || result.stderr.trim() || "unknown").slice(0, 256)
+        : `unavailable:${result.exitCode}`)
+        .catch(() => "unavailable");
+}
+async function readDependencyPreparationReceipt(receiptPath) {
+    try {
+        const parsed = JSON.parse(await fs.readFile(receiptPath, "utf8"));
+        return parsed.schemaVersion === DEPENDENCY_RECEIPT_SCHEMA_VERSION
+            && typeof parsed.fingerprint === "string"
+            && typeof parsed.ecosystem === "string"
+            && typeof parsed.packageRoot === "string"
+            && typeof parsed.command === "string"
+            && typeof parsed.outputMarker === "string"
+            ? parsed
+            : null;
+    }
+    catch (error) {
+        if (error.code === "ENOENT" || error instanceof SyntaxError)
+            return null;
+        throw error;
+    }
+}
+async function persistDependencyPreparationReceipt(receiptPath, receipt) {
+    await fs.mkdir(path.dirname(receiptPath), { recursive: true });
+    const temporaryPath = `${receiptPath}.${randomUUID()}.tmp`;
+    await fs.writeFile(temporaryPath, `${JSON.stringify(receipt, null, 2)}\n`, { encoding: "utf8", mode: 0o600 });
+    try {
+        await fs.rename(temporaryPath, receiptPath);
+    }
+    finally {
+        await fs.rm(temporaryPath, { force: true }).catch(() => undefined);
+    }
+}
+function sha256Text(value) {
+    return createHash("sha256").update(value).digest("hex");
+}
 async function runInstallFallback(entry, worktreePath, reason, executor) {
     const cwd = path.join(worktreePath, entry.packageRoot === "." ? "" : entry.packageRoot);
     if (entry.ecosystem === "node") {
+        const pnpmLockPath = path.join(cwd, "pnpm-lock.yaml");
+        if (await pathExists(pnpmLockPath)) {
+            const args = ["install", "--frozen-lockfile"];
+            const launch = resolvePnpmLaunch(args);
+            await executor.run(cwd, launch.command, launch.args, { env: unattendedPackageManagerEnvironment() });
+            return { ecosystem: entry.ecosystem, packageRoot: entry.packageRoot, reason, command: `pnpm ${args.join(" ")}` };
+        }
         const lockPath = path.join(cwd, "package-lock.json");
         const args = (await pathExists(lockPath)) ? ["ci"] : ["install"];
         const launch = resolveNpmLaunch(args);
-        await executor.run(cwd, launch.command, launch.args);
+        await executor.run(cwd, launch.command, launch.args, { env: unattendedPackageManagerEnvironment() });
         return { ecosystem: entry.ecosystem, packageRoot: entry.packageRoot, reason, command: `npm ${args.join(" ")}` };
     }
     if (entry.ecosystem === "python") {
@@ -219,6 +479,23 @@ async function runInstallFallback(entry, worktreePath, reason, executor) {
         command: "dotnet restore"
     };
 }
+async function resolveNodeInstallPackageRoot(worktreePath, packageRoot) {
+    const resolvedWorktree = path.resolve(worktreePath);
+    let current = path.resolve(resolvedWorktree, packageRoot === "." ? "" : packageRoot);
+    assertWithinRoot(resolvedWorktree, current, "Node package root");
+    while (isSubPath(resolvedWorktree, current)) {
+        if (await pathExists(path.join(current, "pnpm-lock.yaml"))
+            || await pathExists(path.join(current, "pnpm-workspace.yaml"))
+            || await pathExists(path.join(current, "package-lock.json"))) {
+            const relative = normalizeRelativePath(path.relative(resolvedWorktree, current));
+            return relative || ".";
+        }
+        if (current === resolvedWorktree)
+            break;
+        current = path.dirname(current);
+    }
+    return packageRoot;
+}
 export async function requiresInstallFallback(entry, baseCheckoutPath, worktreePath, sourceExists) {
     return resolveFallbackReason(entry, baseCheckoutPath, worktreePath, sourceExists);
 }
@@ -294,7 +571,7 @@ export function resolveNpmLaunch(args, options = {}) {
     const env = options.env ?? process.env;
     const execPath = options.execPath ?? process.execPath;
     const npmExecPath = env.npm_execpath;
-    if (npmExecPath) {
+    if (npmExecPath && path.basename(npmExecPath).toLowerCase() === "npm-cli.js") {
         return { command: execPath, args: [npmExecPath, ...args] };
     }
     const platform = options.platform ?? process.platform;
@@ -310,6 +587,26 @@ export function resolveNpmLaunch(args, options = {}) {
     }
     return { command: "npm", args };
 }
+export function resolvePnpmLaunch(args) {
+    if (process.platform === "win32") {
+        return buildWindowsCmdLaunch("pnpm.cmd", args, process.env.ComSpec);
+    }
+    return { command: "pnpm", args };
+}
+export function formatCommandFailureOutput(stdout, stderr) {
+    const sections = [
+        stderr.trim().length > 0 ? `stderr:\n${stderr.trim()}` : null,
+        stdout.trim().length > 0 ? `stdout:\n${stdout.trim()}` : null,
+    ].filter((section) => section !== null);
+    const output = sections.join("\n");
+    if (output.length <= MAX_COMMAND_FAILURE_OUTPUT_LENGTH) {
+        return output;
+    }
+    return `[last ${MAX_COMMAND_FAILURE_OUTPUT_LENGTH} characters]\n${output.slice(-MAX_COMMAND_FAILURE_OUTPUT_LENGTH)}`;
+}
+export function unattendedPackageManagerEnvironment(env = process.env) {
+    return { ...env, CI: "true" };
+}
 function tryResolveNpmCandidate(candidate) {
     try {
         if (!existsSync(candidate)) {
@@ -331,10 +628,12 @@ function defaultNpmCliCandidates(execPath, homeDir) {
     return candidates;
 }
 const defaultCommandExecutor = {
-    async run(cwd, command, args) {
-        const result = await defaultProcessRunner.run({ command, cwd, args });
+    async run(cwd, command, args, options) {
+        const result = await defaultProcessRunner.run({ command, cwd, args, env: options?.env });
         if (result.exitCode !== 0) {
-            throw new Error(`${command} ${args.join(" ")} failed (${result.exitCode}): ${result.stderr.trim()}`);
+            const output = formatCommandFailureOutput(result.stdout, result.stderr);
+            const details = output.length > 0 ? `\n${output}` : " no output was captured";
+            throw new Error(`${command} ${args.join(" ")} failed (${result.exitCode}) in ${cwd}:${details}`);
         }
     }
 };

package/dist/worktree/index.d.ts

@@ -1,4 +1,5 @@
 export { GitWorktreeService } from "./worktree.service.js";
+export { managedRepoRoot, resolveManagedWorktreeRoot, resolveManagedWorktreeRootForRepo, } from "./worktree-paths.js";
 export { detectWarmPaths, warmWorktreeDependencies, createDirectoryLink, lockfilesDiffer, requiresInstallFallback } from "./dependency-warmer.js";
-export type { WarmDependenciesResult, WarmPathEntry, InstallFallbackResult } from "./dependency-warmer.js";
+export type { WarmDependenciesResult, WarmPathEntry, InstallFallbackResult, DependencyPreparationPolicy, DependencyPreparationReceiptResult, } from "./dependency-warmer.js";
 export type { WorktreeService } from "./worktree.base.js";

package/dist/worktree/index.js

@@ -1,2 +1,3 @@
 export { GitWorktreeService } from "./worktree.service.js";
+export { managedRepoRoot, resolveManagedWorktreeRoot, resolveManagedWorktreeRootForRepo, } from "./worktree-paths.js";
 export { detectWarmPaths, warmWorktreeDependencies, createDirectoryLink, lockfilesDiffer, requiresInstallFallback } from "./dependency-warmer.js";

package/dist/worktree/prior-phase-artifact-hydrator.d.ts

@@ -0,0 +1,2 @@
+import type { DispatchPriorPhaseArtifact } from "../session/session.types.js";
+export declare function hydratePriorPhaseArtifacts(worktreePath: string, artifacts?: readonly DispatchPriorPhaseArtifact[]): Promise<number>;

package/dist/worktree/prior-phase-artifact-hydrator.js

@@ -0,0 +1,136 @@
+import { createHash, randomUUID } from "node:crypto";
+import fs from "node:fs/promises";
+import path from "node:path";
+import { isSubPath } from "../shared/path/path.js";
+const MAX_ARTIFACT_COUNT = 128;
+const MAX_CONTENT_BYTES = 2 * 1024 * 1024;
+const MAX_TOTAL_BYTES = 12 * 1024 * 1024;
+const phaseFiles = {
+    implementation: {
+        verdict: "implementation.completeness.json",
+        report: "implementation.report.md"
+    },
+    self_review: {
+        verdict: "self-review.report.json",
+        report: "self-review.summary.md"
+    },
+    validation: {
+        verdict: "validation.verdict.json",
+        report: "validation.report.md"
+    }
+};
+export async function hydratePriorPhaseArtifacts(worktreePath, artifacts = []) {
+    if (artifacts.length === 0)
+        return 0;
+    if (artifacts.length > MAX_ARTIFACT_COUNT) {
+        throw new Error(`Prior phase artifact handoff exceeds ${MAX_ARTIFACT_COUNT} artifacts.`);
+    }
+    const targets = new Set();
+    let totalBytes = 0;
+    for (const artifact of artifacts) {
+        const workItemId = safeArtifactSegment(artifact.workItemId, "work item id");
+        const files = phaseFiles[artifact.phase];
+        if (!files) {
+            throw new Error(`Unsupported prior phase artifact phase '${artifact.phase}'.`);
+        }
+        const verdictBytes = Buffer.byteLength(artifact.verdictJson, "utf8");
+        const reportBytes = Buffer.byteLength(artifact.report, "utf8");
+        if (verdictBytes > MAX_CONTENT_BYTES || reportBytes > MAX_CONTENT_BYTES) {
+            throw new Error(`Prior phase artifact '${artifact.artifactId}' exceeds the per-file hydration limit.`);
+        }
+        totalBytes += verdictBytes + reportBytes;
+        if (totalBytes > MAX_TOTAL_BYTES) {
+            throw new Error("Prior phase artifact handoff exceeds the total hydration limit.");
+        }
+        verifyContentHash(artifact.verdictJson, artifact.verdictContentHash, artifact.artifactId, "verdict");
+        verifyContentHash(artifact.report, artifact.reportContentHash, artifact.artifactId, "report");
+        validateVerdict(artifact);
+        const artifactRoot = path.resolve(worktreePath, ".forge", "work-items", workItemId, "artifacts");
+        if (!isSubPath(worktreePath, artifactRoot)) {
+            throw new Error("Prior phase artifact target must stay under the worktree.");
+        }
+        await ensureNoSymlinkPathSegments(worktreePath, artifactRoot);
+        await fs.mkdir(artifactRoot, { recursive: true });
+        await ensureNoSymlinkPathSegments(worktreePath, artifactRoot);
+        const verdictPath = path.join(artifactRoot, files.verdict);
+        const reportPath = path.join(artifactRoot, files.report);
+        const targetKey = verdictPath.toLowerCase();
+        if (targets.has(targetKey)) {
+            throw new Error(`Duplicate prior phase artifact target for work item '${workItemId}' phase '${artifact.phase}'.`);
+        }
+        targets.add(targetKey);
+        await writeAtomic(verdictPath, artifact.verdictJson);
+        await writeAtomic(reportPath, artifact.report);
+    }
+    return artifacts.length;
+}
+function validateVerdict(artifact) {
+    let parsed;
+    try {
+        parsed = JSON.parse(artifact.verdictJson);
+    }
+    catch {
+        throw new Error(`Prior phase artifact '${artifact.artifactId}' verdict is not valid JSON.`);
+    }
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+        throw new Error(`Prior phase artifact '${artifact.artifactId}' verdict must be a JSON object.`);
+    }
+    const recordedPhase = parsed["phase"];
+    const normalizedPhase = typeof recordedPhase === "string"
+        ? recordedPhase.trim().toLowerCase().replace(/-/g, "_")
+        : "";
+    if (normalizedPhase !== artifact.phase) {
+        throw new Error(`Prior phase artifact '${artifact.artifactId}' phase does not match its verdict.`);
+    }
+}
+function verifyContentHash(content, expected, artifactId, label) {
+    const normalizedExpected = expected.trim().toLowerCase().replace(/^sha256:/, "");
+    if (!/^[0-9a-f]{64}$/.test(normalizedExpected)) {
+        throw new Error(`Prior phase artifact '${artifactId}' ${label} hash is invalid.`);
+    }
+    const actual = createHash("sha256").update(content, "utf8").digest("hex");
+    if (actual !== normalizedExpected) {
+        throw new Error(`Prior phase artifact '${artifactId}' ${label} content_hash mismatch.`);
+    }
+}
+function safeArtifactSegment(value, label) {
+    const trimmed = value.trim();
+    if (!/^[a-zA-Z0-9_-]{1,128}$/.test(trimmed)) {
+        throw new Error(`Prior phase artifact ${label} is not a safe path segment.`);
+    }
+    return trimmed;
+}
+async function writeAtomic(targetPath, content) {
+    const temporaryPath = `${targetPath}.tmp-${randomUUID()}`;
+    try {
+        await fs.writeFile(temporaryPath, content, { encoding: "utf8", mode: 0o600, flag: "wx" });
+        await fs.rename(temporaryPath, targetPath);
+    }
+    finally {
+        await fs.rm(temporaryPath, { force: true }).catch(() => undefined);
+    }
+}
+async function ensureNoSymlinkPathSegments(root, targetPath) {
+    const resolvedRoot = path.resolve(root);
+    const resolvedTarget = path.resolve(targetPath);
+    const relative = path.relative(resolvedRoot, resolvedTarget);
+    if (relative === ".." || relative.startsWith(`..${path.sep}`) || path.isAbsolute(relative)) {
+        throw new Error("Prior phase artifact path must stay under the worktree.");
+    }
+    let current = resolvedRoot;
+    for (const segment of relative.split(path.sep)) {
+        if (!segment)
+            continue;
+        current = path.join(current, segment);
+        const stat = await fs.lstat(current).catch((error) => {
+            if (error.code === "ENOENT")
+                return null;
+            throw error;
+        });
+        if (!stat)
+            return;
+        if (stat.isSymbolicLink()) {
+            throw new Error("Prior phase artifact path must not traverse symlinked path segments.");
+        }
+    }
+}

package/dist/worktree/worktree-paths.d.ts

@@ -0,0 +1,4 @@
+export declare function managedRepoRoot(allowedRoot: string): string;
+export declare function resolveManagedWorktreeRoot(allowedRoot: string, repoPath: string): string;
+export declare function resolveManagedWorktreeRootForRepo(repoPath: string, allowedRoot?: string): string;
+export declare function defaultWorktreeCoordinatorStateRoot(): string;

package/dist/worktree/worktree-paths.js

@@ -0,0 +1,30 @@
+import os from "node:os";
+import path from "node:path";
+import { isSubPath } from "../shared/path/path.js";
+export function managedRepoRoot(allowedRoot) {
+    return path.join(path.resolve(allowedRoot), ".forge-worktrees", "_repos");
+}
+export function resolveManagedWorktreeRoot(allowedRoot, repoPath) {
+    const resolvedAllowedRoot = path.resolve(allowedRoot);
+    const resolvedRepoPath = path.resolve(repoPath);
+    const baseName = path.basename(resolvedRepoPath);
+    return isSubPath(managedRepoRoot(resolvedAllowedRoot), resolvedRepoPath)
+        ? path.join(resolvedAllowedRoot, ".forge-worktrees", baseName)
+        : path.join(path.dirname(resolvedRepoPath), ".forge-worktrees", baseName);
+}
+export function resolveManagedWorktreeRootForRepo(repoPath, allowedRoot) {
+    const resolvedRepoPath = path.resolve(repoPath);
+    if (allowedRoot && isSubPath(path.resolve(allowedRoot), resolvedRepoPath)) {
+        return resolveManagedWorktreeRoot(allowedRoot, resolvedRepoPath);
+    }
+    const repoParent = path.dirname(resolvedRepoPath);
+    const managedRoot = path.dirname(repoParent);
+    if (path.basename(repoParent) === "_repos" && path.basename(managedRoot) === ".forge-worktrees") {
+        return path.join(managedRoot, path.basename(resolvedRepoPath));
+    }
+    return path.join(repoParent, ".forge-worktrees", path.basename(resolvedRepoPath));
+}
+export function defaultWorktreeCoordinatorStateRoot() {
+    return process.env.FORGE_SANDBOX_STATE_ROOT
+        ?? path.join(os.homedir(), ".forge", "bridge", "sandboxes");
+}

package/dist/worktree/worktree.base.d.ts

@@ -3,3 +3,6 @@ export interface WorktreeService {
     prepare(request: WorktreePrepareRequest): Promise<WorktreeHandle>;
     release(handle: WorktreeHandle): Promise<void>;
 }
+export interface WorktreeLifecycleCoordinator {
+    withLock<T>(repoPath: string, action: () => Promise<T>, signal?: AbortSignal): Promise<T>;
+}

package/dist/worktree/worktree.service.d.ts

@@ -1,12 +1,17 @@
 import { GitClient } from "../shared/git/git.js";
-import type { WorktreeService } from "./worktree.base.js";
+import type { WorktreeLifecycleCoordinator, WorktreeService } from "./worktree.base.js";
 import type { WorktreeHandle, WorktreePrepareRequest } from "./worktree.types.js";
 export declare class GitWorktreeService implements WorktreeService {
     private readonly git;
-    constructor(git?: GitClient);
+    private readonly coordinator;
+    constructor(git?: GitClient, coordinator?: WorktreeLifecycleCoordinator);
     prepare(request: WorktreePrepareRequest): Promise<WorktreeHandle>;
+    private trackedForgePaths;
+    private repoCreationCoordinationPath;
     release(handle: WorktreeHandle): Promise<void>;
+    private restoreOrphanedWorktree;
     private resolveRepoPath;
+    private managedRepoPath;
     private findExistingRepoPath;
     private resolveMatchingRepo;
     private resolveBaseStartPoint;
@@ -15,4 +20,10 @@ export declare class GitWorktreeService implements WorktreeService {
     private currentBranch;
     private ensureGitIdentity;
 }
+type WorktreeRename = (source: string, destination: string) => Promise<void>;
+type WorktreeRenameDelay = (milliseconds: number) => Promise<void>;
+export declare function renameWorktreeForRelease(source: string, destination: string, rename?: WorktreeRename, wait?: WorktreeRenameDelay, maxAttempts?: number): Promise<void>;
+export declare function requiresMutableEnvironmentPreparation(request: Pick<WorktreePrepareRequest, "applicationRuntimeRequired">): boolean;
+export declare function clearRunArtifactRoots(worktreePath: string, request: WorktreePrepareRequest): Promise<void>;
 export declare function normalizeBranchName(value: string | null | undefined, fallback: string): string;
+export {};