@stoneforge/smithy 0.1.0

package/dist/git/merge.d.ts

@@ -0,0 +1,79 @@
+/**
+ * Git Merge Utilities
+ *
+ * Shared squash-merge-in-temp-worktree logic used by both the Merge Steward
+ * and the Docs Steward services.
+ *
+ * Pattern:
+ *  1. Fetch origin
+ *  2. (Optional) Pre-flight conflict detection via git merge-tree
+ *  3. Create temp worktree with detached HEAD at origin/<target>
+ *  4. Squash merge (or regular merge) source branch
+ *  5. Commit with provided message
+ *  6. Push HEAD:<target> to remote
+ *  7. Remove temp worktree (always, in finally)
+ *  8. (Optional) Sync local target branch via fast-forward
+ *
+ * @module
+ */
+export interface MergeBranchOptions {
+    /** Workspace root (the main repo checkout) */
+    workspaceRoot: string;
+    /** Branch to merge from */
+    sourceBranch: string;
+    /** Branch to merge into (auto-detected if omitted) */
+    targetBranch?: string;
+    /** 'squash' (default) or 'merge' (--no-ff) */
+    mergeStrategy?: 'squash' | 'merge';
+    /** Push to remote after merge (default: true) */
+    autoPush?: boolean;
+    /** Commit message (required for squash, auto-generated for merge) */
+    commitMessage?: string;
+    /** Run pre-flight conflict detection via merge-tree (default: true) */
+    preflight?: boolean;
+    /** Fast-forward local target branch after push (default: true) */
+    syncLocal?: boolean;
+}
+export interface MergeBranchResult {
+    /** Whether the merge succeeded */
+    success: boolean;
+    /** Merge/squash commit hash if successful */
+    commitHash?: string;
+    /** Whether a conflict was detected */
+    hasConflict: boolean;
+    /** Error message if merge failed */
+    error?: string;
+    /** Files with conflicts, if any */
+    conflictFiles?: string[];
+}
+/**
+ * Run a git command in a worktree directory.
+ * Refuses to run in the workspace root to prevent corrupting the main repo HEAD.
+ */
+export declare function execGitSafe(command: string, worktreePath: string, workspaceRoot: string): Promise<{
+    stdout: string;
+    stderr: string;
+}>;
+/**
+ * Detect the default target branch for the repo by checking origin/HEAD,
+ * then falling back to origin/main, then origin/master, then 'main'.
+ */
+export declare function detectTargetBranch(workspaceRoot: string): Promise<string>;
+/**
+ * Perform a merge of `sourceBranch` into `targetBranch` using a temporary
+ * worktree. This never touches the main repo's HEAD or index.
+ */
+export declare function mergeBranch(options: MergeBranchOptions): Promise<MergeBranchResult>;
+/**
+ * Fast-forward the local target branch ref to match origin, without
+ * the dangerous checkout dance.
+ *
+ * - When NOT on the target branch: `git fetch origin target:target`
+ *   updates the local ref without touching the working tree at all.
+ * - When ON the target branch: `git merge --ff-only origin/target`
+ *   fast-forwards in place (unavoidably touches working tree files).
+ * - If either fails (e.g. non-ff divergence): logs a warning and
+ *   returns silently. The merge is already pushed to remote.
+ */
+export declare function syncLocalBranch(workspaceRoot: string, targetBranch: string): Promise<void>;
+//# sourceMappingURL=merge.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/git/merge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAaH,MAAM,WAAW,kBAAkB;IACjC,8CAA8C;IAC9C,aAAa,EAAE,MAAM,CAAC;IACtB,2BAA2B;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,sDAAsD;IACtD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,8CAA8C;IAC9C,aAAa,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;IACnC,iDAAiD;IACjD,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,qEAAqE;IACrE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uEAAuE;IACvE,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,kEAAkE;IAClE,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IAChC,kCAAkC;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,6CAA6C;IAC7C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,sCAAsC;IACtC,WAAW,EAAE,OAAO,CAAC;IACrB,oCAAoC;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,mCAAmC;IACnC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AAMD;;;GAGG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAO7C;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAoC/E;AAMD;;;GAGG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAmJzF;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,eAAe,CACnC,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAmCf"}

package/dist/git/merge.js

