MetaMask
diff --git a/‎.github/scripts/bump-ota-version-constants.sh‎
Lines changed: 7 additions & 4 deletions b/‎.github/scripts/bump-ota-version-constants.sh‎
Lines changed: 7 additions & 4 deletions
diff --git a/‎.github/scripts/extract-semver.sh‎
Lines changed: 29 additions & 8 deletions b/‎.github/scripts/extract-semver.sh‎
Lines changed: 29 additions & 8 deletions
diff --git a/‎.github/scripts/run-update-release-changelog-mobile.sh‎
Lines changed: 22 additions & 51 deletions b/‎.github/scripts/run-update-release-changelog-mobile.sh‎
Lines changed: 22 additions & 51 deletions
diff --git a/‎.github/workflows/auto-create-release-pr.yml‎
Lines changed: 12 additions & 8 deletions b/‎.github/workflows/auto-create-release-pr.yml‎
Lines changed: 12 additions & 8 deletions
diff --git a/‎.github/workflows/build-rc-auto.yml‎
Lines changed: 6 additions & 3 deletions b/‎.github/workflows/build-rc-auto.yml‎
Lines changed: 6 additions & 3 deletions
diff --git a/‎.github/workflows/create-bug-report.yml‎
Lines changed: 4 additions & 1 deletion b/‎.github/workflows/create-bug-report.yml‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎.github/workflows/create-release-pr.yml‎
Lines changed: 29 additions & 20 deletions b/‎.github/workflows/create-release-pr.yml‎
Lines changed: 29 additions & 20 deletions
@@ -2,8 +2,10 @@
 # Updates OTA_VERSION in app/constants/ota.ts.
 #
 # With a semver second argument (OTA hotfix release workflow): sets OTA_VERSION to v<semver>
-# exactly as provided (e.g. 7.73.01 -> v7.73.01, 7.73.21 -> v7.73.21). No normalization is applied.
-# Two-digit patch AB means OTA hotfix: base patch A, iteration B.
+# exactly as provided (e.g. 7.75.2 -> v7.75.2). No normalization is applied.
+# The OTA hotfix branch is release/X.Y.Z-ota; the bare X.Y.Z is passed here. Runway always
+# increments the patch past any existing native tag on the same X.Y line, so v<X.Y.Z> is
+# unique (no collision with a native release tag).
 #
 # Without semver (local / legacy): increments in place — vX.XX.X -> v0, vN -> v(N+1), vA.B.C -> vA.B.(C+1)
 set -euo pipefail
@@ -30,8 +32,9 @@ fi
 
 new=""
 if [[ -n "$SEMVER" ]]; then
