Workbench fix

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,49 @@
+## Summary
+
+Describe the user-visible behavior change and why it belongs in Termux:API.
+
+## Scope
+
+- [ ] Android app-side implementation
+- [ ] `TermuxApiReceiver` dispatch
+- [ ] Manifest permissions / activities / services
+- [ ] Debug-only behavior
+- [ ] Companion `termux-api-package` wrapper/helper change
+- [ ] Documentation only
+
+## Runtime proof
+
+Paste the exact commands and results used to validate the change.
+
+```text
+Device:
+Android version:
+Installed app package:
+Installed app version:
+Command helper target package/component/socket:
+Commands run:
+Result:
+```
+
+## CI
+
+- [ ] GitHub Actions debug APK build passes
+- [ ] Artifact SHA / run ID recorded when runtime testing uses a CI APK
+
+## Package / signing compatibility
+
+- [ ] This change does not require package-side updates
+- [ ] Package-side update is included or linked
+- [ ] Debug APK package identity is called out when relevant
+- [ ] Release/F-Droid replacement risk is called out when relevant
+
+## Android permissions and privacy
+
+- [ ] No new Android permissions
+- [ ] New or changed permissions are explained
+- [ ] Logs and screenshots are redacted
+- [ ] Security-sensitive behavior is documented
+
+## Notes for maintainers
+
+List anything reviewers should pay extra attention to, such as Android-version differences, OEM behavior, known limitations, or follow-up work.

.github/workflows/android-debug.yml

@@ -0,0 +1,108 @@
+name: Build Termux API App
+
+on:
+  push:
+    branches: [ master, workbench-api-updates ]
+  pull_request:
+    branches: [ master, workbench-api-updates ]
+  schedule:
+    - cron: "15 0 1 */2 *"
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    name: Build debug APK
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Set up JDK
+        uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: "17"
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v6
+
+      - name: Make Gradle wrapper executable
+        run: chmod +x ./gradlew
+
+      - name: Build Debug APK
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          echo "Setting build variables..."
+
+          # Use PR head SHA instead of merge commit.
+          if [ "$GITHUB_EVENT_NAME" = "pull_request" ]; then
+            GITHUB_SHA="${{ github.event.pull_request.head.sha }}"
+          fi
+
+          CURRENT_VERSION_NAME=$(grep -m 1 -E 'versionName\s+"([^"]+)"' ./app/build.gradle \
+            | sed -E 's/.*versionName\s+"([^"]+)".*/\1/')
+
+          if [ -z "$CURRENT_VERSION_NAME" ]; then
+            echo "❌ Could not extract versionName from app/build.gradle"
+            exit 1
+          fi
+
+          SHORT_SHA="${GITHUB_SHA:0:7}"
+          RELEASE_VERSION_NAME="v${CURRENT_VERSION_NAME}+${SHORT_SHA}"
+
+          if ! printf "%s" "${RELEASE_VERSION_NAME#v}" | grep -qP '^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$'; then
+            echo "❌ Invalid SemVer: ${RELEASE_VERSION_NAME#v}"
+            echo "Current versionName: $CURRENT_VERSION_NAME"
+            exit 1
+          fi
+
+          APK_DIR_PATH="./app/build/outputs/apk/debug"
+          APK_VERSION_TAG="${RELEASE_VERSION_NAME#v}.github.debug"
+          APK_BASENAME_PREFIX="termux-api-app_${APK_VERSION_TAG}"
+
+          echo "APK_DIR_PATH=$APK_DIR_PATH" >> "$GITHUB_ENV"
+          echo "APK_VERSION_TAG=$APK_VERSION_TAG" >> "$GITHUB_ENV"
+          echo "APK_BASENAME_PREFIX=$APK_BASENAME_PREFIX" >> "$GITHUB_ENV"
+
+          echo "Building APK for version: $RELEASE_VERSION_NAME"
+
+          export TERMUX_API_APP__BUILD__APP_VERSION_NAME="${RELEASE_VERSION_NAME#v}"
+          export TERMUX_API_APP__BUILD__APK_VERSION_TAG="$APK_VERSION_TAG"
+
+          ./gradlew assembleDebug --no-daemon --console=plain
+
+          APK_PATH="${APK_DIR_PATH}/${APK_BASENAME_PREFIX}.apk"
+          if [ ! -f "$APK_PATH" ]; then
+            echo "❌ APK not found at expected path: $APK_PATH"
+            echo "Files in output directory:"
+            ls -la "$APK_DIR_PATH" || true
+            exit 1
+          fi
+
+          echo "✅ APK built successfully: $APK_PATH"
+
+          (cd "$APK_DIR_PATH" && sha256sum "${APK_BASENAME_PREFIX}.apk" > checksums-sha256.txt)
+
+          echo "checksums-sha256.txt:"
+          echo '```'
+          cat "$APK_DIR_PATH/checksums-sha256.txt"
+          echo '```'
+
+      - name: Upload Build Artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: termux-api-debug-apk
+          path: |
+            ${{ env.APK_DIR_PATH }}/${{ env.APK_BASENAME_PREFIX }}.apk
+            ${{ env.APK_DIR_PATH }}/checksums-sha256.txt
+            ${{ env.APK_DIR_PATH }}/output-metadata.json
+          if-no-files-found: error
+          retention-days: 30

