fix(mosaic): harden gitea pr wrapper metadata

.woodpecker/ci.yml

@@ -46,28 +46,18 @@ steps:
   test:
     image: *node_image
     environment:
-      # Avoid the namespace-level Woodpecker DB service named "postgres".
-      # The Kubernetes backend exposes service containers by step name.
-      DATABASE_URL: postgresql://mosaic:mosaic@ci-postgres:5432/mosaic
+      DATABASE_URL: postgresql://mosaic:mosaic@postgres:5432/mosaic
     commands:
       - *enable_pnpm
       # Install postgresql-client for pg_isready
       - apk add --no-cache postgresql-client
-      # Wait up to 60s for CI postgres to be ready; fail fast if it never comes up.
+      # Wait up to 30s for postgres to be ready
       - |
-        ready=0
-        for i in $(seq 1 60); do
-          if pg_isready -h ci-postgres -p 5432 -U mosaic; then
-            ready=1
-            break
-          fi
-          echo "Waiting for ci-postgres ($i/60)..."
+        for i in $(seq 1 30); do
+          pg_isready -h postgres -p 5432 -U mosaic && break
+          echo "Waiting for postgres ($i/30)..."
           sleep 1
         done
-        if [ "$ready" -ne 1 ]; then
-          echo "ci-postgres did not become ready" >&2
-          exit 1
-        fi
       # Run migrations (DATABASE_URL is set in environment above)
       - pnpm --filter @mosaicstack/db run db:migrate
       # Run all tests
@@ -76,7 +66,7 @@ steps:
       - typecheck
 
 services:
-  ci-postgres:
+  postgres:
     image: pgvector/pgvector:pg17
     environment:
       POSTGRES_USER: mosaic

docs/PRD.md

@@ -62,8 +62,9 @@ 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. Docker Compose deployment + bare-metal capability
-23. Agent log service — ingest, parse, tier, summarize agent interaction logs
+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
 
 ### Out of Scope (v0.1.0)
 

docs/TASKS.md

@@ -30,6 +30,7 @@ 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
 

docs/scratchpads/t_a292e96f-gitea-pr-wrapper.md

@@ -0,0 +1,48 @@
+# 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.

packages/mosaic/framework/tools/_lib/credentials.sh

@@ -52,20 +52,6 @@ _mosaic_sync_woodpecker_env() {
   printf '%s\n' "$expected" > "$env_file"
 }
 
-# Load legacy flat Woodpecker credentials (.woodpecker.url / .woodpecker.token).
-# Some environments export WOODPECKER_INSTANCE=mosaic, but the current
-# credentials.json may still use the legacy flat schema. Treat "mosaic" as the
-# default flat instance when a nested .woodpecker.mosaic object is absent.
-_mosaic_load_woodpecker_legacy() {
-  export WOODPECKER_URL="$(_mosaic_read_cred '.woodpecker.url')"
-  export WOODPECKER_TOKEN="$(_mosaic_read_cred '.woodpecker.token')"
-  export WOODPECKER_INSTANCE="${WOODPECKER_INSTANCE:-mosaic}"
-  WOODPECKER_URL="${WOODPECKER_URL%/}"
-  [[ -n "$WOODPECKER_URL" ]] || { echo "Error: woodpecker.url not found" >&2; return 1; }
-  [[ -n "$WOODPECKER_TOKEN" ]] || { echo "Error: woodpecker.token not found" >&2; return 1; }
-  _mosaic_sync_woodpecker_env "$WOODPECKER_INSTANCE" "$WOODPECKER_URL" "$WOODPECKER_TOKEN"
-}
-
 load_credentials() {
   local service="$1"
 
@@ -169,14 +155,7 @@ EOF
       ;;
     woodpecker-*)
       local wp_instance="${service#woodpecker-}"
