@bluewombat/isolation-git 0.1.0

package/README.md

@@ -0,0 +1,62 @@
+# Isolation: git
+
+Git worktree attach and three-way merge fold. Host (or a Transformer CLI) loads
+this package when `workLine.isolation` is `@bluewombat/isolation-git`.
+
+```ts
+import { branchNameOf, strategy } from "@bluewombat/isolation-git";
+// strategy.isolation → Isolator
+// strategy.fold → Integrator
+// strategy.refOf(id) → issue/<item>, what the Authority hands the Publisher:
+//   issue/9 for github:owner/repo#9, issue/9-s1 for its Subtask s1,
+//   issue/<slug of the id> for an id in any other shape, cut at 80 with a
+//   7-hex digest of the whole id when it was cut
+// branchNameOf(id) → the same, for anyone holding an id
+```
+
+The Child is a worktree of the Parent, then wiped and filled with the Parent's
+working files so dirty and untracked content matches — `.cursor/`, `CLAUDE.md`,
+`node_modules/`, tracked or not, all of it.
+
+## What a Child does not get
+
+`.env` and `.env.*`, at any depth, unless the Project says otherwise: a secret
+in the clear has no business in a directory an agent reads and a pull request
+may carry. A Project names its own list in the config, and that list
+**replaces** the default:
+
+```json
+"workLine": {
+  "isolation": "@bluewombat/isolation-git",
+  "isolationOptions": { "exclude": [".env", ".env.*", "**/*.pem", "secrets/**"] }
+}
+```
+
+A pattern with no `/` is matched against the last path segment, at any depth
+(`.env` also leaves out `packages/api/.env`); one with a `/` against the whole
+path from the root (`build/out`). `*` is any run of characters within one
+segment, `**` anything, and a leading `**/` means "at any depth". An unknown
+key, or an `exclude` that is not a list of non-empty strings, stops `mason
+run` before it isolates anything. Nothing here reads `.gitignore`: what git
+ignores is very often exactly what a Builder needs (its dependencies, the
+Project's own agent configuration).
+
+Each root entry is copied by `cp` — `-c` on macOS, `--reflink=auto` elsewhere
+— so on a file system that clones (APFS, btrfs, XFS) the Child shares its
+bytes with the Parent instead of doubling them; where `cp` cannot, the entry
+is copied by hand. Excluded paths are removed from the Child afterwards.
+
+## The reference, and who the system is
+
+`strategy.reference.parse` reads what a manager names as the reference work
+line: `remote` and `branch`, required; `credentialEnv` and `author`, optional.
+Anything else is refused. From the optional two it builds the git environment
+of the run — `GIT_AUTHOR_*` / `GIT_COMMITTER_*`, and a credential helper that
+reads the token from the named variable at the moment git asks, after
+clearing the machine's own helpers so a keychain never answers first. Nothing
+is written to disk. Every git this package spawns carries that environment,
+and the parsed reference exposes it as `env` so Host can hand it to the slots
+that touch the work line (Publisher, Refresher) — and to nothing else: a
+Builder never inherits a token.
+
+Without `author`, commits carry the identity of whoever runs the process.

package/dist/branch-name.d.ts

@@ -0,0 +1,2 @@
+export declare function branchNameOf(id: string): string;
+//# sourceMappingURL=branch-name.d.ts.map

package/dist/branch-name.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"branch-name.d.ts","sourceRoot":"","sources":["../src/branch-name.ts"],"names":[],"mappings":"AA4BA,wBAAgB,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAiB/C"}

package/dist/branch-name.js

