fix(mosaic-tools): pass explicit Gitea repo args

2026-05-26 14:31:19 -05:00
17 changed files with 135 additions and 305 deletions
--- a/docs/PRD.md
+++ b/docs/PRD.md
@@ -62,9 +62,8 @@ Jarvis (v0.2.0) is a self-hosted AI assistant with a Python FastAPI backend and
 19. `@mosaicstack/prdy` — PRD wizard
 20. `@mosaicstack/quality-rails` — code quality scaffolder
 21. `@mosaicstack/cli` — unified `mosaic` CLI
-22. Mosaic framework git wrappers — provider-aware issue/PR/CI shell wrappers for GitHub and self-hosted Gitea hosts used by Mosaic/USC repositories
-23. Docker Compose deployment + bare-metal capability
-24. Agent log service — ingest, parse, tier, summarize agent interaction logs
+22. Docker Compose deployment + bare-metal capability
+23. Agent log service — ingest, parse, tier, summarize agent interaction logs

 ### Out of Scope (v0.1.0)

--- a/docs/TASKS.md
+++ b/docs/TASKS.md
@@ -30,7 +30,6 @@ These are MVP-level checks that don't belong to any single workstream. Updated b
 | MVP-T04 | not-started | Sync `.mosaic/orchestrator/mission.json` MVP slot with this manifest (milestone enumeration, etc.)       | Coord state file; consider whether to repopulate via `mosaic coord` or accept hand-edit |
 | MVP-T05 | in-progress | Kick off W1 / FED-M1 — federated tier infrastructure                                                     | Session 16 (2026-04-19): FED-M1-01 in-progress on `feat/federation-m1-tier-config`      |
 | MVP-T06 | not-started | Declare additional workstreams (web dashboard, TUI/CLI parity, remote control, etc.) as scope solidifies | Track each new workstream by adding a row to the Workstream Rollup                      |
-| MVP-T07 | in-progress | Harden Mosaic framework Gitea PR metadata and merge preflight wrappers                                   | Internal ref `t_a292e96f`; source branch `fix/gitea-pr-metadata-login-t-a292e96f`       |

 ## Pointer to Active Workstream

