forge-workflow 0.0.9 → 0.1.0-beta.2

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=$?

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

@@ -7,53 +7,38 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 TEST_TMP="$(mktemp -d)"
 trap 'rm -rf "$TEST_TMP"' EXIT
 
-# ── Create mock bd ───────────────────────────────────────────────────────
+# ── Create mock forge ─────────────────────────────────────────────────────
+# Emits Kernel-shaped JSON ({"data":{"issues":[...]}}) for `issue list`.
 mock_dir="$(mktemp -d)"
 
-cat > "$mock_dir/bd" << 'MOCK'
+cat > "$mock_dir/forge" << 'MOCK'
 #!/usr/bin/env bash
-case "$1" in
-  list)
-    if echo "$*" | grep -q -- "--status=open,in_progress"; then
-      if [[ -n "${BD_MOCK_EMPTY:-}" ]]; then
-        # No output for empty test
-        :
-      elif [[ -n "${BD_MOCK_SINGLE:-}" ]]; then
-        echo "◐ forge-aaa · Feature A"
-      else
-        echo "◐ forge-aaa · Feature A"
-        echo "○ forge-bbb · Feature B"
-        echo "◐ forge-ccc · Feature C"
-      fi
-    fi
-    ;;
-  show)
-    case "$2" in
-      forge-aaa)
-        echo "◐ forge-aaa · Feature A [● P2 · IN_PROGRESS]"
-        echo "Owner: devone"
-        echo "Updated: 2026-03-27T10:00:00Z"
-        ;;
-      forge-bbb)
-        echo "○ forge-bbb · Feature B [● P2 · OPEN]"
-        echo "Owner: devtwo"
-        echo "Updated: 2026-03-24T10:00:00Z"
-        ;;
-      forge-ccc)
-        echo "◐ forge-ccc · Feature C [● P1 · IN_PROGRESS]"
-        echo "Owner: devone"
-        echo "Updated: 2026-03-27T09:00:00Z"
-        echo ""
-        echo "DEPENDS ON"
-        echo "  → ◐ forge-aaa: Feature A"
-        ;;
-    esac
-    ;;
-esac
+args="$*"
+emit() { printf '{"data":{"issues":%s}}\n' "$1"; }
+
+# forge-aaa BLOCKS forge-ccc (kernel: blocker carries the dependency edge), so
+# forge-ccc is the blocked one — its blocked_by resolves to forge-aaa via reverse scan.
+aaa='{"id":"forge-aaa","title":"Feature A","status":"in_progress","assignee":"devone","updated_at":"2026-03-27T10:00:00Z","dependencies":["forge-ccc"]}'
+bbb='{"id":"forge-bbb","title":"Feature B","status":"open","assignee":"devtwo","updated_at":"2026-03-24T10:00:00Z","dependencies":[]}'
+ccc='{"id":"forge-ccc","title":"Feature C","status":"in_progress","assignee":"devone","updated_at":"2026-03-27T09:00:00Z","dependencies":[]}'
+
+if [[ "$args" == *"issue list"* ]]; then
+  if [[ -n "${FORGE_MOCK_EMPTY:-}" ]]; then
+    emit "[]"
+  elif [[ -n "${FORGE_MOCK_SINGLE:-}" ]]; then
+    if [[ "$args" == *"--status=in_progress"* ]]; then emit "[$aaa]"; else emit "[]"; fi
+  else
+    if [[ "$args" == *"--status=open"* ]]; then emit "[$bbb]"
+    elif [[ "$args" == *"--status=in_progress"* ]]; then emit "[$aaa,$ccc]"
+    else emit "[]"; fi
+  fi
+  exit 0
+fi
+exit 0
 MOCK
-chmod +x "$mock_dir/bd"
+chmod +x "$mock_dir/forge"
 
-export BD_CMD="$mock_dir/bd"
+export FORGE_CMD="$mock_dir/forge"
 
 # Source the library under test
 source "$SCRIPT_DIR/lib/dashboard.sh"
@@ -132,24 +117,24 @@ assert_contains "blocked shows dependency" "forge-aaa" "$output"
 echo ""
 echo "── Test 4: No issues → clear message ──"
 
-export BD_MOCK_EMPTY=1
+export FORGE_MOCK_EMPTY=1
 rc=0
 output_empty="$(cmd_dashboard 2>&1)" || rc=$?
 assert_exit "empty dashboard exits 0" 0 "$rc"
 assert_contains "shows no active issues" "No active issues" "$output_empty"
-unset BD_MOCK_EMPTY
+unset FORGE_MOCK_EMPTY
 
 # ── Test 5: Single developer → works correctly ──────────────────────────
 echo ""
 echo "── Test 5: Single developer ──"
 
