@tokenfactory/acc-runner 0.29.4 → 0.33.0

package/dist/provider-auth.js

@@ -0,0 +1,184 @@
+/**
+ * Centralised resolution of how the spawned
+ * `claude` CLI authenticates with Anthropic.
+ *
+ * Claude Code authenticates *strictly* via the `ANTHROPIC_API_KEY`
+ * environment variable (or an apiKeyHelper) — it has no `--api-key` flag;
+ * passing one fails with `error: unknown option '--api-key'`. So "passing
+ * the API key to claude" means making sure the variable is present in the
+ * spawned subprocess's environment.
+ *
+ * When ANTHROPIC_API_KEY is set the CLI bills against the API account, which
+ * has no per-session usage cap. When it is absent the CLI falls back to the
+ * operator's interactive OAuth session, which is subject to the 429 session
+ * caps this change exists to avoid.
+ *
+ * M4 (ENGINE-CODEX): this module was renamed anthropic-auth.ts →
+ * provider-auth.ts and extended to cover the OpenAI Codex CLI as well, which
+ * has TWO auth channels (see §0.1.5 of the multi-model plan): an `api-key`
+ * mode driven by `OPENAI_API_KEY` (keychain/env) and a `subscription` mode
+ * driven by a stored ChatGPT login session. The Anthropic helpers are
+ * unchanged (byte-identical) so existing call sites keep their behaviour.
+ */
+import os from "node:os";
+import path from "node:path";
+import { RUNNER_KEYCHAIN_SERVICE } from "./types.js";
+/** Trimmed ANTHROPIC_API_KEY from `env`, or "" when unset/blank. */
+export function anthropicApiKey(env = process.env) {
+    return (env.ANTHROPIC_API_KEY ?? "").trim();
+}
+/**
+ * Opt-in claude-config isolation. Even with ANTHROPIC_API_KEY
+ * set, the Claude CLI prefers a stored claude.ai OAuth login when one exists —
+ * the observed cause of 429 session caps on a key-configured runner. Pointing
+ * the spawned claude at an isolated CLAUDE_CONFIG_DIR (no stored login) leaves
+ * the env key as the only credential, forcing API-key auth. Opt-in via
+ * ACC_RUNNER_ISOLATE_CLAUDE_CONFIG because the behaviour needs live-runner
+ * validation before becoming default.
+ */
+export function claudeConfigIsolationEnabled(env = process.env) {
+    const v = (env.ACC_RUNNER_ISOLATE_CLAUDE_CONFIG ?? "").trim().toLowerCase();
+    return v === "1" || v === "true" || v === "yes" || v === "on";
+}
+/** Runner-owned claude config dir used when isolation is enabled. */
+export function isolatedClaudeConfigDir(env = process.env) {
+    const override = (env.ACC_RUNNER_CLAUDE_CONFIG_DIR ?? "").trim();
+    return override || path.join(os.homedir(), ".acc-runner", "claude-config");
+}
+/**
+ * `"api-key"` when ANTHROPIC_API_KEY is set (non-blank), else
+ * `"interactive-session"`.
+ */
+export function resolveAuthMode(env = process.env) {
+    return anthropicApiKey(env) ? "api-key" : "interactive-session";
+}
+/**
+ * Returns `base` with ANTHROPIC_API_KEY explicitly forwarded (trimmed) when
+ * set, so every claude spawn site authenticates identically regardless of how
+ * `base` was assembled. A passthrough of `base` when the key is absent — the
+ * CLI then uses the operator's interactive OAuth session.
+ */
+export function withAnthropicAuth(base = process.env) {
+    const key = anthropicApiKey(base);
+    if (!key)
+        return base;
+    const next = { ...base, ANTHROPIC_API_KEY: key };
+    // When isolation is opted in and the operator hasn't already
+    // pinned a config dir, point claude at a runner-owned dir so a stored
+    // claude.ai login can't shadow the API key. Never clobber an explicit value.
+    if (claudeConfigIsolationEnabled(base) &&
+        !(base.CLAUDE_CONFIG_DIR ?? "").trim()) {
+        next.CLAUDE_CONFIG_DIR = isolatedClaudeConfigDir(base);
+    }
+    return next;
+}
+/** One-line, human-readable description of an auth mode for banners/checks. */
+export function describeAuthMode(mode) {
+    return mode === "api-key"
+        ? "api-key (ANTHROPIC_API_KEY set — no session cap)"
+        : "interactive-session (no ANTHROPIC_API_KEY — subject to 429 session caps)";
+}
+/**
+ * Precedence hint for the banner / doctor. Returns null when
+ * there's nothing to add (interactive-session mode is already self-explanatory
+ * via describeAuthMode). In api-key mode it tells the operator either that
+ * isolation is forcing the key, or — if not isolated — how to stop a claude.ai
+ * login from shadowing the key and causing 429s.
+ */
+export function authPrecedenceHint(env = process.env) {
+    if (resolveAuthMode(env) !== "api-key")
+        return null;
+    if (claudeConfigIsolationEnabled(env)) {
+        return `claude config isolated at ${isolatedClaudeConfigDir(env)} — API key forced`;
+    }
+    return ("if you still hit 429 session caps, a claude.ai login is shadowing the API key — " +
+        "run `claude /logout` or set ACC_RUNNER_ISOLATE_CLAUDE_CONFIG=1");
+}
+/**
+ * The per-provider keychain account under the frozen `acc-runner` service.
+ * FROZEN-CONTRACT EXTENSION (Track-A note): this ADDS a namespaced account
+ * (`provider:openai`) alongside the existing `default` session entry — the
+ * session schema in keychain.ts is untouched, so a Track-A review only needs
+ * to bless the new account name, not a shape change. The value is the raw
+ * OPENAI_API_KEY string (never a JSON blob), so it round-trips through keytar
+ * without colliding with the StoredSession JSON at `default`.
+ */
+export const OPENAI_KEYCHAIN_ACCOUNT = "provider:openai";
+/** Trimmed OPENAI_API_KEY from `env`, or "" when unset/blank. */
+export function openaiApiKey(env = process.env) {
+    return (env.OPENAI_API_KEY ?? "").trim();
+}
+/**
+ * Read the OPENAI_API_KEY from the OS keychain (per-provider account). Returns
+ * "" when absent, keytar is unavailable (headless Linux without libsecret), or
+ * the entry is empty. Async because keychain access is — the sync spawn path
+ * (`withOpenAiAuth`) only ever reads the env-present key, exactly like the
+ * Anthropic path; the keychain is consulted by startup/doctor which can await.
+ */
+export async function openaiApiKeyFromKeychain() {
+    try {
+        const mod = (await import("keytar"));
+        const k = mod.default ?? mod;
+        const raw = await k.getPassword(RUNNER_KEYCHAIN_SERVICE, OPENAI_KEYCHAIN_ACCOUNT);
+        return (raw ?? "").trim();
+    }
+    catch {
+        return "";
+    }
+}
+/**
+ * Resolve the `auth_preference` string into a typed preference. Accepts the
+ * env-string forms and the DB spelling; anything unknown/blank falls back to
+ * the `subscription_first` default.
+ */
+export function resolveCodexAuthPreference(raw) {
+    const v = (raw ?? "").trim().toLowerCase();
+    if (v === "api_key_first" || v === "api-key-first" || v === "api_key") {
+        return "api_key_first";
+    }
+    return "subscription_first";
+}
+/**
+ * The auth mode a codex spawn should START in, given the preference and whether
+ * an api key is present. `subscription_first` uses subscription; `api_key_first`
+ * uses the key when one is available (else subscription). This is the FIRST
+ * attempt only — the spill to api-key on a `subscription_exhausted` cap-hit is
+ * driven by the (future, M5) task-runner orchestration, which re-invokes with
+ * mode "api-key" explicitly.
+ */
+export function initialCodexAuthMode(preference, hasApiKey) {
+    if (preference === "api_key_first")
+        return hasApiKey ? "api-key" : "subscription";
+    return "subscription";
+}
+/** One-line, human-readable description of a codex auth mode for banners/checks. */
+export function describeCodexAuthMode(mode) {
+    return mode === "api-key"
+        ? "api-key (OPENAI_API_KEY set — billed to the platform key, no session cap)"
+        : "subscription (ChatGPT login session — subject to plan session/usage caps)";
+}
+/**
+ * Augment `base` for a codex spawn in the given auth mode:
+ *   - "api-key":      OPENAI_API_KEY is forwarded (trimmed) so codex bills the
+ *                     key. A passthrough when the key is absent — codex then
+ *                     errors on missing auth, surfaced as `auth_expired`.
+ *   - "subscription": OPENAI_API_KEY is REMOVED from the environment so codex
+ *                     cannot silently bill the key and instead uses the stored
+ *                     ChatGPT login (the mirror of the claude config-isolation
+ *                     concern: a stray key must not shadow the subscription we
+ *                     deliberately chose to try first).
+ * Never mutates `base`; returns a shallow copy.
+ */
+export function withOpenAiAuth(mode, base = process.env) {
+    const next = { ...base };
+    if (mode === "api-key") {
+        const key = openaiApiKey(base);
+        if (key)
+            next.OPENAI_API_KEY = key;
+        return next;
+    }
+    // subscription: strip the key so codex uses the ChatGPT login session.
+    delete next.OPENAI_API_KEY;
+    return next;
+}
+//# sourceMappingURL=provider-auth.js.map

