sudocode 1.1.17 → 1.1.18-dev.0

package/node_modules/@sudocode-ai/local-server/dist/execution/worktree/git-cli.d.ts

@@ -0,0 +1,208 @@
+/**
+ * Git CLI Wrapper
+ *
+ * Provides a wrapper around git CLI commands for worktree operations.
+ * Uses git CLI directly for reliability (recommended over libgit2/nodegit).
+ *
+ * @module execution/worktree/git-cli
+ */
+import type { WorktreeInfo } from './types.js';
+/**
+ * IGitCli - Interface for git CLI operations
+ */
+export interface IGitCli {
+    /**
+     * Add a new worktree
+     * Equivalent to: git worktree add <path> <branch>
+     *
+     * @param repoPath - Path to the main git repository
+     * @param worktreePath - Path where worktree will be created
+     * @param branch - Branch name for the worktree
+     * @param force - Force creation even if path exists
+     */
+    worktreeAdd(repoPath: string, worktreePath: string, branch: string, force?: boolean): Promise<void>;
+    /**
+     * Remove a worktree
+     * Equivalent to: git worktree remove <path> --force
+     *
+     * @param repoPath - Path to the main git repository
+     * @param worktreePath - Path to worktree to remove
+     * @param force - Force removal even if worktree is dirty
+     */
+    worktreeRemove(repoPath: string, worktreePath: string, force?: boolean): Promise<void>;
+    /**
+     * Prune worktree metadata
+     * Equivalent to: git worktree prune
+     *
+     * @param repoPath - Path to the main git repository
+     */
+    worktreePrune(repoPath: string): Promise<void>;
+    /**
+     * List all worktrees
+     * Equivalent to: git worktree list --porcelain
+     *
+     * @param repoPath - Path to the main git repository
+     * @returns Array of worktree information
+     */
+    worktreeList(repoPath: string): Promise<WorktreeInfo[]>;
+    /**
+     * Create a branch
+     * Equivalent to: git branch <name> <base>
+     *
+     * @param repoPath - Path to the git repository
+     * @param branchName - Name of the new branch
+     * @param baseBranchOrCommit - Base branch or commit SHA to branch from
+     */
+    createBranch(repoPath: string, branchName: string, baseBranchOrCommit: string): Promise<void>;
+    /**
+     * Delete a branch
+     * Equivalent to: git branch -d <name>
+     *
+     * @param repoPath - Path to the git repository
+     * @param branchName - Name of the branch to delete
+     * @param force - Force deletion (use -D instead of -d)
+     */
+    deleteBranch(repoPath: string, branchName: string, force?: boolean): Promise<void>;
+    /**
+     * Configure sparse-checkout for a worktree
+     * Equivalent to: git sparse-checkout set <patterns>
+     *
+     * @param worktreePath - Path to the worktree
+     * @param patterns - Sparse checkout patterns
+     */
+    configureSparseCheckout(worktreePath: string, patterns: string[]): Promise<void>;
+    /**
+     * Check if a path is a valid git repository
+     * Equivalent to: git rev-parse --git-dir
+     *
+     * @param repoPath - Path to check
+     * @returns Promise resolving to true if valid repo, false otherwise
+     */
+    isValidRepo(repoPath: string): Promise<boolean>;
+    /**
+     * List all branches in a repository
+     * Equivalent to: git branch --list --all --format='%(refname:short)'
+     *
+     * @param repoPath - Path to the git repository
+     * @returns Promise resolving to array of branch names
+     */
+    listBranches(repoPath: string): Promise<string[]>;
+    /**
+     * Get current HEAD commit SHA
+     * Equivalent to: git rev-parse HEAD
+     *
+     * @param repoPath - Path to the git repository
+     * @returns Promise resolving to the current HEAD commit SHA
+     */
+    getCurrentCommit(repoPath: string): Promise<string>;
+    /**
+     * Get current branch name
+     * Equivalent to: git rev-parse --abbrev-ref HEAD
+     *
+     * @param repoPath - Path to the git repository
+     * @returns Promise resolving to the current branch name (or "(detached)" if detached HEAD)
+     */
+    getCurrentBranch(repoPath: string): Promise<string>;
+    /**
+     * Merge a branch into the current branch
+     *
+     * @param repoPath - Path to the git repository (or worktree)
+     * @param sourceBranch - Branch to merge from
+     * @param options - Merge options
+     * @returns Promise resolving to merge result
+     */
+    mergeBranch(repoPath: string, sourceBranch: string, options?: {
+        squash?: boolean;
+        message?: string;
+    }): Promise<MergeBranchResult>;
+    /**
+     * Abort a merge in progress
+     * Equivalent to: git merge --abort
+     *
+     * @param repoPath - Path to the git repository (or worktree)
+     */
+    abortMerge(repoPath: string): Promise<void>;
+    /**
+     * Get list of files with merge conflicts
+     * Equivalent to: git diff --name-only --diff-filter=U
+     *
+     * @param repoPath - Path to the git repository (or worktree)
+     * @returns Promise resolving to array of conflicting file paths
+     */
+    getConflictingFiles(repoPath: string): Promise<string[]>;
+}
+/**
+ * Result of a merge operation
+ */
+export interface MergeBranchResult {
+    /** Whether the merge was successful */
+    success: boolean;
+    /** SHA of the merge commit (if successful) */
+    mergeCommit?: string;
+    /** Strategy used for the merge */
+    strategy: 'fast-forward' | 'merge' | 'squash';
+    /** List of files with conflicts (if merge failed) */
+    conflictingFiles?: string[];
+    /** Error message (if merge failed) */
+    error?: string;
+}
+/**
+ * GitCli - Implementation of IGitCli using child_process
+ */
+export declare class GitCli implements IGitCli {
+    /**
+     * Execute a git command
+     *
+     * @param command - Git command to execute
+     * @param cwd - Working directory
+     * @returns Command output
+     * @throws WorktreeError on failure
+     */
+    protected execGit(command: string, cwd: string): string;
+    /**
+     * Escape shell argument
+     *
+     * @param arg - Argument to escape
+     * @returns Escaped argument
+     */
+    private escapeShellArg;
+    worktreeAdd(repoPath: string, worktreePath: string, branch: string, force?: boolean): Promise<void>;
+    worktreeRemove(repoPath: string, worktreePath: string, force?: boolean): Promise<void>;
+    worktreePrune(repoPath: string): Promise<void>;
+    worktreeList(repoPath: string): Promise<WorktreeInfo[]>;
+    /**
+     * Parse output from git worktree list --porcelain
+     *
+     * Format:
+     * worktree /path/to/worktree
+     * HEAD abc123...
+     * branch refs/heads/branch-name
+     * locked reason (optional)
+     * prunable reason (optional)
+     *
+     * @param output - Output from git worktree list --porcelain
+     * @returns Array of WorktreeInfo
+     */
+    private parseWorktreeList;
+    /**
+     * Finalize worktree info with defaults
+     *
+     * @param partial - Partial worktree info
+     * @returns Complete WorktreeInfo
+     */
+    private finalizeWorktreeInfo;
+    createBranch(repoPath: string, branchName: string, baseBranchOrCommit: string): Promise<void>;
+    deleteBranch(repoPath: string, branchName: string, force?: boolean): Promise<void>;
+    configureSparseCheckout(worktreePath: string, patterns: string[]): Promise<void>;
+    isValidRepo(repoPath: string): Promise<boolean>;
+    listBranches(repoPath: string): Promise<string[]>;
+    getCurrentCommit(repoPath: string): Promise<string>;
+    getCurrentBranch(repoPath: string): Promise<string>;
+    mergeBranch(repoPath: string, sourceBranch: string, options?: {
+        squash?: boolean;
+        message?: string;
+    }): Promise<MergeBranchResult>;
+    abortMerge(repoPath: string): Promise<void>;
+    getConflictingFiles(repoPath: string): Promise<string[]>;
+}
+//# sourceMappingURL=git-cli.d.ts.map

