@doist/doistbot-cli 1.0.5 → 1.0.7

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

@@ -1,9 +1,11 @@
 import { performance } from 'node:perf_hooks';
+import { SpanStatusCode } from '@opentelemetry/api';
 import { isKnownDoistbotLogin } from '../../core/bot-logins.js';
 import { recordTaskMetrics } from '../../core/datadog-metrics.js';
 import { logger } from '../../core/logging.js';
 import { removeIssueCommentReactionIfPresent } from '../../core/reactions.js';
 import { resolveIssueRepositories } from '../../core/repository-resolver.js';
+import { recordDecision, withPhase } from '../../core/tracing.js';
 import { parseIssueTriageContext } from '../issue-triage/context.js';
 import { attemptFix } from '../issue-triage/fix-attempt.js';
 import { parseFixAssessment } from '../issue-triage/output.js';
@@ -19,217 +21,240 @@ async function main() {
         repository: `${ctx.owner}/${ctx.repo}`,
         issueNumber: ctx.issueNumber,
     });
-    logger.info('Fix retry task started', {
+    // Root span for the whole run. The Codex fix attempt is wrapped in its own
+    // issue-fix-retry.fix-attempt phase below, keeping its nested model span in
+    // this task's namespace rather than triage's.
+    await withPhase('issue-fix-retry', {
         task: 'issue-fix-retry',
-        issueNumber: ctx.issueNumber,
-        commentId: ctx.commentId,
-    });
-    const { app, readOctokit, writeOctokit } = await createGitHubClients(ctx);
-    async function postComment(body) {
-        if (ctx.dryRun)
-            return;
-        await writeOctokit.rest.issues.createComment({
-            owner: ctx.owner,
-            repo: ctx.repo,
-            issue_number: ctx.issueNumber,
-            body,
-        });
-    }
-    try {
-        const [issue, comments] = await Promise.all([
-            fetchIssue(readOctokit, ctx),
-            fetchIssueComments(readOctokit, ctx),
-        ]);
-        // Find the most recent triage comment from the bot (search backwards to get the latest one)
-        let triageComment;
-        for (let i = comments.length - 1; i >= 0; i--) {
-            const comment = comments[i];
-            if (comment &&
-                isKnownDoistbotLogin(comment.user?.login) &&
-                comment.body?.includes(TRIAGE_MARKER)) {
-                triageComment = comment;
-                break;
-            }
-        }
-        if (!triageComment?.body) {
-            logger.warn('No triage comment found for fix retry', {
-                task: 'issue-fix-retry',
-                issueNumber: ctx.issueNumber,
+        'gen_ai.operation.name': 'invoke_agent',
+        'gen_ai.agent.name': 'doistbot.issue-fix-retry',
+        'issue.number': ctx.issueNumber,
+        'comment.id': ctx.commentId,
+        dry_run: ctx.dryRun,
+    }, async (span) => {
+        const { app, readOctokit, writeOctokit } = await createGitHubClients(ctx);
+        async function postComment(body) {
+            if (ctx.dryRun)
+                return;
+            await writeOctokit.rest.issues.createComment({
+                owner: ctx.owner,
+                repo: ctx.repo,
+                issue_number: ctx.issueNumber,
+                body,
             });
-            await postComment('No previous triage found on this issue. Run `@doistbot /triage` first, then retry with `@doistbot /fix`.');
-            return;
         }
-        // Strip the triage marker to get the raw triage output
-        const triageOutput = triageComment.body.replace(TRIAGE_MARKER, '').trim();
-        const fixAssessment = parseFixAssessment(triageOutput);
-        if (!fixAssessment) {
-            logger.warn('No fix assessment found in triage output', {
+        try {
+            const [issue, comments] = await Promise.all([
+                fetchIssue(readOctokit, ctx),
+                fetchIssueComments(readOctokit, ctx),
+            ]);
+            // Find the most recent triage comment from the bot (search backwards to get the latest one)
+            let triageComment;
+            for (let i = comments.length - 1; i >= 0; i--) {
+                const comment = comments[i];
+                if (comment &&
+                    isKnownDoistbotLogin(comment.user?.login) &&
+                    comment.body?.includes(TRIAGE_MARKER)) {
+                    triageComment = comment;
+                    break;
+                }
+            }
+            if (!triageComment?.body) {
+                // User-actionable (no prior triage), not a malfunction → span stays ok.
+                logger.warn('No triage comment found for fix retry', {
+                    task: 'issue-fix-retry',
+                    issueNumber: ctx.issueNumber,
+                });
+                await postComment('No previous triage found on this issue. Run `@doistbot /triage` first, then retry with `@doistbot /fix`.');
+                return;
+            }
+            // Strip the triage marker to get the raw triage output
+            const triageOutput = triageComment.body.replace(TRIAGE_MARKER, '').trim();
+            const fixAssessment = parseFixAssessment(triageOutput);
+            if (!fixAssessment) {
+                logger.warn('No fix assessment found in triage output', {
+                    task: 'issue-fix-retry',
+                    issueNumber: ctx.issueNumber,
+                });
+                await postComment("The previous triage doesn't include an automated fix assessment. Try running `@doistbot /triage` again on a repo with auto-fix enabled.");
+                return;
+            }
+            if (fixAssessment.targetRepo) {
+                metricRepository = fixAssessment.targetRepo;
+            }
+            logger.info('Fix assessment found from previous triage', {
                 task: 'issue-fix-retry',
                 issueNumber: ctx.issueNumber,
+                classification: fixAssessment.classification,
+                confidence: fixAssessment.confidence,
+                scope: fixAssessment.scope,
             });
-            await postComment("The previous triage doesn't include an automated fix assessment. Try running `@doistbot /triage` again on a repo with auto-fix enabled.");
-            return;
-        }
-        if (fixAssessment.targetRepo) {
-            metricRepository = fixAssessment.targetRepo;
-        }
-        logger.info('Fix assessment found from previous triage', {
-            task: 'issue-fix-retry',
-            issueNumber: ctx.issueNumber,
-            classification: fixAssessment.classification,
-            confidence: fixAssessment.confidence,
-            scope: fixAssessment.scope,
-        });
-        // Resolve repositories to clone. Prefer the target repo from the assessment
-        // (stable across label changes) and fall back to label-based resolution.
-        const reposDir = prepareWorkspaceReposDirectory();
-        const clonedRepositories = [];
-        if (fixAssessment.targetRepo) {
-            const resolution = resolveIssueRepositories(extractLabelNames(issue.labels));
-            const repoTarget = resolution.status === 'resolved'
-                ? resolution.repositories.find((r) => r.fullName === fixAssessment.targetRepo)
-                : undefined;
-            if (repoTarget) {
-                try {
-                    const cloneResult = await cloneRepository({
-                        app,
-                        repository: repoTarget,
-                        reposDir,
-                        fallbackInstallationId: ctx.installationId,
-                    });
-                    clonedRepositories.push(cloneResult);
-                    metricRepository = cloneResult.repository.fullName;
+            // Resolve repositories to clone. Prefer the target repo from the assessment
+            // (stable across label changes) and fall back to label-based resolution.
+            const reposDir = prepareWorkspaceReposDirectory();
+            const clonedRepositories = [];
+            if (fixAssessment.targetRepo) {
+                const resolution = resolveIssueRepositories(extractLabelNames(issue.labels));
+                const repoTarget = resolution.status === 'resolved'
+                    ? resolution.repositories.find((r) => r.fullName === fixAssessment.targetRepo)
+                    : undefined;
+                if (repoTarget) {
+                    try {
+                        const cloneResult = await cloneRepository({
+                            app,
+                            repository: repoTarget,
+                            reposDir,
+                            fallbackInstallationId: ctx.installationId,
+                        });
+                        clonedRepositories.push(cloneResult);
+                        metricRepository = cloneResult.repository.fullName;
+                    }
+                    catch (error) {
+                        logger.warn('Fix retry clone failed for assessment target repo', {
+                            task: 'issue-fix-retry',
+                            repository: fixAssessment.targetRepo,
+                            error: error instanceof Error ? error.message : String(error),
+                        });
+                    }
                 }
-                catch (error) {
-                    logger.warn('Fix retry clone failed for assessment target repo', {
+            }
+            // Fall back to label-based resolution if the assessment target wasn't cloned
+            if (clonedRepositories.length === 0) {
+                const labelNames = extractLabelNames(issue.labels);
+                const resolution = resolveIssueRepositories(labelNames);
+                if (resolution.status === 'unresolved') {
+                    // User-actionable (labels don't map to a repo) → span stays ok.
+                    logger.warn('Fix retry failed: could not resolve repositories from labels', {
                         task: 'issue-fix-retry',
-                        repository: fixAssessment.targetRepo,
-                        error: error instanceof Error ? error.message : String(error),
+                        issueNumber: ctx.issueNumber,
+                        reason: resolution.reason,
                     });
+                    await postComment(`Could not resolve target repositories from the issue labels. Please check the labels and try again.\n\nReason: ${resolution.reason}`);
+                    return;
+                }
+                if (resolution.repositories.length === 1) {
+                    metricRepository = resolution.repositories[0].fullName;
+                }
+                for (const repository of resolution.repositories) {
+                    try {
+                        const cloneResult = await cloneRepository({
+                            app,
+                            repository,
+                            reposDir,
+                            fallbackInstallationId: ctx.installationId,
+                        });
+                        clonedRepositories.push(cloneResult);
+                    }
+                    catch (error) {
+                        logger.warn('Fix retry clone failed', {
+                            task: 'issue-fix-retry',
+                            repository: repository.fullName,
+                            error: error instanceof Error ? error.message : String(error),
+                        });
+                    }
                 }
             }
-        }
-        // Fall back to label-based resolution if the assessment target wasn't cloned
-        if (clonedRepositories.length === 0) {
-            const labelNames = extractLabelNames(issue.labels);
-            const resolution = resolveIssueRepositories(labelNames);
-            if (resolution.status === 'unresolved') {
-                logger.warn('Fix retry failed: could not resolve repositories from labels', {
+            if (clonedRepositories.length === 0) {
+                // Infrastructure failure → mark the run failed.
+                const message = 'Fix retry failed: all repository clones failed';
+                logger.error(message, {
                     task: 'issue-fix-retry',
                     issueNumber: ctx.issueNumber,
-                    reason: resolution.reason,
                 });
-                await postComment(`Could not resolve target repositories from the issue labels. Please check the labels and try again.\n\nReason: ${resolution.reason}`);
+                span.setStatus({ code: SpanStatusCode.ERROR, message });
+                await postComment('Fix retry failed — could not clone the target repositories. Please try again later.');
                 return;
             }
-            if (resolution.repositories.length === 1) {
-                metricRepository = resolution.repositories[0].fullName;
-            }
-            for (const repository of resolution.repositories) {
-                try {
-                    const cloneResult = await cloneRepository({
-                        app,
-                        repository,
-                        reposDir,
-                        fallbackInstallationId: ctx.installationId,
-                    });
-                    clonedRepositories.push(cloneResult);
-                }
-                catch (error) {
-                    logger.warn('Fix retry clone failed', {
-                        task: 'issue-fix-retry',
-                        repository: repository.fullName,
-                        error: error instanceof Error ? error.message : String(error),
+            const issueInstallationAuth = (await app.octokit.auth({
+                type: 'installation',
+                installationId: ctx.installationId,
+            }));
+            // Wrap the Codex fix attempt in a retry-namespaced phase; its
+            // model span (issue-fix-retry.fix-attempt.model) nests under it.
+            const fixResult = await withPhase('issue-fix-retry.fix-attempt', {
+                'gen_ai.operation.name': 'invoke_agent',
+                'gen_ai.agent.name': 'codex.fix',
+            }, () => attemptFix({
+                ctx,
+                octokit: writeOctokit,
+                triageOutput,
+                fixAssessment,
+                clonedRepos: clonedRepositories,
+                issueTitle: issue.title ?? 'Untitled issue',
+                issueUrl: issue.html_url ?? getIssueUrl(ctx.owner, ctx.repo, ctx.issueNumber),
+                ghToken: issueInstallationAuth.token,
+                force: true,
+                modelPhaseName: 'issue-fix-retry.fix-attempt.model',
+            }));
+            metricRepository = fixResult.repository;
+            metricOutcome = fixResult.attempted && fixResult.prCreated ? 'success' : 'failure';
+            const reason = 'reason' in fixResult ? fixResult.reason : undefined;
+            const isDryRun = 'dryRun' in fixResult && fixResult.dryRun === true;
+            recordDecision('issue-fix-retry.outcome', {
+                attempted: fixResult.attempted,
+                pr_created: fixResult.attempted && fixResult.prCreated,
+                reason,
+                pr_url: 'prUrl' in fixResult ? fixResult.prUrl : undefined,
+            });
+            // No PR is a failed retry — unless it was a dry run (expected).
+            if (!fixResult.attempted || !fixResult.prCreated) {
+                if (!isDryRun) {
+                    span.setStatus({
+                        code: SpanStatusCode.ERROR,
+                        message: reason ?? 'Fix retry produced no PR',
                     });
                 }
+                await postComment(`Fix retry failed to produce a PR.\n\nReason: ${reason ?? 'Unknown reason'}`);
             }
         }
-        if (clonedRepositories.length === 0) {
-            logger.error('Fix retry failed: all repository clones failed', {
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            logger.error('Fix retry task failed', {
                 task: 'issue-fix-retry',
                 issueNumber: ctx.issueNumber,
+                error: message,
+                durationMs: performance.now() - startedAt,
             });
-            await postComment('Fix retry failed — could not clone the target repositories. Please try again later.');
-            return;
-        }
-        const issueInstallationAuth = (await app.octokit.auth({
-            type: 'installation',
-            installationId: ctx.installationId,
-        }));
-        const fixResult = await attemptFix({
-            ctx,
-            octokit: writeOctokit,
-            triageOutput,
-            fixAssessment,
-            clonedRepos: clonedRepositories,
-            issueTitle: issue.title ?? 'Untitled issue',
-            issueUrl: issue.html_url ?? getIssueUrl(ctx.owner, ctx.repo, ctx.issueNumber),
-            ghToken: issueInstallationAuth.token,
-            force: true,
-        });
-        logger.info('Fix retry result', {
-            task: 'issue-fix-retry',
-            issueNumber: ctx.issueNumber,
-            attempted: fixResult.attempted,
-            prCreated: fixResult.attempted && fixResult.prCreated,
-            reason: 'reason' in fixResult ? fixResult.reason : undefined,
-            prUrl: 'prUrl' in fixResult ? fixResult.prUrl : undefined,
-            durationMs: performance.now() - startedAt,
-        });
-        metricRepository = fixResult.repository;
-        metricOutcome = fixResult.attempted && fixResult.prCreated ? 'success' : 'failure';
-        // Inform the user if no PR was created
-        if (!fixResult.attempted || !fixResult.prCreated) {
-            const reason = 'reason' in fixResult ? fixResult.reason : 'Unknown reason';
-            await postComment(`Fix retry failed to produce a PR.\n\nReason: ${reason}`);
-        }
-    }
-    catch (error) {
-        logger.error('Fix retry task failed', {
-            task: 'issue-fix-retry',
-            issueNumber: ctx.issueNumber,
-            error: error instanceof Error ? error.message : String(error),
-            durationMs: performance.now() - startedAt,
-        });
-        try {
-            await postComment('Sorry, the fix retry encountered an error. Please try again or contact the team maintaining the bot.');
+            // The catch swallows the error (posts a user message), so set the
+            // span status explicitly — withPhase only auto-marks ERROR on rethrow.
+            span.setStatus({ code: SpanStatusCode.ERROR, message });
+            try {
+                await postComment('Sorry, the fix retry encountered an error. Please try again or contact the team maintaining the bot.');
+            }
+            catch (commentError) {
+                logger.warn('Failed to post fix retry failure response', {
+                    task: 'issue-fix-retry',
+                    issueNumber: ctx.issueNumber,
+                    error: commentError instanceof Error
+                        ? commentError.message
+                        : String(commentError),
+                });
+            }
+            exitCode = 1;
         }
-        catch (commentError) {
-            logger.warn('Failed to post fix retry failure response', {
-                task: 'issue-fix-retry',
-                issueNumber: ctx.issueNumber,
-                error: commentError instanceof Error ? commentError.message : String(commentError),
+        finally {
+            await removeIssueCommentReactionIfPresent({
+                octokit: writeOctokit,
+                owner: ctx.owner,
+                repo: ctx.repo,
+                commentId: ctx.commentId,
+                reactionId: ctx.reactionId,
+                warnMessage: 'Failed to remove fix retry reaction',
+                successMessage: 'Fix retry reaction removed',
+                logMeta: {
+                    task: 'issue-fix-retry',
+                    reactionId: ctx.reactionId,
+                },
+            });
+            await recordTaskMetrics({
+                type: 'fix',
+                repository: metricRepository,
+                model: 'openai',
+                outcome: metricOutcome,
+                durationMs: performance.now() - startedAt,
             });
         }
-        exitCode = 1;
-    }
-    finally {
-        await removeIssueCommentReactionIfPresent({
-            octokit: writeOctokit,
-            owner: ctx.owner,
-            repo: ctx.repo,
-            commentId: ctx.commentId,
-            reactionId: ctx.reactionId,
-            warnMessage: 'Failed to remove fix retry reaction',
-            successMessage: 'Fix retry reaction removed',
-            logMeta: {
-                task: 'issue-fix-retry',
-                reactionId: ctx.reactionId,
-            },
-        });
-        await recordTaskMetrics({
-            type: 'fix',
-            repository: metricRepository,
-            model: 'openai',
-            outcome: metricOutcome,
-            durationMs: performance.now() - startedAt,
-        });
-        logger.info('Fix retry task finalized', {
-            task: 'issue-fix-retry',
-            issueNumber: ctx.issueNumber,
-            durationMs: performance.now() - startedAt,
-        });
-    }
+    });
     if (exitCode !== 0) {
         process.exit(exitCode);
     }