@doist/doistbot-cli 1.0.9 → 1.0.11

package/sandbox/dist/tasks/chat/chat.js

@@ -8,12 +8,15 @@ import { loadPromptTemplateFile, resolvePromptFile } from '../../core/prompt-tem
 import { removeIssueCommentReactionIfPresent } from '../../core/reactions.js';
 import { cloneRepository, createGitHubClients, parseBaseContext, requiredEnv, WORKSPACE_DIR, } from '../../core/shared.js';
 import { withPhase } from '../../core/tracing.js';
-import { buildPrompt } from './prompt.js';
+import { buildBroPrompt, buildPrompt } from './prompt.js';
 const CHAT_PROMPT_FILE = 'chat-prompt.md';
+const BRO_PROMPT_FILE = 'bro-prompt.md';
 const CHAT_TIMEOUT_MS = 5 * 60 * 1000;
 const CHAT_PROVIDER = 'openai';
 const CHAT_MODEL = 'gpt-5.6-luna';
 const CHAT_THINKING_LEVEL = 'high';
+const BRO_SYSTEM_PROMPT = 'You are Doistbot re-explaining one of your own review comments. Use only the source comment in the task prompt. Do not inspect files, call tools, or add facts. Output only the rewritten explanation.';
+const EMPTY_BRO_RESPONSE = "There's no earlier Doistbot comment in this review thread for me to simplify, bro.";
 function parseContext() {
     const base = parseBaseContext();
     const reactionIdRaw = process.env.REACTION_ID;
@@ -24,23 +27,29 @@ function parseContext() {
         reactionId: Number.isFinite(reactionId) ? reactionId : undefined,
         commentType: requiredEnv('COMMENT_TYPE'),
         eventName: requiredEnv('EVENT_NAME'),
+        mode: process.env.CHAT_MODE === 'bro' ? 'bro' : 'chat',
         dryRun: process.env.DRY_RUN?.toLowerCase() === 'true',
     };
 }
+function findLatestDoistbotComment(entries) {
+    for (let index = entries.length - 1; index >= 0; index -= 1) {
+        const entry = entries[index];
+        if (entry && isKnownDoistbotLogin(entry.author)) {
+            return entry.body;
+        }
+    }
+    return undefined;
+}
 /**
  * Gathers context for a review comment (inline code comment thread).
  */
-async function gatherReviewCommentContext(octokit, owner, repo, commentId) {
+export async function gatherReviewCommentContext(octokit, owner, repo, commentId, mode = 'chat') {
     const comment = await octokit.rest.pulls.getReviewComment({
         owner,
         repo,
         comment_id: commentId,
     });
-    const codeSnippet = comment.data.diff_hunk ?? '';
-    const commentBody = comment.data.body ?? '';
-    // Build thread history by walking up the chain
-    const threadHistory = [];
-    const currentCommentAuthor = comment.data.user?.login ?? 'unknown';
+    const threadEntries = [];
     let inReplyToId = comment.data.in_reply_to_id;
     while (inReplyToId) {
         try {
@@ -51,7 +60,16 @@ async function gatherReviewCommentContext(octokit, owner, repo, commentId) {
             });
             const parentAuthor = parentComment.data.user?.login ?? 'unknown';
             const parentBody = parentComment.data.body ?? '';
-            threadHistory.unshift(`**${parentAuthor}**: ${parentBody}`);
+            if (mode === 'bro' && isKnownDoistbotLogin(parentAuthor)) {
+                return {
+                    previousDoistbotComment: parentBody,
+                };
+            }
+            if (mode === 'bro') {
+                inReplyToId = parentComment.data.in_reply_to_id;
+                continue;
+            }
+            threadEntries.unshift({ author: parentAuthor, body: parentBody });
             inReplyToId = parentComment.data.in_reply_to_id;
         }
         catch (error) {
@@ -59,16 +77,28 @@ async function gatherReviewCommentContext(octokit, owner, repo, commentId) {
                 commentId: inReplyToId,
                 error: error instanceof Error ? error.message : String(error),
             });
+            if (mode === 'bro') {
+                throw new Error('Failed to fetch the review thread for bro mode', { cause: error });
+            }
             break;
         }
     }