package/dist/provider-auth.js.map

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

package/dist/review-diff-guard.d.ts

@@ -0,0 +1,12 @@
+/**
+ * True when a review diff is ZERO-LENGTH — empty or pure whitespace. A failed
+ * fetch / a head that never advanced past base yields an empty `git diff`, the
+ * literal infra signal. Deliberately narrow: any real text is a genuine change
+ * left for the reviewer. Mirrors api/_lib/review-request.ts.
+ */
+export declare function isEmptyReviewDiff(diff: string | null | undefined): boolean;
+/** Normalize a diff for stable content-hashing. Mirrors review-request.ts. */
+export declare function normalizeDiffForHash(diff: string | null | undefined): string;
+/** hex sha256 of the normalized diff. Mirrors review-request.ts. */
+export declare function hashReviewDiff(diff: string | null | undefined): string;
+//# sourceMappingURL=review-diff-guard.d.ts.map

package/dist/review-diff-guard.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"review-diff-guard.d.ts","sourceRoot":"","sources":["../src/review-diff-guard.ts"],"names":[],"mappings":"AAiBA;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAE1E;AAED,8EAA8E;AAC9E,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAiB5E;AAED,oEAAoE;AACpE,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAEtE"}

package/dist/review-diff-guard.js

@@ -0,0 +1,52 @@
+/**
+ * V96 (R3) — runner-side zero-diff guard.
+ *
+ * The runner is the HOT review path: runtime/reviewer.ts materializes the exact
+ * PR head into a worktree and computes the diff from it. A zero-length diff there
+ * is an INFRA fault (a fetch that produced an incomplete tree, a head that never
+ * advanced past base) — never a reviewable PR. `isEmptyReviewDiff` lets the
+ * runtime take the fail-closed infra path (re-fetch once, then emit
+ * `task.review_fetch_failed` and post NO verdict) instead of spawning the
+ * reviewer against nothing and burning a review cycle.
+ *
+ * This mirrors api/_lib/review-request.ts byte-for-byte in behaviour; the runner
+ * is a standalone package and cannot import from api/_lib (the same convention as
+ * the duplicated PRICING / MODEL_ALIASES maps). Keep the two in sync.
+ */
+import { createHash } from "node:crypto";
+/**
+ * True when a review diff is ZERO-LENGTH — empty or pure whitespace. A failed
+ * fetch / a head that never advanced past base yields an empty `git diff`, the
+ * literal infra signal. Deliberately narrow: any real text is a genuine change
+ * left for the reviewer. Mirrors api/_lib/review-request.ts.
+ */
+export function isEmptyReviewDiff(diff) {
+    return (diff ?? "").trim().length === 0;
+}
+/** Normalize a diff for stable content-hashing. Mirrors review-request.ts. */
+export function normalizeDiffForHash(diff) {
+    const text = (diff ?? "").replace(/\r\n/g, "\n");
+    const out = [];
+    for (const line of text.split("\n")) {
+        const trimmedEnd = line.replace(/[ \t]+$/, "");
+        if (/^index [0-9a-f]+\.\.[0-9a-f]+( [0-7]{6})?$/i.test(trimmedEnd))
+            continue;
+        const hunk = /^@@ -\d+(?:,\d+)? \+\d+(?:,\d+)? @@(.*)$/.exec(trimmedEnd);
+        if (hunk) {
+            const ctx = hunk[1].trim();
+            out.push(ctx ? `@@ ${ctx}` : "@@");
+            continue;
+        }
+        out.push(trimmedEnd);
+    }
+    while (out.length > 0 && out[0] === "")
+        out.shift();
+    while (out.length > 0 && out[out.length - 1] === "")
+        out.pop();
+    return out.join("\n");
+}
+/** hex sha256 of the normalized diff. Mirrors review-request.ts. */
+export function hashReviewDiff(diff) {
+    return createHash("sha256").update(normalizeDiffForHash(diff), "utf8").digest("hex");
+}
+//# sourceMappingURL=review-diff-guard.js.map

