forge-workflow 0.0.8 → 0.0.10

package/scripts/forge-team/lib/workload.sh

@@ -77,15 +77,38 @@ _status_icon() {
   esac
 }
 
+_json_escape() {
+  local value="${1:-}"
+  value="${value//\\/\\\\}"
+  value="${value//\"/\\\"}"
+  value="${value//$'\n'/\\n}"
+  value="${value//$'\r'/\\r}"
+  value="${value//$'\t'/\\t}"
+  printf '%s' "$value"
+}
+
 # _collect_issues — Gather all open/in_progress issues with details
 # Outputs lines: id|title|status|owner|updated|depends_on
 _collect_issues() {
   local bd_cmd="${BD_CMD:-bd}"
   local list_output
-  list_output="$("$bd_cmd" list --status=open,in_progress 2>/dev/null)" || return 1
+  local combined_exit=0
+
+  # beads 0.62 rejects comma-separated status filters, so fall back to
+  # separate queries when the combined form fails.
+  list_output="$("$bd_cmd" list --status=open,in_progress 2>/dev/null)"
+  combined_exit=$?
+  if [[ "$combined_exit" -ne 0 ]]; then
+    list_output="$(
+      {
+        "$bd_cmd" list --status=open 2>/dev/null || true
+        "$bd_cmd" list --status=in_progress 2>/dev/null || true
+      } | awk 'NF && !seen[$0]++'
+    )"
+  fi
 
   # Filter empty lines
-  if [[ -z "$list_output" ]] || [[ -z "$(echo "$list_output" | tr -d '[:space:]')" ]]; then
+  if [[ -z "$list_output" ]] || [[ -z "$(printf '%s' "$list_output" | tr -d '[:space:]')" ]]; then
     return 0
   fi
 