--- a/docs/scratchpads/t_a292e96f-gitea-pr-wrapper.md
+++ b/docs/scratchpads/t_a292e96f-gitea-pr-wrapper.md
@@ -1,48 +0,0 @@
-# t_a292e96f — Gitea PR metadata and merge wrapper fix
-
-## Objective
-
-Fix Mosaic git wrappers so Gitea repositories on `git.uscllc.com` resolve PR metadata and merge preflight through the correct host credentials, without selecting the stale `mosaicstack` Tea login.
-
-## Acceptance criteria
-
- `pr-metadata.sh` returns `baseRefName=main` for U-Connect PR #1905 and PR #1908.
- `pr-metadata.sh` returns source-branch-style `headRefName`; for Gitea `refs/pull/<n>/head` responses, normalize to `head.label`.
- `pr-merge.sh` preserves Mosaic squash-only and base-branch policy, then uses host-matched Gitea API credentials for Gitea merges instead of a hard-coded Tea login.
- Add regression coverage/harness for Gitea metadata normalization and merge preflight.
- Do not print, log, or commit tokens.
-
-## Plan
-
-1. Reproduce current live metadata/login context with sanitized output.
-2. Patch repo-source shell wrappers under `packages/mosaic/framework/tools/git/`.
-3. Add a hermetic shell regression harness with fake `git`, `curl`, and `tea`.
-4. Validate with `bash -n`, shellcheck if available, regression harness, and live sanitized U-Connect wrapper calls.
-5. Apply the same script changes to the installed Mosaic wrapper location only after source changes validate, so active U-Connect merge wrappers are unblocked while the PR is reviewed.
-6. Commit, push through queue guard, open PR, and hand off to Ultron review task `t_848435ab`; do not merge.
-
-## Progress
-
- Live sanitized metadata check before source patch:
-  - PR #1905: `baseRefName=main`, `headRefName=edith/t_39ce717c-authentik-smoke-gate`.
-  - PR #1908: `baseRefName=main`, `headRefName=refs/pull/1908/head`; raw Gitea `head.label` is `fix/t_23fa9e1d-portal-health-backend`.
-  - `tea login list` contains only `git.mosaicstack.dev`, so the prior `--login mosaicstack` default cannot work for `git.uscllc.com`.
-
-## Verification log
-
- `bash -n packages/mosaic/framework/tools/git/detect-platform.sh packages/mosaic/framework/tools/git/pr-metadata.sh packages/mosaic/framework/tools/git/pr-merge.sh packages/mosaic/framework/tools/git/tests/pr-gitea-wrapper-regression.sh` — pass.
- `shellcheck packages/mosaic/framework/tools/git/detect-platform.sh packages/mosaic/framework/tools/git/pr-metadata.sh packages/mosaic/framework/tools/git/pr-merge.sh packages/mosaic/framework/tools/git/tests/pr-gitea-wrapper-regression.sh` — pass when available in the Kanban runtime.
- `TMPDIR="$PWD/.agent-tmp" bash packages/mosaic/framework/tools/git/tests/pr-gitea-wrapper-regression.sh` — pass; proves host-matched Gitea credential selection, metadata normalization, and merge dry-run preflight without invoking `tea`.
- Live sanitized U-Connect metadata using the patched wrapper from `/src/uconnect`:
-  - PR #1905: `number=1905`, `baseRefName=main`, `headRefName=edith/t_39ce717c-authentik-smoke-gate`, `state=open`.
-  - PR #1908: `number=1908`, `baseRefName=main`, `headRefName=fix/t_23fa9e1d-portal-health-backend`, `state=closed`.
- Live sanitized U-Connect merge preflight using `pr-merge.sh --skip-queue-guard --dry-run`:
-  - PR #1905: `Dry run: Gitea merge preflight OK for USC/uconnect#1905 targeting main via git.uscllc.com API`.
-  - PR #1908: `Dry run: Gitea merge preflight OK for USC/uconnect#1908 targeting main via git.uscllc.com API`.
- Installed wrapper parity: `/home/hermes/.config/mosaic/tools/git/{detect-platform.sh,pr-metadata.sh,pr-merge.sh}` byte-match the PR source copies after validation, so active U-Connect wrapper invocations use the same fix while source PR review runs.
-
-## Risks / notes
-
- `--dry-run` was added to `pr-merge.sh` to validate metadata/auth/preflight without merging a live PR.
- Gitea branch deletion after merge remains a documented warning, matching prior behavior, and is not expanded in this fix.
- Duplicate recovery PR #517 was closed after wrapper-first `pr-close.sh -n 517` failed headlessly with `/dev/tty`; PR #518 is the review target.
--- a/packages/mosaic/framework/tools/git/detect-platform.sh
+++ b/packages/mosaic/framework/tools/git/detect-platform.sh
@@ -74,6 +74,16 @@ 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)
@@ -92,7 +102,7 @@ get_remote_host() {
 }

 # Resolve a Gitea API token for the given host.
-# Priority: Mosaic credential loader → host-matched GITEA_TOKEN env → ~/.git-credentials
+# Priority: Mosaic credential loader → GITEA_TOKEN env → ~/.git-credentials
 get_gitea_token() {
    local host="$1"
    local script_dir
@@ -103,28 +113,16 @@ get_gitea_token() {
    if [[ -f "$cred_loader" ]]; then
        local token
        token=$(
-            # shellcheck source=/dev/null
            source "$cred_loader"
-            # Host-specific wrapper resolution must not inherit a caller/global GITEA_TOKEN.
-            # load_credentials intentionally preserves existing env vars for interactive use,
-            # but merge/metadata wrappers need the token matching the remote host.
-            unset GITEA_TOKEN GITEA_URL
            case "$host" in
                git.mosaicstack.dev) load_credentials gitea-mosaicstack 2>/dev/null ;;
                git.uscllc.com)      load_credentials gitea-usc 2>/dev/null ;;
                *)
