steroids-cli 0.15.3 → 0.15.5

package/dist/commands/merge.js

@@ -1,246 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeCommand = mergeCommand;
-/**
- * steroids merge - Merge completed parallel workstreams
- */
-const node_util_1 = require("node:util");
-const node_crypto_1 = require("node:crypto");
-const node_fs_1 = require("node:fs");
-const node_path_1 = require("node:path");
-const output_js_1 = require("../cli/output.js");
-const help_js_1 = require("../cli/help.js");
-const errors_js_1 = require("../cli/errors.js");
-const connection_js_1 = require("../database/connection.js");
-const global_db_js_1 = require("../runners/global-db.js");
-const loader_js_1 = require("../config/loader.js");
-const merge_js_1 = require("../parallel/merge.js");
-const HELP = (0, help_js_1.generateHelp)({
-    command: 'merge',
-    description: 'Merge completed parallel workstreams into main',
-    details: `When running parallel sessions, each workstream is merged via cherry-pick.
-  This command runs the final merge step for a completed parallel session and recovers
-  from stale merge locks or interrupted conflict resolution when needed.`,
-    usage: [
-        'steroids merge [options]',
-    ],
-    options: [
-        { long: 'project', description: 'Project directory to merge (defaults to cwd)', values: '<path>' },
-        { long: 'session', description: 'Parallel session ID (defaults to latest session for project)', values: '<id>' },
-        { long: 'session-id', description: 'Alias for --session', values: '<id>' },
-        { long: 'remote', description: 'Git remote to fetch from', values: '<name>', default: 'origin' },
-        { long: 'main-branch', description: 'Target branch for cherry-picks', values: '<name>', default: 'main' },
-        { long: 'integration-branch', description: 'Temporary integration branch name', values: '<name>' },
-        { long: 'validation-command', description: 'Shell command to validate merged state before push', values: '<cmd>' },
-    ],
-    examples: [
-        { command: 'steroids merge', description: 'Merge latest parallel session in current project' },
-        { command: 'steroids merge --project ~/projects/my-app', description: 'Merge using an explicit project path' },
-        { command: 'steroids merge --session abc123', description: 'Merge a specific parallel session' },
-    ],
-    related: [
-        { command: 'steroids runners start --parallel', description: 'Start parallel runners' },
-    ],
-});
-function parseSectionIds(sectionIdsJson) {
-    try {
-        const parsed = JSON.parse(sectionIdsJson);
-        if (!Array.isArray(parsed)) {
-            return [];
-        }
-        return parsed.filter((entry) => typeof entry === 'string');
-    }
-    catch {
-        return [];
-    }
-}
-function parseTimestamp(value) {
-    if (!value) {
-        return Number.MAX_SAFE_INTEGER;
-    }
-    const parsed = Date.parse(value);
-    return Number.isNaN(parsed) ? Number.MAX_SAFE_INTEGER : parsed;
-}
-function orderByCompletion(planRows) {
-    return [...planRows].sort((left, right) => {
-        const completedLeft = parseTimestamp(left.completed_at);
-        const completedRight = parseTimestamp(right.completed_at);
-        if (completedLeft !== completedRight) {
-            return completedLeft - completedRight;
-        }
-        return parseTimestamp(left.created_at) - parseTimestamp(right.created_at);
-    });
-}
-function buildPlanForSession(db, session, includeRunning) {
-    const statusFilter = includeRunning ? '' : ' AND status = \'completed\'';
-    const rows = db
-        .prepare(`SELECT id, branch_name, section_ids, status, completed_at, created_at
-       FROM workstreams
-       WHERE session_id = ?${statusFilter}`)
-        .all(session.id);
-    if (rows.length === 0) {
-        return {
-            sessionId: session.id,
-            sessionStatus: session.status,
-            createdAt: session.created_at,
-            workstreams: [],
-            sectionPlans: rows,
-        };
-    }
-    const orderedRows = orderByCompletion(rows);
-    const workstreams = orderedRows
-        .map((row) => ({
-        id: row.id,
-        branchName: row.branch_name,
-    }));
-    return {
-        sessionId: session.id,
-        sessionStatus: session.status,
-        createdAt: session.created_at,
-        workstreams,
-        sectionPlans: orderedRows,
-    };
-}
-function findLatestSessionForProject(db, projectPath) {
-    return db
-        .prepare(`SELECT id, status, created_at
-       FROM parallel_sessions
-       WHERE project_path = ?
-       ORDER BY created_at DESC`)
-        .get(projectPath) ?? null;
-}
-function getSessionById(db, projectPath, sessionId) {
-    return db
-        .prepare(`SELECT id, status, created_at
-       FROM parallel_sessions
-       WHERE id = ? AND project_path = ?`)
-        .get(sessionId, projectPath) ?? null;
-}
-function resolveProjectPath(projectArg) {
-    const projectPath = (0, node_path_1.resolve)(projectArg ?? process.cwd());
-    const steroidsDbPath = (0, node_path_1.join)(projectPath, '.steroids', 'steroids.db');
-    if (!(0, node_fs_1.existsSync)(projectPath)) {
-        throw new Error(`Project directory does not exist: ${projectPath}`);
-    }
-    if (!(0, node_fs_1.existsSync)(steroidsDbPath)) {
-        throw new Error(`Not a steroids project: ${projectPath}`);
-    }
-    return projectPath;
-}
-function resolveMergePlan(db, projectPath, explicitSessionId) {
-    const targetSession = explicitSessionId
-        ? getSessionById(db, projectPath, explicitSessionId)
-        : findLatestSessionForProject(db, projectPath);
-    if (!targetSession) {
-        if (explicitSessionId) {
-            throw new Error(`Parallel session not found: ${explicitSessionId}`);
-        }
-        throw new Error(`No parallel sessions found for project: ${projectPath}`);
-    }
-    const includeRunning = targetSession.status === 'running' || targetSession.status === 'merging';
-    const plan = buildPlanForSession(db, targetSession, includeRunning);
-    if (plan.sectionPlans.length === 0) {
-        throw new Error(`No completed workstreams found for session: ${targetSession.id}`);
-    }
-    return plan;
-}
-function summarizeError(errors) {
-    if (errors.length === 1) {
-        return errors[0];
-    }
-    return errors.join('; ');
-}
-async function mergeCommand(args, flags) {
-    const out = (0, output_js_1.createOutput)({ command: 'merge', flags });
-    if (flags.help) {
-        console.log(HELP);
-        return;
-    }
-    const { values } = (0, node_util_1.parseArgs)({
-        args,
-        options: {
-            project: { type: 'string', short: 'p' },
-            session: { type: 'string' },
-            'session-id': { type: 'string' },
-            remote: { type: 'string', default: 'origin' },
-            'main-branch': { type: 'string', default: 'main' },
-            'integration-branch': { type: 'string' },
-            'validation-command': { type: 'string' },
-        },
-        allowPositionals: false,
-    });
-    const explicitSession = values['session-id']
-        ?? values.session;
-    const projectPath = resolveProjectPath(values.project);
-    // Merge command performs only project-scoped work and never touches other repos.
-    const { db: globalDb, close: closeGlobalDb } = (0, global_db_js_1.openGlobalDatabase)();
-    let plan;
-    try {
-        plan = resolveMergePlan(globalDb, projectPath, explicitSession);
-    }
-    finally {
-        closeGlobalDb();
-    }
-    if (flags.dryRun) {
-        out.success({
-            project_path: projectPath,
-            session_id: plan.sessionId,
-            session_status: plan.sessionStatus,
-            session_created_at: plan.createdAt,
-            workstreams: plan.sectionPlans.map((row) => ({
-                id: row.id,
-                branch_name: row.branch_name,
-                section_ids: parseSectionIds(row.section_ids),
-                status: row.status,
-                completed_at: row.completed_at,
-            })),
-        });
-        return;
-    }
-    let result;
-    const remote = values.remote;
-    const mainBranch = values['main-branch'];
-    const integrationBranch = values['integration-branch'];
-    const configuredValidationCommand = (0, loader_js_1.loadConfig)(projectPath).runners?.parallel?.validationCommand;
-    const validationCommand = values['validation-command']
-        ?? (typeof configuredValidationCommand === 'string' ? configuredValidationCommand : undefined);
-    try {
-        const { close } = (0, connection_js_1.openDatabase)(projectPath);
-        close();
-    }
-    catch (error) {
-        out.error(errors_js_1.ErrorCode.NOT_INITIALIZED, `Not a steroids project: ${projectPath}`);
-        process.exit((0, errors_js_1.getExitCode)(errors_js_1.ErrorCode.NOT_INITIALIZED));
-    }
-    result = await (0, merge_js_1.runParallelMerge)({
-        projectPath,
-        sessionId: plan.sessionId,
-        runnerId: (0, node_crypto_1.randomUUID)(),
-        workstreams: plan.workstreams,
-        remote,
-        mainBranch,
-        integrationBranchName: integrationBranch,
-        validationCommand,
-    });
-    if (!result.success) {
-        const isLockContention = result.errors.some((entry) => entry.includes('Could not acquire merge lock'));
-        const code = isLockContention ? errors_js_1.ErrorCode.RESOURCE_LOCKED : errors_js_1.ErrorCode.GENERAL_ERROR;
-        const message = summarizeError(result.errors);
-        out.error(code, message || 'Merge failed', {
-            session_id: plan.sessionId,
-            project_path: projectPath,
-            merge_result: result,
-        });
-        process.exit((0, errors_js_1.getExitCode)(code));
-    }
-    out.success({
-        session_id: plan.sessionId,
-        project_path: projectPath,
-        session_status: plan.sessionStatus,
-        workstreams: plan.sectionPlans.length,
-        completed_commits: result.completedCommits,
-        conflicts: result.conflicts,
-        skipped: result.skipped,
-    });
-}
-//# sourceMappingURL=merge.js.map

