steroids-cli 0.8.33 → 0.8.35

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

@@ -0,0 +1,68 @@
+"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) {
+    const { db, close } = (0, global_db_js_1.openGlobalDatabase)();
+    try {
+        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 };
+    }
+    finally {
+        close();
+    }
+}
+function clearConflictAttemptState(sessionId, workstreamId) {
+    const { db, close } = (0, global_db_js_1.openGlobalDatabase)();
+    try {
+        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);
+    }
+    finally {
+        close();
+    }
+}
+//# sourceMappingURL=merge-conflict-attempts.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"merge-conflict-attempts.js","sourceRoot":"","sources":["../../src/parallel/merge-conflict-attempts.ts"],"names":[],"mappings":";;;AAMA,sDA6DC;AAED,8DAeC;AApFD,0DAA6D;AAC7D,uDAAuD;AAE1C,QAAA,qBAAqB,GAAG,CAAC,CAAC;AACvC,MAAM,4BAA4B,GAAG,EAAE,CAAC;AAExC,SAAgB,qBAAqB,CACnC,SAAiB,EACjB,YAAoB;IAEpB,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,IAAA,iCAAkB,GAAE,CAAC;IAC3C,IAAI,CAAC;QACH,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;YAAS,CAAC;QACT,KAAK,EAAE,CAAC;IACV,CAAC;AACH,CAAC;AAED,SAAgB,yBAAyB,CAAC,SAAiB,EAAE,YAAoB;IAC/E,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,IAAA,iCAAkB,GAAE,CAAC;IAC3C,IAAI,CAAC;QACH,EAAE,CAAC,OAAO,CACR;;;;;;oBAMc,CACf,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IACjC,CAAC;YAAS,CAAC;QACT,KAAK,EAAE,CAAC;IACV,CAAC;AACH,CAAC"}

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

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

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

@@ -0,0 +1,41 @@
+"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 = (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

