Pre-launch — Gluecron is in final validation. Public signups and git hosting for non-owner users open after launch review.
CodeIssuesDiscussionsWikiPull RequestsProjectsCommitsActionsReleasesContributorsPulse● GatesSecuritySettingsDeploymentsPipelineInsightsAgents✨ Explain✨ Ask AI✨ Workspace✨ Spec✨ Tests▓ Debt Map✨ NL Search🏛 Archaeology
claude/adoring-hopper-5x74bqclaude/affectionate-feynman-ykrf1hclaude/architecture-audit-design-wxprenclaude/build-status-update-3MXsfclaude/charming-meitner-mllb5rclaude/compare-gate-gluecron-s4mFQclaude/confident-faraday-tikcwbclaude/continue-work-XMTlIclaude/crontech-gluecron-deploy-7MIECclaude/crontech-platform-setup-SeKfwclaude/design-2026claude/ecstatic-ptolemy-jMdigclaude/enhance-github-integration-QNHdGclaude/fix-aa-loop-issue-PonMQclaude/fix-actions-and-processclaude/fix-desktop-errors-XqoW8claude/fix-red-workflowsclaude/fix-website-access-6FKJNclaude/gatetest-integration-hardeningclaude/github-audit-improvements-bDFr9claude/gluecron-launch-status-FoMRlclaude/hopeful-lamport-olfCTclaude/issue-to-pr-and-protectionsclaude/jolly-heisenberg-2sg1Qclaude/launch-preparation-QmTb6claude/new-session-xk1l7claude/plan-platform-architecture-kkN4yclaude/platform-analysis-roadmap-1nUGLclaude/platform-launch-assessment-8dWV8claude/polish-platform-release-AeDrUclaude/resume-previous-work-KzyLwclaude/review-crontech-handoff-qYEVqclaude/review-project-completeness-lHhS2claude/review-readme-docs-ulqPKclaude/serene-edison-rj87weclaude/setup-multi-repo-dev-BCwNQclaude/ship-fixes-and-tests-Jvz1cclaude/site-audit-competitive-pctlwgclaude/site-migration-vercel-XstpKclaude/standalone-product-repos-XHFTDcopilot/feat-smart-empty-states-keyboard-first-enhancementcopilot/feat-smart-morning-digest-review-context-restorecopilot/fix-and-process-workflowscopilot/update-ai-powered-code-reviewfeat/debt-mapfeat/push-policy-codeowners-hardeningfeat/smart-digest-contextfeat/stage-impactfeat/t1-secret-migrationfeat/u-polishfeat/w-self-hostfeat/w2-claude-configfix/agent-journey-orphan-sweepgatetest/auto-fix-1776586424172gatetest/auto-fix-1776586534814gatetest/auto-fix-1776590685143gatetest/auto-fix-1776590808199mainops/redeploy-retriggerstyle/dxt-cta-themeworktree-agent-a3377aad30d55da26worktree-agent-a7ef607b7ee1d6c74
auto-merge.ts14.6 KB · 426 lines
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
/**
 * Block K2 — AI-gated auto-merge evaluator.
 *
 * Pure decision helper. Given a PR, answer the single question:
 *
 *   "Should this PR auto-merge right now?"
 *
 * This module is intentionally a parallel surface to the manual-merge path
 * in `src/routes/pulls.tsx` — it MUST NOT relax any rule that the manual
 * path enforces. The rule of thumb: anything an autopilot can do, a human
 * could have done by clicking Merge themselves.
 *
 * Decision rules (all must hold for `merge: true`):
 *
 *   1. A `branch_protection` rule matches the base branch AND
 *      `enableAutoMerge=true` on that rule. Default-deny when no rule
 *      matches — auto-merge is strictly opt-in per branch.
 *   2. PR is not a draft.
 *   3. `evaluateProtection` (the existing branch-protection helper)
 *      returns allowed=true for this PR's context, including required
 *      status checks via `listRequiredChecks` / `passingCheckNames`.
 *   4. When `requireAiApproval=true` on the rule, there is an
 *      AI-review comment carrying `AI_REVIEW_MARKER` whose body looks
 *      like an approval (see `aiCommentLooksApproved`).
 *   5. (Optional) PR diff is within `opts.maxChangedFiles` /
 *      `opts.maxChangedLines` if provided.
 *
 * K3 (the autopilot ticker) is the only intended caller — this module
 * deliberately does NOT execute the merge. It only decides.
 */

