@doist/doistbot-cli 1.0.1 → 1.0.3

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

@@ -1,8 +1,104 @@
 import { logger } from '../../../core/logging.js';
+import { formatPrAuthorForGreeting, normalizePrAuthor } from '../author-format.js';
 import { requestReviewSummary } from '../summary-model.js';
 export const MAX_SUMMARY_BODY_CHARS = 2000;
-export function buildCouncilSummaryPrompt({ prTitle, prBody, findings, }) {
+const MAX_REVIEW_OBSERVATION_CHARS = 500;
+const REVIEW_SUMMARY_EMOJIS = ['😊', '😇', '🤗', '😄 🙌', '😎 👊'];
+const REVIEW_AUTHOR_PLACEHOLDER = 'PR_AUTHOR';
+const GENERIC_REVIEW_SUMMARY_GREETING = 'Thanks for your contribution.';
+function pickSummaryEmoji(prAuthor, seedContext) {
+    const normalizedAuthor = normalizePrAuthor(prAuthor);
+    const normalizedContext = seedContext?.trim();
+    const seed = [normalizedAuthor || 'doistbot-review', normalizedContext]
+        .filter(Boolean)
+        .join(':');
+    const hash = Array.from(seed).reduce((acc, char) => acc + char.charCodeAt(0), 0);
+    return REVIEW_SUMMARY_EMOJIS[hash % REVIEW_SUMMARY_EMOJIS.length];
+}
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+function resolveAuthorGreetingName(prAuthor, prAuthorGreetingName) {
+    return formatPrAuthorForGreeting(prAuthorGreetingName) ?? formatPrAuthorForGreeting(prAuthor);
+}
+export function buildReviewSummaryGreeting(prAuthor, seedContext, prAuthorGreetingName, excludePrAuthorFromSummary = false) {
+    if (excludePrAuthorFromSummary) {
+        return '';
+    }
+    const authorForGreeting = resolveAuthorGreetingName(prAuthor, prAuthorGreetingName);
+    const emoji = pickSummaryEmoji(prAuthor, seedContext);
+    if (!authorForGreeting) {
+        return `Thanks for your contribution ${emoji}.`;
+    }
+    return `Thanks ${authorForGreeting} for your contribution ${emoji}.`;
+}
+export function withReviewSummaryGreeting(summary, prAuthor, prAuthorGreetingName, excludePrAuthorFromSummary = false) {
+    const trimmedSummary = summary.trim();
+    if (excludePrAuthorFromSummary) {
+        return trimmedSummary;
+    }
+    const greeting = buildReviewSummaryGreeting(prAuthor, trimmedSummary, prAuthorGreetingName, excludePrAuthorFromSummary);
+    return trimmedSummary ? `${greeting} ${trimmedSummary}` : greeting;
+}
+function splitOpeningLine(summary) {
+    const firstLineBreak = summary.indexOf('\n');
+    if (firstLineBreak === -1) {
+        return { openingLine: summary, remainingText: '' };
+    }
+    return {
+        openingLine: summary.slice(0, firstLineBreak),
+        remainingText: summary.slice(firstLineBreak),
+    };
+}
+function normalizeSummarySpacing(summary) {
+    return summary
+        .replace(/[ \t]{2,}/g, ' ')
+        .replace(/\s+([.!?,;:])/g, '$1')
+        .trimEnd();
+}
+function replaceUnsafeAuthorPlaceholder(summary) {
+    const placeholderPattern = escapeRegExp(REVIEW_AUTHOR_PLACEHOLDER);
+    const genericGreeting = GENERIC_REVIEW_SUMMARY_GREETING.replace(/[.!?]+$/, '');
+    return normalizeSummarySpacing(summary
+        .replace(new RegExp(`\\bThanks\\s+${placeholderPattern}(?=\\s+for\\b)`, 'g'), 'Thanks')
+        .replace(new RegExp(`\\bThanks\\s+${placeholderPattern}(?=[.!?])`, 'g'), genericGreeting)
+        .replace(new RegExp(`\\bThank you\\s+${placeholderPattern}(?=\\s+for\\b)`, 'g'), 'Thank you')
+        .replace(new RegExp(`\\bThank you\\s+${placeholderPattern}(?=[.!?])`, 'g'), 'Thank you for your contribution')
+        .split(REVIEW_AUTHOR_PLACEHOLDER)
+        .join('the contributor'));
+}
+function replaceAuthorPlaceholders(summary, greetingName) {
+    if (!summary.includes(REVIEW_AUTHOR_PLACEHOLDER)) {
+        return summary;
+    }
+    if (!greetingName) {
+        return replaceUnsafeAuthorPlaceholder(summary);
+    }
+    return summary.split(REVIEW_AUTHOR_PLACEHOLDER).join(greetingName);
+}
+function addEmojiToOpeningSentence(openingLine, emoji) {
+    const sentenceEndMatch = /[.!?](?=\s|$)/.exec(openingLine);
+    if (!sentenceEndMatch) {
+        return `${openingLine} ${emoji}`;
+    }
+    const sentenceEndIndex = sentenceEndMatch.index;
+    return `${openingLine.slice(0, sentenceEndIndex).trimEnd()} ${emoji}${openingLine.slice(sentenceEndIndex)}`;
+}
+export function ensureReviewSummaryApprovedEmoji(summary, prAuthor, prAuthorGreetingName, excludePrAuthorFromSummary = false) {
+    const trimmedSummary = summary.trim();
+    if (!trimmedSummary || excludePrAuthorFromSummary) {
+        return trimmedSummary;
+    }
+    const emoji = pickSummaryEmoji(prAuthor, trimmedSummary);
+    const greetingName = resolveAuthorGreetingName(prAuthor, prAuthorGreetingName);
+    const summaryWithAuthor = replaceAuthorPlaceholders(trimmedSummary, greetingName);
+    const { openingLine: firstLineWithAuthor, remainingText: finalRemainingText } = splitOpeningLine(summaryWithAuthor);
+    const firstLineWithEmoji = addEmojiToOpeningSentence(firstLineWithAuthor, emoji);
+    return firstLineWithEmoji + finalRemainingText;
+}
+export function buildCouncilSummaryPrompt({ prTitle, prBody, findings, excludePrAuthorFromSummary = false, reviewObservations = [], }) {
     const safeTitle = prTitle.trim() || 'Untitled';
+    const safeAuthor = excludePrAuthorFromSummary ? 'unknown' : REVIEW_AUTHOR_PLACEHOLDER;
     const safeBody = prBody.trim();
     const condensedBody = safeBody
         ? safeBody.slice(0, MAX_SUMMARY_BODY_CHARS)
@@ -12,8 +108,24 @@ export function buildCouncilSummaryPrompt({ prTitle, prBody, 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_author>
+${safeAuthor}
+</pr_author>
+
+<pr_author_excluded_from_summary>
+${excludePrAuthorFromSummary ? 'true' : 'false'}
+</pr_author_excluded_from_summary>
+
 <pr_title>
 ${safeTitle}
 </pr_title>
@@ -26,22 +138,39 @@ ${condensedBody}
 ${findingsBlock}
 </review_findings>
 
-Write a single coherent review summary for the PR author. Synthesize the findings into unified prose—do not list them individually or reference the reviewers, models, or any council. Do not mention issues not present in the <review-finding> blocks. If there are no <review-finding> blocks, state that no issues were flagged.
+<review_observations>
+${observationsBlock}
+</review_observations>
+
+Write the complete GitHub review summary body for the PR author. Synthesize the findings into grouped themes—do not mirror every inline comment one-for-one or reference the reviewers, models, council, focus passes, or review observations. Do not mention issues not present in the <review-finding> blocks. If there are no <review-finding> blocks, state that no issues were flagged.
+
+If <pr_author_excluded_from_summary> is "true", do not thank, address, or name the PR author. Otherwise, start with a natural, concise thanks to the author using the literal placeholder ${REVIEW_AUTHOR_PLACEHOLDER}. Do not use a real user name, first name, login, handle, or @ mention. Vary the wording instead of always using the fixed template "Thanks ${REVIEW_AUTHOR_PLACEHOLDER} for your contribution".
+
+Do not include emojis in the summary. The caller will replace ${REVIEW_AUTHOR_PLACEHOLDER} locally and add one approved emoji after the author name for non-excluded PR authors.
 
 Structure:
-- Lead with a concise overview of what changed
-- Follow with one sentence on impact or quality (clarity, correctness, maintainability)
-- If issues exist, end with a neutral sentence summarizing them (no direct asks or blocking language)
+- Start with one short sentence. When the PR author is not excluded, include the thanks and ${REVIEW_AUTHOR_PLACEHOLDER} in that sentence. When the author is excluded, start with 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 to 1-2 sentences for small changes, 3-4 for larger ones. Use a kind, constructive, slightly appreciative tone. Write in flowing prose without headings, bullet points, or multiple paragraphs. Do not include any <review-finding> tags in the output.
+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, constructive, appreciative tone without generic praise. 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 summarizeCouncilReviews({ apiKey, prTitle, prBody, findings, workspaceDir, requestReview = requestReviewSummary, }) {
-    const prompt = buildCouncilSummaryPrompt({ prTitle, prBody, findings });
+export async function summarizeCouncilReviews({ apiKey, prTitle, prBody, findings, prAuthor, prAuthorGreetingName, excludePrAuthorFromSummary, reviewObservations, workspaceDir, requestReview = requestReviewSummary, }) {
+    const prompt = buildCouncilSummaryPrompt({
+        prTitle,
+        prBody,
+        findings,
+        prAuthor,
+        prAuthorGreetingName,
+        excludePrAuthorFromSummary,
+        reviewObservations,
+    });
     logger.info('Summarizing council reviews with the review summary model', {
         findingsCount: findings.length,
+        reviewObservationsCount: reviewObservations?.length ?? 0,
     });
     const result = await requestReview({ apiKey, prompt, workspaceDir });
     const summary = result?.summary?.trim() ?? '';
@@ -51,13 +180,13 @@ export async function summarizeCouncilReviews({ apiKey, prTitle, prBody, finding
         });
         return null;
     }
-    return summary;
+    return ensureReviewSummaryApprovedEmoji(summary, prAuthor, prAuthorGreetingName, excludePrAuthorFromSummary);
 }
-export function buildFallbackSummary({ prTitle, findings, }) {
+export function buildFallbackSummary({ prTitle, findings, prAuthor, prAuthorGreetingName, excludePrAuthorFromSummary, }) {
     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 withReviewSummaryGreeting(`${base} No issues were flagged in the reviewed diff.`, prAuthor, prAuthorGreetingName, excludePrAuthorFromSummary);
     }
-    return `${base} The inline comments cover the issues found in the review.`;
+    return withReviewSummaryGreeting(`${base}\n\nFew things worth tightening:\n- See the inline comments for the issues found in the review.`, prAuthor, prAuthorGreetingName, excludePrAuthorFromSummary);
 }

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

@@ -1,6 +1,6 @@
 import { runCouncilReview } from '../council/orchestrator.js';
 import { buildReviewOutputFromFindings, getApiKeys, getAvailableModels, getProviderFailures, requestModelReview, } from './shared.js';
-async function runSingleModelReview({ prompt, lineLookup, prTitle, prBody, workspaceDir, apiKeys, onProgress, }) {
+async function runSingleModelReview({ prompt, lineLookup, prTitle, prBody, prAuthor, prAuthorGreetingName, resolvePrAuthorGreetingName, excludePrAuthorFromSummary, workspaceDir, apiKeys, onProgress, }) {
     const availableModels = getAvailableModels(apiKeys);
     const model = availableModels[0];
     if (!model) {
@@ -27,6 +27,10 @@ async function runSingleModelReview({ prompt, lineLookup, prTitle, prBody, works
             lineLookup,
             prTitle,
             prBody,
+            prAuthor,
+            prAuthorGreetingName,
+            resolvePrAuthorGreetingName,
+            excludePrAuthorFromSummary,
             summaryApiKey: apiKeys.gemini,
             workspaceDir,
             preferredSummary: reviewResult.summary,
@@ -34,7 +38,7 @@ async function runSingleModelReview({ prompt, lineLookup, prTitle, prBody, works
         providerFailures: [],
     };
 }
-async function runMultiModelReview({ ctx, prompt, lineLookup, prTitle, prBody, apiKeys, onProgress, }) {
+async function runMultiModelReview({ ctx, prompt, lineLookup, prTitle, prBody, prAuthor, prAuthorGreetingName, resolvePrAuthorGreetingName, excludePrAuthorFromSummary, apiKeys, onProgress, }) {
     const result = await runCouncilReview({
         prompt,
         apiKeys,
@@ -52,13 +56,17 @@ async function runMultiModelReview({ ctx, prompt, lineLookup, prTitle, prBody, a
             lineLookup,
             prTitle,
             prBody,
+            prAuthor,
+            prAuthorGreetingName,
+            resolvePrAuthorGreetingName,
+            excludePrAuthorFromSummary,
             summaryApiKey: apiKeys.gemini,
             workspaceDir: ctx.workspaceDir,
         }),
         providerFailures: result.errors,
     };
 }
-export async function runCouncilReviewEngine({ ctx, prompt, lineLookup, prTitle, prBody, onProgress, standardsSection: _standardsSection, }) {
+export async function runCouncilReviewEngine({ ctx, prompt, lineLookup, prTitle, prBody, prAuthor, prAuthorGreetingName, resolvePrAuthorGreetingName, excludePrAuthorFromSummary, onProgress, standardsSection: _standardsSection, }) {
     const apiKeys = getApiKeys(ctx);
     const availableModels = getAvailableModels(apiKeys);
     let metricModels = [];
@@ -88,6 +96,10 @@ export async function runCouncilReviewEngine({ ctx, prompt, lineLookup, prTitle,
             lineLookup,
             prTitle,
             prBody,
+            prAuthor,
+            prAuthorGreetingName,
+            resolvePrAuthorGreetingName,
+            excludePrAuthorFromSummary,
             apiKeys,
             onProgress,
         })
@@ -96,6 +108,10 @@ export async function runCouncilReviewEngine({ ctx, prompt, lineLookup, prTitle,
             lineLookup,
             prTitle,
             prBody,
+            prAuthor,
+            prAuthorGreetingName,
+            resolvePrAuthorGreetingName,
+            excludePrAuthorFromSummary,
             workspaceDir: ctx.workspaceDir,
             apiKeys,
             onProgress,

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

@@ -55,7 +55,7 @@ function parseDedupeResponse(raw) {
             .filter((group) => group.ids.length >= 2),
     };
 }
-function logDedupeProgress(event) {
+function logDedupeProgress(providerConfig, event) {
     logPiProgressEvent({
         event,
         messages: {
@@ -67,7 +67,7 @@ function logDedupeProgress(event) {
             toolUpdate: 'Multi-focus dedupe tool still running',
             toolEnd: 'Multi-focus dedupe tool finished',
         },
-        meta: { provider: DEDUPE_PROVIDER, model: DEDUPE_MODEL_NAME },
+        meta: { provider: providerConfig.provider, model: providerConfig.modelName },
         logResponding: true,
         logTools: true,
         toolLogLevel: 'warn',
@@ -111,30 +111,39 @@ export async function dedupeMultiFocusFindings({ findings, availableModels, work
         return findings;
     }
     if (!availableModels.includes(DEDUPE_PROVIDER)) {
-        return findings;
+        logger.error('Multi-focus dedupe unavailable because Gemini is not enabled', {
+            provider: DEDUPE_PROVIDER,
+            model: DEDUPE_MODEL_NAME,
+        });
+        throw new Error('Multi-focus dedupe requires Gemini to be enabled');
     }
     if (!geminiApiKey) {
-        logger.warn('Multi-focus dedupe skipped because Gemini API key is unavailable', {
+        logger.error('Multi-focus dedupe unavailable because Gemini API key is unavailable', {
             provider: DEDUPE_PROVIDER,
             model: DEDUPE_MODEL_NAME,
         });
-        return findings;
+        throw new Error('Multi-focus dedupe requires a Gemini API key');
     }
+    const providerConfig = {
+        provider: DEDUPE_PROVIDER,
+        apiKey: geminiApiKey,
+        modelName: DEDUPE_MODEL_NAME,
+    };
     for (let attempt = 1; attempt <= DEDUPE_MAX_ATTEMPTS; attempt += 1) {
         let result;
         try {
             result = await invokePiPrompt({
-                provider: DEDUPE_PROVIDER,
-                apiKey: geminiApiKey,
+                provider: providerConfig.provider,
+                apiKey: providerConfig.apiKey,
                 prompt: buildDedupePrompt(findings),
                 cwd: workspaceDir,
                 timeoutMs: DEDUPE_TIMEOUT_MS,
                 capabilityPreset: 'read-only',
-                modelName: DEDUPE_MODEL_NAME,
+                modelName: providerConfig.modelName,
                 thinkingLevel: DEDUPE_THINKING_LEVEL,
                 systemPrompt: DEDUPE_SYSTEM_PROMPT,
                 onProgress: (event) => {
-                    logDedupeProgress(event);
+                    logDedupeProgress(providerConfig, event);
                 },
             });
         }
@@ -142,9 +151,9 @@ export async function dedupeMultiFocusFindings({ findings, availableModels, work
             const shouldRetry = attempt < DEDUPE_MAX_ATTEMPTS;
             logger.warn(shouldRetry
                 ? 'Multi-focus dedupe request threw, retrying'
-                : 'Multi-focus dedupe request threw, returning original findings', {
-                provider: DEDUPE_PROVIDER,
-                model: DEDUPE_MODEL_NAME,
+                : 'Multi-focus dedupe request threw', {
+                provider: providerConfig.provider,
+                model: providerConfig.modelName,
                 attempt,
                 attempts_total: DEDUPE_MAX_ATTEMPTS,
                 error: error instanceof Error ? error.message : String(error),
@@ -153,15 +162,15 @@ export async function dedupeMultiFocusFindings({ findings, availableModels, work
                 await waitForDedupeRetry(attempt);
                 continue;
             }
-            return findings;
+            throw new Error(`Multi-focus dedupe request threw: ${error instanceof Error ? error.message : String(error)}`);
         }
         if (!result.ok) {
             const shouldRetry = attempt < DEDUPE_MAX_ATTEMPTS;
             logger.warn(shouldRetry
                 ? 'Multi-focus dedupe request failed, retrying'
-                : 'Multi-focus dedupe request failed, returning original findings', {
-                provider: DEDUPE_PROVIDER,
-                model: DEDUPE_MODEL_NAME,
+                : 'Multi-focus dedupe request failed', {
+                provider: providerConfig.provider,
+                model: providerConfig.modelName,
                 attempt,
                 attempts_total: DEDUPE_MAX_ATTEMPTS,
                 error: result.error,
@@ -171,37 +180,37 @@ export async function dedupeMultiFocusFindings({ findings, availableModels, work
                 await waitForDedupeRetry(attempt);
                 continue;
             }
-            return findings;
+            throw new Error(`Multi-focus dedupe request failed: ${result.error}`);
         }
         if (hasToolUsage(result.toolUsage)) {
-            logger.warn('Multi-focus dedupe used tools, returning original findings', {
-                provider: DEDUPE_PROVIDER,
-                model: DEDUPE_MODEL_NAME,
+            logger.error('Multi-focus dedupe used tools', {
+                provider: providerConfig.provider,
+                model: providerConfig.modelName,
                 tool_usage: result.toolUsage,
             });
-            return findings;
+            throw new Error('Multi-focus dedupe used tools unexpectedly');
         }
         let parsed;
         try {
             parsed = parseDedupeResponse(result.output);
         }
         catch (error) {
-            logger.warn('Multi-focus dedupe parsing failed, returning original findings', {
-                provider: DEDUPE_PROVIDER,
-                model: DEDUPE_MODEL_NAME,
+            logger.error('Multi-focus dedupe parsing failed', {
+                provider: providerConfig.provider,
+                model: providerConfig.modelName,
                 error: error instanceof Error ? error.message : String(error),
             });
-            return findings;
+            throw new Error(`Multi-focus dedupe parsing failed: ${error instanceof Error ? error.message : String(error)}`);
         }
         const deduped = applyDedupeGroups(findings, parsed.groups);
         logger.info('Multi-focus dedupe completed', {
-            provider: DEDUPE_PROVIDER,
-            model: DEDUPE_MODEL_NAME,
+            provider: providerConfig.provider,
+            model: providerConfig.modelName,
             originalCount: findings.length,
             dedupedCount: deduped.length,
             groupsCount: parsed.groups.length,
         });
         return deduped;
     }
-    return findings;
+    throw new Error('Multi-focus dedupe exhausted attempts without a result');
 }

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

@@ -1,7 +1,12 @@
 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 { parseSeverity } from '../severity.js';
 import { dedupeMultiFocusFindings } from './dedupe.js';
-import { buildReviewOutputFromFindings, getApiKeys, getAvailableModels, getProviderFailures, requestModelReview, } from './shared.js';
+import { getApiKeys, getAvailableModels, getProviderFailures, requestModelReview, } from './shared.js';
+const LOW_PRIORITY_SUMMARY_NOTICE = 'I also included a few optional follow-up notes in the details below.';
 async function runFocusPass({ focus, model, basePrompt, standardsSection, apiKeys, workspaceDir, onProgress, }) {
     const prompt = buildMultiFocusPrompt(basePrompt, focus, standardsSection);
     const result = await requestModelReview({
@@ -41,13 +46,116 @@ async function runFocusPass({ focus, model, basePrompt, standardsSection, apiKey
         status: 'succeeded',
         focus: focus.name,
         model,
+        summary: result.summary.trim(),
         findings: result.findings.map((finding) => ({
             ...finding,
             focus: focus.name,
         })),
     };
 }
-export async function runMultiFocusReviewEngine({ ctx, prompt, lineLookup, prTitle, prBody, standardsSection, onProgress, }) {
+function routeLowPriorityFindings(findings, placement = 'summary') {
+    if (placement === 'inline') {
+        return { inlineFindings: findings, summaryFindings: [] };
+    }
+    const inlineFindings = [];
+    const summaryFindings = [];
+    for (const finding of findings) {
+        const severity = parseSeverity(finding.body);
+        if (severity === 'P3') {
+            summaryFindings.push(finding);
+        }
+        else {
+            inlineFindings.push(finding);
+        }
+    }
+    return { inlineFindings, summaryFindings };
+}
+function buildNoInlineSummaryWithNotes(prTitle, prAuthor, prAuthorGreetingName, excludePrAuthorFromSummary) {
+    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);
+}
+function collectReviewObservations(focusRuns) {
+    const observations = [];
+    const seen = new Set();
+    for (const run of focusRuns) {
+        if (run.status !== 'succeeded') {
+            continue;
+        }
+        const summary = run.summary.replace(/\s+/g, ' ').trim();
+        if (!summary) {
+            continue;
+        }
+        const key = summary.toLowerCase();
+        if (seen.has(key)) {
+            continue;
+        }
+        seen.add(key);
+        observations.push(`${run.focus}: ${summary}`);
+    }
+    return observations.slice(0, 8);
+}
+function formatSummaryOnlyFinding(finding) {
+    const severity = parseSeverity(finding.body);
+    const bodyWithoutSeverity = finding.body.replace(/^\s*\[P\d\]\s*/i, '').trim();
+    const normalizedBody = (bodyWithoutSeverity || finding.body).replace(/\s+/g, ' ').trim();
+    const location = finding.side === 'LEFT'
+        ? `${finding.path}:${finding.line} (removed line)`
+        : `${finding.path}:${finding.line}`;
+    const label = severity ? `[${severity}] ${location}` : location;
+    return `- **${label}**: ${normalizedBody}`;
+}
+function appendSummaryOnlyFindings(summary, summaryFindings) {
+    if (summaryFindings.length === 0) {
+        return summary;
+    }
+    const notes = Array.from(new Set(summaryFindings.map((finding) => formatSummaryOnlyFinding(finding)).filter(Boolean)));
+    if (notes.length === 0) {
+        return summary;
+    }
+    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, }) {
+    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
+        ? null
+        : await summarizeCouncilReviews({
+            apiKey: summaryApiKey,
+            workspaceDir,
+            prTitle,
+            prBody,
+            prAuthor,
+            prAuthorGreetingName: resolvedPrAuthorGreetingName,
+            excludePrAuthorFromSummary,
+            findings,
+            reviewObservations,
+        });
+    const summaryWithoutNotes = synthesizedSummary ||
+        (comments.length === 0 && summaryFindings.length > 0
+            ? buildNoInlineSummaryWithNotes(prTitle, prAuthor, resolvedPrAuthorGreetingName, excludePrAuthorFromSummary)
+            : buildFallbackSummary({
+                prTitle,
+                findings,
+                prAuthor,
+                prAuthorGreetingName: resolvedPrAuthorGreetingName,
+                excludePrAuthorFromSummary,
+            }));
+    return {
+        summary: appendSummaryOnlyFindings(summaryWithoutNotes, summaryFindings),
+        comments,
+        findings: buildReviewOutputFindings({
+            inlineFindings,
+            summaryFindings,
+            lineLookup,
+        }),
+    };
+}
+export async function runMultiFocusReviewEngine({ ctx, prompt, lineLookup, prTitle, prBody, prAuthor, prAuthorGreetingName, resolvePrAuthorGreetingName, excludePrAuthorFromSummary, lowPriorityFindingPlacement, standardsSection, onProgress, }) {
     const apiKeys = getApiKeys(ctx);
     const availableModels = getAvailableModels(apiKeys);
     const metricModels = availableModels.length > 0 ? [...availableModels] : [...ctx.councilModelsEnabled];
@@ -89,19 +197,25 @@ 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,
-        openaiApiKey: ctx.openaiApiKey,
-        anthropicApiKey: ctx.anthropicApiKey,
     });
-    const review = await buildReviewOutputFromFindings({
-        commentsSource: dedupedFindings,
+    const routedFindings = routeLowPriorityFindings(dedupedFindings, lowPriorityFindingPlacement);
+    const review = await buildMultiFocusReviewOutput({
+        inlineFindings: routedFindings.inlineFindings,
+        summaryFindings: routedFindings.summaryFindings,
         lineLookup,
         prTitle,
         prBody,
+        prAuthor,
+        prAuthorGreetingName,
+        resolvePrAuthorGreetingName,
+        excludePrAuthorFromSummary,
+        reviewObservations,
         summaryApiKey: apiKeys.gemini,
         workspaceDir: ctx.workspaceDir,
     });
@@ -111,6 +225,9 @@ export async function runMultiFocusReviewEngine({ ctx, prompt, lineLookup, prTit
         successfulRuns: successfulRuns.length,
         findingsCount: allFindings.length,
         dedupedFindingsCount: dedupedFindings.length,
+        inlineFindingsCount: routedFindings.inlineFindings.length,
+        summaryOnlyFindingsCount: routedFindings.summaryFindings.length,
+        reviewObservationsCount: reviewObservations.length,
         commentsCount: review.comments.length,
     });
     return {

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

@@ -1,6 +1,7 @@
 import { getProvider } from '../../../providers/index.js';
 import { convertFindingsToComments } from '../comment-mapper.js';
-import { buildFallbackSummary, summarizeCouncilReviews } from '../council/summary.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 = {};
@@ -52,22 +53,44 @@ export async function requestModelReview({ model, prompt, apiKeys, workspaceDir,
         return null;
     }
 }
-export async function buildReviewOutputFromFindings({ commentsSource, lineLookup, prTitle, prBody, summaryApiKey, workspaceDir, preferredSummary, }) {
+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 synthesizedSummary = preferredSummaryText || summaryApiKey == null
+    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,
         });
-    const summary = preferredSummaryText || synthesizedSummary || buildFallbackSummary({ prTitle, findings });
     return {
-        summary,
+        summary: hasPreferredSummary
+            ? withReviewSummaryGreeting(summary, prAuthor, resolvedPrAuthorGreetingName, excludePrAuthorFromSummary)
+            : summary,
         comments,
+        findings: buildReviewOutputFindings({
+            inlineFindings: commentsSource,
+            lineLookup,
+        }),
     };
 }

package/sandbox/dist/tasks/review/finding-output.js

@@ -0,0 +1,18 @@
+import { canMapFindingToComment } from './comment-mapper.js';
+import { parseSeverity } from './severity.js';
+function convertFindingToOutputFinding(finding, placement) {
+    return {
+        body: finding.body,
+        severity: parseSeverity(finding.body),
+        placement,
+        path: finding.path,
+        line: finding.line,
+        side: finding.side,
+    };
+}
+export function buildReviewOutputFindings({ inlineFindings, summaryFindings = [], lineLookup, }) {
+    return [
+        ...inlineFindings.map((finding) => convertFindingToOutputFinding(finding, canMapFindingToComment(finding, lineLookup) ? 'inline' : 'summary')),
+        ...summaryFindings.map((finding) => convertFindingToOutputFinding(finding, 'summary')),
+    ];
+}