-                    local matched=false
                    for svc in gitea-mosaicstack gitea-usc; do
-                        unset GITEA_TOKEN GITEA_URL
                        load_credentials "$svc" 2>/dev/null || continue
-                        if [[ "${GITEA_URL:-}" == "https://$host" || "${GITEA_URL:-}" == "http://$host" || "${GITEA_URL:-}" == *"//$host" ]]; then
-                            matched=true
-                            break
-                        fi
-                    done
-                    if [[ "$matched" != true ]]; then
+                        [[ "${GITEA_URL:-}" == *"$host"* ]] && break
                        unset GITEA_TOKEN GITEA_URL
-                    fi
+                    done
                    ;;
            esac
            echo "${GITEA_TOKEN:-}"
@@ -135,12 +133,10 @@ get_gitea_token() {
        fi
    fi

-    # 2. GITEA_TOKEN env var (only when GITEA_URL, if present, matches the remote host)
+    # 2. GITEA_TOKEN env var (may be set by caller)
    if [[ -n "${GITEA_TOKEN:-}" ]]; then
-        if [[ -z "${GITEA_URL:-}" || "${GITEA_URL:-}" == "https://$host" || "${GITEA_URL:-}" == "http://$host" || "${GITEA_URL:-}" == *"//$host" ]]; then
-            echo "$GITEA_TOKEN"
-            return 0
-        fi
+        echo "$GITEA_TOKEN"
+        return 0
    fi

    # 3. ~/.git-credentials file
--- 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"
+    tea issue comment "$ISSUE_NUMBER" "$COMMENT" $(get_gitea_repo_args)
    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,20 +112,22 @@ PLATFORM=$(detect_platform)

 case "$PLATFORM" in
    github)
-        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"
+        CMD=(gh issue create --title "$TITLE")
+        [[ -n "$BODY" ]] && CMD+=(--body "$BODY")
+        [[ -n "$LABELS" ]] && CMD+=(--label "$LABELS")
+        [[ -n "$MILESTONE" ]] && CMD+=(--milestone "$MILESTONE")
+        "${CMD[@]}"
        ;;
    gitea)
        if command -v tea >/dev/null 2>&1; then
-            CMD="tea issue create --title \"$TITLE\""
-            [[ -n "$BODY" ]] && CMD="$CMD --description \"$BODY\""
-            [[ -n "$LABELS" ]] && CMD="$CMD --labels \"$LABELS\""
+            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")
            # tea accepts milestone by name directly (verified 2026-02-05)
-            [[ -n "$MILESTONE" ]] && CMD="$CMD --milestone \"$MILESTONE\""
-            if eval "$CMD"; then
+            [[ -n "$MILESTONE" ]] && CMD+=(--milestone "$MILESTONE")
+            if "${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,7 +80,8 @@ case "$PLATFORM" in
        eval "$CMD"
        ;;
    gitea)
-        CMD="tea issues list --state $STATE --limit $LIMIT"
+        REPO_ARGS=$(get_gitea_repo_args)
+        CMD="tea issues list $REPO_ARGS --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"
+        tea issue comment "$ISSUE_NUMBER" "$COMMENT" $(get_gitea_repo_args)
    fi
-    tea issue reopen "$ISSUE_NUMBER"
+    tea issue reopen "$ISSUE_NUMBER" $(get_gitea_repo_args)
    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"; then
+        if tea issue "$ISSUE_NUMBER" $(get_gitea_repo_args); 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"
+        tea pr comment "$PR_NUMBER" "$COMMENT" $(get_gitea_repo_args)
    fi
