specweave 0.32.10 → 0.33.2

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

@@ -126,10 +126,36 @@ echo ""
 echo "📊 Increment Progress"
 echo ""
 
-# Get active increments
+# Get ready_for_review increments FIRST (needs attention!)
+READY_FOR_REVIEW=$(jq -r '
+  .increments | to_entries[] |
+  select(.value.status == "ready_for_review") |
+  "\(.key)|\(.value.tasks.completed)|\(.value.tasks.total)"
+' "$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; do
+    [[ -z "$id" ]] && continue
+    REVIEW_COUNT=$((REVIEW_COUNT + 1))
+    if [[ "$total" -gt 0 ]]; then
+      pct=$((completed * 100 / total))
+    else
+      pct=0
+    fi
+    bar=$(progress_bar "$pct" 15)
+    echo "  $id"
+    echo "     $bar $completed/$total ($pct%)"
+    echo "     → /specweave:done $id"
+  done <<< "$READY_FOR_REVIEW"
+  echo ""
+fi
+
+# Get active increments (excluding ready_for_review)
 ACTIVE=$(jq -r '
   .increments | to_entries[] |
-  select(.value.status == "active" or .value.status == "planning" or .value.status == "in-progress") |
+  select(.value.status == "active" or .value.status == "planning" or .value.status == "backlog") |
   "\(.key)|\(.value.tasks.completed)|\(.value.tasks.total)"
 ' "$CACHE_FILE" 2>/dev/null)
 
@@ -173,8 +199,20 @@ if [[ -n "$PAUSED" ]]; then
   echo ""
 fi
 
-# If no active/paused
-if [[ "$ACTIVE_COUNT" -eq 0 ]] && [[ -z "$PAUSED" ]]; then
+# Summary section
+if [[ "$REVIEW_COUNT" -gt 0 ]] || [[ "$ACTIVE_COUNT" -gt 0 ]] || [[ -n "$PAUSED" ]]; then
+  # Has work - show summary
+  echo "────────────────────────────────────────"
+  SUMMARY_PARTS=()
+  [[ "$REVIEW_COUNT" -gt 0 ]] && SUMMARY_PARTS+=("$REVIEW_COUNT ready for review")
+  [[ "$ACTIVE_COUNT" -gt 0 ]] && SUMMARY_PARTS+=("$ACTIVE_COUNT active")
+  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
@@ -182,4 +220,11 @@ if [[ "$ACTIVE_COUNT" -eq 0 ]] && [[ -z "$PAUSED" ]]; then
   fi
 fi
 
-echo "💡 For details: /specweave:progress <incrementId>"
+echo ""
+if [[ "$REVIEW_COUNT" -gt 0 ]]; then
+  echo "💡 Run /specweave:done <id> to close reviewed increments"
+elif [[ "$ACTIVE_COUNT" -eq 0 ]]; then
+  echo "💡 Run /specweave:increment to start new work"
+else
+  echo "💡 For details: /specweave:progress <incrementId>"
+fi

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

@@ -64,7 +64,7 @@ else
   # Find first active increment
   ACTIVE_ID=$(jq -r '
     .increments | to_entries[] |
-    select(.value.status == "active" or .value.status == "in-progress") |
+    select(.value.status == "active" or .value.status == "planning" or .value.status == "backlog" or .value.status == "ready_for_review") |
     .key
   ' "$CACHE_FILE" 2>/dev/null | head -1)
 fi

package/plugins/specweave/scripts/session-watchdog.sh

@@ -12,6 +12,9 @@ SPECWEAVE_ROOT="${SPECWEAVE_ROOT:-.specweave}"
 SIGNAL_FILE="${SPECWEAVE_ROOT}/state/.session-stuck"
 HEARTBEAT_FILE="${SPECWEAVE_ROOT}/state/.heartbeat"
 DAEMON_MODE=false
+PROJECT_ROOT="${PWD}"
+SESSION_ID="watchdog-$$-$(date +%s)"
+COORDINATION_THRESHOLD=30  # Heartbeat threshold for active watchdog detection
 
 # Colors
 RED='\033[0;31m'
@@ -176,15 +179,77 @@ check_session_health() {
   fi
 }
 
+# Coordination Functions
+check_active_watchdog() {
+  # Check if another watchdog is running via session registry
+  node "${PROJECT_ROOT}/dist/src/cli/check-watchdog.js" 2>/dev/null || echo ""
+}
+
+register_watchdog() {
+  # Register this watchdog in session registry
+  node "${PROJECT_ROOT}/dist/src/cli/register-session.js" "$SESSION_ID" $$ "watchdog" 2>&1 | \
+    grep -v "^$" | head -3
+}
+
+update_watchdog_heartbeat() {
+  # Update watchdog heartbeat
+  node "${PROJECT_ROOT}/dist/src/cli/update-heartbeat.js" "$SESSION_ID" 2>/dev/null || true
+}
+
+cleanup_watchdog() {
+  # Remove watchdog from registry on exit
+  node "${PROJECT_ROOT}/dist/src/cli/remove-session.js" "$SESSION_ID" 2>&1 | \
+    grep -v "^$" | head -3
+  log "Watchdog cleanup complete"
+}
+
+run_cleanup_service() {
+  # Run zombie process cleanup
+  node "${PROJECT_ROOT}/dist/src/cli/cleanup-zombies.js" 60 2>&1 | \
+    grep -v "^$" | head -10 || true
+}
+
 # Main execution
 if [[ "$DAEMON_MODE" == "true" ]]; then
+  # Coordination check before starting daemon
+  active_watchdog=$(check_active_watchdog)
+
+  if [[ -n "$active_watchdog" ]]; then
+    log "${YELLOW}Watchdog already active (PID: $active_watchdog)${NC}"
+    log "Exiting to avoid duplicate watchdogs"
+    exit 0
+  fi
+
+  # Register as watchdog
+  register_watchdog
+
+  # Trap signals for graceful shutdown
+  trap cleanup_watchdog SIGTERM SIGINT EXIT
+
   log "Starting session watchdog daemon (interval: ${CHECK_INTERVAL}s, threshold: ${STUCK_THRESHOLD_SECONDS}s)"
+  log "Watchdog session: $SESSION_ID (PID: $$)"
   log "Press Ctrl+C to stop"
 
   while true; do
+    # Update own heartbeat
+    update_watchdog_heartbeat
+
+    # Check session health
     check_session_health || true
+
+    # Run cleanup service
+    run_cleanup_service
+
+    # Check if parent process still exists (if we have a parent session)
+    if ! kill -0 $PPID 2>/dev/null; then
+      log "${YELLOW}Parent process died, exiting watchdog${NC}"
+      break
+    fi
+
     sleep "$CHECK_INTERVAL"
   done
+
+  cleanup_watchdog
 else
   log "Running single health check..."
   check_session_health

package/plugins/specweave/scripts/status.js

@@ -86,7 +86,7 @@ for (const folder of incrementFolders) {
 // Display
 console.log('\n📋 SpecWeave Status Overview\n');
 
-const statusOrder = ['active', 'planning', 'in-progress', 'ready_for_review', 'paused', 'backlog', 'completed', 'abandoned'];
+const statusOrder = ['ready_for_review', 'active', 'planning', 'in-progress', 'paused', 'backlog', 'completed', 'abandoned'];
 const statusIcons = {
   'active': '🔄',
   'planning': '📝',
@@ -105,12 +105,16 @@ for (const status of statusOrder) {
   if (items && items.length > 0) {
     hasOutput = true;
     const icon = statusIcons[status] || '•';
-    console.log(`${icon} ${status.replace('_', ' ')} (${items.length}):`);
-    
+    console.log(`${icon} ${status.replace(/_/g, ' ')} (${items.length}):`);
+
     // Show first 5, summarize rest
     const toShow = items.slice(0, 5);
     for (const item of toShow) {
       console.log(`   ${item}`);
+      // Add action hint for ready_for_review
+      if (status === 'ready_for_review') {
+        console.log(`      → /specweave:done ${item}`);
+      }
     }
     if (items.length > 5) {
       console.log(`   ... and ${items.length - 5} more`);
@@ -140,15 +144,28 @@ if (!hasOutput) {
 
 // Summary line
 const total = incrementFolders.length;
-const activeCount = (byStatus['active']?.length || 0) + 
-                   (byStatus['planning']?.length || 0) + 
-                   (byStatus['in-progress']?.length || 0);
+const reviewCount = byStatus['ready_for_review']?.length || 0;
+const activeCount = (byStatus['active']?.length || 0) +
+                   (byStatus['planning']?.length || 0) +
+                   (byStatus['backlog']?.length || 0);
 const completedCount = byStatus['completed']?.length || 0;
 
 console.log('─'.repeat(40));
-console.log(`Total: ${total} increment(s) | Active: ${activeCount} | Completed: ${completedCount} | Archived: ${archivedCount}`);
+const summaryParts = [`Total: ${total}`];
+if (reviewCount > 0) summaryParts.push(`Review: ${reviewCount}`);
+summaryParts.push(`Active: ${activeCount}`);
+summaryParts.push(`Completed: ${completedCount}`);
+if (archivedCount > 0) summaryParts.push(`Archived: ${archivedCount}`);
+console.log(summaryParts.join(' | '));
 console.log('');
-console.log('💡 Commands:');
-console.log('   /specweave:progress        Show task progress');
-console.log('   /specweave:do              Execute current tasks');
-console.log('   /specweave:done <id>       Close increment');
+
+// Context-aware command hints
+if (reviewCount > 0) {
+  console.log('💡 Next step: /specweave:done <id> to close reviewed increment(s)');
+} else if (activeCount > 0) {
+  console.log('💡 Commands:');
+  console.log('   /specweave:progress        Show task progress');
+  console.log('   /specweave:do              Execute current tasks');
+} else {
+  console.log('💡 Run /specweave:increment to start new work');
+}