@caseyharalson/orrery 0.7.1 → 0.8.0

package/lib/orchestration/config.js

@@ -85,31 +85,23 @@ ${getFormatInstructions()}
 - Complete each step fully before starting the next
 - Output clean JSON to stdout—no extra text or markdown wrapping`;
 
-const REVIEW_PROMPT = `You are a Review Agent. Evaluate the changes for the completed plan step.
+const REVIEW_PROMPT = `You are a Review Agent. Review the completed plan step.
 
-## Context
-
-Step context:
-{stepContext}
-
-Modified files:
-{files}
-
-Diff:
-{diff}
+Plan file: {planFile}
+Step to review: {stepIds}
 
-## Instructions
+## Workflow
 
-- Identify bugs, regressions, missing edge cases, or unmet acceptance criteria.
-- If changes are acceptable, respond with approval.
-- If changes need edits, provide specific, actionable feedback.
-- Keep feedback concise and grounded in the diff.
+1. Read the plan file to understand the step's description, requirements, and acceptance criteria
+2. Run \`git diff\` to see all uncommitted changes
+3. Read modified files for full context if needed
+4. Evaluate if changes correctly implement the requirements
 
-## Output Format (JSON, single line)
+## Output Format (JSON)
 
 {"status":"approved","summary":"..."}
 OR
-{"status":"changes_requested","summary":"...","comments":["...","..."]}`;
+{"status":"needs_changes","feedback":[{"comment":"...","file":"...","severity":"blocking|suggestion"}]}`;
 
 module.exports = {
   // Agent configurations (keyed by agent name)

package/lib/orchestration/index.js

@@ -49,8 +49,7 @@ const {
   commit,
   createPullRequest,
   deriveBranchName,
-  hasUncommittedChanges,
-  getUncommittedDiff
+  hasUncommittedChanges
 } = require("../utils/git");
 
 const config = require("./config");
@@ -832,8 +831,6 @@ async function waitForAgentCompletion(
   // Parse results from stdout
   let parsedResults = parseAgentResults(result.stdout);
 
-  const planForReview = loadPlan(planFile);
-
   // Build updates for each step
   const updates = [];
   const reports = [];
@@ -852,51 +849,25 @@ async function waitForAgentCompletion(
       stepResult = createDefaultResult(stepId, result.exitCode, result.stderr);
     }
 
+    let stepReviews = null;
     if (config.review.enabled && stepResult.status === "complete") {
       const maxIterations = resolveReviewMaxIterations();
       if (maxIterations > 0) {
-        const stepData =
-          (planForReview.steps || []).find((step) => step.id === stepId) ||
-          null;
-        const stepContext = stepData
-          ? {
-              id: stepData.id,
-              description: stepData.description,
-              context: stepData.context,
-              requirements: stepData.requirements,
-              criteria: stepData.criteria,
-              files: stepData.files,
-              risk_notes: stepData.risk_notes
-            }
-          : `Step ${stepId} context not found.`;
-
         let approved = false;
         let currentResult = stepResult;
+        const reviews = [];
+        stepReviews = reviews;
 
         for (let iteration = 1; iteration <= maxIterations; iteration++) {
-          const files =
-            Array.isArray(currentResult.artifacts) &&
-            currentResult.artifacts.length > 0
-              ? currentResult.artifacts
-              : stepData && Array.isArray(stepData.files)
-                ? stepData.files
-                : [];
-          const diff = getUncommittedDiff(REPO_ROOT, files);
-
           console.log(
             `Review iteration ${iteration}/${maxIterations} for step ${stepId}`
           );
           const reviewResult = await invokeReviewAgent(
             config,
-            stepContext,
-            files,
-            diff,
+            tempPlanFile,
+            [stepId],
             REPO_ROOT,
-            {
-              planFile,
-              stepId,
-              stepIds: [stepId]
-            }
+            { stepId }
           );
 
           if (reviewResult.error) {
@@ -907,6 +878,11 @@ async function waitForAgentCompletion(
 
           if (reviewResult.approved) {
             console.log(`Review approved for step ${stepId}`);
+            reviews.push({
+              iteration,
+              approved: true,
+              feedback: []
+            });
             approved = true;
             break;
           }
@@ -916,6 +892,26 @@ async function waitForAgentCompletion(
             `Review needs changes for step ${stepId}: ${issueCount} issue(s)`
           );
 
+          for (const fb of reviewResult.feedback) {
+            const loc = fb.file
+              ? `  ${fb.file}${fb.line ? `:${fb.line}` : ""}`
+              : "";
+            const sev =
+              fb.severity === "blocking" ? "[blocking]" : "[suggestion]";
+            console.log(`  ${sev}${loc}: ${fb.comment}`);
+          }
+
+          reviews.push({
+            iteration,
+            approved: false,
+            feedback: reviewResult.feedback.map((fb) => ({
+              severity: fb.severity,
+              file: fb.file || null,
+              line: fb.line || null,
+              comment: fb.comment
+            }))
+          });
+
           if (iteration >= maxIterations) {
             break;
           }
@@ -970,7 +966,7 @@ async function waitForAgentCompletion(
     updates.push(update);
 
     // Prepare report
-    reports.push({
+    const reportData = {
       step_id: stepId,
       agent: agentName,
       outcome: stepResult.status === "complete" ? "success" : "failure",
@@ -979,7 +975,11 @@ async function waitForAgentCompletion(
       artifacts: stepResult.artifacts || [],
       blocked_reason: stepResult.blockedReason || null,
       test_results: stepResult.testResults || null
-    });
+    };
+    if (stepReviews) {
+      reportData.reviews = stepReviews;
+    }
+    reports.push(reportData);
   }
 
   // Update plan file

package/lib/orchestration/review-invoker.js

@@ -1,57 +1,13 @@
 const { invokeAgentWithFailover } = require("./agent-invoker");
 
-function formatStepContext(stepContext) {
-  if (stepContext === undefined || stepContext === null) {
-    return "(no step context provided)";
-  }
-
-  if (typeof stepContext === "string") {
-    const trimmed = stepContext.trim();
-    return trimmed.length > 0 ? trimmed : "(no step context provided)";
-  }
-
-  try {
-    return JSON.stringify(stepContext, null, 2);
-  } catch {
-    return String(stepContext);
-  }
-}
-
-function formatFiles(files) {
-  if (!files) {
-    return "(no files provided)";
-  }
-
-  if (Array.isArray(files)) {
-    if (files.length === 0) {
-      return "(no files provided)";
-    }
-    return files.map((file) => `- ${file}`).join("\n");
-  }
-
-  const trimmed = String(files).trim();
-  return trimmed.length > 0 ? trimmed : "(no files provided)";
-}
-
-function ensureFullFileInstruction(prompt) {
-  const fullFileRegex = /full file|full files|full contents/i;
-  if (fullFileRegex.test(prompt)) {
-    return prompt;
-  }
-
-  const instruction =
-    "Read the full contents of each modified file for context, not only the diff.";
-  return `${prompt}\n\n## Required Context\n${instruction}`;
-}
-
-function buildReviewPrompt(template, stepContext, files, diff) {
+function buildReviewPrompt(template, planFile, stepIds) {
   const basePrompt = String(template || "");
-  const promptWithContext = basePrompt
-    .replace("{stepContext}", formatStepContext(stepContext))
-    .replace("{files}", formatFiles(files))
-    .replace("{diff}", diff ? String(diff) : "(no diff provided)");
-
-  return ensureFullFileInstruction(promptWithContext);
+  const stepIdsStr = Array.isArray(stepIds)
+    ? stepIds.join(", ")
+    : String(stepIds);
+  return basePrompt
+    .replace("{planFile}", planFile || "")
+    .replace("{stepIds}", stepIdsStr);
 }
 
 function buildReviewConfig(config, prompt) {
@@ -268,9 +224,8 @@ function parseReviewResults(stdout) {
 
 async function invokeReviewAgent(
   config,
-  stepContext,
-  files,
-  diff,
+  planFile,
+  stepIds,
   repoRoot,
   options = {}
 ) {
@@ -278,19 +233,14 @@ async function invokeReviewAgent(
     (config && config.review && config.review.prompt) ||
     config.REVIEW_PROMPT ||
     "";
-  const prompt = buildReviewPrompt(promptTemplate, stepContext, files, diff);
+  const normalizedStepIds = Array.isArray(stepIds) ? stepIds : [stepIds];
+  const prompt = buildReviewPrompt(promptTemplate, planFile, normalizedStepIds);
   const reviewConfig = buildReviewConfig(config, prompt);
-  const planFile = options.planFile || options.planPath || "review";
-  const stepIds = options.stepIds
-    ? options.stepIds
-    : options.stepId
-      ? [options.stepId]
-      : ["review"];
 
   const handle = invokeAgentWithFailover(
     reviewConfig,
     planFile,
-    stepIds,
+    normalizedStepIds,
     repoRoot,
     options
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caseyharalson/orrery",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "description": "Workflow planning and orchestration CLI for AI agents",
   "license": "MIT",
   "author": "Casey Haralson",