@claudexor/workspace 4.8.2 → 5.0.2

package/dist/git-transient-capture.js

@@ -1,91 +1,171 @@
-import { mkdirSync, mkdtempSync, rmSync } from "node:fs";
+import { existsSync, mkdirSync, mkdtempSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { CaptureOutputExceeded, parseUnifiedDiff, WorkspaceError } from "@claudexor/core";
-import { containsSecretLikeToken } from "@claudexor/util";
+import { delimiter, join } from "node:path";
+import { CAPTURE_BUFFER_BUDGET_BYTES, CaptureOutputExceeded, WorkspaceError, } from "@claudexor/core";
+import { changedFileInventory } from "./capture-inventory.js";
+import { noteCleanupFault } from "./cleanup-fault.js";
+import { estimatePatchViewBytes, objectDirectoryProgress, preflightCaptureSpace, } from "./capture-objects.js";
 import { nestedRepositoryExcludes, untrackedNestedRepositories, } from "./git-nested-repositories.js";
-import { assertNoBinaryStubs, git, gitEnv } from "./git-run.js";
-export async function captureWorkingTreeTransient(repo, baseSha, pathExcludes = []) {
+import { gitObserved, GitOperationError, proofStallMs, treeBlobBytes } from "./git-observed.js";
+import { makeGitObjectResult, repositoryObjectFormat, storeBoundaryCommit, treeOf, } from "./git-result.js";
+import { assertNoBinaryStubs, gitEnv, SCRATCH_INDEX_CONFIG } from "./git-run.js";
+import { PINNED_DIFF_CONFIG, PINNED_DIFF_FLAGS } from "./object-compose.js";
+import { assertProjectObjectFormat, beginPendingRoots, endPendingRoots, objectStorePath, retainInObjectStore, } from "./object-store.js";
+function alternates(paths) {
+    // Git parses this as a path-list; C-style quoting keeps a legal `:` in a
+    // macOS path from becoming a separator (and escapes quotes/backslashes).
+    return paths.map((path) => JSON.stringify(path)).join(delimiter);
+}
+export async function captureWorkingTreeTransient(repo, baseSha, pathExcludes = [], options = {}) {
+    const projectRoot = options.projectRoot ?? repo;
+    const viewLimit = options.viewLimitBytes ?? CAPTURE_BUFFER_BUDGET_BYTES;
     const scratchDir = mkdtempSync(join(tmpdir(), "claudexor-transient-diff-"));
     const objectDir = join(scratchDir, "objects");
     const indexPath = join(scratchDir, "index");
     mkdirSync(objectDir, { recursive: true, mode: 0o700 });
     let primaryError;
+    // The written candidate tree, for the refusal's own non-exact inventory pass.
+    let candidate;
+    let lease = null;
     try {
-        const actualObjects = await git(repo, [
-            "rev-parse",
-            "--path-format=absolute",
-            "--git-path",
-            "objects",
-        ]);
+        // One project keeps one object format: refused before anything is written or mounted.
+        await assertProjectObjectFormat(projectRoot, await repositoryObjectFormat(repo));
+        const actualObjects = await gitObserved(repo, ["rev-parse", "--path-format=absolute", "--git-path", "objects"], { label: "rev-parse objects", allowFailure: true });
         if (actualObjects.code !== 0 || !actualObjects.stdout.trim()) {
             throw new WorkspaceError(`transient diff could not resolve Git objects: ${actualObjects.stderr.trim()}`);
         }
+        await preflightCaptureSpace(repo, scratchDir, { GIT_OPTIONAL_LOCKS: "0" });
+        // The lease comes first: a prune then either finished before or yields until
+        // the capture's own custody is recorded. No store yet: nothing to mount.
+        const store = objectStorePath(projectRoot);
+        if (existsSync(join(store, "objects")))
+            lease = await beginPendingRoots(store, []);
         const env = {
             GIT_INDEX_FILE: indexPath,
             GIT_OBJECT_DIRECTORY: objectDir,
-            // Git parses this as a path-list. C-style quoting keeps a legal `:` in a
-            // macOS path from becoming a separator (and escapes quotes/backslashes).
-            GIT_ALTERNATE_OBJECT_DIRECTORIES: JSON.stringify(actualObjects.stdout.trim()),
+            GIT_ALTERNATE_OBJECT_DIRECTORIES: alternates([
+                actualObjects.stdout.trim(),
+                ...(lease ? [join(store, "objects")] : []),
+            ]),
             GIT_OPTIONAL_LOCKS: "0",
         };
-        const read = await gitEnv(repo, ["read-tree", baseSha], env);
+        const progress = objectDirectoryProgress(objectDir);
+        const read = await gitObserved(repo, [...SCRATCH_INDEX_CONFIG, "read-tree", baseSha], {
+            env,
+            label: "read-tree (capture base)",
+            allowFailure: true,
+        });
         if (read.code !== 0) {
             throw new WorkspaceError(`transient diff read-tree failed: ${read.stderr.trim()}`);
         }
         const nested = await untrackedNestedRepositories(repo, env, [".", ...pathExcludes], "transient diff");
-        const add = await gitEnv(repo, ["add", "-A", "--", ".", ...pathExcludes, ...nestedRepositoryExcludes(nested)], env);
-        if (add.code !== 0) {
-            throw new WorkspaceError(`transient diff add failed: ${add.stderr.trim()}`);
-        }
-        const writeTree = await gitEnv(repo, ["write-tree"], env);
-        if (writeTree.code !== 0 || !writeTree.stdout.trim()) {
-            throw new WorkspaceError(`transient diff write-tree failed: ${writeTree.stderr.trim()}`);
+        await gitObserved(repo, [
+            ...SCRATCH_INDEX_CONFIG,
+            "add",
+            "-A",
+            "--",
+            ".",
+            ...pathExcludes,
+            ...nestedRepositoryExcludes(nested),
+        ], 
+        // A tracked file whose blob the base already holds is re-hashed without a sign
+        // (no output, no new object), so the silent read is bounded by the base's bytes.
+        {
+            env,
+            label: "add -A (capture)",
+            progress,
+            stallMs: proofStallMs(await treeBlobBytes(repo, baseSha, env)),
+        });
+        const tree = (await gitObserved(repo, [...SCRATCH_INDEX_CONFIG, "write-tree"], {
+            env,
+            label: "write-tree",
+            progress,
+        })).stdout.trim();
+        if (!tree)
+            throw new WorkspaceError("transient diff write-tree returned no tree");
+        candidate = { tree, env };
+        const baseCommit = (await gitObserved(repo, ["rev-parse", "--verify", "--quiet", `${baseSha}^{commit}`], {
+            env,
+            label: "rev-parse base commit",
+            allowFailure: true,
+        })).stdout.trim();
+        const baseTree = await treeOf(repo, baseSha, env);
+        const objectFormat = await repositoryObjectFormat(repo, env);
+        const commit = /^[0-9a-f]{40,64}$/.test(baseCommit) ? baseCommit : null;
+        const boundaryCommit = await storeBoundaryCommit(repo, commit, env);
+        const result = makeGitObjectResult({
+            object_format: objectFormat,
+            base_tree: baseTree,
+            candidate_tree: tree,
+            base_commit: commit,
+            store_boundary_commit: boundaryCommit,
+        });
+        const nestedFacts = nested.length ? { excludedNestedRepositories: nested } : {};
+        if (baseTree === tree) {
+            return { patch: "", captureIncomplete: false, result, ...nestedFacts };
         }
-        const diff = await gitEnv(repo, ["diff", "--binary", baseSha, writeTree.stdout.trim()], env);
-        if (diff.code !== 0) {
-            throw new WorkspaceError(`transient diff failed: ${diff.stderr.trim()}`);
-        }
-        assertNoBinaryStubs(diff.stdout, `transient git diff ${baseSha}`);
-        const flagged = new Set();
-        for (const file of parseUnifiedDiff(diff.stdout).files.filter((entry) => entry.binary)) {
-            const blobs = [
-                ...(!file.added && file.oldPath ? [{ tree: baseSha, path: file.oldPath }] : []),
-                ...(!file.deleted && file.newPath
-                    ? [{ tree: writeTree.stdout.trim(), path: file.newPath }]
-                    : []),
-            ];
-            for (const blob of blobs) {
-                try {
-                    const content = await gitEnv(repo, ["show", `${blob.tree}:${blob.path}`], env);
-                    // An unreadable blob is unprovable, so its payload is withheld too.
-                    if (content.code === 0 && !containsSecretLikeToken(content.stdout))
-                        continue;
-                }
-                catch (error) {
-                    // A complete compressed patch may carry a much larger blob. Failed
-                    // inspection withholds that payload, not the already complete patch.
-                    if (!(error instanceof CaptureOutputExceeded))
-                        throw error;
-                }
-                flagged.add(file.newPath ?? file.oldPath ?? blob.path);
-                break;
-            }
+        // Custody: the candidate tree, plus a dirty base snapshot's own closure.
+        const roots = [tree, ...(commit && boundaryCommit !== commit ? [commit] : [])];
+        await retainInObjectStore({
+            projectRoot,
+            source: { cwd: repo, env, objectsDir: objectDir },
+            roots,
+            boundary: boundaryCommit
+                ? { commit: boundaryCommit, tree: await treeOf(repo, boundaryCommit, env) }
+                : null,
+            objectFormat,
+            owner: options.owner ?? projectRoot,
+        });
+        const estimate = await estimatePatchViewBytes(repo, baseSha, tree, env);
+        const view = estimate.bytes <= viewLimit
+            ? await renderPatchView(repo, baseSha, tree, env)
+            : "exceeds_view_limit";
+        if (view === "exceeds_view_limit" || view === "render_failed") {
+            const inventory = await changedFileInventory(repo, baseSha, tree, env);
+            return {
+                patch: "",
+                captureIncomplete: false,
+                result,
+                patchViewUnavailable: {
+                    reason: view,
+                    limitBytes: viewLimit,
+                    // A render that overflowed proves more than an estimate that fit; one
+                    // that failed for another reason proves nothing about its size.
+                    estimatedBytes: view === "render_failed" ? estimate.bytes : Math.max(estimate.bytes, viewLimit + 1),
+                },
+                ...(inventory ? { inventory } : {}),
+                changedPaths: estimate.paths,
+                existingPaths: estimate.existingPaths,
+                ...nestedFacts,
+            };
         }
         return {
-            patch: diff.stdout,
-            binarySecretPaths: [...flagged],
+            patch: view,
             captureIncomplete: false,
-            ...(nested.length ? { excludedNestedRepositories: nested } : {}),
+            result,
+            ...nestedFacts,
         };
     }
     catch (error) {
         primaryError = error;
-        if (error instanceof CaptureOutputExceeded)
-            return { patch: "", binarySecretPaths: [], captureIncomplete: true, captureFailure: error };
+        // Before the scratch goes, a separate bounded pass over the same candidate
+        // tree names its largest changed files: diagnostic evidence only.
+        if (candidate && error instanceof Error && !Object.isFrozen(error)) {
+            const inventory = await changedFileInventory(repo, baseSha, candidate.tree, candidate.env);
+            if (inventory)
+                Object.defineProperty(error, "captureInventory", { value: inventory });
+        }
+        // Typed packaging failures (an overflow of a bounded read, no space, a
+        // stalled or signalled Git, a read error, a missing object) are an honest
+        // capture refusal; anything else stays a thrown workspace fault.
+        if (error instanceof CaptureOutputExceeded || error instanceof GitOperationError)
+            return { patch: "", captureIncomplete: true, captureFailure: error };
         throw error;
     }
     finally {
+        // Never throws: a pending record that stays only delays a prune, and the
+        // scratch below is still removed under its own terminal rule.
+        const leaseFault = endPendingRoots(lease);
         // Unlike ordinary best-effort scratch cleanup, this directory may contain
         // a candidate token blob. A cleanup failure is therefore terminal and must
         // never be hidden behind the original capture result.
@@ -119,6 +199,24 @@ export async function captureWorkingTreeTransient(repo, baseSha, pathExcludes =
                 }
             }
         }
+        // A failed capture's evidence also names a lease record that stayed, unless the
+        // scratch fault was recorded first.
+        noteCleanupFault(primaryError, leaseFault);
+    }
+}
+/** Today's patch of B..C, rendered under the view limit, else why there is none. A
+ * failed render costs only the view (the exact objects are already kept), never
+ * the capture: a timeout, a Git failure or a binary stub is a typed absence. */
+async function renderPatchView(repo, base, tree, env) {
+    try {
+        const diff = await gitEnv(repo, [...PINNED_DIFF_CONFIG, "diff", "--binary", ...PINNED_DIFF_FLAGS, base, tree], env);
+        if (diff.code !== 0)
+            return "render_failed";
+        assertNoBinaryStubs(diff.stdout, `transient git diff ${base}`);
+        return diff.stdout;
+    }
+    catch (error) {
+        return error instanceof CaptureOutputExceeded ? "exceeds_view_limit" : "render_failed";
     }
 }
 export async function diffWorkingTreeTransient(repo, baseSha, pathExcludes = []) {
@@ -127,4 +225,19 @@ export async function diffWorkingTreeTransient(repo, baseSha, pathExcludes = [])
         throw captured.captureFailure;
     return captured.patch;
 }
+/** The capture's object-backed facts, carried unchanged to its consumers. */
+export function captureObjectFacts(captured) {
+    return {
+        ...(captured.result ? { result: captured.result } : {}),
+        ...(captured.patchViewUnavailable
+            ? { patchViewUnavailable: captured.patchViewUnavailable }
+            : {}),
+        ...(captured.inventory ? { inventory: captured.inventory } : {}),
+        ...(captured.changedPaths ? { changedPaths: captured.changedPaths } : {}),
+        ...(captured.existingPaths ? { existingPaths: captured.existingPaths } : {}),
+        ...(captured.excludedNestedRepositories
+            ? { excludedNestedRepositories: captured.excludedNestedRepositories }
+            : {}),
+    };
+}
 //# sourceMappingURL=git-transient-capture.js.map

package/dist/git-transient-capture.js.map

@@ -1 +1 @@
-{"version":3,"file":"git-transient-capture.js","sourceRoot":"","sources":["../src/git-transient-capture.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAC1F,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EACL,wBAAwB,EACxB,2BAA2B,GAC5B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,mBAAmB,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AA6BhE,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,IAAY,EACZ,OAAe,EACf,YAAY,GAAa,EAAE;IAE3B,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,2BAA2B,CAAC,CAAC,CAAC;IAC5E,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC5C,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACvD,IAAI,YAAqB,CAAC;IAC1B,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE;YACpC,WAAW;YACX,wBAAwB;YACxB,YAAY;YACZ,SAAS;SACV,CAAC,CAAC;QACH,IAAI,aAAa,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;YAC7D,MAAM,IAAI,cAAc,CACtB,iDAAiD,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAC/E,CAAC;QACJ,CAAC;QACD,MAAM,GAAG,GAAG;YACV,cAAc,EAAE,SAAS;YACzB,oBAAoB,EAAE,SAAS;YAC/B,yEAAyE;YACzE,yEAAyE;YACzE,gCAAgC,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YAC7E,kBAAkB,EAAE,GAAG;SACxB,CAAC;QACF,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC,CAAC;QAC7D,IAAI,IAAI,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACpB,MAAM,IAAI,cAAc,CAAC,oCAAoC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACrF,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAC9C,IAAI,EACJ,GAAG,EACH,CAAC,GAAG,EAAE,GAAG,YAAY,CAAC,EACtB,gBAAgB,CACjB,CAAC;QACF,MAAM,GAAG,GAAG,MAAM,MAAM,CACtB,IAAI,EACJ,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,YAAY,EAAE,GAAG,wBAAwB,CAAC,MAAM,CAAC,CAAC,EAC9E,GAAG,CACJ,CAAC;QACF,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACnB,MAAM,IAAI,cAAc,CAAC,8BAA8B,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC9E,CAAC;QACD,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC,YAAY,CAAC,EAAE,GAAG,CAAC,CAAC;QAC1D,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;YACrD,MAAM,IAAI,cAAc,CAAC,qCAAqC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC3F,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;QAC7F,IAAI,IAAI,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACpB,MAAM,IAAI,cAAc,CAAC,0BAA0B,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC3E,CAAC;QACD,mBAAmB,CAAC,IAAI,CAAC,MAAM,EAAE,sBAAsB,OAAO,EAAE,CAAC,CAAC;QAClE,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QAClC,KAAK,MAAM,IAAI,IAAI,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;YACvF,MAAM,KAAK,GAAG;gBACZ,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC/E,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO;oBAC/B,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;oBACzD,CAAC,CAAC,EAAE,CAAC;aACR,CAAC;YACF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,IAAI,CAAC;oBACH,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;oBAC/E,oEAAoE;oBACpE,IAAI,OAAO,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,MAAM,CAAC;wBAAE,SAAS;gBAC/E,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,mEAAmE;oBACnE,qEAAqE;oBACrE,IAAI,CAAC,CAAC,KAAK,YAAY,qBAAqB,CAAC;wBAAE,MAAM,KAAK,CAAC;gBAC7D,CAAC;gBACD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;gBACvD,MAAM;YACR,CAAC;QACH,CAAC;QACD,OAAO;YACL,KAAK,EAAE,IAAI,CAAC,MAAM;YAClB,iBAAiB,EAAE,CAAC,GAAG,OAAO,CAAC;YAC/B,iBAAiB,EAAE,KAAK;YACxB,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,0BAA0B,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACjE,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,YAAY,GAAG,KAAK,CAAC;QACrB,IAAI,KAAK,YAAY,qBAAqB;YACxC,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,iBAAiB,EAAE,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC;QAC9F,MAAM,KAAK,CAAC;IACd,CAAC;YAAS,CAAC;QACT,0EAA0E;QAC1E,2EAA2E;QAC3E,sDAAsD;QACtD,IAAI,CAAC;YACH,MAAM,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,CAAC;QAAC,OAAO,YAAY,EAAE,CAAC;YACtB,yEAAyE;YACzE,mDAAmD;YACnD,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;gBAC/B,MAAM,QAAQ,GAAG,IAAI,cAAc,CAAC,uCAAuC,EAAE;oBAC3E,KAAK,EAAE,YAAY;iBACpB,CAAC,CAAC;gBACH,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,cAAc,EAAE;oBAC9C,KAAK,EAAE,YAAY;oBACnB,UAAU,EAAE,KAAK;iBAClB,CAAC,CAAC;gBACH,MAAM,QAAQ,CAAC;YACjB,CAAC;YACD,IAAI,YAAY,YAAY,KAAK,EAAE,CAAC;gBAClC,IAAI,CAAC;oBACH,MAAM,CAAC,cAAc,CAAC,YAAY,EAAE,cAAc,EAAE;wBAClD,KAAK,EAAE,YAAY;wBACnB,UAAU,EAAE,KAAK;qBAClB,CAAC,CAAC;gBACL,CAAC;gBAAC,MAAM,CAAC;oBACP,qEAAqE;oBACrE,mEAAmE;oBACnE,MAAM,MAAM,CAAC,MAAM,CACjB,IAAI,cAAc,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,EACjE,YAAY,EACZ,EAAE,YAAY,EAAE,CACjB,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,IAAY,EACZ,OAAe,EACf,YAAY,GAAa,EAAE;IAE3B,MAAM,QAAQ,GAAG,MAAM,2BAA2B,CAAC,IAAI,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;IAChF,IAAI,QAAQ,CAAC,iBAAiB;QAAE,MAAM,QAAQ,CAAC,cAAc,CAAC;IAC9D,OAAO,QAAQ,CAAC,KAAK,CAAC;AACxB,CAAC"}
+{"version":3,"file":"git-transient-capture.js","sourceRoot":"","sources":["../src/git-transient-capture.ts"],"names":[],"mappings":"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"}

package/dist/git.d.ts

@@ -1,9 +1,8 @@
 import { type EnsureGitRepositoryDependencies, type EnsureGitRepositoryResult } from "./git-initialization.js";
-export { git } from "./git-run.js";
+export { git, revParse } from "./git-run.js";
 export { captureWorkingTreeTransient, diffWorkingTreeTransient } from "./git-transient-capture.js";
 export { GitBoundaryRootRefusedError, GitInitializationError, type EnsureGitRepositoryDependencies, type EnsureGitRepositoryResult, } from "./git-initialization.js";
 export declare function isGitRepo(repo: string): Promise<boolean>;
-export declare function revParse(repo: string, ref: string): Promise<string>;
 /**
  * Make a project folder usable as a git boundary for write-mode runs.
  *
@@ -19,23 +18,7 @@ export declare function revParse(repo: string, ref: string): Promise<string>;
  */
 export declare function ensureGitRepository(repo: string, dependencies?: EnsureGitRepositoryDependencies): Promise<EnsureGitRepositoryResult>;
 export declare function statusPorcelain(repo: string): Promise<string>;
-/**
- * Capture the full dirty working tree (tracked AND untracked) as a dangling
- * commit; null if clean. Plain `git stash create` captures only TRACKED
- * changes, silently dropping the user's new-but-unstaged files from the run's
- * base. We instead seed a scratch index from HEAD, `add -A` into it (which
- * respects .gitignore, so run artifacts stay out), and commit-tree the result.
- */
-export declare function stashCreate(repo: string): Promise<string | null>;
-/**
- * Capture the CURRENT working-tree state (tracked + untracked, minus `.claudexor`)
- * as a commit sha — always returns one. Dirty trees become a dangling snapshot
- * commit (via `stashCreate`); a clean tree resolves to HEAD. This is the per-turn
- * diff base for in-place threads: snapshot at turn start, snapshot at turn end,
- * `diffTrees(base, end)` yields exactly that turn's net change (pre-existing dirty
- * state is folded into `base`, so the reviewer never sees prior turns' edits).
- */
-export declare function snapshotTree(repo: string): Promise<string>;
+export { snapshotTree, stashCreate } from "./git-snapshot.js";
 /** Net diff between two tree-ish shas (used for in-place per-turn diffs).
  * `--binary`: binary changes carry an APPLYABLE payload instead of
  * degrading to a "Binary files differ" stub that silently loses the work. */
@@ -50,11 +33,45 @@ export declare function materializePatchTree(repo: string, baseSha: string, diff
 export declare function worktreeAdd(repo: string, path: string, branch: string, baseSha: string): Promise<void>;
 /** Disposable candidate checkout with private refs/index/objects. The source
  * repository is only an object alternate, so harness `git add`/`commit` cannot
- * write candidate blobs or refs into the user's repository. */
-export declare function isolatedCloneAdd(repo: string, path: string, branch: string, baseSha: string): Promise<void>;
+ * write candidate blobs or refs into the user's repository. Claudexor's own
+ * clone lists the project object store as a SECOND alternate (#535 D2): a
+ * dirty base resolves after the user's prune; the user repo never gets it. */
+export declare function isolatedCloneAdd(repo: string, path: string, branch: string, baseSha: string, storeObjects?: string): Promise<void>;
 /** Recreate a worktree for an EXISTING branch (recovery: dir lost, branch survived). */
 export declare function worktreeAddExisting(repo: string, path: string, branch: string): Promise<void>;
+/** Best-effort: Git's exit status is ignored. An owner that must not report a
+ * refused removal as done uses `worktreeRemoveRegistered`. */
 export declare function worktreeRemove(repo: string, path: string): Promise<void>;
+/**
+ * Deregister the linked worktree Git records at `path`; Git deletes its
+ * directory too. A path Git does not register is already removed. A refusal
+ * (a locked worktree, an unreadable registration) throws and leaves the
+ * registration and the directory as they were. A directory Git cannot delete
+ * (a permission error) throws after Git deleted the registration: the
+ * directory stays, its `.git` file naming what is gone. The registration is
+ * found by `samePlace` and removed in Git's own spelling, so a stale one whose
+ * directory is gone still goes. Git prints porcelain paths unquoted, one per
+ * line, so a path holding a line break cannot be read back and is refused
+ * rather than reported absent. `beforeRemove` runs once Git is known to
+ * register the path, right before the removal.
+ */
+export declare function worktreeRemoveRegistered(repo: string, path: string, beforeRemove?: () => Promise<void>): Promise<void>;
+/**
+ * The common Git directory of the repository that registered the linked
+ * worktree at `path`, from Git's own records: the worktree's `.git` file names
+ * its registration, which must still exist and name this worktree back. Null
+ * when `path` holds no such file. A registration that is gone or names another
+ * worktree is what a moved or deleted repository leaves, and also a removal
+ * that deleted the registration but not the directory
+ * (`worktreeRemoveRegistered`; a later worktree can take the freed name).
+ * `recorded`, called only then, tells them apart: the common Git directory a
+ * caller kept from before its removal is returned when the registration was
+ * in it. Otherwise this throws, since whatever a moved repository still
+ * records cannot be proven gone.
+ */
+export declare function worktreeRepository(path: string, recorded?: () => string | null): string | null;
+/** The common Git directory of the repository `dir` is in; throws when Git cannot tell. */
+export declare function gitCommonDir(dir: string): Promise<string>;
 /**
  * Apply a unified diff to a tree with a 3-way merge (race-winner adoption into
  * the live in-place tree). Throws loudly on conflict so the caller can disclose
@@ -110,4 +127,12 @@ export declare function reversePatchAndIndexProtected(repo: string, diff: string
 export declare function worktreePrune(repo: string): Promise<void>;
 /** Delete a local branch (best-effort GC of per-attempt claudexor/* branches). */
 export declare function branchDelete(repo: string, branch: string): Promise<void>;
+/**
+ * Delete a local branch, or throw when Git refuses (a held ref lock, a
+ * worktree that still uses it). An absent branch is already deleted. Presence
+ * is read first because `branch -D` reports "not found" and a refusal with the
+ * same exit code. `beforeDelete` runs only for a present branch, right before
+ * the deletion.
+ */
+export declare function branchDeleteIfPresent(repo: string, branch: string, beforeDelete?: () => Promise<void>): Promise<void>;
 //# sourceMappingURL=git.d.ts.map

package/dist/git.d.ts.map

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