night-orch 0.1.0

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

@@ -0,0 +1,13 @@
+import type Database from 'better-sqlite3';
+import type { ForgeAdapter } from '../forge/types.js';
+import type { RepoConfig } from '../config/schema.js';
+/**
+ * Process the merge queue for a single repo.
+ * Called once per poll cycle, after reaction scanning.
+ *
+ * Flow:
+ * 1. Check for active batch → if testing, check CI status
+ * 2. If no active batch → scan for eligible PRs, form new batch
+ */
+export declare function processMergeQueue(db: Database.Database, forge: ForgeAdapter, repoConfig: RepoConfig): Promise<void>;
+//# sourceMappingURL=runner.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/merge-queue/runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAA;AAC1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAqBrD;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,KAAK,EAAE,YAAY,EACnB,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,IAAI,CAAC,CAWf"}

package/dist/merge-queue/runner.js

@@ -0,0 +1,246 @@
+import { runGit } from '../git/process.js';
+import { MergeBatchManager } from './batch.js';
+import { findMergeEligiblePRs } from './eligibility.js';
+import { buildStagingBranch } from './staging.js';
+import { finalizeMerge } from './finalize.js';
+import { bisectBatch, isCulpritIdentified } from './bisect.js';
+import { logger } from '../utils/logger.js';
+import { RunManager } from '../state/runs.js';
+import { nowUtcIso } from '../utils/time.js';
+/**
+ * Batches left in `building` longer than this are considered stuck and
+ * reset to `failed` on the next cycle. A crash between `buildStagingBranch`
+ * kickoff and its completion would otherwise leave the queue wedged
+ * forever, because `building` is non-terminal but `handleActiveBatch` skips
+ * it by design.
+ */
+const STUCK_BUILDING_MS = 30 * 60 * 1000;
+/**
+ * Process the merge queue for a single repo.
+ * Called once per poll cycle, after reaction scanning.
+ *
+ * Flow:
+ * 1. Check for active batch → if testing, check CI status
+ * 2. If no active batch → scan for eligible PRs, form new batch
+ */
+export async function processMergeQueue(db, forge, repoConfig) {
+    if (!repoConfig.mergeQueue.enabled)
+        return;
+    const batchManager = new MergeBatchManager(db);
+    const activeBatch = batchManager.getActiveBatch(repoConfig.repo);
+    if (activeBatch) {
+        await handleActiveBatch(db, forge, repoConfig, batchManager, activeBatch);
+    }
+    else {
+        await formNewBatch(db, forge, repoConfig, batchManager);
+    }
+}
+async function handleActiveBatch(db, forge, repoConfig, batchManager, batch) {
+    if (batch.status === 'pending') {
+        return;
+    }
+    if (batch.status === 'building') {
+        // Building is set synchronously before buildStagingBranch runs. If a
+        // previous cycle crashed mid-build we would otherwise deadlock here —
+        // detect stuck-building by age and fail the batch so a new one can form.
+        if (isBatchStuckBuilding(batch)) {
+            logger.warn({ repo: repoConfig.repo, batchId: batch.id, updatedAt: batch.updatedAt }, 'Merge batch stuck in building — marking failed for retry');
+            batchManager.update(batch.id, { status: 'failed' });
+        }
+        return;
+    }
+    if (batch.status === 'testing') {
+        // Check CI on the staging branch
+        if (!batch.stagingSha || !forge.getRefCheckStatus) {
+            logger.warn({ repo: repoConfig.repo, batchId: batch.id }, 'Cannot check staging CI — missing SHA or forge method');
+            return;
+        }
+        const ciStatus = await forge.getRefCheckStatus(repoConfig.repo, batch.stagingSha);
+        if (ciStatus.overall === 'success') {
+            // Finalize merge FIRST, then mark the batch passed. If finalizeMerge
+            // throws, the batch stays in 'testing' so the next cycle can retry
+            // rather than burying a half-completed merge in a terminal state.
+            // Only close the PRs that actually made it into staging —
+            // `merged_pr_numbers` was captured at staging time and excludes
+            // conflict-ejected PRs.
+            const mergedPrNumbers = batch.mergedPrNumbers ?? batch.prNumbers;
+            logger.info({ repo: repoConfig.repo, batchId: batch.id, prs: mergedPrNumbers }, 'Merge batch CI passed — finalizing');
+            try {
+                await finalizeMerge(forge, repoConfig.repo, repoConfig.baseBranch, batch.stagingSha, mergedPrNumbers, batch.stagingBranch ?? '', repoConfig.localPath);
+            }
+            catch (err) {
+                logger.error({ repo: repoConfig.repo, batchId: batch.id, err }, 'Merge batch finalize failed — marking batch failed for bisect/quarantine');
+                batchManager.update(batch.id, { status: 'failed' });
+                return;
+            }
+            batchManager.update(batch.id, { status: 'passed' });
+            transitionMergedRuns(db, repoConfig.repo, mergedPrNumbers);
+        }
+        else if (ciStatus.overall === 'failure') {
+            logger.warn({ repo: repoConfig.repo, batchId: batch.id }, 'Merge batch CI failed — bisecting');
+            batchManager.update(batch.id, { status: 'failed' });
+            // Retry once if configured
+            if (repoConfig.mergeQueue.retryFlakyOnce && batch.retryCount === 0) {
+                batchManager.update(batch.id, { status: 'testing', retryCount: 1 });
+                logger.info({ repo: repoConfig.repo, batchId: batch.id }, 'Retrying batch once for flaky CI');
+                return;
+            }
+            // Bisect
+            if (isCulpritIdentified(batch.prNumbers)) {
+                // Single PR failed — it's the culprit
+                const culprit = batch.prNumbers[0];
+                logger.warn({ repo: repoConfig.repo, prNumber: culprit }, 'Merge culprit identified');
+                await quarantineCulpritPR(db, forge, repoConfig, culprit);
+            }
+            else {
+                const [left, right] = bisectBatch(batch.prNumbers);
+                const mid = left.length;
+                const leftShas = batch.approvedShas.slice(0, mid);
+                const rightShas = batch.approvedShas.slice(mid);
+                // Create two sub-batches
+                for (const [prs, shas] of [[left, leftShas], [right, rightShas]]) {
+                    const subBatch = batchManager.create({
+                        repo: repoConfig.repo,
+                        baseBranch: repoConfig.baseBranch,
+                        baseSha: batch.baseSha,
+                        prNumbers: prs,
+                        approvedShas: shas,
+                    });
+                    batchManager.update(subBatch.id, { parentBatchId: batch.id, status: 'building' });
+                    // Build staging for sub-batch. Wrap in try/catch so a crash in
+                    // staging does not leave the sub-batch wedged in 'building'.
+                    try {
+                        const staging = await buildStagingBranch(repoConfig.localPath, repoConfig.baseBranch, prs, forge, repoConfig.repo, repoConfig.mergeQueue.stagingBranchPrefix);
+                        batchManager.update(subBatch.id, {
+                            status: 'testing',
+                            stagingBranch: staging.stagingBranch,
+                            stagingSha: staging.stagingSha,
+                            mergedPrNumbers: staging.merged,
+                        });
+                    }
+                    catch (err) {
+                        logger.error({ repo: repoConfig.repo, subBatchId: subBatch.id, err }, 'Staging build threw for bisect sub-batch — marking failed');
+                        batchManager.update(subBatch.id, { status: 'failed' });
+                    }
+                }
+            }
+        }
+        // If pending — CI still running, wait for next cycle
+    }
+}
+function isBatchStuckBuilding(batch) {
+    if (batch.status !== 'building')
+        return false;
+    const updatedAtMs = Date.parse(batch.updatedAt);
+    if (Number.isNaN(updatedAtMs))
+        return false;
+    return Date.now() - updatedAtMs > STUCK_BUILDING_MS;
+}
+/**
+ * Transition runs associated with successfully merged PRs out of
+ * `review_ready` and into `completed`. Without this, successful merges
+ * leave their runs stuck in `review_ready` forever — only the failure
+ * path (`quarantineCulpritPR`) previously updated run state.
+ */
+function transitionMergedRuns(db, repo, mergedPrNumbers) {
+    if (mergedPrNumbers.length === 0)
+        return;
+    const placeholders = mergedPrNumbers.map(() => '?').join(', ');
+    const rows = db
+        .prepare(`SELECT id, pr_number
+       FROM runs
+       WHERE repo = ?
+         AND pr_number IN (${placeholders})
+         AND status = 'review_ready'`)
+        .all(repo, ...mergedPrNumbers);
+    if (rows.length === 0)
+        return;
+    const runManager = new RunManager(db);
+    const endedAt = nowUtcIso();
+    for (const row of rows) {
+        try {
+            runManager.update(row.id, { status: 'completed', endedAt });
+            logger.info({ repo, runId: row.id, prNumber: row.pr_number }, 'Transitioned run out of review_ready after successful merge');
+        }
+        catch (err) {
+            logger.warn({ repo, runId: row.id, prNumber: row.pr_number, err }, 'Failed to transition run to completed after merge');
+        }
+    }
+}
+async function formNewBatch(db, forge, repoConfig, batchManager) {
+    const candidates = await findMergeEligiblePRs(db, forge, repoConfig);
+    if (candidates.length === 0)
+        return;
+    // Take up to batchSize candidates
+    const batchCandidates = candidates.slice(0, repoConfig.mergeQueue.batchSize);
+    const prNumbers = batchCandidates.map(c => c.prNumber);
+    const approvedShas = batchCandidates.map(c => c.headSha);
+    logger.info({ repo: repoConfig.repo, prNumbers }, 'Forming new merge batch');
+    // Get current base SHA
+    const baseResult = await runGit(['rev-parse', `origin/${repoConfig.baseBranch}`], { cwd: repoConfig.localPath });
+    const baseSha = baseResult.stdout.trim();
+    // Create batch record
+    const batch = batchManager.create({
+        repo: repoConfig.repo,
+        baseBranch: repoConfig.baseBranch,
+        baseSha,
+        prNumbers,
+        approvedShas,
+    });
+    batchManager.update(batch.id, { status: 'building' });
+    // Build staging branch. Wrap in try/catch so a crash here does not wedge
+    // the batch in 'building' (handleActiveBatch will also recover stuck
+    // builds by age as a belt-and-braces fallback).
+    let staging;
+    try {
+        staging = await buildStagingBranch(repoConfig.localPath, repoConfig.baseBranch, prNumbers, forge, repoConfig.repo, repoConfig.mergeQueue.stagingBranchPrefix);
+    }
+    catch (err) {
+        logger.error({ repo: repoConfig.repo, batchId: batch.id, err }, 'Staging build threw — marking batch failed');
+        batchManager.update(batch.id, { status: 'failed' });
+        return;
+    }
+    batchManager.update(batch.id, {
+        status: 'testing',
+        stagingBranch: staging.stagingBranch,
+        stagingSha: staging.stagingSha,
+        mergedPrNumbers: staging.merged,
+    });
+    if (staging.ejected.length > 0) {
+        logger.warn({ repo: repoConfig.repo, ejected: staging.ejected }, 'Some PRs ejected from batch due to conflicts');
+    }
+    logger.info({ repo: repoConfig.repo, batchId: batch.id, merged: staging.merged.length, testing: true }, 'Merge batch staged and pushed');
+}
+async function quarantineCulpritPR(db, forge, repoConfig, prNumber) {
+    try {
+        await forge.addLabels(repoConfig.repo, prNumber, [repoConfig.labels.mergeFailed]);
+    }
+    catch (err) {
+        logger.warn({ repo: repoConfig.repo, prNumber, err }, 'Failed to add merge-failed label to culprit PR');
+    }
+    try {
+        await forge.removeLabels(repoConfig.repo, prNumber, [repoConfig.labels.mergeQueued, repoConfig.labels.merging]);
+    }
+    catch (err) {
+        logger.warn({ repo: repoConfig.repo, prNumber, err }, 'Failed to clear merge queue labels from culprit PR');
+    }
+    const rows = db
+        .prepare(`SELECT id
+       FROM runs
+       WHERE repo = ?
+         AND pr_number = ?
+         AND status = 'review_ready'`)
+        .all(repoConfig.repo, prNumber);
+    if (rows.length === 0)
+        return;
+    const runManager = new RunManager(db);
+    const endedAt = nowUtcIso();
+    for (const row of rows) {
+        runManager.update(row.id, {
+            status: 'blocked',
+            blockReason: 'merge_conflict',
+            endedAt,
+        });
+    }
+}
+//# sourceMappingURL=runner.js.map

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

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

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

