From 50bfa24d9956b3d26996b4de409f5654021dafff Mon Sep 17 00:00:00 2001
From: fatsbrown <123950591+fatsbrown@users.noreply.github.com>
Date: Sun, 31 May 2026 13:49:15 -0300
Subject: [PATCH] Maintain server side workouts manifest

Fix user home sync status in single player mode.
Sync workouts before rendering user home.
Changes in launcher pages.
Revert unnecessary changes.
---
 .gitignore                                 |   2 -
 README.md                                  |   3 +-
 cdn/static/web/launcher/intervals.html     |  44 ++----
 cdn/static/web/launcher/trainingpeaks.html |  20 +--
 cdn/static/web/launcher/user_home.html     |  35 ++---
 docker-compose.yml                         |   1 -
 docs/local-usage.md                        | 110 --------------
 local_zwift_workouts.py                    | 168 ---------------------
 tests/__init__.py                          |   0
 tests/test_intervals_workouts.py           | 152 -------------------
 tests/test_local_zwift_workouts.py         | 113 --------------
 tests/test_trainingpeaks_workouts.py       |  55 -------
 tests/test_workout_state.py                |  73 ---------
 workouts_manifest.py                       |  95 ++++++++++++
 zwift_offline.py                           | 106 +++++--------
 15 files changed, 171 insertions(+), 806 deletions(-)
 delete mode 100644 docs/local-usage.md
 delete mode 100644 local_zwift_workouts.py
 delete mode 100644 tests/__init__.py
 delete mode 100644 tests/test_intervals_workouts.py
 delete mode 100644 tests/test_local_zwift_workouts.py
 delete mode 100644 tests/test_trainingpeaks_workouts.py
 delete mode 100644 tests/test_workout_state.py
 create mode 100644 workouts_manifest.py

diff --git a/.gitignore b/.gitignore
index 83e6fff..0b33d80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,3 @@ __pycache__/
 build/
 dist/
 logs/
-.venv/
-scripts/strava_token.txt
diff --git a/README.md b/README.md
index 2c5897d..2eb62d9 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,6 @@ zoffline can be installed on the same machine as Zwift or another local machine.
               - TZ=Europe/London
           volumes:
               - ./storage/:/usr/src/app/zwift-offline/storage
-              - ${ZWIFT_WORKOUTS_DIR:-~/Documents/Zwift/Workouts}:/root/Documents/Zwift/Workouts
           ports:
               - 80:80
               - 443:443
