Merge pull request 'fix(verdict): findings resolved by the change under review never block' (#5) from fix/resolved-findings-dont-block into main

The review model routinely narrates the pre-existing bug a PR fixes as a
critical/confirmed correctness finding; deriveVerdict then failed the very
change that fixes it (three consecutive A-grade reviews of shreai#188
verdicted fail this way). Findings now carry resolved_by_this_change
(prompted, schema'd, normalized); resolved findings are excluded from
fail/warn derivation, and a model-level warn whose findings are all
resolved normalizes to pass. Introduced-or-remaining defects still block.

Co-Authored-By: Claude Fable 5 <[email protected]>
Claude-Session: https://claude.ai/code/session_01AD1cPDz563Fyppc7T4ibhU

src/lib/db.js

@@ -35,6 +35,7 @@ const DDL = [
     state TEXT NOT NULL DEFAULT 'queued',
     outcome TEXT,
     created_ts TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ','now')),
+    started_ts TEXT,
     finished_ts TEXT
   )`,
   `CREATE INDEX IF NOT EXISTS idx_queue_jobs_state ON queue_jobs(state)`
@@ -44,9 +45,17 @@ export function openDb(dbPath) {
   mkdirSync(dirname(dbPath), { recursive: true });
   const db = new DatabaseSync(dbPath);
   for (const stmt of DDL) db.prepare(stmt).run();
+  ensureColumn(db, 'queue_jobs', 'started_ts', 'TEXT');
   return db;
 }
 
+function ensureColumn(db, table, column, type) {
+  const columns = db.prepare(`PRAGMA table_info(${table})`).all();
+  if (!columns.some((c) => c.name === column)) {
+    db.prepare(`ALTER TABLE ${table} ADD COLUMN ${column} ${type}`).run();
+  }
+}
+
 export function insertReview(db, r) {
   const stmt = db.prepare(`
     INSERT INTO reviews (repo, sha, pr, event, pusher, authors, trailers, axes,
@@ -76,6 +85,13 @@ export function enqueueJob(db, job) {
   return res.lastInsertRowid;
 }
 
+export function startJob(db, id) {
+  db.prepare(
+    `UPDATE queue_jobs SET state = 'running',
+       started_ts = strftime('%Y-%m-%dT%H:%M:%fZ','now') WHERE id = ?`
+  ).run(id);
+}
+
 export function finishJob(db, id, outcome = null) {
   db.prepare(
     `UPDATE queue_jobs SET state = 'done', outcome = ?,

src/lib/gitea.js

@@ -1,5 +1,9 @@
 // Minimal Gitea API client (fetch-based, no deps).
 
+// URL path segment from webhook/API-supplied values (owner, repo, refs,
+// shas): never trust them as URL-safe — branch names can carry '/', '#', '?'.
+const seg = (s) => encodeURIComponent(String(s));
+
 export class GiteaClient {
   constructor({ baseUrl, token, timeoutMs = 30000 }) {
     this.baseUrl = baseUrl.replace(/\/$/, '');
@@ -28,24 +32,32 @@ export class GiteaClient {
 
   // PR diff
   getPrDiff(owner, repo, index) {
-    return this.req('GET', `/api/v1/repos/${owner}/${repo}/pulls/${index}.diff`, { raw: true });
+    return this.req('GET', `/api/v1/repos/${seg(owner)}/${seg(repo)}/pulls/${seg(index)}.diff`, { raw: true });
   }
 
   // Single-commit diff
   getCommitDiff(owner, repo, sha) {
-    return this.req('GET', `/api/v1/repos/${owner}/${repo}/git/commits/${sha}.diff`, { raw: true });
+    return this.req('GET', `/api/v1/repos/${seg(owner)}/${seg(repo)}/git/commits/${seg(sha)}.diff`, { raw: true });
   }
 
   // Compare (commit list between two shas)
   compare(owner, repo, before, after) {
-    return this.req('GET', `/api/v1/repos/${owner}/${repo}/compare/${before}...${after}`);
+    return this.req('GET', `/api/v1/repos/${seg(owner)}/${seg(repo)}/compare/${seg(before)}...${seg(after)}`);
   }
 
   // Full-range diff for a push (base...head) in ONE request. Gitea 1.27's API
-  // has no compare .diff variant, but the web compare route serves .diff and
-  // accepts `Authorization: token` (verified live on 1.27.1).
+  // has no compare .diff variant, but the web compare route serves .diff.
+  // CAVEAT (probed live on 1.27.1): the web route does NOT honor
+  // `Authorization: token` for private repos — it resolves as anonymous and
+  // answers 404 even for valid refs. Callers must be ready to fall back to
+  // the API-based sources below (fetchDiff in review.js does).
   getCompareDiff(owner, repo, before, after) {
-    return this.req('GET', `/${owner}/${repo}/compare/${before}...${after}.diff`, { raw: true });
+    return this.req('GET', `/${seg(owner)}/${seg(repo)}/compare/${seg(before)}...${seg(after)}.diff`, { raw: true });
+  }
+
+  // Repo metadata (used for default_branch when the job doesn't carry it)
+  getRepo(owner, repo) {
+    return this.req('GET', `/api/v1/repos/${seg(owner)}/${seg(repo)}`);
   }
 
   // Add a collaborator (requires owner/admin token). 204 on success.

src/lib/prompt.js

@@ -19,12 +19,14 @@ Output schema (every key required):
   "findings": [
     {"title": "...", "file": "path", "line": 123, "severity": "critical"|"high"|"medium"|"low",
      "confidence": "confirmed"|"plausible", "axis": "correctness"|"security"|"tests_coverage"|"design_simplicity"|"performance"|"style"|"breaking_changes"|"docs",
+     "resolved_by_this_change": true|false,
      "detail": "what is wrong, concrete failure scenario, and the fix"}
   ],
   "verdict": "pass"|"warn"|"fail"
 }
 
 Rules:
+- A finding must describe a defect that EXISTS IN THE RESULTING CODE after this diff is applied. The pre-existing bug that this diff FIXES is not a finding — acknowledge it in the correctness rationale instead. If you still list it (e.g. for the record), you MUST set "resolved_by_this_change": true on that finding; findings the diff introduces or leaves unfixed get "resolved_by_this_change": false.
 - "confirmed" means you can trace a concrete failure from the diff alone; anything needing unseen context is "plausible".
 - severity critical/high is reserved for real correctness bugs, security holes, data loss, or breaking API changes.
 - verdict "fail" ONLY when a confirmed critical/high correctness or security finding exists; "warn" for notable but non-blocking issues; otherwise "pass".

src/lib/review.js

@@ -48,9 +48,15 @@ export async function runReview({ cfg, gitea, adminGitea, db, job, withGlobal, l
   // 1. diff — any fetch failure (throw, non-200, or empty body for a job that
   // has commits) short-circuits to a 'warning' status. A diffless prompt would
   // make the model "review" nothing and pass; never send one.
-  let diff = '', truncated = false, diffBytes = 0;
+  let diff = '', truncated = false, diffBytes = 0, partialDiff = false, partialNote = null;
   try {
-    diff = await fetchDiff({ gitea, job });
+    const fetched = await fetchDiff({
+      gitea, job, maxBytes: cfg.maxDiffBytes,
+      log: (m) => log(`[${fullRepo}@${sha.slice(0, 8)}] ${m}`)
+    });
+    diff = fetched.diff;
+    partialDiff = fetched.partial;
+    partialNote = fetched.note;
   } catch (e) {
     return await failOpen({
       cfg, db, job, log, postStatus, dashboardUrl, t0,
@@ -99,6 +105,7 @@ export async function runReview({ cfg, gitea, adminGitea, db, job, withGlobal, l
           tenantId: cfg.tenantId, timeoutMs: cfg.routerTimeoutMs
         });
         servedModel = out.servedModel;
+        assertServedModelAllowed(cfg.model, servedModel);
         const raw = extractJson(out.content);
         if (!raw) {
           log(`[${fullRepo}@${sha.slice(0, 8)}] unparseable model output (served=${servedModel}): ${JSON.stringify(out.content.slice(0, 400))}`);
@@ -118,9 +125,11 @@ export async function runReview({ cfg, gitea, adminGitea, db, job, withGlobal, l
     return await failOpen({ cfg, db, job, log, postStatus, dashboardUrl, t0, error: `review unavailable: ${llmError}` });
   }
 
-  // A truncated diff can never yield a clean 'pass' — part of the change was
-  // not reviewed. Cap at 'warn' (a confirmed-critical 'fail' still fails).
-  applyTruncationCap(review, truncated);
+  // A truncated OR partial diff can never yield a clean 'pass' — part of the
+  // change was not reviewed. Cap at 'warn' (a confirmed-critical 'fail' still
+  // fails). Partial = a fallback source covered less than the full range
+  // (e.g. head commit only); reviewing a subset must not read as a full pass.
+  applyTruncationCap(review, truncated || partialDiff);
 
   // 4. status + comment
   const stateByVerdict = { pass: 'success', warn: 'success', fail: 'failure' };
@@ -130,13 +139,17 @@ export async function runReview({ cfg, gitea, adminGitea, db, job, withGlobal, l
     warn: `Grade ${review.grade} (${review.overall}/100) — pass with warnings (${review.findings.length} finding(s))`,
     fail: `Grade ${review.grade} (${review.overall}/100) — BLOCKED: confirmed critical finding (admin merge = override)`
   };
-  const description = truncated
-    ? `partial review (diff truncated) — ${descByVerdict[review.verdict]}`
+  const partialReasons = [
+    ...(truncated ? ['diff truncated'] : []),
+    ...(partialDiff ? [partialNote || 'incomplete diff coverage'] : [])
+  ];
+  const description = partialReasons.length
+    ? `partial review (${partialReasons.join('; ')}) — ${descByVerdict[review.verdict]}`
     : descByVerdict[review.verdict];
   await safe(log, 'final-status', () =>
     postStatus({ state, context: CONTEXT, description, target_url: dashboardUrl }));
 
-  const md = renderScorecardMarkdown({ repo: fullRepo, sha, review, dashboardUrl, truncated });
+  const md = renderScorecardMarkdown({ repo: fullRepo, sha, review, dashboardUrl, truncated: truncated || partialDiff });
   if (job.prIndex) {
     await safe(log, 'pr-comment', () => postComment(job.prIndex, md));
   } else {
@@ -152,24 +165,170 @@ export async function runReview({ cfg, gitea, adminGitea, db, job, withGlobal, l
     pusher: job.pusher, authors: job.authors, trailers,
     axes: review.axes, overall: review.overall, grade: review.grade,
     verdict: review.verdict, findings: review.findings,
-    statusState: state, error: null, diffBytes, truncated,
+    statusState: state, error: null, diffBytes, truncated: truncated || partialDiff,
     model: servedModel || cfg.model, durationMs: Date.now() - t0
   });
   log(`[${fullRepo}@${sha.slice(0, 8)}] reviewed: ${review.verdict} grade=${review.grade} overall=${review.overall} findings=${review.findings.length} in ${Date.now() - t0}ms`);
   return { ok: true, verdict: review.verdict };
 }
 
-// Push reviews cover the FULL push range in ONE compare diff (base=before,
-// head=after) — never a per-commit subset, so the head status can't claim
-// success for commits that were silently dropped. New-branch pushes
-// (before = 0000…) fall back to the head commit's diff.
-export async function fetchDiff({ gitea, job }) {
-  const { owner, repo } = job;
-  if (job.prIndex) return gitea.getPrDiff(owner, repo, job.prIndex);
-  if (!job.before || ZERO_SHA.test(job.before)) {
-    return gitea.getCommitDiff(owner, repo, job.sha);
+// Push reviews cover the FULL push range — never a silent per-commit subset,
+// so the head status can't claim success for commits that were dropped.
+//
+// Primary sources: PR jobs use the API PR diff; range pushes use ONE web
+// compare diff (base=before, head=after); new-branch pushes (before = 0000…)
+// use the head commit's diff.
+//
+// Fallback chain (a 404 or empty body moves to the next source; any other
+// error — 5xx, network, timeout — propagates immediately, those are forge
+// failures and trying other refs would only hide them):
+//   PR job:  pulls/{n}.diff → git/commits/{head}.diff
+//   range push:
+//     1. web compare {before}...{after}.diff       (404s when `before` is
+//        unknown — force-push/rebase — AND, probed live on Gitea 1.27.1, for
+//        ALL refs on private repos: the web route ignores token auth)
+//     2. web compare {defaultBranch}...{after}.diff (covers unknown-`before`
+//        where the web route itself works, e.g. public repos)
+//     3. API compare {before}...{after} (JSON commit list; this endpoint DOES
+//        honor token auth) → concatenated per-commit git/commits/{sha}.diff,
+//        falling back to the webhook's commitShas for the list. Stops once
+//        past maxBytes — review.js then truncates and caps the verdict.
+//     4. git/commits/{after}.diff (head only, unless 3 already tried it)
+// Only when every source is exhausted does the error propagate to fail-open,
+// listing every URL tried.
+// Returns { diff, partial, note }. `partial: true` means the source covered
+// LESS than the job's full range (head-only fallback, capped/incomplete
+// per-commit reconstruction) — review.js caps the verdict at 'warn' so a
+// subset review can never read as a full pass.
+const SHA_RE = /^[0-9a-f]{7,40}$/i;
+const MAX_COMMIT_DIFFS = 20;
+const full = (diff) => ({ diff, partial: false, note: null });
+const part = (diff, note) => ({ diff, partial: true, note });
+
+export async function fetchDiff({ gitea, job, log = () => {}, maxBytes = Infinity }) {
+  const { owner, repo, sha } = job;
+  const tried = [];
+
+  // Try one diff source: diff text on success, null on 404/empty (recorded
+  // in `tried`), throw on anything else.
+  const attempt = async (label, fn) => {
+    try {
+      const out = await fn();
+      if (out && out.trim()) return out;
+      tried.push(`${label}: empty diff body`);
+      return null;
+    } catch (e) {
+      if (e.status !== 404) throw e;
+      tried.push(e.message);
+      return null;
+    }
+  };
+
+  let diff;
+  if (job.prIndex) {
+    diff = await attempt(`pr #${job.prIndex} diff`, () => gitea.getPrDiff(owner, repo, job.prIndex));
+    if (diff) return full(diff);
+    diff = await attempt(`commit ${sha.slice(0, 8)} diff`, () => gitea.getCommitDiff(owner, repo, sha));
+    if (diff) {
+      log(`diff via fallback: head commit ${sha.slice(0, 8)} (PR #${job.prIndex} diff unavailable) — PARTIAL`);
+      return part(diff, `head commit only, PR #${job.prIndex} diff unavailable`);
+    }
+    throw allDiffSourcesFailed(tried);
   }
-  return gitea.getCompareDiff(owner, repo, job.before, job.sha);
+
+  if (job.before && !ZERO_SHA.test(job.before)) {
+    // 1. full-range web compare (the normal path)
+    diff = await attempt(`compare ${job.before.slice(0, 8)}...${sha.slice(0, 8)} diff`, () => gitea.getCompareDiff(owner, repo, job.before, sha));
+    if (diff) return full(diff);
+
+    // 2. range against the repo default branch (base the server surely has).
+    // Covers a SUPERSET of the push range (from the merge-base), so complete.
+    let defaultBranch = job.defaultBranch;
+    if (!defaultBranch) {
+      // Optional lookup: only a 404 (repo gone) is a recordable miss; auth
+      // and server failures must propagate, not silently skip a source.
+      try { defaultBranch = (await gitea.getRepo(owner, repo))?.default_branch; }
+      catch (e) {
+        if (e.status !== 404) throw e;
+        tried.push(e.message);
+      }
+    }
+    if (defaultBranch) {
+      diff = await attempt(`compare ${defaultBranch}...${sha.slice(0, 8)} diff`, () => gitea.getCompareDiff(owner, repo, defaultBranch, sha));
+      if (diff) {
+        log(`diff via fallback: compare ${defaultBranch}...${sha.slice(0, 8)}`);
+        return full(diff);
+      }
+    }
+
+    // 3. reconstruct the range from the API: commit list, then per-commit diffs
+    let shas = null;
+    try {
+      const cmp = await gitea.compare(owner, repo, job.before, sha);
+      const list = (cmp?.commits || []).map(c => c?.sha).filter(Boolean);
+      if (list.length) shas = list;
+      else tried.push(`api compare ${job.before.slice(0, 8)}...${sha.slice(0, 8)}: no commits`);
+    } catch (e) {
+      if (e.status !== 404) throw e;
+      tried.push(e.message);
+    }
+    if (!shas && Array.isArray(job.commitShas) && job.commitShas.length) shas = job.commitShas;
+    if (shas) {
+      // Webhook/API-supplied list: dedupe, drop anything that isn't a sha,
+      // and hard-cap the request chain so a hostile or huge payload cannot
+      // fan out into hundreds of sequential fetches.
+      const cleaned = [...new Set(shas)].filter((s) => typeof s === 'string' && SHA_RE.test(s));
+      const capped = cleaned.slice(0, MAX_COMMIT_DIFFS);
+      const parts = [];
+      let total = 0, hitByteCap = false;
+      for (const s of capped) {
+        const d = await attempt(`commit ${s.slice(0, 8)} diff`, () => gitea.getCommitDiff(owner, repo, s));
+        if (d) { parts.push(d); total += Buffer.byteLength(d); }
+        if (total > maxBytes) { hitByteCap = true; break; } // review.js truncates + caps the verdict
+      }
+      if (total > 0) {
+        const incomplete = hitByteCap || parts.length < capped.length || cleaned.length > capped.length;
+        log(`diff via fallback: ${parts.length}/${cleaned.length} per-commit diff(s) over ${job.before.slice(0, 8)}...${sha.slice(0, 8)}${incomplete ? ' — PARTIAL' : ''}`);
+        const joined = parts.join('\n');
+        return incomplete
+          ? part(joined, `per-commit reconstruction covered ${parts.length}/${cleaned.length} commit(s)`)
+          : full(joined);
+      }
+    }
+
+    // 4. last resort: head commit alone (skip if step 3 already tried it)
+    if (!shas || !shas.includes(sha)) {
+      diff = await attempt(`commit ${sha.slice(0, 8)} diff`, () => gitea.getCommitDiff(owner, repo, sha));
+      if (diff) {
+        log(`diff via fallback: head commit ${sha.slice(0, 8)} only — PARTIAL`);
+        return part(diff, `head commit only, range ${job.before.slice(0, 8)}...${sha.slice(0, 8)} unrecoverable`);
+      }
+    }
+    throw allDiffSourcesFailed(tried);
+  }
+
+  // new-branch push (before = 0000… or missing): head commit diff is the
+  // long-standing contract for this event shape — complete by definition.
+  diff = await attempt(`commit ${sha.slice(0, 8)} diff`, () => gitea.getCommitDiff(owner, repo, sha));
+  if (diff) return full(diff);
+  throw allDiffSourcesFailed(tried);
+}
+
+export function assertServedModelAllowed(requestedModel, servedModel) {
+  if (!isLocalModel(requestedModel)) return;
+  if (!servedModel) return;
+  if (servedModel === requestedModel) return;
+  throw new Error(`local model contract violated: requested ${requestedModel}, served ${servedModel}`);
+}
+
+function isLocalModel(model) {
+  return /^ollama(?:-remote)?\//.test(String(model || ''));
+}
+
+function allDiffSourcesFailed(tried) {
+  let msg = tried.join(' | ');
+  if (msg.length > 1500) msg = msg.slice(0, 1500) + ` …(+${tried.length} sources)`;
+  return new Error(`all diff sources failed: ${msg}`);
 }
 
 async function failOpen({ cfg, db, job, log, postStatus, dashboardUrl, t0, error, state = 'warning', description }) {

src/lib/router.js

@@ -13,7 +13,10 @@ export async function chat({ routerUrl, model, messages, agentId, sessionId, ten
     // and return non-review text. The domain preflight (agent_mismatch 400)
     // still applies per agent tier; the pipeline's attempt-2 fallback agent
     // covers that.
-    body: JSON.stringify({ model, messages, agentId, sessionId, tenantId, stream: false, tools: false, raw: true }),
+    body: JSON.stringify({
+      model, messages, agentId, sessionId, tenantId,
+      stream: false, tools: false, raw: true, fallbackModels: []
+    }),
     signal: AbortSignal.timeout(timeoutMs)
   });
   if (!res.ok) {

src/lib/verdict.js

@@ -7,6 +7,10 @@ const BLOCKING_AXES = new Set(['correctness', 'security']);
 
 export function isBlockingFinding(f) {
   if (!f || typeof f !== 'object') return false;
+  // A finding the diff itself resolves describes the PRE-change state; it
+  // cannot block the change that fixes it (models routinely narrate the fixed
+  // bug as a critical/confirmed finding, which failed correct fixes).
+  if (f.resolved_by_this_change === true) return false;
   const sev = String(f.severity || '').toLowerCase();
   const conf = String(f.confidence || '').toLowerCase();
   if (!BLOCKING_SEVERITIES.has(sev)) return false;
@@ -21,12 +25,16 @@ export function deriveVerdict(review) {
   const findings = Array.isArray(review?.findings) ? review.findings : [];
   if (findings.some(isBlockingFinding)) return 'fail';
   const hasWarn = findings.some(f => {
+    if (f?.resolved_by_this_change === true) return false;
     const sev = String(f?.severity || '').toLowerCase();
     return sev === 'critical' || sev === 'high' || sev === 'medium';
   });
   if (hasWarn) return 'warn';
-  // trust the model's verdict if it said warn without matching findings
-  if (review?.verdict === 'warn') return 'warn';
+  // Trust the model's verdict if it said warn without matching findings —
+  // unless every finding it gave is resolved_by_this_change, in which case its
+  // warn is about the pre-change state and the resulting code is clean.
+  const allResolved = findings.length > 0 && findings.every(f => f?.resolved_by_this_change === true);
+  if (review?.verdict === 'warn' && !allResolved) return 'warn';
   return 'pass';
 }
 
@@ -49,6 +57,7 @@ export function normalizeReview(raw) {
     severity: pick(String(f?.severity || '').toLowerCase(), ['critical', 'high', 'medium', 'low'], 'low'),
     confidence: pick(String(f?.confidence || '').toLowerCase(), ['confirmed', 'plausible'], 'plausible'),
     axis: f?.axis ? String(f.axis).toLowerCase() : null,
+    resolved_by_this_change: f?.resolved_by_this_change === true,
     detail: String(f?.detail ?? '').slice(0, 2000)
   }));
   const review = {

src/lib/webhook.js

@@ -27,6 +27,7 @@ export function jobFromWebhook(event, payload) {
       sha: after,
       ref: payload.ref,
       before: payload.before,
+      defaultBranch: payload.repository?.default_branch || null,
       prIndex: null,
       prTitle: null,
       pusher: payload.pusher?.username || payload.pusher?.login || null,
@@ -48,6 +49,7 @@ export function jobFromWebhook(event, payload) {
       sha: pr.head?.sha,
       ref: pr.head?.ref,
       before: null,
+      defaultBranch: payload.repository?.default_branch || null,
       prIndex: pr.number,
       prTitle: pr.title || null,
       pusher: payload.sender?.username || payload.sender?.login || null,

src/server.js

@@ -1,6 +1,6 @@
 import { createServer } from 'node:http';
 import { loadConfig } from './config.js';
-import { openDb, listReviews, enqueueJob, finishJob, recoverPendingJobs } from './lib/db.js';
+import { openDb, listReviews, enqueueJob, startJob, finishJob, recoverPendingJobs } from './lib/db.js';
 import { GiteaClient } from './lib/gitea.js';
 import { ReviewQueue } from './lib/queue.js';
 import { verifySignature, jobFromWebhook } from './lib/webhook.js';
@@ -34,7 +34,10 @@ const queue = new ReviewQueue();
 // whatever the outcome (runReview itself posts a final or fail-open status).
 function dispatchJob(queueRowId, job) {
   return queue.enqueue(`${job.owner}/${job.repo}`, (withGlobal) =>
-    runReview({ cfg, gitea, adminGitea, db, job, withGlobal, log })
+    {
+      startJob(db, queueRowId);
+      return runReview({ cfg, gitea, adminGitea, db, job, withGlobal, log });
+    }
   ).then(
     (r) => finishJob(db, queueRowId, r?.ok ? (r.verdict || 'ok') : `error:${String(r?.error || '').slice(0, 200)}`),
     (e) => {

test/fetchdiff.test.js

@@ -18,7 +18,8 @@ const BEFORE = 'b'.repeat(40);
 test('PR jobs use the PR diff', async () => {
   const g = giteaStub();
   const out = await fetchDiff({ gitea: g, job: { owner: 'o', repo: 'r', prIndex: 5, sha: HEAD, before: null } });
-  assert.equal(out, 'PRDIFF');
+  assert.equal(out.diff, 'PRDIFF');
+  assert.equal(out.partial, false);
   assert.deepEqual(g.calls, [['pr', 'o', 'r', 5]]);
 });
 
@@ -32,7 +33,8 @@ test('push uses ONE compare diff over the full before...after range', async () =
       commitShas: Array.from({ length: 25 }, (_, i) => String(i).padStart(40, '0'))
     }
   });
-  assert.equal(out, 'RANGEDIFF');
+  assert.equal(out.diff, 'RANGEDIFF');
+  assert.equal(out.partial, false);
   assert.deepEqual(g.calls, [['compare', 'o', 'r', BEFORE, HEAD]]);
 });
 
@@ -42,7 +44,8 @@ test('new-branch push (before = zero sha) falls back to head commit diff', async
     gitea: g,
     job: { owner: 'o', repo: 'r', prIndex: null, sha: HEAD, before: '0'.repeat(40), commitShas: [HEAD] }
   });
-  assert.equal(out, 'HEADDIFF');
+  assert.equal(out.diff, 'HEADDIFF');
+  assert.equal(out.partial, false);
   assert.deepEqual(g.calls, [['commit', 'o', 'r', HEAD]]);
 });
 
@@ -52,7 +55,8 @@ test('missing before also falls back to head commit diff', async () => {
     gitea: g,
     job: { owner: 'o', repo: 'r', prIndex: null, sha: HEAD, before: null, commitShas: [HEAD] }
   });
-  assert.equal(out, 'HEADDIFF');
+  assert.equal(out.diff, 'HEADDIFF');
+  assert.equal(out.partial, false);
   assert.deepEqual(g.calls, [['commit', 'o', 'r', HEAD]]);
 });
 
@@ -64,3 +68,181 @@ test('compare failure propagates (no silent placeholder diff)', async () => {
     /boom 500/
   );
 });
