@doist/doistbot-cli 1.0.4 → 1.0.6

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,120 @@
+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, provider = 'zai', modelName, fallbackModels = [], 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 summaryModels = [
+        {
+            provider,
+            credential,
+            ...(modelName ? { modelName } : {}),
+        },
+        ...fallbackModels,
+    ];
+    for (const [index, summaryModel] of summaryModels.entries()) {
+        const result = await requestReview({
+            credential: summaryModel.credential,
+            provider: summaryModel.provider,
+            ...(summaryModel.modelName ? { modelName: summaryModel.modelName } : {}),
+            prompt,
+            workspaceDir,
+        });
+        if (result.status === 'failed') {
+            logger.warn('Review summary synthesis failed', {
+                findingsCount: findings.length,
+                reviewObservationsCount: reviewObservations?.length ?? 0,
+                failureReason: result.reason,
+                provider: summaryModel.provider,
+                ...(summaryModel.modelName ? { modelName: summaryModel.modelName } : {}),
+                attempt: index + 1,
+                attemptsTotal: summaryModels.length,
+                ...(result.error ? { error: result.error } : {}),
+                ...(result.timedOut !== undefined ? { timedOut: result.timedOut } : {}),
+                ...(result.durationMs !== undefined ? { durationMs: result.durationMs } : {}),
+                ...(result.outputChars !== undefined ? { outputChars: result.outputChars } : {}),
+            });
+            continue;
+        }
+        const summary = result.summary.trim();
+        logger.info('Review summary synthesis succeeded', {
+            findingsCount: findings.length,
+            reviewObservationsCount: reviewObservations?.length ?? 0,
+            provider: summaryModel.provider,
+            ...(summaryModel.modelName ? { modelName: summaryModel.modelName } : {}),
+            attempt: index + 1,
+            attemptsTotal: summaryModels.length,
+            durationMs: result.durationMs,
+            outputChars: result.outputChars,
+            summaryChars: summary.length,
+        });
+        return summary;
+    }
+    return null;
+}
+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,61 +1,54 @@
 import { performance } from 'node:perf_hooks';
-import { parseCouncilModelsEnabled as parseConfiguredCouncilModelsEnabled } from 'doistbot-repo-config';
+import { getDefaultReviewModels } from 'doistbot-repo-config';
 import { recordTaskMetrics } from '../../core/datadog-metrics.js';
 import { logger } from '../../core/logging.js';
 import { cloneRepository, createGitHubClients, parseBaseContext, requiredEnv, WORKSPACE_DIR, } from '../../core/shared.js';
-import { resolvePrAuthorGreetingName, shouldExcludePrAuthorFromReviewSummary, } from './author-profile.js';
+import { createOpenRouterCredential } from '../../providers/credentials.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 { formatGithubReviewComments, formatGithubReviewSummary } from './github-comment-format.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() {
-    // Parsed/defaulted in webhook-handler before being passed as task env.
-    const raw = process.env.COUNCIL_MODELS_ENABLED;
-    return parseConfiguredCouncilModelsEnabled(raw, { defaultModels: [] });
-}
+const REQUIRED_PRODUCTION_REVIEW_MODELS = getDefaultReviewModels();
 function optionalEnv(name) {
     const value = process.env[name]?.trim();
     return value ? value : undefined;
 }
 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: [...REQUIRED_PRODUCTION_REVIEW_MODELS],
+        reviewDispatchLockAcquired: process.env.REVIEW_DISPATCH_LOCK_ACQUIRED === 'true',
+        reviewDispatchLockCheckRunId: optionalNumberEnv('REVIEW_DISPATCH_LOCK_CHECK_RUN_ID'),
         dryRun: process.env.DRY_RUN?.toLowerCase() === 'true',
     };
 }