@@ -0,0 +1,13 @@
+import type { ForgeAdapter } from '../forge/types.js';
+export interface StagingResult {
+    stagingSha: string;
+    merged: number[];
+    ejected: number[];
+    stagingBranch: string;
+}
+/**
+ * Build a staging branch by sequentially merging PR head branches.
+ * Ejects conflicting PRs and continues with the rest.
+ */
+export declare function buildStagingBranch(repoLocalPath: string, baseBranch: string, prNumbers: number[], forge: ForgeAdapter, repo: string, stagingBranchPrefix: string): Promise<StagingResult>;
+//# sourceMappingURL=staging.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"staging.d.ts","sourceRoot":"","sources":["../../src/merge-queue/staging.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAGrD,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,aAAa,EAAE,MAAM,CAAA;CACtB;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EAAE,EACnB,KAAK,EAAE,YAAY,EACnB,IAAI,EAAE,MAAM,EACZ,mBAAmB,EAAE,MAAM,GAC1B,OAAO,CAAC,aAAa,CAAC,CAgDxB"}

package/dist/merge-queue/staging.js

@@ -0,0 +1,88 @@
+import { mkdtemp, rm } from 'node:fs/promises';
+import { join } from 'node:path';
+import { tmpdir } from 'node:os';
+import { getHeadSha, mergeNoFF, abortMerge } from '../git/repo.js';
+import { runGit } from '../git/process.js';
+import { logger } from '../utils/logger.js';
+/**
+ * Build a staging branch by sequentially merging PR head branches.
+ * Ejects conflicting PRs and continues with the rest.
+ */
+export async function buildStagingBranch(repoLocalPath, baseBranch, prNumbers, forge, repo, stagingBranchPrefix) {
+    const stagingBranch = `${stagingBranchPrefix}/${Date.now()}`;
+    const merged = [];
+    const ejected = [];
+    const stagingWorktreePath = await createStagingWorktree(repoLocalPath, baseBranch, stagingBranch);
+    try {
+        for (const prNumber of prNumbers) {
+            try {
+                // Get PR to find head branch
+                const pr = forge.getPR
+                    ? await forge.getPR(repo, prNumber)
+                    : await forge.findPRByBranch(repo, ''); // fallback — won't work well
+                if (!pr) {
+                    logger.warn({ repo, prNumber }, 'Could not find PR for merge — ejecting');
+                    ejected.push(prNumber);
+                    continue;
+                }
+                // Fetch the PR branch
+                await runGit(['fetch', 'origin', pr.headBranch], { cwd: stagingWorktreePath });
+                // Try to merge
+                const mergeResult = await mergeNoFF(stagingWorktreePath, `origin/${pr.headBranch}`);
+                if (mergeResult.success) {
+                    merged.push(prNumber);
+                    logger.info({ repo, prNumber, branch: pr.headBranch }, 'Merged PR into staging');
+                }
+                else {
+                    await abortMerge(stagingWorktreePath);
+                    ejected.push(prNumber);
+                    logger.warn({ repo, prNumber, branch: pr.headBranch, error: mergeResult.error }, 'Merge conflict — ejecting PR');
+                }
+            }
+            catch (err) {
+                ejected.push(prNumber);
+                logger.warn({ repo, prNumber, err }, 'Failed to merge PR into staging — ejecting');
+            }
+        }
+        const stagingSha = await getHeadSha(stagingWorktreePath);
+        // Push staging branch
+        await runGit(['push', 'origin', stagingBranch, '--force-with-lease'], { cwd: stagingWorktreePath });
+        return { stagingSha, merged, ejected, stagingBranch };
+    }
+    finally {
+        await cleanupStagingWorktree(repoLocalPath, stagingWorktreePath);
+    }
+}
+async function createStagingWorktree(repoLocalPath, baseBranch, stagingBranch) {
+    await runGit(['fetch', 'origin'], { cwd: repoLocalPath });
+    const stagingWorktreePath = await mkdtemp(join(tmpdir(), 'night-orch-staging-'));
+    await runGit(['worktree', 'add', '--force', '-B', stagingBranch, stagingWorktreePath, `origin/${baseBranch}`], { cwd: repoLocalPath });
+    return stagingWorktreePath;
+}
+async function cleanupStagingWorktree(repoLocalPath, stagingWorktreePath) {
+    try {
+        await runGit(['worktree', 'remove', stagingWorktreePath, '--force'], {
+            cwd: repoLocalPath,
+            reject: false,
+        });
+    }
+    catch (err) {
+        logger.debug({ repoLocalPath, stagingWorktreePath, err }, 'Failed to remove staging worktree');
+    }
+    try {
+        await runGit(['worktree', 'prune'], {
+            cwd: repoLocalPath,
+            reject: false,
+        });
+    }
+    catch (err) {
+        logger.debug({ repoLocalPath, err }, 'Failed to prune worktrees after staging cleanup');
+    }
+    try {
+        await rm(stagingWorktreePath, { recursive: true, force: true });
+    }
+    catch {
+        // best-effort cleanup
+    }
+}
+//# sourceMappingURL=staging.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"staging.js","sourceRoot":"","sources":["../../src/merge-queue/staging.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAChC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAS3C;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,aAAqB,EACrB,UAAkB,EAClB,SAAmB,EACnB,KAAmB,EACnB,IAAY,EACZ,mBAA2B;IAE3B,MAAM,aAAa,GAAG,GAAG,mBAAmB,IAAI,IAAI,CAAC,GAAG,EAAE,EAAE,CAAA;IAC5D,MAAM,MAAM,GAAa,EAAE,CAAA;IAC3B,MAAM,OAAO,GAAa,EAAE,CAAA;IAC5B,MAAM,mBAAmB,GAAG,MAAM,qBAAqB,CAAC,aAAa,EAAE,UAAU,EAAE,aAAa,CAAC,CAAA;IAEjG,IAAI,CAAC;QACH,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,IAAI,CAAC;gBACH,6BAA6B;gBAC7B,MAAM,EAAE,GAAG,KAAK,CAAC,KAAK;oBACpB,CAAC,CAAC,MAAM,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC;oBACnC,CAAC,CAAC,MAAM,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA,CAAC,6BAA6B;gBAEtE,IAAI,CAAC,EAAE,EAAE,CAAC;oBACR,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,wCAAwC,CAAC,CAAA;oBACzE,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;oBACtB,SAAQ;gBACV,CAAC;gBAED,sBAAsB;gBACtB,MAAM,MAAM,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,EAAE,GAAG,EAAE,mBAAmB,EAAE,CAAC,CAAA;gBAE9E,eAAe;gBACf,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC,mBAAmB,EAAE,UAAU,EAAE,CAAC,UAAU,EAAE,CAAC,CAAA;gBACnF,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;oBACxB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;oBACrB,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,UAAU,EAAE,EAAE,wBAAwB,CAAC,CAAA;gBAClF,CAAC;qBAAM,CAAC;oBACN,MAAM,UAAU,CAAC,mBAAmB,CAAC,CAAA;oBACrC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;oBACtB,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,WAAW,CAAC,KAAK,EAAE,EAAE,8BAA8B,CAAC,CAAA;gBAClH,CAAC;YACH,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;gBACtB,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,4CAA4C,CAAC,CAAA;YACpF,CAAC;QACH,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,mBAAmB,CAAC,CAAA;QAExD,sBAAsB;QACtB,MAAM,MAAM,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,oBAAoB,CAAC,EAAE,EAAE,GAAG,EAAE,mBAAmB,EAAE,CAAC,CAAA;QAEnG,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,CAAA;IACvD,CAAC;YAAS,CAAC;QACT,MAAM,sBAAsB,CAAC,aAAa,EAAE,mBAAmB,CAAC,CAAA;IAClE,CAAC;AACH,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,aAAqB,EACrB,UAAkB,EAClB,aAAqB;IAErB,MAAM,MAAM,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAA;IACzD,MAAM,mBAAmB,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,qBAAqB,CAAC,CAAC,CAAA;IAChF,MAAM,MAAM,CACV,CAAC,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,mBAAmB,EAAE,UAAU,UAAU,EAAE,CAAC,EAChG,EAAE,GAAG,EAAE,aAAa,EAAE,CACvB,CAAA;IACD,OAAO,mBAAmB,CAAA;AAC5B,CAAC;AAED,KAAK,UAAU,sBAAsB,CAAC,aAAqB,EAAE,mBAA2B;IACtF,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,mBAAmB,EAAE,SAAS,CAAC,EAAE;YACnE,GAAG,EAAE,aAAa;YAClB,MAAM,EAAE,KAAK;SACd,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,KAAK,CAAC,EAAE,aAAa,EAAE,mBAAmB,EAAE,GAAG,EAAE,EAAE,mCAAmC,CAAC,CAAA;IAChG,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE;YAClC,GAAG,EAAE,aAAa;YAClB,MAAM,EAAE,KAAK;SACd,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,KAAK,CAAC,EAAE,aAAa,EAAE,GAAG,EAAE,EAAE,iDAAiD,CAAC,CAAA;IACzF,CAAC;IAED,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,mBAAmB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IACjE,CAAC;IAAC,MAAM,CAAC;QACP,sBAAsB;IACxB,CAAC;AACH,CAAC"}

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