+
+// ---- fallback chain (compare 404: force-push, rebase-then-push, or the web
+// ---- compare route ignoring token auth on private repos) ----
+
+function nf(path) {
+  const e = new Error(`gitea GET ${path} -> 404: Not found.`);
+  e.status = 404;
+  return e;
+}
+
+test('compare 404 falls back to default-branch compare', async () => {
+  const g = giteaStub();
+  const real = g.getCompareDiff;
+  g.getCompareDiff = (o, r, before, after) => before === BEFORE
+    ? Promise.reject(nf(`/o/r/compare/${before}...${after}.diff`))
+    : real(o, r, before, after);
+  const out = await fetchDiff({
+    gitea: g,
+    job: { owner: 'o', repo: 'r', prIndex: null, sha: HEAD, before: BEFORE, defaultBranch: 'main' }
+  });
+  assert.equal(out.diff, 'RANGEDIFF');
+  assert.equal(out.partial, false);
+  assert.deepEqual(g.calls.at(-1), ['compare', 'o', 'r', 'main', HEAD]);
+});
+
+test('compare 404 without defaultBranch on the job looks it up via getRepo', async () => {
+  const g = giteaStub();
+  const real = g.getCompareDiff;
+  g.getCompareDiff = (o, r, before, after) => before === BEFORE
+    ? Promise.reject(nf(`/o/r/compare/${before}...${after}.diff`))
+    : real(o, r, before, after);
+  g.getRepo = () => Promise.resolve({ default_branch: 'develop' });
+  const out = await fetchDiff({
+    gitea: g,
+    job: { owner: 'o', repo: 'r', prIndex: null, sha: HEAD, before: BEFORE }
+  });
+  assert.equal(out.diff, 'RANGEDIFF');
+  assert.equal(out.partial, false);
+  assert.deepEqual(g.calls.at(-1), ['compare', 'o', 'r', 'develop', HEAD]);
+});
+
+test('both compares 404 -> API commit list -> concatenated per-commit diffs', async () => {
+  const g = giteaStub();
+  const C1 = 'c'.repeat(40), C2 = 'd'.repeat(40);
+  g.getCompareDiff = (o, r, before, after) =>
+    Promise.reject(nf(`/o/r/compare/${before}...${after}.diff`));
+  g.compare = (o, r, before, after) => {
+    g.calls.push(['apicompare', o, r, before, after]);
+    return Promise.resolve({ total_commits: 2, commits: [{ sha: C1 }, { sha: C2 }] });
+  };
+  g.getCommitDiff = (o, r, sha) => {
+    g.calls.push(['commit', o, r, sha]);
+    return Promise.resolve(`DIFF(${sha.slice(0, 1)})`);
+  };
+  const out = await fetchDiff({
+    gitea: g,
+    job: { owner: 'o', repo: 'r', prIndex: null, sha: HEAD, before: BEFORE, defaultBranch: 'main' }
+  });
+  assert.equal(out.diff, 'DIFF(c)\nDIFF(d)');
+  assert.equal(out.partial, false);
+  assert.deepEqual(g.calls.filter(c => c[0] === 'commit'), [['commit', 'o', 'r', C1], ['commit', 'o', 'r', C2]]);
+});
+
+test('API compare 404 too -> per-commit diffs from the webhook commitShas', async () => {
+  const g = giteaStub();
+  const C1 = 'c'.repeat(40);
+  g.getCompareDiff = (o, r, before, after) =>
+    Promise.reject(nf(`/o/r/compare/${before}...${after}.diff`));
+  g.compare = (o, r, before, after) =>
+    Promise.reject(nf(`/api/v1/repos/o/r/compare/${before}...${after}`));
+  g.getCommitDiff = (o, r, sha) => {
+    g.calls.push(['commit', o, r, sha]);
+    return Promise.resolve(`DIFF(${sha.slice(0, 1)})`);
+  };
+  const out = await fetchDiff({
+    gitea: g,
+    job: {
+      owner: 'o', repo: 'r', prIndex: null, sha: HEAD, before: BEFORE,
+      defaultBranch: 'main', commitShas: [C1, HEAD]
+    }
+  });
+  assert.equal(out.diff, 'DIFF(c)\nDIFF(a)');
+  assert.equal(out.partial, false);
+});
+
+test('per-commit fallback stops fetching past maxBytes (review truncates after)', async () => {
+  const g = giteaStub();
+  const shas = ['c'.repeat(40), 'd'.repeat(40), 'e'.repeat(40)];
+  g.getCompareDiff = () => Promise.reject(nf('/o/r/compare/x...y.diff'));
+  g.compare = () => Promise.resolve({ commits: shas.map(sha => ({ sha })) });
+  const fetched = [];
+  g.getCommitDiff = (o, r, sha) => { fetched.push(sha); return Promise.resolve('x'.repeat(10)); };
+  const out = await fetchDiff({
+    gitea: g,
+    job: { owner: 'o', repo: 'r', prIndex: null, sha: HEAD, before: BEFORE, defaultBranch: 'main' },
+    maxBytes: 15
+  });
+  // first two diffs exceed the cap (20 > 15) -> third commit never fetched
+  assert.equal(fetched.length, 2);
+  assert.equal(out.diff, 'x'.repeat(10) + '\n' + 'x'.repeat(10));
+  // byte-capped reconstruction covered 2/3 commits -> partial, verdict capped
+  assert.equal(out.partial, true);
+});
+
+test('every source 404 -> throws listing every URL tried (then fail-open)', async () => {
+  const g = giteaStub();
+  g.getCompareDiff = (o, r, before, after) =>
+    Promise.reject(nf(`/o/r/compare/${before}...${after}.diff`));
+  g.compare = (o, r, before, after) =>
+    Promise.reject(nf(`/api/v1/repos/o/r/compare/${before}...${after}`));
+  g.getCommitDiff = (o, r, sha) =>
+    Promise.reject(nf(`/api/v1/repos/o/r/git/commits/${sha}.diff`));
+  await assert.rejects(
+    () => fetchDiff({
+      gitea: g,
+      job: { owner: 'o', repo: 'r', prIndex: null, sha: HEAD, before: BEFORE, defaultBranch: 'main' }
+    }),
+    (e) => {
+      assert.match(e.message, /^all diff sources failed: /);
+      assert.match(e.message, new RegExp(`compare/${BEFORE}\\.\\.\\.${HEAD}\\.diff`));
+      assert.match(e.message, new RegExp(`compare/main\\.\\.\\.${HEAD}\\.diff`));
+      assert.match(e.message, new RegExp(`api/v1/repos/o/r/compare/${BEFORE}`));
+      assert.match(e.message, new RegExp(`git/commits/${HEAD}\\.diff`));
+      return true;
+    }
+  );
+});
+
+test('PR diff 404 falls back to the head commit diff', async () => {
+  const g = giteaStub();
+  g.getPrDiff = (o, r, i) => Promise.reject(nf(`/api/v1/repos/o/r/pulls/${i}.diff`));
+  const out = await fetchDiff({ gitea: g, job: { owner: 'o', repo: 'r', prIndex: 7, sha: HEAD, before: null } });
+  assert.equal(out.diff, 'HEADDIFF');
+  // head-only PR fallback reviews a subset -> partial
+  assert.equal(out.partial, true);
+  assert.deepEqual(g.calls, [['commit', 'o', 'r', HEAD]]);
+});
+
+test('empty compare body is treated as a miss, not a reviewable diff', async () => {
+  const g = giteaStub();
+  g.getCompareDiff = (o, r, before) => before === BEFORE ? Promise.resolve('') : Promise.resolve('RANGEDIFF');
+  const out = await fetchDiff({
+    gitea: g,
+    job: { owner: 'o', repo: 'r', prIndex: null, sha: HEAD, before: BEFORE, defaultBranch: 'main' }
+  });
+  assert.equal(out.diff, 'RANGEDIFF');
+});
+
+test('per-commit fallback dedupes, validates, and caps the sha list at 20', async () => {
+  const g = giteaStub();
+  // 25 unique shas + 1 dup + 1 garbage entry: only the first 20 valid uniques fetch
+  const shas = Array.from({ length: 25 }, (_, i) => String(i).padStart(40, 'f'.charCodeAt ? '0' : '0'));
+  const payload = [...shas, shas[0], 'not-a-sha'];
+  g.getCompareDiff = () => Promise.reject(nf('/o/r/compare/x...y.diff'));
+  g.compare = () => Promise.reject(nf('/api/v1/repos/o/r/compare/x...y'));
+  const fetched = [];
+  g.getCommitDiff = (o, r, sha) => { fetched.push(sha); return Promise.resolve('D'); };
+  const out = await fetchDiff({
+    gitea: g,
+    job: { owner: 'o', repo: 'r', prIndex: null, sha: HEAD, before: BEFORE, defaultBranch: 'main', commitShas: payload }
+  });
+  assert.equal(fetched.length, 20);
+  assert.equal(out.partial, true); // 20/25 covered
+});
+
+test('getRepo auth failure propagates instead of being swallowed', async () => {
+  const g = giteaStub();
+  g.getCompareDiff = (o, r, before) => before === BEFORE
+    ? Promise.reject(nf('/o/r/compare/x...y.diff'))
+    : Promise.resolve('RANGEDIFF');
+  const authErr = new Error('gitea GET /api/v1/repos/o/r -> 401: unauthorized');
+  authErr.status = 401;
+  g.getRepo = () => Promise.reject(authErr);
+  await assert.rejects(
+    () => fetchDiff({ gitea: g, job: { owner: 'o', repo: 'r', prIndex: null, sha: HEAD, before: BEFORE } }),
+    /401: unauthorized/
+  );
+});

