steroids-cli 0.8.21 → 0.8.23

package/dist/parallel/clone.test.js

@@ -0,0 +1,252 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const globals_1 = require("@jest/globals");
+const node_fs_1 = require("node:fs");
+const node_os_1 = require("node:os");
+const node_path_1 = require("node:path");
+const mockStatfsSync = globals_1.jest.fn();
+const mockSymlinkSync = globals_1.jest.fn();
+const mockAccessSync = globals_1.jest.fn();
+globals_1.jest.unstable_mockModule('node:fs', () => {
+    const actualFs = globals_1.jest.requireActual('node:fs');
+    return {
+        ...actualFs,
+        statfsSync: mockStatfsSync,
+        symlinkSync: mockSymlinkSync,
+        accessSync: mockAccessSync,
+    };
+});
+globals_1.jest.unstable_mockModule('node:child_process', () => ({
+    execFileSync: mockExecFileSync,
+}));
+const mockExecFileSync = globals_1.jest.fn();
+let workspaceRoot = '';
+let forceCloneFailure = false;
+let forceBranchFailure = false;
+let createWorkspaceClone;
+let getProjectHash;
+let getWorkspacePath;
+let isSameFileSystem;
+const tempPaths = [];
+function makeTempDir(prefix) {
+    const tempPath = (0, node_fs_1.mkdtempSync)((0, node_path_1.join)((0, node_os_1.tmpdir)(), `${prefix}-XXXXXX`));
+    tempPaths.push(tempPath);
+    return tempPath;
+}
+function cleanupTempPaths() {
+    while (tempPaths.length > 0) {
+        const tempPath = tempPaths.pop();
+        if (tempPath) {
+            (0, node_fs_1.rmSync)(tempPath, { recursive: true, force: true });
+        }
+    }
+}
+function createProjectFixture() {
+    const projectPath = makeTempDir('steroids-clone-project');
+    const steroidsDirectory = (0, node_path_1.join)(projectPath, '.steroids');
+    (0, node_fs_1.mkdirSync)(steroidsDirectory, { recursive: true });
+    (0, node_fs_1.writeFileSync)((0, node_path_1.join)(steroidsDirectory, 'steroids.db'), 'ok');
+    return projectPath;
+}
+function makeStatFs(id) {
+    return { type: id };
+}
+function setFileSystemIds(projectPath, rootPath, projectId, rootId) {
+    const resolvedProjectPath = (0, node_path_1.resolve)(projectPath);
+    const resolvedRootPath = (0, node_path_1.resolve)(rootPath);
+    mockStatfsSync.mockImplementation((targetPath) => {
+        const resolvedTarget = (0, node_path_1.resolve)(String(targetPath));
+        if (resolvedTarget === resolvedProjectPath) {
+            return makeStatFs(projectId);
+        }
+        if (resolvedTarget === resolvedRootPath) {
+            return makeStatFs(rootId);
+        }
+        return makeStatFs('other');
+    });
+}
+function configureExecMock() {
+    mockExecFileSync.mockImplementation(((command, args) => {
+        if (command !== 'git' || !Array.isArray(args)) {
+            return '';
+        }
+        if (args[0] === 'clone') {
+            const workspacePath = args[2];
+            if (typeof workspacePath === 'string') {
+                const workspaceDirectory = (0, node_path_1.resolve)(workspacePath);
+                (0, node_fs_1.mkdirSync)((0, node_path_1.resolve)(workspaceDirectory, '..'), { recursive: true });
+                (0, node_fs_1.mkdirSync)(workspacePath, { recursive: true });
+                (0, node_fs_1.mkdirSync)((0, node_path_1.join)(workspacePath, '.git'), { recursive: true });
+            }
+            if (forceCloneFailure) {
+                throw new Error('mocked clone failure');
+            }
+            return '';
+        }
+        if (args[2] === 'checkout' && forceBranchFailure) {
+            throw new Error('mocked checkout failure');
+        }
+        return '';
+    }));
+}
+(0, globals_1.beforeEach)(async () => {
+    workspaceRoot = makeTempDir('steroids-workspace-root');
+    forceCloneFailure = false;
+    forceBranchFailure = false;
+    mockStatfsSync.mockReset();
+    configureExecMock();
+    mockStatfsSync.mockImplementation(() => makeStatFs('same'));
+    ({
+        createWorkspaceClone,
+        getProjectHash,
+        getWorkspacePath,
+        isSameFileSystem,
+    } = await import('./clone.js'));
+});
+(0, globals_1.afterEach)(() => {
+    mockExecFileSync.mockClear();
+    mockSymlinkSync.mockReset();
+    mockAccessSync.mockReset();
+    mockStatfsSync.mockReset();
+    cleanupTempPaths();
+});
+(0, globals_1.describe)('src/parallel/clone', () => {
+    (0, globals_1.it)('creates workspace clones on the same filesystem with git --local', () => {
+        const projectPath = createProjectFixture();
+        setFileSystemIds(projectPath, workspaceRoot, 'fs-a', 'fs-a');
+        const result = createWorkspaceClone({
+            projectPath,
+            workstreamId: 'stream',
+            branchName: 'steroids/ws-stream',
+            workspaceRoot,
+        });
+        const [cloneCommand, cloneArgs] = mockExecFileSync.mock.calls[0] ?? [];
+        const [checkoutCommand, checkoutArgs] = mockExecFileSync.mock.calls[1] ?? [];
+        (0, globals_1.expect)(cloneCommand).toBe('git');
+        (0, globals_1.expect)(cloneArgs).toEqual(['clone', '--local', projectPath, result.workspacePath]);
+        (0, globals_1.expect)(checkoutCommand).toBe('git');
+        (0, globals_1.expect)(checkoutArgs).toEqual(['-C', result.workspacePath, 'checkout', '-b', 'steroids/ws-stream']);
+        (0, globals_1.expect)(result.usedLocalClone).toBe(true);
+        (0, globals_1.expect)(mockSymlinkSync).toHaveBeenCalledWith((0, node_fs_1.realpathSync)((0, node_path_1.join)(projectPath, '.steroids')), result.steroidsSymlinkPath);
+        (0, globals_1.expect)(mockAccessSync).toHaveBeenCalledWith((0, node_path_1.join)(result.steroidsSymlinkPath, 'steroids.db'), globals_1.expect.any(Number));
+        (0, globals_1.expect)(mockAccessSync).toHaveBeenCalledTimes(1);
+    });
+    (0, globals_1.it)('creates workspace clones on a different filesystem without git --local', () => {
+        const projectPath = createProjectFixture();
+        setFileSystemIds(projectPath, workspaceRoot, 'fs-a', 'fs-b');
+        const result = createWorkspaceClone({
+            projectPath,
+            workstreamId: 'stream',
+            branchName: 'steroids/ws-stream',
+            workspaceRoot,
+        });
+        const [cloneCommand, cloneArgs] = mockExecFileSync.mock.calls[0] ?? [];
+        (0, globals_1.expect)(cloneCommand).toBe('git');
+        (0, globals_1.expect)(cloneArgs).toEqual(['clone', projectPath, result.workspacePath]);
+        (0, globals_1.expect)(result.usedLocalClone).toBe(false);
+    });
+    (0, globals_1.it)('detects same and different filesystems', () => {
+        const projectPath = createProjectFixture();
+        setFileSystemIds(projectPath, workspaceRoot, 'fs-a', 'fs-a');
+        (0, globals_1.expect)(isSameFileSystem(projectPath, workspaceRoot)).toBe(true);
+        setFileSystemIds(projectPath, workspaceRoot, 'fs-a', 'fs-b');
+        (0, globals_1.expect)(isSameFileSystem(projectPath, workspaceRoot)).toBe(false);
+    });
+    (0, globals_1.it)('produces consistent project hashes', () => {
+        const projectPath = createProjectFixture();
+        const sameFirst = getProjectHash(projectPath);
+        const sameSecond = getProjectHash(projectPath);
+        const different = getProjectHash(`${projectPath}-other`);
+        (0, globals_1.expect)(sameFirst).toBe(sameSecond);
+        (0, globals_1.expect)(sameFirst).not.toBe(different);
+        (0, globals_1.expect)(sameFirst).toHaveLength(16);
+    });
+    (0, globals_1.it)('resolves workspace paths with normalized workstream ids', () => {
+        const projectPath = createProjectFixture();
+        const hash = getWorkspacePath(projectPath, 'stream', workspaceRoot);
+        const normalized = getWorkspacePath(projectPath, 'stream', workspaceRoot);
+        const prefixed = getWorkspacePath(projectPath, 'ws-prefixed', workspaceRoot);
+        const expected = (0, node_path_1.join)(workspaceRoot, getProjectHash(projectPath), 'ws-stream');
+        const expectedPrefixed = (0, node_path_1.join)(workspaceRoot, getProjectHash(projectPath), 'ws-prefixed');
+        (0, globals_1.expect)(normalized).toBe(expected);
+        (0, globals_1.expect)(prefixed).toBe(expectedPrefixed);
+        (0, globals_1.expect)(hash).toBe(expected);
+    });
+    (0, globals_1.it)('throws for missing project paths', () => {
+        (0, globals_1.expect)(() => {
+            createWorkspaceClone({
+                projectPath: (0, node_path_1.join)(workspaceRoot, 'does-not-exist'),
+                workstreamId: 'stream',
+                branchName: 'steroids/ws-stream',
+                workspaceRoot,
+            });
+        }).toThrow('Project path does not exist');
+        (0, globals_1.expect)(mockExecFileSync).not.toHaveBeenCalled();
+    });
+    (0, globals_1.it)('throws for project paths that are not directories', () => {
+        const filePath = (0, node_path_1.join)(workspaceRoot, 'not-a-directory');
+        (0, node_fs_1.writeFileSync)(filePath, 'not a directory');
+        (0, globals_1.expect)(() => {
+            createWorkspaceClone({
+                projectPath: filePath,
+                workstreamId: 'stream',
+                branchName: 'steroids/ws-stream',
+                workspaceRoot,
+            });
+        }).toThrow('Project path is not a directory');
+    });
+    (0, globals_1.it)('throws when the workspace already exists and force is not set', () => {
+        const projectPath = createProjectFixture();
+        const workspacePath = getWorkspacePath(projectPath, 'stream', workspaceRoot);
+        (0, node_fs_1.mkdirSync)(workspacePath, { recursive: true });
+        (0, globals_1.expect)(() => {
+            createWorkspaceClone({
+                projectPath,
+                workstreamId: 'stream',
+                branchName: 'steroids/ws-stream',
+                workspaceRoot,
+            });
+        }).toThrow('Workspace already exists');
+    });
+    (0, globals_1.it)('creates and validates the .steroids symlink in the cloned workspace', () => {
+        const projectPath = createProjectFixture();
+        setFileSystemIds(projectPath, workspaceRoot, 'fs-a', 'fs-a');
+        const result = createWorkspaceClone({
+            projectPath,
+            workstreamId: 'stream',
+            branchName: 'steroids/ws-stream',
+            workspaceRoot,
+        });
+        (0, globals_1.expect)(mockSymlinkSync).toHaveBeenCalledWith((0, node_fs_1.realpathSync)((0, node_path_1.join)(projectPath, '.steroids')), result.steroidsSymlinkPath);
+        (0, globals_1.expect)(mockAccessSync).toHaveBeenCalledWith((0, node_path_1.join)(result.steroidsSymlinkPath, 'steroids.db'), globals_1.expect.any(Number));
+    });
+    (0, globals_1.it)('cleans workspace on clone command failure', () => {
+        const projectPath = createProjectFixture();
+        const workspacePath = getWorkspacePath(projectPath, 'stream', workspaceRoot);
+        forceCloneFailure = true;
+        (0, globals_1.expect)(() => {
+            createWorkspaceClone({
+                projectPath,
+                workstreamId: 'stream',
+                branchName: 'steroids/ws-stream',
+                workspaceRoot,
+            });
+        }).toThrow('Git clone failed');
+        (0, globals_1.expect)((0, node_fs_1.existsSync)(workspacePath)).toBe(false);
+    });
+    (0, globals_1.it)('cleans workspace on branch creation failure', () => {
+        const projectPath = createProjectFixture();
+        const workspacePath = getWorkspacePath(projectPath, 'stream', workspaceRoot);
+        forceBranchFailure = true;
+        (0, globals_1.expect)(() => {
+            createWorkspaceClone({
+                projectPath,
+                workstreamId: 'stream',
+                branchName: 'steroids/ws-stream',
+                workspaceRoot,
+            });
+        }).toThrow('Failed to create branch in clone');
+        (0, globals_1.expect)((0, node_fs_1.existsSync)(workspacePath)).toBe(false);
+    });
+});
+//# sourceMappingURL=clone.test.js.map