-export BD_MOCK_SINGLE=1
+export FORGE_MOCK_SINGLE=1
 rc=0
 output_single="$(cmd_dashboard 2>&1)" || rc=$?
 assert_exit "single dev dashboard exits 0" 0 "$rc"
 assert_contains "shows devone" "devone" "$output_single"
 assert_not_contains "no devtwo in single mode" "devtwo" "$output_single"
-unset BD_MOCK_SINGLE
+unset FORGE_MOCK_SINGLE
 
 # ── Test 6: --format=json → valid JSON ──────────────────────────────────
 echo ""

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

@@ -7,74 +7,45 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 TEST_TMP="$(mktemp -d)"
 trap 'rm -rf "$TEST_TMP"' EXIT
 
-# ── Create mock bd ───────────────────────────────────────────────────────
+# ── Create mock forge ────────────────────────────────────────────────────
+# Only handles `forge issue children <id> --json`, emitting the kernel
+# issue-command-contract envelope ({schema_version,command,data:{epic,children,
+# rollup,count},next_commands}). An unknown id mirrors the kernel not-found path:
+# error on stderr, empty stdout, non-zero exit.
 mock_dir="$(mktemp -d)"
 
-cat > "$mock_dir/bd" << 'MOCK'
+cat > "$mock_dir/forge" << 'MOCK'
 #!/usr/bin/env bash
-case "$1 $2" in
-  "show forge-epic1")
-    cat << 'SHOW'
-◐ forge-epic1 · Test Epic [● P2 · IN_PROGRESS]
-Owner: devone
-
-BLOCKS
-  ← ✓ forge-child1: Child 1 (closed)
-  ← ◐ forge-child2: Child 2 (in_progress)
-  ← ○ forge-child3: Child 3 (open)
-SHOW
-    ;;
-  "show forge-child1")
-    echo "✓ forge-child1 · Child 1 [● P2 · CLOSED]"
-    echo "Owner: devone"
-    ;;
-  "show forge-child2")
-    echo "◐ forge-child2 · Child 2 [● P2 · IN_PROGRESS]"
-    echo "Owner: devtwo"
-    ;;
-  "show forge-child3")
-    echo "○ forge-child3 · Child 3 [● P3 · OPEN]"
-    echo "Owner: devone"
-    ;;
-  "show forge-empty")
-    cat << 'SHOW'
-○ forge-empty · Empty Epic [● P2 · OPEN]
-Owner: devone
-SHOW
-    ;;
-  "show forge-blocked")
-    cat << 'SHOW'
-◐ forge-blocked · Blocked Epic [● P2 · IN_PROGRESS]
-Owner: devone
-
-BLOCKS
-  ← ✓ forge-bchild1: Bchild 1 (closed)
-  ← ◐ forge-bchild2: Bchild 2 (in_progress)
-  ← ○ forge-bchild3: Bchild 3 (open)
-SHOW
-    ;;
-  "show forge-bchild1")
-    echo "✓ forge-bchild1 · Bchild 1 [● P2 · CLOSED]"
-    echo "Owner: devone"
-    ;;
-  "show forge-bchild2")
-    cat << 'SHOW'
-◐ forge-bchild2 · Bchild 2 [● P2 · IN_PROGRESS]
-Owner: devtwo
-
-BLOCKED_BY
-  → forge-bchild1: Bchild 1
-SHOW
-    ;;
-  "show forge-bchild3")
-    echo "○ forge-bchild3 · Bchild 3 [● P3 · OPEN]"
-    echo "Owner: devone"
-    ;;
-esac
+if [[ "$1" == "issue" && "$2" == "children" ]]; then
+  id="$3"
+  case "$id" in
+    forge-epic1)
+      cat << 'JSON'
+{"schema_version":"forge.issue.v1","command":"issue.children","data":{"epic":{"id":"forge-epic1","title":"Test Epic","type":"epic","status":"in_progress"},"children":[{"id":"forge-child1","title":"Child 1","status":"done","assignee":"devone","blocked":false,"blocked_by":[],"dependencies":[],"dependents":[]},{"id":"forge-child2","title":"Child 2","status":"in_progress","assignee":"devtwo","blocked":false,"blocked_by":[],"dependencies":[],"dependents":[]},{"id":"forge-child3","title":"Child 3","status":"open","assignee":"devone","blocked":false,"blocked_by":[],"dependencies":[],"dependents":[]}],"rollup":{"total":3,"done":1,"in_progress":1,"open":1,"review":0,"cancelled":0,"blocked":0,"percentage":33,"by_status":{"open":1,"in_progress":1,"review":0,"done":1,"cancelled":0}},"count":3},"next_commands":[]}
+JSON
+      ;;
+    forge-empty)
+      cat << 'JSON'
+{"schema_version":"forge.issue.v1","command":"issue.children","data":{"epic":{"id":"forge-empty","title":"Empty Epic","type":"epic","status":"open"},"children":[],"rollup":{"total":0,"done":0,"in_progress":0,"open":0,"review":0,"cancelled":0,"blocked":0,"percentage":0,"by_status":{"open":0,"in_progress":0,"review":0,"done":0,"cancelled":0}},"count":0},"next_commands":[]}
+JSON
+      ;;
+    forge-blocked)
+      cat << 'JSON'
+{"schema_version":"forge.issue.v1","command":"issue.children","data":{"epic":{"id":"forge-blocked","title":"Blocked Epic","type":"epic","status":"in_progress"},"children":[{"id":"forge-bchild1","title":"Bchild 1","status":"done","assignee":"devone","blocked":false,"blocked_by":[],"dependencies":[],"dependents":["forge-bchild2"]},{"id":"forge-bchild2","title":"Bchild 2","status":"in_progress","assignee":"devtwo","blocked":true,"blocked_by":["forge-bchild1"],"dependencies":["forge-bchild1"],"dependents":[]},{"id":"forge-bchild3","title":"Bchild 3","status":"open","assignee":"devone","blocked":false,"blocked_by":[],"dependencies":[],"dependents":[]}],"rollup":{"total":3,"done":1,"in_progress":1,"open":1,"review":0,"cancelled":0,"blocked":1,"percentage":33,"by_status":{"open":1,"in_progress":1,"review":0,"done":1,"cancelled":0}},"count":3},"next_commands":[]}
+JSON
+      ;;
+    *)
+      echo "Issue $id not found" >&2
+      exit 1
+      ;;
+  esac
+  exit 0
+fi
+exit 1
 MOCK