package/dist/review-diff-guard.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"review-diff-guard.js","sourceRoot":"","sources":["../src/review-diff-guard.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAA+B;IAC/D,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC;AAC1C,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,oBAAoB,CAAC,IAA+B;IAClE,MAAM,IAAI,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACjD,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACpC,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAC/C,IAAI,6CAA6C,CAAC,IAAI,CAAC,UAAU,CAAC;YAAE,SAAS;QAC7E,MAAM,IAAI,GAAG,0CAA0C,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACzE,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAC3B,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACnC,SAAS;QACX,CAAC;QACD,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACvB,CAAC;IACD,OAAO,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE;QAAE,GAAG,CAAC,KAAK,EAAE,CAAC;IACpD,OAAO,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE;QAAE,GAAG,CAAC,GAAG,EAAE,CAAC;IAC/D,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACxB,CAAC;AAED,oEAAoE;AACpE,MAAM,UAAU,cAAc,CAAC,IAA+B;IAC5D,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACvF,CAAC"}

package/dist/review-worktree-cleanup.d.ts

@@ -0,0 +1,73 @@
+/**
+ * V96 (ADDED SCOPE, live incident PR #1063) — tolerant review-worktree teardown.
+ *
+ * Review runs on fallback runners crashed with
+ *   runtime_threw ENOTEMPTY: directory not empty, rmdir .../review-<uuid>/design
+ * because the review-worktree teardown died removing an UNTRACKED directory
+ * (`design/`, the `Agent Auto/` design export) that `git worktree remove` won't
+ * delete and a plain `rmdir` can't (it's non-empty). That crash surfaced as a
+ * `reviewer_error` row, which DECREMENTS the per-PR review retry cap — an infra
+ * fault stealing review budget.
+ *
+ * Two fixes live here, both pure/injectable so they unit-test without a real FS:
+ *
+ *  1. `tolerantRemoveDir` — recursive + force removal that also RETRIES the
+ *     transient races (`ENOTEMPTY`/`EBUSY`/`EPERM`/`EMFILE`) `fs.rm` can throw
+ *     mid-recursion, and NEVER throws (a residual dir is logged, not fatal). This
+ *     is the "recursive, tolerant cleanup" the incident calls for.
+ *  2. `isTeardownError` / `classifyTeardownFailure` — recognize a worktree-
+ *     teardown failure so the caller can classify it as INFRA (fail-closed,
+ *     re-broadcast) instead of a `reviewer_error` verdict that burns a retry.
+ */
+export interface TolerantRemoveDeps {
+    /**
+     * Remove a directory tree. Default: `fs.rm(dir, { recursive, force })`. The
+     * recursive+force flags handle untracked directories (`design/`, `Agent Auto/`)
+     * that `git worktree remove` leaves behind — the root cause of the ENOTEMPTY
+     * crash. Injectable so the unit suite can drive success / transient-then-success
+     * / persistent-failure without touching disk.
+     */
+    rm?: (dir: string, opts: {
+        recursive: boolean;
+        force: boolean;
+    }) => Promise<void>;
+    /** Sleep between retries. Default: real setTimeout. Injectable (tests pass a no-op). */
+    sleep?: (ms: number) => Promise<void>;
+    /** Max retry attempts after the first (default 3). */
+    maxRetries?: number;
+    /** Base backoff between retries in ms (default 50). */
+    retryDelayMs?: number;
+}
+export interface TolerantRemoveResult {
+    removed: boolean;
+    attempts: number;
+    /** First-line of the last error when `removed === false` (log-safe). */
+    lastError?: string;
+}
+/**
+ * Recursively, forcefully, and TOLERANTLY remove a directory tree. Retries the
+ * transient FS races a recursive rm can hit (`ENOTEMPTY` when a child is written
+ * concurrently, `EBUSY`/`EPERM` on a locked handle) with a short backoff, and
+ * returns a result instead of throwing — a review teardown must never crash the
+ * reviewer. `force:true` already swallows ENOENT, so a missing dir is a clean
+ * `removed: true`.
+ */
+export declare function tolerantRemoveDir(dir: string, deps?: TolerantRemoveDeps): Promise<TolerantRemoveResult>;
+/**
+ * True when an error is a worktree-teardown failure — a recursive-removal FS race
+ * (`ENOTEMPTY` etc.), a `git worktree remove` failure, or a bare `rmdir`/`unlink`
+ * failure. The distinguishing property: it originates in CLEANUP, not in forming a
+ * verdict. Matched on both the fs error code and the message text so a wrapped /
+ * re-thrown error (the incident's `runtime_threw: ...ENOTEMPTY... rmdir ...`) is
+ * still recognized.
+ */
+export declare function isTeardownError(err: unknown): boolean;
+/**
+ * Classify a review failure that MIGHT be a teardown crash. Returns `"infra"`
+ * when the error is a teardown failure (the caller must treat it as INFRA:
+ * fail-closed, re-broadcast, NEVER a `reviewer_error` verdict, NEVER decrement
+ * the retry cap) and `"review"` otherwise (a genuine reviewer failure that the
+ * existing error path owns).
+ */
+export declare function classifyTeardownFailure(err: unknown): "infra" | "review";
+//# sourceMappingURL=review-worktree-cleanup.d.ts.map

