@deksden-com/dd-flow-cli 0.9.0-beta.13 → 0.9.0-beta.134

package/dist/services/engines.js

@@ -2,7 +2,9 @@ import crypto from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { spawn, spawnSync } from "node:child_process";
+import { spawn } from "node:child_process";
+import { commandText } from '../harness-runtime/lib/process-json.mjs';
+import { SETUP_STARTUP_MS, publishSetup } from '../harness-runtime/lib/setup-progress.mjs';
 import { createRequire } from "node:module";
 import { getCliBuildInfo } from "./build-info.js";
 import { AppError } from "../shared/errors.js";
@@ -12,6 +14,7 @@ import { requireProtocol } from "./protocols.js";
 import { resolveCanonRootBeforeContext } from "./canon.js";
 import { appendAudit } from "./audit.js";
 import { findProjectByRoot } from "./projects.js";
+import { parseCommandArgs } from "./lifecycle-command.js";
 import { allRunEngineBindings, locateRunRoot, readRunEngineBinding, runEngineBindingSchemaId, writeRunEngineBinding } from "./run-engine-bindings.js";
 export const engineManifestSchemaId = "dd-flow/engine-manifest@1";
 const routerNativeFamilies = new Set(["engine", "version", "schema"]);
@@ -31,6 +34,24 @@ export function isRouterNativeCommand(args) {
     return routerNativeFamilies.has(first) || first === "codex" && args[1] === "hook" && args[2] === "handle";
 }
 export function installCurrentEngine(context, input = {}) {
+    const installation = prepareInstallation(context, input);
+    const first = installation.next();
+    if (first.done && input.forRouting)
+        return first.value;
+    const manifest = first.done ? requireManifest(path.join(String(first.value.path), 'engine.json')) : first.value;
+    return probeEntrypoint(manifest, undefined, context.ddFlowHome, process.env).then(() => first.done ? first.value : installation.next().value)
+        .catch(error => {
+        let cleanup_error;
+        try {
+            installation.return({});
+        }
+        catch (cleanup) {
+            cleanup_error = { message: String(cleanup).slice(0, 2000) };
+        }
+        throw new AppError('engine_install_failed', 'Staged engine admission failed', 1, { ...error.details, cause: error.code, probe_error: { code: error.code, details: error.details }, ...(cleanup_error ? { cleanup_error } : {}) });
+    });
+}
+function* prepareInstallation(context, input) {
     const build = getCliBuildInfo();
     const packageRoot = findPackageRoot(path.dirname(sourceFile));
     if (!packageRoot) {
@@ -66,6 +87,7 @@ export function installCurrentEngine(context, input = {}) {
         const tmp = path.join(parent, `.${path.basename(target)}.tmp-${process.pid}-${Date.now()}`);
         fs.rmSync(tmp, { recursive: true, force: true });
         ensureDir(tmp);
+        publishSetup('probe_started', `engine-staging:${tmp}`);
         copyPackageSnapshot(packageRoot, tmp);
         const stagedManifest = buildManifest(context, build.package_name, build.version, packageRoot, target, tmp);
         const stagedChecksum = stagedManifest.integrity.checksum;
@@ -81,7 +103,7 @@ export function installCurrentEngine(context, input = {}) {
             packageVersion: build.version,
             integrityChecksum: stagedChecksum
         }) : null;
-        if (duplicate) {
+        if (duplicate && manifestDiagnostics(duplicate, { checkEntrypoint: false }).length === 0) {
             fs.rmSync(tmp, { recursive: true, force: true });
             return {
                 ok: true,
@@ -94,13 +116,15 @@ export function installCurrentEngine(context, input = {}) {
         const manifest = { ...stagedManifest, package_root: activationTarget, snapshot_root: activationTarget };
         fs.writeFileSync(path.join(tmp, "engine.json"), `${JSON.stringify(manifest, null, 2)}\n`);
         const checkedManifest = requireManifest(path.join(tmp, "engine.json"));
-        const stagedDiagnostics = manifestDiagnostics({ ...checkedManifest, package_root: tmp, snapshot_root: tmp }, { checkEntrypoint: !input.forRouting });
+        const stagedDiagnostics = manifestDiagnostics({ ...checkedManifest, package_root: tmp, snapshot_root: tmp }, { checkEntrypoint: false });
         if (stagedDiagnostics.length > 0) {
             throw new AppError("engine_install_failed", "Staged dd-flow engine failed its integrity or dependency health check", 1, {
                 diagnostics: stagedDiagnostics,
                 path: tmp
             });
         }
+        if (!input.forRouting)
+            yield { ...checkedManifest, package_root: tmp, snapshot_root: tmp };
         activateEngineAtomically(tmp, activationTarget);
         const installed = requireManifest(path.join(activationTarget, "engine.json"));
         return {
@@ -117,7 +141,7 @@ export function installCurrentEngine(context, input = {}) {
 }
 export function listEngines(context) {
     const root = engineStoreRoot(context.ddFlowHome);
-    const engines = readInstalledManifests(root).map(manifestSummary);
+    const engines = readInstalledManifests(root).map(manifest => manifestSummary(manifest));
     return { ok: true, schema_id: "dd-flow/engine-list@1", engine_store: root, engines };
 }
 export function engineInfo(context, input) {
@@ -135,14 +159,23 @@ export function resolveEngine(context, input = {}) {
     }
     return { ok: true, schema_id: "dd-flow/engine-resolve@1", selection, contexts: compatibilityContexts(context, { ...input, classification }) };
 }
-export function doctorEngines(context, input = {}) {
+export async function doctorEngines(context, input = {}) {
     const root = engineStoreRoot(context.ddFlowHome);
     const installed = readInstalledManifests(root);
-    const checks = installed.map((manifest) => ({
-        engine: manifestSummary(manifest),
-        status: manifestHealthy(manifest) ? "ok" : "corrupt",
-        diagnostics: manifestDiagnostics(manifest)
-    }));
+    const checks = [];
+    for (const manifest of installed) {
+        const diagnostics = manifestDiagnostics(manifest);
+        let probe_error;
+        if (!diagnostics.length)
+            try {
+                await probeEntrypoint(manifest, undefined, context.ddFlowHome, context.env);
+            }
+            catch (error) {
+                probe_error = error instanceof AppError ? error.details : { message: String(error) };
+                diagnostics.push(error instanceof AppError && error.code === 'engine_probe_failed' ? 'entrypoint_dependency_load_failed' : 'entrypoint_probe_unavailable');
+            }
+        checks.push({ engine: manifestSummary(manifest, diagnostics), status: diagnostics.includes("entrypoint_probe_unavailable") ? "unverified" : diagnostics.length ? "corrupt" : "ok", diagnostics, ...(probe_error ? { probe_error } : {}) });
+    }
     const classification = input.classification ?? classifyCliOperation(["engine", "doctor"], input.env ?? context.env);
     const selection = selectEngine(context, input, {}, classification);
     return {
@@ -155,13 +188,14 @@ export function doctorEngines(context, input = {}) {
         exit_code: checks.every((check) => check.status === "ok") && selection.status === "selected" ? 0 : 1
     };
 }
-export function routeArgsThroughEngine(context, args, io, stdin, env, resolvedProjectRoot) {
+export async function routeArgsThroughEngine(context, args, io, stdin, env, resolvedProjectRoot) {
     if (isEngineMode(env) || isRouterNativeCommand(args))
         return Promise.resolve(null);
     const classification = classifyCliOperation(args, env);
     const bound = boundRunEngineForArgs(context, args, resolvedProjectRoot ?? resolveExplicitProjectRoot(args) ?? undefined);
     if (bound) {
         const entrypoint = resolveManifestEntrypoint(bound.manifest);
+        await probeEntrypoint(bound.manifest, undefined, context.ddFlowHome, process.env);
         return spawnEngine(bound.manifest, entrypoint, args, io, stdin, env, getCliBuildInfo().version);
     }
     const selection = selectEngine(context, { projectRoot: resolvedProjectRoot ?? resolveExplicitProjectRoot(args) ?? undefined, env }, { allowCurrentInProcess: true }, classification);
@@ -174,13 +208,25 @@ export function routeArgsThroughEngine(context, args, io, stdin, env, resolvedPr
     if (!selection.selected)
         return Promise.resolve(null);
     const current = getCliBuildInfo();
-    if (selection.selected.package_name === current.package_name && selection.selected.package_version === current.version) {
+    const currentRoot = findPackageRoot(path.dirname(sourceFile));
+    if (selection.selected.package_name === current.package_name && selection.selected.package_version === current.version
+        && currentRoot !== null && fs.realpathSync(selection.selected.snapshot_root) === fs.realpathSync(currentRoot)) {
         return Promise.resolve({ routed: true, exitCode: 0, inProcess: true });
     }
     const entrypoint = resolveManifestEntrypoint(selection.selected);
+    try {
+        await probeEntrypoint(selection.selected, undefined, context.ddFlowHome, process.env);
+    }
+    catch (cause) {
+        const error = cause;
+        if (error.code !== 'engine_probe_failed')
+            throw error;
+        throw new AppError('missing_engine', 'Selected engine cannot load its runtime dependencies', 1, { probe: error.details });
+    }
     return spawnEngine(selection.selected, entrypoint, args, io, stdin, env, current.version);
 }
-export function bindRunEngine(context, input) {
+export async function prepareRunEngineBind(context, input) {
+    const reason = requiredText(input.reason, "reason");
     const projectRoot = resolveProjectRoot(input.projectRoot);
     const located = locateRunRoot(context.db, projectRoot, input.runId);
     if (!located)
@@ -190,40 +236,43 @@ export function bindRunEngine(context, input) {
         packageName: input.packageName ?? getCliBuildInfo().package_name,
         packageVersion: input.engineVersion,
         ...(input.integrityChecksum ? { integrityChecksum: input.integrityChecksum } : {})
-    });
+    }, { checkEntrypoint: false });
     const requested = engineIdentity(manifest);
     if (existing) {
         if (sameEngineIdentity(existing.engine, requested))
-            return { ok: true, action: "run_engine_bind", changed: false, binding: existing };
+            return { kind: "replay", binding: existing };
         throw new AppError("run_engine_binding_immutable", "RUN engine binding cannot be changed", 1, {
             run_id: located.run_id,
             current: existing.engine,
             requested
         });
     }
-    const probeArgs = ["run", "status", located.run_id, "--project-root", projectRoot, "--json"];
-    const probe = spawnSync(process.execPath, [resolveManifestEntrypoint(manifest), ...probeArgs], {
-        cwd: manifest.snapshot_root,
-        env: { ...process.env, ...context.env, DD_FLOW_HOME: context.ddFlowHome, DD_FLOW_ENGINE_MODE: "1", DD_FLOW_ENGINE_HOME: manifest.snapshot_root },
-        encoding: "utf8",
-        timeout: 30_000
-    });
-    if (probe.status !== 0) {
-        throw new AppError("run_engine_probe_failed", "Selected engine cannot read the RUN authority", 1, {
-            run_id: located.run_id,
-            engine: manifestSummary(manifest),
-            command: `dd-flow ${probeArgs.join(" ")}`,
-            exit_code: probe.status,
-            stderr: probe.stderr.slice(0, 2000)
-        });
+    await probeEntrypoint(manifest, ['run', 'status', located.run_id, '--project-root', projectRoot, '--json'], context.ddFlowHome, context.env, 'run_engine');
+    return { kind: "create", projectRoot, located, manifest, requested, reason, entrypoint: resolveManifestEntrypoint(manifest) };
+}
+export async function bindRunEngine(context, input, supplied) {
+    const prepared = supplied ?? await prepareRunEngineBind(context, input);
+    if (prepared.kind === "replay")
+        return { ok: true, action: "run_engine_bind", changed: false, binding: prepared.binding };
+    const { projectRoot, located, manifest, requested, reason } = prepared;
+    const current = locateRunRoot(context.db, projectRoot, input.runId);
+    if (!current || current.run_root !== located.run_root)
+        throw new AppError('run_engine_binding_conflict', 'RUN identity changed during probe', 1);
+    requireBoundManifest(context.ddFlowHome, { packageName: manifest.package_name, packageVersion: manifest.package_version, integrityChecksum: requested.integrity_checksum });
+    const existing = readRunEngineBinding(located.binding_path, { allowMissing: true });
+    if (existing) {
+        if (sameEngineIdentity(existing.engine, requested))
+            return { ok: true, action: "run_engine_bind", changed: false, binding: existing };
+        throw new AppError("run_engine_binding_immutable", "RUN engine binding cannot be changed", 1, { run_id: located.run_id, current: existing.engine, requested });
     }
+    const probeArgs = ["run", "status", located.run_id, "--project-root", projectRoot, "--json"];
     const binding = {
         schema_id: runEngineBindingSchemaId,
         run_id: located.run_id,
         project_root: projectRoot,
         bound_at: context.now(),
         source: "legacy_recovery",
-        reason: requiredText(input.reason, "reason"),
+        reason,
         engine: requested,
         probe: { status: "passed", command: `dd-flow ${probeArgs.join(" ")}` }
     };
@@ -252,6 +301,36 @@ export function bindCurrentEngineToRun(context, input) {
     };
     return writeRunEngineBinding(path.join(input.runRoot, "engine-binding.json"), binding).binding;
 }
+/** Forks are a new execution authority.  The source binding stays immutable;
+ * this replaces only the copied binding after proving the selected engine can
+ * read the copied RUN. */
+export async function upgradeForkedRunEngine(context, input) {
+    const projectRoot = resolveProjectRoot(input.projectRoot);
+    const located = locateRunRoot(context.db, projectRoot, input.runId);
+    if (!located)
+        throw new AppError("not_found", `Forked RUN is not registered: ${input.runId}`, 1);
+    const manifest = requireBoundManifest(context.ddFlowHome, {
+        packageName: getCliBuildInfo().package_name,
+        packageVersion: input.engineVersion,
+        ...(input.integrityChecksum ? { integrityChecksum: input.integrityChecksum } : {})
+    });
+    const requested = engineIdentity(manifest);
+    const priorBinding = fs.readFileSync(located.binding_path, 'utf8');
+    const lineage = path.join(located.run_root, "fork-lineage.json");
+    if (!fs.existsSync(lineage))
+        throw new AppError("fork_lineage_missing", "Engine upgrade is permitted only for a derived RUN", 1, { run_id: located.run_id });
+    const probeArgs = ["run", "status", located.run_id, "--project-root", projectRoot, "--json"];
+    const priorLineage = fs.readFileSync(lineage, 'utf8');
+    await probeEntrypoint(manifest, probeArgs, context.ddFlowHome, context.env, 'fork_engine');
+    if (fs.readFileSync(located.binding_path, 'utf8') !== priorBinding || fs.readFileSync(lineage, 'utf8') !== priorLineage)
+        throw new AppError('fork_engine_binding_conflict', 'Fork identity changed during probe', 1);
+    requireBoundManifest(context.ddFlowHome, { packageName: manifest.package_name, packageVersion: manifest.package_version, integrityChecksum: manifest.integrity.checksum });
+    const binding = { schema_id: runEngineBindingSchemaId, run_id: located.run_id, project_root: projectRoot, bound_at: context.now(), source: "fork_upgrade", reason: requiredText(input.reason, "reason"), engine: requested, probe: { status: "passed", command: `dd-flow ${probeArgs.join(" ")}` } };
+    const temporary = `${located.binding_path}.fork-${process.pid}-${Date.now()}.tmp`;
+    fs.writeFileSync(temporary, `${JSON.stringify(binding, null, 2)}\n`);
+    fs.renameSync(temporary, located.binding_path);
+    return binding;
+}
 function boundRunEngineForArgs(context, args, projectRoot) {
     const runId = runIdForArgs(args);
     if (!runId || !projectRoot)
@@ -274,6 +353,8 @@ function runIdForArgs(args) {
     const [family, command, ...rest] = args;
     const parsed = parseLightArgs(rest);
     if (family === "run" && command !== "start" && command !== "list") {
+        if (["drive", "control", "recovery", "capacity"].includes(command ?? ""))
+            return option(parsed, "run");
         if (command === "flags")
             return positional(parsed, 1);
         return positional(parsed, 0);
@@ -290,7 +371,7 @@ function runIdForArgs(args) {
         return option(parsed, "run");
     return null;
 }
-function requireBoundManifest(ddFlowHome, input) {
+function requireBoundManifest(ddFlowHome, input, options = {}) {
     const manifest = input.snapshotRoot
         ? requireManifest(path.join(input.snapshotRoot, "engine.json"))
         : findInstalledManifest(ddFlowHome, {
@@ -303,7 +384,7 @@ function requireBoundManifest(ddFlowHome, input) {
         || manifest.package_version !== input.packageVersion
         || input.integrityChecksum !== undefined && manifest.integrity.checksum !== input.integrityChecksum
         || input.snapshotRoot !== undefined && path.resolve(manifest.snapshot_root) !== path.resolve(input.snapshotRoot)
-        || !manifestHealthy(manifest)) {
+        || manifestDiagnostics(manifest, options).length !== 0) {
         throw new AppError("run_engine_binding_invalid", "RUN engine binding points to a missing or unhealthy engine snapshot", 1, {
             package_name: input.packageName,
             package_version: input.packageVersion,
@@ -344,7 +425,7 @@ function executionManifest(context) {
     return requireManifest(path.join(String(installed.path), "engine.json"));
 }
 function requiredText(value, label) {
-    const normalized = value.trim();
+    const normalized = typeof value === "string" ? value.trim() : "";
     if (!normalized)
         throw new AppError("usage", `Missing required value: ${label}`, 2);
     return normalized;
@@ -380,14 +461,14 @@ export function selectEngine(context, input, options = {}, classification = inpu
     const requiredRange = stringValue(compatibility?.engine?.version_range) ?? (classification.mode === "mb_upgrade" ? null : `>=${build.version} <9999.0.0`);
     const recommended = stringValue(compatibility?.engine?.recommended_version) ?? build.version;
     const installHintTemplate = stringValue(compatibility?.engine?.old_engine_install_hint) ?? `npx ${packageName}@<version> engine install`;
-    const manifests = readInstalledManifests(engineStoreRoot(context.ddFlowHome))
+    // An engine-mode caller already executes this module's build. Another
+    // installed engine cannot establish compatibility for its current writes.
+    // Keep full snapshot validation in routing/binding, not lease maintenance.
+    const executingCurrent = options.allowCurrentInProcess && isEngineMode(input.env ?? process.env);
+    const manifests = executingCurrent ? [] : readInstalledManifests(engineStoreRoot(context.ddFlowHome))
         .filter((manifest) => manifest.package_name === packageName)
         .filter((manifest) => requiredRange !== null && satisfiesRange(manifest.package_version, requiredRange))
-        .filter((manifest) => options.allowCurrentInProcess
-        && manifest.package_name === build.package_name
-        && manifest.package_version === build.version
-        ? true
-        : manifestHealthy(manifest))
+        .filter((manifest) => manifestHealthy(manifest))
         .sort((a, b) => {
         const versionOrder = compareSemverStrings(b.package_version, a.package_version);
         if (versionOrder !== 0)
@@ -402,7 +483,7 @@ export function selectEngine(context, input, options = {}, classification = inpu
         requiredRange !== null &&
         packageName === build.package_name &&
         satisfiesRange(build.version, requiredRange)
-        ? currentBuildManifest(context, build)
+        ? currentBuildManifest(context, build, options.verifyCurrentContent !== false)
         : null);
     const diagnostics = [
         ...targetBlockers,
@@ -420,9 +501,38 @@ export function selectEngine(context, input, options = {}, classification = inpu
         diagnostics
     };
 }
-function currentBuildManifest(context, build) {
+function currentBuildManifest(context, build, verifyContent) {
     const packageRoot = findPackageRoot(path.dirname(sourceFile)) ?? process.cwd();
-    return buildManifest(context, build.package_name, build.version, packageRoot, packageRoot, packageRoot);
+    const manifestFile = path.join(packageRoot, "engine.json");
+    const installedLayout = path.basename(path.dirname(path.dirname(packageRoot))) === "engines"
+        && path.basename(path.dirname(packageRoot)) === path.basename(path.dirname(engineVersionRoot(context.ddFlowHome, build.package_name, build.version)));
+    if (fs.existsSync(manifestFile) || installedLayout) {
+        const installed = readManifest(manifestFile);
+        // Use the executing module's physical root, never an environment alias.
+        // A damaged installed manifest must not become a development fallback.
+        if (!installed || installed.package_name !== build.package_name || installed.package_version !== build.version
+            || installed.engine_version !== build.version || installed.engine_id !== "dd-flow-engine"
+            || typeof installed.snapshot_root !== "string" || !fs.existsSync(installed.snapshot_root)
+            || fs.realpathSync(installed.snapshot_root) !== fs.realpathSync(packageRoot)
+            || typeof installed.entrypoint !== "string" || installed.integrity?.source !== "package_snapshot"
+            || typeof installed.integrity?.checksum !== "string" || !/^[a-f0-9]{64}$/.test(installed.integrity.checksum)
+            || (installed.schema_registry && (!Array.isArray(installed.schema_registry.entries)
+                || installed.schema_registry.entries.some(entry => !entry || typeof entry.path !== "string"
+                    || typeof entry.id !== "string" || typeof entry.name !== "string" || !/^[a-f0-9]{64}$/.test(entry.checksum ?? ""))))) {
+            throw new AppError("unhealthy_engine", "Executing engine snapshot manifest does not match its build", 1, { manifest: manifestFile });
+        }
+        const diagnostics = manifestDiagnostics(installed, { checkEntrypoint: false, verifyContent });
+        if (diagnostics.length)
+            throw new AppError("unhealthy_engine", "Executing engine snapshot is unhealthy", 1, { manifest: manifestFile, diagnostics });
+        return installed;
+    }
+    // Only an unmaterialized package has no snapshot proof. Canon and
+    // package-manager aliases are expected in development checkouts.
+    const manifest = buildManifest(context, build.package_name, build.version, packageRoot, packageRoot, packageRoot, null);
+    // An ephemeral routing choice has no snapshot proof. Hash bytes only when
+    // materializing/validating an installed snapshot, never on every CLI call.
+    manifest.integrity.mode = "degraded_local_development";
+    return manifest;
 }
 export function compatibilityContexts(context, input = {}) {
     const env = input.env ?? process.env;
@@ -560,40 +670,16 @@ function canonCompatibilitySha(memorybankRoot) {
         return null;
     }
 }
-function parseLightArgs(args) {
-    const positional = [];
-    const options = new Map();
-    for (let index = 0; index < args.length; index += 1) {
-        const value = args[index];
-        if (value?.startsWith("--")) {
-            const equal = value.indexOf("=");
-            if (equal > 2) {
-                const key = value.slice(2, equal);
-                options.set(key, [...(options.get(key) ?? []), value.slice(equal + 1)]);
-                continue;
-            }
-            const key = value.slice(2);
-            const next = args[index + 1];
-            if (!next || next.startsWith("--"))
-                options.set(key, [...(options.get(key) ?? []), ""]);
-            else {
-                options.set(key, [...(options.get(key) ?? []), next]);
-                index += 1;
-            }
-        }
-        else if (value)
-            positional.push(value);
-    }
-    return { positional, options };
-}
+const parseLightArgs = parseCommandArgs;
 function option(parsed, key) {
     const values = parsed.options.get(key);
-    return values?.[values.length - 1] || null;
+    const value = values?.[values.length - 1];
+    return value && value !== "__dd_flow_flag__" ? value : null;
 }
 function positional(parsed, index) {
     return parsed.positional[index] ?? null;
 }
-function buildManifest(context, packageName, version, packageRoot, snapshotRoot, checksumRoot) {
+function buildManifest(context, packageName, version, packageRoot, snapshotRoot, checksumRoot, checksum = engineSnapshotChecksum(checksumRoot)) {
     return {
         schema_id: engineManifestSchemaId,
         package_name: packageName,
@@ -614,29 +700,46 @@ function buildManifest(context, packageName, version, packageRoot, snapshotRoot,
         schema_registry: buildSchemaRegistry(checksumRoot),
         integrity: {
             source: "package_snapshot",
-            checksum: engineSnapshotChecksum(checksumRoot),
+            checksum,
             mode: "full_content"
         }
     };
 }
 function copyPackageSnapshot(packageRoot, target) {
+    let copied = 0;
+    for (const [relative, source] of packageSnapshotFiles(packageRoot)) {
+        const destination = path.join(target, relative);
+        ensureDir(path.dirname(destination));
+        fs.copyFileSync(source, destination);
+        if (++copied % 64 === 0)
+            publishSetup('transfer_progress', `${target}:${copied}`);
+    }
+}
+/** The same source inventory drives validation and copying; no staging writes. */
+function packageSnapshotFiles(packageRoot) {
+    const files = new Map();
+    const collect = (source, relative, skipNodeModules = false) => {
+        if (!fs.statSync(source).isDirectory()) {
+            files.set(relative, source);
+            return;
+        }
+        for (const entry of fs.readdirSync(source, { withFileTypes: true })) {
+            if (skipNodeModules && entry.name === "node_modules")
+                continue;
+            const child = path.join(source, entry.name), name = path.join(relative, entry.name);
+            if (entry.isDirectory())
+                collect(child, name, skipNodeModules);
+            else if (entry.isFile())
+                files.set(name, child);
+        }
+    };
     for (const item of ["dist", "package.json", "README.md", "CHANGELOG.md", "tools"]) {
         const from = path.join(packageRoot, item);
         if (!fs.existsSync(from))
             continue;
-        const to = path.join(target, item);
-        const stat = fs.statSync(from);
-        if (stat.isDirectory())
-            copyDir(from, to);
-        else {
-            ensureDir(path.dirname(to));
-            fs.copyFileSync(from, to);
-        }
+        collect(from, item);
     }
-    copyProductionDependencies(packageRoot, target);
-}
-function copyProductionDependencies(packageRoot, target) {
-    const queue = [{ sourceRoot: packageRoot, targetRoot: target, ancestors: new Set() }];
+    const queue = [{ sourceRoot: packageRoot, targetRoot: "", ancestors: new Set() }];
     const copied = new Set();
     while (queue.length > 0) {
         const current = queue.shift();
@@ -651,12 +754,39 @@ function copyProductionDependencies(packageRoot, target) {
             if (copied.has(copyKey))
                 continue;
             copied.add(copyKey);
-            copyDir(sourceRoot, targetRoot, true);
+            collect(sourceRoot, targetRoot, true);
             if (current.ancestors.has(sourceRoot))
                 continue;
             queue.push({ sourceRoot, targetRoot, ancestors: new Set([...current.ancestors, sourceRoot]) });
         }
     }
+    return files;
+}
+export function prepareForkEngine(engineVersion, integrityChecksum) {
+    const build = getCliBuildInfo();
+    if (engineVersion !== build.version)
+        throw new AppError("fork_engine_unavailable", "Fork installs the invoking CLI engine; invoke the requested version to upgrade the fork", 2, { requested: engineVersion, available: build.version });
+    const packageRoot = findPackageRoot(path.dirname(sourceFile));
+    if (!packageRoot || !fs.existsSync(path.join(packageRoot, "dist", "cli.js")))
+        throw new AppError("harness_runtime_unbuilt", "Build the CLI before preparing a fork", 1);
+    const files = packageSnapshotFiles(packageRoot);
+    if (integrityChecksum !== undefined) {
+        const checksum = snapshotFilesChecksum(files);
+        if (checksum !== integrityChecksum)
+            throw new AppError("fork_engine_unavailable", "Requested engine checksum differs from the invoking CLI artifact", 2, { requested: integrityChecksum });
+    }
+}
+function snapshotFilesChecksum(files) {
+    const checksum = crypto.createHash("sha256");
+    for (const [relative, source] of [...files].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0)) {
+        if (path.basename(relative) === "engine.json")
+            continue;
+        checksum.update(relative);
+        checksum.update("\0");
+        checksum.update(fs.readFileSync(source));
+        checksum.update("\0");
+    }
+    return checksum.digest("hex");
 }
 function readProductionDependencies(packageRoot) {
     try {
@@ -713,19 +843,6 @@ function hasAncestorFile(start, name) {
         current = parent;
     }
 }
-function copyDir(from, to, skipNodeModules = false) {
-    ensureDir(to);
-    for (const entry of fs.readdirSync(from, { withFileTypes: true })) {
-        if (skipNodeModules && entry.name === "node_modules")
-            continue;
-        const source = path.join(from, entry.name);
-        const target = path.join(to, entry.name);
-        if (entry.isDirectory())
-            copyDir(source, target, skipNodeModules);
-        else if (entry.isFile())
-            fs.copyFileSync(source, target);
-    }
-}
 function acquireInstallLock(lockDir) {
     ensureDir(path.dirname(lockDir));
     try {
@@ -750,6 +867,9 @@ function readInstalledManifests(root) {
         if (!fs.statSync(packageRoot).isDirectory())
             continue;
         for (const versionDir of fs.readdirSync(packageRoot)) {
+            // Failed staging, activation backups and locks are not installations.
+            if (versionDir.startsWith(".") || /\.previous-\d+-\d+$/.test(versionDir) || versionDir.endsWith(".lock"))
+                continue;
             const manifest = readManifest(path.join(packageRoot, versionDir, "engine.json"));
             if (manifest)
                 manifests.push(manifest);
@@ -802,7 +922,7 @@ function manifestDiagnostics(manifest, options = {}) {
     if (!manifest.integrity || manifest.integrity.mode !== "full_content" || !manifest.integrity.checksum) {
         diagnostics.push("content_checksum_missing");
     }
-    else if (fs.existsSync(snapshotRoot)) {
+    else if (options.verifyContent !== false && fs.existsSync(snapshotRoot)) {
         try {
             if (engineSnapshotChecksum(snapshotRoot) !== manifest.integrity.checksum)
                 diagnostics.push("content_checksum_mismatch");
@@ -816,6 +936,8 @@ function manifestDiagnostics(manifest, options = {}) {
             const schemaPath = safeResolveSnapshotPath(manifest, entry.path);
             if (!schemaPath || !fs.existsSync(schemaPath))
                 diagnostics.push(`schema_registry_missing:${entry.name}`);
+            else if (options.verifyContent === false)
+                continue;
             else if (fileChecksum(schemaPath) !== entry.checksum)
                 diagnostics.push(`schema_registry_checksum_mismatch:${entry.name}`);
             else {
@@ -829,25 +951,21 @@ function manifestDiagnostics(manifest, options = {}) {
             }
         }
     }
-    if (options.checkEntrypoint !== false && entrypoint && fs.existsSync(entrypoint) && !diagnostics.includes("entrypoint_outside_snapshot")) {
-        const health = spawnSync(process.execPath, [entrypoint, "--version", "--json"], {
-            cwd: snapshotRoot,
-            env: {
-                ...process.env,
-                DD_FLOW_ENGINE_MODE: "1",
-                DD_FLOW_ENGINE_HOME: snapshotRoot,
-                DD_FLOW_ENGINE_HEALTHCHECK: "1"
-            },
-            encoding: "utf8",
-            stdio: ["ignore", "pipe", "pipe"],
-            timeout: 15_000
-        });
-        if (health.status !== 0)
-            diagnostics.push("entrypoint_dependency_load_failed");
-    }
     return diagnostics;
 }
-function manifestSummary(manifest) {
+async function probeEntrypoint(manifest, args = ['--version', '--json'], runtimeHome, env = {}, purpose = 'engine') {
+    publishSetup('probe_started', manifest.snapshot_root);
+    try {
+        await commandText(resolveManifestEntrypoint(manifest), args, { cwd: manifest.snapshot_root,
+            env: { ...env, DD_FLOW_ENGINE_MODE: '1', DD_FLOW_ENGINE_HOME: manifest.snapshot_root, ...(runtimeHome ? { DD_FLOW_HOME: runtimeHome } : {}), ...(args[0] === '--version' ? { DD_FLOW_ENGINE_HEALTHCHECK: '1' } : {}) }, startupMs: SETUP_STARTUP_MS, phase: 'engine-probe' });
+        publishSetup('probe_completed', manifest.snapshot_root);
+    }
+    catch (cause) {
+        const error = cause;
+        throw new AppError(error.details?.reason === 'child_exit' && error.details?.signal === null && error.details?.exit_code !== null ? `${purpose}_probe_failed` : `${purpose}_probe_unavailable`, 'Selected engine probe did not complete successfully', 1, { cause: error.code, message: error.message, ...error.details });
+    }
+}
+function manifestSummary(manifest, diagnostics = manifestDiagnostics(manifest, { checkEntrypoint: false })) {
     return {
         schema_id: manifest.schema_id,
         package_name: manifest.package_name,
@@ -859,8 +977,8 @@ function manifestSummary(manifest) {
         snapshot_root: manifest.snapshot_root,
         resolved_entrypoint: safeResolveManifestEntrypoint(manifest),
         installed_at: manifest.installed_at,
-        healthy: manifestHealthy(manifest),
-        diagnostics: manifestDiagnostics(manifest)
+        healthy: diagnostics.length === 0,
+        diagnostics
     };
 }
 function resolveManifestEntrypoint(manifest) {
@@ -1011,22 +1129,30 @@ function findPackageRoot(start) {
     }
 }
 export function engineSnapshotChecksum(root) {
+    publishSetup('probe_started', `engine-digest:${root}`);
     const files = [];
     collectFiles(root, root, files);
     const checksum = crypto.createHash("sha256");
+    let checked = 0;
     for (const file of files.sort()) {
         checksum.update(file);
         checksum.update("\0");
         checksum.update(fs.readFileSync(path.join(root, file)));
+        if (++checked % 64 === 0)
+            publishSetup('identity_digest_progress', `${root}:${checked}`);
         checksum.update("\0");
     }
-    return checksum.digest("hex");
+    const result = checksum.digest("hex");
+    publishSetup('identity_digest_completed', root);
+    return result;
 }
 function collectFiles(root, current, files) {
     for (const entry of fs.readdirSync(current, { withFileTypes: true })) {
         if (entry.name === "engine.json")
             continue;
         const full = path.join(current, entry.name);
+        if (entry.isSymbolicLink())
+            throw new AppError("engine_integrity_symlink", "Pinned engine snapshot contains an unhashed symbolic link", 1, { path: path.relative(root, full) });
         if (entry.isDirectory())
             collectFiles(root, full, files);
         else if (entry.isFile())