@@ -86,7 +85,6 @@ zoffline can be installed on the same machine as Zwift or another local machine.
           restart: unless-stopped
   ```
   * In the ``volumes`` tag replace ``./storage/`` before the ``:`` with the directory path you want to use as your local zoffline data store.
-  * Set ``ZWIFT_WORKOUTS_DIR`` if your local Zwift workouts folder is not ``~/Documents/Zwift/Workouts``.
 * If you are not running zoffline on the same PC that Zwift is running: create a ``server-ip.txt`` file in the ``storage`` directory containing the IP address of the PC running zoffline.
 * Start zoffline with: ``docker-compose up -d``
 </details>
@@ -439,3 +437,4 @@ this project and does not endorse this project.
 
 All product and company names are trademarks of their respective holders. Use of
 them does not imply any affiliation with or endorsement by them.
+
diff --git a/cdn/static/web/launcher/intervals.html b/cdn/static/web/launcher/intervals.html
index 14414b1..9f1ee13 100644
--- a/cdn/static/web/launcher/intervals.html
+++ b/cdn/static/web/launcher/intervals.html
@@ -32,36 +32,6 @@
           </div>
         </div>
       </form>
-      {% if sync_status %}
-        <ul class="list-group top-buffer">
-          <li class="list-group-item py-2">
-            <div class="text-shadow">Active provider: {{ active_provider or 'not selected' }}</div>
-          </li>
-          <li class="list-group-item py-2">
-            {% if sync_status.metadata %}
-              <div class="text-shadow">Synced workout: {{ sync_status.metadata.name or sync_status.metadata.filename }}</div>
-              <div class="text-shadow"><small>{{ sync_status.metadata.filename }}</small></div>
-              {% if sync_status.metadata.start_date_local %}
-                <div class="text-shadow"><small>{{ sync_status.metadata.start_date_local }}</small></div>
-              {% endif %}
-            {% else %}
-              <div class="text-shadow">No synced Intervals workout is cached right now.</div>
-              <div class="text-shadow"><small>Use "Sync today's workout" before launching Zwift.</small></div>
-            {% endif %}
-          </li>
-          <li class="list-group-item py-2">
-            {% if sync_status.local_status %}
-              <div class="text-shadow">Local Zwift catalog: {{ 'ready for launch' if sync_status.local_status.healthy else 'needs refresh' }}</div>
-              <div class="text-shadow"><small>File: {{ 'present' if sync_status.local_status.file_exists else 'missing' }} | Manifest: {{ 'present' if sync_status.local_status.manifest_entry_exists else 'missing' }}</small></div>
-              {% if sync_status.local_status.manifest_entry %}
-                <div class="text-shadow"><small>Guid {{ sync_status.local_status.manifest_entry.guid }}, checksum {{ sync_status.local_status.manifest_entry.checksum }}</small></div>
-              {% endif %}
-            {% else %}
-              <div class="text-shadow">Local Zwift catalog: waiting for next sync</div>
-            {% endif %}
-          </li>
-        </ul>
-      {% endif %}
       {% with messages = get_flashed_messages() %}
         {% if messages %}
           <ul class="list-group top-buffer">
@@ -74,5 +44,19 @@
         {% endif %}
       {% endwith %}
     </div>
+    {% if sync_status and aid and akey %}
+      <div class="col-sm-8 col-md-6">
+        <ul class="list-group top-buffer">
+          <li class="list-group-item py-2">
+            {% if sync_status.metadata %}
+              <div class="text-shadow">Synced workout: {{ sync_status.metadata.name or sync_status.metadata.filename }}</div>
+            {% else %}
+              <div class="text-shadow">No synced Intervals workout.</div>
+              <div class="text-shadow"><small>Use "Sync today's workout" before launching Zwift.</small></div>
+            {% endif %}
+          </li>
+        </ul>
+      </div>
+    {% endif %}
   </div>
 {% endblock %}
diff --git a/cdn/static/web/launcher/trainingpeaks.html b/cdn/static/web/launcher/trainingpeaks.html
index 91d933e..8068655 100644
--- a/cdn/static/web/launcher/trainingpeaks.html
+++ b/cdn/static/web/launcher/trainingpeaks.html
@@ -11,15 +11,7 @@
     </div>
   </div>
   <div class="row">
-    <div class="col-sm-8 col-md-6 top-buffer">
-      <div class="list-group">
-        <div class="list-group-item py-2">
-          <div class="text-shadow">{{ message }}</div>
-        </div>
-        <div class="list-group-item py-2">
-          <div class="text-shadow">Manual bridge mode: export TrainingPeaks workouts as .zwo files into a local folder, save that folder path here, then click "Import workouts".</div>
-        </div>
-      </div>
+    <div class="col-sm-8 col-md-6">
       <form id="trainingpeaks" action="{{ url_for('trainingpeaks', username=username) }}" method="post" class="top-buffer">
         <div class="row">
           <div class="col-md-12">
@@ -45,5 +37,15 @@
         {% endif %}
       {% endwith %}
     </div>
+    <div class="col-sm-8 col-md-6">
+      <div class="list-group top-buffer">
+        <div class="list-group-item py-2">
+          <div class="text-shadow">{{ message }}</div>
+        </div>
+        <div class="list-group-item py-2">
+          <div class="text-shadow">Manual bridge mode: export TrainingPeaks workouts as .zwo files into a folder, save that folder path here, then click "Import workouts".</div>
+        </div>
+      </div>
+    </div>
   </div>
 {% endblock %}
diff --git a/cdn/static/web/launcher/user_home.html b/cdn/static/web/launcher/user_home.html
index 7ef84a8..8e41a48 100644
--- a/cdn/static/web/launcher/user_home.html
+++ b/cdn/static/web/launcher/user_home.html
@@ -29,25 +29,6 @@
   </div>
   <div class="row">
     <div class="col-sm-6 col-md-5">
-      {% if workout_sync_status %}
-        <ul class="list-group top-buffer">
-          <li class="list-group-item py-2">
-            <div class="text-shadow">Workout provider: {{ active_workout_provider or 'not selected' }}</div>
-            {% if workout_sync_status.metadata %}
-              <div class="text-shadow"><small>{{ workout_sync_status.metadata.name or workout_sync_status.metadata.filename }}</small></div>
-            {% else %}
-              <div class="text-shadow"><small>No synced workout cached yet.</small></div>
-            {% endif %}
-          </li>
-          <li class="list-group-item py-2">
-            {% if workout_sync_status.local_status %}
-              <div class="text-shadow">Local workout catalog: {{ 'ready for launch' if workout_sync_status.local_status.healthy else 'needs refresh' }}</div>
-            {% else %}
-              <div class="text-shadow">Local workout catalog: waiting for next sync</div>
-            {% endif %}
-          </li>
-        </ul>
-      {% endif %}
       <form method="POST" action="/start-zwift" class="top-buffer">
         <div class="row">
           <div class="col-md-12">
@@ -102,5 +83,21 @@
         {% endif %}
       {% endwith %}
     </div>
+    {% if workout_sync_status %}
+      <div class="col-sm-8 col-md-6">
+        <ul class="list-group top-buffer">
+          <li class="list-group-item py-2">
+            <div class="text-shadow">Workout provider: {{ active_workout_provider or 'not selected' }}</div>
+          </li>
+          <li class="list-group-item py-2">
+            {% if workout_sync_status.metadata %}
+              <div class="text-shadow"><small>{{ workout_sync_status.metadata.name or workout_sync_status.metadata.filename }}</small></div>
+            {% else %}
+              <div class="text-shadow"><small>No synced workout.</small></div>
+            {% endif %}
+          </li>
+        </ul>
+      </div>
+    {% endif %}
   </div>
 {% endblock %}
diff --git a/docker-compose.yml b/docker-compose.yml
index f4d1647..b995946 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,7 +9,6 @@ services:
             - TZ=Europe/London
         volumes:
             - ./storage/:/usr/src/app/zwift-offline/storage
-            - ${ZWIFT_WORKOUTS_DIR:-~/Documents/Zwift/Workouts}:/root/Documents/Zwift/Workouts
         ports:
             - 80:80
             - 443:443
diff --git a/docs/local-usage.md b/docs/local-usage.md
deleted file mode 100644
index f180320..0000000
--- a/docs/local-usage.md
+++ /dev/null
@@ -1,110 +0,0 @@
-# zoffline 本地使用说明
-
-## 当前已完成能力
-
-1. Intervals.icu
-- 可在启动 Zwift 前自动拉取当天 workout
-- 骑完保存后可自动上传活动回 Intervals.icu
-- 若活动匹配当天同步的 workout，会自动带 paired_event_id 并 mark-done
-
-2. Strava
-- 已支持 OAuth 授权
-- 骑完保存后可自动上传 FIT 到 Strava
-
-3. TrainingPeaks
-- 已支持手工桥接模式
-- 将 TrainingPeaks 导出的 `.zwo` 文件放入本地目录后，可一键导入 Zwift custom workouts
-- 当前不支持官方 API 自动拉取/自动上传，因为需要 TrainingPeaks partner access
-
-4. Provider 互斥模式
-- Intervals.icu 和 TrainingPeaks 不会再同时出现在 customworkouts
-- 谁最后同步，谁就是当前 active provider
-
-## 启动方式
-
-推荐使用非特权端口本地运行：
-
-```bash
-cd /Users/sumulige/Documents/Antigravity/zwift-offline
-python3 -m venv .venv
-. .venv/bin/activate
-pip install -r requirements.txt
-env \
-  ZOFFLINE_CDN_PORT=18080 \
-  ZOFFLINE_TCP_PORT=13025 \
-  ZOFFLINE_UDP_PORT=13024 \
-  ZOFFLINE_API_PORT=18443 \
-  ZOFFLINE_API_USE_CERT=false \
-  ./.venv/bin/python standalone.py
-```
-
-打开页面：
-- 主页: `http://127.0.0.1:18443/user/zoffline/`
-- Settings: `http://127.0.0.1:18443/settings/zoffline/`
-- Intervals: `http://127.0.0.1:18443/intervals/zoffline/`
-- Strava: `http://127.0.0.1:18443/strava/zoffline/`
-- TrainingPeaks: `http://127.0.0.1:18443/trainingpeaks/zoffline/`
-
-## Intervals.icu 设置
-
-在 `Settings -> Intervals` 中填写：
-- Athlete ID
-- API key
-
-然后你可以：
-- 点击 `Sync today's workout` 手动同步
-- 或点击 `Start Zwift` 时自动同步
-
-同步成功后：
-- workout 会写入 `storage/<player_id>/customworkouts/`
-- metadata 会写入 provider state 文件
-
-## Strava 设置
-
-在 `Settings -> Strava` 中填写：
-- Client ID
-- Client Secret
-
-然后点击 `Authorize` 完成 OAuth。
-
-授权成功后，`storage/<player_id>/strava_token.txt` 会存在。
-
-之后每次活动保存时会自动上传到 Strava。
-
-## TrainingPeaks 手工桥接
-
-1. 在 TrainingPeaks 中导出 workout 为 `.zwo`
-2. 把 `.zwo` 文件放到本地某个目录，例如：
-   - `/Users/yourname/TrainingPeaksExports`
-3. 打开 `TrainingPeaks` 页面
-4. 在 `Bridge folder` 输入该目录
-5. 点击 `Save bridge folder`
-6. 点击 `Import workouts`
-
-导入后的文件会写到：
-- `storage/<player_id>/customworkouts/trainingpeaks-*.zwo`
-
-## Provider 切换规则
-
-- 点击 `Intervals -> Sync today's workout`
-  - active provider 切到 `intervals-icu`
-  - TrainingPeaks workouts 会被清掉
-
-- 点击 `TrainingPeaks -> Import workouts`
-  - active provider 切到 `trainingpeaks`
-  - Intervals workouts 会被清掉
-
-- 点击 `Start Zwift` 时，只会同步当前 active provider
-
-## 关键文件
-
-- Intervals provider: `intervals_workouts.py`
-- TrainingPeaks bridge/provider scaffold: `trainingpeaks_workouts.py`
-- Provider state: `workout_state.py`
-- 主服务: `zwift_offline.py`
-
-## Git 提交
-
-本次功能提交：
-- commit: `f0418ee`
-- message: `feat: add workout provider sync integrations`
diff --git a/local_zwift_workouts.py b/local_zwift_workouts.py
deleted file mode 100644
index 5b2cd76..0000000
--- a/local_zwift_workouts.py
+++ /dev/null
@@ -1,168 +0,0 @@
-import hashlib
-import os
-import xml.etree.ElementTree as ET
-
-
-MANIFEST_FILENAME = 'workouts.files'
-
-
-def workouts_dir(root_dir, player_id):
-    return os.path.join(root_dir, str(player_id))
-
-
-def manifest_file(root_dir, player_id):
-    return os.path.join(workouts_dir(root_dir, player_id), MANIFEST_FILENAME)
-
-
-def parse_int(value):
-    try:
-        return int((value or '0').strip() or '0')
-    except ValueError:
-        return 0
-
-
-def file_checksum(content):
-    return (-sum(content)) % 256
-
-
-def file_guid(filename):
-    digest = hashlib.sha1(filename.encode('utf-8')).digest()
-    return (int.from_bytes(digest[:4], 'big') & 0x7fffffff) or 1
-
-
-def load_manifest(root_dir, player_id):
-    path = manifest_file(root_dir, player_id)
-    if not os.path.exists(path):
-        return []
-    try:
-        root = ET.parse(path).getroot()
-    except ET.ParseError:
-        return []
-    entries = []
-    for node in root.findall('custom_file'):
-        name = (node.findtext('name') or '').strip()
-        if not name:
-            continue
-        entries.append({
-            'name': name,
-            'time': parse_int(node.findtext('time')),
-            'guid': parse_int(node.findtext('guid')),
-            'checksum': parse_int(node.findtext('checksum')),
-            'deleted': (node.findtext('deleted') or 'false').strip().lower() == 'true',
-        })
-    return entries
-
-
-def save_manifest(root_dir, player_id, entries):
-    directory = workouts_dir(root_dir, player_id)
-    os.makedirs(directory, exist_ok=True)
-    root = ET.Element('custom_file_directory')
-    for entry in sorted(entries, key=lambda item: item['name'].lower()):
-        node = ET.SubElement(root, 'custom_file')
-        ET.SubElement(node, 'name').text = entry['name']
-        ET.SubElement(node, 'time').text = str(int(entry['time']))
-        ET.SubElement(node, 'guid').text = str(int(entry['guid']))
-        ET.SubElement(node, 'checksum').text = str(int(entry['checksum']))
-        ET.SubElement(node, 'deleted').text = 'true' if entry.get('deleted') else 'false'
-    ET.SubElement(root, 'deleted_files')
-    tree = ET.ElementTree(root)
-    ET.indent(tree, space='    ')
-    path = manifest_file(root_dir, player_id)
-    tree.write(path, encoding='utf-8', xml_declaration=False)
-    with open(path, 'a', encoding='utf-8') as fd:
-        fd.write('\n')
-    return path
-
-
-def upsert_manifest_entry(root_dir, player_id, filename, content, timestamp=None):
-    entries = [entry for entry in load_manifest(root_dir, player_id) if entry['name'] != filename]
-    timestamp = int(timestamp if timestamp is not None else os.path.getmtime(os.path.join(workouts_dir(root_dir, player_id), filename)))
-    entry = {
-        'name': filename,
-        'time': timestamp,
-        'guid': file_guid(filename),
-        'checksum': file_checksum(content),
-        'deleted': False,
-    }
-    entries.append(entry)
-    save_manifest(root_dir, player_id, entries)
-    return entry
-
-
-def remove_manifest_entries(root_dir, player_id, names):
-    names = set(names)
-    if not names:
-        return 0
-    existing = load_manifest(root_dir, player_id)
-    remaining = [entry for entry in existing if entry['name'] not in names]
-    removed = len(existing) - len(remaining)
-    if removed or os.path.exists(manifest_file(root_dir, player_id)):
-        save_manifest(root_dir, player_id, remaining)
-    return removed
-
-
-def export_workout(root_dir, player_id, filename, content):
-    directory = workouts_dir(root_dir, player_id)
-    os.makedirs(directory, exist_ok=True)
-    path = os.path.join(directory, filename)
-    with open(path, 'wb') as fd:
-        fd.write(content)
-    timestamp = int(os.path.getmtime(path))
-    manifest_entry = upsert_manifest_entry(root_dir, player_id, filename, content, timestamp=timestamp)
-    return {
-        'path': path,
-        'manifest_path': manifest_file(root_dir, player_id),
-        'manifest_entry': manifest_entry,
-    }
-
-
-def remove_prefixed_workouts(root_dir, player_id, prefixes):
-    directory = workouts_dir(root_dir, player_id)
-    if not os.path.isdir(directory):
-        return {'removed_files': 0, 'removed_manifest_entries': 0}
-    names_to_remove = []
-    removed_files = 0
-    for name in os.listdir(directory):
-        if name == MANIFEST_FILENAME or not any(name.startswith(prefix) for prefix in prefixes):
-            continue
-        path = os.path.join(directory, name)
-        if not os.path.isfile(path):
-            continue
-        os.remove(path)
-        names_to_remove.append(name)
-        removed_files += 1
-    removed_manifest_entries = remove_manifest_entries(root_dir, player_id, names_to_remove)
-    return {
-        'removed_files': removed_files,
-        'removed_manifest_entries': removed_manifest_entries,
-    }
-
-
-def health_report(root_dir, player_id, filename):
-    directory = workouts_dir(root_dir, player_id)
-    path = os.path.join(directory, filename)
-    entries = {entry['name']: entry for entry in load_manifest(root_dir, player_id)}
-    entry = entries.get(filename)
-    report = {
-        'directory': directory,
-        'path': path,
-        'manifest_path': manifest_file(root_dir, player_id),
-        'file_exists': os.path.exists(path),
-        'manifest_entry_exists': entry is not None,
-        'manifest_entry': entry,
-    }
-    if report['file_exists']:
-        with open(path, 'rb') as fd:
-            content = fd.read()
-        report['expected_checksum'] = file_checksum(content)
-        report['expected_guid'] = file_guid(filename)
-    else:
-        report['expected_checksum'] = None
-        report['expected_guid'] = file_guid(filename)
-    report['healthy'] = (
-        report['file_exists']
-        and report['manifest_entry_exists']
-        and entry.get('checksum') == report['expected_checksum']
-        and int(entry.get('guid') or 0) > 0
-    ) if entry else False
-    return report
diff --git a/tests/__init__.py b/tests/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/test_intervals_workouts.py b/tests/test_intervals_workouts.py
deleted file mode 100644
index 2a40a9b..0000000
--- a/tests/test_intervals_workouts.py
+++ /dev/null
@@ -1,152 +0,0 @@
-import datetime
-import unittest
-from types import SimpleNamespace
-
-from intervals_workouts import sync_workout, upload_activity
-
-
-class FakeResponse:
-    def __init__(self, payload=None, content=b"", status_code=200):
-        self._payload = payload
-        self.content = content
-        self.status_code = status_code
-
-    def json(self):
-        return self._payload
-
-    def raise_for_status(self):
-        if self.status_code >= 400:
-            raise RuntimeError(f"HTTP {self.status_code}")
-
-
-class FakeSession:
-    def __init__(self, responses=None):
-        self.responses = list(responses or [])
-        self.calls = []
-
-    def _pop(self):
-        return self.responses.pop(0)
-
-    def get(self, url, **kwargs):
-        self.calls.append(("GET", url, kwargs))
-        return self._pop()
-
-    def post(self, url, **kwargs):
-        self.calls.append(("POST", url, kwargs))
-        return self._pop()
-
-
-class SyncWorkoutTests(unittest.TestCase):
-    def test_sync_workout_downloads_next_planned_workout_and_saves_it(self):
-        now = datetime.datetime(2026, 4, 22, 10, 30, tzinfo=datetime.timezone.utc)
-        session = FakeSession([
-            FakeResponse(payload={
-                "events": [
-                    {
-                        "id": 41,
-                        "name": "Morning opener",
-                        "start_date_local": "2026-04-22T08:00:00+00:00",
-                    },
-                    {
-                        "id": 42,
-                        "name": "Threshold Session",
-                        "start_date_local": "2026-04-22T18:00:00+00:00",
-                    },
-                ]
-            }),
-            FakeResponse(content=b"<workout_file />"),
-        ])
-        saved = []
-
-        result = sync_workout(
-            athlete_id="123",
-            api_key="secret",
-            store_workout=lambda filename, content, event: saved.append((filename, content, event)),
-            today=now.date(),
-            now=now,
-            session=session,
-        )
-
-        self.assertEqual(result["status"], "synced")
-        self.assertEqual(result["event"]["id"], 42)
-        self.assertEqual(saved[0][0], "intervals-icu-42-threshold-session.zwo")
-        self.assertEqual(saved[0][1], b"<workout_file />")
-        self.assertEqual(saved[0][2]["id"], 42)
-        self.assertIn("/athlete/123/events?oldest=2026-04-22", session.calls[0][1])
-        self.assertTrue(session.calls[1][1].endswith("/athlete/123/events/42/download.zwo"))
-
-    def test_sync_workout_returns_no_workout_when_none_found(self):
-        today = datetime.date(2026, 4, 22)
-        session = FakeSession([FakeResponse(payload=[])])
-        saved = []
-
-        result = sync_workout(
-            athlete_id="123",
-            api_key="secret",
-            store_workout=lambda filename, content, event: saved.append((filename, content, event)),
-            today=today,
-            session=session,
-        )
-
-        self.assertEqual(result["status"], "no_workout")
-        self.assertEqual(saved, [])
-        self.assertEqual(len(session.calls), 1)
-
-    def test_upload_activity_pairs_synced_workout_and_marks_event_done(self):
-        activity = SimpleNamespace(
-            name="VO2 ride",
-            fit=b"FITDATA",
-            start_date="2026-04-22T18:05:00Z",
-        )
-        metadata = {
-            "event_id": 42,
-            "start_date_local": "2026-04-22T18:00:00+00:00",
-            "filename": "intervals-icu-42-threshold-session.zwo",
-        }
-        session = FakeSession([FakeResponse(), FakeResponse()])
-
-        result = upload_activity(
-            athlete_id="123",
-            api_key="secret",
-            activity=activity,
-            workout_metadata=metadata,
-            session=session,
-        )
-
-        self.assertEqual(result["status"], "uploaded")
-        self.assertTrue(result["paired"])
-        self.assertIn("paired_event_id=42", session.calls[0][1])
-        self.assertEqual(session.calls[0][0], "POST")
-        self.assertEqual(session.calls[1][1], "https://intervals.icu/api/v1/athlete/123/events/42/mark-done")
-        uploaded = session.calls[0][2]["files"]["file"]
-        self.assertEqual(uploaded.read(), b"FITDATA")
-
-    def test_upload_activity_without_matching_synced_workout_skips_pairing(self):
-        activity = SimpleNamespace(
-            name="VO2 ride",
-            fit=b"FITDATA",
-            start_date="2026-04-23T06:00:00Z",
-        )
-        metadata = {
-            "event_id": 42,
-            "start_date_local": "2026-04-22T18:00:00+00:00",
-            "filename": "intervals-icu-42-threshold-session.zwo",
-        }
-        session = FakeSession([FakeResponse()])
-
-        result = upload_activity(
-            athlete_id="123",
-            api_key="secret",
-            activity=activity,
-            workout_metadata=metadata,
-            session=session,
-        )
-
-        self.assertEqual(result["status"], "uploaded")
-        self.assertFalse(result["paired"])
-        self.assertNotIn("paired_event_id=42", session.calls[0][1])
-        self.assertEqual(len(session.calls), 1)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/tests/test_local_zwift_workouts.py b/tests/test_local_zwift_workouts.py
deleted file mode 100644
index c0eca8a..0000000
--- a/tests/test_local_zwift_workouts.py
+++ /dev/null
@@ -1,113 +0,0 @@
-import os
-import tempfile
-import unittest
-
-from local_zwift_workouts import (
-    export_workout,
-    file_checksum,
-    file_guid,
-    health_report,
-    load_manifest,
-    manifest_file,
-    remove_prefixed_workouts,
-    save_manifest,
-    workouts_dir,
-)
-
-
-class LocalZwiftWorkoutsTests(unittest.TestCase):
-    def test_workouts_dir_is_player_scoped(self):
-        self.assertEqual(workouts_dir('/tmp/zwift', 1), '/tmp/zwift/1')
-
-    def test_file_checksum_uses_8bit_twos_complement(self):
-        self.assertEqual(file_checksum(b'\x01'), 255)
-        self.assertEqual(file_checksum(b'ABC'), (-ord('A') - ord('B') - ord('C')) % 256)
-
-    def test_export_workout_creates_file_and_manifest_entry(self):
-        with tempfile.TemporaryDirectory() as tmp:
-            result = export_workout(tmp, 1, 'intervals-icu-test.zwo', b'<workout_file/>')
-
-            self.assertTrue(os.path.exists(result['path']))
-            self.assertTrue(os.path.exists(result['manifest_path']))
-            entries = load_manifest(tmp, 1)
-            self.assertEqual(len(entries), 1)
-            self.assertEqual(entries[0]['name'], 'intervals-icu-test.zwo')
-            self.assertEqual(entries[0]['guid'], file_guid('intervals-icu-test.zwo'))
-            self.assertEqual(entries[0]['checksum'], file_checksum(b'<workout_file/>'))
-
-    def test_export_workout_preserves_unmanaged_manifest_entries(self):
-        with tempfile.TemporaryDirectory() as tmp:
-            save_manifest(tmp, 1, [{
-                'name': 'custom-other.zwo',
-                'time': 123,
-                'guid': 456,
-                'checksum': 78,
-                'deleted': False,
-            }])
-
-            export_workout(tmp, 1, 'intervals-icu-test.zwo', b'<workout_file/>')
-
-            names = {entry['name'] for entry in load_manifest(tmp, 1)}
-            self.assertEqual(names, {'custom-other.zwo', 'intervals-icu-test.zwo'})
-
-    def test_load_manifest_tolerates_bad_numeric_fields(self):
-        with tempfile.TemporaryDirectory() as tmp:
-            os.makedirs(workouts_dir(tmp, 1))
-            with open(manifest_file(tmp, 1), 'w', encoding='utf-8') as fd:
-                fd.write(
-                    '<custom_file_directory>'
-                    '<custom_file>'
-                    '<name>intervals-icu-test.zwo</name>'
-                    '<time>bad</time>'
-                    '<guid></guid>'
-                    '<checksum>also-bad</checksum>'
-                    '<deleted>false</deleted>'
-                    '</custom_file>'
-                    '</custom_file_directory>'
-                )
-
-            entries = load_manifest(tmp, 1)
-            self.assertEqual(entries[0]['time'], 0)
-            self.assertEqual(entries[0]['guid'], 0)
-            self.assertEqual(entries[0]['checksum'], 0)
-
-    def test_remove_prefixed_workouts_removes_matching_files_and_manifest_entries(self):
-        with tempfile.TemporaryDirectory() as tmp:
-            export_workout(tmp, 1, 'intervals-icu-a.zwo', b'a')
-            export_workout(tmp, 1, 'trainingpeaks-b.zwo', b'b')
-            export_workout(tmp, 1, 'custom-other.zwo', b'c')
-
-            removed = remove_prefixed_workouts(tmp, 1, {'intervals-icu-'})
-
-            self.assertEqual(removed['removed_files'], 1)
-            self.assertFalse(os.path.exists(os.path.join(tmp, '1', 'intervals-icu-a.zwo')))
-            self.assertTrue(os.path.exists(os.path.join(tmp, '1', 'trainingpeaks-b.zwo')))
-            self.assertTrue(os.path.exists(os.path.join(tmp, '1', 'custom-other.zwo')))
-            names = {entry['name'] for entry in load_manifest(tmp, 1)}
-            self.assertEqual(names, {'trainingpeaks-b.zwo', 'custom-other.zwo'})
-
-    def test_health_report_detects_consistent_export(self):
-        with tempfile.TemporaryDirectory() as tmp:
-            export_workout(tmp, 1, 'intervals-icu-a.zwo', b'a')
-            report = health_report(tmp, 1, 'intervals-icu-a.zwo')
-            self.assertTrue(report['healthy'])
-            self.assertTrue(report['manifest_entry_exists'])
-            self.assertEqual(report['manifest_entry']['guid'], file_guid('intervals-icu-a.zwo'))
-
-    def test_health_report_detects_manifest_mismatch(self):
-        with tempfile.TemporaryDirectory() as tmp:
-            export_workout(tmp, 1, 'intervals-icu-a.zwo', b'a')
-            save_manifest(tmp, 1, [{
-                'name': 'intervals-icu-a.zwo',
-                'time': 123,
-                'guid': 999,
-                'checksum': 42,
-                'deleted': False,
-            }])
-            report = health_report(tmp, 1, 'intervals-icu-a.zwo')
-            self.assertFalse(report['healthy'])
-            self.assertTrue(os.path.exists(manifest_file(tmp, 1)))
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/test_trainingpeaks_workouts.py b/tests/test_trainingpeaks_workouts.py
deleted file mode 100644
index 32c05bf..0000000
--- a/tests/test_trainingpeaks_workouts.py
+++ /dev/null
@@ -1,55 +0,0 @@
-import os
-import tempfile
-import unittest
-from types import SimpleNamespace
-
-from trainingpeaks_workouts import (
-    build_workout_filename,
-    sync_exported_workouts,
-    sync_workout,
-    upload_activity,
-)
-
-
-class TrainingPeaksWorkoutTests(unittest.TestCase):
-    def test_build_workout_filename_uses_trainingpeaks_prefix(self):
-        workout = {'id': 51, 'title': 'VO2 Max Builder'}
-        self.assertEqual(build_workout_filename(workout), 'trainingpeaks-51-vo2-max-builder.zwo')
-
-    def test_sync_exported_workouts_imports_zwo_files_only(self):
-        with tempfile.TemporaryDirectory() as tmp:
-            with open(os.path.join(tmp, 'VO2 Builder.zwo'), 'wb') as fd:
-                fd.write(b'<workout_file id="1"/>')
-            with open(os.path.join(tmp, 'Tempo Ride.zwo'), 'wb') as fd:
-                fd.write(b'<workout_file id="2"/>')
-            with open(os.path.join(tmp, 'ignore.txt'), 'w') as fd:
-                fd.write('ignore me')
-
-            saved = []
-            result = sync_exported_workouts(tmp, lambda filename, content, workout: saved.append((filename, content, workout)))
-
-            self.assertEqual(result['status'], 'synced')
-            self.assertEqual(result['count'], 2)
-            self.assertEqual([item[0] for item in saved], [
-                'trainingpeaks-tempo-ride.zwo',
-                'trainingpeaks-vo2-builder.zwo',
-            ])
-
-    def test_sync_exported_workouts_handles_missing_folder(self):
-        result = sync_exported_workouts('/tmp/does-not-exist-hermes', lambda *args: None)
-        self.assertEqual(result['status'], 'missing_folder')
-
-    def test_sync_workout_reports_partner_access_requirement(self):
-        result = sync_workout(credentials={'client_id': 'abc'})
-        self.assertEqual(result['status'], 'unsupported')
-        self.assertIn('partner', result['message'].lower())
-
-    def test_upload_activity_reports_partner_access_requirement(self):
-        activity = SimpleNamespace(name='Ride', fit=b'FIT')
-        result = upload_activity(credentials={'access_token': 'abc'}, activity=activity)
-        self.assertEqual(result['status'], 'unsupported')
-        self.assertIn('partner', result['message'].lower())
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/test_workout_state.py b/tests/test_workout_state.py
deleted file mode 100644
index 6270371..0000000
--- a/tests/test_workout_state.py
+++ /dev/null
@@ -1,73 +0,0 @@
-import json
-import os
-import tempfile
-import unittest
-
-from workout_state import (
-    clear_metadata,
-    load_active_provider,
-    load_metadata,
-    metadata_file,
-    resolve_active_provider,
-    save_active_provider,
-    save_metadata,
-)
-
-
-class WorkoutStateTests(unittest.TestCase):
-    def test_metadata_file_is_provider_specific(self):
-        path = metadata_file('/tmp/storage', 7, 'intervals-icu')
-        self.assertEqual(path, '/tmp/storage/7/intervals_icu_workout.json')
-
-    def test_save_and_load_metadata_round_trip(self):
-        with tempfile.TemporaryDirectory() as tmp:
-            payload = save_metadata(
-                tmp,
-                1,
-                'intervals-icu',
-                {
-                    'id': 42,
-                    'name': 'Threshold Session',
-                    'start_date_local': '2026-04-22T18:00:00+00:00',
-                },
-                'intervals-icu-42-threshold-session.zwo',
-            )
-            self.assertEqual(payload['provider'], 'intervals-icu')
-            self.assertEqual(payload['event_id'], 42)
-            self.assertEqual(payload['filename'], 'intervals-icu-42-threshold-session.zwo')
-
-            loaded = load_metadata(tmp, 1, 'intervals-icu')
-            self.assertEqual(loaded['event_id'], 42)
-            self.assertEqual(loaded['provider'], 'intervals-icu')
-
-    def test_clear_metadata_removes_only_selected_provider(self):
-        with tempfile.TemporaryDirectory() as tmp:
-            save_metadata(tmp, 1, 'intervals-icu', {'id': 42, 'name': 'A'}, 'a.zwo')
-            save_metadata(tmp, 1, 'trainingpeaks', {'id': 99, 'name': 'B'}, 'b.zwo')
-
-            clear_metadata(tmp, 1, 'intervals-icu')
-
-            self.assertIsNone(load_metadata(tmp, 1, 'intervals-icu'))
-            self.assertEqual(load_metadata(tmp, 1, 'trainingpeaks')['event_id'], 99)
-
-    def test_save_and_load_active_provider(self):
-        with tempfile.TemporaryDirectory() as tmp:
-            self.assertIsNone(load_active_provider(tmp, 1))
-            save_active_provider(tmp, 1, 'trainingpeaks')
-            self.assertEqual(load_active_provider(tmp, 1), 'trainingpeaks')
-
-    def test_resolve_active_provider_uses_saved_provider_when_available(self):
-        active = resolve_active_provider('trainingpeaks', {'intervals-icu', 'trainingpeaks'})
-        self.assertEqual(active, 'trainingpeaks')
-
-    def test_resolve_active_provider_falls_back_to_first_available(self):
-        active = resolve_active_provider('trainingpeaks', {'intervals-icu'})
-        self.assertEqual(active, 'intervals-icu')
-
-    def test_resolve_active_provider_prefers_intervals_when_nothing_saved(self):
-        active = resolve_active_provider(None, {'trainingpeaks', 'intervals-icu'})
-        self.assertEqual(active, 'intervals-icu')
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/workouts_manifest.py b/workouts_manifest.py
new file mode 100644
index 0000000..473447f
--- /dev/null
+++ b/workouts_manifest.py
@@ -0,0 +1,95 @@
+import hashlib
+import os
+import xml.etree.ElementTree as ET
+
+
+MANIFEST_FILENAME = 'workouts.files'
+
+
+def manifest_file(workouts_dir):
+    return os.path.join(workouts_dir, MANIFEST_FILENAME)
+
+
+def parse_int(value):
+    try:
+        return int((value or '0').strip() or '0')
+    except ValueError:
+        return 0
+
+
+def file_checksum(content):
+    return (-sum(content)) % 256
+
+
+def file_guid(filename):
+    digest = hashlib.sha1(filename.encode('utf-8')).digest()
+    return (int.from_bytes(digest[:4], 'big') & 0x7fffffff) or 1
+
+
+def load_manifest(workouts_dir):
+    path = manifest_file(workouts_dir)
+    if not os.path.exists(path):
+        return []
+    try:
+        root = ET.parse(path).getroot()
+    except ET.ParseError:
+        return []
+    entries = []
+    for node in root.findall('custom_file'):
+        name = (node.findtext('name') or '').strip()
+        if not name:
+            continue
+        entries.append({
+            'name': name,
+            'time': parse_int(node.findtext('time')),
+            'guid': parse_int(node.findtext('guid')),
+            'checksum': parse_int(node.findtext('checksum')),
+            'deleted': (node.findtext('deleted') or 'false').strip().lower() == 'true',
+        })
+    return entries
+
+
+def save_manifest(workouts_dir, entries):
+    os.makedirs(workouts_dir, exist_ok=True)
+    root = ET.Element('custom_file_directory')
+    for entry in sorted(entries, key=lambda item: item['name'].lower()):
+        node = ET.SubElement(root, 'custom_file')
+        ET.SubElement(node, 'name').text = entry['name']
+        ET.SubElement(node, 'time').text = str(int(entry['time']))
+        ET.SubElement(node, 'guid').text = str(int(entry['guid']))
+        ET.SubElement(node, 'checksum').text = str(int(entry['checksum']))
+        ET.SubElement(node, 'deleted').text = 'true' if entry.get('deleted') else 'false'
+    ET.SubElement(root, 'deleted_files')
+    tree = ET.ElementTree(root)
+    ET.indent(tree, space='    ')
+    path = manifest_file(workouts_dir)
+    tree.write(path, encoding='utf-8', xml_declaration=False)
+    with open(path, 'a', encoding='utf-8') as fd:
+        fd.write('\n')
+    return path
+
+
+def upsert_manifest_entry(workouts_dir, filename, content, timestamp=None):
+    entries = [entry for entry in load_manifest(workouts_dir) if entry['name'] != filename]
+    timestamp = int(timestamp if timestamp is not None else os.path.getmtime(os.path.join(workouts_dir, filename)))
+    entry = {
+        'name': filename,
+        'time': timestamp,
+        'guid': file_guid(filename),
+        'checksum': file_checksum(content),
+        'deleted': False,
+    }
+    entries.append(entry)
+    save_manifest(workouts_dir, entries)
+    return entry
+
+
+def remove_prefixed_workouts(workouts_dir, prefixes):
+    entries = load_manifest(workouts_dir)
+    removed = 0
+    for entry in entries:
+        if entry['name'].startswith(tuple(prefixes)):
+            entry['deleted'] = True
+            removed += 1
+    save_manifest(workouts_dir, entries)
+    return removed
diff --git a/zwift_offline.py b/zwift_offline.py
index 38980eb..c7d055b 100644
--- a/zwift_offline.py
+++ b/zwift_offline.py
@@ -65,7 +65,7 @@ import online_sync
 import intervals_workouts
 import trainingpeaks_workouts
 import workout_state
