forge-workflow 0.0.10 → 0.1.0-beta.2

package/scripts/forge-team/lib/sync-github.sh

@@ -1,17 +1,17 @@
 #!/usr/bin/env bash
-# scripts/forge-team/lib/sync-github.sh — Bidirectional sync between Beads and GitHub
+# scripts/forge-team/lib/sync-github.sh — Bidirectional sync between Forge issues and GitHub
 #
 # Functions:
-#   sync_issue_create  <beads-id>             — Create GitHub issue from Beads
-#   sync_issue_claim   <beads-id>             — Assign current dev on GitHub
-#   sync_issue_status  <beads-id> <status>    — Update status label on GitHub
-#   sync_issue_close   <beads-id>             — Close GitHub issue
-#   sync_issue_deps    <beads-id-a> <beads-id-b> — Add "Blocked by" comment
-#   _get_github_issue_number <beads-id>       — Extract canonical GitHub issue from bd show
+#   sync_issue_create  <issue-id>             — Create GitHub issue from a Forge issue
+#   sync_issue_claim   <issue-id>             — Assign current dev on GitHub
+#   sync_issue_status  <issue-id> <status>    — Update status label on GitHub
+#   sync_issue_close   <issue-id>             — Close GitHub issue
+#   sync_issue_deps    <issue-id-a> <issue-id-b> — Add "Blocked by" comment
+#   _get_github_issue_number <issue-id>       — Extract canonical GitHub issue from issue show
 #
 # Env overrides (for testing):
-#   GH_CMD  — Path to gh binary (default: gh)
-#   BD_CMD  — Path to bd binary (default: bd)
+#   GH_CMD    — Path to gh binary (default: gh)
+#   FORGE_CMD — Path to forge binary (default: forge)
 #
 # All GitHub-sourced strings are sanitized via sanitize_for_agent() before
 # use in shell commands (OWASP A03).
@@ -87,45 +87,6 @@ _extract_issue_number_from_url() {
   printf '%s' "$suffix"
 }
 
-_extract_issue_title_from_show() {
-  local input="${1:-}"
-
-  printf '%s' "$input" | node -e '
-    const fs = require("node:fs");
-    const input = fs.readFileSync(0, "utf8");
-    const lines = input.split(/\r?\n/);
-    const titledLine = lines.find((line) => /^Title:\s*/.test(line));
-
-    if (titledLine) {
-      process.stdout.write(titledLine.replace(/^Title:\s*/, "").trim());
-      process.exit(0);
-    }
-
-    const summaryLine = lines.find((line) => line.trim().length > 0);
-    if (!summaryLine) {
-      process.exit(0);
-    }
-
-    const separators = [" - ", " \u00B7 ", " \u2022 "];
-    for (const separator of separators) {
-      const separatorIndex = summaryLine.indexOf(separator);
-      if (separatorIndex === -1) {
-        continue;
-      }
-
-      const candidate = summaryLine
-        .slice(separatorIndex + separator.length)
-        .replace(/\s+\[[^\]]*\]\s*$/u, "")
-        .trim();
-
-      if (candidate.length > 0) {
-        process.stdout.write(candidate);
-        break;
-      }
-    }
-  '
-}
-
 _sync_mapping_file() {
   local root="${TEAM_MAP_ROOT:-.}"
   printf '%s' "${SYNC_MAPPING_FILE:-$root/.github/beads-mapping.json}"
@@ -196,41 +157,30 @@ NODE
 }
 
 # ── _get_github_issue_number ─────────────────────────────────────────────
