@telora/daemon 0.12.33

package/dist/worktree-safety.js

@@ -0,0 +1,113 @@
+/**
+ * Worktree safety checks and guards.
+ *
+ * Uncommitted change detection, unmerged commit checks, safety commits,
+ * guarded worktree removal, and WIP commit after agent exit.
+ */
+import { existsSync } from 'node:fs';
+import { runGitSync } from './git-types.js';
+import { commitWip, removeWorktreeBase, } from '@telora/daemon-core';
+/**
+ * Check if a worktree has uncommitted changes (dirty working tree).
+ */
+export function worktreeHasUncommittedChanges(worktreePath) {
+    if (!existsSync(worktreePath))
+        return false;
+    const result = runGitSync(['status', '--porcelain'], worktreePath);
+    return result.success && result.output.trim().length > 0;
+}
+/**
+ * Check if a branch has commits not yet merged into a target branch.
+ */
+export function branchHasUnmergedCommits(branchName, targetBranch, repoPath) {
+    const result = runGitSync(['log', '--oneline', `${targetBranch}..${branchName}`, '--'], repoPath);
+    return result.success && result.output.trim().length > 0;
+}
+/**
+ * Commit all uncommitted changes in a worktree as a safety net.
+ * Returns the commit hash if successful, null otherwise.
+ */
+export function safetyCommitWorktree(worktreePath, deliveryName) {
+    // Stage everything
+    const addResult = runGitSync(['add', '-A'], worktreePath);
+    if (!addResult.success) {
+        console.error(`Safety commit: failed to stage changes: ${addResult.error}`);
+        return null;
+    }
+    // Commit
+    const commitResult = runGitSync(['commit', '-m', `wip: uncommitted agent work for "${deliveryName}" (safety commit)`], worktreePath);
+    if (!commitResult.success) {
+        console.warn(`Safety commit: commit failed (may be empty): ${commitResult.error}`);
+        return null;
+    }
+    // Return the new commit hash
+    const hashResult = runGitSync(['rev-parse', 'HEAD'], worktreePath);
+    return hashResult.success ? hashResult.output : null;
+}
+/**
+ * Remove a worktree when an agent session ends.
+ * The branch is preserved for PR creation.
+ *
+ * SAFETY: Refuses to remove a worktree that has uncommitted changes or
+ * unmerged commits. Uncommitted changes are auto-committed as a safety
+ * net to prevent losing agent work.
+ *
+ * @returns true if the worktree was actually removed, false if it was preserved
+ */
+export function removeWorktree(repoPath, worktreePath, options = {}) {
+    const { branchName, integrationBranch, deliveryName, mergeSucceeded } = options;
+    try {
+        if (!existsSync(worktreePath)) {
+            console.log(`Worktree already removed: ${worktreePath}`);
+            runGitSync(['worktree', 'prune'], repoPath);
+            return true;
+        }
+        // Guard 1: Check for uncommitted changes and safety-commit them
+        if (worktreeHasUncommittedChanges(worktreePath)) {
+            console.warn(`Worktree has uncommitted changes: ${worktreePath}. ` +
+                `Creating safety commit to preserve work...`);
+            const hash = safetyCommitWorktree(worktreePath, deliveryName ?? 'unknown');
+            if (hash) {
+                console.log(`Safety commit created: ${hash.slice(0, 8)}`);
+            }
+            else {
+                // Could not commit -- refuse to delete
+                console.error(`REFUSING to remove worktree ${worktreePath}: ` +
+                    `has uncommitted changes and safety commit failed. ` +
+                    `Manual cleanup required.`);
+                return false;
+            }
+        }
+        // Guard 2: Check for unmerged commits (if we know the branch and integration)
+        if (branchName && integrationBranch && !mergeSucceeded) {
+            if (branchHasUnmergedCommits(branchName, integrationBranch, repoPath)) {
+                console.error(`REFUSING to remove worktree ${worktreePath}: ` +
+                    `branch ${branchName} has commits not merged to ${integrationBranch}. ` +
+                    `Branch preserved for manual merge/review.`);
+                return false;
+            }
+        }
+        // Safe to remove -- delegate to daemon-core's base removal
+        return removeWorktreeBase(repoPath, worktreePath);
+    }
+    catch (err) {
+        console.error('Error removing worktree:', err instanceof Error ? err.message : String(err));
+        return false;
+    }
+}
+/**
+ * Commit any uncommitted changes in a worktree as a WIP commit.
+ *
+ * Called by the daemon after an agent process exits but before worktree
+ * removal. Captures in-flight work that the agent didn't commit before
+ * being terminated.
+ *
+ * Delegates to daemon-core's commitWip for the actual git operations.
+ *
+ * @returns The commit hash if a WIP commit was created, null if no changes or failure.
+ */
+export function commitWipChanges(worktreePath, contextName) {
+    console.log(`[worktree] Committing WIP changes in ${worktreePath} for "${contextName}"`);
+    return commitWip(worktreePath, `Uncommitted work captured by daemon on agent exit (${contextName})`);
+}
+//# sourceMappingURL=worktree-safety.js.map