package/dist/commands/merge.js.map

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

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

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

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

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

@@ -1 +0,0 @@
-{"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-conflict-attempts.d.ts

@@ -1,8 +0,0 @@
-export declare const MAX_CONFLICT_ATTEMPTS = 5;
-export declare function recordConflictAttempt(sessionId: string, workstreamId: string): {
-    attempts: number;
-    blocked: boolean;
-    backoffMinutes: number | null;
-};
-export declare function clearConflictAttemptState(sessionId: string, workstreamId: string): void;
-//# sourceMappingURL=merge-conflict-attempts.d.ts.map

package/dist/parallel/merge-conflict-attempts.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"merge-conflict-attempts.d.ts","sourceRoot":"","sources":["../../src/parallel/merge-conflict-attempts.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,qBAAqB,IAAI,CAAC;AAGvC,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,GACnB;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAuDvE;AAED,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CAYvF"}

package/dist/parallel/merge-conflict-attempts.js

@@ -1,60 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MAX_CONFLICT_ATTEMPTS = void 0;
-exports.recordConflictAttempt = recordConflictAttempt;
-exports.clearConflictAttemptState = clearConflictAttemptState;
-const global_db_js_1 = require("../runners/global-db.js");
-const merge_errors_js_1 = require("./merge-errors.js");
-exports.MAX_CONFLICT_ATTEMPTS = 5;
-const MAX_CONFLICT_BACKOFF_MINUTES = 30;
-function recordConflictAttempt(sessionId, workstreamId) {
-    return (0, global_db_js_1.withGlobalDatabase)((db) => {
-        const row = db
-            .prepare(`SELECT conflict_attempts
-         FROM workstreams
-         WHERE session_id = ?
-           AND id = ?
-         LIMIT 1`)
-            .get(sessionId, workstreamId);
-        if (!row) {
-            throw new merge_errors_js_1.ParallelMergeError('Parallel workstream row not found while recording conflict attempt', 'LEASE_ROW_MISSING');
-        }
-        const attempts = (row.conflict_attempts ?? 0) + 1;
-        if (attempts >= exports.MAX_CONFLICT_ATTEMPTS) {
-            db.prepare(`UPDATE workstreams
-         SET conflict_attempts = ?,
-             status = 'failed',
-             next_retry_at = NULL,
-             last_reconcile_action = 'blocked_conflict',
-             last_reconciled_at = datetime('now')
-         WHERE session_id = ?
-           AND id = ?`).run(attempts, sessionId, workstreamId);
-            db.prepare(`UPDATE parallel_sessions
-         SET status = 'blocked_conflict',
-             completed_at = NULL
-         WHERE id = ?`).run(sessionId);
-            return { attempts, blocked: true, backoffMinutes: null };
-        }
-        const backoffMinutes = Math.min(2 ** Math.max(0, attempts - 1), MAX_CONFLICT_BACKOFF_MINUTES);
-        db.prepare(`UPDATE workstreams
-       SET conflict_attempts = ?,
-           next_retry_at = datetime('now', ?),
-           last_reconcile_action = 'conflict_retry',
-           last_reconciled_at = datetime('now')
-       WHERE session_id = ?
-         AND id = ?`).run(attempts, `+${backoffMinutes} minutes`, sessionId, workstreamId);
-        return { attempts, blocked: false, backoffMinutes };
-    });
-}
-function clearConflictAttemptState(sessionId, workstreamId) {
-    (0, global_db_js_1.withGlobalDatabase)((db) => {
-        db.prepare(`UPDATE workstreams
-       SET conflict_attempts = 0,
-           next_retry_at = NULL,
-           last_reconcile_action = 'conflict_resolved',
-           last_reconciled_at = datetime('now')
-       WHERE session_id = ?
-         AND id = ?`).run(sessionId, workstreamId);
-    });
-}
-//# sourceMappingURL=merge-conflict-attempts.js.map

package/dist/parallel/merge-conflict-attempts.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"merge-conflict-attempts.js","sourceRoot":"","sources":["../../src/parallel/merge-conflict-attempts.ts"],"names":[],"mappings":";;;AAMA,sDA0DC;AAED,8DAYC;AA9ED,0DAAiF;AACjF,uDAAuD;AAE1C,QAAA,qBAAqB,GAAG,CAAC,CAAC;AACvC,MAAM,4BAA4B,GAAG,EAAE,CAAC;AAExC,SAAgB,qBAAqB,CACnC,SAAiB,EACjB,YAAoB;IAEpB,OAAO,IAAA,iCAAkB,EAAC,CAAC,EAAE,EAAE,EAAE;QAC/B,MAAM,GAAG,GAAG,EAAE;aACX,OAAO,CACN;;;;iBAIS,CACV;aACA,GAAG,CAAC,SAAS,EAAE,YAAY,CAA8C,CAAC;QAE7E,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,IAAI,oCAAkB,CAC1B,oEAAoE,EACpE,mBAAmB,CACpB,CAAC;QACJ,CAAC;QAED,MAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QAClD,IAAI,QAAQ,IAAI,6BAAqB,EAAE,CAAC;YACtC,EAAE,CAAC,OAAO,CACR;;;;;;;sBAOc,CACf,CAAC,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;YAEzC,EAAE,CAAC,OAAO,CACR;;;sBAGc,CACf,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAEjB,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;QAC3D,CAAC;QAED,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,GAAG,CAAC,CAAC,EAAE,4BAA4B,CAAC,CAAC;QAC9F,EAAE,CAAC,OAAO,CACR;;;;;;oBAMc,CACf,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,cAAc,UAAU,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;QAEvE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC;IACtD,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,yBAAyB,CAAC,SAAiB,EAAE,YAAoB;IAC/E,IAAA,iCAAkB,EAAC,CAAC,EAAE,EAAE,EAAE;QACxB,EAAE,CAAC,OAAO,CACR;;;;;;oBAMc,CACf,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/parallel/merge-conflict-invoke.d.ts

@@ -1,2 +0,0 @@
-export declare function invokeMergeConflictModel(role: 'coder' | 'reviewer', projectPath: string, taskId: string | undefined, prompt: string): Promise<string>;
-//# sourceMappingURL=merge-conflict-invoke.d.ts.map

package/dist/parallel/merge-conflict-invoke.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"merge-conflict-invoke.d.ts","sourceRoot":"","sources":["../../src/parallel/merge-conflict-invoke.ts"],"names":[],"mappings":"AAKA,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,OAAO,GAAG,UAAU,EAC1B,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAiDjB"}

