Compare commits
1 Commits
fix/t_a292
...
fix/pr-ci-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a4cbd4be51 |
@@ -653,9 +653,3 @@ 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
|
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)
|
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)
|
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.
|
|
||||||
|
|||||||
@@ -30,12 +30,19 @@ EOF
|
|||||||
# get_remote_host and get_gitea_token are provided by detect-platform.sh
|
# get_remote_host and get_gitea_token are provided by detect-platform.sh
|
||||||
|
|
||||||
extract_state_from_status_json() {
|
extract_state_from_status_json() {
|
||||||
python3 - <<'PY'
|
# Capture piped JSON BEFORE invoking `python3 - <<PY`. The heredoc binds
|
||||||
|
# stdin to the Python program text — so json.load(sys.stdin) inside would
|
||||||
|
# try to re-read stdin after `-` already consumed it for the program,
|
||||||
|
# yielding EOF and returning "unknown" every time. Pass payload via env.
|
||||||
|
local payload
|
||||||
|
payload=$(cat)
|
||||||
|
PR_CI_STATUS_JSON="$payload" python3 - <<'PY'
|
||||||
import json
|
import json
|
||||||
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
try:
|
try:
|
||||||
payload = json.load(sys.stdin)
|
payload = json.loads(os.environ.get("PR_CI_STATUS_JSON", ""))
|
||||||
except Exception:
|
except Exception:
|
||||||
print("unknown")
|
print("unknown")
|
||||||
raise SystemExit(0)
|
raise SystemExit(0)
|
||||||
@@ -66,12 +73,16 @@ PY
|
|||||||
}
|
}
|
||||||
|
|
||||||
print_status_summary() {
|
print_status_summary() {
|
||||||
python3 - <<'PY'
|
# Same stdin-collision fix as extract_state_from_status_json above.
|
||||||
|
local payload
|
||||||
|
payload=$(cat)
|
||||||
|
PR_CI_STATUS_JSON="$payload" python3 - <<'PY'
|
||||||
import json
|
import json
|
||||||
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
try:
|
try:
|
||||||
payload = json.load(sys.stdin)
|
payload = json.loads(os.environ.get("PR_CI_STATUS_JSON", ""))
|
||||||
except Exception:
|
except Exception:
|
||||||
print("[pr-ci-wait] status payload unavailable")
|
print("[pr-ci-wait] status payload unavailable")
|
||||||
raise SystemExit(0)
|
raise SystemExit(0)
|
||||||
|
|||||||
@@ -69,81 +69,32 @@ elif [[ "$PLATFORM" == "gitea" ]]; then
|
|||||||
|
|
||||||
API_URL="https://${HOST}/api/v1/repos/${OWNER}/${REPO}/pulls/${PR_NUMBER}"
|
API_URL="https://${HOST}/api/v1/repos/${OWNER}/${REPO}/pulls/${PR_NUMBER}"
|
||||||
|
|
||||||
declare -a TOKEN_CANDIDATES=()
|
GITEA_API_TOKEN=$(get_gitea_token "$HOST" || true)
|
||||||
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")
|
|
||||||
}
|
|
||||||
|
|
||||||
add_token_candidate "${GITEA_TOKEN:-}"
|
if [[ -n "$GITEA_API_TOKEN" ]]; then
|
||||||
add_token_candidate "$(get_gitea_token "$HOST" || true)"
|
RAW=$(curl -sS -H "Authorization: token $GITEA_API_TOKEN" "$API_URL")
|
||||||
|
else
|
||||||
# Git HTTPS credentials often contain a valid Gitea API token even when a
|
RAW=$(curl -sS "$API_URL")
|
||||||
# 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
|
fi
|
||||||
|
|
||||||
# Normalize Gitea response to match our expected schema
|
# Normalize Gitea response to match our expected schema
|
||||||
METADATA=$(echo "$RAW" | python3 -c "
|
METADATA=$(echo "$RAW" | python3 -c "
|
||||||
import json, sys
|
import json, sys
|
||||||
data = json.load(sys.stdin)
|
data = json.load(sys.stdin)
|
||||||
head = data.get('head') or {}
|
|
||||||
base = data.get('base') or {}
|
|
||||||
user = data.get('user') or {}
|
|
||||||
normalized = {
|
normalized = {
|
||||||
'number': data.get('number') or data.get('index'),
|
'number': data.get('number'),
|
||||||
'title': data.get('title'),
|
'title': data.get('title'),
|
||||||
'body': data.get('body', ''),
|
'body': data.get('body', ''),
|
||||||
'state': data.get('state'),
|
'state': data.get('state'),
|
||||||
'author': user.get('login', ''),
|
'author': data.get('user', {}).get('login', ''),
|
||||||
'headRefName': head.get('ref') or head.get('label', '').split(':')[-1],
|
'headRefName': data.get('head', {}).get('ref', ''),
|
||||||
'baseRefName': base.get('ref') or base.get('label', '').split(':')[-1],
|
'baseRefName': data.get('base', {}).get('ref', ''),
|
||||||
'labels': [l.get('name', '') for l in data.get('labels', [])],
|
'labels': [l.get('name', '') for l in data.get('labels', [])],
|
||||||
'assignees': [a.get('login', '') for a in data.get('assignees', [])],
|
'assignees': [a.get('login', '') for a in data.get('assignees', [])],
|
||||||
'milestone': data.get('milestone', {}).get('title', '') if data.get('milestone') else '',
|
'milestone': data.get('milestone', {}).get('title', '') if data.get('milestone') else '',
|
||||||
'createdAt': data.get('created_at', ''),
|
'createdAt': data.get('created_at', ''),
|
||||||
'updatedAt': data.get('updated_at', ''),
|
'updatedAt': data.get('updated_at', ''),
|
||||||
'url': data.get('html_url') or data.get('url', ''),
|
'url': data.get('html_url', ''),
|
||||||
'isDraft': data.get('draft', False),
|
'isDraft': data.get('draft', False),
|
||||||
'mergeable': data.get('mergeable'),
|
'mergeable': data.get('mergeable'),
|
||||||
'diffUrl': data.get('diff_url', ''),
|
'diffUrl': data.get('diff_url', ''),
|
||||||
|
|||||||
Reference in New Issue
Block a user