-    tea pr close "$PR_NUMBER"
+    tea pr close "$PR_NUMBER" $(get_gitea_repo_args)
    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,6 +17,51 @@ 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]
@@ -118,33 +163,37 @@ PLATFORM=$(detect_platform)

 case "$PLATFORM" in
    github)
-        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"
+        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[@]}"
        ;;
    gitea)
-        # 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\""
+        # 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")

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

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

-        eval "$CMD"
+        if "${CMD[@]}"; then
+            exit 0
+        fi
+        echo "Warning: tea pr create failed, trying Gitea API fallback..." >&2
+        gitea_pr_create_api
        ;;
    *)
        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,7 +74,8 @@ case "$PLATFORM" in
        ;;
    gitea)
        # tea pr list - note: tea uses 'pulls' subcommand in some versions
-        CMD="tea pr list --state $STATE --limit $LIMIT"
+        REPO_ARGS=$(get_gitea_repo_args)
+        CMD="tea pr list $REPO_ARGS --state $STATE --limit $LIMIT"

        # tea filtering may be limited
        if [[ -n "$LABEL" ]]; then
--- a/packages/mosaic/framework/tools/git/pr-merge.sh
+++ b/packages/mosaic/framework/tools/git/pr-merge.sh
@@ -1,11 +1,10 @@
 #!/bin/bash
 # pr-merge.sh - Merge pull requests on Gitea or GitHub
-# Usage: pr-merge.sh -n PR_NUMBER [-m squash] [-d] [--skip-queue-guard] [--dry-run]
+# Usage: pr-merge.sh -n PR_NUMBER [-m squash] [-d] [--skip-queue-guard]

 set -e

 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck disable=SC1091
 source "$SCRIPT_DIR/detect-platform.sh"

 # Default values
@@ -13,7 +12,6 @@ PR_NUMBER=""
 MERGE_METHOD="squash"
 DELETE_BRANCH=false
 SKIP_QUEUE_GUARD=false
-DRY_RUN=false

 usage() {
    cat <<EOF
@@ -26,7 +24,6 @@ Options:
    -m, --method METHOD     Merge method: squash only (default: squash)
    -d, --delete-branch     Delete the head branch after merge
        --skip-queue-guard  Skip CI queue guard wait before merge
-        --dry-run           Validate metadata/auth/preflight without merging
    -h, --help              Show this help message

 Examples:
@@ -57,10 +54,6 @@ while [[ $# -gt 0 ]]; do
            SKIP_QUEUE_GUARD=true
            shift
            ;;
-        --dry-run)
-            DRY_RUN=true
-            shift
-            ;;
        -h|--help)
            usage
            ;;
@@ -81,8 +74,7 @@ if [[ "$MERGE_METHOD" != "squash" ]]; then
    exit 1
 fi

-METADATA_JSON="$("$SCRIPT_DIR/pr-metadata.sh" -n "$PR_NUMBER")"
-BASE_BRANCH="$(printf '%s' "$METADATA_JSON" | python3 -c 'import json, sys; print((json.load(sys.stdin).get("baseRefName") or "").strip())')"
+BASE_BRANCH="$("$SCRIPT_DIR/pr-metadata.sh" -n "$PR_NUMBER" | python3 -c 'import json, sys; print((json.load(sys.stdin).get("baseRefName") or "").strip())')"
 if [[ "$BASE_BRANCH" != "main" ]]; then
    echo "Error: Mosaic policy allows merges only for PRs targeting 'main' (found '$BASE_BRANCH')." >&2
    exit 1
@@ -102,55 +94,19 @@ REPO=$(get_repo_name)

 case "$PLATFORM" in
    github)
