@proletariat/cli 0.3.90 → 0.3.92

package/dist/commands/work/index.js

@@ -33,6 +33,7 @@ export default class Work extends PMOCommand {
             { id: 'status', name: 'Status — view in-progress tickets', command: `prlt work status -P ${projectId} --json` },
             { id: 'spawn', name: 'Spawn — batch by column', command: `prlt work spawn -P ${projectId} --json` },
             { id: 'ready', name: 'Ready — mark work ready for review', command: `prlt work ready -P ${projectId} --json` },
+            { id: 'ship', name: 'Ship — rebase, merge PR, move to Done', command: `prlt work ship -P ${projectId} --json` },
             { id: 'complete', name: 'Complete — mark work done', command: `prlt work complete -P ${projectId} --json` },
             { id: 'hooks', name: 'Hooks — manage lifecycle hooks', command: 'prlt work hooks --json' },
             { id: 'cancel', name: 'Cancel', command: '' },
@@ -85,6 +86,9 @@ export default class Work extends PMOCommand {
             case 'ready':
                 await this.config.runCommand('work:ready', projectArgs);
                 break;
+            case 'ship':
+                await this.config.runCommand('work:ship', projectArgs);
+                break;
             case 'complete':
                 await this.config.runCommand('work:complete', projectArgs);
                 break;

package/dist/commands/work/index.js.map

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

package/dist/commands/work/ship.d.ts

@@ -0,0 +1,43 @@
+import { PMOCommand } from '../../lib/pmo/index.js';
+export default class WorkShip extends PMOCommand {
+    static description: string;
+    static examples: string[];
+    static args: {
+        ticketId: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
+    };
+    static flags: {
+        pr: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        method: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        wait: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'no-rebase': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'delete-branch': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        admin: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        machine: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        project: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+    };
+    execute(): Promise<void>;
+    /**
+     * Resolve the linked ticket for a PR.
+     */
+    private resolveLinkedTicket;
+    /**
+     * Wait for CI checks to pass. Returns immediately if all passed.
+     * If --wait is set, polls until all complete. Otherwise warns on pending.
+     */
+    private waitForCI;
+    /**
+     * Check if the PR has merge conflicts with the base branch.
+     */
+    private checkMergeConflicts;
+    /**
+     * Rebase the PR branch onto the base branch and force-push.
+     */
+    private rebaseOntoBase;
+    /**
+     * Resolve the working directory for git operations.
+     * Tries: devcontainer repo dirs, execution worktree, agent dirs.
+     */
+    private resolveWorktreePath;
+}

package/dist/commands/work/ship.js

@@ -0,0 +1,587 @@
+import { Args, Flags } from '@oclif/core';
+import * as path from 'node:path';
+import * as fs from 'node:fs';
+import Database from 'better-sqlite3';
+import { PMOCommand, pmoBaseFlags, autoExportToBoard } from '../../lib/pmo/index.js';
+import { getWorkColumnSetting, findColumnByName } from '../../lib/pmo/utils.js';
+import { styles } from '../../lib/styles.js';
+import { getWorkspaceInfo } from '../../lib/agents/commands.js';
+import { ExecutionStorage } from '../../lib/execution/storage.js';
+import { isGHInstalled, isGHAuthenticated, getPRByNumber, getPRForBranch, getPRChecks, mergePR, getGitHubRepo, } from '../../lib/pr/index.js';
+import { shouldOutputJson, outputErrorAsJson, outputSuccessAsJson, createMetadata, } from '../../lib/prompt-json.js';
+import { getEventBus } from '../../lib/events/event-bus.js';
+import { validateBranchName } from '../../lib/branch/index.js';
+import { PMO_TABLES } from '../../lib/pmo/schema.js';
+import { execSync } from 'node:child_process';
+/**
+ * Sleep for the given number of milliseconds.
+ */
+function sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+export default class WorkShip extends PMOCommand {
+    static description = 'Ship work: rebase, merge PR, and move ticket to Done';
+    static examples = [
+        '<%= config.bin %> <%= command.id %> TKT-001',
+        '<%= config.bin %> <%= command.id %> PRLT-1092',
+        '<%= config.bin %> <%= command.id %> --pr 929',
+        '<%= config.bin %> <%= command.id %> TKT-001 --dry-run',
+        '<%= config.bin %> <%= command.id %> TKT-001 --wait',
+        '<%= config.bin %> <%= command.id %> TKT-001 --no-rebase',
+    ];
+    static args = {
+        ticketId: Args.string({
+            description: 'Ticket ID - prompts with dropdown if not provided',
+            required: false,
+        }),
+    };
+    static flags = {
+        ...pmoBaseFlags,
+        pr: Flags.integer({
+            description: 'PR number to merge (alternative to ticket ID lookup)',
+            required: false,
+        }),
+        method: Flags.string({
+            description: 'Merge method',
+            options: ['merge', 'squash', 'rebase'],
+            default: 'squash',
+        }),
+        wait: Flags.boolean({
+            description: 'Wait for CI to go green before merging',
+            default: false,
+        }),
+        'no-rebase': Flags.boolean({
+            description: 'Fail on conflicts instead of auto-rebasing',
+            default: false,
+        }),
+        'dry-run': Flags.boolean({
+            description: 'Show what would happen without doing it',
+            default: false,
+        }),
+        'delete-branch': Flags.boolean({
+            description: 'Delete remote branch after merging',
+            default: true,
+            allowNo: true,
+        }),
+        admin: Flags.boolean({
+            description: 'Use admin privileges to bypass branch protections',
+            default: false,
+        }),
+    };
+    async execute() {
+        const { args, flags } = await this.parse(WorkShip);
+        const projectId = flags.project;
+        const jsonMode = shouldOutputJson(flags);
+        const handleError = (code, message) => {
+            if (jsonMode) {
+                outputErrorAsJson(code, message, createMetadata('work ship', flags));
+                return;
+            }
+            this.error(message);
+        };
+        // Check gh CLI
+        if (!isGHInstalled()) {
+            return handleError('GH_NOT_INSTALLED', 'GitHub CLI (gh) is not installed. Install it from https://cli.github.com/');
+        }
+        if (!isGHAuthenticated()) {
+            return handleError('GH_NOT_AUTHENTICATED', 'GitHub CLI is not authenticated. Run "gh auth login" first.');
+        }
+        // Get workspace info
+        let workspaceInfo;
+        try {
+            workspaceInfo = getWorkspaceInfo();
+        }
+        catch {
+            return handleError('NOT_IN_WORKSPACE', 'Not in a workspace. Run "prlt new" first.');
+        }
+        const dbPath = path.join(workspaceInfo.path, '.proletariat', 'workspace.db');
+        const db = new Database(dbPath);
+        const executionStorage = new ExecutionStorage(db);
+        try {
+            // --- Step 1: Resolve ticket and PR ---
+            let ticketId = args.ticketId;
+            let prNumber = flags.pr;
+            let ticket = null;
+            let prInfo = null;
+            if (prNumber) {
+                // PR number provided directly — find the PR, then resolve the ticket
+                prInfo = getPRByNumber(prNumber);
+                if (!prInfo) {
+                    db.close();
+                    return handleError('PR_NOT_FOUND', `PR #${prNumber} not found.`);
+                }
+                // Try to resolve the linked ticket
+                ticket = await this.resolveLinkedTicket(prNumber, prInfo.headBranch, projectId);
+                if (ticket) {
+                    ticketId = ticket.id;
+                }
+            }
+            else {
+                // Resolve ticket first
+                if (!ticketId) {
+                    // Prompt for ticket selection from shippable tickets (in review or in progress)
+                    const allTickets = await this.storage.listTickets(projectId);
+                    const shippableTickets = allTickets.filter(t => t.statusCategory === 'started' ||
+                        (t.statusName && (t.statusName.toLowerCase().includes('progress') ||
+                            t.statusName.toLowerCase().includes('review'))));
+                    if (shippableTickets.length === 0) {
+                        db.close();
+                        if (jsonMode) {
+                            outputErrorAsJson('NO_SHIPPABLE_WORK', 'No in-progress or in-review work found.', createMetadata('work ship', flags));
+                            return;
+                        }
+                        this.log(styles.info('No in-progress or in-review work found.'));
+                        return;
+                    }
+                    const selected = await this.selectFromList({
+                        message: 'Select work to ship:',
+                        items: shippableTickets,
+                        getName: (t) => `${t.id} - ${t.title} (${t.statusName})`,
+                        getValue: (t) => t.id,
+                        getCommand: (t) => `prlt work ship ${t.id} --json`,
+                        jsonMode: jsonMode ? { flags, commandName: 'work ship' } : null,
+                    });
+                    if (!selected) {
+                        db.close();
+                        return;
+                    }
+                    ticketId = selected;
+                }
+                // Get ticket
+                ticket = await this.storage.getTicket(ticketId);
+                if (!ticket) {
+                    db.close();
+                    return handleError('TICKET_NOT_FOUND', `Ticket "${ticketId}" not found.`);
+                }
+                ticketId = ticket.id;
+                // Find PR from ticket metadata or branch
+                prNumber = ticket.metadata?.pr_number ? parseInt(ticket.metadata.pr_number, 10) : undefined;
+                if (prNumber) {
+                    prInfo = getPRByNumber(prNumber);
+                }
+                if (!prInfo) {
+                    // Try to find PR from execution branch
+                    const runningExecution = executionStorage.getRunningExecution(ticketId);
+                    const branch = runningExecution?.branch || ticket.branch;
+                    if (branch) {
+                        prInfo = getPRForBranch(branch);
+                        if (prInfo) {
+                            prNumber = prInfo.number;
+                        }
+                    }
+                }
+                if (!prInfo || !prNumber) {
+                    db.close();
+                    return handleError('NO_PR_FOUND', `No pull request found for ticket "${ticketId}". Create one with "prlt work ready ${ticketId} --pr".`);
+                }
+            }
+            // Validate PR state
+            if (prInfo.state === 'MERGED') {
+                db.close();
+                if (jsonMode) {
+                    outputSuccessAsJson({ alreadyMerged: true, prNumber, title: prInfo.title, ticketId: ticketId ?? null }, createMetadata('work ship', flags));
+                    return;
+                }
+                this.log(styles.info(`PR #${prNumber} is already merged.`));
+                return;
+            }
+            if (prInfo.state === 'CLOSED') {
+                db.close();
+                return handleError('PR_CLOSED', `PR #${prNumber} is closed. Reopen it first.`);
+            }
+            // Resolve the working directory for git operations
+            const cwd = this.resolveWorktreePath(workspaceInfo, executionStorage, ticketId);
+            // --- Dry run summary ---
+            if (flags['dry-run']) {
+                this.log('');
+                this.log(styles.info('Dry run — no changes will be made:'));
+                this.log('');
+                this.log(styles.muted(`   PR:      #${prNumber} — ${prInfo.title}`));
+                this.log(styles.muted(`   Branch:  ${prInfo.headBranch} → ${prInfo.baseBranch}`));
+                this.log(styles.muted(`   Method:  ${flags.method}`));
+                if (ticketId) {
+                    this.log(styles.muted(`   Ticket:  ${ticketId}${ticket ? ` — ${ticket.title}` : ''}`));
+                }
+                // Check CI
+                const checks = getPRChecks(prNumber, cwd);
+                if (checks.length > 0) {
+                    const allPassed = checks.every(c => c.conclusion === 'SUCCESS' || c.conclusion === 'SKIPPED');
+                    const pending = checks.filter(c => !c.conclusion || c.status === 'IN_PROGRESS' || c.status === 'QUEUED');
+                    const failed = checks.filter(c => c.conclusion === 'FAILURE');
+                    if (allPassed) {
+                        this.log(styles.muted(`   CI:      All checks passed (${checks.length})`));
+                    }
+                    else if (pending.length > 0) {
+                        this.log(styles.muted(`   CI:      ${pending.length} pending, ${failed.length} failed`));
+                    }
+                    else {
+                        this.log(styles.muted(`   CI:      ${failed.length} failed`));
+                    }
+                }
+                else {
+                    this.log(styles.muted(`   CI:      No checks configured`));
+                }
+                // Check conflicts
+                const hasConflicts = this.checkMergeConflicts(prNumber, cwd);
+                this.log(styles.muted(`   Conflicts: ${hasConflicts ? 'Yes — would rebase' : 'None'}`));
+                this.log('');
+                this.log(styles.muted('   Actions that would be taken:'));
+                if (hasConflicts && !flags['no-rebase']) {
+                    this.log(styles.muted('   1. Rebase onto base branch and force-push'));
+                    this.log(styles.muted('   2. Wait for CI to rerun'));
+                }
+                this.log(styles.muted(`   ${hasConflicts && !flags['no-rebase'] ? '3' : '1'}. Squash merge PR #${prNumber}`));
+                if (ticketId) {
+                    this.log(styles.muted(`   ${hasConflicts && !flags['no-rebase'] ? '4' : '2'}. Move ticket ${ticketId} to Done`));
+                }
+                if (flags['delete-branch']) {
+                    this.log(styles.muted(`   ${hasConflicts && !flags['no-rebase'] ? '5' : '3'}. Delete remote branch ${prInfo.headBranch}`));
+                }
+                db.close();
+                return;
+            }
+            // --- Step 2: Check CI status ---
+            this.log('');
+            this.log(styles.info(`Shipping PR #${prNumber}: ${prInfo.title}`));
+            const ciResult = await this.waitForCI(prNumber, flags.wait, cwd);
+            if (!ciResult.passed) {
+                db.close();
+                return handleError('CI_FAILED', ciResult.message);
+            }
+            // --- Step 3: Check for merge conflicts and rebase if needed ---
+            const hasConflicts = this.checkMergeConflicts(prNumber, cwd);
+            if (hasConflicts) {
+                if (flags['no-rebase']) {
+                    db.close();
+                    return handleError('MERGE_CONFLICTS', `PR #${prNumber} has merge conflicts. Resolve them manually or run without --no-rebase to auto-rebase.`);
+                }
+                this.log(styles.muted('   Merge conflicts detected, rebasing...'));
+                const rebaseResult = this.rebaseOntoBase(prInfo.headBranch, prInfo.baseBranch, cwd);
+                if (!rebaseResult.success) {
+                    db.close();
+                    return handleError('REBASE_FAILED', `Rebase failed: ${rebaseResult.error}. Resolve conflicts manually.`);
+                }
+                this.log(styles.muted('   Rebased and force-pushed. Waiting for CI...'));
+                // Wait for CI to rerun after rebase
+                const postRebaseCI = await this.waitForCI(prNumber, true, cwd);
+                if (!postRebaseCI.passed) {
+                    db.close();
+                    return handleError('CI_FAILED_AFTER_REBASE', postRebaseCI.message);
+                }
+            }
+            // --- Step 4: Merge the PR ---
+            const method = flags.method;
+            this.log(styles.muted(`   Merging PR #${prNumber} (${method})...`));
+            const mergeResult = mergePR(prNumber, {
+                method,
+                deleteBranch: flags['delete-branch'],
+                admin: flags.admin,
+                cwd,
+            });
+            if (!mergeResult.success) {
+                db.close();
+                return handleError('MERGE_FAILED', `Failed to merge PR #${prNumber}: ${mergeResult.error}`);
+            }
+            this.log(styles.success(`   PR #${prNumber} merged`));
+            // --- Step 5: Move ticket to Done ---
+            let ticketMovedToDone = false;
+            let ticketTransitionProvider;
+            let previousColumn;
+            let doneColumn;
+            if (ticket && ticketId) {
+                // Update PR metadata
+                await this.storage.updateTicket(ticketId, {
+                    metadata: {
+                        ...ticket.metadata,
+                        pr_state: 'MERGED',
+                        merged_at: new Date().toISOString(),
+                    },
+                });
+                try {
+                    const targetColumnName = getWorkColumnSetting(db, 'done');
+                    const board = ticket.projectId ? await this.storage.getProjectBoard(ticket.projectId) : null;
+                    const columnNames = board ? board.columns.map(col => col.name) : [];
+                    doneColumn = findColumnByName(columnNames, targetColumnName);
+                    if (doneColumn && ticket.projectId) {
+                        previousColumn = ticket.statusName;
+                        await this.storage.moveTicket(ticket.projectId, ticketId, doneColumn);
+                        ticketMovedToDone = true;
+                        // Sync to external provider
+                        try {
+                            const provider = await this.resolveTicketProvider(ticketId, ticket.projectId);
+                            if (provider.name !== 'pmo') {
+                                const moveResult = await provider.moveTicket(ticketId, doneColumn);
+                                if (moveResult.success) {
+                                    ticketTransitionProvider = moveResult.provider;
+                                    this.log(styles.muted(`   Synced to ${moveResult.provider}: ${doneColumn}`));
+                                }
+                            }
+                        }
+                        catch {
+                            // Non-fatal
+                        }
+                    }
+                }
+                catch (err) {
+                    this.warn(`Failed to move ticket ${ticketId} to Done: ${err instanceof Error ? err.message : err}`);
+                }
+                // Auto-export board
+                await autoExportToBoard(this.pmoPath, this.storage);
+                // Mark execution as completed
+                const runningExecution = executionStorage.getRunningExecution(ticketId);
+                if (runningExecution) {
+                    executionStorage.updateStatus(runningExecution.id, 'completed');
+                    this.log(styles.muted(`   Execution ${runningExecution.id} marked as completed`));
+                }
+            }
+            // --- Step 6: Emit event ---
+            if (ticketId) {
+                try {
+                    const repo = getGitHubRepo(cwd);
+                    const prUrl = repo ? `https://github.com/${repo}/pull/${prNumber}` : null;
+                    getEventBus().emit('work:pr_merged', {
+                        workItemId: ticketId,
+                        source: 'github',
+                        prNumber,
+                        prTitle: prInfo.title,
+                        prUrl,
+                        mergeMethod: method,
+                        timestamp: new Date(),
+                    });
+                }
+                catch {
+                    // Non-critical
+                }
+            }
+            db.close();
+            // --- Output ---
+            if (jsonMode) {
+                outputSuccessAsJson({
+                    shipped: true,
+                    prNumber,
+                    prTitle: prInfo.title,
+                    method,
+                    branchDeleted: flags['delete-branch'],
+                    ticketId: ticketId ?? null,
+                    ticketMovedToDone,
+                    ticketTransitionProvider: ticketTransitionProvider ?? null,
+                }, createMetadata('work ship', flags));
+                return;
+            }
+            this.log('');
+            this.log(styles.success(`Shipped: ${ticketId ?? `PR #${prNumber}`}`));
+            this.log(styles.muted(`   PR:     #${prNumber} — ${prInfo.title}`));
+            this.log(styles.muted(`   Method: ${method}`));
+            if (flags['delete-branch']) {
+                this.log(styles.muted(`   Branch: ${prInfo.headBranch} deleted`));
+            }
+            if (ticketMovedToDone && ticketId) {
+                this.log(styles.muted(`   Ticket: ${ticketId} → ${doneColumn}`));
+                if (previousColumn) {
+                    this.log(styles.muted(`   From:   ${previousColumn}`));
+                }
+            }
+        }
+        catch (error) {
+            db.close();
+            throw error;
+        }
+    }
+    /**
+     * Resolve the linked ticket for a PR.
+     */
+    async resolveLinkedTicket(prNumber, headBranch, projectId) {
+        // 1. Find by PR metadata on tickets
+        const allTickets = await this.storage.listTickets(projectId);
+        const byMetadata = allTickets.find(t => t.metadata?.pr_number === String(prNumber) ||
+            t.metadata?.pr_url?.endsWith(`/pull/${prNumber}`) ||
+            t.metadata?.pr_url?.endsWith(`/${prNumber}`));
+        if (byMetadata)
+            return byMetadata;
+        // 2. Look up from agent_work table by branch name
+        try {
+            const db = this.storage.getDatabase();
+            const row = db.prepare(`SELECT ticket_id FROM ${PMO_TABLES.agent_work} WHERE branch = ? LIMIT 1`).get(headBranch);
+            if (row?.ticket_id) {
+                const ticket = await this.storage.getTicket(row.ticket_id);
+                if (ticket)
+                    return ticket;
+            }
+        }
+        catch {
+            // agent_work lookup failed
+        }
+        // 3. Parse ticket ID from branch name
+        const branchResult = validateBranchName(headBranch);
+        if (branchResult.valid && branchResult.parts?.ticketId) {
+            const branchTicketId = branchResult.parts.ticketId;
+            const directTicket = await this.storage.getTicket(branchTicketId);
+            if (directTicket)
+                return directTicket;
+            const byExternalKey = allTickets.find(t => t.metadata?.external_key === branchTicketId);
+            if (byExternalKey)
+                return byExternalKey;
+        }
+        return null;
+    }
+    /**
+     * Wait for CI checks to pass. Returns immediately if all passed.
+     * If --wait is set, polls until all complete. Otherwise warns on pending.
+     */
+    async waitForCI(prNumber, shouldWait, cwd) {
+        const maxAttempts = 120; // 30 minutes max (15s intervals)
+        let attempts = 0;
+        while (attempts < maxAttempts) {
+            const checks = getPRChecks(prNumber, cwd);
+            // No checks configured — pass through
+            if (checks.length === 0) {
+                this.log(styles.muted('   No CI checks configured'));
+                return { passed: true, message: '' };
+            }
+            const failed = checks.filter(c => c.conclusion === 'FAILURE');
+            const pending = checks.filter(c => !c.conclusion || c.status === 'IN_PROGRESS' || c.status === 'QUEUED');
+            const passed = checks.filter(c => c.conclusion === 'SUCCESS' || c.conclusion === 'SKIPPED');
+            // All done
+            if (pending.length === 0) {
+                if (failed.length > 0) {
+                    const failedNames = failed.map(c => c.name).join(', ');
+                    return {
+                        passed: false,
+                        message: `CI checks failed: ${failedNames}. Fix the failures before shipping.`,
+                    };
+                }
+                this.log(styles.muted(`   CI: ${passed.length} checks passed`));
+                return { passed: true, message: '' };
+            }
+            // Checks still running
+            if (!shouldWait) {
+                const pendingNames = pending.map(c => c.name).join(', ');
+                return {
+                    passed: false,
+                    message: `CI checks still running: ${pendingNames}. Use --wait to wait for them, or re-run after they complete.`,
+                };
+            }
+            // Wait and retry
+            if (attempts === 0) {
+                this.log(styles.muted(`   Waiting for CI (${pending.length} pending)...`));
+            }
+            attempts++;
+            await sleep(15_000);
+        }
+        return {
+            passed: false,
+            message: 'Timed out waiting for CI checks (30 minutes). Check manually.',
+        };
+    }
+    /**
+     * Check if the PR has merge conflicts with the base branch.
+     */
+    checkMergeConflicts(prNumber, cwd) {
+        try {
+            const result = execSync(`gh pr view ${prNumber} --json mergeable -q .mergeable`, {
+                cwd,
+                encoding: 'utf-8',
+                stdio: ['pipe', 'pipe', 'pipe'],
+            }).trim();
+            return result === 'CONFLICTING';
+        }
+        catch {
+            // If we can't determine, assume no conflicts
+            return false;
+        }
+    }
+    /**
+     * Rebase the PR branch onto the base branch and force-push.
+     */
+    rebaseOntoBase(headBranch, baseBranch, cwd) {
+        try {
+            // Fetch latest from origin
+            execSync('git fetch origin', {
+                cwd,
+                stdio: ['pipe', 'pipe', 'pipe'],
+            });
+            // Check out the head branch
+            execSync(`git checkout ${headBranch}`, {
+                cwd,
+                stdio: ['pipe', 'pipe', 'pipe'],
+            });
+            // Rebase onto base
+            execSync(`git rebase origin/${baseBranch}`, {
+                cwd,
+                stdio: ['pipe', 'pipe', 'pipe'],
+            });
+            // Force-push
+            execSync(`git push --force-with-lease origin ${headBranch}`, {
+                cwd,
+                stdio: ['pipe', 'pipe', 'pipe'],
+            });
+            return { success: true };
+        }
+        catch (error) {
+            // Abort rebase on failure
+            try {
+                execSync('git rebase --abort', {
+                    cwd,
+                    stdio: ['pipe', 'pipe', 'pipe'],
+                });
+            }
+            catch {
+                // Ignore abort failures
+            }
+            return {
+                success: false,
+                error: error instanceof Error ? error.message : 'Unknown rebase error',
+            };
+        }
+    }
+    /**
+     * Resolve the working directory for git operations.
+     * Tries: devcontainer repo dirs, execution worktree, agent dirs.
+     */
+    resolveWorktreePath(workspaceInfo, executionStorage, ticketId) {
+        // In devcontainer, find repo directories
+        if (process.env.DEVCONTAINER === 'true') {
+            try {
+                const entries = fs.readdirSync('/workspace', { withFileTypes: true });
+                const repoDirs = entries.filter(e => e.isDirectory() && !e.name.startsWith('.') && e.name !== 'node_modules');
+                if (repoDirs.length > 0) {
+                    return path.join('/workspace', repoDirs[0].name);
+                }
+            }
+            catch {
+                // Fall through
+            }
+        }
+        // Try execution record
+        if (ticketId) {
+            const execution = executionStorage.getRunningExecution(ticketId);
+            if (execution?.agentName) {
+                const agentRecord = workspaceInfo.agents.find(a => a.name === execution.agentName);
+                let agentDir;
+                if (agentRecord?.worktree_path) {
+                    agentDir = path.join(workspaceInfo.path, agentRecord.worktree_path);
+                }
+                else if (agentRecord?.type === 'ephemeral') {
+                    agentDir = path.join(workspaceInfo.path, 'agents', workspaceInfo.ephemeralAgentsDir, execution.agentName);
+                }
+                else if (agentRecord) {
+                    agentDir = path.join(workspaceInfo.path, 'agents', workspaceInfo.persistentAgentsDir, execution.agentName);
+                }
+                if (agentDir && fs.existsSync(agentDir)) {
+                    try {
+                        const entries = fs.readdirSync(agentDir, { withFileTypes: true });
+                        const repoDirs = entries.filter(e => e.isDirectory() && !e.name.startsWith('.') && e.name !== 'node_modules');
+                        if (repoDirs.length > 0) {
+                            return path.join(agentDir, repoDirs[0].name);
+                        }
+                    }
+                    catch {
+                        // Fall through
+                    }
+                }
+            }
+        }
+        return undefined;
+    }
+}
+//# sourceMappingURL=ship.js.map