Skip to content

Self-hosted, Self-Improving, Federated Everything App — dev management, agent orchestration, persistent mind, digital twin, second brain, and creative pipeline from a single dashboard over Tailscale to port the user into the OS

fix(code-review): correct reviewer option docs (#12575)

[._.]/ Adam Eivy74143ea56b7f
diff --git a/server/services/codeReview.js b/server/services/codeReview.js
index dcebb4b707..3998ab5ac6 100644
--- a/server/services/codeReview.js
+++ b/server/services/codeReview.js
@@ -42,6 +42,7 @@ import {
resolveReviewerGroup,
resolveReviewerPins,
normalizeReviewerEffort,
+ normalizeReviewers,
EFFORT_SELECTABLE_REVIEWERS,
MODEL_SELECTABLE_REVIEWERS,
} from '../lib/reviewerConfig.js'
@@ -455,14 +456,14 @@ export async function getCodeReviewDefaults() {
}
/**
- * Reviewer-loop option resolver shared by `finalizeAgent` (agentLifecycle.js)
- * and the CLI cleanup path (agentCliSpawning.js): merges per-task metadata
+ * Reviewer-loop option resolver used by `server/services/agentCompletionCleanup.js`,
+ * `server/services/cosMergeHandoff.js`, `server/services/developmentWatchdog.js`,
+ * and `server/routes/apps/pullRequests.js`: merges per-task metadata
* with the user's Code Review Defaults, returning `{ reviewers, reviewStopMode,
* reviewerApplies }` in the exact shape `cleanupAgentWorktree` expects.
*
- * Pass `normalize` (server/lib/validation.js `normalizeReviewers`) so this
- * module doesn't have to import it directly — keeps validation.js as the
- * single source of truth for the reviewer enum & fallback rules.
+ * `normalize` can override `normalizeReviewers` for callers that need a
+ * different normalization contract.
*
* `reviewerModels` is a reviewer-keyed model map (e.g. `{ codex: 'gpt-5.6-sol',
* ollama: 'qwen2.5:7b' }`) resolved with task-over-default precedence: the task's
@@ -480,7 +481,7 @@ export async function getCodeReviewDefaults() {
* Errors in settings I/O fall back to the hardcoded defaults — settings read
* failures shouldn't block agent completion.
*/
-export async function resolveReviewLoopOptions(metadata, { normalize }) {
+export async function resolveReviewLoopOptions(metadata, { normalize = normalizeReviewers } = {}) {
const defaults = await getCodeReviewDefaults().catch(() => null)
const reviewers = resolveReviewerGroup(metadata, defaults, defaults?.reviewers, normalize)
// GitHub reviewer usernames: a task-level list (even empty) overrides the
@@ -528,9 +529,9 @@ export async function resolveReviewLoopOptions(metadata, { normalize }) {
* settings-event-invalidated like `getCodeReviewDefaults()`, because a probe
* result can go stale from something settings changes never fire for (the
* user installs/uninstalls a CLI mid-session). Deliberately kept OUT of
- * `getCodeReviewDefaults()`/`pickCodeReviewDefaults()`: those are synchronous,
- * no-I/O functions also called from the agent-completion spawn path
- * (`resolveReviewLoopOptions`), and this does a real `execFile` per reviewer —
+ * `pickCodeReviewDefaults()`: that is a synchronous, no-I/O function also used
+ * by callers that already have settings in memory. `getCodeReviewDefaults()`
+ * is async and reads settings; this does a real `execFile` per reviewer —
* only the `GET /defaults` route needs it, so it's called from there alone.
*
* Warn-only, per #3606's "warn, do not block" decision: this never filters or
@@ -1195,13 +1196,12 @@ async function runReviewerCompletion({ backend, model: pinnedModel, messages, us
* reviewer's working directory when its vendor enforces a no-tool or
* read-only review mode (#6338), neither of which can write to it. A CLI with
* no such mode never receives it: it runs in a scratch directory instead.
- * @param {boolean} [opts.isolateFromCheckout] - Run a CLI reviewer in a scratch
- * cwd instead of `opts.cwd`, whatever its mode.
- * @param {boolean} [opts.toolFree] - Deprecated alias for checkout isolation.
+ * @param {boolean} [opts.toolFree] - Run a CLI reviewer in a scratch cwd
+ * instead of `opts.cwd`, whatever its mode.
* @param {string} [opts.kind] - `claim-review` always uses a scratch cwd;
* enforced vendor isolation is preferred but is not a transport requirement.
*/
-export async function runLocalCodeReview({ backend, model, diff, effort = null, timeoutMs = undefined, baseUrl = null, cwd = null, isolateFromCheckout = false, toolFree = false, kind = null } = {}) {
+export async function runLocalCodeReview({ backend, model, diff, effort = null, timeoutMs = undefined, baseUrl = null, cwd = null, toolFree = false, kind = null } = {}) {
if (!isToolFreeReviewer(backend)) {
return { ok: false, error: `Unsupported reviewer backend: ${backend}` }
}
@@ -1232,7 +1232,7 @@ export async function runLocalCodeReview({ backend, model, diff, effort = null,
diffSizeBytes,
baseUrl,
cwd,
- isolateFromCheckout: kind === 'claim-review' || isolateFromCheckout || toolFree,
+ isolateFromCheckout: kind === 'claim-review' || toolFree,
allowUnconfined: true,
systemPromptFor: buildCodeReviewSystemPrompt,
userMessage: { role: 'user', content: `Review this PR diff:\n\n${fence}diff\n${trimmedDiff}\n${fence}` },
diff --git a/server/services/codeReview.providers.test.js b/server/services/codeReview.providers.test.js
index 9303203dcf..45411af0cd 100644
--- a/server/services/codeReview.providers.test.js
+++ b/server/services/codeReview.providers.test.js
@@ -320,7 +320,6 @@ describe('configured provider reviewers', () => {
it.each([
{ kind: 'claim-review' },
{ toolFree: true },
- { isolateFromCheckout: true },
])('isolates a review with %j even when a repository was supplied', async isolation => {
getProviderById.mockResolvedValue({ ...provider, type: 'cli', command: 'claude' });
runCliProviderPrompt.mockResolvedValue({ text: 'NO FINDINGS', partial: false });
diff --git a/server/services/codeReview.test.js b/server/services/codeReview.test.js
index bd38f6de8b..83a628a2bc 100644
--- a/server/services/codeReview.test.js
+++ b/server/services/codeReview.test.js
@@ -698,6 +698,12 @@ describe('codeReview helpers', () => {
})
describe('resolveReviewLoopOptions', () => {
+ it('uses the reviewer config normalizer by default', async () => {
+ mockedSettings.current = { codeReview: { reviewers: ['copilot'] } }
+ const out = await resolveReviewLoopOptions({ reviewers: ['grok'] })
+ expect(out.reviewers).toEqual(['grok'])
+ })
+
// Reviewers inspecting public PR content are advisory only — the follow-up
// must never hand an untrusted diff to a second process with write authority.
// Pinned on the resolver itself because this is the one place the rule lives:
diff --git a/server/services/cosTaskPrompts.js b/server/services/cosTaskPrompts.js
index e5f9f1084f..2f8a4fb578 100644
--- a/server/services/cosTaskPrompts.js
+++ b/server/services/cosTaskPrompts.js
@@ -135,7 +135,6 @@ export function buildLocalReviewerInstructions(reviewers, reviewerModels = {}, r
.join(' ');
const ingressJqObject = [
...Object.keys(ingressPinned).map((key) => `${key}: $${key}`),
- ...(isProviderReviewer(ingressReviewer) ? ['inheritDefaults: false'] : []),
].join(', ');
const claimCommentGateBlock = claimCommentGate && ingressReviewer ? `
diff --git a/server/services/developmentWatchdog.js b/server/services/developmentWatchdog.js
index 604cc3bb7a..a785e24243 100644
--- a/server/services/developmentWatchdog.js
+++ b/server/services/developmentWatchdog.js
@@ -275,9 +275,8 @@ async function dispatch(app, decision) {
const finalState = await loadState();
if (authorityLost(finalState, app.id)) return { reason: 'authority-changed' };
const { resolveReviewLoopOptions } = await import('./codeReview.js');
- const { normalizeReviewers, claimSafeReviewers } = await import('../lib/reviewerConfig.js');
- const { isTruthyMeta } = await import('./agentState.js');
- const options = await resolveReviewLoopOptions({}, { normalize: normalizeReviewers, isTruthyMeta });
+ const { claimSafeReviewers } = await import('../lib/reviewerConfig.js');
+ const options = await resolveReviewLoopOptions({});
const reviewers = claimSafeReviewers(options.reviewers);
const { spawnReviewLoopFollowUp } = await import('./agentWorktreeCleanup.js');
const task = await spawnReviewLoopFollowUp({ originalAgentId: null,
diff --git a/server/services/developmentWatchdog.test.js b/server/services/developmentWatchdog.test.js
index 380a2cdc3b..aa4f5af9fe 100644
--- a/server/services/developmentWatchdog.test.js
+++ b/server/services/developmentWatchdog.test.js
@@ -39,7 +39,6 @@ vi.mock('../lib/execGit.js', () => ({ execGit: async () => ({ stdout: m.branch }
vi.mock('../lib/peerHttpClient.js', () => ({ peerFetch: async () => { throw new Error('offline'); } }));
vi.mock('./blockedIssueReconcile.js', () => ({ parseBlockingIssueNumbers: () => m.dependencies }));
vi.mock('./codeReview.js', () => ({ resolveReviewLoopOptions: async () => ({ reviewers: ['codex'] }) }));
-vi.mock('./agentState.js', () => ({ isTruthyMeta: value => value === true }));
vi.mock('./agentWorktreeCleanup.js', () => ({ spawnReviewLoopFollowUp: async options => { m.adds.push(options); return { id: 'resolution' }; } }));
vi.mock('./userActions.js', () => ({ listUserActions: async () => [] }));
vi.mock('./reviewQueue.js', () => ({ buildQueue: async () => ({ sources: {}, partial: false, nextCursor: null }) }));