-    // Add the current comment at the end
-    threadHistory.push(`**${currentCommentAuthor}**: ${commentBody}`);
+    if (mode === 'bro') {
+        return {};
+    }
+    const codeSnippet = comment.data.diff_hunk ?? '';
+    const commentBody = comment.data.body ?? '';
+    const currentCommentAuthor = comment.data.user?.login ?? 'unknown';
+    const previousDoistbotComment = findLatestDoistbotComment(threadEntries);
+    threadEntries.push({ author: currentCommentAuthor, body: commentBody });
     const userQuestion = commentBody.replace(/@doistbot\s*/i, '').trim();
     return {
-        threadHistory: threadHistory.join('\n\n'),
+        threadHistory: threadEntries
+            .map(({ author, body }) => `**${author}**: ${body}`)
+            .join('\n\n'),
         userQuestion,
         codeSnippet,
+        previousDoistbotComment,
     };
 }
 /**
@@ -125,7 +155,7 @@ async function gatherIssueCommentContext(octokit, owner, repo, prNumber, comment
         prAuthor,
     };
 }
-export async function invokeChatModel(prompt) {
+export async function invokeChatModel(prompt, mode = 'chat') {
     const apiKey = process.env.OPENAI_KEY?.trim();
     if (!apiKey) {
         // Config error: no model call attempted, so no model span. The reason is
@@ -144,10 +174,16 @@ export async function invokeChatModel(prompt) {
             prompt,
             cwd: WORKSPACE_DIR,
             timeoutMs: CHAT_TIMEOUT_MS,
-            capabilityPreset: 'workspace-inspection',
+            capabilityPreset: mode === 'bro' ? 'none' : 'workspace-inspection',
             thinkingLevel: CHAT_THINKING_LEVEL,
             // Keep the executed model in sync with the recorded span attr.
             modelName: CHAT_MODEL,
+            ...(mode === 'bro'
+                ? {
+                    systemPrompt: BRO_SYSTEM_PROMPT,
+                    noContextFiles: true,
+                }
+                : {}),
         });
         // Record why the model stopped, before the ok/failure branch so
         // terminal "error"/"aborted"/"length" endings are reported too.
@@ -215,6 +251,7 @@ function formatChatDryRunOutput(ctx, response) {
         commentId: ctx.commentId,
         commentType: ctx.commentType,
         eventName: ctx.eventName,
+        mode: ctx.mode,
         response,
     }, null, 2);
 }
@@ -265,6 +302,7 @@ async function main() {
         task: 'chat',
         'gen_ai.operation.name': 'invoke_agent',
         'gen_ai.agent.name': 'doistbot.chat',
+        'chat.mode': ctx.mode,
         'pr.number': ctx.prNumber,
         'comment.id': ctx.commentId,
         'comment.type': ctx.commentType,
@@ -274,47 +312,59 @@ async function main() {
         // Inside the span so auth/setup failures are captured by the root span.
         const { app, readOctokit, writeOctokit } = await createGitHubClients(ctx);
         try {
-            // Clone repository
-            await cloneRepository({
-                app,
-                owner: ctx.owner,
-                repo: ctx.repo,
-                prNumber: ctx.prNumber,
-                installationId: ctx.installationId,
-            });
+            // /bro only rewrites an existing comment, so it does not need repository contents.
+            if (ctx.mode !== 'bro') {
+                await cloneRepository({
+                    app,
+                    owner: ctx.owner,
+                    repo: ctx.repo,
+                    prNumber: ctx.prNumber,
+                    installationId: ctx.installationId,
+                });
+            }
             // Gather thread context from GitHub API
             let threadContext;
             if (ctx.commentType === 'review') {
-                threadContext = await gatherReviewCommentContext(readOctokit, ctx.owner, ctx.repo, ctx.commentId);
+                threadContext = await gatherReviewCommentContext(readOctokit, ctx.owner, ctx.repo, ctx.commentId, ctx.mode);
             }
             else {
                 threadContext = await gatherIssueCommentContext(readOctokit, ctx.owner, ctx.repo, ctx.prNumber, ctx.commentId);
             }
-            // Build prompt and invoke the chat model
-            const promptTemplate = loadPromptTemplateFile({
-                fileName: resolvePromptFile(import.meta.url, CHAT_PROMPT_FILE),
-                promptLabel: 'chat',
-            });
-            const prompt = buildPrompt({
-                promptTemplate,
-                owner: ctx.owner,
-                repo: ctx.repo,
-                prNumber: ctx.prNumber,
-                threadHistory: threadContext.threadHistory,
-                userQuestion: threadContext.userQuestion,
-                codeSnippet: threadContext.codeSnippet,
-                prTitle: threadContext.prTitle,
-                prAuthor: threadContext.prAuthor,
-            });
-            const modelResult = await invokeChatModel(prompt);
-            if (!modelResult.ok) {
-                span.setStatus({ code: SpanStatusCode.ERROR, message: modelResult.reason });
-                logger.warn('Chat model produced no usable response', {
-                    reason: modelResult.reason,
+            let response;
+            if (ctx.mode === 'bro' && !threadContext.previousDoistbotComment) {
+                response = EMPTY_BRO_RESPONSE;
+            }
+            else {
+                const promptTemplate = loadPromptTemplateFile({
+                    fileName: resolvePromptFile(import.meta.url, ctx.mode === 'bro' ? BRO_PROMPT_FILE : CHAT_PROMPT_FILE),
+                    promptLabel: ctx.mode,
                 });
-                return;
+                const prompt = ctx.mode === 'bro'
+                    ? buildBroPrompt({
+                        promptTemplate,
+                        previousDoistbotComment: threadContext.previousDoistbotComment ?? '',
+                    })
+                    : buildPrompt({
+                        promptTemplate,
+                        owner: ctx.owner,
+                        repo: ctx.repo,
+                        prNumber: ctx.prNumber,
+                        threadHistory: threadContext.threadHistory ?? '',
+                        userQuestion: threadContext.userQuestion ?? '',
+                        codeSnippet: threadContext.codeSnippet,
+                        prTitle: threadContext.prTitle,
+                        prAuthor: threadContext.prAuthor,
+                    });
+                const modelResult = await invokeChatModel(prompt, ctx.mode);
+                if (!modelResult.ok) {
+                    span.setStatus({ code: SpanStatusCode.ERROR, message: modelResult.reason });
+                    logger.warn('Chat model produced no usable response', {
+                        reason: modelResult.reason,
+                    });
+                    return;
+                }
+                response = modelResult.output;
             }
-            const response = modelResult.output;
             if (ctx.dryRun) {
                 logger.info('Dry run enabled, printing chat response instead of posting to GitHub');
                 process.stdout.write(`${formatChatDryRunOutput(ctx, response)}\n`);

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

@@ -13,3 +13,8 @@ export function buildPrompt({ promptTemplate, owner, repo, prNumber, threadHisto
         CODE_SNIPPET: codeSnippet ? `\`\`\`\n${codeSnippet}\n\`\`\`` : 'No code context available.',
     });
 }
+export function buildBroPrompt({ promptTemplate, previousDoistbotComment, }) {
+    return fillPromptTemplate(promptTemplate, {
+        PREVIOUS_DOISTBOT_COMMENT: previousDoistbotComment,
+    });
+}

package/sandbox/dist/tasks/issue-fix-retry/fix-retry.js

@@ -252,6 +252,7 @@ async function main() {
                 model: 'openai',
                 outcome: metricOutcome,
                 durationMs: performance.now() - startedAt,
+                sandboxVariant: ctx.sandboxVariant,
             });
         }
     });

package/sandbox/dist/tasks/issue-summarize/model.js

@@ -5,7 +5,7 @@ import { withPhase } from '../../core/tracing.js';
 const ISSUE_SUMMARIZE_TIMEOUT_MS = 5 * 60 * 1000;
 const ISSUE_SUMMARIZE_MULTIMODAL_MODEL = 'google/gemini-2.5-pro';
 const SUMMARIZE_TEXT_PROVIDER = 'zai';
-// Single source of truth: inherit the repo-wide ZAI default so a default-model
+// Single source of truth: inherit the repo-wide Z.ai default so a default-model
 // bump in core/pi.ts moves summarize too, and the executed model matches the
 // recorded gen_ai.request.model.
 const SUMMARIZE_TEXT_MODEL = DEFAULT_OPENROUTER_MODELS.zai;

package/sandbox/dist/tasks/issue-triage/context.js

@@ -1,3 +1,4 @@
+import { parseSandboxVariant } from 'doistbot-issue-routing';
 import { optionalPositiveInt, requiredEnv, requiredPositiveInt } from '../../core/shared.js';
 import { withPhase } from '../../core/tracing.js';
 import { extractLabelNames, fetchIssue, fetchIssueComments, } from './shared.js';
@@ -37,6 +38,7 @@ export function parseIssueTriageContext(env = process.env) {
         deliveryId,
         dryRun: env.DRY_RUN?.toLowerCase() === 'true',
         triggerType,
+        sandboxVariant: parseSandboxVariant(env.SANDBOX_VARIANT),
         enableAutoFixOverride: parseOptionalBoolean(env.ENABLE_AUTO_FIX),
     };
 }

package/sandbox/dist/tasks/issue-triage/fix-attempt.js

@@ -1,6 +1,7 @@
 import { execFileSync } from 'child_process';
 import { logger } from '../../core/logging.js';
 import { fillPromptTemplate, loadPromptTemplateFile, resolvePromptFile, } from '../../core/prompt-template.js';
+import { findRepositoryRoutes } from '../../core/repository-map.js';
 import { resolveAutofixCapabilityEnv } from './autofix-capabilities.js';
 import { validateDiff } from './diff-validator.js';
 import { CODEX_CANNOT_FIX_REASON, FIX_LOOP_FAILED_REASON_PREFIX } from './fix-failure-reasons.js';
@@ -288,7 +289,7 @@ async function postFollowUpComment({ octokit, ctx, prUrl, prNumber, targetRepo,
             task: 'issue-triage',
             issueNumber: ctx.issueNumber,
             targetRepo: targetRepo.fullName,
-            surfaces: targetRepo.surfaces,
+            routes: findRepositoryRoutes(targetRepo).map((route) => route.id),
         });
     }
     const body = buildFollowUpCommentBody({

package/sandbox/dist/tasks/issue-triage/fix-loop/promotion-task.js

@@ -25,18 +25,15 @@ export function parsePromotionTaskInput() {
  */
 export function buildPromotionSession({ input, octokit, }) {
     const { owner, repo } = input.base;
-    // Single source of truth: look up the canonical RepositoryTarget here
-    // (with real surfaces) so downstream effects like requestHeroReview can
-    // route by surface without re-scanning PRODUCT_REPOSITORIES.
+    // Use the issue-routing catalog when the target repository is supported.
+    // The review effect can then derive its configured route and hero team.
     const repository = findRepositoryTarget(owner, repo) ?? {
         owner,
         repo,
         fullName: `${owner}/${repo}`,
-        // Fallback for repos not in the registry. surfaces=[] makes
-        // resolveHeroGroup fall through to cx-hero — the desired behavior
-        // for unknown targets.
+        // Keep the existing Product type for an unknown target. The repository
+        // does not occur in that product's routes, so hero routing uses cx-hero.
         product: 'Todoist',
-        surfaces: [],
     };
     return {
         kind: 'fix-loop-promotion',

package/sandbox/dist/tasks/issue-triage/hero-group-map.js

@@ -1,5 +1,5 @@
 import { normalizeScopedLabelValue, scopedLabelValue } from '../../core/label-parsing.js';
-import { PRODUCT_REPOSITORIES } from '../../core/repository-map.js';
+import { APP_LABEL_ALIASES, findIssueRoute, findRepositoryRoutes, findRepositoryTarget as findRoutingRepositoryTarget, PRODUCT_LABEL_ALIASES, PRODUCT_ROUTES, } from '../../core/repository-map.js';
 const HERO_GROUPS = {
     'android-hero': { key: 'android-hero', mention: '@Doist/android-hero' },
     'app-copy-hero': { key: 'app-copy-hero', mention: '@Doist/app-copy-hero' },
@@ -39,37 +39,17 @@ const TEAM_LABEL_TO_HERO = {
     product: 'product-hero',
     support: 'cx-hero',
 };
-const SURFACE_TO_HERO = {
-    android: 'android-hero',
-    backend: 'backend-hero',
-    cli: 'frontend-hero',
-    desktop: 'desktop-hero',
-    ios: 'apple-hero',
-    mcp: 'frontend-hero',
-    web: 'frontend-hero',
-};
 export const CX_HERO_MANUAL_HANDLE = HERO_GROUPS['cx-hero'].mention;
 /**
- * Looks up a known Doist repository by owner/repo in PRODUCT_REPOSITORIES.
- * Returns the canonical RepositoryTarget (with surfaces) or undefined when
- * the repo isn't in the registry. Used at session construction to populate
- * targetRepo.repository.surfaces accurately, so downstream effects can
- * reuse the surface map without re-scanning the registry.
+ * Looks up a repository supported by issue routing.
  */
 export function findRepositoryTarget(owner, repo) {
-    for (const list of Object.values(PRODUCT_REPOSITORIES)) {
-        const match = list.find((target) => target.owner === owner && target.repo === repo);
-        if (match) {
-            return match;
-        }
-    }
-    return undefined;
+    return findRoutingRepositoryTarget(owner, repo);
 }
 /**
- * Derives the GitHub team slug (under the Doist org) for a PR's hero
- * reviewer from a RepositoryTarget. The target's surfaces decide the team
- * (web → frontend-hero, etc.). Falls back to cx-hero for unknown surfaces
- * and for user-mention groups like dateist (`@amix`) that aren't real teams.
+ * Derives the GitHub team slug for a PR from its configured issue route.
+ * Repositories that are unknown or belong to routes with different hero teams
+ * use cx-hero because the repository alone does not give enough context.
  */
 export function resolveHeroTeamSlug(target) {
     const group = resolveHeroGroup([], target);
@@ -80,6 +60,9 @@ export function resolveHeroTeamSlug(target) {
     // HeroGroupKey to HeroTeamSlug here.
     return group.key;
 }
+function resolveAppLabelAlias(value) {
+    return APP_LABEL_ALIASES[normalizeScopedLabelValue(value)];
+}
 export function isKnownHeroRoutingLabel(label) {
     const teamValue = scopedLabelValue(label, 'Team');
     if (teamValue && TEAM_LABEL_TO_HERO[normalizeScopedLabelValue(teamValue)]) {
@@ -89,7 +72,50 @@ export function isKnownHeroRoutingLabel(label) {
     if (!appValue) {
         return false;
     }
-    return normalizeScopedLabelValue(appValue) in SURFACE_TO_HERO;
+    const appLabel = resolveAppLabelAlias(appValue);
+    return (appLabel !== undefined &&
+        appLabel !== 'all' &&
+        Object.values(PRODUCT_ROUTES).some((routes) => routes.some((route) => route.id === appLabel)));
+}
+function resolveProduct(labels) {
+    const products = new Set();
+    for (const label of labels) {
+        const productValue = scopedLabelValue(label, 'Product');
+        if (!productValue) {
+            continue;
+        }
+        const product = PRODUCT_LABEL_ALIASES[normalizeScopedLabelValue(productValue)];
+        if (product) {
+            products.add(product);
+        }
+    }
+    return products.size === 1 ? products.values().next().value : undefined;
+}
+function resolveAppRouteHeroKeys(labels) {
+    const routeIds = new Set();
+    for (const label of labels) {
+        const appValue = scopedLabelValue(label, 'App');
+        if (!appValue) {
+            continue;
+        }
+        const appLabel = resolveAppLabelAlias(appValue);
+        if (appLabel && appLabel !== 'all') {
+            routeIds.add(appLabel);
+        }
+    }
+    const product = resolveProduct(labels);
+    const heroKeys = new Set();
+    for (const routeId of routeIds) {
+        const routes = product
+            ? [findIssueRoute(product, routeId)].filter((route) => route !== undefined)
+            : Object.values(PRODUCT_ROUTES)
+                .flat()
+                .filter((route) => route.id === routeId);
+        for (const route of routes) {
+            heroKeys.add(route.heroTeam);
+        }
+    }
+    return heroKeys;
 }
 export function resolveHeroGroup(labels, primaryRepo) {
     const teamHeroKeys = new Set();
@@ -109,22 +135,20 @@ export function resolveHeroGroup(labels, primaryRepo) {
     if (teamHeroKeys.size > 1) {
         return null;
     }
-    if (primaryRepo) {
-        for (const surface of primaryRepo.surfaces) {
-            const heroKey = SURFACE_TO_HERO[surface];
-            if (heroKey) {
-                return HERO_GROUPS[heroKey];
-            }
-        }
+    const appHeroKeys = resolveAppRouteHeroKeys(labels);
+    if (appHeroKeys.size === 1) {
+        return HERO_GROUPS[appHeroKeys.values().next().value];
     }
-    for (const label of labels) {
-        const appValue = scopedLabelValue(label, 'App');
-        if (!appValue) {
-            continue;
+    if (appHeroKeys.size > 1) {
+        return null;
+    }
+    if (primaryRepo) {
+        const repositoryHeroKeys = new Set(findRepositoryRoutes(primaryRepo).map((route) => route.heroTeam));
+        if (repositoryHeroKeys.size === 1) {
+            return HERO_GROUPS[repositoryHeroKeys.values().next().value];
         }
-        const heroKey = SURFACE_TO_HERO[normalizeScopedLabelValue(appValue)];
-        if (heroKey) {
-            return HERO_GROUPS[heroKey];
+        if (repositoryHeroKeys.size > 1) {
+            return null;
         }
     }
     return null;

package/sandbox/dist/tasks/issue-triage/output.js

@@ -20,7 +20,7 @@ Detected labels: Product=[$PRODUCTS] App=[$APPS] Team=[$TEAMS]
 Please update labels and run \`@doistbot /triage\` again.
 Expected examples:
 - \`Product:Todoist\` + \`App:Android\`
-- \`Product:Twist\` + \`App:Web\`
+- \`Product:Comms\` + \`App:Android\`
 - \`Product:Todoist\` + \`App:All\``;
 function hasHeading(body, heading) {
     const escapedHeading = heading.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');

package/sandbox/dist/tasks/issue-triage/resolution.js

@@ -12,6 +12,7 @@ export async function resolveTriageScope(params) {
             parsed_products: result.parsedLabels.productLabels,
             parsed_apps: result.parsedLabels.appLabels,
             parsed_teams: result.parsedLabels.teamLabels,
+            matched_routes: result.matchedRoutes,
             unknown_product_labels: result.parsedLabels.unknownProductLabels,
             unknown_app_labels: result.parsedLabels.unknownAppLabels,
             unknown_team_labels: result.parsedLabels.unknownTeamLabels,

package/sandbox/dist/tasks/issue-triage/shared.js

@@ -1,6 +1,7 @@
 import { spawnSync } from 'child_process';
 import fs from 'fs';
 import path from 'path';
+import { extractIssueLabelNames } from 'doistbot-issue-routing';
 import { App } from 'octokit';
 import { logger } from '../../core/logging.js';
 import { REPOS_SUBDIR, resolveWriteOctokit, WORKSPACE_DIR } from '../../core/shared.js';
@@ -10,18 +11,7 @@ export function getIssueUrl(owner, repo, issueNumber) {
     return `https://github.com/${owner}/${repo}/issues/${issueNumber}`;
 }
 export function extractLabelNames(labels) {
-    if (!labels?.length) {
-        return [];
-    }
-    const names = labels
-        .map((label) => {
-        if (typeof label === 'string') {
-            return label.trim();
-        }
-        return label.name?.trim() ?? '';
-    })
-        .filter((label) => label.length > 0);
-    return [...new Set(names)];
+    return extractIssueLabelNames(labels);
 }
 export function prepareWorkspaceReposDirectory() {
     const reposDir = path.join(WORKSPACE_DIR, REPOS_SUBDIR);

package/sandbox/dist/tasks/issue-triage/triage.js

@@ -430,6 +430,7 @@ async function runIssueTriagePipeline(ctx, mode) {
                     model: TRIAGE_PROVIDER,
                     outcome: pendingFixMetric.outcome,
                     durationMs: performance.now() - pendingFixMetric.startedAt,
+                    sandboxVariant: ctx.sandboxVariant,
                 });
             }
             if (shouldRecordTriageMetric) {
@@ -439,6 +440,7 @@ async function runIssueTriagePipeline(ctx, mode) {
                     model: TRIAGE_PROVIDER,
                     outcome: triageMetricOutcome,
                     durationMs: triageDurationMs ?? performance.now() - startedAt,
+                    sandboxVariant: ctx.sandboxVariant,
                 });
             }
         }

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

@@ -1,5 +1,6 @@
 import { SpanStatusCode } from '@opentelemetry/api';
 import { logger } from '../../../core/logging.js';
+import { toPiInvocationTelemetryFields } from '../../../core/pi.js';
 import { genAiProviderName, withPhase } from '../../../core/tracing.js';
 import { convertFindingsToComments } from '../comment-mapper.js';
 import { buildReviewOutputFindings } from '../finding-output.js';
@@ -29,6 +30,16 @@ const DEFAULT_GEMINI_FLASH_FALLBACK_FOCUSES = [
 ];
 // Open models whose failed pass triggers that fallback.
 const GEMINI_FLASH_FALLBACK_MODELS = ['deepseek', 'zai'];
+function setReviewLatencyAttributes(span, result) {
+    const telemetry = result.telemetry;
+    if (!telemetry)
+        return;
+    const attributes = Object.fromEntries(Object.entries(toPiInvocationTelemetryFields(telemetry)).map(([name, value]) => [
+        `review.${name}`,
+        value,
+    ]));
+    span.setAttributes(attributes);
+}
 function lowPrioritySummaryNotice(count) {
     return count === 1
         ? 'I also left one optional follow-up note in the details below.'
@@ -60,6 +71,9 @@ async function runFocusPass({ focus, model, basePrompt, standardsSection, apiKey
         if (result?.requestModel) {
             span.setAttributes({ 'gen_ai.request.model': result.requestModel });
         }
+        if (result) {
+            setReviewLatencyAttributes(span, result);
+        }
         if (!result) {
             const error = `No review result returned for ${model}`;
             span.setStatus({ code: SpanStatusCode.ERROR, message: error });

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

@@ -22,6 +22,8 @@ export function getAvailableModels(apiKeys) {
         models.push('openai');
     if (hasReviewProviderCredential(apiKeys.deepseek))
         models.push('deepseek');
+    if (hasReviewProviderCredential(apiKeys.grok))
+        models.push('grok');
     if (hasReviewProviderCredential(apiKeys.zai))
         models.push('zai');
     return models;

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

@@ -15,7 +15,8 @@ import { REVIEW_FOCUS_DEFINITIONS } from './multi-focus-prompt.js';
 import { appendReviewFeedbackLink } from './review-feedback.js';
 import { runSharedReview } from './runner.js';
 const REVIEW_EVENT = 'COMMENT';
-const REQUIRED_PRODUCTION_REVIEW_MODELS = getDefaultReviewModels();
+const DEFAULT_PRODUCTION_REVIEW_MODELS = getDefaultReviewModels();
+const SUPPORTED_PRODUCTION_REVIEW_MODELS = ['openai', 'deepseek', 'grok', 'zai'];
 const REVIEW_FOCUSES = REVIEW_FOCUS_DEFINITIONS.map((focus) => focus.name);
 function optionalEnv(name) {
     const value = process.env[name]?.trim();
@@ -43,8 +44,8 @@ function parseContext() {
 export function parseReviewModelsEnv(value) {
     return parseCsvAllowList({
         value,
-        allowedValues: REQUIRED_PRODUCTION_REVIEW_MODELS,
-        fallback: REQUIRED_PRODUCTION_REVIEW_MODELS,
+        allowedValues: SUPPORTED_PRODUCTION_REVIEW_MODELS,
+        fallback: DEFAULT_PRODUCTION_REVIEW_MODELS,
         envName: 'REVIEW_MODELS_ENABLED',
     });
 }
@@ -253,6 +254,7 @@ async function main() {
             }
             if (ctx.openRouterApiKey) {
                 reviewApiKeys.deepseek = createOpenRouterCredential(ctx.openRouterApiKey);
+                reviewApiKeys.grok = createOpenRouterCredential(ctx.openRouterApiKey);
                 reviewApiKeys.zai = createOpenRouterCredential(ctx.openRouterApiKey);
             }
             if (ctx.openaiApiKey) {

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

@@ -6,7 +6,7 @@ import { genAiProviderName, withPhase } from '../../core/tracing.js';
 import { resolveReviewProviderCredential } from '../../providers/credentials.js';
 import { extractJsonCandidatesFromResponse } from '../../providers/helpers.js';
 const REVIEW_SUMMARY_TIMEOUT_MS = 5 * 60 * 1000;
-const REVIEW_SUMMARY_THINKING_LEVEL = 'medium';
+const DEFAULT_REVIEW_SUMMARY_THINKING_LEVEL = 'medium';
 // One model span per summary attempt; a fallback chain emits one span per model.
 const SUMMARY_PHASE = 'review.summary';
 const DIFF_SIDE = {
@@ -93,12 +93,13 @@ export async function requestReviewSummary({ credential, provider = 'zai', model
 }
 async function runReviewSummaryRequest({ provider, resolvedCredential, resolvedModelName, logModelName, prompt, workspaceDir, }) {
     try {
+        const thinkingLevel = provider === 'zai' ? 'high' : DEFAULT_REVIEW_SUMMARY_THINKING_LEVEL;
         logger.info('Review summary model request', {
             provider,
             modelName: logModelName,
             promptLength: prompt.length,
             timeoutMs: REVIEW_SUMMARY_TIMEOUT_MS,
-            thinkingLevel: REVIEW_SUMMARY_THINKING_LEVEL,
+            thinkingLevel,
         });
         const result = await invokePiPrompt({
             provider,
@@ -111,7 +112,7 @@ async function runReviewSummaryRequest({ provider, resolvedCredential, resolvedM
             cwd: workspaceDir ?? getWorkspaceDir(),
             timeoutMs: REVIEW_SUMMARY_TIMEOUT_MS,
             capabilityPreset: 'read-only',
-            thinkingLevel: REVIEW_SUMMARY_THINKING_LEVEL,
+            thinkingLevel,
         });
         if (!result.ok) {
             const reason = getRequestFailureReason(result);

package/sandbox/dist/tasks/review/thinking-level.js

@@ -4,6 +4,8 @@ export function getReviewThinkingLevel(model) {
             return 'high';
         case 'openai':
             return 'high';
+        case 'grok':
+            return 'high';
         case 'zai':
             return 'high';
         case 'gemini':