steroids-cli 0.15.4 → 0.15.6

package/dist/parallel/merge-lock.js

@@ -1,91 +0,0 @@
-"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.assertMergeLockEpoch = assertMergeLockEpoch;
-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 getNextLockEpoch(db, sessionId) {
-    const row = db
-        .prepare('SELECT COALESCE(MAX(lock_epoch), 0) AS max_epoch FROM merge_locks WHERE session_id = ?')
-        .get(sessionId);
-    return (row?.max_epoch ?? 0) + 1;
-}
-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 acquireTx = db.transaction(() => {
-        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, lock.lock_epoch);
-                return { acquired: true, lock: refreshed };
-            }
-            return { acquired: false, lock };
-        }
-        const lockEpoch = getNextLockEpoch(db, options.sessionId);
-        db.prepare('DELETE FROM merge_locks WHERE session_id = ?').run(options.sessionId);
-        const inserted = db.prepare('INSERT INTO merge_locks (session_id, runner_id, lock_epoch, acquired_at, expires_at, heartbeat_at) VALUES (?, ?, ?, ?, ?, ?)').run(options.sessionId, options.runnerId, lockEpoch, getNowISOString(), utcExpiresAt(options.timeoutMinutes), getNowISOString());
-        if (inserted.changes !== 1) {
-            return { acquired: false };
-        }
-        return { acquired: true, lock: getLatestMergeLock(db, options.sessionId) ?? undefined };
-    });
-    return acquireTx();
-}
-function refreshMergeLock(db, sessionId, runnerId, timeoutMinutes, lockEpoch) {
-    const result = db.prepare(`UPDATE merge_locks
-     SET heartbeat_at = ?, expires_at = ?
-     WHERE session_id = ? AND runner_id = ? AND lock_epoch = ?`).run(getNowISOString(), utcExpiresAt(timeoutMinutes), sessionId, runnerId, lockEpoch);
-    if (result.changes !== 1) {
-        throw new merge_errors_js_1.ParallelMergeError('Lost merge lock fence while refreshing heartbeat', 'MERGE_LOCK_FENCE_LOST');
-    }
-    const lock = getLatestMergeLock(db, sessionId);
-    if (!lock) {
-        throw new merge_errors_js_1.ParallelMergeError('Lost merge lock unexpectedly', 'MERGE_LOCK_NOT_FOUND');
-    }
-    if (lock.lock_epoch !== lockEpoch || lock.runner_id !== runnerId) {
-        throw new merge_errors_js_1.ParallelMergeError('Merge lock epoch mismatch detected', 'MERGE_LOCK_EPOCH_MISMATCH');
-    }
-    return lock;
-}
-function assertMergeLockEpoch(db, sessionId, runnerId, lockEpoch) {
-    const row = db
-        .prepare(`SELECT session_id, runner_id, lock_epoch, expires_at
-       FROM merge_locks
-       WHERE session_id = ? AND runner_id = ? AND lock_epoch = ?
-       LIMIT 1`)
-        .get(sessionId, runnerId, lockEpoch);
-    if (!row) {
-        throw new merge_errors_js_1.ParallelMergeError('Merge lock fence no longer owned by current runner', 'MERGE_LOCK_FENCE_LOST');
-    }
-    if (new Date(row.expires_at).getTime() < Date.now()) {
-        throw new merge_errors_js_1.ParallelMergeError('Merge lock expired', 'MERGE_LOCK_EXPIRED');
-    }
-}
-function releaseMergeLock(db, sessionId, runnerId, lockEpoch) {
-    db
-        .prepare('DELETE FROM merge_locks WHERE session_id = ? AND runner_id = ? AND lock_epoch = ?')
-        .run(sessionId, runnerId, lockEpoch);
-}
-//# sourceMappingURL=merge-lock.js.map

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

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

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

