steroids-cli 0.8.22 → 0.8.24

package/dist/parallel/merge.d.ts

@@ -0,0 +1,39 @@
+/**
+ * Parallel merge orchestration
+ * Cherry-picks completed workstream branches into main with crash-safe progress tracking.
+ */
+import { MergeLockRecord } from './merge-lock.js';
+import { ParallelMergeError } from './merge-errors.js';
+export interface MergeWorkstreamSpec {
+    id: string;
+    branchName: string;
+}
+export interface MergeOptions {
+    projectPath: string;
+    sessionId: string;
+    runnerId: string;
+    workstreams: MergeWorkstreamSpec[];
+    remote?: string;
+    mainBranch?: string;
+    lockTimeoutMinutes?: number;
+    heartbeatIntervalMs?: number;
+    remoteWorkspaceRoot?: string;
+    cleanupOnSuccess?: boolean;
+}
+export interface MergeResult {
+    success: boolean;
+    completedCommits: number;
+    conflicts: number;
+    skipped: number;
+    errors: string[];
+}
+declare function getNowISOString(): string;
+declare function cleanupWorkspaceState(projectPath: string, workspaceRoot: string, workstreamIds: string[], options: {
+    cleanupOnSuccess: boolean;
+}): void;
+/**
+ * Run cherry-pick merge loop across completed workstreams.
+ */
+export declare function runParallelMerge(options: MergeOptions): Promise<MergeResult>;
+export { MergeLockRecord, ParallelMergeError, getNowISOString, cleanupWorkspaceState, };
+//# sourceMappingURL=merge.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/parallel/merge.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAgBH,OAAO,EACL,eAAe,EAIhB,MAAM,iBAAiB,CAAC;AASzB,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,YAAY;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,mBAAmB,EAAE,CAAC;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAOD,iBAAS,eAAe,IAAI,MAAM,CAEjC;AAcD,iBAAS,qBAAqB,CAC5B,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,MAAM,EAAE,EACvB,OAAO,EAAE;IAAE,gBAAgB,EAAE,OAAO,CAAA;CAAE,GACrC,IAAI,CAqBN;AAqGD;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,CA+HlF;AAED,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,eAAe,EACf,qBAAqB,GACtB,CAAC"}

package/dist/parallel/merge.js