package/node_modules/@sudocode-ai/local-server/dist/execution/worktree/git-cli.d.ts.map

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

package/node_modules/@sudocode-ai/local-server/dist/execution/worktree/git-cli.js

@@ -0,0 +1,280 @@
+/**
+ * Git CLI Wrapper
+ *
+ * Provides a wrapper around git CLI commands for worktree operations.
+ * Uses git CLI directly for reliability (recommended over libgit2/nodegit).
+ *
+ * @module execution/worktree/git-cli
+ */
+import { execSync } from 'child_process';
+import { WorktreeError, WorktreeErrorCode } from './types.js';
+/**
+ * GitCli - Implementation of IGitCli using child_process
+ */
+export class GitCli {
+    /**
+     * Execute a git command
+     *
+     * @param command - Git command to execute
+     * @param cwd - Working directory
+     * @returns Command output
+     * @throws WorktreeError on failure
+     */
+    execGit(command, cwd) {
+        try {
+            return execSync(command, {
+                cwd,
+                encoding: 'utf8',
+                stdio: ['pipe', 'pipe', 'pipe'],
+            });
+        }
+        catch (error) {
+            const stderr = error.stderr?.toString() || '';
+            const stdout = error.stdout?.toString() || '';
+            const message = stderr || stdout || error.message || 'Unknown git error';
+            throw new WorktreeError(`Git command failed: ${command}\n${message}`, WorktreeErrorCode.GIT_ERROR, error);
+        }
+    }
+    /**
+     * Escape shell argument
+     *
+     * @param arg - Argument to escape
+     * @returns Escaped argument
+     */
+    escapeShellArg(arg) {
+        // Escape single quotes and wrap in single quotes
+        return `'${arg.replace(/'/g, "'\\''")}'`;
+    }
+    async worktreeAdd(repoPath, worktreePath, branch, force = false) {
+        const escapedPath = this.escapeShellArg(worktreePath);
+        const escapedBranch = this.escapeShellArg(branch);
+        const forceFlag = force ? '--force' : '';
+        const command = `git worktree add ${forceFlag} ${escapedPath} ${escapedBranch}`.trim();
+        this.execGit(command, repoPath);
+    }
+    async worktreeRemove(repoPath, worktreePath, force = false) {
+        const escapedPath = this.escapeShellArg(worktreePath);
+        const forceFlag = force ? '--force' : '';
+        const command = `git worktree remove ${forceFlag} ${escapedPath}`.trim();
+        this.execGit(command, repoPath);
+    }
+    async worktreePrune(repoPath) {
+        this.execGit('git worktree prune', repoPath);
+    }
+    async worktreeList(repoPath) {
+        const output = this.execGit('git worktree list --porcelain', repoPath);
+        return this.parseWorktreeList(output);
+    }
+    /**
+     * Parse output from git worktree list --porcelain
+     *
+     * Format:
+     * worktree /path/to/worktree
+     * HEAD abc123...
+     * branch refs/heads/branch-name
+     * locked reason (optional)
+     * prunable reason (optional)
+     *
+     * @param output - Output from git worktree list --porcelain
+     * @returns Array of WorktreeInfo
+     */
+    parseWorktreeList(output) {
+        const worktrees = [];
+        const lines = output.split('\n').filter((line) => line.trim());
+        let currentWorktree = null;
+        for (const line of lines) {
+            if (line.startsWith('worktree ')) {
+                // Start a new worktree entry
+                if (currentWorktree && currentWorktree.path) {
+                    worktrees.push(this.finalizeWorktreeInfo(currentWorktree));
+                }
+                currentWorktree = {
+                    path: line.substring('worktree '.length).trim(),
+                    isMain: false,
+                    isLocked: false,
+                };
+            }
+            else if (line.startsWith('HEAD ')) {
+                if (currentWorktree) {
+                    currentWorktree.commit = line.substring('HEAD '.length).trim();
+                }
+            }
+            else if (line.startsWith('branch ')) {
+                if (currentWorktree) {
+                    const branchRef = line.substring('branch '.length).trim();
+                    // Extract branch name from refs/heads/branch-name
+                    currentWorktree.branch = branchRef.replace('refs/heads/', '');
+                }
+            }
+            else if (line.startsWith('bare')) {
+                if (currentWorktree) {
+                    currentWorktree.isMain = true;
+                }
+            }
+            else if (line.startsWith('locked ')) {
+                if (currentWorktree) {
+                    currentWorktree.isLocked = true;
+                    currentWorktree.lockReason = line.substring('locked '.length).trim();
+                }
+            }
+        }
+        // Add the last worktree
+        if (currentWorktree && currentWorktree.path) {
+            worktrees.push(this.finalizeWorktreeInfo(currentWorktree));
+        }
+        return worktrees;
+    }
+    /**
+     * Finalize worktree info with defaults
+     *
+     * @param partial - Partial worktree info
+     * @returns Complete WorktreeInfo
+     */
+    finalizeWorktreeInfo(partial) {
+        return {
+            path: partial.path || '',
+            branch: partial.branch || '(detached)',
+            commit: partial.commit || '',
+            isMain: partial.isMain || false,
+            isLocked: partial.isLocked || false,
+            lockReason: partial.lockReason,
+        };
+    }
+    async createBranch(repoPath, branchName, baseBranchOrCommit) {
+        const escapedBranch = this.escapeShellArg(branchName);
+        const escapedBase = this.escapeShellArg(baseBranchOrCommit);
+        const command = `git branch ${escapedBranch} ${escapedBase}`;
+        this.execGit(command, repoPath);
+    }
+    async deleteBranch(repoPath, branchName, force = false) {
+        const escapedBranch = this.escapeShellArg(branchName);
+        const flag = force ? '-D' : '-d';
+        const command = `git branch ${flag} ${escapedBranch}`;
+        this.execGit(command, repoPath);
+    }
+    async configureSparseCheckout(worktreePath, patterns) {
+        // Enable sparse-checkout
+        this.execGit('git sparse-checkout init --cone', worktreePath);
+        // Set patterns
+        const escapedPatterns = patterns.map((p) => this.escapeShellArg(p)).join(' ');
+        const command = `git sparse-checkout set ${escapedPatterns}`;
+        this.execGit(command, worktreePath);
+    }
+    async isValidRepo(repoPath) {
+        try {
+            this.execGit('git rev-parse --git-dir', repoPath);
+            return true;
+        }
+        catch (error) {
+            return false;
+        }
+    }
+    async listBranches(repoPath) {
+        const output = this.execGit(`git branch --list --all --format='%(refname:short)'`, repoPath);
+        return output
+            .split('\n')
+            .map((line) => line.trim())
+            .filter((line) => line.length > 0)
+            .map((branch) => {
+            // Remove 'origin/' prefix if present for remote branches
+            // This gives us both local and remote branch names in a consistent format
+            return branch.replace(/^remotes\/origin\//, '');
+        });
+    }
+    async getCurrentCommit(repoPath) {
+        const output = this.execGit('git rev-parse HEAD', repoPath);
+        return output.trim();
+    }
+    async getCurrentBranch(repoPath) {
+        try {
+            const output = this.execGit('git rev-parse --abbrev-ref HEAD', repoPath);
+            return output.trim();
+        }
+        catch (error) {
+            // If we can't get the branch (detached HEAD, etc.), return '(detached)'
+            return '(detached)';
+        }
+    }
+    async mergeBranch(repoPath, sourceBranch, options) {
+        const escapedBranch = this.escapeShellArg(sourceBranch);
+        try {
+            if (options?.squash) {
+                // Squash merge: git merge --squash <branch>
+                this.execGit(`git merge --squash ${escapedBranch}`, repoPath);
+                // For squash merges, we need to commit separately
+                const message = options.message || `Squash merge branch '${sourceBranch}'`;
+                const escapedMessage = this.escapeShellArg(message);
+                this.execGit(`git commit -m ${escapedMessage}`, repoPath);
+                const mergeCommit = await this.getCurrentCommit(repoPath);
+                return {
+                    success: true,
+                    mergeCommit,
+                    strategy: 'squash',
+                };
+            }
+            else {
+                // Regular merge: try fast-forward first, then regular merge
+                const sourceCommit = this.execGit(`git rev-parse ${escapedBranch}`, repoPath).trim();
+                // Check if current is an ancestor of source (fast-forward possible)
+                try {
+                    this.execGit(`git merge-base --is-ancestor HEAD ${escapedBranch}`, repoPath);
+                    // Fast-forward is possible
+                    this.execGit(`git merge --ff-only ${escapedBranch}`, repoPath);
+                    return {
+                        success: true,
+                        mergeCommit: sourceCommit,
+                        strategy: 'fast-forward',
+                    };
+                }
+                catch {
+                    // Fast-forward not possible, do a regular merge
+                    const message = options?.message || `Merge branch '${sourceBranch}'`;
+                    const escapedMessage = this.escapeShellArg(message);
+                    this.execGit(`git merge --no-ff -m ${escapedMessage} ${escapedBranch}`, repoPath);
+                    const mergeCommit = await this.getCurrentCommit(repoPath);
+                    return {
+                        success: true,
+                        mergeCommit,
+                        strategy: 'merge',
+                    };
+                }
+            }
+        }
+        catch (error) {
+            // Check if this is a merge conflict
+            const conflictingFiles = await this.getConflictingFiles(repoPath);
+            if (conflictingFiles.length > 0) {
+                return {
+                    success: false,
+                    strategy: options?.squash ? 'squash' : 'merge',
+                    conflictingFiles,
+                    error: `Merge conflict in ${conflictingFiles.length} file(s)`,
+                };
+            }
+            // Some other error
+            const message = error.message || 'Unknown merge error';
+            return {
+                success: false,
+                strategy: options?.squash ? 'squash' : 'merge',
+                error: message,
+            };
+        }
+    }
+    async abortMerge(repoPath) {
+        this.execGit('git merge --abort', repoPath);
+    }
+    async getConflictingFiles(repoPath) {
+        try {
+            const output = this.execGit('git diff --name-only --diff-filter=U', repoPath);
+            return output
+                .split('\n')
+                .map((line) => line.trim())
+                .filter((line) => line.length > 0);
+        }
+        catch {
+            // No conflicts or not in a merge state
+            return [];
+        }
+    }
+}
+//# sourceMappingURL=git-cli.js.map

package/node_modules/@sudocode-ai/local-server/dist/execution/worktree/git-cli.js.map

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