@@ -0,0 +1,23 @@
+export type MergeBatchStatus = 'pending' | 'building' | 'testing' | 'passed' | 'failed' | 'bisecting';
+export interface MergeBatchRecord {
+    id: string;
+    repo: string;
+    baseBranch: string;
+    baseSha: string;
+    status: MergeBatchStatus;
+    stagingBranch: string | null;
+    stagingSha: string | null;
+    prNumbers: number[];
+    /**
+     * PRs actually merged into the staging branch. `null` before staging runs
+     * or for pre-migration batches; callers that finalize/close PRs must
+     * prefer this over `prNumbers` so ejected PRs are not closed as merged.
+     */
+    mergedPrNumbers: number[] | null;
+    approvedShas: string[];
+    retryCount: number;
+    parentBatchId: string | null;
+    createdAt: string;
+    updatedAt: string;
+}
+//# sourceMappingURL=types.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/merge-queue/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,gBAAgB,GAAG,SAAS,GAAG,UAAU,GAAG,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,WAAW,CAAA;AAErG,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,gBAAgB,CAAA;IACxB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAA;IAC5B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,SAAS,EAAE,MAAM,EAAE,CAAA;IACnB;;;;OAIG;IACH,eAAe,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;IAChC,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAA;IAC5B,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;CAClB"}

