steroids-cli 0.15.4 → 0.15.6

package/dist/parallel/merge.js

@@ -1,228 +0,0 @@
-"use strict";
-/**
- * Parallel merge orchestration
- * Cherry-picks completed workstream branches into main with crash-safe progress tracking.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.cleanupWorkspaceState = exports.ParallelMergeError = void 0;
-exports.runParallelMerge = runParallelMerge;
-const node_path_1 = require("node:path");
-const node_fs_1 = require("node:fs");
-const clone_js_1 = require("./clone.js");
-const pool_js_1 = require("../workspace/pool.js");
-const connection_js_1 = require("../database/connection.js");
-const global_db_js_1 = require("../runners/global-db.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_errors_js_1 = require("./merge-errors.js");
-Object.defineProperty(exports, "ParallelMergeError", { enumerable: true, get: function () { return merge_errors_js_1.ParallelMergeError; } });
-const merge_validation_js_1 = require("./merge-validation.js");
-const merge_workspace_js_1 = require("./merge-workspace.js");
-Object.defineProperty(exports, "cleanupWorkspaceState", { enumerable: true, get: function () { return merge_workspace_js_1.cleanupWorkspaceState; } });
-const merge_sealing_js_1 = require("./merge-sealing.js");
-const merge_process_js_1 = require("./merge-process.js");
-const DEFAULT_REMOTE = 'origin';
-const DEFAULT_MAIN_BRANCH = 'main';
-const DEFAULT_LOCK_TIMEOUT_MINUTES = 120;
-const DEFAULT_HEARTBEAT_INTERVAL_MS = 30_000;
-/**
- * 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 integrationBranchName = options.integrationBranchName ?? `steroids/integration-${sessionId.slice(0, 8)}`;
-    const validationCommand = options.validationCommand;
-    let mergePath = projectPath;
-    let integrationWorkspacePath = null;
-    const { db, close } = (0, connection_js_1.openDatabase)(projectPath);
-    const summary = {
-        success: false,
-        completedCommits: 0,
-        conflicts: 0,
-        skipped: 0,
-        errors: [],
-    };
-    let heartbeatTimer = null;
-    let lockEpoch = 0;
-    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;
-        }
-        lockEpoch = lock.lock?.lock_epoch ?? 0;
-        (0, merge_lock_js_1.assertMergeLockEpoch)(db, sessionId, runnerId, lockEpoch);
-        (0, global_db_js_1.updateParallelSessionStatus)(sessionId, 'merging');
-        const canonicalRemoteUrl = (0, pool_js_1.resolveRemoteUrl)(projectPath);
-        const integrationWorkspace = (0, clone_js_1.createIntegrationWorkspace)({
-            projectPath,
-            sessionId,
-            baseBranch: mainBranch,
-            remote,
-            workspaceRoot,
-            integrationBranchName,
-            canonicalRemoteUrl: canonicalRemoteUrl ?? undefined,
-        });
-        mergePath = integrationWorkspace.workspacePath;
-        integrationWorkspacePath = integrationWorkspace.workspacePath;
-        const recoveringFromCherryPick = (0, merge_git_js_1.hasCherryPickInProgress)(mergePath);
-        heartbeatTimer = setInterval(() => {
-            try {
-                (0, merge_lock_js_1.refreshMergeLock)(db, sessionId, runnerId, lockTimeoutMinutes, lockEpoch);
-                (0, merge_lock_js_1.assertMergeLockEpoch)(db, sessionId, runnerId, lockEpoch);
-            }
-            catch {
-                // If heartbeat fails, merge keeps running until lock-dependent operations fail.
-            }
-        }, heartbeatIntervalMs);
-        (0, merge_workspace_js_1.ensureMergeWorkingTree)(mergePath);
-        (0, merge_lock_js_1.assertMergeLockEpoch)(db, sessionId, runnerId, lockEpoch);
-        const availableWorkstreams = [];
-        for (const stream of workstreams) {
-            (0, merge_lock_js_1.assertMergeLockEpoch)(db, sessionId, runnerId, lockEpoch);
-            try {
-                (0, merge_git_js_1.safeRunMergeCommand)(mergePath, remote, stream.branchName);
-                availableWorkstreams.push(stream);
-            }
-            catch (error) {
-                if (error instanceof merge_errors_js_1.ParallelMergeError && error.code === 'REMOTE_BRANCH_MISSING') {
-                    // Branch may already be deleted by a previous successful merge attempt.
-                    // Treat as non-fatal to avoid failing the whole session recovery.
-                    summary.skipped += 1;
-                    continue;
-                }
-                throw error;
-            }
-        }
-        (0, merge_sealing_js_1.sealWorkstreamsForMerge)(db, sessionId, runnerId, lockEpoch, mergePath, remote, mainBranch, availableWorkstreams);
-        if (!recoveringFromCherryPick) {
-            const pullOutput = (0, merge_git_js_1.runGitCommand)(mergePath, ['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 availableWorkstreams) {
-            const stats = await (0, merge_process_js_1.processWorkstream)(db, mergePath, sessionId, workstream, mainBranch, remote, progressRows, { sessionId, runnerId, timeoutMinutes: lockTimeoutMinutes, lockEpoch });
-            summary.completedCommits += stats.applied;
-            summary.skipped += stats.skipped;
-            summary.conflicts += stats.conflicts;
-        }
-        (0, merge_validation_js_1.runValidationGate)(mergePath, validationCommand);
-        (0, merge_lock_js_1.assertMergeLockEpoch)(db, sessionId, runnerId, lockEpoch);
-        const pushResult = (0, merge_git_js_1.runGitCommand)(mergePath, ['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');
-        }
-        (0, global_db_js_1.updateParallelSessionStatus)(sessionId, 'cleanup_draining');
-        for (const stream of workstreams) {
-            try {
-                (0, merge_lock_js_1.assertMergeLockEpoch)(db, sessionId, runnerId, lockEpoch);
-                (0, merge_git_js_1.runGitCommand)(mergePath, ['push', remote, '--delete', stream.branchName]);
-            }
-            catch {
-                // Ignore branch delete failures; branch may already be deleted.
-            }
-        }
-        (0, merge_git_js_1.runGitCommand)(mergePath, ['remote', 'prune', remote]);
-        if (cleanupOnSuccess) {
-            (0, merge_workspace_js_1.cleanupWorkspaceState)(projectPath, workspaceRoot, workstreams.map((stream) => stream.id), {
-                cleanupOnSuccess,
-            });
-            if (integrationWorkspacePath) {
-                (0, node_fs_1.rmSync)(integrationWorkspacePath, { recursive: true, force: true });
-                integrationWorkspacePath = null;
-            }
-        }
-        else {
-            (0, global_db_js_1.updateParallelSessionStatus)(sessionId, 'cleanup_pending');
-        }
-        summary.success = true;
-        try {
-            (0, global_db_js_1.resolveValidationEscalationsForSession)(sessionId);
-        }
-        catch {
-            // best-effort resolution marker; merge completion should not fail because of escalation bookkeeping.
-        }
-        if (options.skipSessionComplete) {
-            // Caller will decide when to mark session complete (e.g. after all workstreams finish).
-            // Reset to 'running' so wakeup does not see a terminal-ish status and spawn a new session.
-            (0, global_db_js_1.updateParallelSessionStatus)(sessionId, 'running');
-        }
-        else {
-            (0, global_db_js_1.updateParallelSessionStatus)(sessionId, 'completed', true);
-        }
-        return summary;
-    }
-    catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        if (!summary.errors.includes(message)) {
-            summary.errors.push(message);
-        }
-        if (error instanceof merge_errors_js_1.ParallelMergeError && error.code === 'VALIDATION_FAILED') {
-            const commandFromError = typeof error.details?.command === 'string' ? error.details.command : null;
-            const stderrFromError = typeof error.details?.stderr === 'string' ? error.details.stderr : null;
-            const stdoutFromError = typeof error.details?.stdout === 'string' ? error.details.stdout : null;
-            try {
-                const escalation = (0, global_db_js_1.recordValidationEscalation)({
-                    sessionId,
-                    projectPath,
-                    workspacePath: integrationWorkspacePath ?? mergePath,
-                    validationCommand: commandFromError ?? (validationCommand?.trim() || '(not configured)'),
-                    errorMessage: message,
-                    stdoutSnippet: (0, merge_validation_js_1.snippet)(stdoutFromError),
-                    stderrSnippet: (0, merge_validation_js_1.snippet)(stderrFromError || message),
-                });
-                summary.validationEscalationId = escalation.id;
-                summary.validationWorkspacePath = escalation.workspace_path;
-                summary.errors.push(`Validation blocked for session ${sessionId}. Escalation ${escalation.id} created. Workspace preserved at ${escalation.workspace_path}.`);
-            }
-            catch (escalationError) {
-                const escalationMessage = escalationError instanceof Error ? escalationError.message : String(escalationError);
-                summary.errors.push(`Validation escalation persistence failed for session ${sessionId}: ${escalationMessage}. Workspace preserved at ${integrationWorkspacePath ?? mergePath}.`);
-            }
-            (0, global_db_js_1.updateParallelSessionStatus)(sessionId, 'blocked_validation', false);
-        }
-        else if (error instanceof merge_errors_js_1.ParallelMergeError && error.code === 'CONFLICT_ATTEMPT_LIMIT') {
-            (0, global_db_js_1.updateParallelSessionStatus)(sessionId, 'blocked_conflict', false);
-        }
-        else {
-            (0, global_db_js_1.updateParallelSessionStatus)(sessionId, 'failed', true);
-        }
-        return summary;
-    }
-    finally {
-        if (heartbeatTimer) {
-            clearInterval(heartbeatTimer);
-            heartbeatTimer = null;
-        }
-        if (cleanupOnSuccess && integrationWorkspacePath && summary.success) {
-            (0, node_fs_1.rmSync)(integrationWorkspacePath, { recursive: true, force: true });
-        }
-        if (lockEpoch > 0) {
-            (0, merge_lock_js_1.releaseMergeLock)(db, sessionId, runnerId, lockEpoch);
-        }
-        close();
-    }
-}
-//# sourceMappingURL=merge.js.map

package/dist/parallel/merge.js.map

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

package/dist/workspace/git-lifecycle-merge.d.ts

@@ -1,23 +0,0 @@
-/**
- * Phase 5: Post-Review Merge Pipeline.
- *
- * Extracted from git-lifecycle.ts for 500-line compliance.
- * Implements rebase, push, ff-only merge, push base, verify, cleanup.
- */
-import type Database from 'better-sqlite3';
-import type { PoolSlot } from './types.js';
-export type MergeResult = {
-    ok: true;
-    mergedSha: string;
-} | {
-    ok: false;
-    reason: string;
-    conflict: boolean;
-    infrastructure?: boolean;
-};
-/**
- * Full merge pipeline: rebase, push, ff-only merge, push base, verify, cleanup.
- * Acquires merge lock for serialization.
- */
-export declare function mergeToBase(globalDb: Database.Database, slot: PoolSlot, taskId: string): MergeResult;
-//# sourceMappingURL=git-lifecycle-merge.d.ts.map