-      # credentials.json is authoritative — always read from it, ignore env.
-      # Backward compatibility: the default Mosaic Woodpecker instance may be
-      # stored in the legacy flat schema (.woodpecker.url/.token) instead of
-      # .woodpecker.mosaic.url/.token.
-      if [[ "$wp_instance" == "mosaic" ]] && [[ -z "$(_mosaic_read_cred '.woodpecker.mosaic.url')" ]] && [[ -n "$(_mosaic_read_cred '.woodpecker.url')" ]]; then
-        WOODPECKER_INSTANCE="mosaic" _mosaic_load_woodpecker_legacy
-        return $?
-      fi
+      # credentials.json is authoritative — always read from it, ignore env
       export WOODPECKER_URL="$(_mosaic_read_cred ".woodpecker.${wp_instance}.url")"
       export WOODPECKER_TOKEN="$(_mosaic_read_cred ".woodpecker.${wp_instance}.token")"
       export WOODPECKER_INSTANCE="$wp_instance"
@@ -187,10 +166,7 @@ EOF
       _mosaic_sync_woodpecker_env "$wp_instance" "$WOODPECKER_URL" "$WOODPECKER_TOKEN"
       ;;
     woodpecker)
-      # Resolve default instance, then load it. If WOODPECKER_INSTANCE is set to
-      # "mosaic" by a shell/profile but credentials.json still uses the legacy
-      # flat .woodpecker.url/.token schema, load the flat credentials instead of
-      # failing with "woodpecker.mosaic.url not found".
+      # Resolve default instance, then load it
       local wp_default
       wp_default="${WOODPECKER_INSTANCE:-$(_mosaic_read_cred '.woodpecker.default')}"
       if [[ -z "$wp_default" ]]; then
@@ -198,18 +174,18 @@ EOF
         local legacy_url
         legacy_url="$(_mosaic_read_cred '.woodpecker.url')"
         if [[ -n "$legacy_url" ]]; then
-          _mosaic_load_woodpecker_legacy
+          export WOODPECKER_URL="${WOODPECKER_URL:-$legacy_url}"
+          export WOODPECKER_TOKEN="${WOODPECKER_TOKEN:-$(_mosaic_read_cred '.woodpecker.token')}"
+          WOODPECKER_URL="${WOODPECKER_URL%/}"
+          [[ -n "$WOODPECKER_URL" ]] || { echo "Error: woodpecker.url not found" >&2; return 1; }
+          [[ -n "$WOODPECKER_TOKEN" ]] || { echo "Error: woodpecker.token not found" >&2; return 1; }
         else
           echo "Error: woodpecker.default not set and no WOODPECKER_INSTANCE env var" >&2
           echo "Available instances: $(jq -r '.woodpecker | keys | join(", ")' "$MOSAIC_CREDENTIALS_FILE" 2>/dev/null)" >&2
           return 1
         fi
       else
-        if [[ "$wp_default" == "mosaic" ]] && [[ -z "$(_mosaic_read_cred '.woodpecker.mosaic.url')" ]] && [[ -n "$(_mosaic_read_cred '.woodpecker.url')" ]]; then
-          WOODPECKER_INSTANCE="mosaic" _mosaic_load_woodpecker_legacy
-        else
-          load_credentials "woodpecker-${wp_default}"
-        fi
+        load_credentials "woodpecker-${wp_default}"
       fi
       ;;
     cloudflare-*)

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

@@ -92,7 +92,7 @@ get_remote_host() {
 }
 
 # Resolve a Gitea API token for the given host.