@@ -0,0 +1,231 @@
+"use strict";
+/**
+ * Parallel merge orchestration
+ * Cherry-picks completed workstream branches into main with crash-safe progress tracking.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ParallelMergeError = void 0;
+exports.runParallelMerge = runParallelMerge;
+exports.getNowISOString = getNowISOString;
+exports.cleanupWorkspaceState = cleanupWorkspaceState;
+const node_path_1 = require("node:path");
+const node_fs_1 = require("node:fs");
+const clone_js_1 = require("./clone.js");
+const clone_js_2 = require("./clone.js");
+const connection_js_1 = require("../database/connection.js");
+const merge_git_js_1 = require("./merge-git.js");
+const merge_lock_js_1 = require("./merge-lock.js");
+const merge_progress_js_1 = require("./merge-progress.js");
+const merge_conflict_js_1 = require("./merge-conflict.js");
+const merge_errors_js_1 = require("./merge-errors.js");
+Object.defineProperty(exports, "ParallelMergeError", { enumerable: true, get: function () { return merge_errors_js_1.ParallelMergeError; } });
+const DEFAULT_REMOTE = 'origin';
+const DEFAULT_MAIN_BRANCH = 'main';
+const DEFAULT_LOCK_TIMEOUT_MINUTES = 120;
+const DEFAULT_HEARTBEAT_INTERVAL_MS = 30_000;
+function getNowISOString() {
+    return new Date().toISOString();
+}
+function ensureMergeWorkingTree(projectPath) {
+    const lines = (0, merge_git_js_1.gitStatusLines)(projectPath);
+    if (lines.length === 0)
+        return;
+    if (!(0, merge_git_js_1.hasCherryPickInProgress)(projectPath)) {
+        throw new merge_errors_js_1.ParallelMergeError('Working tree is dirty. Commit or stash changes before merging.', 'DIRTY_WORKTREE');
+    }
+}
+function cleanupWorkspaceState(projectPath, workspaceRoot, workstreamIds, options) {
+    if (!options.cleanupOnSuccess)
+        return;
+    const baseRoot = (0, node_path_1.resolve)(workspaceRoot);
+    const hash = (0, clone_js_2.getProjectHash)(projectPath);
+    const projectWorkspaceRoot = (0, node_path_1.resolve)(baseRoot, hash);
+    if (!projectWorkspaceRoot.startsWith(baseRoot)) {
+        return;
+    }
+    for (const workstreamId of workstreamIds) {
+        const folder = (0, node_path_1.resolve)(projectWorkspaceRoot, workstreamId.startsWith('ws-') ? workstreamId : `ws-${workstreamId}`);
+        if ((0, node_path_1.resolve)(folder).startsWith(projectWorkspaceRoot)) {
+            (0, node_fs_1.rmSync)(folder, { recursive: true, force: true });
+        }
+    }
+}
+async function processWorkstream(db, projectPath, sessionId, workstream, mainBranch, remote, progressRows, heartbeat) {
+    const summary = { applied: 0, skipped: 0, conflicts: 0 };
+    const commits = (0, merge_git_js_1.getWorkstreamCommitList)(projectPath, remote, workstream.branchName, mainBranch);
+    if (commits.length === 0) {
+        return summary;
+    }
+    const workstreamProgress = (0, merge_progress_js_1.getMergeProgressForWorkstream)(progressRows, workstream.id);
+    const workstreamLookup = new Map();
+    for (const row of workstreamProgress) {
+        workstreamLookup.set(row.position, row);
+    }
+    for (let position = 0; position < commits.length; position += 1) {
+        const commitSha = commits[position];
+        const shortSha = (0, merge_git_js_1.getCommitShortSha)(commitSha);
+        const prior = workstreamLookup.get(position);
+        if (prior?.status === 'applied' && prior.commit_sha === commitSha) {
+            summary.applied += 1;
+            continue;
+        }
+        if (prior?.status === 'skipped' && prior.commit_sha === commitSha) {
+            summary.skipped += 1;
+            continue;
+        }
+        if (prior?.status === 'conflict' && prior.commit_sha === commitSha) {
+            if ((0, merge_git_js_1.hasCherryPickInProgress)(projectPath)) {
+                const outcome = await (0, merge_conflict_js_1.runConflictResolutionCycle)({
+                    db,
+                    projectPath,
+                    sessionId,
+                    workstreamId: workstream.id,
+                    branchName: workstream.branchName,
+                    position,
+                    commitSha,
+                    existingTaskId: prior.conflict_task_id ?? undefined,
+                });
+                if (outcome === 'skipped')
+                    summary.skipped += 1;
+                else
+                    summary.applied += 1;
+                summary.conflicts += 1;
+                continue;
+            }
+            (0, merge_progress_js_1.clearProgressEntry)(db, sessionId, workstream.id, position);
+        }
+        if (prior && prior.commit_sha !== commitSha) {
+            (0, merge_progress_js_1.clearProgressEntry)(db, sessionId, workstream.id, position);
+        }
+        try {
+            (0, merge_git_js_1.runGitCommand)(projectPath, ['cherry-pick', commitSha]);
+            (0, merge_progress_js_1.upsertProgressEntry)(db, sessionId, workstream.id, position, commitSha, 'applied');
+            summary.applied += 1;
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            if (!/CONFLICT|merge conflict|could not apply|needs merge/i.test(message)) {
+                throw error;
+            }
+            const outcome = await (0, merge_conflict_js_1.runConflictResolutionCycle)({
+                db,
+                projectPath,
+                sessionId,
+                workstreamId: workstream.id,
+                branchName: workstream.branchName,
+                position,
+                commitSha,
+            });
+            if (outcome === 'skipped') {
+                summary.skipped += 1;
+            }
+            else {
+                summary.applied += 1;
+            }
+            summary.conflicts += 1;
+        }
+        (0, merge_lock_js_1.refreshMergeLock)(db, heartbeat.sessionId, heartbeat.runnerId, heartbeat.timeoutMinutes);
+    }
+    return summary;
+}
+/**
+ * Run cherry-pick merge loop across completed workstreams.
+ */
+async function runParallelMerge(options) {
+    const projectPath = (0, node_path_1.resolve)(options.projectPath);
+    const sessionId = options.sessionId;
+    const runnerId = options.runnerId;
+    const workstreams = options.workstreams;
+    const remote = options.remote ?? DEFAULT_REMOTE;
+    const mainBranch = options.mainBranch ?? DEFAULT_MAIN_BRANCH;
+    const lockTimeoutMinutes = options.lockTimeoutMinutes ?? DEFAULT_LOCK_TIMEOUT_MINUTES;
+    const heartbeatIntervalMs = options.heartbeatIntervalMs ?? DEFAULT_HEARTBEAT_INTERVAL_MS;
+    const workspaceRoot = options.remoteWorkspaceRoot ?? (0, clone_js_1.getDefaultWorkspaceRoot)();
+    const cleanupOnSuccess = options.cleanupOnSuccess ?? true;
+    const { db, close } = (0, connection_js_1.openDatabase)(projectPath);
+    const summary = {
+        success: false,
+        completedCommits: 0,
+        conflicts: 0,
+        skipped: 0,
+        errors: [],
+    };
+    let heartbeatTimer = null;
+    try {
+        const lock = (0, merge_lock_js_1.acquireMergeLock)(db, {
+            sessionId,
+            runnerId,
+            timeoutMinutes: lockTimeoutMinutes,
+        });
+        if (!lock.acquired) {
+            summary.errors.push(`Could not acquire merge lock (held by ${lock.lock?.runner_id ?? 'another process'})`);
+            return summary;
+        }
+        const recoveringFromCherryPick = (0, merge_git_js_1.hasCherryPickInProgress)(projectPath);
+        heartbeatTimer = setInterval(() => {
+            try {
+                (0, merge_lock_js_1.refreshMergeLock)(db, sessionId, runnerId, lockTimeoutMinutes);
+            }
+            catch {
+                // If heartbeat fails, merge keeps running until lock-dependent operations fail.
+            }
+        }, heartbeatIntervalMs);
+        ensureMergeWorkingTree(projectPath);
+        for (const stream of workstreams) {
+            (0, merge_git_js_1.safeRunMergeCommand)(projectPath, remote, stream.branchName);
+        }
+        if (!recoveringFromCherryPick) {
+            const pullOutput = (0, merge_git_js_1.runGitCommand)(projectPath, ['pull', '--ff-only', remote, mainBranch], { allowFailure: true });
+            const pullOutputLower = pullOutput.toLowerCase();
+            if (pullOutputLower.includes('fatal:') || pullOutputLower.includes('error:') || pullOutputLower.includes('error ')) {
+                if (pullOutputLower.includes('could not apply') ||
+                    pullOutputLower.includes('not possible to fast-forward')) {
+                    throw new merge_errors_js_1.ParallelMergeError('main is behind; local commits detected. Run "git pull --rebase" before merge.', 'NON_FAST_FORWARD');
+                }
+                throw new merge_errors_js_1.ParallelMergeError(`Failed to refresh main from ${remote}/${mainBranch}: ${pullOutput}`, 'PULL_FAILED');
+            }
+        }
+        const progressRows = (0, merge_progress_js_1.listMergeProgress)(db, sessionId);
+        for (const workstream of workstreams) {
+            const stats = await processWorkstream(db, projectPath, sessionId, workstream, mainBranch, remote, progressRows, { sessionId, runnerId, timeoutMinutes: lockTimeoutMinutes });
+            summary.completedCommits += stats.applied;
+            summary.skipped += stats.skipped;
+            summary.conflicts += stats.conflicts;
+        }
+        const pushResult = (0, merge_git_js_1.runGitCommand)(projectPath, ['push', remote, mainBranch], { allowFailure: true });
+        if ((0, merge_git_js_1.isNoPushError)(pushResult)) {
+            summary.errors.push('Push to main failed.');
+            throw new merge_errors_js_1.ParallelMergeError(pushResult, 'PUSH_FAILED');
+        }
+        for (const stream of workstreams) {
+            try {
+                (0, merge_git_js_1.runGitCommand)(projectPath, ['push', remote, '--delete', stream.branchName]);
+            }
+            catch {
+                // Ignore branch delete failures; branch may already be deleted.
+            }
+        }
+        (0, merge_git_js_1.runGitCommand)(projectPath, ['remote', 'prune', remote]);
+        cleanupWorkspaceState(projectPath, workspaceRoot, workstreams.map((stream) => stream.id), {
+            cleanupOnSuccess,
+        });
+        summary.success = true;
+        return summary;
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        if (!summary.errors.includes(message)) {
+            summary.errors.push(message);
+        }
+        return summary;
+    }
+    finally {
+        if (heartbeatTimer) {
+            clearInterval(heartbeatTimer);
+            heartbeatTimer = null;
+        }
+        (0, merge_lock_js_1.releaseMergeLock)(db, sessionId, runnerId);
+        close();
+    }
+}
+//# sourceMappingURL=merge.js.map

