steroids-cli 0.9.11 → 0.9.13

package/dist/parallel/merge-commit-checks.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Commit integration checks and SHA resolution
+ */
+export declare function isAppliedCommitIntegrated(projectPath: string, commitSha: string | null): boolean;
+export declare function resolveGitSha(output: string): string | null;
+//# sourceMappingURL=merge-commit-checks.d.ts.map

package/dist/parallel/merge-commit-checks.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-commit-checks.d.ts","sourceRoot":"","sources":["../../src/parallel/merge-commit-checks.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,wBAAgB,yBAAyB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAiBhG;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAK3D"}

package/dist/parallel/merge-commit-checks.js

@@ -0,0 +1,28 @@
+"use strict";
+/**
+ * Commit integration checks and SHA resolution
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isAppliedCommitIntegrated = isAppliedCommitIntegrated;
+exports.resolveGitSha = resolveGitSha;
+const merge_git_js_1 = require("./merge-git.js");
+function isAppliedCommitIntegrated(projectPath, commitSha) {
+    if (!commitSha) {
+        return false;
+    }
+    const output = (0, merge_git_js_1.runGitCommand)(projectPath, ['branch', '--contains', commitSha, '--list', 'HEAD'], { allowFailure: true });
+    const lower = output.toLowerCase();
+    if (lower.includes('fatal:') || lower.includes('error:')) {
+        return false;
+    }
+    return output.trim().length > 0;
+}
+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;
+}
+//# sourceMappingURL=merge-commit-checks.js.map

package/dist/parallel/merge-commit-checks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-commit-checks.js","sourceRoot":"","sources":["../../src/parallel/merge-commit-checks.ts"],"names":[],"mappings":";AAAA;;GAEG;;AAIH,8DAiBC;AAED,sCAKC;AA1BD,iDAA+C;AAE/C,SAAgB,yBAAyB,CAAC,WAAmB,EAAE,SAAwB;IACrF,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,4BAAa,EAC1B,WAAW,EACX,CAAC,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC,EACrD,EAAE,YAAY,EAAE,IAAI,EAAE,CACvB,CAAC;IACF,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;IAEnC,IAAI,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;AAClC,CAAC;AAED,SAAgB,aAAa,CAAC,MAAc;IAC1C,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;IAC9B,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAC1B,IAAI,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAC;IAChD,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC;AACpD,CAAC"}

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

@@ -0,0 +1,21 @@
+/**
+ * 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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,104 @@
+"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

@@ -0,0 +1 @@
+{"version":3,"file":"merge-process.js","sourceRoot":"","sources":["../../src/parallel/merge-process.ts"],"names":[],"mappings":";AAAA;;GAEG;;AAwBH,8CA+HC;AArJD,iDAKwB;AACxB,2DAK6B;AAC7B,2DAAiE;AACjE,qEAAqE;AACrE,mDAAmD;AAQ5C,KAAK,UAAU,iBAAiB,CACrC,EAAyC,EACzC,WAAmB,EACnB,SAAiB,EACjB,UAA+B,EAC/B,UAAkB,EAClB,MAAc,EACd,YAAgC,EAChC,SAA6F;IAE7F,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC;IACzD,MAAM,OAAO,GAAG,IAAA,sCAAuB,EAAC,WAAW,EAAE,MAAM,EAAE,UAAU,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAEhG,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,kBAAkB,GAAG,IAAA,iDAA6B,EAAC,YAAY,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;IACtF,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAA4B,CAAC;IAC7D,KAAK,MAAM,GAAG,IAAI,kBAAkB,EAAE,CAAC;QACrC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,IAAI,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,QAAQ,IAAI,CAAC,EAAE,CAAC;QAChE,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;QACpC,MAAM,QAAQ,GAAG,IAAA,gCAAiB,EAAC,SAAS,CAAC,CAAC;QAC9C,MAAM,KAAK,GAAG,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE7C,IAAI,KAAK,EAAE,MAAM,KAAK,SAAS,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YAClE,IAAI,IAAA,kDAAyB,EAAC,WAAW,EAAE,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAC;gBACrE,OAAO,CAAC,OAAO,IAAI,CAAC,CAAC;gBACrB,SAAS;YACX,CAAC;YAED,IAAA,sCAAkB,EAAC,EAAE,EAAE,SAAS,EAAE,UAAU,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QAC7D,CAAC;QAED,IAAI,KAAK,EAAE,MAAM,KAAK,SAAS,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YAClE,OAAO,CAAC,OAAO,IAAI,CAAC,CAAC;YACrB,SAAS;QACX,CAAC;QAED,IAAI,KAAK,EAAE,MAAM,KAAK,UAAU,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YACnE,IAAI,IAAA,sCAAuB,EAAC,WAAW,CAAC,EAAE,CAAC;gBACzC,MAAM,OAAO,GAAG,MAAM,IAAA,8CAA0B,EAAC;oBAC/C,EAAE;oBACF,WAAW;oBACX,SAAS;oBACT,YAAY,EAAE,UAAU,CAAC,EAAE;oBAC3B,QAAQ,EAAE,SAAS,CAAC,QAAQ;oBAC5B,kBAAkB,EAAE;wBAClB,SAAS,EAAE,SAAS,CAAC,SAAS;wBAC9B,cAAc,EAAE,SAAS,CAAC,cAAc;qBACzC;oBACD,UAAU,EAAE,UAAU,CAAC,UAAU;oBACjC,QAAQ;oBACR,SAAS;oBACT,cAAc,EAAE,KAAK,CAAC,gBAAgB,IAAI,SAAS;iBACpD,CAAC,CAAC;gBAEH,IAAI,OAAO,KAAK,SAAS;oBAAE,OAAO,CAAC,OAAO,IAAI,CAAC,CAAC;;oBAC3C,OAAO,CAAC,OAAO,IAAI,CAAC,CAAC;gBAC1B,OAAO,CAAC,SAAS,IAAI,CAAC,CAAC;gBACvB,SAAS;YACX,CAAC;YAED,IAAA,sCAAkB,EAAC,EAAE,EAAE,SAAS,EAAE,UAAU,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QAC7D,CAAC;QAED,IAAI,KAAK,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YAC5C,IAAA,sCAAkB,EAAC,EAAE,EAAE,SAAS,EAAE,UAAU,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QAC7D,CAAC;QAED,IAAI,CAAC;YACH,IAAA,4BAAa,EAAC,WAAW,EAAE,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC,CAAC;YACvD,MAAM,gBAAgB,GAAG,IAAA,4BAAa,EAAC,WAAW,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAClF,IAAA,uCAAmB,EACjB,EAAE,EACF,SAAS,EACT,UAAU,CAAC,EAAE,EACb,QAAQ,EACR,SAAS,EACT,SAAS,EACT,IAAI,EACJ,gBAAgB,CACjB,CAAC;YACF,OAAO,CAAC,OAAO,IAAI,CAAC,CAAC;QACvB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvE,IAAI,CAAC,sDAAsD,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC1E,MAAM,KAAK,CAAC;YACd,CAAC;YAED,MAAM,OAAO,GAAG,MAAM,IAAA,8CAA0B,EAAC;gBAC/C,EAAE;gBACF,WAAW;gBACX,SAAS;gBACT,YAAY,EAAE,UAAU,CAAC,EAAE;gBAC3B,QAAQ,EAAE,SAAS,CAAC,QAAQ;gBAC5B,kBAAkB,EAAE;oBAClB,SAAS,EAAE,SAAS,CAAC,SAAS;oBAC9B,cAAc,EAAE,SAAS,CAAC,cAAc;iBACzC;gBACD,UAAU,EAAE,UAAU,CAAC,UAAU;gBACjC,QAAQ;gBACR,SAAS;aACV,CAAC,CAAC;YAEH,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;gBAC1B,OAAO,CAAC,OAAO,IAAI,CAAC,CAAC;YACvB,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,OAAO,IAAI,CAAC,CAAC;YACvB,CAAC;YAED,OAAO,CAAC,SAAS,IAAI,CAAC,CAAC;QACzB,CAAC;QAED,IAAA,gCAAgB,EACd,EAAE,EACF,SAAS,CAAC,SAAS,EACnB,SAAS,CAAC,QAAQ,EAClB,SAAS,CAAC,cAAc,EACxB,SAAS,CAAC,SAAS,CACpB,CAAC;IACJ,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}

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

@@ -0,0 +1,11 @@
+/**
+ * Workstream sealing before cherry-pick merge
+ */
+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

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