package/dist/worktree-safety.js.map

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

package/dist/worktree-strategy.d.ts

@@ -0,0 +1,69 @@
+/**
+ * Strategy worktree lifecycle: canonical removal and orphan cleanup.
+ *
+ * safeRemoveStrategyWorktree is the single code path for all strategy
+ * worktree removals -- it merges before removing and conditionally
+ * clears in-memory state.
+ *
+ * cleanupOrphanStrategyWorktrees scans the worktree directory on startup
+ * and removes worktrees that no longer match any active strategy.
+ */
+import type { DaemonConfig } from './types.js';
+/**
+ * Parameters for the canonical worktree removal function.
+ */
+export interface SafeRemoveStrategyWorktreeParams {
+    config: DaemonConfig;
+    worktreePath: string;
+    branchName: string;
+    /** Human-readable name for logging and merge commit messages. */
+    deliveryName: string;
+    /** Delivery/strategy ID for merge traceability. Falls back to deliveryName. */
+    deliveryId?: string;
+    /** If provided, clears in-memory worktree state on successful removal. */
+    strategyId?: string;
+}
+/**
+ * Result of a canonical worktree removal attempt.
+ */
+export interface SafeRemoveResult {
+    /** Whether the worktree was actually removed from disk. */
+    removed: boolean;
+    /** Whether a merge to integration was attempted and succeeded. */
+    merged: boolean;
+    /** Error message if merge failed. */
+    mergeError?: string;
+}
+/**
+ * Canonical strategy worktree removal: merge-before-remove + conditional cleanup.
+ *
+ * Every code path that removes a strategy worktree should route through this
+ * function. It encapsulates the full lifecycle:
+ *   1. Check for unmerged commits on the branch
+ *   2. Attempt merge to integration if needed
+ *   3. Call removeWorktree with safety guards (handles uncommitted changes)
+ *   4. Conditionally clear in-memory state based on whether removal succeeded
+ *
+ * Returns structured result so callers can count cleaned/preserved and log.
+ */
+export declare function safeRemoveStrategyWorktree(params: SafeRemoveStrategyWorktreeParams): Promise<SafeRemoveResult>;
+/**
+ * Clean up orphan strategy worktrees on daemon startup.
+ *
+ * Scans the worktree directory and cross-references against active
+ * strategies (those with assigned agent roles and queued deliveries).
+ * Worktrees that don't match any active strategy are orphans from a
+ * previous daemon run and are cleaned up.
+ *
+ * Conservative approach:
+ * - Safety-commits any uncommitted changes before removal
+ * - Checks for unmerged commits before deleting
+ * - Logs all actions for auditability
+ *
+ * @returns Count of orphans cleaned up and preserved
+ */
+export declare function cleanupOrphanStrategyWorktrees(config: DaemonConfig): Promise<{
+    cleaned: number;
+    preserved: number;
+}>;
+//# sourceMappingURL=worktree-strategy.d.ts.map

package/dist/worktree-strategy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree-strategy.d.ts","sourceRoot":"","sources":["../src/worktree-strategy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAU/C;;GAEG;AACH,MAAM,WAAW,gCAAgC;IAC/C,MAAM,EAAE,YAAY,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,iEAAiE;IACjE,YAAY,EAAE,MAAM,CAAC;IACrB,+EAA+E;IAC/E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,0EAA0E;IAC1E,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,2DAA2D;IAC3D,OAAO,EAAE,OAAO,CAAC;IACjB,kEAAkE;IAClE,MAAM,EAAE,OAAO,CAAC;IAChB,qCAAqC;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAID;;;;;;;;;;;GAWG;AACH,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,gCAAgC,GACvC,OAAO,CAAC,gBAAgB,CAAC,CA8D3B;AAID;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAsHjD"}