package/dist/review-worktree-cleanup.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"review-worktree-cleanup.d.ts","sourceRoot":"","sources":["../src/review-worktree-cleanup.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAYH,MAAM,WAAW,kBAAkB;IACjC;;;;;;OAMG;IACH,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAClF,wFAAwF;IACxF,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,sDAAsD;IACtD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,uDAAuD;IACvD,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,wEAAwE;IACxE,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAUD;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,kBAAuB,GAC5B,OAAO,CAAC,oBAAoB,CAAC,CA0B/B;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAcrD;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,GAAG,QAAQ,CAExE"}

package/dist/review-worktree-cleanup.js

@@ -0,0 +1,103 @@
+/**
+ * V96 (ADDED SCOPE, live incident PR #1063) — tolerant review-worktree teardown.
+ *
+ * Review runs on fallback runners crashed with
+ *   runtime_threw ENOTEMPTY: directory not empty, rmdir .../review-<uuid>/design
+ * because the review-worktree teardown died removing an UNTRACKED directory
+ * (`design/`, the `Agent Auto/` design export) that `git worktree remove` won't
+ * delete and a plain `rmdir` can't (it's non-empty). That crash surfaced as a
+ * `reviewer_error` row, which DECREMENTS the per-PR review retry cap — an infra
+ * fault stealing review budget.
+ *
+ * Two fixes live here, both pure/injectable so they unit-test without a real FS:
+ *
+ *  1. `tolerantRemoveDir` — recursive + force removal that also RETRIES the
+ *     transient races (`ENOTEMPTY`/`EBUSY`/`EPERM`/`EMFILE`) `fs.rm` can throw
+ *     mid-recursion, and NEVER throws (a residual dir is logged, not fatal). This
+ *     is the "recursive, tolerant cleanup" the incident calls for.
+ *  2. `isTeardownError` / `classifyTeardownFailure` — recognize a worktree-
+ *     teardown failure so the caller can classify it as INFRA (fail-closed,
+ *     re-broadcast) instead of a `reviewer_error` verdict that burns a retry.
+ */
+/** Node fs error codes that a recursive dir removal can hit transiently. */
+const RETRYABLE_FS_CODES = new Set([
+    "ENOTEMPTY",
+    "EBUSY",
+    "EPERM",
+    "EMFILE",
+    "ENFILE",
+    "EACCES",
+]);
+function fsErrCode(err) {
+    return String(err?.code ?? "");
+}
+function defaultSleep(ms) {
+    return new Promise((r) => setTimeout(r, ms));
+}
+/**
+ * Recursively, forcefully, and TOLERANTLY remove a directory tree. Retries the
+ * transient FS races a recursive rm can hit (`ENOTEMPTY` when a child is written
+ * concurrently, `EBUSY`/`EPERM` on a locked handle) with a short backoff, and
+ * returns a result instead of throwing — a review teardown must never crash the
+ * reviewer. `force:true` already swallows ENOENT, so a missing dir is a clean
+ * `removed: true`.
+ */
+export async function tolerantRemoveDir(dir, deps = {}) {
+    const maxRetries = deps.maxRetries ?? 3;
+    const retryDelayMs = deps.retryDelayMs ?? 50;
+    const sleep = deps.sleep ?? defaultSleep;
+    const rm = deps.rm ??
+        (async (d, opts) => {
+            const fs = await import("node:fs/promises");
+            await fs.rm(d, opts);
+        });
+    let lastError;
+    for (let attempt = 1; attempt <= maxRetries + 1; attempt++) {
+        try {
+            await rm(dir, { recursive: true, force: true });
+            return { removed: true, attempts: attempt };
+        }
+        catch (err) {
+            lastError = err?.message?.split("\n")[0] ?? String(err);
+            const code = fsErrCode(err);
+            if (!RETRYABLE_FS_CODES.has(code) || attempt > maxRetries) {
+                return { removed: false, attempts: attempt, lastError };
+            }
+            await sleep(retryDelayMs * attempt);
+        }
+    }
+    return { removed: false, attempts: maxRetries + 1, lastError };
+}
+/**
+ * True when an error is a worktree-teardown failure — a recursive-removal FS race
+ * (`ENOTEMPTY` etc.), a `git worktree remove` failure, or a bare `rmdir`/`unlink`
+ * failure. The distinguishing property: it originates in CLEANUP, not in forming a
+ * verdict. Matched on both the fs error code and the message text so a wrapped /
+ * re-thrown error (the incident's `runtime_threw: ...ENOTEMPTY... rmdir ...`) is
+ * still recognized.
+ */
+export function isTeardownError(err) {
+    const code = fsErrCode(err);
+    if (RETRYABLE_FS_CODES.has(code) || code === "ENOENT") {
+        // ENOENT alone isn't a teardown failure, but with rmdir/worktree text it is.
+    }
+    if (RETRYABLE_FS_CODES.has(code))
+        return true;
+    const msg = (err?.message ?? String(err)).toLowerCase();
+    return (/\brmdir\b/.test(msg) ||
+        /directory not empty/.test(msg) ||
+        /enotempty/.test(msg) ||
+        /worktree (?:remove|prune)/.test(msg) ||
+        /review-[0-9a-f-]+/.test(msg));
+}
+/**
+ * Classify a review failure that MIGHT be a teardown crash. Returns `"infra"`
+ * when the error is a teardown failure (the caller must treat it as INFRA:
+ * fail-closed, re-broadcast, NEVER a `reviewer_error` verdict, NEVER decrement
+ * the retry cap) and `"review"` otherwise (a genuine reviewer failure that the
+ * existing error path owns).
+ */
+export function classifyTeardownFailure(err) {
+    return isTeardownError(err) ? "infra" : "review";
+}
+//# sourceMappingURL=review-worktree-cleanup.js.map

