fix(git): select USC Gitea login for PR merges (#516)

packages/mosaic/framework/defaults/TOOLS.md

@@ -9,7 +9,7 @@ All tool suites are located at `~/.config/mosaic/tools/`.
 
 ### Git Wrappers (Use First)
 
-Mosaic wrappers at `~/.config/mosaic/tools/git/*.sh` handle platform detection and edge cases. Always use these before raw CLI commands.
+Mosaic wrappers at `~/.config/mosaic/tools/git/*.sh` handle platform detection and edge cases. Always use these before raw CLI commands. For self-hosted Gitea, the shared credential helper selects API credentials by remote host (`git.mosaicstack.dev` → `gitea-mosaicstack`, `git.uscllc.com` → `gitea-usc`), and the PR merge wrapper selects the matching tea login (`git.mosaicstack.dev` → `mosaicstack`, `git.uscllc.com` → `usc`) unless `GITEA_LOGIN` is explicitly set to a safe tea login override.
 
 ```bash
 # Issues

packages/mosaic/framework/tools/git/detect-platform.sh

@@ -91,6 +91,31 @@ get_remote_host() {
     return 1
 }
 
+# Resolve the tea login name for the given Gitea host.
+# Priority: explicit caller override → known Mosaic host mapping → no forced login.
+get_gitea_login() {
+    local host="$1"
+
+    if [[ -n "${GITEA_LOGIN:-}" ]]; then
+        echo "$GITEA_LOGIN"
+        return 0
+    fi
+
+    case "$host" in
+        git.mosaicstack.dev)
+            echo "mosaicstack"
+            return 0
+            ;;
+        git.uscllc.com)
+            echo "usc"
+            return 0
+            ;;
+        *)
+            return 1
+            ;;
+    esac
+}
+
 # Resolve a Gitea API token for the given host.
 # Priority: Mosaic credential loader → GITEA_TOKEN env → ~/.git-credentials
 get_gitea_token() {
@@ -104,6 +129,10 @@ get_gitea_token() {
         local token
         token=$(
             source "$cred_loader"
+            # load_credentials preserves pre-existing env vars by design. Clear
+            # Gitea env in this subshell so host-specific credential lookup wins
+            # over an ambient token for a different Gitea instance.
+            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 ;;

packages/mosaic/framework/tools/git/pr-merge.sh

@@ -69,6 +69,11 @@ if [[ -z "$PR_NUMBER" ]]; then
     usage
 fi
 
+if [[ ! "$PR_NUMBER" =~ ^[0-9]+$ ]]; then
+    echo "Error: PR number must be numeric." >&2
+    exit 1
+fi
+
 if [[ "$MERGE_METHOD" != "squash" ]]; then
     echo "Error: Mosaic policy enforces squash merge only. Received '$MERGE_METHOD'." >&2
     exit 1
@@ -94,19 +99,31 @@ REPO=$(get_repo_name)
 
 case "$PLATFORM" in
     github)
-        CMD="gh pr merge $PR_NUMBER --squash"
-        [[ "$DELETE_BRANCH" == true ]] && CMD="$CMD --delete-branch"
-        eval "$CMD"
+        CMD=(gh pr merge "$PR_NUMBER" --squash)
+        [[ "$DELETE_BRANCH" == true ]] && CMD+=(--delete-branch)
+        "${CMD[@]}"
         ;;
     gitea)
-        CMD="tea pr merge $PR_NUMBER --style squash --repo $OWNER/$REPO --login ${GITEA_LOGIN:-mosaicstack}"
+        HOST=$(get_remote_host) || {
+            echo "Error: Could not determine remote host." >&2
+            exit 1
+        }
+        CMD=(tea pr merge "$PR_NUMBER" --style squash --repo "$OWNER/$REPO")
+        GITEA_TEA_LOGIN=$(get_gitea_login "$HOST" || true)
+        if [[ -n "$GITEA_TEA_LOGIN" ]]; then
+            if [[ ! "$GITEA_TEA_LOGIN" =~ ^[A-Za-z0-9._-]+$ ]]; then
+                echo "Error: Gitea tea login contains unsupported characters." >&2
+                exit 1
+            fi
+            CMD+=(--login "$GITEA_TEA_LOGIN")
+        fi
 
         # Delete branch after merge if requested
         if [[ "$DELETE_BRANCH" == true ]]; then
             echo "Note: Branch deletion after merge may need to be done separately with tea" >&2
         fi
 
-        eval "$CMD"
+        "${CMD[@]}"
         ;;
     *)
         echo "Error: Could not detect git platform" >&2

packages/mosaic/framework/tools/git/tests/gitea-login-selection.test.sh

@@ -0,0 +1,97 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+source "$SCRIPT_DIR/detect-platform.sh"
+
+fail() {
+  echo "FAIL: $*" >&2
+  exit 1
+}
+
+assert_eq() {
+  local expected="$1"
+  local actual="$2"
+  local message="$3"
+  if [[ "$actual" != "$expected" ]]; then
+    fail "$message: expected '$expected', got '$actual'"
+  fi
+}
+
+unset GITEA_LOGIN || true
+assert_eq "usc" "$(get_gitea_login git.uscllc.com)" "USC Gitea host should select usc tea login"
+assert_eq "mosaicstack" "$(get_gitea_login git.mosaicstack.dev)" "Mosaic Gitea host should select mosaicstack tea login"
+
+GITEA_LOGIN="custom-login"
+export GITEA_LOGIN
+assert_eq "custom-login" "$(get_gitea_login git.uscllc.com)" "Explicit GITEA_LOGIN should override host default"
+
+unset GITEA_LOGIN || true
+unknown_login="$(get_gitea_login git.example.invalid || true)"
+assert_eq "" "$unknown_login" "Unknown Gitea hosts should not force a mismatched login"
+
+TEST_WORKDIR="${TEST_WORKDIR:-$SCRIPT_DIR/tests/.tmp-gitea-login-selection}"
+rm -rf "$TEST_WORKDIR"
+mkdir -p "$TEST_WORKDIR"
+trap 'rm -rf "$TEST_WORKDIR"' EXIT
+
+cat > "$TEST_WORKDIR/credentials.json" <<'JSON'
+{
+  "gitea": {
+    "mosaicstack": {
+      "url": "https://git.mosaicstack.dev",
+      "token": "mosaic-token"
+    },
+    "usc": {
+      "url": "https://git.uscllc.com",
+      "token": "usc-token"
+    }
+  }
+}
+JSON
+
+export MOSAIC_CREDENTIALS_FILE="$TEST_WORKDIR/credentials.json"
+GITEA_TOKEN="ambient-wrong-token"
+GITEA_URL="https://git.mosaicstack.dev"
+export GITEA_TOKEN GITEA_URL
+assert_eq "usc-token" "$(get_gitea_token git.uscllc.com)" "Host-specific credential lookup should ignore ambient mismatched GITEA_TOKEN"
+assert_eq "mosaic-token" "$(get_gitea_token git.mosaicstack.dev)" "Host-specific credential lookup should select Mosaic token for Mosaic host"
+
+FAKEBIN="$TEST_WORKDIR/fakebin"
+REPO_DIR="$TEST_WORKDIR/repo"
+CAPTURE_FILE="$TEST_WORKDIR/tea-args.txt"
+mkdir -p "$FAKEBIN" "$REPO_DIR"
+
+cat > "$FAKEBIN/python3" <<'SH'
+#!/usr/bin/env bash
+cat >/dev/null
+printf 'main\n'
+SH
+chmod +x "$FAKEBIN/python3"
+
+cat > "$FAKEBIN/tea" <<'SH'
+#!/usr/bin/env bash
+printf '%s\n' "$@" > "$TEA_CAPTURE_FILE"
+SH
+chmod +x "$FAKEBIN/tea"
+
+(
+  cd "$REPO_DIR"
+  git init -q
+  git remote add origin https://git.uscllc.com/USC/uconnect.git
+  PATH="$FAKEBIN:$PATH" TEA_CAPTURE_FILE="$CAPTURE_FILE" "$SCRIPT_DIR/pr-merge.sh" --skip-queue-guard -n 1905
+)
+assert_eq $'pr\nmerge\n1905\n--style\nsquash\n--repo\nUSC/uconnect\n--login\nusc' "$(cat "$CAPTURE_FILE")" "pr-merge should pass USC tea login as isolated argv entries"
+
+PWNED_FILE="$TEST_WORKDIR/pwned"
+if (
+  cd "$REPO_DIR"
+  PATH="$FAKEBIN:$PATH" TEA_CAPTURE_FILE="$CAPTURE_FILE" GITEA_LOGIN="bad;touch $PWNED_FILE" "$SCRIPT_DIR/pr-merge.sh" --skip-queue-guard -n 1905 >/dev/null 2>&1
+); then
+  fail "pr-merge should reject GITEA_LOGIN values with shell metacharacters"
+fi
+if [[ -e "$PWNED_FILE" ]]; then
+  fail "pr-merge executed shell metacharacters from GITEA_LOGIN"
+fi
+
+echo "gitea-login-selection tests passed"