@caseyharalson/orrery 0.14.0 → 0.14.2

package/lib/cli/commands/resume.js

@@ -205,7 +205,7 @@ module.exports = function registerResumeCommand(program) {
         console.log("Resuming orchestration...\n");
         await orchestrate({
           resume: true,
-          plan: options.plan,
+          plan: planFile,
           onComplete: options.onComplete
         });
         return;
@@ -280,7 +280,7 @@ module.exports = function registerResumeCommand(program) {
       console.log("\nResuming orchestration...\n");
       await orchestrate({
         resume: true,
-        plan: options.plan,
+        plan: planFile,
         onComplete: options.onComplete
       });
     });

package/lib/orchestration/config.js

@@ -24,20 +24,26 @@ function getAgentPriority() {
 function getInstalledAgentPriority() {
   const requestedAgents = getAgentPriority();
   const installedAgents = detectInstalledAgents();
+  const isExplicit = !!(
+    process.env.ORRERY_AGENT_PRIORITY &&
+    process.env.ORRERY_AGENT_PRIORITY.trim()
+  );
 
   const filteredAgents = requestedAgents.filter((agent) =>
     installedAgents.includes(agent)
   );
 
-  // Warn about agents in priority that aren't installed
-  const skippedAgents = requestedAgents.filter(
-    (agent) => !installedAgents.includes(agent)
-  );
-  if (skippedAgents.length > 0) {
-    const missingDirs = skippedAgents.map((a) => `~/.${a}`).join(", ");
-    console.warn(
-      `[config] Skipping unconfigured agents: ${skippedAgents.join(", ")} (missing: ${missingDirs})`
+  // Only warn about missing agents when the user explicitly set ORRERY_AGENT_PRIORITY
+  if (isExplicit) {
+    const skippedAgents = requestedAgents.filter(
+      (agent) => !installedAgents.includes(agent)
     );
+    if (skippedAgents.length > 0) {
+      const missingDirs = skippedAgents.map((a) => `~/.${a}`).join(", ");
+      console.warn(
+        `[config] Skipping unconfigured agents: ${skippedAgents.join(", ")} (missing: ${missingDirs})`
+      );
+    }
   }
 
   if (filteredAgents.length === 0) {

package/lib/orchestration/index.js

@@ -380,6 +380,26 @@ async function orchestrate(options = {}) {
       );
     }
 
+    // Resume mode: find and continue the plan for the current branch
+    if (normalizedOptions.resume) {
+      const sourceBranch = getCurrentBranch(REPO_ROOT);
+      if (hasUncommittedChanges(REPO_ROOT)) {
+        console.error(
+          "Error: Uncommitted changes detected. Please commit or stash before resuming."
+        );
+        process.exit(1);
+      }
+      await handleResumeMode(
+        plansDir,
+        completedDir,
+        reportsDir,
+        sourceBranch,
+        normalizedOptions.plan,
+        normalizedOptions.onComplete
+      );
+      return;
+    }
+
     // Filter out plans that are already dispatched (have work_branch set)
     const dispatchedPlans = [];
 
@@ -432,19 +452,6 @@ async function orchestrate(options = {}) {
       process.exit(1);
     }
 
-    // Resume mode: find and continue the plan for the current branch
-    if (normalizedOptions.resume) {
-      await handleResumeMode(
-        plansDir,
-        completedDir,
-        reportsDir,
-        sourceBranch,
-        normalizedOptions.plan,
-        normalizedOptions.onComplete
-      );
-      return;
-    }
-
     console.log(`Found ${planFiles.length} plan(s) to process:\n`);
     for (const pf of planFiles) {
       console.log(`  - ${path.basename(pf)}`);
@@ -1373,7 +1380,7 @@ async function processPlan(
             tracker
           );
           plan = loadPlan(planFile);
-          await mergeWorktreeCommits(results, ctx.workingDir);
+          await mergeWorktreeCommits(results, ctx.workingDir, ctx.mainRepoRoot);
         } else {
           // Serial mode: wait for one
           const { stepIds, parsedResults } = await waitForAgentCompletion(
@@ -1476,7 +1483,7 @@ async function processPlan(
           tracker
         );
         plan = loadPlan(planFile);
-        await mergeWorktreeCommits(results, ctx.workingDir);
+        await mergeWorktreeCommits(results, ctx.workingDir, ctx.mainRepoRoot);
       } else {
         // Serial execution: wait for one agent at a time
         const { stepIds, parsedResults } = await waitForAgentCompletion(
@@ -1888,9 +1895,11 @@ async function waitForAllParallelAgents(
 /**
  * Merge commits from worktrees back to main repository
  * @param {Object[]} completedAgents - Array of completed agent results
- * @param {string} repoRoot - Path to main repository
+ * @param {string} repoRoot - Path to working directory (plan worktree) for cherry-pick
+ * @param {string} [mainRepoRoot] - Path to main repository where step worktree branches live
  */
-async function mergeWorktreeCommits(completedAgents, repoRoot) {
+async function mergeWorktreeCommits(completedAgents, repoRoot, mainRepoRoot) {
+  const branchLookupRoot = mainRepoRoot || repoRoot;
   const allCommits = [];
   const worktreesToClean = [];
 
@@ -1904,8 +1913,24 @@ async function mergeWorktreeCommits(completedAgents, repoRoot) {
     worktreesToClean.push({ path: worktreePath, branch: branchName });
 
     try {
-      // Get commits made in worktree branch
-      const commits = getCommitRange("HEAD", branchName, repoRoot);
+      // Commit any uncommitted changes the agent left in the step worktree
+      if (fs.existsSync(worktreePath) && hasUncommittedChanges(worktreePath)) {
+        const stepDesc = agent.stepIds ? agent.stepIds.join(", ") : branchName;
+        const commitSha = commit(
+          `feat: complete step(s) ${stepDesc}`,
+          [],
+          worktreePath
+        );
+        if (commitSha) {
+          console.log(
+            `Committed agent changes in worktree ${branchName} (${commitSha.slice(0, 7)})`
+          );
+        }
+      }
+
+      // Get commits made in worktree branch — branches live in the main repo,
+      // not in the plan worktree, so use branchLookupRoot for the range query
+      const commits = getCommitRange("HEAD", branchName, branchLookupRoot);
       if (commits.length > 0) {
         console.log(
           `Found ${commits.length} commit(s) in worktree ${branchName}`
@@ -1949,11 +1974,11 @@ async function mergeWorktreeCommits(completedAgents, repoRoot) {
     }
   }
 
-  // Clean up worktrees
+  // Clean up worktrees — these were created in the main repo, not the plan worktree
   for (const worktree of worktreesToClean) {
     try {
-      removeWorktree(worktree.path, repoRoot);
-      deleteBranch(worktree.branch, repoRoot, true);
+      removeWorktree(worktree.path, branchLookupRoot);
+      deleteBranch(worktree.branch, branchLookupRoot, true);
       console.log(`Cleaned up worktree: ${worktree.branch}`);
     } catch (err) {
       console.error(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caseyharalson/orrery",
-  "version": "0.14.0",
+  "version": "0.14.2",
   "description": "Workflow planning and orchestration CLI for AI agents",
   "license": "MIT",
   "author": "Casey Haralson",
@@ -34,7 +34,8 @@
     "lint": "eslint .",
     "prepublishOnly": "npm run lint && npm run format:check && npm test",
     "release:prepare": "node scripts/prepare-release.js",
-    "test": "node --test",
+    "test": "node --test test/cli.test.js test/cli/*.test.js test/helpers/*.js test/orchestration/*.test.js test/utils/*.test.js",
+    "test:integration": "node --test --test-timeout=600000 test/integration/scenarios/*.test.js",
     "validate": "npm run format:check && npm run lint && npm test"
   },
   "files": [