import { and, eq } from "drizzle-orm";
import { db } from "../db";
import { branchProtection, prComments } from "../db/schema";
import type { BranchProtection } from "../db/schema";
import {
  countHumanApprovals,
  evaluateProtection,
  listRequiredChecks,
  matchProtection,
  passingCheckNames,
} from "./branch-protection";
import { AI_REVIEW_MARKER } from "./ai-review";
import { audit } from "./notify";
import { getRepoPath } from "../git/repository";
import { getLatestCachedPrRisk } from "./pr-risk";

// ---------------------------------------------------------------------------
// Public types
// ---------------------------------------------------------------------------

export interface AutoMergeContext {
  pullRequestId: string;
  repositoryId: string;
  baseBranch: string;
  isDraft: boolean;
  authorUserId: string;
}

export interface AutoMergeDecision {
  merge: boolean;
  reason: string;
  blocking?: string[];
}

export interface AutoMergeOptions {
  maxChangedFiles?: number;
  maxChangedLines?: number;
  /** Injectable clock for tests. Unused today but reserved for K3 cooldowns. */
  now?: Date;
  /**
   * Test-only injection of an owner/repo pair so the diff-size check can
   * shell out to the bare repo. In production the caller resolves these
   * from the repository row before calling. When omitted, the size cap is
   * skipped (treated as "no cap configured").
   */
  ownerName?: string;
  repoName?: string;
  /** Head branch for the diff-size check. Required when caps are set. */
  headBranch?: string;
}

// ---------------------------------------------------------------------------
// Pure decision helper
// ---------------------------------------------------------------------------

/**
 * Internal pure decision helper. All DB-derived facts are passed in as
 * arguments so tests can drive every branch without a real database.
 *
 * Block M3 — when `risk` is provided AND its band is `critical`, the
 * auto-merge is blocked with a clear reason. Lower bands never block
 * auto-merge; the score is informational on the manual path only.
 */
export function decideAutoMerge(args: {
  rule: BranchProtection | null;
  isDraft: boolean;
  aiApproved: boolean;
  humanApprovalCount: number;
  hasFailedGates: boolean;
  passingCheckNames: string[];
  requiredCheckNames: string[];
  diffStats?: { files: number; lines: number } | null;
  caps?: { maxChangedFiles?: number; maxChangedLines?: number };
  risk?: { score: number; band: "low" | "medium" | "high" | "critical" } | null;
}): AutoMergeDecision {
  const blocking: string[] = [];

  // 1. Default-deny: must have a matching rule AND it must opt in.
  if (!args.rule) {
    blocking.push(
      "No branch_protection rule matches the base branch — auto-merge is default-deny."
    );
    return { merge: false, reason: blocking[0], blocking };
  }
  if (!args.rule.enableAutoMerge) {
    blocking.push(
      `Branch protection '${args.rule.pattern}' does not have auto-merge enabled.`
    );
  }

  // 2. Draft check.
  if (args.isDraft) {
    blocking.push("Pull request is marked as a draft.");
  }

  // 3. Reuse the manual-merge gating exactly. Whatever blocks a human Merge
  // click must also block auto-merge.
  const decision = evaluateProtection(
    args.rule,
    {
      aiApproved: args.aiApproved,
      humanApprovalCount: args.humanApprovalCount,
      gateResultGreen: !args.hasFailedGates,
      hasFailedGates: args.hasFailedGates,
      passingCheckNames: args.passingCheckNames,
    },
    args.requiredCheckNames
  );
  if (!decision.allowed) {
    for (const r of decision.reasons) blocking.push(r);
  }

  // 4. AI-approval semantics — already covered by evaluateProtection when
  // requireAiApproval=true. We do NOT double-add the same reason here; the
  // caller is responsible for sourcing `aiApproved` from a marker-bearing
  // AI comment that survives `aiCommentLooksApproved`.

  // M3. Pre-merge risk score — `critical` blocks auto-merge regardless
  // of every other gate being green. Lower bands are informational only.
  if (args.risk && args.risk.band === "critical") {
    blocking.push(`PR risk score is critical (${args.risk.score}/10)`);
  }

  // 5. Optional size cap.
  if (args.caps && args.diffStats) {
    const { maxChangedFiles, maxChangedLines } = args.caps;
    if (
      typeof maxChangedFiles === "number" &&
      args.diffStats.files > maxChangedFiles
    ) {
      blocking.push(
        `PR changes ${args.diffStats.files} file(s); auto-merge cap is ${maxChangedFiles}.`
      );
    }
    if (
      typeof maxChangedLines === "number" &&
      args.diffStats.lines > maxChangedLines
    ) {
      blocking.push(
        `PR changes ${args.diffStats.lines} line(s); auto-merge cap is ${maxChangedLines}.`
      );
    }
  }

  if (blocking.length === 0) {
    return {
      merge: true,
      reason: `All auto-merge conditions met for '${args.rule.pattern}'.`,
    };
  }
  return { merge: false, reason: blocking.join(" "), blocking };
}