-# Extracts the canonical GitHub issue number from `bd show <id> --json`.
+# Extracts the canonical GitHub issue number from the issue's github_issue:<n>
+# label (via `issue show <id> --json`), falling back to the local mapping file.
 # Returns the number or empty string (exit 1 if not found).
 _get_github_issue_number() {
   local beads_id="${1:-}"
   if [[ -z "$beads_id" ]]; then
-    _sync_error "beads-id required"
+    _sync_error "issue id required"
     return 1
   fi
 
-  local bd_cmd="${BD_CMD:-bd}"
+  local forge_cmd="${FORGE_CMD:-forge}"
   local show_output
-  show_output="$("$bd_cmd" show "$beads_id" --json 2>/dev/null)" || {
-    _sync_error "Failed to get beads info for $beads_id"
+  show_output="$("$forge_cmd" issue show "$beads_id" --json 2>/dev/null)" || {
+    _sync_error "Failed to get issue info for $beads_id"
     return 1
   }
 
   local issue_num
-  issue_num="$(printf '%s' "$show_output" | node -e '
-    const fs = require("node:fs");
-    const input = fs.readFileSync(0, "utf8");
-    try {
-      const data = JSON.parse(input);
-      const issue = Array.isArray(data) ? data[0] : data;
-      const value = issue?.github?.number
-        ?? issue?.githubNumber
-        ?? issue?.issueNumber
-        ?? issue?.github_issue
-        ?? null;
-      if (value != null && value !== "") {
-        process.stdout.write(String(value));
-      }
-    } catch (_err) {
-      process.exitCode = 0;
-    }
-  ')"
+  issue_num="$(printf '%s' "$show_output" | jq -r '
+    (.data.issue // .data // {})
+    | (.labels // [])
+    | map(select(startswith("github_issue:")))
+    | (.[0] // "")
+    | ltrimstr("github_issue:")' 2>/dev/null)"
 
   if [[ -z "$issue_num" ]]; then
     issue_num="$(_get_issue_number_from_mapping "$beads_id" 2>/dev/null || true)"
@@ -246,16 +196,16 @@ _get_github_issue_number() {
 }
 
 # ── _get_issue_title ─────────────────────────────────────────────────────
-# Extracts issue title from `bd show <id>` output.
-# Looks for "Title: <text>" line or falls back to the summary line.
+# Extracts the issue title from `issue show <id> --json`. Falls back to the
+# issue id when the title is empty.
 _get_issue_title() {
   local beads_id="${1:-}"
-  local bd_cmd="${BD_CMD:-bd}"
+  local forge_cmd="${FORGE_CMD:-forge}"
   local show_output
-  show_output="$("$bd_cmd" show "$beads_id" 2>/dev/null)" || return 1
+  show_output="$("$forge_cmd" issue show "$beads_id" --json 2>/dev/null)" || return 1
 
   local title
-  title="$(_extract_issue_title_from_show "$show_output")"
+  title="$(printf '%s' "$show_output" | jq -r '(.data.issue // .data // {}) | (.title // "")' 2>/dev/null)"
 
   if [[ -z "$title" ]]; then
     title="$beads_id"
@@ -266,10 +216,10 @@ _get_issue_title() {
 
 # ── Public API ───────────────────────────────────────────────────────────
 
-# sync_issue_create <beads-id>
-# Creates GitHub issue from Beads issue data.
-# Persists both the canonical mapping file and the legacy github_issue state
-# until downstream hook and verify flows stop reading bd show output.
+# sync_issue_create <issue-id>
+# Creates a GitHub issue from the Forge issue data.
+# Persists both the canonical mapping file and the github_issue:<n> label so
+# that downstream hook and verify flows can resolve the GitHub association.
 # Returns 0 on success, 1 on failure.
 sync_issue_create() {
   local beads_id="${1:-}"
@@ -279,9 +229,24 @@ sync_issue_create() {
   fi
 
   local gh_cmd="${GH_CMD:-gh}"
-  local bd_cmd="${BD_CMD:-bd}"
+  local forge_cmd="${FORGE_CMD:-forge}"
+
+  # Retry-safety / idempotency: the mapping file is persisted *before* the
+  # github_issue:<n> label is stored, so a previous run that created the GitHub
+  # issue and mapping but failed on the label leaves a recoverable mapping entry.
+  # On retry, repair the missing label from the mapping instead of calling
+  # `gh issue create` again and creating a duplicate GitHub issue.
+  local existing_num
+  existing_num="$(_get_issue_number_from_mapping "$beads_id" 2>/dev/null || true)"
+  if [[ -n "$existing_num" ]]; then
+    if ! "$forge_cmd" issue update "$beads_id" --label "github_issue:$existing_num" >/dev/null 2>&1; then
+      _sync_error "Failed to store github_issue:$existing_num for $beads_id"
+      return 1
+    fi
+    return 0
+  fi
 
-  # Get title from bd show
+  # Get title from the issue backend
   local raw_title
   raw_title="$(_get_issue_title "$beads_id")" || {
     _sync_error "Failed to get title for $beads_id"
@@ -313,8 +278,8 @@ sync_issue_create() {
     return 1
   fi
 
-  if ! "$bd_cmd" set-state "$beads_id" "github_issue=$issue_num" >/dev/null 2>&1; then
-    _sync_error "Failed to store github_issue=$issue_num for $beads_id"
+  if ! "$forge_cmd" issue update "$beads_id" --label "github_issue:$issue_num" >/dev/null 2>&1; then
+    _sync_error "Failed to store github_issue:$issue_num for $beads_id"
     return 1
   fi
 

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

@@ -7,15 +7,15 @@
 # Checks:
 #   1. gh auth status (GitHub CLI authenticated)
 #   2. Identity mapped in team-map.jsonl
-#   3. Orphan Beads issues (Beads without GitHub counterpart)
-#   4. Orphan GitHub issues (GitHub without Beads counterpart)
-#   5. Assignee consistency between Beads and GitHub
+#   3. Orphan tracked issues (no GitHub counterpart)
+#   4. Orphan GitHub issues (no tracked counterpart)
+#   5. Assignee consistency between tracked issues and GitHub
 #
 # Env overrides (for testing):
 #   GH_CMD              — Path to gh binary (default: gh)
-#   BD_CMD              — Path to bd binary (default: bd)
-#   TEAM_MAP_ROOT       — Root dir for .beads/ and .github/ (default: .)
-#   VERIFY_MAPPING_FILE — Path to beads-mapping.json (default: $TEAM_MAP_ROOT/.github/beads-mapping.json)
+#   FORGE_CMD           — Path to forge binary (default: forge)
+#   TEAM_MAP_ROOT       — Root dir for .forge/ and .github/ (default: .)
+#   VERIFY_MAPPING_FILE — Path to the GitHub issue mapping (default: $TEAM_MAP_ROOT/.github/beads-mapping.json)
 #
 # This file does NOT set errexit/pipefail — callers manage their own shell options.
 
@@ -66,16 +66,19 @@ _mapping_file() {
   printf '%s' "${VERIFY_MAPPING_FILE:-$root/.github/beads-mapping.json}"
 }
 
-# ── _extract_beads_ids ───────────────────────────────────────────────────
-# Parse bd list output to extract beads IDs.
-# Input format: "◐ forge-aaa · Feature A" or "○ forge-bbb · Feature B"
-# Output: one ID per line
-_extract_beads_ids() {
-  local input="${1:-}"
-  if [[ -z "$input" ]]; then
-    return 0
-  fi
-  printf '%s\n' "$input" | grep -oP '(forge-[a-zA-Z0-9]+(\.[a-zA-Z0-9]+)*)' || true
+# ── _verify_active_issues_json ─────────────────────────────────────────────
+# Merged JSON array of open + in_progress issues. The Kernel list filter does
+# not accept comma-joined statuses, so query each status separately and
+# concatenate the issue arrays.
+_verify_active_issues_json() {
+  local forge_cmd="${FORGE_CMD:-forge}"
+  local open_json inprog_json
+  open_json="$("$forge_cmd" issue list --status=open --json 2>/dev/null)" || open_json=""
+  inprog_json="$("$forge_cmd" issue list --status=in_progress --json 2>/dev/null)" || inprog_json=""
+  jq -n \
+    --argjson a "${open_json:-null}" \
+    --argjson b "${inprog_json:-null}" \
+    '((($a.data.issues) // []) + (($b.data.issues) // []))' 2>/dev/null || echo "[]"
 }
 
 # ── Public API ───────────────────────────────────────────────────────────
@@ -84,7 +87,6 @@ _extract_beads_ids() {
 # Exit 0 if all clean, exit 1 if any issues found.
 cmd_verify() {
   local gh_cmd="${GH_CMD:-gh}"
-  local bd_cmd="${BD_CMD:-bd}"
   local issues_found=0
 
   echo "forge team verify"
@@ -130,47 +132,75 @@ cmd_verify() {
     issues_found=$((issues_found + 1))
   fi
 
-  # ── Check 3: Orphan Beads issues (Beads without GitHub) ─────────────
-  local bd_output
-  bd_output="$("$bd_cmd" list --status=open,in_progress 2>/dev/null)" || bd_output=""
-
-  local beads_ids
-  beads_ids="$(_extract_beads_ids "$bd_output")"
-
-  local beads_total=0
-  local beads_synced=0
-  local beads_orphans=()
-
-  if [[ -n "$beads_ids" ]]; then
-    while IFS= read -r bid; do
-      [[ -z "$bid" ]] && continue
-      beads_total=$((beads_total + 1))
-
-      # Check if this beads issue has github_issue state
-      local show_output
-      show_output="$("$bd_cmd" show "$bid" 2>/dev/null)" || show_output=""
-      if printf '%s' "$show_output" | grep -qP 'github_issue:\d+'; then
-        beads_synced=$((beads_synced + 1))
-      else
-        beads_orphans+=("$bid")
-      fi
-    done <<< "$beads_ids"
-  fi
+  # ── Association set: labels ∪ mapping (shared by Check 3 and Check 4) ─
+  # A GitHub↔Forge association can live in either the issue's `github_issue:<n>`
+  # label OR the local mapping file. Build a single set from BOTH so Check 3
+  # (Forge→GitHub) and Check 4 (GitHub→Forge) agree: a label-only or
+  # mapping-only association must never be misreported as an orphan.
+  local mapping_file
+  mapping_file="$(_mapping_file)"
+  local mapping_content="{}"
+  [[ -f "$mapping_file" ]] && mapping_content="$(cat "$mapping_file" 2>/dev/null || echo '{}')"
+
+  local issues_json
+  issues_json="$(_verify_active_issues_json)"
+
+  local -A assoc_gh_num=()   # associated GitHub numbers (mapping keys ∪ label numbers)
+  local -A assoc_beads=()    # associated Forge ids (mapping values ∪ labelled ids)
+
+  # From the mapping file: keys are GitHub numbers, values are Forge ids. The
+  # value is a string today; tolerate a legacy/forward object form ({beads_id}).
+  local _m_num _m_bid
+  while IFS=$'\t' read -r _m_num _m_bid; do
+    [[ -n "$_m_num" ]] && assoc_gh_num["$_m_num"]=1
+    [[ -n "$_m_bid" && "$_m_bid" != "null" ]] && assoc_beads["$_m_bid"]=1
+  done <<< "$(printf '%s' "$mapping_content" | jq -r '
+    to_entries[]
+    | [ (.key | tostring),
+        (if (.value | type) == "object" then (.value.beads_id // "") else (.value | tostring) end) ]
+    | @tsv' 2>/dev/null | tr -d '\r')"
+
+  # From active issues: a github_issue:<n> label links the issue id to number n.
+  local _l_id _l_num
+  while IFS=$'\t' read -r _l_id _l_num; do
+    [[ -z "$_l_id" ]] && continue
+    assoc_beads["$_l_id"]=1
+    [[ -n "$_l_num" ]] && assoc_gh_num["$_l_num"]=1
+  done <<< "$(printf '%s' "$issues_json" | jq -r '
+    .[]
+    | . as $x
+    | ((($x.labels // []) | map(select(startswith("github_issue:"))) | .[0] // "") | ltrimstr("github_issue:")) as $num
+    | select($num != "")
+    | [ $x.id, $num ] | @tsv' 2>/dev/null | tr -d '\r')"
+
+  # ── Check 3: Orphan tracked issues (no GitHub counterpart) ──────────
+  local issue_total issue_synced=0
+  issue_total="$(printf '%s' "$issues_json" | jq 'length' 2>/dev/null || echo 0)"
+
+  local issue_orphans=()
+  local _aid
+  while IFS= read -r _aid; do
+    [[ -z "$_aid" ]] && continue
+    if [[ -n "${assoc_beads[$_aid]:-}" ]]; then
+      issue_synced=$((issue_synced + 1))
+    else
+      issue_orphans+=("$_aid")
+    fi
+  done <<< "$(printf '%s' "$issues_json" | jq -r '.[].id' 2>/dev/null | tr -d '\r')"
 
-  if [[ ${#beads_orphans[@]} -eq 0 ]]; then
-    echo "✓ Beads→GitHub: ${beads_synced}/${beads_total} issues synced"
+  if [[ ${#issue_orphans[@]} -eq 0 ]]; then
+    echo "✓ Forge→GitHub: ${issue_synced}/${issue_total} issues synced"
   else
-    echo "✗ Beads→GitHub: ${#beads_orphans[@]} orphan issues found"
-    for orphan in "${beads_orphans[@]}"; do
+    echo "✗ Forge→GitHub: ${#issue_orphans[@]} orphan issues found"
+    for orphan in "${issue_orphans[@]}"; do
       _verify_prompt "${orphan} has no GitHub issue. Run: forge team sync-issue ${orphan}"
     done
-    issues_found=$((issues_found + ${#beads_orphans[@]}))
+    issues_found=$((issues_found + ${#issue_orphans[@]}))
   fi
 
-  # ── Check 4: Orphan GitHub issues (GitHub without Beads) ────────────
-  local mapping_file
-  mapping_file="$(_mapping_file)"
-
+  # ── Check 4: Orphan GitHub issues (no tracked counterpart) ──────────
+  # Uses the same association set: a GitHub number is mapped when it appears in
+  # the mapping file OR as a github_issue:<n> label on an active issue.
   local gh_issues_json
   gh_issues_json="$("$gh_cmd" issue list --state open --json number,title --limit 100 2>/dev/null)" || gh_issues_json="[]"
 
@@ -178,43 +208,23 @@ cmd_verify() {
   gh_issue_count="$(printf '%s' "$gh_issues_json" | jq 'length')"
 
   local gh_orphans=()
-
-  if [[ "$gh_issue_count" -gt 0 ]] && [[ -f "$mapping_file" ]]; then
-    local mapping_content
-    mapping_content="$(cat "$mapping_file")"
-
-    local i=0
-    while [[ $i -lt $gh_issue_count ]]; do
-      local issue_num
-      issue_num="$(printf '%s' "$gh_issues_json" | jq -r ".[$i].number")"
-
-      # Check if this GitHub issue number is a key in the mapping
-      local mapped
-      mapped="$(printf '%s' "$mapping_content" | jq -r --arg n "$issue_num" '.[$n] // empty')"
-
-      if [[ -z "$mapped" ]]; then
-        gh_orphans+=("$issue_num")
-      fi
-      i=$((i + 1))
-    done
-  elif [[ "$gh_issue_count" -gt 0 ]] && [[ ! -f "$mapping_file" ]]; then
-    # No mapping file — all GitHub issues are orphans
-    local i=0
-    while [[ $i -lt $gh_issue_count ]]; do
-      local issue_num
-      issue_num="$(printf '%s' "$gh_issues_json" | jq -r ".[$i].number")"
+  local i=0
+  while [[ $i -lt $gh_issue_count ]]; do
+    local issue_num
+    issue_num="$(printf '%s' "$gh_issues_json" | jq -r ".[$i].number")"
+    if [[ -z "${assoc_gh_num[$issue_num]:-}" ]]; then
       gh_orphans+=("$issue_num")
-      i=$((i + 1))
-    done
-  fi
+    fi
+    i=$((i + 1))
+  done
 
   if [[ ${#gh_orphans[@]} -eq 0 ]]; then
     local mapped_count=$((gh_issue_count))
-    echo "✓ GitHub→Beads: ${mapped_count}/${mapped_count} issues mapped"
+    echo "✓ GitHub→Forge: ${mapped_count}/${mapped_count} issues mapped"
   else
-    echo "✗ GitHub→Beads: ${#gh_orphans[@]} orphan issues found"
+    echo "✗ GitHub→Forge: ${#gh_orphans[@]} orphan issues found"
     for orphan_num in "${gh_orphans[@]}"; do
-      _verify_prompt "GitHub #${orphan_num} has no Beads issue. Run: forge team import #${orphan_num}"
+      _verify_prompt "GitHub #${orphan_num} has no tracked issue. Run: forge team import #${orphan_num}"
     done
     issues_found=$((issues_found + ${#gh_orphans[@]}))
   fi

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

@@ -7,7 +7,7 @@
 #   cmd_workload  — Main entry point for `forge team workload`
 #
 # Env overrides (for testing):
-#   BD_CMD          — Path to bd binary
+#   FORGE_CMD       — Path to forge binary
 #   GH_CMD          — Path to gh binary
 #   WORKLOAD_NOW    — Override "now" timestamp for testing (ISO 8601)
 #
@@ -88,70 +88,46 @@ _json_escape() {
 }
 
 # _collect_issues — Gather all open/in_progress issues with details
-# Outputs lines: id|title|status|owner|updated|depends_on
+# Outputs tab-delimited (jq @tsv) lines: id<TAB>title<TAB>status<TAB>owner<TAB>updated<TAB>depends_on
+# @tsv escapes any tab/newline/CR inside fields, so user-controlled titles that
+# contain '|', tabs, or newlines never shift the downstream columns.
+#
+# The Kernel list filter does not accept comma-joined statuses, so query each
+# active status separately and concatenate the JSON issue arrays. Every field
+# the workload view needs (status, assignee, updated_at, dependencies) is
+# present in `issue list --json`, so no per-issue lookup is required.
 _collect_issues() {
-  local bd_cmd="${BD_CMD:-bd}"
-  local list_output
-  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 "$(printf '%s' "$list_output" | tr -d '[:space:]')" ]]; then
-    return 0
-  fi
-
-  while IFS= read -r line; do
-    # Skip empty lines
-    [[ -z "$line" ]] && continue
-
-    # 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]+(\.[a-zA-Z0-9]+)*' | head -1)"
-    [[ -z "$issue_id" ]] && continue
-
-    # Get details via bd show
-    local show_output
-    show_output="$("$bd_cmd" show "$issue_id" 2>/dev/null)" || continue
-
-    # Parse owner
-    local owner
-    owner="$(echo "$show_output" | grep -E '^Owner:' | sed 's/^Owner:[[:space:]]*//')"
-    [[ -z "$owner" ]] && owner="unassigned"
-
-    # Parse status from the header line [● Px · STATUS]
-    local status
-    status="$(echo "$show_output" | head -1 | grep -oE '(IN_PROGRESS|OPEN|BLOCKED|CLOSED)' | head -1)"
-    [[ -z "$status" ]] && status="OPEN"
-
-    # Parse title — text after "forge-xxx · " on first line
-    local title
-    title="$(echo "$show_output" | head -1 | sed -E 's/^[^·]*·[[:space:]]*//' | sed -E 's/[[:space:]]*\[.*//')"
-
-    # Parse updated timestamp
-    local updated
-    updated="$(echo "$show_output" | grep -E '^Updated:' | sed 's/^Updated:[[:space:]]*//')"
-    [[ -z "$updated" ]] && updated=""
-
-    # Parse dependencies (DEPENDS ON section)
-    local depends_on=""
-    if echo "$show_output" | grep -q "DEPENDS ON"; then
-      depends_on="$(echo "$show_output" | grep -E '^\s*→' | sed -E 's/^\s*→\s*//' | sed -E 's/:.*//' | tr '\n' ',' | sed 's/,$//')"
-    fi
-
-    echo "${issue_id}|${title}|${status}|${owner}|${updated}|${depends_on}"
-  done <<< "$list_output"
+  local forge_cmd="${FORGE_CMD:-forge}"
+  local open_json inprog_json issues_json
+
+  open_json="$("$forge_cmd" issue list --status=open --json 2>/dev/null)" || open_json=""
+  inprog_json="$("$forge_cmd" issue list --status=in_progress --json 2>/dev/null)" || inprog_json=""
+
+  issues_json="$(jq -n \
+    --argjson a "${open_json:-null}" \
+    --argjson b "${inprog_json:-null}" \
+    '((($a.data.issues) // []) + (($b.data.issues) // []))' 2>/dev/null)" || issues_json="[]"
+
+  # A Kernel issue's `.dependencies` lists the issues it BLOCKS (outgoing), so
+  # depends_on (the issues that block THIS one) is a reverse scan: issues within
+  # the active set whose `.dependencies` include this issue.
+  printf '%s' "$issues_json" | jq -r '
+    . as $all
+    | $all[]
+    | . as $x
+    | [ $x.id,
+        ($x.title // ""),
+        (($x.status // "open") | ascii_upcase),
+        ($x.assignee // $x.claimed_by // "unassigned"),
+        (($x.updated_at // "") | sub("\\.[0-9]+Z$"; "Z")),
+        ( [ $all[]
+            | select( (.dependencies // [])
+                | map(if type == "object" then (.id // .to // "") else . end)
+                | any(. == $x.id) )
+            | .id ]
+          | join(",") )
+      ]
+    | @tsv' | tr -d '\r'
 }
 
 # ── Public API ───────────────────────────────────────────────────────────
@@ -213,7 +189,7 @@ cmd_workload() {
   local work_dir
   work_dir="$(mktemp -d)"
 
-  while IFS='|' read -r issue_id title status owner updated depends_on; do
+  while IFS=$'\t' read -r issue_id title status owner updated depends_on; do
     [[ -z "$issue_id" ]] && continue
 
     # Apply developer filter

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

@@ -7,7 +7,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 TEST_TMP="$(mktemp -d)"
 trap 'rm -rf "$TEST_TMP"' EXIT
 
-# Override TEAM_MAP_ROOT so tests don't touch real .beads/
+# Override TEAM_MAP_ROOT so tests don't touch real .forge/
 export TEAM_MAP_ROOT="$TEST_TMP"
 
 # ── Create mock gh ───────────────────────────────────────────────────────
@@ -52,26 +52,32 @@ exit 1
 MOCK
 chmod +x "$mock_dir/gh-fail"
 
-# ── Create mock bd ───────────────────────────────────────────────────────
-cat > "$mock_dir/bd" << 'MOCK'
+# ── Create mock forge ─────────────────────────────────────────────────────
+# `issue show --json` carries the github_issue:<n> association as a label.
+cat > "$mock_dir/forge" << 'MOCK'
 #!/usr/bin/env bash
-case "$1" in
-  show)
-    case "$2" in
-      forge-assigned) echo "forge-assigned  Assigned Issue [github_issue:42]" ;;
-      forge-unassigned) echo "forge-unassigned  Unassigned Issue [github_issue:43]" ;;
-      forge-mine) echo "forge-mine  My Issue [github_issue:44]" ;;
-      forge-nogithub) echo "forge-nogithub  No GitHub Issue" ;;
-      *) echo "unknown issue" ;;
-    esac ;;
-  update) echo "Updated" ;;
-  comments) echo "Comment added" ;;
+sub="$1 $2"
+id="$3"
+case "$sub" in
+  "issue show")
+    case "$id" in
+      forge-assigned)   labels='["github_issue:42"]' ;;
+      forge-unassigned) labels='["github_issue:43"]' ;;
+      forge-mine)       labels='["github_issue:44"]' ;;
+      forge-nogithub)   labels='[]' ;;
+      *)                printf 'unexpected issue id: %s\n' "$id" >&2; exit 64 ;;
+    esac
+    printf '{"data":{"issue":{"id":"%s","labels":%s}}}\n' "$id" "$labels"
+    ;;
+  "issue claim")   printf '{"data":{"id":"%s"}}\n' "$id" ;;
+  "issue comment") printf '{"data":{"id":"%s"}}\n' "$id" ;;
+  *) printf 'unexpected forge command: %s\n' "$*" >&2; exit 64 ;;
 esac
 MOCK
-chmod +x "$mock_dir/bd"
+chmod +x "$mock_dir/forge"
 
 export GH_CMD="$mock_dir/gh"
-export BD_CMD="$mock_dir/bd"
+export FORGE_CMD="$mock_dir/forge"
 
 # Source the library under test
 source "$SCRIPT_DIR/lib/claim.sh"
@@ -109,7 +115,7 @@ assert_exit() {
 # ── Test 1: Pre-claim on unassigned issue → returns 0 ───────────────────
 echo "── Test 1: Pre-claim on unassigned issue ──"
 unset _GITHUB_USER_CACHE
-mkdir -p "$TEST_TMP/.beads"
+mkdir -p "$TEST_TMP/.forge"
 rc=0
 pre_claim_check "forge-unassigned" 2>/dev/null || rc=$?
 assert_exit "unassigned issue returns 0" 0 "$rc"
@@ -136,7 +142,7 @@ assert_exit "assigned to self returns 0" 0 "$rc"
 echo ""
 echo "── Test 4: --force overrides pre-claim check ──"
 unset _GITHUB_USER_CACHE
-mkdir -p "$TEST_TMP/.beads"
+mkdir -p "$TEST_TMP/.forge"
 rc=0
 output="$(forge_team_claim "forge-assigned" "--force" 2>&1)" || rc=$?
 assert_exit "force claim succeeds" 0 "$rc"
@@ -146,7 +152,7 @@ assert_contains "confirmation output" "claimed" "$output"
 echo ""
 echo "── Test 5: Claim with lock succeeds ──"
 unset _GITHUB_USER_CACHE
-mkdir -p "$TEST_TMP/.beads"
+mkdir -p "$TEST_TMP/.forge"
 # Use the unassigned issue so pre-claim passes
 rc=0
 output="$(forge_team_claim "forge-unassigned" 2>&1)" || rc=$?