package/dist/parallel/merge-conflict-invoke.js

@@ -1,41 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.invokeMergeConflictModel = invokeMergeConflictModel;
-const loader_js_1 = require("../config/loader.js");
-const invocation_logger_js_1 = require("../providers/invocation-logger.js");
-const registry_js_1 = require("../providers/registry.js");
-const merge_errors_js_1 = require("./merge-errors.js");
-async function invokeMergeConflictModel(role, projectPath, taskId, prompt) {
-    const config = (0, loader_js_1.loadConfig)(projectPath);
-    const modelConfig = role === 'coder' ? config.ai?.coder : config.ai?.reviewer;
-    if (!modelConfig?.provider || !modelConfig?.model) {
-        throw new merge_errors_js_1.ParallelMergeError(`Missing AI ${role} configuration. Configure via config.ai.${role}.`, 'AI_CONFIG_MISSING');
-    }
-    const providerName = modelConfig.provider;
-    const model = modelConfig.model;
-    const registry = await (0, registry_js_1.getProviderRegistry)();
-    const provider = registry.get(providerName);
-    const result = await (0, invocation_logger_js_1.logInvocation)(prompt, (ctx) => provider.invoke(prompt, {
-        model,
-        timeout: 60 * 60 * 1000,
-        cwd: projectPath,
-        role,
-        streamOutput: false,
-        onActivity: ctx?.onActivity,
-    }), {
-        role,
-        provider: providerName,
-        model,
-        taskId,
-        projectPath,
-    });
-    if (!result.success) {
-        const details = result.stderr || result.stdout || 'model returned non-zero exit code';
-        throw new merge_errors_js_1.ParallelMergeError(`${role.toUpperCase()} invocation failed during merge conflict handling: ${details}`, 'AI_INVOCATION_FAILED');
-    }
-    if (result.timedOut) {
-        throw new merge_errors_js_1.ParallelMergeError(`${role} invocation timed out`, 'AI_INVOKE_TIMEOUT');
-    }
-    return result.stdout;
-}
-//# sourceMappingURL=merge-conflict-invoke.js.map