@@ -0,0 +1,254 @@
+/**
+ * Git Merge Utilities
+ *
+ * Shared squash-merge-in-temp-worktree logic used by both the Merge Steward
+ * and the Docs Steward services.
+ *
+ * Pattern:
+ *  1. Fetch origin
+ *  2. (Optional) Pre-flight conflict detection via git merge-tree
+ *  3. Create temp worktree with detached HEAD at origin/<target>
+ *  4. Squash merge (or regular merge) source branch
+ *  5. Commit with provided message
+ *  6. Push HEAD:<target> to remote
+ *  7. Remove temp worktree (always, in finally)
+ *  8. (Optional) Sync local target branch via fast-forward
+ *
+ * @module
+ */
+import { exec } from 'node:child_process';
+import fs from 'node:fs';
+import path from 'node:path';
+import { promisify } from 'node:util';
+const execAsync = promisify(exec);
+// ============================================================================
+// Helpers
+// ============================================================================
+/**
+ * Run a git command in a worktree directory.
+ * Refuses to run in the workspace root to prevent corrupting the main repo HEAD.
+ */
+export async function execGitSafe(command, worktreePath, workspaceRoot) {
+    if (path.resolve(worktreePath) === path.resolve(workspaceRoot)) {
+        throw new Error(`SAFETY: Refusing to run "git ${command}" in main repo. Use a worktree.`);
+    }
+    return execAsync(`git ${command}`, { cwd: worktreePath, encoding: 'utf8' });
+}
+/**
+ * Detect the default target branch for the repo by checking origin/HEAD,
+ * then falling back to origin/main, then origin/master, then 'main'.
+ */
+export async function detectTargetBranch(workspaceRoot) {
+    // Try origin/HEAD symref
+    try {
+        const { stdout } = await execAsync('git symbolic-ref refs/remotes/origin/HEAD', {
+            cwd: workspaceRoot,
+            encoding: 'utf8',
+        });
+        const match = stdout.trim().match(/refs\/remotes\/origin\/(.+)/);
+        if (match)
+            return match[1];
+    }
+    catch {
+        // Fall through
+    }
+    // Try origin/main
+    try {
+        await execAsync('git rev-parse --verify origin/main', {
+            cwd: workspaceRoot,
+            encoding: 'utf8',
+        });
+        return 'main';
+    }
+    catch {
+        // Fall through
+    }
+    // Try origin/master
+    try {
+        await execAsync('git rev-parse --verify origin/master', {
+            cwd: workspaceRoot,
+            encoding: 'utf8',
+        });
+        return 'master';
+    }
+    catch {
+        // Fall through
+    }
+    return 'main';
+}
+// ============================================================================
+// Main
+// ============================================================================
+/**
+ * Perform a merge of `sourceBranch` into `targetBranch` using a temporary
+ * worktree. This never touches the main repo's HEAD or index.
+ */
+export async function mergeBranch(options) {
+    const { workspaceRoot, sourceBranch, mergeStrategy = 'squash', autoPush = true, commitMessage, preflight = true, syncLocal = true, } = options;
+    const targetBranch = options.targetBranch ?? await detectTargetBranch(workspaceRoot);
+    // Build commit message
+    const message = commitMessage
+        ?? (mergeStrategy === 'squash'
+            ? `Squash merge ${sourceBranch} into ${targetBranch}`
+            : `Merge branch '${sourceBranch}'`);
+    // 1. Fetch latest remote state
+    await execAsync('git fetch origin', { cwd: workspaceRoot, encoding: 'utf8' });
+    // 2. Pre-flight conflict detection via merge-tree
+    if (preflight) {
+        try {
+            const { stdout: mergeBase } = await execAsync(`git merge-base origin/${targetBranch} ${sourceBranch}`, { cwd: workspaceRoot, encoding: 'utf8' });
+            const dryRun = await execAsync(`git merge-tree ${mergeBase.trim()} origin/${targetBranch} ${sourceBranch}`, { cwd: workspaceRoot, encoding: 'utf8' }).catch((e) => e);
+            if (dryRun.stdout?.includes('<<<<<<<')) {
+                const dryRunOutput = dryRun.stdout;
+                const conflictFiles = [...dryRunOutput.matchAll(/\+\+\+ b\/(.+)/g)].map(m => m[1]);
+                return {
+                    success: false,
+                    hasConflict: true,
+                    error: 'Pre-flight: merge conflicts detected',
+                    conflictFiles: conflictFiles.length > 0 ? conflictFiles : undefined,
+                };
+            }
+        }
+        catch {
+            // merge-base can fail if branches have no common ancestor; continue to worktree merge
+        }
+    }
+    // 3. Create temp worktree
+    const safeName = sourceBranch.replace(/[^a-zA-Z0-9-]/g, '-');
+    const mergeDirName = `_merge-${safeName}-${Date.now()}`;
+    const mergeDir = path.join(workspaceRoot, '.stoneforge/.worktrees', mergeDirName);
+    // Clean up leftover worktree from a previously crashed run
+    if (fs.existsSync(mergeDir)) {
+        await execAsync(`git worktree remove --force "${mergeDir}"`, {
+            cwd: workspaceRoot, encoding: 'utf8',
+        });
+    }
+    // Create with detached HEAD at origin/<target> (avoids locking the target branch)
+    await execAsync(`git worktree add --detach "${mergeDir}" origin/${targetBranch}`, {
+        cwd: workspaceRoot, encoding: 'utf8',
+    });
+    let mergeResult;
+    try {
+        let commitHash;
+        if (mergeStrategy === 'squash') {
+            await execGitSafe(`merge --squash ${sourceBranch}`, mergeDir, workspaceRoot);
+            await execGitSafe(`commit -m "${message.replace(/"/g, '\\"')}"`, mergeDir, workspaceRoot);
+            const { stdout: hash } = await execGitSafe('rev-parse HEAD', mergeDir, workspaceRoot);
+            commitHash = hash.trim();
+        }
+        else {
+            await execGitSafe(`merge --no-ff -m "${message.replace(/"/g, '\\"')}" ${sourceBranch}`, mergeDir, workspaceRoot);
+            const { stdout: hash } = await execGitSafe('rev-parse HEAD', mergeDir, workspaceRoot);
+            commitHash = hash.trim();
+        }
+        // 6. Push to remote
+        if (autoPush) {
+            try {
+                await execGitSafe(`push origin HEAD:${targetBranch}`, mergeDir, workspaceRoot);
+            }
+            catch (pushError) {
+                const pushErrorMsg = pushError instanceof Error ? pushError.message : String(pushError);
+                console.warn(`[git/merge] Failed to push to remote: ${pushErrorMsg}`);
+            }
+        }
+        mergeResult = { success: true, commitHash, hasConflict: false };
+    }
+    catch (error) {
+        const execError = error;
+        const output = (execError.stdout ?? '') + (execError.stderr ?? '') + (execError.message ?? '');
+        if (output.includes('CONFLICT') || output.includes('Automatic merge failed')) {
+            // Abort the merge to clean up
+            try {
+                if (mergeStrategy === 'squash') {
+                    await execGitSafe('reset --hard HEAD', mergeDir, workspaceRoot);
+                }
+                else {
+                    await execGitSafe('merge --abort', mergeDir, workspaceRoot);
+                }
+            }
+            catch {
+                // Ignore abort errors
+            }
+            const conflictMatch = output.match(/CONFLICT \([^)]+\): Merge conflict in (.+)/g);
+            const conflictFiles = conflictMatch?.map((m) => {
+                const match = m.match(/in (.+)$/);
+                return match ? match[1] : '';
+            }).filter(Boolean);
+            mergeResult = {
+                success: false,
+                hasConflict: true,
+                error: 'Merge conflict detected',
+                conflictFiles,
+            };
+        }
+        else {
+            mergeResult = {
+                success: false,
+                hasConflict: false,
+                error: output || 'Merge failed',
+            };
+        }
+    }
+    finally {
+        // 7. Always remove temp worktree
+        try {
+            await execAsync(`git worktree remove --force "${mergeDir}"`, {
+                cwd: workspaceRoot, encoding: 'utf8',
+            });
+        }
+        catch {
+            // Ignore cleanup errors
+        }
+    }
+    // 8. Sync local target branch with remote (best-effort)
+    if (mergeResult.success && autoPush && syncLocal) {
+        await syncLocalBranch(workspaceRoot, targetBranch);
+    }
+    return mergeResult;
+}
+/**
+ * Fast-forward the local target branch ref to match origin, without
+ * the dangerous checkout dance.
+ *
+ * - When NOT on the target branch: `git fetch origin target:target`
+ *   updates the local ref without touching the working tree at all.
+ * - When ON the target branch: `git merge --ff-only origin/target`
+ *   fast-forwards in place (unavoidably touches working tree files).
+ * - If either fails (e.g. non-ff divergence): logs a warning and
+ *   returns silently. The merge is already pushed to remote.
+ */
+export async function syncLocalBranch(workspaceRoot, targetBranch) {
+    try {
+        // Determine current branch (may be detached HEAD in worktrees)
+        let currentBranch;
+        try {
+            const { stdout } = await execAsync('git symbolic-ref --short HEAD', { cwd: workspaceRoot, encoding: 'utf8' });
+            currentBranch = stdout.trim();
+        }
+        catch {
+            // Detached HEAD — not on any branch
+        }
+        if (!currentBranch) {
+            console.warn('[git/merge] WARNING: workspace is in detached HEAD state during syncLocalBranch. Skipping sync. Run `git checkout master` to fix.');
+            return;
+        }
+        if (currentBranch === targetBranch) {
+            // We're on the target branch — fast-forward in place
+            await execAsync(`git merge --ff-only origin/${targetBranch}`, {
+                cwd: workspaceRoot, encoding: 'utf8',
+            });
+        }
+        else {
+            // Not on target branch — update the ref without touching the worktree
+            await execAsync(`git fetch origin ${targetBranch}:${targetBranch}`, {
+                cwd: workspaceRoot, encoding: 'utf8',
+            });
+        }
+    }
+    catch {
+        // Non-fatal: local branch sync is best-effort.
+        // The merge is already pushed to remote — user can `git pull` manually.
+        console.warn('[git/merge] Failed to fast-forward local target branch (non-ff divergence or missing ref). Run `git pull` to sync manually.');
+    }
+}
+//# sourceMappingURL=merge.js.map