package/dist/parallel/clone.test.js.map

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

package/dist/parallel/merge-conflict.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Merge conflict resolution helpers.
+ */
+import type Database from 'better-sqlite3';
+interface ParseReviewDecisionResult {
+    decision: 'approve' | 'reject';
+    notes: string;
+}
+export interface ConflictRunOptions {
+    db: Database.Database;
+    projectPath: string;
+    sessionId: string;
+    workstreamId: string;
+    branchName: string;
+    position: number;
+    commitSha: string;
+    existingTaskId?: string;
+}
+export declare function parseReviewDecision(raw: string): ParseReviewDecisionResult;
+export declare function runConflictResolutionCycle(options: ConflictRunOptions): Promise<'continued' | 'skipped'>;
+export {};
+//# sourceMappingURL=merge-conflict.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"merge-conflict.d.ts","sourceRoot":"","sources":["../../src/parallel/merge-conflict.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AA2B3C,UAAU,yBAAyB;IACjC,QAAQ,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,CAwB1E;AAoLD,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CA6J9G"}

package/dist/parallel/merge-conflict.js

@@ -0,0 +1,227 @@
+"use strict";
+/**
+ * Merge conflict resolution helpers.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseReviewDecision = parseReviewDecision;
+exports.runConflictResolutionCycle = runConflictResolutionCycle;
+const node_crypto_1 = require("node:crypto");
+const loader_js_1 = require("../config/loader.js");
+const queries_js_1 = require("../database/queries.js");
+const invocation_logger_js_1 = require("../providers/invocation-logger.js");
+const registry_js_1 = require("../providers/registry.js");
+const merge_git_js_1 = require("./merge-git.js");
+const merge_errors_js_1 = require("./merge-errors.js");
+const merge_progress_js_1 = require("./merge-progress.js");
+function parseReviewDecision(raw) {
+    const trimmed = raw.trim();
+    const upper = trimmed.toUpperCase();
+    const hasApprove = upper.includes('APPROVE');
+    const hasReject = upper.includes('REJECT');
+    if (hasApprove && !hasReject) {
+        return {
+            decision: 'approve',
+            notes: trimmed || 'APPROVED by merge-conflict reviewer',
+        };
+    }
+    if (hasReject) {
+        return {
+            decision: 'reject',
+            notes: trimmed || 'Please review and correct conflict resolution',
+        };
+    }
+    return {
+        decision: 'reject',
+        notes: trimmed || 'Decision was not clear. Please provide explicit APPROVE/REJECT.',
+    };
+}
+function buildMergeConflictSectionName() {
+    return 'merge-conflicts';
+}
+function getNowISOString() {
+    return new Date().toISOString();
+}
+function createMergeConflictSection(db) {
+    const sectionName = buildMergeConflictSectionName();
+    const existing = db
+        .prepare('SELECT id FROM sections WHERE name = ? LIMIT 1')
+        .get(sectionName);
+    if (existing) {
+        return existing.id;
+    }
+    const maxPosRow = db
+        .prepare('SELECT MAX(position) as maxPos FROM sections')
+        .get();
+    const position = (maxPosRow?.maxPos ?? -1) + 1;
+    const sectionId = (0, node_crypto_1.createHash)('sha1').update(sectionName + position).digest('hex');
+    db.prepare(`INSERT INTO sections (id, name, position, priority, skipped, created_at)
+     VALUES (?, ?, ?, ?, ?, ?)`).run(sectionId, sectionName, position, 80, 0, getNowISOString());
+    return sectionId;
+}
+function ensureMergeConflictTask(db, workstreamId, shortSha, branchName, commitMessage, conflictedFiles, conflictPatch, forceNew = false) {
+    const sectionId = createMergeConflictSection(db);
+    if (!forceNew) {
+        const existing = db
+            .prepare(`SELECT t.id
+         FROM tasks t
+         INNER JOIN sections s ON s.id = t.section_id
+         WHERE s.name = ? AND t.title LIKE ?
+         ORDER BY t.created_at DESC
+         LIMIT 1`)
+            .get(buildMergeConflictSectionName(), `Merge conflict: cherry-pick ${shortSha}%`);
+        if (existing?.id) {
+            return existing.id;
+        }
+    }
+    const title = `Merge conflict: cherry-pick ${shortSha} from ${branchName}`;
+    const created = (0, queries_js_1.createTask)(db, title, {
+        sectionId,
+        sourceFile: `merge-conflict (${workstreamId})`,
+        filePath: conflictedFiles.join(', '),
+        status: 'pending',
+        fileContentHash: conflictPatch.substring(0, 2048),
+        fileCommitSha: commitMessage,
+    });
+    (0, queries_js_1.addAuditEntry)(db, created.id, 'null', 'pending', 'merge', {
+        actorType: 'orchestrator',
+        notes: `Generated from conflict while cherry-picking ${shortSha} from ${branchName}:\n${commitMessage}`,
+    });
+    return created.id;
+}
+function createPromptForConflictCoder(options) {
+    const notesSection = options.rejectionNotes
+        ? `\n\nLatest review note from the resolver:\n${options.rejectionNotes}\n`
+        : '';
+    return `You are resolving a merge conflict for a cherry-pick during parallel merge.\n\n## Conflict context\nWorkstream: ${options.workstreamId}\nBranch: ${options.branchName}\nCommit: ${options.shortSha}\nCommit Message:\n${options.commitMessage}\n\nConflicted files:\n${options.conflictedFiles.map((file) => `- ${file}`).join('\n')}\n\nIntended patch:\n${options.conflictPatch}\n\nRules:\n1) Edit conflicted files to a correct resolution.\n2) Remove ALL conflict markers (<<<<<<, =======, >>>>>>) in resolved files.\n3) Stage only the resolved files using git add.\n4) Do NOT commit.\n5) Be surgical; change only files required for this commit.\n${notesSection}\n\nRespond with a short confirmation when done.`;
+}
+function createPromptForConflictReviewer(options) {
+    const files = options.stagedFiles.length > 0
+        ? options.stagedFiles.map((file) => `- ${file}`).join('\n')
+        : 'No files staged yet';
+    return `You are reviewing a staged resolution for a cherry-pick conflict in parallel merge.\n\nWorkstream: ${options.workstreamId}\nBranch: ${options.branchName}\nCommit: ${options.shortSha}\nOriginal message: ${options.commitMessage}\n\nCurrent staged diff to be committed by cherry-pick --continue:\n${options.stagedDiff || '(empty diff)'}\n\nFiles staged:\n${files}\n\nDecision rules:\n- Reply with APPROVE if the resolution is correct.\n- Reply with REJECT and actionable notes if any conflict marker remains or logic is incorrect.\n\nFormat:\nAPPROVE - <optional note> or\nREJECT - <checklist itemized note>`;
+}
+async function invokeModel(role, projectPath, taskId, prompt) {
+    const config = (0, loader_js_1.loadConfig)(projectPath);
+    const modelConfig = role === 'coder' ? config.ai?.coder : config.ai?.reviewer;
+    if (!modelConfig?.provider || !modelConfig?.model) {
+        throw new merge_errors_js_1.ParallelMergeError(`Missing AI ${role} configuration. Configure via config.ai.${role}.`, 'AI_CONFIG_MISSING');
+    }
+    const providerName = modelConfig.provider;
+    const model = modelConfig.model;
+    const registry = (0, registry_js_1.getProviderRegistry)();
+    const provider = registry.get(providerName);
+    const result = await (0, invocation_logger_js_1.logInvocation)(prompt, (ctx) => provider.invoke(prompt, {
+        model,
+        timeout: 60 * 60 * 1000,
+        cwd: projectPath,
+        role,
+        streamOutput: false,
+        onActivity: ctx?.onActivity,
+    }), {
+        role,
+        provider: providerName,
+        model,
+        taskId,
+        projectPath,
+    });
+    if (!result.success) {
+        const details = result.stderr || result.stdout || 'model returned non-zero exit code';
+        throw new merge_errors_js_1.ParallelMergeError(`${role.toUpperCase()} invocation failed during merge conflict handling: ${details}`, 'AI_INVOCATION_FAILED');
+    }
+    if (result.timedOut) {
+        throw new merge_errors_js_1.ParallelMergeError(`${role} invocation timed out`, 'AI_INVOKE_TIMEOUT');
+    }
+    return result.stdout;
+}
+async function runConflictResolutionCycle(options) {
+    const { db, projectPath, sessionId, workstreamId, branchName, position, commitSha, existingTaskId, } = options;
+    const shortSha = options.commitSha.slice(0, 7);
+    const conflictedFiles = (0, merge_git_js_1.getConflictedFiles)(projectPath);
+    const conflictPatch = (0, merge_git_js_1.getCommitPatch)(projectPath, commitSha);
+    const commitMessage = (0, merge_git_js_1.getCommitMessage)(projectPath, commitSha);
+    const taskId = ensureMergeConflictTask(db, workstreamId, shortSha, branchName, commitMessage, conflictedFiles, conflictPatch, !existingTaskId);
+    let conflictTaskId = existingTaskId ?? taskId;
+    if (conflictTaskId !== taskId) {
+        conflictTaskId = taskId;
+    }
+    (0, merge_progress_js_1.upsertProgressEntry)(db, sessionId, workstreamId, position, commitSha, 'conflict', conflictTaskId);
+    const currentConflictTask = (0, queries_js_1.getTask)(db, conflictTaskId);
+    if (!currentConflictTask) {
+        throw new merge_errors_js_1.ParallelMergeError('Created merge-conflict task not found', 'TASK_MISSING');
+    }
+    if (currentConflictTask.status === 'completed') {
+        (0, merge_progress_js_1.upsertProgressEntry)(db, sessionId, workstreamId, position, commitSha, 'applied', conflictTaskId);
+        return 'continued';
+    }
+    (0, queries_js_1.updateTaskStatus)(db, currentConflictTask.id, 'in_progress', 'merge-conflict-orchestrator');
+    while (true) {
+        const existingTask = (0, queries_js_1.getTask)(db, currentConflictTask.id);
+        const lastNotes = existingTask?.rejection_count
+            ? `After ${existingTask.rejection_count} rejection(s).`
+            : undefined;
+        const coderPrompt = createPromptForConflictCoder({
+            workstreamId,
+            shortSha,
+            branchName,
+            commitMessage,
+            conflictedFiles,
+            conflictPatch,
+            rejectionNotes: lastNotes,
+        });
+        await invokeModel('coder', projectPath, currentConflictTask.id, coderPrompt);
+        const remaining = (0, merge_git_js_1.getConflictedFiles)(projectPath);
+        if (remaining.length > 0) {
+            (0, queries_js_1.updateTaskStatus)(db, currentConflictTask.id, 'in_progress', 'merge-conflict-orchestrator', `Conflict markers still present: ${remaining.join(', ')}`);
+            continue;
+        }
+        const stagedFiles = (0, merge_git_js_1.getCachedFiles)(projectPath);
+        const stagedDiff = (0, merge_git_js_1.getCachedDiff)(projectPath);
+        if (stagedFiles.length === 0 || stagedDiff.trim().length === 0) {
+            (0, queries_js_1.updateTaskStatus)(db, currentConflictTask.id, 'in_progress', 'merge-conflict-orchestrator', 'No staged diff found. Stage resolved files before requesting review.');
+            continue;
+        }
+        (0, queries_js_1.updateTaskStatus)(db, currentConflictTask.id, 'review', 'merge-conflict-orchestrator');
+        const reviewerPrompt = createPromptForConflictReviewer({
+            workstreamId,
+            shortSha,
+            branchName,
+            commitMessage,
+            stagedDiff,
+            stagedFiles,
+        });
+        const decisionText = await invokeModel('reviewer', projectPath, currentConflictTask.id, reviewerPrompt);
+        const decision = parseReviewDecision(decisionText);
+        if (decision.decision === 'reject') {
+            (0, queries_js_1.rejectTask)(db, currentConflictTask.id, 'merge-conflict-reviewer', decision.notes);
+            if ((0, merge_git_js_1.cleanTreeHasConflicts)(projectPath)) {
+                continue;
+            }
+            // If no explicit conflict markers remain but reviewer still rejects, keep iterating.
+            continue;
+        }
+        if ((0, merge_git_js_1.hasUnmergedFiles)(projectPath)) {
+            (0, queries_js_1.rejectTask)(db, currentConflictTask.id, 'merge-conflict-reviewer', 'Conflict markers still present. Please fix.');
+            continue;
+        }
+        if (!(0, merge_git_js_1.hasCherryPickInProgress)(projectPath)) {
+            throw new merge_errors_js_1.ParallelMergeError('Cherry-pick no longer in progress while resolving conflict', 'CHERRY_PICK_CONTEXT_LOST');
+        }
+        try {
+            (0, merge_git_js_1.runGitCommand)(projectPath, ['-c', 'core.editor=true', 'cherry-pick', '--continue']);
+            (0, queries_js_1.approveTask)(db, currentConflictTask.id, 'merge-conflict-reviewer', decision.notes);
+            (0, merge_progress_js_1.upsertProgressEntry)(db, sessionId, workstreamId, position, commitSha, 'applied', currentConflictTask.id);
+            return 'continued';
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            if (/nothing to commit|previous cherry-pick is empty/i.test(message)) {
+                (0, merge_git_js_1.runGitCommand)(projectPath, ['cherry-pick', '--skip']);
+                (0, merge_progress_js_1.upsertProgressEntry)(db, sessionId, workstreamId, position, commitSha, 'skipped', currentConflictTask.id);
+                (0, queries_js_1.updateTaskStatus)(db, currentConflictTask.id, 'completed', 'merge-conflict-reviewer', 'Cherry-pick is now empty after resolution; skipped this commit.');
+                return 'skipped';
+            }
+            throw error;
+        }
+    }
+}
+//# sourceMappingURL=merge-conflict.js.map

package/dist/parallel/merge-conflict.js.map

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

package/dist/parallel/merge-errors.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Merge orchestration error type.
+ */
+export declare class ParallelMergeError extends Error {
+    readonly code: string;
+    constructor(message: string, code?: string, options?: {
+        cause?: unknown;
+    });
+}
+//# sourceMappingURL=merge-errors.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"merge-errors.d.ts","sourceRoot":"","sources":["../../src/parallel/merge-errors.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,SAAgB,IAAI,EAAE,MAAM,CAAC;gBAEjB,OAAO,EAAE,MAAM,EAAE,IAAI,SAAyB,EAAE,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE;CAK1F"}

