Dev

.codex/scripts/task_guard.sh

@@ -332,7 +332,11 @@ finish_task() {
     [[ -n "$path" ]] || continue
     path_matches_file "$path" "$state_dir/protected" && continue
     path_matches_file "$path" "$state_dir/scope" || continue
-    git add -A -- "$path"
+    if [[ -e "$path" || -L "$path" ]]; then
+      git add -A -- "$path"
+    else
+      git add -u -- .
+    fi
     task_change_count=$((task_change_count + 1))
   done < <(list_dirty)
   ((task_change_count > 0)) || safety_gate "no task-owned changes to commit"

.gitattributes

@@ -0,0 +1 @@
+*.patch whitespace=-blank-at-eol,-blank-at-eof

.github/scripts/publish-oci-apks.sh

@@ -12,8 +12,8 @@ mkdir -p "$(dirname "$metadata_file")"
 printf '{}\n' > "$metadata_file"
 
 if [[ -z "$repository_input" || -z "$username" || -z "$token" || -z "$release_tag" ]]; then
-  echo "OCI publishing skipped: configure vars.OCI_REPOSITORY and OCI credentials."
-  exit 0
+  echo "OCI publishing requested but vars.OCI_REPOSITORY, OCI credentials, or RELEASE_TAG are missing." >&2
+  exit 1
 fi
 
 if ! command -v oras >/dev/null 2>&1; then

.github/workflows/android-release.yml

@@ -8,7 +8,7 @@ on:
         required: false
         type: string
       release_channel:
-        description: "Release channel, auto uses beta on fongmi-sync"
+        description: "Release channel, auto uses beta on dev/fongmi-sync and stable on main"
         required: false
         default: auto
         type: choice
@@ -26,7 +26,7 @@ on:
         default: false
         type: boolean
       sync_cnb:
-        description: "Mirror APKs to CNB Release and sync CNB manifests"
+        description: "Optionally mirror APKs to CNB Release and sync CNB manifests"
         required: false
         default: false
         type: boolean
@@ -39,12 +39,17 @@ on:
 permissions:
   contents: write
 
+concurrency:
+  group: android-release-update-channel
+  cancel-in-progress: false
+
 env:
   TZ: Asia/Shanghai
   CNB_API_ENDPOINT: https://api.cnb.cool
   CNB_WEB_ENDPOINT: https://cnb.cool
   CNB_REPO_SLUG: fish2035/webhtv-release
   CNB_REPO_URL: https://cnb.cool/fish2035/webhtv-release.git
+  UPDATE_CHANNEL_TAG: update-channel
 
 jobs:
   release:
@@ -78,14 +83,33 @@ jobs:
 
       - name: Install Android packages
         run: |
-          sdkmanager "platform-tools" "platforms;android-37.0" "build-tools;37.0.0"
+          # API 37 is not published in sdkmanager's stable channel; install the platform archive directly.
+          sdkmanager "platform-tools" "platforms;android-28" "build-tools;36.0.0"
+          curl -fsSL -o /tmp/platform-37.zip https://dl.google.com/android/repository/platform-37.0_r01.zip
+          rm -rf /tmp/platform-37 "$ANDROID_HOME/platforms/android-37"
+          mkdir -p /tmp/platform-37 "$ANDROID_HOME/platforms"
+          unzip -q /tmp/platform-37.zip -d /tmp/platform-37
+          platform_jar="$(find /tmp/platform-37 -name android.jar -print -quit)"
+          test -n "$platform_jar"
+          mv "$(dirname "$platform_jar")" "$ANDROID_HOME/platforms/android-37"
 
-      - name: Run WebSocket danmaku tests
+      - name: Run release-critical tests
         run: |
           chmod +x ./gradlew
           ./gradlew \
             :app:testMobileArm64_v8aDebugUnitTest \
             --tests 'com.fongmi.android.tv.player.danmaku.*' \
+            --tests 'com.fongmi.android.tv.UpdateChannelTest' \
+            --tests 'com.fongmi.android.tv.UpdaterFutureTest' \
+            --tests 'com.fongmi.android.tv.utils.GithubTest' \
+            --tests 'com.fongmi.android.tv.utils.GithubProxyTest' \
+            --tests 'com.fongmi.android.tv.ui.dialog.AboutDialogLayoutTest' \
+            --tests 'com.fongmi.android.tv.ui.dialog.UpdateDialogChannelVisibilityTest' \
+            --tests 'com.fongmi.android.tv.ui.adapter.VodAdapterLayoutTest' \
+            --no-daemon
+          ./gradlew \
+            :app:testLeanbackArm64_v8aDebugUnitTest \
+            --tests 'com.fongmi.android.tv.ui.dialog.UpdateDialogLayoutTest' \
             --no-daemon
 
       - name: Resolve release tag
@@ -95,21 +119,23 @@ jobs:
           VERSION_CODE="$(sed -n 's/^[[:space:]]*versionCode[[:space:]]*\([0-9][0-9]*\).*/\1/p' app/build.gradle | head -1)"
           CHANNEL="${{ inputs.release_channel }}"
           if [ "$CHANNEL" = "auto" ] || [ -z "$CHANNEL" ]; then
-            if [ "${{ github.ref_name }}" = "fongmi-sync" ]; then
+            if [ "${{ github.ref_name }}" = "dev" ] || [ "${{ github.ref_name }}" = "fongmi-sync" ]; then
               CHANNEL="beta"
             else
               CHANNEL="stable"
             fi
           fi
+          COMMIT_EPOCH="$(git show -s --format=%ct "$GITHUB_SHA")"
+          TAG_TIME="$(date -d "@$COMMIT_EPOCH" +%Y%m%d%H%M)"
           if [ "$CHANNEL" = "beta" ]; then
             APK_SUFFIX="-beta"
             TAG_PATTERN="^v${VERSION_NAME}-beta-[0-9]{12}$"
-            TAG_DEFAULT="v${VERSION_NAME}-beta-$(date +%Y%m%d%H%M)"
+            TAG_DEFAULT="v${VERSION_NAME}-beta-$TAG_TIME"
             TAG_EXPECT="v${VERSION_NAME}-beta-yyyyMMddHHmm"
           else
             APK_SUFFIX=""
             TAG_PATTERN="^v${VERSION_NAME}-[0-9]{12}$"
-            TAG_DEFAULT="v${VERSION_NAME}-$(date +%Y%m%d%H%M)"
+            TAG_DEFAULT="v${VERSION_NAME}-$TAG_TIME"
             TAG_EXPECT="v${VERSION_NAME}-yyyyMMddHHmm"
           fi
           TAG="${{ inputs.release_tag }}"
@@ -120,9 +146,12 @@ jobs:
             echo "::error title=Invalid release tag::Expected $TAG_EXPECT, got: $TAG"
             exit 1
           fi
-          if git rev-parse "$TAG" >/dev/null 2>&1; then
-            echo "::error title=Release tag exists::$TAG already exists"
-            exit 1
+          if EXISTING_TAG_SHA="$(git rev-parse "$TAG^{commit}" 2>/dev/null)"; then
+            if [ "$EXISTING_TAG_SHA" != "$GITHUB_SHA" ]; then
+              echo "::error title=Existing release tag targets another commit::$TAG points to $EXISTING_TAG_SHA, expected $GITHUB_SHA"
+              exit 1
+            fi
+            echo "::notice title=Reusing release tag::$TAG already points to this commit"
           fi
           {
             echo "tag=$TAG"
@@ -186,16 +215,14 @@ jobs:
       - name: Set up ORAS
         id: oras
         if: ${{ inputs.publish_oci }}
-        continue-on-error: true
-        uses: oras-project/setup-oras@v1
+        uses: oras-project/setup-oras@22ce207df3b08e061f537244349aac6ae1d214f6 # v1
         with:
           url: https://github.com/oras-project/oras/releases/download/v1.3.4/oras_1.3.4_linux_amd64.tar.gz
           checksum: f27adb935022d94df8dc77719c322dda592c78a0d57a6f7dcdd8d900b248c454
 
       - name: Publish APKs to OCI Registry
         id: oci
         if: ${{ inputs.publish_oci && steps.oras.outcome == 'success' }}
-        continue-on-error: true
         env:
           DIST_DIR: dist
           OCI_METADATA_FILE: build/oci-metadata.json
@@ -205,10 +232,6 @@ jobs:
           OCI_TOKEN: ${{ secrets.OCI_TOKEN }}
         run: bash .github/scripts/publish-oci-apks.sh
 
-      - name: Report OCI publish failure
-        if: ${{ inputs.publish_oci && (steps.oras.outcome == 'failure' || steps.oci.outcome == 'failure') }}
-        run: echo "::warning title=OCI publish unavailable::GitHub release will continue without OCI metadata."
-
       - name: Prepare release notes input
         id: release_notes
         env:
@@ -298,12 +321,58 @@ jobs:
             PRERELEASE_FLAG="--prerelease"
           fi
           NOTES="${RELEASE_NOTES:-手动触发 GitHub Actions 构建发布。}"
-          gh release create "${{ steps.meta.outputs.tag }}" \
-            --target "$GITHUB_SHA" \
-            --title "${{ steps.meta.outputs.title }}" \
-            --notes "$NOTES" \
-            $PRERELEASE_FLAG \
-            dist/*.apk dist/*.json
+          if gh release view "${{ steps.meta.outputs.tag }}" >/dev/null 2>&1; then
+            gh release upload "${{ steps.meta.outputs.tag }}" dist/*.apk dist/*.json --clobber
+          else
+            gh release create "${{ steps.meta.outputs.tag }}" \
+              --target "$GITHUB_SHA" \
+              --title "${{ steps.meta.outputs.title }}" \
+              --notes "$NOTES" \
+              $PRERELEASE_FLAG \
+              dist/*.apk dist/*.json
+          fi
+
+      - name: Publish update channel manifests
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          set -euo pipefail
+          rm -rf channel-manifests other-channel-manifests
+          mkdir -p channel-manifests other-channel-manifests
+          cp dist/*.json channel-manifests/
+
+          if [ "${{ steps.meta.outputs.channel }}" = "stable" ]; then
+            OTHER_TAG="$(gh release list --limit 100 --json tagName,isDraft,isPrerelease \
+              --jq '[.[] | select((.isDraft == false) and (.isPrerelease == true) and (.tagName | test("-beta-[0-9]{12}$")))] | first | .tagName // ""')"
+            OTHER_PATTERN="*-beta.json"
+          else
+            OTHER_TAG="$(gh release list --limit 100 --json tagName,isDraft,isPrerelease \
+              --jq '[.[] | select((.isDraft == false) and (.isPrerelease == false) and (.tagName | test("^v.+-[0-9]{12}$")))] | first | .tagName // ""')"
+            OTHER_PATTERN="*.json"
+          fi
+
+          if [ -n "$OTHER_TAG" ]; then
+            if gh release download "$OTHER_TAG" --pattern "$OTHER_PATTERN" --dir other-channel-manifests; then
+              for manifest in other-channel-manifests/*.json; do
+                [ -e "$manifest" ] || continue
+                if [ "${{ steps.meta.outputs.channel }}" = "beta" ] && [[ "$(basename "$manifest")" == *-beta.json ]]; then
+                  continue
+                fi
+                cp "$manifest" channel-manifests/
+              done
+            else
+              echo "::warning title=Channel manifest seed failed::Could not download $OTHER_PATTERN from $OTHER_TAG."
+            fi
+          fi
+
+          if ! gh release view "$UPDATE_CHANNEL_TAG" >/dev/null 2>&1; then
+            gh release create "$UPDATE_CHANNEL_TAG" \
+              --target "$GITHUB_SHA" \
+              --title "Update channel manifests" \
+              --notes "Machine-managed stable and beta update manifests." \
+              --prerelease
+          fi
+          gh release upload "$UPDATE_CHANNEL_TAG" channel-manifests/*.json --clobber
 
       - name: Sync to CNB
         if: ${{ inputs.sync_cnb }}

.github/workflows/delayed-dev-promotion.yml

@@ -0,0 +1,102 @@
+name: Delayed Dev Promotion
+
+# Git does not retain per-commit remote push timestamps. This workflow promotes
+# the newest first-parent dev commit whose commit timestamp is older than the delay.
+
+on:
+  schedule:
+    - cron: "17 * * * *"
+  workflow_dispatch:
+    inputs:
+      delay_hours:
+        description: "Hours a dev commit must age before it is promoted"
+        required: false
+        default: "24"
+        type: string
+
+permissions:
+  contents: write
+
+concurrency:
+  group: delayed-dev-promotion
+  cancel-in-progress: false
+
+env:
+  TZ: Asia/Shanghai
+  SOURCE_BRANCH: dev
+  TARGET_BRANCH: main
+  DEFAULT_DELAY_HOURS: "24"
+
+jobs:
+  promote:
+    name: Promote delayed dev commit to main
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Promote eligible dev commit
+        env:
+          DELAY_HOURS_INPUT: ${{ github.event.inputs.delay_hours }}
+        run: |
+          set -euo pipefail
+
+          delay_hours="${DELAY_HOURS_INPUT:-$DEFAULT_DELAY_HOURS}"
+          if ! printf '%s' "$delay_hours" | grep -Eq '^[0-9]+$'; then
+            echo "::error title=Invalid delay_hours::Expected a positive integer, got: $delay_hours"
+            exit 1
+          fi
+          if [ "$delay_hours" -lt 1 ]; then
+            echo "::error title=Invalid delay_hours::Expected delay_hours to be at least 1."
+            exit 1
+          fi
+
+          git fetch origin \
+            "+refs/heads/${SOURCE_BRANCH}:refs/remotes/origin/${SOURCE_BRANCH}" \
+            "+refs/heads/${TARGET_BRANCH}:refs/remotes/origin/${TARGET_BRANCH}"
+
+          cutoff="$(date -u -d "${delay_hours} hours ago" +'%Y-%m-%dT%H:%M:%SZ')"
+          eligible="$(git rev-list --first-parent -n 1 --before="$cutoff" "origin/${SOURCE_BRANCH}" || true)"
+
+          if [ -z "$eligible" ]; then
+            echo "No ${SOURCE_BRANCH} commit is older than ${delay_hours} hours."
+            exit 0
+          fi
+
+          short="$(git rev-parse --short=12 "$eligible")"
+          subject="$(git log -1 --format=%s "$eligible")"
+          echo "Eligible ${SOURCE_BRANCH} commit: ${short} ${subject}"
+          echo "Cutoff (UTC): ${cutoff}"
+
+          if git merge-base --is-ancestor "$eligible" "origin/${TARGET_BRANCH}"; then
+            echo "${short} is already reachable from ${TARGET_BRANCH}."
+            exit 0
+          fi
+
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git checkout -B "$TARGET_BRANCH" "origin/${TARGET_BRANCH}"
+
+          if ! git merge --no-ff --no-edit "$eligible"; then
+            echo "::error title=Promotion merge conflict::${SOURCE_BRANCH}@${short} cannot be merged into ${TARGET_BRANCH} cleanly."
+            exit 1
+          fi
+
+          if ! git push origin "HEAD:refs/heads/${TARGET_BRANCH}"; then
+            echo "::error title=Promotion push failed::${TARGET_BRANCH} changed concurrently or rejects direct Actions pushes; no force push was attempted."
+            exit 1
+          fi
+
+          {
+            echo "## Delayed dev promotion"
+            echo
+            echo "Promoted \`${SOURCE_BRANCH}\` commit \`${short}\` to \`${TARGET_BRANCH}\`."
+            echo
+            echo "- Delay: ${delay_hours} hours"
+            echo "- Cutoff (UTC): ${cutoff}"
+            echo "- Subject: ${subject}"
+          } >> "$GITHUB_STEP_SUMMARY"

.gitignore

@@ -3,6 +3,7 @@
 .vscode/
 .gradle/
 build/
+.cxx/
 dist/
 out/
 !third_party/mpv-native-overrides/aimagereader-stable/video/out/
@@ -27,6 +28,12 @@ nostr_副本*.html
 __pycache__/
 *.pyc
 third_party/sources/
+app/signing/
+.gradle-user-home/
 plans/
-/docs/
+.tokensave
+.codebase-memory
+graphify-out/
 .codex/task-state/
+
+参考/*