-import local_zwift_workouts
+import workouts_manifest
 
 logging.basicConfig(level=os.environ.get("LOGLEVEL", "INFO"))
 logger = logging.getLogger('zoffline')
@@ -213,6 +213,7 @@ class AnonUser(User, AnonymousUserMixin, db.Model):
     first_name = "z"
     last_name = "offline"
     enable_ghosts = os.path.isfile(ENABLEGHOSTS_FILE)
+    is_admin = False
 
     def is_authenticated(self):
         return True
@@ -882,6 +883,19 @@ def save_player_zfile(player_id, folder, filename, content):
     return row
 
 
+def update_workouts_manifest(player_id, folder, filename, content):
+    workouts_manifest.upsert_manifest_entry(os.path.join(STORAGE_DIR, str(player_id), folder), filename, content)
+    timestamp = int(time.time())
+    row = Zfile.query.filter_by(folder=folder, filename=workouts_manifest.MANIFEST_FILENAME, player_id=player_id).first()
+    if not row:
+        row = Zfile(folder=folder, filename=workouts_manifest.MANIFEST_FILENAME, timestamp=timestamp, player_id=player_id)
+        db.session.add(row)
+    else:
+        row.timestamp = timestamp
+    db.session.commit()
+    return row
+
+
 def remove_player_zfiles_by_prefix(player_id, folder, prefix):
     rows = Zfile.query.filter_by(folder=folder, player_id=player_id)
     removed = False
