specweave 0.32.10 → 0.33.3

package/plugins/specweave/scripts/progress.js

@@ -118,11 +118,24 @@ if (specificId) {
 
 // Show all active increments
 const increments = incrementFolders.map(parseIncrement);
-const active = increments.filter(i => ['active', 'planning', 'in-progress'].includes(i.status));
+const readyForReview = increments.filter(i => i.status === 'ready_for_review');
+const active = increments.filter(i => ['active', 'planning', 'backlog'].includes(i.status));
 const paused = increments.filter(i => i.status === 'paused');
 
 console.log('\n📊 Increment Progress\n');
 
+// Show ready_for_review FIRST (needs attention!)
+if (readyForReview.length > 0) {
+  console.log(`👀 Ready for Review (${readyForReview.length}):`);
+  for (const inc of readyForReview) {
+    const bar = createProgressBar(inc.percentage, 15);
+    console.log(`  ${inc.id}`);
+    console.log(`     ${bar} ${inc.completedTasks}/${inc.totalTasks} (${inc.percentage}%)`);
+    console.log(`     → /specweave:done ${inc.id}`);
+  }
+  console.log('');
+}
+
 if (active.length > 0) {
   console.log(`🔄 Active (${active.length}):`);
   for (const inc of active) {
@@ -141,16 +154,31 @@ if (paused.length > 0) {
   console.log('');
 }
 
-if (active.length === 0 && paused.length === 0) {
+// Summary section
+if (readyForReview.length > 0 || active.length > 0 || paused.length > 0) {
+  console.log('─'.repeat(40));
+  const parts = [];
+  if (readyForReview.length > 0) parts.push(`${readyForReview.length} ready for review`);
+  if (active.length > 0) parts.push(`${active.length} active`);
+  if (paused.length > 0) parts.push(`${paused.length} paused`);
+  console.log(`Summary: ${parts.join(', ')}`);
+  console.log('');
+
+  if (readyForReview.length > 0) {
+    console.log('💡 Run /specweave:done <id> to close reviewed increments');
+  } else {
+    console.log('💡 For details: /specweave:progress <incrementId>');
+  }
+} else {
   console.log('No active increments.');
   const completed = increments.filter(i => i.status === 'completed');
   if (completed.length > 0) {
     console.log(`${completed.length} completed increment(s).`);
   }
+  console.log('');
+  console.log('💡 Run /specweave:increment to start new work');
 }
 
-console.log('💡 For details: /specweave:progress <incrementId>');
-
 // Helpers
 function createProgressBar(pct, width = 20) {
   const filled = Math.round((pct / 100) * width);
@@ -162,6 +190,8 @@ function formatStatus(status) {
   const icons = {
     'active': '🔄 active',
     'planning': '📝 planning',
+    'backlog': '📋 backlog',
+    'ready_for_review': '👀 ready for review',
     'paused': '⏸️ paused',
     'completed': '✅ completed',
     'abandoned': '❌ abandoned'

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

@@ -110,7 +110,7 @@ if [[ -f "$CACHE_FILE" ]] && jq -e '.' "$CACHE_FILE" >/dev/null 2>&1; then
   # Show active increments
   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" or .value.status == "ready_for_review") |
     "\(.key)|\(.value.status)|\(.value.tasks.completed)|\(.value.tasks.total)"
   ' "$CACHE_FILE" 2>/dev/null)
 

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');
+}

package/plugins/specweave-ado/lib/per-us-sync.js

@@ -0,0 +1,247 @@
+import { consoleLogger } from "../../../src/utils/logger.js";
+class PerUSAdoSync {
+  constructor(adoClient, projectMappings, options = {}) {
+    this.adoClient = adoClient;
+    this.projectMappings = projectMappings;
+    this.logger = options.logger ?? consoleLogger;
+  }
+  /**
+   * Sync all user stories to their respective ADO projects
+   *
+   * @param userStories - User stories with explicit project/board fields
+   * @param featureId - Feature ID (e.g., "FS-137")
+   * @param options - Sync options
+   */
+  async syncUserStories(userStories, featureId, options = {}) {
+    const synced = [];
+    const failed = [];
+    const externalRefs = {};
+    const groups = this.groupByProject(userStories, options.defaultProject);
+    this.logger.log(`\u{1F4E1} Per-US ADO Sync: ${userStories.length} USs across ${groups.size} projects`);
+    for (const [projectId, stories] of groups) {
+      const mapping = this.projectMappings[projectId]?.ado;
+      if (!mapping) {
+        this.logger.warn(`   \u26A0\uFE0F  No ADO mapping for project "${projectId}" - skipping ${stories.length} USs`);
+        for (const story of stories) {
+          failed.push({
+            usId: story.id,
+            projectId,
+            adoProject: "N/A",
+            areaPath: "",
+            workItemId: 0,
+            url: "",
+            action: "skipped",
+            error: `No ADO mapping for project "${projectId}"`
+          });
+        }
+        continue;
+      }
+      for (const story of stories) {
+        try {
+          const result = await this.syncUserStory(story, mapping, featureId, options);
+          synced.push({
+            ...result,
+            projectId
+          });
+          if (!options.dryRun && result.action !== "skipped") {
+            externalRefs[story.id] = {
+              ado: {
+                provider: "ado",
+                issueNumber: result.workItemId,
+                url: result.url,
+                targetProject: projectId,
+                lastSynced: (/* @__PURE__ */ new Date()).toISOString()
+              }
+            };
+          }
+        } catch (error) {
+          failed.push({
+            usId: story.id,
+            projectId,
+            adoProject: mapping.project,
+            areaPath: mapping.areaPath || "",
+            workItemId: 0,
+            url: "",
+            action: "skipped",
+            error: error instanceof Error ? error.message : String(error)
+          });
+        }
+      }
+    }
+    const created = synced.filter((r) => r.action === "created").length;
+    const updated = synced.filter((r) => r.action === "updated").length;
+    const skipped = synced.filter((r) => r.action === "skipped").length;
+    return {
+      success: failed.length === 0,
+      synced,
+      failed,
+      externalRefs,
+      summary: {
+        total: userStories.length,
+        created,
+        updated,
+        skipped,
+        failed: failed.length
+      }
+    };
+  }
+  /**
+   * Sync a single user story to ADO
+   *
+   * For 2-level structures:
+   * - **Project**: maps to ADO project
+   * - **Board**: maps to area path under the project
+   */
+  async syncUserStory(story, mapping, featureId, options) {
+    const title = `[${featureId}][${story.id}] ${story.title}`;
+    const description = this.buildWorkItemDescription(story, featureId);
+    let areaPath = mapping.areaPath || mapping.project;
+    if (story.board) {
+      areaPath = `${mapping.project}\\${story.board}`;
+    }
+    if (options.dryRun) {
+      this.logger.log(`   \u{1F50D} [DRY-RUN] Would sync ${story.id} to ${mapping.project} (area: ${areaPath})`);
+      return {
+        usId: story.id,
+        projectId: story.project || "unknown",
+        adoProject: mapping.project,
+        areaPath,
+        workItemId: 0,
+        url: "",
+        action: "skipped"
+      };
+    }
+    const existingItem = await this.findExistingWorkItem(mapping.project, story.id);
+    if (existingItem) {
+      await this.adoClient.updateWorkItem(
+        mapping.project,
+        existingItem.id,
+        title,
+        description,
+        areaPath
+      );
+      this.logger.log(`   \u{1F504} Updated ${story.id} \u2192 ${mapping.project}/${existingItem.id}`);
+      return {
+        usId: story.id,
+        projectId: story.project || "unknown",
+        adoProject: mapping.project,
+        areaPath,
+        workItemId: existingItem.id,
+        url: this.adoClient.getWorkItemUrl(mapping.project, existingItem.id),
+        action: "updated"
+      };
+    } else {
+      const newItem = await this.adoClient.createWorkItem(
+        mapping.project,
+        "User Story",
+        title,
+        description,
+        areaPath
+      );
+      this.logger.log(`   \u2705 Created ${story.id} \u2192 ${mapping.project}/${newItem.id}`);
+      return {
+        usId: story.id,
+        projectId: story.project || "unknown",
+        adoProject: mapping.project,
+        areaPath,
+        workItemId: newItem.id,
+        url: newItem.url,
+        action: "created"
+      };
+    }
+  }
+  /**
+   * Find existing work item by US ID in title
+   */
+  async findExistingWorkItem(project, usId) {
+    try {
+      const query = `[System.Title] Contains '[${usId}]'`;
+      const results = await this.adoClient.searchWorkItems(project, query);
+      return results.length > 0 ? { id: results[0].id } : null;
+    } catch {
+      return null;
+    }
+  }
+  /**
+   * Build work item description from user story
+   */
+  buildWorkItemDescription(story, featureId) {
+    const lines = [];
+    lines.push(`<h1>${story.title}</h1>`);
+    lines.push("");
+    if (story.description) {
+      lines.push(`<p>${story.description}</p>`);
+      lines.push("");
+    }
+    if (story.acceptanceCriteria && story.acceptanceCriteria.length > 0) {
+      lines.push("<h2>Acceptance Criteria</h2>");
+      lines.push("<ul>");
+      for (const ac of story.acceptanceCriteria) {
+        lines.push(`  <li>${ac}</li>`);
+      }
+      lines.push("</ul>");
+      lines.push("");
+    }
+    lines.push("<hr/>");
+    lines.push("");
+    lines.push(`<p><strong>Feature</strong>: ${featureId}</p>`);
+    lines.push(`<p><strong>User Story</strong>: ${story.id}</p>`);
+    if (story.project) {
+      lines.push(`<p><strong>Project</strong>: ${story.project}</p>`);
+    }
+    if (story.board) {
+      lines.push(`<p><strong>Board</strong>: ${story.board}</p>`);
+    }
+    lines.push("");
+    lines.push("<p><em>Auto-generated by SpecWeave</em></p>");
+    return lines.join("\n");
+  }
+  /**
+   * Group user stories by their explicit project field
+   */
+  groupByProject(userStories, defaultProject) {
+    const groups = /* @__PURE__ */ new Map();
+    for (const story of userStories) {
+      const project = story.project || defaultProject || "default";
+      if (!groups.has(project)) {
+        groups.set(project, []);
+      }
+      groups.get(project).push(story);
+    }
+    return groups;
+  }
+}
+function formatPerUSSyncResults(result) {
+  const lines = [];
+  lines.push("");
+  lines.push("\u{1F4CA} Per-US ADO Sync Results");
+  lines.push("");
+  const byProject = /* @__PURE__ */ new Map();
+  for (const r of [...result.synced, ...result.failed]) {
+    const existing = byProject.get(r.projectId) || [];
+    existing.push(r);
+    byProject.set(r.projectId, existing);
+  }
+  for (const [projectId, results] of byProject) {
+    const adoProject = results[0]?.adoProject || "N/A";
+    const areaPath = results[0]?.areaPath || "";
+    lines.push(`**${projectId}** (\u2192 ${adoProject}${areaPath ? ` [${areaPath}]` : ""}):`);
+    for (const r of results) {
+      const icon = r.action === "created" ? "\u2705" : r.action === "updated" ? "\u{1F504}" : r.error ? "\u274C" : "\u23ED\uFE0F";
+      if (r.workItemId > 0) {
+        lines.push(`  ${icon} ${r.usId} \u2192 ${r.adoProject}/${r.workItemId}`);
+      } else if (r.error) {
+        lines.push(`  ${icon} ${r.usId}: ${r.error}`);
+      } else {
+        lines.push(`  ${icon} ${r.usId} (${r.action})`);
+      }
+    }
+    lines.push("");
+  }
+  lines.push(`\u{1F4C8} Summary: ${result.summary.created} created, ${result.summary.updated} updated, ${result.summary.failed} failed`);
+  return lines.join("\n");
+}
+export {
+  PerUSAdoSync,
+  formatPerUSSyncResults
+};