package/dist/parallel/merge-conflict-invoke.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"merge-conflict-invoke.js","sourceRoot":"","sources":["../../src/parallel/merge-conflict-invoke.ts"],"names":[],"mappings":";;AAKA,4DAsDC;AA3DD,mDAAiD;AACjD,4EAAkE;AAClE,0DAA+D;AAC/D,uDAAuD;AAEhD,KAAK,UAAU,wBAAwB,CAC5C,IAA0B,EAC1B,WAAmB,EACnB,MAA0B,EAC1B,MAAc;IAEd,MAAM,MAAM,GAAG,IAAA,sBAAU,EAAC,WAAW,CAAC,CAAC;IACvC,MAAM,WAAW,GAAG,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC;IAE9E,IAAI,CAAC,WAAW,EAAE,QAAQ,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,CAAC;QAClD,MAAM,IAAI,oCAAkB,CAC1B,cAAc,IAAI,2CAA2C,IAAI,GAAG,EACpE,mBAAmB,CACpB,CAAC;IACJ,CAAC;IAED,MAAM,YAAY,GAAG,WAAW,CAAC,QAAQ,CAAC;IAC1C,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC;IAEhC,MAAM,QAAQ,GAAG,MAAM,IAAA,iCAAmB,GAAE,CAAC;IAC7C,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,MAAM,IAAA,oCAAa,EAChC,MAAM,EACN,CAAC,GAAG,EAAE,EAAE,CACN,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE;QACtB,KAAK;QACL,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI;QACvB,GAAG,EAAE,WAAW;QAChB,IAAI;QACJ,YAAY,EAAE,KAAK;QACnB,UAAU,EAAE,GAAG,EAAE,UAAU;KAC5B,CAAC,EACJ;QACE,IAAI;QACJ,QAAQ,EAAE,YAAY;QACtB,KAAK;QACL,MAAM;QACN,WAAW;KACZ,CACF,CAAC;IAEF,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,IAAI,mCAAmC,CAAC;QACtF,MAAM,IAAI,oCAAkB,CAC1B,GAAG,IAAI,CAAC,WAAW,EAAE,sDAAsD,OAAO,EAAE,EACpF,sBAAsB,CACvB,CAAC;IACJ,CAAC;IAED,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpB,MAAM,IAAI,oCAAkB,CAAC,GAAG,IAAI,uBAAuB,EAAE,mBAAmB,CAAC,CAAC;IACpF,CAAC;IAED,OAAO,MAAM,CAAC,MAAM,CAAC;AACvB,CAAC"}