-  if ! [[ "$SEMVER" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-    echo "Error: semver must be numeric X.Y.Z, got: ${SEMVER}" >&2
+  # Strict SemVer core: no leading zeros on numeric identifiers.
+  if ! [[ "$SEMVER" =~ ^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$ ]]; then
+    echo "Error: semver must be strict SemVer X.Y.Z (no leading zeros), got: ${SEMVER}" >&2
     exit 1
   fi
   new="v${SEMVER}"
 
@@ -2,21 +2,42 @@
 
 set -euo pipefail
 
+# Extracts semver from a release branch name and flags whether it's an OTA hotfix.
+#
+# Supported branch shapes:
+#   release/X.Y.Z       → semver=X.Y.Z, is_ota=false
+#   release/X.Y.Z-ota   → semver=X.Y.Z, is_ota=true
+#
+# The `-ota` suffix is the signal for an OTA hotfix. Runway always increments the
+# patch past any native tag on the same X.Y line, so the stripped semver is still
+# unique (e.g. native v7.75.1 → OTA branch release/7.75.2-ota; git tag v7.75.2 is
+# fresh). OTA_VERSION in app/constants/ota.ts is set to the stripped semver
+# (v7.75.2), and the production OTA tag uses the same v-prefixed string.
+
 ref_name="${GITHUB_REF#refs/heads/}"
 
-# Extract semver only for release/X.Y.Z
-if [[ "$ref_name" == release/* ]]; then
-  semver="${ref_name#release/}"
-else
-  echo "Error: Branch name must be release/X.Y.Z where X, Y, Z are numbers. Got: $ref_name" >&2
+if [[ "$ref_name" != release/* ]]; then
+  echo "Error: Branch name must be release/X.Y.Z or release/X.Y.Z-ota. Got: $ref_name" >&2
   exit 1
 fi
 
-# Validate semver format X.Y.Z where X, Y, Z are numbers
-if ! [[ "$semver" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-  echo "Error: Invalid semver in branch name: $ref_name (extracted: $semver; must be numeric X.Y.Z)" >&2
+tail="${ref_name#release/}"
+
+is_ota="false"
+if [[ "$tail" == *-ota ]]; then
+  is_ota="true"
+  semver="${tail%-ota}"
+else
+  semver="$tail"
+fi
+
+# Strict SemVer core: no leading zeros on numeric identifiers (0 alone is fine).
+if ! [[ "$semver" =~ ^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$ ]]; then
+  echo "Error: Invalid semver in branch name: $ref_name (extracted: $semver; must be strict SemVer X.Y.Z with no leading zeros)" >&2
   exit 1
 fi
 
 echo "  semver-version: ${semver}"
+echo "  is-ota: ${is_ota}"
 echo "semver=${semver}" >> "$GITHUB_OUTPUT"
+echo "is_ota=${is_ota}" >> "$GITHUB_OUTPUT"
@@ -1,25 +1,19 @@
 #!/usr/bin/env bash
 # Invokes MetaMask github-tools update-release-changelog.sh with OTA version handling.
 #
-# OTA hotfix detection: a two-digit patch in the branch version (e.g. release/7.77.01).
-# auto-changelog rejects these as invalid SemVer (leading zeros are forbidden).
-#
-# This wrapper converts the Runway OTA version to a valid SemVer prerelease
-# for the changelog tool:
-#   Runway 7.77.01  → SemVer 7.77.0-ota.1
-#   Runway 7.77.21  → SemVer 7.77.2-ota.1
-#
-# The SemVer prerelease format stays in CHANGELOG.md permanently. auto-changelog
-# validates ALL version headers on every run, so non-SemVer versions like 7.77.01
-# would break all future changelog generation (not just OTA runs).
-#
-# The Runway version (7.77.01) is used only in branch names, OTA_VERSION, and PR titles.
-#
-# Mapping (two-digit patch AB):  X.Y.AB → X.Y.A-ota.B
-# Single-digit patches pass through unchanged.
+# Branch conventions:
+#   release/X.Y.Z       → native release/hotfix; passes through unchanged (tool derives
+#                         the version from package.json on the branch).
+#   release/X.Y.Z-ota   → OTA hotfix; the -ota suffix exists only on the branch name.
+#                         The changelog header and the production git tag both use the
+#                         bare X.Y.Z. package.json on the OTA branch still carries the
+#                         previous native version (OTA doesn't bump native), so we must
+#                         pass X.Y.Z explicitly to auto-changelog. Runway always advances
+#                         X.Y.Z past any existing native patch on the same X.Y line, so
+#                         the bare header never collides with a prior native entry.
 set -euo pipefail
 
-RELEASE_BRANCH="${1:?release branch (e.g. release/7.73.01)}"
+RELEASE_BRANCH="${1:?release branch (e.g. release/7.75.0 or release/7.75.2-ota)}"
 PLATFORM="${2:?platform (mobile|extension)}"
 REPO_URL="${3:?repository https URL}"
 PREV_REF="${4:-null}"
@@ -30,47 +24,24 @@ if [[ ! -f "$SCRIPT" ]]; then
   exit 1
 fi
 
-# Extract version from branch name
-if [[ "$RELEASE_BRANCH" =~ ^release/([0-9]+\.[0-9]+\.[0-9]+)$ ]]; then
+# Extract version and detect OTA suffix from branch name
+if [[ "$RELEASE_BRANCH" =~ ^release/([0-9]+\.[0-9]+\.[0-9]+)(-ota)?$ ]]; then
   RUNWAY_VERSION="${BASH_REMATCH[1]}"
+  OTA_SUFFIX="${BASH_REMATCH[2]}"
 else
-  echo "Error: branch does not match release/X.Y.Z: ${RELEASE_BRANCH}" >&2
+  echo "Error: branch does not match release/X.Y.Z or release/X.Y.Z-ota: ${RELEASE_BRANCH}" >&2
   exit 1
 fi
 
-PATCH="${RUNWAY_VERSION##*.}"
+if [[ -n "$OTA_SUFFIX" ]]; then
+  # OTA hotfix: pass the bare X.Y.Z as the explicit SemVer version because package.json
+  # on the OTA branch is still pinned to the prior native version.
+  echo "OTA hotfix detected: branch ${RELEASE_BRANCH} → changelog header ${RUNWAY_VERSION}, tag v${RUNWAY_VERSION}"
 
-if [[ ${#PATCH} -eq 2 ]]; then
-  # OTA hotfix: two-digit patch AB → X.Y.A-ota.B
-  BASE_PATCH="${PATCH:0:1}"
-  OTA_NUM="${PATCH:1:1}"
-  SEMVER_VERSION="${RUNWAY_VERSION%.*}.${BASE_PATCH}-ota.${OTA_NUM}"
-
-  echo "OTA hotfix detected: Runway ${RUNWAY_VERSION} → SemVer ${SEMVER_VERSION}"
-
-  # Pass real branch (arg 1) for git ops, valid SemVer (arg 6) for auto-changelog.
+  # Pass real branch (arg 1) for git ops, bare SemVer (arg 6) for auto-changelog.
   # Changelog branch (arg 5) left empty so the tool auto-derives it from the SemVer version.
-  "$SCRIPT" "$RELEASE_BRANCH" "$PLATFORM" "$REPO_URL" "$PREV_REF" "" "$SEMVER_VERSION"
-
-  # Fix comparison URLs on the changelog branch.
-  # auto-changelog generates tag refs like "v7.76.0-ota.1" but the actual git tag
-  # is "v7.76.01" (Runway format). Only URL tag refs carry the "v" prefix, so this
-  # sed does not touch version headers (which are bare "7.76.0-ota.1" without "v").
-  CL_BRANCH="release-changelog/${SEMVER_VERSION}"
-  git fetch origin "$CL_BRANCH" 2>/dev/null || true
-  if git rev-parse "origin/${CL_BRANCH}" >/dev/null 2>&1; then
-    git checkout "$CL_BRANCH"
-    if grep -q "v${SEMVER_VERSION}" CHANGELOG.md 2>/dev/null; then
-      sed -i "s|v${SEMVER_VERSION}|v${RUNWAY_VERSION}|g" CHANGELOG.md
-      if ! git diff --quiet CHANGELOG.md; then
-        git add CHANGELOG.md
-        git commit -m "fix: use Runway tag v${RUNWAY_VERSION} in changelog comparison URLs"
-        git push origin "$CL_BRANCH"
-        echo "Fixed changelog comparison URLs: v${SEMVER_VERSION} → v${RUNWAY_VERSION}"
-      fi
-    fi
-  fi
+  exec "$SCRIPT" "$RELEASE_BRANCH" "$PLATFORM" "$REPO_URL" "$PREV_REF" "" "$RUNWAY_VERSION"
 else
-  # Regular release or single-digit hotfix: pass through unchanged
+  # Native release or hotfix: pass through; the tool derives the version from package.json.
   exec "$SCRIPT" "$RELEASE_BRANCH" "$PLATFORM" "$REPO_URL" "$PREV_REF"
 fi
@@ -1,13 +1,15 @@
 name: Auto Create Release PR
 
-# When Runway creates release/X.Y.Z, this workflow calls create-release-pr.yml.
-# Semver convention for mobile hotfixes:
-# - X.Y.0 — regular release (no OTA_VERSION bump)
-# - X.Y.Z with a single-digit patch (e.g. 7.71.1, 7.71.2) — regular hotfix (no OTA_VERSION bump)
-# - X.Y.AB with a two-digit patch (e.g. 7.73.01, 7.73.21) — OTA hotfix; OTA_VERSION is v7.73.01.
-#   Two-digit patch AB → base patch A, OTA iteration B.
-#   CHANGELOG.md uses the SemVer prerelease format (e.g. 7.73.0-ota.1) permanently
-#   because auto-changelog validates all version headers as strict SemVer.
+# When Runway creates release/X.Y.Z (native) or release/X.Y.Z-ota (OTA hotfix),
+# this workflow calls create-release-pr.yml.
+# Semver / branch convention for mobile hotfixes:
+# - release/X.Y.0         — regular release (no OTA_VERSION bump).
+# - release/X.Y.Z (Z > 0) — native hotfix (no OTA_VERSION bump).
+# - release/X.Y.Z-ota     — OTA hotfix; OTA_VERSION is set to v<X.Y.Z>.
+#   Runway always increments Z past any existing native patch on the same X.Y
+#   line, so the production OTA tag v<X.Y.Z> never collides with a native tag.
+#   The `-ota` suffix is a branch-name convention ONLY: CHANGELOG.md header,
+#   OTA_VERSION, and the production git tag all use the bare X.Y.Z.
 
 on:
   create:
@@ -23,6 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       semver: ${{ steps.out.outputs.semver }}
+      is_ota: ${{ steps.out.outputs.is_ota }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -44,3 +47,4 @@ jobs:
       google-application-creds-base64: ${{ secrets.GCP_RLS_SHEET_ACCOUNT_BASE64 }}
     with:
       semver-version: ${{ needs.extract.outputs.semver }}
+      is-ota: ${{ needs.extract.outputs.is_ota == 'true' }}
@@ -54,13 +54,16 @@ jobs:
           echo "Checking branch: $BRANCH_NAME"
           echo "branch-name=$BRANCH_NAME" >> "$GITHUB_OUTPUT"
 
-          # Validate branch matches release/x.y.z format (semantic versioning)
-          if [[ "$BRANCH_NAME" =~ ^release/[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+          # Validate branch matches release/x.y.z or release/x.y.z-ota (OTA hotfix) format
+          if [[ "$BRANCH_NAME" =~ ^release/[0-9]+\.[0-9]+\.[0-9]+(-ota)?$ ]]; then
             VERSION="${BRANCH_NAME#release/}"
+            # Strip `-ota` suffix: it is a branch-name convention only. Downstream consumers
+            # (build-announce display "RC X.Y.Z", test-plan artifact name) expect strict X.Y.Z.
+            VERSION="${VERSION%-ota}"
             echo "Valid release branch detected: $BRANCH_NAME (version: $VERSION)"
             echo "semver=$VERSION" >> "$GITHUB_OUTPUT"
           else
-            echo "Branch '$BRANCH_NAME' does not match release/x.y.z pattern. Skipping."
+            echo "Branch '$BRANCH_NAME' does not match release/x.y.z or release/x.y.z-ota pattern. Skipping."
             echo "semver=" >> "$GITHUB_OUTPUT"
             exit 1
           fi
 
@@ -9,8 +9,11 @@ jobs:
       - name: Extract version from branch name if release branch
         id: extract_version
         run: |
-          if [[ "$GITHUB_REF" =~ ^refs/heads/release/[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+          if [[ "$GITHUB_REF" =~ ^refs/heads/release/[0-9]+\.[0-9]+\.[0-9]+(-ota)?$ ]]; then
             version="${GITHUB_REF#refs/heads/release/}"
+            # Strip `-ota` suffix: it is a branch-name convention only. Downstream
+            # (create-bug-report-issue.ts → isValidVersionFormat) expects strict X.Y.Z.
+            version="${version%-ota}"
             echo "New release branch($version), continue next steps"
             echo "version=$version" >> "$GITHUB_OUTPUT"
           else
 
@@ -6,12 +6,21 @@ on:
       semver-version:
         description: 'A semantic version, eg: x.x.x'
         required: true
+      is-ota:
+        description: 'Set to true for OTA hotfix (branch release/X.Y.Z-ota). Leave false for native release/hotfix.'
+        required: false
+        type: boolean
+        default: false
 
   workflow_call:
     inputs:
       semver-version:
         required: true
         type: string
+      is-ota:
+        required: false
+        type: boolean
+        default: false
     secrets:
       github-token:
         required: false
@@ -24,7 +33,8 @@ on:
 
 jobs:
   resolve-bases:
-    # Determines if the release is hotfix or not based on semver. Then sets the appropriate base branches for the checkout and release PR.
+    # Determines if the release is a hotfix or not based on semver, and whether it's an OTA hotfix
+    # based on the is-ota input. Sets the appropriate base branches for the checkout and release PR.
     runs-on: ubuntu-latest
     outputs:
       checkout_base: ${{ steps.out.outputs.checkout_base }}
@@ -35,26 +45,25 @@ jobs:
         shell: bash
         env:
           SEMVER: ${{ inputs.semver-version }}
+          IS_OTA: ${{ inputs.is-ota }}
         run: |
           set -euo pipefail
 
           echo "Provided semver input: ${SEMVER}"
-          # Validate semver
-          if ! [[ "${SEMVER:-}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-            echo "Error: semver-version must be numeric X.Y.Z, got: ${SEMVER:-<empty>}" >&2
+          echo "Provided is-ota input: ${IS_OTA}"
+          # Validate strict SemVer core (no leading zeros; the -ota suffix lives on the branch name, not the semver input).
+          if ! [[ "${SEMVER:-}" =~ ^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$ ]]; then
+            echo "Error: semver-version must be strict SemVer X.Y.Z (no leading zeros), got: ${SEMVER:-<empty>}" >&2
             exit 1
           fi
 
           patch="${SEMVER##*.}"
-          # OTA hotfix: patch has exactly two digits (e.g. 01, 21, 22).
-          # Two-digit patch AB → base patch A, OTA iteration B.
-          # Single-digit patches are regular hotfixes; single-digit 0 is a regular release.
-          if [[ ${#patch} -eq 2 ]]; then
+          if [[ "${IS_OTA}" == "true" ]]; then
             echo "is_ota=true" >> "$GITHUB_OUTPUT"
-            echo "OTA hotfix (two-digit patch: ${patch}): branch release/${SEMVER}; OTA_VERSION v${SEMVER}."
+            echo "OTA hotfix: branch release/${SEMVER}-ota; OTA_VERSION v${SEMVER}."
           else
             echo "is_ota=false" >> "$GITHUB_OUTPUT"
-            echo "Not OTA hotfix (patch segment: ${patch})."
+            echo "Native release/hotfix (patch=${patch})."
           fi
 
           if [ "$patch" -gt 0 ]; then
@@ -116,7 +125,7 @@ jobs:
           github-token: ${{ github.event_name == 'workflow_dispatch' && secrets.PR_TOKEN || secrets.github-token }}
           google-application-creds-base64: ${{ github.event_name == 'workflow_dispatch' && secrets.GCP_RLS_SHEET_ACCOUNT_BASE64 || secrets.google-application-creds-base64 }}
 
-      # Check PR before checkout/bump/push so retries do not increment OTA_VERSION again when a PR already exists.
+      # Check PR before checkout/bump/push so retries do not overwrite OTA_VERSION again when a PR already exists.
       - name: Check for existing OTA release PR
         id: ota_release_pr
         if: needs.resolve-bases.outputs.is_ota == 'true'
@@ -127,7 +136,7 @@ jobs:
           GH_TOKEN: ${{ github.event_name == 'workflow_dispatch' && secrets.PR_TOKEN || secrets.github-token }}
         run: |
           set -euo pipefail
-          BRANCH="release/${SEMVER}"
+          BRANCH="release/${SEMVER}-ota"
           COUNT=$(gh pr list --repo "$GITHUB_REPOSITORY" --head "$BRANCH" --base "$RELEASE_BASE" --json number --jq 'length')
           if [[ "$COUNT" -gt 0 ]]; then
             echo "exists=true" >> "$GITHUB_OUTPUT"
@@ -141,7 +150,7 @@ jobs:
         if: needs.resolve-bases.outputs.is_ota == 'true' && steps.ota_release_pr.outputs.exists != 'true'
         uses: actions/checkout@v4
         with:
-          ref: release/${{ inputs.semver-version }}
+          ref: release/${{ inputs.semver-version }}-ota
           token: ${{ github.event_name == 'workflow_dispatch' && secrets.PR_TOKEN || secrets.github-token }}
           fetch-depth: 0
 
@@ -153,7 +162,7 @@ jobs:
           GH_TOKEN: ${{ github.event_name == 'workflow_dispatch' && secrets.PR_TOKEN || secrets.github-token }}
         run: |
           set -euo pipefail
-          BRANCH="release/${SEMVER}"
+          BRANCH="release/${SEMVER}-ota"
           git config user.name metamaskbot
           git config user.email metamaskbot@users.noreply.github.com
           bash .github/scripts/bump-ota-version-constants.sh app/constants/ota.ts "${SEMVER}"
@@ -165,7 +174,9 @@ jobs:
             git push origin "$BRANCH"
           fi
 
-      # Changelog: run-update-release-changelog-mobile.sh converts OTA two-digit patches to valid SemVer prereleases. The SemVer format stays in CHANGELOG.md permanently.
+      # Changelog: run-update-release-changelog-mobile.sh passes the bare X.Y.Z (stripped from
+      # release/X.Y.Z-ota) to auto-changelog, so the changelog header and the production git
+      # tag match exactly (both v<X.Y.Z>). The `-ota` suffix is a branch-name convention only.
       - name: Checkout github-tools (release changelog)
         if: needs.resolve-bases.outputs.is_ota == 'true' && steps.ota_release_pr.outputs.exists != 'true'
         uses: actions/checkout@v4
@@ -194,7 +205,7 @@ jobs:
           corepack enable
           yarn install --immutable
           bash .github/scripts/run-update-release-changelog-mobile.sh \
-            "release/${{ inputs.semver-version }}" \
+            "release/${{ inputs.semver-version }}-ota" \
             mobile \
             "${{ github.server_url }}/${{ github.repository }}" \
             "null"
@@ -208,13 +219,11 @@ jobs:
           GH_TOKEN: ${{ github.event_name == 'workflow_dispatch' && secrets.PR_TOKEN || secrets.github-token }}
         run: |
           set -euo pipefail
-          BRANCH="release/${SEMVER}"
-          PATCH="${SEMVER##*.}"
-          SEMVER_CL="${SEMVER%.*}.${PATCH:0:1}-ota.${PATCH:1:1}"
+          BRANCH="release/${SEMVER}-ota"
           BODY="OTA hotfix: branch \`${BRANCH}\`."
           BODY="${BODY}"$'\n\n'"- Native semver and build version are **not** bumped."
           BODY="${BODY}"$'\n'"- \`OTA_VERSION\` in \`app/constants/ota.ts\` is \`v${SEMVER}\`."
-          BODY="${BODY}"$'\n'"- CHANGELOG.md uses the SemVer prerelease format \`${SEMVER_CL}\` (maps to Runway \`${SEMVER}\`) because auto-changelog validates all headers as strict SemVer."
+          BODY="${BODY}"$'\n'"- CHANGELOG.md header and production git tag both use bare \`${SEMVER}\` / \`v${SEMVER}\`; the \`-ota\` suffix is branch-only."
           gh pr create --repo "$GITHUB_REPOSITORY" --draft \
             --base "$RELEASE_BASE" --head "$BRANCH" \
             --title "release: ${SEMVER} (OTA)" \