package/dist/workspace/git-lifecycle-merge.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"git-lifecycle-merge.d.ts","sourceRoot":"","sources":["../../src/workspace/git-lifecycle-merge.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAE3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAmB3C,MAAM,MAAM,WAAW,GACnB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAM/E;;;GAGG;AACH,wBAAgB,WAAW,CACzB,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAC3B,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,MAAM,GACb,WAAW,CAkLb"}

package/dist/workspace/git-lifecycle-merge.js

@@ -1,159 +0,0 @@
-"use strict";
-/**
- * Phase 5: Post-Review Merge Pipeline.
- *
- * Extracted from git-lifecycle.ts for 500-line compliance.
- * Implements rebase, push, ff-only merge, push base, verify, cleanup.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeToBase = mergeToBase;
-const git_helpers_js_1 = require("./git-helpers.js");
-const git_lifecycle_js_1 = require("./git-lifecycle.js");
-const pool_js_1 = require("./pool.js");
-const merge_lock_js_1 = require("./merge-lock.js");
-// ─────────────────────────────────────────────────────────────────────────────
-// Merge pipeline
-// ─────────────────────────────────────────────────────────────────────────────
-/**
- * Full merge pipeline: rebase, push, ff-only merge, push base, verify, cleanup.
- * Acquires merge lock for serialization.
- */
-function mergeToBase(globalDb, slot, taskId) {
-    const slotPath = slot.slot_path;
-    const localOnly = slot.remote_url === null;
-    const remote = 'origin';
-    const baseBranch = slot.base_branch;
-    const taskBranch = slot.task_branch;
-    const startingSha = slot.starting_sha;
-    const baseRef = localOnly ? baseBranch : `${remote}/${baseBranch}`;
-    // Step 2: Verify commits exist
-    const log = (0, git_helpers_js_1.getLogOneline)(slotPath, `${startingSha}..HEAD`);
-    if (!log || log.trim().length === 0) {
-        return { ok: false, reason: 'No commits to merge', conflict: false };
-    }
-    // Step 3: Acquire merge lock
-    const lockAcquired = (0, merge_lock_js_1.acquireWorkspaceMergeLock)(globalDb, slot.project_id, slot.runner_id, slot.id, 300_000, // 5 min timeout
-    5_000 // 5s poll
-    );
-    if (!lockAcquired) {
-        return {
-            ok: false,
-            reason: 'Could not acquire merge lock within 5 minutes',
-            conflict: false,
-        };
-    }
-    // Update status to merging
-    (0, pool_js_1.updateSlotStatus)(globalDb, slot.id, 'merging');
-    try {
-        // Step 4: Fetch base (skip for local-only)
-        if (!localOnly) {
-            const fetchResult = (0, git_helpers_js_1.execGit)(slotPath, ['fetch', remote], {
-                tolerateFailure: true,
-                timeoutMs: 120_000,
-            });
-            if (fetchResult === null) {
-                // Transient fetch failure — existing retry path
-                (0, merge_lock_js_1.releaseWorkspaceMergeLock)(globalDb, slot.project_id);
-                return { ok: false, reason: 'git fetch origin failed during merge', conflict: false };
-            }
-            // Verify base branch exists after successful fetch
-            if ((0, git_lifecycle_js_1.verifyBaseRef)(slotPath, baseBranch, localOnly) === 'missing') {
-                (0, merge_lock_js_1.releaseWorkspaceMergeLock)(globalDb, slot.project_id);
-                return {
-                    ok: false,
-                    reason: `Remote base branch '${baseBranch}' does not exist on origin`,
-                    conflict: false,
-                    infrastructure: true,
-                };
-            }
-        }
-        // Step 5: Rebase task branch onto base
-        const rebaseResult = (0, git_helpers_js_1.execGit)(slotPath, ['rebase', baseRef], { tolerateFailure: true });
-        if (rebaseResult === null) {
-            // Rebase failed (likely conflicts)
-            (0, git_helpers_js_1.abortRebase)(slotPath);
-            (0, git_helpers_js_1.execGit)(slotPath, ['rebase', '--abort'], { tolerateFailure: true });
-            (0, merge_lock_js_1.releaseWorkspaceMergeLock)(globalDb, slot.project_id);
-            return { ok: false, reason: 'Rebase conflict', conflict: true };
-        }
-        if (!localOnly) {
-            // Step 6: Push task branch with force-with-lease
-            const pushTaskResult = (0, git_helpers_js_1.pushWithRetries)(slotPath, remote, taskBranch, 3, [1000, 4000, 16000], true // --force-with-lease
-            );
-            if (!pushTaskResult.success) {
-                (0, merge_lock_js_1.releaseWorkspaceMergeLock)(globalDb, slot.project_id);
-                return {
-                    ok: false,
-                    reason: pushTaskResult.error || 'Push task branch failed',
-                    conflict: false,
-                };
-            }
-        }
-        // Step 7: Merge to base branch (ff-only)
-        (0, git_helpers_js_1.execGit)(slotPath, ['checkout', baseBranch]);
-        (0, git_helpers_js_1.execGit)(slotPath, ['reset', '--hard', baseRef]);
-        const mergeResult = (0, git_helpers_js_1.execGit)(slotPath, ['merge', '--ff-only', taskBranch], { tolerateFailure: true });
-        if (mergeResult === null) {
-            (0, merge_lock_js_1.releaseWorkspaceMergeLock)(globalDb, slot.project_id);
-            return {
-                ok: false,
-                reason: 'ff-only merge failed (invariant violation)',
-                conflict: false,
-            };
-        }
-        if (!localOnly) {
-            // Step 8: Push base branch
-            const pushBaseResult = (0, git_helpers_js_1.pushWithRetries)(slotPath, remote, baseBranch, 3, [2000, 8000, 32000]);
-            if (!pushBaseResult.success) {
-                (0, merge_lock_js_1.releaseWorkspaceMergeLock)(globalDb, slot.project_id);
-                return {
-                    ok: false,
-                    reason: pushBaseResult.error || 'Push base branch failed',
-                    conflict: false,
-                };
-            }
-        }
-        // Step 9: Release merge lock
-        (0, merge_lock_js_1.releaseWorkspaceMergeLock)(globalDb, slot.project_id);
-        // Step 10: Verify reachability (remote only)
-        if (!localOnly) {
-            (0, git_helpers_js_1.execGit)(slotPath, ['fetch', remote, baseBranch], {
-                tolerateFailure: true,
-                timeoutMs: 120_000,
-            });
-            const mergedSha = (0, git_helpers_js_1.execGit)(slotPath, ['rev-parse', taskBranch]);
-            if (mergedSha) {
-                const reachable = (0, git_helpers_js_1.isAncestor)(slotPath, mergedSha, `${remote}/${baseBranch}`);
-                if (!reachable) {
-                    console.error(`[workspace] ERROR: merged SHA ${mergedSha} not reachable from ${remote}/${baseBranch} — push may have failed silently`);
-                    // Don't delete task branch — leave it for manual inspection
-                    return { ok: false, reason: `Merged SHA ${mergedSha} not reachable from remote base (push failed silently)`, conflict: false };
-                }
-            }
-        }
-        // Step 11: Cleanup
-        const mergedSha = (0, git_helpers_js_1.execGit)(slotPath, ['rev-parse', taskBranch]) || '';
-        if (!localOnly) {
-            // Delete remote task branch (ignore failure)
-            (0, git_helpers_js_1.execGit)(slotPath, ['push', remote, '--delete', taskBranch], {
-                tolerateFailure: true,
-            });
-        }
-        // Delete local task branch
-        (0, git_helpers_js_1.execGit)(slotPath, ['branch', '-D', taskBranch], { tolerateFailure: true });
-        // Reset worktree to base
-        (0, git_helpers_js_1.execGit)(slotPath, ['checkout', baseBranch]);
-        (0, git_helpers_js_1.execGit)(slotPath, ['reset', '--hard', baseRef]);
-        return { ok: true, mergedSha };
-    }
-    catch (error) {
-        // Release lock on any unexpected error
-        (0, merge_lock_js_1.releaseWorkspaceMergeLock)(globalDb, slot.project_id);
-        return {
-            ok: false,
-            reason: `Unexpected error: ${error instanceof Error ? error.message : String(error)}`,
-            conflict: false,
-        };
-    }
-}
-//# sourceMappingURL=git-lifecycle-merge.js.map

