fix(git-tools): correlate Gitea PR merge state and CI runs (#140)

[St0nefish]

Closes #140.

Summary

Two Gitea-only defects made git-cli report the wrong thing, plus a fork-bomb landmine in the test mocks that the first fix exposed.

1. pr show reported merged PRs as open

The Gitea path sourced from tea pr list, whose JSON omits the merged boolean and merged_at timestamp entirely — tea only encodes merge state into the state string. A merged PR came back merged:false and callers treated it as still open.

Fetches the PR detail via tea api repos/{owner}/{repo}/pulls/<n> instead, mirroring the existing run:show/run:list pattern, and derives state from merged so it matches the GitHub path. merged_at is now emitted on both platforms so the shape is identical.

2. run watch timed out into no-workflow when CI had actually run

Gitea leaves head_branch empty on pull_request-triggered runs, so run list --branch correlates nothing. Resolves the branch head SHA up front and falls back to head_sha correlation when the branch-filtered lookup is empty.

GitHub is unaffected — its server-side --branch filter populates the first call, so the SHA path is never taken. The two GitHub-only call sites (statusCheckRollup) are deliberately left alone.

3. Test mocks fork-bombed on any unmatched git subcommand

Every suite that PATH-injects a fake git fell through to command git "$@". command bypasses functions and aliases but not PATH lookup, and the mock's directory is prepended to PATH — so the mock re-executed itself, unbounded.

Latent since the mocks were written, because nothing had ever called git with a subcommand other than remote get-url origin. The rev-parse call in fix 2 was the first, and it took out a whole terminal: 56,311 processes in one cgroup scope against a pids.max of 114,647, after which every fork in that terminal failed.

Fixed at all 11 fallbacks across 9 suites by stripping the mock's own directory from PATH before delegating:

*) PATH=${PATH#"${0%/*}":}; exec git "$@" ;;

Without this, CI itself would fork-bomb on the rev-parse call, so it is a prerequisite for fix 2 rather than a follow-up.

Test plan

• bash tests/test.sh — 32 suites, 0 failed; previously hung indefinitely
• tests/session/test-ci-poll.sh — 38/38 (this is the suite that bombed)
• New regression suites: test-pr-show-gitea.sh (4), test-run-watch-gitea.sh (2)
• All git-cli suites: 43 tests, 0 failures
• Mock behaviour verified directly: matched cases still return mock values, unmatched delegate to real git and terminate, git rev-parse origin/<missing> returns git's own error instead of recursing
• validate-frontmatter.sh 103/0; utils/sync.sh --check no drift

Versions

git-tools 2.2.1 → 2.2.2, session 4.5.0 → 4.5.1 (both vendor git-cli).

[Copilot]

🟢 Approval recommended

The fixes directly address the reported Gitea defects and are backed by targeted regression tests plus a hardened mock setup to prevent recursive git execution.

Pull request overview

This PR fixes two Gitea-specific correctness bugs in git-cli (PR merge-state reporting and CI run correlation in run watch) and hardens the test harness to prevent recursive git mock execution (fork-bomb) when unmocked subcommands are invoked.

Changes:

• Fix pr show on Gitea to fetch PR details via tea api .../pulls/<n> and emit consistent merge fields (merged, merged_at, derived state), matching the GitHub path’s semantics.
• Fix run watch --branch on Gitea by resolving the branch head SHA and falling back to head_sha correlation when branch-based correlation yields no runs.
• Update git mocks across test suites to safely delegate unmatched subcommands to real git (avoid PATH-based self-recursion), and add Gitea regression tests for both defects.

File summaries

File	Description
utils/git-cli	Gitea pr show now uses REST detail for reliable merge fields; Gitea run watch gains head-SHA fallback correlation.
tests/session/test-pr-wait.sh	Fix git mock fallback to avoid recursive execution when delegating to real git.
tests/session/test-pr-auto-merge-status.sh	Fix git mock fallback to avoid recursive execution when delegating to real git.
tests/session/test-ci-poll.sh	Fix git mock fallback(s) to avoid recursive execution when delegating to real git.
tests/git-cli/test-run-watch-gitea.sh	Add regression coverage for Gitea run watch head-SHA fallback correlation.
tests/git-cli/test-run-show.sh	Fix git mock fallback to avoid recursive execution when delegating to real git.
tests/git-cli/test-pr-show-gitea.sh	Add regression coverage for Gitea pr show REST merge fields + guard against tea pr list usage.
tests/git-cli/test-pr-create.sh	Fix git mock fallback to avoid recursive execution when delegating to real git.
tests/git-cli/test-issue-write-json.sh	Fix git mock fallback(s) to avoid recursive execution when delegating to real git.
tests/git-cli/test-body-args.sh	Fix git mock fallback to avoid recursive execution when delegating to real git.
plugins-copilot/session/.claude-plugin/plugin.json	Bump session plugin version to ship the vendored git-cli fix.
plugins-copilot/git-tools/.claude-plugin/plugin.json	Bump git-tools plugin version to ship the vendored git-cli fix.
plugins-claude/session/scripts/git-cli	Vendored git-cli copy updated to include the Gitea fixes.
plugins-claude/session/.claude-plugin/plugin.json	Bump session plugin version to ship the vendored git-cli fix.
plugins-claude/git-tools/scripts/git-cli	Vendored git-cli copy updated to include the Gitea fixes.
plugins-claude/git-tools/.claude-plugin/plugin.json	Bump git-tools plugin version to ship the vendored git-cli fix.

Review details

• Files reviewed: 16/16 changed files
• Comments generated: 0
• Review effort level: Lite

---

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.