@doist/doistbot-cli 1.0.0 → 1.0.1

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

@@ -5,7 +5,7 @@ import { validateDiff } from './diff-validator.js';
 import { CX_HERO_MANUAL_HANDLE, resolveHeroGroup } from './hero-group-map.js';
 import { HERO_AUTOFIX_MARKER } from './markers.js';
 import { invokeTriageModel } from './model.js';
-import { createFixPR, findPRTemplate } from './pr-creator.js';
+import { commitAndPushFix, findPRTemplate, openDraftFixPR } from './pr-creator.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;
@@ -91,6 +91,31 @@ function buildFixPrompt({ ctx, triageOutput, fixAssessment, issueTitle, issueUrl
         PR_TEMPLATE_SECTION: prTemplate ? buildPRTemplateSection(prTemplate) : '',
     });
 }
+function formatPreviousFinding(finding) {
+    const tag = finding.severity ? `[${finding.severity}] ` : '';
+    const body = finding.body.trim().replace(/\s+/g, ' ');
+    return `- ${tag}${finding.path}:${finding.line}: ${body}`;
+}
+export function buildPreviousFindingsSection(findings) {
+    return [
+        '# Previous Review Findings',
+        '',
+        'A prior fix attempt for this issue was reviewed and the following issues were',
+        'flagged. Address each finding in your new fix attempt before producing the diff:',
+        '',
+        ...findings.map(formatPreviousFinding),
+        '',
+        '---',
+        '',
+    ].join('\n');
+}
+export function buildFixPromptWithFindings(input) {
+    const basePrompt = buildFixPrompt(input);
+    if (!input.previousFindings || input.previousFindings.length === 0) {
+        return basePrompt;
+    }
+    return buildPreviousFindingsSection(input.previousFindings) + basePrompt;
+}
 function captureGitDiff(repoLocalPath) {
     try {
         // Stage all changes (including new untracked files) so they appear in the diff
@@ -166,55 +191,13 @@ async function postFollowUpComment({ octokit, ctx, prUrl, prNumber, targetRepo,
         heroGroup: heroGroup?.key ?? null,
     });
 }
-export async function attemptFix(input) {
-    const { ctx, octokit, triageOutput, fixAssessment, clonedRepos, force } = input;
-    const startedAt = Date.now();
-    const fallbackRepository = fixAssessment.targetRepo ??
-        (clonedRepos.length === 1 ? clonedRepos[0].fullName : `${ctx.owner}/${ctx.repo}`);
-    if (!force && !shouldAttemptFix(fixAssessment)) {
-        logger.info('Fix attempt skipped — assessment does not qualify', {
-            task: 'issue-triage',
-            issueNumber: ctx.issueNumber,
-            classification: fixAssessment.classification,
-            confidence: fixAssessment.confidence,
-        });
-        return {
-            attempted: false,
-            repository: fallbackRepository,
-            reason: `Assessment: ${fixAssessment.classification} (confidence: ${fixAssessment.confidence})`,
-        };
-    }
-    if (clonedRepos.length === 0) {
-        return {
-            attempted: false,
-            repository: fallbackRepository,
-            reason: 'No cloned repositories available for fix attempt.',
-        };
-    }
-    const matched = fixAssessment.targetRepo
-        ? clonedRepos.find((r) => r.fullName === fixAssessment.targetRepo)
-        : clonedRepos.length === 1
-            ? clonedRepos[0]
-            : undefined;
-    if (!matched) {
-        return {
-            attempted: false,
-            repository: fallbackRepository,
-            reason: `Unable to resolve a unique target repository from assessment: ${fixAssessment.targetRepo ?? 'missing targetRepo'}`,
-        };
-    }
-    const targetRepo = matched;
-    logger.info('Fix attempt starting', {
-        task: 'issue-triage',
-        issueNumber: ctx.issueNumber,
-        targetRepo: targetRepo.fullName,
-        trigger: ctx.triggerType,
-    });
+export async function runFixCore(input) {
+    const { ctx, triageOutput, fixAssessment, targetRepo, resetTo = 'HEAD' } = input;
     // Reset repo to clean state before fix attempt (triage Codex may have modified files).
     // Use `git reset --hard` to clear both the working tree and the index, since
     // captureGitDiff stages files with `git add -A`.
     try {
-        execFileSync('git', ['reset', '--hard', 'HEAD'], {
+        execFileSync('git', ['reset', '--hard', resetTo], {
             cwd: targetRepo.localPath,
             encoding: 'utf8',
             stdio: 'pipe',
@@ -226,12 +209,17 @@ export async function attemptFix(input) {
         });
     }
     catch (error) {
+        const reason = error instanceof Error ? error.message : String(error);
         logger.warn('Failed to reset repo state before fix attempt', {
             task: 'issue-triage',
             issueNumber: ctx.issueNumber,
             targetRepo: targetRepo.fullName,
-            error: error instanceof Error ? error.message : String(error),
+            error: reason,
         });
+        return {
+            ok: false,
+            reason: `Failed to reset repository state before fix attempt: ${reason}`,
+        };
     }
     const prTemplate = findPRTemplate(targetRepo.localPath);
     if (prTemplate) {
@@ -243,7 +231,7 @@ export async function attemptFix(input) {
         });
     }
     // Run Codex to generate the fix
-    const prompt = buildFixPrompt({
+    const prompt = buildFixPromptWithFindings({
         ctx,
         triageOutput,
         fixAssessment,
@@ -251,6 +239,7 @@ export async function attemptFix(input) {
         issueUrl: input.issueUrl,
         targetRepo,
         prTemplate,
+        previousFindings: input.previousFindings,
     });
     const timeoutMs = fixAssessment.classification === 'speculative'
         ? SPECULATIVE_CODEX_TIMEOUT_MS
@@ -265,19 +254,14 @@ export async function attemptFix(input) {
         },
     });
     if (!codexResult.ok) {
-        logger.warn('Fix Codex invocation failed', {
+        logger.warn('Fix attempt invocation failed', {
             task: 'issue-triage',
             issueNumber: ctx.issueNumber,
             error: codexResult.error,
             timedOut: codexResult.timedOut,
             durationMs: codexResult.durationMs,
         });
-        return {
-            attempted: true,
-            repository: targetRepo.fullName,
-            prCreated: false,
-            reason: `Codex fix failed: ${codexResult.error}`,
-        };
+        return { ok: false, reason: `Fix attempt failed: ${codexResult.error}` };
     }
     const fixDescription = codexResult.output;
     logger.info('Fix Codex invocation completed', {
@@ -293,12 +277,7 @@ export async function attemptFix(input) {
             issueNumber: ctx.issueNumber,
             output: fixDescription.slice(0, 500),
         });
-        return {
-            attempted: true,
-            repository: targetRepo.fullName,
-            prCreated: false,
-            reason: 'Codex determined fix cannot be applied automatically.',
-        };
+        return { ok: false, reason: 'Codex determined fix cannot be applied automatically.' };
     }
     // Capture the diff
     const diff = captureGitDiff(targetRepo.localPath);
@@ -307,12 +286,7 @@ export async function attemptFix(input) {
             task: 'issue-triage',
             issueNumber: ctx.issueNumber,
         });
-        return {
-            attempted: true,
-            repository: targetRepo.fullName,
-            prCreated: false,
-            reason: 'Codex produced no file changes.',
-        };
+        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.
@@ -324,11 +298,91 @@ export async function attemptFix(input) {
             issueNumber: ctx.issueNumber,
             reason: validation.reason,
         });
+        return { ok: false, reason: `Diff validation failed: ${validation.reason}` };
+    }
+    const generatedPRTitle = parsePRTitleFromOutput(fixDescription);
+    if (generatedPRTitle) {
+        logger.info('Parsed PR title from Codex output', {
+            task: 'issue-triage',
+            issueNumber: ctx.issueNumber,
+            generatedPRTitle,
+        });
+    }
+    const generatedPRBody = parsePRBodyFromOutput(fixDescription);
+    if (generatedPRBody) {
+        logger.info('Parsed PR body from Codex output', {
+            task: 'issue-triage',
+            issueNumber: ctx.issueNumber,
+            prBodyChars: generatedPRBody.length,
+        });
+    }
+    return {
+        ok: true,
+        codexOutput: fixDescription,
+        diff,
+        generatedPRTitle,
+        generatedPRBody,
+    };
+}
+export async function attemptFix(input) {
+    const { ctx, octokit, triageOutput, fixAssessment, clonedRepos, force } = input;
+    const startedAt = Date.now();
+    const fallbackRepository = fixAssessment.targetRepo ??
+        (clonedRepos.length === 1 ? clonedRepos[0].fullName : `${ctx.owner}/${ctx.repo}`);
+    if (!force && !shouldAttemptFix(fixAssessment)) {
+        logger.info('Fix attempt skipped — assessment does not qualify', {
+            task: 'issue-triage',
+            issueNumber: ctx.issueNumber,
+            classification: fixAssessment.classification,
+            confidence: fixAssessment.confidence,
+        });
+        return {
+            attempted: false,
+            repository: fallbackRepository,
+            reason: `Assessment: ${fixAssessment.classification} (confidence: ${fixAssessment.confidence})`,
+        };
+    }
+    if (clonedRepos.length === 0) {
+        return {
+            attempted: false,
+            repository: fallbackRepository,
+            reason: 'No cloned repositories available for fix attempt.',
+        };
+    }
+    const matched = fixAssessment.targetRepo
+        ? clonedRepos.find((r) => r.fullName === fixAssessment.targetRepo)
+        : clonedRepos.length === 1
+            ? clonedRepos[0]
+            : undefined;
+    if (!matched) {
+        return {
+            attempted: false,
+            repository: fallbackRepository,
+            reason: `Unable to resolve a unique target repository from assessment: ${fixAssessment.targetRepo ?? 'missing targetRepo'}`,
+        };
+    }
+    const targetRepo = matched;
+    logger.info('Fix attempt starting', {
+        task: 'issue-triage',
+        issueNumber: ctx.issueNumber,
+        targetRepo: targetRepo.fullName,
+        trigger: ctx.triggerType,
+    });
+    const coreResult = await runFixCore({
+        ctx,
+        triageOutput,
+        fixAssessment,
+        targetRepo,
+        issueTitle: input.issueTitle,
+        issueUrl: input.issueUrl,
+        ghToken: input.ghToken,
+    });
+    if (!coreResult.ok) {
         return {
             attempted: true,
             repository: targetRepo.fullName,
             prCreated: false,
-            reason: `Diff validation failed: ${validation.reason}`,
+            reason: coreResult.reason,
         };
     }
     if (ctx.dryRun) {
@@ -336,7 +390,7 @@ export async function attemptFix(input) {
             task: 'issue-triage',
             issueNumber: ctx.issueNumber,
             targetRepo: targetRepo.fullName,
-            diffLines: diff.split('\n').length,
+            diffLines: coreResult.diff.split('\n').length,
         });
         return {
             attempted: true,
@@ -345,36 +399,28 @@ export async function attemptFix(input) {
             reason: 'Dry run — PR not created.',
         };
     }
-    const generatedPRTitle = parsePRTitleFromOutput(fixDescription);
-    if (generatedPRTitle) {
-        logger.info('Parsed PR title from Codex output', {
-            task: 'issue-triage',
-            issueNumber: ctx.issueNumber,
-            prTitleChars: generatedPRTitle.length,
-        });
-    }
-    const generatedPRBody = parsePRBodyFromOutput(fixDescription);
-    if (generatedPRBody) {
-        logger.info('Parsed PR body from Codex output', {
-            task: 'issue-triage',
-            issueNumber: ctx.issueNumber,
-            prBodyChars: generatedPRBody.length,
-        });
-    }
     try {
-        const prResult = await createFixPR({
+        const { branch } = await commitAndPushFix({
             repoOwner: targetRepo.owner,
             repoName: targetRepo.repo,
             repoLocalPath: targetRepo.localPath,
             githubToken: ctx.githubToken,
             issueNumber: ctx.issueNumber,
             issueTitle: input.issueTitle,
+            prTitle: coreResult.generatedPRTitle ?? undefined,
+        });
+        const prResult = await openDraftFixPR({
+            repoOwner: targetRepo.owner,
+            repoName: targetRepo.repo,
+            octokit,
+            issueNumber: ctx.issueNumber,
+            issueTitle: input.issueTitle,
             issueUrl: input.issueUrl,
             triageAnalysis: triageOutput,
-            fixDescription: stripPRTitleSection(fixDescription),
-            diff,
-            prTitle: generatedPRTitle ?? undefined,
-            prBody: generatedPRBody ?? undefined,
+            fixDescription: stripPRTitleSection(coreResult.codexOutput),
+            branch,
+            prTitle: coreResult.generatedPRTitle ?? undefined,
+            prBody: coreResult.generatedPRBody ?? undefined,
             fixAssessment,
         });
         // Post follow-up comment on the issue

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

@@ -1,7 +1,6 @@
 import { execFileSync } from 'child_process';
 import fs from 'fs';
 import path from 'path';
-import { Octokit } from 'octokit';
 import { logger } from '../../core/logging.js';
 import { fillPromptTemplate, loadPromptTemplateFile } from '../../core/prompt-template.js';
 const PR_TEMPLATE_PATHS = [
@@ -11,6 +10,7 @@ const PR_TEMPLATE_PATHS = [
     'PULL_REQUEST_TEMPLATE.md',
     'docs/pull_request_template.md',
 ];
+const GIT_PUSH_TIMEOUT_MS = 2 * 60 * 1000;
 export function findPRTemplate(repoLocalPath) {
     for (const templatePath of PR_TEMPLATE_PATHS) {
         const fullPath = path.join(repoLocalPath, templatePath);
@@ -81,6 +81,7 @@ function pushBranch({ repoLocalPath, branch, token, owner, repo, }) {
         cwd: repoLocalPath,
         encoding: 'utf8',
         stdio: 'pipe',
+        timeout: GIT_PUSH_TIMEOUT_MS,
         env: {
             ...process.env,
             GIT_CONFIG_COUNT: '1',
@@ -194,7 +195,7 @@ function buildPRBody({ issueNumber, issueUrl, triageAnalysis, fixDescription, fi
         ISSUE_NUMBER: String(issueNumber),
     });
 }
-export async function createFixPR(input) {
+export async function commitAndPushFix(input) {
     const branch = generateBranchName(input.issueNumber);
     logger.info('Creating fix PR', {
         task: 'issue-triage',
@@ -209,7 +210,6 @@ export async function createFixPR(input) {
         issueTitle: input.issueTitle,
         prTitle: input.prTitle,
     });
-    const octokit = new Octokit({ auth: input.githubToken });
     pushBranch({
         repoLocalPath: input.repoLocalPath,
         branch,
@@ -217,11 +217,19 @@ export async function createFixPR(input) {
         owner: input.repoOwner,
         repo: input.repoName,
     });
+    const headSha = execFileSync('git', ['rev-parse', 'HEAD'], {
+        cwd: input.repoLocalPath,
+        encoding: 'utf8',
+        stdio: 'pipe',
+    }).trim();
     logger.info('Fix branch pushed, creating draft PR', {
         task: 'issue-triage',
         repository: `${input.repoOwner}/${input.repoName}`,
         branch,
     });
+    return { branch, headSha };
+}
+export async function openDraftFixPR(input) {
     const prBody = input.prBody
         ? stripEmptySections(input.prBody)
         : buildPRBody({
@@ -231,19 +239,19 @@ export async function createFixPR(input) {
             fixDescription: input.fixDescription,
             fixAssessment: input.fixAssessment,
         });
-    const { data: repo } = await octokit.rest.repos.get({
+    const { data: repo } = await input.octokit.rest.repos.get({
         owner: input.repoOwner,
         repo: input.repoName,
     });
     const prTitle = input.prTitle
         ? `${input.prTitle} (Doist/Issues#${input.issueNumber})`
         : `fix: ${input.issueTitle} (Doist/Issues#${input.issueNumber})`;
-    const { data: pr } = await octokit.rest.pulls.create({
+    const { data: pr } = await input.octokit.rest.pulls.create({
         owner: input.repoOwner,
         repo: input.repoName,
         title: prTitle,
         body: prBody,
-        head: branch,
+        head: input.branch,
         base: repo.default_branch,
         draft: true,
     });
@@ -251,7 +259,7 @@ export async function createFixPR(input) {
         const prLabel = input.fixAssessment?.classification === 'speculative'
             ? 'doistbot-speculative-fix'
             : 'doistbot-auto-fix';
-        await octokit.rest.issues.addLabels({
+        await input.octokit.rest.issues.addLabels({
             owner: input.repoOwner,
             repo: input.repoName,
             issue_number: pr.number,
@@ -271,11 +279,10 @@ export async function createFixPR(input) {
         repository: `${input.repoOwner}/${input.repoName}`,
         prNumber: pr.number,
         prUrl: pr.html_url,
-        branch,
+        branch: input.branch,
     });
     return {
         prUrl: pr.html_url,
         prNumber: pr.number,
-        branch,
     };
 }

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

@@ -1,9 +1,9 @@
 import { getRepoConfig } from 'doistbot-repo-config';
 export function isAutoFixEnabled(config) {
-    return config?.issue_triage?.enable_auto_fix === true;
+    return config?.issue_triage?.enable_auto_fix !== false;
 }
 export function isAutoTriageEnabled(config) {
-    return config?.issue_triage?.enable_auto_triage === true;
+    return config?.issue_triage?.enable_auto_triage !== false;
 }
 export function createRepoConfigLoader({ octokit, logger, }) {
     const cache = new Map();
@@ -22,3 +22,29 @@ export function createRepoConfigLoader({ octokit, logger, }) {
         return config;
     };
 }
+/**
+ * Returns true only when every repository allows the feature. Treats a config
+ * load error as an opt-out (fail closed) so transient GitHub API failures
+ * cannot silently override an explicit `enable_*: false`.
+ */
+export async function allRepositoriesAllow({ repositories, loadRepoConfig, isEnabled, feature, logger, }) {
+    for (const repository of repositories) {
+        let config;
+        try {
+            config = await loadRepoConfig(repository);
+        }
+        catch (error) {
+            logger.warn('Failed to load repo config; failing closed', {
+                component: 'issue-triage',
+                feature,
+                repository: repository.fullName,
+                error: error instanceof Error ? error.message : String(error),
+            });
+            return false;
+        }
+        if (!isEnabled(config)) {
+            return false;
+        }
+    }
+    return true;
+}

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

@@ -12,7 +12,7 @@ import { attemptFix } from './fix-attempt.js';
 import { invokeTriageModel } from './model.js';
 import { buildTriageFailureMessage, buildUnresolvedLabelsOutput, ensureStructuredTriageOutput, parseFixAssessment, REQUIRED_HEADINGS, } from './output.js';
 import { fillTemplate, loadPromptTemplate } from './prompt.js';
-import { createRepoConfigLoader, isAutoFixEnabled, isAutoTriageEnabled } from './repo-config.js';
+import { allRepositoriesAllow, createRepoConfigLoader, isAutoFixEnabled, isAutoTriageEnabled, } from './repo-config.js';
 import { buildHeroRoutingComment, postHeroRoutingComment, shouldPostHeroRoutingComment, } from './routing.js';
 import { cloneRepository, createGitHubClients, extractLabelNames, fetchIssue, fetchIssueComments, getIssueUrl, prepareWorkspaceReposDirectory, TRIAGE_MARKER, } from './shared.js';
 import { deleteAutoTriagePlaceholder, postIssueComment } from './side-effects.js';
@@ -246,17 +246,16 @@ async function runIssueTriagePipeline(ctx, mode) {
             logger,
         });
         if (ctx.triggerType === 'auto') {
-            let enableAutoTriage = false;
-            for (const repository of resolution.repositories) {
-                const config = await getCachedRepoConfig(repository);
-                if (isAutoTriageEnabled(config)) {
-                    enableAutoTriage = true;
-                    break;
-                }
-            }
+            const enableAutoTriage = await allRepositoriesAllow({
+                repositories: resolution.repositories,
+                loadRepoConfig: getCachedRepoConfig,
+                isEnabled: isAutoTriageEnabled,
+                feature: 'auto_triage',
+                logger,
+            });
             if (!enableAutoTriage) {
                 shouldRecordTriageMetric = false;
-                logger.info('Auto issue triage skipped: no resolved repository enables auto triage', {
+                logger.info('Auto issue triage skipped: a resolved repository disabled auto triage', {
                     task: 'issue-triage',
                     issueNumber: ctx.issueNumber,
                     resolvedRepos: resolution.repositories.map((repository) => repository.fullName),
@@ -264,14 +263,28 @@ async function runIssueTriagePipeline(ctx, mode) {
                 await deleteAutoTriagePlaceholder({
                     octokit: writeOctokit,
                     ctx,
-                    reason: 'auto_triage_not_enabled',
+                    reason: 'auto_triage_disabled',
                 });
                 return;
             }
         }
+        let enableAutoFix = ctx.enableAutoFixOverride ?? true;
+        if (ctx.enableAutoFixOverride === undefined) {
+            enableAutoFix = await allRepositoriesAllow({
+                repositories: resolution.repositories,
+                loadRepoConfig: getCachedRepoConfig,
+                isEnabled: isAutoFixEnabled,
+                feature: 'auto_fix',
+                logger,
+            });
+        }
         const reposDir = prepareWorkspaceReposDirectory();
         const clonedRepositories = [];
         const failedRepositories = [];
+        logger.info('Issue triage clone phase started', {
+            task: 'issue-triage',
+            issue_number: ctx.issueNumber,
+        });
         for (const repository of resolution.repositories) {
             try {
                 const cloneResult = await cloneRepository({
@@ -319,16 +332,6 @@ async function runIssueTriagePipeline(ctx, mode) {
             type: 'installation',
             installationId: ctx.installationId,
         }));
-        let enableAutoFix = ctx.enableAutoFixOverride ?? false;
-        if (ctx.enableAutoFixOverride === undefined) {
-            for (const { repository } of clonedRepositories) {
-                const config = await getCachedRepoConfig(repository);
-                if (isAutoFixEnabled(config)) {
-                    enableAutoFix = true;
-                    break;
-                }
-            }
-        }
         const prompt = buildPrompt({
             ctx,
             issue,
@@ -552,8 +555,12 @@ async function main() {
     try {
         await runIssueTriage(parseIssueTriageContext());
     }
-    catch {
-        process.exit(1);
+    catch (error) {
+        logger.error('Issue triage task failed in main', {
+            task: 'issue-triage',
+            error: error instanceof Error ? error.message : String(error),
+        });
+        process.exitCode = 1;
     }
 }
 if (process.env.VITEST !== 'true' && process.env.TASK_TYPE === 'issue-triage') {