.github/workflows/github_action_build.yml

@@ -1,75 +1,107 @@
-name: GitHub Action Build
+name: Build Termux API App
 
 on:
   push:
-    branches:
-      - master
+    branches: [ master, workbench-api-updates ]
   pull_request:
-    branches:
-      - master
+    branches: [ master, workbench-api-updates ]
   schedule:
-    - cron: "15 0 1 */2 *"
+    - cron: "15 0 1 */2 *"  # 1st of every even month at 00:15
   workflow_dispatch:
 
 jobs:
   build:
     runs-on: ubuntu-latest
+
     steps:
-      - name: Clone repository
-        uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0  # Needed if you ever want full history
+
+      - name: Set up JDK
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: '17'  # Adjust to your project's requirement
 
-      - name: Build
-        shell: bash {0}
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v6
+
+      - name: Build Debug APK
+        shell: bash
         run: |
-          exit_on_error() { echo "$1"; exit 1; }
+          set -euo pipefail
 
-          echo "Setting vars"
+          echo "Setting build variables..."
 
-          if [ "$GITHUB_EVENT_NAME" == "pull_request" ]; then
-              GITHUB_SHA="${{ github.event.pull_request.head.sha }}" # Do not use last merge commit set in GITHUB_SHA
+          # Use PR head SHA instead of merge commit when running for pull_request.
+          if [ "${GITHUB_EVENT_NAME}" = "pull_request" ]; then
+            if command -v jq >/dev/null 2>&1; then
+              GITHUB_SHA="$(jq -r '.pull_request.head.sha // env.GITHUB_SHA' "${GITHUB_EVENT_PATH}")"
+            fi
           fi
 
-          # Set RELEASE_VERSION_NAME to "<CURRENT_VERSION_NAME>+<last_commit_hash>"
-          CURRENT_VERSION_NAME_REGEX='\s+versionName "([^"]+)"$'
-          CURRENT_VERSION_NAME="$(grep -m 1 -E "$CURRENT_VERSION_NAME_REGEX" ./app/build.gradle | sed -r "s/$CURRENT_VERSION_NAME_REGEX/\1/")"
-          RELEASE_VERSION_NAME="v$CURRENT_VERSION_NAME+${GITHUB_SHA:0:7}" # The "+" is necessary so that versioning precedence is not affected
-          if ! printf "%s" "${RELEASE_VERSION_NAME/v/}" | grep -qP '^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$'; then
-            exit_on_error "The release version '${RELEASE_VERSION_NAME/v/}' generated from current version '$CURRENT_VERSION_NAME' is not a valid version as per semantic version '2.0.0' spec in the format 'major.minor.patch(-prerelease)(+buildmetadata)'. https://semver.org/spec/v2.0.0.html."
+          # Extract versionName from build.gradle
+          CURRENT_VERSION_NAME=$(grep -m 1 -E 'versionName\s+"([^"]+)"' ./app/build.gradle \
+            | sed -E 's/.*versionName\s+"([^"]+)".*/\1/')
+
+          if [ -z "$CURRENT_VERSION_NAME" ]; then
+            echo "Could not extract versionName from app/build.gradle"
+            exit 1
+          fi
+
+          SHORT_SHA="${GITHUB_SHA:0:7}"
+          RELEASE_VERSION_NAME="v${CURRENT_VERSION_NAME}+${SHORT_SHA}"
+
+          # SemVer 2.0.0 validation (with build metadata)
+          if ! printf "%s" "${RELEASE_VERSION_NAME#v}" | grep -qP '^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$'; then
+            echo "Invalid SemVer: ${RELEASE_VERSION_NAME#v}"
+            echo "Current versionName: $CURRENT_VERSION_NAME"
+            exit 1
           fi
 
           APK_DIR_PATH="./app/build/outputs/apk/debug"
