@doist/doistbot-cli 1.0.13 → 1.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@doist/doistbot-cli",
-    "version": "1.0.13",
+    "version": "1.0.15",
     "description": "Local self-review CLI for Doistbot",
     "type": "module",
     "main": "dist/index.js",
@@ -40,8 +40,8 @@
         "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",
+        "@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",
@@ -51,7 +51,7 @@
         "commander": "14.0.3",
         "js-yaml": "4.3.2",
         "octokit": "5.0.5",
-        "undici": "8.10.2",
+        "undici": "8.11.2",
         "yocto-spinner": "1.2.2"
     },
     "devDependencies": {

package/sandbox/_node_modules/doistbot-logging/dist/index.d.ts

@@ -7,6 +7,8 @@ export type LoggerOptions = {
     suppressLogs?: (level: LogLevel) => boolean;
     suppressInfoLogs?: () => boolean;
     includeLogField?: boolean;
+    /** Receives serialized JSON without a trailing newline. The writer must add one. */
+    write?: (line: string) => void;
     buildInfo?: {
         version: number;
         commit: string;

package/sandbox/_node_modules/doistbot-logging/dist/index.js

@@ -33,8 +33,14 @@ export function createLogger(options = {}) {
         }
         Object.assign(payload, traceInfo);
         payload.meta = metaInfo;
-        // eslint-disable-next-line no-console
-        console.log(JSON.stringify(payload));
+        const line = JSON.stringify(payload);
+        if (options.write) {
+            options.write(line);
+        }
+        else {
+            // eslint-disable-next-line no-console
+            console.log(line);
+        }
     }
     return {
         info: (message, meta) => log('info', message, meta),

package/sandbox/dist/core/pi-tool-output-filter-extension.js

@@ -0,0 +1,59 @@
+import { writeSync } from 'node:fs';
+import { scrubPii } from './pii-scrubber.js';
+// Pi applies tool_result changes before sending the result to the model. Filter
+// all text tools so redirecting CLI output to a file cannot bypass filtering.
+// eslint-disable-next-line import/no-default-export
+export default function toolOutputFilterExtension(pi) {
+    const secrets = Object.entries(process.env)
+        .filter(([key, value]) => /(?:KEY|TOKEN|PASSWORD|SECRET)$/.test(key) && value && value.length >= 8)
+        .map(([, value]) => value);
+    function filterText(value) {
+        for (const secret of secrets)
+            value = value.split(secret).join('[REDACTED_SECRET]');
+        return scrubPii(value);
+    }
+    function filterValue(value) {
+        if (typeof value === 'string')
+            return filterText(value);
+        if (Array.isArray(value))
+            return value.map(filterValue);
+        if (value && typeof value === 'object')
+            return Object.fromEntries(Object.entries(value).map(([key, entry]) => [filterText(key), filterValue(entry)]));
+        return value;
+    }
+    pi.on('tool_call', (event) => {
+        try {
+            // Pi redirects process.stdout writes to stderr in JSON mode.
+            // Write this protocol record directly to its stdout pipe.
+            writeSync(1, `${JSON.stringify({
+                type: 'doistbot_tool_audit',
+                tool: event.toolName,
+                // Audit queries/commands, never service response bodies.
+                input: JSON.stringify(filterValue(event.input)).slice(0, 8_000),
+            })}\n`);
+        }
+        catch {
+            return { block: true, reason: 'Tool query could not be safely recorded.' };
+        }
+        return undefined;
+    });
+    pi.on('tool_result', (event) => {
+        try {
+            return {
+                content: event.content.map((item) => item.type === 'text' ? { ...item, text: filterText(item.text) } : item),
+                details: filterValue(event.details ?? null),
+            };
+        }
+        catch {
+            // Pi otherwise ignores extension errors and keeps the original
+            // result. Explicitly replace it so a filter failure cannot leak text.
+            return {
+                content: [
+                    { type: 'text', text: 'Tool output withheld: filtering failed.' },
+                ],
+                details: null,
+                isError: true,
+            };
+        }
+    });
+}

package/sandbox/dist/core/pi.js

@@ -3,7 +3,9 @@ import { mkdtempSync, rmSync, writeFileSync } from 'fs';
 import { tmpdir } from 'os';
 import path from 'path';
 import { fileURLToPath } from 'url';
+import { logger } from './logging.js';
 import { PI_EXECUTION_LIMIT_ENV } from './pi-execution-limits-extension.js';
+import { approvedSkillArgs, buildToolEnvironment } from './tool-environment.js';
 export function toPiInvocationTelemetryFields(telemetry) {
     return {
         turn_count: telemetry.turnCount,
@@ -54,7 +56,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.1-sol',
 };
 export const DEFAULT_OPENROUTER_MODELS = {
     deepseek: 'deepseek/deepseek-v4-pro-0813',
@@ -95,6 +97,7 @@ function resolvePiCliPath() {
 }
 const PI_CLI_PATH = resolvePiCliPath();
 const PI_EXECUTION_LIMIT_EXTENSION_PATH = fileURLToPath(new URL('./pi-execution-limits-extension.js', import.meta.url));
+const PI_TOOL_OUTPUT_FILTER_EXTENSION_PATH = fileURLToPath(new URL('./pi-tool-output-filter-extension.js', import.meta.url));
 let cachedNodeExecutable;
 let cachedOpenRouterSessionExtensionPath;
 export function resolveNodeExecutable({ execPath = process.execPath, argv0 = process.argv0, canExecute = canExecuteNode, } = {}) {
@@ -416,7 +419,11 @@ export function createPiInvoker({ provider, apiKey, piProviderId, cwd, extraEnv,
                 'json',
                 '--no-session',
                 '--no-extensions',
+                ...(process.env.SANDBOX_PROFILE
+                    ? ['--extension', PI_TOOL_OUTPUT_FILTER_EXTENSION_PATH]
+                    : []),
                 '--no-skills',
+                ...approvedSkillArgs(),
                 '--no-prompt-templates',
                 ...(noContextFiles ? ['--no-context-files'] : []),
                 '--model',
@@ -428,21 +435,11 @@ export function createPiInvoker({ provider, apiKey, piProviderId, cwd, extraEnv,
                 ...executionLimitExtension.args,
                 ...imageArgs,
             ];
-            const inheritedEnv = {
-                ...process.env,
-            };
-            // Repository-scoped credentials must be passed explicitly through
-            // extraEnv by an authorized task invocation.
-            delete inheritedEnv.GH_PACKAGES_TOKEN;
-            const childEnv = {
-                ...inheritedEnv,
-                HOME: process.env.HOME,
-                PATH: process.env.PATH,
-                GIT_TERMINAL_PROMPT: '0',
+            const childEnv = buildToolEnvironment({
                 ...extraEnv,
                 ...openRouterSessionExtension.extraEnv,
                 ...executionLimitExtension.extraEnv,
-            };
+            });
             const apiKeyEnvVar = PI_API_KEY_ENV_VAR_BY_PI_PROVIDER[resolvedPiProviderId];
             if (piAuthProviderId) {
                 delete childEnv[apiKeyEnvVar];
@@ -450,7 +447,6 @@ export function createPiInvoker({ provider, apiKey, piProviderId, cwd, extraEnv,
             else {
                 childEnv[apiKeyEnvVar] = apiKey;
             }
-            delete childEnv.GITHUB_TOKEN;
             try {
                 const child = spawn(resolveNodeExecutable(), args, {
                     cwd,
@@ -576,6 +572,13 @@ export function createPiInvoker({ provider, apiKey, piProviderId, cwd, extraEnv,
                         }
                         try {
                             const parsed = JSON.parse(trimmed);
+                            if (parsed.type === 'doistbot_tool_audit') {
+                                logger.info('Sandbox tool query', {
+                                    tool: parsed.tool,
+                                    input: parsed.input,
+                                });
+                                continue;
+                            }
                             if (parsed.type === 'session') {
                                 sessionHeaderSeen = true;
                                 continue;

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

@@ -1 +1 @@
-export { APP_LABEL_ALIASES, APP_TO_ROUTE_SELECTORS, findIntegrationRoute, findIntegrationRoutes, findIssueRoute, 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';
+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/core/tool-environment.js

@@ -0,0 +1,22 @@
+/** Prepare credentials for Pi shell tools. */
+export function buildToolEnvironment(extraEnv = {}, inherited = process.env) {
+    const env = { ...inherited };
+    delete env.GH_PACKAGES_TOKEN;
+    Object.assign(env, extraEnv);
+    delete env.GITHUB_TOKEN;
+    delete env.PRIVATE_KEY;
+    env.GIT_TERMINAL_PROMPT = '0';
+    env.DD_API_KEY = env.DD_API_KEY ?? env.DATADOG_API_KEY;
+    env.DD_APP_KEY = env.DD_APP_KEY ?? env.DATADOG_APP_KEY;
+    env.DD_SITE = env.DD_SITE?.trim() || env.DATADOG_SITE?.trim() || 'datadoghq.com';
+    return env;
+}
+export function approvedSkillArgs(env = process.env) {
+    if (!env.SANDBOX_PROFILE)
+        return [];
+    const skills = ['/app/apps/sandbox/skills/investigation/SKILL.md'];
+    if (env.SANDBOX_PROFILE === 'android') {
+        skills.push('/app/apps/sandbox/skills/agent-device/SKILL.md');
+    }
+    return skills.flatMap((skill) => ['--skill', skill]);
+}

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-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

@@ -9,6 +9,7 @@ import { CX_HERO_MANUAL_HANDLE, resolveHeroGroup } from './hero-group-map.js';
 import { AUTOFIX_FAILURE_MARKER, FIX_LOOP_START_MARKER, HERO_AUTOFIX_MARKER } from './markers.js';
 import { invokeTriageModel } from './model.js';
 import { commitAndPushFix, findPRTemplate, openDraftFixPR } from './pr-creator.js';
+import { sandboxEnvironmentError } from './sandbox-environment.js';
 const FIX_PROMPT_FILE = 'issue-triage-fix-prompt.md';
 // Maximum time allowed for the Codex fix-generation invocation before we abort
 const AUTO_FIX_CODEX_TIMEOUT_MS = 45 * 60 * 1000;
@@ -147,13 +148,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 +285,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 +300,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,
@@ -327,6 +331,9 @@ export async function runFixCore(input) {
             reason: buildFixAssessmentSkipReason(fixAssessment),
         };
     }
+    const environmentError = sandboxEnvironmentError(targetRepo.repository.fullName);
+    if (environmentError)
+        return { ok: false, reason: environmentError };
     const capabilityEnvResult = resolveAutofixCapabilityEnv(targetRepo.repository.fullName);
     if (!capabilityEnvResult.ok) {
         return capabilityEnvResult;
@@ -389,7 +396,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 +445,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 +584,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 +594,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;

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

@@ -1,5 +1,5 @@
 import { normalizeScopedLabelValue, scopedLabelValue } from '../../core/label-parsing.js';
-import { APP_LABEL_ALIASES, findIntegrationRoute, findIntegrationRoutes, findIssueRoute, findRepositoryRoutes, findRepositoryTarget as findRoutingRepositoryTarget, INTEGRATION_LABEL_ALIASES, PRODUCT_LABEL_ALIASES, PRODUCT_ROUTES, } from '../../core/repository-map.js';
+import { APP_LABEL_ALIASES, findIntegrationRoute, findIssueRoute, findOwningRoutes, findRepositoryTarget as findRoutingRepositoryTarget, INTEGRATION_LABEL_ALIASES, 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' },
@@ -181,13 +181,7 @@ export function resolveHeroGroup(labels, primaryRepo) {
         return null;
     }
     if (primaryRepo) {
-        // A repository carried by both a product route and an integration route —
-        // todoist-macos owns the Safari extension, for example — keeps the product
-        // route's hero, so integration routes only cover integration-only repos.
-        const productRoutes = findRepositoryRoutes(primaryRepo);
-        const repositoryHeroKeys = new Set(productRoutes.length > 0
-            ? productRoutes.map((route) => route.heroTeam)
-            : findIntegrationRoutes(primaryRepo).map((route) => route.heroTeam));
+        const repositoryHeroKeys = new Set(findOwningRoutes(primaryRepo).map((route) => route.heroTeam));
         if (repositoryHeroKeys.size === 1) {
             return HERO_GROUPS[repositoryHeroKeys.values().next().value];
         }

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

@@ -1,3 +1,4 @@
 export const HERO_AUTOFIX_MARKER = '<!--doistbot-autofix-followup-->';
+export const ASSIGNEE_REVIEW_MARKER = '<!--doistbot-assignee-review-requested-->';
 export const FIX_LOOP_START_MARKER = '<!--doistbot-fixloop-start-->';
 export const AUTOFIX_FAILURE_MARKER = '<!--doistbot-autofix-failure-->';

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

@@ -4,6 +4,10 @@ import path from 'path';
 import { DOISTBOT_AUTO_FIX_LABEL, DOISTBOT_SPECULATIVE_FIX_LABEL } from 'doistbot-shared-contracts';
 import { logger } from '../../core/logging.js';
 import { fillPromptTemplate, loadPromptTemplateFile, resolvePromptFile, } from '../../core/prompt-template.js';
+import { withRetry } from '../../core/retry.js';
+import { requestAssigneeReview } from './assignee-review.js';
+import { GITHUB_REQUEST_TIMEOUT_MS } from './github-request.js';
+import { markPullRequestReady } from './pr-readiness.js';
 const PR_TEMPLATE_PATHS = [
     '.github/pull_request_template.md',
     '.github/PULL_REQUEST_TEMPLATE.md',
@@ -241,7 +245,7 @@ export async function commitAndPushFix(input) {
 /**
  * Commits + pushes a second fix attempt on the EXISTING iter-0 branch. Unlike
  * commitAndPushFix, this does not create a new branch — callers (the fix loop's
- * iter-1 path) need the existing draft PR to pick up the new commit, which only
+ * iter-1 path) need the existing PR to pick up the new commit, which only
  * works if we push to the same branch the PR was opened from.
  *
  * Assumes the working tree already has the iter-1 changes staged (typically by
@@ -272,6 +276,7 @@ export async function commitAndPushIteration(input) {
     });
     return { headSha };
 }
+/** Opens a draft, then marks it ready if an eligible assignee review was requested. */
 export async function openDraftFixPR(input) {
     const prBody = input.prBody
         ? stripEmptySections(input.prBody)
@@ -298,6 +303,13 @@ export async function openDraftFixPR(input) {
         base: repo.default_branch,
         draft: true,
     });
+    const requestedAssignees = await requestAssigneeReview({
+        owner: input.repoOwner,
+        repo: input.repoName,
+        prNumber: pr.number,
+        octokit: input.octokit,
+        assigneeReview: input.assigneeReview,
+    });
     try {
         const prLabel = input.fixAssessment?.classification === 'speculative'
             ? DOISTBOT_SPECULATIVE_FIX_LABEL
@@ -307,6 +319,7 @@ export async function openDraftFixPR(input) {
             repo: input.repoName,
             issue_number: pr.number,
             labels: [prLabel],
+            request: { signal: AbortSignal.timeout(GITHUB_REQUEST_TIMEOUT_MS) },
         });
     }
     catch (error) {
@@ -317,6 +330,50 @@ export async function openDraftFixPR(input) {
             error: error instanceof Error ? error.message : String(error),
         });
     }
+    if (requestedAssignees.length > 0) {
+        // Apply the autofix label before emitting ready_for_review. An accepted
+        // assignee request is sufficient, even if writing its receipt failed.
+        try {
+            await markPullRequestReady({
+                octokit: input.octokit,
+                owner: input.repoOwner,
+                repo: input.repoName,
+                prNumber: pr.number,
+            });
+            logger.info('Assignee-reviewed fix PR marked ready', {
+                task: 'issue-triage',
+                repository: `${input.repoOwner}/${input.repoName}`,
+                prNumber: pr.number,
+            });
+        }
+        catch (error) {
+            // The PR and review request already exist. Preserve both and keep
+            // the fix loop running rather than reporting PR creation failure.
+            logger.warn('Failed to mark assignee-reviewed fix PR ready', {
+                task: 'issue-triage',
+                repository: `${input.repoOwner}/${input.repoName}`,
+                prNumber: pr.number,
+                error: error instanceof Error ? error.message : String(error),
+            });
+            try {
+                await withRetry(() => input.octokit.rest.issues.createComment({
+                    owner: input.repoOwner,
+                    repo: input.repoName,
+                    issue_number: pr.number,
+                    body: "Review was requested from the issue assignees, but I couldn't confirm that this PR was marked ready for review. Please check its status and mark it ready manually if needed.",
+                    request: { signal: AbortSignal.timeout(GITHUB_REQUEST_TIMEOUT_MS) },
+                }));
+            }
+            catch (commentError) {
+                logger.warn('Failed to report fix PR readiness failure', {
+                    task: 'issue-triage',
+                    repository: `${input.repoOwner}/${input.repoName}`,
+                    prNumber: pr.number,
+                    error: commentError instanceof Error ? commentError.message : String(commentError),
+                });
+            }
+        }
+    }
     logger.info('Fix PR created', {
         task: 'issue-triage',
         repository: `${input.repoOwner}/${input.repoName}`,
@@ -327,5 +384,6 @@ export async function openDraftFixPR(input) {
     return {
         prUrl: pr.html_url,
         prNumber: pr.number,
+        ...(requestedAssignees.length > 0 && { requestedAssignees }),
     };
 }

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

@@ -0,0 +1,25 @@
+import { withRetry } from '../../core/retry.js';
+import { GITHUB_REQUEST_TIMEOUT_MS } from './github-request.js';
+/** Safe both at creation and when the later CI-driven promotion runs. */
+export async function markPullRequestReady({ octokit, owner, repo, prNumber, }) {
+    // Re-read on every attempt: a mutation may have succeeded even if its
+    // response was lost. Repeating that mutation on a ready PR would fail.
+    await withRetry(async () => {
+        const { data: pr } = await octokit.rest.pulls.get({
+            owner,
+            repo,
+            pull_number: prNumber,
+            request: { signal: AbortSignal.timeout(GITHUB_REQUEST_TIMEOUT_MS) },
+        });
+        if (!pr.draft)
+            return;
+        await octokit.graphql(`mutation($pullRequestId: ID!) {
+                markPullRequestReadyForReview(input: { pullRequestId: $pullRequestId }) {
+                    pullRequest { isDraft }
+                }
+            }`, {
+            pullRequestId: pr.node_id,
+            request: { signal: AbortSignal.timeout(GITHUB_REQUEST_TIMEOUT_MS) },
+        });
+    });
+}

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

@@ -0,0 +1,53 @@
+import { repositorySandboxProfile, SANDBOX_PROFILES } from 'doistbot-issue-routing';
+function readSelection() {
+    if (!process.env.SANDBOX_SELECTION)
+        return undefined;
+    const selection = JSON.parse(process.env.SANDBOX_SELECTION);
+    function strings(value) {
+        return Array.isArray(value) && value.every((item) => typeof item === 'string');
+    }
+    if (!selection ||
+        !strings(selection.repositories) ||
+        !strings(selection.labels) ||
+        !strings(selection.verificationLimits) ||
+        typeof selection.reason !== 'string' ||
+        (selection.profile !== 'legacy' &&
+            (!SANDBOX_PROFILES.includes(selection.profile) || typeof selection.image !== 'string')))
+        throw new Error('Invalid sandbox selection.');
+    return selection;
+}
+/** Check image identity only. Repo setup and required checks belong to issue #524. */
+export function sandboxEnvironmentError(repository) {
+    let selection;
+    try {
+        selection = readSelection();
+    }
+    catch {
+        return 'Invalid sandbox selection.';
+    }
+    if (!selection)
+        return undefined;
+    if (!selection.repositories.some((candidate) => candidate.toLowerCase() === repository.toLowerCase()))
+        return 'Fix target is outside the recorded sandbox scope.';
+    // Mixed scopes deliberately retain the existing image and autofix behavior.
+    if (selection.profile === 'legacy')
+        return undefined;
+    const profile = repositorySandboxProfile(repository, selection.labels);
+    if (selection.profile !== profile ||
+        process.env.SANDBOX_PROFILE !== profile ||
+        process.env.SANDBOX_IMAGE_ID !== selection.image)
+        return 'Unsupported fix environment: target needs a different image. Cross-image fix dispatch is not enabled.';
+    return undefined;
+}
+export function describeSandboxEnvironment() {
+    let selection;
+    try {
+        selection = readSelection();
+    }
+    catch {
+        return '\n\nSandbox selection is invalid; automatic fixes are unavailable.';
+    }
+    if (!selection)
+        return '';
+    return `\n\n## Sandbox environment\nProfile: ${selection.profile}. ${selection.reason}\n${selection.verificationLimits.join('\n')}\nInstalled tools do not prove that repository builds or tests passed. Report only checks actually performed.`;
+}

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

@@ -17,6 +17,7 @@ import { fillTemplate, loadPromptTemplate } from './prompt.js';
 import { allRepositoriesAllow, createRepoConfigLoader, isAutoFixEnabled, isAutoTriageEnabled, } from './repo-config.js';
 import { resolveTriageScope } from './resolution.js';
 import { buildHeroRoutingComment, postTriageRouting, shouldPostHeroRoutingComment, } from './routing.js';
+import { describeSandboxEnvironment } from './sandbox-environment.js';
 import { createGitHubClients, getIssueUrl, prepareWorkspaceReposDirectory } from './shared.js';
 import { deleteAutoTriagePlaceholder, postTriageOutput } from './side-effects.js';
 const MAX_ISSUE_BODY_CHARS = 8_000;
@@ -238,7 +239,7 @@ async function runIssueTriagePipeline(ctx, mode) {
                 type: 'installation',
                 installationId: ctx.installationId,
             }));
-            const prompt = buildPrompt({
+            let prompt = buildPrompt({
                 ctx,
                 issue,
                 comments,
@@ -247,6 +248,7 @@ async function runIssueTriagePipeline(ctx, mode) {
                 decisionPath: resolution.decisionPath,
                 enableAutoFix,
             });
+            prompt += describeSandboxEnvironment();
             const triageResult = await invokeTriageModel({
                 prompt,
                 apiKey: ctx.openaiApiKey,
@@ -254,7 +256,7 @@ async function runIssueTriagePipeline(ctx, mode) {
                 extraEnv: {
                     GH_TOKEN: issueInstallationAuth.token,
                 },
-                thinkingLevel: 'high',
+                thinkingLevel: 'xhigh',
             });
             if (!triageResult.ok) {
                 await postFinalTriageComment(buildTriageFailureMessage(triageResult.error));
@@ -318,6 +320,10 @@ async function runIssueTriagePipeline(ctx, mode) {
                     issueUrl: issue.html_url ?? getIssueUrl(ctx.owner, ctx.repo, ctx.issueNumber),
                     ghToken: issueInstallationAuth.token,
                     loadRepoConfig: getCachedRepoConfig,
+                    assigneeReview: {
+                        assignees: (issue.assignees ?? []).map((assignee) => assignee.login),
+                        membershipOctokit: readOctokit,
+                    },
                 });
                 logger.info('triage.fix_attempted', {
                     task: 'issue-triage',

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

@@ -3,7 +3,7 @@ export function getReviewThinkingLevel(model) {
         case 'deepseek':
             return 'high';
         case 'openai':
-            return 'high';
+            return 'xhigh';
         case 'grok':
             return 'high';
         case 'zai':

package/sandbox/node_modules/doistbot-logging/dist/index.d.ts

@@ -7,6 +7,8 @@ export type LoggerOptions = {
     suppressLogs?: (level: LogLevel) => boolean;
     suppressInfoLogs?: () => boolean;
     includeLogField?: boolean;
+    /** Receives serialized JSON without a trailing newline. The writer must add one. */
+    write?: (line: string) => void;
     buildInfo?: {
         version: number;
         commit: string;

package/sandbox/node_modules/doistbot-logging/dist/index.js

@@ -33,8 +33,14 @@ export function createLogger(options = {}) {
         }
         Object.assign(payload, traceInfo);
         payload.meta = metaInfo;
-        // eslint-disable-next-line no-console
-        console.log(JSON.stringify(payload));
+        const line = JSON.stringify(payload);
+        if (options.write) {
+            options.write(line);
+        }
+        else {
+            // eslint-disable-next-line no-console
+            console.log(line);
+        }
     }
     return {
         info: (message, meta) => log('info', message, meta),

package/sandbox/src/review/prompts/service-production-readiness.md

@@ -73,6 +73,8 @@ Any state that must survive restarts must be stored externally, e.g.:
 
 Local disk may be used only for temporary data.
 
+Durable state must be backed up. DynamoDB tables must have [point-in-time recovery](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Point-in-time-recovery.html) enabled and carry the account's `Backup` tag so the AWS Backup plan selects them. Caches, lock tables and short-lived session tables with a TTL are exempt.
+
 ## Resource Limits
 
 Define expected CPU, memory, network, and local disk usage.