fix: correctly provide review in status updates

Author: jahilldev

api/src/agent/agent.model.ts

@@ -1,4 +1,4 @@
-export const AGENT_PHASES = ['PLAN', 'IMPLEMENT', 'REVIEW', 'REVISE'] as const;
+export const AGENT_PHASES = ['PLAN', 'IMPLEMENT', 'REVIEW', 'REVISE', 'PR_BODY'] as const;
 export type AgentPhase = (typeof AGENT_PHASES)[number];
 
 export type AgentRunStatus = 'RUNNING' | 'SUCCEEDED' | 'FAILED' | 'TIMED_OUT';
@@ -70,3 +70,12 @@ export interface RevisePromptContext {
   plan: string;
   issuesText: string;
 }
+
+export interface PrBodyPromptContext {
+  repoFullName: string;
+  issueNumber: number;
+  issueTitle: string;
+  issueBody: string;
+  baseBranch: string;
+  branchName: string;
+}

api/src/agent/agent.prompts.ts

@@ -1,6 +1,7 @@
 import {
   type ImplementPromptContext,
   type PlanPromptContext,
+  type PrBodyPromptContext,
   type RevisePromptContext,
 } from './agent.model.js';
 
@@ -64,3 +65,13 @@ export function buildRevisePrompt(ctx: RevisePromptContext): string {
     `When finished, end your reply with a short summary of the fixes. The orchestrator will commit your changes — do not run git yourself.`,
   ].join('\n\n');
 }
+
+export function buildPrBodyPrompt(ctx: PrBodyPromptContext): string {
+  return [
+    `You are Hermes, an autonomous engineer working in a clone of \`${ctx.repoFullName}\`. You have just finished implementing changes for the following GitHub issue.`,
+    `--- ISSUE #${ctx.issueNumber}: ${ctx.issueTitle} ---\n${ctx.issueBody}\n--- END ISSUE ---`,
+    `Your implementation is on branch \`${ctx.branchName}\`. Use git to inspect the diff against \`${ctx.baseBranch}\` to understand exactly what was changed.`,
+    `Write the body for the GitHub pull request. Write it as an experienced developer would — first person, concise, describing what was done and any key decisions. Do not reproduce the implementation plan verbatim. Do not add a \`Closes #N\` line or any AI-generated footer; those are added automatically.`,
+    `Output ONLY the PR body as GitHub-flavored Markdown. No preamble, no explanation — just the content.`,
+  ].join('\n\n');
+}

api/src/orchestrator/orchestrator.service.ts

@@ -11,6 +11,7 @@ import { HermesAgentService } from '../agent/agent.service.js';
 import {
   buildImplementPrompt,
   buildPlanPrompt,
+  buildPrBodyPrompt,
   buildRevisePrompt,
 } from '../agent/agent.prompts.js';
 import { WorkspaceService } from '../workspace/workspace.service.js';