package/dist/parallel/merge-conflict-prompts.d.ts

@@ -1,23 +0,0 @@
-export interface ParseReviewDecisionResult {
-    decision: 'approve' | 'reject';
-    notes: string;
-}
-export declare function parseReviewDecision(raw: string): ParseReviewDecisionResult;
-export declare function createPromptForConflictCoder(options: {
-    workstreamId: string;
-    shortSha: string;
-    branchName: string;
-    commitMessage: string;
-    conflictedFiles: string[];
-    conflictPatch: string;
-    rejectionNotes?: string;
-}): string;
-export declare function createPromptForConflictReviewer(options: {
-    workstreamId: string;
-    shortSha: string;
-    branchName: string;
-    commitMessage: string;
-    stagedDiff: string;
-    stagedFiles: string[];
-}): string;
-//# sourceMappingURL=merge-conflict-prompts.d.ts.map

package/dist/parallel/merge-conflict-prompts.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"merge-conflict-prompts.d.ts","sourceRoot":"","sources":["../../src/parallel/merge-conflict-prompts.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,CAwB1E;AAED,wBAAgB,4BAA4B,CAAC,OAAO,EAAE;IACpD,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GAAG,MAAM,CAMT;AAED,wBAAgB,+BAA+B,CAAC,OAAO,EAAE;IACvD,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,GAAG,MAAM,CAMT"}

