@doist/doistbot-cli 1.0.12 → 1.0.14

package/dist/config.js

@@ -29,7 +29,7 @@ const ALL_REVIEW_FOCUSES = [
     'standards',
 ];
 const OPENROUTER_REVIEW_MODELS = ['deepseek', 'zai'];
-const CLI_GEMINI_REVIEW_MODEL = 'gemini-3.7-flash';
+const CLI_GEMINI_REVIEW_MODEL = 'gemini-3.8-flash';
 function createCliGeminiCredential(apiKey) {
     return {
         apiKey,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@doist/doistbot-cli",
-    "version": "1.0.12",
+    "version": "1.0.14",
     "description": "Local self-review CLI for Doistbot",
     "type": "module",
     "main": "dist/index.js",
@@ -40,10 +40,10 @@
         "test": "vitest run src scripts --config ../../config/vitest.base.ts"
     },
     "dependencies": {
-        "@earendil-works/pi-ai": "0.85.1",
-        "@earendil-works/pi-coding-agent": "0.85.1",
-        "@inquirer/checkbox": "5.2.4",
-        "@inquirer/password": "5.2.1",
+        "@earendil-works/pi-ai": "0.87.1",
+        "@earendil-works/pi-coding-agent": "0.87.1",
+        "@inquirer/checkbox": "5.2.5",
+        "@inquirer/password": "5.2.2",
         "@napi-rs/keyring": "1.3.0",
         "@opentelemetry/api": "1.9.1",
         "ajv": "8.20.0",

package/sandbox/dist/core/pi.js

@@ -54,7 +54,7 @@ export const DEFAULT_PI_MODELS = {
     gemini: 'gemini-3.1-pro-preview',
     grok: 'grok-4.6',
     zai: 'glm5.2',
-    openai: 'gpt-5.6-terra',
+    openai: 'gpt-6-sol',
 };
 export const DEFAULT_OPENROUTER_MODELS = {
     deepseek: 'deepseek/deepseek-v4-pro-0813',
@@ -63,7 +63,7 @@ export const DEFAULT_OPENROUTER_MODELS = {
     zai: 'z-ai/glm-5.3-flash',
 };
 // Gemini flash fallback model.
-export const DEFAULT_GEMINI_FLASH_MODEL = 'gemini-3.7-flash';
+export const DEFAULT_GEMINI_FLASH_MODEL = 'gemini-3.8-flash';
 export const MAX_PI_THINKING_BY_PROVIDER = {
     deepseek: 'high',
     gemini: 'high',

package/sandbox/dist/core/repository-map.js

@@ -1 +1 @@
-export { APP_LABEL_ALIASES, APP_TO_ROUTE_SELECTORS, findIssueRoute, findRepositoryRoutes, findRepositoryTarget, PRODUCT_LABEL_ALIASES, PRODUCT_ROUTES, RESOLUTION_PRECEDENCE, TEAM_LABEL_ALIASES, TEAM_TO_ROUTE_SELECTORS, } from 'doistbot-issue-routing';
+export { APP_LABEL_ALIASES, APP_TO_ROUTE_SELECTORS, findIntegrationRoute, findIntegrationRoutes, findIssueRoute, findOwningRoutes, findRepositoryRoutes, findRepositoryTarget, INTEGRATION_LABEL_ALIASES, INTEGRATION_ROUTES, PRODUCT_LABEL_ALIASES, PRODUCT_ROUTES, RESOLUTION_PRECEDENCE, TEAM_LABEL_ALIASES, TEAM_TO_ROUTE_SELECTORS, } from 'doistbot-issue-routing';

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

@@ -13,7 +13,7 @@ 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_MODEL = 'gpt-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.";

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

@@ -10,7 +10,7 @@ import { parseIssueTriageContext } from '../issue-triage/context.js';
 import { attemptFix } from '../issue-triage/fix-attempt.js';
 import { parseFixAssessment } from '../issue-triage/output.js';
 import { cloneRepository, createGitHubClients, extractLabelNames, fetchIssue, fetchIssueComments, getIssueUrl, prepareWorkspaceReposDirectory, TRIAGE_MARKER, } from '../issue-triage/shared.js';
-async function main() {
+export async function main() {
     const startedAt = performance.now();
     const ctx = parseIssueTriageContext();
     let exitCode = 0;
@@ -184,6 +184,10 @@ async function main() {
                 issueUrl: issue.html_url ?? getIssueUrl(ctx.owner, ctx.repo, ctx.issueNumber),
                 ghToken: issueInstallationAuth.token,
                 force: true,
+                assigneeReview: {
+                    assignees: (issue.assignees ?? []).map((assignee) => assignee.login),
+                    membershipOctokit: readOctokit,
+                },
                 modelPhaseName: 'issue-fix-retry.fix-attempt.model',
             }));
             metricRepository = fixResult.repository;

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

@@ -11,6 +11,7 @@ export function parseSummarizeContext(env = process.env) {
         appId: requiredEnv('APP_ID', env),
         privateKey: requiredEnv('PRIVATE_KEY', env),
         githubToken: requiredEnv('GITHUB_TOKEN', env),
+        geminiApiKey: requiredEnv('GEMINI_API_KEY', env),
         openRouterApiKey: requiredEnv('OPENROUTER_API_KEY', env),
         commentId,
         reactionId,

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

@@ -1,9 +1,9 @@
 import { SpanStatusCode } from '@opentelemetry/api';
 import { logger } from '../../core/logging.js';
-import { buildPiImageContent, createPiInvoker, DEFAULT_OPENROUTER_MODELS } from '../../core/pi.js';
+import { buildPiImageContent, createPiInvoker, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_OPENROUTER_MODELS, } from '../../core/pi.js';
 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 ISSUE_SUMMARIZE_MULTIMODAL_MODEL = DEFAULT_GEMINI_FLASH_MODEL;
 const SUMMARIZE_TEXT_PROVIDER = 'zai';
 // 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
@@ -14,7 +14,7 @@ const SUMMARIZE_MULTIMODAL_PROVIDER = 'gcp.gemini';
 // `issue-summarize.model`; each chunk summary uses `issue-summarize.chunk`.
 const SUMMARIZE_MODEL_PHASE = 'issue-summarize.model';
 const SUMMARIZE_CHUNK_PHASE = 'issue-summarize.chunk';
-export function createIssueSummarizeModel(apiKey) {
+export function createIssueSummarizeTextModel(apiKey) {
     return createPiInvoker({
         provider: 'zai',
         apiKey,
@@ -23,6 +23,15 @@ export function createIssueSummarizeModel(apiKey) {
         capabilityPreset: 'read-only',
     });
 }
+export function createIssueSummarizeMultimodalModel(apiKey) {
+    return createPiInvoker({
+        provider: 'gemini',
+        apiKey,
+        piProviderId: 'google',
+        cwd: process.cwd(),
+        capabilityPreset: 'read-only',
+    });
+}
 async function invokeIssueSummarizeTextModel({ model, prompt, phaseName, }) {
     return withPhase(phaseName, {
         'gen_ai.operation.name': 'chat',
@@ -115,11 +124,11 @@ async function invokeMultimodalSummarizeModel({ model, prompt, mediaImages, }) {
         }
     });
 }
-export async function invokeIssueSummarizeModel({ model, prompt, mediaImages, }) {
+export async function invokeIssueSummarizeModel({ textModel, multimodalModel, prompt, mediaImages, }) {
     if (mediaImages.length === 0) {
         logger.info('Using text-only summarize model request');
         return await invokeIssueSummarizeTextModel({
-            model,
+            model: textModel,
             prompt,
             phaseName: SUMMARIZE_MODEL_PHASE,
         });
@@ -127,12 +136,20 @@ export async function invokeIssueSummarizeModel({ model, prompt, mediaImages, })
     logger.info('Using multimodal summarize model request', {
         mediaImages: mediaImages.length,
     });
-    const multimodal = await invokeMultimodalSummarizeModel({ model, prompt, mediaImages });
+    const multimodal = await invokeMultimodalSummarizeModel({
+        model: multimodalModel,
+        prompt,
+        mediaImages,
+    });
     if (multimodal) {
         return multimodal;
     }
     // Multimodal failed — fall back to a separate text request (own model span).
-    return await invokeIssueSummarizeTextModel({ model, prompt, phaseName: SUMMARIZE_MODEL_PHASE });
+    return await invokeIssueSummarizeTextModel({
+        model: textModel,
+        prompt,
+        phaseName: SUMMARIZE_MODEL_PHASE,
+    });
 }
 function buildChunkSummaryPrompt({ chunk, chunkIndex, selectedChunkCount, totalChunks, }) {
     return `You are preparing an intermediate summary for a GitHub issue discussion.

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

@@ -7,7 +7,7 @@ import { resolveWriteOctokit } from '../../core/shared.js';
 import { withPhase } from '../../core/tracing.js';
 import { parseSummarizeContext } from './context.js';
 import { buildMediaPromptImages, extractMediaReferences, formatMediaContext, inspectMediaReferences, } from './media.js';
-import { createIssueSummarizeModel, invokeIssueSummarizeModel, summarizeChunks } from './model.js';
+import { createIssueSummarizeMultimodalModel, createIssueSummarizeTextModel, invokeIssueSummarizeModel, summarizeChunks, } from './model.js';
 import { buildFallbackSummary, ensureStructuredSummary, stripVisualContextSection, } from './output.js';
 import { fillTemplate, loadPromptTemplate } from './prompt.js';
 import { buildThreadEntries, prepareThreadPrompt } from './thread.js';
@@ -41,7 +41,8 @@ function summarizeMediaInspectionStats(mediaInspections) {
 async function summarizeIssue({ ctx, issue, entries, mediaReferences, mediaInspections, }) {
     const template = loadPromptTemplate();
     const threadPrompt = prepareThreadPrompt(entries);
-    const summarizeModel = createIssueSummarizeModel(ctx.openRouterApiKey);
+    const textModel = createIssueSummarizeTextModel(ctx.openRouterApiKey);
+    const multimodalModel = createIssueSummarizeMultimodalModel(ctx.geminiApiKey);
     logger.info('Prepared summarize thread prompt', {
         entryCount: entries.length,
         chunked: threadPrompt.chunked,
@@ -50,7 +51,7 @@ async function summarizeIssue({ ctx, issue, entries, mediaReferences, mediaInspe
     });
     const threadContent = threadPrompt.chunked
         ? await summarizeChunks({
-            model: summarizeModel,
+            model: textModel,
             chunks: threadPrompt.chunks,
             totalChunks: threadPrompt.totalChunks,
         })
@@ -75,7 +76,8 @@ async function summarizeIssue({ ctx, issue, entries, mediaReferences, mediaInspe
         mediaImagesIncluded: mediaPromptImages.length,
     });
     const summary = await invokeIssueSummarizeModel({
-        model: summarizeModel,
+        textModel,
+        multimodalModel,
         prompt,
         mediaImages: mediaPromptImages,
     });

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

@@ -0,0 +1,114 @@
+import { isKnownDoistbotLogin } from '../../core/bot-logins.js';
+import { logger } from '../../core/logging.js';
+import { findOwningRoutes, findRepositoryTarget } from '../../core/repository-map.js';
+import { withRetry } from '../../core/retry.js';
+import { GITHUB_REQUEST_TIMEOUT_MS } from './github-request.js';
+import { ASSIGNEE_REVIEW_MARKER } from './markers.js';
+export async function resolveAssigneeReviewers({ owner, repo, assignees, membershipOctokit, }) {
+    const repository = findRepositoryTarget(owner, repo);
+    if (!repository || assignees.length === 0)
+        return [];
+    const routes = findOwningRoutes(repository);
+    const teams = [...new Set(routes.map((route) => route.ownerTeam))];
+    const reviewers = [];
+    const logins = [...new Set(assignees.map((login) => login.toLowerCase()))];
+    for (const username of logins) {
+        if (isKnownDoistbotLogin(username))
+            continue;
+        for (const teamSlug of teams) {
+            try {
+                const { data } = await withRetry(() => membershipOctokit.rest.teams.getMembershipForUserInOrg({
+                    org: owner,
+                    team_slug: teamSlug,
+                    username,
+                    request: { signal: AbortSignal.timeout(GITHUB_REQUEST_TIMEOUT_MS) },
+                }));
+                if (data.state === 'active') {
+                    reviewers.push(username);
+                    break;
+                }
+            }
+            catch (error) {
+                // A missing/invisible membership never qualifies an assignee.
+                if (error?.status !== 404) {
+                    logger.warn('Unable to verify autofix assignee team membership', {
+                        repository: `${owner}/${repo}`,
+                        username,
+                        team: teamSlug,
+                        error: error instanceof Error ? error.message : String(error),
+                    });
+                }
+            }
+        }
+    }
+    return reviewers;
+}
+/** Best-effort early review request. Failure must not lose an already opened PR. */
+export async function requestAssigneeReview({ assigneeReview, ...pr }) {
+    if (!assigneeReview)
+        return [];
+    const reviewers = await resolveAssigneeReviewers({ ...pr, ...assigneeReview });
+    if (reviewers.length === 0)
+        return [];
+    try {
+        await withRetry(() => pr.octokit.rest.pulls.requestReviewers({
+            owner: pr.owner,
+            repo: pr.repo,
+            pull_number: pr.prNumber,
+            reviewers,
+            request: { signal: AbortSignal.timeout(GITHUB_REQUEST_TIMEOUT_MS) },
+        }));
+    }
+    catch (error) {
+        logger.warn('Autofix assignee review request failed; retaining Hero fallback', {
+            repository: `${pr.owner}/${pr.repo}`,
+            pr_number: pr.prNumber,
+            reviewers,
+            error: error instanceof Error ? error.message : String(error),
+        });
+        return [];
+    }
+    try {
+        // A bot-authored receipt on the target PR survives the separate promotion
+        // process, completed/removed review requests, and edits to the PR body.
+        // Only write it AFTER GitHub accepts the request, never for candidates.
+        await withRetry(() => pr.octokit.rest.issues.createComment({
+            owner: pr.owner,
+            repo: pr.repo,
+            issue_number: pr.prNumber,
+            body: [
+                ASSIGNEE_REVIEW_MARKER,
+                '',
+                `Requested review from issue assignees: ${reviewers.map((login) => `@${login}`).join(', ')}.`,
+            ].join('\n'),
+            request: { signal: AbortSignal.timeout(GITHUB_REQUEST_TIMEOUT_MS) },
+        }));
+    }
+    catch (error) {
+        logger.warn('Failed to record autofix assignee review request; Hero fallback remains armed', {
+            repository: `${pr.owner}/${pr.repo}`,
+            pr_number: pr.prNumber,
+            reviewers,
+            error: error instanceof Error ? error.message : String(error),
+        });
+    }
+    return reviewers;
+}
+export async function hasAssigneeReviewRequest(pr) {
+    return withRetry(async () => {
+        const pages = pr.octokit.paginate.iterator(pr.octokit.rest.issues.listComments, {
+            owner: pr.owner,
+            repo: pr.repo,
+            issue_number: pr.prNumber,
+            per_page: 100,
+            request: { signal: AbortSignal.timeout(GITHUB_REQUEST_TIMEOUT_MS) },
+        });
+        for await (const { data: comments } of pages) {
+            if (comments.some((comment) => isKnownDoistbotLogin(comment.user?.login) &&
+                comment.body?.split('\n')[0]?.trim() === ASSIGNEE_REVIEW_MARKER)) {
+                return true;
+            }
+        }
+        return false;
+    });
+}

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

@@ -147,13 +147,15 @@ function captureGitDiff(repoLocalPath) {
     }
 }
 const DOISTBOT_DEVS_MENTION = '@Doist/doistbot-devs';
-export function buildFollowUpCommentBody({ prUrl, targetRepoFullName, fixAssessment, heroMention, }) {
+export function buildFollowUpCommentBody({ prUrl, targetRepoFullName, fixAssessment, heroMention, requestedAssignees = [], }) {
     const description = fixAssessment.classification === 'speculative'
-        ? `I've created a draft PR with a speculative fix as a starting point: ${prUrl}. This likely needs refinement — see the PR description for confidence details.`
-        : `I've created a draft PR with a proposed fix: ${prUrl}`;
-    const introLine = heroMention
-        ? `${heroMention} a doistbot autofix PR is ready for your review.`
-        : `${CX_HERO_MANUAL_HANDLE} I couldn't resolve a Hero for \`${targetRepoFullName}\`. Could you please route this manually? cc ${DOISTBOT_DEVS_MENTION} to update the hero mapping so future autofix PRs can be assigned automatically.`;
+        ? `I've created a PR with a speculative fix as a starting point: ${prUrl}. This likely needs refinement — see the PR description for confidence details.`
+        : `I've created a PR with a proposed fix: ${prUrl}`;
+    const introLine = requestedAssignees.length > 0
+        ? `I've requested a review from ${requestedAssignees.map((login) => `@${login}`).join(', ')} on the autofix PR.`
+        : heroMention
+            ? `${heroMention} a doistbot autofix PR is ready for your review.`
+            : `${CX_HERO_MANUAL_HANDLE} I couldn't resolve a Hero for \`${targetRepoFullName}\`. Could you please route this manually? cc ${DOISTBOT_DEVS_MENTION} to update the hero mapping so future autofix PRs can be assigned automatically.`;
     return [
         HERO_AUTOFIX_MARKER,
         '',
@@ -282,9 +284,9 @@ export async function postAutoFixFailureComment({ octokit, ctx, reason, targetRe
         operation: existing ? 'update' : 'create',
     });
 }
-async function postFollowUpComment({ octokit, ctx, prUrl, prNumber, targetRepo, fixAssessment, }) {
-    const heroGroup = resolveHeroGroup([], targetRepo);
-    if (!heroGroup) {
+async function postFollowUpComment({ octokit, ctx, prUrl, prNumber, targetRepo, fixAssessment, requestedAssignees = [], }) {
+    const heroGroup = requestedAssignees.length > 0 ? null : resolveHeroGroup([], targetRepo);
+    if (!heroGroup && requestedAssignees.length === 0) {
         logger.warn('No hero mapping found for autofix target repo', {
             task: 'issue-triage',
             issueNumber: ctx.issueNumber,
@@ -297,6 +299,7 @@ async function postFollowUpComment({ octokit, ctx, prUrl, prNumber, targetRepo,
         targetRepoFullName: targetRepo.fullName,
         fixAssessment,
         heroMention: heroGroup?.mention ?? null,
+        requestedAssignees,
     });
     await octokit.rest.issues.createComment({
         owner: ctx.owner,
@@ -389,7 +392,7 @@ export async function runFixCore(input) {
         prompt,
         apiKey: ctx.openaiApiKey,
         cwd: targetRepo.localPath,
-        thinkingLevel: 'xhigh',
+        thinkingLevel: 'max',
         timeoutMs,
         extraEnv: {
             GH_TOKEN: input.ghToken,
@@ -438,7 +441,7 @@ export async function runFixCore(input) {
         return { ok: false, reason: 'Codex produced no file changes.' };
     }
     // Validate the diff — speculative fixes bypass the file-count limit since they
-    // are draft PRs intended as starting points that may touch more files.
+    // are starting-point PRs that may touch more files.
     const diffLimits = fixAssessment.classification === 'speculative' ? { maxChangedFiles: Infinity } : undefined;
     const validation = validateDiff(diff, diffLimits);
     if (!validation.valid) {
@@ -577,6 +580,7 @@ export async function attemptFix(input) {
             prTitle: coreResult.generatedPRTitle ?? undefined,
             prBody: coreResult.generatedPRBody ?? undefined,
             fixAssessment,
+            assigneeReview: input.assigneeReview,
         });
         // Post follow-up comment on the issue
         await postFollowUpComment({
@@ -586,6 +590,7 @@ export async function attemptFix(input) {
             prNumber: openedPr.prNumber,
             targetRepo: targetRepo.repository,
             fixAssessment,
+            requestedAssignees: openedPr.requestedAssignees,
         });
         logger.info('Fix attempt completed successfully', {
             task: 'issue-triage',

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

@@ -52,6 +52,7 @@ function toAttemptFixInput(input) {
         issueTitle: input.issueTitle,
         issueUrl: input.issueUrl,
         ghToken: input.ghToken,
+        assigneeReview: input.assigneeReview,
     };
 }
 function stateLogMeta(state) {
@@ -184,6 +185,7 @@ export async function runConfiguredFix(input) {
             issueUrl: input.issueUrl,
             ghToken: input.ghToken,
             pushToken: input.ctx.githubToken,
+            assigneeReview: input.assigneeReview,
             apiKeys: {
                 openai: input.ctx.openaiApiKey,
                 ...(input.ctx.geminiApiKey !== undefined && { gemini: input.ctx.geminiApiKey }),

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

@@ -3,10 +3,12 @@ import { withRetry } from '../../../core/retry.js';
 import { renderPriorityBadge } from '../../review/github-comment-format.js';
 import { runLocalReview as defaultRunLocalReview } from '../../review/local.js';
 import { parseSeverity } from '../../review/severity.js';
+import { hasAssigneeReviewRequest } from '../assignee-review.js';
 import { runFixCore as defaultRunFixCore, stripPRTitleSection } from '../fix-attempt.js';
 import { resolveHeroTeamSlug } from '../hero-group-map.js';
 import { FIX_LOOP_START_MARKER } from '../markers.js';
 import { commitAndPushFix as defaultCommitAndPushFix, commitAndPushIteration as defaultCommitAndPushIteration, openDraftFixPR as defaultOpenDraftFixPR, } from '../pr-creator.js';
+import { markPullRequestReady } from '../pr-readiness.js';
 export function buildFixLoopStartCommentBody(args) {
     const p0 = renderPriorityBadge('P0') ?? 'P0';
     const p1 = renderPriorityBadge('P1') ?? 'P1';
@@ -15,9 +17,9 @@ export function buildFixLoopStartCommentBody(args) {
         '',
         '### Working on a fix',
         '',
-        `I've opened a draft PR with an initial fix: ${args.prUrl}`,
+        `I've opened a PR with an initial fix: ${args.prUrl}`,
         '',
-        `The PR targets \`${args.targetRepoFullName}\`. I'll review it locally, iterate on ${p0} and ${p1} findings, and run CI. Once everything passes, I'll promote the PR out of draft and request a hero review on it.`,
+        `The PR targets \`${args.targetRepoFullName}\`. I'll review it locally, iterate on ${p0} and ${p1} findings, and run CI. Once everything passes, I'll mark the PR ready if it is still a draft. If review hasn't already been requested from an issue assignee, I'll request a hero review then.`,
     ].join('\n');
 }
 const DRY_RUN_HEAD_SHA = '0'.repeat(40);
@@ -184,6 +186,7 @@ export class DefaultLoopEffects {
             ...(input.generatedPRTitle ? { prTitle: input.generatedPRTitle } : {}),
             ...(input.generatedPRBody ? { prBody: input.generatedPRBody } : {}),
             fixAssessment: session.fixAssessment,
+            assigneeReview: session.assigneeReview,
         });
         await this.postFixStartedSourceIssueComment({
             prUrl: prResult.prUrl,
@@ -396,25 +399,12 @@ export class DefaultLoopEffects {
             }));
             return;
         }
-        // TODO: thread node_id through from the webhook handler's
-        // fetchPRPromotionState so this second pulls.get goes away.
-        const pr = await withRetry(() => this.session.octokit.rest.pulls.get({
+        await markPullRequestReady({
+            octokit: this.session.octokit,
             owner: this.session.targetRepo.repository.owner,
             repo: this.session.targetRepo.repository.repo,
-            pull_number: prNumber,
-        }));
-        // Idempotency: markPullRequestReadyForReview throws
-        // `UNPROCESSABLE: Pull request is not a draft` if the PR is already
-        // ready. On webhook redelivery the catch block in runPromotionFlow
-        // would re-arm awaiting-ci and loop on every subsequent CI event.
-        if (!pr.data.draft) {
-            return;
-        }
-        await withRetry(() => this.session.octokit.graphql(`mutation($pullRequestId: ID!) {
-                    markPullRequestReadyForReview(input: { pullRequestId: $pullRequestId }) {
-                        pullRequest { isDraft }
-                    }
-                }`, { pullRequestId: pr.data.node_id }));
+            prNumber,
+        });
     }
     async applyAskLabel(prNumber) {
         if (this.opts.dryRun) {
@@ -454,6 +444,18 @@ export class DefaultLoopEffects {
             }));
             return;
         }
+        // Read the durable receipt on the target PR, not the source issue.
+        // Do not infer success from the current requested_reviewers array:
+        // completed reviews disappear from that array before CI may finish.
+        if (await hasAssigneeReviewRequest({
+            octokit: this.session.octokit,
+            owner: this.session.targetRepo.repository.owner,
+            repo: this.session.targetRepo.repository.repo,
+            prNumber,
+        })) {
+            logger.info('Skipping Hero review: assignee review was already requested', this.logContext({ pr_number: prNumber }));
+            return;
+        }
         await withRetry(() => this.session.octokit.rest.pulls.requestReviewers({
             owner: this.session.targetRepo.repository.owner,
             repo: this.session.targetRepo.repository.repo,

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

@@ -1,19 +1,22 @@
-import { iterationLabel, PROMOTION_COMMENT_MARKER } from 'doistbot-shared-contracts';
+import { autofixFeedbackCommentMarker, iterationLabel } from 'doistbot-shared-contracts';
 import { logger } from '../../../core/logging.js';
 import { isFixLoopTerminal, isTerminal, next, } from './state-machine.js';
 const CI_FAILED_LABEL = 'doistbot:ci-failed';
 const NEEDS_HUMAN_LABEL = 'doistbot:needs-human';
 const AWAITING_CI_LABEL = 'doistbot:awaiting-ci';
-// Stamped on terminal comments so postIssueComment can find-or-update an
-// existing comment instead of double-posting when an earlier dispatch
-// succeeded on GitHub but the response timed out.
-//
-// The success and human-escalation paths use DISTINCT markers: merge tracking
-// reads 👍/👎 reactions on the promotion (success) comment to derive the thumbs
-// metric, so it must be uniquely identifiable. A shared marker would let a
-// CI-failed-then-human-merged bot PR expose its failure comment as the reaction
-// target instead.
-const PROMOTION_NEEDS_HUMAN_COMMENT_MARKER = '<!--doistbot-promotion-needs-human-comment-->';
+// Each terminal comment carries its outcome in the marker so retries update
+// the same reaction target and closure tracking can classify the result.
+export const PR_FEEDBACK_FOOTER = '<sub>🤖🫵 Please, react 👍 or 👎 on this comment to rate this bot-authored PR.</sub>';
+function withFeedbackFooter(body) {
+    return `${body}\n\n${PR_FEEDBACK_FOOTER}`;
+}
+async function postNeedsHumanFeedbackComment(effects, prNumber, body = 'This PR needs human review.') {
+    await effects.postIssueComment({
+        prNumber,
+        marker: autofixFeedbackCommentMarker('needs_human'),
+        body: withFeedbackFooter(body),
+    });
+}
 function formatFailedChecks(checks) {
     return checks.map((c) => (c.url ? `- [${c.name}](${c.url})` : `- ${c.name}`)).join('\n');
 }
@@ -107,15 +110,20 @@ export async function runFixLoop(input) {
     if (state.kind === 'PUSHED_AWAITING_CI' &&
         state.iteration !== undefined &&
         state.promotionPolicy.kind === 'doistbot_fix_ci') {
-        // Local review accepted the patch; hand off to CI. awaiting-ci is the
-        // contract the webhook handler keys on, so it must NOT appear until
-        // we reach this terminal — otherwise a fast CI suite can promote a
-        // patch the bot is still reviewing (or about to iterate on).
+        // Local review accepted the patch; hand off to CI. awaiting-ci must
+        // NOT appear earlier: a fast CI suite could otherwise finalize checks
+        // for a patch the bot is still reviewing or about to iterate on.
+        // Assignee-reviewed PRs may already be ready, but still need this handoff.
+        // The iter-N label event also triggers reconciliation if CI already
+        // finished before awaiting-ci existed. Keep both labels in one call.
         await tryApplyLabels(effects, state.prNumber, [
             AWAITING_CI_LABEL,
             iterationLabel(state.iteration),
         ]);
     }
+    if (state.kind === 'DONE_NEEDS_HUMAN' && state.prNumber !== undefined) {
+        await postNeedsHumanFeedbackComment(effects, state.prNumber);
+    }
     return state;
 }
 async function tryApplyLabels(effects, prNumber, labels) {
@@ -123,7 +131,7 @@ async function tryApplyLabels(effects, prNumber, labels) {
         await effects.applyLabels({ prNumber, labels });
     }
     catch (error) {
-        logger.error('fix-loop: failed to apply tracking labels to draft PR', {
+        logger.error('fix-loop: failed to apply tracking labels to PR', {
             task: 'fix-loop',
             pr_number: prNumber,
             labels,
@@ -170,22 +178,19 @@ export async function runPromotionFlow(effects, input) {
             return state;
         }
         if (state.kind === 'DONE_PROMOTED') {
-            // Order matters: promoteToReady flips the PR out of draft and is
-            // effectively irreversible. Run it LAST so any failure on the
-            // reviewer/ask/comment steps re-arms awaiting-ci while the PR
-            // is still a draft — the next delivery re-runs the full sequence
-            // cleanly instead of seeing a half-promoted PR.
             await effects.requestHeroReview(input.prNumber);
             await effects.applyAskLabel(input.prNumber);
+            // Publish the successful validation outcome before making a
+            // remaining draft ready, so an immediate merge cannot beat the
+            // feedback comment and closure tracking.
             await effects.postIssueComment({
                 prNumber: input.prNumber,
-                marker: PROMOTION_COMMENT_MARKER,
-                // This comment doubles as the thumbs-feedback prompt: merge
+                marker: autofixFeedbackCommentMarker('success'),
+                // This comment doubles as the thumbs-feedback prompt: closure
                 // tracking reads 👍/👎 reactions on this exact comment (located
-                // via the marker above) when the PR merges. Keep the reaction
+                // via the marker above) when the PR closes. Keep the reaction
                 // ask on the comment people are invited to react to.
-                body: 'CI passed — promoting this PR out of draft and requesting hero review.\n\n' +
-                    '<sub>🤖🫵 Please, react 👍 or 👎 on this comment to rate this bot-authored PR.</sub>',
+                body: withFeedbackFooter('CI passed. Review has been requested; any remaining draft status will be cleared.'),
             });
             await effects.promoteToReady(input.prNumber);
             return state;
@@ -200,11 +205,7 @@ export async function runPromotionFlow(effects, input) {
                 : ciStatus.kind === 'no_checks'
                     ? 'No CI checks ran on this PR — please verify manually before merging.'
                     : 'This PR needs human review.';
-            await effects.postIssueComment({
-                prNumber: input.prNumber,
-                marker: PROMOTION_NEEDS_HUMAN_COMMENT_MARKER,
-                body,
-            });
+            await postNeedsHumanFeedbackComment(effects, input.prNumber, body);
             return state;
         }
         if (!isTerminal(state)) {

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

@@ -0,0 +1,2 @@
+/** Deadline for autofix reviewer routing and PR readiness requests. */
+export const GITHUB_REQUEST_TIMEOUT_MS = 15_000;