package/dist/worktree-strategy.js

@@ -0,0 +1,214 @@
+/**
+ * Strategy worktree lifecycle: canonical removal and orphan cleanup.
+ *
+ * safeRemoveStrategyWorktree is the single code path for all strategy
+ * worktree removals -- it merges before removing and conditionally
+ * clears in-memory state.
+ *
+ * cleanupOrphanStrategyWorktrees scans the worktree directory on startup
+ * and removes worktrees that no longer match any active strategy.
+ */
+import { existsSync, readdirSync, statSync } from 'node:fs';
+import { join, resolve } from 'node:path';
+import { runGitSync } from './git-types.js';
+import { mergeToIntegration } from './git-merge.js';
+import { getActiveStrategies } from './queries/deliveries.js';
+import { removeStrategyWorktree as removeStrategyWorktreeState } from './strategy-worktree-state.js';
+import { sanitizeGitSegment } from './git-utils.js';
+import { branchHasUnmergedCommits, removeWorktree } from './worktree-safety.js';
+// ── Canonical worktree removal ────────────────────────────────────
+/**
+ * Canonical strategy worktree removal: merge-before-remove + conditional cleanup.
+ *
+ * Every code path that removes a strategy worktree should route through this
+ * function. It encapsulates the full lifecycle:
+ *   1. Check for unmerged commits on the branch
+ *   2. Attempt merge to integration if needed
+ *   3. Call removeWorktree with safety guards (handles uncommitted changes)
+ *   4. Conditionally clear in-memory state based on whether removal succeeded
+ *
+ * Returns structured result so callers can count cleaned/preserved and log.
+ */
+export async function safeRemoveStrategyWorktree(params) {
+    const { config, worktreePath, branchName, deliveryName, deliveryId, strategyId } = params;
+    const { repoPath, integrationBranch } = config;
+    // 1. Attempt merge if there are unmerged commits
+    let mergeSucceeded = false;
+    let merged = false;
+    let mergeError;
+    try {
+        if (branchHasUnmergedCommits(branchName, integrationBranch, repoPath)) {
+            console.log(`[worktree] Attempting merge for ${branchName} before removal`);
+            const mergeResult = await mergeToIntegration({
+                config,
+                branchName,
+                deliveryName,
+                deliveryId: deliveryId ?? deliveryName,
+            });
+            mergeSucceeded = mergeResult.success;
+            merged = true;
+            if (mergeResult.success) {
+                console.log(`[worktree] Merge succeeded for ${branchName}`);
+            }
+            else {
+                mergeError = mergeResult.error ?? 'unknown';
+                console.warn(`[worktree] Merge failed for ${branchName}: ${mergeError}. ` +
+                    `Safety guards will preserve the branch.`);
+            }
+        }
+        else {
+            mergeSucceeded = true; // Nothing to merge
+        }
+    }
+    catch (err) {
+        mergeError = err.message;
+        console.warn(`[worktree] Merge attempt failed for ${branchName}: ${mergeError}`);
+    }
+    // 2. Remove worktree (safety guards handle uncommitted changes and unmerged commits)
+    let removed = false;
+    try {
+        removed = removeWorktree(repoPath, worktreePath, {
+            branchName,
+            integrationBranch,
+            deliveryName,
+            mergeSucceeded,
+        });
+    }
+    catch (err) {
+        console.warn(`[worktree] Failed to remove worktree ${worktreePath}: ${err.message}`);
+    }
+    // 3. Conditionally clear in-memory state
+    if (strategyId) {
+        if (removed) {
+            removeStrategyWorktreeState(strategyId);
+        }
+        else {
+            console.log(`[worktree] Worktree preserved for strategy ${strategyId} -- keeping in-memory state`);
+        }
+    }
+    return { removed, merged, mergeError };
+}
+// ── Orphan strategy worktree cleanup ──────────────────────────────
+/**
+ * Clean up orphan strategy worktrees on daemon startup.
+ *
+ * Scans the worktree directory and cross-references against active
+ * strategies (those with assigned agent roles and queued deliveries).
+ * Worktrees that don't match any active strategy are orphans from a
+ * previous daemon run and are cleaned up.
+ *
+ * Conservative approach:
+ * - Safety-commits any uncommitted changes before removal
+ * - Checks for unmerged commits before deleting
+ * - Logs all actions for auditability
+ *
+ * @returns Count of orphans cleaned up and preserved
+ */
+export async function cleanupOrphanStrategyWorktrees(config) {
+    const { worktreeDir, repoPath, organizationId, productId } = config;
+    let cleaned = 0;
+    let preserved = 0;
+    if (!existsSync(worktreeDir)) {
+        return { cleaned, preserved };
+    }
+    // 1. List all subdirectories in the worktree directory
+    let entries;
+    try {
+        entries = readdirSync(worktreeDir).filter((entry) => {
+            try {
+                return statSync(join(worktreeDir, entry)).isDirectory();
+            }
+            catch (e) {
+                console.debug(`[worktree] Failed to stat ${entry} (may have been deleted):`, e.message);
+                return false;
+            }
+        });
+    }
+    catch (err) {
+        console.warn(`[worktree] Failed to scan worktree directory: ${err instanceof Error ? err.message : String(err)}`);
+        return { cleaned, preserved };
+    }
+    if (entries.length === 0) {
+        return { cleaned, preserved };
+    }
+    // 2. Query active strategies
+    let activeStrategyBranchDirs;
+    try {
+        const activeStrategiesList = await getActiveStrategies(organizationId, productId);
+        activeStrategyBranchDirs = new Set();
+        for (const s of activeStrategiesList) {
+            const shortId = s.strategy_id.slice(0, 8);
+            const sanitizedRole = sanitizeGitSegment(s.agent_role_name ?? 'reviewer');
+            const sanitizedName = sanitizeGitSegment(s.strategy_name);
+            const expectedDir = `agent-${sanitizedRole}-${sanitizedName}-${shortId}`;
+            if (entries.includes(expectedDir)) {
+                activeStrategyBranchDirs.add(expectedDir);
+            }
+            else {
+                // Fallback: match by strategy ID prefix in case sanitization differs
+                for (const entry of entries) {
+                    if (entry.endsWith(shortId)) {
+                        activeStrategyBranchDirs.add(entry);
+                    }
+                }
+            }
+        }
+    }
+    catch (err) {
+        console.warn(`[worktree] Failed to query active strategies for orphan detection: ` +
+            `${err instanceof Error ? err.message : String(err)}. Skipping orphan cleanup.`);
+        return { cleaned, preserved };
+    }
+    // 3. Identify orphans: agent worktree dirs not matching any active strategy
+    const orphanDirs = entries.filter((entry) => {
+        if (!entry.startsWith('agent-'))
+            return false;
+        return !activeStrategyBranchDirs.has(entry);
+    });
+    if (orphanDirs.length === 0) {
+        console.log('[worktree] No orphan strategy worktrees found');
+        return { cleaned, preserved };
+    }
+    console.log(`[worktree] Found ${orphanDirs.length} orphan strategy worktree(s)`);
+    // 4. Parse git worktree list to get branch names for each path
+    const worktreeListResult = runGitSync(['worktree', 'list', '--porcelain'], repoPath);
+    const pathToBranch = new Map();
+    if (worktreeListResult.success) {
+        let currentPath = null;
+        for (const line of worktreeListResult.output.split('\n')) {
+            if (line.startsWith('worktree ')) {
+                currentPath = line.slice('worktree '.length);
+            }
+            else if (line.startsWith('branch refs/heads/') && currentPath) {
+                pathToBranch.set(resolve(currentPath), line.slice('branch refs/heads/'.length));
+                currentPath = null;
+            }
+            else if (line === '') {
+                currentPath = null;
+            }
+        }
+    }
+    // 5. Clean up each orphan via canonical removal path
+    for (const dir of orphanDirs) {
+        const worktreePath = resolve(join(worktreeDir, dir));
+        const branchName = pathToBranch.get(worktreePath) ?? dir.replace(/-/g, '/');
+        const deliveryName = branchName.split('/').slice(2).join('/') || dir;
+        console.log(`[worktree] Cleaning up orphan strategy worktree: ${worktreePath} [${branchName}]`);
+        const result = await safeRemoveStrategyWorktree({
+            config,
+            worktreePath,
+            branchName,
+            deliveryName,
+            deliveryId: dir, // No real delivery ID -- use dir name for traceability
+        });
+        if (result.removed) {
+            cleaned++;
+        }
+        else {
+            preserved++;
+        }
+    }
+    console.log(`[worktree] Orphan strategy worktree cleanup: ${cleaned} cleaned, ${preserved} preserved`);
+    return { cleaned, preserved };
+}
+//# sourceMappingURL=worktree-strategy.js.map