-        if [[ "$DRY_RUN" == true ]]; then
-            echo "Dry run: GitHub merge preflight OK for ${OWNER}/${REPO}#${PR_NUMBER} targeting ${BASE_BRANCH}"
-            exit 0
-        fi
-        CMD=(gh pr merge "$PR_NUMBER" --squash)
-        [[ "$DELETE_BRANCH" == true ]] && CMD+=(--delete-branch)
-        "${CMD[@]}"
+        CMD="gh pr merge $PR_NUMBER --squash"
+        [[ "$DELETE_BRANCH" == true ]] && CMD="$CMD --delete-branch"
+        eval "$CMD"
        ;;
    gitea)
-        HOST=$(get_remote_host) || {
-            echo "Error: Cannot determine host from remote URL" >&2
-            exit 1
-        }
-        TOKEN=$(get_gitea_token "$HOST") || {
-            echo "Error: Could not resolve Gitea API token for ${HOST}" >&2
-            exit 1
-        }
-
-        if [[ "$DRY_RUN" == true ]]; then
-            echo "Dry run: Gitea merge preflight OK for ${OWNER}/${REPO}#${PR_NUMBER} targeting ${BASE_BRANCH} via ${HOST} API"
-            exit 0
-        fi
-
-        RESPONSE_FILE=$(mktemp)
-        trap 'rm -f "$RESPONSE_FILE"' EXIT
-        HTTP_CODE=$(curl -sS \
-            -X POST \
-            -H "Authorization: token $TOKEN" \
-            -H "Content-Type: application/json" \
-            -d '{"Do":"squash"}' \
-            -o "$RESPONSE_FILE" \
-            -w '%{http_code}' \
-            "https://${HOST}/api/v1/repos/${OWNER}/${REPO}/pulls/${PR_NUMBER}/merge")
-        RESPONSE_BODY=$(cat "$RESPONSE_FILE")
-        rm -f "$RESPONSE_FILE"
-        trap - EXIT
-
-        if [[ ! "$HTTP_CODE" =~ ^2 ]]; then
-            echo "Error: Gitea PR merge failed for ${OWNER}/${REPO}#${PR_NUMBER} (HTTP ${HTTP_CODE})" >&2
-            if [[ -n "$RESPONSE_BODY" ]]; then
-                printf '%s\n' "$RESPONSE_BODY" >&2
-            fi
-            exit 1
-        fi
+        CMD="tea pr merge $PR_NUMBER --style squash --repo $OWNER/$REPO --login ${GITEA_LOGIN:-mosaicstack}"

        # Delete branch after merge if requested
        if [[ "$DELETE_BRANCH" == true ]]; then
-            echo "Note: Branch deletion after merge may need to be done separately with the Gitea API" >&2
+            echo "Note: Branch deletion after merge may need to be done separately with tea" >&2
        fi
+
+        eval "$CMD"
        ;;
    *)
        echo "Error: Could not detect git platform" >&2
--- a/packages/mosaic/framework/tools/git/pr-metadata.sh
+++ b/packages/mosaic/framework/tools/git/pr-metadata.sh
@@ -5,7 +5,6 @@
 set -e

 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck disable=SC1091
 source "$SCRIPT_DIR/detect-platform.sh"

 # Parse arguments
@@ -56,51 +55,39 @@ if [[ "$PLATFORM" == "github" ]]; then
 elif [[ "$PLATFORM" == "gitea" ]]; then
    OWNER=$(get_repo_owner)
    REPO=$(get_repo_name)