package/dist/merge-queue/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/merge-queue/types.ts"],"names":[],"mappings":""}

package/dist/metrics/collectors.d.ts

@@ -0,0 +1,24 @@
+import { Counter, Histogram, Gauge, Registry } from 'prom-client';
+export declare function createMetricsRegistry(): {
+    registry: Registry<"text/plain; version=0.0.4; charset=utf-8">;
+    runsTotal: Counter<"status">;
+    issuesProcessed: Counter<"repo">;
+    loopIterations: Counter<"repo">;
+    agentInvocations: Counter<"role" | "adapter">;
+    prOperations: Counter<"type">;
+    verifyRunsTotal: Counter<"result">;
+    notificationsTotal: Counter<"result" | "channel">;
+    errorsTotal: Counter<"repo" | "error_type">;
+    activeRuns: Gauge<string>;
+    queuedIssues: Gauge<string>;
+    blockedIssues: Gauge<string>;
+    dailyCostUsd: Gauge<string>;
+    eligibleIssues: Gauge<"repo">;
+    runDuration: Histogram<string>;
+    phaseDuration: Histogram<"phase">;
+    agentDuration: Histogram<"role" | "adapter">;
+    verifyDuration: Histogram<string>;
+    estimatedCost: Counter<"repo" | "agent">;
+};
+export type Metrics = ReturnType<typeof createMetricsRegistry>;
+//# sourceMappingURL=collectors.d.ts.map

