steroids-cli 0.17.1 → 0.18.0

package/dist/orchestrator/automated-approval-effects.js

@@ -0,0 +1,294 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildApprovalEffectsReplayInput = buildApprovalEffectsReplayInput;
+exports.markApprovalEffectsPending = markApprovalEffectsPending;
+exports.runPendingApprovalEffects = runPendingApprovalEffects;
+exports.completeTaskWithApprovalEffects = completeTaskWithApprovalEffects;
+exports.reconcilePendingApprovalEffects = reconcilePendingApprovalEffects;
+exports.loadQueuedApprovalEffectsReplayInput = loadQueuedApprovalEffectsReplayInput;
+const queries_js_1 = require("../database/queries.js");
+const section_pr_js_1 = require("../git/section-pr.js");
+const integration_js_1 = require("../hooks/integration.js");
+const reviewer_approval_js_1 = require("../intake/reviewer-approval.js");
+const task_reference_js_1 = require("../intake/task-reference.js");
+const approval_effects_replay_js_1 = require("./approval-effects-replay.js");
+const section_completion_js_1 = require("./section-completion.js");
+const CATEGORY_APPROVAL_EFFECTS_PENDING = 'approval_effects_pending';
+const CATEGORY_APPROVAL_EFFECTS_APPLIED = 'approval_effects_applied';
+const CATEGORY_APPROVAL_EFFECT_STEP_APPLIED = 'approval_effect_step_applied';
+const CATEGORY_APPROVAL_EFFECTS_MIGRATION_ANOMALY = 'approval_effects_migration_anomaly';
+function hasAuditCategory(db, taskId, category) {
+    const row = db
+        .prepare(`SELECT 1
+       FROM audit
+       WHERE task_id = ?
+         AND category = ?
+       LIMIT 1`)
+        .get(taskId, category);
+    return Boolean(row);
+}
+function getAppliedEffectSteps(db, taskId) {
+    const rows = db
+        .prepare(`SELECT metadata
+       FROM audit
+       WHERE task_id = ?
+         AND category = ?
+       ORDER BY id ASC`)
+        .all(taskId, CATEGORY_APPROVAL_EFFECT_STEP_APPLIED);
+    const steps = new Set();
+    for (const row of rows) {
+        if (!row.metadata) {
+            continue;
+        }
+        try {
+            const parsed = JSON.parse(row.metadata);
+            if (parsed.step) {
+                steps.add(parsed.step);
+            }
+        }
+        catch {
+            // Ignore corrupt historical metadata and keep replay deterministic.
+        }
+    }
+    return steps;
+}
+function markEffectStepApplied(db, taskId, actor, step) {
+    (0, queries_js_1.addAuditEntry)(db, taskId, 'completed', 'completed', actor, {
+        actorType: 'orchestrator',
+        category: CATEGORY_APPROVAL_EFFECT_STEP_APPLIED,
+        notes: `[approval_effects] Applied step: ${step}`,
+        metadata: { step },
+    });
+}
+function loadReplayInputFromCategory(db, taskId, category) {
+    const row = db
+        .prepare(`SELECT metadata
+       FROM audit
+       WHERE task_id = ?
+         AND category = ?
+       ORDER BY created_at DESC, id DESC
+       LIMIT 1`)
+        .get(taskId, category);
+    if (!row?.metadata) {
+        return null;
+    }
+    try {
+        return (0, approval_effects_replay_js_1.parseApprovalEffectsReplayInput)(JSON.parse(row.metadata));
+    }
+    catch (error) {
+        throw new Error(`Invalid approval effects replay metadata for task ${taskId} (${category}): ${error instanceof Error ? error.message : String(error)}`);
+    }
+}
+function loadReplayInputFromMergePending(db, taskId) {
+    const row = db
+        .prepare(`SELECT metadata
+       FROM audit
+       WHERE task_id = ?
+         AND to_status = 'merge_pending'
+         ORDER BY created_at DESC, id DESC
+         LIMIT 1`)
+        .get(taskId);
+    if (!row?.metadata) {
+        return null;
+    }
+    try {
+        const parsed = JSON.parse(row.metadata);
+        if (!parsed.approval_effects_replay) {
+            return null;
+        }
+        return (0, approval_effects_replay_js_1.parseApprovalEffectsReplayInput)(parsed.approval_effects_replay);
+    }
+    catch (error) {
+        throw new Error(`Invalid merge_pending approval replay metadata for task ${taskId}: ${error instanceof Error ? error.message : String(error)}`);
+    }
+}
+function allProjectTasksCompleted(db) {
+    const allTasks = (0, queries_js_1.listTasks)(db, { status: 'all' });
+    return allTasks.length > 0 && allTasks.every((task) => task.status === 'completed');
+}
+async function maybeTriggerSectionCompletion(db, task, options, actor, appliedSteps) {
+    if (appliedSteps.has('section_completion') || !task.section_id) {
+        return;
+    }
+    const section = (0, queries_js_1.getSection)(db, task.section_id);
+    if (!section) {
+        markEffectStepApplied(db, task.id, actor, 'section_completion');
+        return;
+    }
+    const sectionTasks = (0, queries_js_1.listTasks)(db, { sectionId: task.section_id });
+    const state = (0, section_completion_js_1.getSectionCompletionState)(sectionTasks);
+    if (state.done && !appliedSteps.has('section_completed_hook')) {
+        if (options.hooksEnabled !== false) {
+            await (0, integration_js_1.triggerSectionCompleted)({
+                id: section.id,
+                name: section.name,
+                taskCount: sectionTasks.length,
+            }, sectionTasks.map((entry) => ({ id: entry.id, title: entry.title })), { verbose: options.verbose, projectPath: options.projectPath });
+        }
+        markEffectStepApplied(db, task.id, actor, 'section_completed_hook');
+    }
+    await (0, section_pr_js_1.checkSectionCompletionAndPR)(db, options.projectPath, task.section_id, options.config);
+    markEffectStepApplied(db, task.id, actor, 'section_completion');
+}
+async function maybeTriggerProjectCompletion(db, taskId, options, actor, appliedSteps) {
+    if (appliedSteps.has('project_completion')) {
+        return;
+    }
+    if (allProjectTasksCompleted(db) && options.hooksEnabled !== false) {
+        const allTasks = (0, queries_js_1.listTasks)(db, { status: 'all' });
+        const sections = (0, queries_js_1.listSections)(db);
+        const files = Array.from(new Set(allTasks.map((task) => task.source_file).filter(Boolean)));
+        await (0, integration_js_1.triggerProjectCompleted)({
+            totalTasks: allTasks.length,
+            files,
+            sectionCount: sections.length,
+        }, { verbose: options.verbose, projectPath: options.projectPath });
+    }
+    markEffectStepApplied(db, taskId, actor, 'project_completion');
+}
+function noteMigrationAnomaly(db, taskId, actor, reason) {
+    const existing = db
+        .prepare(`SELECT 1
+       FROM audit
+       WHERE task_id = ?
+         AND category = ?
+         AND notes = ?
+       LIMIT 1`)
+        .get(taskId, CATEGORY_APPROVAL_EFFECTS_MIGRATION_ANOMALY, reason);
+    if (existing) {
+        return;
+    }
+    (0, queries_js_1.addAuditEntry)(db, taskId, 'completed', 'completed', actor, {
+        actorType: 'orchestrator',
+        category: CATEGORY_APPROVAL_EFFECTS_MIGRATION_ANOMALY,
+        notes: reason,
+    });
+}
+function buildApprovalEffectsReplayInput(task, projectPath) {
+    const intakeReplay = (0, reviewer_approval_js_1.buildIntakeApprovalReplayInput)(task, projectPath);
+    return intakeReplay
+        ? { version: 1, intake: intakeReplay }
+        : (0, approval_effects_replay_js_1.createEmptyApprovalEffectsReplayInput)();
+}
+function markApprovalEffectsPending(db, taskId, actor, replayInput) {
+    (0, queries_js_1.addAuditEntry)(db, taskId, 'completed', 'completed', actor, {
+        actorType: 'orchestrator',
+        category: CATEGORY_APPROVAL_EFFECTS_PENDING,
+        notes: '[approval_effects] Pending replay',
+        metadata: replayInput,
+    });
+}
+async function runPendingApprovalEffects(db, task, options, replayInput, actor = 'orchestrator') {
+    const appliedSteps = getAppliedEffectSteps(db, task.id);
+    const fullTask = (0, queries_js_1.getTask)(db, task.id);
+    if (!fullTask) {
+        throw new Error(`Task not found while applying approval effects: ${task.id}`);
+    }
+    if (!appliedSteps.has('task_completed_hook')) {
+        if (options.hooksEnabled !== false) {
+            await (0, integration_js_1.triggerTaskCompleted)(fullTask, {
+                verbose: options.verbose,
+                projectPath: options.projectPath,
+            });
+        }
+        markEffectStepApplied(db, task.id, actor, 'task_completed_hook');
+    }
+    if (replayInput.intake && !appliedSteps.has('intake')) {
+        (0, reviewer_approval_js_1.handleIntakeTaskApproval)(db, task, replayInput.intake);
+        markEffectStepApplied(db, task.id, actor, 'intake');
+    }
+    else if (!replayInput.intake && (0, task_reference_js_1.parseIntakeTaskReference)(task)) {
+        noteMigrationAnomaly(db, task.id, actor, '[approval_effects] Intake replay input missing; intake follow-up was not replayed automatically.');
+    }
+    await maybeTriggerSectionCompletion(db, task, options, actor, appliedSteps);
+    await maybeTriggerProjectCompletion(db, task.id, options, actor, appliedSteps);
+    if (!hasAuditCategory(db, task.id, CATEGORY_APPROVAL_EFFECTS_APPLIED)) {
+        (0, queries_js_1.addAuditEntry)(db, task.id, 'completed', 'completed', actor, {
+            actorType: 'orchestrator',
+            category: CATEGORY_APPROVAL_EFFECTS_APPLIED,
+            notes: '[approval_effects] Replay applied',
+        });
+    }
+}
+async function completeTaskWithApprovalEffects(db, task, options) {
+    const currentTask = (0, queries_js_1.getTask)(db, task.id);
+    if (!currentTask) {
+        throw new Error(`Task not found: ${task.id}`);
+    }
+    const replayInput = options.replayInput ??
+        buildApprovalEffectsReplayInput(task, options.intakeProjectPath ?? options.projectPath);
+    db.transaction(() => {
+        if (currentTask.status !== 'completed') {
+            (0, queries_js_1.updateTaskStatus)(db, task.id, 'completed', options.actor, options.notes, options.commitSha);
+        }
+        if (!loadReplayInputFromCategory(db, task.id, CATEGORY_APPROVAL_EFFECTS_PENDING)) {
+            markApprovalEffectsPending(db, task.id, options.actor, replayInput);
+        }
+    })();
+    await runPendingApprovalEffects(db, task, options, replayInput, options.actor);
+}
+async function reconcilePendingApprovalEffects(db, options) {
+    const pendingTasks = db
+        .prepare(`WITH latest_pending AS (
+         SELECT task_id, MAX(id) AS pending_id
+         FROM audit
+         WHERE category = ?
+         GROUP BY task_id
+       ),
+       latest_applied AS (
+         SELECT task_id, MAX(id) AS applied_id
+         FROM audit
+         WHERE category = ?
+         GROUP BY task_id
+       )
+       SELECT t.id, t.title, t.source_file, t.section_id
+       FROM tasks t
+       JOIN latest_pending lp ON lp.task_id = t.id
+       LEFT JOIN latest_applied la ON la.task_id = t.id
+       WHERE t.status = 'completed'
+         AND (la.applied_id IS NULL OR la.applied_id < lp.pending_id)`)
+        .all(CATEGORY_APPROVAL_EFFECTS_PENDING, CATEGORY_APPROVAL_EFFECTS_APPLIED);
+    let replayed = 0;
+    for (const task of pendingTasks) {
+        const replayInput = loadReplayInputFromCategory(db, task.id, CATEGORY_APPROVAL_EFFECTS_PENDING);
+        if (!replayInput) {
+            continue;
+        }
+        await runPendingApprovalEffects(db, task, options, replayInput);
+        replayed += 1;
+    }
+    const legacyCandidates = db
+        .prepare(`SELECT t.id, t.title, t.source_file, t.section_id
+       FROM tasks t
+       WHERE t.status = 'completed'
+         AND EXISTS (
+           SELECT 1
+           FROM audit a
+           WHERE a.task_id = t.id
+             AND a.to_status = 'completed'
+         )
+         AND NOT EXISTS (
+           SELECT 1
+           FROM audit a
+           WHERE a.task_id = t.id
+             AND a.category IN (?, ?, ?)
+         )
+       ORDER BY t.updated_at DESC
+       LIMIT 100`)
+        .all(CATEGORY_APPROVAL_EFFECTS_PENDING, CATEGORY_APPROVAL_EFFECTS_APPLIED, CATEGORY_APPROVAL_EFFECTS_MIGRATION_ANOMALY);
+    for (const task of legacyCandidates) {
+        if ((0, task_reference_js_1.parseIntakeTaskReference)(task)) {
+            noteMigrationAnomaly(db, task.id, 'orchestrator', '[approval_effects] Legacy completed intake task is missing immutable replay input; intake follow-up requires manual verification.');
+            continue;
+        }
+        const replayInput = (0, approval_effects_replay_js_1.createEmptyApprovalEffectsReplayInput)();
+        markApprovalEffectsPending(db, task.id, 'orchestrator', replayInput);
+        await runPendingApprovalEffects(db, task, options, replayInput);
+        replayed += 1;
+    }
+    return replayed;
+}
+function loadQueuedApprovalEffectsReplayInput(db, taskId) {
+    return loadReplayInputFromMergePending(db, taskId);
+}
+//# sourceMappingURL=automated-approval-effects.js.map