@@ -949,18 +963,6 @@ def resolve_workout_provider_for_player(player_id):
     return workout_state.resolve_active_provider(load_active_workout_provider(player_id), available_workout_providers_for_player(player_id))
 
 
-def local_zwift_workouts_root():
-    return os.path.expanduser('~/Documents/Zwift/Workouts')
-
-
-def export_local_zwift_workout(player_id, filename, content):
-    return local_zwift_workouts.export_workout(local_zwift_workouts_root(), player_id, filename, content)
-
-
-def remove_local_zwift_workouts_by_prefixes(player_id, prefixes):
-    return local_zwift_workouts.remove_prefixed_workouts(local_zwift_workouts_root(), player_id, prefixes)
-
-
 def managed_workout_prefixes(provider):
     if provider == 'intervals-icu':
         return {'intervals-icu-'}
@@ -974,7 +976,7 @@ def clear_managed_workouts_for_provider(player_id, provider, clear_metadata=True
     for prefix in prefixes:
         remove_player_zfiles_by_prefix(player_id, 'customworkouts', prefix)
     if prefixes:
-        remove_local_zwift_workouts_by_prefixes(player_id, prefixes)
+        workouts_manifest.remove_prefixed_workouts(os.path.join(STORAGE_DIR, str(player_id), 'customworkouts'), prefixes)
     if provider == 'intervals-icu' and clear_metadata:
         clear_intervals_workout_metadata(player_id)
 
@@ -989,17 +991,14 @@ def current_workout_sync_status(player_id, provider=None):
             'provider': provider,
             'metadata': None,
             'server_file_exists': False,
-            'local_status': None,
         }
     filename = metadata.get('filename')
     server_file = os.path.join(STORAGE_DIR, str(player_id), 'customworkouts', filename) if filename else ''
