steroids-cli 0.8.22 → 0.8.23

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"}

package/dist/parallel/merge-git.js

@@ -0,0 +1,134 @@
+"use strict";
+/**
+ * Git helper operations used by parallel merge orchestration.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runGitCommand = runGitCommand;
+exports.cleanTreeHasConflicts = cleanTreeHasConflicts;
+exports.hasUnmergedFiles = hasUnmergedFiles;
+exports.gitStatusLines = gitStatusLines;
+exports.hasCherryPickInProgress = hasCherryPickInProgress;
+exports.getWorkstreamCommitList = getWorkstreamCommitList;
+exports.getCommitPatch = getCommitPatch;
+exports.getCommitMessage = getCommitMessage;
+exports.getCommitShortSha = getCommitShortSha;
+exports.getConflictedFiles = getConflictedFiles;
+exports.getCachedDiff = getCachedDiff;
+exports.getCachedFiles = getCachedFiles;
+exports.isNonFatalFetchResult = isNonFatalFetchResult;
+exports.isMissingRemoteBranchFailure = isMissingRemoteBranchFailure;
+exports.safeRunMergeCommand = safeRunMergeCommand;
+exports.isNoPushError = isNoPushError;
+const node_child_process_1 = require("node:child_process");
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
+const merge_errors_js_1 = require("./merge-errors.js");
+function runGitCommand(cwd, args, options = {}) {
+    const { allowFailure = false, timeoutMs = 120_000 } = options;
+    try {
+        return (0, node_child_process_1.execFileSync)('git', args, {
+            cwd,
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+            timeout: timeoutMs,
+            maxBuffer: options.maxBuffer,
+        }).trim();
+    }
+    catch (error) {
+        if (allowFailure) {
+            if (error instanceof Error) {
+                const err = error;
+                return [err.stdout, err.stderr]
+                    .map((value) => (typeof value === 'string' ? value : value?.toString()))
+                    .filter(Boolean)
+                    .join('\n')
+                    .trim();
+            }
+            return '';
+        }
+        const err = error;
+        const stderr = err.stderr ? err.stderr.toString() : '';
+        const stdout = err.stdout ? err.stdout.toString() : '';
+        const details = [stderr, stdout].filter(Boolean).join('\n') || err.message || 'Unknown git error';
+        throw new merge_errors_js_1.ParallelMergeError(`Git command failed: git ${args.join(' ')}\n${details}`, 'GIT_ERROR');
+    }
+}
+function cleanTreeHasConflicts(projectPath) {
+    const status = runGitCommand(projectPath, ['status', '--porcelain']);
+    return status.split('\n').some((line) => line.startsWith('UU') || line.includes('U'));
+}
+function hasUnmergedFiles(projectPath) {
+    const unmerged = runGitCommand(projectPath, ['diff', '--name-only', '--diff-filter=U']);
+    return unmerged.trim().length > 0;
+}
+function gitStatusLines(projectPath) {
+    const status = runGitCommand(projectPath, ['status', '--porcelain']);
+    return status.split('\n').filter(Boolean);
+}
+function hasCherryPickInProgress(projectPath) {
+    return (0, node_fs_1.existsSync)((0, node_path_1.resolve)(projectPath, '.git', 'CHERRY_PICK_HEAD'));
+}
+function getWorkstreamCommitList(projectPath, remote, workstreamBranch, mainBranch) {
+    const arg = `${mainBranch}..${remote}/${workstreamBranch}`;
+    const output = runGitCommand(projectPath, ['log', arg, '--format=%H', '--reverse'], { allowFailure: true });
+    if (/error:|fatal:|error /.test(output.toLowerCase()) && !isMissingRemoteBranchFailure(output)) {
+        throw new merge_errors_js_1.ParallelMergeError(`Failed to list commits from ${remote}/${workstreamBranch}: ${output}`, 'COMMIT_LIST_FAILED');
+    }
+    if (isMissingRemoteBranchFailure(output)) {
+        return [];
+    }
+    return output
+        .split('\n')
+        .map((line) => line.trim())
+        .filter(Boolean);
+}
+function getCommitPatch(projectPath, commitSha) {
+    return runGitCommand(projectPath, ['show', commitSha, '--']);
+}
+function getCommitMessage(projectPath, commitSha) {
+    return runGitCommand(projectPath, ['log', '-1', '--format=%s%n%b', commitSha]);
+}
+function getCommitShortSha(commitSha) {
+    return commitSha.length > 7 ? commitSha.slice(0, 7) : commitSha;
+}
+function getConflictedFiles(projectPath) {
+    const output = runGitCommand(projectPath, ['diff', '--name-only', '--diff-filter=U']);
+    return output.split('\n').filter(Boolean);
+}
+function getCachedDiff(projectPath) {
+    return runGitCommand(projectPath, ['diff', '--cached']);
+}
+function getCachedFiles(projectPath) {
+    const output = runGitCommand(projectPath, ['diff', '--cached', '--name-only']);
+    return output.split('\n').filter(Boolean);
+}
+function isNonFatalFetchResult(output) {
+    const lower = output.toLowerCase();
+    return (lower.includes('couldn\'t find remote ref') ||
+        lower.includes('does not exist') ||
+        lower.includes('fatal: remote ref does not exist'));
+}
+function isMissingRemoteBranchFailure(output) {
+    const lower = output.toLowerCase();
+    return (lower.includes('couldn\'t find remote ref') ||
+        (lower.includes('remote branch') && lower.includes('not found')) ||
+        lower.includes('unknown revision or path not in the working tree') ||
+        lower.includes('does not exist') ||
+        lower.includes('fatal: remote ref does not exist'));
+}
+function safeRunMergeCommand(projectPath, remote, branchName) {
+    const output = runGitCommand(projectPath, ['fetch', '--prune', remote, branchName], { allowFailure: true });
+    const lower = output.toLowerCase();
+    if (!/error:|fatal:/.test(lower)) {
+        return;
+    }
+    if (isNonFatalFetchResult(lower)) {
+        return;
+    }
+    throw new merge_errors_js_1.ParallelMergeError(`Failed to fetch ${branchName} from ${remote}: ${output}`, 'FETCH_FAILED');
+}
+function isNoPushError(output) {
+    const lower = output.toLowerCase();
+    return lower.includes('error:') || lower.includes('fatal:');
+}
+//# sourceMappingURL=merge-git.js.map

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

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

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

@@ -0,0 +1,26 @@
+/**
+ * Merge lock management for concurrent merge workers.
+ */
+import type Database from 'better-sqlite3';
+export interface MergeLockRecord {
+    id: number;
+    session_id: string;
+    runner_id: string;
+    acquired_at: string;
+    expires_at: string;
+    heartbeat_at: string;
+}
+export interface MergeLockOptions {
+    sessionId: string;
+    runnerId: string;
+    timeoutMinutes: number;
+}
+export declare function isLockExpired(lock: MergeLockRecord): boolean;
+export declare function getLatestMergeLock(db: Database.Database, sessionId: string): MergeLockRecord | null;
+export declare function acquireMergeLock(db: Database.Database, options: MergeLockOptions): {
+    acquired: boolean;
+    lock?: MergeLockRecord;
+};
+export declare function refreshMergeLock(db: Database.Database, sessionId: string, runnerId: string, timeoutMinutes: number): MergeLockRecord;
+export declare function releaseMergeLock(db: Database.Database, sessionId: string, runnerId: string): void;
+//# sourceMappingURL=merge-lock.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"merge-lock.d.ts","sourceRoot":"","sources":["../../src/parallel/merge-lock.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAG3C,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;CACxB;AAUD,wBAAgB,aAAa,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAE5D;AAED,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,CASnG;AAED,wBAAgB,gBAAgB,CAC9B,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,OAAO,EAAE,gBAAgB,GACxB;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,eAAe,CAAA;CAAE,CA6B/C;AAED,wBAAgB,gBAAgB,CAC9B,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,GACrB,eAAe,CAajB;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAEjG"}