@@ -1,21 +0,0 @@
-/**
- * Per-workstream commit processing
- */
-import { MergeProgressRow } from './merge-progress.js';
-import { openDatabase } from '../database/connection.js';
-interface MergeWorkstreamSpec {
-    id: string;
-    branchName: string;
-}
-export declare function processWorkstream(db: ReturnType<typeof openDatabase>['db'], projectPath: string, sessionId: string, workstream: MergeWorkstreamSpec, mainBranch: string, remote: string, progressRows: MergeProgressRow[], heartbeat: {
-    sessionId: string;
-    runnerId: string;
-    timeoutMinutes: number;
-    lockEpoch: number;
-}): Promise<{
-    applied: number;
-    skipped: number;
-    conflicts: number;
-}>;
-export {};
-//# sourceMappingURL=merge-process.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"merge-process.d.ts","sourceRoot":"","sources":["../../src/parallel/merge-process.ts"],"names":[],"mappings":"AAAA;;GAEG;AAQH,OAAO,EAIL,gBAAgB,EACjB,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,UAAU,mBAAmB;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,iBAAiB,CACrC,EAAE,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,IAAI,CAAC,EACzC,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,gBAAgB,EAAE,EAChC,SAAS,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC5F,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAsHlE"}

package/dist/parallel/merge-process.js

