@doist/doistbot-cli 1.0.4 → 1.0.5

package/sandbox/dist/tasks/review/engines/multi-focus.js

@@ -1,8 +1,8 @@
 import { logger } from '../../../core/logging.js';
 import { convertFindingsToComments } from '../comment-mapper.js';
-import { buildFallbackSummary, summarizeCouncilReviews, withReviewSummaryGreeting, } from '../council/summary.js';
 import { buildReviewOutputFindings } from '../finding-output.js';
 import { buildMultiFocusPrompt, REVIEW_FOCUS_DEFINITIONS, } from '../multi-focus-prompt.js';
+import { buildFallbackSummary, summarizeReviewFindings } from '../review-summary.js';
 import { parseSeverity } from '../severity.js';
 import { dedupeMultiFocusFindings } from './dedupe.js';
 import { getApiKeys, getAvailableModels, getProviderFailures, requestModelReview, } from './shared.js';
@@ -14,7 +14,6 @@ async function runFocusPass({ focus, model, basePrompt, standardsSection, apiKey
         prompt,
         apiKeys,
         workspaceDir,
-        logEngine: 'multi_focus',
         onProgress,
     });
     if (!result) {
@@ -70,10 +69,10 @@ function routeLowPriorityFindings(findings, placement = 'summary') {
     }
     return { inlineFindings, summaryFindings };
 }