-# Priority: Mosaic credential loader → GITEA_TOKEN env → ~/.git-credentials
+# Priority: Mosaic credential loader → host-matched GITEA_TOKEN env → ~/.git-credentials
 get_gitea_token() {
     local host="$1"
     local script_dir
@@ -103,16 +103,28 @@ 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
-                        load_credentials "$svc" 2>/dev/null || continue
-                        [[ "${GITEA_URL:-}" == *"$host"* ]] && break
                         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
+                        unset GITEA_TOKEN GITEA_URL
+                    fi
                     ;;
             esac
             echo "${GITEA_TOKEN:-}"
@@ -123,10 +135,12 @@ get_gitea_token() {
         fi
     fi
 
-    # 2. GITEA_TOKEN env var (may be set by caller)
+    # 2. GITEA_TOKEN env var (only when GITEA_URL, if present, matches the remote host)
     if [[ -n "${GITEA_TOKEN:-}" ]]; then
-        echo "$GITEA_TOKEN"
-        return 0
+        if [[ -z "${GITEA_URL:-}" || "${GITEA_URL:-}" == "https://$host" || "${GITEA_URL:-}" == "http://$host" || "${GITEA_URL:-}" == *"//$host" ]]; then
+            echo "$GITEA_TOKEN"
+            return 0
+        fi
     fi
 
     # 3. ~/.git-credentials file

packages/mosaic/framework/tools/git/issue-list.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # issue-list.sh - List issues on Gitea or GitHub
-# Usage: issue-list.sh [-r owner/repo] [-s state] [-l label] [-m milestone] [-a assignee]
+# Usage: issue-list.sh [-s state] [-l label] [-m milestone] [-a assignee]
 
 set -e
 
@@ -13,7 +13,6 @@ LABEL=""
 MILESTONE=""
 ASSIGNEE=""
 LIMIT=100
-REPO_OVERRIDE=""
 
 usage() {
     cat <<EOF
@@ -27,14 +26,12 @@ Options:
     -m, --milestone NAME    Filter by milestone name
     -a, --assignee USER     Filter by assignee
     -n, --limit N           Maximum issues to show (default: 100)
-    -r, --repo OWNER/REPO   Repository slug (default: infer from git origin)
     -h, --help              Show this help message
 
 Examples:
     $(basename "$0")                          # List open issues
     $(basename "$0") -s all -l bug            # All issues with 'bug' label
     $(basename "$0") -m "0.2.0"               # Issues in milestone 0.2.0
-    $(basename "$0") --repo ddk/ai-bma         # List issues from anywhere
 EOF
     exit 1
 }
@@ -62,10 +59,6 @@ while [[ $# -gt 0 ]]; do
             LIMIT="$2"
             shift 2
             ;;
-        -r|--repo)
-            REPO_OVERRIDE="$2"
-            shift 2
-            ;;
         -h|--help)
             usage
             ;;
@@ -76,33 +69,25 @@ while [[ $# -gt 0 ]]; do
     esac
 done
 
-if [[ -n "$REPO_OVERRIDE" ]]; then
-    REPO_INFO="$REPO_OVERRIDE"
-    PLATFORM=$(detect_platform 2>/dev/null || echo gitea)
-else
-    PLATFORM=$(detect_platform)
-    REPO_INFO=$(get_repo_info)
-fi
-
-if [[ -z "$REPO_INFO" || "$REPO_INFO" == error:* ]]; then
-    echo "Error: Could not determine repository from git origin. Run from a repo or pass --repo." >&2
-    exit 1
-fi
+PLATFORM=$(detect_platform)
 
 case "$PLATFORM" in
     github)
-        CMD=(gh issue list --repo "$REPO_INFO" --state "$STATE" --limit "$LIMIT")
-        [[ -n "$LABEL" ]] && CMD+=(--label "$LABEL")
-        [[ -n "$MILESTONE" ]] && CMD+=(--milestone "$MILESTONE")
-        [[ -n "$ASSIGNEE" ]] && CMD+=(--assignee "$ASSIGNEE")
-        "${CMD[@]}"
+        CMD="gh issue list --state $STATE --limit $LIMIT"
+        [[ -n "$LABEL" ]] && CMD="$CMD --label \"$LABEL\""
+        [[ -n "$MILESTONE" ]] && CMD="$CMD --milestone \"$MILESTONE\""
+        [[ -n "$ASSIGNEE" ]] && CMD="$CMD --assignee \"$ASSIGNEE\""
+        eval "$CMD"
         ;;
     gitea)
-        CMD=(tea issues list --repo "$REPO_INFO" --state "$STATE" --limit "$LIMIT")
-        [[ -n "$LABEL" ]] && CMD+=(--labels "$LABEL")
-        [[ -n "$MILESTONE" ]] && CMD+=(--milestones "$MILESTONE")
-        [[ -n "$ASSIGNEE" ]] && CMD+=(--assignee "$ASSIGNEE")
-        "${CMD[@]}"
+        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
+        eval "$CMD"
+        if [[ -n "$ASSIGNEE" ]]; then
+            echo "Note: Assignee filtering may require manual review for Gitea" >&2
+        fi
         ;;
     *)
         echo "Error: Could not detect git platform" >&2

packages/mosaic/framework/tools/git/pr-ci-wait.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # pr-ci-wait.sh - Wait for PR CI status to reach terminal state (GitHub/Gitea)
-# Usage: pr-ci-wait.sh -n <pr_number> [-r owner/repo] [-t timeout_sec] [-i interval_sec]
+# Usage: pr-ci-wait.sh -n <pr_number> [-t timeout_sec] [-i interval_sec]
 
 set -euo pipefail
 
@@ -10,7 +10,6 @@ source "$SCRIPT_DIR/detect-platform.sh"
 PR_NUMBER=""
 TIMEOUT_SEC=1800
 INTERVAL_SEC=15
-REPO_OVERRIDE=""
 
 usage() {
     cat <<EOF
@@ -18,14 +17,12 @@ Usage: $(basename "$0") -n <pr_number> [-t timeout_sec] [-i interval_sec]
 
 Options:
   -n, --number NUMBER      PR number (required)
-  -r, --repo OWNER/REPO    Repository slug (default: infer from git origin)
   -t, --timeout SECONDS    Max wait time in seconds (default: 1800)
   -i, --interval SECONDS   Poll interval in seconds (default: 15)
   -h, --help               Show this help
 
 Examples:
   $(basename "$0") -n 643
-  $(basename "$0") -n 643 --repo ddk/ai-bma
   $(basename "$0") -n 643 -t 900 -i 10
 EOF
 }
@@ -98,7 +95,7 @@ PY
 }
 
 github_get_pr_head_sha() {
-    gh pr view "$PR_NUMBER" --repo "$OWNER/$REPO" --json headRefOid --jq '.headRefOid'
+    gh pr view "$PR_NUMBER" --json headRefOid --jq '.headRefOid'
 }
 
 github_get_commit_status_json() {
@@ -135,10 +132,6 @@ while [[ $# -gt 0 ]]; do
             PR_NUMBER="$2"
             shift 2
             ;;
-        -r|--repo)
-            REPO_OVERRIDE="$2"
-            shift 2
-            ;;
         -t|--timeout)
             TIMEOUT_SEC="$2"
             shift 2
@@ -170,21 +163,10 @@ if ! [[ "$TIMEOUT_SEC" =~ ^[0-9]+$ ]] || ! [[ "$INTERVAL_SEC" =~ ^[0-9]+$ ]]; th
     exit 1
 fi
 
-if [[ -n "$REPO_OVERRIDE" ]]; then
-    REPO_INFO="$REPO_OVERRIDE"
-    PLATFORM=$(detect_platform 2>/dev/null || echo gitea)
-else
-    detect_platform > /dev/null
-    REPO_INFO=$(get_repo_info)
-fi
+detect_platform > /dev/null
 
-if [[ -z "$REPO_INFO" || "$REPO_INFO" == error:* || "$REPO_INFO" != */* ]]; then
-    echo "Error: Could not determine repository from git origin. Run from a repo or pass --repo owner/repo." >&2
-    exit 1
-fi
-
-OWNER=${REPO_INFO%%/*}
-REPO=${REPO_INFO##*/}
+OWNER=$(get_repo_owner)
+REPO=$(get_repo_name)
 START_TS=$(date +%s)
 DEADLINE_TS=$((START_TS + TIMEOUT_SEC))
 
@@ -200,7 +182,10 @@ if [[ "$PLATFORM" == "github" ]]; then
     fi
     echo "[pr-ci-wait] Platform=github PR=#${PR_NUMBER} head_sha=${HEAD_SHA}"
 elif [[ "$PLATFORM" == "gitea" ]]; then
-    HOST=$(get_remote_host 2>/dev/null || echo "git.mosaicstack.dev")
+    HOST=$(get_remote_host) || {
+        echo "Error: Could not determine remote host." >&2
+        exit 1
+    }
     TOKEN=$(get_gitea_token "$HOST") || {
         echo "Error: Gitea token not found. Set GITEA_TOKEN or configure ~/.git-credentials." >&2
         exit 1
@@ -210,7 +195,7 @@ elif [[ "$PLATFORM" == "gitea" ]]; then
         echo "Error: Could not resolve head SHA for PR #$PR_NUMBER." >&2
         exit 1
     fi
-    echo "[pr-ci-wait] Platform=gitea host=${HOST} repo=${OWNER}/${REPO} PR=#${PR_NUMBER} head_sha=${HEAD_SHA}"
+    echo "[pr-ci-wait] Platform=gitea host=${HOST} PR=#${PR_NUMBER} head_sha=${HEAD_SHA}"
 else
     echo "Error: Unsupported platform '${PLATFORM}'." >&2
     exit 1

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

@@ -1,6 +1,6 @@
 #!/bin/bash
 # pr-diff.sh - Get the diff for a pull request on GitHub or Gitea
-# Usage: pr-diff.sh -n <pr_number> [-r owner/repo] [-o <output_file>]
+# Usage: pr-diff.sh -n <pr_number> [-o <output_file>]
 
 set -e
 
@@ -10,7 +10,6 @@ source "$SCRIPT_DIR/detect-platform.sh"
 # Parse arguments
 PR_NUMBER=""
 OUTPUT_FILE=""
-REPO_OVERRIDE=""
 
 while [[ $# -gt 0 ]]; do
     case $1 in
@@ -22,16 +21,11 @@ while [[ $# -gt 0 ]]; do
             OUTPUT_FILE="$2"
             shift 2
             ;;
-        -r|--repo)
-            REPO_OVERRIDE="$2"
-            shift 2
-            ;;
         -h|--help)
-            echo "Usage: pr-diff.sh -n <pr_number> [-r owner/repo] [-o <output_file>]"
+            echo "Usage: pr-diff.sh -n <pr_number> [-o <output_file>]"
             echo ""
             echo "Options:"
             echo "  -n, --number   PR number (required)"
-            echo "  -r, --repo     Repository slug (default: infer from git origin)"
             echo "  -o, --output   Output file (optional, prints to stdout if omitted)"
             echo "  -h, --help     Show this help"
             exit 0
@@ -48,30 +42,31 @@ if [[ -z "$PR_NUMBER" ]]; then
     exit 1
 fi
 
-if [[ -n "$REPO_OVERRIDE" ]]; then
-    REPO_INFO="$REPO_OVERRIDE"
-    PLATFORM=$(detect_platform 2>/dev/null || echo gitea)
-else
-    detect_platform > /dev/null
-    REPO_INFO=$(get_repo_info)
-fi
-
-if [[ -z "$REPO_INFO" || "$REPO_INFO" == error:* ]]; then
-    echo "Error: Could not determine repository from git origin. Run from a repo or pass --repo." >&2
-    exit 1
-fi
+detect_platform > /dev/null
 
 if [[ "$PLATFORM" == "github" ]]; then
     if [[ -n "$OUTPUT_FILE" ]]; then
-        gh pr diff "$PR_NUMBER" --repo "$REPO_INFO" > "$OUTPUT_FILE"
+        gh pr diff "$PR_NUMBER" > "$OUTPUT_FILE"
     else
-        gh pr diff "$PR_NUMBER" --repo "$REPO_INFO"
+        gh pr diff "$PR_NUMBER"
     fi
 elif [[ "$PLATFORM" == "gitea" ]]; then
     # tea doesn't have a direct diff command — use the API
-    HOST=$(get_remote_host 2>/dev/null || echo "git.mosaicstack.dev")
+    OWNER=$(get_repo_owner)
+    REPO=$(get_repo_name)
+    REMOTE_URL=$(git remote get-url origin 2>/dev/null)
 
-    DIFF_URL="https://${HOST}/api/v1/repos/${REPO_INFO}/pulls/${PR_NUMBER}.diff"
+    # 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
+
+    DIFF_URL="https://${HOST}/api/v1/repos/${OWNER}/${REPO}/pulls/${PR_NUMBER}.diff"
 
     GITEA_API_TOKEN=$(get_gitea_token "$HOST" || true)
 

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

@@ -1,6 +1,6 @@
 #!/bin/bash
 # pr-list.sh - List pull requests on Gitea or GitHub
-# Usage: pr-list.sh [-r owner/repo] [-s state] [-l label] [-a author]
+# Usage: pr-list.sh [-s state] [-l label] [-a author]
 
 set -e
 
@@ -12,7 +12,6 @@ STATE="open"
 LABEL=""
 AUTHOR=""
 LIMIT=100
-REPO_OVERRIDE=""
 
 usage() {
     cat <<EOF
@@ -25,14 +24,12 @@ Options:
     -l, --label LABEL       Filter by label
     -a, --author USER       Filter by author
     -n, --limit N           Maximum PRs to show (default: 100)
-    -r, --repo OWNER/REPO   Repository slug (default: infer from git origin)
     -h, --help              Show this help message
 
 Examples:
     $(basename "$0")                          # List open PRs
     $(basename "$0") -s all                   # All PRs
     $(basename "$0") -s merged -a username    # Merged PRs by user
-    $(basename "$0") --repo ddk/ai-bma         # List PRs from anywhere
 EOF
     exit 1
 }
@@ -56,10 +53,6 @@ while [[ $# -gt 0 ]]; do
             LIMIT="$2"
             shift 2
             ;;
-        -r|--repo)
-            REPO_OVERRIDE="$2"
-            shift 2
-            ;;
         -h|--help)
             usage
             ;;
@@ -70,30 +63,18 @@ while [[ $# -gt 0 ]]; do
     esac
 done
 
-if [[ -n "$REPO_OVERRIDE" ]]; then
-    REPO_INFO="$REPO_OVERRIDE"
-    # Explicit --repo is primarily for Gitea wrappers; if a git origin is present,
-    # still honor GitHub detection for cross-platform behavior.
-    PLATFORM=$(detect_platform 2>/dev/null || echo gitea)
-else
-    PLATFORM=$(detect_platform)
-    REPO_INFO=$(get_repo_info)
-fi
-
-if [[ -z "$REPO_INFO" || "$REPO_INFO" == error:* ]]; then
-    echo "Error: Could not determine repository from git origin. Run from a repo or pass --repo." >&2
-    exit 1
-fi
+PLATFORM=$(detect_platform)
 
 case "$PLATFORM" in
     github)
-        CMD=(gh pr list --repo "$REPO_INFO" --state "$STATE" --limit "$LIMIT")
-        [[ -n "$LABEL" ]] && CMD+=(--label "$LABEL")
-        [[ -n "$AUTHOR" ]] && CMD+=(--author "$AUTHOR")
-        "${CMD[@]}"
+        CMD="gh pr list --state $STATE --limit $LIMIT"
+        [[ -n "$LABEL" ]] && CMD="$CMD --label \"$LABEL\""
+        [[ -n "$AUTHOR" ]] && CMD="$CMD --author \"$AUTHOR\""
+        eval "$CMD"
         ;;
     gitea)
-        CMD=(tea pr list --repo "$REPO_INFO" --state "$STATE" --limit "$LIMIT")
+        # tea pr list - note: tea uses 'pulls' subcommand in some versions
+        CMD="tea pr list --state $STATE --limit $LIMIT"
 
         # tea filtering may be limited
         if [[ -n "$LABEL" ]]; then
@@ -103,7 +84,7 @@ case "$PLATFORM" in
             echo "Note: Author filtering may require manual review for Gitea" >&2
         fi
 
-        "${CMD[@]}"
+        eval "$CMD"
         ;;
     *)
         echo "Error: Could not detect git platform" >&2

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

@@ -1,10 +1,11 @@
 #!/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]
+# Usage: pr-merge.sh -n PR_NUMBER [-m squash] [-d] [--skip-queue-guard] [--dry-run]
 
 set -e
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# shellcheck disable=SC1091
 source "$SCRIPT_DIR/detect-platform.sh"
 
 # Default values
@@ -12,6 +13,7 @@ PR_NUMBER=""
 MERGE_METHOD="squash"
 DELETE_BRANCH=false
 SKIP_QUEUE_GUARD=false
+DRY_RUN=false
 
 usage() {
     cat <<EOF
@@ -24,6 +26,7 @@ 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:
@@ -54,6 +57,10 @@ while [[ $# -gt 0 ]]; do
             SKIP_QUEUE_GUARD=true
             shift
             ;;
+        --dry-run)
+            DRY_RUN=true
+            shift
+            ;;
         -h|--help)
             usage
             ;;
@@ -74,7 +81,8 @@ if [[ "$MERGE_METHOD" != "squash" ]]; then
     exit 1
 fi
 
-BASE_BRANCH="$("$SCRIPT_DIR/pr-metadata.sh" -n "$PR_NUMBER" | python3 -c 'import json, sys; print((json.load(sys.stdin).get("baseRefName") or "").strip())')"
+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())')"
 if [[ "$BASE_BRANCH" != "main" ]]; then
     echo "Error: Mosaic policy allows merges only for PRs targeting 'main' (found '$BASE_BRANCH')." >&2
     exit 1
@@ -94,19 +102,55 @@ REPO=$(get_repo_name)
 
 case "$PLATFORM" in
     github)
-        CMD="gh pr merge $PR_NUMBER --squash"
-        [[ "$DELETE_BRANCH" == true ]] && CMD="$CMD --delete-branch"
-        eval "$CMD"
+        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[@]}"
         ;;
     gitea)
-        CMD="tea pr merge $PR_NUMBER --style squash --repo $OWNER/$REPO --login ${GITEA_LOGIN:-mosaicstack}"
+        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
 
         # 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
+            echo "Note: Branch deletion after merge may need to be done separately with the Gitea API" >&2
         fi
-
-        eval "$CMD"
         ;;
     *)
         echo "Error: Could not detect git platform" >&2

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