package/dist/orchestrator/automated-approval-effects.js.map

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

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

@@ -0,0 +1,12 @@
+import type Database from 'better-sqlite3';
+import type { SteroidsConfig } from '../config/loader.js';
+import type { Task } from '../database/queries.js';
+export interface MergeQueueCompletionOptions {
+    config: SteroidsConfig;
+    projectPath: string;
+    intakeProjectPath?: string;
+    mergedSha?: string;
+    notes: string;
+}
+export declare function completeMergePendingTask(db: Database.Database, task: Pick<Task, 'id' | 'title' | 'source_file' | 'section_id'>, options: MergeQueueCompletionOptions): Promise<void>;
+//# sourceMappingURL=merge-queue-completion.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"merge-queue-completion.d.ts","sourceRoot":"","sources":["../../src/orchestrator/merge-queue-completion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AASnD,MAAM,WAAW,2BAA2B;IAC1C,MAAM,EAAE,cAAc,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wBAAsB,wBAAwB,CAC5C,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,GAAG,aAAa,GAAG,YAAY,CAAC,EAC/D,OAAO,EAAE,2BAA2B,GACnC,OAAO,CAAC,IAAI,CAAC,CA0Bf"}

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

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.completeMergePendingTask = completeMergePendingTask;
+const queries_js_1 = require("../database/queries.js");
+const automated_approval_effects_js_1 = require("./automated-approval-effects.js");
+const approval_effects_replay_js_1 = require("./approval-effects-replay.js");
+async function completeMergePendingTask(db, task, options) {
+    let replayInput = (0, automated_approval_effects_js_1.loadQueuedApprovalEffectsReplayInput)(db, task.id);
+    if (!replayInput) {
+        try {
+            replayInput = (0, automated_approval_effects_js_1.buildApprovalEffectsReplayInput)(task, options.intakeProjectPath ?? options.projectPath);
+        }
+        catch (error) {
+            replayInput = (0, approval_effects_replay_js_1.createEmptyApprovalEffectsReplayInput)();
+            (0, queries_js_1.addAuditEntry)(db, task.id, 'merge_pending', 'merge_pending', 'orchestrator', {
+                actorType: 'orchestrator',
+                category: 'approval_effects_migration_anomaly',
+                notes: '[approval_effects] Missing queued replay input at merge completion; continuing without intake replay: ' +
+                    (error instanceof Error ? error.message : String(error)),
+            });
+        }
+    }
+    await (0, automated_approval_effects_js_1.completeTaskWithApprovalEffects)(db, task, {
+        actor: 'orchestrator',
+        notes: options.notes,
+        commitSha: options.mergedSha,
+        config: options.config,
+        projectPath: options.projectPath,
+        intakeProjectPath: options.intakeProjectPath,
+        replayInput,
+    });
+}
+//# sourceMappingURL=merge-queue-completion.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"merge-queue-completion.js","sourceRoot":"","sources":["../../src/orchestrator/merge-queue-completion.ts"],"names":[],"mappings":";;AAmBA,4DA8BC;AA9CD,uDAAuD;AACvD,mFAIyC;AACzC,6EAAqF;AAU9E,KAAK,UAAU,wBAAwB,CAC5C,EAAqB,EACrB,IAA+D,EAC/D,OAAoC;IAEpC,IAAI,WAAW,GAAG,IAAA,oEAAoC,EAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IACpE,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,IAAI,CAAC;YACH,WAAW,GAAG,IAAA,+DAA+B,EAAC,IAAI,EAAE,OAAO,CAAC,iBAAiB,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC;QACxG,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,WAAW,GAAG,IAAA,kEAAqC,GAAE,CAAC;YACtD,IAAA,0BAAa,EAAC,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE;gBAC3E,SAAS,EAAE,cAAc;gBACzB,QAAQ,EAAE,oCAAoC;gBAC9C,KAAK,EACH,wGAAwG;oBACxG,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aAC3D,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,MAAM,IAAA,+DAA+B,EAAC,EAAE,EAAE,IAAI,EAAE;QAC9C,KAAK,EAAE,cAAc;QACrB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;QAC5C,WAAW;KACZ,CAAC,CAAC;AACL,CAAC"}

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