+function optionalNumberEnv(name) {
+    const value = optionalEnv(name);
+    if (value === undefined) {
+        return undefined;
+    }
+    const parsed = Number(value);
+    return Number.isFinite(parsed) ? parsed : undefined;
+}
 function getConversationSummaryApiKeys(ctx) {
     const apiKeys = {};
-    if (ctx.councilModelsEnabled.includes('gemini') && ctx.geminiApiKey) {
+    if (ctx.reviewModelsEnabled.includes('gemini') && ctx.geminiApiKey) {
         apiKeys.gemini = ctx.geminiApiKey;
     }
-    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 +62,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
@@ -102,6 +86,7 @@ async function main() {
             sha: ctx.headSha,
             pullNumber: ctx.prNumber,
             deliveryId: ctx.deliveryId,
+            checkRunId: ctx.reviewDispatchLockCheckRunId,
         };
         if (input.conclusion === 'success') {
             await postReviewSuccessCheckRun({ ...baseArgs, review: input.review });
@@ -141,16 +126,18 @@ async function main() {
             // There's also a small TOCTOU window between this check and the
             // in_progress post — same race the prior comment-based lock had,
             // and same bound (one duplicate review when it fires).
-            const otherInProgress = await isAnotherReviewInProgress({
-                octokit: checkRunOctokit,
-                owner: ctx.owner,
-                repo: ctx.repo,
-                sha: ctx.headSha,
-                deliveryId: ctx.deliveryId,
-            });
-            if (otherInProgress) {
-                logger.info('Another review is already in progress on this SHA, skipping');
-                return;
+            if (!ctx.reviewDispatchLockAcquired) {
+                const otherInProgress = await isAnotherReviewInProgress({
+                    octokit: checkRunOctokit,
+                    owner: ctx.owner,
+                    repo: ctx.repo,
+                    sha: ctx.headSha,
+                    deliveryId: ctx.deliveryId,
+                });
+                if (otherInProgress) {
+                    logger.info('Another review is already in progress on this SHA, skipping');
+                    return;
+                }
             }
             await postReviewInProgressCheckRun({
                 octokit: checkRunOctokit,
@@ -159,6 +146,7 @@ async function main() {
                 sha: ctx.headSha,
                 pullNumber: ctx.prNumber,
                 deliveryId: ctx.deliveryId,
+                checkRunId: ctx.reviewDispatchLockCheckRunId,
             });
         }
         else if (ctx.dryRun) {
@@ -193,7 +181,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 +192,18 @@ 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.geminiApiKey) {
+            reviewApiKeys.gemini = ctx.geminiApiKey;
+        }
+        if (ctx.openRouterApiKey) {
+            reviewApiKeys.deepseek = createOpenRouterCredential(ctx.openRouterApiKey);
+            reviewApiKeys.zai = createOpenRouterCredential(ctx.openRouterApiKey);
+        }
+        if (ctx.openaiApiKey) {
+            reviewApiKeys.openai = ctx.openaiApiKey;
+        }
         const reviewResult = await runSharedReview({
             owner: ctx.owner,
             repo: ctx.repo,
@@ -223,21 +214,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;
@@ -306,7 +286,7 @@ async function submitReview({ octokit, owner, repo, pull_number, deliveryId, rev
         event: REVIEW_EVENT,
     };
     if (review.summary?.length) {
-        const summaryWithFeedbackLink = appendReviewFeedbackLink(review.summary, {
+        const summaryWithFeedbackLink = appendReviewFeedbackLink(formatGithubReviewSummary(review.summary), {
             owner,
             repo,
             prNumber: pull_number,

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

@@ -1,12 +1,15 @@
+import { createHash } from 'crypto';
 import fs from 'fs';
 import { logger } from '../../core/logging.js';
-import { getReviewEngineRunner } from './engines/index.js';
+import { hasReviewProviderCredential } from '../../providers/credentials.js';
+import { runMultiFocusReviewEngine } from './engines/multi-focus.js';
 import {} from './engines/types.js';
 import { buildAnnotatedDiff, buildDiffSection } from './diff.js';
 import { buildMultiFocusSharedPrompt } from './multi-focus-prompt.js';
-import { buildPrompt, loadStandardsSection } from './prompt.js';
+import { loadStandardsSection } from './prompt.js';
 const REVIEW_GUIDANCE_FILES = ['AGENTS.md', 'CLAUDE.md', 'GEMINI.md'];
 const MASKED_PR_AUTHOR_LABEL = 'PR author';
+const OPENROUTER_SESSION_REPO_SEGMENT_MAX_LENGTH = 96;
 function getGuidanceFilePresence(workspaceDir) {
     return Object.fromEntries(REVIEW_GUIDANCE_FILES.map((fileName) => [
         fileName,
@@ -42,25 +45,29 @@ function buildEnginePrompt({ input, diffSection, truncated, standardsSection, pr
         truncated,
         standardsSection,
     };
-    if (input.reviewEngine === 'council') {
-        const promptTemplate = input.promptTemplate;
-        if (!promptTemplate) {
-            throw new Error('Council review requires a prompt template');
-        }
-        return {
-            prompt: buildPrompt({
-                promptTemplate,
-                ...sharedPromptArgs,
-            }),
-            promptTemplateLength: promptTemplate.length,
-        };
-    }
     return {
         prompt: buildMultiFocusSharedPrompt(sharedPromptArgs),
     };
 }
-function getEnabledReviewModels({ apiKeys, councilModelsEnabled, }) {
-    return councilModelsEnabled.filter((model) => apiKeys[model]);
+function getEnabledReviewModels({ apiKeys, reviewModelsEnabled, }) {
+    return reviewModelsEnabled.filter((model) => hasReviewProviderCredential(apiKeys[model]));
+}
+function getMissingRequiredReviewModels(availableModels, requiredReviewModels = []) {
+    return requiredReviewModels.filter((model) => !availableModels.includes(model));
+}
+function toOpenRouterSessionSegment(value, fallback) {
+    const normalized = value
+        .trim()
+        .toLowerCase()
+        .replace(/[^a-z0-9._-]+/g, '-')
+        .replace(/^-+|-+$/g, '')
+        .slice(0, OPENROUTER_SESSION_REPO_SEGMENT_MAX_LENGTH);
+    return normalized || fallback;
+}
+export function buildOpenRouterReviewSessionId({ owner, repo, prNumber, prompt, }) {
+    const repoSegment = toOpenRouterSessionSegment(`${owner}-${repo}`, 'repo');
+    const promptHash = createHash('sha256').update(prompt).digest('hex').slice(0, 32);
+    return `doistbot-review-${repoSegment}-pr-${prNumber}-${promptHash}`;
 }
 export async function runSharedReview(input) {
     const { annotatedFiles, lineLookup } = buildAnnotatedDiff(input.files);
@@ -85,35 +92,40 @@ export async function runSharedReview(input) {
             providerFailures: [],
         };
     }
-    if (getEnabledReviewModels(input).length === 0) {
+    const configuredAvailableModels = getEnabledReviewModels(input);
+    if (configuredAvailableModels.length === 0) {
         logger.error('No enabled review models with API keys are available, skipping review', {
-            review_engine: input.reviewEngine,
-            council_models_enabled: input.councilModelsEnabled,
+            review_models_enabled: input.reviewModelsEnabled,
         });
         return {
             status: 'skipped',
             reason: 'no_models',
             availableModels: [],
-            metricModels: [...input.councilModelsEnabled],
-            mode: input.reviewEngine === 'multi_focus' ? 'multi_focus' : 'single',
+            metricModels: [...input.reviewModelsEnabled],
+            mode: 'multi_focus',
             providerFailures: [],
         };
     }
-    const unresolvedPrAuthorGreetingNamePromise = input.excludePrAuthorFromSummary === true
-        ? undefined
-        : input.prAuthorGreetingName != null
-            ? Promise.resolve(input.prAuthorGreetingName)
-            : input.resolvePrAuthorGreetingName?.();
-    const prAuthorGreetingNamePromise = unresolvedPrAuthorGreetingNamePromise?.catch((error) => {
-        logger.warn('Failed to resolve PR author greeting name for review summary', {
-            error: error instanceof Error ? error.message : String(error),
+    const missingRequiredModels = getMissingRequiredReviewModels(configuredAvailableModels, input.requiredReviewModels);
+    if (missingRequiredModels.length > 0) {
+        logger.error('Required review models with API keys are unavailable, skipping review', {
+            review_models_enabled: input.reviewModelsEnabled,
+            available_models: configuredAvailableModels,
+            missing_required_models: missingRequiredModels,
         });
-        return undefined;
-    });
+        return {
+            status: 'skipped',
+            reason: 'no_models',
+            availableModels: configuredAvailableModels,
+            metricModels: [...input.reviewModelsEnabled],
+            mode: 'multi_focus',
+            providerFailures: [],
+        };
+    }
     const prConversationPromise = input.loadPrConversation?.() ?? Promise.resolve(undefined);
     const prConversation = maskPrAuthorInConversation(await prConversationPromise, input.prAuthor);
     const standardsSection = loadStandardsSection();
-    const { prompt, promptTemplateLength } = buildEnginePrompt({
+    const { prompt } = buildEnginePrompt({
         input,
         diffSection,
         truncated,
@@ -121,9 +133,8 @@ export async function runSharedReview(input) {
         prConversation,
     });
     logger.info('Review prompt prepared', {
-        engine: input.reviewEngine,
+        engine: 'multi_focus',
         prompt_length: prompt.length,
-        prompt_template_length: promptTemplateLength,
         pr_body_length: input.prBody.trim().slice(0, 4000).length,
         pr_conversation_length: prConversation?.promptText.trim().length ?? 0,
         diff_length: diffSection.length,
@@ -134,39 +145,33 @@ export async function runSharedReview(input) {
         guidance_files: getGuidanceFilePresence(input.workspaceDir),
     });
     input.onProgress?.({ type: 'prompt_prepared', fileCount: annotatedFiles.length });
-    const runReviewEngine = getReviewEngineRunner(input.reviewEngine);
     const engineContext = {
         owner: input.owner,
         repo: input.repo,
         prNumber: input.prNumber,
         workspaceDir: input.workspaceDir,
-        geminiApiKey: input.apiKeys.gemini,
-        openaiApiKey: input.apiKeys.openai,
-        anthropicApiKey: input.apiKeys.anthropic,
-        reviewEngine: input.reviewEngine,
-        councilEnabled: input.councilEnabled,
-        councilModelsEnabled: input.councilModelsEnabled,
+        apiKeys: input.apiKeys,
+        reviewModelsEnabled: input.reviewModelsEnabled,
+        openRouterSessionId: buildOpenRouterReviewSessionId({
+            owner: input.owner,
+            repo: input.repo,
+            prNumber: input.prNumber,
+            prompt,
+        }),
     };
-    const { review, availableModels, metricModels, mode, providerFailures } = await runReviewEngine({
+    const { review, availableModels, metricModels, mode, providerFailures } = await runMultiFocusReviewEngine({
         ctx: engineContext,
         prompt,
         standardsSection,
         lineLookup,
         prTitle: input.prTitle,
         prBody: input.prBody,
-        prAuthor: input.prAuthor,
-        prAuthorGreetingName: input.prAuthorGreetingName,
-        resolvePrAuthorGreetingName: prAuthorGreetingNamePromise
-            ? () => prAuthorGreetingNamePromise
-            : undefined,
-        excludePrAuthorFromSummary: input.excludePrAuthorFromSummary,
         lowPriorityFindingPlacement: input.lowPriorityFindingPlacement,
         onProgress: input.onProgress,
     });
     if (availableModels.length === 0) {
         logger.error('No enabled review models with API keys are available, skipping review', {
-            review_engine: input.reviewEngine,
-            council_models_enabled: input.councilModelsEnabled,
+            review_models_enabled: input.reviewModelsEnabled,
         });
         return {
             status: 'skipped',
@@ -200,7 +205,7 @@ export async function runSharedReview(input) {
         };
     }
     logger.info('Review completed', {
-        engine: input.reviewEngine,
+        engine: 'multi_focus',
         mode,
         comments_count: review.comments.length,
     });