cluttry 1.0.3 → 1.5.0

package/dist/commands/finish.js

@@ -0,0 +1,817 @@
+/**
+ * cry finish command
+ *
+ * Show session summary and optionally create PR, cleanup worktree.
+ * Safe by default - never auto-merges, never deletes without confirmation.
+ */
+import { createInterface } from 'node:readline';
+import { execSync, spawnSync } from 'node:child_process';
+import { isGitRepo, getRepoRoot, getCurrentBranch, git, removeWorktree, deleteBranch, getDefaultBranch, getUpstreamBranch, } from '../lib/git.js';
+import { findSessionForCwd, findMainRepoRoot, deleteSession, } from '../lib/session.js';
+import * as out from '../lib/output.js';
+import { fail, errors, printError } from '../lib/errors.js';
+/**
+ * Parse git status --porcelain output
+ */
+function parseGitStatus(output) {
+    const lines = output.split('\n').filter(line => line.trim());
+    const staged = [];
+    const unstaged = [];
+    const untracked = [];
+    for (const line of lines) {
+        const index = line[0];
+        const worktree = line[1];
+        const file = line.slice(3);
+        if (index === '?' && worktree === '?') {
+            untracked.push(file);
+        }
+        else {
+            if (index !== ' ' && index !== '?') {
+                staged.push(file);
+            }
+            if (worktree !== ' ' && worktree !== '?') {
+                unstaged.push(file);
+            }
+        }
+    }
+    return {
+        staged,
+        unstaged,
+        untracked,
+        clean: staged.length === 0 && unstaged.length === 0 && untracked.length === 0,
+    };
+}
+/**
+ * Parse git diff --stat output
+ */
+function parseDiffStat(output) {
+    const lines = output.trim().split('\n');
+    if (lines.length === 0 || output.trim() === '') {
+        return { filesChanged: 0, insertions: 0, deletions: 0, summary: 'No changes' };
+    }
+    // Last line contains summary like: "5 files changed, 100 insertions(+), 20 deletions(-)"
+    const lastLine = lines[lines.length - 1];
+    const filesMatch = lastLine.match(/(\d+) files? changed/);
+    const insertMatch = lastLine.match(/(\d+) insertions?\(\+\)/);
+    const deleteMatch = lastLine.match(/(\d+) deletions?\(-\)/);
+    return {
+        filesChanged: filesMatch ? parseInt(filesMatch[1], 10) : 0,
+        insertions: insertMatch ? parseInt(insertMatch[1], 10) : 0,
+        deletions: deleteMatch ? parseInt(deleteMatch[1], 10) : 0,
+        summary: lastLine.trim() || 'No changes',
+    };
+}
+/**
+ * Get commits ahead/behind base branch
+ */
+function getCommitInfo(baseBranch, cwd) {
+    const commits = {
+        ahead: 0,
+        behind: 0,
+        list: [],
+    };
+    try {
+        // Get commits ahead (on this branch but not on base)
+        const aheadOutput = git(['rev-list', '--count', `${baseBranch}..HEAD`], cwd);
+        commits.ahead = parseInt(aheadOutput, 10) || 0;
+        // Get commits behind (on base but not on this branch)
+        const behindOutput = git(['rev-list', '--count', `HEAD..${baseBranch}`], cwd);
+        commits.behind = parseInt(behindOutput, 10) || 0;
+        // Get list of commits ahead
+        if (commits.ahead > 0) {
+            const logOutput = git(['log', '--oneline', '--no-decorate', `${baseBranch}..HEAD`], cwd);
+            commits.list = logOutput.split('\n').filter(line => line.trim()).map(line => {
+                const [sha, ...rest] = line.split(' ');
+                return { sha, message: rest.join(' ') };
+            });
+        }
+    }
+    catch {
+        // Base branch might not exist or be reachable
+    }
+    return commits;
+}
+/**
+ * Detect session info from git when no manifest is available
+ * Uses improved base branch detection via merge-base and upstream tracking
+ */
+function detectSessionFromGit(cwd) {
+    try {
+        const branch = getCurrentBranch(cwd);
+        if (!branch)
+            return null;
+        const repoRoot = getRepoRoot(cwd);
+        const mainRepoRoot = findMainRepoRoot(cwd);
+        // Determine base branch with fallback chain:
+        // 1. Upstream tracking branch (e.g., origin/main)
+        // 2. Default branch from origin/HEAD
+        // 3. 'main' or 'master' if they exist
+        // 4. Current branch as last resort
+        let baseBranch = null;
+        // Try upstream tracking branch
+        const upstream = getUpstreamBranch(cwd);
+        if (upstream) {
+            // Extract branch name from origin/branch format
+            const upstreamBranch = upstream.replace(/^origin\//, '');
+            // Verify it's a different branch
+            if (upstreamBranch !== branch) {
+                baseBranch = upstreamBranch;
+            }
+        }
+        // Try default branch
+        if (!baseBranch) {
+            const defaultBranch = getDefaultBranch(cwd);
+            if (defaultBranch && defaultBranch !== branch) {
+                baseBranch = defaultBranch;
+            }
+        }
+        // Try common branch names
+        if (!baseBranch) {
+            for (const candidate of ['main', 'master', 'develop']) {
+                try {
+                    git(['rev-parse', '--verify', `refs/heads/${candidate}`], cwd);
+                    if (candidate !== branch) {
+                        baseBranch = candidate;
+                        break;
+                    }
+                }
+                catch {
+                    // Branch doesn't exist, try next
+                }
+            }
+        }
+        // Last resort: use current branch (no comparison possible)
+        if (!baseBranch) {
+            baseBranch = branch;
+        }
+        return {
+            branch,
+            baseBranch,
+            worktreePath: repoRoot,
+            repoRoot: mainRepoRoot ?? repoRoot,
+        };
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Build session summary
+ */
+function buildSummary(session, sessionId) {
+    const cwd = session.worktreePath;
+    const baseBranch = session.baseBranch ?? 'main';
+    // Get git status
+    let statusOutput = '';
+    try {
+        statusOutput = git(['status', '--porcelain'], cwd);
+    }
+    catch {
+        // Ignore errors
+    }
+    // Get diff stat against base branch
+    let diffOutput = '';
+    try {
+        diffOutput = git(['diff', '--stat', baseBranch], cwd);
+    }
+    catch {
+        // Base branch might not exist
+    }
+    return {
+        branch: session.branch,
+        baseBranch,
+        worktreePath: session.worktreePath,
+        repoRoot: session.repoRoot,
+        sessionId,
+        status: parseGitStatus(statusOutput),
+        diff: parseDiffStat(diffOutput),
+        commits: getCommitInfo(baseBranch, cwd),
+    };
+}
+/**
+ * Print summary in human-readable format
+ */
+function printSummary(summary) {
+    out.header('Session Summary');
+    out.newline();
+    // Basic info
+    out.log(`  Branch:      ${out.fmt.branch(summary.branch)}`);
+    out.log(`  Base:        ${out.fmt.branch(summary.baseBranch)}`);
+    out.log(`  Worktree:    ${out.fmt.path(summary.worktreePath)}`);
+    if (summary.sessionId) {
+        out.log(`  Session ID:  ${out.fmt.dim(summary.sessionId)}`);
+    }
+    out.newline();
+    // Status
+    out.log(out.fmt.bold('Working Tree Status:'));
+    if (summary.status.clean) {
+        out.log(`  ${out.fmt.green('✓')} Clean`);
+    }
+    else {
+        if (summary.status.staged.length > 0) {
+            out.log(`  ${out.fmt.green('Staged:')} ${summary.status.staged.length} file(s)`);
+            for (const file of summary.status.staged.slice(0, 5)) {
+                out.log(`    ${out.fmt.green('+')} ${file}`);
+            }
+            if (summary.status.staged.length > 5) {
+                out.log(`    ${out.fmt.dim(`... and ${summary.status.staged.length - 5} more`)}`);
+            }
+        }
+        if (summary.status.unstaged.length > 0) {
+            out.log(`  ${out.fmt.yellow('Modified:')} ${summary.status.unstaged.length} file(s)`);
+            for (const file of summary.status.unstaged.slice(0, 5)) {
+                out.log(`    ${out.fmt.yellow('~')} ${file}`);
+            }
+            if (summary.status.unstaged.length > 5) {
+                out.log(`    ${out.fmt.dim(`... and ${summary.status.unstaged.length - 5} more`)}`);
+            }
+        }
+        if (summary.status.untracked.length > 0) {
+            out.log(`  ${out.fmt.gray('Untracked:')} ${summary.status.untracked.length} file(s)`);
+            for (const file of summary.status.untracked.slice(0, 3)) {
+                out.log(`    ${out.fmt.gray('?')} ${file}`);
+            }
+            if (summary.status.untracked.length > 3) {
+                out.log(`    ${out.fmt.dim(`... and ${summary.status.untracked.length - 3} more`)}`);
+            }
+        }
+    }
+    out.newline();
+    // Diff stats
+    out.log(out.fmt.bold(`Changes vs ${summary.baseBranch}:`));
+    if (summary.diff.filesChanged === 0 && summary.commits.ahead === 0) {
+        out.log(`  ${out.fmt.dim('No changes')}`);
+    }
+    else {
+        out.log(`  ${summary.diff.summary}`);
+    }
+    out.newline();
+    // Commits
+    out.log(out.fmt.bold('Commits:'));
+    if (summary.commits.ahead === 0 && summary.commits.behind === 0) {
+        out.log(`  ${out.fmt.dim('Up to date with')} ${summary.baseBranch}`);
+    }
+    else {
+        if (summary.commits.ahead > 0) {
+            out.log(`  ${out.fmt.green(`↑ ${summary.commits.ahead}`)} ahead of ${summary.baseBranch}`);
+            for (const commit of summary.commits.list.slice(0, 5)) {
+                out.log(`    ${out.fmt.dim(commit.sha)} ${commit.message}`);
+            }
+            if (summary.commits.list.length > 5) {
+                out.log(`    ${out.fmt.dim(`... and ${summary.commits.list.length - 5} more`)}`);
+            }
+        }
+        if (summary.commits.behind > 0) {
+            out.log(`  ${out.fmt.yellow(`↓ ${summary.commits.behind}`)} behind ${summary.baseBranch}`);
+        }
+    }
+    out.newline();
+}
+/**
+ * Interactive prompt with choices
+ */
+async function promptChoice(message, choices) {
+    const rl = createInterface({
+        input: process.stdin,
+        output: process.stdout,
+    });
+    out.log(message);
+    for (const choice of choices) {
+        out.log(`  ${out.fmt.bold(choice.key)}) ${choice.label}`);
+    }
+    return new Promise((resolve) => {
+        rl.question('Choice: ', (answer) => {
+            rl.close();
+            const match = choices.find(c => c.key.toLowerCase() === answer.toLowerCase());
+            if (match) {
+                resolve(match.value);
+            }
+            else {
+                // Default to first choice or abort
+                resolve(choices.find(c => c.value === 'abort')?.value ?? choices[0].value);
+            }
+        });
+    });
+}
+/**
+ * Prompt for text input
+ */
+async function promptText(message, defaultValue) {
+    const rl = createInterface({
+        input: process.stdin,
+        output: process.stdout,
+    });
+    const prompt = defaultValue
+        ? `${message} [${defaultValue}]: `
+        : `${message}: `;
+    return new Promise((resolve) => {
+        rl.question(prompt, (answer) => {
+            rl.close();
+            resolve(answer.trim() || defaultValue || '');
+        });
+    });
+}
+/**
+ * Simple yes/no confirmation
+ */
+async function confirm(message) {
+    const rl = createInterface({
+        input: process.stdin,
+        output: process.stdout,
+    });
+    return new Promise((resolve) => {
+        rl.question(`${message} [y/N] `, (answer) => {
+            rl.close();
+            resolve(answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes');
+        });
+    });
+}
+/**
+ * Check if gh CLI is installed and authenticated
+ */
+function isGhAvailable() {
+    try {
+        const result = spawnSync('gh', ['auth', 'status'], {
+            encoding: 'utf-8',
+            stdio: 'pipe',
+        });
+        return result.status === 0;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Check if repo has an origin remote
+ */
+function hasOriginRemote(cwd) {
+    try {
+        const remotes = git(['remote'], cwd);
+        return remotes.split('\n').some(r => r.trim() === 'origin');
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Push branch to origin
+ */
+function pushToOrigin(branch, cwd) {
+    try {
+        git(['push', '-u', 'origin', branch], cwd);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Check if branch is pushed to origin
+ */
+function isBranchPushed(branch, cwd) {
+    try {
+        git(['rev-parse', `origin/${branch}`], cwd);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Create PR using gh CLI
+ */
+function createPullRequest(branch, baseBranch, cwd) {
+    try {
+        const result = spawnSync('gh', ['pr', 'create', '--base', baseBranch, '--head', branch, '--fill'], {
+            cwd,
+            encoding: 'utf-8',
+            stdio: 'pipe',
+        });
+        if (result.status === 0) {
+            const url = result.stdout.trim().split('\n').pop() || '';
+            return { success: true, url };
+        }
+        else {
+            return { success: false, error: result.stderr || 'Unknown error' };
+        }
+    }
+    catch (error) {
+        return { success: false, error: error.message };
+    }
+}
+/**
+ * Show git diff in pager
+ */
+function showDiff(cwd) {
+    try {
+        execSync('git diff', {
+            cwd,
+            stdio: 'inherit',
+        });
+    }
+    catch {
+        // User may have quit pager
+    }
+}
+/**
+ * Generate a default commit message from branch name
+ * feature/add-login -> Add login
+ * fix-auth-bug -> Fix auth bug
+ * feat-oauth -> Feat oauth
+ */
+function generateDefaultMessage(branch) {
+    // Remove common prefixes
+    let message = branch
+        .replace(/^(feature|feat|fix|bugfix|hotfix|chore|refactor|docs|test|ci)[\/\-]/i, '')
+        .replace(/[-_]/g, ' ')
+        .trim();
+    // Capitalize first letter
+    if (message.length > 0) {
+        message = message.charAt(0).toUpperCase() + message.slice(1);
+    }
+    return message || branch;
+}
+/**
+ * Stage all changes
+ */
+function stageAll(cwd) {
+    try {
+        git(['add', '-A'], cwd);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Create a commit with the given message
+ */
+function createCommit(message, cwd) {
+    try {
+        git(['commit', '-m', message], cwd);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Check if there are staged changes
+ */
+function hasStagedChanges(cwd) {
+    try {
+        const output = git(['diff', '--cached', '--name-only'], cwd);
+        return output.trim().length > 0;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Full commit wizard with staging options
+ *
+ * Returns true if commit was successful, false if aborted/failed
+ */
+async function runCommitWizard(cwd, branch, status, providedMessage) {
+    const hasStaged = status.staged.length > 0;
+    const hasUnstaged = status.unstaged.length > 0 || status.untracked.length > 0;
+    // Non-interactive mode with provided message
+    if (providedMessage) {
+        out.log('Staging all changes...');
+        if (!stageAll(cwd)) {
+            out.error('Failed to stage changes.');
+            return false;
+        }
+        out.log(`Committing with message: "${providedMessage}"`);
+        if (!createCommit(providedMessage, cwd)) {
+            out.error('Failed to create commit.');
+            return false;
+        }
+        out.success('Commit created');
+        return true;
+    }
+    // Interactive mode
+    out.newline();
+    out.header('Commit Wizard');
+    out.newline();
+    // Show current state
+    if (hasStaged) {
+        out.log(`  ${out.fmt.green('Staged:')} ${status.staged.length} file(s)`);
+    }
+    if (hasUnstaged) {
+        out.log(`  ${out.fmt.yellow('Unstaged:')} ${status.unstaged.length + status.untracked.length} file(s)`);
+    }
+    out.newline();
+    // Build choices based on current state
+    const choices = [];
+    if (hasUnstaged) {
+        choices.push({ key: 'a', label: 'Stage all changes and commit', value: 'stage-all' });
+    }
+    if (hasStaged) {
+        choices.push({ key: 's', label: 'Commit only staged changes', value: 'staged-only' });
+    }
+    choices.push({ key: 'x', label: 'Abort', value: 'abort' });
+    // If nothing staged and nothing unstaged, nothing to do
+    if (!hasStaged && !hasUnstaged) {
+        out.log(out.fmt.dim('Nothing to commit.'));
+        return true;
+    }
+    const action = await promptChoice('How would you like to commit?', choices);
+    if (action === 'abort') {
+        out.log('Commit aborted.');
+        return false;
+    }
+    // Stage if needed
+    if (action === 'stage-all') {
+        out.log('Staging all changes...');
+        if (!stageAll(cwd)) {
+            out.error('Failed to stage changes.');
+            return false;
+        }
+    }
+    // Verify we have something to commit
+    if (!hasStagedChanges(cwd)) {
+        out.warn('No changes staged for commit.');
+        return false;
+    }
+    // Get commit message
+    const defaultMessage = generateDefaultMessage(branch);
+    const message = await promptText('Commit message', defaultMessage);
+    if (!message) {
+        out.warn('Empty commit message. Aborting.');
+        return false;
+    }
+    // Create commit
+    out.log('Creating commit...');
+    if (!createCommit(message, cwd)) {
+        out.error('Failed to create commit.');
+        return false;
+    }
+    out.success('Commit created');
+    return true;
+}
+/**
+ * Print manual PR instructions when gh is not available
+ */
+function printManualInstructions(summary) {
+    out.newline();
+    out.header('Manual PR Instructions');
+    out.newline();
+    const { branch, baseBranch, worktreePath } = summary;
+    out.log('GitHub CLI (gh) is not available. To create a PR manually:');
+    out.newline();
+    if (!isBranchPushed(branch, worktreePath)) {
+        out.log(`  1. Push your branch:`);
+        out.log(`     ${out.fmt.dim(`git push -u origin ${branch}`)}`);
+        out.newline();
+    }
+    out.log(`  2. Create a PR on GitHub:`);
+    out.log(`     ${out.fmt.dim(`https://github.com/<owner>/<repo>/compare/${baseBranch}...${branch}`)}`);
+    out.newline();
+    out.log(`  Or install gh CLI:`);
+    out.log(`     ${out.fmt.dim('brew install gh && gh auth login')}`);
+    out.newline();
+}
+/**
+ * Perform cleanup: remove worktree, optionally delete branch and session
+ */
+async function performCleanup(summary, options, dryRun) {
+    const { branch, worktreePath, repoRoot, sessionId } = summary;
+    if (dryRun) {
+        out.log(out.fmt.dim('[dry-run] Would remove worktree:') + ` ${worktreePath}`);
+        if (options.deleteBranch) {
+            out.log(out.fmt.dim('[dry-run] Would delete branch:') + ` ${branch}`);
+        }
+        if (sessionId) {
+            out.log(out.fmt.dim('[dry-run] Would delete session:') + ` ${sessionId}`);
+        }
+        return true;
+    }
+    // Remove worktree
+    out.log(`Removing worktree: ${out.fmt.path(worktreePath)}`);
+    try {
+        removeWorktree(worktreePath, false, repoRoot);
+        out.success('Worktree removed');
+    }
+    catch (error) {
+        out.error(`Failed to remove worktree: ${error.message}`);
+        return false;
+    }
+    // Delete branch if requested
+    if (options.deleteBranch) {
+        const currentBranch = getCurrentBranch(repoRoot);
+        if (branch === currentBranch) {
+            out.warn(`Cannot delete branch '${branch}' - it's currently checked out.`);
+        }
+        else {
+            out.log(`Deleting branch: ${out.fmt.branch(branch)}`);
+            try {
+                deleteBranch(branch, false, repoRoot);
+                out.success('Branch deleted');
+            }
+            catch (error) {
+                out.warn(`Failed to delete branch: ${error.message}`);
+            }
+        }
+    }
+    // Delete session manifest
+    if (sessionId) {
+        if (deleteSession(repoRoot, sessionId)) {
+            out.success('Session manifest removed');
+        }
+    }
+    return true;
+}
+export async function finish(options) {
+    const cwd = process.cwd();
+    // Check if we're in a git repo
+    if (!isGitRepo(cwd)) {
+        if (options.json) {
+            console.log(JSON.stringify({ error: 'Not a git repository' }));
+            process.exit(1);
+        }
+        fail(errors.notGitRepo());
+    }
+    // Try to find session manifest first
+    let session = findSessionForCwd(cwd);
+    let sessionId = null;
+    if (session) {
+        sessionId = session.id;
+    }
+    else {
+        // Fallback to git introspection
+        const detected = detectSessionFromGit(cwd);
+        if (!detected) {
+            if (options.json) {
+                console.log(JSON.stringify({ error: 'Could not detect session info' }));
+                process.exit(1);
+            }
+            fail(errors.sessionNotFound('current directory'));
+        }
+        session = detected;
+    }
+    // Build summary
+    let summary = buildSummary(session, sessionId);
+    // JSON mode - just output and exit
+    if (options.json) {
+        console.log(JSON.stringify(summary, null, 2));
+        return;
+    }
+    // Print summary
+    printSummary(summary);
+    const isDirty = !summary.status.clean;
+    const hasCommits = summary.commits.ahead > 0;
+    const dryRun = options.dryRun ?? false;
+    // Handle dirty state
+    if (isDirty) {
+        // Skip commit entirely if --skip-commit is set
+        if (options.skipCommit) {
+            out.log(out.fmt.dim('Skipping commit (--skip-commit).'));
+        }
+        else if (options.message) {
+            // Non-interactive commit with provided message
+            if (dryRun) {
+                out.log(out.fmt.dim(`[dry-run] Would stage all and commit with message: "${options.message}"`));
+            }
+            else {
+                const success = await runCommitWizard(cwd, summary.branch, summary.status, options.message);
+                if (!success) {
+                    out.error('Commit failed.');
+                    process.exit(1);
+                }
+                // Refresh summary
+                summary = buildSummary(session, sessionId);
+            }
+        }
+        else if (options.nonInteractive) {
+            if (options.allowDirty) {
+                out.warn('Working tree is dirty. Proceeding with --allow-dirty.');
+            }
+            else {
+                out.error('Working tree has uncommitted changes.');
+                out.info('Use --allow-dirty to proceed anyway, --message to commit, or --skip-commit to bypass.');
+                process.exit(1);
+            }
+        }
+        else {
+            // Interactive dirty handling
+            const action = await promptChoice('Working tree has uncommitted changes. What would you like to do?', [
+                { key: 'd', label: 'View diff', value: 'diff' },
+                { key: 'c', label: 'Commit changes', value: 'commit' },
+                { key: 'a', label: 'Abort', value: 'abort' },
+            ]);
+            if (action === 'diff') {
+                showDiff(cwd);
+                out.newline();
+                // After viewing diff, ask again
+                const nextAction = await promptChoice('What next?', [
+                    { key: 'c', label: 'Commit changes', value: 'commit' },
+                    { key: 'a', label: 'Abort', value: 'abort' },
+                ]);
+                if (nextAction === 'abort') {
+                    out.log('Aborted.');
+                    process.exit(0);
+                }
+                // Run commit wizard
+                const success = await runCommitWizard(cwd, summary.branch, summary.status);
+                if (!success) {
+                    out.error('Commit failed or was cancelled.');
+                    process.exit(1);
+                }
+                // Refresh summary
+                summary = buildSummary(session, sessionId);
+            }
+            else if (action === 'commit') {
+                const success = await runCommitWizard(cwd, summary.branch, summary.status);
+                if (!success) {
+                    out.error('Commit failed or was cancelled.');
+                    process.exit(1);
+                }
+                // Refresh summary
+                summary = buildSummary(session, sessionId);
+            }
+            else {
+                out.log('Aborted.');
+                process.exit(0);
+            }
+        }
+    }
+    // Check for commits to create PR
+    const updatedHasCommits = summary.commits.ahead > 0 || hasCommits;
+    const ghAvailable = isGhAvailable();
+    const hasOrigin = hasOriginRemote(cwd);
+    const canCreatePr = ghAvailable && hasOrigin;
+    if (updatedHasCommits || options.pr) {
+        out.newline();
+        if (dryRun) {
+            out.log(out.fmt.dim('[dry-run] Would push branch and create PR'));
+        }
+        else if (canCreatePr) {
+            // Push if needed
+            if (!isBranchPushed(summary.branch, cwd)) {
+                out.log(`Pushing branch: ${out.fmt.branch(summary.branch)}`);
+                if (!pushToOrigin(summary.branch, cwd)) {
+                    fail(errors.pushFailed(summary.branch));
+                }
+                out.success('Branch pushed');
+            }
+            // Create PR
+            out.log('Creating pull request...');
+            const prResult = createPullRequest(summary.branch, summary.baseBranch, cwd);
+            if (prResult.success) {
+                out.success(`PR created: ${prResult.url}`);
+            }
+            else {
+                // PR might already exist
+                if (prResult.error?.includes('already exists')) {
+                    out.info('A pull request already exists for this branch.');
+                }
+                else {
+                    out.warn(`Could not create PR: ${prResult.error}`);
+                }
+            }
+        }
+        else if (!ghAvailable) {
+            printManualInstructions(summary);
+            // Exit 0 as requested - not an error
+            process.exit(0);
+        }
+        else if (!hasOrigin) {
+            printError(errors.noRemoteConfigured());
+        }
+    }
+    else {
+        out.log(out.fmt.dim('No commits to push.'));
+    }
+    // Cleanup prompt
+    if (options.noCleanup) {
+        // Skip cleanup entirely
+        out.newline();
+        out.success('Done (cleanup skipped)');
+        return;
+    }
+    if (options.cleanup) {
+        // Auto cleanup
+        out.newline();
+        await performCleanup(summary, options, dryRun);
+        out.newline();
+        out.success('Done');
+        return;
+    }
+    // Interactive cleanup prompt
+    if (!options.nonInteractive) {
+        out.newline();
+        const shouldCleanup = await confirm('Remove worktree and clean up?');
+        if (shouldCleanup) {
+            let deleteBranchChoice = options.deleteBranch ?? false;
+            if (!deleteBranchChoice) {
+                deleteBranchChoice = await confirm('Also delete the branch?');
+            }
+            const cleanupOpts = { ...options, deleteBranch: deleteBranchChoice };
+            await performCleanup(summary, cleanupOpts, dryRun);
+        }
+    }
+    out.newline();
+    out.success('Done');
+}
+//# sourceMappingURL=finish.js.map