-    local_status = local_zwift_workouts.health_report(local_zwift_workouts_root(), player_id, filename) if filename else None
     return {
         'provider': provider,
         'metadata': metadata,
         'server_file_exists': bool(filename and os.path.exists(server_file)),
         'server_file': server_file,
-        'local_status': local_status,
     }
 
 
@@ -1025,7 +1024,7 @@ def sync_intervals_workout_for_player(player_id):
     def store_workout(filename, content, event):
         clear_managed_workouts_for_provider(player_id, 'intervals-icu', clear_metadata=False)
         stored['zfile'] = save_player_zfile(player_id, 'customworkouts', filename, content)
-        stored['local_export'] = export_local_zwift_workout(player_id, filename, content)
+        update_workouts_manifest(player_id, 'customworkouts', filename, content)
         stored['metadata'] = save_intervals_workout_metadata(player_id, event, filename)
 
     try:
@@ -1035,15 +1034,13 @@ def sync_intervals_workout_for_player(player_id):
             return {
                 **result,
                 'sync_status': current_workout_sync_status(player_id, 'intervals-icu'),
-                'message': 'No Intervals.icu workout found for today. Cleared stale managed exports.',
+                'message': 'No Intervals.icu workout found for today.',
             }
         if result['status'] == 'synced':
             sync_status = current_workout_sync_status(player_id, 'intervals-icu')
             return {
                 **result,
-                'local_export': stored.get('local_export'),
                 'sync_status': sync_status,
-                'message': '%s Local Zwift workout catalog prepared.' % result['message'],
             }
         return result
     except Exception as exc:
