@caseyharalson/orrery 0.7.2 → 0.9.0

package/lib/orchestration/agent-invoker.js

@@ -410,6 +410,7 @@ async function invokeAgentWithTimeout(
  * @param {string[]} stepIds - Step IDs to execute
  * @param {string} repoRoot - Repository root path
  * @param {Object} options - Options including callbacks
+ * @param {number} [options.timeoutMs] - Timeout in milliseconds (overrides config.failover.timeoutMs)
  * @returns {Object} - Handle with completion promise
  */
 function invokeAgentWithFailover(
@@ -420,6 +421,10 @@ function invokeAgentWithFailover(
   options = {}
 ) {
   const failoverConfig = config.failover || { enabled: false };
+  const timeoutMs =
+    options.timeoutMs !== undefined
+      ? options.timeoutMs
+      : failoverConfig.timeoutMs;
 
   // If failover is disabled, use default agent directly
   if (!failoverConfig.enabled) {
@@ -487,7 +492,7 @@ function invokeAgentWithFailover(
           planFile,
           stepIds,
           repoRoot,
-          failoverConfig.timeoutMs,
+          timeoutMs,
           options
         );
 

package/lib/orchestration/config.js

@@ -93,8 +93,11 @@ Step to review: {stepIds}
 ## Workflow
 
 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
+2. Discover all changes:
+   - Run \`git status --porcelain\` to list all modified, staged, and untracked files
+   - Run \`git diff\` for unstaged changes to tracked files
+   - Run \`git diff --cached\` for staged changes
+3. Read modified/created files for full context
 4. Evaluate if changes correctly implement the requirements
 
 ## Output Format (JSON)
@@ -142,6 +145,7 @@ module.exports = {
     enabled: true,
 
     // Timeout in milliseconds before trying next agent (15 minutes)
+    // Can be overridden via ORRERY_AGENT_TIMEOUT environment variable
     timeoutMs: 900000,
 
     // Patterns to detect failover-triggering errors from stderr

package/lib/orchestration/index.js

@@ -165,6 +165,19 @@ function resolveReviewMaxIterations(cliValue) {
   return config.review.maxIterations;
 }
 
+function resolveAgentTimeout(cliValue) {
+  if (typeof cliValue === "number" && cliValue > 0) {
+    return cliValue;
+  }
+
+  const envValue = parseEnvInteger(process.env.ORRERY_AGENT_TIMEOUT);
+  if (envValue !== undefined) {
+    return envValue;
+  }
+
+  return config.failover.timeoutMs;
+}
+
 function resolvePlanFile(planArg, plansDir) {
   if (!planArg) return null;
 
@@ -760,6 +773,7 @@ async function startSteps(planFile, stepIds, activeAgents, tracker) {
     stepIds,
     REPO_ROOT,
     {
+      timeoutMs: resolveAgentTimeout(),
       onStdout: (text, ids) => {
         if (config.logging.streamOutput) {
           const prefix = `[${ids.join(",")}]`;
@@ -849,11 +863,14 @@ 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) {
         let approved = false;
         let currentResult = stepResult;
+        const reviews = [];
+        stepReviews = reviews;
 
         for (let iteration = 1; iteration <= maxIterations; iteration++) {
           console.log(
@@ -864,7 +881,7 @@ async function waitForAgentCompletion(
             tempPlanFile,
             [stepId],
             REPO_ROOT,
-            { stepId }
+            { stepId, timeoutMs: resolveAgentTimeout() }
           );
 
           if (reviewResult.error) {
@@ -875,6 +892,11 @@ async function waitForAgentCompletion(
 
           if (reviewResult.approved) {
             console.log(`Review approved for step ${stepId}`);
+            reviews.push({
+              iteration,
+              approved: true,
+              feedback: []
+            });
             approved = true;
             break;
           }
@@ -884,6 +906,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;
           }
@@ -896,7 +938,8 @@ async function waitForAgentCompletion(
             REPO_ROOT,
             {
               stepId,
-              stepIds: [stepId]
+              stepIds: [stepId],
+              timeoutMs: resolveAgentTimeout()
             }
           );
 
@@ -938,7 +981,7 @@ async function waitForAgentCompletion(
     updates.push(update);
 
     // Prepare report
-    reports.push({
+    const reportData = {
       step_id: stepId,
       agent: agentName,
       outcome: stepResult.status === "complete" ? "success" : "failure",
@@ -947,7 +990,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/progress-tracker.js

@@ -18,6 +18,7 @@ class ProgressTracker {
     this.startTime = Date.now();
     this.stepCompletionTimes = []; // Duration of each completed step
     this.stepStartTimes = new Map(); // stepId -> startTime
+    this.isFirstStep = true;
   }
 
   /**
@@ -148,6 +149,12 @@ class ProgressTracker {
    * @param {string[]} stepIds - Array of step IDs starting
    */
   logStepStart(stepIds) {
+    if (this.isFirstStep) {
+      this.isFirstStep = false;
+    } else {
+      console.log("");
+      console.log("----------------------------------------");
+    }
     this.recordStart(stepIds);
     const processed = this.completedCount + this.blockedCount;
     const stepList = stepIds.join(", ");

package/package.json

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