@@ -1,104 +0,0 @@
-"use strict";
-/**
- * Per-workstream commit processing
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.processWorkstream = processWorkstream;
-const merge_git_js_1 = require("./merge-git.js");
-const merge_progress_js_1 = require("./merge-progress.js");
-const merge_conflict_js_1 = require("./merge-conflict.js");
-const merge_commit_checks_js_1 = require("./merge-commit-checks.js");
-const merge_lock_js_1 = require("./merge-lock.js");
-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) {
-            if ((0, merge_commit_checks_js_1.isAppliedCommitIntegrated)(projectPath, prior.applied_commit_sha)) {
-                summary.applied += 1;
-                continue;
-            }
-            (0, merge_progress_js_1.clearProgressEntry)(db, sessionId, workstream.id, position);
-        }
-        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,
-                    runnerId: heartbeat.runnerId,
-                    mergeLockHeartbeat: {
-                        lockEpoch: heartbeat.lockEpoch,
-                        timeoutMinutes: heartbeat.timeoutMinutes,
-                    },
-                    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]);
-            const appliedCommitSha = (0, merge_git_js_1.runGitCommand)(projectPath, ['rev-parse', 'HEAD']).trim();
-            (0, merge_progress_js_1.upsertProgressEntry)(db, sessionId, workstream.id, position, commitSha, 'applied', null, appliedCommitSha);
-            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,
-                runnerId: heartbeat.runnerId,
-                mergeLockHeartbeat: {
-                    lockEpoch: heartbeat.lockEpoch,
-                    timeoutMinutes: heartbeat.timeoutMinutes,
-                },
-                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, heartbeat.lockEpoch);
-    }
-    return summary;
-}
-//# sourceMappingURL=merge-process.js.map

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

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

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

@@ -1,22 +0,0 @@
-/**
- * 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;
-    applied_commit_sha: string | null;
-    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, appliedCommitSha?: string | null): void;
-export declare function getMergeProgressForWorkstream(rows: MergeProgressRow[], workstreamId: string): MergeProgressRow[];
-export declare function findMergeProgressBySourceCommit(rows: MergeProgressRow[], workstreamId: string, sourceCommitSha: string): MergeProgressRow | undefined;
-//# sourceMappingURL=merge-progress.d.ts.map

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

@@ -1 +0,0 @@
-{"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,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,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,EACpC,gBAAgB,GAAE,MAAM,GAAG,IAAW,GACrC,IAAI,CAmBN;AAED,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,gBAAgB,EAAE,EACxB,YAAY,EAAE,MAAM,GACnB,gBAAgB,EAAE,CAIpB;AAED,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,gBAAgB,EAAE,EACxB,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,MAAM,GACtB,gBAAgB,GAAG,SAAS,CAI9B"}

package/dist/parallel/merge-progress.js

@@ -1,41 +0,0 @@
-"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;
-exports.findMergeProgressBySourceCommit = findMergeProgressBySourceCommit;
-function getNowISOString() {
-    return new Date().toISOString();
-}
-function listMergeProgress(db, sessionId) {
-    return db
-        .prepare(`SELECT id, session_id, workstream_id, position, commit_sha, applied_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, appliedCommitSha = null) {
-    const payloadApplied = status === 'applied' ? getNowISOString() : null;
-    const payloadAppliedCommit = status === 'applied' ? appliedCommitSha : null;
-    clearProgressEntry(db, sessionId, workstreamId, position);
-    db.prepare(`INSERT INTO merge_progress
-      (session_id, workstream_id, position, commit_sha, applied_commit_sha, status, conflict_task_id, applied_at)
-     VALUES (?, ?, ?, ?, ?, ?, ?, ?)`).run(sessionId, workstreamId, position, commitSha, payloadAppliedCommit, status, conflictTaskId, payloadApplied);
-}
-function getMergeProgressForWorkstream(rows, workstreamId) {
-    return rows
-        .filter((row) => row.workstream_id === workstreamId)
-        .sort((left, right) => left.position - right.position);
-}
-function findMergeProgressBySourceCommit(rows, workstreamId, sourceCommitSha) {
-    return rows.find((row) => row.workstream_id === workstreamId && row.commit_sha === sourceCommitSha);
-}
-//# sourceMappingURL=merge-progress.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"merge-progress.js","sourceRoot":"","sources":["../../src/parallel/merge-progress.ts"],"names":[],"mappings":";AAAA;;GAEG;;AAqBH,8CASC;AAED,gDASC;AAED,kDA4BC;AAED,sEAOC;AAED,0EAQC;AAzED,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,EACpC,mBAAkC,IAAI;IAEtC,MAAM,cAAc,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACvE,MAAM,oBAAoB,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC;IAE5E,kBAAkB,CAAC,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;IAC1D,EAAE,CAAC,OAAO,CACR;;qCAEiC,CAClC,CAAC,GAAG,CACH,SAAS,EACT,YAAY,EACZ,QAAQ,EACR,SAAS,EACT,oBAAoB,EACpB,MAAM,EACN,cAAc,EACd,cAAc,CACf,CAAC;AACJ,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;AAED,SAAgB,+BAA+B,CAC7C,IAAwB,EACxB,YAAoB,EACpB,eAAuB;IAEvB,OAAO,IAAI,CAAC,IAAI,CACd,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,aAAa,KAAK,YAAY,IAAI,GAAG,CAAC,UAAU,KAAK,eAAe,CAClF,CAAC;AACJ,CAAC"}

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

@@ -1,8 +0,0 @@
-import { openDatabase } from '../database/connection.js';
-interface MergeWorkstreamSpec {
-    id: string;
-    branchName: string;
-}
-export declare function sealWorkstreamsForMerge(mergeDb: ReturnType<typeof openDatabase>['db'], sessionId: string, runnerId: string, lockEpoch: number, mergePath: string, remote: string, mainBranch: string, workstreams: MergeWorkstreamSpec[]): void;
-export {};
-//# sourceMappingURL=merge-sealing.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"merge-sealing.d.ts","sourceRoot":"","sources":["../../src/parallel/merge-sealing.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAIzD,UAAU,mBAAmB;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;CACpB;AASD,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,IAAI,CAAC,EAC9C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,mBAAmB,EAAE,GACjC,IAAI,CAwEN"}

package/dist/parallel/merge-sealing.js

@@ -1,60 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sealWorkstreamsForMerge = sealWorkstreamsForMerge;
-const global_db_js_1 = require("../runners/global-db.js");
-/**
- * Workstream sealing before cherry-pick merge
- */
-const merge_git_js_1 = require("./merge-git.js");
-const merge_lock_js_1 = require("./merge-lock.js");
-const merge_errors_js_1 = require("./merge-errors.js");
-function resolveGitSha(output) {
-    const trimmed = output.trim();
-    if (!trimmed)
-        return null;
-    if (/fatal:|error:/i.test(trimmed))
-        return null;
-    return trimmed.split('\n').at(-1)?.trim() ?? null;
-}
-function sealWorkstreamsForMerge(mergeDb, sessionId, runnerId, lockEpoch, mergePath, remote, mainBranch, workstreams) {
-    (0, global_db_js_1.withGlobalDatabase)((db) => {
-        const sealedEntries = [];
-        (0, merge_lock_js_1.assertMergeLockEpoch)(mergeDb, sessionId, runnerId, lockEpoch);
-        for (let index = 0; index < workstreams.length; index += 1) {
-            (0, merge_lock_js_1.assertMergeLockEpoch)(mergeDb, sessionId, runnerId, lockEpoch);
-            const stream = workstreams[index];
-            const commits = (0, merge_git_js_1.getWorkstreamCommitList)(mergePath, remote, stream.branchName, mainBranch);
-            const sealedHeadSha = resolveGitSha((0, merge_git_js_1.runGitCommand)(mergePath, ['rev-parse', `${remote}/${stream.branchName}`], { allowFailure: true }));
-            const sealedBaseSha = resolveGitSha((0, merge_git_js_1.runGitCommand)(mergePath, ['merge-base', `${remote}/${mainBranch}`, `${remote}/${stream.branchName}`], { allowFailure: true }));
-            if (!sealedHeadSha || !sealedBaseSha) {
-                throw new merge_errors_js_1.ParallelMergeError(`Could not resolve sealed merge SHAs for ${remote}/${stream.branchName}`, 'REMOTE_BRANCH_MISSING');
-            }
-            sealedEntries.push({
-                streamId: stream.id,
-                sealedBaseSha,
-                sealedHeadSha,
-                commits,
-                completionOrder: index + 1,
-            });
-        }
-        const applySealedUpdates = db.transaction(() => {
-            for (const entry of sealedEntries) {
-                const update = db.prepare(`UPDATE workstreams
-           SET sealed_base_sha = ?,
-               sealed_head_sha = ?,
-               sealed_commit_shas = ?,
-               completion_order = COALESCE(completion_order, ?),
-               completed_at = COALESCE(completed_at, datetime('now')),
-               status = 'completed'
-           WHERE session_id = ?
-             AND id = ?
-             AND status IN ('running', 'completed')`).run(entry.sealedBaseSha, entry.sealedHeadSha, JSON.stringify(entry.commits), entry.completionOrder, sessionId, entry.streamId);
-                if (update.changes !== 1) {
-                    throw new merge_errors_js_1.ParallelMergeError(`Workstream lease check failed while sealing ${entry.streamId}`, 'LEASE_FENCE_FAILED');
-                }
-            }
-        });
-        applySealedUpdates();
-    });
-}
-//# sourceMappingURL=merge-sealing.js.map

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

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

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