@@ -1079,11 +1076,10 @@ def sync_trainingpeaks_workout_for_player(player_id):
 
     activate_workout_provider(player_id, 'trainingpeaks')
     clear_managed_workouts_for_provider(player_id, 'trainingpeaks', clear_metadata=False)
-    exports = []
 
     def store_workout(filename, content, workout):
         save_player_zfile(player_id, 'customworkouts', filename, content)
-        exports.append(export_local_zwift_workout(player_id, filename, content))
+        update_workouts_manifest(player_id, 'customworkouts', filename, content)
 
     try:
         result = trainingpeaks_workouts.sync_exported_workouts(folder, store_workout)
@@ -1091,13 +1087,7 @@ def sync_trainingpeaks_workout_for_player(player_id):
             clear_managed_workouts_for_provider(player_id, 'trainingpeaks', clear_metadata=False)
             return {
                 **result,
-                'message': 'No .zwo workouts were found in the TrainingPeaks bridge folder. Cleared stale managed exports.',
-            }
-        if result['status'] == 'synced':
-            return {
-                **result,
-                'local_exports': exports,
-                'message': '%s Local Zwift workout catalog prepared.' % result['message'],
+                'message': 'No .zwo workouts were found in the TrainingPeaks bridge folder.',
             }
         return result
     except Exception as exc:
