work-kit-cli 0.2.1 → 0.2.2

package/cli/src/commands/complete.ts

@@ -1,7 +1,7 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { readState, writeState, findWorktreeRoot, readStateMd } from "../state/store.js";
-import { isPhaseComplete } from "../engine/transitions.js";
+import { isPhaseComplete, nextSubStageInPhase } from "../engine/transitions.js";
 import { checkLoopback } from "../engine/loopbacks.js";
 import { PHASE_ORDER } from "../config/phases.js";
 import { parseLocation, resetToLocation } from "../state/helpers.js";
@@ -117,6 +117,14 @@ export function completeCommand(target: string, outcome?: string, worktreeRoot?:
     };
   }
 
+  // Advance currentSubStage to the next pending sub-stage so the observer refreshes
+  const nextSS = nextSubStageInPhase(state, phase);
+  if (nextSS) {
+    state.currentSubStage = nextSS;
+  } else {
+    state.currentSubStage = null;
+  }
+
   writeState(root, state);
 
   return {

package/cli/src/config/phases.ts

@@ -41,7 +41,7 @@ const WORKFLOW_MATRIX: Record<Classification, Record<string, InclusionRule>> = {
     "test/verify": "YES", "test/e2e": "skip", "test/validate": "YES",
     "review/self-review": "YES", "review/security": "skip", "review/performance": "skip",
     "review/compliance": "skip", "review/handoff": "YES",
-    "deploy/merge": "optional", "deploy/monitor": "optional", "deploy/remediate": "optional",
+    "deploy/merge": "YES", "deploy/monitor": "optional", "deploy/remediate": "optional",
     "wrap-up/wrap-up": "YES",
   },
   "small-change": {
@@ -52,7 +52,7 @@ const WORKFLOW_MATRIX: Record<Classification, Record<string, InclusionRule>> = {
     "test/verify": "YES", "test/e2e": "skip", "test/validate": "skip",
     "review/self-review": "YES", "review/security": "skip", "review/performance": "skip",
     "review/compliance": "skip", "review/handoff": "YES",
-    "deploy/merge": "optional", "deploy/monitor": "optional", "deploy/remediate": "optional",
+    "deploy/merge": "YES", "deploy/monitor": "optional", "deploy/remediate": "optional",
     "wrap-up/wrap-up": "YES",
   },
   refactor: {
@@ -63,7 +63,7 @@ const WORKFLOW_MATRIX: Record<Classification, Record<string, InclusionRule>> = {
     "test/verify": "YES", "test/e2e": "skip", "test/validate": "skip",
     "review/self-review": "YES", "review/security": "skip", "review/performance": "YES",
     "review/compliance": "skip", "review/handoff": "YES",
-    "deploy/merge": "optional", "deploy/monitor": "optional", "deploy/remediate": "optional",
+    "deploy/merge": "YES", "deploy/monitor": "optional", "deploy/remediate": "optional",
     "wrap-up/wrap-up": "YES",
   },
   feature: {
@@ -74,7 +74,7 @@ const WORKFLOW_MATRIX: Record<Classification, Record<string, InclusionRule>> = {
     "test/verify": "YES", "test/e2e": "if UI", "test/validate": "YES",
     "review/self-review": "YES", "review/security": "YES", "review/performance": "skip",
     "review/compliance": "YES", "review/handoff": "YES",
-    "deploy/merge": "optional", "deploy/monitor": "optional", "deploy/remediate": "optional",
+    "deploy/merge": "YES", "deploy/monitor": "optional", "deploy/remediate": "optional",
     "wrap-up/wrap-up": "YES",
   },
   "large-feature": {
@@ -85,7 +85,7 @@ const WORKFLOW_MATRIX: Record<Classification, Record<string, InclusionRule>> = {
     "test/verify": "YES", "test/e2e": "YES", "test/validate": "YES",
     "review/self-review": "YES", "review/security": "YES", "review/performance": "YES",
     "review/compliance": "YES", "review/handoff": "YES",
-    "deploy/merge": "optional", "deploy/monitor": "optional", "deploy/remediate": "optional",
+    "deploy/merge": "YES", "deploy/monitor": "optional", "deploy/remediate": "optional",
     "wrap-up/wrap-up": "YES",
   },
 };
@@ -110,9 +110,7 @@ export function buildFullWorkflow(): WorkflowStep[] {
   const steps: WorkflowStep[] = [];
   for (const phase of PHASE_ORDER) {
     for (const subStage of SUBSTAGES_BY_PHASE[phase]) {
-      // Deploy is optional by default
-      const included = phase !== "deploy";
-      steps.push({ phase, subStage, included });
+      steps.push({ phase, subStage, included: true });
     }
   }
   return steps;

package/cli/src/observer/renderer.ts

@@ -144,16 +144,8 @@ function renderWorkItem(item: WorkItemView, innerWidth: number): string[] {
   const gap2 = Math.max(2, innerWidth - modePlainLen - timingPlainLen);
   lines.push(modeStr + " ".repeat(gap2) + timingText);
 
-  // Line 3: progress bar with phase label + substage position
-  let phaseLabel = "—";
-  if (item.currentPhase) {
-    phaseLabel = item.currentSubStage
-      ? `${item.currentPhase}/${item.currentSubStage}`
-      : item.currentPhase;
-    if (item.currentSubStageIndex != null && item.currentPhaseTotal != null) {
-      phaseLabel += ` (${item.currentSubStageIndex}/${item.currentPhaseTotal})`;
-    }
-  }
+  // Line 3: progress bar with phase label only (no sub-stage inline)
+  const phaseLabel = item.currentPhase || "—";
   const barMaxWidth = Math.max(20, Math.min(40, innerWidth - 30));
   lines.push("  " + renderProgressBar(
     item.progress.completed,
@@ -163,10 +155,19 @@ function renderWorkItem(item: WorkItemView, innerWidth: number): string[] {
     barMaxWidth
   ));
 
-  // Line 4: phase indicators
+  // Line 4: phase indicators with sub-stage shown under current phase
   const phaseStrs = item.phases.map(p => `${p.name} ${phaseIndicator(p.status)}`);
   lines.push("  " + phaseStrs.join("  "));
 
+  // Line 5 (optional): current sub-stage detail under the phase line
+  if (item.currentSubStage && item.currentPhase) {
+    let subLabel = `↳ ${item.currentSubStage}`;
+    if (item.currentSubStageIndex != null && item.currentPhaseTotal != null) {
+      subLabel += ` (${item.currentSubStageIndex}/${item.currentPhaseTotal})`;
+    }
+    lines.push("    " + dim(subLabel));
+  }
+
   // Line 5 (optional): loopbacks
   if (item.loopbacks.count > 0) {
     const lb = item.loopbacks;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "work-kit-cli",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Structured development workflow for Claude Code. Two modes, 6 phases, 27 sub-stages.",
   "type": "module",
   "bin": {