From a97c333844be93c2c213b07ca95c63b435074a78 Mon Sep 17 00:00:00 2001
From: csh <caoshenghui@tinysoft.com.cn>
Date: Sat, 28 Feb 2026 11:18:49 +0800
Subject: [PATCH] :wrench: chore(ci): add resilient upstream fetch fallback for
 superpowers update

---
 .gitea/ci/update_thirdparty_superpowers.sh | 110 ++++++++++++++++++---
 tests/test_superpowers_workflows.py        |   3 +-
 2 files changed, 98 insertions(+), 15 deletions(-)

diff --git a/.gitea/ci/update_thirdparty_superpowers.sh b/.gitea/ci/update_thirdparty_superpowers.sh
index a669e8e..1270b3d 100644
--- a/.gitea/ci/update_thirdparty_superpowers.sh
+++ b/.gitea/ci/update_thirdparty_superpowers.sh
@@ -10,6 +10,71 @@ UPSTREAM_REF="${UPSTREAM_REF:-main}"
 COMMIT_AUTHOR_NAME="${COMMIT_AUTHOR_NAME:-playbook-bot}"
 COMMIT_AUTHOR_EMAIL="${COMMIT_AUTHOR_EMAIL:-playbook-bot@local}"
 
+retry_cmd() {
+  local retries="$1"
+  shift
+  local delay="$1"
+  shift
+
+  local attempt=1
+  while true; do
+    if "$@"; then
+      return 0
+    fi
+    if [ "$attempt" -ge "$retries" ]; then
+      return 1
+    fi
+    echo "Retry ($attempt/$retries): $*" >&2
+    sleep "$delay"
+    attempt=$((attempt + 1))
+  done
+}
+
+github_owner_repo() {
+  case "$1" in
+    https://github.com/*)
+      echo "$1" | sed -E 's#^https://github.com/([^/]+/[^/.]+)(\.git)?$#\1#'
+      ;;
+    http://github.com/*)
+      echo "$1" | sed -E 's#^http://github.com/([^/]+/[^/.]+)(\.git)?$#\1#'
+      ;;
+    git@github.com:*)
+      echo "$1" | sed -E 's#^git@github.com:([^/]+/[^/.]+)(\.git)?$#\1#'
+      ;;
+    *)
+      return 1
+      ;;
+  esac
+}
+
+resolve_latest_sha() {
+  local repo="$1"
+  local ref="$2"
+  local tmp_json="$3"
+  local gh_repo="$4"
+  local sha=""
+
+  # Prefer GitHub API when possible to avoid git+gnutls handshake failures.
+  if [ -n "$gh_repo" ]; then
+    local api_url="https://api.github.com/repos/${gh_repo}/commits/${ref}"
+    if retry_cmd 3 2 curl -fsSL --retry 3 --retry-delay 2 "$api_url" -o "$tmp_json"; then
+      sha="$(sed -n 's/^[[:space:]]*"sha":[[:space:]]*"\([0-9a-f]\{40\}\)".*/\1/p' "$tmp_json" | head -n 1)"
+      if [ -n "$sha" ]; then
+        echo "$sha"
+        return 0
+      fi
+    fi
+  fi
+
+  # Fallback to git transport.
+  sha="$(retry_cmd 3 2 git -c http.version=HTTP/1.1 ls-remote "$repo" "refs/heads/$ref" | awk 'NR==1 {print $1}')"
+  if [ -n "$sha" ]; then
+    echo "$sha"
+    return 0
+  fi
+  return 1
+}
+
 cd "$REPO_DIR"
 
 git config user.name "$COMMIT_AUTHOR_NAME"
@@ -18,7 +83,18 @@ git config user.email "$COMMIT_AUTHOR_EMAIL"
 git fetch origin "$TARGET_BRANCH"
 git checkout -B "$TARGET_BRANCH" "origin/$TARGET_BRANCH"
 
-latest_sha="$(git ls-remote "$UPSTREAM_REPO" "refs/heads/$UPSTREAM_REF" | awk 'NR==1 {print $1}')"
+tmp_dir="$(mktemp -d)"
+cleanup() {
+  rm -rf "$tmp_dir"
+}
+trap cleanup EXIT
+
+gh_repo=""
+if gh_repo="$(github_owner_repo "$UPSTREAM_REPO" 2>/dev/null)"; then
+  :
+fi
+
+latest_sha="$(resolve_latest_sha "$UPSTREAM_REPO" "$UPSTREAM_REF" "$tmp_dir/latest.json" "$gh_repo" || true)"
 if [ -z "$latest_sha" ]; then
   echo "ERROR: failed to resolve upstream ref: $UPSTREAM_REPO $UPSTREAM_REF" >&2
   exit 1
@@ -34,21 +110,27 @@ if [ "$latest_sha" = "$current_sha" ]; then
   exit 0
 fi
 
-tmp_dir="$(mktemp -d)"
-cleanup() {
-  rm -rf "$tmp_dir"
-}
-trap cleanup EXIT
-
-upstream_dir="$tmp_dir/upstream"
-git init "$upstream_dir" >/dev/null
-git -C "$upstream_dir" remote add origin "$UPSTREAM_REPO"
-git -C "$upstream_dir" fetch --depth 1 origin "$latest_sha"
-git -C "$upstream_dir" checkout --detach FETCH_HEAD
-
 rm -rf "$SNAPSHOT_DIR"
 mkdir -p "$SNAPSHOT_DIR"
-git -C "$upstream_dir" archive --format=tar HEAD | tar -xf - -C "$SNAPSHOT_DIR"
+
+snapshot_loaded=0
+
+if [ -n "$gh_repo" ]; then
+  tar_url="https://codeload.github.com/${gh_repo}/tar.gz/${latest_sha}"
+  if retry_cmd 3 2 curl -fsSL --retry 3 --retry-delay 2 "$tar_url" -o "$tmp_dir/upstream.tar.gz"; then
+    tar -xzf "$tmp_dir/upstream.tar.gz" -C "$SNAPSHOT_DIR" --strip-components=1
+    snapshot_loaded=1
+  fi
+fi
+
+if [ "$snapshot_loaded" -eq 0 ]; then
+  upstream_dir="$tmp_dir/upstream"
+  git init "$upstream_dir" >/dev/null
+  git -C "$upstream_dir" remote add origin "$UPSTREAM_REPO"
+  retry_cmd 3 2 git -C "$upstream_dir" fetch --depth 1 origin "$latest_sha"
+  git -C "$upstream_dir" checkout --detach FETCH_HEAD
+  git -C "$upstream_dir" archive --format=tar HEAD | tar -xf - -C "$SNAPSHOT_DIR"
+fi
 
 snapshot_date="$(date -u +%Y-%m-%d)"
 cat > "$SOURCE_FILE" <<EOF
diff --git a/tests/test_superpowers_workflows.py b/tests/test_superpowers_workflows.py
index 3375de9..c3bccee 100644
--- a/tests/test_superpowers_workflows.py
+++ b/tests/test_superpowers_workflows.py
@@ -34,7 +34,8 @@ class SuperpowersWorkflowTests(unittest.TestCase):
     def test_auto_update_script_targets_thirdparty_branch(self):
         text = AUTO_UPDATE_SCRIPT.read_text(encoding="utf-8")
         self.assertIn('TARGET_BRANCH="${TARGET_BRANCH:-thirdparty/skill}"', text)
-        self.assertIn("git ls-remote", text)
+        self.assertIn("api.github.com/repos", text)
+        self.assertIn("ls-remote", text)
         self.assertIn('git checkout -B "$TARGET_BRANCH" "origin/$TARGET_BRANCH"', text)