@@ -1197,23 +1187,12 @@ def intervals(username):
     if request.method == "POST":
         if request.form['athlete_id'] == "" or request.form['api_key'] == "":
             flash("Intervals.icu credentials can't be empty.")
-            return render_template(
-                "intervals.html",
-                username=current_user.username,
-                sync_status=current_workout_sync_status(current_user.player_id, 'intervals-icu'),
-                active_provider=resolve_workout_provider_for_player(current_user.player_id),
-            )
+            return render_template("intervals.html", username=current_user.username)
         encrypt_credentials(file, (request.form['athlete_id'], request.form['api_key']))
         return redirect(url_for('settings', username=current_user.username))
     cred = decrypt_credentials(file)
-    return render_template(
-        "intervals.html",
-        username=current_user.username,
-        aid=cred[0],
-        akey=cred[1],
-        sync_status=current_workout_sync_status(current_user.player_id, 'intervals-icu'),
-        active_provider=resolve_workout_provider_for_player(current_user.player_id),
-    )
+    return render_template("intervals.html", username=current_user.username, aid=cred[0], akey=cred[1],
+        sync_status=current_workout_sync_status(current_user.player_id, 'intervals-icu'))
 
 
 @app.route("/intervals/<username>/sync", methods=["GET"])
@@ -1232,12 +1211,8 @@ def trainingpeaks(username):
         flash('TrainingPeaks bridge folder saved.')
         return redirect(url_for('trainingpeaks', username=current_user.username))
     bridge_folder = load_trainingpeaks_bridge_folder(current_user.player_id)