@@ -0,0 +1,42 @@
+import { createHash } from "node:crypto";
+/**
+ * A ref name for one Isolation, from its id.
+ *
+ * An unnamed Child leaves nothing behind: once its directory is gone, no one
+ * can see what the work was. The name is derived rather than asked for, so the
+ * contract keeps one id and gains no second identity to keep in step.
+ */
+/**
+ * What the branch is named after: the tracked item it works on, not the tool
+ * that made it. The tool is one git user among others on the repository; the
+ * branch outlives its run and is read by people who never heard of it.
+ */
+const REF_PREFIX = "issue";
+/**
+ * `<scheme>:<path>#<number>[:<rest>]` is how a tracker names an item — a
+ * GitHub issue, a GitLab one — and inside one Project the work line belongs to
+ * one repository, so the number alone tells the branches apart. An id in any
+ * other shape keeps its whole slug.
+ */
+const TRACKED_ITEM = /^[a-z][a-z0-9+.-]*:(?:[^#]*\/)?[^#/]*#(\d+)(?::(.+))?$/i;
+/** Where a slug is cut; past it, a digest of the whole id keeps two long ids apart. */
+const MAX_SLUG = 80;
+const DIGEST_LENGTH = 7;
+export function branchNameOf(id) {
+    const item = TRACKED_ITEM.exec(id);
+    const short = item?.[1] === undefined ? id : item[2] === undefined ? item[1] : `${item[1]}:${item[2]}`;
+    const slug = short
+        .toLowerCase()
+        .replace(/[^a-z0-9]+/g, "-")
+        .replace(/^-+|-+$/g, "");
+    if (slug.length <= MAX_SLUG) {
+        return `${REF_PREFIX}/${slug.length > 0 ? slug : "isolation"}`;
+    }
+    // Two ids that differ only past the cut would otherwise share a name, and
+    // `-B` would reset one Isolation's branch onto the other's. The digest is
+    // of the id as given, so the name stays a function of the id alone.
+    const digest = createHash("sha256").update(id).digest("hex").slice(0, DIGEST_LENGTH);
+    const head = slug.slice(0, MAX_SLUG - DIGEST_LENGTH - 1).replace(/-+$/, "");
+    return `${REF_PREFIX}/${head}-${digest}`;
+}
+//# sourceMappingURL=branch-name.js.map

package/dist/branch-name.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"branch-name.js","sourceRoot":"","sources":["../src/branch-name.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC;;;;;;GAMG;AACH;;;;GAIG;AACH,MAAM,UAAU,GAAG,OAAO,CAAC;AAE3B;;;;;GAKG;AACH,MAAM,YAAY,GAAG,yDAAyD,CAAC;AAE/E,uFAAuF;AACvF,MAAM,QAAQ,GAAG,EAAE,CAAC;AACpB,MAAM,aAAa,GAAG,CAAC,CAAC;AAExB,MAAM,UAAU,YAAY,CAAC,EAAU;IACrC,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACnC,MAAM,KAAK,GACT,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3F,MAAM,IAAI,GAAG,KAAK;SACf,WAAW,EAAE;SACb,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC;SAC3B,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAC3B,IAAI,IAAI,CAAC,MAAM,IAAI,QAAQ,EAAE,CAAC;QAC5B,OAAO,GAAG,UAAU,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IACjE,CAAC;IACD,0EAA0E;IAC1E,0EAA0E;IAC1E,oEAAoE;IACpE,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;IACrF,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,GAAG,aAAa,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC5E,OAAO,GAAG,UAAU,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC;AAC3C,CAAC"}

package/dist/child/run-child.d.ts

@@ -0,0 +1,42 @@
+type ClockName = "isolation" | "integration";
+export type SpawnRequest = {
+    argv: string[];
+    /** Undefined lets the child inherit the caller's directory. */
+    cwd?: string | undefined;
+    /** Wall-clock budget for this child (ms). */
+    timeoutMs: number;
+    /** Which clock owns the nearer deadline when timeoutMs hits. */
+    timeoutClock: ClockName;
+    /** When true, treat kill as interrupted (stop signal). */
+    shouldInterrupt: () => boolean;
+    /** Undefined lets the child inherit the caller's environment. */
+    env?: NodeJS.ProcessEnv | undefined;
+    /** Layered on top of the inherited environment. Ignored when `env` is set. */
+    envOverrides?: NodeJS.ProcessEnv | undefined;
+};
+export type SpawnOutcome = {
+    kind: "exited";
+    exitCode: number | null;
+    signal: NodeJS.Signals | null;
+    stdout: string;
+    stderr: string;
+} | {
+    kind: "timed_out";
+    clock: ClockName;
+    stdout: string;
+    stderr: string;
+} | {
+    kind: "interrupted";
+    stdout: string;
+    stderr: string;
+} | {
+    kind: "spawn_error";
+    detail: string;
+};
+/**
+ * Run one child with a wall-clock timeout. Does not inherit the caller's stdin.
+ */
+export declare function runChild(request: SpawnRequest): Promise<SpawnOutcome>;
+export declare function combinedOutput(stdout: string, stderr: string): string;
+export {};
+//# sourceMappingURL=run-child.d.ts.map

package/dist/child/run-child.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-child.d.ts","sourceRoot":"","sources":["../../src/child/run-child.ts"],"names":[],"mappings":"AAIA,KAAK,SAAS,GAAG,WAAW,GAAG,aAAa,CAAC;AAE7C,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,+DAA+D;IAC/D,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,6CAA6C;IAC7C,SAAS,EAAE,MAAM,CAAC;IAClB,gEAAgE;IAChE,YAAY,EAAE,SAAS,CAAC;IACxB,0DAA0D;IAC1D,eAAe,EAAE,MAAM,OAAO,CAAC;IAC/B,iEAAiE;IACjE,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,GAAG,SAAS,CAAC;IACpC,8EAA8E;IAC9E,YAAY,CAAC,EAAE,MAAM,CAAC,UAAU,GAAG,SAAS,CAAC;CAC9C,CAAC;AAgBF,MAAM,MAAM,YAAY,GACpB;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,GACD;IACE,IAAI,EAAE,WAAW,CAAC;IAClB,KAAK,EAAE,SAAS,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,GACD;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,GACD;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAiBN;;GAEG;AACH,wBAAgB,QAAQ,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CA+FrE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAGrE"}

package/dist/child/run-child.js

@@ -0,0 +1,121 @@
+import { spawn } from "node:child_process";
+const OUTPUT_TRUNCATE = 8_192;
+/**
+ * The one place ambient environment enters a child. `env` replaces it outright;
+ * `envOverrides` layers on top of what the child would inherit anyway.
+ */
+function childEnv(request) {
+    if (request.env !== undefined) {
+        return request.env;
+    }
+    if (request.envOverrides !== undefined) {
+        return { ...process.env, ...request.envOverrides };
+    }
+    return undefined;
+}
+function truncate(text) {
+    if (text.length <= OUTPUT_TRUNCATE) {
+        return text;
+    }
+    return `${text.slice(0, OUTPUT_TRUNCATE)}…[truncated]`;
+}
+function killProcessTree(child) {
+    try {
+        child.kill("SIGKILL");
+    }
+    catch {
+        // already gone
+    }
+}
+/**
+ * Run one child with a wall-clock timeout. Does not inherit the caller's stdin.
+ */
+export function runChild(request) {
+    return new Promise((resolve) => {
+        const [file, ...args] = request.argv;
+        if (file === undefined) {
+            resolve({ kind: "spawn_error", detail: "Empty command." });
+            return;
+        }
+        let settled = false;
+        let timedOut = false;
+        let interrupted = false;
+        let stdout = "";
+        let stderr = "";
+        let timer;
+        let interruptPoll;
+        const finish = (outcome) => {
+            if (settled) {
+                return;
+            }
+            settled = true;
+            if (timer !== undefined) {
+                clearTimeout(timer);
+            }
+            if (interruptPoll !== undefined) {
+                clearInterval(interruptPoll);
+            }
+            resolve(outcome);
+        };
+        let child;
+        try {
+            child = spawn(file, args, {
+                cwd: request.cwd,
+                env: childEnv(request),
+                stdio: ["ignore", "pipe", "pipe"],
+            });
+        }
+        catch (error) {
+            const detail = error instanceof Error ? error.message : String(error);
+            finish({ kind: "spawn_error", detail });
+            return;
+        }
+        if (!child.stdout || !child.stderr) {
+            finish({ kind: "spawn_error", detail: "Child stdout/stderr pipes unavailable." });
+            return;
+        }
+        child.stdout.setEncoding("utf8");
+        child.stderr.setEncoding("utf8");
+        child.stdout.on("data", (chunk) => {
+            stdout += chunk;
+        });
+        child.stderr.on("data", (chunk) => {
+            stderr += chunk;
+        });
+        child.on("error", (error) => {
+            finish({ kind: "spawn_error", detail: error.message });
+        });
+        timer = setTimeout(() => {
+            timedOut = true;
+            killProcessTree(child);
+        }, Math.max(1, request.timeoutMs));
+        interruptPoll = setInterval(() => {
+            if (request.shouldInterrupt()) {
+                interrupted = true;
+                killProcessTree(child);
+            }
+        }, 20);
+        if (request.shouldInterrupt()) {
+            interrupted = true;
+            killProcessTree(child);
+        }
+        child.on("close", (exitCode, signal) => {
+            const out = truncate(stdout);
+            const err = truncate(stderr);
+            if (interrupted || request.shouldInterrupt()) {
+                finish({ kind: "interrupted", stdout: out, stderr: err });
+                return;
+            }
+            if (timedOut) {
+                finish({ kind: "timed_out", clock: request.timeoutClock, stdout: out, stderr: err });
+                return;
+            }
+            finish({ kind: "exited", exitCode, signal, stdout: out, stderr: err });
+        });
+    });
+}
+export function combinedOutput(stdout, stderr) {
+    const parts = [stdout, stderr].filter((p) => p.length > 0);
+    return truncate(parts.join("\n"));
+}
+//# sourceMappingURL=run-child.js.map

package/dist/child/run-child.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-child.js","sourceRoot":"","sources":["../../src/child/run-child.ts"],"names":[],"mappings":"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"}

package/dist/copy-working-files.d.ts

@@ -0,0 +1,40 @@
+import { type IsolationStop, IsolationStoppedError } from "@bluewombat/isolator";
+/**
+ * What never leaves the Parent for a Child, unless a Project says otherwise:
+ * a secret in the clear has no business in a workspace an agent reads and a
+ * pull request may carry.
+ */
+export declare const DEFAULT_EXCLUDES: readonly string[];
+/**
+ * Copy working files from `from` into an existing `to` directory.
+ * Skips `.git` only at the root of `from` when `skipGitAtRoot` is set, and
+ * every path `exclude` names (see `isExcluded`).
+ *
+ * Each root entry is cloned by `cp` where the file system can — APFS, btrfs,
+ * XFS: same bytes on disk, no second copy — and copied by hand where it
+ * cannot. Excluded paths are then removed from the Child; a clone shares
+ * blocks that were already on the disk, so nothing was written in the clear
+ * that was not there before.
+ */
+export declare function copyWorkingFiles(input: {
+    from: string;
+    to: string;
+    skipGitAtRoot: boolean;
+    exclude?: readonly string[];
+    shouldStop: () => IsolationStop | undefined;
+}): Promise<void>;
+export declare function wipeWorkingFiles(directory: string, shouldStop: () => IsolationStop | undefined): Promise<void>;
+export { IsolationStoppedError };
+/**
+ * Whether `path` (relative to the copied root, `/`-separated) is one a
+ * Project asked to leave behind.
+ *
+ * A pattern with no `/` is matched against the last segment, at any depth:
+ * `.env` leaves out `.env` and `packages/api/.env`. A pattern with a `/` is
+ * matched against the whole relative path from the root. `*` stands for any
+ * run of characters within one segment, `**` for anything, `/` included; a
+ * pattern opening with two stars and a slash means "at any depth", like a
+ * bare name does.
+ */
+export declare function isExcluded(path: string, patterns: readonly string[]): boolean;
+//# sourceMappingURL=copy-working-files.d.ts.map

package/dist/copy-working-files.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"copy-working-files.d.ts","sourceRoot":"","sources":["../src/copy-working-files.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,aAAa,EAAE,qBAAqB,EAAkB,MAAM,sBAAsB,CAAC;AAMjG;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,EAAE,SAAS,MAAM,EAAuB,CAAC;AAEtE;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CAAC,KAAK,EAAE;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,aAAa,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,UAAU,EAAE,MAAM,aAAa,GAAG,SAAS,CAAC;CAC7C,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBhB;AAED,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,aAAa,GAAG,SAAS,GAC1C,OAAO,CAAC,IAAI,CAAC,CAUf;AAED,OAAO,EAAE,qBAAqB,EAAE,CAAC;AAEjC;;;;;;;;;;GAUG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAQ7E"}

package/dist/copy-working-files.js

@@ -0,0 +1,144 @@
+import { copyFile, lstat, mkdir, readdir, readlink, rm, symlink } from "node:fs/promises";
+import { platform } from "node:os";
+import { basename, join, relative, sep } from "node:path";
+import { IsolationStoppedError, throwIfStopped } from "@bluewombat/isolator";
+import { runChild } from "./child/run-child.js";
+/** How long one `cp` of one root entry may take before the walk takes over. */
+const CLONE_TIMEOUT_MS = 120_000;
+/**
+ * What never leaves the Parent for a Child, unless a Project says otherwise:
+ * a secret in the clear has no business in a workspace an agent reads and a
+ * pull request may carry.
+ */
+export const DEFAULT_EXCLUDES = [".env", ".env.*"];
+/**
+ * Copy working files from `from` into an existing `to` directory.
+ * Skips `.git` only at the root of `from` when `skipGitAtRoot` is set, and
+ * every path `exclude` names (see `isExcluded`).
+ *
+ * Each root entry is cloned by `cp` where the file system can — APFS, btrfs,
+ * XFS: same bytes on disk, no second copy — and copied by hand where it
+ * cannot. Excluded paths are then removed from the Child; a clone shares
+ * blocks that were already on the disk, so nothing was written in the clear
+ * that was not there before.
+ */
+export async function copyWorkingFiles(input) {
+    const exclude = input.exclude ?? DEFAULT_EXCLUDES;
+    await throwIfStopped(input.shouldStop);
+    const entries = await readdir(input.from, { withFileTypes: true });
+    for (const entry of entries) {
+        await throwIfStopped(input.shouldStop);
+        if (input.skipGitAtRoot && entry.name === ".git") {
+            continue;
+        }
+        if (isExcluded(entry.name, exclude)) {
+            continue;
+        }
+        const src = join(input.from, entry.name);
+        const dest = join(input.to, entry.name);
+        const cloned = await clone(src, dest, input.shouldStop);
+        if (!cloned) {
+            await rm(dest, { recursive: true, force: true });
+            await copyEntry(src, dest, entry, input.shouldStop);
+        }
+    }
+    await pruneExcluded(input.to, input.to, exclude, input.shouldStop);
+}
+export async function wipeWorkingFiles(directory, shouldStop) {
+    await throwIfStopped(shouldStop);
+    const entries = await readdir(directory);
+    for (const name of entries) {
+        await throwIfStopped(shouldStop);
+        if (name === ".git") {
+            continue;
+        }
+        await rm(join(directory, name), { recursive: true, force: true });
+    }
+}
+export { IsolationStoppedError };
+/**
+ * Whether `path` (relative to the copied root, `/`-separated) is one a
+ * Project asked to leave behind.
+ *
+ * A pattern with no `/` is matched against the last segment, at any depth:
+ * `.env` leaves out `.env` and `packages/api/.env`. A pattern with a `/` is
+ * matched against the whole relative path from the root. `*` stands for any
+ * run of characters within one segment, `**` for anything, `/` included; a
+ * pattern opening with two stars and a slash means "at any depth", like a
+ * bare name does.
+ */
+export function isExcluded(path, patterns) {
+    const normalized = path.split(sep).join("/");
+    return patterns.some((pattern) => {
+        // A leading `**/` says "at any depth", which is what a bare name already means.
+        const bare = pattern.startsWith("**/") ? pattern.slice(3) : pattern;
+        const subject = bare.includes("/") ? normalized : basename(normalized);
+        return toRegExp(bare).test(subject);
+    });
+}
+function toRegExp(pattern) {
+    const source = pattern
+        .split("**")
+        .map((part) => part
+        .split("*")
+        .map((literal) => literal.replace(/[.+?^${}()|[\]\\]/g, "\\$&"))
+        .join("[^/]*"))
+        .join(".*");
+    return new RegExp(`^${source}$`);
+}
+async function clone(src, dest, shouldStop) {
+    const flag = platform() === "darwin" ? "-c" : "--reflink=auto";
+    const outcome = await runChild({
+        argv: ["cp", "-R", "-P", flag, src, dest],
+        timeoutMs: CLONE_TIMEOUT_MS,
+        timeoutClock: "isolation",
+        shouldInterrupt: () => shouldStop() === "interrupt",
+    });
+    if (outcome.kind === "interrupted") {
+        throw new IsolationStoppedError("interrupt");
+    }
+    return outcome.kind === "exited" && outcome.exitCode === 0;
+}
+async function copyEntry(src, dest, entry, shouldStop) {
+    await throwIfStopped(shouldStop);
+    if (entry.isDirectory()) {
+        await mkdir(dest);
+        const entries = await readdir(src, { withFileTypes: true });
+        for (const child of entries) {
+            await copyEntry(join(src, child.name), join(dest, child.name), child, shouldStop);
+        }
+        return;
+    }
+    if (entry.isSymbolicLink()) {
+        const target = await readlink(src);
+        await symlink(target, dest);
+        return;
+    }
+    if (entry.isFile()) {
+        await copyFile(src, dest);
+        return;
+    }
+    throw new Error(`Cannot isolate "${src}": unsupported file type.`);
+}
+/** Remove from `directory` every path below `root` that `patterns` name. Never follows a link. */
+async function pruneExcluded(root, directory, patterns, shouldStop) {
+    if (patterns.length === 0) {
+        return;
+    }
+    await throwIfStopped(shouldStop);
+    const entries = await readdir(directory, { withFileTypes: true });
+    for (const entry of entries) {
+        const path = join(directory, entry.name);
+        if (directory === root && entry.name === ".git") {
+            continue;
+        }
+        if (isExcluded(relative(root, path), patterns)) {
+            await rm(path, { recursive: true, force: true });
+            continue;
+        }
+        if (entry.isDirectory() && !(await lstat(path)).isSymbolicLink()) {
+            await pruneExcluded(root, path, patterns, shouldStop);
+        }
+    }
+}
+//# sourceMappingURL=copy-working-files.js.map

package/dist/copy-working-files.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"copy-working-files.js","sourceRoot":"","sources":["../src/copy-working-files.ts"],"names":[],"mappings":"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"}

package/dist/fold.d.ts

@@ -0,0 +1,6 @@
+import type { FoldBackend } from "@bluewombat/integrator";
+/**
+ * Fold by three-way git merge. Never forced.
+ */
+export declare const gitFold: FoldBackend;
+//# sourceMappingURL=fold.d.ts.map

package/dist/fold.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fold.d.ts","sourceRoot":"","sources":["../src/fold.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAG1D;;GAEG;AACH,eAAO,MAAM,OAAO,EAAE,WAarB,CAAC"}

package/dist/fold.js

@@ -0,0 +1,19 @@
+import { gitMerge } from "./git-merge.js";
+/**
+ * Fold by three-way git merge. Never forced.
+ */
+export const gitFold = {
+    async fold(input) {
+        return await gitMerge({
+            parent: input.parent,
+            child: input.child,
+            ...(input.id === undefined ? {} : { id: input.id }),
+            ...(input.subject === undefined ? {} : { subject: input.subject }),
+            ...(input.mergeSubject === undefined ? {} : { mergeSubject: input.mergeSubject }),
+            deadlineMs: input.deadlineMs,
+            now: input.now,
+            shouldInterrupt: input.shouldInterrupt,
+        });
+    },
+};
+//# sourceMappingURL=fold.js.map

package/dist/fold.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fold.js","sourceRoot":"","sources":["../src/fold.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C;;GAEG;AACH,MAAM,CAAC,MAAM,OAAO,GAAgB;IAClC,KAAK,CAAC,IAAI,CAAC,KAAK;QACd,OAAO,MAAM,QAAQ,CAAC;YACpB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;YACnD,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;YAClE,GAAG,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC;YACjF,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,eAAe,EAAE,KAAK,CAAC,eAAe;SACvC,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}

