Merge remote-tracking branch 'origin/main' into worktree-20260325-181052

Author: JoeOakhartNava

plugins/dso/scripts/sprint-list-epics.sh

@@ -108,11 +108,13 @@ print(json.dumps({'index': idx, 'child_counts': dict(child_counts)}))
 " 2>/dev/null || echo '{"index":{},"child_counts":{}}'
 }
 
-# Count non-hidden subdirectories in tracker to detect "has entries but reducer failed"
+# Check for non-hidden subdirectories in tracker to detect "has entries but reducer failed".
+# Uses find -L to follow symlinks — in worktrees, .tickets-tracker is a symlink to the
+# main repo's tracker dir, and find without -L returns 0 entries through symlinks on macOS.
 _tracker_has_entries() {
-    local count
-    count=$(find "$TRACKER_DIR" -mindepth 1 -maxdepth 1 -type d ! -name '.*' 2>/dev/null | head -1)
-    [ -n "$count" ]
+    local first_entry
+    first_entry=$(find -L "$TRACKER_DIR" -mindepth 1 -maxdepth 1 -type d ! -name '.*' 2>/dev/null | head -1)
+    [ -n "$first_entry" ]
 }
 
 # Build index with retry on transient failure

plugins/dso/scripts/validate-review-output.sh

@@ -18,6 +18,7 @@ set -euo pipefail
 #
 # Caller IDs and their schema hashes (--caller for review-protocol):
 #   roadmap                f4e5f5a355e4c145
+#   brainstorm             f4e5f5a355e4c145
 #   design-wireframe       bd60a68f8060f939
 #   implementation-plan    ae8bfc7bd9a0d7e3
 #   retro                  8a1a3dd74e54f101
@@ -52,6 +53,7 @@ HASH_PLAN_REVIEW="9dba6875b85b7bc3"
 
 # --- Per-caller schema hashes (for --caller with review-protocol) ---
 HASH_CALLER_ROADMAP="f4e5f5a355e4c145"
+HASH_CALLER_BRAINSTORM="f4e5f5a355e4c145"
 HASH_CALLER_DESIGN_WIREFRAME="bd60a68f8060f939"
 HASH_CALLER_IMPLEMENTATION_PLAN="ae8bfc7bd9a0d7e3"
 HASH_CALLER_RETRO="8a1a3dd74e54f101"
@@ -84,6 +86,7 @@ Prompt IDs:
 
 Caller IDs (use with: review-protocol <file> --caller <id>):
   roadmap                ${HASH_CALLER_ROADMAP}
+  brainstorm             ${HASH_CALLER_BRAINSTORM}
   design-wireframe       ${HASH_CALLER_DESIGN_WIREFRAME}
   implementation-plan    ${HASH_CALLER_IMPLEMENTATION_PLAN}
   retro                  ${HASH_CALLER_RETRO}
@@ -107,6 +110,7 @@ fi
 
 if [[ "$1" == "--list-callers" ]]; then
     echo "roadmap                ${HASH_CALLER_ROADMAP}"
+    echo "brainstorm             ${HASH_CALLER_BRAINSTORM}"
     echo "design-wireframe       ${HASH_CALLER_DESIGN_WIREFRAME}"
     echo "implementation-plan    ${HASH_CALLER_IMPLEMENTATION_PLAN}"
     echo "retro                  ${HASH_CALLER_RETRO}"
@@ -164,7 +168,7 @@ fi
 # Validate known caller IDs
 if [[ -n "$CALLER_ID" ]]; then
     case "$CALLER_ID" in
-        roadmap|design-wireframe|implementation-plan|retro|design-review|dev-onboarding|preplanning) ;;
+        roadmap|brainstorm|design-wireframe|implementation-plan|retro|design-review|dev-onboarding|preplanning) ;;
         *)
             echo "ERROR: unknown caller-id: '$CALLER_ID'" >&2
             echo "Run '$SCRIPT_NAME --list-callers' to see valid caller IDs." >&2
@@ -444,6 +448,26 @@ CALLER_SCHEMAS = {
             },
         ],
     },
+    "brainstorm": {
+        "schema_hash": "f4e5f5a355e4c145",
+        "perspectives": [
+            {
+                "perspective": "Agent Clarity",
+                "required_dimensions": ["self_contained", "success_measurable"],
+                "required_finding_fields": [],
+            },
+            {
+                "perspective": "Scope",
+                "required_dimensions": ["right_sized", "no_overlap", "dependency_aware"],
+                "required_finding_fields": [],
+            },
+            {
+                "perspective": "Value",
+                "required_dimensions": ["user_impact", "validation_signal"],
+                "required_finding_fields": [],
+            },
+        ],
+    },
     "design-wireframe": {
         "schema_hash": "bd60a68f8060f939",
         "perspectives": [
@@ -871,6 +895,7 @@ case "$PROMPT_ID" in
         if [[ "$FAILED" -eq 0 && -n "$CALLER_ID" ]]; then
             case "$CALLER_ID" in
                 roadmap)              CALLER_HASH="$HASH_CALLER_ROADMAP" ;;
+                brainstorm)           CALLER_HASH="$HASH_CALLER_BRAINSTORM" ;;
                 design-wireframe)     CALLER_HASH="$HASH_CALLER_DESIGN_WIREFRAME" ;;
                 implementation-plan)  CALLER_HASH="$HASH_CALLER_IMPLEMENTATION_PLAN" ;;
                 retro)                CALLER_HASH="$HASH_CALLER_RETRO" ;;

