@caseyharalson/orrery 0.11.0 → 0.13.0

package/lib/cli/commands/status.js

@@ -1,9 +1,15 @@
+const fs = require("fs");
 const path = require("path");
 
-const { getPlansDir } = require("../../utils/paths");
+const {
+  getPlansDir,
+  getCompletedDir,
+  getWorkDir
+} = require("../../utils/paths");
 const { getPlanFiles, loadPlan } = require("../../orchestration/plan-loader");
 const { findPlanForCurrentBranch } = require("../../utils/plan-detect");
-const { getCurrentBranch } = require("../../utils/git");
+const { getCurrentBranch, derivePlanId } = require("../../utils/git");
+const { getLockStatus, listPlanLocks } = require("../../utils/lock");
 
 function supportsColor() {
   return Boolean(process.stdout.isTTY) && !process.env.NO_COLOR;
@@ -47,7 +53,21 @@ function resolvePlanPath(planArg) {
   if (!planArg) return null;
   if (path.isAbsolute(planArg)) return planArg;
   if (planArg.includes(path.sep)) return path.resolve(process.cwd(), planArg);
-  return path.join(getPlansDir(), planArg);
+
+  // Build candidate filenames: exact name, then with .yaml/.yml appended
+  const names = [planArg];
+  if (!planArg.endsWith(".yaml") && !planArg.endsWith(".yml")) {
+    names.push(`${planArg}.yaml`, `${planArg}.yml`);
+  }
+
+  // Check active plans first, then completed
+  for (const dir of [getPlansDir(), getCompletedDir()]) {
+    for (const name of names) {
+      const candidate = path.join(dir, name);
+      if (fs.existsSync(candidate)) return candidate;
+    }
+  }
+  return path.join(getPlansDir(), planArg); // default so caller's error message still works
 }
 
 function summarizePlans(plans) {
@@ -75,6 +95,14 @@ function renderPlanList(plans) {
 function renderPlanDetail(plan) {
   const status = getPlanStatus(plan);
   console.log(`${formatStatusLabel(status)} ${plan.fileName}`);
+  if (plan.metadata.completed_at) {
+    console.log(`  Completed: ${plan.metadata.completed_at}`);
+  }
+  const planId = derivePlanId(plan.fileName);
+  const logFile = path.join(getWorkDir(), `exec-${planId}.log`);
+  if (fs.existsSync(logFile)) {
+    console.log(`  Log: ${logFile}`);
+  }
   for (const step of plan.steps) {
     const stepLabel = formatStatusLabel(step.status || "pending");
     const description = step.description ? ` - ${step.description}` : "";
@@ -92,12 +120,44 @@ module.exports = function registerStatusCommand(program) {
     .description("Show orchestration status for plans in the current project")
     .option("--plan <file>", "Show detailed status for a specific plan")
     .action((options) => {
+      // Check for active global execution
+      const lock = getLockStatus();
+      if (lock.locked) {
+        console.log(
+          `Execution in progress (PID ${lock.pid}, started ${lock.startedAt})\n`
+        );
+      } else if (lock.stale) {
+        console.log(
+          `Note: Stale lock detected (PID ${lock.pid} no longer running)\n`
+        );
+      }
+
+      // Check for per-plan executions
+      const planLocks = listPlanLocks();
+      const activePlanLocks = planLocks.filter((l) => l.active);
+      const stalePlanLocks = planLocks.filter((l) => l.stale);
+
+      if (activePlanLocks.length > 0) {
+        console.log(`Active plan executions (${activePlanLocks.length}):`);
+        for (const pl of activePlanLocks) {
+          let line = `  - ${pl.planId} (PID ${pl.pid}, started ${pl.startedAt})`;
+          if (pl.worktreePath) line += `\n    worktree: ${pl.worktreePath}`;
+          console.log(line);
+        }
+        console.log();
+      }
+      if (stalePlanLocks.length > 0) {
+        console.log(
+          `Note: ${stalePlanLocks.length} stale per-plan lock(s) detected\n`
+        );
+      }
+
       const plansDir = getPlansDir();
       const planArg = options.plan;
 
       if (planArg) {
         const planPath = resolvePlanPath(planArg);
-        if (!planPath || !require("fs").existsSync(planPath)) {
+        if (!planPath || !fs.existsSync(planPath)) {
           console.error(`Plan not found: ${planArg}`);
           process.exitCode = 1;
           return;
@@ -122,16 +182,28 @@ module.exports = function registerStatusCommand(program) {
       }
 
       const planFiles = getPlanFiles(plansDir);
-      if (planFiles.length === 0) {
+      const completedDir = getCompletedDir();
+      const completedFiles = getPlanFiles(completedDir);
+
+      if (planFiles.length === 0 && completedFiles.length === 0) {
         console.log("No plans found");
         return;
       }
 
-      const plans = planFiles.map((planFile) => loadPlan(planFile));
-      const { pendingSteps, completedSteps } = summarizePlans(plans);
-      console.log(
-        `${plans.length} plans, ${pendingSteps} pending steps, ${completedSteps} completed`
-      );
-      renderPlanList(plans);
+      if (planFiles.length > 0) {
+        const plans = planFiles.map((planFile) => loadPlan(planFile));
+        const { pendingSteps, completedSteps } = summarizePlans(plans);
+        console.log(
+          `${plans.length} plans, ${pendingSteps} pending steps, ${completedSteps} completed`
+        );
+        renderPlanList(plans);
+      }
+
+      if (completedFiles.length > 0) {
+        if (planFiles.length > 0) console.log();
+        console.log(`Completed (${completedFiles.length}):`);
+        const completedPlans = completedFiles.map((f) => loadPlan(f));
+        renderPlanList(completedPlans);
+      }
     });
 };

package/lib/cli/index.js

@@ -10,6 +10,7 @@ const registerResume = require("./commands/resume");
 const registerValidatePlan = require("./commands/validate-plan");
 const registerIngestPlan = require("./commands/ingest-plan");
 const registerManual = require("./commands/manual");
+const registerPlansDir = require("./commands/plans-dir");
 const registerHelp = require("./commands/help");
 
 function getPackageVersion() {
@@ -36,6 +37,7 @@ function buildProgram() {
   registerValidatePlan(program);
   registerIngestPlan(program);
   registerManual(program);
+  registerPlansDir(program);
   registerHelp(program);
 
   program.on("command:*", (operands) => {