Fix release version alignment with upstream and mark-release-tag push

- build-release.yml now accepts release_version input and bumps
  package.json before building, so fork releases match upstream tag
  versions (e.g. v0.0.84) instead of the stale version on main
- sync-fork.yml passes upstream release tag to build workflow
- mark-release-tag pulls latest before pushing to avoid non-fast-forward
  rejection (sync-and-build pushes first)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: aadivar

.github/workflows/build-release.yml

@@ -2,7 +2,17 @@ name: Build and Release
 
 on:
   workflow_dispatch:
+    inputs:
+      release_version:
+        description: "Version to release (e.g. 0.0.84). Leave empty to use package.json version."
+        type: string
+        default: ""
   workflow_call:
+    inputs:
+      release_version:
+        description: "Version to release (from upstream tag)"
+        type: string
+        default: ""
 
 # Prevent concurrent builds
 concurrency:
@@ -18,6 +28,15 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Bump version to match upstream release
+        if: inputs.release_version != ''
+        run: |
+          # Strip leading 'v' if present (e.g. v0.0.84 -> 0.0.84)
+          VERSION="${{ inputs.release_version }}"
+          VERSION="${VERSION#v}"
+          npm version "$VERSION" --no-git-tag-version
+          echo "Version bumped to $VERSION"
+
       - name: Setup Python (for node-gyp)
         uses: actions/setup-python@v5
         with:
@@ -86,6 +105,15 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Bump version to match upstream release
+        if: inputs.release_version != ''
+        run: |
+          # Strip leading 'v' if present (e.g. v0.0.84 -> 0.0.84)
+          VERSION="${{ inputs.release_version }}"
+          VERSION="${VERSION#v}"
+          npm version "$VERSION" --no-git-tag-version
+          echo "Version bumped to $VERSION"
+
       - name: Setup Python (for node-gyp)
         uses: actions/setup-python@v5
         with:
@@ -134,6 +162,15 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Bump version to match upstream release
+        if: inputs.release_version != ''
+        run: |
+          # Strip leading 'v' if present (e.g. v0.0.84 -> 0.0.84)
+          VERSION="${{ inputs.release_version }}"
+          VERSION="${VERSION#v}"
+          npm version "$VERSION" --no-git-tag-version
+          echo "Version bumped to $VERSION"
+
       - name: Setup Python (for node-gyp)
         uses: actions/setup-python@v5
         with:

.github/workflows/sync-fork.yml

@@ -161,6 +161,8 @@ jobs:
     needs: [check-upstream, sync-and-build]
     if: needs.check-upstream.outputs.should_release == 'true' && (needs['sync-and-build'].result == 'skipped' || needs['sync-and-build'].outputs.sync_success == 'true')
     uses: ./.github/workflows/build-release.yml
+    with:
+      release_version: ${{ needs.check-upstream.outputs.latest_release_tag }}
     secrets: inherit
 
   mark-release-tag:
@@ -172,13 +174,17 @@ jobs:
       - name: Checkout fork
         uses: actions/checkout@v4
         with:
+          ref: main
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Configure Git
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
 
+      - name: Pull latest (sync-and-build may have pushed)
+        run: git pull --rebase origin main
+
       - name: Update last released upstream tag marker
         run: |
           echo "${{ needs.check-upstream.outputs.latest_release_tag }}" > .last-released-upstream-tag