-function buildNoInlineSummaryWithNotes(prTitle, prAuthor, prAuthorGreetingName, excludePrAuthorFromSummary) {
+function buildNoInlineSummaryWithNotes(prTitle) {
     const safeTitle = prTitle.trim();
     const base = safeTitle ? `This PR updates ${safeTitle}.` : 'This PR updates the codebase.';
-    return withReviewSummaryGreeting(`${base} No inline issues were flagged.`, prAuthor, prAuthorGreetingName, excludePrAuthorFromSummary);
+    return `${base} No inline issues were flagged.`;
 }
 function collectReviewObservations(focusRuns) {
     const observations = [];
@@ -116,34 +115,25 @@ function appendSummaryOnlyFindings(summary, summaryFindings) {
     const title = `Optional follow-up note${notes.length === 1 ? '' : 's'} (${notes.length})`;
     return `${summary.trim()}\n\n${LOW_PRIORITY_SUMMARY_NOTICE}\n\n<details>\n<summary>${title}</summary>\n\n${notes.join('\n')}\n\n</details>`;
 }
-async function buildMultiFocusReviewOutput({ inlineFindings, summaryFindings, lineLookup, prTitle, prBody, prAuthor, prAuthorGreetingName, resolvePrAuthorGreetingName, excludePrAuthorFromSummary, reviewObservations, summaryApiKey, workspaceDir, }) {
+async function buildMultiFocusReviewOutput({ inlineFindings, summaryFindings, lineLookup, prTitle, prBody, reviewObservations, summaryCredential, workspaceDir, }) {
     const comments = convertFindingsToComments(inlineFindings, lineLookup);
     const findings = Array.from(new Set(comments.map((comment) => comment.body.trim()).filter(Boolean)));
-    const resolvedPrAuthorGreetingName = excludePrAuthorFromSummary === true
-        ? undefined
-        : (prAuthorGreetingName ?? (await resolvePrAuthorGreetingName?.()));
-    const synthesizedSummary = summaryApiKey == null
+    const synthesizedSummary = summaryCredential == null
         ? null
-        : await summarizeCouncilReviews({
-            apiKey: summaryApiKey,
+        : await summarizeReviewFindings({
+            credential: summaryCredential,
             workspaceDir,
             prTitle,
             prBody,
-            prAuthor,
-            prAuthorGreetingName: resolvedPrAuthorGreetingName,
-            excludePrAuthorFromSummary,
             findings,
             reviewObservations,
         });
     const summaryWithoutNotes = synthesizedSummary ||
         (comments.length === 0 && summaryFindings.length > 0
-            ? buildNoInlineSummaryWithNotes(prTitle, prAuthor, resolvedPrAuthorGreetingName, excludePrAuthorFromSummary)
+            ? buildNoInlineSummaryWithNotes(prTitle)
             : buildFallbackSummary({
                 prTitle,
                 findings,
-                prAuthor,
-                prAuthorGreetingName: resolvedPrAuthorGreetingName,
-                excludePrAuthorFromSummary,
             }));
     return {
         summary: appendSummaryOnlyFindings(summaryWithoutNotes, summaryFindings),
@@ -155,10 +145,10 @@ async function buildMultiFocusReviewOutput({ inlineFindings, summaryFindings, li
         }),
     };
 }
-export async function runMultiFocusReviewEngine({ ctx, prompt, lineLookup, prTitle, prBody, prAuthor, prAuthorGreetingName, resolvePrAuthorGreetingName, excludePrAuthorFromSummary, lowPriorityFindingPlacement, standardsSection, onProgress, }) {
+export async function runMultiFocusReviewEngine({ ctx, prompt, lineLookup, prTitle, prBody, lowPriorityFindingPlacement, standardsSection, onProgress, }) {
     const apiKeys = getApiKeys(ctx);
     const availableModels = getAvailableModels(apiKeys);
-    const metricModels = availableModels.length > 0 ? [...availableModels] : [...ctx.councilModelsEnabled];
+    const metricModels = availableModels.length > 0 ? [...availableModels] : [...ctx.reviewModelsEnabled];
     if (availableModels.length === 0) {
         return {
             review: null,
@@ -198,12 +188,21 @@ export async function runMultiFocusReviewEngine({ ctx, prompt, lineLookup, prTit
     }
     const allFindings = successfulRuns.flatMap((run) => run.findings);
     const reviewObservations = collectReviewObservations(successfulRuns);
-    const dedupedFindings = await dedupeMultiFocusFindings({
-        findings: allFindings,
-        availableModels,
-        workspaceDir: ctx.workspaceDir,
-        geminiApiKey: ctx.geminiApiKey,
-    });
+    let dedupedFindings = allFindings;
+    try {
+        dedupedFindings = await dedupeMultiFocusFindings({
+            findings: allFindings,
+            availableModels,
+            workspaceDir: ctx.workspaceDir,
+            geminiCredential: ctx.geminiCredential,
+        });
+    }
+    catch (error) {
+        logger.warn('Multi-focus dedupe failed, continuing with raw findings', {
+            findingsCount: allFindings.length,
+            error: error instanceof Error ? error.message : String(error),
+        });
+    }
     const routedFindings = routeLowPriorityFindings(dedupedFindings, lowPriorityFindingPlacement);
     const review = await buildMultiFocusReviewOutput({
         inlineFindings: routedFindings.inlineFindings,
@@ -211,12 +210,8 @@ export async function runMultiFocusReviewEngine({ ctx, prompt, lineLookup, prTit
         lineLookup,
         prTitle,
         prBody,
-        prAuthor,
-        prAuthorGreetingName,
-        resolvePrAuthorGreetingName,
-        excludePrAuthorFromSummary,
         reviewObservations,
-        summaryApiKey: apiKeys.gemini,
+        summaryCredential: apiKeys.gemini,
         workspaceDir: ctx.workspaceDir,
     });
     logger.info('Multi-focus review completed', {

package/sandbox/dist/tasks/review/engines/shared.js

@@ -1,29 +1,22 @@
+import { getReviewProviderCredential, hasReviewProviderCredential, } from '../../../providers/credentials.js';
 import { getProvider } from '../../../providers/index.js';
-import { convertFindingsToComments } from '../comment-mapper.js';
-import { buildFallbackSummary, summarizeCouncilReviews, withReviewSummaryGreeting, } from '../council/summary.js';
-import { buildReviewOutputFindings } from '../finding-output.js';
 import { getReviewThinkingLevel } from '../thinking-level.js';
 export function getApiKeys(ctx) {
     const apiKeys = {};
-    if (ctx.councilModelsEnabled.includes('gemini')) {
-        apiKeys.gemini = ctx.geminiApiKey;
+    if (ctx.reviewModelsEnabled.includes('gemini')) {
+        apiKeys.gemini = ctx.geminiCredential;
     }
-    if (ctx.councilModelsEnabled.includes('openai')) {
+    if (ctx.reviewModelsEnabled.includes('openai')) {
         apiKeys.openai = ctx.openaiApiKey;
     }
-    if (ctx.councilModelsEnabled.includes('anthropic')) {
-        apiKeys.anthropic = ctx.anthropicApiKey;
-    }
     return apiKeys;
 }
 export function getAvailableModels(apiKeys) {
     const models = [];
-    if (apiKeys.gemini)
+    if (hasReviewProviderCredential(apiKeys.gemini))
         models.push('gemini');
-    if (apiKeys.openai)
+    if (hasReviewProviderCredential(apiKeys.openai))
         models.push('openai');
-    if (apiKeys.anthropic)
-        models.push('anthropic');
     return models;
 }
 export function getProviderFailures(results) {
@@ -34,63 +27,22 @@ export function getProviderFailures(results) {
         error: result.error,
     }));
 }
-export async function requestModelReview({ model, prompt, apiKeys, workspaceDir, logEngine, onProgress, }) {
-    const apiKey = apiKeys[model];
-    if (!apiKey) {
+export async function requestModelReview({ model, prompt, apiKeys, workspaceDir, onProgress, }) {
+    const credential = getReviewProviderCredential(apiKeys, model);
+    if (!credential) {
         return null;
     }
     const provider = getProvider(model);
     const config = {
-        apiKey,
+        ...credential,
         workspaceDir,
         thinkingLevel: getReviewThinkingLevel(model),
         onProgress,
     };
     try {
-        return await provider.review(prompt, config, logEngine ? { engine: logEngine } : undefined);
+        return await provider.review(prompt, config);
     }
     catch {
         return null;
     }
 }
-export async function buildReviewOutputFromFindings({ commentsSource, lineLookup, prTitle, prBody, prAuthor, prAuthorGreetingName, resolvePrAuthorGreetingName, excludePrAuthorFromSummary, summaryApiKey, workspaceDir, preferredSummary, reviewObservations, }) {
-    const comments = convertFindingsToComments(commentsSource, lineLookup);
-    const findings = Array.from(new Set(comments.map((comment) => comment.body.trim()).filter(Boolean)));
-    const preferredSummaryText = preferredSummary?.trim();
-    const hasPreferredSummary = Boolean(preferredSummaryText);
-    const resolvedPrAuthorGreetingName = excludePrAuthorFromSummary === true
-        ? undefined
-        : (prAuthorGreetingName ?? (await resolvePrAuthorGreetingName?.()));
-    const synthesizedSummary = hasPreferredSummary || summaryApiKey == null
-        ? null
-        : await summarizeCouncilReviews({
-            apiKey: summaryApiKey,
-            workspaceDir,
-            prTitle,
-            prBody,
-            prAuthor,
-            prAuthorGreetingName: resolvedPrAuthorGreetingName,
-            excludePrAuthorFromSummary,
-            findings,
-            reviewObservations,
-        });
-    const summary = preferredSummaryText ||
-        synthesizedSummary ||
-        buildFallbackSummary({
-            prTitle,
-            findings,
-            prAuthor,
-            prAuthorGreetingName: resolvedPrAuthorGreetingName,
-            excludePrAuthorFromSummary,
-        });
-    return {
-        summary: hasPreferredSummary
-            ? withReviewSummaryGreeting(summary, prAuthor, resolvedPrAuthorGreetingName, excludePrAuthorFromSummary)
-            : summary,
-        comments,
-        findings: buildReviewOutputFindings({
-            inlineFindings: commentsSource,
-            lineLookup,
-        }),
-    };
-}

package/sandbox/dist/tasks/review/local.js

@@ -1,24 +1,9 @@
-import { getLocalCustomPrompt, getLocalRepoConfig, parseCouncilModelsEnabled, resolveReviewEngine, } from 'doistbot-repo-config';
+import { parseReviewModelsEnabled } from 'doistbot-repo-config';
 import { logger, withInfoLogsSuppressed, withLogsSuppressed } from '../../core/logging.js';
 import {} from './diff.js';
 import { createGitRunner, getLocalReviewFiles, resolveLocalAuthor, resolveRepositoryMetadata, tryGit, } from './local-git.js';
-import { loadDefaultReviewPromptTemplate } from './prompt.js';
 import { runSharedReview } from './runner.js';
 const LOCAL_REVIEW_PR_NUMBER = 0;
-function resolveLocalPromptTemplate(workspaceDir, promptFile) {
-    if (promptFile) {
-        const customPrompt = getLocalCustomPrompt({
-            workspaceDir,
-            path: promptFile,
-            logger,
-        });
-        if (customPrompt) {
-            return customPrompt;
-        }
-        logger.info('Local custom prompt not found, using default', { path: promptFile });
-    }
-    return loadDefaultReviewPromptTemplate();
-}
 export async function runLocalReview(input) {
     if (input.suppressLogs === true) {
         return await withLogsSuppressed(['info', 'warn', 'error'], async () => await runLocalReviewWithLogging(input));
@@ -41,13 +26,6 @@ async function runLocalReviewWithLogging(input) {
         source: input.source,
     });
     input.onProgress?.({ type: 'local_files_resolved', fileCount: files.length });
-    const repoConfig = getLocalRepoConfig({ workspaceDir: input.workspaceDir, logger });
-    const reviewEngine = resolveReviewEngine({
-        configuredEngine: repoConfig?.review?.engine,
-        envEngine: process.env.REVIEW_ENGINE,
-        logger,
-        repository: `${owner}/${repo}`,
-    });
     const reviewResult = await runSharedReview({
         owner,
         repo,
@@ -58,13 +36,10 @@ async function runLocalReviewWithLogging(input) {
         prBody: 'Local self-review before opening a pull request.',
         prAuthor: author,
         files,
-        reviewEngine,
-        promptTemplate: reviewEngine === 'council'
-            ? resolveLocalPromptTemplate(input.workspaceDir, repoConfig?.review?.prompt_file)
-            : undefined,
         apiKeys: input.apiKeys,
-        councilEnabled: repoConfig?.review?.council?.enabled !== false,
-        councilModelsEnabled: parseCouncilModelsEnabled(process.env.COUNCIL_MODELS_ENABLED),
+        reviewModelsEnabled: parseReviewModelsEnabled(process.env.REVIEW_MODELS_ENABLED, {
+            requiredModels: [],
+        }),
         lowPriorityFindingPlacement: 'inline',
         workspaceDir: input.workspaceDir,
         onProgress: input.onProgress,

package/sandbox/dist/tasks/review/prompt.js

@@ -1,13 +1,10 @@
 import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
-import { getCustomPrompt } from 'doistbot-repo-config';
 import { logger } from '../../core/logging.js';
-import { fillPromptTemplate, loadPromptTemplateFile } from '../../core/prompt-template.js';
 const MAX_BODY_CHARS = 4000;
 let cachedStandardsSection = null;
 const REVIEW_TASK_DIR = path.dirname(fileURLToPath(import.meta.url));
-const PROMPT_FILE = path.resolve(REVIEW_TASK_DIR, '../../../review-prompt.md');
 const STANDARDS_PROMPTS_DIR = path.resolve(REVIEW_TASK_DIR, '../../../src/review/prompts');
 function loadOutlineMap() {
     try {
@@ -51,29 +48,6 @@ export function loadStandardsSection() {
         return '';
     }
 }
-export async function resolvePromptTemplate({ octokit, owner, repo, promptFile, }) {
-    if (promptFile) {
-        const customPrompt = await getCustomPrompt({
-            octokit,
-            owner,
-            repo,
-            path: promptFile,
-            logger,
-        });
-        if (customPrompt) {
-            logger.info('Using custom prompt file', { path: promptFile });
-            return customPrompt;
-        }
-        logger.info('Custom prompt not found, using default', { path: promptFile });
-    }
-    return loadDefaultReviewPromptTemplate();
-}
-export function loadDefaultReviewPromptTemplate() {
-    return loadPromptTemplateFile({
-        fileName: PROMPT_FILE,
-        promptLabel: 'review',
-    });
-}
 function formatPrConversation(prConversation) {
     const promptText = prConversation?.promptText.trim();
     if (promptText) {
@@ -89,38 +63,17 @@ export function buildReviewPromptVariables({ repoOwner, repoName, prNumber, prTi
     const condensedBody = safeBody
         ? safeBody.slice(0, MAX_BODY_CHARS)
         : 'No PR description was provided.';
-    const conversation = formatPrConversation(prConversation);
-    const repoFull = `${repoOwner}/${repoName}`;
     const fullDiffSection = diffSection + (truncated ? '\n[Diff was truncated to fit token limits]' : '');
     return {
-        REPO_FULL: repoFull,
+        REPO_FULL: `${repoOwner}/${repoName}`,
         PR_NUMBER: String(prNumber),
         PR_TITLE: prTitle || 'Untitled',
         PR_AUTHOR: prAuthor,
         BASE_REF: baseRef,
         HEAD_REF: headRef,
         PR_BODY: condensedBody,
-        PR_CONVERSATION: conversation,
+        PR_CONVERSATION: formatPrConversation(prConversation),
         DIFF_SECTION: fullDiffSection,
         STANDARDS_SECTION: standardsSection,
     };
 }
-/**
- * Builds the final prompt sent to the review summary model, combining metadata, description, and annotated diff.
- */
-export function buildPrompt({ promptTemplate, repoOwner, repoName, prNumber, prTitle, prBody, prConversation, prAuthor, baseRef, headRef, diffSection, truncated, standardsSection, }) {
-    return fillPromptTemplate(promptTemplate, buildReviewPromptVariables({
-        repoOwner,
-        repoName,
-        prNumber,
-        prTitle,
-        prBody,
-        prConversation,
-        prAuthor,
-        baseRef,
-        headRef,
-        diffSection,
-        truncated,
-        standardsSection,
-    }));
-}

package/sandbox/dist/tasks/review/review-summary.js

@@ -0,0 +1,82 @@
+import { logger } from '../../core/logging.js';
+import { requestReviewSummary } from './summary-model.js';
+export const MAX_SUMMARY_BODY_CHARS = 2000;
+const MAX_REVIEW_OBSERVATION_CHARS = 500;
+export function buildReviewSummaryPrompt({ prTitle, prBody, findings, reviewObservations = [], }) {
+    const safeTitle = prTitle.trim() || 'Untitled';
+    const safeBody = prBody.trim();
+    const condensedBody = safeBody
+        ? safeBody.slice(0, MAX_SUMMARY_BODY_CHARS)
+        : 'No PR description was provided.';
+    const findingsBlock = findings.length > 0
+        ? findings
+            .map((finding) => `<review-finding>\n${finding.trim()}\n</review-finding>`)
+            .join('\n\n')
+        : 'No issues were flagged in the inline comments.';
+    const observationsBlock = reviewObservations.length > 0
+        ? reviewObservations
+            .map((observation) => observation.trim())
+            .filter(Boolean)
+            .slice(0, 8)
+            .map((observation) => `<review-observation>\n${observation.slice(0, MAX_REVIEW_OBSERVATION_CHARS)}\n</review-observation>`)
+            .join('\n\n') || 'No additional review observations were captured.'
+        : 'No additional review observations were captured.';
+    return `You are an expert code review summarizer for the Doist engineering team.
+
+<pr_title>
+${safeTitle}
+</pr_title>
+
+<pr_description>
+${condensedBody}
+</pr_description>
+
+<review_findings>
+${findingsBlock}
+</review_findings>
+
+<review_observations>
+${observationsBlock}
+</review_observations>
+
+Write the complete GitHub review summary body. Synthesize the findings into grouped themes—do not mirror every inline comment one-for-one or reference the reviewers, models, focus passes, or review observations. Use review observations only as context for the overview. Do not mention issues not present in the <review-finding> blocks. If there are no <review-finding> blocks, state that no issues were flagged.
+
+Structure:
+- Start with one short sentence giving a concise overview of what changed.
+- If issues exist, add a blank line, then the exact heading "Few things worth tightening:", then 1-4 concise bullets grouping what to improve.
+- If no issues exist, do not add a heading or bullets.
+
+Keep it human and compact: the opener should be 1 sentence, or 2 only if the PR is large and the second sentence adds useful context. Use a kind, warm, and supportive tone while staying concrete, constructive, and pragmatic. Avoid generic praise or flattery. Bullets should be short fragments or single sentences, not paragraphs. Do not include any <review-finding> or <review-observation> tags in the output.
+
+Respond with only valid JSON in this exact shape:
+{"summary":"<your summary>","comments":[]}`;
+}
+export async function summarizeReviewFindings({ credential, prTitle, prBody, findings, reviewObservations, workspaceDir, requestReview = requestReviewSummary, }) {
+    const prompt = buildReviewSummaryPrompt({
+        prTitle,
+        prBody,
+        findings,
+        reviewObservations,
+    });
+    logger.info('Summarizing review findings with the review summary model', {
+        findingsCount: findings.length,
+        reviewObservationsCount: reviewObservations?.length ?? 0,
+    });
+    const result = await requestReview({ credential, prompt, workspaceDir });
+    const summary = result?.summary?.trim() ?? '';
+    if (!summary) {
+        logger.warn('Review summary model returned an empty summary', {
+            findingsCount: findings.length,
+        });
+        return null;
+    }
+    return summary;
+}
+export function buildFallbackSummary({ prTitle, findings, }) {
+    const safeTitle = prTitle.trim();
+    const base = safeTitle ? `This PR updates ${safeTitle}.` : 'This PR updates the codebase.';
+    if (findings.length === 0) {
+        return `${base} No issues were flagged in the reviewed diff.`;
+    }
+    return `${base}\n\nFew things worth tightening:\n- See the inline comments for the issues found in the review.`;
+}

package/sandbox/dist/tasks/review/review.js

@@ -1,27 +1,22 @@
 import { performance } from 'node:perf_hooks';
-import { parseCouncilModelsEnabled as parseConfiguredCouncilModelsEnabled } from 'doistbot-repo-config';
+import { parseReviewModelsEnabled as parseConfiguredReviewModelsEnabled } from 'doistbot-repo-config';
 import { recordTaskMetrics } from '../../core/datadog-metrics.js';
 import { logger } from '../../core/logging.js';
+import { createOpenRouterCredential } from '../../providers/credentials.js';
 import { cloneRepository, createGitHubClients, parseBaseContext, requiredEnv, WORKSPACE_DIR, } from '../../core/shared.js';
-import { resolvePrAuthorGreetingName, shouldExcludePrAuthorFromReviewSummary, } from './author-profile.js';
 import { getReviewCheckRunTitle, isAnotherReviewInProgress, postReviewFailureCheckRun, postReviewInProgressCheckRun, postReviewSuccessCheckRun, postStaleReviewPointerIfHeadMoved, } from './check-run.js';
 import { fetchReviewConversationContext } from './conversation-context.js';
 import {} from './diff.js';
 import { formatReviewForTerminal } from './format.js';
 import { formatGithubReviewComments } from './github-comment-format.js';
-import { resolvePromptTemplate } from './prompt.js';
-import { parseReviewEngine } from './review-engine.js';
 import { appendReviewFeedbackLink } from './review-feedback.js';
 import { runSharedReview } from './runner.js';
 const REVIEW_EVENT = 'COMMENT';
-function parseCouncilEnabled() {
-    // Council is enabled by default unless explicitly disabled
-    return process.env.COUNCIL_ENABLED?.toLowerCase() !== 'false';
-}
-function parseCouncilModelsEnabled() {
+const REQUIRED_PRODUCTION_REVIEW_MODELS = ['gemini', 'openai'];
+function parseReviewModelsEnabled() {
     // Parsed/defaulted in webhook-handler before being passed as task env.
-    const raw = process.env.COUNCIL_MODELS_ENABLED;
-    return parseConfiguredCouncilModelsEnabled(raw, { defaultModels: [] });
+    const raw = process.env.REVIEW_MODELS_ENABLED;
+    return parseConfiguredReviewModelsEnabled(raw, { defaultModels: [] });
 }
 function optionalEnv(name) {
     const value = process.env[name]?.trim();
@@ -29,33 +24,25 @@ function optionalEnv(name) {
 }
 function parseContext() {
     const base = parseBaseContext();
-    const requestedReviewEngine = parseReviewEngine(process.env.REVIEW_ENGINE);
     return {
         ...base,
         branch: requiredEnv('BRANCH'),
         baseBranch: requiredEnv('BASE_BRANCH'),
         headSha: optionalEnv('HEAD_SHA'),
-        geminiApiKey: optionalEnv('GEMINI_API_KEY'),
+        openRouterApiKey: optionalEnv('OPENROUTER_API_KEY'),
         openaiApiKey: optionalEnv('OPENAI_KEY'),
-        anthropicApiKey: optionalEnv('ANTHROPIC_KEY'),
-        requestedReviewEngine,
-        reviewEngine: requestedReviewEngine,
-        councilEnabled: parseCouncilEnabled(),
-        councilModelsEnabled: parseCouncilModelsEnabled(),
+        reviewModelsEnabled: parseReviewModelsEnabled(),
         dryRun: process.env.DRY_RUN?.toLowerCase() === 'true',
     };
 }
 function getConversationSummaryApiKeys(ctx) {
     const apiKeys = {};
-    if (ctx.councilModelsEnabled.includes('gemini') && ctx.geminiApiKey) {
-        apiKeys.gemini = ctx.geminiApiKey;
+    if (ctx.reviewModelsEnabled.includes('gemini') && ctx.openRouterApiKey) {
+        apiKeys.gemini = createOpenRouterCredential(ctx.openRouterApiKey);
     }
-    if (ctx.councilModelsEnabled.includes('openai') && ctx.openaiApiKey) {
+    if (ctx.reviewModelsEnabled.includes('openai') && ctx.openaiApiKey) {
         apiKeys.openai = ctx.openaiApiKey;
     }
-    if (ctx.councilModelsEnabled.includes('anthropic') && ctx.anthropicApiKey) {
-        apiKeys.anthropic = ctx.anthropicApiKey;
-    }
     return apiKeys;
 }
 async function main() {
@@ -69,17 +56,8 @@ async function main() {
     logger.setBaseContext(logContext);
     logger.info('Review task started', {
         dryRun: ctx.dryRun,
-        requestedReviewEngine: ctx.requestedReviewEngine,
-        reviewEngine: ctx.reviewEngine,
-        councilEnabled: ctx.councilEnabled,
-        councilModelsEnabled: ctx.councilModelsEnabled,
+        reviewModelsEnabled: ctx.reviewModelsEnabled,
     });
-    if (ctx.requestedReviewEngine !== ctx.reviewEngine) {
-        logger.warn('Requested review engine is not implemented yet, falling back', {
-            requestedReviewEngine: ctx.requestedReviewEngine,
-            effectiveReviewEngine: ctx.reviewEngine,
-        });
-    }
     const { app, readOctokit, writeOctokit } = await createGitHubClients(ctx);
     // GitHub's Check Runs API requires App-installation auth; calling it with
     // writeOctokit (the doistbot PAT) returns 403. Centralize the choice here
@@ -193,7 +171,6 @@ async function main() {
         ]);
         const pr = prResponse.data;
         const prAuthor = pr.user?.login ?? 'unknown';
-        const excludePrAuthorFromSummary = shouldExcludePrAuthorFromReviewSummary(prAuthor);
         function loadPrConversation() {
             return fetchReviewConversationContext({
                 octokit: readOctokit,
@@ -205,14 +182,14 @@ async function main() {
                 workspaceDir: WORKSPACE_DIR,
             });
         }
-        const promptTemplate = ctx.reviewEngine === 'council'
-            ? await resolvePromptTemplate({
-                octokit: readOctokit,
-                owner: ctx.owner,
-                repo: ctx.repo,
-            })
-            : undefined;
-        reviewMetricModels = [...ctx.councilModelsEnabled];
+        reviewMetricModels = [...ctx.reviewModelsEnabled];
+        const reviewApiKeys = {};
+        if (ctx.openRouterApiKey) {
+            reviewApiKeys.gemini = createOpenRouterCredential(ctx.openRouterApiKey);
+        }
+        if (ctx.openaiApiKey) {
+            reviewApiKeys.openai = ctx.openaiApiKey;
+        }
         const reviewResult = await runSharedReview({
             owner: ctx.owner,
             repo: ctx.repo,
@@ -223,21 +200,10 @@ async function main() {
             prBody: pr.body ?? '',
             loadPrConversation,
             prAuthor,
-            resolvePrAuthorGreetingName: () => resolvePrAuthorGreetingName({
-                octokit: readOctokit,
-                login: prAuthor,
-            }),
-            excludePrAuthorFromSummary,
             files: files,
-            reviewEngine: ctx.reviewEngine,
-            promptTemplate,
-            apiKeys: {
-                gemini: ctx.geminiApiKey,
-                openai: ctx.openaiApiKey,
-                anthropic: ctx.anthropicApiKey,
-            },
-            councilEnabled: ctx.councilEnabled,
-            councilModelsEnabled: ctx.councilModelsEnabled,
+            apiKeys: reviewApiKeys,
+            reviewModelsEnabled: ctx.reviewModelsEnabled,
+            requiredReviewModels: REQUIRED_PRODUCTION_REVIEW_MODELS,
             workspaceDir: WORKSPACE_DIR,
         });
         reviewMetricModels = reviewResult.metricModels;