-    return render_template(
-        "trainingpeaks.html",
-        username=current_user.username,
-        message=trainingpeaks_workouts.PARTNER_ACCESS_MESSAGE,
-        bridge_folder=bridge_folder,
-    )
+    return render_template("trainingpeaks.html", username=current_user.username,
+        message=trainingpeaks_workouts.PARTNER_ACCESS_MESSAGE, bridge_folder=bridge_folder)
 
 
 @app.route("/trainingpeaks/<username>/sync", methods=["GET"])
@@ -1251,18 +1226,14 @@ def trainingpeaks_sync(username):
 @app.route("/user/<username>/")
 @login_required
 def user_home(username):
-    return render_template(
-        "user_home.html",
-        username=current_user.username,
-        enable_ghosts=bool(current_user.enable_ghosts),
-        climbs=CLIMBS,
-        online=get_online(),
-        is_admin=current_user.is_admin,
-        restarting=restarting,
-        restarting_in_minutes=restarting_in_minutes,
-        active_workout_provider=resolve_workout_provider_for_player(current_user.player_id),
-        workout_sync_status=current_workout_sync_status(current_user.player_id),
-    )
+    provider = resolve_workout_provider_for_player(current_user.player_id)
+    if provider == 'intervals-icu':
+        sync_intervals_workout_for_player(current_user.player_id)
+    elif provider == 'trainingpeaks':
+        sync_trainingpeaks_workout_for_player(current_user.player_id)
+    return render_template("user_home.html", username=current_user.username, enable_ghosts=bool(current_user.enable_ghosts), climbs=CLIMBS,
+        online=get_online(), is_admin=current_user.is_admin, restarting=restarting, restarting_in_minutes=restarting_in_minutes,
+        active_workout_provider=provider, workout_sync_status=current_workout_sync_status(current_user.player_id))
 
 def enqueue_player_update(player_id, wa_bytes):
     if not player_id in player_update_queue:
@@ -4644,8 +4615,7 @@ def launch_zwift():
         if MULTIPLAYER:
             return redirect(url_for('login'))
         else:
-            return render_template("user_home.html", username=current_user.username, enable_ghosts=os.path.exists(ENABLEGHOSTS_FILE), online=get_online(),
-                climbs=CLIMBS, is_admin=False, restarting=restarting, restarting_in_minutes=restarting_in_minutes)
+            return redirect(url_for('user_home', username=current_user.username))
     else:
         if MULTIPLAYER:
             return redirect("http://zwift/?code=zwift_refresh_token%s" % fake_refresh_token_with_session_cookie(request.cookies.get('remember_token')), 302)
@@ -4745,14 +4715,6 @@ def start_zwift():
     selected_climb = request.form['climb']
     if selected_climb != 'CALENDAR':
         climb_override[request.remote_addr] = selected_climb
-    provider = resolve_workout_provider_for_player(current_user.player_id)
-    sync_result = None
-    if provider == 'intervals-icu':
-        sync_result = sync_intervals_workout_for_player(current_user.player_id)
-    elif provider == 'trainingpeaks':
-        sync_result = sync_trainingpeaks_workout_for_player(current_user.player_id)
-    if sync_result and sync_result['status'] in ('synced', 'no_workout', 'error'):
-        flash(sync_result['message'])
     return redirect("/ride", 302)