@@ -5,6 +5,7 @@
 set -e
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# shellcheck disable=SC1091
 source "$SCRIPT_DIR/detect-platform.sh"
 
 # Parse arguments
@@ -55,39 +56,51 @@ if [[ "$PLATFORM" == "github" ]]; then
 elif [[ "$PLATFORM" == "gitea" ]]; then
     OWNER=$(get_repo_owner)
     REPO=$(get_repo_name)
-    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
+    HOST=$(get_remote_host) || {
         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
-        RAW=$(curl -sS -H "Authorization: token $GITEA_API_TOKEN" "$API_URL")
+        HTTP_CODE=$(curl -sS -H "Authorization: token $GITEA_API_TOKEN" -o "$RESPONSE_FILE" -w '%{http_code}' "$API_URL")
     else
-        RAW=$(curl -sS "$API_URL")
+        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
     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': data.get('head', {}).get('ref', ''),
+    'headRefName': head_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', [])],

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

@@ -1,6 +1,6 @@
 #!/bin/bash
 # pr-view.sh - View pull request details on GitHub or Gitea
-# Usage: pr-view.sh -n <pr_number> [-r owner/repo]
+# Usage: pr-view.sh -n <pr_number>
 
 set -e
 
@@ -9,7 +9,6 @@ source "$SCRIPT_DIR/detect-platform.sh"
 
 # Parse arguments
 PR_NUMBER=""
-REPO_OVERRIDE=""
 
 while [[ $# -gt 0 ]]; do
     case $1 in
@@ -17,16 +16,11 @@ while [[ $# -gt 0 ]]; do
             PR_NUMBER="$2"
             shift 2
             ;;
-        -r|--repo)
-            REPO_OVERRIDE="$2"
-            shift 2
-            ;;
         -h|--help)
-            echo "Usage: pr-view.sh -n <pr_number> [-r owner/repo]"
+            echo "Usage: pr-view.sh -n <pr_number>"
             echo ""
             echo "Options:"
             echo "  -n, --number   PR number (required)"
-            echo "  -r, --repo     Repository slug (default: infer from git origin)"
             echo "  -h, --help     Show this help"
             exit 0
             ;;
@@ -42,23 +36,12 @@ if [[ -z "$PR_NUMBER" ]]; then
     exit 1
 fi
 
-if [[ -n "$REPO_OVERRIDE" ]]; then
-    REPO_INFO="$REPO_OVERRIDE"
-    PLATFORM=$(detect_platform 2>/dev/null || echo gitea)
-else
-    detect_platform > /dev/null
-    REPO_INFO=$(get_repo_info)
-fi
-
-if [[ -z "$REPO_INFO" || "$REPO_INFO" == error:* ]]; then
-    echo "Error: Could not determine repository from git origin. Run from a repo or pass --repo." >&2
-    exit 1
-fi
+detect_platform
 
 if [[ "$PLATFORM" == "github" ]]; then
-    gh pr view "$PR_NUMBER" --repo "$REPO_INFO"
+    gh pr view "$PR_NUMBER"
 elif [[ "$PLATFORM" == "gitea" ]]; then
-    tea pr "$PR_NUMBER" --repo "$REPO_INFO"
+    tea pr "$PR_NUMBER"
 else
     echo "Error: Unknown platform"
     exit 1

packages/mosaic/framework/tools/git/tests/pr-gitea-wrapper-regression.sh

@@ -0,0 +1,116 @@
+#!/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'

packages/mosaic/framework/tools/woodpecker/pipeline-list.sh

@@ -50,7 +50,7 @@ REPO_ID=$(wp_resolve_repo_id "$REPO") || exit 1
 
 response=$(curl -sk -w "\n%{http_code}" \
   -H "Authorization: Bearer $WOODPECKER_TOKEN" \
-  "${WOODPECKER_URL}/api/repos/${REPO_ID}/pipelines?perPage=${LIMIT}")
+  "${WOODPECKER_URL}/api/repos/${REPO_ID}/pipelines?per_page=${LIMIT}")
 
 http_code=$(echo "$response" | tail -n1)
 body=$(echo "$response" | sed '$d')

packages/mosaic/framework/tools/woodpecker/pipeline-status.sh

@@ -64,7 +64,7 @@ _wp_fetch() {
 
 if [[ -z "$NUMBER" ]]; then
   # Get latest pipeline number from list, then fetch full detail
-  list_body=$(_wp_fetch "${WOODPECKER_URL}/api/repos/${REPO_ID}/pipelines?perPage=1") || exit 1
+  list_body=$(_wp_fetch "${WOODPECKER_URL}/api/repos/${REPO_ID}/pipelines?per_page=1") || exit 1
   NUMBER=$(echo "$list_body" | jq -r '.[0].number // empty')
   if [[ -z "$NUMBER" ]]; then
     echo "Error: No pipelines found" >&2