steroids-cli 0.8.21 → 0.8.23

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

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