specweave 1.0.263 → 1.0.264

package/dist/src/utils/docs-preview/types.d.ts

@@ -1,3 +1,27 @@
+export interface DocCategory {
+    /** Folder name (e.g., 'strategy') */
+    id: string;
+    /** Human-readable label (e.g., 'Strategy') */
+    label: string;
+    /** Short description for landing page */
+    description: string;
+    /** Emoji icon for the category */
+    icon: string;
+    /** Number of markdown documents found */
+    docCount: number;
+}
+export interface ProjectMetadata {
+    /** Project name */
+    name: string;
+    /** Project description / tagline */
+    description: string;
+    /** 1-2 letter initials for logo generation */
+    initials: string;
+    /** Detected doc categories that actually exist */
+    categories: DocCategory[];
+    /** Source of the project name detection */
+    source: 'config' | 'package' | 'directory';
+}
 export interface DocusaurusConfig {
     title: string;
     tagline: string;
@@ -7,6 +31,8 @@ export interface DocusaurusConfig {
     port?: number;
     theme?: 'default' | 'classic' | 'dark';
     excludeFolders?: string[];
+    /** Auto-detected project metadata */
+    projectMetadata?: ProjectMetadata;
 }
 export interface SidebarItem {
     type: 'doc' | 'category';

package/dist/src/utils/docs-preview/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/utils/docs-preview/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG,MAAM,CAAC;IACvC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,KAAK,GAAG,UAAU,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,WAAW,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,WAAW,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,gBAAgB,CAAC;IACzB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,OAAO,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/utils/docs-preview/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IAC1B,qCAAqC;IACrC,EAAE,EAAE,MAAM,CAAC;IACX,8CAA8C;IAC9C,KAAK,EAAE,MAAM,CAAC;IACd,yCAAyC;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,kCAAkC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,yCAAyC;IACzC,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,mBAAmB;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,oCAAoC;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,8CAA8C;IAC9C,QAAQ,EAAE,MAAM,CAAC;IACjB,kDAAkD;IAClD,UAAU,EAAE,WAAW,EAAE,CAAC;IAC1B,2CAA2C;IAC3C,MAAM,EAAE,QAAQ,GAAG,SAAS,GAAG,WAAW,CAAC;CAC5C;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG,MAAM,CAAC;IACvC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,qCAAqC;IACrC,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,KAAK,GAAG,UAAU,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,WAAW,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,WAAW,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,gBAAgB,CAAC;IACzB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,OAAO,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "specweave",
-  "version": "1.0.263",
+  "version": "1.0.264",
   "description": "Spec-driven development framework for AI coding agents. First-class support for Claude Code — compatible with any LLM-powered coding tool. Living documentation, autonomous execution, quality gates, and multilingual support (9 languages).",
   "type": "module",
   "main": "dist/index.js",

package/plugins/specweave/scripts/progress.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 /**
- * Instant Increment Progress
+ * Instant Increment Progress (Node.js fallback)
  *
- * Executed by UserPromptSubmit hook for /sw:progress
- * Bypasses LLM entirely - output shown directly to user
+ * Executed by UserPromptSubmit hook for /sw:progress when jq is unavailable.
+ * Reads files directly (no cache needed). Bypasses LLM entirely.
  *
  * Usage: node progress.js [incrementId] [--help]
  */
@@ -67,34 +67,80 @@ if (incrementFolders.length === 0) {
 function parseIncrement(folder) {
   const metaPath = path.join(incrementsDir, folder, 'metadata.json');
   const tasksPath = path.join(incrementsDir, folder, 'tasks.md');
-  
+  const specPath = path.join(incrementsDir, folder, 'spec.md');
+
   let metadata = { status: 'unknown' };
   if (fs.existsSync(metaPath)) {
     try {
       metadata = JSON.parse(fs.readFileSync(metaPath, 'utf-8'));
     } catch {}
   }
-  
+
   let totalTasks = 0;
   let completedTasks = 0;
-  
+
   if (fs.existsSync(tasksPath)) {
     const content = fs.readFileSync(tasksPath, 'utf-8');
-    const taskMatches = content.match(/### T-\d+/g);
-    totalTasks = taskMatches ? taskMatches.length : 0;
-    
-    const completedMatches = content.match(/\*\*Status\*\*:\s*\[x\]/gi);
-    completedTasks = completedMatches ? completedMatches.length : 0;
+    const headingTasks = (content.match(/^#{2,} T-\d+/gm) || []).length;
+    const checklistTasks = (content.match(/^- \[[x ]\] T-\d+/gm) || []).length;
+    totalTasks = headingTasks + checklistTasks;
+
+    const completedStatus = (content.match(/\*\*Status\*\*:\s*\[x\]/gi) || []).length;
+    const completedDate = (content.match(/\*\*Completed\*\*:\s*\d/gi) || []).length;
+    const completedChecklist = (content.match(/^- \[x\] T-\d+/gm) || []).length;
+    completedTasks = completedStatus + completedDate + completedChecklist;
   }
-  
+
+  let totalAcs = 0;
+  let completedAcs = 0;
+  if (fs.existsSync(specPath)) {
+    const specContent = fs.readFileSync(specPath, 'utf-8');
+    const acMatches = specContent.match(/- \[.\] \*\*AC-/g);
+    totalAcs = acMatches ? acMatches.length : 0;
+    const acDone = specContent.match(/- \[x\] \*\*AC-/g);
+    completedAcs = acDone ? acDone.length : 0;
+  }
+
+  // Get last activity from newest file mtime
+  let lastActivity = 0;
+  try {
+    if (fs.existsSync(metaPath)) lastActivity = Math.max(lastActivity, fs.statSync(metaPath).mtimeMs);
+    if (fs.existsSync(tasksPath)) lastActivity = Math.max(lastActivity, fs.statSync(tasksPath).mtimeMs);
+    if (fs.existsSync(specPath)) lastActivity = Math.max(lastActivity, fs.statSync(specPath).mtimeMs);
+  } catch {}
+
   return {
     id: folder,
     status: metadata.status || 'unknown',
     type: metadata.type || 'feature',
+    priority: metadata.priority || 'P1',
     totalTasks,
     completedTasks,
-    percentage: totalTasks > 0 ? Math.round((completedTasks / totalTasks) * 100) : 0
+    totalAcs,
+    completedAcs,
+    percentage: totalTasks > 0 ? Math.round((completedTasks / totalTasks) * 100) : 0,
+    lastActivity
+  };
+}
+
+// Helpers
+function createProgressBar(pct, width = 20) {
+  const filled = Math.round((pct / 100) * width);
+  const empty = width - filled;
+  return `[${'█'.repeat(filled)}${'░'.repeat(empty)}]`;
+}
+
+function formatStatus(status) {
+  const icons = {
+    'active': '🔄 active',
+    'planning': '📝 planning',
+    'backlog': '📋 backlog',
+    'ready_for_review': '👀 ready for review',
+    'paused': '⏸️ paused',
+    'completed': '✅ completed',
+    'abandoned': '❌ abandoned'
   };
+  return icons[status] || status;
 }
 
 // If specific increment requested
@@ -104,67 +150,139 @@ if (specificId) {
     console.log(`Increment not found: ${specificId}`);
     process.exit(1);
   }
-  
+
   const inc = parseIncrement(folder);
   const bar = createProgressBar(inc.percentage);
-  
+
   console.log(`\n📊 Progress: ${inc.id}\n`);
   console.log(`Status: ${formatStatus(inc.status)}`);
   console.log(`Type: ${inc.type}`);
   console.log(`Tasks: ${inc.completedTasks}/${inc.totalTasks} (${inc.percentage}%)`);
   console.log(`Progress: ${bar}`);
+  if (inc.totalAcs > 0) {
+    const acPct = Math.round((inc.completedAcs / inc.totalAcs) * 100);
+    console.log(`ACs: ${inc.completedAcs}/${inc.totalAcs} (${acPct}%)`);
+  }
   process.exit(0);
 }
 
 // Show all active increments
 const increments = incrementFolders.map(parseIncrement);
-const readyForReview = increments.filter(i => i.status === 'ready_for_review');
-const active = increments.filter(i => ['active', 'planning', 'backlog'].includes(i.status));
+
+// Categorize increments
+const needsClosure = increments
+  .filter(i => ['active', 'planning', 'planned'].includes(i.status) && i.totalTasks > 0 && i.completedTasks === i.totalTasks)
+  .sort((a, b) => b.lastActivity - a.lastActivity);
+
+const readyForReview = increments
+  .filter(i => i.status === 'ready_for_review')
+  .sort((a, b) => b.lastActivity - a.lastActivity);
+
+const active = increments
+  .filter(i => ['active', 'planning', 'planned'].includes(i.status) &&
+    (i.totalTasks > 0 || i.totalAcs > 0) &&
+    !(i.totalTasks > 0 && i.completedTasks === i.totalTasks))
+  .sort((a, b) => b.lastActivity - a.lastActivity);
+
+const emptyActive = increments
+  .filter(i => ['active', 'planning', 'planned'].includes(i.status) && i.totalTasks === 0 && i.totalAcs === 0);
+
+const backlog = increments
+  .filter(i => i.status === 'backlog')
+  .sort((a, b) => b.lastActivity - a.lastActivity);
+
 const paused = increments.filter(i => i.status === 'paused');
 
 console.log('\n📊 Increment Progress\n');
 
-// Show ready_for_review FIRST (needs attention!)
+// Section 1: Needs Closure
+if (needsClosure.length > 0) {
+  console.log('⚠️  Needs Closure (100% tasks done):');
+  for (const inc of needsClosure) {
+    console.log(`  ${inc.id} → /sw:done ${inc.id}`);
+  }
+  console.log('');
+}
+
+// Section 2: Ready for Review
 if (readyForReview.length > 0) {
-  console.log(`👀 Ready for Review (${readyForReview.length}):`);
+  console.log('👀 Ready for Review:');
   for (const inc of readyForReview) {
-    const bar = createProgressBar(inc.percentage, 15);
-    console.log(`  ${inc.id}`);
-    console.log(`     ${bar} ${inc.completedTasks}/${inc.totalTasks} (${inc.percentage}%)`);
+    const bar = createProgressBar(inc.percentage, 12);
+    const priBadge = inc.priority === 'P0' ? '🔴' : inc.priority === 'P1' ? '🟠' : '';
+    let acInfo = '';
+    if (inc.totalAcs > 0) {
+      const acPct = Math.round((inc.completedAcs / inc.totalAcs) * 100);
+      acInfo = ` | ${inc.completedAcs}/${inc.totalAcs} ACs (${acPct}%)`;
+    }
+    console.log(`  ${priBadge} ${inc.id}`);
+    console.log(`     ${bar} ${inc.completedTasks}/${inc.totalTasks} tasks${acInfo}`);
     console.log(`     → /sw:done ${inc.id}`);
   }
   console.log('');
 }
 
+// Section 3: Active (with work, not done, not empty)
 if (active.length > 0) {
-  console.log(`🔄 Active (${active.length}):`);
+  console.log('🔄 Active:');
   for (const inc of active) {
-    const bar = createProgressBar(inc.percentage, 15);
-    console.log(`  ${inc.id}`);
-    console.log(`     ${bar} ${inc.completedTasks}/${inc.totalTasks} (${inc.percentage}%)`);
+    const bar = createProgressBar(inc.percentage, 12);
+    const priBadge = inc.priority === 'P0' ? '🔴' : inc.priority === 'P1' ? '🟠' : '';
+    const statusInd = ['planning', 'planned'].includes(inc.status) ? ' (📝 planning)' : '';
+    let acInfo = '';
+    if (inc.totalAcs > 0) {
+      const acPct = Math.round((inc.completedAcs / inc.totalAcs) * 100);
+      acInfo = ` | ${inc.completedAcs}/${inc.totalAcs} ACs (${acPct}%)`;
+    }
+    console.log(`  ${priBadge} ${inc.id}${statusInd}`);
+    console.log(`     ${bar} ${inc.completedTasks}/${inc.totalTasks} tasks${acInfo}`);
   }
   console.log('');
 }
 
+// Section 4: Planning (no tasks) — collapsed
+if (emptyActive.length > 0) {
+  const ids = emptyActive.map(i => i.id).join(', ');
+  console.log(`📝 Planning (no tasks): ${ids}`);
+  console.log('');
+}
+
+// Section 5: Backlog
+if (backlog.length > 0) {
+  console.log('📋 Backlog:');
+  for (const inc of backlog) {
+    const priBadge = inc.priority === 'P0' ? '🔴' : inc.priority === 'P1' ? '🟠' : '';
+    console.log(`  ${priBadge} ${inc.id} - ${inc.percentage}% planned`);
+  }
+  console.log('');
+}
+
+// Section 6: Paused
 if (paused.length > 0) {
   console.log(`⏸️  Paused (${paused.length}):`);
   for (const inc of paused) {
-    console.log(`  ${inc.id} - ${inc.percentage}%`);
+    console.log(`  ${inc.id} - ${inc.percentage}% tasks`);
   }
   console.log('');
 }
 
-// Summary section
-if (readyForReview.length > 0 || active.length > 0 || paused.length > 0) {
+// Summary
+const totalActionable = needsClosure.length + readyForReview.length + active.length + emptyActive.length + backlog.length + paused.length;
+if (totalActionable > 0) {
   console.log('─'.repeat(40));
   const parts = [];
+  if (needsClosure.length > 0) parts.push(`${needsClosure.length} needs closure`);
   if (readyForReview.length > 0) parts.push(`${readyForReview.length} ready for review`);
   if (active.length > 0) parts.push(`${active.length} active`);
+  if (emptyActive.length > 0) parts.push(`${emptyActive.length} planning`);
+  if (backlog.length > 0) parts.push(`${backlog.length} backlog`);
   if (paused.length > 0) parts.push(`${paused.length} paused`);
   console.log(`Summary: ${parts.join(', ')}`);
   console.log('');
 
-  if (readyForReview.length > 0) {
+  if (needsClosure.length > 0) {
+    console.log('💡 Run /sw:done <id> to close completed increments');
+  } else if (readyForReview.length > 0) {
     console.log('💡 Run /sw:done <id> to close reviewed increments');
   } else {
     console.log('💡 For details: /sw:progress <incrementId>');
@@ -178,23 +296,3 @@ if (readyForReview.length > 0 || active.length > 0 || paused.length > 0) {
   console.log('');
   console.log('💡 Run /sw:increment to start new work');
 }
-
-// Helpers
-function createProgressBar(pct, width = 20) {
-  const filled = Math.round((pct / 100) * width);
-  const empty = width - filled;
-  return `[${'█'.repeat(filled)}${'░'.repeat(empty)}]`;
-}
-
-function formatStatus(status) {
-  const icons = {
-    'active': '🔄 active',
-    'planning': '📝 planning',
-    'backlog': '📋 backlog',
-    'ready_for_review': '👀 ready for review',
-    'paused': '⏸️ paused',
-    'completed': '✅ completed',
-    'abandoned': '❌ abandoned'
-  };
-  return icons[status] || status;
-}

package/plugins/specweave/scripts/read-progress.sh

@@ -38,7 +38,8 @@ if [[ ! -d "$PROJECT_ROOT/.specweave" ]]; then
 fi
 
 CACHE_FILE="$PROJECT_ROOT/.specweave/state/dashboard.json"
-SCRIPTS_DIR="$PROJECT_ROOT/plugins/specweave/scripts"
+# Resolve scripts dir relative to this script (works in both dev and plugin cache)
+SCRIPTS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 # Check if jq is available, fall back to Node if not
 if ! command -v jq >/dev/null 2>&1; then
@@ -60,6 +61,36 @@ elif ! jq -e '.' "$CACHE_FILE" >/dev/null 2>&1; then
   NEED_REBUILD=true
 fi
 
+# Staleness check: if any increment file is newer than cache, rebuild
+if [[ "$NEED_REBUILD" == "false" ]] && [[ -f "$CACHE_FILE" ]]; then
+  CACHE_MTIME=0
+  if [[ "$(uname)" == "Darwin" ]]; then
+    CACHE_MTIME=$(stat -f "%m" "$CACHE_FILE" 2>/dev/null || echo "0")
+  else
+    CACHE_MTIME=$(stat -c "%Y" "$CACHE_FILE" 2>/dev/null || echo "0")
+  fi
+
+  INC_DIR="$PROJECT_ROOT/.specweave/increments"
+  if [[ -d "$INC_DIR" ]]; then
+    for d in "$INC_DIR"/[0-9]*/; do
+      [[ -d "$d" ]] || continue
+      for f in "$d"metadata.json "$d"tasks.md "$d"spec.md; do
+        [[ -f "$f" ]] || continue
+        FILE_MTIME=0
+        if [[ "$(uname)" == "Darwin" ]]; then
+          FILE_MTIME=$(stat -f "%m" "$f" 2>/dev/null || echo "0")
+        else
+          FILE_MTIME=$(stat -c "%Y" "$f" 2>/dev/null || echo "0")
+        fi
+        if [[ "$FILE_MTIME" -gt "$CACHE_MTIME" ]]; then
+          NEED_REBUILD=true
+          break 2
+        fi
+      done
+    done
+  fi
+fi
+
 if [[ "$NEED_REBUILD" == "true" ]]; then
   bash "$SCRIPTS_DIR/rebuild-dashboard-cache.sh" --quiet 2>/dev/null || true
 fi
@@ -170,7 +201,9 @@ if [[ -n "$INCREMENT_ID" ]]; then
   echo "Priority: $PRIORITY_FMT"
   echo ""
   echo "Tasks:    $COMPLETED/$TOTAL ($TASK_PCT%) $BAR"
-  echo "ACs:      $AC_COMPLETED/$AC_TOTAL ($AC_PCT%)"
+  if [[ "$AC_TOTAL" -gt 0 ]]; then
+    echo "ACs:      $AC_COMPLETED/$AC_TOTAL ($AC_PCT%)"
+  fi
   exit 0
 fi
 
@@ -179,17 +212,39 @@ echo ""
 echo "📊 Increment Progress"
 echo ""
 
-# Get ready_for_review increments FIRST (needs attention!)
+# ── Section 1: Needs Closure (100% done but still active/planning) ──
+NEEDS_CLOSURE=$(jq -r '
+  [.increments | to_entries[] |
+   select((.value.status == "active" or .value.status == "planning" or .value.status == "planned") and
+          .value.tasks.total > 0 and
+          .value.tasks.completed == .value.tasks.total)] |
+  sort_by(.value.lastActivityEpoch // 0) | reverse | .[] |
+  .key
+' "$CACHE_FILE" 2>/dev/null)
+
+CLOSURE_COUNT=0
+if [[ -n "$NEEDS_CLOSURE" ]]; then
+  echo "⚠️  Needs Closure (100% tasks done):"
+  while IFS= read -r id; do
+    [[ -z "$id" ]] && continue
+    CLOSURE_COUNT=$((CLOSURE_COUNT + 1))
+    echo "  $id → /sw:done $id"
+  done <<< "$NEEDS_CLOSURE"
+  echo ""
+fi
+
+# ── Section 2: Ready for Review ──
 READY_FOR_REVIEW=$(jq -r '
-  .increments | to_entries[] |
-  select(.value.status == "ready_for_review") |
-  "\(.key)|\(.value.tasks.completed)|\(.value.tasks.total)|\(.value.acs.completed)|\(.value.acs.total)|\(.value.priority)|\(.value.type)"
+  [.increments | to_entries[] |
+   select(.value.status == "ready_for_review")] |
+  sort_by(.value.lastActivityEpoch // 0) | reverse | .[] |
+  "\(.key)|\(.value.tasks.completed)|\(.value.tasks.total)|\(.value.acs.completed)|\(.value.acs.total)|\(.value.priority)"
 ' "$CACHE_FILE" 2>/dev/null)
 
 REVIEW_COUNT=0
 if [[ -n "$READY_FOR_REVIEW" ]]; then
   echo "👀 Ready for Review:"
-  while IFS='|' read -r id completed total ac_completed ac_total priority inc_type; do
+  while IFS='|' read -r id completed total ac_completed ac_total priority; do
     [[ -z "$id" ]] && continue
     REVIEW_COUNT=$((REVIEW_COUNT + 1))
     if [[ "$total" -gt 0 ]]; then
@@ -197,34 +252,36 @@ if [[ -n "$READY_FOR_REVIEW" ]]; then
     else
       pct=0
     fi
-    if [[ "$ac_total" -gt 0 ]]; then
-      ac_pct=$((ac_completed * 100 / ac_total))
-    else
-      ac_pct=0
-    fi
     bar=$(progress_bar "$pct" 12)
-    # Format priority badge
     pri_badge=""
     case "$priority" in P0|critical) pri_badge="🔴" ;; P1|high) pri_badge="🟠" ;; esac
+    ac_info=""
+    if [[ "$ac_total" -gt 0 ]]; then
+      ac_pct=$((ac_completed * 100 / ac_total))
+      ac_info=" | $ac_completed/$ac_total ACs ($ac_pct%)"
+    fi
     echo "  $pri_badge $id"
-    echo "     $bar $completed/$total tasks | $ac_completed/$ac_total ACs ($ac_pct%)"
+    echo "     $bar $completed/$total tasks$ac_info"
     echo "     → /sw:done $id"
   done <<< "$READY_FOR_REVIEW"
   echo ""
 fi
 
-# Get active increments (excluding ready_for_review and backlog)
-# Note: "planned" is a legacy typo for "planning" - support both for backwards compatibility
+# ── Section 3: Active (with real work, not 100% done, not empty) ──
+# Excludes: 100%-done (shown in Needs Closure), 0-tasks-0-ACs (shown in Planning)
 ACTIVE=$(jq -r '
-  .increments | to_entries[] |
-  select(.value.status == "active" or .value.status == "planning" or .value.status == "planned") |
-  "\(.key)|\(.value.tasks.completed)|\(.value.tasks.total)|\(.value.acs.completed)|\(.value.acs.total)|\(.value.status)|\(.value.priority)|\(.value.type)"
+  [.increments | to_entries[] |
+   select((.value.status == "active" or .value.status == "planning" or .value.status == "planned") and
+          (.value.tasks.total > 0 or .value.acs.total > 0) and
+          ((.value.tasks.total == 0) or (.value.tasks.completed < .value.tasks.total)))] |
+  sort_by(.value.lastActivityEpoch // 0) | reverse | .[] |
+  "\(.key)|\(.value.tasks.completed)|\(.value.tasks.total)|\(.value.acs.completed)|\(.value.acs.total)|\(.value.status)|\(.value.priority)"
 ' "$CACHE_FILE" 2>/dev/null)
 
 ACTIVE_COUNT=0
 if [[ -n "$ACTIVE" ]]; then
   echo "🔄 Active:"
-  while IFS='|' read -r id completed total ac_completed ac_total inc_status priority inc_type; do
+  while IFS='|' read -r id completed total ac_completed ac_total inc_status priority; do
     [[ -z "$id" ]] && continue
     ACTIVE_COUNT=$((ACTIVE_COUNT + 1))
     if [[ "$total" -gt 0 ]]; then
@@ -232,37 +289,57 @@ if [[ -n "$ACTIVE" ]]; then
     else
       pct=0
     fi
-    if [[ "$ac_total" -gt 0 ]]; then
-      ac_pct=$((ac_completed * 100 / ac_total))
-    else
-      ac_pct=0
-    fi
     bar=$(progress_bar "$pct" 12)
-    # Format priority badge
     pri_badge=""
     case "$priority" in P0|critical) pri_badge="🔴" ;; P1|high) pri_badge="🟠" ;; esac
-    # Show status indicator if planning
     status_indicator=""
     case "$inc_status" in
       planning|planned) status_indicator=" (📝 planning)" ;;
     esac
+    ac_info=""
+    if [[ "$ac_total" -gt 0 ]]; then
+      ac_pct=$((ac_completed * 100 / ac_total))
+      ac_info=" | $ac_completed/$ac_total ACs ($ac_pct%)"
+    fi
     echo "  $pri_badge $id$status_indicator"
-    echo "     $bar $completed/$total tasks | $ac_completed/$ac_total ACs ($ac_pct%)"
+    echo "     $bar $completed/$total tasks$ac_info"
   done <<< "$ACTIVE"
   echo ""
 fi
 
-# Get backlog increments (separate from active)
-BACKLOG=$(jq -r '
+# ── Section 4: Planning (no tasks yet) — collapsed single line ──
+EMPTY_ACTIVE=$(jq -r '
   .increments | to_entries[] |
-  select(.value.status == "backlog") |
-  "\(.key)|\(.value.tasks.completed)|\(.value.tasks.total)|\(.value.acs.completed)|\(.value.acs.total)|\(.value.priority)"
+  select((.value.status == "active" or .value.status == "planning" or .value.status == "planned") and
+         .value.tasks.total == 0 and .value.acs.total == 0) |
+  .key
+' "$CACHE_FILE" 2>/dev/null)
+
+EMPTY_COUNT=0
+if [[ -n "$EMPTY_ACTIVE" ]]; then
+  EMPTY_LIST=""
+  while IFS= read -r id; do
+    [[ -z "$id" ]] && continue
+    EMPTY_COUNT=$((EMPTY_COUNT + 1))
+    [[ -n "$EMPTY_LIST" ]] && EMPTY_LIST="$EMPTY_LIST, "
+    EMPTY_LIST="$EMPTY_LIST$id"
+  done <<< "$EMPTY_ACTIVE"
+  echo "📝 Planning (no tasks): $EMPTY_LIST"
+  echo ""
+fi
+
+# ── Section 5: Backlog ──
+BACKLOG=$(jq -r '
+  [.increments | to_entries[] |
+   select(.value.status == "backlog")] |
+  sort_by(.value.lastActivityEpoch // 0) | reverse | .[] |
+  "\(.key)|\(.value.tasks.completed)|\(.value.tasks.total)|\(.value.priority)"
 ' "$CACHE_FILE" 2>/dev/null)
 
 BACKLOG_COUNT=0
 if [[ -n "$BACKLOG" ]]; then
   echo "📋 Backlog:"
-  while IFS='|' read -r id completed total ac_completed ac_total priority; do
+  while IFS='|' read -r id completed total priority; do
     [[ -z "$id" ]] && continue
     BACKLOG_COUNT=$((BACKLOG_COUNT + 1))
     if [[ "$total" -gt 0 ]]; then
@@ -270,7 +347,6 @@ if [[ -n "$BACKLOG" ]]; then
     else
       pct=0
     fi
-    # Format priority badge
     pri_badge=""
     case "$priority" in P0|critical) pri_badge="🔴" ;; P1|high) pri_badge="🟠" ;; esac
     echo "  $pri_badge $id - $pct% planned"
@@ -278,48 +354,46 @@ if [[ -n "$BACKLOG" ]]; then
   echo ""
 fi
 
-# Get paused increments
+# ── Section 6: Paused ──
 PAUSED=$(jq -r '
   .increments | to_entries[] |
   select(.value.status == "paused") |
-  "\(.key)|\(.value.tasks.completed)|\(.value.tasks.total)|\(.value.acs.completed)|\(.value.acs.total)"
+  "\(.key)|\(.value.tasks.completed)|\(.value.tasks.total)"
 ' "$CACHE_FILE" 2>/dev/null)
 
+PAUSED_COUNT=0
 if [[ -n "$PAUSED" ]]; then
-  PAUSED_COUNT=$(echo "$PAUSED" | wc -l | tr -d ' ')
+  while IFS='|' read -r id completed total; do
+    [[ -z "$id" ]] && continue
+    PAUSED_COUNT=$((PAUSED_COUNT + 1))
+  done <<< "$PAUSED"
   echo "⏸️  Paused ($PAUSED_COUNT):"
-  while IFS='|' read -r id completed total ac_completed ac_total; do
+  while IFS='|' read -r id completed total; do
     [[ -z "$id" ]] && continue
     if [[ "$total" -gt 0 ]]; then
       pct=$((completed * 100 / total))
     else
       pct=0
     fi
-    if [[ "$ac_total" -gt 0 ]]; then
-      ac_pct=$((ac_completed * 100 / ac_total))
-    else
-      ac_pct=0
-    fi
-    echo "  $id - $pct% tasks | $ac_pct% ACs"
+    echo "  $id - $pct% tasks"
   done <<< "$PAUSED"
   echo ""
 fi
 
-# Summary section
-if [[ "$REVIEW_COUNT" -gt 0 ]] || [[ "$ACTIVE_COUNT" -gt 0 ]] || [[ "$BACKLOG_COUNT" -gt 0 ]] || [[ -n "$PAUSED" ]]; then
-  # Has work - show summary
+# ── Summary ──
+TOTAL_ACTIONABLE=$((CLOSURE_COUNT + REVIEW_COUNT + ACTIVE_COUNT + EMPTY_COUNT + BACKLOG_COUNT + PAUSED_COUNT))
+if [[ "$TOTAL_ACTIONABLE" -gt 0 ]]; then
   echo "────────────────────────────────────────"
   SUMMARY_PARTS=()
+  [[ "$CLOSURE_COUNT" -gt 0 ]] && SUMMARY_PARTS+=("$CLOSURE_COUNT needs closure")
   [[ "$REVIEW_COUNT" -gt 0 ]] && SUMMARY_PARTS+=("$REVIEW_COUNT ready for review")
   [[ "$ACTIVE_COUNT" -gt 0 ]] && SUMMARY_PARTS+=("$ACTIVE_COUNT active")
+  [[ "$EMPTY_COUNT" -gt 0 ]] && SUMMARY_PARTS+=("$EMPTY_COUNT planning")
   [[ "$BACKLOG_COUNT" -gt 0 ]] && SUMMARY_PARTS+=("$BACKLOG_COUNT backlog")
-  PAUSED_COUNT=0
-  [[ -n "$PAUSED" ]] && PAUSED_COUNT=$(echo "$PAUSED" | grep -c '|' || echo 0)
   [[ "$PAUSED_COUNT" -gt 0 ]] && SUMMARY_PARTS+=("$PAUSED_COUNT paused")
 
   IFS=', '; echo "Summary: ${SUMMARY_PARTS[*]}"
 else
-  # No work in progress
   echo "No active increments."
   COMPLETED_COUNT=$(jq '.summary.completed // 0' "$CACHE_FILE")
   if [[ "$COMPLETED_COUNT" -gt 0 ]]; then
@@ -328,9 +402,11 @@ else
 fi
 
 echo ""
-if [[ "$REVIEW_COUNT" -gt 0 ]]; then
+if [[ "$CLOSURE_COUNT" -gt 0 ]]; then
+  echo "💡 Run /sw:done <id> to close completed increments"
+elif [[ "$REVIEW_COUNT" -gt 0 ]]; then
   echo "💡 Run /sw:done <id> to close reviewed increments"
-elif [[ "$ACTIVE_COUNT" -eq 0 ]]; then
+elif [[ "$ACTIVE_COUNT" -eq 0 ]] && [[ "$EMPTY_COUNT" -eq 0 ]]; then
   echo "💡 Run /sw:increment to start new work"
 else
   echo "💡 For details: /sw:progress <incrementId>"