@@ -1,6 +0,0 @@
-/**
- * Merge validation gate and workspace utilities
- */
-export declare function runValidationGate(mergePath: string, validationCommand?: string): void;
-export declare function snippet(value: string | null | undefined, limit?: number): string;
-//# sourceMappingURL=merge-validation.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"merge-validation.d.ts","sourceRoot":"","sources":["../../src/parallel/merge-validation.ts"],"names":[],"mappings":"AAAA;;GAEG;AAQH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CA2CrF;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,KAAK,SAA2B,GAAG,MAAM,CAWlG"}

package/dist/parallel/merge-validation.js

@@ -1,57 +0,0 @@
-"use strict";
-/**
- * Merge validation gate and workspace utilities
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runValidationGate = runValidationGate;
-exports.snippet = snippet;
-const node_child_process_1 = require("node:child_process");
-const merge_errors_js_1 = require("./merge-errors.js");
-const VALIDATION_MAX_BUFFER_BYTES = 20 * 1024 * 1024;
-const VALIDATION_SNIPPET_LIMIT = 8_000;
-function runValidationGate(mergePath, validationCommand) {
-    if (!validationCommand || validationCommand.trim().length === 0) {
-        return;
-    }
-    try {
-        (0, node_child_process_1.execSync)(validationCommand, {
-            cwd: mergePath,
-            stdio: 'pipe',
-            encoding: 'utf-8',
-            maxBuffer: VALIDATION_MAX_BUFFER_BYTES,
-        });
-    }
-    catch (error) {
-        const err = error;
-        const stderr = typeof err.stderr === 'string' ? err.stderr : err.stderr?.toString() ?? '';
-        const stdout = typeof err.stdout === 'string' ? err.stdout : err.stdout?.toString() ?? '';
-        if (err.code === 'ENOBUFS') {
-            throw new merge_errors_js_1.ParallelMergeError('Validation gate output exceeded the maximum buffer size. Reduce output verbosity or split the command.', 'VALIDATION_FAILED', {
-                details: {
-                    command: validationCommand.trim(),
-                    stderr: stderr ?? '',
-                    stdout: stdout ?? '',
-                },
-            });
-        }
-        const message = [stderr, stdout, err.message].filter(Boolean).join('\n') || String(error);
-        throw new merge_errors_js_1.ParallelMergeError(`Validation gate failed: ${message}`, 'VALIDATION_FAILED', {
-            details: {
-                command: validationCommand.trim(),
-                stderr,
-                stdout,
-            },
-        });
-    }
-}
-function snippet(value, limit = VALIDATION_SNIPPET_LIMIT) {
-    if (!value) {
-        return '';
-    }
-    const trimmed = value.trim();
-    if (trimmed.length <= limit) {
-        return trimmed;
-    }
-    return trimmed.slice(-limit);
-}
-//# sourceMappingURL=merge-validation.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"merge-validation.js","sourceRoot":"","sources":["../../src/parallel/merge-validation.ts"],"names":[],"mappings":";AAAA;;GAEG;;AAQH,8CA2CC;AAED,0BAWC;AA9DD,2DAA8C;AAC9C,uDAAuD;AAEvD,MAAM,2BAA2B,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC;AACrD,MAAM,wBAAwB,GAAG,KAAK,CAAC;AAEvC,SAAgB,iBAAiB,CAAC,SAAiB,EAAE,iBAA0B;IAC7E,IAAI,CAAC,iBAAiB,IAAI,iBAAiB,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChE,OAAO;IACT,CAAC;IAED,IAAI,CAAC;QACH,IAAA,6BAAQ,EAAC,iBAAiB,EAAE;YAC1B,GAAG,EAAE,SAAS;YACd,KAAK,EAAE,MAAM;YACb,QAAQ,EAAE,OAAO;YACjB,SAAS,EAAE,2BAA2B;SACvC,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,MAAM,GAAG,GAAG,KAAsF,CAAC;QACnG,MAAM,MAAM,GAAG,OAAO,GAAG,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QAC1F,MAAM,MAAM,GAAG,OAAO,GAAG,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QAC1F,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC3B,MAAM,IAAI,oCAAkB,CAC1B,wGAAwG,EACxG,mBAAmB,EACnB;gBACE,OAAO,EAAE;oBACP,OAAO,EAAE,iBAAiB,CAAC,IAAI,EAAE;oBACjC,MAAM,EAAE,MAAM,IAAI,EAAE;oBACpB,MAAM,EAAE,MAAM,IAAI,EAAE;iBACrB;aACF,CACF,CAAC;QACJ,CAAC;QAED,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;QAC1F,MAAM,IAAI,oCAAkB,CAC1B,2BAA2B,OAAO,EAAE,EACpC,mBAAmB,EACnB;YACE,OAAO,EAAE;gBACP,OAAO,EAAE,iBAAiB,CAAC,IAAI,EAAE;gBACjC,MAAM;gBACN,MAAM;aACP;SACF,CACF,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAgB,OAAO,CAAC,KAAgC,EAAE,KAAK,GAAG,wBAAwB;IACxF,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,OAAO,CAAC,MAAM,IAAI,KAAK,EAAE,CAAC;QAC5B,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC"}

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

@@ -1,8 +0,0 @@
-/**
- * Merge workspace preparation and cleanup
- */
-export declare function ensureMergeWorkingTree(projectPath: string): void;
-export declare function cleanupWorkspaceState(projectPath: string, workspaceRoot: string, workstreamIds: string[], options: {
-    cleanupOnSuccess: boolean;
-}): void;
-//# sourceMappingURL=merge-workspace.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"merge-workspace.d.ts","sourceRoot":"","sources":["../../src/parallel/merge-workspace.ts"],"names":[],"mappings":"AAAA;;GAEG;AAQH,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAUhE;AAED,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,MAAM,EAAE,EACvB,OAAO,EAAE;IAAE,gBAAgB,EAAE,OAAO,CAAA;CAAE,GACrC,IAAI,CAqBN"}