package/dist/git-merge.d.ts

@@ -0,0 +1,37 @@
+import { type FoldStop } from "@bluewombat/integrator";
+export type GitMergeResult = {
+    ok: true;
+} | {
+    ok: false;
+    stop: FoldStop;
+} | {
+    ok: false;
+    conflict: true;
+    report: string;
+} | {
+    ok: false;
+    detail: string;
+};
+/**
+ * Three-way git merge of Child working files into Parent. Never forced.
+ * Does not fall back to copy.
+ *
+ * History is left only where something happened: a side with nothing loose
+ * gets no snapshot commit, a Parent that never moved is fast-forwarded, and a
+ * merge commit exists only when both sides moved. What is written is named
+ * after the work (`subject`), not after this mechanism.
+ */
+export declare function gitMerge(input: {
+    parent: string;
+    child: string;
+    /** Names this Integration in what it writes, so history says what was folded. */
+    id?: string;
+    /** What the folded work is; the commit that carries it says this. */
+    subject?: string;
+    /** What a merge commit says, when both sides moved. */
+    mergeSubject?: string;
+    deadlineMs: number;
+    now: () => number;
+    shouldInterrupt: () => boolean;
+}): Promise<GitMergeResult>;
+//# sourceMappingURL=git-merge.d.ts.map

package/dist/git-merge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-merge.d.ts","sourceRoot":"","sources":["../src/git-merge.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,QAAQ,EAA2C,MAAM,wBAAwB,CAAC;AAOhG,MAAM,MAAM,cAAc,GACtB;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GACZ;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAA;CAAE,GAC7B;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAC7C;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAwFlC;;;;;;;;GAQG;AACH,wBAAsB,QAAQ,CAAC,KAAK,EAAE;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,iFAAiF;IACjF,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,qEAAqE;IACrE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uDAAuD;IACvD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,OAAO,CAAC;CAChC,GAAG,OAAO,CAAC,cAAc,CAAC,CAmO1B"}