fix(git): harden Gitea PR metadata lookup

2026-05-22 10:28:09 -05:00
13 changed files with 104 additions and 116 deletions
--- a/docs/scratchpads/mvp-20260312.md
+++ b/docs/scratchpads/mvp-20260312.md
@@ -653,3 +653,9 @@ Independent security review surfaced three high-impact and four medium findings;
 2. After merge, kickoff M3-01 (DTOs) on `feat/federation-m3-types` with sonnet subagent in worktree
 3. Once M3-01 lands, fan out: M3-02 (harness) || M3-03 (AuthGuard) → M3-04 (ScopeService) || M3-08 (FederationClient)
 4. Re-converge at M3-10 (Integration) → M3-11 (E2E)
+
+### Session 24 — 2026-05-22 — Gitea PR metadata wrapper hardening
+
+- Fixed `packages/mosaic/framework/tools/git/pr-metadata.sh` Gitea path to fail closed on non-2xx API responses instead of normalizing API error JSON into null/empty PR metadata.
+- Added token fallback behavior: try explicit `GITEA_TOKEN`, Mosaic credential-loader token, then matching `~/.git-credentials` HTTPS token; this handles stale host-scoped credential-loader entries while preserving existing credential sources.
+- Confirmed real U-Connect Gitea PRs #1905 and #1908 now return `number`, `headRefName`, `baseRefName`, `state`, `author`, `url`, and `mergeable` correctly, restoring `pr-merge.sh` base branch detection.
--- a/packages/mosaic/framework/tools/git/detect-platform.sh
+++ b/packages/mosaic/framework/tools/git/detect-platform.sh
@@ -74,16 +74,6 @@ get_repo_name() {
    echo "${repo_info##*/}"
 }

-get_repo_slug() {
-    get_repo_info
-}
-
-get_gitea_repo_args() {
-    local repo
-    repo=$(get_repo_slug) || return 1
-    printf -- '--repo %q --login %q' "$repo" "${GITEA_LOGIN:-mosaicstack}"
-}
-
 get_remote_host() {
    local remote_url
    remote_url=$(git remote get-url origin 2>/dev/null || true)
--- a/packages/mosaic/framework/tools/git/issue-comment.sh
+++ b/packages/mosaic/framework/tools/git/issue-comment.sh
@@ -53,7 +53,7 @@ if [[ "$PLATFORM" == "github" ]]; then
    gh issue comment "$ISSUE_NUMBER" --body "$COMMENT"
    echo "Added comment to GitHub issue #$ISSUE_NUMBER"
 elif [[ "$PLATFORM" == "gitea" ]]; then
-    tea issue comment "$ISSUE_NUMBER" "$COMMENT" $(get_gitea_repo_args)
+    tea issue comment "$ISSUE_NUMBER" "$COMMENT"
    echo "Added comment to Gitea issue #$ISSUE_NUMBER"
 else
    echo "Error: Unknown platform"
--- a/packages/mosaic/framework/tools/git/issue-create.sh
+++ b/packages/mosaic/framework/tools/git/issue-create.sh
@@ -112,22 +112,20 @@ PLATFORM=$(detect_platform)

 case "$PLATFORM" in
    github)
-        CMD=(gh issue create --title "$TITLE")
-        [[ -n "$BODY" ]] && CMD+=(--body "$BODY")
-        [[ -n "$LABELS" ]] && CMD+=(--label "$LABELS")
-        [[ -n "$MILESTONE" ]] && CMD+=(--milestone "$MILESTONE")
-        "${CMD[@]}"
+        CMD="gh issue create --title \"$TITLE\""
+        [[ -n "$BODY" ]] && CMD="$CMD --body \"$BODY\""
+        [[ -n "$LABELS" ]] && CMD="$CMD --label \"$LABELS\""
+        [[ -n "$MILESTONE" ]] && CMD="$CMD --milestone \"$MILESTONE\""
+        eval "$CMD"
        ;;
    gitea)
        if command -v tea >/dev/null 2>&1; then
-            REPO_SLUG=$(get_repo_slug)
-            REPO_ARGS=(--repo "$REPO_SLUG" --login "${GITEA_LOGIN:-mosaicstack}")
-            CMD=(tea issue create "${REPO_ARGS[@]}" --title "$TITLE")
-            [[ -n "$BODY" ]] && CMD+=(--description "$BODY")
-            [[ -n "$LABELS" ]] && CMD+=(--labels "$LABELS")
+            CMD="tea issue create --title \"$TITLE\""
+            [[ -n "$BODY" ]] && CMD="$CMD --description \"$BODY\""
+            [[ -n "$LABELS" ]] && CMD="$CMD --labels \"$LABELS\""
            # tea accepts milestone by name directly (verified 2026-02-05)