tests/hooks/test-validate-review-output.sh

@@ -724,4 +724,61 @@ assert_ne \
     "0" \
     "$OLD_DIM_EXIT"
 
+# ============================================================
+# 14. brainstorm caller: accepted with same schema as roadmap
+# ============================================================
+
+# brainstorm uses the same perspectives as roadmap (Agent Clarity, Scope, Value)
+VALID_RP_BRAINSTORM=$(write_fixture "rp-brainstorm-valid.json" '{
+  "subject": "Brainstorm epic review",
+  "reviews": [
+    {
+      "perspective": "Agent Clarity",
+      "status": "reviewed",
+      "dimensions": {
+        "self_contained": 4,
+        "success_measurable": 4
+      },
+      "findings": []
+    },
+    {
+      "perspective": "Scope",
+      "status": "reviewed",
+      "dimensions": {
+        "right_sized": 4,
+        "no_overlap": 4,
+        "dependency_aware": 4
+      },
+      "findings": []
+    },
+    {
+      "perspective": "Value",
+      "status": "reviewed",
+      "dimensions": {
+        "user_impact": 4,
+        "validation_signal": 4
+      },
+      "findings": []
+    }
+  ],
+  "conflicts": []
+}')
+
+VALID_RP_BRAINSTORM_EXIT=$(run_script review-protocol "$VALID_RP_BRAINSTORM" --caller brainstorm)
+assert_eq \
+    "test_review_protocol_caller_brainstorm_valid_passes: valid brainstorm caller schema exits 0" \
+    "0" \
+    "$VALID_RP_BRAINSTORM_EXIT"
+
+VALID_RP_BRAINSTORM_OUTPUT=$(run_script_output review-protocol "$VALID_RP_BRAINSTORM" --caller brainstorm)
+assert_contains \
+    "test_review_protocol_caller_brainstorm_schema_valid_yes: brainstorm caller output contains SCHEMA_VALID: yes" \
+    "SCHEMA_VALID: yes" \
+    "$VALID_RP_BRAINSTORM_OUTPUT"
+
+assert_contains \
+    "test_review_protocol_caller_brainstorm_output_includes_caller: output includes caller=brainstorm" \
+    "caller=brainstorm" \
+    "$VALID_RP_BRAINSTORM_OUTPUT"
+
 print_summary

tests/scripts/test-sprint-list-epics.sh

@@ -530,6 +530,49 @@ else
     (( FAIL++ ))
 fi
 
+# ── Test 27: Retry works when tracker dir is a symlink (worktree scenario) ─────
+echo "Test 27: test_retry_through_symlink — retry detects entries through symlink"
+test_retry_through_symlink() {
+    local TDIR27 ACTUAL27 SYMLINK27
+    TDIR27=$(mktemp -d)
+    ACTUAL27="$TDIR27/actual-tracker"
+    SYMLINK27="$TDIR27/symlinked-tracker"
+    mkdir -p "$ACTUAL27"
+
+    # Create a valid v3 epic in the actual directory
+    make_v3_ticket "$ACTUAL27" "epic-symlink" "epic" "open" "1" "" "Symlink Epic"
+
+    # Create a symlink pointing to the actual directory (mimics worktree .tickets-tracker)
+    ln -s "$ACTUAL27" "$SYMLINK27"
+
+    # Make the epic dir temporarily unreadable (simulates transient failure).
+    # The retry mechanism must detect entries THROUGH the symlink.
+    chmod 000 "$ACTUAL27/epic-symlink"
+
+    # Restore permissions before first retry fires
+    (sleep 0.1 && chmod 755 "$ACTUAL27/epic-symlink") &
+    local restore_pid=$!
+
+    local out27 exit27=0
+    out27=$(TICKETS_TRACKER_DIR="$SYMLINK27" SPRINT_MAX_RETRIES=3 SPRINT_RETRY_WAIT=0.8 \
+        bash "$SCRIPT" 2>/dev/null) || exit27=$?
+
+    wait "$restore_pid" 2>/dev/null || true
+    chmod -R 755 "$ACTUAL27" 2>/dev/null || true
+    rm -rf "$TDIR27"
+
+    # The script should have retried (via symlink) and found the epic
+    [ "$exit27" -eq 0 ] || return 1
+    echo "$out27" | grep -q "epic-symlink" || return 1
+}
+if test_retry_through_symlink; then
+    echo "  PASS: retry works through symlinked tracker dir"
+    (( PASS++ ))
+else
+    echo "  FAIL: retry did not work through symlinked tracker dir" >&2
+    (( FAIL++ ))
+fi
+
 echo ""
 echo "Results: $PASS passed, $FAIL failed"
 [ "$FAIL" -eq 0 ]