@doist/doistbot-cli 1.0.5 → 1.0.7

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

@@ -1,14 +1,18 @@
 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 { invokePiPrompt } from '../../core/pi.js';
-import { loadPromptTemplateFile } from '../../core/prompt-template.js';
+import { loadPromptTemplateFile, resolvePromptFile } from '../../core/prompt-template.js';
 import { removeIssueCommentReactionIfPresent } from '../../core/reactions.js';
 import { cloneRepository, createGitHubClients, parseBaseContext, requiredEnv, WORKSPACE_DIR, } from '../../core/shared.js';
+import { withPhase } from '../../core/tracing.js';
 import { buildPrompt } from './prompt.js';
 const CHAT_PROMPT_FILE = 'chat-prompt.md';
 const CHAT_TIMEOUT_MS = 5 * 60 * 1000;
+const CHAT_PROVIDER = 'zai';
+const CHAT_MODEL = 'z-ai/glm-5.2';
 function parseContext() {
     const base = parseBaseContext();
     const reactionIdRaw = process.env.REACTION_ID;
@@ -19,6 +23,7 @@ function parseContext() {
         reactionId: Number.isFinite(reactionId) ? reactionId : undefined,
         commentType: requiredEnv('COMMENT_TYPE'),
         eventName: requiredEnv('EVENT_NAME'),
+        dryRun: process.env.DRY_RUN?.toLowerCase() === 'true',
     };
 }
 /**
@@ -122,26 +127,57 @@ async function gatherIssueCommentContext(octokit, owner, repo, prNumber, comment
 export async function invokeChatModel(prompt) {
     const apiKey = process.env.OPENROUTER_API_KEY?.trim();
     if (!apiKey) {
+        // Config error: no model call attempted, so no model span. The reason is
+        // returned so the caller's root span reports the real cause.
         logger.warn('Chat model API key missing');
-        return null;
+        return { ok: false, reason: 'OPENROUTER_API_KEY missing' };
     }
-    const result = await invokePiPrompt({
-        provider: 'gemini',
-        apiKey,
-        piProviderId: 'openrouter',
-        prompt,
-        cwd: WORKSPACE_DIR,
-        timeoutMs: CHAT_TIMEOUT_MS,
-        capabilityPreset: 'workspace-inspection',
-    });
-    if (!result.ok) {
-        logger.warn('Chat model request failed', {
-            error: result.error,
-            timedOut: result.timedOut,
+    return withPhase('chat.model', {
+        'gen_ai.operation.name': 'chat',
+        'gen_ai.provider.name': CHAT_PROVIDER,
+        'gen_ai.request.model': CHAT_MODEL,
+    }, async (span) => {
+        const result = await invokePiPrompt({
+            provider: CHAT_PROVIDER,
+            apiKey,
+            piProviderId: 'openrouter',
+            prompt,
+            cwd: WORKSPACE_DIR,
+            timeoutMs: CHAT_TIMEOUT_MS,
+            capabilityPreset: 'workspace-inspection',
+            // Keep the executed model in sync with the recorded span attr.
+            modelName: CHAT_MODEL,
         });
-        return null;
-    }
-    return result.output.trim() || null;
+        // Record why the model stopped, before the ok/failure branch so
+        // terminal "error"/"aborted"/"length" endings are reported too.
+        // stopReason values:
+        //   stop     Natural end — model finished or hit a stop sequence.
+        //   length   Hit the token cap (max_tokens or context limit).
+        //   toolUse  Paused to call a tool. Expected mid-agent-loop.
+        //   error    Provider errored mid-generation.
+        //   aborted  Generation was cancelled (e.g. signal/timeout).
+        if (result.stopReason) {
+            span.setAttribute('gen_ai.response.finish_reasons', [result.stopReason]);
+        }
+        if (!result.ok) {
+            // Failure returns a result rather than throwing — mark the span
+            // ERROR explicitly so it survives to phase.end (withPhase only
+            // auto-errors on a throw).
+            span.setStatus({ code: SpanStatusCode.ERROR, message: result.error });
+            logger.warn('Chat model request failed', {
+                error: result.error,
+                timedOut: result.timedOut,
+            });
+            return { ok: false, reason: result.error };
+        }
+        const output = result.output.trim();
+        if (!output) {
+            const reason = 'chat model produced no output';
+            span.setStatus({ code: SpanStatusCode.ERROR, message: reason });
+            return { ok: false, reason };
+        }
+        return { ok: true, output };
+    });
 }
 /**
  * Posts the response to the correct location.
@@ -170,6 +206,17 @@ async function postResponse(octokit, ctx, response) {
         prNumber: ctx.prNumber,
     });
 }
+function formatChatDryRunOutput(ctx, response) {
+    return JSON.stringify({
+        task: 'chat',
+        repository: `${ctx.owner}/${ctx.repo}`,
+        prNumber: ctx.prNumber,
+        commentId: ctx.commentId,
+        commentType: ctx.commentType,
+        eventName: ctx.eventName,
+        response,
+    }, null, 2);
+}
 /**
  * Removes the 👀 reaction from the triggering comment.
  */