-            [[ -n "$MILESTONE" ]] && CMD+=(--milestone "$MILESTONE")
-            if "${CMD[@]}"; then
+            [[ -n "$MILESTONE" ]] && CMD="$CMD --milestone \"$MILESTONE\""
+            if eval "$CMD"; then
                exit 0
            fi
            echo "Warning: tea issue create failed, trying Gitea API fallback..." >&2
--- a/packages/mosaic/framework/tools/git/issue-list.sh
+++ b/packages/mosaic/framework/tools/git/issue-list.sh
@@ -80,8 +80,7 @@ case "$PLATFORM" in
        eval "$CMD"
        ;;
    gitea)
-        REPO_ARGS=$(get_gitea_repo_args)
-        CMD="tea issues list $REPO_ARGS --state $STATE --limit $LIMIT"
+        CMD="tea issues list --state $STATE --limit $LIMIT"
        [[ -n "$LABEL" ]] && CMD="$CMD --labels \"$LABEL\""
        [[ -n "$MILESTONE" ]] && CMD="$CMD --milestones \"$MILESTONE\""
        # Note: tea may not support assignee filter directly
--- a/packages/mosaic/framework/tools/git/issue-reopen.sh
+++ b/packages/mosaic/framework/tools/git/issue-reopen.sh
@@ -52,9 +52,9 @@ if [[ "$PLATFORM" == "github" ]]; then
    echo "Reopened GitHub issue #$ISSUE_NUMBER"
 elif [[ "$PLATFORM" == "gitea" ]]; then
    if [[ -n "$COMMENT" ]]; then
-        tea issue comment "$ISSUE_NUMBER" "$COMMENT" $(get_gitea_repo_args)
+        tea issue comment "$ISSUE_NUMBER" "$COMMENT"
    fi
-    tea issue reopen "$ISSUE_NUMBER" $(get_gitea_repo_args)
+    tea issue reopen "$ISSUE_NUMBER"
    echo "Reopened Gitea issue #$ISSUE_NUMBER"
 else
    echo "Error: Unknown platform"
--- a/packages/mosaic/framework/tools/git/issue-view.sh
+++ b/packages/mosaic/framework/tools/git/issue-view.sh
@@ -67,7 +67,7 @@ if [[ "$PLATFORM" == "github" ]]; then
    gh issue view "$ISSUE_NUMBER"
 elif [[ "$PLATFORM" == "gitea" ]]; then
    if command -v tea >/dev/null 2>&1; then
-        if tea issue "$ISSUE_NUMBER" $(get_gitea_repo_args); then
+        if tea issue "$ISSUE_NUMBER"; then
            exit 0
        fi
        echo "Warning: tea issue view failed, trying Gitea API fallback..." >&2
--- a/packages/mosaic/framework/tools/git/pr-close.sh
+++ b/packages/mosaic/framework/tools/git/pr-close.sh
@@ -52,9 +52,9 @@ if [[ "$PLATFORM" == "github" ]]; then
    echo "Closed GitHub PR #$PR_NUMBER"
 elif [[ "$PLATFORM" == "gitea" ]]; then
    if [[ -n "$COMMENT" ]]; then
-        tea pr comment "$PR_NUMBER" "$COMMENT" $(get_gitea_repo_args)
+        tea pr comment "$PR_NUMBER" "$COMMENT"
    fi
-    tea pr close "$PR_NUMBER" $(get_gitea_repo_args)
+    tea pr close "$PR_NUMBER"
    echo "Closed Gitea PR #$PR_NUMBER"
 else
    echo "Error: Unknown platform"
--- a/packages/mosaic/framework/tools/git/pr-create.sh
+++ b/packages/mosaic/framework/tools/git/pr-create.sh
@@ -17,51 +17,6 @@ MILESTONE=""
 DRAFT=false
 ISSUE=""