package/dist/workspace/git-lifecycle-merge.js.map

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

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

@@ -1,21 +0,0 @@
-/**
- * Merge failure handling for the workspace pool lifecycle.
- * Encapsulates the logic for handling merge/push/rebase failures,
- * incrementing counters, and deciding whether to block or retry.
- */
-import type Database from 'better-sqlite3';
-import type { PoolSlotContext } from './types.js';
-import type { MergeResult } from './git-lifecycle-merge.js';
-export interface MergeFailureResult {
-    taskBlocked: boolean;
-    blockStatus?: 'blocked_conflict' | 'blocked_error';
-    reason: string;
-}
-/**
- * Handle a merge pipeline failure: increment counters, check caps,
- * release slot, return task to pending or block.
- */
-export declare function handleMergeFailure(projectDb: Database.Database, ctx: PoolSlotContext, taskId: string, mergeResult: MergeResult & {
-    ok: false;
-}): MergeFailureResult;
-//# sourceMappingURL=merge-pipeline.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"merge-pipeline.d.ts","sourceRoot":"","sources":["../../src/workspace/merge-pipeline.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAa5D,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,kBAAkB,GAAG,eAAe,CAAC;IACnD,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,QAAQ,CAAC,QAAQ,EAC5B,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,WAAW,GAAG;IAAE,EAAE,EAAE,KAAK,CAAA;CAAE,GACvC,kBAAkB,CAuFpB"}