@@ -210,102 +257,126 @@ async function main() {
         commentId: ctx.commentId,
     };
     logger.setBaseContext(logContext);
-    logger.info('Chat task started', {
-        commentType: ctx.commentType,
-        eventName: ctx.eventName,
-    });
-    const { app, readOctokit, writeOctokit } = await createGitHubClients(ctx);
     const reactionId = ctx.reactionId;
     let exitCode = 0;
     let metricOutcome = 'failure';
-    try {
-        // Clone repository
-        await cloneRepository({
-            app,
-            owner: ctx.owner,
-            repo: ctx.repo,
-            prNumber: ctx.prNumber,
-            installationId: ctx.installationId,
-        });
-        // Gather thread context from GitHub API
-        let threadContext;
-        if (ctx.commentType === 'review') {
-            threadContext = await gatherReviewCommentContext(readOctokit, ctx.owner, ctx.repo, ctx.commentId);
-        }
-        else {
-            threadContext = await gatherIssueCommentContext(readOctokit, ctx.owner, ctx.repo, ctx.prNumber, ctx.commentId);
-        }
-        // Build prompt and invoke the chat model
-        const promptTemplate = loadPromptTemplateFile({
-            fileName: CHAT_PROMPT_FILE,
-            promptLabel: 'chat',
-        });
-        const prompt = buildPrompt({
-            promptTemplate,
-            owner: ctx.owner,
-            repo: ctx.repo,
-            prNumber: ctx.prNumber,
-            threadHistory: threadContext.threadHistory,
-            userQuestion: threadContext.userQuestion,
-            codeSnippet: threadContext.codeSnippet,
-            prTitle: threadContext.prTitle,
-            prAuthor: threadContext.prAuthor,
-        });
-        const response = await invokeChatModel(prompt);
-        if (!response) {
-            logger.warn('Chat model request returned no output');
-            return;
-        }
-        // Post response
-        await postResponse(writeOctokit, ctx, response);
-        logger.info('Chat task completed');
-        metricOutcome = 'success';
-    }
-    catch (error) {
-        logger.error('Chat task failed', {
-            error: error instanceof Error ? error.message : String(error),
-        });
-        // Post error message to the PR
+    await withPhase('chat', {
+        task: 'chat',
+        'gen_ai.operation.name': 'invoke_agent',
+        'gen_ai.agent.name': 'doistbot.chat',
+        'pr.number': ctx.prNumber,
+        'comment.id': ctx.commentId,
+        'comment.type': ctx.commentType,
+        'event.name': ctx.eventName,
+        dry_run: ctx.dryRun,
+    }, async (span) => {
+        // Inside the span so auth/setup failures are captured by the root span.
+        const { app, readOctokit, writeOctokit } = await createGitHubClients(ctx);
         try {
-            const errorMessage = 'Sorry, I encountered an error while processing your request. Please try again or contact the team maintaining the bot.';
+            // Clone repository
+            await cloneRepository({
+                app,
+                owner: ctx.owner,
+                repo: ctx.repo,
+                prNumber: ctx.prNumber,
+                installationId: ctx.installationId,
+            });
+            // Gather thread context from GitHub API
+            let threadContext;
             if (ctx.commentType === 'review') {
-                await writeOctokit.rest.pulls.createReplyForReviewComment({
-                    owner: ctx.owner,
-                    repo: ctx.repo,
-                    pull_number: ctx.prNumber,
-                    comment_id: ctx.commentId,
-                    body: errorMessage,
-                });
+                threadContext = await gatherReviewCommentContext(readOctokit, ctx.owner, ctx.repo, ctx.commentId);
             }
             else {
-                await writeOctokit.rest.issues.createComment({
-                    owner: ctx.owner,
-                    repo: ctx.repo,
-                    issue_number: ctx.prNumber,
-                    body: errorMessage,
+                threadContext = await gatherIssueCommentContext(readOctokit, ctx.owner, ctx.repo, ctx.prNumber, ctx.commentId);
+            }
+            // Build prompt and invoke the chat model
+            const promptTemplate = loadPromptTemplateFile({
+                fileName: resolvePromptFile(import.meta.url, CHAT_PROMPT_FILE),
+                promptLabel: 'chat',
+            });
+            const prompt = buildPrompt({
+                promptTemplate,
+                owner: ctx.owner,
+                repo: ctx.repo,
+                prNumber: ctx.prNumber,
+                threadHistory: threadContext.threadHistory,
+                userQuestion: threadContext.userQuestion,
+                codeSnippet: threadContext.codeSnippet,
+                prTitle: threadContext.prTitle,
+                prAuthor: threadContext.prAuthor,
+            });
+            const modelResult = await invokeChatModel(prompt);
+            if (!modelResult.ok) {
+                span.setStatus({ code: SpanStatusCode.ERROR, message: modelResult.reason });
+                logger.warn('Chat model produced no usable response', {
+                    reason: modelResult.reason,
                 });
+                return;
             }
+            const response = modelResult.output;
+            if (ctx.dryRun) {
+                logger.info('Dry run enabled, printing chat response instead of posting to GitHub');
+                process.stdout.write(`${formatChatDryRunOutput(ctx, response)}\n`);
+            }
+            else {
+                await postResponse(writeOctokit, ctx, response);
+            }
+            metricOutcome = 'success';
         }
-        catch (replyError) {
-            logger.error('Failed to post error message', {
-                error: replyError instanceof Error ? replyError.message : String(replyError),
-            });
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            logger.error('Chat task failed', { error: message });
+            // The catch swallows the error to post a user reply, so set the
+            // span status explicitly — withPhase only auto-errors on rethrow.
+            span.setStatus({ code: SpanStatusCode.ERROR, message });
+            if (ctx.dryRun) {
+                logger.info('Dry run enabled, skipping chat error response post');
+            }
+            else {
+                try {
+                    const errorMessage = 'Sorry, I encountered an error while processing your request. Please try again or contact the team maintaining the bot.';
+                    if (ctx.commentType === 'review') {
+                        await writeOctokit.rest.pulls.createReplyForReviewComment({
+                            owner: ctx.owner,
+                            repo: ctx.repo,
+                            pull_number: ctx.prNumber,
+                            comment_id: ctx.commentId,
+                            body: errorMessage,
+                        });
+                    }
+                    else {
+                        await writeOctokit.rest.issues.createComment({
+                            owner: ctx.owner,
+                            repo: ctx.repo,
+                            issue_number: ctx.prNumber,
+                            body: errorMessage,
+                        });
+                    }
+                }
+                catch (replyError) {
+                    logger.error('Failed to post error message', {
+                        error: replyError instanceof Error
+                            ? replyError.message
+                            : String(replyError),
+                    });
+                }
+            }
+            exitCode = 1;
         }
-        exitCode = 1;
-    }
-    finally {
-        // Always remove reaction
-        if (reactionId) {
-            await removeReaction(writeOctokit, ctx, reactionId);
+        finally {
+            // Local dry runs must stay side-effect free.
+            if (reactionId && !ctx.dryRun) {
+                await removeReaction(writeOctokit, ctx, reactionId);
+            }
+            await recordTaskMetrics({
+                type: 'chat',
+                repository: `${ctx.owner}/${ctx.repo}`,
+                model: 'zai',
+                outcome: metricOutcome,
+                durationMs: performance.now() - startedAt,
+            });
         }
-        await recordTaskMetrics({
-            type: 'chat',
-            repository: `${ctx.owner}/${ctx.repo}`,
-            model: 'google',
-            outcome: metricOutcome,
-            durationMs: performance.now() - startedAt,
-        });
-    }
+    });
     if (exitCode !== 0) {
         process.exit(exitCode);
     }