package/dist/metrics/collectors.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"collectors.d.ts","sourceRoot":"","sources":["../../src/metrics/collectors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEjE,wBAAgB,qBAAqB;;;;;;;;;;;;;;;;;;;;EAoJpC;AAED,MAAM,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAA"}

package/dist/metrics/collectors.js

@@ -0,0 +1,132 @@
+import { Counter, Histogram, Gauge, Registry } from 'prom-client';
+export function createMetricsRegistry() {
+    const registry = new Registry();
+    const runsTotal = new Counter({
+        name: 'night_orch_runs_total',
+        help: 'Total runs by outcome',
+        labelNames: ['status'],
+        registers: [registry],
+    });
+    const issuesProcessed = new Counter({
+        name: 'night_orch_issues_processed_total',
+        help: 'Issues processed',
+        labelNames: ['repo'],
+        registers: [registry],
+    });
+    const loopIterations = new Counter({
+        name: 'night_orch_loop_iterations_total',
+        help: 'Plan/code/review iterations',
+        labelNames: ['repo'],
+        registers: [registry],
+    });
+    const agentInvocations = new Counter({
+        name: 'night_orch_agent_invocations_total',
+        help: 'Agent calls by role and adapter',
+        labelNames: ['role', 'adapter'],
+        registers: [registry],
+    });
+    const prOperations = new Counter({
+        name: 'night_orch_pr_operations_total',
+        help: 'PR operations by type',
+        labelNames: ['type'],
+        registers: [registry],
+    });
+    const verifyRunsTotal = new Counter({
+        name: 'night_orch_verify_runs_total',
+        help: 'Verification runs by result',
+        labelNames: ['result'],
+        registers: [registry],
+    });
+    const notificationsTotal = new Counter({
+        name: 'night_orch_notifications_total',
+        help: 'Notifications sent by channel and result',
+        labelNames: ['channel', 'result'],
+        registers: [registry],
+    });
+    const errorsTotal = new Counter({
+        name: 'night_orch_errors_total',
+        help: 'Errors by category',
+        labelNames: ['repo', 'error_type'],
+        registers: [registry],
+    });
+    const activeRuns = new Gauge({
+        name: 'night_orch_active_runs',
+        help: 'Currently running',
+        registers: [registry],
+    });
+    const queuedIssues = new Gauge({
+        name: 'night_orch_queued_issues',
+        help: 'Eligible issues waiting',
+        registers: [registry],
+    });
+    const blockedIssues = new Gauge({
+        name: 'night_orch_blocked_issues',
+        help: 'Blocked issues',
+        registers: [registry],
+    });
+    const dailyCostUsd = new Gauge({
+        name: 'night_orch_daily_cost_usd',
+        help: 'Estimated daily API cost in USD',
+        registers: [registry],
+    });
+    const eligibleIssues = new Gauge({
+        name: 'night_orch_eligible_issues',
+        help: 'Eligible issues by repo',
+        labelNames: ['repo'],
+        registers: [registry],
+    });
+    const runDuration = new Histogram({
+        name: 'night_orch_run_duration_seconds',
+        help: 'Time per run',
+        buckets: [60, 300, 600, 1200, 1800, 3600, 7200],
+        registers: [registry],
+    });
+    const phaseDuration = new Histogram({
+        name: 'night_orch_phase_duration_seconds',
+        help: 'Time per loop phase',
+        labelNames: ['phase'],
+        buckets: [10, 30, 60, 120, 300, 600, 1800],
+        registers: [registry],
+    });
+    const agentDuration = new Histogram({
+        name: 'night_orch_agent_duration_seconds',
+        help: 'Time per agent call',
+        labelNames: ['role', 'adapter'],
+        buckets: [30, 60, 120, 300, 600, 1200, 1800],
+        registers: [registry],
+    });
+    const verifyDuration = new Histogram({
+        name: 'night_orch_verify_duration_seconds',
+        help: 'Time per verification run',
+        buckets: [5, 15, 30, 60, 120, 300],
+        registers: [registry],
+    });
+    const estimatedCost = new Counter({
+        name: 'night_orch_estimated_cost_dollars',
+        help: 'Estimated API cost',
+        labelNames: ['repo', 'agent'],
+        registers: [registry],
+    });
+    return {
+        registry,
+        runsTotal,
+        issuesProcessed,
+        loopIterations,
+        agentInvocations,
+        prOperations,
+        verifyRunsTotal,
+        notificationsTotal,
+        errorsTotal,
+        activeRuns,
+        queuedIssues,
+        blockedIssues,
+        dailyCostUsd,
+        eligibleIssues,
+        runDuration,
+        phaseDuration,
+        agentDuration,
+        verifyDuration,
+        estimatedCost,
+    };
+}
+//# sourceMappingURL=collectors.js.map

package/dist/metrics/collectors.js.map

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

package/dist/metrics/server.d.ts

@@ -0,0 +1,8 @@
+import { type Server } from 'node:http';
+import type { Metrics } from './collectors.js';
+/**
+ * Start an HTTP server serving Prometheus metrics on /metrics
+ * and a JSON summary on /api/stats.
+ */
+export declare function startMetricsServer(metrics: Metrics, host: string, port: number): Server;
+//# sourceMappingURL=server.d.ts.map

package/dist/metrics/server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/metrics/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,MAAM,EAAE,MAAM,WAAW,CAAA;AACrD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAG9C;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GACX,MAAM,CA+BR"}