-# get_remote_host, get_gitea_token, get_repo_info, and get_gitea_repo_args are provided by detect-platform.sh
-
-gitea_pr_create_api() {
-    local host repo token url payload
-    host=$(get_remote_host) || {
-        echo "Error: could not determine remote host for API fallback" >&2
-        return 1
-    }
-    repo=$(get_repo_info) || {
-        echo "Error: could not determine repo owner/name for API fallback" >&2
-        return 1
-    }
-    token=$(get_gitea_token "$host") || {
-        echo "Error: Gitea token not found for API fallback (set GITEA_TOKEN or configure ~/.git-credentials)" >&2
-        return 1
-    }
-
-    if [[ -n "$LABELS" || -n "$MILESTONE" || "$DRAFT" == true ]]; then
-        echo "Warning: API fallback applies title/body/head/base only; labels/milestone/draft require authenticated tea setup." >&2
-    fi
-
-    payload=$(TITLE="$TITLE" BODY="$BODY" HEAD_BRANCH="$HEAD_BRANCH" BASE_BRANCH="$BASE_BRANCH" python3 - <<'PY'
-import json
-import os
-
-payload = {
-    "title": os.environ["TITLE"],
-    "head": os.environ["HEAD_BRANCH"],
-    "base": os.environ["BASE_BRANCH"] or "main",
-}
-body = os.environ.get("BODY", "")
-if body:
-    payload["body"] = body
-print(json.dumps(payload))
-PY
-)
-
-    url="https://${host}/api/v1/repos/${repo}/pulls"
-    curl -fsS -X POST \
-      -H "Authorization: token ${token}" \
-      -H "Content-Type: application/json" \
-      -d "$payload" \
-      "$url"
-}
-
 usage() {
    cat <<EOF
 Usage: $(basename "$0") [OPTIONS]
@@ -163,37 +118,33 @@ PLATFORM=$(detect_platform)

 case "$PLATFORM" in
    github)
-        CMD=(gh pr create --title "$TITLE")
-        [[ -n "$BODY" ]] && CMD+=(--body "$BODY")
-        [[ -n "$BASE_BRANCH" ]] && CMD+=(--base "$BASE_BRANCH")
-        [[ -n "$HEAD_BRANCH" ]] && CMD+=(--head "$HEAD_BRANCH")
-        [[ -n "$LABELS" ]] && CMD+=(--label "$LABELS")
-        [[ -n "$MILESTONE" ]] && CMD+=(--milestone "$MILESTONE")
-        [[ "$DRAFT" == true ]] && CMD+=(--draft)
-        "${CMD[@]}"
+        CMD="gh pr create --title \"$TITLE\""
+        [[ -n "$BODY" ]] && CMD="$CMD --body \"$BODY\""
+        [[ -n "$BASE_BRANCH" ]] && CMD="$CMD --base \"$BASE_BRANCH\""
+        [[ -n "$HEAD_BRANCH" ]] && CMD="$CMD --head \"$HEAD_BRANCH\""
+        [[ -n "$LABELS" ]] && CMD="$CMD --label \"$LABELS\""
+        [[ -n "$MILESTONE" ]] && CMD="$CMD --milestone \"$MILESTONE\""
+        [[ "$DRAFT" == true ]] && CMD="$CMD --draft"
+        eval "$CMD"
        ;;
    gitea)
-        # tea pull create syntax. Always pass --repo because tea repo inference
-        # is unreliable in Mosaic worktrees/profile shells. Use arrays instead
-        # of eval so markdown backticks/body content are not shell-executed.
-        REPO_SLUG=$(get_repo_slug)
-        REPO_ARGS=(--repo "$REPO_SLUG" --login "${GITEA_LOGIN:-mosaicstack}")
-        CMD=(tea pr create "${REPO_ARGS[@]}" --title "$TITLE")
-        [[ -n "$BODY" ]] && CMD+=(--description "$BODY")
-        [[ -n "$BASE_BRANCH" ]] && CMD+=(--base "$BASE_BRANCH")
-        [[ -n "$HEAD_BRANCH" ]] && CMD+=(--head "$HEAD_BRANCH")
+        # tea pull create syntax
+        CMD="tea pr create --title \"$TITLE\""
+        [[ -n "$BODY" ]] && CMD="$CMD --description \"$BODY\""
+        [[ -n "$BASE_BRANCH" ]] && CMD="$CMD --base \"$BASE_BRANCH\""
+        [[ -n "$HEAD_BRANCH" ]] && CMD="$CMD --head \"$HEAD_BRANCH\""

        # Handle labels for tea
        if [[ -n "$LABELS" ]]; then
            # tea may use --labels flag
-            CMD+=(--labels "$LABELS")
+            CMD="$CMD --labels \"$LABELS\""
        fi

        # Handle milestone for tea
        if [[ -n "$MILESTONE" ]]; then