package/dist/parallel/merge-sealing.js

@@ -0,0 +1,64 @@
+"use strict";
+/**
+ * Workstream sealing before cherry-pick merge
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sealWorkstreamsForMerge = sealWorkstreamsForMerge;
+const merge_git_js_1 = require("./merge-git.js");
+const merge_lock_js_1 = require("./merge-lock.js");
+const global_db_js_1 = require("../runners/global-db.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) {
+    const { db, close } = (0, global_db_js_1.openGlobalDatabase)();
+    try {
+        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();
+    }
+    finally {
+        close();
+    }
+}
+//# sourceMappingURL=merge-sealing.js.map

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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,6 @@
+/**
+ * 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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,57 @@
+"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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,8 @@
+/**
+ * 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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,37 @@
+"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

@@ -0,0 +1 @@
+{"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

@@ -4,6 +4,7 @@
  */
 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;
@@ -39,13 +40,9 @@ export interface MergeResult {
     validationEscalationId?: string;
     validationWorkspacePath?: 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, };
+export { MergeLockRecord, ParallelMergeError, cleanupWorkspaceState, };
 //# sourceMappingURL=merge.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/parallel/merge.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAwBH,OAAO,EACL,eAAe,EAKhB,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;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;AASD,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;AA6SD;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,CAgOlF;AAED,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,eAAe,EACf,qBAAqB,GACtB,CAAC"}
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/parallel/merge.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAkBH,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,CAgOlF;AAED,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,qBAAqB,GACtB,CAAC"}