package/dist/parallel/merge-errors.js

@@ -0,0 +1,16 @@
+"use strict";
+/**
+ * Merge orchestration error type.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ParallelMergeError = void 0;
+class ParallelMergeError extends Error {
+    code;
+    constructor(message, code = 'PARALLEL_MERGE_ERROR', options) {
+        super(message, options);
+        this.name = 'ParallelMergeError';
+        this.code = code;
+    }
+}
+exports.ParallelMergeError = ParallelMergeError;
+//# sourceMappingURL=merge-errors.js.map

package/dist/parallel/merge-errors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-errors.js","sourceRoot":"","sources":["../../src/parallel/merge-errors.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,MAAa,kBAAmB,SAAQ,KAAK;IAC3B,IAAI,CAAS;IAE7B,YAAY,OAAe,EAAE,IAAI,GAAG,sBAAsB,EAAE,OAA6B;QACvF,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACxB,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;QACjC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF;AARD,gDAQC"}

package/dist/parallel/merge-git.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Git helper operations used by parallel merge orchestration.
+ */
+export interface GitCommandOptions {
+    allowFailure?: boolean;
+    maxBuffer?: number;
+    timeoutMs?: number;
+}
+export declare function runGitCommand(cwd: string, args: string[], options?: GitCommandOptions): string;
+export declare function cleanTreeHasConflicts(projectPath: string): boolean;
+export declare function hasUnmergedFiles(projectPath: string): boolean;
+export declare function gitStatusLines(projectPath: string): string[];
+export declare function hasCherryPickInProgress(projectPath: string): boolean;
+export declare function getWorkstreamCommitList(projectPath: string, remote: string, workstreamBranch: string, mainBranch: string): string[];
+export declare function getCommitPatch(projectPath: string, commitSha: string): string;
+export declare function getCommitMessage(projectPath: string, commitSha: string): string;
+export declare function getCommitShortSha(commitSha: string): string;
+export declare function getConflictedFiles(projectPath: string): string[];
+export declare function getCachedDiff(projectPath: string): string;
+export declare function getCachedFiles(projectPath: string): string[];
+export declare function isNonFatalFetchResult(output: string): boolean;
+export declare function isMissingRemoteBranchFailure(output: string): boolean;
+export declare function safeRunMergeCommand(projectPath: string, remote: string, branchName: string): void;
+export declare function isNoPushError(output: string): boolean;
+//# sourceMappingURL=merge-git.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"merge-git.d.ts","sourceRoot":"","sources":["../../src/parallel/merge-git.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH,MAAM,WAAW,iBAAiB;IAChC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,aAAa,CAC3B,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,GAAE,iBAAsB,GAC9B,MAAM,CA8BR;AAED,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAGlE;AAED,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAG7D;AAED,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,CAG5D;AAED,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAEpE;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,MAAM,EACxB,UAAU,EAAE,MAAM,GACjB,MAAM,EAAE,CAuBV;AAED,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAE7E;AAED,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAE/E;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,CAGhE;AAED,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAEzD;AAED,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,CAG5D;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAO7D;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CASpE;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAajG;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAGrD"}