-            MILESTONE_ID=$(tea milestones list "${REPO_ARGS[@]}" 2>/dev/null | grep -E "^\s*[0-9]+" | grep "$MILESTONE" | awk '{print $1}' | head -1)
+            MILESTONE_ID=$(tea milestones list 2>/dev/null | grep -E "^\s*[0-9]+" | grep "$MILESTONE" | awk '{print $1}' | head -1)
            if [[ -n "$MILESTONE_ID" ]]; then
-                CMD+=(--milestone "$MILESTONE_ID")
+                CMD="$CMD --milestone $MILESTONE_ID"
            else
                echo "Warning: Could not find milestone '$MILESTONE', creating without milestone" >&2
            fi
@@ -204,11 +155,7 @@ case "$PLATFORM" in
            echo "Note: Draft PR may not be supported by your tea version" >&2
        fi

-        if "${CMD[@]}"; then
-            exit 0
-        fi
-        echo "Warning: tea pr create failed, trying Gitea API fallback..." >&2
-        gitea_pr_create_api
+        eval "$CMD"
        ;;
    *)
        echo "Error: Could not detect git platform" >&2
--- a/packages/mosaic/framework/tools/git/pr-list.sh
+++ b/packages/mosaic/framework/tools/git/pr-list.sh
@@ -74,8 +74,7 @@ case "$PLATFORM" in
        ;;
    gitea)
        # tea pr list - note: tea uses 'pulls' subcommand in some versions
-        REPO_ARGS=$(get_gitea_repo_args)
-        CMD="tea pr list $REPO_ARGS --state $STATE --limit $LIMIT"
+        CMD="tea pr list --state $STATE --limit $LIMIT"

        # tea filtering may be limited
        if [[ -n "$LABEL" ]]; then
--- a/packages/mosaic/framework/tools/git/pr-metadata.sh
+++ b/packages/mosaic/framework/tools/git/pr-metadata.sh
@@ -69,32 +69,81 @@ elif [[ "$PLATFORM" == "gitea" ]]; then

    API_URL="https://${HOST}/api/v1/repos/${OWNER}/${REPO}/pulls/${PR_NUMBER}"

-    GITEA_API_TOKEN=$(get_gitea_token "$HOST" || true)
+    declare -a TOKEN_CANDIDATES=()
+    add_token_candidate() {
+        local candidate="$1"
+        [[ -z "$candidate" ]] && return 0
+        local existing
+        for existing in "${TOKEN_CANDIDATES[@]:-}"; do
+            [[ "$existing" == "$candidate" ]] && return 0
+        done
+        TOKEN_CANDIDATES+=("$candidate")
+    }