// ---------------------------------------------------------------------------
// AI-comment approval heuristic
// ---------------------------------------------------------------------------

/**
 * Decide whether a single AI-review comment body indicates approval.
 *
 * `triggerAiReview` (in src/lib/ai-review.ts) emits a marker-bearing
 * summary comment in two shapes:
 *
 *   - On success: starts with `## AI Code Review`, followed by either
 *     `"no blocking issues found"` (approved) or
 *     `"flagged N item(s) for human attention"` (not approved).
 *   - On API failure: starts with `## AI review unavailable`.
 *
 * Per spec, approval is defined negatively:
 *   - body does NOT contain `"AI review unavailable"`, AND
 *   - body does NOT contain `"severity: blocking"` (case-insensitive).
 *
 * We additionally treat the "flagged N item(s)" verdict as not-approved
 * because that's what triggerAiReview itself uses to signal blocking
 * findings, even though it doesn't use the `severity: blocking` token.
 * If future reviewers do emit `severity: blocking`, that branch still
 * matches via the case-insensitive substring rule.
 */
export function aiCommentLooksApproved(body: string): boolean {
  if (!body) return false;
  const lower = body.toLowerCase();
  if (lower.includes("ai review unavailable")) return false;
  if (lower.includes("severity: blocking")) return false;
  // triggerAiReview's "flagged N item(s)" wording — explicit non-approval.
  if (/flagged \d+ item/i.test(body)) return false;
  return true;
}

// ---------------------------------------------------------------------------
// DB-backed orchestrator
// ---------------------------------------------------------------------------

/**
 * Locate the AI-review summary comment for a PR and return whether it
 * looks like an approval. Returns false when no marker-bearing AI
 * comment is found — i.e. AI review hasn't completed yet.
 */
async function aiApprovedForPr(pullRequestId: string): Promise<boolean> {
  try {
    const rows = await db
      .select({ body: prComments.body })
      .from(prComments)
      .where(
        and(
          eq(prComments.pullRequestId, pullRequestId),
          eq(prComments.isAiReview, true)
        )
      );
    const markerRows = rows.filter((r) =>
      (r.body || "").includes(AI_REVIEW_MARKER)
    );
    if (markerRows.length === 0) return false;
    // If *any* marker comment looks approved, count as approved. In
    // practice triggerAiReview writes exactly one summary marker, so this
    // collapses to the single comment's verdict.
    return markerRows.some((r) => aiCommentLooksApproved(r.body || ""));
  } catch {
    return false;
  }
}

/**
 * Best-effort diff stats for size caps. Shells out to `git diff
 * --numstat base...head` in the bare repo. Returns null on any error so
 * the caller can decide whether to fail-closed (we currently treat null
 * stats as "size unknown → don't enforce the cap" which is permissive
 * but documented).
 */
async function diffStatsForBranches(
  ownerName: string,
  repoName: string,
  baseBranch: string,
  headBranch: string
): Promise<{ files: number; lines: number } | null> {
  try {
    const cwd = getRepoPath(ownerName, repoName);
    const proc = Bun.spawn(
      ["git", "diff", "--numstat", `${baseBranch}...${headBranch}`, "--"],
      { cwd, stdout: "pipe", stderr: "pipe" }
    );
    const text = await new Response(proc.stdout).text();
    await proc.exited;
    let files = 0;
    let lines = 0;
    for (const line of text.split("\n")) {
      if (!line.trim()) continue;
      const [add, del] = line.split("\t");
      files += 1;
      const a = add === "-" ? 0 : parseInt(add, 10) || 0;
      const d = del === "-" ? 0 : parseInt(del, 10) || 0;
      lines += a + d;
    }
    return { files, lines };
  } catch {
    return null;
  }
}

/**
 * Headline entry point. Resolves the DB-derived facts and delegates to
 * `decideAutoMerge`. K3 (autopilot ticker) calls this; the optional
 * AI-review completion path may also call it to flip the merge-now bit.
 */