test/modelContract.test.js

@@ -0,0 +1,25 @@
+import { test } from 'node:test';
+import assert from 'node:assert/strict';
+import { assertServedModelAllowed } from '../src/lib/review.js';
+
+test('local model reviews accept the exact served local model', () => {
+  assert.doesNotThrow(() =>
+    assertServedModelAllowed('ollama-remote/qwen2.5-coder:7b', 'ollama-remote/qwen2.5-coder:7b'));
+});
+
+test('local model reviews fail on cloud fallback drift', () => {
+  assert.throws(
+    () => assertServedModelAllowed('ollama-remote/qwen2.5-coder:7b', 'google/gemini-2.5-flash'),
+    /local model contract violated/
+  );
+});
+
+test('cloud model reviews allow provider fallback reporting', () => {
+  assert.doesNotThrow(() =>
+    assertServedModelAllowed('anthropic/claude-sonnet-4-6', 'google/gemini-2.5-flash'));
+});
+
+test('missing served model metadata does not fail local requests', () => {
+  assert.doesNotThrow(() =>
+    assertServedModelAllowed('ollama-remote/qwen2.5-coder:7b', null));
+});

test/persistqueue.test.js

@@ -1,6 +1,6 @@
 import { test } from 'node:test';
 import assert from 'node:assert/strict';