@@ -33,8 +33,15 @@ export declare function pushTargetBranch(slotPath: string, targetBranch: string)
     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 markCompleted(db: Database.Database, task: Pick<Task, 'id' | 'title' | 'source_file' | 'section_id'>, options: {
+    config: SteroidsConfig;
+    projectPath: string;
+    intakeProjectPath?: string;
+    mergedSha?: string;
+    notes: string;
+}): Promise<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 resolveRebaseRemoteUrl(globalDb: Database.Database, taskId: string, sourceProjectPath: string): string | null;
 export declare function processMergeQueue(db: Database.Database, task: Task, config: SteroidsConfig, sourceProjectPath: string, runnerId?: string): Promise<void>;
 //# sourceMappingURL=merge-queue.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"merge-queue.d.ts","sourceRoot":"","sources":["../../src/orchestrator/merge-queue.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAE3C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAKnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAK1D,MAAM,MAAM,cAAc,GAAG,WAAW,GAAG,WAAW,GAAG,WAAW,CAAC;AACrE,MAAM,MAAM,eAAe,GAAG,WAAW,GAAG,WAAW,CAAC;AAExD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,CAe/D;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAYjE;AAID,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,OAAO,CAAC;IACZ,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,KAAK,CAAC,EAAE,cAAc,GAAG,iBAAiB,GAAG,iBAAiB,CAAC;IAC/D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,GAClB,UAAU,CAsCZ;AAED,wBAAgB,iBAAiB,CAC/B,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,cAAc,GAAG,iBAAiB,GAAG,iBAAiB,GAC5D,IAAI,CAqBN;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;CAClC;AAED,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,GACnB,kBAAkB,CAuCpB;AAED,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,cAAc,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAOvE;AAED,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB,IAAI,CASN;AAED,wBAAgB,aAAa,CAC3B,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,GACjB,IAAI,CAUN;AAID,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GACb,IAAI,CAyBN;AAID,wBAAsB,kBAAkB,CACtC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,cAAc,EACtB,iBAAiB,EAAE,MAAM,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CA6Gf;AAiDD,wBAAsB,iBAAiB,CACrC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,cAAc,EACtB,iBAAiB,EAAE,MAAM,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAgBf"}