-          APK_VERSION_TAG="$RELEASE_VERSION_NAME.github.debug" # Note the ".", GITHUB_SHA will already have "+" before it
-          APK_BASENAME_PREFIX="termux-api-app_$APK_VERSION_TAG"
+          APK_VERSION_TAG="${RELEASE_VERSION_NAME#v}.github.debug"
+          APK_BASENAME_PREFIX="termux-api-app_${APK_VERSION_TAG}"
 
-          # Used by upload step later
           echo "APK_DIR_PATH=$APK_DIR_PATH" >> $GITHUB_ENV
           echo "APK_VERSION_TAG=$APK_VERSION_TAG" >> $GITHUB_ENV
           echo "APK_BASENAME_PREFIX=$APK_BASENAME_PREFIX" >> $GITHUB_ENV
 
-          echo "Building APK file for '$RELEASE_VERSION_NAME' release with '$APK_VERSION_TAG' tag"
-          export TERMUX_API_APP__BUILD__APP_VERSION_NAME="${RELEASE_VERSION_NAME/v/}" # Used by app/build.gradle
-          export TERMUX_API_APP__BUILD__APK_VERSION_TAG="$APK_VERSION_TAG" # Used by app/build.gradle
-          if ! ./gradlew assembleDebug; then
-            exit_on_error "Build failed for '$RELEASE_VERSION_NAME' release with '$APK_VERSION_TAG' tag."
-          fi
+          echo "Building APK for version: $RELEASE_VERSION_NAME"
 
-          echo "Validating APK file"
-          if ! test -f "$APK_DIR_PATH/${APK_BASENAME_PREFIX}.apk"; then
-            files_found="$(ls "$APK_DIR_PATH")"
-            exit_on_error "Failed to find built APK file at '$APK_DIR_PATH/${APK_BASENAME_PREFIX}.apk'. Files found: "$'\n'"$files_found"
-          fi
+          export TERMUX_API_APP__BUILD__APP_VERSION_NAME="${RELEASE_VERSION_NAME#v}"
+          export TERMUX_API_APP__BUILD__APK_VERSION_TAG="$APK_VERSION_TAG"
+
+          ./gradlew assembleDebug --no-daemon
 
-          echo "Generating checksums-sha256.txt file"
-          if ! (cd "$APK_DIR_PATH"; sha256sum "${APK_BASENAME_PREFIX}.apk" > checksums-sha256.txt); then
-            exit_on_error "Generate checksums-sha256.txt file failed for '$RELEASE_VERSION_NAME' release."
+          # Validation
+          APK_PATH="${APK_DIR_PATH}/${APK_BASENAME_PREFIX}.apk"
+          if [ ! -f "$APK_PATH" ]; then
+            echo "APK not found at expected path: $APK_PATH"
+            echo "Files in output directory:"
+            ls -la "$APK_DIR_PATH" || true
+            exit 1
           fi
-          echo "checksums-sha256.txt:"$'\n```\n'"$(cat "$APK_DIR_PATH/checksums-sha256.txt")"$'\n```'
 
-      - name: Upload files to action
-        uses: actions/upload-artifact@v4
+          echo "APK built successfully: $APK_PATH"
+
+          # Generate checksum
+          (cd "$APK_DIR_PATH" && sha256sum "${APK_BASENAME_PREFIX}.apk" > checksums-sha256.txt)
+
+          echo "checksums-sha256.txt:"
+          echo '```'
+          cat "$APK_DIR_PATH/checksums-sha256.txt"
+          echo '```'
+
+      - name: Upload Build Artifacts
+        uses: actions/upload-artifact@v7
         with:
-          name: ${{ env.APK_BASENAME_PREFIX }}
+          name: termux-api-debug
           path: |
-            ${{ env.APK_DIR_PATH }}/${{ env.APK_BASENAME_PREFIX }}.apk
-            ${{ env.APK_DIR_PATH }}/checksums-sha256.txt
-            ${{ env.APK_DIR_PATH }}/output-metadata.json
+            app/build/outputs/apk/debug/*.apk
+            app/build/outputs/apk/debug/checksums-sha256.txt
+            app/build/outputs/apk/debug/output-metadata.json
+          if-no-files-found: error
+          retention-days: 30

.github/workflows/github_release_build.yml

@@ -12,7 +12,7 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Clone repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           ref: ${{ env.GITHUB_REF }}
 

.gitignore

@@ -34,3 +34,6 @@ Thumbs.db
 
 # Temp/backup files
 *~
+
+artifacts/
+build-output/