-    if [[ -n "$GITEA_API_TOKEN" ]]; then
-        RAW=$(curl -sS -H "Authorization: token $GITEA_API_TOKEN" "$API_URL")
-    else
-        RAW=$(curl -sS "$API_URL")
+    add_token_candidate "${GITEA_TOKEN:-}"
+    add_token_candidate "$(get_gitea_token "$HOST" || true)"
+
+    # Git HTTPS credentials often contain a valid Gitea API token even when a
+    # Mosaic credential-source entry is stale. Try them as a fallback before
+    # falling back to an unauthenticated request.
+    CREDS_FILE="$HOME/.git-credentials"
+    if [[ -f "$CREDS_FILE" ]]; then
+        while IFS= read -r credential_token; do
+            add_token_candidate "$credential_token"
+        done < <(grep -F "$HOST" "$CREDS_FILE" 2>/dev/null | sed -n 's#https\?://[^@]*:\([^@/]*\)@.*#\1#p')
+    fi
+
+    RAW=""
+    HTTP_STATUS=""
+    if [[ ${#TOKEN_CANDIDATES[@]} -gt 0 ]]; then
+        for GITEA_API_TOKEN in "${TOKEN_CANDIDATES[@]}"; do
+            RESPONSE_FILE=$(mktemp)
+            HTTP_STATUS=$(curl -sS -o "$RESPONSE_FILE" -w '%{http_code}' -H "Authorization: token $GITEA_API_TOKEN" "$API_URL" || true)
+            RAW=$(cat "$RESPONSE_FILE")
+            rm -f "$RESPONSE_FILE"
+            [[ "$HTTP_STATUS" =~ ^2 ]] && break
+        done
+    fi
+
+    if [[ ! "$HTTP_STATUS" =~ ^2 ]]; then
+        RESPONSE_FILE=$(mktemp)
+        HTTP_STATUS=$(curl -sS -o "$RESPONSE_FILE" -w '%{http_code}' "$API_URL" || true)
+        RAW=$(cat "$RESPONSE_FILE")
+        rm -f "$RESPONSE_FILE"
+    fi
+
+    if [[ ! "$HTTP_STATUS" =~ ^2 ]]; then
+        ERROR_MESSAGE=$(printf '%s' "$RAW" | python3 -c 'import json, sys
+try:
+    data=json.load(sys.stdin)
+except Exception:
+    data={}
+print(data.get("message") or data.get("error") or "unknown error")')
+        echo "Error: failed to fetch Gitea PR #$PR_NUMBER from $HOST/$OWNER/$REPO (HTTP $HTTP_STATUS): $ERROR_MESSAGE" >&2
+        exit 1
    fi

    # Normalize Gitea response to match our expected schema
    METADATA=$(echo "$RAW" | python3 -c "
 import json, sys
 data = json.load(sys.stdin)
+head = data.get('head') or {}
+base = data.get('base') or {}
+user = data.get('user') or {}
 normalized = {
-    'number': data.get('number'),
+    'number': data.get('number') or data.get('index'),
    'title': data.get('title'),
    'body': data.get('body', ''),
    'state': data.get('state'),
-    'author': data.get('user', {}).get('login', ''),
-    'headRefName': data.get('head', {}).get('ref', ''),
-    'baseRefName': data.get('base', {}).get('ref', ''),
+    'author': user.get('login', ''),
+    'headRefName': head.get('ref') or head.get('label', '').split(':')[-1],
+    'baseRefName': base.get('ref') or base.get('label', '').split(':')[-1],
    'labels': [l.get('name', '') for l in data.get('labels', [])],
    'assignees': [a.get('login', '') for a in data.get('assignees', [])],
    'milestone': data.get('milestone', {}).get('title', '') if data.get('milestone') else '',
    'createdAt': data.get('created_at', ''),
    'updatedAt': data.get('updated_at', ''),
-    'url': data.get('html_url', ''),
+    'url': data.get('html_url') or data.get('url', ''),
    'isDraft': data.get('draft', False),
    'mergeable': data.get('mergeable'),
    'diffUrl': data.get('diff_url', ''),
--- a/packages/mosaic/framework/tools/git/pr-review.sh
+++ b/packages/mosaic/framework/tools/git/pr-review.sh
@@ -85,7 +85,7 @@ if [[ "$PLATFORM" == "github" ]]; then
 elif [[ "$PLATFORM" == "gitea" ]]; then
    case $ACTION in
        approve)
-            tea pr approve "$PR_NUMBER" $(get_gitea_repo_args) ${COMMENT:+--comment "$COMMENT"}
+            tea pr approve "$PR_NUMBER" ${COMMENT:+--comment "$COMMENT"}
            echo "Approved Gitea PR #$PR_NUMBER"
            ;;
        request-changes)
@@ -93,7 +93,7 @@ elif [[ "$PLATFORM" == "gitea" ]]; then
                echo "Error: Comment required for request-changes"
                exit 1
            fi
-            tea pr reject "$PR_NUMBER" $(get_gitea_repo_args) --comment "$COMMENT"
+            tea pr reject "$PR_NUMBER" --comment "$COMMENT"
            echo "Requested changes on Gitea PR #$PR_NUMBER"
            ;;
        comment)
@@ -101,7 +101,7 @@ elif [[ "$PLATFORM" == "gitea" ]]; then
                echo "Error: Comment required"
                exit 1
            fi
-            tea pr comment "$PR_NUMBER" "$COMMENT" $(get_gitea_repo_args)
+            tea pr comment "$PR_NUMBER" "$COMMENT"
            echo "Added comment to Gitea PR #$PR_NUMBER"
            ;;
        *)
--- a/packages/mosaic/framework/tools/git/pr-view.sh
+++ b/packages/mosaic/framework/tools/git/pr-view.sh
@@ -41,7 +41,7 @@ detect_platform
 if [[ "$PLATFORM" == "github" ]]; then
    gh pr view "$PR_NUMBER"
 elif [[ "$PLATFORM" == "gitea" ]]; then
-    tea pr "$PR_NUMBER" $(get_gitea_repo_args)
+    tea pr "$PR_NUMBER"
 else
    echo "Error: Unknown platform"
    exit 1