steroids-cli 0.14.2 → 0.15.0

package/dist/monitor/scanner-queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scanner-queries.d.ts","sourceRoot":"","sources":["../../src/monitor/scanner-queries.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACtC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAY5C,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,QAAQ,CAAC,QAAQ,EAC5B,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,EAAE,CAiBX;AAYD,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,QAAQ,CAAC,QAAQ,EAC5B,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,uBAAuB,EAAE,MAAM,GAC9B,OAAO,EAAE,CA6BX;AAaD,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,QAAQ,CAAC,QAAQ,EAC5B,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,EAAE,CAuBX;AAYD,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,QAAQ,CAAC,QAAQ,EAC5B,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,EAAE,CAmBX"}
+{"version":3,"file":"scanner-queries.d.ts","sourceRoot":"","sources":["../../src/monitor/scanner-queries.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACtC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAY5C,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,QAAQ,CAAC,QAAQ,EAC5B,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,EAAE,CAiBX;AAYD,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,QAAQ,CAAC,QAAQ,EAC5B,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,uBAAuB,EAAE,MAAM,GAC9B,OAAO,EAAE,CA6BX;AAaD,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,QAAQ,CAAC,QAAQ,EAC5B,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,EAAE,CAuBX;AAYD,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,QAAQ,CAAC,QAAQ,EAC5B,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,EAAE,CAmBX;AAaD,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,QAAQ,CAAC,QAAQ,EAC5B,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,EAAE,CAsBX;AAWD,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,QAAQ,CAAC,QAAQ,EAC5B,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,EAAE,CAeX;AAaD,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAC3B,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAChB,OAAO,EAAE,CAqBX"}

package/dist/monitor/scanner-queries.js

@@ -8,6 +8,9 @@ exports.scanFailedAndSkippedTasks = scanFailedAndSkippedTasks;
 exports.scanHighInvocations = scanHighInvocations;
 exports.scanRepeatedFailures = scanRepeatedFailures;
 exports.scanBlockedTasks = scanBlockedTasks;
+exports.scanStuckMergePhase = scanStuckMergePhase;
+exports.scanDisputedTasks = scanDisputedTasks;
+exports.scanStaleMergeLocks = scanStaleMergeLocks;
 function scanFailedAndSkippedTasks(projectDb, projectPath, projectName) {
     const rows = projectDb
         .prepare(`SELECT id, title, status FROM tasks WHERE status IN ('failed', 'skipped')`)
@@ -88,4 +91,58 @@ function scanBlockedTasks(projectDb, projectPath, projectName) {
         context: { status: row.status },
     }));
 }
+function scanStuckMergePhase(projectDb, projectPath, projectName) {
+    const rows = projectDb
+        .prepare(`SELECT id, title, merge_phase, updated_at FROM tasks
+       WHERE status = 'merge_pending' AND merge_phase IS NOT NULL
+         AND (
+           (merge_phase = 'queued' AND updated_at < datetime('now', '-15 minutes'))
+           OR (merge_phase IN ('rebasing', 'rebase_review') AND updated_at < datetime('now', '-90 minutes'))
+         )`)
+        .all();
+    return rows.map((row) => ({
+        type: 'stuck_merge_phase',
+        severity: 'warning',
+        projectPath,
+        projectName,
+        taskId: row.id,
+        taskTitle: row.title,
+        details: `Task "${row.title}" stuck in merge phase '${row.merge_phase}'`,
+        context: { mergePhase: row.merge_phase, updatedAt: row.updated_at },
+    }));
+}
+function scanDisputedTasks(projectDb, projectPath, projectName) {
+    const rows = projectDb
+        .prepare(`SELECT id, title FROM tasks WHERE status = 'disputed'`)
+        .all();
+    return rows.map((row) => ({
+        type: 'disputed_task',
+        severity: 'warning',
+        projectPath,
+        projectName,
+        taskId: row.id,
+        taskTitle: row.title,
+        details: `Task "${row.title}" is disputed — needs manual resolution`,
+        context: {},
+    }));
+}
+function scanStaleMergeLocks(globalDb, projectPath, projectName, projectId) {
+    const staleCutoffMs = Date.now() - 5 * 60_000; // 5 minutes
+    const row = globalDb
+        .prepare(`SELECT project_id, runner_id, acquired_at, heartbeat_at
+       FROM workspace_merge_locks
+       WHERE project_id = ? AND heartbeat_at < ?`)
+        .get(projectId, staleCutoffMs);
+    if (!row)
+        return [];
+    const ageMinutes = Math.round((Date.now() - row.heartbeat_at) / 60_000);
+    return [{
+            type: 'stale_merge_lock',
+            severity: 'warning',
+            projectPath,
+            projectName,
+            details: `Merge lock held for ${ageMinutes}m without heartbeat (runner: ${row.runner_id})`,
+            context: { runnerId: row.runner_id, acquiredAt: row.acquired_at, heartbeatAt: row.heartbeat_at },
+        }];
+}
 //# sourceMappingURL=scanner-queries.js.map

package/dist/monitor/scanner-queries.js.map

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

package/dist/monitor/scanner.d.ts

