Merge pull request #27 from AndreJorgeLopes/wonderful-swirles-e95c58

fix: prevent fail() from shadowing bats-assert; unmask 9 latent test bugs

Author: AndreJorgeLopes

lib/init.sh

@@ -45,7 +45,7 @@ devflow_init() {
         fi
       fi
     else
-      fail "$cmd — not found"
+      status_fail "$cmd — not found"
       missing=1
     fi
   done
@@ -54,7 +54,7 @@ devflow_init() {
     if has_cmd brew; then
       ok "brew"
     else
-      fail "brew — not found (required on macOS)"
+      status_fail "brew — not found (required on macOS)"
       missing=1
     fi
   fi

lib/release.sh

@@ -25,10 +25,8 @@ _parse_conventional_commits() {
     log_target="HEAD"
   fi
 
-  # Stream commits with NUL separators using git's %x00 (portable, no bash NUL issues)
-  local commits
-  commits="$(git -C "$project_dir" log "$log_target" --format='%B%x00' 2>/dev/null || echo "")"
-  if [[ -z "$commits" ]]; then
+  # Bail early if the commit range is empty
+  if ! git -C "$project_dir" log "$log_target" --format='%H' 2>/dev/null | grep -q .; then
     echo "none"
     return 0
   fi
@@ -46,7 +44,9 @@ _parse_conventional_commits() {
   local fix_msgs=""
   local other_msgs=""
 
-  # Parse each commit
+  # Parse each commit. Stream NUL-delimited blocks directly from git log via
+  # process substitution — bash command substitution strips NUL bytes, so we
+  # cannot capture the output into a variable first.
   local IFS_SAVE="$IFS"
   while IFS= read -r -d '' commit_block; do
     [[ -z "$commit_block" ]] && continue
@@ -72,14 +72,15 @@ _parse_conventional_commits() {
         other_msgs+="other|${subject}\n"
         ;;
     esac
-  done < <(printf '%s' "$commits")
+  done < <(git -C "$project_dir" log "$log_target" --format='%B%x00' 2>/dev/null)
   IFS="$IFS_SAVE"
 
   # Output
   echo "$bump"
   [[ -n "$feat_msgs" ]] && printf "%b" "$feat_msgs"
   [[ -n "$fix_msgs" ]] && printf "%b" "$fix_msgs"
   [[ -n "$other_msgs" ]] && printf "%b" "$other_msgs"
+  return 0
 }
 
 # ── Semver Arithmetic ────────────────────────────────────────────────────────
@@ -211,6 +212,6 @@ devflow_release_preview() {
   if check_version_consistency "$proj" >/dev/null 2>&1; then
     ok "Version files are consistent"
   else
-    fail "Version files are inconsistent — run 'devflow check-version' for details"
+    status_fail "Version files are inconsistent — run 'devflow check-version' for details"
   fi
 }

lib/seed.sh

@@ -146,7 +146,7 @@ JSON
   if hindsight_post "/v1/retain" "$body" >/dev/null; then
     ok "Mental model: ${id}"
   else
-    fail "Failed to seed mental model: ${id}"
+    status_fail "Failed to seed mental model: ${id}"
   fi
 }
 
@@ -169,6 +169,6 @@ JSON
   if hindsight_post "/v1/retain" "$body" >/dev/null; then
     ok "Directive: ${id}"
   else
-    fail "Failed to seed directive: ${id}"
+    status_fail "Failed to seed directive: ${id}"
   fi
 }

lib/services.sh

@@ -101,25 +101,25 @@ devflow_status() {
         ok "Hindsight container running (Docker)"
         hindsight_runtime_found=true
       else
-        fail "Hindsight container not running — run 'devflow up' to start"
+        status_fail "Hindsight container not running — run 'devflow up' to start"
       fi
     else
-      fail "Docker runtime not running — run 'devflow up' to start"
+      status_fail "Docker runtime not running — run 'devflow up' to start"
     fi
   fi
 
   if hindsight_available; then
     ok "Hindsight API reachable at ${HINDSIGHT_API}"
   else
-    fail "Hindsight API not reachable at ${HINDSIGHT_API}"
+    status_fail "Hindsight API not reachable at ${HINDSIGHT_API}"
   fi
 
   # ── Layer 2: Worktrunk ─────────────────────────────────────────────────────
   printf "\n${BOLD}Layer 2: Worktrunk${RESET} (git worktrees)\n"
   if has_cmd wt; then
     ok "worktrunk (wt) installed"
   else
-    fail "worktrunk (wt) not installed"
+    status_fail "worktrunk (wt) not installed"
   fi
 
   # ── Layer 3: Code Review ────────────────────────────────────────────────────
@@ -131,7 +131,7 @@ devflow_status() {
   elif has_cmd opencode; then
     ok "Code review CLI: opencode (fallback)"
   else
-    fail "No code review CLI found — install Claude Code or OpenCode"
+    status_fail "No code review CLI found — install Claude Code or OpenCode"
   fi
 
   # ── Layer 4: CLAUDE.md + Skills ────────────────────────────────────────────
@@ -141,7 +141,7 @@ devflow_status() {
   if [[ -f "${HOME}/.claude/CLAUDE.md" ]]; then
     ok "~/.claude/CLAUDE.md found (user-scoped)"
   else
-    fail "~/.claude/CLAUDE.md not found"
+    status_fail "~/.claude/CLAUDE.md not found"
   fi
 
   # Check project-scoped CLAUDE.md
@@ -169,7 +169,7 @@ devflow_status() {
     if claude plugin list 2>/dev/null | grep -q "worktrunk"; then
       ok "worktrunk plugin installed"
     else
-      fail "worktrunk plugin not installed"
+      status_fail "worktrunk plugin not installed"
     fi
   fi
 
@@ -179,10 +179,10 @@ devflow_status() {
     if docker_compose -f "$compose_file" ps --status running 2>/dev/null | grep -q "langfuse"; then
       ok "Langfuse container running"
     else
-      fail "Langfuse container not running — run 'devflow up' to start"
+      status_fail "Langfuse container not running — run 'devflow up' to start"
     fi
   else
-    fail "Docker runtime not running — run 'devflow up' to start"
+    status_fail "Docker runtime not running — run 'devflow up' to start"
   fi
 
   echo ""

lib/utils.sh

@@ -28,9 +28,9 @@ section() { printf "\n${BOLD}${CYAN}── %s ──${RESET}\n" "$*"; }
 detail() { printf "  ${DIM}%s${RESET}\n" "$*"; }
 
 # Status indicators
-ok()   { printf "  ${GREEN}✓${RESET} %s\n" "$*"; }
-fail() { printf "  ${RED}✗${RESET} %s\n" "$*"; }
-skip() { printf "  ${YELLOW}⊘${RESET} %s\n" "$*"; }
+ok()          { printf "  ${GREEN}✓${RESET} %s\n" "$*"; }
+status_fail() { printf "  ${RED}✗${RESET} %s\n" "$*"; }
+skip()        { printf "  ${YELLOW}⊘${RESET} %s\n" "$*"; }
 
 # ── Checks ────────────────────────────────────────────────────────────────────
 

tests/unit/utils.bats

@@ -30,7 +30,9 @@ teardown() {
 @test "project_root returns directory containing .git" {
   run project_root
   assert_success
-  assert [ -d "${output}/.git" ]
+  # In a regular checkout `.git` is a directory; in a worktree it's a file
+  # pointing at the parent repo's gitdir. Accept either.
+  assert [ -e "${output}/.git" ]
 }
 
 # ── devflow_root ──────────────────────────────────────────────────

tests/unit/watch.bats

@@ -204,7 +204,12 @@ EOF
 # ── _detect_install_mode ───────────────────────────────────────
 
 @test "detect_install_mode returns link for symlinked devflow" {
-  ln -sf /some/repo/bin/devflow "${MOCK_DIR}/devflow"
+  # `command -v` skips dangling symlinks, so the target must actually exist
+  # — otherwise the lookup falls through to a real devflow on PATH.
+  local target="${BATS_TEST_TMPDIR}/real-devflow"
+  printf '#!/bin/sh\n' > "$target"
+  chmod +x "$target"
+  ln -sf "$target" "${MOCK_DIR}/devflow"
   run _detect_install_mode
   assert_success
   assert_output "link"