+{"version":3,"file":"merge-queue.d.ts","sourceRoot":"","sources":["../../src/orchestrator/merge-queue.ts"],"names":[],"mappings":"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"}

package/dist/orchestrator/merge-queue.js

@@ -17,6 +17,7 @@ exports.cleanupTaskBranch = cleanupTaskBranch;
 exports.markCompleted = markCompleted;
 exports.transitionToRebasing = transitionToRebasing;
 exports.handleMergeAttempt = handleMergeAttempt;
+exports.resolveRebaseRemoteUrl = resolveRebaseRemoteUrl;
 exports.processMergeQueue = processMergeQueue;
 const node_child_process_1 = require("node:child_process");
 const queries_js_1 = require("../database/queries.js");
@@ -25,6 +26,7 @@ const pool_js_1 = require("../workspace/pool.js");
 const clone_js_1 = require("../parallel/clone.js");
 const git_helpers_js_1 = require("../workspace/git-helpers.js");
 const global_db_js_1 = require("../runners/global-db.js");
+const merge_queue_completion_js_1 = require("./merge-queue-completion.js");
 function classifyPushError(error) {
     const lower = error.toLowerCase();
     if (lower.includes('non-fast-forward') || lower.includes('fetch first') || lower.includes('stale info')) {
@@ -168,13 +170,13 @@ function cleanupTaskBranch(slotPath, taskBranch) {
         // Non-fatal — branch may already be deleted or remote unreachable
     }
 }
-function markCompleted(db, taskId, mergedSha) {
-    db.prepare(`UPDATE tasks SET status = 'completed', merge_phase = NULL, approved_sha = NULL, rebase_attempts = 0, updated_at = datetime('now')
-     WHERE id = ?`).run(taskId);
-    (0, queries_js_1.addAuditEntry)(db, taskId, 'merge_pending', 'completed', 'orchestrator', {
-        actorType: 'orchestrator',
-        notes: '[merge_queue] Merge completed successfully',
-        commitSha: mergedSha,
+async function markCompleted(db, task, options) {
+    await (0, merge_queue_completion_js_1.completeMergePendingTask)(db, task, {
+        config: options.config,
+        projectPath: options.projectPath,
+        intakeProjectPath: options.intakeProjectPath,
+        mergedSha: options.mergedSha,
+        notes: options.notes,
     });
 }
 const MAX_REBASE_ATTEMPTS = 3;
@@ -210,7 +212,13 @@ async function handleMergeAttempt(db, task, config, sourceProjectPath, runnerId)
     // Local-only guard: no remote configured → skip merge queue
     const remoteUrl = (0, pool_js_1.resolveRemoteUrl)(sourceProjectPath);
     if (!remoteUrl) {
-        markCompleted(db, task.id, approvedSha);
+        await markCompleted(db, task, {
+            config,
+            projectPath: sourceProjectPath,
+            intakeProjectPath: sourceProjectPath,
+            mergedSha: approvedSha,
+            notes: '[merge_queue] Local-only task completed without remote merge',
+        });
         return;
     }
     const projectId = (0, clone_js_1.getProjectHash)(sourceProjectPath);
@@ -233,7 +241,13 @@ async function handleMergeAttempt(db, task, config, sourceProjectPath, runnerId)
         // Step 1: Fetch and prepare
         const prepResult = fetchAndPrepare(slotPath, taskBranch, targetBranch, approvedSha);
         if (prepResult.alreadyMerged) {
-            markCompleted(db, task.id, approvedSha);
+            await markCompleted(db, task, {
+                config,
+                projectPath: sourceProjectPath,
+                intakeProjectPath: sourceProjectPath,
+                mergedSha: approvedSha,
+                notes: '[merge_queue] Task branch was already merged; marking completed',
+            });
             cleanupTaskBranch(slotPath, taskBranch);
             return;
         }
@@ -273,7 +287,13 @@ async function handleMergeAttempt(db, task, config, sourceProjectPath, runnerId)
         // Step 5: Cleanup task branch (non-fatal)
         cleanupTaskBranch(slotPath, taskBranch);
         // Step 6: Mark completed
-        markCompleted(db, task.id, mergedSha);
+        await markCompleted(db, task, {
+            config,
+            projectPath: sourceProjectPath,
+            intakeProjectPath: sourceProjectPath,
+            mergedSha,
+            notes: '[merge_queue] Merge completed successfully',
+        });
     }
     finally {
         if (lockAcquired) {
@@ -295,17 +315,32 @@ async function handleMergeAttempt(db, task, config, sourceProjectPath, runnerId)
     }
 }
 // ─── Rebase phase wrapper ────────────────────────────────────────────────────
+function resolveRebaseRemoteUrl(globalDb, taskId, sourceProjectPath) {
+    const existingSlot = globalDb
+        .prepare(`SELECT remote_url
+       FROM workspace_pool_slots
+       WHERE task_id = ? AND remote_url IS NOT NULL AND remote_url != ''
+       ORDER BY id DESC LIMIT 1`)
+        .get(taskId);
+    return existingSlot?.remote_url ?? (0, pool_js_1.resolveRemoteUrl)(sourceProjectPath);
+}
 async function handleRebasePhase(db, task, config, sourceProjectPath, phase, runnerId) {
     const { handleRebaseCoder, handleRebaseReview } = await import('./merge-queue-rebase.js');
     const targetBranch = config.git?.branch ?? 'main';
-    const remoteUrl = (0, pool_js_1.resolveRemoteUrl)(sourceProjectPath);
+    const gdb = (0, global_db_js_1.openGlobalDatabase)();
+    const remoteUrl = resolveRebaseRemoteUrl(gdb.db, task.id, sourceProjectPath);
     if (!remoteUrl) {
         // Local-only — no rebase needed, mark completed
-        markCompleted(db, task.id, task.approved_sha ?? undefined);
+        await markCompleted(db, task, {
+            config,
+            projectPath: sourceProjectPath,
+            intakeProjectPath: sourceProjectPath,
+            mergedSha: task.approved_sha ?? undefined,
+            notes: '[merge_queue] Local-only rebase path completed without remote merge',
+        });
         return;
     }
     const projectId = (0, clone_js_1.getProjectHash)(sourceProjectPath);
-    const gdb = (0, global_db_js_1.openGlobalDatabase)();
     let slotId;
     try {
         const slot = (0, pool_js_1.claimSlot)(gdb.db, projectId, runnerId ?? `rebase:${process.pid}`, task.id);

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

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

package/dist/orchestrator/reviewer-approval-outcome.d.ts

@@ -0,0 +1,26 @@
+import type Database from 'better-sqlite3';
+import type { SteroidsConfig } from '../config/loader.js';
+import { type Task } from '../database/queries.js';
+import type { ApprovalEffectsReplayInput } from './approval-effects-replay.js';
+import type { ApprovalSafetyResult, SubmissionContext } from './submission-context.js';
+export type ApprovedOutcome = {
+    kind: 'complete';
+    commitSha: string;
+} | {
+    kind: 'queue_merge';
+    approvedSha: string;
+};
+export declare function deriveApprovedOutcome(submissionContext: SubmissionContext, approvalSafety: Extract<ApprovalSafetyResult, {
+    ok: true;
+}>): ApprovedOutcome;
+export declare function applyApprovedOutcome(db: Database.Database, task: Pick<Task, 'id' | 'title' | 'source_file' | 'section_id'>, outcome: ApprovedOutcome, options: {
+    actor: string;
+    notes: string;
+    config: SteroidsConfig;
+    projectPath: string;
+    intakeProjectPath?: string;
+    hooksEnabled?: boolean;
+    verbose?: boolean;
+    replayInput?: ApprovalEffectsReplayInput;
+}): Promise<void>;
+//# sourceMappingURL=reviewer-approval-outcome.d.ts.map

package/dist/orchestrator/reviewer-approval-outcome.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"reviewer-approval-outcome.d.ts","sourceRoot":"","sources":["../../src/orchestrator/reviewer-approval-outcome.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAA0B,KAAK,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAK3E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC/E,OAAO,KAAK,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEvF,MAAM,MAAM,eAAe,GACvB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GACvC;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjD,wBAAgB,qBAAqB,CACnC,iBAAiB,EAAE,iBAAiB,EACpC,cAAc,EAAE,OAAO,CAAC,oBAAoB,EAAE;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,CAAC,GAC1D,eAAe,CAMjB;AAED,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,GAAG,aAAa,GAAG,YAAY,CAAC,EAC/D,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE;IACP,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,cAAc,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,0BAA0B,CAAC;CAC1C,GACA,OAAO,CAAC,IAAI,CAAC,CA6Cf"}