@@ -0,0 +1 @@
+{"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,IAAA,iCAAmB,GAAE,CAAC;IACvC,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

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

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

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

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

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

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

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

@@ -0,0 +1 @@
+{"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 +1,22 @@
 /**
- * Merge conflict resolution helpers.
+ * Merge conflict resolution orchestrator.
  */
 import type Database from 'better-sqlite3';
-interface ParseReviewDecisionResult {
-    decision: 'approve' | 'reject';
-    notes: string;
-}
+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 parseReviewDecision(raw: string): ParseReviewDecisionResult;
 export declare function runConflictResolutionCycle(options: ConflictRunOptions): Promise<'continued' | 'skipped'>;
-export {};
 //# sourceMappingURL=merge-conflict.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"merge-conflict.d.ts","sourceRoot":"","sources":["../../src/parallel/merge-conflict.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AA2B3C,UAAU,yBAAyB;IACjC,QAAQ,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,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,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,CAwB1E;AAoLD,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CA6J9G"}
+{"version":3,"file":"merge-conflict.d.ts","sourceRoot":"","sources":["../../src/parallel/merge-conflict.ts"],"names":[],"mappings":"AAAA;;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;AAwGD,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAyN9G"}

package/dist/parallel/merge-conflict.js

@@ -1,145 +1,85 @@
 "use strict";
 /**
- * Merge conflict resolution helpers.
+ * Merge conflict resolution orchestrator.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseReviewDecision = parseReviewDecision;
+exports.parseReviewDecision = void 0;
 exports.runConflictResolutionCycle = runConflictResolutionCycle;
-const node_crypto_1 = require("node:crypto");
-const loader_js_1 = require("../config/loader.js");
 const queries_js_1 = require("../database/queries.js");
-const invocation_logger_js_1 = require("../providers/invocation-logger.js");
-const registry_js_1 = require("../providers/registry.js");
 const merge_git_js_1 = require("./merge-git.js");
 const merge_errors_js_1 = require("./merge-errors.js");
 const merge_progress_js_1 = require("./merge-progress.js");
-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 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
+const global_db_js_1 = require("../runners/global-db.js");
+const merge_conflict_attempts_js_1 = require("./merge-conflict-attempts.js");
+const merge_conflict_invoke_js_1 = require("./merge-conflict-invoke.js");
+const merge_conflict_prompts_js_1 = require("./merge-conflict-prompts.js");
+const merge_conflict_task_js_1 = require("./merge-conflict-task.js");
+const merge_lock_js_1 = require("./merge-lock.js");
+var merge_conflict_prompts_js_2 = require("./merge-conflict-prompts.js");
+Object.defineProperty(exports, "parseReviewDecision", { enumerable: true, get: function () { return merge_conflict_prompts_js_2.parseReviewDecision; } });
+function refreshMergeConflictLease(sessionId, workstreamId, projectPath, runnerId) {
+    const { db, close } = (0, global_db_js_1.openGlobalDatabase)();
+    try {
+        const row = db
+            .prepare(`SELECT id, claim_generation, runner_id
+         FROM workstreams
+         WHERE session_id = ?
+           AND id = ?
+           AND clone_path = ?
+           AND status IN ('running', 'completed')
          LIMIT 1`)
-            .get(buildMergeConflictSectionName(), `Merge conflict: cherry-pick ${shortSha}%`);
-        if (existing?.id) {
-            return existing.id;
+            .get(sessionId, workstreamId, projectPath);
+        if (!row) {
+            throw new merge_errors_js_1.ParallelMergeError('Parallel workstream lease row not found during conflict resolution', 'LEASE_ROW_MISSING');
+        }
+        if (row.runner_id !== null && row.runner_id !== runnerId) {
+            throw new merge_errors_js_1.ParallelMergeError(`Parallel workstream lease owned by ${row.runner_id}, not ${runnerId}`, 'LEASE_FENCE_FAILED');
+        }
+        const update = db
+            .prepare(`UPDATE workstreams
+         SET runner_id = ?,
+             lease_expires_at = datetime('now', '+120 seconds')
+         WHERE id = ?
+           AND status IN ('running', 'completed')
+           AND claim_generation = ?
+           AND (runner_id IS NULL OR runner_id = ?)`)
+            .run(runnerId, row.id, row.claim_generation, runnerId);
+        if (update.changes !== 1) {
+            throw new merge_errors_js_1.ParallelMergeError('Parallel workstream lease fence check failed during conflict resolution', 'LEASE_FENCE_FAILED');
         }
     }
-    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;
-}
-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>`;
-}
-async function invokeModel(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');
+    finally {
+        close();
     }
-    const providerName = modelConfig.provider;
-    const model = modelConfig.model;
-    const registry = (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,
+}
+function delay(ms) {
+    return new Promise((resolve) => {
+        setTimeout(resolve, ms);
     });
-    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');
+}
+async function waitForConflictRetryWindow(db, sessionId, workstreamId, projectPath, runnerId, backoffMinutes, mergeLockHeartbeat) {
+    if (backoffMinutes <= 0) {
+        return;
     }
-    if (result.timedOut) {
-        throw new merge_errors_js_1.ParallelMergeError(`${role} invocation timed out`, 'AI_INVOKE_TIMEOUT');
+    let remainingMs = backoffMinutes * 60_000;
+    const heartbeatSliceMs = 30_000;
+    while (remainingMs > 0) {
+        const waitMs = Math.min(heartbeatSliceMs, remainingMs);
+        await delay(waitMs);
+        remainingMs -= waitMs;
+        refreshMergeConflictLease(sessionId, workstreamId, projectPath, runnerId);
+        if (mergeLockHeartbeat) {
+            (0, merge_lock_js_1.refreshMergeLock)(db, sessionId, runnerId, mergeLockHeartbeat.timeoutMinutes, mergeLockHeartbeat.lockEpoch);
+        }
     }
-    return result.stdout;
 }
 async function runConflictResolutionCycle(options) {
-    const { db, projectPath, sessionId, workstreamId, branchName, position, commitSha, existingTaskId, } = options;
-    const shortSha = options.commitSha.slice(0, 7);
+    const { db, projectPath, sessionId, workstreamId, runnerId, mergeLockHeartbeat, branchName, position, commitSha, existingTaskId, } = options;
+    const shortSha = commitSha.slice(0, 7);
     const conflictedFiles = (0, merge_git_js_1.getConflictedFiles)(projectPath);
     const conflictPatch = (0, merge_git_js_1.getCommitPatch)(projectPath, commitSha);
     const commitMessage = (0, merge_git_js_1.getCommitMessage)(projectPath, commitSha);
-    const taskId = ensureMergeConflictTask(db, workstreamId, shortSha, branchName, commitMessage, conflictedFiles, conflictPatch, !existingTaskId);
+    const taskId = (0, merge_conflict_task_js_1.ensureMergeConflictTask)(db, workstreamId, shortSha, branchName, commitMessage, conflictedFiles, conflictPatch, !existingTaskId);
     let conflictTaskId = existingTaskId ?? taskId;
     if (conflictTaskId !== taskId) {
         conflictTaskId = taskId;
@@ -149,17 +89,32 @@ async function runConflictResolutionCycle(options) {
     if (!currentConflictTask) {
         throw new merge_errors_js_1.ParallelMergeError('Created merge-conflict task not found', 'TASK_MISSING');
     }
+    refreshMergeConflictLease(sessionId, workstreamId, projectPath, runnerId);
     if (currentConflictTask.status === 'completed') {
-        (0, merge_progress_js_1.upsertProgressEntry)(db, sessionId, workstreamId, position, commitSha, 'applied', conflictTaskId);
+        const appliedCommitSha = (0, merge_git_js_1.runGitCommand)(projectPath, ['rev-parse', 'HEAD'], { allowFailure: true }).trim();
+        (0, merge_progress_js_1.upsertProgressEntry)(db, sessionId, workstreamId, position, commitSha, 'applied', conflictTaskId, appliedCommitSha || null);
+        (0, merge_conflict_attempts_js_1.clearConflictAttemptState)(sessionId, workstreamId);
         return 'continued';
     }
     (0, queries_js_1.updateTaskStatus)(db, currentConflictTask.id, 'in_progress', 'merge-conflict-orchestrator');
     while (true) {
+        const conflictAttempt = (0, merge_conflict_attempts_js_1.recordConflictAttempt)(sessionId, workstreamId);
+        if (conflictAttempt.blocked) {
+            (0, queries_js_1.rejectTask)(db, currentConflictTask.id, 'merge-conflict-reviewer', `Conflict resolution attempt limit reached (${merge_conflict_attempts_js_1.MAX_CONFLICT_ATTEMPTS}). Session moved to blocked_conflict.`);
+            throw new merge_errors_js_1.ParallelMergeError(`Conflict resolution exceeded ${merge_conflict_attempts_js_1.MAX_CONFLICT_ATTEMPTS} attempts for ${shortSha}`, 'CONFLICT_ATTEMPT_LIMIT');
+        }
+        refreshMergeConflictLease(sessionId, workstreamId, projectPath, runnerId);
+        if (conflictAttempt.attempts > 1 && (conflictAttempt.backoffMinutes ?? 0) > 0) {
+            (0, queries_js_1.updateTaskStatus)(db, currentConflictTask.id, 'in_progress', 'merge-conflict-orchestrator', `Waiting ${conflictAttempt.backoffMinutes} minute(s) before retry ${conflictAttempt.attempts}.`);
+            await waitForConflictRetryWindow(db, sessionId, workstreamId, projectPath, runnerId, conflictAttempt.backoffMinutes ?? 0, mergeLockHeartbeat);
+        }
         const existingTask = (0, queries_js_1.getTask)(db, currentConflictTask.id);
-        const lastNotes = existingTask?.rejection_count
-            ? `After ${existingTask.rejection_count} rejection(s).`
-            : undefined;
-        const coderPrompt = createPromptForConflictCoder({
+        const noteParts = [`Attempt ${conflictAttempt.attempts}/${merge_conflict_attempts_js_1.MAX_CONFLICT_ATTEMPTS}.`];
+        if (existingTask?.rejection_count) {
+            noteParts.push(`After ${existingTask.rejection_count} rejection(s).`);
+        }
+        const lastNotes = noteParts.join(' ');
+        const coderPrompt = (0, merge_conflict_prompts_js_1.createPromptForConflictCoder)({
             workstreamId,
             shortSha,
             branchName,
@@ -168,7 +123,7 @@ async function runConflictResolutionCycle(options) {
             conflictPatch,
             rejectionNotes: lastNotes,
         });
-        await invokeModel('coder', projectPath, currentConflictTask.id, coderPrompt);
+        await (0, merge_conflict_invoke_js_1.invokeMergeConflictModel)('coder', projectPath, currentConflictTask.id, coderPrompt);
         const remaining = (0, merge_git_js_1.getConflictedFiles)(projectPath);
         if (remaining.length > 0) {
             (0, queries_js_1.updateTaskStatus)(db, currentConflictTask.id, 'in_progress', 'merge-conflict-orchestrator', `Conflict markers still present: ${remaining.join(', ')}`);
@@ -181,7 +136,7 @@ async function runConflictResolutionCycle(options) {
             continue;
         }
         (0, queries_js_1.updateTaskStatus)(db, currentConflictTask.id, 'review', 'merge-conflict-orchestrator');
-        const reviewerPrompt = createPromptForConflictReviewer({
+        const reviewerPrompt = (0, merge_conflict_prompts_js_1.createPromptForConflictReviewer)({
             workstreamId,
             shortSha,
             branchName,
@@ -189,14 +144,10 @@ async function runConflictResolutionCycle(options) {
             stagedDiff,
             stagedFiles,
         });
-        const decisionText = await invokeModel('reviewer', projectPath, currentConflictTask.id, reviewerPrompt);
-        const decision = parseReviewDecision(decisionText);
+        const decisionText = await (0, merge_conflict_invoke_js_1.invokeMergeConflictModel)('reviewer', projectPath, currentConflictTask.id, reviewerPrompt);
+        const decision = (0, merge_conflict_prompts_js_1.parseReviewDecision)(decisionText);
         if (decision.decision === 'reject') {
             (0, queries_js_1.rejectTask)(db, currentConflictTask.id, 'merge-conflict-reviewer', decision.notes);
-            if ((0, merge_git_js_1.cleanTreeHasConflicts)(projectPath)) {
-                continue;
-            }
-            // If no explicit conflict markers remain but reviewer still rejects, keep iterating.
             continue;
         }
         if ((0, merge_git_js_1.hasUnmergedFiles)(projectPath)) {
@@ -207,17 +158,22 @@ async function runConflictResolutionCycle(options) {
             throw new merge_errors_js_1.ParallelMergeError('Cherry-pick no longer in progress while resolving conflict', 'CHERRY_PICK_CONTEXT_LOST');
         }
         try {
+            refreshMergeConflictLease(sessionId, workstreamId, projectPath, runnerId);
             (0, merge_git_js_1.runGitCommand)(projectPath, ['-c', 'core.editor=true', 'cherry-pick', '--continue']);
             (0, queries_js_1.approveTask)(db, currentConflictTask.id, 'merge-conflict-reviewer', decision.notes);
-            (0, merge_progress_js_1.upsertProgressEntry)(db, sessionId, workstreamId, position, commitSha, 'applied', currentConflictTask.id);
+            const appliedCommitSha = (0, merge_git_js_1.runGitCommand)(projectPath, ['rev-parse', 'HEAD'], { allowFailure: true }).trim();
+            (0, merge_progress_js_1.upsertProgressEntry)(db, sessionId, workstreamId, position, commitSha, 'applied', currentConflictTask.id, appliedCommitSha || null);
+            (0, merge_conflict_attempts_js_1.clearConflictAttemptState)(sessionId, workstreamId);
             return 'continued';
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
             if (/nothing to commit|previous cherry-pick is empty/i.test(message)) {
+                refreshMergeConflictLease(sessionId, workstreamId, projectPath, runnerId);
                 (0, merge_git_js_1.runGitCommand)(projectPath, ['cherry-pick', '--skip']);
                 (0, merge_progress_js_1.upsertProgressEntry)(db, sessionId, workstreamId, position, commitSha, 'skipped', currentConflictTask.id);
                 (0, queries_js_1.updateTaskStatus)(db, currentConflictTask.id, 'completed', 'merge-conflict-reviewer', 'Cherry-pick is now empty after resolution; skipped this commit.');
+                (0, merge_conflict_attempts_js_1.clearConflictAttemptState)(sessionId, workstreamId);
                 return 'skipped';
             }
             throw error;