package/dist/review-worktree-cleanup.js.map

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

package/dist/runtime/reviewer.d.ts.map

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

package/dist/runtime/reviewer.js

@@ -15,12 +15,14 @@
  * cron's poll-merge loop can advance.
  */
 import { execa } from "execa";
-import { parseClaudeJson, priceUsdCents, normalizeUsage, } from "../cost-pricing.js";
-import { classifyClaudeExit, extractResetTime } from "../failure-classifier.js";
-import { withAnthropicAuth } from "../anthropic-auth.js";
+import { priceUsdCents, normalizeUsage, } from "../cost-pricing.js";
+import { extractResetTime } from "../failure-classifier.js";
 import { buildEnv } from "../bin-resolve.js";
+import { getEngine } from "../engines/registry.js";
 import { ensureRepoClone } from "./clone-cache.js";
 import { prepareReviewWorktree, ReviewFetchError } from "./worktree.js";
+import { isEmptyReviewDiff } from "../review-diff-guard.js";
+import { classifyTeardownFailure } from "../review-worktree-cleanup.js";
 // Byte-identical to prompts/reviewer-agent.md. The runner does not have
 // the markdown file at runtime (the package ships without prompts/) so
 // the prompt is embedded. Keep this string in sync with the markdown
@@ -327,25 +329,17 @@ async function emitReviewFetchFailed(supabase, assignment, err) {
         process.stderr.write(`[acc-runner] task.review_fetch_failed emit failed: ${logErr.message}\n`);
     }
 }