package/dist/parallel/merge-conflict-prompts.js

@@ -1,40 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseReviewDecision = parseReviewDecision;
-exports.createPromptForConflictCoder = createPromptForConflictCoder;
-exports.createPromptForConflictReviewer = createPromptForConflictReviewer;
-function parseReviewDecision(raw) {
-    const trimmed = raw.trim();
-    const upper = trimmed.toUpperCase();
-    const hasApprove = upper.includes('APPROVE');
-    const hasReject = upper.includes('REJECT');
-    if (hasApprove && !hasReject) {
-        return {
-            decision: 'approve',
-            notes: trimmed || 'APPROVED by merge-conflict reviewer',
-        };
-    }
-    if (hasReject) {
-        return {
-            decision: 'reject',
-            notes: trimmed || 'Please review and correct conflict resolution',
-        };
-    }
-    return {
-        decision: 'reject',
-        notes: trimmed || 'Decision was not clear. Please provide explicit APPROVE/REJECT.',
-    };
-}
-function createPromptForConflictCoder(options) {
-    const notesSection = options.rejectionNotes
-        ? `\n\nLatest review note from the resolver:\n${options.rejectionNotes}\n`
-        : '';
-    return `You are resolving a merge conflict for a cherry-pick during parallel merge.\n\n## Conflict context\nWorkstream: ${options.workstreamId}\nBranch: ${options.branchName}\nCommit: ${options.shortSha}\nCommit Message:\n${options.commitMessage}\n\nConflicted files:\n${options.conflictedFiles.map((file) => `- ${file}`).join('\n')}\n\nIntended patch:\n${options.conflictPatch}\n\nRules:\n1) Edit conflicted files to a correct resolution.\n2) Remove ALL conflict markers (<<<<<<, =======, >>>>>>) in resolved files.\n3) Stage only the resolved files using git add.\n4) Do NOT commit.\n5) Be surgical; change only files required for this commit.\n${notesSection}\n\nRespond with a short confirmation when done.`;
-}
-function createPromptForConflictReviewer(options) {
-    const files = options.stagedFiles.length > 0
-        ? options.stagedFiles.map((file) => `- ${file}`).join('\n')
-        : 'No files staged yet';
-    return `You are reviewing a staged resolution for a cherry-pick conflict in parallel merge.\n\nWorkstream: ${options.workstreamId}\nBranch: ${options.branchName}\nCommit: ${options.shortSha}\nOriginal message: ${options.commitMessage}\n\nCurrent staged diff to be committed by cherry-pick --continue:\n${options.stagedDiff || '(empty diff)'}\n\nFiles staged:\n${files}\n\nDecision rules:\n- Reply with APPROVE if the resolution is correct.\n- Reply with REJECT and actionable notes if any conflict marker remains or logic is incorrect.\n\nFormat:\nAPPROVE - <optional note> or\nREJECT - <checklist itemized note>`;
-}
-//# sourceMappingURL=merge-conflict-prompts.js.map

package/dist/parallel/merge-conflict-prompts.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"merge-conflict-prompts.js","sourceRoot":"","sources":["../../src/parallel/merge-conflict-prompts.ts"],"names":[],"mappings":";;AAKA,kDAwBC;AAED,oEAcC;AAED,0EAaC;AAvDD,SAAgB,mBAAmB,CAAC,GAAW;IAC7C,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;IAC3B,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IACpC,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAC7C,MAAM,SAAS,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAE3C,IAAI,UAAU,IAAI,CAAC,SAAS,EAAE,CAAC;QAC7B,OAAO;YACL,QAAQ,EAAE,SAAS;YACnB,KAAK,EAAE,OAAO,IAAI,qCAAqC;SACxD,CAAC;IACJ,CAAC;IAED,IAAI,SAAS,EAAE,CAAC;QACd,OAAO;YACL,QAAQ,EAAE,QAAQ;YAClB,KAAK,EAAE,OAAO,IAAI,+CAA+C;SAClE,CAAC;IACJ,CAAC;IAED,OAAO;QACL,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE,OAAO,IAAI,iEAAiE;KACpF,CAAC;AACJ,CAAC;AAED,SAAgB,4BAA4B,CAAC,OAQ5C;IACC,MAAM,YAAY,GAAG,OAAO,CAAC,cAAc;QACzC,CAAC,CAAC,8CAA8C,OAAO,CAAC,cAAc,IAAI;QAC1E,CAAC,CAAC,EAAE,CAAC;IAEP,OAAO,mHAAmH,OAAO,CAAC,YAAY,aAAa,OAAO,CAAC,UAAU,aAAa,OAAO,CAAC,QAAQ,sBAAsB,OAAO,CAAC,aAAa,0BAA0B,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,OAAO,CAAC,aAAa,gRAAgR,YAAY,kDAAkD,CAAC;AAC1sB,CAAC;AAED,SAAgB,+BAA+B,CAAC,OAO/C;IACC,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC;QAC1C,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QAC3D,CAAC,CAAC,qBAAqB,CAAC;IAE1B,OAAO,sGAAsG,OAAO,CAAC,YAAY,aAAa,OAAO,CAAC,UAAU,aAAa,OAAO,CAAC,QAAQ,uBAAuB,OAAO,CAAC,aAAa,uEAAuE,OAAO,CAAC,UAAU,IAAI,cAAc,sBAAsB,KAAK,sPAAsP,CAAC;AACxmB,CAAC"}