export async function evaluateAutoMerge(
  ctx: AutoMergeContext,
  opts: AutoMergeOptions = {}
): Promise<AutoMergeDecision> {
  // 1. Match the protection rule. matchProtection returns the most
  // specific rule, or null when none configured.
  const rule = await matchProtection(ctx.repositoryId, ctx.baseBranch);

  // 2. Source the AI-approval signal only if the rule actually requires
  // it. Avoids the DB hit on rules that don't care.
  const aiApproved =
    rule && rule.requireAiApproval ? await aiApprovedForPr(ctx.pullRequestId) : true;

  // 3. Human approvals — same query the manual-merge path uses.
  const humanApprovalCount = await countHumanApprovals(ctx.pullRequestId);

  // 4. Required-checks matrix. Skip the DB hit if the rule has no
  // matched required checks.
  let requiredCheckNames: string[] = [];
  let passing: string[] = [];
  if (rule) {
    try {
      const required = await listRequiredChecks(rule.id);
      requiredCheckNames = required.map((r) => r.checkName);
      if (requiredCheckNames.length > 0) {
        // We don't have the head SHA in the context. Passing
        // commitSha=null causes passingCheckNames to scan the most
        // recent 200 rows for the repo, which is good enough for the
        // K2 decision surface — the K3 ticker is the source of truth
        // for fresh status. This matches the spirit of the manual path
        // (which uses the freshly-resolved head SHA).
        passing = await passingCheckNames(ctx.repositoryId, null);
      }
    } catch {
      requiredCheckNames = [];
      passing = [];
    }
  }

  // 5. hasFailedGates: derived from required checks. We don't run the
  // full `runAllGateChecks` here because that's a heavyweight side-
  // effecting call; K3 is expected to have already triggered gate runs.
  // Treat "any required check is not in the passing set" as failing.
  const hasFailedGates =
    requiredCheckNames.length > 0 &&
    requiredCheckNames.some((n) => !passing.includes(n));

  // 6. Optional size cap.
  let diffStats: { files: number; lines: number } | null = null;
  const hasCap =
    typeof opts.maxChangedFiles === "number" ||
    typeof opts.maxChangedLines === "number";
  if (hasCap && opts.ownerName && opts.repoName && opts.headBranch) {
    diffStats = await diffStatsForBranches(
      opts.ownerName,
      opts.repoName,
      ctx.baseBranch,
      opts.headBranch
    );
  }

  // M3 — best-effort cached risk lookup. Never throws; missing risk
  // simply means the decision falls through to the existing gates.
  let riskForDecision:
    | { score: number; band: "low" | "medium" | "high" | "critical" }
    | null = null;
  try {
    const cached = await getLatestCachedPrRisk(ctx.pullRequestId);
    if (cached) {
      riskForDecision = { score: cached.score, band: cached.band };
    }
  } catch {
    riskForDecision = null;
  }

  return decideAutoMerge({
    rule,
    isDraft: ctx.isDraft,
    aiApproved,
    humanApprovalCount,
    hasFailedGates,
    passingCheckNames: passing,
    requiredCheckNames,
    diffStats,
    caps: hasCap
      ? {
          maxChangedFiles: opts.maxChangedFiles,
          maxChangedLines: opts.maxChangedLines,
        }
      : undefined,
    risk: riskForDecision,
  });
}

// ---------------------------------------------------------------------------
// Audit helper
// ---------------------------------------------------------------------------

/**
 * Record an auto-merge attempt in the audit log. K3 should call this
 * once per evaluation tick so operators can see the decision trail.
 * Uses `auto_merge.evaluated` for any decision, and `auto_merge.merged`
 * separately when K3 actually performs the merge (K3's responsibility).
 */
export async function recordAutoMergeAttempt(
  repositoryId: string,
  pullRequestId: string,
  decision: AutoMergeDecision
): Promise<void> {
  await audit({
    repositoryId,
    action: "auto_merge.evaluated",
    targetType: "pull_request",
    targetId: pullRequestId,
    metadata: {
      merge: decision.merge,
      reason: decision.reason,
      blocking: decision.blocking ?? [],
    },
  });
}

// ---------------------------------------------------------------------------
// Test-only surface
// ---------------------------------------------------------------------------

export const __test = {
  decideAutoMerge,
  aiCommentLooksApproved,
  diffStatsForBranches,
  aiApprovedForPr,
};