@@ -11,7 +11,7 @@
  * - Graceful: missing/corrupt project DBs are skipped with a warning
  */
 export interface Anomaly {
-    type: 'orphaned_task' | 'hanging_invocation' | 'zombie_runner' | 'dead_runner' | 'db_inconsistency' | 'credit_exhaustion' | 'failed_task' | 'skipped_task' | 'idle_project' | 'high_invocations' | 'repeated_failures' | 'blocked_task';
+    type: 'orphaned_task' | 'hanging_invocation' | 'zombie_runner' | 'dead_runner' | 'db_inconsistency' | 'credit_exhaustion' | 'failed_task' | 'skipped_task' | 'idle_project' | 'high_invocations' | 'repeated_failures' | 'blocked_task' | 'stale_merge_lock' | 'stuck_merge_phase' | 'disputed_task';
     severity: 'info' | 'warning' | 'critical';
     projectPath: string;
     projectName: string;

package/dist/monitor/scanner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scanner.d.ts","sourceRoot":"","sources":["../../src/monitor/scanner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AA2BH,MAAM,WAAW,OAAO;IACtB,IAAI,EACA,eAAe,GACf,oBAAoB,GACpB,eAAe,GACf,aAAa,GACb,kBAAkB,GAClB,mBAAmB,GACnB,aAAa,GACb,cAAc,GACd,cAAc,GACd,kBAAkB,GAClB,mBAAmB,GACnB,cAAc,CAAC;IACnB,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,CAAC;IAC1C,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,OAAO,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;CACjB;AA4MD,wBAAsB,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC,CAoJnD"}
+{"version":3,"file":"scanner.d.ts","sourceRoot":"","sources":["../../src/monitor/scanner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AA+BH,MAAM,WAAW,OAAO;IACtB,IAAI,EACA,eAAe,GACf,oBAAoB,GACpB,eAAe,GACf,aAAa,GACb,kBAAkB,GAClB,mBAAmB,GACnB,aAAa,GACb,cAAc,GACd,cAAc,GACd,kBAAkB,GAClB,mBAAmB,GACnB,cAAc,GACd,kBAAkB,GAClB,mBAAmB,GACnB,eAAe,CAAC;IACpB,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,CAAC;IAC1C,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,OAAO,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;CACjB;AA4MD,wBAAsB,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC,CA8JnD"}

package/dist/monitor/scanner.js

@@ -23,6 +23,7 @@ const node_path_2 = require("node:path");
 const stuck_task_detector_js_1 = require("../health/stuck-task-detector.js");
 const global_db_connection_js_1 = require("../runners/global-db-connection.js");
 const cron_js_1 = require("../runners/cron.js");
+const clone_js_1 = require("../parallel/clone.js");
 const global_db_backoffs_js_1 = require("../runners/global-db-backoffs.js");
 const scanner_queries_js_1 = require("./scanner-queries.js");
 // ---------------------------------------------------------------------------
@@ -91,7 +92,7 @@ function hasPendingWork(projectDb) {
     // disputed tasks (S3's sanitiser auto-resolves them after 30 min).
     const row = projectDb
         .prepare(`SELECT COUNT(*) as count FROM tasks
-       WHERE status IN ('pending', 'in_progress', 'review')`)
+       WHERE status IN ('pending', 'in_progress', 'review', 'merge_pending')`)
         .get();
     return row.count > 0;
 }
@@ -252,7 +253,14 @@ async function runScan() {
             anomalies.push(...(0, scanner_queries_js_1.scanRepeatedFailures)(projectDb, projectPath, projectName));
             // 5. Blocked tasks (merge conflicts or errors needing reset)
             anomalies.push(...(0, scanner_queries_js_1.scanBlockedTasks)(projectDb, projectPath, projectName));
-            // 6. Idle project check — warning if cron is running (should have spawned a runner)
+            // 6. Stuck merge phase (queued > 15 min, rebasing > 90 min)
+            anomalies.push(...(0, scanner_queries_js_1.scanStuckMergePhase)(projectDb, projectPath, projectName));
+            // 7. Disputed tasks
+            anomalies.push(...(0, scanner_queries_js_1.scanDisputedTasks)(projectDb, projectPath, projectName));
+            // 8. Stale merge locks (>5 min without heartbeat)
+            const projectId = (0, clone_js_1.getProjectHash)(projectPath);
+            anomalies.push(...(0, scanner_queries_js_1.scanStaleMergeLocks)(globalDb, projectPath, projectName, projectId));
+            // 9. Idle project check — warning if cron is running (should have spawned a runner)
             if (hasPendingWork(projectDb) && !hasActiveRunner(globalDb, projectPath)) {
                 const cronActive = (0, cron_js_1.cronStatus)().installed;
                 // S6: Check if any provider is backed off — this legitimately prevents wakeup

package/dist/monitor/scanner.js.map

@@ -1 +1 @@
-{"version":3,"file":"scanner.js","sourceRoot":"","sources":["../../src/monitor/scanner.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;;;;AAoQH,0BAoJC;AAtZD,oEAAsC;AACtC,yCAAqC;AACrC,qCAAqC;AACrC,yCAAiC;AACjC,6EAG0C;AAC1C,gFAG4C;AAC5C,gDAAgD;AAChD,4EAA6E;AAC7E,6DAK8B;AAqC9B,8EAA8E;AAC9E,WAAW;AACX,8EAA8E;AAE9E,mEAAmE;AACnE,MAAM,uBAAuB,GAAG,GAAG,CAAC;AAEpC,2DAA2D;AAC3D,MAAM,yBAAyB,GAAG,IAAI,CAAC;AAEvC,8EAA8E;AAC9E,UAAU;AACV,8EAA8E;AAE9E,SAAS,aAAa,CAAC,WAAmB;IACxC,OAAO,IAAA,gBAAI,EAAC,WAAW,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;AACvD,CAAC;AAED,SAAS,qBAAqB,CAAC,WAAmB;IAChD,MAAM,MAAM,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;IAC1C,IAAI,CAAC,IAAA,oBAAU,EAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAC;IACrC,IAAI,CAAC;QACH,MAAM,EAAE,GAAG,IAAI,wBAAQ,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QACzE,EAAE,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QACjC,OAAO,EAAE,CAAC;IACZ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,QAA2B,EAAE,WAAmB;IACvE,sCAAsC;IACtC,MAAM,YAAY,GAAG,QAAQ;SAC1B,OAAO,CACN;;;0DAGoD,CACrD;SACA,GAAG,CAAC,WAAW,CAA8B,CAAC;IACjD,IAAI,YAAY;QAAE,OAAO,IAAI,CAAC;IAE9B,yFAAyF;IACzF,MAAM,cAAc,GAAG,QAAQ;SAC5B,OAAO,CACN;;;;;eAKS,CACV;SACA,GAAG,CAAC,WAAW,CAA8B,CAAC;IACjD,IAAI,cAAc;QAAE,OAAO,IAAI,CAAC;IAEhC,0FAA0F;IAC1F,MAAM,aAAa,GAAG,QAAQ;SAC3B,OAAO,CACN;;;;;;;;eAQS,CACV;SACA,GAAG,CAAC,WAAW,CAA8B,CAAC;IACjD,OAAO,aAAa,KAAK,SAAS,CAAC;AACrC,CAAC;AAED,SAAS,cAAc,CAAC,SAA4B;IAClD,kFAAkF;IAClF,mEAAmE;IACnE,MAAM,GAAG,GAAG,SAAS;SAClB,OAAO,CACN;4DACsD,CACvD;SACA,GAAG,EAAuB,CAAC;IAC9B,OAAO,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC;AACvB,CAAC;AAED,8EAA8E;AAC9E,iCAAiC;AACjC,8EAA8E;AAE9E,SAAS,wBAAwB,CAC/B,WAAmB;IAEnB,IAAI,CAAC;QACH,OAAO,IAAA,iDAAyB,EAAC,WAAW,CAAC,CAAC;IAChD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,IAAI,CAAC,kDAAkD,IAAA,oBAAQ,EAAC,WAAW,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC7F,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,8EAA8E;AAC9E,wCAAwC;AACxC,8EAA8E;AAE9E,SAAS,cAAc,CACrB,MAAgC,EAChC,WAAmB,EACnB,WAAmB;IAEnB,MAAM,SAAS,GAAc,EAAE,CAAC;IAEhC,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;QACrC,SAAS,CAAC,IAAI,CAAC;YACb,IAAI,EAAE,eAAe;YACrB,QAAQ,EAAE,UAAU;YACpB,WAAW;YACX,WAAW;YACX,MAAM,EAAE,CAAC,CAAC,MAAM;YAChB,SAAS,EAAE,CAAC,CAAC,KAAK;YAClB,OAAO,EAAE,SAAS,CAAC,CAAC,KAAK,kBAAkB,CAAC,CAAC,kBAAkB,yBAAyB;YACxF,OAAO,EAAE;gBACP,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,kBAAkB,EAAE,CAAC,CAAC,kBAAkB;gBACxC,eAAe,EAAE,CAAC,CAAC,eAAe;gBAClC,gBAAgB,EAAE,CAAC,CAAC,gBAAgB,EAAE,WAAW,EAAE,IAAI,IAAI;aAC5D;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,kBAAkB,EAAE,CAAC;QAC1C,SAAS,CAAC,IAAI,CAAC;YACb,IAAI,EAAE,oBAAoB;YAC1B,QAAQ,EAAE,UAAU;YACpB,WAAW;YACX,WAAW;YACX,MAAM,EAAE,CAAC,CAAC,MAAM;YAChB,SAAS,EAAE,CAAC,CAAC,KAAK;YAClB,QAAQ,EAAE,CAAC,CAAC,QAAQ;YACpB,OAAO,EAAE,GAAG,CAAC,CAAC,KAAK,gBAAgB,CAAC,CAAC,kBAAkB,eAAe,CAAC,CAAC,QAAQ,EAAE;YAClF,OAAO,EAAE;gBACP,KAAK,EAAE,CAAC,CAAC,KAAK;gBACd,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,kBAAkB,EAAE,CAAC,CAAC,kBAAkB;gBACxC,oBAAoB,EAAE,CAAC,CAAC,oBAAoB;gBAC5C,SAAS,EAAE,CAAC,CAAC,SAAS;aACvB;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;QACrC,SAAS,CAAC,IAAI,CAAC;YACb,IAAI,EAAE,eAAe;YACrB,QAAQ,EAAE,UAAU;YACpB,WAAW;YACX,WAAW;YACX,QAAQ,EAAE,CAAC,CAAC,QAAQ;YACpB,MAAM,EAAE,CAAC,CAAC,aAAa,IAAI,SAAS;YACpC,OAAO,EAAE,iBAAiB,CAAC,CAAC,QAAQ,SAAS,CAAC,CAAC,GAAG,uBAAuB,CAAC,CAAC,qBAAqB,GAAG;YACnG,OAAO,EAAE;gBACP,GAAG,EAAE,CAAC,CAAC,GAAG;gBACV,qBAAqB,EAAE,CAAC,CAAC,qBAAqB;aAC/C;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;QACnC,SAAS,CAAC,IAAI,CAAC;YACb,IAAI,EAAE,aAAa;YACnB,QAAQ,EAAE,UAAU;YACpB,WAAW;YACX,WAAW;YACX,QAAQ,EAAE,CAAC,CAAC,QAAQ;YACpB,MAAM,EAAE,CAAC,CAAC,aAAa,IAAI,SAAS;YACpC,OAAO,EAAE,eAAe,CAAC,CAAC,QAAQ,SAAS,CAAC,CAAC,GAAG,uBAAuB;YACvE,OAAO,EAAE;gBACP,GAAG,EAAE,CAAC,CAAC,GAAG;gBACV,qBAAqB,EAAE,CAAC,CAAC,qBAAqB;aAC/C;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;QACzC,SAAS,CAAC,IAAI,CAAC;YACb,IAAI,EAAE,kBAAkB;YACxB,QAAQ,EAAE,MAAM;YAChB,WAAW;YACX,WAAW;YACX,MAAM,EAAE,CAAC,CAAC,MAAM;YAChB,SAAS,EAAE,CAAC,CAAC,KAAK;YAClB,OAAO,EAAE,SAAS,CAAC,CAAC,KAAK,8DAA8D;YACvF,OAAO,EAAE;gBACP,kBAAkB,EAAE,CAAC,CAAC,kBAAkB;aACzC;SACF,CAAC,CAAC;IACL,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,8EAA8E;AAC9E,aAAa;AACb,8EAA8E;AAEvE,KAAK,UAAU,OAAO;IAC3B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,MAAM,SAAS,GAAc,EAAE,CAAC;IAEhC,IAAI,UAAU,GAAoC,IAAI,CAAC;IACvD,IAAI,CAAC;QACH,UAAU,GAAG,IAAA,4CAAkB,GAAE,CAAC;IACpC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO;YACL,SAAS;YACT,YAAY,EAAE,CAAC;YACf,SAAS,EAAE,EAAE;YACb,OAAO,EAAE,gCAAgC;SAC1C,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,UAAU,CAAC,EAAE,CAAC;IAE/B,IAAI,QAAsD,CAAC;IAC3D,IAAI,CAAC;QACH,QAAQ,GAAG,QAAQ;aAChB,OAAO,CAAC,mDAAmD,CAAC;aAC5D,GAAG,EAAkD,CAAC;IAC3D,CAAC;IAAC,MAAM,CAAC;QACP,UAAU,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO;YACL,SAAS;YACT,YAAY,EAAE,CAAC;YACf,SAAS,EAAE,EAAE;YACb,OAAO,EAAE,gCAAgC;SAC1C,CAAC;IACJ,CAAC;IAED,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;QACjC,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,IAAI,IAAA,oBAAQ,EAAC,WAAW,CAAC,CAAC;QAE1D,MAAM,SAAS,GAAG,qBAAqB,CAAC,WAAW,CAAC,CAAC;QACrD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,wEAAwE;YACxE,SAAS;QACX,CAAC;QAED,IAAI,CAAC;YACH,iDAAiD;YACjD,MAAM,WAAW,GAAG,IAAA,yCAAgB,EAAC;gBACnC,WAAW;gBACX,SAAS;gBACT,QAAQ;aACT,CAAC,CAAC;YACH,SAAS,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;YAEzE,0BAA0B;YAC1B,SAAS,CAAC,IAAI,CAAC,GAAG,IAAA,8CAAyB,EAAC,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;YAElF,2BAA2B;YAC3B,SAAS,CAAC,IAAI,CACZ,GAAG,IAAA,wCAAmB,EAAC,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,uBAAuB,EAAE,yBAAyB,CAAC,CAChH,CAAC;YAEF,uBAAuB;YACvB,SAAS,CAAC,IAAI,CAAC,GAAG,IAAA,yCAAoB,EAAC,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;YAE7E,6DAA6D;YAC7D,SAAS,CAAC,IAAI,CAAC,GAAG,IAAA,qCAAgB,EAAC,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;YAEzE,oFAAoF;YACpF,IAAI,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,CAAC;gBACzE,MAAM,UAAU,GAAG,IAAA,oBAAU,GAAE,CAAC,SAAS,CAAC;gBAE1C,8EAA8E;gBAC9E,0EAA0E;gBAC1E,MAAM,eAAe,GAAG,wBAAwB,CAAC,WAAW,CAAC,CAAC;gBAC9D,MAAM,WAAW,GAAG,eAAe,KAAK,IAAI,CAAC;gBAC7C,MAAM,QAAQ,GAAwB,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;gBAEhG,IAAI,OAAe,CAAC;gBACpB,IAAI,WAAW,EAAE,CAAC;oBAChB,OAAO,GAAG,YAAY,WAAW,sDAAsD,eAAe,CAAC,QAAQ,oBAAoB,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC;gBACxL,CAAC;qBAAM,IAAI,UAAU,EAAE,CAAC;oBACtB,OAAO,GAAG,YAAY,WAAW,qFAAqF,CAAC;gBACzH,CAAC;qBAAM,CAAC;oBACN,OAAO,GAAG,YAAY,WAAW,yCAAyC,CAAC;gBAC7E,CAAC;gBAED,SAAS,CAAC,IAAI,CAAC;oBACb,IAAI,EAAE,cAAc;oBACpB,QAAQ;oBACR,WAAW;oBACX,WAAW;oBACX,OAAO;oBACP,OAAO,EAAE,EAAE,UAAU,EAAE,iBAAiB,EAAE,WAAW,EAAE,eAAe,EAAE,eAAe,IAAI,SAAS,EAAE;iBACvG,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,4DAA4D;QAC9D,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC;gBACH,SAAS,CAAC,KAAK,EAAE,CAAC;YACpB,CAAC;YAAC,MAAM,CAAC;gBACP,sBAAsB;YACxB,CAAC;QACH,CAAC;IACH,CAAC;IAED,sCAAsC;IACtC,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAC3B,kFAAkF,CACnF,CAAC,GAAG,CAAC,GAAG,CAA0D,CAAC;QACpE,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpB,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;YACjF,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC/C,IAAI,UAAU,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;oBACvE,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACzB,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,yDAAyD;IAC3D,CAAC;IAED,UAAU,CAAC,KAAK,EAAE,CAAC;IAEnB,gBAAgB;IAChB,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,UAAU,CAAC,CAAC,MAAM,CAAC;IAC3E,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,MAAM,CAAC;IACzE,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,MAAM,CAAC;IAEnE,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,CAAC,IAAI,CAAC,WAAW,QAAQ,CAAC,MAAM,aAAa,CAAC,CAAC;IACpD,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3B,KAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IACtC,CAAC;SAAM,CAAC;QACN,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,IAAI,QAAQ,GAAG,CAAC;YAAE,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,WAAW,CAAC,CAAC;QACtD,IAAI,OAAO,GAAG,CAAC;YAAE,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,UAAU,CAAC,CAAC;QACnD,IAAI,IAAI,GAAG,CAAC;YAAE,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,CAAC;QAC1C,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAChC,CAAC;IAED,OAAO;QACL,SAAS;QACT,YAAY,EAAE,QAAQ,CAAC,MAAM;QAC7B,SAAS;QACT,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;KAC3B,CAAC;AACJ,CAAC"}
+{"version":3,"file":"scanner.js","sourceRoot":"","sources":["../../src/monitor/scanner.ts"],"names":[],"mappings":"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"}

package/dist/orchestrator/merge-queue-rebase.d.ts

@@ -0,0 +1,27 @@
+/**
+ * Merge queue rebase cycle — handles LLM-powered conflict resolution.
+ *
+ * Responsibility: rebase coder invocation, diff fence validation,
+ * rebase review orchestration, and merge_phase transitions.
+ *
+ * Step functions are exported for unit testing.
+ */
+import type Database from 'better-sqlite3';
+import type { Task } from '../database/queries.js';
+import type { SteroidsConfig } from '../config/loader.js';
+export declare function resetBranchToSha(slotPath: string, taskBranch: string, sha: string): void;
+export interface ConflictCapture {
+    ok: boolean;
+    conflictFiles: string[];
+    error?: string;
+}
+export declare function captureConflictFiles(slotPath: string, taskBranch: string, targetBranch: string): ConflictCapture;
+export interface DiffFenceResult {
+    valid: boolean;
+    violations: string[];
+}
+export declare function validateDiffFence(slotPath: string, allowedFiles: string[], baseRef: string): DiffFenceResult;
+export declare function handleRebaseCoder(db: Database.Database, task: Task, config: SteroidsConfig, slotPath: string, targetBranch: string, taskBranch: string, runnerId?: string): Promise<void>;
+export declare function handleRebaseReview(db: Database.Database, task: Task, config: SteroidsConfig, slotPath: string, targetBranch: string, taskBranch: string, runnerId?: string): Promise<void>;
+export declare function parseRebaseReviewDecision(stdout: string): 'approve' | 'reject';
+//# sourceMappingURL=merge-queue-rebase.d.ts.map

package/dist/orchestrator/merge-queue-rebase.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-queue-rebase.d.ts","sourceRoot":"","sources":["../../src/orchestrator/merge-queue-rebase.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAE3C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAEnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAS1D,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,MAAM,GACV,IAAI,CAIN;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,OAAO,CAAC;IACZ,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,GACnB,eAAe,CAoCjB;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EAAE,EACtB,OAAO,EAAE,MAAM,GACd,eAAe,CAejB;AAyCD,wBAAsB,iBAAiB,CACrC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAsJf;AAID,wBAAsB,kBAAkB,CACtC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CA0Hf;AAID,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,QAAQ,CAQ9E"}

package/dist/orchestrator/merge-queue-rebase.js

@@ -0,0 +1,355 @@
+"use strict";
+/**
+ * Merge queue rebase cycle — handles LLM-powered conflict resolution.
+ *
+ * Responsibility: rebase coder invocation, diff fence validation,
+ * rebase review orchestration, and merge_phase transitions.
+ *
+ * Step functions are exported for unit testing.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resetBranchToSha = resetBranchToSha;
+exports.captureConflictFiles = captureConflictFiles;
+exports.validateDiffFence = validateDiffFence;
+exports.handleRebaseCoder = handleRebaseCoder;
+exports.handleRebaseReview = handleRebaseReview;
+exports.parseRebaseReviewDecision = parseRebaseReviewDecision;
+const node_child_process_1 = require("node:child_process");
+const queries_js_1 = require("../database/queries.js");
+const merge_queue_js_1 = require("./merge-queue.js");
+const registry_js_1 = require("../providers/registry.js");
+const invocation_logger_js_1 = require("../providers/invocation-logger.js");
+const node_fs_1 = require("node:fs");
+const node_os_1 = require("node:os");
+const node_path_1 = require("node:path");
+// ─── Pure step functions ────────────────────────────────────────────────────
+function resetBranchToSha(slotPath, taskBranch, sha) {
+    (0, node_child_process_1.execFileSync)('git', ['checkout', '-B', taskBranch, sha], {
+        cwd: slotPath, encoding: 'utf-8', timeout: 30_000,
+    });
+}
+function captureConflictFiles(slotPath, taskBranch, targetBranch) {
+    // Start rebase to discover conflicts
+    try {
+        (0, node_child_process_1.execFileSync)('git', ['rebase', `origin/${targetBranch}`], {
+            cwd: slotPath, encoding: 'utf-8', timeout: 120_000,
+        });
+        // No conflicts — rebase succeeded cleanly (shouldn't reach here if
+        // attemptRebaseAndFastForward already failed, but handle gracefully)
+        return { ok: true, conflictFiles: [] };
+    }
+    catch {
+        // Expected — rebase failed due to conflicts
+    }
+    // Capture conflicting files
+    let conflictFiles = [];
+    try {
+        const output = (0, node_child_process_1.execFileSync)('git', ['diff', '--name-only', '--diff-filter=U'], {
+            cwd: slotPath, encoding: 'utf-8', timeout: 10_000,
+        }).trim();
+        conflictFiles = output ? output.split('\n').filter(Boolean) : [];
+    }
+    catch {
+        // Fallback: no conflict info available
+    }
+    // Abort the in-progress rebase
+    try {
+        (0, node_child_process_1.execFileSync)('git', ['rebase', '--abort'], {
+            cwd: slotPath, encoding: 'utf-8', timeout: 10_000,
+        });
+    }
+    catch { /* already clean */ }
+    if (conflictFiles.length === 0) {
+        return { ok: false, conflictFiles: [], error: 'Could not determine conflicting files' };
+    }
+    return { ok: true, conflictFiles };
+}
+function validateDiffFence(slotPath, allowedFiles, baseRef) {
+    let modifiedFiles;
+    try {
+        const output = (0, node_child_process_1.execFileSync)('git', ['diff', '--name-only', baseRef], {
+            cwd: slotPath, encoding: 'utf-8', timeout: 10_000,
+        }).trim();
+        modifiedFiles = output ? output.split('\n').filter(Boolean) : [];
+    }
+    catch {
+        return { valid: false, violations: ['Could not determine modified files'] };
+    }
+    const allowedSet = new Set(allowedFiles);
+    const violations = modifiedFiles.filter(f => !allowedSet.has(f));
+    return { valid: violations.length === 0, violations };
+}
+// ─── Rebase coder prompt ────────────────────────────────────────────────────
+function buildRebaseCoderPrompt(task, conflictFiles, targetBranch) {
+    return [
+        `TASK ID: ${task.id}`,
+        '',
+        '# Rebase Conflict Resolution',
+        '',
+        `You are resolving merge conflicts so this task branch can be merged into \`${targetBranch}\`.`,
+        '',
+        '## Conflict Files',
+        ...conflictFiles.map(f => `- ${f}`),
+        '',
+        '## Rules',
+        '1. Read CLAUDE.md and AGENTS.md before starting.',
+        '2. ONLY modify files listed above. Do NOT touch any other files.',
+        '3. Resolve each conflict by understanding both sides and producing correct merged code.',
+        '4. Run the build command to verify your changes compile.',
+        '5. Run the test command to verify nothing is broken.',
+        '6. If you cannot resolve a conflict correctly, say so — do not guess.',
+        '',
+        '## Task Context',
+        `Title: ${task.title}`,
+        '',
+        '## Instructions',
+        `1. Run: git rebase origin/${targetBranch}`,
+        '2. For each conflict file, resolve the conflict markers.',
+        '3. Stage resolved files: git add <file>',
+        '4. Continue rebase: git rebase --continue',
+        '5. Build and test to verify.',
+    ].join('\n');
+}
+// ─── Orchestrator: handleRebaseCoder ────────────────────────────────────────
+async function handleRebaseCoder(db, task, config, slotPath, targetBranch, taskBranch, runnerId) {
+    const approvedSha = task.approved_sha;
+    if (!approvedSha) {
+        (0, queries_js_1.updateTaskStatus)(db, task.id, 'blocked_error', 'orchestrator', '[merge_queue] No approved_sha for rebase — cannot proceed');
+        return;
+    }
+    // Step 1: Reset task branch to approved_sha (clean slate for each attempt)
+    try {
+        (0, node_child_process_1.execFileSync)('git', ['fetch', 'origin', targetBranch, taskBranch], {
+            cwd: slotPath, encoding: 'utf-8', timeout: 120_000,
+            env: { ...process.env, GIT_TERMINAL_PROMPT: '0' },
+        });
+    }
+    catch {
+        // Transient — retry next iteration
+        return;
+    }
+    resetBranchToSha(slotPath, taskBranch, `origin/${taskBranch}`);
+    // Step 2: Capture conflict files
+    const capture = captureConflictFiles(slotPath, taskBranch, targetBranch);
+    if (!capture.ok) {
+        if (capture.conflictFiles.length === 0 && !capture.error) {
+            // Clean rebase succeeded — no conflicts, go back to queued for merge attempt
+            db.prepare(`UPDATE tasks SET merge_phase = 'queued', updated_at = datetime('now') WHERE id = ?`).run(task.id);
+            return;
+        }
+        db.prepare(`UPDATE tasks SET status = 'disputed', merge_phase = NULL, approved_sha = NULL, rebase_attempts = 0, updated_at = datetime('now') WHERE id = ?`).run(task.id);
+        (0, queries_js_1.addAuditEntry)(db, task.id, 'merge_pending', 'disputed', 'orchestrator', {
+            actorType: 'orchestrator',
+            notes: `[merge_queue] Could not capture conflict files: ${capture.error}`,
+        });
+        return;
+    }
+    if (capture.conflictFiles.length === 0) {
+        // No conflicts — go back to queued
+        db.prepare(`UPDATE tasks SET merge_phase = 'queued', updated_at = datetime('now') WHERE id = ?`).run(task.id);
+        return;
+    }
+    // Reset branch again for the LLM to work on
+    resetBranchToSha(slotPath, taskBranch, `origin/${taskBranch}`);
+    const preRebaseSha = (0, node_child_process_1.execFileSync)('git', ['rev-parse', 'HEAD'], {
+        cwd: slotPath, encoding: 'utf-8', timeout: 10_000,
+    }).trim();
+    // Step 3: Invoke LLM rebase coder
+    const coderConfig = config.ai?.coder;
+    if (!coderConfig?.provider || !coderConfig.model) {
+        (0, queries_js_1.updateTaskStatus)(db, task.id, 'blocked_error', 'orchestrator', '[merge_queue] No coder AI provider configured for rebase');
+        return;
+    }
+    const prompt = buildRebaseCoderPrompt(task, capture.conflictFiles, targetBranch);
+    const promptFile = (0, node_path_1.join)((0, node_os_1.tmpdir)(), `steroids-rebase-coder-${Date.now()}.txt`);
+    (0, node_fs_1.writeFileSync)(promptFile, prompt, 'utf-8');
+    let llmSuccess = false;
+    try {
+        const registry = await (0, registry_js_1.getProviderRegistry)();
+        const provider = registry.get(coderConfig.provider);
+        if (!(await provider.isAvailable())) {
+            (0, queries_js_1.updateTaskStatus)(db, task.id, 'blocked_error', 'orchestrator', `[merge_queue] Rebase coder provider '${coderConfig.provider}' not available`);
+            return;
+        }
+        const result = await (0, invocation_logger_js_1.logInvocation)(prompt, (ctx) => provider.invoke(prompt, {
+            model: coderConfig.model,
+            timeout: 1800_000, // 30 min
+            cwd: slotPath,
+            promptFile,
+            role: 'coder',
+            streamOutput: false,
+            onActivity: ctx?.onActivity,
+        }), {
+            role: 'rebase_coder',
+            provider: coderConfig.provider,
+            model: coderConfig.model,
+            taskId: task.id,
+            projectPath: slotPath,
+            runnerId,
+        });
+        llmSuccess = result.success;
+    }
+    catch {
+        llmSuccess = false;
+    }
+    finally {
+        try {
+            (0, node_fs_1.unlinkSync)(promptFile);
+        }
+        catch { /* ignore */ }
+    }
+    if (!llmSuccess) {
+        db.prepare(`UPDATE tasks SET status = 'disputed', merge_phase = NULL, approved_sha = NULL, rebase_attempts = 0, updated_at = datetime('now') WHERE id = ?`).run(task.id);
+        (0, queries_js_1.addAuditEntry)(db, task.id, 'merge_pending', 'disputed', 'orchestrator', {
+            actorType: 'orchestrator',
+            notes: '[merge_queue] LLM rebase coder failed — escalating to disputed',
+        });
+        return;
+    }
+    // Step 4: Validate diff fence
+    const fence = validateDiffFence(slotPath, capture.conflictFiles, preRebaseSha);
+    if (!fence.valid) {
+        db.prepare(`UPDATE tasks SET status = 'disputed', merge_phase = NULL, approved_sha = NULL, rebase_attempts = 0, updated_at = datetime('now') WHERE id = ?`).run(task.id);
+        (0, queries_js_1.addAuditEntry)(db, task.id, 'merge_pending', 'disputed', 'orchestrator', {
+            actorType: 'orchestrator',
+            notes: `[merge_queue] Diff fence violation — LLM modified files outside conflict scope: ${fence.violations.join(', ')}`,
+        });
+        return;
+    }
+    // Step 5: Force-push updated task branch
+    try {
+        (0, node_child_process_1.execFileSync)('git', ['push', 'origin', taskBranch, '--force-with-lease'], {
+            cwd: slotPath, encoding: 'utf-8', timeout: 60_000,
+            env: { ...process.env, GIT_TERMINAL_PROMPT: '0' },
+        });
+    }
+    catch {
+        (0, queries_js_1.updateTaskStatus)(db, task.id, 'blocked_error', 'orchestrator', '[merge_queue] Failed to push rebased task branch');
+        return;
+    }
+    // Step 6: Transition to rebase_review (do NOT set approved_sha)
+    db.prepare(`UPDATE tasks SET merge_phase = 'rebase_review', updated_at = datetime('now') WHERE id = ?`).run(task.id);
+    (0, queries_js_1.addAuditEntry)(db, task.id, 'merge_pending', 'merge_pending', 'orchestrator', {
+        actorType: 'orchestrator',
+        notes: `[merge_queue] Rebase coder completed — awaiting rebase review (conflicts: ${capture.conflictFiles.join(', ')})`,
+    });
+}
+// ─── Orchestrator: handleRebaseReview ───────────────────────────────────────
+async function handleRebaseReview(db, task, config, slotPath, targetBranch, taskBranch, runnerId) {
+    // Fetch latest
+    try {
+        (0, node_child_process_1.execFileSync)('git', ['fetch', 'origin', targetBranch, taskBranch], {
+            cwd: slotPath, encoding: 'utf-8', timeout: 120_000,
+            env: { ...process.env, GIT_TERMINAL_PROMPT: '0' },
+        });
+    }
+    catch {
+        return; // Transient — retry next iteration
+    }
+    // Invoke reviewer on the rebased task branch
+    const reviewerConfig = config.ai?.reviewer;
+    if (!reviewerConfig?.provider || !reviewerConfig.model) {
+        (0, queries_js_1.updateTaskStatus)(db, task.id, 'blocked_error', 'orchestrator', '[merge_queue] No reviewer AI provider configured for rebase review');
+        return;
+    }
+    const prompt = [
+        `TASK ID: ${task.id}`,
+        '',
+        '# Rebase Review',
+        '',
+        'Review the conflict resolution changes on this task branch.',
+        'Focus on: correctness of merge conflict resolution, no regressions, build passes.',
+        '',
+        `Task: ${task.title}`,
+        '',
+        'Instructions:',
+        '1. Read CLAUDE.md and AGENTS.md.',
+        `2. Review the diff: git diff origin/${targetBranch}...origin/${taskBranch}`,
+        '3. Verify build and tests pass.',
+        '4. Output DECISION: APPROVE or DECISION: REJECT with reasoning.',
+    ].join('\n');
+    const promptFile = (0, node_path_1.join)((0, node_os_1.tmpdir)(), `steroids-rebase-reviewer-${Date.now()}.txt`);
+    (0, node_fs_1.writeFileSync)(promptFile, prompt, 'utf-8');
+    let reviewerStdout = '';
+    let reviewerSuccess = false;
+    try {
+        const registry = await (0, registry_js_1.getProviderRegistry)();
+        const provider = registry.get(reviewerConfig.provider);
+        if (!(await provider.isAvailable())) {
+            (0, queries_js_1.updateTaskStatus)(db, task.id, 'blocked_error', 'orchestrator', `[merge_queue] Rebase reviewer provider '${reviewerConfig.provider}' not available`);
+            return;
+        }
+        const result = await (0, invocation_logger_js_1.logInvocation)(prompt, (ctx) => provider.invoke(prompt, {
+            model: reviewerConfig.model,
+            timeout: 900_000, // 15 min
+            cwd: slotPath,
+            promptFile,
+            role: 'reviewer',
+            streamOutput: false,
+            onActivity: ctx?.onActivity,
+        }), {
+            role: 'rebase_reviewer',
+            provider: reviewerConfig.provider,
+            model: reviewerConfig.model,
+            taskId: task.id,
+            projectPath: slotPath,
+            runnerId,
+        });
+        reviewerStdout = result.stdout;
+        reviewerSuccess = result.success;
+    }
+    catch {
+        reviewerSuccess = false;
+    }
+    finally {
+        try {
+            (0, node_fs_1.unlinkSync)(promptFile);
+        }
+        catch { /* ignore */ }
+    }
+    if (!reviewerSuccess) {
+        db.prepare(`UPDATE tasks SET status = 'disputed', merge_phase = NULL, approved_sha = NULL, rebase_attempts = 0, updated_at = datetime('now') WHERE id = ?`).run(task.id);
+        (0, queries_js_1.addAuditEntry)(db, task.id, 'merge_pending', 'disputed', 'orchestrator', {
+            actorType: 'orchestrator',
+            notes: '[merge_queue] Rebase reviewer failed — escalating to disputed',
+        });
+        return;
+    }
+    // Parse decision from reviewer output
+    const decision = parseRebaseReviewDecision(reviewerStdout);
+    if (decision === 'approve') {
+        // Re-record approved_sha from remote HEAD of task branch
+        let newApprovedSha;
+        try {
+            newApprovedSha = (0, node_child_process_1.execFileSync)('git', ['rev-parse', `origin/${taskBranch}`], {
+                cwd: slotPath, encoding: 'utf-8', timeout: 10_000,
+            }).trim();
+        }
+        catch { /* fall through */ }
+        if (!newApprovedSha) {
+            (0, queries_js_1.updateTaskStatus)(db, task.id, 'blocked_error', 'orchestrator', '[merge_queue] Could not resolve approved_sha after rebase review');
+            return;
+        }
+        db.prepare(`UPDATE tasks SET merge_phase = 'queued', approved_sha = ?, updated_at = datetime('now')
+       WHERE id = ?`).run(newApprovedSha, task.id);
+        (0, queries_js_1.addAuditEntry)(db, task.id, 'merge_pending', 'merge_pending', 'orchestrator', {
+            actorType: 'orchestrator',
+            notes: `[merge_queue] Rebase review approved — re-queued for merge (new sha: ${newApprovedSha})`,
+        });
+    }
+    else {
+        // Reject — transition back to rebasing (handles increment + cap)
+        (0, merge_queue_js_1.transitionToRebasing)(db, task.id, 'Rebase review rejected');
+    }
+}
+// ─── Decision parser ────────────────────────────────────────────────────────
+function parseRebaseReviewDecision(stdout) {
+    const upper = stdout.toUpperCase();
+    // Look for explicit DECISION: APPROVE/REJECT tokens
+    if (upper.includes('DECISION: APPROVE') || upper.includes('DECISION:APPROVE')) {
+        return 'approve';
+    }
+    // Default to reject if no clear approval signal
+    return 'reject';
+}
+//# sourceMappingURL=merge-queue-rebase.js.map

package/dist/orchestrator/merge-queue-rebase.js.map

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

package/dist/orchestrator/merge-queue.d.ts

@@ -0,0 +1,40 @@
+/**
+ * Merge queue pipeline — routes merge_pending tasks through the merge gate.
+ *
+ * Responsibility: pipeline routing, merge orchestration, pool slot and lock lifecycle.
+ * Step functions (fetchAndPrepare, attemptRebaseAndFastForward, etc.) are composed
+ * here but contain their own logic.
+ */
+import type Database from 'better-sqlite3';
+import type { Task } from '../database/queries.js';
+import type { SteroidsConfig } from '../config/loader.js';
+export type PushErrorClass = 'race_loss' | 'transient' | 'permanent';
+export type FetchErrorClass = 'transient' | 'permanent';
+export declare function classifyPushError(error: string): PushErrorClass;
+export declare function classifyFetchError(error: string): FetchErrorClass;
+export interface PrepResult {
+    ok: boolean;
+    alreadyMerged?: boolean;
+    error?: 'sha_mismatch' | 'fetch_transient' | 'fetch_permanent';
+    slotPath?: string;
+    taskBranchLocal?: string;
+    targetBranch?: string;
+}
+export declare function fetchAndPrepare(slotPath: string, taskBranch: string, targetBranch: string, approvedSha: string): PrepResult;
+export declare function handlePrepFailure(db: Database.Database, taskId: string, error: 'sha_mismatch' | 'fetch_transient' | 'fetch_permanent'): void;
+export interface MergeAttemptResult {
+    merged: boolean;
+    reason?: 'conflicts' | 'ff_only';
+}
+export declare function attemptRebaseAndFastForward(slotPath: string, taskBranch: string, targetBranch: string): MergeAttemptResult;
+export declare function pushTargetBranch(slotPath: string, targetBranch: string): Promise<{
+    ok: boolean;
+    errorClass?: PushErrorClass;
+    error?: string;
+}>;
+export declare function cleanupTaskBranch(slotPath: string, taskBranch: string): void;
+export declare function markCompleted(db: Database.Database, taskId: string, mergedSha?: string): void;
+export declare function transitionToRebasing(db: Database.Database, taskId: string, reason: string): void;
+export declare function handleMergeAttempt(db: Database.Database, task: Task, config: SteroidsConfig, sourceProjectPath: string, runnerId?: string): Promise<void>;
+export declare function processMergeQueue(db: Database.Database, task: Task, config: SteroidsConfig, sourceProjectPath: string, runnerId?: string): Promise<void>;
+//# sourceMappingURL=merge-queue.d.ts.map