package/dist/parallel/merge-conflict-task.d.ts

@@ -1,3 +0,0 @@
-import type Database from 'better-sqlite3';
-export declare function ensureMergeConflictTask(db: Database.Database, workstreamId: string, shortSha: string, branchName: string, commitMessage: string, conflictedFiles: string[], conflictPatch: string, forceNew?: boolean): string;
-//# sourceMappingURL=merge-conflict-task.d.ts.map

package/dist/parallel/merge-conflict-task.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"merge-conflict-task.d.ts","sourceRoot":"","sources":["../../src/parallel/merge-conflict-task.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAqC3C,wBAAgB,uBAAuB,CACrC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,eAAe,EAAE,MAAM,EAAE,EACzB,aAAa,EAAE,MAAM,EACrB,QAAQ,UAAQ,GACf,MAAM,CA2CR"}

package/dist/parallel/merge-conflict-task.js

@@ -1,59 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureMergeConflictTask = ensureMergeConflictTask;
-const node_crypto_1 = require("node:crypto");
-const queries_js_1 = require("../database/queries.js");
-function buildMergeConflictSectionName() {
-    return 'merge-conflicts';
-}
-function getNowISOString() {
-    return new Date().toISOString();
-}
-function createMergeConflictSection(db) {
-    const sectionName = buildMergeConflictSectionName();
-    const existing = db
-        .prepare('SELECT id FROM sections WHERE name = ? LIMIT 1')
-        .get(sectionName);
-    if (existing) {
-        return existing.id;
-    }
-    const maxPosRow = db
-        .prepare('SELECT MAX(position) as maxPos FROM sections')
-        .get();
-    const position = (maxPosRow?.maxPos ?? -1) + 1;
-    const sectionId = (0, node_crypto_1.createHash)('sha1').update(sectionName + position).digest('hex');
-    db.prepare(`INSERT INTO sections (id, name, position, priority, skipped, created_at)
-     VALUES (?, ?, ?, ?, ?, ?)`).run(sectionId, sectionName, position, 80, 0, getNowISOString());
-    return sectionId;
-}
-function ensureMergeConflictTask(db, workstreamId, shortSha, branchName, commitMessage, conflictedFiles, conflictPatch, forceNew = false) {
-    const sectionId = createMergeConflictSection(db);
-    if (!forceNew) {
-        const existing = db
-            .prepare(`SELECT t.id
-         FROM tasks t
-         INNER JOIN sections s ON s.id = t.section_id
-         WHERE s.name = ? AND t.title LIKE ?
-         ORDER BY t.created_at DESC
-         LIMIT 1`)
-            .get(buildMergeConflictSectionName(), `Merge conflict: cherry-pick ${shortSha}%`);
-        if (existing?.id) {
-            return existing.id;
-        }
-    }
-    const title = `Merge conflict: cherry-pick ${shortSha} from ${branchName}`;
-    const created = (0, queries_js_1.createTask)(db, title, {
-        sectionId,
-        sourceFile: `merge-conflict (${workstreamId})`,
-        filePath: conflictedFiles.join(', '),
-        status: 'pending',
-        fileContentHash: conflictPatch.substring(0, 2048),
-        fileCommitSha: commitMessage,
-    });
-    (0, queries_js_1.addAuditEntry)(db, created.id, 'null', 'pending', 'merge', {
-        actorType: 'orchestrator',
-        notes: `Generated from conflict while cherry-picking ${shortSha} from ${branchName}:\n${commitMessage}`,
-    });
-    return created.id;
-}
-//# sourceMappingURL=merge-conflict-task.js.map

