From a4397d48de7f7b8b75d7c0d22744a1c6a230a529 Mon Sep 17 00:00:00 2001
From: lucaronin <luca.rossi.917@gmail.com>
Date: Sun, 12 Apr 2026 22:14:53 +0200
Subject: [PATCH] fix: split alpha and stable release channels

---
 ...{release-canary.yml => release-stable.yml} |  74 +--
 .github/workflows/release.yml                 |  79 ++--
 docs/ABSTRACTIONS.md                          |  21 +-
 docs/ARCHITECTURE.md                          |  58 ++-
 docs/GETTING-STARTED.md                       |   7 +
 ...table-release-channels-and-beta-cohorts.md |  44 ++
 docs/adr/README.md                            |   3 +-
 src-tauri/src/app_updater.rs                  | 179 +++++++
 src-tauri/src/commands/system.rs              |  48 ++
 src-tauri/src/lib.rs                          |   3 +
 src-tauri/src/settings.rs                     |  77 +++-
 src-tauri/tauri.conf.json                     |   2 +-
 src/App.tsx                                   |   2 +-
 src/components/SettingsPanel.test.tsx         |  76 +--
 src/components/SettingsPanel.tsx              | 435 ++++++++++++------
 src/hooks/useSettings.test.ts                 |   5 +-
 src/hooks/useSettings.ts                      |  17 +-
 src/hooks/useUpdater.test.ts                  | 342 +++++++-------
 src/hooks/useUpdater.ts                       |  90 ++--
 src/lib/appUpdater.ts                         |  37 ++
 src/lib/releaseChannel.test.ts                |  38 ++
 src/lib/releaseChannel.ts                     |  13 +
 .../canary-release-feature-flags.spec.ts      |  50 --
 tests/smoke/release-channel-settings.spec.ts  |  52 +++
 24 files changed, 1227 insertions(+), 525 deletions(-)
 rename .github/workflows/{release-canary.yml => release-stable.yml} (83%)
 create mode 100644 docs/adr/0057-alpha-stable-release-channels-and-beta-cohorts.md
 create mode 100644 src-tauri/src/app_updater.rs
 create mode 100644 src/lib/appUpdater.ts
 create mode 100644 src/lib/releaseChannel.test.ts
 create mode 100644 src/lib/releaseChannel.ts
 delete mode 100644 tests/smoke/canary-release-feature-flags.spec.ts
 create mode 100644 tests/smoke/release-channel-settings.spec.ts

diff --git a/.github/workflows/release-canary.yml b/.github/workflows/release-stable.yml
similarity index 83%
rename from .github/workflows/release-canary.yml
rename to .github/workflows/release-stable.yml
index a27b4153..77e83e7a 100644
--- a/.github/workflows/release-canary.yml
+++ b/.github/workflows/release-stable.yml
@@ -1,31 +1,32 @@
-name: Release (Canary)
+name: Release (Stable)
 
 on:
   push:
-    branches:
-      - canary
+    tags:
+      - 'stable-v*'
 
 concurrency:
-  group: release-canary-${{ github.ref }}
+  group: release-stable-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
   # ─────────────────────────────────────────────────────────────
-  # Phase 1: Compute the canary version string
+  # Phase 1: Compute the stable version string once
   # ─────────────────────────────────────────────────────────────
   version:
-    name: Compute version
+    name: Compute stable version
     runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.ver.outputs.version }}
       tag: ${{ steps.ver.outputs.tag }}
     steps:
       - id: ver
+        shell: bash
         run: |
-          VERSION="0.$(date -u +%Y%m%d).${GITHUB_RUN_NUMBER}-canary"
+          VERSION="${GITHUB_REF_NAME#stable-v}"
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
-          echo "tag=v$VERSION"    >> "$GITHUB_OUTPUT"
-          echo "### Canary version: \`$VERSION\`" >> "$GITHUB_STEP_SUMMARY"
+          echo "tag=${GITHUB_REF_NAME}" >> "$GITHUB_OUTPUT"
+          echo "### Stable version: \`$VERSION\`" >> "$GITHUB_STEP_SUMMARY"
 
   # ─────────────────────────────────────────────────────────────
   # Phase 2: Build each architecture in parallel
@@ -131,10 +132,10 @@ jobs:
           retention-days: 1
 
   # ─────────────────────────────────────────────────────────────
-  # Phase 3: Publish GitHub Release (prerelease)
+  # Phase 3: Publish GitHub Release
   # ─────────────────────────────────────────────────────────────
   release:
-    name: GitHub Release (canary)
+    name: GitHub Release (stable)
     needs: [version, build]
     runs-on: ubuntu-latest
     permissions:
@@ -149,26 +150,26 @@ jobs:
 
       - name: Generate release notes
         run: |
-          PREV_TAG=$(git tag --sort=-version:refname | grep canary | head -n 1 || echo "")
+          PREV_TAG=$(git tag --list 'stable-v*' --sort=-version:refname | grep -vx "${{ needs.version.outputs.tag }}" | head -n 1 || echo "")
           if [ -z "$PREV_TAG" ]; then
             NOTES=$(git log --oneline --no-merges -20)
           else
-            NOTES=$(git log --oneline --no-merges "${PREV_TAG}..HEAD")
+            NOTES=$(git log --oneline --no-merges "${PREV_TAG}..${{ needs.version.outputs.tag }}")
           fi
           {
-            echo "## What's Changed (Canary)"
+            echo "## What's Changed"
             echo ""
             echo "$NOTES" | while IFS= read -r line; do echo "- $line"; done
             echo ""
             echo "---"
-            echo "**Canary build — pre-release, may be unstable**"
+            echo "**Stable release — manually promoted from \`main\`**"
             echo ""
             echo "**Requires Apple Silicon (M1/M2/M3)**"
             echo ""
-            echo "*Built from \`$(git rev-parse --short HEAD)\` on $(date -u +%Y-%m-%d)*"
+            echo "*Built from \`$(git rev-parse --short ${{ needs.version.outputs.tag }})\` on $(date -u +%Y-%m-%d)*"
           } > release_notes.md
 
-      - name: Build latest-canary.json
+      - name: Build stable-latest.json
         run: |
           VERSION="${{ needs.version.outputs.version }}"
           TAG="${{ needs.version.outputs.tag }}"
@@ -179,10 +180,10 @@ jobs:
           ARM_SIG=$(cat updater-aarch64/*.app.tar.gz.sig)
           ARM_TARBALL=$(ls updater-aarch64/*.app.tar.gz | xargs basename)
 
-          cat > latest-canary.json << EOF
+          cat > stable-latest.json << EOF
           {
             "version": "${VERSION}",
-            "notes": "Canary build. See ${PAGES_URL} for release notes.",
+            "notes": "Stable release. See ${PAGES_URL} for full release notes.",
             "pub_date": "$(date -u +%Y-%m-%dT%H:%M:%SZ)",
             "platforms": {
               "darwin-aarch64": {
@@ -192,24 +193,24 @@ jobs:
             }
           }
           EOF
-          echo "latest-canary.json:"; cat latest-canary.json
+          echo "stable-latest.json:"; cat stable-latest.json
 
-      - name: Publish GitHub Release (prerelease)
+      - name: Publish GitHub Release
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ needs.version.outputs.tag }}
-          name: Tolaria ${{ needs.version.outputs.version }} (Canary)
+          name: Tolaria ${{ needs.version.outputs.version }}
           body_path: release_notes.md
           draft: false
-          prerelease: true
+          prerelease: false
           files: |
             dmg-aarch64/*.dmg
             updater-aarch64/*.app.tar.gz
             updater-aarch64/*.app.tar.gz.sig
-            latest-canary.json
+            stable-latest.json
 
   # ─────────────────────────────────────────────────────────────
-  # Phase 4: Update GitHub Pages (preserve stable latest.json)
+  # Phase 4: Update GitHub Pages
   # ─────────────────────────────────────────────────────────────
   pages:
     name: Update release history page
@@ -227,13 +228,16 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          mkdir -p _site
+          mkdir -p _site/alpha _site/stable
           gh api repos/${{ github.repository }}/releases --paginate > _site/releases.json
           PAGES_URL="https://refactoringhq.github.io/${GITHUB_REPOSITORY#*/}"
-          # Download stable latest.json from existing GH Pages (preserve it)
-          curl -fsSL "${PAGES_URL}/latest.json" -o _site/latest.json || echo '{}' > _site/latest.json
-          # Copy canary latest.json from this release
-          gh release download --repo ${{ github.repository }} "${{ needs.version.outputs.tag }}" --pattern "latest-canary.json" --output _site/latest-canary.json || true
+
+          curl -fsSL "${PAGES_URL}/alpha/latest.json" -o _site/alpha/latest.json || echo '{}' > _site/alpha/latest.json
+          gh release download --repo ${{ github.repository }} "${{ needs.version.outputs.tag }}" --pattern "stable-latest.json" --output _site/stable/latest.json || echo '{}' > _site/stable/latest.json
+
+          cp _site/alpha/latest.json _site/latest.json
+          cp _site/alpha/latest.json _site/latest-canary.json
+
           cat > _site/index.html << 'HTMLEOF'
           <!DOCTYPE html>
           <html lang="en">