package/dist/parallel/merge-lock.js

@@ -0,0 +1,58 @@
+"use strict";
+/**
+ * Merge lock management for concurrent merge workers.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isLockExpired = isLockExpired;
+exports.getLatestMergeLock = getLatestMergeLock;
+exports.acquireMergeLock = acquireMergeLock;
+exports.refreshMergeLock = refreshMergeLock;
+exports.releaseMergeLock = releaseMergeLock;
+const merge_errors_js_1 = require("./merge-errors.js");
+function getNowISOString() {
+    return new Date().toISOString();
+}
+function utcExpiresAt(timeoutMinutes) {
+    return new Date(Date.now() + timeoutMinutes * 60_000).toISOString();
+}
+function isLockExpired(lock) {
+    return new Date(lock.expires_at).getTime() < Date.now();
+}
+function getLatestMergeLock(db, sessionId) {
+    return db
+        .prepare(`SELECT * FROM merge_locks
+       WHERE session_id = ?
+       ORDER BY acquired_at DESC
+       LIMIT 1`)
+        .get(sessionId);
+}
+function acquireMergeLock(db, options) {
+    const lock = getLatestMergeLock(db, options.sessionId);
+    if (lock && !isLockExpired(lock)) {
+        if (lock.runner_id === options.runnerId) {
+            const refreshed = refreshMergeLock(db, lock.session_id, options.runnerId, options.timeoutMinutes);
+            return { acquired: true, lock: refreshed };
+        }
+        return { acquired: false, lock };
+    }
+    db.prepare('DELETE FROM merge_locks WHERE session_id = ?').run(options.sessionId);
+    const inserted = db.prepare('INSERT INTO merge_locks (session_id, runner_id, acquired_at, expires_at, heartbeat_at) VALUES (?, ?, ?, ?, ?)').run(options.sessionId, options.runnerId, getNowISOString(), utcExpiresAt(options.timeoutMinutes), getNowISOString());
+    if (inserted.changes !== 1) {
+        return { acquired: false };
+    }
+    return { acquired: true, lock: getLatestMergeLock(db, options.sessionId) ?? undefined };
+}
+function refreshMergeLock(db, sessionId, runnerId, timeoutMinutes) {
+    db.prepare(`UPDATE merge_locks
+     SET heartbeat_at = ?, expires_at = ?
+     WHERE session_id = ? AND runner_id = ?`).run(getNowISOString(), utcExpiresAt(timeoutMinutes), sessionId, runnerId);
+    const lock = getLatestMergeLock(db, sessionId);
+    if (!lock) {
+        throw new merge_errors_js_1.ParallelMergeError('Lost merge lock unexpectedly', 'MERGE_LOCK_NOT_FOUND');
+    }
+    return lock;
+}
+function releaseMergeLock(db, sessionId, runnerId) {
+    db.prepare('DELETE FROM merge_locks WHERE session_id = ? AND runner_id = ?').run(sessionId, runnerId);
+}
+//# sourceMappingURL=merge-lock.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"merge-lock.js","sourceRoot":"","sources":["../../src/parallel/merge-lock.ts"],"names":[],"mappings":";AAAA;;GAEG;;AA4BH,sCAEC;AAED,gDASC;AAED,4CAgCC;AAED,4CAkBC;AAED,4CAEC;AAhGD,uDAAuD;AAiBvD,SAAS,eAAe;IACtB,OAAO,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AAClC,CAAC;AAED,SAAS,YAAY,CAAC,cAAsB;IAC1C,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,cAAc,GAAG,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;AACtE,CAAC;AAED,SAAgB,aAAa,CAAC,IAAqB;IACjD,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;AAC1D,CAAC;AAED,SAAgB,kBAAkB,CAAC,EAAqB,EAAE,SAAiB;IACzE,OAAO,EAAE;SACN,OAAO,CACN;;;eAGS,CACV;SACA,GAAG,CAAC,SAAS,CAA2B,CAAC;AAC9C,CAAC;AAED,SAAgB,gBAAgB,CAC9B,EAAqB,EACrB,OAAyB;IAEzB,MAAM,IAAI,GAAG,kBAAkB,CAAC,EAAE,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAEvD,IAAI,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;QACjC,IAAI,IAAI,CAAC,SAAS,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAC;YACxC,MAAM,SAAS,GAAG,gBAAgB,CAAC,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;YAClG,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC7C,CAAC;QAED,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACnC,CAAC;IAED,EAAE,CAAC,OAAO,CAAC,8CAA8C,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAElF,MAAM,QAAQ,GAAG,EAAE,CAAC,OAAO,CACzB,+GAA+G,CAChH,CAAC,GAAG,CACH,OAAO,CAAC,SAAS,EACjB,OAAO,CAAC,QAAQ,EAChB,eAAe,EAAE,EACjB,YAAY,CAAC,OAAO,CAAC,cAAc,CAAC,EACpC,eAAe,EAAE,CAClB,CAAC;IAEF,IAAI,QAAQ,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;QAC3B,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IAC7B,CAAC;IAED,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,kBAAkB,CAAC,EAAE,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,EAAE,CAAC;AAC1F,CAAC;AAED,SAAgB,gBAAgB,CAC9B,EAAqB,EACrB,SAAiB,EACjB,QAAgB,EAChB,cAAsB;IAEtB,EAAE,CAAC,OAAO,CACR;;4CAEwC,CACzC,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,YAAY,CAAC,cAAc,CAAC,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;IAE5E,MAAM,IAAI,GAAG,kBAAkB,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;IAC/C,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,oCAAkB,CAAC,8BAA8B,EAAE,sBAAsB,CAAC,CAAC;IACvF,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,gBAAgB,CAAC,EAAqB,EAAE,SAAiB,EAAE,QAAgB;IACzF,EAAE,CAAC,OAAO,CAAC,gEAAgE,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;AACxG,CAAC"}

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

@@ -0,0 +1,20 @@
+/**
+ * Merge progress persistence for crash recovery.
+ */
+import type Database from 'better-sqlite3';
+export interface MergeProgressRow {
+    id: number;
+    session_id: string;
+    workstream_id: string;
+    position: number;
+    commit_sha: string;
+    status: 'applied' | 'conflict' | 'skipped';
+    conflict_task_id: string | null;
+    created_at: string;
+    applied_at: string | null;
+}
+export declare function listMergeProgress(db: Database.Database, sessionId: string): MergeProgressRow[];
+export declare function clearProgressEntry(db: Database.Database, sessionId: string, workstreamId: string, position: number): void;
+export declare function upsertProgressEntry(db: Database.Database, sessionId: string, workstreamId: string, position: number, commitSha: string, status: MergeProgressRow['status'], conflictTaskId?: string | null): void;
+export declare function getMergeProgressForWorkstream(rows: MergeProgressRow[], workstreamId: string): MergeProgressRow[];
+//# sourceMappingURL=merge-progress.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"merge-progress.d.ts","sourceRoot":"","sources":["../../src/parallel/merge-progress.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAE3C,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,SAAS,GAAG,UAAU,GAAG,SAAS,CAAC;IAC3C,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAMD,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAS9F;AAED,wBAAgB,kBAAkB,CAChC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,GACf,IAAI,CAIN;AAED,wBAAgB,mBAAmB,CACjC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC,EAClC,cAAc,GAAE,MAAM,GAAG,IAAW,GACnC,IAAI,CASN;AAED,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,gBAAgB,EAAE,EACxB,YAAY,EAAE,MAAM,GACnB,gBAAgB,EAAE,CAIpB"}