-chmod +x "$mock_dir/bd"
+chmod +x "$mock_dir/forge"
 
-export BD_CMD="$mock_dir/bd"
+export FORGE_CMD="$mock_dir/forge"
 
 # Source the library under test
 source "$SCRIPT_DIR/lib/epic.sh"
@@ -116,7 +87,7 @@ output="$(cmd_epic "forge-epic1" 2>&1)" || rc=$?
 assert_exit "exits 0" 0 "$rc"
 assert_contains "shows epic id" "forge-epic1" "$output"
 assert_contains "progress shows 1/3" "1/3" "$output"
-assert_contains "shows closed child marker" "forge-child1" "$output"
+assert_contains "shows done child marker" "✓ forge-child1" "$output"
 assert_contains "shows in_progress child" "forge-child2" "$output"
 assert_contains "shows open child" "forge-child3" "$output"
 
@@ -145,13 +116,14 @@ echo "── Test 5: --format=json ──"
 rc=0
 output_json="$(cmd_epic "forge-epic1" "--format=json" 2>&1)" || rc=$?
 assert_exit "json exits 0" 0 "$rc"
-# Validate it's actual JSON (check for opening brace and key fields)
-assert_contains "json has epic_id" "epic_id" "$output_json"
-assert_contains "json has total" "total" "$output_json"
-assert_contains "json has done" "done" "$output_json"
-assert_contains "json has percentage" "percentage" "$output_json"
-assert_contains "json has children" "children" "$output_json"
-assert_contains "json has by_developer" "by_developer" "$output_json"
+# Validate it parses as JSON and carries the expected fields/values.
+assert_eq "json total is 3" "3" "$(printf '%s' "$output_json" | jq -r '.total')"
+assert_eq "json done is 1" "1" "$(printf '%s' "$output_json" | jq -r '.done')"
+assert_eq "json percentage is 33" "33" "$(printf '%s' "$output_json" | jq -r '.percentage')"
+assert_eq "json has 3 children" "3" "$(printf '%s' "$output_json" | jq -r '.children | length')"
+assert_eq "json by_developer devone total 2" "2" "$(printf '%s' "$output_json" | jq -r '.by_developer.devone.total')"
+assert_eq "json by_developer devone done 1" "1" "$(printf '%s' "$output_json" | jq -r '.by_developer.devone.done')"
+assert_eq "json epic_id" "forge-epic1" "$(printf '%s' "$output_json" | jq -r '.epic_id')"
 
 # ── Test 6: Missing issue-id → error ────────────────────────────────────
 echo ""
@@ -169,6 +141,15 @@ output_blocked="$(cmd_epic "forge-blocked" 2>&1)" || rc=$?
 assert_exit "blocked epic exits 0" 0 "$rc"
 assert_contains "blocked section present" "Blocked" "$output_blocked"
 assert_contains "blocked child mentioned" "forge-bchild2" "$output_blocked"
+assert_contains "blocked-by id mentioned" "forge-bchild1" "$output_blocked"
+
+# ── Test 8: Unknown epic id → not-found error ────────────────────────────
+echo ""
+echo "── Test 8: Unknown epic id ──"
+rc=0
+output_unknown="$(cmd_epic "forge-nope" 2>&1)" || rc=$?
+assert_exit "unknown id returns 1" 1 "$rc"
+assert_contains "error about fetch" "Could not fetch" "$output_unknown"
 
 # ── Results ──────────────────────────────────────────────────────────────
 echo ""