package/dist/worktree-strategy.js.map

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

package/dist/worktree.d.ts

@@ -0,0 +1,159 @@
+/**
+ * Git worktree management for the daemon.
+ *
+ * Handles worktree creation, cleanup, pruning, and safety checks
+ * for agent session isolation.
+ *
+ * Base operations (prune, existence check, WIP commit, removal, creation)
+ * are imported from @telora/daemon-core. Daemon-specific extensions
+ * (safety guards, merge-before-remove, orphan cleanup) are implemented here.
+ */
+import type { DaemonConfig } from './types.js';
+/**
+ * Derive the merge worktree path from config. Deterministic — no state.
+ */
+export declare function getMergeWorktreePath(config: DaemonConfig): string;
+/**
+ * Create or validate the persistent merge worktree.
+ *
+ * Uses a detached HEAD worktree at `.telora/merge-worktree/` so merge
+ * functions can checkout any branch without "already checked out" conflicts.
+ * The main repo working tree is never touched during merge operations.
+ *
+ * Called once from initGit() after ensureIntegrationBranch().
+ */
+export declare function ensureMergeWorktree(config: DaemonConfig): string;
+/**
+ * Parameters for the canonical worktree removal function.
+ */
+export interface SafeRemoveStrategyWorktreeParams {
+    config: DaemonConfig;
+    worktreePath: string;
+    branchName: string;
+    /** Human-readable name for logging and merge commit messages. */
+    deliveryName: string;
+    /** Delivery/strategy ID for merge traceability. Falls back to deliveryName. */
+    deliveryId?: string;
+    /** If provided, clears in-memory worktree state on successful removal. */
+    strategyId?: string;
+}
+/**
+ * Result of a canonical worktree removal attempt.
+ */
+export interface SafeRemoveResult {
+    /** Whether the worktree was actually removed from disk. */
+    removed: boolean;
+    /** Whether a merge to integration was attempted and succeeded. */
+    merged: boolean;
+    /** Error message if merge failed. */
+    mergeError?: string;
+}
+/**
+ * Ensure the worktree directory exists.
+ */
+export declare function ensureWorktreeDir(config: DaemonConfig): void;
+/**
+ * Clean up stale worktree entries on startup.
+ *
+ * Delegates to daemon-core's pruneWorktrees.
+ */
+export declare function pruneWorktrees(repoPath: string): void;
+/**
+ * Check if a worktree exists for a branch.
+ *
+ * Delegates to daemon-core's worktreeExistsForBranch.
+ */
+export declare function worktreeExistsForBranch(branchName: string, repoPath: string): boolean;
+/**
+ * Ensure MCP server build artifacts are available in a worktree.
+ *
+ * The MCP server dist/ directories are gitignored build artifacts that only
+ * exist in the main repo. Worktrees created via `git worktree add` won't have
+ * them, which prevents Claude Code from loading MCP tools (the .mcp.json
+ * references relative paths like `mcp/telora-products/dist/index.js`).
+ *
+ * This function symlinks each MCP dist/ directory from the main repo into the
+ * worktree so the relative paths in .mcp.json resolve correctly.
+ */
+export declare function ensureMcpServerInWorktree(repoPath: string, worktreePath: string): void;
+/**
+ * Create a worktree for an agent session.
+ * The worktree is created from the integration branch.
+ *
+ * @returns The path to the created worktree
+ */
+export declare function createWorktree(config: DaemonConfig, branchName: string): Promise<string>;
+/**
+ * Check if a worktree has uncommitted changes (dirty working tree).
+ */
+export declare function worktreeHasUncommittedChanges(worktreePath: string): boolean;
+/**
+ * Check if a branch has commits not yet merged into a target branch.
+ */
+export declare function branchHasUnmergedCommits(branchName: string, targetBranch: string, repoPath: string): boolean;
+/**
+ * Commit all uncommitted changes in a worktree as a safety net.
+ * Returns the commit hash if successful, null otherwise.
+ */
+export declare function safetyCommitWorktree(worktreePath: string, deliveryName: string): string | null;
+/**
+ * Remove a worktree when an agent session ends.
+ * The branch is preserved for PR creation.
+ *
+ * SAFETY: Refuses to remove a worktree that has uncommitted changes or
+ * unmerged commits. Uncommitted changes are auto-committed as a safety
+ * net to prevent losing agent work.
+ *
+ * @returns true if the worktree was actually removed, false if it was preserved
+ */
+export declare function removeWorktree(repoPath: string, worktreePath: string, options?: {
+    branchName?: string;
+    integrationBranch?: string;
+    deliveryName?: string;
+    mergeSucceeded?: boolean;
+}): boolean;
+/**
+ * Commit any uncommitted changes in a worktree as a WIP commit.
+ *
+ * Called by the daemon after an agent process exits but before worktree
+ * removal. Captures in-flight work that the agent didn't commit before
+ * being terminated.
+ *
+ * Delegates to daemon-core's commitWip for the actual git operations.
+ *
+ * @returns The commit hash if a WIP commit was created, null if no changes or failure.
+ */
+export declare function commitWipChanges(worktreePath: string, contextName: string): string | null;
+/**
+ * Canonical strategy worktree removal: merge-before-remove + conditional cleanup.
+ *
+ * Every code path that removes a strategy worktree should route through this
+ * function. It encapsulates the full lifecycle:
+ *   1. Check for unmerged commits on the branch
+ *   2. Attempt merge to integration if needed
+ *   3. Call removeWorktree with safety guards (handles uncommitted changes)
+ *   4. Conditionally clear in-memory state based on whether removal succeeded
+ *
+ * Returns structured result so callers can count cleaned/preserved and log.
+ */
+export declare function safeRemoveStrategyWorktree(params: SafeRemoveStrategyWorktreeParams): Promise<SafeRemoveResult>;
+/**
+ * Clean up orphan strategy worktrees on daemon startup.
+ *
+ * Scans the worktree directory and cross-references against active
+ * strategies (those with assigned agent roles and queued deliveries).
+ * Worktrees that don't match any active strategy are orphans from a
+ * previous daemon run and are cleaned up.
+ *
+ * Conservative approach:
+ * - Safety-commits any uncommitted changes before removal
+ * - Checks for unmerged commits before deleting
+ * - Logs all actions for auditability
+ *
+ * @returns Count of orphans cleaned up and preserved
+ */
+export declare function cleanupOrphanStrategyWorktrees(config: DaemonConfig): Promise<{
+    cleaned: number;
+    preserved: number;
+}>;
+//# sourceMappingURL=worktree.d.ts.map

package/dist/worktree.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../src/worktree.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAgB/C;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAEjE;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAqChE;AAID;;GAEG;AACH,MAAM,WAAW,gCAAgC;IAC/C,MAAM,EAAE,YAAY,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,iEAAiE;IACjE,YAAY,EAAE,MAAM,CAAC;IACrB,+EAA+E;IAC/E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,0EAA0E;IAC1E,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,2DAA2D;IAC3D,OAAO,EAAE,OAAO,CAAC;IACjB,kEAAkE;IAClE,MAAM,EAAE,OAAO,CAAC;IAChB,qCAAqC;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CAK5D;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAErD;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,OAAO,CAET;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CA6CtF;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,CA+DjB;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAI3E;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,GACf,OAAO,CAMT;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAqB9F;AAED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE;IACP,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,OAAO,CAAC;CACrB,GACL,OAAO,CAgDT;AAID;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAGzF;AAID;;;;;;;;;;;GAWG;AACH,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,gCAAgC,GACvC,OAAO,CAAC,gBAAgB,CAAC,CA8D3B;AAID;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAoIjD"}