package/dist/parallel/merge-workspace.js

@@ -1,37 +0,0 @@
-"use strict";
-/**
- * Merge workspace preparation and cleanup
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureMergeWorkingTree = ensureMergeWorkingTree;
-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 merge_git_js_1 = require("./merge-git.js");
-const merge_errors_js_1 = require("./merge-errors.js");
-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_1.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 });
-        }
-    }
-}
-//# sourceMappingURL=merge-workspace.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"merge-workspace.js","sourceRoot":"","sources":["../../src/parallel/merge-workspace.ts"],"names":[],"mappings":";AAAA;;GAEG;;AAQH,wDAUC;AAED,sDA0BC;AA5CD,yCAAoC;AACpC,qCAAiC;AACjC,yCAA4C;AAC5C,iDAAyE;AACzE,uDAAuD;AAEvD,SAAgB,sBAAsB,CAAC,WAAmB;IACxD,MAAM,KAAK,GAAG,IAAA,6BAAc,EAAC,WAAW,CAAC,CAAC;IAC1C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAE/B,IAAI,CAAC,IAAA,sCAAuB,EAAC,WAAW,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,oCAAkB,CAC1B,gEAAgE,EAChE,gBAAgB,CACjB,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAgB,qBAAqB,CACnC,WAAmB,EACnB,aAAqB,EACrB,aAAuB,EACvB,OAAsC;IAEtC,IAAI,CAAC,OAAO,CAAC,gBAAgB;QAAE,OAAO;IAEtC,MAAM,QAAQ,GAAG,IAAA,mBAAO,EAAC,aAAa,CAAC,CAAC;IACxC,MAAM,IAAI,GAAG,IAAA,yBAAc,EAAC,WAAW,CAAC,CAAC;IACzC,MAAM,oBAAoB,GAAG,IAAA,mBAAO,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAErD,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC/C,OAAO;IACT,CAAC;IAED,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;QACzC,MAAM,MAAM,GAAG,IAAA,mBAAO,EACpB,oBAAoB,EACpB,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,YAAY,EAAE,CACrE,CAAC;QAEF,IAAI,IAAA,mBAAO,EAAC,MAAM,CAAC,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE,CAAC;YACrD,IAAA,gBAAM,EAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/parallel/merge.d.ts

@@ -1,48 +0,0 @@
-/**
- * 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';
-import { cleanupWorkspaceState } from './merge-workspace.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;
-    integrationBranchName?: string;
-    validationCommand?: string;
-    /**
-     * When true, do NOT mark the session as 'completed' after merging this
-     * workstream. The caller is responsible for checking whether all workstreams
-     * are done and marking the session complete. Used by autoMergeOnCompletion
-     * so that a single fast workstream finishing doesn't mark the whole session
-     * complete while other workstreams are still running.
-     */
-    skipSessionComplete?: boolean;
-}
-export interface MergeResult {
-    success: boolean;
-    completedCommits: number;
-    conflicts: number;
-    skipped: number;
-    errors: string[];
-    validationEscalationId?: string;
-    validationWorkspacePath?: string;
-}
-/**
- * Run cherry-pick merge loop across completed workstreams.
- */
-export declare function runParallelMerge(options: MergeOptions): Promise<MergeResult>;
-export { MergeLockRecord, ParallelMergeError, cleanupWorkspaceState, };
-//# sourceMappingURL=merge.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/parallel/merge.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAmBH,OAAO,EACL,eAAe,EAKhB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,OAAO,EAA0B,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAIrF,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;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;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;IACjB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,uBAAuB,CAAC,EAAE,MAAM,CAAC;CAClC;AAOD;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,CA+OlF;AAED,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,qBAAqB,GACtB,CAAC"}