@@ -95,7 +118,7 @@ _collect_issues() {
 
     # Extract issue id: first field like "forge-xxx" after optional icon
     local issue_id
-    issue_id="$(echo "$line" | grep -oE 'forge-[a-zA-Z0-9]+' | head -1)"
+    issue_id="$(echo "$line" | grep -oE 'forge-[a-zA-Z0-9]+(\.[a-zA-Z0-9]+)*' | head -1)"
     [[ -z "$issue_id" ]] && continue
 
     # Get details via bd show
@@ -141,9 +164,10 @@ cmd_workload() {
 
   # Parse arguments
   while [[ $# -gt 0 ]]; do
-    case "$1" in
+    local arg="${1%$'\r'}"
+    case "$arg" in
       --developer=*)
-        filter_developer="${1#--developer=}"
+        filter_developer="${arg#--developer=}"
         shift
         ;;
       --me)
@@ -160,11 +184,11 @@ cmd_workload() {
         shift
         ;;
       --format=*)
-        _workload_error "Unsupported format: ${1#--format=}"
+        _workload_error "Unsupported format: ${arg#--format=}"
         return 1
         ;;
       *)
-        _workload_error "Unknown argument: $1"
+        _workload_error "Unknown argument: $arg"
         return 1
         ;;
     esac
@@ -232,16 +256,13 @@ cmd_workload() {
       [[ -n "$stale_flag" ]] && stale_bool="true"
       local blocked_ids=""
       [[ -n "$depends_on" ]] && blocked_ids="$depends_on"
-
-      # Use jq to build safe JSON
-      jq -n -c \
-        --arg id "$issue_id" \
-        --arg title "$title" \
-        --arg status "$status" \
-        --arg updated "$updated" \
-        --argjson stale "$stale_bool" \
-        --arg blocked_by "$blocked_ids" \
-        '{id: $id, title: $title, status: $status, updated: $updated, stale: $stale, blocked_by: $blocked_by}' \
+      printf '{"id":"%s","title":"%s","status":"%s","updated":"%s","stale":%s,"blocked_by":"%s"}\n' \
+        "$(_json_escape "$issue_id")" \
+        "$(_json_escape "$title")" \
+        "$(_json_escape "$status")" \
+        "$(_json_escape "$updated")" \
+        "$stale_bool" \
+        "$(_json_escape "$blocked_ids")" \
         >> "$work_dir/json/${owner}"
     fi
   done <<< "$issues_data"
@@ -260,22 +281,30 @@ cmd_workload() {
   # Output
   if [[ "$format" == "json" ]]; then
     # Build JSON object: { "devone": [...], "devtwo": [...] }
-    local json_result="{"
-    local first=true
+    local first_dev="true"
+    printf '{'
     for dev_file in "$work_dir/json"/*; do
       local dev_name
       dev_name="$(basename "$dev_file")"
-      local issues_array
-      issues_array="$(jq -s '.' "$dev_file")"
-      if [[ "$first" == "true" ]]; then
-        first=false
+      local first_issue="true"
+      if [[ "$first_dev" == "true" ]]; then
+        first_dev="false"
       else
-        json_result+=","
+        printf ','
       fi
-      json_result+="$(jq -n -c --arg dev "$dev_name" --argjson issues "$issues_array" '{($dev): $issues}' | sed 's/^{//' | sed 's/}$//')"
+      printf '"%s":[' "$(_json_escape "$dev_name")"
+      while IFS= read -r issue_json; do
+        [[ -z "$issue_json" ]] && continue
+        if [[ "$first_issue" == "true" ]]; then
+          first_issue="false"
+        else
+          printf ','
+        fi
+        printf '%s' "$issue_json"
+      done < "$dev_file"
+      printf ']'
     done
-    json_result+="}"
-    echo "$json_result"
+    printf '}\n'
   else
     local first_dev=true
     for dev_file in "$work_dir/devs"/*; do

package/scripts/forge-team/tests/sync-github.test.sh

@@ -3,16 +3,17 @@ set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 
-# ── Setup temp dir for test isolation ────────────────────────────────────
 TEST_TMP="$(mktemp -d)"
 trap 'rm -rf "$TEST_TMP" "$mock_dir"' EXIT
 
-# ── Create mock dir and log file ─────────────────────────────────────────
-mock_dir="$(mktemp -d /c/tmp/forge-sync-test.XXXXXX)"
+mock_dir="$(mktemp -d)"
+portable_bin="$(mktemp -d)"
 log_file="$mock_dir/calls.log"
 touch "$log_file"
+REAL_GREP="$(command -v grep)"
+ORIGINAL_PATH="$PATH"
+export REAL_GREP
 
-# ── Mock gh ──────────────────────────────────────────────────────────────
 cat > "$mock_dir/gh" << 'MOCK'
 #!/usr/bin/env bash
 echo "$*" >> "$LOG_FILE"
@@ -23,45 +24,69 @@ case "$1 $2" in
   "issue comment") echo ""; exit 0 ;;
   "api user") echo "testuser"; exit 0 ;;
 esac
-echo "unknown gh command: $*" >&2; exit 1
+echo "unknown gh command: $*" >&2
+exit 1
 MOCK
 chmod +x "$mock_dir/gh"
 
-# ── Mock bd ──────────────────────────────────────────────────────────────
 cat > "$mock_dir/bd" << 'MOCK'
 #!/usr/bin/env bash
 echo "$*" >> "$LOG_FILE"
 case "$1" in
   show)
-    echo "○ $2 · Test Issue [github_issue:42]"
-    echo "Title: Test Issue"
+    if [[ "${3:-}" == "--json" ]]; then
+      cat <<'JSON'
+{"id":"beads-001","github":{"number":42,"nodeId":"I_kwDOForge42","url":"https://github.com/test/repo/issues/42"},"shared":{"title":"Test Issue"}}
+JSON
+    else
+      echo "o $2 - Test Issue"
+      echo "Title: Test Issue"
+    fi
     ;;
   set-state) echo "State set" ;;
 esac
 MOCK
 chmod +x "$mock_dir/bd"
 
-# ── Mock bd that returns NO github_issue ─────────────────────────────────
 cat > "$mock_dir/bd-no-gh" << 'MOCK'
 #!/usr/bin/env bash
 echo "$*" >> "$LOG_FILE"
 case "$1" in
   show)
-    echo "○ $2 · Test Issue"
-    echo "Title: Test Issue"
+    if [[ "${3:-}" == "--json" ]]; then
+      cat <<'JSON'
+{"id":"beads-999","shared":{"title":"Test Issue"}}
+JSON
+    else
+      echo "o $2 - Test Issue"
+      echo "Title: Test Issue"
+    fi
     ;;
   set-state) echo "State set" ;;
 esac
 MOCK
 chmod +x "$mock_dir/bd-no-gh"
 
-# Export env for mocks
+cat > "$portable_bin/grep" << 'MOCK'
+#!/usr/bin/env bash
+for arg in "$@"; do
+  case "$arg" in
+    -P|--perl-regexp|-*P*)
+      echo "grep: PCRE support disabled for test" >&2
+      exit 2
+      ;;
+  esac
+done
+exec "$REAL_GREP" "$@"
+MOCK
+chmod +x "$portable_bin/grep"
+
 export LOG_FILE="$log_file"
 export GH_CMD="$mock_dir/gh"
 export BD_CMD="$mock_dir/bd"
 export TEAM_MAP_ROOT="$TEST_TMP"
+mapping_file="$TEAM_MAP_ROOT/.github/beads-mapping.json"
 
-# Source the library under test
 source "$SCRIPT_DIR/lib/sync-github.sh"
 
 PASS=0
@@ -70,119 +95,193 @@ FAIL=0
 assert_eq() {
   local label="$1" expected="$2" actual="$3"
   if [[ "$actual" == "$expected" ]]; then
-    PASS=$((PASS + 1)); echo "  PASS: $label"
+    PASS=$((PASS + 1))
+    echo "  PASS: $label"
   else
-    FAIL=$((FAIL + 1)); echo "  FAIL: $label (expected '$expected', got '$actual')"
+    FAIL=$((FAIL + 1))
+    echo "  FAIL: $label (expected '$expected', got '$actual')"
   fi
 }
 
 assert_contains() {
   local label="$1" expected="$2" actual="$3"
   if [[ "$actual" == *"$expected"* ]]; then
-    PASS=$((PASS + 1)); echo "  PASS: $label"
+    PASS=$((PASS + 1))
+    echo "  PASS: $label"
+  else
+    FAIL=$((FAIL + 1))
+    echo "  FAIL: $label (expected to contain '$expected', got '$actual')"
+  fi
+}
+
+assert_not_contains() {
+  local label="$1" unexpected="$2" actual="$3"
+  if [[ "$actual" == *"$unexpected"* ]]; then
+    FAIL=$((FAIL + 1))
+    echo "  FAIL: $label (did not expect '$unexpected', got '$actual')"
   else
-    FAIL=$((FAIL + 1)); echo "  FAIL: $label (expected to contain '$expected', got '$actual')"
+    PASS=$((PASS + 1))
+    echo "  PASS: $label"
   fi
 }
 
 assert_exit() {
   local label="$1" expected="$2" actual="$3"
   if [[ "$actual" -eq "$expected" ]]; then
-    PASS=$((PASS + 1)); echo "  PASS: $label"
+    PASS=$((PASS + 1))
+    echo "  PASS: $label"
   else
-    FAIL=$((FAIL + 1)); echo "  FAIL: $label (expected exit $expected, got $actual)"
+    FAIL=$((FAIL + 1))
+    echo "  FAIL: $label (expected exit $expected, got $actual)"
   fi
 }
 
-# ── Test 1: sync_issue_create — creates GitHub issue, calls bd set-state ─
-echo "── Test 1: sync_issue_create ──"
-> "$log_file"  # clear log
+echo "== Test 1: sync_issue_create =="
+> "$log_file"
 rc=0
 sync_issue_create "beads-001" || rc=$?
 assert_exit "exit code 0" 0 "$rc"
-# Check gh was called with issue create
 log_contents="$(cat "$log_file")"
 assert_contains "gh issue create called" "issue create" "$log_contents"
 assert_contains "title includes Test Issue" "Test Issue" "$log_contents"
 assert_contains "body includes beads-001" "beads-001" "$log_contents"
-# Check bd set-state was called with github_issue=42
-assert_contains "bd set-state called" "set-state" "$log_contents"
-assert_contains "github_issue=42 set" "github_issue=42" "$log_contents"
+assert_contains "sync create writes legacy github_issue state" "github_issue=42" "$log_contents"
+assert_contains "sync create calls set-state for hook compatibility" "set-state" "$log_contents"
+assert_contains "sync create persists mapping entry" '"42": "beads-001"' "$(cat "$mapping_file")"
 
-# ── Test 2: sync_issue_claim — updates GitHub assignee ───────────────────
-echo ""
-echo "── Test 2: sync_issue_claim ──"
+echo
+echo "== Test 2: sync_issue_claim =="
 > "$log_file"
 unset _GITHUB_USER_CACHE
 rc=0
 sync_issue_claim "beads-001" || rc=$?
 assert_exit "exit code 0" 0 "$rc"
 log_contents="$(cat "$log_file")"
+assert_contains "canonical lookup uses --json" "--json" "$log_contents"
 assert_contains "gh issue edit called" "issue edit" "$log_contents"
 assert_contains "add-assignee used" "--add-assignee" "$log_contents"
 assert_contains "assignee is testuser" "testuser" "$log_contents"
 
-# ── Test 3: sync_issue_status — removes old labels, adds new one ─────────
-echo ""
-echo "── Test 3: sync_issue_status ──"
+echo
+echo "== Test 3: sync_issue_status =="
 > "$log_file"
 rc=0
 sync_issue_status "beads-001" "in_progress" || rc=$?
 assert_exit "exit code 0" 0 "$rc"
 log_contents="$(cat "$log_file")"
+assert_contains "canonical lookup uses --json" "--json" "$log_contents"
 assert_contains "gh issue edit called" "issue edit" "$log_contents"
 assert_contains "removes status/open" "--remove-label status/open" "$log_contents"
 assert_contains "adds status/in-progress" "--add-label status/in-progress" "$log_contents"
 
-# ── Test 4: sync_issue_close — closes GitHub issue ───────────────────────
-echo ""
-echo "── Test 4: sync_issue_close ──"
+echo
+echo "== Test 4: sync_issue_close =="
 > "$log_file"
 rc=0
 sync_issue_close "beads-001" || rc=$?
 assert_exit "exit code 0" 0 "$rc"
 log_contents="$(cat "$log_file")"
+assert_contains "canonical lookup uses --json" "--json" "$log_contents"
 assert_contains "gh issue close called" "issue close" "$log_contents"
 assert_contains "closes issue 42" " 42" "$log_contents"
 
-# ── Test 5: sync_issue_deps — adds comment on GitHub issue ───────────────
-echo ""
-echo "── Test 5: sync_issue_deps ──"
+echo
+echo "== Test 5: sync_issue_deps =="
 > "$log_file"
 rc=0
 sync_issue_deps "beads-001" "beads-002" || rc=$?
 assert_exit "exit code 0" 0 "$rc"
 log_contents="$(cat "$log_file")"
+assert_contains "canonical lookup uses --json" "--json" "$log_contents"
 assert_contains "gh issue comment called" "issue comment" "$log_contents"
 assert_contains "Blocked by referenced" "Blocked by #42" "$log_contents"
 
-# ── Test 6: _get_github_issue_number — extracts number from bd show ──────
-echo ""
-echo "── Test 6: _get_github_issue_number ──"
+echo
+echo "== Test 6: _get_github_issue_number =="
 result="$(_get_github_issue_number "beads-001")"
 assert_eq "extracts issue number 42" "42" "$result"
+log_contents="$(cat "$log_file")"
+assert_contains "_get_github_issue_number uses JSON" "--json" "$log_contents"
 
-# ── Test 7: Missing GitHub issue number → returns error ──────────────────
-echo ""
-echo "── Test 7: Missing GitHub issue number ──"
+echo
+echo "== Test 7: Mapping fallback when canonical GitHub number missing =="
+mkdir -p "$(dirname "$mapping_file")"
+cat > "$mapping_file" << 'JSON'
+{
+  "77": "beads-999"
+}
+JSON
+export BD_CMD="$mock_dir/bd-no-gh"
+result="$(_get_github_issue_number "beads-999")"
+assert_eq "mapping fallback returns issue number 77" "77" "$result"
+export BD_CMD="$mock_dir/bd"
+
+echo
+echo "== Test 8: Mapping fallback returns newest issue number =="
+cat > "$mapping_file" << 'JSON'
+{
+  "77": "beads-999",
+  "91": "beads-999",
+  "88": "beads-other"
+}
+JSON
+export BD_CMD="$mock_dir/bd-no-gh"
+result="$(_get_github_issue_number "beads-999")"
+assert_eq "mapping fallback returns newest matching issue number" "91" "$result"
+export BD_CMD="$mock_dir/bd"
+
+echo
+echo "== Test 9: Missing canonical GitHub number =="
+rm -f "$mapping_file"
 export BD_CMD="$mock_dir/bd-no-gh"
 rc=0
 result="$(_get_github_issue_number "beads-999" 2>/dev/null)" || rc=$?
-assert_exit "returns error when no github_issue" 1 "$rc"
-# Restore normal bd mock
+assert_exit "returns error when no canonical github number" 1 "$rc"
+export BD_CMD="$mock_dir/bd"
+
+echo
+echo "== Test 10: Legacy github_issue state fallback =="
+cat > "$mock_dir/bd-legacy" << 'MOCK'
+#!/usr/bin/env bash
+echo "$*" >> "$LOG_FILE"
+case "$1" in
+  show)
+    if [[ "${3:-}" == "--json" ]]; then
+      cat <<'JSON'
+{"id":"beads-legacy","github_issue":43,"shared":{"title":"Legacy Issue"}}
+JSON
+    else
+      echo "o $2 - Legacy Issue"
+      echo "github_issue:43"
+      echo "Title: Legacy Issue"
+    fi
+    ;;
+  set-state) echo "State set" ;;
+esac
+MOCK
+chmod +x "$mock_dir/bd-legacy"
+export BD_CMD="$mock_dir/bd-legacy"
+rc=0
+result="$(_get_github_issue_number "beads-legacy" 2>/dev/null)" || rc=$?
+assert_exit "legacy github_issue exits successfully" 0 "$rc"
+assert_eq "legacy github_issue returns number" "43" "$result"
 export BD_CMD="$mock_dir/bd"
 
-# ── Test 8: Injection in issue title → sanitized before gh call ──────────
-echo ""
-echo "── Test 8: Injection in title sanitized ──"
-# Create a bd mock that returns injection-laden title
+echo
+echo "== Test 11: Injection in title sanitized =="
 cat > "$mock_dir/bd-inject" << 'MOCK'
 #!/usr/bin/env bash
 echo "$*" >> "$LOG_FILE"
 case "$1" in
   show)
-    echo '○ beads-inject · Evil $(rm -rf /) Issue [github_issue:99]'
-    echo 'Title: Evil $(rm -rf /) Issue'
+    if [[ "${3:-}" == "--json" ]]; then
+      cat <<'JSON'
+{"id":"beads-inject","github":{"number":99,"url":"https://github.com/test/repo/issues/99"},"shared":{"title":"Evil $(rm -rf /) Issue"}}
+JSON
+    else
+      echo 'o beads-inject - Evil $(rm -rf /) Issue'
+      echo 'Title: Evil $(rm -rf /) Issue'
+    fi
     ;;
   set-state) echo "State set" ;;
 esac
@@ -194,16 +293,54 @@ rc=0
 sync_issue_create "beads-inject" || rc=$?
 assert_exit "exit code 0 with injection" 0 "$rc"
 log_contents="$(cat "$log_file")"
-# The $(...) pattern must NOT appear in the gh call
 if [[ "$log_contents" == *'$(rm'* ]]; then
-  FAIL=$((FAIL + 1)); echo "  FAIL: injection NOT sanitized — \$(rm found in gh call"
+  FAIL=$((FAIL + 1))
+  echo "  FAIL: injection NOT sanitized - \$\(rm found in gh call"
 else
-  PASS=$((PASS + 1)); echo "  PASS: injection sanitized — no \$(rm in gh call"
+  PASS=$((PASS + 1))
+  echo "  PASS: injection sanitized - no \$\(rm in gh call"
 fi
-# Restore normal bd mock
 export BD_CMD="$mock_dir/bd"
 
-# ── Results ──────────────────────────────────────────────────────────────
-echo ""
+echo
+echo "== Test 11: sync_issue_create without grep -P =="
+export PATH="$portable_bin:$ORIGINAL_PATH"
+> "$log_file"
+rc=0
+sync_issue_create "beads-001" || rc=$?
+assert_exit "sync_issue_create works when grep -P is unavailable" 0 "$rc"
+log_contents="$(cat "$log_file")"
+assert_contains "gh issue create called without PCRE grep" "issue create" "$log_contents"
+export PATH="$ORIGINAL_PATH"
+
+echo
+echo "== Test 12: sync_issue_create with summary-only bd show =="
+cat > "$mock_dir/bd-summary-only" << 'MOCK'
+#!/usr/bin/env bash
+echo "$*" >> "$LOG_FILE"
+case "$1" in
+  show)
+    if [[ "${3:-}" == "--json" ]]; then
+      cat <<'JSON'
+{"id":"beads-summary","github":{"number":77,"url":"https://github.com/test/repo/issues/77"},"shared":{"title":"Summary Only Title"}}
+JSON
+    else
+      echo "o $2 - Summary Only Title"
+    fi
+    ;;
+  set-state) echo "State set" ;;
+esac
+MOCK
+chmod +x "$mock_dir/bd-summary-only"
+export BD_CMD="$mock_dir/bd-summary-only"
+> "$log_file"
+rc=0
+sync_issue_create "beads-summary" || rc=$?
+assert_exit "sync_issue_create works with summary-only bd show" 0 "$rc"
+log_contents="$(cat "$log_file")"
+assert_contains "summary-only title is passed to gh issue create" "Summary Only Title" "$log_contents"
+export BD_CMD="$mock_dir/bd"
+
+echo
 echo "Results: $PASS passed, $FAIL failed"
 [[ $FAIL -eq 0 ]] && exit 0 || exit 1

package/scripts/forge-team/tests/workload.test.sh

@@ -32,9 +32,15 @@ cat > "$mock_dir/bd" << 'MOCK'
 #!/usr/bin/env bash
 case "$1 $2" in
   "list --status=open,in_progress")
-    echo "◐ forge-aaa · Feature A"
+    exit 1
+    ;;
+  "list --status=open")
     echo "○ forge-bbb · Feature B"
+    ;;
+  "list --status=in_progress")
+    echo "◐ forge-aaa · Feature A"
     echo "◐ forge-ccc · Feature C"
+    echo "◐ forge-m1n8.6 · Sub-feature X (dotted ID)"
     ;;
   "show forge-aaa")
     echo "◐ forge-aaa · Feature A [● P2 · IN_PROGRESS]"
@@ -54,6 +60,19 @@ case "$1 $2" in
     echo "DEPENDS ON"
     echo "  → forge-aaa: Feature A"
     ;;
+  "show forge-m1n8.6")
+    # Dotted sub-ID — bd show must receive the full ID including .6
+    echo "◐ forge-m1n8.6 · Sub-feature X [● P2 · IN_PROGRESS]"
+    echo "Owner: devthree"
+    echo "Updated: 2026-03-27T08:00:00Z"
+    ;;
+  "show forge-m1n8")
+    # Parent epic — if a buggy parser truncates forge-m1n8.6 to forge-m1n8,
+    # the workload would get this WRONG owner and trigger the guard below.
+    echo "◐ forge-m1n8 · PARENT EPIC (WRONG — dotted ID was truncated)"
+    echo "Owner: WRONG_OWNER_DO_NOT_USE"
+    echo "Updated: 2026-03-20T10:00:00Z"
+    ;;
 esac
 MOCK
 chmod +x "$mock_dir/bd"
@@ -65,6 +84,12 @@ case "$1 $2" in
   "list --status=open,in_progress")
     echo ""
     ;;
+  "list --status=open")
+    echo "○ forge-should-not-appear · Open fallback sentinel"
+    ;;
+  "list --status=in_progress")
+    echo "◐ forge-should-not-appear-2 · In-progress fallback sentinel"
+    ;;
 esac
 MOCK
 chmod +x "$mock_dir/bd-empty"
@@ -125,6 +150,11 @@ assert_contains "shows devtwo header" "Developer: devtwo" "$output"
 assert_contains "shows forge-aaa" "forge-aaa" "$output"
 assert_contains "shows forge-bbb" "forge-bbb" "$output"
 assert_contains "shows forge-ccc" "forge-ccc" "$output"
+# Dotted ID regression (forge-hpev): the full forge-m1n8.6 must be extracted,
+# not truncated to forge-m1n8. devthree owns the sub-issue, not WRONG_OWNER.
+assert_contains "shows devthree (dotted ID owner)" "Developer: devthree" "$output"
+assert_contains "shows dotted ID forge-m1n8.6 in full" "forge-m1n8.6" "$output"
+assert_not_contains "does NOT attribute to WRONG_OWNER (parent epic)" "WRONG_OWNER" "$output"
 
 # ── Test 2: --developer=devone filters correctly ─────────────────────────
 echo ""
@@ -158,6 +188,7 @@ rc=0
 output="$(cmd_workload 2>/dev/null)" || rc=$?
 assert_exit "exits 0" 0 "$rc"
 assert_contains "shows no active work message" "No active work" "$output"
+assert_not_contains "does not fall back when combined query succeeds with no issues" "forge-should-not-appear" "$output"
 export BD_CMD="$mock_dir/bd"
 
 # ── Test 5: Stale assignment flagged (>48h) ──────────────────────────────
@@ -178,18 +209,18 @@ rc=0
 output="$(cmd_workload --format=json 2>/dev/null)" || rc=$?
 assert_exit "exits 0" 0 "$rc"
 # Validate it's parseable JSON
-if echo "$output" | jq . >/dev/null 2>&1; then
+if echo "$output" | node -e 'JSON.parse(require("fs").readFileSync(0, "utf8"));' >/dev/null 2>&1; then
   PASS=$((PASS + 1)); echo "  PASS: output is valid JSON"
 else
   FAIL=$((FAIL + 1)); echo "  FAIL: output is not valid JSON: $output"
 fi
 # Check JSON has developer keys
-if echo "$output" | jq -e '.devone' >/dev/null 2>&1; then
+if echo "$output" | node -e 'const data = JSON.parse(require("fs").readFileSync(0, "utf8")); process.exit(data.devone ? 0 : 1);' >/dev/null 2>&1; then
   PASS=$((PASS + 1)); echo "  PASS: JSON contains devone key"
 else
   FAIL=$((FAIL + 1)); echo "  FAIL: JSON missing devone key"
 fi
-if echo "$output" | jq -e '.devtwo' >/dev/null 2>&1; then
+if echo "$output" | node -e 'const data = JSON.parse(require("fs").readFileSync(0, "utf8")); process.exit(data.devtwo ? 0 : 1);' >/dev/null 2>&1; then
   PASS=$((PASS + 1)); echo "  PASS: JSON contains devtwo key"
 else
   FAIL=$((FAIL + 1)); echo "  FAIL: JSON missing devtwo key"