package/dist/parallel/merge-progress.js

@@ -0,0 +1,36 @@
+"use strict";
+/**
+ * Merge progress persistence for crash recovery.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.listMergeProgress = listMergeProgress;
+exports.clearProgressEntry = clearProgressEntry;
+exports.upsertProgressEntry = upsertProgressEntry;
+exports.getMergeProgressForWorkstream = getMergeProgressForWorkstream;
+function getNowISOString() {
+    return new Date().toISOString();
+}
+function listMergeProgress(db, sessionId) {
+    return db
+        .prepare(`SELECT id, session_id, workstream_id, position, commit_sha, status, conflict_task_id, created_at, applied_at
+       FROM merge_progress
+       WHERE session_id = ?
+       ORDER BY workstream_id, position ASC`)
+        .all(sessionId);
+}
+function clearProgressEntry(db, sessionId, workstreamId, position) {
+    db.prepare('DELETE FROM merge_progress WHERE session_id = ? AND workstream_id = ? AND position = ?').run(sessionId, workstreamId, position);
+}
+function upsertProgressEntry(db, sessionId, workstreamId, position, commitSha, status, conflictTaskId = null) {
+    const payloadApplied = status === 'applied' ? getNowISOString() : null;
+    clearProgressEntry(db, sessionId, workstreamId, position);
+    db.prepare(`INSERT INTO merge_progress
+      (session_id, workstream_id, position, commit_sha, status, conflict_task_id, applied_at)
+     VALUES (?, ?, ?, ?, ?, ?, ?)`).run(sessionId, workstreamId, position, commitSha, status, conflictTaskId, payloadApplied);
+}
+function getMergeProgressForWorkstream(rows, workstreamId) {
+    return rows
+        .filter((row) => row.workstream_id === workstreamId)
+        .sort((left, right) => left.position - right.position);
+}
+//# sourceMappingURL=merge-progress.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"merge-progress.js","sourceRoot":"","sources":["../../src/parallel/merge-progress.ts"],"names":[],"mappings":";AAAA;;GAEG;;AAoBH,8CASC;AAED,gDASC;AAED,kDAiBC;AAED,sEAOC;AApDD,SAAS,eAAe;IACtB,OAAO,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AAClC,CAAC;AAED,SAAgB,iBAAiB,CAAC,EAAqB,EAAE,SAAiB;IACxE,OAAO,EAAE;SACN,OAAO,CACN;;;4CAGsC,CACvC;SACA,GAAG,CAAC,SAAS,CAAuB,CAAC;AAC1C,CAAC;AAED,SAAgB,kBAAkB,CAChC,EAAqB,EACrB,SAAiB,EACjB,YAAoB,EACpB,QAAgB;IAEhB,EAAE,CAAC,OAAO,CACR,wFAAwF,CACzF,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;AAC3C,CAAC;AAED,SAAgB,mBAAmB,CACjC,EAAqB,EACrB,SAAiB,EACjB,YAAoB,EACpB,QAAgB,EAChB,SAAiB,EACjB,MAAkC,EAClC,iBAAgC,IAAI;IAEpC,MAAM,cAAc,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAEvE,kBAAkB,CAAC,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;IAC1D,EAAE,CAAC,OAAO,CACR;;kCAE8B,CAC/B,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;AAC9F,CAAC;AAED,SAAgB,6BAA6B,CAC3C,IAAwB,EACxB,YAAoB;IAEpB,OAAO,IAAI;SACR,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,aAAa,KAAK,YAAY,CAAC;SACnD,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;AAC3D,CAAC"}