@north-light/crouter 0.3.302 → 0.3.304

package/dist/core/substrate/surface-match.js

@@ -10,6 +10,7 @@
 // container (its owning repo dir for `read`, its canonical routing anchor for
 // `memory-read`).
 import { basename, isAbsolute, matchesGlob, relative, sep } from 'node:path';
+import { commandSegments, stripHeredocs } from '../shell-segments.js';
 import { CRTR_DIR_NAME } from '../../types.js';
 import { realpathOrSelf } from '../fs-utils.js';
 import { evalCondition } from '../predicate.js';
@@ -102,129 +103,6 @@ export function matchesMemoryReadEntry(entry, routingAnchor, subject, name) {
         return false;
     return entry.match.some((g) => memoryReadGlobMatches(g, routingAnchor, name));
 }
-/** Split a command into shell segments on unquoted `;`, newline, `&&`, `||`,
- *  and `|`. A single `&`, subshell parentheses, and backticks are left inside
- *  their segment — this is a best-effort guardrail, not a shell parser.
- *  Heredoc bodies are a separate pre-match concern (see `stripHeredocs`). */
-function splitCommandSegments(command) {
-    const segments = [];
-    let current = '';
-    let quote = null;
-    let escaped = false;
-    const finish = () => {
-        segments.push(current);
-        current = '';
-    };
-    for (let i = 0; i < command.length; i += 1) {
-        const ch = command[i];
-        if (escaped) {
-            current += ch;
-            escaped = false;
-            continue;
-        }
-        if (ch === '\\' && quote !== "'") {
-            current += ch;
-            escaped = true;
-            continue;
-        }
-        if (quote !== null) {
-            current += ch;
-            if (ch === quote)
-                quote = null;
-            continue;
-        }
-        if (ch === "'" || ch === '"') {
-            current += ch;
-            quote = ch;
-            continue;
-        }
-        if (ch === '\n' || ch === ';') {
-            finish();
-            continue;
-        }
-        if ((ch === '&' || ch === '|') && command[i + 1] === ch) {
-            finish();
-            i += 1;
-            continue;
-        }
-        if (ch === '|') {
-            finish();
-            continue;
-        }
-        current += ch;
-    }
-    finish();
-    return segments;
-}
-/** Tokenize one segment into shell words, marking quoted spans opaque. */
-function tokenizeCommandSegment(segment) {
-    const tokens = [];
-    let text = '';
-    let opaque = false;
-    let started = false;
-    let quote = null;
-    let escaped = false;
-    const finish = () => {
-        if (started)
-            tokens.push({ text, opaque });
-        text = '';
-        opaque = false;
-        started = false;
-    };
-    for (let i = 0; i < segment.length; i += 1) {
-        const ch = segment[i];
-        if (escaped) {
-            text += ch;
-            started = true;
-            escaped = false;
-            continue;
-        }
-        if (ch === '\\' && quote !== "'") {
-            escaped = true;
-            started = true;
-            continue;
-        }
-        if (quote !== null) {
-            started = true;
-            if (ch === quote) {
-                quote = null;
-            }
-            else {
-                text += ch;
-            }
-            continue;
-        }
-        if (ch === "'" || ch === '"') {
-            quote = ch;
-            opaque = true;
-            started = true;
-            continue;
-        }
-        if (/\s/.test(ch)) {
-            finish();
-            continue;
-        }
-        text += ch;
-        started = true;
-    }
-    if (escaped)
-        text += '\\';
-    finish();
-    return tokens;
-}
-/** Every non-empty command segment as its env-stripped token list: leading
- *  `VAR=value` assignments are dropped so `tokens[0]` is the executable. */
-function commandSegments(command) {
-    return splitCommandSegments(command)
-        .map(tokenizeCommandSegment)
-        .map((tokens) => {
-        let first = 0;
-        while (first < tokens.length && /^[A-Za-z_][A-Za-z0-9_]*=/.test(tokens[first].text))
-            first += 1;
-        return tokens.slice(first);
-    })
-        .filter((tokens) => tokens.length > 0);
-}
 function commandGlobPattern(glob) {
     const words = glob.trim().split(/\s+/);
     if (words.length === 1 && words[0] === '')
@@ -275,7 +153,9 @@ function commandGlobMatches(glob, command) {
     const pattern = commandGlobPattern(glob);
     if (pattern === null)
         return false;
-    return commandSegments(command).some((tokens) => segmentMatches(pattern, tokens));
+    return commandSegments(command)
+        .filter(({ tokens }) => tokens.length > 0)
+        .some(({ tokens }) => segmentMatches(pattern, tokens));
 }
 /** Does a `command` entry fit the executed command string? */
 export function matchesCommandEntry(entry, subject, command) {
@@ -283,42 +163,6 @@ export function matchesCommandEntry(entry, subject, command) {
         return false;
     return entry.match.some((g) => commandGlobMatches(g, command));
 }
-const HEREDOC_OPEN = /<<(-?)\s*(["']?)([A-Za-z_][A-Za-z0-9_]*)\2/g;
-/** Remove heredoc BODIES (the stdin data between `<<DELIM` and its closing
- *  `DELIM` line) from a command before it is matched. The opening line is kept
- *  — `crtr push final <<'EOF'` is still a real `push final` invocation — but the
- *  body lines, which are data fed on stdin and never executed as commands, are
- *  dropped. Without this a doc-writing command whose body merely MENTIONS a
- *  matched invocation would have its whole call held. Post-execution `command`
- *  delivery does not need this (a spurious late injection costs a paragraph);
- *  a `pre-command` block costs the agent a turn, so it does. */
-export function stripHeredocs(command) {
-    const lines = command.split('\n');
-    const out = [];
-    let i = 0;
-    while (i < lines.length) {
-        const line = lines[i];
-        out.push(line);
-        i += 1;
-        // Every heredoc opened on this line, left to right; their bodies stack and
-        // are consumed in that order.
-        const delims = [];
-        HEREDOC_OPEN.lastIndex = 0;
-        let m;
-        while ((m = HEREDOC_OPEN.exec(line)) !== null)
-            delims.push({ name: m[3], dash: m[1] === '-' });
-        for (const d of delims) {
-            while (i < lines.length) {
-                // `<<-` strips leading TABS from the body and the closing delimiter.
-                const probe = d.dash ? lines[i].replace(/^\t+/, '') : lines[i];
-                i += 1;
-                if (probe === d.name)
-                    break; // closing delimiter line — drop it, stop
-            }
-        }
-    }
-    return out.join('\n');
-}
 /** Does a `pre-command` entry fit a command that is ABOUT to run? The same
  *  glob machinery `command` uses — one matcher, one semantics — applied to the
  *  command with its heredoc bodies stripped. Subshell parentheses, backticks,

package/dist/core/worktree-close.d.ts

@@ -0,0 +1,4 @@
+import { type CloseManagedWorktreeResult } from './worktree.js';
+/** Async daemon executor for explicit close. The lock wait and every Git
+ * subprocess yield to the daemon event loop. */
+export declare function closeManagedWorktreeAsync(nodeId: string): Promise<CloseManagedWorktreeResult>;

package/dist/core/worktree-close.js

@@ -0,0 +1,225 @@
+import { existsSync, realpathSync } from 'node:fs';
+import { resolve } from 'node:path';
+import { getNode, updateNode } from './canvas/index.js';
+import { withExclusiveDirectoryLockAsync } from './exclusive-lock.js';
+import { gitAsync } from './git.js';
+import { proveBranchContained } from './worktree-containment.js';
+import { concludeAbsentManagedWorktreeAsync } from './worktree-mutation-async.js';
+import { parseStatusPorcelain, planLandIntoCheckout } from './worktree-landing.js';
+import { WORKTREE_LOCK_WAIT_MS, checkoutPathForBranchInList, missingWorktreeRecoveryHint, persistClosedWorktreeState, samePath, worktreeLockPathForCommonDir, WorktreeError } from './worktree.js';
+import { shellQuote } from '../shared/shell-quote.js';
+function detailOf(result) {
+    return (result.stderr.trim() || result.stdout.trim()).trim();
+}
+async function runGit(cwd, args, code, next) {
+    const result = await gitAsync(args, cwd);
+    if (result.status !== 0)
+        throw new WorktreeError(code, `git ${args.join(' ')} failed`, next, detailOf(result));
+    return result.stdout.trim();
+}
+async function commonGitDir(cwd) {
+    const output = await runGit(cwd, ['rev-parse', '--git-common-dir'], 'git_common_dir_failed', 'Inspect the repository git metadata, then retry.');
+    return realpathSync(resolve(cwd, output));
+}
+async function resolveLandableBase(cwd, baseRef) {
+    const ref = `refs/heads/${baseRef}`;
+    const exists = await gitAsync(['show-ref', '--verify', '--quiet', ref], cwd);
+    if (exists.status === 1 && exists.executionFailed !== true) {
+        throw new WorktreeError('missing_base_branch', `managed worktree base '${baseRef}' does not name an existing local branch`, 'The base must be a local branch that landing can fast-forward — freshen your local branch from origin first (rebase-not-merge), then base on it.');
+    }
+    if (exists.status !== 0) {
+        const execution = exists.processError === undefined ? '' : `\nprocess error: ${exists.processError}`;
+        throw new WorktreeError('base_branch_inspection_failed', `could not inspect local base branch '${baseRef}' (git show-ref exited with status ${exists.status})`, 'Inspect the repository and its Git metadata, then retry.', `status: ${exists.status}\nstderr: ${exists.stderr.trim() || '<empty>'}${execution}`);
+    }
+    return runGit(cwd, ['rev-parse', '--verify', ref], 'base_branch_resolve_failed', 'Inspect the local base branch, then retry.');
+}
+async function rebaseInProgress(cwd) {
+    for (const path of ['rebase-merge', 'rebase-apply']) {
+        const gitPath = await runGit(cwd, ['rev-parse', '--git-path', path], 'git_path_failed', 'Inspect the worktree manually, then retry.');
+        if (existsSync(gitPath))
+            return true;
+    }
+    return false;
+}
+async function registeredWorktree(cwd, path, branch) {
+    const list = await gitAsync(['worktree', 'list', '--porcelain'], cwd);
+    if (list.status !== 0)
+        return false;
+    let current = null;
+    for (const line of list.stdout.split('\n')) {
+        if (line.startsWith('worktree '))
+            current = line.slice('worktree '.length).trim();
+        else if (current !== null && samePath(current, path) && line === `branch refs/heads/${branch}`)
+            return true;
+    }
+    return false;
+}
+function deferredCleanupResult(wt) {
+    return {
+        worktree_removed: false,
+        worktree_remove_error: `cleanup pending: the caller checkout at ${wt.path} remains intact. After its node exits, run \`git -C ${shellQuote(wt.repo_root)} worktree remove ${shellQuote(wt.path)}\` after confirming it is safe to delete.`,
+        branch_deleted: false,
+        branch_delete_error: `cleanup pending: local branch ${wt.branch} remains checked out at ${wt.path}; delete it only after that checkout is removed and its landed commit is still contained in ${wt.base_ref}.`,
+    };
+}
+function recordBlockedLandIntent(nodeId, blocked) {
+    const current = getNode(nodeId)?.managed_worktree;
+    if (current === undefined || current === null || current.state !== 'open')
+        return;
+    const { sweep: _sweep, ...retained } = current;
+    updateNode(nodeId, { managed_worktree: { ...retained, land_intent: { at: new Date().toISOString(), blocked } } });
+}
+async function dropStashIfStillTip(cwd, stashSha) {
+    const tip = await gitAsync(['rev-parse', '--verify', '--quiet', 'refs/stash'], cwd);
+    if (tip.status === 0 && tip.stdout.trim() === stashSha)
+        await gitAsync(['stash', 'drop'], cwd);
+}
+async function landIntoBaseCheckout(baseCheckout, branch, baseSha, landedSha) {
+    const status = await gitAsync(['status', '--porcelain'], baseCheckout);
+    if (status.status !== 0)
+        return { ok: false, detail: detailOf(status) };
+    const diff = await gitAsync(['diff', '--name-only', baseSha, landedSha], baseCheckout);
+    if (diff.status !== 0)
+        return { ok: false, detail: detailOf(diff) };
+    const incoming = diff.stdout.split('\n').map((line) => line.trim()).filter((line) => line !== '');
+    const plan = planLandIntoCheckout(parseStatusPorcelain(status.stdout), incoming);
+    if (plan.kind === 'refuse')
+        return { ok: false, detail: `untracked files in ${baseCheckout} would be overwritten by the incoming commits: ${plan.collisions.join(', ')}` };
+    const merge = async () => {
+        const result = await gitAsync(['merge', '--ff-only', landedSha], baseCheckout);
+        return result.status === 0 ? { ok: true } : { ok: false, detail: detailOf(result) };
+    };
+    if (plan.kind === 'direct')
+        return merge();
+    const before = await gitAsync(['rev-parse', '--verify', '--quiet', 'refs/stash'], baseCheckout);
+    const beforeSha = before.status === 0 ? before.stdout.trim() : null;
+    const pushed = await gitAsync(['stash', 'push', '--message', `crtr landing ${branch}`], baseCheckout);
+    if (pushed.status !== 0)
+        return { ok: false, detail: detailOf(pushed) };
+    const after = await gitAsync(['rev-parse', '--verify', '--quiet', 'refs/stash'], baseCheckout);
+    const stashSha = after.status === 0 ? after.stdout.trim() : null;
+    if (stashSha === null || stashSha === beforeSha)
+        return merge();
+    const landed = await merge();
+    if (!landed.ok) {
+        if ((await gitAsync(['stash', 'apply', stashSha], baseCheckout)).status === 0)
+            await dropStashIfStillTip(baseCheckout, stashSha);
+        return landed;
+    }
+    if ((await gitAsync(['stash', 'apply', stashSha], baseCheckout)).status === 0) {
+        await dropStashIfStillTip(baseCheckout, stashSha);
+        return { ok: true };
+    }
+    await gitAsync(['reset', '--hard', landedSha], baseCheckout);
+    return { ok: true, stash: `local changes in ${baseCheckout} conflicted with the landed commits and were PRESERVED as stash ${stashSha}; nothing was lost. Re-apply them with \`git -C ${shellQuote(baseCheckout)} stash apply ${stashSha}\` and resolve the conflict.` };
+}
+async function closeLocked(nodeId) {
+    const node = getNode(nodeId);
+    if (node === null)
+        throw new WorktreeError('unknown_node', `unknown node: ${nodeId}`, 'Run this from a live node, or pass a real node id once that command supports it.');
+    const wt = node?.managed_worktree?.state === 'open' ? node.managed_worktree : null;
+    if (wt === null)
+        throw new WorktreeError('no_managed_worktree', `node ${nodeId} has no open managed worktree`, 'Nothing to close for this node.');
+    if (!existsSync(wt.path))
+        throw new WorktreeError('worktree_missing', `managed worktree path is missing: ${wt.path}`, missingWorktreeRecoveryHint(wt));
+    if (await rebaseInProgress(wt.path))
+        throw new WorktreeError('rebase_in_progress', 'this managed worktree is mid-rebase', `Resolve conflicts in ${wt.path}, run \`git rebase --continue\` there, then rerun \`crtr node worktree close\`.`);
+    const status = await runGit(wt.path, ['status', '--porcelain'], 'status_failed', 'Inspect the worktree manually, then retry.');
+    if (status !== '')
+        throw new WorktreeError('dirty_worktree', 'managed worktree has uncommitted changes', `Commit the work in ${wt.path}, then rerun \`crtr node worktree close\`.`);
+    const branch = await runGit(wt.path, ['rev-parse', '--abbrev-ref', 'HEAD'], 'branch_check_failed', 'Inspect the worktree manually, then retry.');
+    const head = await runGit(wt.path, ['rev-parse', 'HEAD'], 'landed_sha_failed', 'Inspect the worktree checkout manually, then rerun `crtr node worktree close`.');
+    if (branch !== wt.branch) {
+        const recorded = await gitAsync(['show-ref', '--verify', '--quiet', `refs/heads/${wt.branch}`], wt.path);
+        if (recorded.status === 0 || branch === 'HEAD' || !(await registeredWorktree(wt.repo_root, wt.path, branch))) {
+            throw new WorktreeError('wrong_branch', `managed worktree is not on its recorded branch (expected ${wt.branch}, found ${branch === 'HEAD' ? 'detached HEAD' : branch})`, `Inspect ${wt.path}, then rerun \`crtr node worktree close\`.`);
+        }
+        if (await proveBranchContained(wt.path, wt, head) === null) {
+            throw new WorktreeError('branch_moved_unlanded', `managed worktree's recorded branch ${wt.branch} no longer exists; its checkout is now on ${branch} at ${head}, which carries content local base branch '${wt.base_ref}' does not yet contain`, `Land or push ${branch} through its own workflow before closing.`);
+        }
+        const commonDir = await commonGitDir(wt.path);
+        if (!(await registeredWorktree(wt.repo_root, wt.path, branch)) || (await runGit(wt.path, ['rev-parse', '--abbrev-ref', 'HEAD'], 'branch_check_failed', 'Inspect the worktree manually, then retry.')) !== branch || (await runGit(wt.path, ['rev-parse', 'HEAD'], 'branch_check_failed', 'Inspect the worktree manually, then retry.')) !== head) {
+            throw new WorktreeError('wrong_branch', `managed worktree at ${wt.path} changed while closing`, `Inspect ${wt.path}, then rerun \`crtr node worktree close\`.`);
+        }
+        persistClosedWorktreeState(nodeId, { ...wt, disposal: { observed_branch: branch, observed_sha: head, common_dir: commonDir, authorized: new Date().toISOString() } }, 'pending');
+        return { node_id: nodeId, branch, worktree_path: wt.path, landed_sha: head, ...deferredCleanupResult(wt), branch_delete_error: `${branch} is not a crtr-managed branch and will never be deleted automatically; it is preserved once the checkout above is removed.` };
+    }
+    // Decide whether landing remains before resolving a destination. A diverged
+    // local base cannot replay history that the recorded upstream already has.
+    if (await proveBranchContained(wt.path, wt, head) !== null) {
+        persistClosedWorktreeState(nodeId, wt, 'pending');
+        return { node_id: nodeId, branch: wt.branch, worktree_path: wt.path, landed_sha: head, ...deferredCleanupResult(wt) };
+    }
+    let baseSha;
+    try {
+        baseSha = await resolveLandableBase(wt.path, wt.base_ref);
+    }
+    catch (error) {
+        if (!(error instanceof WorktreeError) || error.code !== 'missing_base_branch' || head !== wt.base_sha)
+            throw error;
+        persistClosedWorktreeState(nodeId, wt, 'pending');
+        return { node_id: nodeId, branch: wt.branch, worktree_path: wt.path, landed_sha: wt.base_sha, ...deferredCleanupResult(wt) };
+    }
+    const rebase = await gitAsync(['rebase', baseSha], wt.path);
+    if (rebase.status !== 0)
+        throw new WorktreeError('rebase_failed', `rebase onto local base branch '${wt.base_ref}' did not complete`, `Resolve conflicts in ${wt.path}, run \`git rebase --continue\` there, then rerun \`crtr node worktree close\`.`, detailOf(rebase));
+    const landedSha = await runGit(wt.path, ['rev-parse', 'HEAD'], 'landed_sha_failed', 'Inspect the worktree checkout manually, then rerun `crtr node worktree close`.');
+    const blocked = (message, next, detail) => {
+        recordBlockedLandIntent(nodeId, message);
+        return new WorktreeError('land_base_failed', message, next, detail);
+    };
+    const fastForward = await gitAsync(['merge-base', '--is-ancestor', baseSha, landedSha], wt.path);
+    if (fastForward.status !== 0)
+        throw blocked(`rebased worktree is not a fast-forward of local base branch '${wt.base_ref}'`, 'Ask the user how to land this managed worktree.', detailOf(fastForward));
+    const list = await runGit(wt.path, ['worktree', 'list', '--porcelain'], 'worktree_list_failed', 'Inspect the repository worktrees manually, then retry.');
+    const baseCheckout = checkoutPathForBranchInList(list, wt.base_ref);
+    let stashNote;
+    if (baseCheckout !== null) {
+        const checkoutHead = await gitAsync(['rev-parse', 'HEAD'], baseCheckout);
+        if (checkoutHead.status !== 0 || checkoutHead.stdout.trim() !== baseSha)
+            throw blocked(`local base branch '${wt.base_ref}' changed while this worktree was closing`, `Reconcile the base checkout at ${baseCheckout}, then rerun \`crtr node worktree close\`.`, checkoutHead.status !== 0 ? detailOf(checkoutHead) : `expected ${baseSha}, found ${checkoutHead.stdout.trim()}`);
+        const landed = await landIntoBaseCheckout(baseCheckout, wt.branch, baseSha, landedSha);
+        if (!landed.ok)
+            throw blocked(`could not fast-forward local base branch '${wt.base_ref}' to this worktree`, `Local base branch '${wt.base_ref}' is checked out at ${baseCheckout} in a state that blocks a fast-forward.`, landed.detail);
+        stashNote = landed.stash;
+    }
+    else {
+        const update = await gitAsync(['update-ref', `refs/heads/${wt.base_ref}`, landedSha, baseSha], wt.path);
+        if (update.status !== 0)
+            throw blocked(`could not fast-forward local base branch '${wt.base_ref}' to this worktree`, 'Ask the user how to land this managed worktree.', detailOf(update));
+    }
+    persistClosedWorktreeState(nodeId, wt, 'pending');
+    return { node_id: nodeId, branch: wt.branch, worktree_path: wt.path, landed_sha: landedSha, ...deferredCleanupResult(wt), ...(stashNote === undefined ? {} : { base_checkout_stash: stashNote }) };
+}
+/** Async daemon executor for explicit close. The lock wait and every Git
+ * subprocess yield to the daemon event loop. */
+export async function closeManagedWorktreeAsync(nodeId) {
+    const wt = getNode(nodeId)?.managed_worktree;
+    if (wt === undefined || wt === null || wt.state !== 'open')
+        return closeLocked(nodeId);
+    if (!existsSync(wt.path)) {
+        const conclusion = await concludeAbsentManagedWorktreeAsync(nodeId);
+        if (conclusion !== null) {
+            return {
+                node_id: nodeId,
+                branch: conclusion.dropped.branch,
+                worktree_path: conclusion.dropped.worktree_path,
+                landed_sha: conclusion.landedSha,
+                worktree_removed: true,
+                branch_deleted: conclusion.dropped.branch_deleted,
+                ...(conclusion.dropped.branch_delete_error === undefined ? {} : { branch_delete_error: conclusion.dropped.branch_delete_error }),
+            };
+        }
+    }
+    const current = getNode(nodeId)?.managed_worktree;
+    if (current === undefined || current === null || current.state !== 'open')
+        return closeLocked(nodeId);
+    const cwd = existsSync(current.path) ? current.path : current.repo_root;
+    const commonDir = await commonGitDir(cwd);
+    return withExclusiveDirectoryLockAsync(worktreeLockPathForCommonDir(commonDir), () => closeLocked(nodeId), {
+        // Leave room for the API handler to serialize the typed refusal before its
+        // 30s client socket deadline.
+        timeoutMs: Math.min(WORKTREE_LOCK_WAIT_MS, 25_000),
+        timeoutError: () => new WorktreeError('worktree_lock_timeout', `timed out waiting to create a managed worktree in ${commonDir}`, 'Wait for the other managed-worktree operation to finish, then retry.'),
+    });
+}

package/dist/core/worktree-containment.d.ts

@@ -0,0 +1,14 @@
+import type { ManagedWorktree } from './canvas/index.js';
+export interface BranchContainmentProof {
+    containingRef: string;
+    containingSha: string;
+}
+/** Resolve the base branch's configured upstream, or its origin fallback. */
+export declare function upstreamTip(cwd: string, baseRef: string): Promise<{
+    ref: string;
+    sha: string;
+} | null>;
+/** Prove that a recorded base or its upstream already carries a branch's
+ * committed content. This is the one decision point for explicit close and
+ * sweep cleanup: destination resolution happens only when this returns null. */
+export declare function proveBranchContained(cwd: string, wt: Pick<ManagedWorktree, 'base_ref'>, branchSha: string): Promise<BranchContainmentProof | null>;

package/dist/core/worktree-containment.js

@@ -0,0 +1,48 @@
+import { gitAsync } from './git.js';
+async function revParseRef(cwd, ref) {
+    const result = await gitAsync(['rev-parse', '--verify', '--quiet', ref], cwd);
+    return result.status === 0 ? result.stdout.trim() : null;
+}
+/** Resolve the base branch's configured upstream, or its origin fallback. */
+export async function upstreamTip(cwd, baseRef) {
+    const upstream = await gitAsync(['rev-parse', '--symbolic-full-name', '--verify', `${baseRef}@{upstream}`], cwd);
+    const ref = upstream.status === 0 && upstream.stdout.trim().startsWith('refs/')
+        ? upstream.stdout.trim()
+        : `refs/remotes/origin/${baseRef}`;
+    const sha = await revParseRef(cwd, ref);
+    return sha === null ? null : { ref, sha };
+}
+/** Prove that a recorded base or its upstream already carries a branch's
+ * committed content. This is the one decision point for explicit close and
+ * sweep cleanup: destination resolution happens only when this returns null. */
+export async function proveBranchContained(cwd, wt, branchSha) {
+    const candidates = [];
+    const localBaseRef = `refs/heads/${wt.base_ref}`;
+    const localBase = await revParseRef(cwd, localBaseRef);
+    if (localBase !== null)
+        candidates.push({ ref: localBaseRef, sha: localBase });
+    const upstream = await upstreamTip(cwd, wt.base_ref);
+    if (upstream !== null)
+        candidates.push(upstream);
+    for (const candidate of candidates) {
+        if ((await gitAsync(['merge-base', '--is-ancestor', branchSha, candidate.sha], cwd)).status === 0)
+            return { containingRef: candidate.ref, containingSha: candidate.sha };
+    }
+    for (const candidate of candidates) {
+        const cherry = await gitAsync(['cherry', candidate.sha, branchSha], cwd);
+        if (cherry.status !== 0)
+            continue;
+        const lines = cherry.stdout.split('\n').map((line) => line.trim()).filter((line) => line !== '');
+        if (lines.every((line) => line.startsWith('-')))
+            return { containingRef: candidate.ref, containingSha: candidate.sha };
+    }
+    for (const candidate of candidates) {
+        const candidateTree = await revParseRef(cwd, `${candidate.sha}^{tree}`);
+        if (candidateTree === null)
+            continue;
+        const merged = await gitAsync(['merge-tree', '--write-tree', candidate.sha, branchSha], cwd);
+        if (merged.status === 0 && merged.stdout.split('\n')[0]?.trim() === candidateTree)
+            return { containingRef: candidate.ref, containingSha: candidate.sha };
+    }
+    return null;
+}

package/dist/core/worktree-mutation-async.d.ts

@@ -0,0 +1,13 @@
+import { type ManagedWorktree } from './canvas/index.js';
+import { type AbandonManagedWorktreeResult, type AutoDroppedWorktree } from './worktree.js';
+export declare function rollbackManagedWorktreeAsync(wt: ManagedWorktree): Promise<void>;
+export declare function createManagedWorktreeAsync(cwd: string, nodeId: string, baseRef?: string): Promise<ManagedWorktree>;
+export interface AbsentWorktreeConclusion {
+    dropped: AutoDroppedWorktree;
+    landedSha: string;
+}
+/** Conclude an absent checkout only from the same branch-delivery proof used by
+ * push-final and explicit close. */
+export declare function concludeAbsentManagedWorktreeAsync(nodeId: string): Promise<AbsentWorktreeConclusion | null>;
+export declare function autoDropCleanManagedWorktreeAsync(nodeId: string): Promise<AutoDroppedWorktree | null>;
+export declare function abandonManagedWorktreeAsync(nodeId: string, by: string): Promise<AbandonManagedWorktreeResult>;