package/dist/git/merge.js.map

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

package/dist/git/worktree-manager.d.ts

@@ -0,0 +1,299 @@
+/**
+ * Worktree Manager
+ *
+ * This module provides git worktree management for the orchestration system.
+ * Each worker agent gets a dedicated git worktree for true parallel development.
+ *
+ * Key features:
+ * - Verify git repo exists before operations
+ * - Create isolated worktrees for workers
+ * - Branch naming: agent/{worker-name}/{task-id}-{slug}
+ * - Worktree path: .stoneforge/.worktrees/{worker-name}-{task-slug}/
+ * - Clean up worktrees after merge
+ *
+ * @module
+ */
+import type { ElementId, Timestamp } from '@stoneforge/core';
+/**
+ * Lifecycle state of a worktree
+ */
+export type WorktreeState = 'creating' | 'active' | 'suspended' | 'merging' | 'cleaning' | 'archived';
+/**
+ * All valid worktree states
+ */
+export declare const WorktreeStates: readonly ["creating", "active", "suspended", "merging", "cleaning", "archived"];
+/**
+ * Valid state transitions for worktrees
+ */
+export declare const WorktreeStateTransitions: Record<WorktreeState, WorktreeState[]>;
+/**
+ * Information about a git worktree
+ */
+export interface WorktreeInfo {
+    /** Full path to the worktree directory */
+    readonly path: string;
+    /** Relative path from workspace root (e.g., ".stoneforge/.worktrees/alice-feature") */
+    readonly relativePath: string;
+    /** Branch checked out in this worktree */
+    readonly branch: string;
+    /** HEAD commit hash */
+    readonly head: string;
+    /** Whether this is the main worktree */
+    readonly isMain: boolean;
+    /** Worktree lifecycle state */
+    state: WorktreeState;
+    /** Agent name associated with this worktree */
+    readonly agentName?: string;
+    /** Task ID associated with this worktree */
+    readonly taskId?: string;
+    /** When the worktree was created */
+    readonly createdAt?: Timestamp;
+}
+/**
+ * Options for creating a worktree
+ */
+export interface CreateWorktreeOptions {
+    /** Agent name for path generation */
+    readonly agentName: string;
+    /** Task ID for branch naming */
+    readonly taskId: ElementId;
+    /** Task title for slug generation (optional) */
+    readonly taskTitle?: string;
+    /** Custom branch name (overrides auto-generated) */
+    readonly customBranch?: string;
+    /** Custom worktree path (overrides auto-generated) */
+    readonly customPath?: string;
+    /** Base branch to create from (default: current branch) */
+    readonly baseBranch?: string;
+    /** Track remote branch (default: true) */
+    readonly trackRemote?: boolean;
+    /** Install dependencies after worktree creation (default: false) */
+    readonly installDependencies?: boolean;
+}
+/**
+ * Options for removing a worktree
+ */
+export interface RemoveWorktreeOptions {
+    /** Force removal even if there are uncommitted changes */
+    readonly force?: boolean;
+    /** Also delete the branch (local) */
+    readonly deleteBranch?: boolean;
+    /** Force delete branch even if not fully merged */
+    readonly forceBranchDelete?: boolean;
+    /** Also delete the remote branch (requires deleteBranch to be true) */
+    readonly deleteRemoteBranch?: boolean;
+}
+/**
+ * Result of creating a worktree
+ */
+export interface CreateWorktreeResult {
+    /** The created worktree info */
+    readonly worktree: WorktreeInfo;
+    /** The branch name created/checked out */
+    readonly branch: string;
+    /** Full path to the worktree */
+    readonly path: string;
+    /** Whether a new branch was created */
+    readonly branchCreated: boolean;
+}
+/**
+ * Configuration for the WorktreeManager
+ */
+export interface WorktreeManagerConfig {
+    /** Workspace root directory (must be a git repo) */
+    readonly workspaceRoot: string;
+    /** Directory for worktrees relative to workspace root (default: ".stoneforge/.worktrees") */
+    readonly worktreeDir?: string;
+    /** Default base branch (default: auto-detect from git) */
+    readonly defaultBaseBranch?: string;
+}
+/**
+ * Error thrown when git repository is not found
+ */
+export declare class GitRepositoryNotFoundError extends Error {
+    constructor(path: string);
+}
+/**
+ * Error thrown when a worktree operation fails
+ */
+export declare class WorktreeError extends Error {
+    readonly code: string;
+    readonly details?: string;
+    constructor(message: string, code: string, details?: string);
+}
+/**
+ * WorktreeManager interface for git worktree operations.
+ *
+ * The manager provides methods for:
+ * - Initializing workspace and verifying git repo
+ * - Creating worktrees for workers
+ * - Removing worktrees after merge
+ * - Listing and querying worktrees
+ */
+export interface WorktreeManager {
+    /**
+     * Initializes the workspace, verifying git repo exists.
+     *
+     * @throws GitRepositoryNotFoundError if no git repo found
+     */
+    initWorkspace(): Promise<void>;
+    /**
+     * Checks if the workspace has been initialized.
+     */
+    isInitialized(): boolean;
+    /**
+     * Gets the workspace root directory.
+     */
+    getWorkspaceRoot(): string;
+    /**
+     * Creates a new worktree for a worker.
+     *
+     * @param options - Worktree creation options
+     * @returns The created worktree result
+     */
+    createWorktree(options: CreateWorktreeOptions): Promise<CreateWorktreeResult>;
+    /**
+     * Creates a read-only worktree detached on the default branch.
+     * Used for triage sessions that should not create new branches.
+     *
+     * @param options - Agent name and purpose for path generation
+     * @returns The created worktree result
+     */
+    createReadOnlyWorktree(options: {
+        agentName: string;
+        purpose: string;
+    }): Promise<CreateWorktreeResult>;
+    /**
+     * Removes a worktree.
+     *
+     * @param worktreePath - Path to the worktree (relative or absolute)
+     * @param options - Removal options
+     */
+    removeWorktree(worktreePath: string, options?: RemoveWorktreeOptions): Promise<void>;
+    /**
+     * Suspends a worktree (marks it inactive but preserves it).
+     *
+     * @param worktreePath - Path to the worktree
+     */
+    suspendWorktree(worktreePath: string): Promise<void>;
+    /**
+     * Resumes a suspended worktree.
+     *
+     * @param worktreePath - Path to the worktree
+     */
+    resumeWorktree(worktreePath: string): Promise<void>;
+    /**
+     * Lists all worktrees in the workspace.
+     *
+     * @param includeMain - Whether to include the main worktree (default: false)
+     */
+    listWorktrees(includeMain?: boolean): Promise<WorktreeInfo[]>;
+    /**
+     * Gets information about a specific worktree.
+     *
+     * @param worktreePath - Path to the worktree (relative or absolute)
+     */
+    getWorktree(worktreePath: string): Promise<WorktreeInfo | undefined>;
+    /**
+     * Gets the worktree path for an agent/task combination.
+     *
+     * @param agentName - The agent's name
+     * @param taskTitle - The task title (optional, used for slug)
+     */
+    getWorktreePath(agentName: string, taskTitle?: string): string;
+    /**
+     * Gets worktrees for a specific agent.
+     *
+     * @param agentName - The agent's name
+     */
+    getWorktreesForAgent(agentName: string): Promise<WorktreeInfo[]>;
+    /**
+     * Checks if a worktree exists at the given path.
+     *
+     * @param worktreePath - Path to check
+     */
+    worktreeExists(worktreePath: string): Promise<boolean>;
+    /**
+     * Gets the current branch of the main worktree.
+     */
+    getCurrentBranch(): Promise<string>;
+    /**
+     * Gets the default base branch (main, master, etc).
+     */
+    getDefaultBranch(): Promise<string>;
+    /**
+     * Checks if a branch exists.
+     *
+     * @param branchName - The branch name to check
+     */
+    branchExists(branchName: string): Promise<boolean>;
+}
+/**
+ * Implementation of the WorktreeManager.
+ */
+export declare class WorktreeManagerImpl implements WorktreeManager {
+    private readonly config;
+    private initialized;
+    private defaultBranch;
+    private worktreeStates;
+    private realWorkspaceRoot;
+    constructor(config: WorktreeManagerConfig);
+    initWorkspace(): Promise<void>;
+    isInitialized(): boolean;
+    getWorkspaceRoot(): string;
+    createWorktree(options: CreateWorktreeOptions): Promise<CreateWorktreeResult>;
+    /**
+     * Create a read-only (detached HEAD) worktree for triage sessions.
+     * Uses `git worktree add --detach` so no new branch is created.
+     */
+    createReadOnlyWorktree(options: {
+        agentName: string;
+        purpose: string;
+    }): Promise<CreateWorktreeResult>;
+    removeWorktree(worktreePath: string, options?: RemoveWorktreeOptions): Promise<void>;
+    suspendWorktree(worktreePath: string): Promise<void>;
+    resumeWorktree(worktreePath: string): Promise<void>;
+    listWorktrees(includeMain?: boolean): Promise<WorktreeInfo[]>;
+    getWorktree(worktreePath: string): Promise<WorktreeInfo | undefined>;
+    getWorktreePath(agentName: string, taskTitle?: string): string;
+    getWorktreesForAgent(agentName: string): Promise<WorktreeInfo[]>;
+    worktreeExists(worktreePath: string): Promise<boolean>;
+    getCurrentBranch(): Promise<string>;
+    getDefaultBranch(): Promise<string>;
+    branchExists(branchName: string): Promise<boolean>;
+    private ensureInitialized;
+    private execGit;
+    /**
+     * Installs dependencies in a worktree directory.
+     * Detects the package manager (pnpm, npm, yarn, bun) and runs install.
+     * Uses a longer timeout since dependency installation can take a while.
+     *
+     * Tries a strict install first (--frozen-lockfile / ci) and falls back to
+     * a plain install when the lockfile is out of sync with package.json
+     * (common when the base branch has uncommitted lockfile changes).
+     */
+    private installDependencies;
+    private resolvePath;
+    private getRelativePath;
+    private parseWorktreeList;
+    private finalizeWorktreeInfo;
+    private detectDefaultBranch;
+    private ensureGitignore;
+}
+/**
+ * Creates a WorktreeManager instance
+ */
+export declare function createWorktreeManager(config: WorktreeManagerConfig): WorktreeManager;
+/**
+ * Type guard to check if a value is a valid WorktreeState
+ */
+export declare function isWorktreeState(value: unknown): value is WorktreeState;
+/**
+ * Checks if a state transition is valid
+ */
+export declare function isValidStateTransition(from: WorktreeState, to: WorktreeState): boolean;
+/**
+ * Gets human-readable description of a worktree state
+ */
+export declare function getWorktreeStateDescription(state: WorktreeState): string;
+//# sourceMappingURL=worktree-manager.d.ts.map

package/dist/git/worktree-manager.d.ts.map

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