@@ -253,13 +257,13 @@ jobs:
               .release .downloads { margin-top: 0.75rem; display: flex; gap: 0.5rem; flex-wrap: wrap; }
               .release .downloads a { display: inline-block; padding: 0.375rem 0.75rem; background: #155DFF; color: #fff; border-radius: 6px; text-decoration: none; font-size: 0.8125rem; font-weight: 500; }
               .release .downloads a:hover { background: #1248CC; }
-              .canary { border-left: 3px solid #f59e0b; }
+              .alpha { border-left: 3px solid #f59e0b; }
               .empty { color: #787774; text-align: center; padding: 3rem; }
             </style>
           </head>
           <body>
             <h1>Tolaria Release History</h1>
-            <p class="subtitle">Auto-updated on every release</p>
+            <p class="subtitle">Alpha builds update on every push to main. Stable builds appear when a stable-vX.Y.Z tag is promoted.</p>
             <div id="releases"></div>
             <script>
               fetch('releases.json').then(r=>r.json()).then(releases=>{
@@ -271,8 +275,8 @@ jobs:
                   const links=dmgs.map(a=>'<a href="'+a.browser_download_url+'">'+a.name+'</a>').join('');
                   const body=(r.body||'').replace(/</g,'&lt;').replace(/>/g,'&gt;');
                   const div=document.createElement('div');
-                  div.className='release'+(r.prerelease?' canary':'');
-                  div.innerHTML='<h2>'+(r.name||r.tag_name)+'</h2><div class="meta">'+date+' · '+r.tag_name+(r.prerelease?' · <strong>Canary</strong>':'')+'</div><div class="body">'+body+'</div>'+(links?'<div class="downloads">'+links+'</div>':'');
+                  div.className='release'+(r.prerelease?' alpha':'');
+                  div.innerHTML='<h2>'+(r.name||r.tag_name)+'</h2><div class="meta">'+date+' · '+r.tag_name+(r.prerelease?' · <strong>Alpha</strong>':'')+'</div><div class="body">'+body+'</div>'+(links?'<div class="downloads">'+links+'</div>':'');
                   el.appendChild(div);
                 });
               });
@@ -286,4 +290,4 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./_site
-          commit_message: "Update release history for canary ${{ needs.version.outputs.tag }}"
+          commit_message: "Update release history for ${{ needs.version.outputs.tag }}"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0b90b853..e2638d9e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,4 +1,4 @@
-name: Release
+name: Release (Alpha)
 
 on:
   push:
@@ -6,26 +6,48 @@ on:
       - main
 
 concurrency:
-  group: release-${{ github.ref }}
+  group: release-alpha-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
   # ─────────────────────────────────────────────────────────────
-  # Phase 1: Compute the version string once
+  # Phase 1: Compute the alpha version string once
+  # Alpha builds are prereleases of the next stable patch version.
   # ─────────────────────────────────────────────────────────────
   version:
-    name: Compute version
+    name: Compute alpha version
     runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.ver.outputs.version }}
       tag: ${{ steps.ver.outputs.tag }}
     steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
       - id: ver
+        shell: bash
         run: |
-          VERSION="0.$(date -u +%Y%m%d).${GITHUB_RUN_NUMBER}"
+          LAST_STABLE_TAG=$(git tag --list 'stable-v*' --sort=-version:refname | head -n 1)
+          if [ -z "$LAST_STABLE_TAG" ]; then
+            BASE_VERSION="0.1.0"
+          else
+            BASE_VERSION="${LAST_STABLE_TAG#stable-v}"
+          fi
+
+          export BASE_VERSION
+          NEXT_PATCH_VERSION=$(python3 - <<'PY'
+import os
+
+major, minor, patch = os.environ["BASE_VERSION"].split(".")
+print(f"{major}.{minor}.{int(patch) + 1}")
+PY
+)
+
+          VERSION="${NEXT_PATCH_VERSION}-alpha.$(date -u +%Y%m%d%H%M).${GITHUB_RUN_NUMBER}"
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
-          echo "tag=v$VERSION"    >> "$GITHUB_OUTPUT"
-          echo "### Version: \`$VERSION\`" >> "$GITHUB_STEP_SUMMARY"
+          echo "tag=alpha-v$VERSION" >> "$GITHUB_OUTPUT"
+          echo "### Alpha version: \`$VERSION\`" >> "$GITHUB_STEP_SUMMARY"
 
   # ─────────────────────────────────────────────────────────────
   # Phase 2: Build each architecture in parallel
@@ -90,7 +112,6 @@ jobs:
           APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
           APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
         run: |
-          # Decode and import the certificate so codesign can use it in beforeBuildCommand
           CERT_PATH="$RUNNER_TEMP/apple_cert.p12"
           KEYCHAIN_PATH="$RUNNER_TEMP/laputa-signing.keychain-db"
           KEYCHAIN_PASSWORD="$(uuidgen)"
@@ -137,7 +158,7 @@ jobs:
   # No lipo/re-signing — use the per-arch artifacts directly
   # ─────────────────────────────────────────────────────────────
   release:
-    name: GitHub Release
+    name: GitHub Release (alpha)
     needs: [version, build]
     runs-on: ubuntu-latest
     permissions:
@@ -152,24 +173,26 @@ jobs:
 
       - name: Generate release notes
         run: |
-          PREV_TAG=$(git tag --sort=-version:refname | head -n 1 || echo "")
+          PREV_TAG=$(git tag --list 'alpha-v*' --sort=-version:refname | head -n 1 || echo "")
           if [ -z "$PREV_TAG" ]; then
             NOTES=$(git log --oneline --no-merges -20)
           else
             NOTES=$(git log --oneline --no-merges "${PREV_TAG}..HEAD")
           fi
           {
-            echo "## What's Changed"
+            echo "## What's Changed (Alpha)"
             echo ""
             echo "$NOTES" | while IFS= read -r line; do echo "- $line"; done
             echo ""
             echo "---"
+            echo "**Alpha build — updated on every push to \`main\`**"
+            echo ""
             echo "**Requires Apple Silicon (M1/M2/M3)**"
             echo ""
             echo "*Built from \`$(git rev-parse --short HEAD)\` on $(date -u +%Y-%m-%d)*"
           } > release_notes.md
 
-      - name: Build latest.json
+      - name: Build alpha-latest.json
         run: |
           VERSION="${{ needs.version.outputs.version }}"
           TAG="${{ needs.version.outputs.tag }}"
@@ -180,10 +203,10 @@ jobs:
           ARM_SIG=$(cat updater-aarch64/*.app.tar.gz.sig)
           ARM_TARBALL=$(ls updater-aarch64/*.app.tar.gz | xargs basename)
 
-          cat > latest.json << EOF
+          cat > alpha-latest.json << EOF
           {
             "version": "${VERSION}",
-            "notes": "See ${PAGES_URL} for full release notes.",
+            "notes": "Alpha build. See ${PAGES_URL} for full release notes.",
             "pub_date": "$(date -u +%Y-%m-%dT%H:%M:%SZ)",
             "platforms": {
               "darwin-aarch64": {
@@ -193,21 +216,21 @@ jobs:
             }
           }
           EOF
-          echo "latest.json:"; cat latest.json
+          echo "alpha-latest.json:"; cat alpha-latest.json
 
       - name: Publish GitHub Release
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ needs.version.outputs.tag }}
-          name: Tolaria ${{ needs.version.outputs.version }}
+          name: Tolaria ${{ needs.version.outputs.version }} (Alpha)
           body_path: release_notes.md
           draft: false
-          prerelease: false
+          prerelease: true
           files: |
             dmg-aarch64/*.dmg
             updater-aarch64/*.app.tar.gz
             updater-aarch64/*.app.tar.gz.sig
-            latest.json
+            alpha-latest.json
 
   # ─────────────────────────────────────────────────────────────
   # Phase 4: Update GitHub Pages with release history
@@ -228,13 +251,16 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          mkdir -p _site
+          mkdir -p _site/alpha _site/stable
           gh api repos/${{ github.repository }}/releases --paginate > _site/releases.json
           PAGES_URL="https://refactoringhq.github.io/${GITHUB_REPOSITORY#*/}"
-          # Copy latest.json to GitHub Pages for auto-updater endpoint
-          gh release download --repo ${{ github.repository }} --pattern "latest.json" --output _site/latest.json || true
-          # Preserve canary latest.json from existing GH Pages
-          curl -fsSL "${PAGES_URL}/latest-canary.json" -o _site/latest-canary.json || true
+
+          gh release download --repo ${{ github.repository }} "${{ needs.version.outputs.tag }}" --pattern "alpha-latest.json" --output _site/alpha/latest.json || echo '{}' > _site/alpha/latest.json
+          curl -fsSL "${PAGES_URL}/stable/latest.json" -o _site/stable/latest.json || echo '{}' > _site/stable/latest.json
+
+          cp _site/alpha/latest.json _site/latest.json
+          cp _site/alpha/latest.json _site/latest-canary.json
+
           cat > _site/index.html << 'HTMLEOF'
           <!DOCTYPE html>
           <html lang="en">
@@ -254,12 +280,13 @@ jobs:
               .release .downloads { margin-top: 0.75rem; display: flex; gap: 0.5rem; flex-wrap: wrap; }
               .release .downloads a { display: inline-block; padding: 0.375rem 0.75rem; background: #155DFF; color: #fff; border-radius: 6px; text-decoration: none; font-size: 0.8125rem; font-weight: 500; }
               .release .downloads a:hover { background: #1248CC; }
+              .alpha { border-left: 3px solid #f59e0b; }
               .empty { color: #787774; text-align: center; padding: 3rem; }
             </style>
           </head>
           <body>
             <h1>Tolaria Release History</h1>
-            <p class="subtitle">Auto-updated on every release</p>
+            <p class="subtitle">Alpha builds update on every push to main. Stable builds appear when a stable-vX.Y.Z tag is promoted.</p>
             <div id="releases"></div>
             <script>
               fetch('releases.json').then(r=>r.json()).then(releases=>{
@@ -271,8 +298,8 @@ jobs:
                   const links=dmgs.map(a=>'<a href="'+a.browser_download_url+'">'+a.name+'</a>').join('');
                   const body=(r.body||'').replace(/</g,'&lt;').replace(/>/g,'&gt;');
                   const div=document.createElement('div');
-                  div.className='release';
-                  div.innerHTML='<h2>'+(r.name||r.tag_name)+'</h2><div class="meta">'+date+' · '+r.tag_name+'</div><div class="body">'+body+'</div>'+(links?'<div class="downloads">'+links+'</div>':'');
+                  div.className='release'+(r.prerelease?' alpha':'');
+                  div.innerHTML='<h2>'+(r.name||r.tag_name)+'</h2><div class="meta">'+date+' · '+r.tag_name+(r.prerelease?' · <strong>Alpha</strong>':'')+'</div><div class="body">'+body+'</div>'+(links?'<div class="downloads">'+links+'</div>':'');
                   el.appendChild(div);
                 });
               });
diff --git a/docs/ABSTRACTIONS.md b/docs/ABSTRACTIONS.md
index a061b3d2..60597ae7 100644
--- a/docs/ABSTRACTIONS.md
+++ b/docs/ABSTRACTIONS.md
@@ -551,7 +551,7 @@ interface Settings {
   crash_reporting_enabled: boolean | null
   analytics_enabled: boolean | null
   anonymous_id: string | null
-  release_channel: string | null
+  release_channel: string | null // null = stable default, "alpha" = every-push prerelease feed
 }
 ```
 
@@ -578,8 +578,21 @@ Managed by `useSettings` hook and `SettingsPanel` component.
 ## Updates & Feature Flags
 
 ### Hooks
-- **`useUpdater()`** — Checks for updates using the Tauri updater plugin. Automatic download and install.
-- **`useFeatureFlag(flag)`** — Returns boolean for a named feature flag. Checks `localStorage` override (`ff_<name>`), then falls back to compile-time default. Type-safe via `FeatureFlagName` union.
+- **`useUpdater(releaseChannel)`** — Channel-aware updater state machine. Checks the selected feed, surfaces available/downloading/ready states, and delegates install work to Rust.
+- **`useFeatureFlag(flag)`** — Returns boolean for a named feature flag. Checks `localStorage` override (`ff_<name>`), then falls back to telemetry-backed evaluation. Type-safe via `FeatureFlagName` union.
+
+### Frontend helpers
+- **`src/lib/releaseChannel.ts`** — Normalizes persisted channel values so legacy or invalid settings fall back to Stable, while Stable serializes back to `null`.
+- **`src/lib/appUpdater.ts`** — Thin wrapper around the Tauri updater commands. Keeps the React hook free of endpoint-selection details.
+
+### Rust
+- **`src-tauri/src/app_updater.rs`** — Chooses the correct update endpoint (`alpha/latest.json` or `stable/latest.json`) and adapts Tauri updater results into frontend-friendly payloads.
+
+### Tauri Commands
+- **`check_for_app_update`** — Channel-aware update manifest lookup.
+- **`download_and_install_app_update`** — Channel-aware download/install with streamed progress events.
 
 ### CI/CD
-- **`.github/workflows/release.yml`** — Stable builds from `main`. Produces `latest.json` on GitHub Pages.
+- **`.github/workflows/release.yml`** — Alpha prereleases from every push to `main`. Publishes `alpha/latest.json` and refreshes the legacy `latest.json` / `latest-canary.json` aliases to the alpha feed.
+- **`.github/workflows/release-stable.yml`** — Stable releases from `stable-v*` tags. Publishes `stable/latest.json`.
+- **Beta cohorts** are handled in PostHog targeting only. There is no beta updater feed.
diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md
index 25365075..87d5ab92 100644
--- a/docs/ARCHITECTURE.md
+++ b/docs/ARCHITECTURE.md
@@ -749,24 +749,45 @@ Every push to `main` triggers `.github/workflows/release.yml`:
 
 ```
 push to main
-  → version job: compute 0.YYYYMMDD.RUN_NUMBER
-  → build job (matrix: aarch64 + x86_64):
-      → pnpm install, stamp version, pnpm build, tauri build --target <arch>
-      → upload .app, .tar.gz + .sig, .dmg as artifacts
+  → version job: read latest stable-vX.Y.Z tag
+  → compute next patch prerelease X.Y.(Z+1)-alpha.UTCSTAMP.RUN_NUMBER
+  → build job:
+      → pnpm install, stamp version, pnpm build, tauri build --target aarch64-apple-darwin
+      → upload signed .app.tar.gz + .sig and .dmg artifacts
   → release job:
-      → download both arch artifacts
-      → lipo aarch64 + x86_64 → universal binary
-      → create universal .dmg + signed updater tarball
-      → generate latest.json (per-arch + universal platform entries)
-      → publish GitHub Release with all assets + auto-generated notes
+      → generate alpha-latest.json
+      → publish GitHub prerelease alpha-v<version>
   → pages job:
       → build static HTML release history page
+      → publish alpha/latest.json
+      → refresh latest.json + latest-canary.json as compatibility aliases to alpha
+      → preserve stable/latest.json
+      → deploy to gh-pages
+```
+
+Stable promotions trigger `.github/workflows/release-stable.yml`:
+
+```
+push stable-vX.Y.Z tag
+  → version job: use X.Y.Z from the tag
+  → build job:
+      → pnpm install, stamp version, pnpm build, tauri build --target aarch64-apple-darwin
+      → upload signed .app.tar.gz + .sig and .dmg artifacts
+  → release job:
+      → generate stable-latest.json
+      → publish GitHub release Tolaria X.Y.Z
+  → pages job:
+      → publish stable/latest.json
+      → preserve alpha/latest.json
       → deploy to gh-pages
 ```
 
 ### Versioning
 
-Format: `0.YYYYMMDD.GITHUB_RUN_NUMBER` (e.g. `0.20260223.42`). Stamped into `tauri.conf.json` and `Cargo.toml` dynamically.
+- Stable promotions use git tags in the form `stable-vX.Y.Z`.
+- Alpha builds are prereleases of the next stable patch version, for example stable `1.2.3` → alpha `1.2.4-alpha.202604122135.7`.
+- The workflows stamp the computed version into `tauri.conf.json` and `Cargo.toml` at build time.
+- This keeps semver monotonic when a user switches between Stable and Alpha.
 
 ### In-App Updates
 
@@ -825,17 +846,18 @@ sequenceDiagram
 
 Tolaria uses the Tauri updater plugin for automatic updates:
 
-- Builds from `main` branch are published as GitHub Releases
-- `latest.json` is published to GitHub Pages for the updater plugin
-- `useUpdater()` hook checks for updates automatically and supports download + install
+- `src-tauri/tauri.conf.json` points the default desktop feed at `stable/latest.json`
+- `useUpdater(releaseChannel)` waits 3 seconds after launch, then calls Rust commands instead of hard-coding one updater endpoint in the frontend
+- `src-tauri/src/app_updater.rs` maps the selected channel to `alpha/latest.json` or `stable/latest.json`
+- `download_and_install_app_update` streams progress events back into `UpdateBanner`
 
 ### Feature Flags (PostHog + Release Channels)
 
 Feature flags are backed by PostHog and evaluated per release channel:
 
 - **Alpha**: all features always enabled (no PostHog lookup)
-- **Beta**: sees features where the PostHog flag targets `release_channel = beta`
-- **Stable** (default): sees features where the flag targets `release_channel = stable`
+- **Stable** (default): PostHog rules decide which features are enabled
+- **Beta cohorts**: modeled in PostHog as tags or person-property targeting, not as a separate updater build or Settings option
 
 ```typescript
 import { useFeatureFlag } from './hooks/useFeatureFlag'
@@ -845,14 +867,14 @@ const enabled = useFeatureFlag('example_flag') // boolean
 
 **Resolution order:**
 1. `localStorage` override: key `ff_<name>` with value `"true"` or `"false"`
-2. `isFeatureEnabled(flag)` in `telemetry.ts` → checks release channel, then PostHog, then hardcoded defaults
+2. `isFeatureEnabled(flag)` in `telemetry.ts` → Alpha short-circuit, then PostHog, then hardcoded defaults
 
 **How to add a new flag:**
 1. Add the flag name to the `FeatureFlagName` union type in `src/hooks/useFeatureFlag.ts`
-2. Create the flag on PostHog dashboard with rollout rules per channel
+2. Create the flag on PostHog with Stable rollout rules and any optional beta-cohort targeting
 3. Use `useFeatureFlag('your_flag')` in components
 
-Release channel is selectable in Settings (alpha / beta / stable) and passed to PostHog as a person property via `identify()`. See ADR-0042.
+Release channel is selectable in Settings as `alpha` or `stable` and passed to PostHog as a person property via `identify()`. Beta targeting is managed in PostHog, not in the updater settings. See ADR-0057.
 
 ## Platform Support — iOS / iPadOS (Prototype)
 
diff --git a/docs/GETTING-STARTED.md b/docs/GETTING-STARTED.md
index c286028b..fee993d0 100644
--- a/docs/GETTING-STARTED.md
+++ b/docs/GETTING-STARTED.md
@@ -121,6 +121,8 @@ tolaria/
 │   │   └── ...
 │   │
 │   ├── lib/
+│   │   ├── appUpdater.ts         # Frontend wrapper around channel-aware updater commands
+│   │   ├── releaseChannel.ts     # Alpha/stable normalization helpers
 │   │   └── utils.ts              # Tailwind merge + cn() helper
 │   │
 │   └── test/
@@ -152,6 +154,7 @@ tolaria/
 │   │   ├── search.rs             # Keyword search (walkdir-based)
 │   │   ├── claude_cli.rs         # Claude CLI subprocess management
 │   │   ├── mcp.rs                # MCP server lifecycle + registration
+│   │   ├── app_updater.rs        # Alpha/stable updater endpoint selection
 │   │   ├── settings.rs           # App settings persistence
 │   │   ├── vault_config.rs       # Per-vault UI config
 │   │   ├── vault_list.rs         # Vault list persistence
@@ -212,6 +215,7 @@ tolaria/
 | `src-tauri/src/git/` | All git operations (clone, commit, pull, push, conflicts, pulse). |
 | `src-tauri/src/search.rs` | Keyword search — scans vault files with walkdir. |
 | `src-tauri/src/claude_cli.rs` | Claude CLI subprocess spawning + NDJSON stream parsing. |
+| `src-tauri/src/app_updater.rs` | Desktop updater bridge — selects alpha/stable manifests and streams install progress. |
 
 ### Editor
 
@@ -242,8 +246,11 @@ tolaria/
 | File | Why it matters |
 |------|---------------|
 | `src/hooks/useSettings.ts` | App settings (telemetry, release channel, auto-sync interval). |
+| `src/lib/releaseChannel.ts` | Normalizes persisted updater-channel values (`stable` default, optional `alpha`). |
+| `src/lib/appUpdater.ts` | Frontend wrapper for channel-aware updater commands. |
 | `src/hooks/useVaultConfig.ts` | Per-vault local UI preferences (zoom, view mode, colors, Inbox columns, explicit organization workflow). |
 | `src/components/SettingsPanel.tsx` | Settings UI for telemetry, release channel, sync interval, and the vault-level explicit organization toggle. |
+| `src/hooks/useUpdater.ts` | In-app updates using the selected alpha/stable feed. |
 
 ## Architecture Patterns
 
diff --git a/docs/adr/0057-alpha-stable-release-channels-and-beta-cohorts.md b/docs/adr/0057-alpha-stable-release-channels-and-beta-cohorts.md
new file mode 100644
index 00000000..642ab90b
--- /dev/null
+++ b/docs/adr/0057-alpha-stable-release-channels-and-beta-cohorts.md
@@ -0,0 +1,44 @@
+---
+type: ADR
+id: "0057"
+title: "Alpha/stable release channels with PostHog beta cohorts"
+status: active
+date: 2026-04-12
+---
+
+## Context
+
+Tolaria's updater and release docs still described a canary branch, a beta updater channel, and a single `latest.json` feed. That no longer matched the desired product model:
+
+- `main` should continuously publish **alpha** builds.
+- **Stable** should be promoted manually by pushing `stable-vX.Y.Z` tags.
+- "Beta" users should be modeled in PostHog for targeting and analysis, not as a separate binary or updater feed.
+
+The updater also needed semver-safe versioning when a user switches between Stable and Alpha. A date-based alpha version below the latest stable release would cause the updater to ignore newer alpha builds after a stable promotion.
+
+This ADR supersedes ADR-0017's canary-branch updater model.
+
+## Decision
+
+**Tolaria exposes exactly two updater channels: `stable` and `alpha`. Stable is the default feed, while every push to `main` publishes a prerelease alpha build to `alpha/latest.json`, and manually promoted `stable-vX.Y.Z` tags publish stable builds to `stable/latest.json`. Beta audiences are handled in PostHog and are not a third updater channel.**
+
+## Options considered
+
+- **Option A** (chosen): Two updater channels (`stable`, `alpha`) plus PostHog beta cohorts. Pros: matches the product requirement, keeps CI simple, keeps updater semantics understandable, and separates release distribution from experimentation audiences. Cons: requires semver-aware alpha versioning and a small migration for legacy channel settings.
+- **Option B**: Keep the canary branch / canary channel model. Pros: no workflow redesign. Cons: no longer matches how releases are actually promoted and forces distribution strategy to depend on a long-lived branch.
+- **Option C**: Add a third updater channel for beta builds. Pros: direct binary segmentation. Cons: extra CI complexity, extra updater endpoints, and unnecessary duplication because beta targeting is already better handled by PostHog.
+
+## Consequences
+
+- `release.yml` now publishes alpha prereleases from every push to `main`.
+- `release-stable.yml` publishes stable releases only from `stable-v*` tags.
+- `src-tauri/src/app_updater.rs` selects `alpha/latest.json` or `stable/latest.json` at runtime.
+- `release_channel` stays an app setting, but only `alpha` is stored explicitly; Stable serializes to the default `null` value.
+- Legacy or invalid persisted channel values fall back to Stable.
+- Alpha versions are prereleases of the next stable patch version (for example `1.2.4-alpha.202604122135.7` after stable `1.2.3`) so semver ordering remains valid across channel switches.
+- The legacy GitHub Pages aliases `latest.json` and `latest-canary.json` continue to mirror alpha for backward compatibility.
+- Beta rollouts and internal-user targeting are done in PostHog using person properties or cohorts rather than updater manifests.
+
+## Advice
+
+If a future release process needs more than two binary distribution rings, re-evaluate this decision only when PostHog cohorting is no longer sufficient and the extra operational cost of another updater feed is justified.
diff --git a/docs/adr/README.md b/docs/adr/README.md
index 7a4cd49d..e23d0d76 100644
--- a/docs/adr/README.md
+++ b/docs/adr/README.md
@@ -72,7 +72,7 @@ proposed → active → superseded
 | [0014](0014-git-based-vault-cache.md) | Git-based incremental vault cache | active |
 | [0015](0015-auto-save-with-debounce.md) | Auto-save with 500ms debounce | active |
 | [0016](0016-sentry-posthog-telemetry.md) | Sentry + PostHog telemetry with consent | active |
-| [0017](0017-canary-release-channel.md) | Canary release channel and feature flags | active |
+| [0017](canary-release-channel-and-local-feature-flags.md) | Canary release channel and feature flags | superseded → [0057](0057-alpha-stable-release-channels-and-beta-cohorts.md) |
 | [0018](0018-codescene-code-health-gates.md) | CodeScene code health gates in CI | active |
 | [0019](0019-github-device-flow-oauth.md) | GitHub device flow OAuth for vault sync | superseded → [0056](0056-system-git-cli-auth-no-provider-oauth.md) |
 | [0020](0020-keyboard-first-design.md) | Keyboard-first design principle | active |
@@ -112,3 +112,4 @@ proposed → active → superseded
 | [0054](0054-deterministic-shortcut-qa-matrix.md) | Deterministic shortcut QA matrix | active |
 | [0055](0055-h1-is-the-only-editor-title-surface.md) | H1 is the only editor title surface | active |
 | [0056](0056-system-git-cli-auth-no-provider-oauth.md) | System git auth only — no provider-specific OAuth or repo APIs | active |
+| [0057](0057-alpha-stable-release-channels-and-beta-cohorts.md) | Alpha/stable release channels with PostHog beta cohorts | active |
diff --git a/src-tauri/src/app_updater.rs b/src-tauri/src/app_updater.rs
new file mode 100644
index 00000000..196e497e
--- /dev/null
+++ b/src-tauri/src/app_updater.rs
@@ -0,0 +1,179 @@
+use serde::Serialize;
+use tauri::{ipc::Channel, AppHandle, Runtime, Url};
+use tauri_plugin_updater::UpdaterExt;
+
+const RELEASES_BASE_URL: &str = "https://refactoringhq.github.io/tolaria";
+
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AppUpdateMetadata {
+    pub current_version: String,
+    pub version: String,
+    pub date: Option<String>,
+    pub body: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize)]
+#[serde(tag = "event", content = "data")]
+pub enum AppUpdateDownloadEvent {
+    #[serde(rename_all = "camelCase")]
+    Started {
+        content_length: Option<u64>,
+    },
+    #[serde(rename_all = "camelCase")]
+    Progress {
+        chunk_length: usize,
+    },
+    Finished,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum ReleaseChannel {
+    Alpha,
+    Stable,
+}
+
+impl ReleaseChannel {
+    fn from_settings_value(value: Option<&str>) -> Self {
+        match crate::settings::effective_release_channel(value) {
+            "alpha" => Self::Alpha,
+            _ => Self::Stable,
+        }
+    }
+
+    fn as_str(self) -> &'static str {
+        match self {
+            Self::Alpha => "alpha",
+            Self::Stable => "stable",
+        }
+    }
+
+    fn updater_endpoint(self) -> Result<Url, String> {
+        let endpoint = format!("{}/{}/latest.json", RELEASES_BASE_URL, self.as_str());
+        Url::parse(&endpoint).map_err(|e| format!("Invalid updater endpoint: {e}"))
+    }
+}
+
+fn build_updater<R: Runtime>(
+    app_handle: &AppHandle<R>,
+    release_channel: ReleaseChannel,
+) -> Result<tauri_plugin_updater::Updater, String> {
+    app_handle
+        .updater_builder()
+        .endpoints(vec![release_channel.updater_endpoint()?])
+        .map_err(|e| format!("Failed to configure updater endpoint: {e}"))?
+        .build()
+        .map_err(|e| format!("Failed to build updater: {e}"))
+}
+
+fn to_update_metadata(update: tauri_plugin_updater::Update) -> AppUpdateMetadata {
+    AppUpdateMetadata {
+        current_version: update.current_version,
+        version: update.version,
+        date: update.date.map(|value| value.to_string()),
+        body: update.body,
+    }
+}
+
+pub async fn check_for_app_update<R: Runtime>(
+    app_handle: AppHandle<R>,
+    release_channel: Option<String>,
+) -> Result<Option<AppUpdateMetadata>, String> {
+    let channel = ReleaseChannel::from_settings_value(release_channel.as_deref());
+    let updater = build_updater(&app_handle, channel)?;
+    let update = updater
+        .check()
+        .await
+        .map_err(|e| format!("Failed to check for updates: {e}"))?;
+
+    Ok(update.map(to_update_metadata))
+}
+
+pub async fn download_and_install_app_update<R: Runtime>(
+    app_handle: AppHandle<R>,
+    release_channel: Option<String>,
+    expected_version: String,
+    on_event: Channel<AppUpdateDownloadEvent>,
+) -> Result<(), String> {
+    let channel = ReleaseChannel::from_settings_value(release_channel.as_deref());
+    let updater = build_updater(&app_handle, channel)?;
+    let update = updater
+        .check()
+        .await
+        .map_err(|e| format!("Failed to refresh update metadata: {e}"))?
+        .ok_or_else(|| "No update is currently available".to_string())?;
+
+    if update.version != expected_version {
+        return Err(format!(
+            "Expected update version {}, found {}",
+            expected_version, update.version
+        ));
+    }
+
+    let mut started = false;
+    update
+        .download_and_install(
+            |chunk_length, content_length| {
+                if !started {
+                    started = true;
+                    let _ = on_event.send(AppUpdateDownloadEvent::Started { content_length });
+                }
+
+                let _ = on_event.send(AppUpdateDownloadEvent::Progress { chunk_length });
+            },
+            || {
+                let _ = on_event.send(AppUpdateDownloadEvent::Finished);
+            },
+        )
+        .await
+        .map_err(|e| format!("Failed to download and install update: {e}"))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::ReleaseChannel;
+
+    #[test]
+    fn release_channel_defaults_to_stable() {
+        assert_eq!(
+            ReleaseChannel::from_settings_value(None),
+            ReleaseChannel::Stable
+        );
+        assert_eq!(
+            ReleaseChannel::from_settings_value(Some("stable")),
+            ReleaseChannel::Stable
+        );
+        assert_eq!(
+            ReleaseChannel::from_settings_value(Some("beta")),
+            ReleaseChannel::Stable
+        );
+        assert_eq!(
+            ReleaseChannel::from_settings_value(Some("invalid")),
+            ReleaseChannel::Stable
+        );
+    }
+
+    #[test]
+    fn release_channel_accepts_alpha() {
+        assert_eq!(
+            ReleaseChannel::from_settings_value(Some("alpha")),
+            ReleaseChannel::Alpha
+        );
+        assert_eq!(
+            ReleaseChannel::from_settings_value(Some("  alpha  ")),
+            ReleaseChannel::Alpha
+        );
+    }
+
+    #[test]
+    fn release_channel_endpoints_match_expected_paths() {
+        assert_eq!(
+            ReleaseChannel::Alpha.updater_endpoint().unwrap().as_str(),
+            "https://refactoringhq.github.io/tolaria/alpha/latest.json"
+        );
+        assert_eq!(
+            ReleaseChannel::Stable.updater_endpoint().unwrap().as_str(),
+            "https://refactoringhq.github.io/tolaria/stable/latest.json"
+        );
+    }
+}
diff --git a/src-tauri/src/commands/system.rs b/src-tauri/src/commands/system.rs
index 8179f877..b1ab0bd0 100644
--- a/src-tauri/src/commands/system.rs
+++ b/src-tauri/src/commands/system.rs
@@ -4,6 +4,8 @@ use crate::settings::Settings;
 use crate::vault_list;
 use crate::vault_list::VaultList;
 use serde::Deserialize;
+#[cfg(desktop)]
+use tauri::ipc::Channel;
 
 use super::parse_build_label;
 
@@ -109,6 +111,52 @@ pub fn save_settings(settings: Settings) -> Result<(), String> {
     crate::settings::save_settings(settings)
 }
 
+#[cfg(desktop)]
+#[tauri::command]
+pub async fn check_for_app_update(
+    app_handle: tauri::AppHandle,
+    release_channel: Option<String>,
+) -> Result<Option<crate::app_updater::AppUpdateMetadata>, String> {
+    crate::app_updater::check_for_app_update(app_handle, release_channel).await
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub async fn check_for_app_update(
+    _app_handle: tauri::AppHandle,
+    _release_channel: Option<String>,
+) -> Result<Option<crate::app_updater::AppUpdateMetadata>, String> {
+    Ok(None)
+}
+
+#[cfg(desktop)]
+#[tauri::command]
+pub async fn download_and_install_app_update(
+    app_handle: tauri::AppHandle,
+    release_channel: Option<String>,
+    expected_version: String,
+    on_event: Channel<crate::app_updater::AppUpdateDownloadEvent>,
+) -> Result<(), String> {
+    crate::app_updater::download_and_install_app_update(
+        app_handle,
+        release_channel,
+        expected_version,
+        on_event,
+    )
+    .await
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub async fn download_and_install_app_update(
+    _app_handle: tauri::AppHandle,
+    _release_channel: Option<String>,
+    _expected_version: String,
+    _on_event: tauri::ipc::Channel<crate::app_updater::AppUpdateDownloadEvent>,
+) -> Result<(), String> {
+    Err("App updates are not available on mobile".into())
+}
+
 #[tauri::command]
 pub fn reinit_telemetry() {
     crate::telemetry::reinit_sentry();
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index dc448dff..4cea10d5 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -1,3 +1,4 @@
+pub mod app_updater;
 pub mod claude_cli;
 mod commands;
 pub mod frontmatter;
@@ -187,9 +188,11 @@ fn with_invoke_handler(builder: tauri::Builder<tauri::Wry>) -> tauri::Builder<ta
         commands::create_vault_folder,
         commands::batch_archive_notes,
         commands::get_settings,
+        commands::check_for_app_update,
         commands::update_menu_state,
         commands::trigger_menu_command,
         commands::save_settings,
+        commands::download_and_install_app_update,
         commands::load_vault_list,
         commands::save_vault_list,
         commands::clone_repo,
diff --git a/src-tauri/src/settings.rs b/src-tauri/src/settings.rs
index 7ea9692d..a64f973a 100644
--- a/src-tauri/src/settings.rs
+++ b/src-tauri/src/settings.rs
@@ -15,6 +15,38 @@ pub struct Settings {
     pub release_channel: Option<String>,
 }
 
+fn normalize_optional_string(value: Option<String>) -> Option<String> {
+    value
+        .map(|candidate| candidate.trim().to_string())
+        .filter(|candidate| !candidate.is_empty())
+}
+
+pub fn normalize_release_channel(value: Option<&str>) -> Option<String> {
+    match value.map(|candidate| candidate.trim().to_ascii_lowercase()) {
+        Some(channel) if channel == "alpha" => Some(channel),
+        _ => None,
+    }
+}
+
+pub fn effective_release_channel(value: Option<&str>) -> &'static str {
+    if normalize_release_channel(value).is_some() {
+        "alpha"
+    } else {
+        "stable"
+    }
+}
+
+fn normalize_settings(settings: Settings) -> Settings {
+    Settings {
+        auto_pull_interval_minutes: settings.auto_pull_interval_minutes,
+        telemetry_consent: settings.telemetry_consent,
+        crash_reporting_enabled: settings.crash_reporting_enabled,
+        analytics_enabled: settings.analytics_enabled,
+        anonymous_id: normalize_optional_string(settings.anonymous_id),
+        release_channel: normalize_release_channel(settings.release_channel.as_deref()),
+    }
+}
+
 fn app_config_dir() -> Result<PathBuf, String> {
     dirs::config_dir().ok_or_else(|| "Could not determine config directory".to_string())
 }
@@ -49,7 +81,9 @@ fn get_settings_at(path: &PathBuf) -> Result<Settings, String> {
     }
     let content =
         fs::read_to_string(path).map_err(|e| format!("Failed to read settings: {}", e))?;
-    serde_json::from_str(&content).map_err(|e| format!("Failed to parse settings: {}", e))
+    let settings =
+        serde_json::from_str(&content).map_err(|e| format!("Failed to parse settings: {}", e))?;
+    Ok(normalize_settings(settings))
 }
 
 fn save_settings_at(path: &PathBuf, settings: Settings) -> Result<(), String> {
@@ -58,21 +92,7 @@ fn save_settings_at(path: &PathBuf, settings: Settings) -> Result<(), String> {
             .map_err(|e| format!("Failed to create config directory: {}", e))?;
     }
 
-    // Trim whitespace and convert empty strings to None.
-    let cleaned = Settings {
-        auto_pull_interval_minutes: settings.auto_pull_interval_minutes,
-        telemetry_consent: settings.telemetry_consent,
-        crash_reporting_enabled: settings.crash_reporting_enabled,
-        analytics_enabled: settings.analytics_enabled,
-        anonymous_id: settings
-            .anonymous_id
-            .map(|k| k.trim().to_string())
-            .filter(|k| !k.is_empty()),
-        release_channel: settings
-            .release_channel
-            .map(|k| k.trim().to_string())
-            .filter(|k| !k.is_empty()),
-    };
+    let cleaned = normalize_settings(settings);
 
     let json = serde_json::to_string_pretty(&cleaned)
         .map_err(|e| format!("Failed to serialize settings: {}", e))?;
@@ -180,7 +200,7 @@ mod tests {
             crash_reporting_enabled: Some(true),
             analytics_enabled: Some(false),
             anonymous_id: Some("abc-123-uuid".to_string()),
-            release_channel: Some("beta".to_string()),
+            release_channel: Some("alpha".to_string()),
             ..Default::default()
         };
         let json = serde_json::to_string(&settings).unwrap();
@@ -211,11 +231,11 @@ mod tests {
     fn test_save_trims_whitespace() {
         let loaded = save_and_reload(Settings {
             anonymous_id: Some("  test-uuid  ".to_string()),
-            release_channel: Some("  beta  ".to_string()),
+            release_channel: Some("  alpha  ".to_string()),
             ..Default::default()
         });
         assert_eq!(loaded.anonymous_id.as_deref(), Some("test-uuid"));
-        assert_eq!(loaded.release_channel.as_deref(), Some("beta"));
+        assert_eq!(loaded.release_channel.as_deref(), Some("alpha"));
     }
 
     #[test]
@@ -227,6 +247,25 @@ mod tests {
         assert!(loaded.release_channel.is_none());
     }
 
+    #[test]
+    fn test_non_alpha_release_channels_normalize_to_stable() {
+        let loaded = save_and_reload(Settings {
+            release_channel: Some("beta".to_string()),
+            ..Default::default()
+        });
+        assert!(loaded.release_channel.is_none());
+    }
+
+    #[test]
+    fn test_get_settings_normalizes_legacy_beta_channel() {
+        let dir = tempfile::TempDir::new().unwrap();
+        let path = dir.path().join("settings.json");
+        fs::write(&path, r#"{"release_channel":"beta"}"#).unwrap();
+
+        let loaded = get_settings_at(&path).unwrap();
+        assert!(loaded.release_channel.is_none());
+    }
+
     #[test]
     fn test_save_creates_parent_directories() {
         let dir = tempfile::TempDir::new().unwrap();
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 3c999d1c..4199a72e 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -54,7 +54,7 @@
   "plugins": {
     "updater": {
       "endpoints": [
-        "https://refactoringhq.github.io/tolaria/latest.json"
+        "https://refactoringhq.github.io/tolaria/stable/latest.json"
       ],
       "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEE4NkQ5MDI3REVCRkFGNUMKUldSY3I3L2VKNUJ0cU5JRlRZZlp3NGhnU3ZwbkVKeGVvREpmb2sxRVJndHFpVFZPNlArbEE5R1IK"
     }
diff --git a/src/App.tsx b/src/App.tsx
index ba781798..8bdb5020 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -512,7 +512,7 @@ function App() {
   const zoom = useZoom()
   const buildNumber = useBuildNumber()
 
-  const { status: updateStatus, actions: updateActions } = useUpdater()
+  const { status: updateStatus, actions: updateActions } = useUpdater(settings.release_channel)
 
   const handleCheckForUpdates = useCallback(async () => {
     if (updateStatus.state === 'downloading') {
diff --git a/src/components/SettingsPanel.test.tsx b/src/components/SettingsPanel.test.tsx
index 52206c36..fd8335fa 100644
--- a/src/components/SettingsPanel.test.tsx
+++ b/src/components/SettingsPanel.test.tsx
@@ -1,5 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { fireEvent, render, screen } from '@testing-library/react'
+import { fireEvent, render, screen, within } from '@testing-library/react'
 import { SettingsPanel } from './SettingsPanel'
 import type { Settings } from '../types'
 
@@ -12,12 +12,25 @@ const emptySettings: Settings = {
   release_channel: null,
 }
 
+function installPointerCapturePolyfill() {
+  if (!HTMLElement.prototype.hasPointerCapture) {
+    HTMLElement.prototype.hasPointerCapture = () => false
+  }
+  if (!HTMLElement.prototype.setPointerCapture) {
+    HTMLElement.prototype.setPointerCapture = () => {}
+  }
+  if (!HTMLElement.prototype.releasePointerCapture) {
+    HTMLElement.prototype.releasePointerCapture = () => {}
+  }
+}
+
 describe('SettingsPanel', () => {
   const onSave = vi.fn()
   const onClose = vi.fn()
 
   beforeEach(() => {
     vi.clearAllMocks()
+    installPointerCapturePolyfill()
   })
 
   it('renders nothing when not open', () => {
@@ -35,16 +48,7 @@ describe('SettingsPanel', () => {
     expect(screen.getByText('Sync')).toBeInTheDocument()
   })
 
-  it('does not show AI Provider Keys section', () => {
-    render(
-      <SettingsPanel open={true} settings={emptySettings} onSave={onSave} onClose={onClose} />
-    )
-    expect(screen.queryByText('AI Provider Keys')).not.toBeInTheDocument()
-    expect(screen.queryByText('OpenAI')).not.toBeInTheDocument()
-    expect(screen.queryByText('Google AI')).not.toBeInTheDocument()
-  })
-
-  it('calls onSave with settings on save', () => {
+  it('calls onSave with stable defaults on save', () => {
     render(
       <SettingsPanel open={true} settings={emptySettings} onSave={onSave} onClose={onClose} />
     )
@@ -53,10 +57,37 @@ describe('SettingsPanel', () => {
 
     expect(onSave).toHaveBeenCalledWith(expect.objectContaining({
       auto_pull_interval_minutes: 5,
+      release_channel: null,
     }))
     expect(onClose).toHaveBeenCalled()
   })
 
+  it('defaults the release channel trigger to stable', () => {
+    render(
+      <SettingsPanel open={true} settings={emptySettings} onSave={onSave} onClose={onClose} />
+    )
+
+    expect(screen.getByTestId('settings-release-channel')).toHaveAttribute('data-value', 'stable')
+    expect(screen.queryByText(/Beta\/Stable/i)).not.toBeInTheDocument()
+  })
+
+  it('preserves alpha when alpha is already selected', () => {
+    const alphaSettings: Settings = {
+      ...emptySettings,
+      release_channel: 'alpha',
+    }
+
+    render(
+      <SettingsPanel open={true} settings={alphaSettings} onSave={onSave} onClose={onClose} />
+    )
+
+    fireEvent.click(screen.getByTestId('settings-save'))
+
+    expect(onSave).toHaveBeenCalledWith(expect.objectContaining({
+      release_channel: 'alpha',
+    }))
+  })
+
   it('defaults the organization workflow switch to on', () => {
     render(
       <SettingsPanel open={true} settings={emptySettings} onSave={onSave} onClose={onClose} />
@@ -126,7 +157,6 @@ describe('SettingsPanel', () => {
     expect(onClose).toHaveBeenCalled()
   })
 
-
   it('shows keyboard shortcut hint in footer', () => {
     render(
       <SettingsPanel open={true} settings={emptySettings} onSave={onSave} onClose={onClose} />
@@ -134,14 +164,6 @@ describe('SettingsPanel', () => {
     expect(screen.getByText(/to open settings/)).toBeInTheDocument()
   })
 
-  it('does not show the removed GitHub auth section', () => {
-    render(
-      <SettingsPanel open={true} settings={emptySettings} onSave={onSave} onClose={onClose} />
-    )
-    expect(screen.queryByText('GitHub')).not.toBeInTheDocument()
-    expect(screen.queryByText(/Connect your GitHub account/i)).not.toBeInTheDocument()
-  })
-
   describe('Privacy & Telemetry section', () => {
     it('renders crash reporting and analytics toggles', () => {
       render(
@@ -162,18 +184,20 @@ describe('SettingsPanel', () => {
       render(
         <SettingsPanel open={true} settings={withTelemetry} onSave={onSave} onClose={onClose} />
       )
-      const crashCheckbox = screen.getByTestId('settings-crash-reporting').querySelector('input') as HTMLInputElement
-      const analyticsCheckbox = screen.getByTestId('settings-analytics').querySelector('input') as HTMLInputElement
-      expect(crashCheckbox.checked).toBe(true)
-      expect(analyticsCheckbox.checked).toBe(false)
+
+      const crashCheckbox = within(screen.getByTestId('settings-crash-reporting')).getByRole('checkbox')
+      const analyticsCheckbox = within(screen.getByTestId('settings-analytics')).getByRole('checkbox')
+
+      expect(crashCheckbox).toHaveAttribute('aria-checked', 'true')
+      expect(analyticsCheckbox).toHaveAttribute('aria-checked', 'false')
     })
 
     it('saves telemetry settings when toggled and saved', () => {
       render(
         <SettingsPanel open={true} settings={emptySettings} onSave={onSave} onClose={onClose} />
       )
-      const crashCheckbox = screen.getByTestId('settings-crash-reporting').querySelector('input')!
-      fireEvent.click(crashCheckbox)
+
+      fireEvent.click(within(screen.getByTestId('settings-crash-reporting')).getByRole('checkbox'))
       fireEvent.click(screen.getByTestId('settings-save'))
 
       expect(onSave).toHaveBeenCalledWith(expect.objectContaining({
diff --git a/src/components/SettingsPanel.tsx b/src/components/SettingsPanel.tsx
index 60760348..38d0ccfe 100644
--- a/src/components/SettingsPanel.tsx
+++ b/src/components/SettingsPanel.tsx
@@ -1,7 +1,24 @@
-import { useState, useRef, useCallback, useEffect } from 'react'
+import {
+  useState,
+  useRef,
+  useCallback,
+  useEffect,
+  type KeyboardEvent as ReactKeyboardEvent,
+  type MouseEvent as ReactMouseEvent,
+} from 'react'
 import { X } from '@phosphor-icons/react'
 import type { Settings } from '../types'
+import { normalizeReleaseChannel, serializeReleaseChannel, type ReleaseChannel } from '../lib/releaseChannel'
 import { trackEvent } from '../lib/telemetry'
+import { Button } from './ui/button'
+import { Checkbox, type CheckedState } from './ui/checkbox'
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from './ui/select'
 import { Switch } from './ui/switch'
 
 interface SettingsPanelProps {
@@ -13,12 +30,79 @@ interface SettingsPanelProps {
   onClose: () => void
 }
 
-// --- Settings Panel ---
+interface SettingsDraft {
+  pullInterval: number
+  releaseChannel: ReleaseChannel
+  crashReporting: boolean
+  analytics: boolean
+  explicitOrganization: boolean
+}
 
-function isSaveShortcut(event: React.KeyboardEvent): boolean {
+interface SettingsBodyProps {
+  pullInterval: number
+  setPullInterval: (value: number) => void
+  releaseChannel: ReleaseChannel
+  setReleaseChannel: (value: ReleaseChannel) => void
+  explicitOrganization: boolean
+  setExplicitOrganization: (value: boolean) => void
+  crashReporting: boolean
+  setCrashReporting: (value: boolean) => void
+  analytics: boolean
+  setAnalytics: (value: boolean) => void
+}
+
+const PULL_INTERVAL_OPTIONS = [1, 2, 5, 10, 15, 30] as const
+
+function isSaveShortcut(event: ReactKeyboardEvent): boolean {
   return event.key === 'Enter' && (event.metaKey || event.ctrlKey)
 }
 
+function createSettingsDraft(
+  settings: Settings,
+  explicitOrganizationEnabled: boolean,
+): SettingsDraft {
+  return {
+    pullInterval: settings.auto_pull_interval_minutes ?? 5,
+    releaseChannel: normalizeReleaseChannel(settings.release_channel),
+    crashReporting: settings.crash_reporting_enabled ?? false,
+    analytics: settings.analytics_enabled ?? false,
+    explicitOrganization: explicitOrganizationEnabled,
+  }
+}
+
+function resolveTelemetryConsent(settings: Settings, draft: SettingsDraft): boolean | null {
+  if (draft.crashReporting || draft.analytics) return true
+  return settings.telemetry_consent === null ? null : false
+}
+
+function resolveAnonymousId(settings: Settings, draft: SettingsDraft): string | null {
+  if (draft.crashReporting || draft.analytics) {
+    return settings.anonymous_id ?? crypto.randomUUID()
+  }
+
+  return settings.anonymous_id
+}
+
+function buildSettingsFromDraft(settings: Settings, draft: SettingsDraft): Settings {
+  return {
+    auto_pull_interval_minutes: draft.pullInterval,
+    telemetry_consent: resolveTelemetryConsent(settings, draft),
+    crash_reporting_enabled: draft.crashReporting,
+    analytics_enabled: draft.analytics,
+    anonymous_id: resolveAnonymousId(settings, draft),
+    release_channel: serializeReleaseChannel(draft.releaseChannel),
+  }
+}
+
+function trackTelemetryConsentChange(previousAnalytics: boolean, nextAnalytics: boolean): void {
+  if (!previousAnalytics && nextAnalytics) trackEvent('telemetry_opted_in')
+  if (previousAnalytics && !nextAnalytics) trackEvent('telemetry_opted_out')
+}
+
+function isChecked(checked: CheckedState): boolean {
+  return checked === true
+}
+
 export function SettingsPanel({
   open,
   settings,
@@ -28,6 +112,7 @@ export function SettingsPanel({
   onClose,
 }: SettingsPanelProps) {
   if (!open) return null
+
   return (
     <SettingsPanelInner
       settings={settings}
@@ -50,57 +135,59 @@ function SettingsPanelInner({
   onSaveExplicitOrganization,
   onClose,
 }: SettingsPanelInnerProps) {
-  const [pullInterval, setPullInterval] = useState(settings.auto_pull_interval_minutes ?? 5)
-  const [releaseChannel, setReleaseChannel] = useState(settings.release_channel ?? 'stable')
-  const [crashReporting, setCrashReporting] = useState(settings.crash_reporting_enabled ?? false)
-  const [analytics, setAnalytics] = useState(settings.analytics_enabled ?? false)
-  const [explicitOrganization, setExplicitOrganization] = useState(explicitOrganizationEnabled)
+  const [draft, setDraft] = useState(() => createSettingsDraft(settings, explicitOrganizationEnabled))
   const panelRef = useRef<HTMLDivElement>(null)
 
-  // Auto-focus first input when settings panel opens
   useEffect(() => {
     const timer = setTimeout(() => {
-      const input = panelRef.current?.querySelector('input')
-      input?.focus()
+      const focusTarget = panelRef.current?.querySelector<HTMLElement>('[data-settings-autofocus="true"]')
+      focusTarget?.focus()
     }, 50)
     return () => clearTimeout(timer)
   }, [])
 
-  const buildSettings = useCallback((): Settings => ({
-    auto_pull_interval_minutes: pullInterval,
-    telemetry_consent: (crashReporting || analytics) ? true : (settings.telemetry_consent === null ? null : false),
-    crash_reporting_enabled: crashReporting,
-    analytics_enabled: analytics,
-    anonymous_id: (crashReporting || analytics) ? (settings.anonymous_id ?? crypto.randomUUID()) : settings.anonymous_id,
-    release_channel: releaseChannel === 'stable' ? null : releaseChannel,
-  }), [pullInterval, releaseChannel, crashReporting, analytics, settings.telemetry_consent, settings.anonymous_id])
+  const updateDraft = useCallback(
+    <Key extends keyof SettingsDraft>(key: Key, value: SettingsDraft[Key]) => {
+      setDraft((current) => ({ ...current, [key]: value }))
+    },
+    [],
+  )
 
-  const handleSave = () => {
-    const prevAnalytics = settings.analytics_enabled ?? false
-    const newAnalytics = analytics
-    if (!prevAnalytics && newAnalytics) trackEvent('telemetry_opted_in')
-    if (prevAnalytics && !newAnalytics) trackEvent('telemetry_opted_out')
-    onSave(buildSettings())
-    onSaveExplicitOrganization?.(explicitOrganization)
+  const handleSave = useCallback(() => {
+    trackTelemetryConsentChange(settings.analytics_enabled === true, draft.analytics)
+    onSave(buildSettingsFromDraft(settings, draft))
+    onSaveExplicitOrganization?.(draft.explicitOrganization)
     onClose()
-  }
+  }, [draft, onClose, onSave, onSaveExplicitOrganization, settings])
 
-  const handleKeyDown = (e: React.KeyboardEvent) => {
-    if (e.key === 'Escape') {
-      e.stopPropagation()
-      onClose()
-    }
-    if (isSaveShortcut(e)) {
-      e.preventDefault()
-      handleSave()
-    }
-  }
+  const handleBackdropClick = useCallback(
+    (event: ReactMouseEvent<HTMLDivElement>) => {
+      if (event.target === event.currentTarget) onClose()
+    },
+    [onClose],
+  )
+
+  const handleKeyDown = useCallback(
+    (event: ReactKeyboardEvent) => {
+      if (event.key === 'Escape') {
+        event.stopPropagation()
+        onClose()
+        return
+      }
+
+      if (isSaveShortcut(event)) {
+        event.preventDefault()
+        handleSave()
+      }
+    },
+    [handleSave, onClose],
+  )
 
   return (
     <div
-      className="fixed inset-0 flex items-center justify-center z-50"
+      className="fixed inset-0 z-50 flex items-center justify-center"
       style={{ background: 'rgba(0,0,0,0.4)' }}
-      onClick={e => { if (e.target === e.currentTarget) onClose() }}
+      onClick={handleBackdropClick}
       onKeyDown={handleKeyDown}
       data-testid="settings-panel"
     >
@@ -111,12 +198,16 @@ function SettingsPanelInner({
       >
         <SettingsHeader onClose={onClose} />
         <SettingsBody
-          pullInterval={pullInterval} setPullInterval={setPullInterval}
-          releaseChannel={releaseChannel} setReleaseChannel={setReleaseChannel}
-          explicitOrganization={explicitOrganization}
-          setExplicitOrganization={setExplicitOrganization}
-          crashReporting={crashReporting} setCrashReporting={setCrashReporting}
-          analytics={analytics} setAnalytics={setAnalytics}
+          pullInterval={draft.pullInterval}
+          setPullInterval={(value) => updateDraft('pullInterval', value)}
+          releaseChannel={draft.releaseChannel}
+          setReleaseChannel={(value) => updateDraft('releaseChannel', value)}
+          explicitOrganization={draft.explicitOrganization}
+          setExplicitOrganization={(value) => updateDraft('explicitOrganization', value)}
+          crashReporting={draft.crashReporting}
+          setCrashReporting={(value) => updateDraft('crashReporting', value)}
+          analytics={draft.analytics}
+          setAnalytics={(value) => updateDraft('analytics', value)}
         />
         <SettingsFooter onClose={onClose} onSave={handleSave} />
       </div>
@@ -131,95 +222,156 @@ function SettingsHeader({ onClose }: { onClose: () => void }) {
       style={{ height: 56, padding: '0 24px', borderBottom: '1px solid var(--border)' }}
     >
       <span style={{ fontSize: 16, fontWeight: 600, color: 'var(--foreground)' }}>Settings</span>
-      <button
-        className="border-none bg-transparent p-1 text-muted-foreground cursor-pointer hover:text-foreground"
+      <Button
+        variant="ghost"
+        size="icon-sm"
         onClick={onClose}
         title="Close settings"
+        aria-label="Close settings"
       >
         <X size={16} />
-      </button>
+      </Button>
     </div>
   )
 }
 
-interface SettingsBodyProps {
-  pullInterval: number; setPullInterval: (v: number) => void
-  releaseChannel: string; setReleaseChannel: (v: string) => void
-  explicitOrganization: boolean; setExplicitOrganization: (v: boolean) => void
-  crashReporting: boolean; setCrashReporting: (v: boolean) => void
-  analytics: boolean; setAnalytics: (v: boolean) => void
-}
-
-function SettingsBody(props: SettingsBodyProps) {
+function SettingsBody({
+  pullInterval,
+  setPullInterval,
+  releaseChannel,
+  setReleaseChannel,
+  explicitOrganization,
+  setExplicitOrganization,
+  crashReporting,
+  setCrashReporting,
+  analytics,
+  setAnalytics,
+}: SettingsBodyProps) {
   return (
     <div style={{ padding: 24, display: 'flex', flexDirection: 'column', gap: 20, overflow: 'auto' }}>
-      <div>
-        <div style={{ fontSize: 13, fontWeight: 600, color: 'var(--foreground)', marginBottom: 4 }}>Sync</div>
-        <div style={{ fontSize: 12, color: 'var(--muted-foreground)', lineHeight: 1.5 }}>
-          Automatically pull vault changes from Git in the background.
-        </div>
-      </div>
-
-      <div style={{ display: 'flex', flexDirection: 'column', gap: 6 }}>
-        <label style={{ fontSize: 12, fontWeight: 500, color: 'var(--foreground)' }}>Pull interval (minutes)</label>
-        <select
-          value={props.pullInterval}
-          onChange={(e) => props.setPullInterval(Number(e.target.value))}
-          className="border border-border bg-transparent text-foreground rounded"
-          style={{ fontSize: 13, padding: '8px 10px', outline: 'none', fontFamily: 'inherit' }}
-          data-testid="settings-pull-interval"
-        >
-          <option value={1}>1</option>
-          <option value={2}>2</option>
-          <option value={5}>5</option>
-          <option value={10}>10</option>
-          <option value={15}>15</option>
-          <option value={30}>30</option>
-        </select>
-      </div>
-
-      <div style={{ height: 1, background: 'var(--border)' }} />
-
-      <div>
-        <div style={{ fontSize: 13, fontWeight: 600, color: 'var(--foreground)', marginBottom: 4 }}>Release Channel</div>
-        <div style={{ fontSize: 12, color: 'var(--muted-foreground)', lineHeight: 1.5 }}>
-          Controls which features are visible. Alpha users see all features. Beta/Stable see features as they are promoted.
-        </div>
-      </div>
-
-      <div style={{ display: 'flex', flexDirection: 'column', gap: 6 }}>
-        <label style={{ fontSize: 12, fontWeight: 500, color: 'var(--foreground)' }}>Release channel</label>
-        <select
-          value={props.releaseChannel}
-          onChange={(e) => props.setReleaseChannel(e.target.value)}
-          className="border border-border bg-transparent text-foreground rounded"
-          style={{ fontSize: 13, padding: '8px 10px', outline: 'none', fontFamily: 'inherit' }}
-          data-testid="settings-release-channel"
-        >
-          <option value="stable">Stable</option>
-          <option value="beta">Beta</option>
-          <option value="alpha">Alpha (bleeding edge)</option>
-        </select>
-      </div>
-
-      <div style={{ height: 1, background: 'var(--border)' }} />
-
-      <OrganizationWorkflowSection
-        checked={props.explicitOrganization}
-        onChange={props.setExplicitOrganization}
+      <SectionHeading
+        title="Sync"
+        description="Automatically pull vault changes from Git in the background."
       />
 
-      <div style={{ height: 1, background: 'var(--border)' }} />
+      <LabeledSelect
+        label="Pull interval (minutes)"
+        value={`${pullInterval}`}
+        onValueChange={(value) => setPullInterval(Number(value))}
+        options={PULL_INTERVAL_OPTIONS.map((value) => ({
+          value: `${value}`,
+          label: `${value}`,
+        }))}
+        testId="settings-pull-interval"
+        autoFocus={true}
+      />
 
-      <div>
-        <div style={{ fontSize: 13, fontWeight: 600, color: 'var(--foreground)', marginBottom: 4 }}>Privacy &amp; Telemetry</div>
-        <div style={{ fontSize: 12, color: 'var(--muted-foreground)', lineHeight: 1.5 }}>
-          Anonymous data helps us fix bugs and improve Tolaria. No vault content, note titles, or file paths are ever sent.
-        </div>
+      <Divider />
+
+      <SectionHeading
+        title="Release Channel"
+        description="Controls which update feed Tolaria polls. Stable only receives manually promoted releases. Alpha follows every push to main."
+      />
+
+      <LabeledSelect
+        label="Release channel"
+        value={releaseChannel}
+        onValueChange={(value) => setReleaseChannel(value as ReleaseChannel)}
+        options={[
+          { value: 'stable', label: 'Stable' },
+          { value: 'alpha', label: 'Alpha' },
+        ]}
+        testId="settings-release-channel"
+      />
+
+      <Divider />
+
+      <OrganizationWorkflowSection
+        checked={explicitOrganization}
+        onChange={setExplicitOrganization}
+      />
+
+      <Divider />
+
+      <SectionHeading
+        title="Privacy & Telemetry"
+        description="Anonymous data helps us fix bugs and improve Tolaria. No vault content, note titles, or file paths are ever sent."
+      />
+
+      <TelemetryToggle
+        label="Crash reporting"
+        description="Send anonymous error reports"
+        checked={crashReporting}
+        onChange={setCrashReporting}
+        testId="settings-crash-reporting"
+      />
+      <TelemetryToggle
+        label="Usage analytics"
+        description="Share anonymous usage patterns"
+        checked={analytics}
+        onChange={setAnalytics}
+        testId="settings-analytics"
+      />
+    </div>
+  )
+}
+
+function SectionHeading({
+  title,
+  description,
+}: {
+  title: string
+  description: string
+}) {
+  return (
+    <div>
+      <div style={{ fontSize: 13, fontWeight: 600, color: 'var(--foreground)', marginBottom: 4 }}>{title}</div>
+      <div style={{ fontSize: 12, color: 'var(--muted-foreground)', lineHeight: 1.5 }}>
+        {description}
       </div>
+    </div>
+  )
+}
 
-      <TelemetryToggle label="Crash reporting" description="Send anonymous error reports" checked={props.crashReporting} onChange={props.setCrashReporting} testId="settings-crash-reporting" />
-      <TelemetryToggle label="Usage analytics" description="Share anonymous usage patterns" checked={props.analytics} onChange={props.setAnalytics} testId="settings-analytics" />
+function Divider() {
+  return <div style={{ height: 1, background: 'var(--border)' }} />
+}
+
+function LabeledSelect({
+  label,
+  value,
+  onValueChange,
+  options,
+  testId,
+  autoFocus = false,
+}: {
+  label: string
+  value: string
+  onValueChange: (value: string) => void
+  options: Array<{ value: string; label: string }>
+  testId: string
+  autoFocus?: boolean
+}) {
+  return (
+    <div style={{ display: 'flex', flexDirection: 'column', gap: 6 }}>
+      <label style={{ fontSize: 12, fontWeight: 500, color: 'var(--foreground)' }}>{label}</label>
+      <Select value={value} onValueChange={onValueChange}>
+        <SelectTrigger
+          className="w-full bg-transparent"
+          data-testid={testId}
+          data-value={value}
+          data-settings-autofocus={autoFocus ? 'true' : undefined}
+        >
+          <SelectValue />
+        </SelectTrigger>
+        <SelectContent>
+          {options.map((option) => (
+            <SelectItem key={option.value} value={option.value}>
+              {option.label}
+            </SelectItem>
+          ))}
+        </SelectContent>
+      </Select>
     </div>
   )
 }
@@ -233,12 +385,10 @@ function OrganizationWorkflowSection({
 }) {
   return (
     <>
-      <div>
-        <div style={{ fontSize: 13, fontWeight: 600, color: 'var(--foreground)', marginBottom: 4 }}>Workflow</div>
-        <div style={{ fontSize: 12, color: 'var(--muted-foreground)', lineHeight: 1.5 }}>
-          Choose whether Tolaria shows the Inbox workflow and the organized toggle.
-        </div>
-      </div>
+      <SectionHeading
+        title="Workflow"
+        description="Choose whether Tolaria shows the Inbox workflow and the organized toggle."
+      />
 
       <label
         className="flex items-start justify-between gap-3"
@@ -257,10 +407,22 @@ function OrganizationWorkflowSection({
   )
 }
 
-function TelemetryToggle({ label, description, checked, onChange, testId }: { label: string; description: string; checked: boolean; onChange: (v: boolean) => void; testId: string }) {
+function TelemetryToggle({
+  label,
+  description,
+  checked,
+  onChange,
+  testId,
+}: {
+  label: string
+  description: string
+  checked: boolean
+  onChange: (value: boolean) => void
+  testId: string
+}) {
   return (
-    <label style={{ display: 'flex', alignItems: 'center', gap: 10, cursor: 'pointer' }} data-testid={testId}>
-      <input type="checkbox" checked={checked} onChange={(e) => onChange(e.target.checked)} style={{ width: 16, height: 16, accentColor: 'var(--primary)' }} />
+    <label className="flex items-center gap-3" style={{ cursor: 'pointer' }} data-testid={testId}>
+      <Checkbox checked={checked} onCheckedChange={(value) => onChange(isChecked(value))} />
       <div>
         <div style={{ fontSize: 13, fontWeight: 500, color: 'var(--foreground)' }}>{label}</div>
         <div style={{ fontSize: 11, color: 'var(--muted-foreground)' }}>{description}</div>
@@ -277,21 +439,12 @@ function SettingsFooter({ onClose, onSave }: { onClose: () => void; onSave: () =
     >
       <span style={{ fontSize: 11, color: 'var(--muted-foreground)' }}>{'\u2318'}, to open settings</span>
       <div className="flex gap-2">
-        <button
-          className="border border-border bg-transparent text-foreground rounded cursor-pointer hover:bg-accent"
-          style={{ fontSize: 13, padding: '6px 16px' }}
-          onClick={onClose}
-        >
+        <Button variant="outline" onClick={onClose}>
           Cancel
-        </button>
-        <button
-          className="border-none rounded cursor-pointer"
-          style={{ fontSize: 13, padding: '6px 16px', background: 'var(--primary)', color: 'white' }}
-          onClick={onSave}
-          data-testid="settings-save"
-        >
+        </Button>
+        <Button onClick={onSave} data-testid="settings-save">
           Save
-        </button>
+        </Button>
       </div>
     </div>
   )
diff --git a/src/hooks/useSettings.test.ts b/src/hooks/useSettings.test.ts
index ca90cf7f..3807eda2 100644
--- a/src/hooks/useSettings.test.ts
+++ b/src/hooks/useSettings.test.ts
@@ -48,9 +48,12 @@ describe('useSettings', () => {
   })
 
   it('returns empty settings initially', () => {
-    const { result } = renderHook(() => useSettings())
+    mockInvokeFn.mockImplementationOnce(() => new Promise(() => {}))
+
+    const { result, unmount } = renderHook(() => useSettings())
     expect(result.current.settings).toEqual(defaultSettings)
     expect(result.current.loaded).toBe(false)
+    unmount()
   })
 
   it('loads settings from backend on mount', async () => {
diff --git a/src/hooks/useSettings.ts b/src/hooks/useSettings.ts
index 861be7ed..d2c1d677 100644
--- a/src/hooks/useSettings.ts
+++ b/src/hooks/useSettings.ts
@@ -1,6 +1,7 @@
 import { useCallback, useEffect, useState } from 'react'
 import { invoke } from '@tauri-apps/api/core'
 import { isTauri, mockInvoke } from '../mock-tauri'
+import { normalizeReleaseChannel, serializeReleaseChannel } from '../lib/releaseChannel'
 import type { Settings } from '../types'
 
 function tauriCall<T>(command: string, tauriArgs: Record<string, unknown>, mockArgs?: Record<string, unknown>): Promise<T> {
@@ -16,6 +17,15 @@ const EMPTY_SETTINGS: Settings = {
   release_channel: null,
 }
 
+function normalizeSettings(settings: Settings): Settings {
+  return {
+    ...settings,
+    release_channel: serializeReleaseChannel(
+      normalizeReleaseChannel(settings.release_channel),
+    ),
+  }
+}
+
 export function useSettings() {
   const [settings, setSettings] = useState<Settings>(EMPTY_SETTINGS)
   const [loaded, setLoaded] = useState(false)
@@ -23,7 +33,7 @@ export function useSettings() {
   const loadSettings = useCallback(async () => {
     try {
       const s = await tauriCall<Settings>('get_settings', {})
-      setSettings(s)
+      setSettings(normalizeSettings(s))
     } catch (err) {
       console.warn('Failed to load settings:', err)
     } finally {
@@ -36,9 +46,10 @@ export function useSettings() {
   }, [loadSettings])
 
   const saveSettings = useCallback(async (newSettings: Settings) => {
+    const normalizedSettings = normalizeSettings(newSettings)
     try {
-      await tauriCall<null>('save_settings', { settings: newSettings })
-      setSettings(newSettings)
+      await tauriCall<null>('save_settings', { settings: normalizedSettings })
+      setSettings(normalizedSettings)
     } catch (err) {
       console.error('Failed to save settings:', err)
     }
diff --git a/src/hooks/useUpdater.test.ts b/src/hooks/useUpdater.test.ts
index 9189da76..22929ad3 100644
--- a/src/hooks/useUpdater.test.ts
+++ b/src/hooks/useUpdater.test.ts
@@ -1,32 +1,109 @@
 import { renderHook, act } from '@testing-library/react'
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
+import { beforeEach, afterEach, describe, expect, it, vi } from 'vitest'
 import { useUpdater } from './useUpdater'
 
-// Mock isTauri
 vi.mock('../mock-tauri', () => ({
   isTauri: vi.fn(() => false),
 }))
 
-// Mock openExternalUrl
 const mockOpenExternalUrl = vi.fn()
 vi.mock('../utils/url', () => ({
   openExternalUrl: (...args: unknown[]) => mockOpenExternalUrl(...args),
 }))
 
-// Mock the dynamic imports
-const mockCheck = vi.fn()
-const mockRelaunch = vi.fn()
+const mockInvoke = vi.fn()
 
-vi.mock('@tauri-apps/plugin-updater', () => ({
-  check: (...args: unknown[]) => mockCheck(...args),
-}))
+vi.mock('@tauri-apps/api/core', () => ({
+  invoke: (...args: unknown[]) => mockInvoke(...args),
+  Channel: class {
+    onmessage: (response: unknown) => void
 
-vi.mock('@tauri-apps/plugin-process', () => ({
-  relaunch: (...args: unknown[]) => mockRelaunch(...args),
+    constructor(onmessage?: (response: unknown) => void) {
+      this.onmessage = onmessage ?? (() => {})
+    }
+  },
 }))
 
 import { isTauri } from '../mock-tauri'
 
+interface AppUpdateMetadata {
+  currentVersion: string
+  version: string
+  date?: string
+  body?: string
+}
+
+type DownloadArgs = {
+  releaseChannel: string
+  expectedVersion: string
+  onEvent: {
+    onmessage: (
+      response:
+        | { event: 'Started'; data: { contentLength?: number } }
+        | { event: 'Progress'; data: { chunkLength: number } }
+        | { event: 'Finished' },
+    ) => void
+  }
+}
+
+function makeUpdate(overrides: Partial<AppUpdateMetadata> = {}): AppUpdateMetadata {
+  return {
+    currentVersion: '1.0.0',
+    version: '1.2.0',
+    body: 'Bug fixes and improvements',
+    ...overrides,
+  }
+}
+
+function installInvokeHandlers({
+  checkResult = null,
+  downloadImpl,
+}: {
+  checkResult?: AppUpdateMetadata | null | Error
+  downloadImpl?: (args: DownloadArgs) => Promise<void>
+}) {
+  mockInvoke.mockImplementation((command: string, args?: unknown) => {
+    if (command === 'check_for_app_update') {
+      if (checkResult instanceof Error) return Promise.reject(checkResult)
+      return Promise.resolve(checkResult)
+    }
+
+    if (command === 'download_and_install_app_update') {
+      if (downloadImpl) return downloadImpl(args as DownloadArgs)
+      return Promise.resolve(null)
+    }
+
+    return Promise.resolve(null)
+  })
+}
+
+function renderUpdater(releaseChannel: string) {
+  return renderHook(() => useUpdater(releaseChannel))
+}
+
+async function performManualCheck(
+  releaseChannel: string,
+  checkResult: AppUpdateMetadata | null | Error,
+) {
+  vi.mocked(isTauri).mockReturnValue(true)
+  installInvokeHandlers({ checkResult })
+
+  const hook = renderUpdater(releaseChannel)
+  let outcome: string | undefined
+
+  await act(async () => {
+    outcome = await hook.result.current.actions.checkForUpdates()
+  })
+
+  return { result: hook.result, outcome }
+}
+
+async function advanceAutoCheck() {
+  await act(async () => {
+    await vi.advanceTimersByTimeAsync(3500)
+  })
+}
+
 describe('useUpdater', () => {
   beforeEach(() => {
     vi.useFakeTimers()
@@ -41,111 +118,90 @@ describe('useUpdater', () => {
 
   it('starts in idle state', () => {
     vi.mocked(isTauri).mockReturnValue(false)
-    const { result } = renderHook(() => useUpdater())
+
+    const { result } = renderUpdater('stable')
+
     expect(result.current.status).toEqual({ state: 'idle' })
   })
 
-  it('does nothing when not in Tauri', async () => {
+  it('does not check for updates when not running in Tauri', async () => {
     vi.mocked(isTauri).mockReturnValue(false)
-    renderHook(() => useUpdater())
-    await vi.advanceTimersByTimeAsync(5000)
-    expect(mockCheck).not.toHaveBeenCalled()
+
+    renderUpdater('stable')
+    await advanceAutoCheck()
+
+    expect(mockInvoke).not.toHaveBeenCalled()
   })
 
-  it('checks for updates after 3s delay when in Tauri', async () => {
+  it('checks for stable updates after the startup delay', async () => {
     vi.mocked(isTauri).mockReturnValue(true)
-    mockCheck.mockResolvedValue(null) // no update
+    installInvokeHandlers({ checkResult: null })
 
-    renderHook(() => useUpdater())
-    expect(mockCheck).not.toHaveBeenCalled()
+    renderUpdater('stable')
+    await advanceAutoCheck()
 
-    await vi.advanceTimersByTimeAsync(3500)
-    await vi.waitFor(() => {
-      expect(mockCheck).toHaveBeenCalledOnce()
+    expect(mockInvoke).toHaveBeenCalledWith('check_for_app_update', {
+      releaseChannel: 'stable',
     })
   })
 
-  it('stays idle when no update is available', async () => {
-    vi.mocked(isTauri).mockReturnValue(true)
-    mockCheck.mockResolvedValue(null)
+  it('transitions to available when an alpha update is found', async () => {
+    const { result } = await performManualCheck(
+      'alpha',
+      makeUpdate({ version: '1.2.4-alpha.202604121830.10' }),
+    )
 
-    const { result } = renderHook(() => useUpdater())
-    await vi.advanceTimersByTimeAsync(3500)
-
-    await vi.waitFor(() => {
-      expect(mockCheck).toHaveBeenCalled()
+    expect(result.current.status).toEqual({
+      state: 'available',
+      version: '1.2.4-alpha.202604121830.10',
+      notes: 'Bug fixes and improvements',
     })
+
+    expect(mockInvoke).toHaveBeenCalledWith('check_for_app_update', {
+      releaseChannel: 'alpha',
+    })
+  })
+
+  it('returns up-to-date when no update is available', async () => {
+    const { result, outcome } = await performManualCheck('stable', null)
+
+    expect(outcome).toBe('up-to-date')
     expect(result.current.status).toEqual({ state: 'idle' })
   })
 
-  it('transitions to available when update is found', async () => {
-    vi.mocked(isTauri).mockReturnValue(true)
-    mockCheck.mockResolvedValue({
+  it('returns available and sets status when an update exists', async () => {
+    const { result, outcome } = await performManualCheck(
+      'stable',
+      makeUpdate({ body: undefined }),
+    )
+
+    expect(outcome).toBe('available')
+    expect(result.current.status).toEqual({
+      state: 'available',
       version: '1.2.0',
-      body: 'Bug fixes and improvements',
-      downloadAndInstall: vi.fn(),
-    })
-
-    const { result } = renderHook(() => useUpdater())
-    await vi.advanceTimersByTimeAsync(3500)
-
-    await vi.waitFor(() => {
-      expect(result.current.status).toEqual({
-        state: 'available',
-        version: '1.2.0',
-        notes: 'Bug fixes and improvements',
-      })
+      notes: undefined,
     })
   })
 
-  it('handles missing body gracefully', async () => {
-    vi.mocked(isTauri).mockReturnValue(true)
-    mockCheck.mockResolvedValue({
-      version: '2.0.0',
-      body: null,
-      downloadAndInstall: vi.fn(),
-    })
+  it('returns error when the update check fails', async () => {
+    const { result, outcome } = await performManualCheck(
+      'stable',
+      new Error('network error'),
+    )
 
-    const { result } = renderHook(() => useUpdater())
-    await vi.advanceTimersByTimeAsync(3500)
-
-    await vi.waitFor(() => {
-      expect(result.current.status).toEqual({
-        state: 'available',
-        version: '2.0.0',
-        notes: undefined,
-      })
-    })
-  })
-
-  it('stays idle on network error (fails silently)', async () => {
-    vi.mocked(isTauri).mockReturnValue(true)
-    mockCheck.mockRejectedValue(new Error('Network error'))
-
-    const { result } = renderHook(() => useUpdater())
-    await vi.advanceTimersByTimeAsync(3500)
-
-    await vi.waitFor(() => {
-      expect(console.warn).toHaveBeenCalledWith(
-        '[updater] Failed to check for updates'
-      )
-    })
+    expect(outcome).toBe('error')
+    expect(console.warn).toHaveBeenCalledWith('[updater] Failed to check for updates')
     expect(result.current.status).toEqual({ state: 'idle' })
   })
 
-  it('dismiss returns to idle from available', async () => {
+  it('dismiss resets the banner state', async () => {
     vi.mocked(isTauri).mockReturnValue(true)
-    mockCheck.mockResolvedValue({
-      version: '1.2.0',
-      body: 'Notes',
-      downloadAndInstall: vi.fn(),
-    })
+    installInvokeHandlers({ checkResult: makeUpdate() })
 
-    const { result } = renderHook(() => useUpdater())
-    await vi.advanceTimersByTimeAsync(3500)
+    const { result } = renderUpdater('stable')
 
-    await vi.waitFor(() => {
-      expect(result.current.status.state).toBe('available')
+    await act(async () => {
+      await result.current.actions.checkForUpdates()
     })
 
     act(() => {
@@ -155,10 +211,10 @@ describe('useUpdater', () => {
     expect(result.current.status).toEqual({ state: 'idle' })
   })
 
-  it('openReleaseNotes opens the release notes URL via openExternalUrl', async () => {
+  it('openReleaseNotes opens the release notes page', () => {
     vi.mocked(isTauri).mockReturnValue(false)
 
-    const { result } = renderHook(() => useUpdater())
+    const { result } = renderUpdater('stable')
 
     act(() => {
       result.current.actions.openReleaseNotes()
@@ -169,27 +225,24 @@ describe('useUpdater', () => {
     )
   })
 
-  it('startDownload transitions through downloading to ready', async () => {
+  it('downloads and installs the available update with progress', async () => {
     vi.mocked(isTauri).mockReturnValue(true)
-
-    const mockDownload = vi.fn(async (callback: (event: { event: string; data?: Record<string, unknown> }) => void) => {
-      callback({ event: 'Started', data: { contentLength: 1000 } })
-      callback({ event: 'Progress', data: { chunkLength: 500 } })
-      callback({ event: 'Progress', data: { chunkLength: 500 } })
-      callback({ event: 'Finished' })
+    installInvokeHandlers({
+      checkResult: makeUpdate(),
+      downloadImpl: async (args) => {
+        expect(args.releaseChannel).toBe('stable')
+        expect(args.expectedVersion).toBe('1.2.0')
+        args.onEvent.onmessage({ event: 'Started', data: { contentLength: 1000 } })
+        args.onEvent.onmessage({ event: 'Progress', data: { chunkLength: 500 } })
+        args.onEvent.onmessage({ event: 'Progress', data: { chunkLength: 500 } })
+        args.onEvent.onmessage({ event: 'Finished' })
+      },
     })
 
-    mockCheck.mockResolvedValue({
-      version: '1.2.0',
-      body: 'Notes',
-      downloadAndInstall: mockDownload,
-    })
+    const { result } = renderUpdater('stable')
 
-    const { result } = renderHook(() => useUpdater())
-    await vi.advanceTimersByTimeAsync(3500)
-
-    await vi.waitFor(() => {
-      expect(result.current.status.state).toBe('available')
+    await act(async () => {
+      await result.current.actions.checkForUpdates()
     })
 
     await act(async () => {
@@ -197,75 +250,28 @@ describe('useUpdater', () => {
     })
 
     expect(result.current.status).toEqual({ state: 'ready', version: '1.2.0' })
-    expect(mockDownload).toHaveBeenCalled()
   })
 
-  describe('checkForUpdates (manual)', () => {
-    it('returns up-to-date when no update is available', async () => {
-      vi.mocked(isTauri).mockReturnValue(true)
-      mockCheck.mockResolvedValue(null)
-
-      const { result } = renderHook(() => useUpdater())
-
-      let checkResult: string | undefined
-      await act(async () => {
-        checkResult = await result.current.actions.checkForUpdates()
-      })
-
-      expect(checkResult).toBe('up-to-date')
-      expect(result.current.status).toEqual({ state: 'idle' })
+  it('transitions to error when download fails', async () => {
+    vi.mocked(isTauri).mockReturnValue(true)
+    installInvokeHandlers({
+      checkResult: makeUpdate(),
+      downloadImpl: async () => {
+        throw new Error('download failed')
+      },
     })
 
-    it('returns available and sets status when update exists', async () => {
-      vi.mocked(isTauri).mockReturnValue(true)
-      mockCheck.mockResolvedValue({
-        version: '3.0.0',
-        body: 'Major release',
-        downloadAndInstall: vi.fn(),
-      })
+    const { result } = renderUpdater('stable')
 
-      const { result } = renderHook(() => useUpdater())
-
-      let checkResult: string | undefined
-      await act(async () => {
-        checkResult = await result.current.actions.checkForUpdates()
-      })
-
-      expect(checkResult).toBe('available')
-      expect(result.current.status).toEqual({
-        state: 'available',
-        version: '3.0.0',
-        notes: 'Major release',
-      })
+    await act(async () => {
+      await result.current.actions.checkForUpdates()
     })
 
-    it('returns error on network failure', async () => {
-      vi.mocked(isTauri).mockReturnValue(true)
-      mockCheck.mockRejectedValue(new Error('No internet'))
-
-      const { result } = renderHook(() => useUpdater())
-
-      let checkResult: string | undefined
-      await act(async () => {
-        checkResult = await result.current.actions.checkForUpdates()
-      })
-
-      expect(checkResult).toBe('error')
-      expect(console.warn).toHaveBeenCalledWith('[updater] Failed to check for updates')
+    await act(async () => {
+      await result.current.actions.startDownload()
     })
 
-    it('returns up-to-date when not in Tauri', async () => {
-      vi.mocked(isTauri).mockReturnValue(false)
-
-      const { result } = renderHook(() => useUpdater())
-
-      let checkResult: string | undefined
-      await act(async () => {
-        checkResult = await result.current.actions.checkForUpdates()
-      })
-
-      expect(checkResult).toBe('up-to-date')
-      expect(mockCheck).not.toHaveBeenCalled()
-    })
+    expect(console.warn).toHaveBeenCalledWith('[updater] Download failed')
+    expect(result.current.status).toEqual({ state: 'error' })
   })
 })
diff --git a/src/hooks/useUpdater.ts b/src/hooks/useUpdater.ts
index d54052fc..2706b414 100644
--- a/src/hooks/useUpdater.ts
+++ b/src/hooks/useUpdater.ts
@@ -1,5 +1,11 @@
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { useCallback, useEffect, useRef, useState, type Dispatch, type SetStateAction } from 'react'
 import { isTauri } from '../mock-tauri'
+import {
+  checkForAppUpdate,
+  downloadAndInstallAppUpdate,
+  type AppUpdateDownloadEvent,
+  type AppUpdateMetadata,
+} from '../lib/appUpdater'
 import { openExternalUrl } from '../utils/url'
 
 const RELEASE_NOTES_URL = 'https://refactoringhq.github.io/tolaria/'
@@ -20,30 +26,63 @@ export interface UpdateActions {
   dismiss: () => void
 }
 
-export function useUpdater(): { status: UpdateStatus; actions: UpdateActions } {
+function toAvailableStatus(update: AppUpdateMetadata): UpdateStatus {
+  return {
+    state: 'available',
+    version: update.version,
+    notes: update.body ?? undefined,
+  }
+}
+
+function createDownloadProgressHandler(
+  version: string,
+  setStatus: Dispatch<SetStateAction<UpdateStatus>>,
+): (event: AppUpdateDownloadEvent) => void {
+  let totalBytes = 0
+  let downloadedBytes = 0
+
+  return (event) => {
+    if (event.event === 'Started') {
+      totalBytes = event.data.contentLength ?? 0
+      return
+    }
+
+    if (event.event === 'Progress') {
+      downloadedBytes += event.data.chunkLength
+      const progress = totalBytes > 0 ? Math.min(downloadedBytes / totalBytes, 1) : 0
+      setStatus({ state: 'downloading', version, progress })
+      return
+    }
+
+    setStatus({ state: 'ready', version })
+  }
+}
+
+export function useUpdater(
+  releaseChannel: string | null | undefined,
+): { status: UpdateStatus; actions: UpdateActions } {
   const [status, setStatus] = useState<UpdateStatus>({ state: 'idle' })
-  const updateRef = useRef<unknown>(null)
+  const updateRef = useRef<AppUpdateMetadata | null>(null)
 
   const checkForUpdates = useCallback(async (): Promise<UpdateCheckResult> => {
     if (!isTauri()) return 'up-to-date'
 
     try {
-      const { check } = await import('@tauri-apps/plugin-updater')
-      const update = await check()
-      if (!update) return 'up-to-date'
+      const update = await checkForAppUpdate(releaseChannel)
+      if (!update) {
+        updateRef.current = null
+        setStatus({ state: 'idle' })
+        return 'up-to-date'
+      }
 
       updateRef.current = update
-      setStatus({
-        state: 'available',
-        version: update.version,
-        notes: update.body ?? undefined,
-      })
+      setStatus(toAvailableStatus(update))
       return 'available'
     } catch {
       console.warn('[updater] Failed to check for updates')
       return 'error'
     }
-  }, [])
+  }, [releaseChannel])
 
   useEffect(() => {
     if (!isTauri()) return
@@ -52,29 +91,17 @@ export function useUpdater(): { status: UpdateStatus; actions: UpdateActions } {
   }, [checkForUpdates])
 
   const startDownload = useCallback(async () => {
-    const update = updateRef.current as {
-      version: string
-      downloadAndInstall: (cb: (event: { event: string; data?: { contentLength?: number; chunkLength?: number } }) => void) => Promise<void>
-    } | null
+    const update = updateRef.current
     if (!update) return
 
-    let totalBytes = 0
-    let downloadedBytes = 0
-
     setStatus({ state: 'downloading', version: update.version, progress: 0 })
 
     try {
-      await update.downloadAndInstall((event) => {
-        if (event.event === 'Started' && event.data?.contentLength) {
-          totalBytes = event.data.contentLength
-        } else if (event.event === 'Progress' && event.data?.chunkLength) {
-          downloadedBytes += event.data.chunkLength
-          const progress = totalBytes > 0 ? Math.min(downloadedBytes / totalBytes, 1) : 0
-          setStatus({ state: 'downloading', version: update.version, progress })
-        } else if (event.event === 'Finished') {
-          setStatus({ state: 'ready', version: update.version })
-        }
-      })
+      await downloadAndInstallAppUpdate(
+        releaseChannel,
+        update.version,
+        createDownloadProgressHandler(update.version, setStatus),
+      )
 
       // If Finished wasn't emitted via callback, set ready after await resolves
       setStatus((prev) => (prev.state === 'downloading' ? { state: 'ready', version: update.version } : prev))
@@ -82,13 +109,14 @@ export function useUpdater(): { status: UpdateStatus; actions: UpdateActions } {
       console.warn('[updater] Download failed')
       setStatus({ state: 'error' })
     }
-  }, [])
+  }, [releaseChannel])
 
   const openReleaseNotes = useCallback(() => {
     openExternalUrl(RELEASE_NOTES_URL)
   }, [])
 
   const dismiss = useCallback(() => {
+    updateRef.current = null
     setStatus({ state: 'idle' })
   }, [])
 
diff --git a/src/lib/appUpdater.ts b/src/lib/appUpdater.ts
new file mode 100644
index 00000000..16f27cfb
--- /dev/null
+++ b/src/lib/appUpdater.ts
@@ -0,0 +1,37 @@
+import { Channel, invoke } from '@tauri-apps/api/core'
+import { normalizeReleaseChannel } from './releaseChannel'
+
+export interface AppUpdateMetadata {
+  currentVersion: string
+  version: string
+  date?: string
+  body?: string
+}
+
+export type AppUpdateDownloadEvent =
+  | { event: 'Started'; data: { contentLength?: number } }
+  | { event: 'Progress'; data: { chunkLength: number } }
+  | { event: 'Finished' }
+
+export async function checkForAppUpdate(
+  releaseChannel: string | null | undefined,
+): Promise<AppUpdateMetadata | null> {
+  return invoke<AppUpdateMetadata | null>('check_for_app_update', {
+    releaseChannel: normalizeReleaseChannel(releaseChannel),
+  })
+}
+
+export async function downloadAndInstallAppUpdate(
+  releaseChannel: string | null | undefined,
+  expectedVersion: string,
+  onEvent: (event: AppUpdateDownloadEvent) => void,
+): Promise<void> {
+  const channel = new Channel<AppUpdateDownloadEvent>()
+  channel.onmessage = onEvent
+
+  await invoke('download_and_install_app_update', {
+    releaseChannel: normalizeReleaseChannel(releaseChannel),
+    expectedVersion,
+    onEvent: channel,
+  })
+}
diff --git a/src/lib/releaseChannel.test.ts b/src/lib/releaseChannel.test.ts
new file mode 100644
index 00000000..2efa2a9e
--- /dev/null
+++ b/src/lib/releaseChannel.test.ts
@@ -0,0 +1,38 @@
+import { describe, expect, it } from 'vitest'
+import {
+  normalizeReleaseChannel,
+  serializeReleaseChannel,
+  type ReleaseChannel,
+} from './releaseChannel'
+
+describe('releaseChannel', () => {
+  it('normalizes only alpha explicitly', () => {
+    expect(normalizeReleaseChannel('alpha')).toBe('alpha')
+    expect(normalizeReleaseChannel('  ALPHA  ')).toBe('alpha')
+  })
+
+  it('falls back to stable for legacy or invalid values', () => {
+    expect(normalizeReleaseChannel(null)).toBe('stable')
+    expect(normalizeReleaseChannel('stable')).toBe('stable')
+    expect(normalizeReleaseChannel('beta')).toBe('stable')
+    expect(normalizeReleaseChannel('invalid')).toBe('stable')
+  })
+
+  it('serializes stable back to the persisted default shape', () => {
+    expect(serializeReleaseChannel('stable')).toBeNull()
+    expect(serializeReleaseChannel('alpha')).toBe('alpha')
+  })
+
+  it('roundtrips persisted values through the normalized channel model', () => {
+    const channels: Array<[string | null, ReleaseChannel]> = [
+      ['alpha', 'alpha'],
+      ['stable', 'stable'],
+      ['beta', 'stable'],
+      [null, 'stable'],
+    ]
+
+    for (const [persistedValue, expectedChannel] of channels) {
+      expect(normalizeReleaseChannel(persistedValue)).toBe(expectedChannel)
+    }
+  })
+})
diff --git a/src/lib/releaseChannel.ts b/src/lib/releaseChannel.ts
new file mode 100644
index 00000000..7014d693
--- /dev/null
+++ b/src/lib/releaseChannel.ts
@@ -0,0 +1,13 @@
+export type ReleaseChannel = 'alpha' | 'stable'
+
+function cleanedReleaseChannel(value: string | null | undefined): string {
+  return value?.trim().toLowerCase() ?? ''
+}
+
+export function normalizeReleaseChannel(value: string | null | undefined): ReleaseChannel {
+  return cleanedReleaseChannel(value) === 'alpha' ? 'alpha' : 'stable'
+}
+
+export function serializeReleaseChannel(channel: ReleaseChannel): string | null {
+  return channel === 'alpha' ? 'alpha' : null
+}
diff --git a/tests/smoke/canary-release-feature-flags.spec.ts b/tests/smoke/canary-release-feature-flags.spec.ts
deleted file mode 100644
index 9ddea875..00000000
--- a/tests/smoke/canary-release-feature-flags.spec.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { test, expect } from '@playwright/test'
-import { openCommandPalette, executeCommand } from './helpers'
-
-async function openSettings(page: import('@playwright/test').Page) {
-  await openCommandPalette(page)
-  await executeCommand(page, 'Settings')
-  const panel = page.locator('[data-testid="settings-panel"]')
-  await panel.waitFor({ timeout: 5000 })
-  return panel
-}
-
-test.describe('Release channel settings', () => {
-  test.beforeEach(async ({ page }) => {
-    await page.goto('/')
-    await page.waitForLoadState('networkidle')
-  })
-
-  test('Settings panel shows Release channel dropdown defaulting to Stable', async ({ page }) => {
-    await openSettings(page)
-
-    // Check the Release Channel section exists
-    await expect(page.getByText('Release Channel')).toBeVisible()
-
-    // Check the dropdown defaults to stable
-    const select = page.locator('[data-testid="settings-release-channel"]')
-    await expect(select).toBeVisible()
-    await expect(select).toHaveValue('stable')
-
-    // Update channel should NOT be present
-    await expect(page.locator('[data-testid="settings-update-channel"]')).not.toBeVisible()
-  })
-
-  test('Release channel can be changed to alpha and saved', async ({ page }) => {
-    await openSettings(page)
-
-    // Change to alpha
-    const select = page.locator('[data-testid="settings-release-channel"]')
-    await select.selectOption('alpha')
-    await expect(select).toHaveValue('alpha')
-
-    // Save (closes the panel)
-    await page.click('[data-testid="settings-save"]')
-    await page.waitForTimeout(500)
-
-    // Reopen settings and verify the value persisted
-    await openSettings(page)
-    const reopenedSelect = page.locator('[data-testid="settings-release-channel"]')
-    await expect(reopenedSelect).toHaveValue('alpha')
-  })
-})
diff --git a/tests/smoke/release-channel-settings.spec.ts b/tests/smoke/release-channel-settings.spec.ts
new file mode 100644
index 00000000..9363876e
--- /dev/null
+++ b/tests/smoke/release-channel-settings.spec.ts
@@ -0,0 +1,52 @@
+import { test, expect } from '@playwright/test'
+import { openCommandPalette, executeCommand } from './helpers'
+
+async function openSettings(page: import('@playwright/test').Page) {
+  await page.locator('body').click()
+  await page.keyboard.press('Meta+,')
+  const panel = page.locator('[data-testid="settings-panel"]')
+  try {
+    await panel.waitFor({ timeout: 2000 })
+    return panel
+  } catch {
+    await openCommandPalette(page)
+    await executeCommand(page, 'Settings')
+    await panel.waitFor({ timeout: 5000 })
+  }
+  return panel
+}
+
+test.describe('Release channel settings', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto('/')
+    await page.waitForLoadState('networkidle')
+  })
+
+  test('Settings panel defaults the release channel to Stable', async ({ page }) => {
+    await openSettings(page)
+
+    const trigger = page.locator('[data-testid="settings-release-channel"]')
+    await expect(trigger).toBeVisible()
+    await expect(trigger).toHaveAttribute('data-value', 'stable')
+
+    await trigger.click()
+    await expect(page.getByRole('option', { name: 'Stable' })).toBeVisible()
+    await expect(page.getByRole('option', { name: 'Alpha' })).toBeVisible()
+    await expect(page.getByRole('option', { name: 'Beta' })).toHaveCount(0)
+  })
+
+  test('Release channel can be changed to alpha and saved', async ({ page }) => {
+    await openSettings(page)
+
+    const trigger = page.locator('[data-testid="settings-release-channel"]')
+    await trigger.click()
+    await page.getByRole('option', { name: 'Alpha' }).click()
+    await expect(trigger).toHaveAttribute('data-value', 'alpha')
+
+    await page.click('[data-testid="settings-save"]')
+    await page.waitForTimeout(500)
+
+    await openSettings(page)
+    await expect(page.locator('[data-testid="settings-release-channel"]')).toHaveAttribute('data-value', 'alpha')
+  })
+})