@@ -501,7 +502,12 @@ export class OrchestratorService {
     const maxPasses = this.review.maxPasses;
     let result: ReviewResult | null = null;
 
-    for (let pass = 1; pass <= maxPasses; pass++) {
+    // Pass numbers are globally incrementing per job across task retries so the paper trail is
+    // preserved and ordering by passNumber desc always returns the most recent pass.
+    const priorPasses = await this.prisma.reviewPass.count({ where: { jobId } });
+
+    for (let iter = 1; iter <= maxPasses; iter++) {
+      const pass = priorPasses + iter;
       // Idempotent: a no-op when already SELF_REVIEWING, REVISING -> SELF_REVIEWING otherwise.
       await this.jobs.transition(jobId, 'SELF_REVIEWING', {
         reason: `review pass ${pass}`,
@@ -546,7 +552,7 @@ export class OrchestratorService {
       // Only revise when the review produced parseable, actionable issues. If the output
       // couldn't be parsed there is nothing for the revise agent to act on — it would spin
       // and time out. Re-reviewing the unchanged code on the next pass is the right move.
-      if (pass < maxPasses && parsed !== null) {
+      if (iter < maxPasses && parsed !== null) {
         await this.jobs.transition(jobId, 'REVISING', {
           reason: `addressing review pass ${pass}`,
           actor: 'AGENT',
@@ -609,12 +615,29 @@ export class OrchestratorService {
       lastReview.verdict === 'PASS' &&
       lastReview.confidence >= this.review.threshold;
     const unresolved = lastReview ? formatIssues(JSON.parse(lastReview.issues)) : undefined;
-    const plan = await this.approvedPlan(jobId);
 
     if (!job.prNumber) {
+      const prBodyRes = await this.agent.run({
+        jobId,
+        phase: 'PR_BODY',
+        cwd: this.workspace.dir(jobId),
+        prompt: buildPrBodyPrompt({
+          repoFullName: job.repoFullName,
+          issueNumber: job.issueNumber,
+          issueTitle: job.issueTitle,
+          issueBody: job.issueBody,
+          baseBranch: base,
+          branchName,
+        }),
+      });
+      const agentSummary =
+        prBodyRes.status === 'SUCCEEDED' && prBodyRes.stdout.trim().length > 0
+          ? prBodyRes.stdout.trim().slice(0, 8_000)
+          : `Resolves #${job.issueNumber}: ${job.issueTitle}`;
+
       const body = buildPrBody({
         issueNumber: job.issueNumber,
-        plan,
+        agentSummary,
         confidence: lastReview?.confidence ?? null,
         threshold: this.review.threshold,
         meetsThreshold: meets,

api/src/orchestrator/orchestrator.utility.ts

@@ -60,7 +60,7 @@ export function reviseCommitMessage(pass: number): string {
 
 export interface PrBodyInput {
   issueNumber: number;
-  plan: string;
+  agentSummary: string;
   confidence: number | null;
   threshold: number;
   meetsThreshold: boolean;
@@ -69,26 +69,24 @@ export interface PrBodyInput {
 
 export function buildPrBody(input: PrBodyInput): string {
   const lines = [
-    `This pull request was generated by **Hermes Agent** to resolve #${input.issueNumber}.`,
+    input.agentSummary.trim(),
     '',
     `Closes #${input.issueNumber}`,
     '',
-    '## Plan',
-    input.plan.trim(),
-    '',
-    '## Self-review',
-    `Confidence: ${input.confidence ?? 'n/a'}/100 (threshold ${input.threshold}).`,
+    '---',
   ];
   if (input.meetsThreshold) {
-    lines.push('All automated review checks passed.');
+    lines.push(
+      `🤖 Automated self-review: confidence ${input.confidence}/100 — all checks passed.`,
+    );
   } else {
     lines.push(
-      'Opened below the confidence threshold for human attention. Unresolved findings:',
-      '',
-      input.unresolvedIssues ?? '(none recorded)',
+      `🤖 Automated self-review: confidence ${input.confidence ?? 'n/a'}/100 (threshold ${input.threshold}) — opened below threshold for human attention.`,
     );
+    if (input.unresolvedIssues) {
+      lines.push('', '**Unresolved findings:**', '', input.unresolvedIssues);
+    }
   }
-  lines.push('', '---', '🤖 Draft PR generated by Hermes Agent — review before merging.');
   return lines.join('\n');
 }
 

api/src/workspace/workspace.service.ts

@@ -151,6 +151,11 @@ export class WorkspaceService {
     await rm(dir, { recursive: true, force: true });
   }
 
+  /** Returns the absolute path of the job's workspace directory. */
+  dir(jobId: string): string {
+    return workspaceDir(this.config.get('WORKSPACE_ROOT'), jobId);
+  }
+
   /**
    * Downloads GitHub-hosted attachments into a `.attachments/` sub-directory of the
    * workspace. Skips files already present (idempotent across phases). Returns the set of