package/dist/parallel/merge-conflict-task.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"merge-conflict-task.js","sourceRoot":"","sources":["../../src/parallel/merge-conflict-task.ts"],"names":[],"mappings":";;AAqCA,0DAoDC;AAxFD,6CAAyC;AACzC,uDAAmE;AAEnE,SAAS,6BAA6B;IACpC,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED,SAAS,eAAe;IACtB,OAAO,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AAClC,CAAC;AAED,SAAS,0BAA0B,CAAC,EAAqB;IACvD,MAAM,WAAW,GAAG,6BAA6B,EAAE,CAAC;IACpD,MAAM,QAAQ,GAAG,EAAE;SAChB,OAAO,CAAC,gDAAgD,CAAC;SACzD,GAAG,CAAC,WAAW,CAA+B,CAAC;IAElD,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,QAAQ,CAAC,EAAE,CAAC;IACrB,CAAC;IAED,MAAM,SAAS,GAAG,EAAE;SACjB,OAAO,CAAC,8CAA8C,CAAC;SACvD,GAAG,EAA+B,CAAC;IAEtC,MAAM,QAAQ,GAAG,CAAC,SAAS,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,IAAA,wBAAU,EAAC,MAAM,CAAC,CAAC,MAAM,CAAC,WAAW,GAAG,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAElF,EAAE,CAAC,OAAO,CACR;+BAC2B,CAC5B,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC;IAElE,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAgB,uBAAuB,CACrC,EAAqB,EACrB,YAAoB,EACpB,QAAgB,EAChB,UAAkB,EAClB,aAAqB,EACrB,eAAyB,EACzB,aAAqB,EACrB,QAAQ,GAAG,KAAK;IAEhB,MAAM,SAAS,GAAG,0BAA0B,CAAC,EAAE,CAAC,CAAC;IAEjD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,QAAQ,GAAG,EAAE;aAChB,OAAO,CACN;;;;;iBAKS,CACV;aACA,GAAG,CAAC,6BAA6B,EAAE,EAAE,+BAA+B,QAAQ,GAAG,CAA+B,CAAC;QAElH,IAAI,QAAQ,EAAE,EAAE,EAAE,CAAC;YACjB,OAAO,QAAQ,CAAC,EAAE,CAAC;QACrB,CAAC;IACH,CAAC;IAED,MAAM,KAAK,GAAG,+BAA+B,QAAQ,SAAS,UAAU,EAAE,CAAC;IAC3E,MAAM,OAAO,GAAG,IAAA,uBAAU,EAAC,EAAE,EAAE,KAAK,EAAE;QACpC,SAAS;QACT,UAAU,EAAE,mBAAmB,YAAY,GAAG;QAC9C,QAAQ,EAAE,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;QACpC,MAAM,EAAE,SAAS;QACjB,eAAe,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC;QACjD,aAAa,EAAE,aAAa;KAC7B,CAAC,CAAC;IAEH,IAAA,0BAAa,EACX,EAAE,EACF,OAAO,CAAC,EAAE,EACV,MAAM,EACN,SAAS,EACT,OAAO,EACP;QACE,SAAS,EAAE,cAAc;QACzB,KAAK,EAAE,gDAAgD,QAAQ,SAAS,UAAU,MAAM,aAAa,EAAE;KACxG,CACF,CAAC;IAEF,OAAO,OAAO,CAAC,EAAE,CAAC;AACpB,CAAC"}

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

@@ -1,22 +0,0 @@
-/**
- * Merge conflict resolution orchestrator.
- */
-import type Database from 'better-sqlite3';
-export { parseReviewDecision } from './merge-conflict-prompts.js';
-export interface ConflictRunOptions {
-    db: Database.Database;
-    projectPath: string;
-    sessionId: string;
-    workstreamId: string;
-    runnerId: string;
-    mergeLockHeartbeat?: {
-        lockEpoch: number;
-        timeoutMinutes: number;
-    };
-    branchName: string;
-    position: number;
-    commitSha: string;
-    existingTaskId?: string;
-}
-export declare function runConflictResolutionCycle(options: ConflictRunOptions): Promise<'continued' | 'skipped'>;
-//# sourceMappingURL=merge-conflict.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"merge-conflict.d.ts","sourceRoot":"","sources":["../../src/parallel/merge-conflict.ts"],"names":[],"mappings":"AACA;;GAEG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAkC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,kBAAkB,CAAC,EAAE;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,cAAc,EAAE,MAAM,CAAC;KACxB,CAAC;IACF,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAqGD,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAyN9G"}