+// M2 (ENGINE-EXTRACT): the coding engine the reviewer drives — the default
+// `claude-code` engine. spawn/argv/result-parse/failure-class behavior is
+// byte-identical to the pre-refactor inline logic now owned by
+// src/engines/claude-code.ts. buildEnv() is the reviewer's base env (mirrors
+// v0.74-B): the engine forwards ANTHROPIC_API_KEY over it when set.
+const engine = getEngine();
 function defaultSpawnClaude(modelId) {
-    const args = ["--print", "--dangerously-skip-permissions", "--output-format=json"];
-    const trimmed = (modelId ?? "").trim();
-    if (trimmed)
-        args.push("--model", trimmed);
-    // v0.74-B: forward ANTHROPIC_API_KEY (trimmed) when set so the reviewer
-    // claude authenticates via the API account (no per-session cap) rather than
-    // the interactive OAuth session. claude has no --api-key flag; the env var
-    // is the only auth channel. See src/anthropic-auth.ts.
-    return execa("claude", args, {
-        stdin: "pipe",
-        stdout: "pipe",
-        stderr: "pipe",
-        reject: false,
-        env: withAnthropicAuth(buildEnv()),
-    });
+    return engine.spawn({ modelId, baseEnv: buildEnv() });
 }
 function parseEnvelope(stdout, fallbackModel) {
-    const parsed = parseClaudeJson(stdout);
+    const parsed = engine.parseResult(stdout);
     if (!parsed) {
         return { result: stdout.trim(), session_id: null, cost_usd: 0, model: fallbackModel };
     }
@@ -354,7 +348,7 @@ function parseEnvelope(stdout, fallbackModel) {
     const cents = priceUsdCents(model, usage);
     return {
         result: parsed.result ?? "",
-        // any-allowed: parseClaudeJson keeps additional fields on the
+        // any-allowed: engine.parseResult keeps additional fields on the
         // record; session_id isn't on the typed shape but appears in
         // every observed `--output-format=json` envelope from Claude CLI.
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -378,13 +372,23 @@ export async function runReview(assignment, deps) {
         outcome = await driveReview(assignment, deps, fetchMeta, prepareTree, spawnFn);
     }
     catch (err) {
-        outcome = {
-            decision: "reviewer_error",
-            reasons: [`runtime_threw: ${err.message?.slice(0, 200)}`],
-            confidence: 0,
-            session_id: null,
-            cost_usd: 0,
-        };
+        // V96 (ADDED SCOPE): a worktree teardown crash that escaped driveReview
+        // (ENOTEMPTY / rmdir on an untracked dir — PR #1063) is INFRA, never a
+        // review verdict. Treat it like a fetch failure: post NO verdict so R0's
+        // re-broadcast reassigns it, instead of a reviewer_error that burns a retry.
+        if (classifyTeardownFailure(err) === "infra") {
+            process.stderr.write(`[acc-runner] review teardown crash (infra, no verdict): ${err.message?.slice(0, 200)}\n`);
+            outcome = null;
+        }
+        else {
+            outcome = {
+                decision: "reviewer_error",
+                reasons: [`runtime_threw: ${err.message?.slice(0, 200)}`],
+                confidence: 0,
+                session_id: null,
+                cost_usd: 0,
+            };
+        }
     }
     // R0-D: fail-closed. driveReview returns null when it could not materialize
     // the exact PR head — `task.review_fetch_failed` was already emitted there.
@@ -462,6 +466,12 @@ async function driveReview(assignment, deps, fetchMeta, prepareTree, spawnFn) {
     // R0-D-REVIEWER-WORKSPACE-INTEGRITY: materialize the EXACT PR head before
     // forming any verdict, or fail closed. On failure we post NO verdict and emit
     // `task.review_fetch_failed`; R0's re-broadcast reassigns to a healthy runner.
+    //
+    // V96 (R3) ZERO-DIFF GUARD: an empty diff off the materialized head is an INFRA
+    // fault (an incomplete fetch, a head that never advanced). Re-fetch ONCE (a
+    // fresh tree) before giving up; if it is STILL empty, fail closed exactly like
+    // a fetch failure — post NO verdict, emit `task.review_fetch_failed` — so the
+    // reviewer is never spawned against nothing and no review cycle is burned.
     let tree;
     try {
         tree = await prepareTree({
@@ -469,12 +479,45 @@ async function driveReview(assignment, deps, fetchMeta, prepareTree, spawnFn) {
             reviewId: assignment.review_id,
             prNumber: assignment.pr_number,
         });
+        if (isEmptyReviewDiff(tree.diff)) {
+            await tree.cleanup().catch(() => undefined);
+            tree = await prepareTree({
+                repo,
+                reviewId: assignment.review_id,
+                prNumber: assignment.pr_number,
+            });
+            if (isEmptyReviewDiff(tree.diff)) {
+                await tree.cleanup().catch(() => undefined);
+                const emptyErr = new ReviewFetchError({
+                    event: "task.review_fetch_failed",
+                    prNumber: assignment.pr_number,
+                    expectedHeadSha: tree.headSha,
+                    reason: "review request carried a zero-length diff after one re-fetch (infra fault) — " +
+                        "not sent to the reviewer, no review cycle consumed",
+                });
+                await emitReviewFetchFailed(deps.supabase, assignment, emptyErr);
+                return null;
+            }
+        }
     }
     catch (err) {
         if (err instanceof ReviewFetchError) {
             await emitReviewFetchFailed(deps.supabase, assignment, err);
             return null;
         }
+        // V96 (ADDED SCOPE): a worktree TEARDOWN failure (ENOTEMPTY / rmdir on an
+        // untracked dir, PR #1063) is INFRA, never a review verdict. Fail closed
+        // like a fetch failure — post no verdict, re-broadcast — instead of letting
+        // it become a reviewer_error that decrements the retry cap.
+        if (classifyTeardownFailure(err) === "infra") {
+            await emitReviewFetchFailed(deps.supabase, assignment, new ReviewFetchError({
+                event: "task.review_fetch_failed",
+                prNumber: assignment.pr_number,
+                expectedHeadSha: "",
+                reason: `review worktree teardown failed (infra): ${err.message?.split("\n")[0] ?? String(err)}`,
+            }));
+            return null;
+        }
         throw err;
     }
     try {
@@ -515,7 +558,7 @@ async function runClaudeAndDecide(prompt, policy, deps, spawnFn) {
         // point retrying before then). A brownout with NO reset time is retried
         // in-process with exponential backoff, bounded by classifyCapacityRetry, so
         // a momentary blip recovers without pausing the whole runner.
-        const classified = classifyClaudeExit(invokeResult.exitCode, invokeResult.stderr, invokeResult.stdout, invokeResult.durationMs);
+        const classified = engine.classifyFailure(invokeResult.exitCode, invokeResult.stderr, invokeResult.stdout, invokeResult.durationMs);
         const isCapacity = classified.class === "capacity_exhausted" ||
             classified.class === "claude_unavailable";
         if (isCapacity) {
@@ -555,7 +598,7 @@ async function runClaudeAndDecide(prompt, policy, deps, spawnFn) {
         // output, no 429/auth/env signal) is also treated as capacity rather than
         // reviewer_error — the host is fine but claude is momentarily unreachable,
         // so the review should not consume the per-PR retry cap.
-        const classified = classifyClaudeExit(exitCode, claudeStderr, stdout, durationMs);
+        const classified = engine.classifyFailure(exitCode, claudeStderr, stdout, durationMs);
         if (classified.class === "capacity_exhausted" ||
             classified.class === "claude_unavailable") {
             const resumeMs = extractResetTime(`${claudeStderr}\n${stdout}`);