-import { openDb, enqueueJob, finishJob, recoverPendingJobs } from '../src/lib/db.js';
+import { openDb, enqueueJob, startJob, finishJob, recoverPendingJobs } from '../src/lib/db.js';
 
 const JOB = (over = {}) => ({
   event: 'push', owner: 'nirpa', repo: 'demo', sha: 'a'.repeat(40),
@@ -32,6 +32,19 @@ test('finished jobs are not recovered again', () => {
   assert.equal(recoverPendingJobs(db).length, 0);
 });
 
+test('running jobs are visible and recovered on startup', () => {
+  const db = openDb(':memory:');
+  const id = enqueueJob(db, JOB({ sha: '4'.repeat(40) }));
+  startJob(db, id);
+
+  const row = db.prepare(`SELECT state, started_ts FROM queue_jobs WHERE id = ?`).get(id);
+  assert.equal(row.state, 'running');
+  assert.match(row.started_ts, /^\d{4}-\d{2}-\d{2}T/);
+
+  const pending = recoverPendingJobs(db);
+  assert.deepEqual(pending.map(p => p.id), [id]);
+});
+
 test('unparseable persisted job is marked done, not re-run forever', () => {
   const db = openDb(':memory:');
   db.prepare(`INSERT INTO queue_jobs (repo, sha, job) VALUES ('a/b', 'c', '{broken')`).run();

test/routerClient.test.js

@@ -0,0 +1,34 @@
+import { test } from 'node:test';
+import assert from 'node:assert/strict';
+import { chat } from '../src/lib/router.js';
+
+test('review router client disables model fallbacks explicitly', async () => {
+  const originalFetch = globalThis.fetch;
+  let body;
+  globalThis.fetch = async (_url, init) => {
+    body = JSON.parse(init.body);
+    return Response.json({
+      message: { content: '{"axes":{},"overall":90,"grade":"A","findings":[]}' },
+      _shre: { model: 'ollama-remote/qwen2.5-coder:7b' }
+    });
+  };
+
+  try {
+    await chat({
+      routerUrl: 'http://router.test',
+      model: 'ollama-remote/qwen2.5-coder:7b',
+      messages: [{ role: 'user', content: 'review' }],
+      agentId: 'code-reviewer',
+      sessionId: 'review-test',
+      tenantId: 'nirlab',
+      timeoutMs: 1000
+    });
+  } finally {
+    globalThis.fetch = originalFetch;
+  }
+
+  assert.deepEqual(body.fallbackModels, []);
+  assert.equal(body.tools, false);
+  assert.equal(body.raw, true);
+  assert.equal(body.stream, false);
+});