-    HOST=$(get_remote_host) || {
+    REMOTE_URL=$(git remote get-url origin 2>/dev/null)
+
+    # Extract host from remote URL
+    if [[ "$REMOTE_URL" == https://* ]]; then
+        HOST=$(echo "$REMOTE_URL" | sed -E 's|https://([^/]+)/.*|\1|')
+    elif [[ "$REMOTE_URL" == git@* ]]; then
+        HOST=$(echo "$REMOTE_URL" | sed -E 's|git@([^:]+):.*|\1|')
+    else
        echo "Error: Cannot determine host from remote URL" >&2
        exit 1
-    }
+    fi

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

    GITEA_API_TOKEN=$(get_gitea_token "$HOST" || true)

-    RESPONSE_FILE=$(mktemp)
-    trap 'rm -f "$RESPONSE_FILE"' EXIT
    if [[ -n "$GITEA_API_TOKEN" ]]; then
-        HTTP_CODE=$(curl -sS -H "Authorization: token $GITEA_API_TOKEN" -o "$RESPONSE_FILE" -w '%{http_code}' "$API_URL")
+        RAW=$(curl -sS -H "Authorization: token $GITEA_API_TOKEN" "$API_URL")
    else
-        HTTP_CODE=$(curl -sS -o "$RESPONSE_FILE" -w '%{http_code}' "$API_URL")
-    fi
-    RAW=$(cat "$RESPONSE_FILE")
-    rm -f "$RESPONSE_FILE"
-    trap - EXIT
-
-    if [[ ! "$HTTP_CODE" =~ ^2 ]]; then
-        echo "Error: Gitea PR metadata request failed for ${OWNER}/${REPO}#${PR_NUMBER} (HTTP ${HTTP_CODE})" >&2
-        exit 1
+        RAW=$(curl -sS "$API_URL")
    fi

    # Normalize Gitea response to match our expected schema
    METADATA=$(echo "$RAW" | python3 -c "
 import json, sys
 data = json.load(sys.stdin)
-if 'message' in data and not data.get('number'):
-    raise SystemExit('Error: Gitea PR metadata response did not contain PR data')
-head = data.get('head') or {}
-head_ref = head.get('ref') or ''
-head_label = head.get('label') or ''
-# Gitea can report closed/merged PR heads as refs/pull/<n>/head; callers need
-# the source branch name equivalent to GitHub headRefName, so prefer label then.
-if head_ref.startswith('refs/pull/') and head_label:
-    head_ref = head_label
 normalized = {
    'number': data.get('number'),
    'title': data.get('title'),
    'body': data.get('body', ''),
    'state': data.get('state'),
    'author': data.get('user', {}).get('login', ''),
-    'headRefName': head_ref,
+    'headRefName': data.get('head', {}).get('ref', ''),
    'baseRefName': data.get('base', {}).get('ref', ''),
    'labels': [l.get('name', '') for l in data.get('labels', [])],
    'assignees': [a.get('login', '') for a in data.get('assignees', [])],
--- 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" ${COMMENT:+--comment "$COMMENT"}
+            tea pr approve "$PR_NUMBER" $(get_gitea_repo_args) ${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" --comment "$COMMENT"
+            tea pr reject "$PR_NUMBER" $(get_gitea_repo_args) --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"
+            tea pr comment "$PR_NUMBER" "$COMMENT" $(get_gitea_repo_args)
            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"
+    tea pr "$PR_NUMBER" $(get_gitea_repo_args)
 else
    echo "Error: Unknown platform"
    exit 1
--- a/packages/mosaic/framework/tools/git/tests/pr-gitea-wrapper-regression.sh
+++ b/packages/mosaic/framework/tools/git/tests/pr-gitea-wrapper-regression.sh
@@ -1,116 +0,0 @@
-#!/usr/bin/env bash
-# Regression harness for Gitea PR metadata normalization and merge preflight.
-
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-GIT_TOOLS_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
-TEST_ROOT="${TEST_ROOT:-$(pwd)/.test-output/pr-gitea-wrapper-regression}"
-FAKE_BIN="$TEST_ROOT/bin"
-FAKE_REPO="$TEST_ROOT/repo"
-
-rm -rf "$TEST_ROOT"
-mkdir -p "$FAKE_BIN" "$FAKE_REPO" "$TEST_ROOT/state"
-
-cat > "$FAKE_BIN/git" <<'SH'
-#!/usr/bin/env bash
-set -euo pipefail
-if [[ "$*" == "remote get-url origin" ]]; then
-  echo "https://git.uscllc.com/usc/uconnect.git"
-  exit 0
-fi
-echo "unexpected git invocation: $*" >&2
-exit 2
-SH
-chmod +x "$FAKE_BIN/git"
-
-cat > "$FAKE_BIN/curl" <<'SH'
-#!/usr/bin/env bash
-set -euo pipefail
-method="GET"
-out_file=""
-write_format=""
-url=""
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    -X)
-      method="$2"; shift 2 ;;
-    -o)
-      out_file="$2"; shift 2 ;;
-    -w)
-      write_format="$2"; shift 2 ;;
-    -H|-d)
-      shift 2 ;;
-    -s|-S|-f|-k|-sS|-fsS)
-      shift ;;
-    http*)
-      url="$1"; shift ;;
-    *)
-      shift ;;
-  esac
-done
-
-body='{}'
-code="200"
-if [[ "$method" == "GET" && "$url" == *"/api/v1/repos/usc/uconnect/pulls/1908" ]]; then
-  body='{"number":1908,"title":"Test PR","body":"","state":"open","user":{"login":"edith"},"head":{"label":"fix/t_23fa9e1d-portal-health-backend","ref":"refs/pull/1908/head","sha":"abc123"},"base":{"label":"main","ref":"main","sha":"def456"},"labels":[],"assignees":[],"created_at":"2026-05-22T00:00:00Z","updated_at":"2026-05-22T00:00:00Z","html_url":"https://git.uscllc.com/usc/uconnect/pulls/1908","draft":false,"mergeable":true,"diff_url":"https://git.uscllc.com/usc/uconnect/pulls/1908.diff"}'
-elif [[ "$method" == "POST" && "$url" == *"/api/v1/repos/usc/uconnect/pulls/1908/merge" ]]; then
-  echo "$url" > "${TEST_ROOT:?}/state/merge-url"
-  body='{"merged":true}'
-else
-  code="404"
-  body='{"message":"not found"}'
-fi
-
-if [[ -n "$out_file" ]]; then
-  printf '%s' "$body" > "$out_file"
-else
-  printf '%s' "$body"
-fi
-if [[ -n "$write_format" ]]; then
-  printf '%s' "$code"
-fi
-SH
-chmod +x "$FAKE_BIN/curl"
-
-cat > "$FAKE_BIN/tea" <<'SH'
-#!/usr/bin/env bash
-echo "tea must not be invoked by Gitea merge preflight" >&2
-exit 99
-SH
-chmod +x "$FAKE_BIN/tea"
-
-cat > "$TEST_ROOT/credentials.json" <<'JSON'
-{
-  "gitea": {
-    "usc": {"url": "https://git.uscllc.com", "token": "fake-token-usc"},
-    "mosaicstack": {"url": "https://git.mosaicstack.dev", "token": "fake-token-mosaic"}
-  }
-}
-JSON
-
-export PATH="$FAKE_BIN:$PATH"
-export TEST_ROOT
-export MOSAIC_CREDENTIALS_FILE="$TEST_ROOT/credentials.json"
-cd "$FAKE_REPO"
-
-metadata="$("$GIT_TOOLS_DIR/pr-metadata.sh" -n 1908)"
-python3 - "$metadata" <<'PY'
-import json
-import sys
-metadata = json.loads(sys.argv[1])
-assert metadata["baseRefName"] == "main", metadata
-assert metadata["headRefName"] == "fix/t_23fa9e1d-portal-health-backend", metadata
-PY
-
-merge_output="$("$GIT_TOOLS_DIR/pr-merge.sh" -n 1908 -m squash --skip-queue-guard --dry-run 2>&1)"
-if grep -q "mosaicstack\|Login name\|tea must not" <<<"$merge_output"; then
-  echo "$merge_output" >&2
-  exit 1
-fi
-if ! grep -q "Dry run: Gitea merge preflight OK" <<<"$merge_output"; then
-  echo "$merge_output" >&2
-  exit 1
-fi
-
-printf 'Gitea PR metadata and merge preflight regression passed\n'