@caseyharalson/orrery 0.14.3 → 0.15.0

package/agent/skills/discovery/SKILL.md

@@ -1,9 +1,11 @@
 ---
 name: discovery
 description: >
-  Create executable plans for building systems, features, or modules. Use for
-  planning requests, architectural decisions, or when decomposing big ideas
-  into concrete implementation steps.
+  Author an orrery plan — a YAML file under the orrery plans directory that
+  the orrery CLI executes step-by-step. Use ONLY when the user explicitly
+  asks to create an orrery plan (e.g., "make an orrery plan", "use orrery
+  discovery", "/discovery"). Do NOT use for general planning, architectural
+  discussion, or decomposing ideas unless the output is an orrery plan file.
 hooks:
   PostToolUse:
     - matcher: "Write"

package/agent/skills/orrery-execute/SKILL.md

@@ -1,7 +1,10 @@
 ---
 name: orrery-execute
 description: >
-  Write or modify code according to a plan step. Handle implementation.
+  Implement a single step from an orrery plan (YAML file under the orrery
+  plans directory) when invoked by the orrery orchestrator. Do NOT use for
+  general coding, bug fixes, or implementation work outside of an orrery
+  plan run.
 user-invocable: false
 ---
 

package/agent/skills/orrery-report/SKILL.md

@@ -1,9 +1,11 @@
 ---
 name: orrery-report
 description: >
-  Final reporting phase for the orrery workflow. Outputs structured JSON
-  summarizing execution results, test outcomes, and status. Use after
-  orrery-verify completes or when reporting blocked status.
+  Final reporting phase for a single step of an orrery plan, invoked by the
+  orrery orchestrator after orrery-verify completes (or when reporting blocked
+  status). Outputs structured JSON consumed by the orrery orchestrator. Do
+  NOT use for general status summaries or reports outside of an orrery plan
+  run.
 user-invocable: false
 ---
 

package/agent/skills/orrery-review/SKILL.md

@@ -1,7 +1,10 @@
 ---
 name: orrery-review
 description: >
-  Review code changes after each step execution and provide structured feedback.
+  Review changes made for a single step of an orrery plan (YAML file under
+  the orrery plans directory) when invoked by the orrery orchestrator, and
+  produce structured feedback for the editor agent. Do NOT use for general
+  code review outside of an orrery plan run.
 user-invocable: false
 ---
 

package/agent/skills/orrery-verify/SKILL.md

@@ -1,9 +1,11 @@
 ---
 name: orrery-verify
 description: >
-  Run tests, linting, and validation to verify changes work correctly.
-  Use after implementation to check acceptance criteria, run test suites,
-  and ensure nothing is broken.
+  Verify a single step from an orrery plan (YAML file under the orrery plans
+  directory) when invoked by the orrery orchestrator after orrery-execute.
+  Runs the plan step's acceptance criteria, tests, and linting. Do NOT use
+  for general test runs, linting, or verification work outside of an orrery
+  plan run.
 user-invocable: false
 ---
 

package/agent/skills/refine-plan/SKILL.md

@@ -1,10 +1,12 @@
 ---
 name: refine-plan
 description: >
-  Analyze and improve an existing plan file. Reviews plan structure, dependencies,
-  context quality, and acceptance criteria, then implements improvements directly.
-  Requires a plan file argument (e.g., /refine-plan my-plan.yaml).
-  Run `orrery plans-dir` to find the plans directory.
+  Analyze and improve an existing orrery plan (YAML file under the orrery
+  plans directory). Reviews plan structure, dependencies, context quality,
+  and acceptance criteria, then edits the plan file directly. Use ONLY when
+  the user explicitly asks to refine an orrery plan and provides a plan file
+  argument (e.g., /refine-plan my-plan.yaml). Run `orrery plans-dir` to find
+  the plans directory. Do NOT use for general plan or design-doc review.
 hooks:
   PostToolUse:
     - matcher: "Write"

package/agent/skills/simulate-plan/SKILL.md

@@ -1,10 +1,12 @@
 ---
 name: simulate-plan
 description: >
-  Explore a plan through conversational dialogue before committing to execution.
-  Requires a plan file argument (e.g., /simulate-plan my-plan.yaml, /simulate-plan my-plan).
-  Run `orrery plans-dir` to find the plans directory.
-  Ask "what if" questions, trace dependencies, and build intuition about what you're building.
+  Explore an existing orrery plan (YAML file under the orrery plans directory)
+  through conversational dialogue before committing to execution. Use ONLY
+  when the user explicitly asks to simulate an orrery plan and provides a
+  plan file argument (e.g., /simulate-plan my-plan.yaml, /simulate-plan
+  my-plan). Run `orrery plans-dir` to find the plans directory. Do NOT use
+  for general "what if" brainstorming outside of an orrery plan.
 ---
 
 # Simulate Skill

package/lib/cli/commands/status.js

@@ -27,8 +27,8 @@ function colorize(text, color) {
 }
 
 function getPlanStatus(plan) {
-  if (plan.isSuccessful()) return "complete";
-  if (plan.steps.some((step) => step.status === "blocked")) return "blocked";
+  if (plan.isComplete()) return "complete";
+  if (plan.hasBlockedSteps()) return "blocked";
   if (plan.steps.some((step) => step.status === "in_progress")) {
     return "in_progress";
   }

package/lib/orchestration/index.js

@@ -469,7 +469,7 @@ async function orchestrate(options = {}) {
         normalizedOptions.onComplete
       );
 
-      if (result.isComplete && result.isSuccessful) {
+      if (result.isComplete) {
         // Plan completed successfully - return to source branch for next plan
         const currentBranch = getCurrentBranch(REPO_ROOT);
         if (currentBranch !== sourceBranch) {
@@ -601,20 +601,19 @@ async function resumeInWorktree(
       );
       logPullRequestInfo(prInfo);
 
-      const isSuccessful = plan.isSuccessful();
       runOnCompleteHook(
         onComplete,
         {
           planName: planFileName,
           planFile,
-          outcome: isSuccessful ? "success" : "partial",
+          outcome: "success",
           workBranch: plan.metadata.work_branch || "",
           sourceBranch,
           prUrl: prInfo.url || "",
           stepsTotal: plan.steps.length,
           stepsCompleted: plan.steps.filter((s) => s.status === "complete")
             .length,
-          stepsBlocked: plan.steps.filter((s) => s.status === "blocked").length
+          stepsBlocked: 0
         },
         worktreePath
       );
@@ -830,13 +829,12 @@ async function handleResumeMode(
     const prInfo = createPullRequest(prTitle, prBody, sourceBranch, REPO_ROOT);
     logPullRequestInfo(prInfo);
 
-    const isSuccessful = matchingPlan.isSuccessful();
     runOnCompleteHook(
       onComplete,
       {
         planName: planFileName,
         planFile: matchingPlanFile,
-        outcome: isSuccessful ? "success" : "partial",
+        outcome: "success",
         workBranch: matchingPlan.metadata.work_branch || currentBranch,
         sourceBranch,
         prUrl: prInfo.url || "",
@@ -844,8 +842,7 @@ async function handleResumeMode(
         stepsCompleted: matchingPlan.steps.filter(
           (s) => s.status === "complete"
         ).length,
-        stepsBlocked: matchingPlan.steps.filter((s) => s.status === "blocked")
-          .length
+        stepsBlocked: 0
       },
       REPO_ROOT
     );
@@ -1014,8 +1011,6 @@ async function processPlanInWorktree(normalizedOptions) {
     const isComplete = plan.isComplete();
 
     if (isComplete) {
-      const isSuccessful = plan.isSuccessful();
-
       // Archive the plan
       archivePlan(resolvedPlanFile, plan, completedDir);
 
@@ -1046,14 +1041,14 @@ async function processPlanInWorktree(normalizedOptions) {
         {
           planName: planFileName,
           planFile: resolvedPlanFile,
-          outcome: isSuccessful ? "success" : "partial",
+          outcome: "success",
           workBranch,
           sourceBranch,
           prUrl: prInfo.url || "",
           stepsTotal: plan.steps.length,
           stepsCompleted: plan.steps.filter((s) => s.status === "complete")
             .length,
-          stepsBlocked: plan.steps.filter((s) => s.status === "blocked").length
+          stepsBlocked: 0
         },
         worktreePath
       );
@@ -1066,11 +1061,7 @@ async function processPlanInWorktree(normalizedOptions) {
         console.error(`Failed to clean up worktree: ${err.message}`);
       }
 
-      if (isSuccessful) {
-        console.log("\n=== Plan Complete (success) ===");
-      } else {
-        console.log("\n=== Plan Complete (partial — some steps blocked) ===");
-      }
+      console.log("\n=== Plan Complete (success) ===");
     } else {
       // Plan not complete — commit WIP and preserve worktree
       const progressCommit = commit(
@@ -1124,7 +1115,7 @@ async function processPlanInWorktree(normalizedOptions) {
  * @param {string} completedDir - Directory for completed plans
  * @param {string} reportsDir - Directory for reports
  * @param {boolean} parallelEnabled - Whether parallel execution with worktrees is enabled
- * @returns {Promise<{isComplete: boolean, isSuccessful: boolean, workBranch: string}>}
+ * @returns {Promise<{isComplete: boolean, workBranch: string}>}
  */
 async function processPlanWithBranching(
   planFile,
@@ -1178,8 +1169,6 @@ async function processPlanWithBranching(
   const isComplete = plan.isComplete();
 
   if (isComplete) {
-    const isSuccessful = plan.isSuccessful();
-
     // Step 6: Archive the plan (on work branch)
     archivePlan(planFile, plan, completedDir);
 
@@ -1204,19 +1193,19 @@ async function processPlanWithBranching(
       {
         planName: planFileName,
         planFile,
-        outcome: isSuccessful ? "success" : "partial",
+        outcome: "success",
         workBranch,
         sourceBranch,
         prUrl: prInfo.url || "",
         stepsTotal: plan.steps.length,
         stepsCompleted: plan.steps.filter((s) => s.status === "complete")
           .length,
-        stepsBlocked: plan.steps.filter((s) => s.status === "blocked").length
+        stepsBlocked: 0
       },
       REPO_ROOT
     );
 
-    return { isComplete: true, isSuccessful, workBranch };
+    return { isComplete: true, workBranch };
   } else {
     // Plan not complete (still has pending steps or was interrupted)
     // Commit any progress made
@@ -1250,7 +1239,7 @@ async function processPlanWithBranching(
       "\nPlan not complete. Work branch preserved for later continuation."
     );
 
-    return { isComplete: false, isSuccessful: false, workBranch };
+    return { isComplete: false, workBranch };
   }
 }
 
@@ -1291,26 +1280,15 @@ function logPullRequestInfo(prInfo) {
  */
 function generatePRBody(plan) {
   const steps = plan.steps || [];
-  const completed = steps.filter((s) => s.status === "complete").length;
-  const blocked = steps.filter((s) => s.status === "blocked").length;
   const total = steps.length;
 
   let body = `## Plan Summary\n\n`;
-  body += `- **Status:** ${plan.metadata.outcome === "success" ? "All steps complete" : "Partial (some steps blocked)"}\n`;
-  body += `- **Steps:** ${completed}/${total} complete`;
-  if (blocked > 0) {
-    body += `, ${blocked} blocked`;
-  }
-  body += `\n\n`;
+  body += `- **Status:** All steps complete\n`;
+  body += `- **Steps:** ${total}/${total} complete\n\n`;
 
   body += `## Steps\n\n`;
   for (const step of steps) {
-    const icon =
-      step.status === "complete" ? "x" : step.status === "blocked" ? "-" : " ";
-    body += `- [${icon}] **${step.id}**: ${step.description}\n`;
-    if (step.status === "blocked" && step.blocked_reason) {
-      body += `  - Blocked: ${step.blocked_reason}\n`;
-    }
+    body += `- [x] **${step.id}**: ${step.description}\n`;
   }
 
   body += `\n---\n*Generated by Orrery*`;
@@ -2037,17 +2015,12 @@ function runOnCompleteHook(command, context, cwd) {
  * Archive a completed plan
  */
 function archivePlan(planFile, plan, completedDir) {
-  const success = plan.isSuccessful();
-  const status = success ? "SUCCESS" : "PARTIAL (some steps blocked)";
-
-  // Add completion metadata
   plan.metadata.completed_at = new Date().toISOString();
-  plan.metadata.outcome = success ? "success" : "partial";
+  plan.metadata.outcome = "success";
   savePlan(plan);
 
-  // Move to completed
   const destPath = movePlanToCompleted(planFile, completedDir);
-  console.log(`\nPlan archived: ${status}`);
+  console.log(`\nPlan archived: SUCCESS`);
   console.log(`  -> ${path.relative(REPO_ROOT, destPath)}`);
 }
 

package/lib/orchestration/plan-loader.js

@@ -52,21 +52,19 @@ function loadPlan(filePath) {
     },
 
     /**
-     * Check if all steps are complete or blocked
+     * Check if all steps are complete
      * @returns {boolean}
      */
     isComplete() {
-      return this.steps.every(
-        (s) => s.status === "complete" || s.status === "blocked"
-      );
+      return this.steps.every((s) => s.status === "complete");
     },
 
     /**
-     * Check if all steps are complete (none blocked)
+     * Check if the plan has any blocked steps
      * @returns {boolean}
      */
-    isSuccessful() {
-      return this.steps.every((s) => s.status === "complete");
+    hasBlockedSteps() {
+      return this.steps.some((s) => s.status === "blocked");
     }
   };
 }

package/package.json

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