package/dist/workspace/merge-pipeline.js

@@ -1,74 +0,0 @@
-"use strict";
-/**
- * Merge failure handling for the workspace pool lifecycle.
- * Encapsulates the logic for handling merge/push/rebase failures,
- * incrementing counters, and deciding whether to block or retry.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleMergeFailure = handleMergeFailure;
-const git_lifecycle_js_1 = require("./git-lifecycle.js");
-const queries_js_1 = require("../database/queries.js");
-const pool_js_1 = require("./pool.js");
-const MAX_CONFLICT_COUNT = 3;
-const MAX_MERGE_FAILURE_COUNT = 3;
-/**
- * Handle a merge pipeline failure: increment counters, check caps,
- * release slot, return task to pending or block.
- */
-function handleMergeFailure(projectDb, ctx, taskId, mergeResult) {
-    // Infrastructure failure (e.g. missing remote base branch) — block immediately, PRESERVE branch for diagnosis
-    if (mergeResult.infrastructure) {
-        (0, pool_js_1.releaseSlot)(ctx.globalDb, ctx.slot.id);
-        (0, queries_js_1.setTaskBlocked)(projectDb, taskId, 'blocked_error', `Infrastructure failure: ${mergeResult.reason}`);
-        return {
-            taskBlocked: true,
-            blockStatus: 'blocked_error',
-            reason: `Blocked: ${mergeResult.reason}`,
-        };
-    }
-    if (mergeResult.conflict) {
-        // ---- ORDERING CONSTRAINT: delete branch BEFORE releaseSlot ----
-        // releaseSlot clears task_branch in DB; we read from the in-memory
-        // ctx.slot which still has the value. Once the slot is idle, another
-        // runner could claim it, so the branch must be gone first.
-        const slot = ctx.slot;
-        if (slot.task_branch && slot.slot_path) {
-            (0, git_lifecycle_js_1.deleteTaskBranchFromSlot)(slot.slot_path, slot.task_branch);
-        }
-        (0, pool_js_1.releaseSlot)(ctx.globalDb, ctx.slot.id);
-        // Rebase conflict path
-        const conflictCount = (0, queries_js_1.incrementTaskConflictCount)(projectDb, taskId);
-        if (conflictCount >= MAX_CONFLICT_COUNT) {
-            (0, queries_js_1.setTaskBlocked)(projectDb, taskId, 'blocked_conflict', `Rebase conflict on ${conflictCount} consecutive attempts: ${mergeResult.reason}`);
-            return {
-                taskBlocked: true,
-                blockStatus: 'blocked_conflict',
-                reason: `Blocked after ${conflictCount} rebase conflicts`,
-            };
-        }
-        // Return to pending for full retry
-        (0, queries_js_1.returnTaskToPending)(projectDb, taskId, 'orchestrator', `Rebase conflict (attempt ${conflictCount}/${MAX_CONFLICT_COUNT}): ${mergeResult.reason}`);
-        return {
-            taskBlocked: false,
-            reason: `Rebase conflict (attempt ${conflictCount}/${MAX_CONFLICT_COUNT})`,
-        };
-    }
-    // General merge failure — PRESERVE branch, only release slot
-    (0, pool_js_1.releaseSlot)(ctx.globalDb, ctx.slot.id);
-    const mergeFailureCount = (0, queries_js_1.incrementMergeFailureCount)(projectDb, taskId);
-    if (mergeFailureCount >= MAX_MERGE_FAILURE_COUNT) {
-        (0, queries_js_1.setTaskBlocked)(projectDb, taskId, 'blocked_error', `Merge pipeline failed ${mergeFailureCount} times: ${mergeResult.reason}`);
-        return {
-            taskBlocked: true,
-            blockStatus: 'blocked_error',
-            reason: `Blocked after ${mergeFailureCount} merge failures`,
-        };
-    }
-    // Return to pending for full retry
-    (0, queries_js_1.returnTaskToPending)(projectDb, taskId, 'orchestrator', `Merge failure (attempt ${mergeFailureCount}/${MAX_MERGE_FAILURE_COUNT}): ${mergeResult.reason}`);
-    return {
-        taskBlocked: false,
-        reason: `Merge failure (attempt ${mergeFailureCount}/${MAX_MERGE_FAILURE_COUNT})`,
-    };
-}
-//# sourceMappingURL=merge-pipeline.js.map

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

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