package/dist/parallel/merge.js.map

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

package/dist/parallel/merge.test.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Tests for parallel merge orchestration and conflict recovery.
+ */
+export {};
+//# sourceMappingURL=merge.test.d.ts.map

package/dist/parallel/merge.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.test.d.ts","sourceRoot":"","sources":["../../src/parallel/merge.test.ts"],"names":[],"mappings":"AAAA;;GAEG"}

package/dist/parallel/merge.test.js

@@ -0,0 +1,322 @@
+"use strict";
+/**
+ * Tests for parallel merge orchestration and conflict recovery.
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const better_sqlite3_1 = __importDefault(require("better-sqlite3"));
+const globals_1 = require("@jest/globals");
+const node_fs_1 = require("node:fs");
+const node_fs_2 = require("node:fs");
+const node_os_1 = require("node:os");
+const node_path_1 = require("node:path");
+const schema_js_1 = require("../database/schema.js");
+const clone_js_1 = require("./clone.js");
+const mockExecFileSync = globals_1.jest.fn();
+globals_1.jest.unstable_mockModule('node:child_process', () => ({
+    execFileSync: mockExecFileSync,
+}));
+const mockOpenDatabase = globals_1.jest.fn();
+const mockClose = globals_1.jest.fn();
+let db;
+globals_1.jest.unstable_mockModule('../database/connection.js', () => ({
+    openDatabase: mockOpenDatabase,
+    getDbPath: globals_1.jest.fn().mockReturnValue('/tmp/steroids.db'),
+}));
+const mockLoadConfig = globals_1.jest.fn();
+globals_1.jest.unstable_mockModule('../config/loader.js', () => ({
+    loadConfig: mockLoadConfig,
+}));
+const mockProviderInvoke = globals_1.jest.fn();
+globals_1.jest.unstable_mockModule('../providers/registry.js', () => ({
+    getProviderRegistry: () => ({
+        get: () => ({ invoke: mockProviderInvoke }),
+    }),
+}));
+const mockLogInvocation = globals_1.jest.fn();
+globals_1.jest.unstable_mockModule('../providers/invocation-logger.js', () => ({
+    logInvocation: mockLogInvocation,
+}));
+let mergeModule;
+let lockModule;
+let progressModule;
+let conflictModule;
+let gitPlan = [];
+let invocationOutputs = [];
+function createDb() {
+    const next = new better_sqlite3_1.default(':memory:');
+    next.exec(schema_js_1.SCHEMA_SQL);
+    return next;
+}
+function setGitPlan(steps) {
+    gitPlan = steps.map((step) => ({ ...step }));
+}
+function queueInvocationOutputs(outputs) {
+    invocationOutputs = [...outputs];
+}
+function takeGitOutput(args) {
+    const step = gitPlan.shift();
+    if (!step) {
+        throw new Error(`Unexpected git command: git ${args.join(' ')}`);
+    }
+    (0, globals_1.expect)(step.args).toEqual(globals_1.expect.arrayContaining(args));
+    if (step.error) {
+        throw new Error(step.error);
+    }
+    return step.output ?? '';
+}
+(0, globals_1.beforeEach)(async () => {
+    db = createDb();
+    mockOpenDatabase.mockReturnValue({ db, close: mockClose });
+    globals_1.jest.clearAllMocks();
+    mockClose.mockClear();
+    gitPlan = [];
+    invocationOutputs = [];
+    mockExecFileSync.mockImplementation(((command, args) => {
+        if (command !== 'git') {
+            throw new Error(`Unexpected command ${command}`);
+        }
+        if (!Array.isArray(args)) {
+            throw new Error('Invalid git args');
+        }
+        return takeGitOutput(args);
+    }));
+    mockLoadConfig.mockReturnValue({
+        ai: {
+            coder: { provider: 'mock', model: 'mock-model' },
+            reviewer: { provider: 'mock', model: 'mock-model' },
+        },
+    });
+    mockLogInvocation.mockImplementation(async () => ({
+        success: true,
+        exitCode: 0,
+        stdout: invocationOutputs.shift() ?? 'APPROVE',
+        stderr: '',
+        duration: 1,
+        timedOut: false,
+    }));
+    [mergeModule, lockModule, progressModule, conflictModule] = await Promise.all([
+        import('./merge.js'),
+        import('./merge-lock.js'),
+        import('./merge-progress.js'),
+        import('./merge-conflict.js'),
+    ]);
+});
+(0, globals_1.afterEach)(() => {
+    if (db) {
+        db.close();
+    }
+});
+(0, globals_1.describe)('parseReviewDecision', () => {
+    (0, globals_1.it)('parses explicit APPROVE', () => {
+        const result = conflictModule.parseReviewDecision('APPROVE - looks good');
+        (0, globals_1.expect)(result.decision).toBe('approve');
+    });
+    (0, globals_1.it)('parses explicit REJECT', () => {
+        const result = conflictModule.parseReviewDecision('REJECT - this is incorrect');
+        (0, globals_1.expect)(result.decision).toBe('reject');
+    });
+    (0, globals_1.it)('treats ambiguous responses as reject', () => {
+        const result = conflictModule.parseReviewDecision('This is partly APPROVE, but also REJECT for conflicts');
+        (0, globals_1.expect)(result.decision).toBe('reject');
+    });
+});
+(0, globals_1.describe)('merge lock behavior', () => {
+    (0, globals_1.it)('acquires lock when none exists', () => {
+        const result = lockModule.acquireMergeLock(db, {
+            sessionId: 'session-1',
+            runnerId: 'runner-a',
+            timeoutMinutes: 120,
+        });
+        (0, globals_1.expect)(result.acquired).toBe(true);
+        (0, globals_1.expect)(result.lock?.runner_id).toBe('runner-a');
+    });
+    (0, globals_1.it)('rejects lock when held by another active runner', () => {
+        const lockRow = new Date(Date.now() + 60 * 60 * 1000).toISOString();
+        db.prepare('INSERT INTO merge_locks (session_id, runner_id, acquired_at, expires_at, heartbeat_at) VALUES (?, ?, datetime("now"), ?, datetime("now"))').run('session-2', 'runner-current', lockRow);
+        const result = lockModule.acquireMergeLock(db, {
+            sessionId: 'session-2',
+            runnerId: 'runner-other',
+            timeoutMinutes: 120,
+        });
+        (0, globals_1.expect)(result.acquired).toBe(false);
+        (0, globals_1.expect)(result.lock?.runner_id).toBe('runner-current');
+    });
+    (0, globals_1.it)('replaces lock when expired', () => {
+        const stale = new Date(Date.now() - 60_000).toISOString();
+        db.prepare('INSERT INTO merge_locks (session_id, runner_id, acquired_at, expires_at, heartbeat_at) VALUES (?, ?, datetime("now"), ?, datetime("now"))').run('session-3', 'runner-stale', stale);
+        const result = lockModule.acquireMergeLock(db, {
+            sessionId: 'session-3',
+            runnerId: 'runner-fresh',
+            timeoutMinutes: 120,
+        });
+        (0, globals_1.expect)(result.acquired).toBe(true);
+        (0, globals_1.expect)(result.lock?.runner_id).toBe('runner-fresh');
+    });
+    (0, globals_1.it)('refreshes existing lock heartbeat', () => {
+        lockModule.acquireMergeLock(db, {
+            sessionId: 'session-4',
+            runnerId: 'runner-refresh',
+            timeoutMinutes: 120,
+        });
+        const before = lockModule.getLatestMergeLock(db, 'session-4');
+        (0, globals_1.expect)(before).toBeTruthy();
+        const after = lockModule.refreshMergeLock(db, 'session-4', 'runner-refresh', 120);
+        (0, globals_1.expect)(after.id).toBe(before.id);
+        (0, globals_1.expect)(new Date(after.heartbeat_at).getTime()).toBeGreaterThanOrEqual(new Date(before.heartbeat_at).getTime());
+    });
+});
+(0, globals_1.describe)('merge progress tracking', () => {
+    (0, globals_1.it)('stores and clears progress entries', () => {
+        progressModule.upsertProgressEntry(db, 'session-progress', 'ws-1', 0, 'abc123', 'applied');
+        progressModule.upsertProgressEntry(db, 'session-progress', 'ws-1', 1, 'def456', 'conflict', 'task-1');
+        const rows = progressModule.listMergeProgress(db, 'session-progress');
+        (0, globals_1.expect)(rows).toHaveLength(2);
+        (0, globals_1.expect)(progressModule.getMergeProgressForWorkstream(rows, 'ws-1').map((row) => row.position)).toEqual([0, 1]);
+        progressModule.clearProgressEntry(db, 'session-progress', 'ws-1', 0);
+        const remaining = progressModule.listMergeProgress(db, 'session-progress');
+        (0, globals_1.expect)(remaining.map((row) => row.position)).toEqual([1]);
+    });
+});
+(0, globals_1.describe)('runParallelMerge integration', () => {
+    const createProjectAndWorkspace = () => {
+        const projectPath = (0, node_fs_2.mkdtempSync)((0, node_path_1.join)((0, node_os_1.tmpdir)(), 'steroids-merge-XXXXXX'));
+        const workspaceRoot = (0, node_fs_2.mkdtempSync)((0, node_path_1.join)((0, node_os_1.tmpdir)(), 'steroids-merge-workspace-XXXXXX'));
+        (0, node_fs_1.mkdirSync)((0, node_path_1.resolve)(projectPath, '.git'), { recursive: true });
+        return { projectPath, workspaceRoot };
+    };
+    (0, globals_1.it)('merges successfully with clean cherry-pick path', async () => {
+        const { projectPath, workspaceRoot } = createProjectAndWorkspace();
+        setGitPlan([
+            { args: ['status', '--porcelain'], output: '' },
+            { args: ['fetch', '--prune', 'origin', 'steroids/ws-alpha'], output: '' },
+            { args: ['pull', '--ff-only', 'origin', 'main'], output: '' },
+            { args: ['log', 'main..origin/steroids/ws-alpha', '--format=%H', '--reverse'], output: 'commit-a\ncommit-b' },
+            { args: ['cherry-pick', 'commit-a'], output: '' },
+            { args: ['cherry-pick', 'commit-b'], output: '' },
+            { args: ['push', 'origin', 'main'], output: 'ok' },
+            { args: ['push', 'origin', '--delete', 'steroids/ws-alpha'], output: '' },
+            { args: ['remote', 'prune', 'origin'], output: '' },
+        ]);
+        const result = await mergeModule.runParallelMerge({
+            projectPath,
+            sessionId: 'merge-session',
+            runnerId: 'runner-1',
+            workstreams: [{ id: 'alpha', branchName: 'steroids/ws-alpha' }],
+            remoteWorkspaceRoot: workspaceRoot,
+        });
+        (0, globals_1.expect)(result.success).toBe(true);
+        (0, globals_1.expect)(result.completedCommits).toBe(2);
+        (0, globals_1.expect)(result.errors).toHaveLength(0);
+        (0, globals_1.expect)(mockOpenDatabase).toHaveBeenCalledWith(projectPath);
+    });
+    (0, globals_1.it)('resumes from prior progress rows', async () => {
+        progressModule.upsertProgressEntry(db, 'resume-session', 'alpha', 0, 'commit-a', 'applied');
+        const { projectPath } = createProjectAndWorkspace();
+        setGitPlan([
+            { args: ['status', '--porcelain'], output: '' },
+            { args: ['fetch', '--prune', 'origin', 'steroids/ws-alpha'], output: '' },
+            { args: ['pull', '--ff-only', 'origin', 'main'], output: '' },
+            { args: ['log', 'main..origin/steroids/ws-alpha', '--format=%H', '--reverse'], output: 'commit-a\ncommit-b' },
+            { args: ['cherry-pick', 'commit-b'], output: '' },
+            { args: ['push', 'origin', 'main'], output: 'ok' },
+            { args: ['push', 'origin', '--delete', 'steroids/ws-alpha'], output: '' },
+            { args: ['remote', 'prune', 'origin'], output: '' },
+        ]);
+        const result = await mergeModule.runParallelMerge({
+            projectPath,
+            sessionId: 'resume-session',
+            runnerId: 'runner-1',
+            workstreams: [{ id: 'alpha', branchName: 'steroids/ws-alpha' }],
+        });
+        (0, globals_1.expect)(result.success).toBe(true);
+        (0, globals_1.expect)(result.completedCommits).toBe(2);
+        const rows = progressModule.listMergeProgress(db, 'resume-session');
+        (0, globals_1.expect)(rows).toHaveLength(2);
+    });
+    (0, globals_1.it)('handles merge conflict with coder/reviewer loop', async () => {
+        const { projectPath } = createProjectAndWorkspace();
+        queueInvocationOutputs([
+            'coder resolved',
+            'APPROVE - conflict resolved',
+        ]);
+        (0, node_fs_1.mkdirSync)((0, node_path_1.resolve)(projectPath, '.git'), { recursive: true });
+        (0, node_fs_1.writeFileSync)((0, node_path_1.resolve)(projectPath, '.git', 'CHERRY_PICK_HEAD'), '0000000000000000000000000000000000000000');
+        setGitPlan([
+            { args: ['status', '--porcelain'], output: '' },
+            { args: ['fetch', '--prune', 'origin', 'steroids/ws-alpha'], output: '' },
+            { args: ['pull', '--ff-only', 'origin', 'main'], output: '' },
+            { args: ['log', 'main..origin/steroids/ws-alpha', '--format=%H', '--reverse'], output: 'commit-conflict' },
+            { args: ['cherry-pick', 'commit-conflict'], error: 'CONFLICT: could not apply commit-conflict' },
+            { args: ['show', 'commit-conflict', '--'], output: 'patch' },
+            { args: ['log', '-1', '--format=%s%n%b', 'commit-conflict'], output: 'Conflicting commit' },
+            { args: ['diff', '--name-only', '--diff-filter=U'], output: 'src/file.ts' },
+            { args: ['diff', '--name-only', '--diff-filter=U'], output: '' },
+            { args: ['diff', '--cached', '--name-only'], output: 'src/file.ts' },
+            { args: ['diff', '--cached'], output: 'staged diff' },
+            { args: ['diff', '--name-only', '--diff-filter=U'], output: '' },
+            { args: ['-c', 'core.editor=true', 'cherry-pick', '--continue'], output: '' },
+            { args: ['push', 'origin', 'main'], output: 'ok' },
+            { args: ['push', 'origin', '--delete', 'steroids/ws-alpha'], output: '' },
+            { args: ['remote', 'prune', 'origin'], output: '' },
+        ]);
+        const result = await mergeModule.runParallelMerge({
+            projectPath,
+            sessionId: 'conflict-session',
+            runnerId: 'runner-1',
+            workstreams: [{ id: 'alpha', branchName: 'steroids/ws-alpha' }],
+        });
+        (0, globals_1.expect)(result.success).toBe(true);
+        (0, globals_1.expect)(result.completedCommits).toBe(1);
+        (0, globals_1.expect)(result.conflicts).toBe(1);
+    });
+    (0, globals_1.it)('cleans workspace directory after successful merge', async () => {
+        const { projectPath, workspaceRoot } = createProjectAndWorkspace();
+        const projectHash = (0, clone_js_1.getProjectHash)(projectPath);
+        const sessionPath = (0, node_path_1.resolve)(workspaceRoot, projectHash, 'ws-alpha');
+        (0, node_fs_1.mkdirSync)(sessionPath, { recursive: true });
+        (0, node_fs_1.writeFileSync)((0, node_path_1.resolve)(sessionPath, '.keep'), 'cleanup target');
+        setGitPlan([
+            { args: ['status', '--porcelain'], output: '' },
+            { args: ['fetch', '--prune', 'origin', 'steroids/ws-alpha'], output: '' },
+            { args: ['pull', '--ff-only', 'origin', 'main'], output: '' },
+            { args: ['log', 'main..origin/steroids/ws-alpha', '--format=%H', '--reverse'], output: 'commit-a' },
+            { args: ['cherry-pick', 'commit-a'], output: '' },
+            { args: ['push', 'origin', 'main'], output: 'ok' },
+            { args: ['push', 'origin', '--delete', 'steroids/ws-alpha'], output: '' },
+            { args: ['remote', 'prune', 'origin'], output: '' },
+        ]);
+        const result = await mergeModule.runParallelMerge({
+            projectPath,
+            sessionId: 'cleanup-session',
+            runnerId: 'runner-1',
+            workstreams: [{ id: 'alpha', branchName: 'steroids/ws-alpha' }],
+            remoteWorkspaceRoot: workspaceRoot,
+            cleanupOnSuccess: true,
+        });
+        (0, globals_1.expect)(result.success).toBe(true);
+        (0, globals_1.expect)((0, node_fs_1.existsSync)(sessionPath)).toBe(false);
+    });
+    (0, globals_1.it)('reports push failures as errors', async () => {
+        const { projectPath } = createProjectAndWorkspace();
+        setGitPlan([
+            { args: ['status', '--porcelain'], output: '' },
+            { args: ['fetch', '--prune', 'origin', 'steroids/ws-alpha'], output: '' },
+            { args: ['pull', '--ff-only', 'origin', 'main'], output: '' },
+            { args: ['log', 'main..origin/steroids/ws-alpha', '--format=%H', '--reverse'], output: 'commit-a' },
+            { args: ['cherry-pick', 'commit-a'], output: '' },
+            { args: ['push', 'origin', 'main'], output: 'error: failed to push' },
+        ]);
+        const result = await mergeModule.runParallelMerge({
+            projectPath,
+            sessionId: 'push-fail-session',
+            runnerId: 'runner-1',
+            workstreams: [{ id: 'alpha', branchName: 'steroids/ws-alpha' }],
+        });
+        (0, globals_1.expect)(result.success).toBe(false);
+        (0, globals_1.expect)(result.errors.some((error) => error.includes('Push to main failed.'))).toBe(true);
+    });
+});
+//# sourceMappingURL=merge.test.js.map