feat: show live countdown with seconds on receive account screen (#203 )

Replace the static "expires in 20 minutes" label with a StatefulWidget that ticks every second and displays the remaining time as MM:SS.
2026-05-24 15:11:56 +02:00
55 changed files with 415 additions and 3035 deletions
@@ -109,51 +109,3 @@ jobs:
      - name: Cleanup TLS credentials
        if: always()
        run: rm -rf /tmp/dagger-tls /tmp/stunnel-dagger.conf /tmp/stunnel.pid
-
-  merge-renovate:
-    name: Auto-merge Renovate PR
-    needs: [check]
-    if: github.event_name == 'pull_request' && startsWith(github.head_ref, 'renovate/')
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-
-    steps:
-      - name: Merge if automerge label is set
-        env:
-          FORGEJO_TOKEN: ${{ github.token }}
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-        run: |
-          python3 - << 'PYEOF'
-          import os, json, urllib.request, urllib.error, sys
-
-          token = os.environ["FORGEJO_TOKEN"]
-          url_base = os.environ.get("GITHUB_SERVER_URL", "").rstrip("/")
-          repo = os.environ.get("GITHUB_REPOSITORY", "")
-          pr_number = os.environ["PR_NUMBER"]
-          api = f"{url_base}/api/v1/repos/{repo}"
-          headers = {"Authorization": f"token {token}", "Content-Type": "application/json"}
-
-          req = urllib.request.Request(f"{api}/issues/{pr_number}/labels", headers=headers)
-          with urllib.request.urlopen(req) as r:
-              labels = [l["name"] for l in json.loads(r.read())]
-
-          if "automerge" not in labels:
-              print(f"PR #{pr_number}: no 'automerge' label — major update, skipping")
-              sys.exit(0)
-
-          body = json.dumps({"Do": "merge"}).encode()
-          req = urllib.request.Request(
-              f"{api}/pulls/{pr_number}/merge",
-              data=body, headers=headers, method="POST"
-          )
-          try:
-              with urllib.request.urlopen(req) as r:
-                  print(f"PR #{pr_number} merged successfully")
-          except urllib.error.HTTPError as e:
-              err = e.read().decode()
-              if "already been merged" in err or "has been merged" in err:
-                  print(f"PR #{pr_number} already merged — OK")
-              else:
-                  print(f"Merge failed: {err}")
-                  sys.exit(1)
-          PYEOF
@@ -22,8 +22,6 @@ jobs:
      - name: Detect Android and Linux changes
        id: diff
        shell: bash
-        env:
-          FORGEJO_TOKEN: ${{ github.token }}
        run: |
          # On workflow_dispatch always build everything
          if [ "$GITHUB_EVENT_NAME" = "workflow_dispatch" ]; then
@@ -32,38 +30,6 @@ jobs:
            exit 0
          fi

-          HEAD_SHA=$(git rev-parse HEAD)
-
-          # Skip if this exact commit was already successfully deployed (prevents
-          # hourly schedule from redeploying the same commit on every tick).
-          LAST_DEPLOYED_SHA=$(python3 - << 'PYEOF'
-          import json, os, sys, urllib.request
-          token = os.environ.get("FORGEJO_TOKEN", "")
-          server = os.environ.get("GITHUB_SERVER_URL", "").rstrip("/")
-          repo = os.environ.get("GITHUB_REPOSITORY", "")
-          url = f"{server}/api/v1/repos/{repo}/actions/runs?workflow_id=deploy.yml&status=success&limit=5"
-          req = urllib.request.Request(url, headers={"Authorization": f"token {token}"})
-          try:
-              with urllib.request.urlopen(req) as r:
-                  data = json.loads(r.read())
-              runs = [
-                  r for r in data.get("workflow_runs", [])
-                  if r.get("workflow_id") == "deploy.yml" and r.get("status") == "success"
-              ]
-              print(runs[0].get("commit_sha") or "")
-          except Exception as e:
-              print(f"API check failed: {e}", file=sys.stderr)
-              print("")
-          PYEOF
-          )
-
-          if [ -n "$LAST_DEPLOYED_SHA" ] && [ "$HEAD_SHA" = "$LAST_DEPLOYED_SHA" ]; then
-            echo "HEAD $HEAD_SHA already successfully deployed — skipping"
-            echo "android=false" >> "$GITHUB_OUTPUT"
-            echo "linux=false"   >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-
          # Diff the HEAD commit against its parent; fall back to listing HEAD's files
          # when the parent is unavailable (initial commit, shallow clone).
          CHANGED=$(git diff --name-only HEAD~1 HEAD 2>/dev/null \
@@ -72,7 +38,7 @@ jobs:
          echo "Changed files:"
          echo "$CHANGED"

-          android_re='^(android/|integration_test/|lib/|pubspec\.yaml|pubspec\.lock|drift_schemas/|scripts/deploy_playstore\.py)'
+          android_re='^(android/|integration_test/|lib/|pubspec\.yaml|pubspec\.lock|drift_schemas/)'
          linux_re='^(linux/|lib/|pubspec\.yaml|pubspec\.lock)'

          echo "$CHANGED" | grep -qE "$android_re" \
@@ -83,6 +49,44 @@ jobs:
            && echo "linux=true"   >> "$GITHUB_OUTPUT" \
            || echo "linux=false"  >> "$GITHUB_OUTPUT"

+  test-android-firebase:
+    name: Android Instrumented Tests (Firebase Test Lab)
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    needs: [check-changes]
+    if: needs.check-changes.outputs.android == 'true'
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Check runner tools
+        run: |
+          command -v dagger  >/dev/null 2>&1 || { echo "ERROR: dagger is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
+          command -v task    >/dev/null 2>&1 || { echo "ERROR: task is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
+          dpkg -s stunnel4 netcat-openbsd >/dev/null 2>&1 || { echo "ERROR: stunnel4/netcat-openbsd are not installed in the runner image. Add them to .forgejo/Dockerfile."; exit 1; }
+
+      - name: Setup Dagger Remote Engine (via stunnel)
+        env:
+          DAGGER_STUNNEL_URL: ${{ secrets.DAGGER_STUNNEL_URL }}
+          DAGGER_CA_CERT: ${{ secrets.DAGGER_CA_CERT }}
+          DAGGER_CLIENT_CERT: ${{ secrets.DAGGER_CLIENT_CERT }}
+          DAGGER_CLIENT_KEY: ${{ secrets.DAGGER_CLIENT_KEY }}
+        run: scripts/setup_dagger_remote.sh
+
+      - name: Run Android Tests on Firebase Test Lab
+        if: ${{ secrets.FIREBASE_TEST_LAB_SERVICE_ACCOUNT_KEY != '' }}
+        env:
+          FIREBASE_TEST_LAB_SERVICE_ACCOUNT_KEY: ${{ secrets.FIREBASE_TEST_LAB_SERVICE_ACCOUNT_KEY }}
+          FIREBASE_PROJECT_ID: ${{ vars.FIREBASE_PROJECT_ID }}
+          DAGGER_NO_NAG: "1"
+        run: task test-android-firebase
+
+      - name: Cleanup TLS credentials
+        if: always()
+        run: rm -rf /tmp/dagger-tls /tmp/stunnel-dagger.conf /tmp/stunnel.pid
+
  deploy-playstore:
    name: Build & Deploy to Play Store
    runs-on: ubuntu-latest
@@ -93,7 +97,7 @@ jobs:
    steps:
      - uses: actions/checkout@v4
        with:
-          fetch-depth: 100
+          fetch-depth: 1

      - name: Check runner tools
        run: |
@@ -132,7 +136,7 @@ jobs:
    steps:
      - uses: actions/checkout@v4
        with:
-          fetch-depth: 100
+          fetch-depth: 1

      - name: Check runner tools
        run: |
@@ -174,7 +178,7 @@ jobs:
    steps:
      - uses: actions/checkout@v4
        with:
-          fetch-depth: 100
+          fetch-depth: 1

      - name: Check runner tools
        run: |
@@ -249,9 +253,10 @@ jobs:
  label-deploy-health:
    name: Update Deploy Health Label
    runs-on: ubuntu-latest
-    needs: [deploy-playstore, deploy-apk, build-linux]
+    needs: [test-android-firebase, deploy-playstore, deploy-apk, build-linux]
    if: |
      always() && vars.DEPLOY_HEALTH_ISSUE != '' && (
+        needs.test-android-firebase.result == 'success' || needs.test-android-firebase.result == 'failure' ||
        needs.deploy-playstore.result == 'success' || needs.deploy-playstore.result == 'failure' ||
        needs.deploy-apk.result == 'success' || needs.deploy-apk.result == 'failure' ||
        needs.build-linux.result == 'success' || needs.build-linux.result == 'failure'
@@ -264,7 +269,7 @@ jobs:
          FORGEJO_TOKEN: ${{ github.token }}
          FORGEJO_URL: ${{ github.server_url }}
          DEPLOY_HEALTH_ISSUE: ${{ vars.DEPLOY_HEALTH_ISSUE }}
-          ALL_SUCCEEDED: ${{ (needs.deploy-playstore.result == 'success' || needs.deploy-playstore.result == 'skipped') && (needs.deploy-apk.result == 'success' || needs.deploy-apk.result == 'skipped') && (needs.build-linux.result == 'success' || needs.build-linux.result == 'skipped') }}
+          ALL_SUCCEEDED: ${{ (needs.test-android-firebase.result == 'success' || needs.test-android-firebase.result == 'skipped') && (needs.deploy-playstore.result == 'success' || needs.deploy-playstore.result == 'skipped') && (needs.deploy-apk.result == 'success' || needs.deploy-apk.result == 'skipped') && (needs.build-linux.result == 'success' || needs.build-linux.result == 'skipped') }}
        run: |
          python3 - << 'PYEOF'
          import os, json, urllib.request, urllib.error
@@ -1,132 +0,0 @@
-name: Firebase Tests
-
-on:
-  schedule:
-    - cron: '0 3 * * *'   # once per day at 3 AM
-  workflow_dispatch:
-
-jobs:
-  check-changes:
-    name: Detect Firebase-Relevant Changes
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    outputs:
-      has_changes: ${{ steps.diff.outputs.has_changes }}
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Detect Firebase-relevant changes in last 24 hours
-        id: diff
-        shell: bash
-        run: |
-          # On workflow_dispatch always run
-          if [ "$GITHUB_EVENT_NAME" = "workflow_dispatch" ]; then
-            echo "has_changes=true" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-
-          SINCE=$(date -u -d '24 hours ago' '+%Y-%m-%dT%H:%M:%S')
-          CHANGED=$(git log --since="$SINCE" --name-only --format= -- \
-            'android/' 'integration_test/' 'lib/' 'pubspec.yaml' 'pubspec.lock' 'drift_schemas/' \
-            | sort -u | grep -v '^$')
-
-          if [ -n "$CHANGED" ]; then
-            echo "Firebase-relevant files changed since $SINCE:"
-            echo "$CHANGED"
-            echo "has_changes=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "No Firebase-relevant changes in the last 24 hours — skipping tests"
-            echo "has_changes=false" >> "$GITHUB_OUTPUT"
-          fi
-
-  test-android-firebase:
-    name: Android Instrumented Tests (Firebase Test Lab)
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    needs: [check-changes]
-    if: needs.check-changes.outputs.has_changes == 'true'
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: Check runner tools
-        run: |
-          command -v dagger  >/dev/null 2>&1 || { echo "ERROR: dagger is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
-          command -v task    >/dev/null 2>&1 || { echo "ERROR: task is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
-          dpkg -s stunnel4 netcat-openbsd >/dev/null 2>&1 || { echo "ERROR: stunnel4/netcat-openbsd are not installed in the runner image. Add them to .forgejo/Dockerfile."; exit 1; }
-
-      - name: Setup Dagger Remote Engine (via stunnel)
-        env:
-          DAGGER_STUNNEL_URL: ${{ secrets.DAGGER_STUNNEL_URL }}
-          DAGGER_CA_CERT: ${{ secrets.DAGGER_CA_CERT }}
-          DAGGER_CLIENT_CERT: ${{ secrets.DAGGER_CLIENT_CERT }}
-          DAGGER_CLIENT_KEY: ${{ secrets.DAGGER_CLIENT_KEY }}
-        run: scripts/setup_dagger_remote.sh
-
-      - name: Run Android Tests on Firebase Test Lab
-        if: ${{ secrets.FIREBASE_TEST_LAB_SERVICE_ACCOUNT_KEY != '' }}
-        env:
-          FIREBASE_TEST_LAB_SERVICE_ACCOUNT_KEY: ${{ secrets.FIREBASE_TEST_LAB_SERVICE_ACCOUNT_KEY }}
-          FIREBASE_PROJECT_ID: ${{ vars.FIREBASE_PROJECT_ID }}
-          DAGGER_NO_NAG: "1"
-        run: task test-android-firebase
-
-      - name: Cleanup TLS credentials
-        if: always()
-        run: rm -rf /tmp/dagger-tls /tmp/stunnel-dagger.conf /tmp/stunnel.pid
-
-      - name: Create issue on test failure
-        if: failure()
-        env:
-          FORGEJO_TOKEN: ${{ github.token }}
-          FORGEJO_URL: ${{ github.server_url }}
-          RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
-        run: |
-          python3 - << 'PYEOF'
-          import os, json, urllib.request, urllib.error
-
-          token = os.environ["FORGEJO_TOKEN"]
-          url_base = os.environ["FORGEJO_URL"].rstrip("/")
-          run_url = os.environ["RUN_URL"]
-
-          headers = {"Authorization": f"token {token}", "Content-Type": "application/json"}
-          api = f"{url_base}/api/v1/repos/guettli/sharedinbox"
-
-          def api_get(path):
-              req = urllib.request.Request(f"{api}{path}", headers=headers)
-              with urllib.request.urlopen(req) as r:
-                  return json.loads(r.read())
-
-          def api_post(path, body):
-              data = json.dumps(body).encode()
-              req = urllib.request.Request(f"{api}{path}", data=data, headers=headers, method="POST")
-              with urllib.request.urlopen(req) as r:
-                  return json.loads(r.read())
-
-          repo_labels = api_get("/labels")
-          label_map = {l["name"]: l["id"] for l in repo_labels}
-
-          label_ids = [label_map["Ready"]] if "Ready" in label_map else []
-
-          title = "Firebase Tests failed — find root cause and fix"
-          body = (
-              "Firebase instrumented tests failed in the daily run.\n\n"
-              f"**Failed run:** {run_url}\n\n"
-              "## Steps to resolve\n\n"
-              "1. **Find the root cause**: Check the test run logs linked above and identify which test(s) failed and why.\n"
-              "2. **Fix if possible**: If the failure is caused by a code bug, create a fix. If it is a flaky or infrastructure issue, document the findings.\n"
-              "3. Close this issue once the root cause is resolved and the tests pass.\n"
-          )
-
-          issue = api_post("/issues", {
-              "title": title,
-              "body": body,
-              "labels": label_ids,
-          })
-          print(f"Created issue #{issue['number']}: {issue['html_url']}")
-          PYEOF
@@ -1,18 +0,0 @@
-name: Monitor Agent Loop
-
-on:
-  schedule:
-    - cron: '0 */2 * * *'  # every 2 hours
-  workflow_dispatch:
-
-jobs:
-  monitor:
-    name: Check Agent Loop Health
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Check agent loop heartbeat
-        run: python3 scripts/agent_loop.py monitor
@@ -1,39 +0,0 @@
-name: Renovate
-
-on:
-  schedule:
-    - cron: '0 6 * * *'
-  workflow_dispatch:
-
-jobs:
-  renovate:
-    name: Renovate
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Check runner tools
-        run: |
-          command -v dagger  >/dev/null 2>&1 || { echo "ERROR: dagger is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
-          command -v task    >/dev/null 2>&1 || { echo "ERROR: task is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
-          dpkg -s stunnel4 netcat-openbsd >/dev/null 2>&1 || { echo "ERROR: stunnel4/netcat-openbsd are not installed in the runner image. Add them to .forgejo/Dockerfile."; exit 1; }
-
-      - name: Setup Dagger Remote Engine (via stunnel)
-        env:
-          DAGGER_STUNNEL_URL: ${{ secrets.DAGGER_STUNNEL_URL }}
-          DAGGER_CA_CERT: ${{ secrets.DAGGER_CA_CERT }}
-          DAGGER_CLIENT_CERT: ${{ secrets.DAGGER_CLIENT_CERT }}
-          DAGGER_CLIENT_KEY: ${{ secrets.DAGGER_CLIENT_KEY }}
-        run: scripts/setup_dagger_remote.sh
-
-      - name: Run Renovate
-        env:
-          DAGGER_NO_NAG: "1"
-          RENOVATE_FORGEJO_TOKEN: ${{ secrets.RENOVATE_FORGEJO_TOKEN }}
-        run: task renovate
-
-      - name: Cleanup TLS credentials
-        if: always()
-        run: rm -rf /tmp/dagger-tls /tmp/stunnel-dagger.conf /tmp/stunnel.pid
@@ -13,42 +13,20 @@ jobs:
  deploy:
    name: Build & Deploy Website
    runs-on: ubuntu-latest
-    timeout-minutes: 60

    steps:
      - uses: actions/checkout@v4
        with:
          submodules: recursive

-      - name: Check runner tools
-        run: |
-          command -v dagger  >/dev/null 2>&1 || { echo "ERROR: dagger is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
-          command -v task    >/dev/null 2>&1 || { echo "ERROR: task is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
-          dpkg -s stunnel4 netcat-openbsd >/dev/null 2>&1 || { echo "ERROR: stunnel4/netcat-openbsd are not installed in the runner image. Add them to .forgejo/Dockerfile."; exit 1; }
-
-      - name: Setup Dagger Remote Engine (via stunnel)
-        env:
-          DAGGER_STUNNEL_URL: ${{ secrets.DAGGER_STUNNEL_URL }}
-          DAGGER_CA_CERT: ${{ secrets.DAGGER_CA_CERT }}
-          DAGGER_CLIENT_CERT: ${{ secrets.DAGGER_CLIENT_CERT }}
-          DAGGER_CLIENT_KEY: ${{ secrets.DAGGER_CLIENT_KEY }}
-        run: scripts/setup_dagger_remote.sh
-
      - name: Build & Deploy Website
-        if: ${{ secrets.SSH_PRIVATE_KEY != '' }}
        env:
          SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
-          SSH_KNOWN_HOSTS: ${{ secrets.SSH_KNOWN_HOSTS }}
          SSH_USER: ${{ secrets.SSH_USER }}
          SSH_HOST: ${{ secrets.SSH_HOST }}
-          DAGGER_NO_NAG: "1"
-        run: task publish-website
+        run: task website-deploy

      - name: Verify Website
        env:
          SSH_HOST: ${{ secrets.WEBSITE_SSH_HOST }}
        run: scripts/website-verify.sh
-
-      - name: Cleanup TLS credentials
-        if: always()
-        run: rm -rf /tmp/dagger-tls /tmp/stunnel-dagger.conf /tmp/stunnel.pid
@@ -28,8 +28,7 @@ android/.gradle/
 android/local.properties
 android/app/google-services.json
 android/key.properties
-# android/app/src/main/java/io/flutter/plugins/ intentionally tracked so that
-# GeneratedPluginRegistrant.java (catch Throwable) is committed and used by CI.
+android/app/src/main/java/io/flutter/plugins/
 .android/
 Android/
 .gradle/
@@ -33,12 +33,12 @@ repos:
      - id: ci-no-direct-dagger
        name: check for direct dagger calls in workflows (use Task instead)
        language: system
-        entry: "bash -c 'git --no-pager grep \"dagger call\" .forgejo/workflows/ && echo \"ERROR: Direct dagger calls found in workflows. Use Taskfile instead.\" && exit 1 || exit 0'"
+        entry: "bash -c 'git grep \"dagger call\" .forgejo/workflows/ && echo \"ERROR: Direct dagger calls found in workflows. Use Taskfile instead.\" && exit 1 || exit 0'"
        pass_filenames: false
        always_run: true
      - id: dagger-progress-plain
        name: ensure all dagger calls use --progress=plain
        language: system
-        entry: "bash -c 'git --no-pager grep \"dagger call\" -- \":!.pre-commit-config.yaml\" | grep -v \"\\-\\-progress=plain\" && echo \"ERROR: All dagger calls must include --progress=plain\" && exit 1 || exit 0'"
+        entry: "bash -c 'git grep \"dagger call\" -- \":!.pre-commit-config.yaml\" | grep -v \"\\-\\-progress=plain\" && echo \"ERROR: All dagger calls must include --progress=plain\" && exit 1 || exit 0'"
        pass_filenames: false
        always_run: true
@@ -10,21 +10,9 @@ CLI tool `fgj` is available to query issues/PRs/actions.

 We use issues, follow this label state machine:

- **State/ToPlan** — Issue needs a plan written by an agent before implementation
- **State/Planned** — Plan has been posted as a comment; awaiting human review
- **State/Ready** — Issue is approved and ready for implementation
- **State/InProgress** — Set while an agent (or human) is actively working
- **State/Question** — Agent hit a blocker or needs clarification
-
-Full lifecycle:
-
-```
-State/ToPlan → State/Planned   (automated: agent_loop.py runs a planning agent)
-State/Planned → State/Ready    (manual: human reviews the plan and approves)
-State/Ready → State/InProgress (automated: agent_loop.py before starting implementation)
-State/InProgress → closed      (automated: after PR is merged and CI passes)
-any state → State/Question     (automated or manual: when blocked)
-```
+- **State/Ready** — Issue is available to pick up
+- **State/InProgress** — Set this when you start working on an issue
+- **State/Question** — Set this when you hit a blocker or need clarification

 List open issues ready to pick up:

@@ -34,11 +22,9 @@ fgj issue list --json --state open | jq '[.[] | select(.labels[].name == "State/

 Rules:

- Never start implementation on an issue without `State/Ready`
- Planning agents only post a plan comment — they do NOT write code or open PRs
- After `State/Planned`, a human must review the plan and manually add `State/Ready`
- When working via the agent loop: label transitions are set automatically
-  by `agent_loop.py` — do **not** set them yourself.
+- Never start work on an issue without `State/Ready`
+- When working via the agent loop: `State/Ready` → `State/InProgress` is set automatically
+  by `agent_loop.py` before the agent starts — do **not** set it yourself.
 - When working manually: switch to `State/InProgress` as your **first action**:
  ```bash
  fgj issue edit <NUMBER> --remove-label "State/Ready" --add-label "State/InProgress"
@@ -224,7 +224,7 @@ tasks:
    desc: Build AAB via Dagger (cached, versionCode=1 placeholder) and export locally
    cmds:
      - mkdir -p build/app/outputs/bundle/release
-      - HASH=$(git rev-parse --short HEAD) && dagger call --progress=plain -q -m ci --source=. build-android-release --commit-hash "$HASH" -o build/app/outputs/bundle/release/app-release.aab
+      - dagger call --progress=plain -q -m ci --source=. build-android-release -o build/app/outputs/bundle/release/app-release.aab

  upload-android-bundle:
    desc: Upload AAB from build/ to Play Store via Dagger
@@ -238,7 +238,6 @@ tasks:

  publish-android:
    desc: Build cached AAB, stamp versionCode, sign, and publish to Play Store via Dagger
-    deps: [generate-changelog]
    preconditions:
      - sh: test -n "$PLAY_STORE_CONFIG_JSON"
        msg: "PLAY_STORE_CONFIG_JSON is not set"
@@ -247,7 +246,7 @@ tasks:
      - sh: test -n "$ANDROID_KEYSTORE_PASSWORD"
        msg: "ANDROID_KEYSTORE_PASSWORD is not set"
    cmds:
-      - HASH=$(git rev-parse --short HEAD) && dagger call --progress=plain -q -m ci --source=. publish-android --play-store-config env:PLAY_STORE_CONFIG_JSON --keystore-base64 env:ANDROID_KEYSTORE_BASE64 --keystore-password env:ANDROID_KEYSTORE_PASSWORD --commit-hash "$HASH"
+      - dagger call --progress=plain -q -m ci --source=. publish-android --play-store-config env:PLAY_STORE_CONFIG_JSON --keystore-base64 env:ANDROID_KEYSTORE_BASE64 --keystore-password env:ANDROID_KEYSTORE_PASSWORD

  deploy-apk:
    desc: Build and deploy Android APK via Dagger
@@ -336,14 +335,6 @@ tasks:
      - |
        dagger query '{ engine { localCache { prune(maxUsedSpace: "75gb", targetSpace: "50gb") } } }'

-  renovate:
-    desc: Run Renovate bot against the repository via Dagger
-    preconditions:
-      - sh: test -n "$RENOVATE_FORGEJO_TOKEN"
-        msg: "RENOVATE_FORGEJO_TOKEN is not set"
-    cmds:
-      - dagger call --progress=plain -q -m ci --source=. renovate --renovate-token env:RENOVATE_FORGEJO_TOKEN
-
  integration-android:
    desc: UI integration tests on a connected Android emulator (Stalwart on host, emulator reaches it via 10.0.2.2)
    deps: [_preflight, _android-sdk-check, _android-avd-setup]
@@ -4,6 +4,7 @@ gradle-wrapper.jar
 /gradlew
 /gradlew.bat
 /local.properties
+GeneratedPluginRegistrant.java
 .cxx/

 # Remember to never publicly share your keystore.
@@ -1,89 +0,0 @@
-package io.flutter.plugins;
-
-import androidx.annotation.Keep;
-import androidx.annotation.NonNull;
-import io.flutter.Log;
-
-import io.flutter.embedding.engine.FlutterEngine;
-
-/**
- * Generated file. Do not edit.
- * This file is generated by the Flutter tool based on the
- * plugins that support the Android platform.
- */
-@Keep
-public final class GeneratedPluginRegistrant {
-  private static final String TAG = "GeneratedPluginRegistrant";
-  public static void registerWith(@NonNull FlutterEngine flutterEngine) {
-    try {
-      flutterEngine.getPlugins().add(new dev.fluttercommunity.plus.device_info.DeviceInfoPlusPlugin());
-    } catch (Exception e) {
-      Log.e(TAG, "Error registering plugin device_info_plus, dev.fluttercommunity.plus.device_info.DeviceInfoPlusPlugin", e);
-    }
-    try {
-      flutterEngine.getPlugins().add(new com.mr.flutter.plugin.filepicker.FilePickerPlugin());
-    } catch (Exception e) {
-      Log.e(TAG, "Error registering plugin file_picker, com.mr.flutter.plugin.filepicker.FilePickerPlugin", e);
-    }
-    try {
-      flutterEngine.getPlugins().add(new com.dexterous.flutterlocalnotifications.FlutterLocalNotificationsPlugin());
-    } catch (Exception e) {
-      Log.e(TAG, "Error registering plugin flutter_local_notifications, com.dexterous.flutterlocalnotifications.FlutterLocalNotificationsPlugin", e);
-    }
-    try {
-      flutterEngine.getPlugins().add(new io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin());
-    } catch (Exception e) {
-      Log.e(TAG, "Error registering plugin flutter_plugin_android_lifecycle, io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin", e);
-    }
-    try {
-      flutterEngine.getPlugins().add(new com.it_nomads.fluttersecurestorage.FlutterSecureStoragePlugin());
-    } catch (Exception e) {
-      Log.e(TAG, "Error registering plugin flutter_secure_storage, com.it_nomads.fluttersecurestorage.FlutterSecureStoragePlugin", e);
-    }
-    try {
-      flutterEngine.getPlugins().add(new dev.flutter.plugins.integration_test.IntegrationTestPlugin());
-    } catch (Exception e) {
-      Log.e(TAG, "Error registering plugin integration_test, dev.flutter.plugins.integration_test.IntegrationTestPlugin", e);
-    }
-    try {
-      flutterEngine.getPlugins().add(new dev.steenbakker.mobile_scanner.MobileScannerPlugin());
-    } catch (Exception e) {
-      Log.e(TAG, "Error registering plugin mobile_scanner, dev.steenbakker.mobile_scanner.MobileScannerPlugin", e);
-    }
-    try {
-      flutterEngine.getPlugins().add(new com.crazecoder.openfile.OpenFilePlugin());
-    } catch (Exception e) {
-      Log.e(TAG, "Error registering plugin open_filex, com.crazecoder.openfile.OpenFilePlugin", e);
-    }
-    try {
-      flutterEngine.getPlugins().add(new dev.fluttercommunity.plus.packageinfo.PackageInfoPlugin());
-    } catch (Exception e) {
-      Log.e(TAG, "Error registering plugin package_info_plus, dev.fluttercommunity.plus.packageinfo.PackageInfoPlugin", e);
-    }
-    try {
-      flutterEngine.getPlugins().add(new io.flutter.plugins.pathprovider.PathProviderPlugin());
-    } catch (Exception e) {
-      Log.e(TAG, "Error registering plugin path_provider_android, io.flutter.plugins.pathprovider.PathProviderPlugin", e);
-    }
-    try {
-      flutterEngine.getPlugins().add(new dev.fluttercommunity.plus.share.SharePlusPlugin());
-    } catch (Exception e) {
-      Log.e(TAG, "Error registering plugin share_plus, dev.fluttercommunity.plus.share.SharePlusPlugin", e);
-    }
-    try {
-      flutterEngine.getPlugins().add(new io.flutter.plugins.urllauncher.UrlLauncherPlugin());
-    } catch (Exception e) {
-      Log.e(TAG, "Error registering plugin url_launcher_android, io.flutter.plugins.urllauncher.UrlLauncherPlugin", e);
-    }
-    try {
-      flutterEngine.getPlugins().add(new io.flutter.plugins.webviewflutter.WebViewFlutterPlugin());
-    } catch (Exception e) {
-      Log.e(TAG, "Error registering plugin webview_flutter_android, io.flutter.plugins.webviewflutter.WebViewFlutterPlugin", e);
-    }
-    try {
-      flutterEngine.getPlugins().add(new dev.fluttercommunity.workmanager.WorkmanagerPlugin());
-    } catch (Exception e) {
-      Log.e(TAG, "Error registering plugin workmanager_android, dev.fluttercommunity.workmanager.WorkmanagerPlugin", e);
-    }
-  }
-}
@@ -286,21 +286,6 @@ func (m *Ci) firebaseSrc() *dagger.Directory {
 	})
 }

-// androidBase wraps setup(androidSrc()) with the Gradle named-cache so that
-// Gradle dependencies survive across Dagger execution-cache misses.
-func (m *Ci) androidBase() *dagger.Container {
-	return m.setup(m.androidSrc()).
-		WithMountedCache("/home/ci/.gradle", dag.CacheVolume("gradle-cache"),
-			dagger.ContainerWithMountedCacheOpts{Owner: "ci"})
-}
-
-// firebaseBase wraps setup(firebaseSrc()) with the Gradle named-cache.
-func (m *Ci) firebaseBase() *dagger.Container {
-	return m.setup(m.firebaseSrc()).
-		WithMountedCache("/home/ci/.gradle", dag.CacheVolume("gradle-cache"),
-			dagger.ContainerWithMountedCacheOpts{Owner: "ci"})
-}
-
 // linuxSrc is the source subset for Linux builds and integration tests.
 func (m *Ci) linuxSrc() *dagger.Directory {
 	return m.Source.Filter(dagger.DirectoryFilterOpts{
@@ -599,17 +584,9 @@ func (m *Ci) BuildLinux() *dagger.Directory {
 }

 // BuildLinuxRelease builds the Linux release bundle.
-func (m *Ci) BuildLinuxRelease(
-	// Git commit hash injected as GIT_HASH dart-define so the About page can display it.
-	// +optional
-	commitHash string,
-) *dagger.Directory {
-	args := []string{"flutter", "build", "linux", "--release"}
-	if commitHash != "" {
-		args = append(args, "--dart-define=GIT_HASH="+commitHash)
-	}
+func (m *Ci) BuildLinuxRelease() *dagger.Directory {
 	return m.setup(m.linuxSrc()).
-		WithExec(args).
+		WithExec([]string{"flutter", "build", "linux", "--release"}).
 		Directory("build/linux/x64/release/bundle")
 }

@@ -622,7 +599,7 @@ func (m *Ci) DeployLinux(
 	sshHost string,
 	commitHash string,
 ) (string, error) {
-	bundle := m.BuildLinuxRelease(commitHash)
+	bundle := m.BuildLinuxRelease()

 	datePath := time.Now().Format("2006/01/02")
 	remoteDir := fmt.Sprintf("public_html/builds/%s", datePath)
@@ -638,27 +615,16 @@ func (m *Ci) DeployLinux(

 // setupKeystore decodes the base64 keystore into the android build container.
 func (m *Ci) setupKeystore(keystoreBase64 *dagger.Secret, keystorePassword *dagger.Secret) *dagger.Container {
-	return m.androidBase().
+	return m.setup(m.androidSrc()).
 		WithSecretVariable("ANDROID_KEYSTORE_BASE64", keystoreBase64).
 		WithSecretVariable("ANDROID_KEYSTORE_PASSWORD", keystorePassword).
 		WithExec([]string{"/bin/sh", "-c", `echo "$ANDROID_KEYSTORE_BASE64" | base64 -d > android/app/upload-keystore.jks`})
 }

 // BuildAndroidApk builds a release APK signed with the upload key.
-func (m *Ci) BuildAndroidApk(
-	keystoreBase64 *dagger.Secret,
-	keystorePassword *dagger.Secret,
-	buildNumber string,
-	// Git commit hash injected as GIT_HASH dart-define so the About page can display it.
-	// +optional
-	commitHash string,
-) *dagger.File {
-	args := []string{"flutter", "build", "apk", "--release", "--no-pub", "--build-number", buildNumber}
-	if commitHash != "" {
-		args = append(args, "--dart-define=GIT_HASH="+commitHash)
-	}
+func (m *Ci) BuildAndroidApk(keystoreBase64 *dagger.Secret, keystorePassword *dagger.Secret, buildNumber string) *dagger.File {
 	return m.setupKeystore(keystoreBase64, keystorePassword).
-		WithExec(args).
+		WithExec([]string{"flutter", "build", "apk", "--release", "--no-pub", "--build-number", buildNumber}).
 		File("build/app/outputs/flutter-apk/app-release.apk")
 }

@@ -674,7 +640,7 @@ func (m *Ci) DeployApk(
 	keystorePassword *dagger.Secret,
 	buildNumber string,
 ) (string, error) {
-	apk := m.BuildAndroidApk(keystoreBase64, keystorePassword, buildNumber, commitHash)
+	apk := m.BuildAndroidApk(keystoreBase64, keystorePassword, buildNumber)

 	datePath := time.Now().Format("2006/01/02")
 	remoteDir := fmt.Sprintf("public_html/builds/%s", datePath)
@@ -690,7 +656,8 @@ func (m *Ci) DeployApk(
 // BuildAndroidDebugApks builds the debug app APK and the androidTest APK needed for Firebase Test Lab.
 // Returns a flat directory with app-debug.apk and app-debug-androidTest.apk.
 func (m *Ci) BuildAndroidDebugApks() *dagger.Directory {
-	built := m.firebaseBase().
+	built := m.setup(m.firebaseSrc()).
+		WithMountedCache("/home/ci/.gradle", dag.CacheVolume("gradle-cache"), dagger.ContainerWithMountedCacheOpts{Owner: "ci"}).
 		WithExec([]string{"flutter", "build", "apk", "--debug", "--no-pub"}).
 		WithWorkdir("/src/android").
 		// --no-daemon avoids connecting to a stale daemon whose registry file was
@@ -749,17 +716,9 @@ func (m *Ci) TestAndroidFirebase(

 // BuildAndroidRelease builds the AAB with a fixed build-number so Dagger can cache it.
 // versionCode and signing are applied separately via StampAndroidVersionCode + SignAndroidBundle.
-func (m *Ci) BuildAndroidRelease(
-	// Git commit hash injected as GIT_HASH dart-define so the About page can display it.
-	// +optional
-	commitHash string,
-) *dagger.File {
-	args := []string{"flutter", "build", "appbundle", "--release", "--no-pub", "--build-number", "1"}
-	if commitHash != "" {
-		args = append(args, "--dart-define=GIT_HASH="+commitHash)
-	}
-	return m.androidBase().
-		WithExec(args).
+func (m *Ci) BuildAndroidRelease() *dagger.File {
+	return m.setup(m.androidSrc()).
+		WithExec([]string{"flutter", "build", "appbundle", "--release", "--no-pub", "--build-number", "1"}).
 		File("build/app/outputs/bundle/release/app-release.aab")
 }

@@ -831,41 +790,14 @@ func (m *Ci) PublishAndroid(
 	playStoreConfig *dagger.Secret,
 	keystoreBase64 *dagger.Secret,
 	keystorePassword *dagger.Secret,
-	// Git commit hash injected as GIT_HASH dart-define so the About page can display it.
-	// +optional
-	commitHash string,
 ) (string, error) {
 	versionCode := int(time.Now().Unix())
-	aab := m.BuildAndroidRelease(commitHash)
+	aab := m.BuildAndroidRelease()
 	stamped := m.StampAndroidVersionCode(aab, versionCode)
 	signed := m.SignAndroidBundle(stamped, keystoreBase64, keystorePassword)
 	return m.UploadToPlayStore(ctx, signed, playStoreConfig)
 }

-// Renovate runs Renovate bot against the repository on Forgejo/Codeberg.
-func (m *Ci) Renovate(ctx context.Context, renovateToken *dagger.Secret) (string, error) {
-	// Codeberg's GET /pulls?state=all&limit=100 times out with a 504, but limit=10
-	// completes in ~9 s. Patch the compiled pr-cache.js to use 10 instead of the
-	// hardcoded 20/100 values before launching renovate.
-	const patchCmd = `for f in \
-			/usr/local/renovate/dist/modules/platform/forgejo/pr-cache.js \
-			/usr/local/renovate/dist/modules/platform/gitea/pr-cache.js; do \
-		sed -i 's/limit: this\.items\.length ? 20 : 100/limit: this.items.length ? 10 : 10/' "$f" && echo "patched $f"; \
-		done`
-	return dag.Container().
-		From("renovate/renovate:43").
-		WithSecretVariable("RENOVATE_TOKEN", renovateToken).
-		WithEnvVariable("RENOVATE_PLATFORM", "forgejo").
-		WithEnvVariable("RENOVATE_ENDPOINT", "https://codeberg.org").
-		WithEnvVariable("RENOVATE_REPOSITORIES", "guettli/sharedinbox").
-		WithEnvVariable("LOG_LEVEL", "info").
-		WithUser("root").
-		WithExec([]string{"/bin/sh", "-c", patchCmd}).
-		WithUser("ubuntu").
-		WithExec([]string{"renovate"}).
-		Stdout(ctx)
-}
-
 // Graph returns a Mermaid diagram of the CI pipeline structure.
 // Paste the output into any Mermaid renderer (codeberg, github, mermaid.live)
 // or save it as a .md file to get a rendered diagram.
@@ -13,7 +13,7 @@ export SSH_PRIVATE_KEY=$(cat "$HOME/.ssh/id_ed25519")

 # Add nix profile and nix store tools (task, dagger) to PATH
 export PATH="$HOME/.nix-profile/bin:$PATH"
-for pkg in "*go-task-*/bin/task" "*dagger-*/bin/dagger" "*fgj-*/bin/fgj"; do
+for pkg in "*go-task-*/bin/task" "*dagger-*/bin/dagger"; do
    bin=$(ls -d /nix/store/$pkg 2>/dev/null | sort -V | tail -1)
    [ -n "$bin" ] && export PATH="$(dirname "$bin"):$PATH"
 done
@@ -4,16 +4,6 @@ This file contains tasks which got implemented.

 Tasks get moved from next.md to done.md

-## Tasks (2026-05-26)
-
- **Renovate Bot (Issue #257)**: Renovate Bot runs daily via Forgejo Actions to keep
-  dependencies up to date. All required components are in main:
-  - `renovate.json` — Renovate configuration covering pub, Dockerfile, and Forgejo Actions
-  - `ci/main.go` — `Renovate()` Dagger function using Forgejo platform and Codeberg endpoint
-  - `.forgejo/workflows/renovate.yml` — daily cron (06:00 UTC) workflow
-  - `Taskfile.yml` — `renovate` task
-  - Issue #257 closed.
-
 ## Tasks (2026-05-11)

 - **Stabilize Email List UI during Selection (Issue #14)**: Prevented layout shifts when entering
@@ -1 +0,0 @@
-const int dbSchemaVersion = 33;
@@ -11,13 +11,4 @@ abstract class MailboxRepository {

  /// Deletes all locally-cached mailbox rows for [accountId].
  Future<void> clearForResync(String accountId);
-
-  /// Creates a new mailbox named [name] for [accountId] and tags it with
-  /// [role] in the local database. For JMAP accounts the role is also sent
-  /// to the server. Returns the newly created [Mailbox].
-  Future<Mailbox> createMailboxWithRole(
-    String accountId,
-    String name,
-    String role,
-  );
 }
@@ -19,8 +19,6 @@ class SyncLogEntry {
    required this.id,
    required this.result,
    this.errorMessage,
-    this.stackTrace,
-    this.isPermanent = false,
    required this.protocol,
    required this.emailsFetched,
    required this.emailsSkipped,
@@ -36,8 +34,6 @@ class SyncLogEntry {
  final int id;
  final String result; // 'ok' or 'error'
  final String? errorMessage;
-  final String? stackTrace;
-  final bool isPermanent;
  final String protocol; // 'imap' or 'jmap'
  final int emailsFetched;
  final int emailsSkipped;
@@ -58,8 +54,6 @@ abstract class SyncLogRepository {
    required String accountId,
    required bool success,
    String? errorMessage,
-    String? stackTrace,
-    bool isPermanent = false,
    required String protocol,
    required int emailsFetched,
    required int emailsSkipped,
@@ -87,8 +81,6 @@ class NoOpSyncLogRepository implements SyncLogRepository {
    required String accountId,
    required bool success,
    String? errorMessage,
-    String? stackTrace,
-    bool isPermanent = false,
    required String protocol,
    required int emailsFetched,
    required int emailsSkipped,
@@ -260,8 +260,6 @@ class _AccountSync implements _SyncLoop {
            accountId: account.id,
            success: false,
            errorMessage: e.toString(),
-            stackTrace: st.toString(),
-            isPermanent: isPermanent,
            protocol: 'imap',
            emailsFetched: 0,
            emailsSkipped: 0,
@@ -515,8 +513,6 @@ class _JmapAccountSync implements _SyncLoop {
            accountId: account.id,
            success: false,
            errorMessage: e.toString(),
-            stackTrace: st.toString(),
-            isPermanent: isPermanent,
            protocol: 'jmap',
            emailsFetched: 0,
            emailsSkipped: 0,
@@ -6,7 +6,6 @@ import 'package:drift/native.dart';
 import 'package:flutter/services.dart';
 import 'package:path/path.dart' as p;
 import 'package:path_provider/path_provider.dart';
-import 'package:sharedinbox/core/db_schema_version.dart';

 part 'database.g.dart';

@@ -193,9 +192,6 @@ class SyncLogs extends Table {
  DateTimeColumn get finishedAt => dateTime()();
  // Added in schema v13: raw protocol log when account.verbose == true.
  TextColumn get protocolLog => text().nullable()();
-  // Added in schema v33: stack trace and permanent flag for error entries.
-  TextColumn get errorStackTrace => text().nullable()();
-  BoolColumn get isPermanent => boolean().withDefault(const Constant(false))();
 }

 /// Per-mailbox breakdown for a single sync cycle.
@@ -333,7 +329,7 @@ class AppDatabase extends _$AppDatabase {
  AppDatabase([QueryExecutor? executor]) : super(executor ?? _openConnection());

  @override
-  int get schemaVersion => dbSchemaVersion;
+  int get schemaVersion => 32;

  Future<void> _createEmailFts() async {
    await customStatement('''
@@ -574,10 +570,6 @@ class AppDatabase extends _$AppDatabase {
          if (from < 32) {
            await m.createTable(localSieveApplied);
          }
-          if (from >= 7 && from < 33) {
-            await m.addColumn(syncLogs, syncLogs.errorStackTrace);
-            await m.addColumn(syncLogs, syncLogs.isPermanent);
-          }
        },
      );
 }
@@ -79,14 +79,6 @@ class MailboxRepositoryImpl implements MailboxRepository {
    );
    try {
      final mailboxes = await client.listMailboxes(recursive: true);
-
-      // Pre-load existing DB roles so we can preserve manually-set roles for
-      // folders the server doesn't tag with a special-use attribute.
-      final existingRows = await (_db.select(_db.mailboxes)
-            ..where((t) => t.accountId.equals(account.id)))
-          .get();
-      final existingRoles = {for (final r in existingRows) r.id: r.role};
-
      for (final mb in mailboxes) {
        final path = mb.path;
        final id = '${account.id}:$path';
@@ -104,12 +96,6 @@ class MailboxRepositoryImpl implements MailboxRepository {
          log('STATUS skipped for $path: $e');
        }

-        // Use the server-assigned role when available; fall back to the
-        // existing DB role so that manually-created folders (e.g. a user
-        // who just created their Archive folder) keep their role across syncs
-        // when the IMAP server does not expose a special-use attribute.
-        final role = _imapRole(mb) ?? existingRoles[id];
-
        await _db.into(_db.mailboxes).insertOnConflictUpdate(
              MailboxesCompanion.insert(
                id: id,
@@ -118,7 +104,7 @@ class MailboxRepositoryImpl implements MailboxRepository {
                name: mb.name,
                unreadCount: Value(unread),
                totalCount: Value(total),
-                role: Value(role),
+                role: Value(_imapRole(mb)),
              ),
            );
      }
@@ -324,104 +310,4 @@ class MailboxRepositoryImpl implements MailboxRepository {
          ..where((t) => t.accountId.equals(accountId)))
        .go();
  }
-
-  @override
-  Future<model.Mailbox> createMailboxWithRole(
-    String accountId,
-    String name,
-    String role,
-  ) async {
-    final account = (await _accounts.getAccount(accountId))!;
-    final password = await _accounts.getPassword(accountId);
-    switch (account.type) {
-      case account_model.AccountType.imap:
-        return _createMailboxWithRoleImap(account, password, name, role);
-      case account_model.AccountType.jmap:
-        return _createMailboxWithRoleJmap(account, password, name, role);
-    }
-  }
-
-  Future<model.Mailbox> _createMailboxWithRoleImap(
-    account_model.Account account,
-    String password,
-    String name,
-    String role,
-  ) async {
-    final client = await _imapConnect(
-      account,
-      _effectiveUsername(account),
-      password,
-    );
-    try {
-      await client.createMailbox(name);
-    } finally {
-      await client.logout();
-    }
-    final id = '${account.id}:$name';
-    await _db.into(_db.mailboxes).insertOnConflictUpdate(
-          MailboxesCompanion.insert(
-            id: id,
-            accountId: account.id,
-            path: name,
-            name: name,
-            role: Value(role),
-          ),
-        );
-    final row = await (_db.select(_db.mailboxes)..where((t) => t.id.equals(id)))
-        .getSingle();
-    return _toModel(row);
-  }
-
-  Future<model.Mailbox> _createMailboxWithRoleJmap(
-    account_model.Account account,
-    String password,
-    String name,
-    String role,
-  ) async {
-    final jmapUrl = account.jmapUrl;
-    if (jmapUrl == null || jmapUrl.isEmpty) {
-      throw Exception('JMAP account ${account.id} has no jmapUrl');
-    }
-    final jmap = await JmapClient.connect(
-      httpClient: _httpClient,
-      jmapUrl: Uri.parse(jmapUrl),
-      username: _effectiveUsername(account),
-      password: password,
-    );
-    final responses = await jmap.call([
-      [
-        'Mailbox/set',
-        {
-          'accountId': jmap.accountId,
-          'create': {
-            'new-mailbox': {'name': name, 'role': role},
-          },
-        },
-        '0',
-      ],
-    ]);
-    final result = _responseArgs(responses, 0, 'Mailbox/set');
-    final created = result['created'] as Map<String, dynamic>?;
-    final newId =
-        (created?['new-mailbox'] as Map<String, dynamic>?)?['id'] as String?;
-    if (newId == null) {
-      throw Exception(
-        'Failed to create mailbox "$name": server returned no ID',
-      );
-    }
-    final dbId = '${account.id}:$newId';
-    await _db.into(_db.mailboxes).insertOnConflictUpdate(
-          MailboxesCompanion.insert(
-            id: dbId,
-            accountId: account.id,
-            path: newId,
-            name: name,
-            role: Value(role),
-          ),
-        );
-    final row = await (_db.select(_db.mailboxes)
-          ..where((t) => t.id.equals(dbId)))
-        .getSingle();
-    return _toModel(row);
-  }
 }
@@ -13,8 +13,6 @@ class SyncLogRepositoryImpl implements SyncLogRepository {
    required String accountId,
    required bool success,
    String? errorMessage,
-    String? stackTrace,
-    bool isPermanent = false,
    required String protocol,
    required int emailsFetched,
    required int emailsSkipped,
@@ -32,8 +30,6 @@ class SyncLogRepositoryImpl implements SyncLogRepository {
              accountId: accountId,
              result: success ? 'ok' : 'error',
              errorMessage: Value(errorMessage),
-              errorStackTrace: Value(stackTrace),
-              isPermanent: Value(isPermanent),
              protocol: Value(protocol),
              itemsSynced: Value(emailsFetched),
              emailsSkipped: Value(emailsSkipped),
@@ -79,8 +75,6 @@ class SyncLogRepositoryImpl implements SyncLogRepository {
            id: r.id,
            result: r.result,
            errorMessage: r.errorMessage,
-            stackTrace: r.errorStackTrace,
-            isPermanent: r.isPermanent,
            protocol: r.protocol,
            emailsFetched: r.itemsSynced,
            emailsSkipped: r.emailsSkipped,
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:io';

 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -7,7 +8,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:sharedinbox/core/models/account.dart';
 import 'package:sharedinbox/di.dart';
-import 'package:sharedinbox/ui/utils/about_markdown.dart';
 import 'package:url_launcher/url_launcher.dart';

 class AboutScreen extends ConsumerStatefulWidget {
@@ -19,22 +19,57 @@ class AboutScreen extends ConsumerStatefulWidget {

 class _AboutScreenState extends ConsumerState<AboutScreen> {
  final Future<PackageInfo> _packageInfoFuture = PackageInfo.fromPlatform();
-  late final Future<String?> _deviceModelFuture;
  late final Stream<List<Account>> _accountsStream;
-  String? _deviceModel;
+
+  static const _gitHash = String.fromEnvironment('GIT_HASH');

  @override
  void initState() {
    super.initState();
    _accountsStream = ref.read(accountRepositoryProvider).observeAccounts();
-    _deviceModelFuture = getDeviceModel();
-    unawaited(
-      _deviceModelFuture.then((model) {
-        if (mounted) setState(() => _deviceModel = model);
-      }),
-    );
  }

+  String _buildMarkdown(
+    BuildContext context,
+    PackageInfo? pkg,
+    int imapCount,
+    int jmapCount,
+  ) {
+    final size = MediaQuery.of(context).size;
+    final pixelRatio = MediaQuery.of(context).devicePixelRatio;
+    final physW = (size.width * pixelRatio).toInt();
+    final physH = (size.height * pixelRatio).toInt();
+    final version =
+        pkg != null ? '${pkg.version}+${pkg.buildNumber}' : 'unknown';
+    final versionDisplay = _gitHash.isNotEmpty
+        ? '[$version](https://codeberg.org/guettli/sharedinbox/commit/$_gitHash)'
+        : version;
+    final osName = _capitalize(Platform.operatingSystem);
+    final isDark = MediaQuery.of(context).platformBrightness == Brightness.dark;
+
+    final gitCommitLine = _gitHash.isNotEmpty
+        ? '| Git Commit | [$_gitHash](https://codeberg.org/guettli/sharedinbox/commit/$_gitHash) |\n'
+        : '';
+    return '## [sharedinbox.de](https://sharedinbox.de)\n\n'
+        '| Property | Value |\n'
+        '|----------|-------|\n'
+        '| App Version | $versionDisplay |\n'
+        '$gitCommitLine'
+        '| Platform | ${Platform.operatingSystem} |\n'
+        '| $osName Version | ${Platform.operatingSystemVersion} |\n'
+        '| Resolution | ${physW}x$physH px'
+        ' (logical: ${size.width.toInt()}x${size.height.toInt()} pt,'
+        ' ratio: ${pixelRatio.toStringAsFixed(1)}x) |\n'
+        '| Dart Version | ${Platform.version.split(' ').first} |\n'
+        '| Processors | ${Platform.numberOfProcessors} |\n'
+        '| Dark Mode | ${isDark ? 'yes' : 'no'} |\n'
+        '| IMAP Accounts | $imapCount |\n'
+        '| JMAP Accounts | $jmapCount |\n';
+  }
+
+  static String _capitalize(String s) =>
+      s.isEmpty ? s : '${s[0].toUpperCase()}${s.substring(1)}';
+
  Future<void> _copyToClipboard(
    BuildContext context,
    int imapCount,
@@ -44,20 +79,10 @@ class _AboutScreenState extends ConsumerState<AboutScreen> {
    try {
      pkg = await _packageInfoFuture;
    } catch (_) {}
-    String? deviceModel;
-    try {
-      deviceModel = await _deviceModelFuture;
-    } catch (_) {}
    if (!context.mounted) return;
    await Clipboard.setData(
      ClipboardData(
-        text: buildAboutMarkdown(
-          context: context,
-          pkg: pkg,
-          imapCount: imapCount,
-          jmapCount: jmapCount,
-          deviceModel: deviceModel,
-        ),
+        text: _buildMarkdown(context, pkg, imapCount, jmapCount),
      ),
    );
    if (context.mounted) {
@@ -70,30 +95,6 @@ class _AboutScreenState extends ConsumerState<AboutScreen> {
    }
  }

-  Future<void> _launchUrl(BuildContext context, Uri url) async {
-    try {
-      final launched =
-          await launchUrl(url, mode: LaunchMode.externalApplication);
-      if (!launched && context.mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          const SnackBar(
-            duration: Duration(seconds: 5),
-            content: Text('Could not open browser.'),
-          ),
-        );
-      }
-    } catch (e) {
-      if (context.mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            duration: const Duration(seconds: 5),
-            content: Text('Error: $e'),
-          ),
-        );
-      }
-    }
-  }
-
  Future<void> _createIssue(
    BuildContext context,
    int imapCount,
@@ -103,19 +104,9 @@ class _AboutScreenState extends ConsumerState<AboutScreen> {
    try {
      pkg = await _packageInfoFuture;
    } catch (_) {}
-    String? deviceModel;
-    try {
-      deviceModel = await _deviceModelFuture;
-    } catch (_) {}
    if (!context.mounted) return;
    final body = Uri.encodeComponent(
-      buildAboutMarkdown(
-        context: context,
-        pkg: pkg,
-        imapCount: imapCount,
-        jmapCount: jmapCount,
-        deviceModel: deviceModel,
-      ),
+      _buildMarkdown(context, pkg, imapCount, jmapCount),
    );
    final url = Uri.parse(
      'https://codeberg.org/guettli/sharedinbox/issues/new?body=$body',
@@ -166,18 +157,20 @@ class _AboutScreenState extends ConsumerState<AboutScreen> {
                      return const Center(child: CircularProgressIndicator());
                    }
                    return Markdown(
-                      data: buildAboutMarkdown(
-                        context: context,
-                        pkg: snapshot.data,
-                        imapCount: imapCount,
-                        jmapCount: jmapCount,
-                        deviceModel: _deviceModel,
+                      data: _buildMarkdown(
+                        context,
+                        snapshot.data,
+                        imapCount,
+                        jmapCount,
                      ),
                      selectable: true,
                      onTapLink: (text, href, title) {
                        if (href != null) {
                          unawaited(
-                            _launchUrl(context, Uri.parse(href)),
+                            launchUrl(
+                              Uri.parse(href),
+                              mode: LaunchMode.externalApplication,
+                            ),
                          );
                        }
                      },
@@ -87,24 +87,22 @@ class _AccountReceiveScreenState extends ConsumerState<AccountReceiveScreen> {
    }
  }

-  // Pre-flight: probe the scanner's permission-state method to verify the
-  // plugin is registered.  MissingPluginException is thrown on Android builds
-  // where the plugin is not linked (issue #204).  All other exceptions mean
-  // the plugin exists but something else failed — the MobileScanner widget
-  // will surface those via its own error builder.
+  // Pre-flight: start + stop the scanner to verify the plugin is available.
+  // Falls back to text entry on any exception (including MissingPluginException).
  Future<void> _initScanner() async {
+    MobileScannerController? ctrl;
    bool available = false;
    try {
-      await const MethodChannel(
-        'dev.steenbakker.mobile_scanner/scanner/method',
-      ).invokeMethod<int>('state');
+      ctrl = MobileScannerController();
+      await ctrl.start();
+      await ctrl.stop();
      available = true;
-    } on MissingPluginException {
-      // Plugin not registered on this device; text fallback will be shown.
    } catch (_) {
-      // Plugin registered but state check failed; let the scanner widget
-      // handle it via its errorBuilder.
-      available = true;
+      // Plugin not available on this device; text fallback will be shown.
+    } finally {
+      try {
+        await ctrl?.dispose();
+      } catch (_) {}
    }
    if (!mounted) return;
    if (available) {
@@ -57,24 +57,22 @@ class _AccountSendScreenState extends ConsumerState<AccountSendScreen> {
    }
  }

-  // Pre-flight: probe the scanner's permission-state method to verify the
-  // plugin is registered.  MissingPluginException is thrown on Android builds
-  // where the plugin is not linked (issue #204).  All other exceptions mean
-  // the plugin exists but something else failed — the MobileScanner widget
-  // will surface those via its own error builder.
+  // Pre-flight: start + stop the scanner to verify the plugin is available.
+  // Falls back to text entry on any exception (including MissingPluginException).
  Future<void> _initScanner() async {
+    MobileScannerController? ctrl;
    bool available = false;
    try {
-      await const MethodChannel(
-        'dev.steenbakker.mobile_scanner/scanner/method',
-      ).invokeMethod<int>('state');
+      ctrl = MobileScannerController();
+      await ctrl.start();
+      await ctrl.stop();
      available = true;
-    } on MissingPluginException {
-      // Plugin not registered on this device; text fallback will be shown.
    } catch (_) {
-      // Plugin registered but state check failed; let the scanner widget
-      // handle it via its errorBuilder.
-      available = true;
+      // Plugin not available on this device; text fallback will be shown.
+    } finally {
+      try {
+        await ctrl?.dispose();
+      } catch (_) {}
    }
    if (!mounted) return;
    if (available) {
@@ -1,6 +1,7 @@
 import 'dart:async';

 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart' show rootBundle;
 import 'package:flutter_markdown_plus/flutter_markdown_plus.dart';
 import 'package:url_launcher/url_launcher.dart';

@@ -12,8 +13,7 @@ class ChangeLogScreen extends StatelessWidget {
    return Scaffold(
      appBar: AppBar(title: const Text('ChangeLog')),
      body: FutureBuilder<String>(
-        future:
-            DefaultAssetBundle.of(context).loadString('assets/changelog.txt'),
+        future: rootBundle.loadString('assets/changelog.txt'),
        builder: (context, snapshot) {
          if (snapshot.connectionState == ConnectionState.waiting) {
            return const Center(child: CircularProgressIndicator());
@@ -1,6 +1,5 @@
 import 'dart:io';

-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:package_info_plus/package_info_plus.dart';
@@ -18,38 +17,20 @@ class CrashScreen extends StatelessWidget {
  final StackTrace? stackTrace;
  final String gitHash;

-  String get _buildMode {
-    if (kDebugMode) return 'debug';
-    if (kProfileMode) return 'profile';
-    return 'release';
-  }
-
-  Future<String> _fetchVersion() async {
+  Future<String> _buildReport() async {
+    String version = 'unknown';
    try {
      final info = await PackageInfo.fromPlatform();
-      return '${info.version}+${info.buildNumber}';
-    } catch (_) {
-      return 'unknown';
-    }
-  }
-
-  Future<String> _buildReport() async {
-    final version = await _fetchVersion();
+      version = '${info.version}+${info.buildNumber}';
+    } catch (_) {}
    final platform =
        '${Platform.operatingSystem} ${Platform.operatingSystemVersion}';
-    final versionDisplay = gitHash.isNotEmpty
-        ? '[$version](https://codeberg.org/guettli/sharedinbox/commit/$gitHash)'
-        : version;
    final gitLine = gitHash.isNotEmpty
        ? 'Git Commit: [$gitHash](https://codeberg.org/guettli/sharedinbox/commit/$gitHash)\n'
        : '';
-    final timestamp = DateTime.now().toUtc().toIso8601String();
-    return 'App Version: $versionDisplay\n'
-        'Build Mode: $_buildMode\n'
+    return 'App Version: $version\n'
        '$gitLine'
-        'Platform: $platform\n'
-        'Dart: ${Platform.version}\n'
-        'Timestamp: $timestamp\n\n'
+        'Platform: $platform\n\n'
        'Error:\n```\n$exception\n```\n\n'
        'Stack Trace:\n```\n$stackTrace\n```';
  }
@@ -75,49 +56,8 @@ class CrashScreen extends StatelessWidget {
                  style: Theme.of(ctx).textTheme.titleMedium,
                  textAlign: TextAlign.center,
                ),
-                const SizedBox(height: 4),
-                FutureBuilder<String>(
-                  future: _fetchVersion(),
-                  builder: (context, snapshot) => Text(
-                    'v${snapshot.data ?? '…'}  •  $_buildMode  •  '
-                    '${Platform.operatingSystem} ${Platform.operatingSystemVersion}',
-                    style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                          color: Colors.grey[600],
-                        ),
-                    textAlign: TextAlign.center,
-                  ),
-                ),
                if (gitHash.isNotEmpty) ...[
                  const SizedBox(height: 8),
-                  FutureBuilder<PackageInfo>(
-                    future: PackageInfo.fromPlatform(),
-                    builder: (_, snapshot) {
-                      if (!snapshot.hasData) return const SizedBox.shrink();
-                      final version =
-                          '${snapshot.data!.version}+${snapshot.data!.buildNumber}';
-                      return GestureDetector(
-                        onTap: () async {
-                          final url = Uri.parse(
-                            'https://codeberg.org/guettli/sharedinbox/commit/$gitHash',
-                          );
-                          await launchUrl(
-                            url,
-                            mode: LaunchMode.externalApplication,
-                          );
-                        },
-                        child: Text(
-                          'App Version: $version',
-                          style: const TextStyle(
-                            fontSize: 12,
-                            color: Colors.blue,
-                            decoration: TextDecoration.underline,
-                          ),
-                          textAlign: TextAlign.center,
-                        ),
-                      );
-                    },
-                  ),
-                  const SizedBox(height: 4),
                  GestureDetector(
                    onTap: () async {
                      final url = Uri.parse(
@@ -38,7 +38,6 @@ class _EditAccountScreenState extends ConsumerState<EditAccountScreen> {
  var _sieveSsl = true;
  var _verbose = false;
  final _jmapUrlCtrl = TextEditingController();
-  bool _hasStoredPassword = false;

  // -- "Try connection" state ------------------------------------------------
  bool _tryTesting = false;
@@ -51,7 +50,6 @@ class _EditAccountScreenState extends ConsumerState<EditAccountScreen> {
    _smtpHostCtrl.addListener(_rebuild);
    _sieveHostCtrl.addListener(_rebuild);
    _imapHostCtrl.addListener(_rebuild);
-    _passwordCtrl.addListener(_rebuild);
    unawaited(_load());
  }

@@ -65,11 +63,6 @@ class _EditAccountScreenState extends ConsumerState<EditAccountScreen> {
      context.pop();
      return;
    }
-    try {
-      await repo.getPassword(account.id);
-      _hasStoredPassword = true;
-    } catch (_) {}
-    if (!mounted) return;
    _account = account;
    _displayNameCtrl.text = account.displayName;
    _usernameCtrl.text = account.username;
@@ -91,7 +84,6 @@ class _EditAccountScreenState extends ConsumerState<EditAccountScreen> {
    _smtpHostCtrl.removeListener(_rebuild);
    _sieveHostCtrl.removeListener(_rebuild);
    _imapHostCtrl.removeListener(_rebuild);
-    _passwordCtrl.removeListener(_rebuild);
    for (final c in [
      _displayNameCtrl,
      _usernameCtrl,
@@ -275,12 +267,10 @@ class _EditAccountScreenState extends ConsumerState<EditAccountScreen> {
            ),
            _field(
              _passwordCtrl,
-              _hasStoredPassword
-                  ? 'New password (leave blank to keep)'
-                  : 'Password',
+              'New password (leave blank to keep)',
              key: const Key('editPasswordField'),
              obscure: true,
-              required: !_hasStoredPassword,
+              required: false,
            ),
            if (account.type == AccountType.jmap) ...[
              const Divider(height: 32),
@@ -355,17 +345,10 @@ class _EditAccountScreenState extends ConsumerState<EditAccountScreen> {
              testing: _tryTesting,
              okMessage: _tryOk,
              errorMessage: _tryErr,
-              onPressed: _hasStoredPassword || _passwordCtrl.text.isNotEmpty
-                  ? _tryConnection
-                  : null,
+              onPressed: _tryConnection,
            ),
            const SizedBox(height: 8),
-            FilledButton(
-              onPressed: _hasStoredPassword || _passwordCtrl.text.isNotEmpty
-                  ? _save
-                  : null,
-              child: const Text('Save'),
-            ),
+            FilledButton(onPressed: _save, child: const Text('Save')),
          ],
        ),
      ),
@@ -70,9 +70,16 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
            onPressed: header == null
                ? null
                : () {
-                    unawaited(
-                      _replyWithRecipientDialog(context, header, body),
-                    );
+                    unawaited(_reply(context, header, body, replyAll: false));
+                  },
+          ),
+          IconButton(
+            icon: const Icon(Icons.reply_all),
+            tooltip: 'Reply all',
+            onPressed: header == null
+                ? null
+                : () {
+                    unawaited(_reply(context, header, body, replyAll: true));
                  },
          ),
          IconButton(
@@ -114,15 +121,6 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
            tooltip: 'Snooze',
            onPressed: header == null ? null : () => _snooze(context, header),
          ),
-          IconButton(
-            icon: const Icon(Icons.report_outlined),
-            tooltip: 'Mark as spam',
-            onPressed: header == null
-                ? null
-                : () {
-                    unawaited(_markAsSpam(context, header));
-                  },
-          ),
          IconButton(
            icon: const Icon(Icons.delete),
            tooltip: 'Delete',
@@ -305,78 +303,17 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
    return '\n\n— On $date, $from wrote:\n$quoted';
  }

-  Future<void> _replyWithRecipientDialog(
-    BuildContext context,
-    Email header,
-    EmailBody? body,
-  ) async {
-    final account =
-        await ref.read(accountRepositoryProvider).getAccount(header.accountId);
-    final ownEmail = account?.email.toLowerCase() ?? '';
-
-    final seen = <String>{};
-    final candidates = <_Candidate>[];
-
-    void addIfNew(EmailAddress addr, _Placement defaultPlacement) {
-      final key = addr.email.toLowerCase();
-      if (key == ownEmail || seen.contains(key)) return;
-      seen.add(key);
-      candidates.add(_Candidate(addr, defaultPlacement));
-    }
-
-    for (final addr in header.from) {
-      addIfNew(addr, _Placement.to);
-    }
-    for (final addr in header.to) {
-      addIfNew(addr, _Placement.to);
-    }
-    for (final addr in header.cc) {
-      addIfNew(addr, _Placement.cc);
-    }
-
-    if (!context.mounted) return;
-
-    if (candidates.length <= 1) {
-      final to = candidates
-          .where((c) => c.placement == _Placement.to)
-          .map((c) => c.address.email)
-          .join(', ');
-      final cc = candidates
-          .where((c) => c.placement == _Placement.cc)
-          .map((c) => c.address.email)
-          .join(', ');
-      await _composeReply(context, header, body, to: to, cc: cc);
-      return;
-    }
-
-    final confirmed = await showDialog<List<_Candidate>>(
-      context: context,
-      builder: (ctx) => _ReplyAllDialog(candidates: candidates),
-    );
-
-    if (confirmed == null || !context.mounted) return;
-
-    final to = confirmed
-        .where((c) => c.placement == _Placement.to)
-        .map((c) => c.address.email)
-        .join(', ');
-    final cc = confirmed
-        .where((c) => c.placement == _Placement.cc)
-        .map((c) => c.address.email)
-        .join(', ');
-    await _composeReply(context, header, body, to: to, cc: cc);
-  }
-
-  Future<void> _composeReply(
+  Future<void> _reply(
    BuildContext context,
    Email header,
    EmailBody? body, {
-    required String to,
-    required String cc,
+    required bool replyAll,
  }) async {
+    final to = header.from.isNotEmpty ? header.from.first.email : '';
    final subject = (header.subject?.startsWith('Re:') ?? false)
        ? header.subject!
        : 'Re: ${header.subject ?? ''}';
+    final cc = replyAll ? header.to.map((a) => a.email).join(', ') : '';
    final quoted = await _quotedBody(header, body);
    if (!context.mounted) return;
    unawaited(
@@ -393,38 +330,6 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
    );
  }

-  Future<void> _markAsSpam(BuildContext context, Email header) async {
-    final mailboxRepo = ref.read(mailboxRepositoryProvider);
-    final junk = await mailboxRepo.findMailboxByRole(header.accountId, 'junk');
-
-    if (junk == null) {
-      if (!context.mounted) return;
-      ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(content: Text('No Junk folder found')),
-      );
-      return;
-    }
-
-    await ref
-        .read(emailRepositoryProvider)
-        .moveEmail(widget.emailId, junk.path);
-
-    unawaited(
-      ref.read(undoServiceProvider.notifier).pushAction(
-            UndoAction(
-              id: DateTime.now().toIso8601String(),
-              accountId: header.accountId,
-              type: UndoType.move,
-              emailIds: [widget.emailId],
-              sourceMailboxPath: header.mailboxPath,
-              destinationMailboxPath: junk.path,
-            ),
-          ),
-    );
-
-    if (context.mounted) context.pop();
-  }
-
  Future<void> _forward(
    BuildContext context,
    Email header,
@@ -765,94 +670,6 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
  }
 }

-enum _Placement { to, cc, skip }
-
-class _Candidate {
-  _Candidate(this.address, this.placement);
-  final EmailAddress address;
-  _Placement placement;
-}
-
-class _ReplyAllDialog extends StatefulWidget {
-  const _ReplyAllDialog({required this.candidates});
-  final List<_Candidate> candidates;
-
-  @override
-  State<_ReplyAllDialog> createState() => _ReplyAllDialogState();
-}
-
-class _ReplyAllDialogState extends State<_ReplyAllDialog> {
-  late final List<_Candidate> _candidates;
-
-  @override
-  void initState() {
-    super.initState();
-    _candidates = [
-      for (final c in widget.candidates) _Candidate(c.address, c.placement),
-    ];
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: const Text('Reply All'),
-      content: SizedBox(
-        width: double.maxFinite,
-        child: ListView(
-          shrinkWrap: true,
-          children: [
-            for (final c in _candidates)
-              Padding(
-                padding: const EdgeInsets.symmetric(vertical: 4),
-                child: Row(
-                  children: [
-                    Expanded(
-                      child: Text(
-                        c.address.toString(),
-                        overflow: TextOverflow.ellipsis,
-                      ),
-                    ),
-                    const SizedBox(width: 8),
-                    SegmentedButton<_Placement>(
-                      showSelectedIcon: false,
-                      segments: const [
-                        ButtonSegment(
-                          value: _Placement.to,
-                          label: Text('To'),
-                        ),
-                        ButtonSegment(
-                          value: _Placement.cc,
-                          label: Text('Cc'),
-                        ),
-                        ButtonSegment(
-                          value: _Placement.skip,
-                          label: Text('Skip'),
-                        ),
-                      ],
-                      selected: {c.placement},
-                      onSelectionChanged: (s) =>
-                          setState(() => c.placement = s.first),
-                    ),
-                  ],
-                ),
-              ),
-          ],
-        ),
-      ),
-      actions: [
-        TextButton(
-          onPressed: () => Navigator.pop(context),
-          child: const Text('Cancel'),
-        ),
-        TextButton(
-          onPressed: () => Navigator.pop(context, _candidates),
-          child: const Text('Reply'),
-        ),
-      ],
-    );
-  }
-}
-
 class _MimeRow {
  const _MimeRow(this.depth, this.label);
  final int depth;
@@ -7,7 +7,6 @@ import 'package:intl/intl.dart';

 import 'package:sharedinbox/core/models/account.dart';
 import 'package:sharedinbox/core/models/email.dart';
-import 'package:sharedinbox/core/models/mailbox.dart';
 import 'package:sharedinbox/core/models/undo_action.dart';
 import 'package:sharedinbox/core/repositories/email_repository.dart';
 import 'package:sharedinbox/di.dart';
@@ -25,8 +24,6 @@ int _dayKey(DateTime dt) => dt.year * 10000 + dt.month * 100 + dt.day;
 String _fmtDate(DateTime dt) =>
    _formattedDates[_dayKey(dt)] ??= _dateFmt.format(dt);

-enum _MissingFolderChoice { chooseExisting, createNew }
-
 class EmailListScreen extends ConsumerStatefulWidget {
  const EmailListScreen({
    super.key,
@@ -423,79 +420,24 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
    );
  }

-  Future<void> _batchMoveToRole(
-    String role, {
-    required String dialogTitle,
-    required String createFolderName,
-  }) async {
+  Future<void> _batchMoveToRole(String role, String notFoundMessage) async {
    final ids = _selectedEmailIds;
    _clearSelection();
-
-    final mailboxRepo = ref.read(mailboxRepositoryProvider);
-    Mailbox? mailbox =
-        await mailboxRepo.findMailboxByRole(widget.accountId, role);
-
+    final mailbox = await ref
+        .read(mailboxRepositoryProvider)
+        .findMailboxByRole(widget.accountId, role);
    if (!mounted) return;
-
    if (mailbox == null) {
-      final choice = await showDialog<_MissingFolderChoice>(
-        context: context,
-        builder: (ctx) => AlertDialog(
-          title: Text(dialogTitle),
-          actions: [
-            TextButton(
-              onPressed: () =>
-                  Navigator.pop(ctx, _MissingFolderChoice.chooseExisting),
-              child: const Text('Choose existing folder'),
-            ),
-            FilledButton(
-              onPressed: () =>
-                  Navigator.pop(ctx, _MissingFolderChoice.createNew),
-              child: Text('Create "$createFolderName"'),
-            ),
-          ],
+      ScaffoldMessenger.of(
+        context,
+      ).showSnackBar(
+        SnackBar(
+          duration: const Duration(seconds: 5),
+          content: Text(notFoundMessage),
        ),
      );
-      if (!mounted || choice == null) return;
-
-      switch (choice) {
-        case _MissingFolderChoice.chooseExisting:
-          final mailboxes =
-              await mailboxRepo.observeMailboxes(widget.accountId).first;
-          if (!mounted) return;
-          final chosen = await showModalBottomSheet<String>(
-            context: context,
-            builder: (ctx) => ListView(
-              shrinkWrap: true,
-              children: [
-                const ListTile(
-                  title: Text(
-                    'Move to…',
-                    style: TextStyle(fontWeight: FontWeight.bold),
-                  ),
-                ),
-                for (final m
-                    in mailboxes.where((m) => m.path != widget.mailboxPath))
-                  ListTile(
-                    leading: const Icon(Icons.folder_outlined),
-                    title: Text(m.name),
-                    onTap: () => Navigator.pop(ctx, m.path),
-                  ),
-              ],
-            ),
-          );
-          if (chosen == null || !mounted) return;
-          mailbox = mailboxes.firstWhere((m) => m.path == chosen);
-        case _MissingFolderChoice.createNew:
-          mailbox = await mailboxRepo.createMailboxWithRole(
-            widget.accountId,
-            createFolderName,
-            role,
-          );
-          if (!mounted) return;
-      }
+      return;
    }
-
    final repo = ref.read(emailRepositoryProvider);

    // Fetch full email data before moving so we can restore them if user clicks Undo.
@@ -521,11 +463,8 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
    unawaited(ref.read(undoServiceProvider.notifier).pushAction(action));
  }

-  Future<void> _batchArchive() => _batchMoveToRole(
-        'archive',
-        dialogTitle: 'No archive folder found',
-        createFolderName: 'Archive',
-      );
+  Future<void> _batchArchive() =>
+      _batchMoveToRole('archive', 'No archive folder found');

  Future<void> _refreshSearchAndPopIfEmpty() async {
    if (!mounted || !_searching) return;
@@ -604,11 +543,8 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
    }
  }

-  Future<void> _batchMarkSpam() => _batchMoveToRole(
-        'junk',
-        dialogTitle: 'No spam folder found',
-        createFolderName: 'Junk',
-      );
+  Future<void> _batchMarkSpam() =>
+      _batchMoveToRole('junk', 'No spam folder found');

  Future<void> _batchMove() async {
    final ids = _selectedEmailIds;
@@ -1,15 +1,11 @@
 import 'dart:async';

 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:intl/intl.dart';
-import 'package:package_info_plus/package_info_plus.dart';

-import 'package:sharedinbox/core/models/account.dart';
 import 'package:sharedinbox/core/repositories/sync_log_repository.dart';
 import 'package:sharedinbox/di.dart';
-import 'package:sharedinbox/ui/utils/about_markdown.dart';

 final _timeFmt = DateFormat('MMM d, HH:mm:ss');

@@ -25,57 +21,6 @@ String _fmtBytes(int bytes) {
  return '${(bytes / (1024 * 1024)).toStringAsFixed(1)} MB';
 }

-String _buildSyncEntryMarkdown(SyncLogEntry entry) {
-  final buf = StringBuffer();
-  buf.writeln('## Sync Entry');
-  buf.writeln();
-  buf.writeln('| Property | Value |');
-  buf.writeln('|----------|-------|');
-  buf.writeln('| Started | ${_timeFmt.format(entry.startedAt)} |');
-  buf.writeln('| Finished | ${_timeFmt.format(entry.finishedAt)} |');
-  buf.writeln('| Duration | ${_fmtDuration(entry.duration)} |');
-  if (entry.protocol.isNotEmpty) {
-    buf.writeln('| Protocol | ${entry.protocol.toUpperCase()} |');
-  }
-  final statusLabel = entry.isOk
-      ? 'OK'
-      : entry.isPermanent
-          ? 'Error (permanent)'
-          : 'Error';
-  buf.writeln('| Status | $statusLabel |');
-  buf.writeln('| Emails fetched | ${entry.emailsFetched} |');
-  buf.writeln('| Emails up-to-date | ${entry.emailsSkipped} |');
-  buf.writeln('| Mailboxes synced | ${entry.mailboxesSynced} |');
-  buf.writeln('| Pending changes flushed | ${entry.pendingFlushed} |');
-  buf.writeln('| Data transferred | ${_fmtBytes(entry.bytesTransferred)} |');
-  if (entry.mailboxStats.isNotEmpty) {
-    buf.writeln();
-    buf.writeln('### Per mailbox');
-    buf.writeln();
-    buf.writeln('| Mailbox | Fetched | Up-to-date | Duration |');
-    buf.writeln('|---------|---------|------------|----------|');
-    for (final m in entry.mailboxStats) {
-      final dur = m.duration != null ? _fmtDuration(m.duration!) : '-';
-      buf.writeln('| ${m.mailboxPath} | ${m.fetched} | ${m.skipped} | $dur |');
-    }
-  }
-  if (entry.errorMessage != null) {
-    buf.writeln();
-    buf.writeln('**Error:**');
-    buf.writeln();
-    buf.writeln(entry.errorMessage);
-  }
-  if (entry.stackTrace != null) {
-    buf.writeln();
-    buf.writeln('**Stack trace:**');
-    buf.writeln();
-    buf.writeln('```');
-    buf.write(entry.stackTrace);
-    buf.writeln('```');
-  }
-  return buf.toString();
-}
-
 class SyncLogScreen extends ConsumerStatefulWidget {
  const SyncLogScreen({super.key, required this.accountId});

@@ -124,41 +69,6 @@ class _SyncLogScreenState extends ConsumerState<SyncLogScreen> {
    ref.read(syncManagerProvider).syncNow(widget.accountId);
  }

-  Future<void> _copyEntry(SyncLogEntry entry, BuildContext context) async {
-    final accounts =
-        await ref.read(accountRepositoryProvider).observeAccounts().first;
-    final imapCount = accounts.where((a) => a.type == AccountType.imap).length;
-    final jmapCount = accounts.where((a) => a.type == AccountType.jmap).length;
-
-    PackageInfo? pkg;
-    try {
-      pkg = await PackageInfo.fromPlatform();
-    } catch (_) {}
-
-    final deviceModel = await getDeviceModel();
-
-    if (!context.mounted) return;
-
-    final syncMd = _buildSyncEntryMarkdown(entry);
-    final aboutMd = buildAboutMarkdown(
-      context: context,
-      pkg: pkg,
-      imapCount: imapCount,
-      jmapCount: jmapCount,
-      deviceModel: deviceModel,
-    );
-    await Clipboard.setData(ClipboardData(text: '$syncMd\n$aboutMd'));
-
-    if (context.mounted) {
-      ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(
-          duration: Duration(seconds: 3),
-          content: Text('Copied to clipboard'),
-        ),
-      );
-    }
-  }
-
  @override
  Widget build(BuildContext context) {
    return Scaffold(
@@ -186,20 +96,16 @@ class _SyncLogScreenState extends ConsumerState<SyncLogScreen> {
          ? const Center(child: Text('No sync entries yet'))
          : ListView.builder(
              itemCount: _entries.length,
-              itemBuilder: (ctx, i) => _SyncLogTile(
-                entry: _entries[i],
-                onCopy: () => _copyEntry(_entries[i], ctx),
-              ),
+              itemBuilder: (ctx, i) => _SyncLogTile(entry: _entries[i]),
            ),
    );
  }
 }

 class _SyncLogTile extends StatelessWidget {
-  const _SyncLogTile({required this.entry, required this.onCopy});
+  const _SyncLogTile({required this.entry});

  final SyncLogEntry entry;
-  final VoidCallback onCopy;

  @override
  Widget build(BuildContext context) {
@@ -209,12 +115,6 @@ class _SyncLogTile extends StatelessWidget {
    final theme = Theme.of(context);
    final errorColor = theme.colorScheme.error;

-    final subtitleText = entry.isOk
-        ? '${entry.emailsFetched} new · ${entry.emailsSkipped} up-to-date · took $durationLabel'
-        : entry.isPermanent
-            ? 'Error (permanent) · took $durationLabel'
-            : 'Error · took $durationLabel';
-
    return ExpansionTile(
      leading: Icon(
        entry.isOk ? Icons.check_circle : Icons.error_outline,
@@ -225,20 +125,11 @@ class _SyncLogTile extends StatelessWidget {
        style: entry.isOk ? null : TextStyle(color: errorColor),
      ),
      subtitle: Text(
-        subtitleText,
+        entry.isOk
+            ? '${entry.emailsFetched} new · ${entry.emailsSkipped} up-to-date · took $durationLabel'
+            : 'Error · took $durationLabel',
        style: TextStyle(fontSize: 12, color: entry.isOk ? null : errorColor),
      ),
-      trailing: Row(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          IconButton(
-            icon: const Icon(Icons.copy, size: 18),
-            tooltip: 'Copy as markdown',
-            onPressed: onCopy,
-          ),
-          const Icon(Icons.expand_more),
-        ],
-      ),
      children: [
        Padding(
          padding: const EdgeInsets.fromLTRB(72, 0, 16, 12),
@@ -280,31 +171,6 @@ class _SyncLogTile extends StatelessWidget {
                    style: TextStyle(color: errorColor, fontSize: 12),
                  ),
                ),
-              if (entry.stackTrace != null) ...[
-                const Padding(
-                  padding: EdgeInsets.only(top: 6, bottom: 2),
-                  child: Text(
-                    'Stack trace',
-                    style: TextStyle(fontSize: 12, color: Colors.grey),
-                  ),
-                ),
-                Container(
-                  width: double.infinity,
-                  padding: const EdgeInsets.all(8),
-                  decoration: BoxDecoration(
-                    color: Colors.black87,
-                    borderRadius: BorderRadius.circular(4),
-                  ),
-                  child: Text(
-                    entry.stackTrace!,
-                    style: TextStyle(
-                      fontSize: 10,
-                      fontFamily: 'monospace',
-                      color: Colors.red[300],
-                    ),
-                  ),
-                ),
-              ],
              if (entry.protocolLog != null) ...[
                const Padding(
                  padding: EdgeInsets.only(top: 6, bottom: 2),
@@ -1,75 +0,0 @@
-import 'dart:io';
-
-import 'package:device_info_plus/device_info_plus.dart';
-import 'package:flutter/material.dart';
-import 'package:package_info_plus/package_info_plus.dart';
-import 'package:sharedinbox/core/db_schema_version.dart';
-
-const _gitHash = String.fromEnvironment('GIT_HASH');
-
-/// Builds the About markdown table used in [AboutScreen] and sync log copies.
-String buildAboutMarkdown({
-  required BuildContext context,
-  PackageInfo? pkg,
-  required int imapCount,
-  required int jmapCount,
-  String? deviceModel,
-}) {
-  final size = MediaQuery.of(context).size;
-  final pixelRatio = MediaQuery.of(context).devicePixelRatio;
-  final physW = (size.width * pixelRatio).toInt();
-  final physH = (size.height * pixelRatio).toInt();
-  final version = pkg != null ? '${pkg.version}+${pkg.buildNumber}' : 'unknown';
-  final versionDisplay = _gitHash.isNotEmpty
-      ? '[$version](https://codeberg.org/guettli/sharedinbox/commit/$_gitHash)'
-      : version;
-  final osName = _capitalize(Platform.operatingSystem);
-  final isDark = MediaQuery.of(context).platformBrightness == Brightness.dark;
-  final locale = Localizations.localeOf(context).toString();
-  final textScale =
-      MediaQuery.of(context).textScaler.scale(1.0).toStringAsFixed(1);
-
-  final gitCommitLine = _gitHash.isNotEmpty
-      ? '| Git Commit | [$_gitHash](https://codeberg.org/guettli/sharedinbox/commit/$_gitHash) |\n'
-      : '';
-  final deviceModelLine =
-      deviceModel != null ? '| Device Model | $deviceModel |\n' : '';
-
-  return '## [sharedinbox.de](https://sharedinbox.de)\n\n'
-      '| Property | Value |\n'
-      '|----------|-------|\n'
-      '| App Version | $versionDisplay |\n'
-      '$gitCommitLine'
-      '| Platform | ${Platform.operatingSystem} |\n'
-      '| $osName Version | ${Platform.operatingSystemVersion} |\n'
-      '$deviceModelLine'
-      '| Resolution | ${physW}x$physH px'
-      ' (logical: ${size.width.toInt()}x${size.height.toInt()} pt,'
-      ' ratio: ${pixelRatio.toStringAsFixed(1)}x) |\n'
-      '| Dart Version | ${Platform.version.split(' ').first} |\n'
-      '| Processors | ${Platform.numberOfProcessors} |\n'
-      '| Dark Mode | ${isDark ? 'yes' : 'no'} |\n'
-      '| Locale | $locale |\n'
-      '| Text Scale | $textScale× |\n'
-      '| DB Schema Version | $dbSchemaVersion |\n'
-      '| IMAP Accounts | $imapCount |\n'
-      '| JMAP Accounts | $jmapCount |\n';
-}
-
-/// Fetches device model string, or null when unavailable.
-Future<String?> getDeviceModel() async {
-  try {
-    final info = DeviceInfoPlugin();
-    if (Platform.isAndroid) {
-      final android = await info.androidInfo;
-      return '${android.manufacturer} / ${android.model}';
-    } else if (Platform.isIOS) {
-      final ios = await info.iosInfo;
-      return ios.utsname.machine;
-    }
-  } catch (_) {}
-  return null;
-}
-
-String _capitalize(String s) =>
-    s.isEmpty ? s : '${s[0].toUpperCase()}${s.substring(1)}';
@@ -249,22 +249,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.7.12"
-  device_info_plus:
-    dependency: "direct main"
-    description:
-      name: device_info_plus
-      sha256: "6a642e1daa10190af89ba6cb6386c0df7d071a3592080bfe1e44faa63ae1df65"
-      url: "https://pub.dev"
-    source: hosted
-    version: "13.1.0"
-  device_info_plus_platform_interface:
-    dependency: transitive
-    description:
-      name: device_info_plus_platform_interface
-      sha256: "04b173a92e2d9161dfead145667037c8d834db725ce2e7b942bfe18fd2f45a46"
-      url: "https://pub.dev"
-    source: hosted
-    version: "8.1.0"
  drift:
    dependency: "direct main"
    description:
@@ -1133,13 +1117,13 @@ packages:
    source: hosted
    version: "6.3.2"
  url_launcher_android:
-    dependency: "direct overridden"
+    dependency: transitive
    description:
      name: url_launcher_android
-      sha256: "5c8b6c2d89a78f5a1cca70a73d9d5f86c701b36b42f9c9dac7bad592113c28e9"
+      sha256: "17bc677f0b301615530dd1d67e0a9828cafa2d0b6b6eae4cd3679b7eac4a273c"
      url: "https://pub.dev"
    source: hosted
-    version: "6.3.24"
+    version: "6.3.30"
  url_launcher_ios:
    dependency: transitive
    description:
@@ -1300,14 +1284,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "6.3.0"
-  win32_registry:
-    dependency: transitive
-    description:
-      name: win32_registry
-      sha256: "73b1d78920a9d6e03f8b4e43e612b87bf3152a0e5c5e5150267762b7c4116904"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.3"
  workmanager:
    dependency: "direct main"
    description:
@@ -61,7 +61,6 @@ dependencies:
  # App version metadata for crash reports
  package_info_plus: ^10.1.0
  share_plus: ^13.1.0
-  device_info_plus: ^13.1.0

 dev_dependencies:
  flutter_test:
@@ -90,7 +89,3 @@ dependency_overrides:
  # (SIGSEGV in libdartjni.so FindClassUnchecked). Pin to 2.2.20 which uses
  # stable Pigeon and is known to work reliably.
  path_provider_android: ">=2.2.0 <2.2.21"
-  # url_launcher_android 6.3.25 updated to Pigeon 26, which causes a
-  # channel-error on launchUrl on some Android devices (same root cause as
-  # path_provider_android). Pin to <6.3.25 which uses stable Pigeon.
-  url_launcher_android: ">=6.3.0 <6.3.25"
@@ -1,16 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:recommended"
-  ],
-  "labels": ["dependencies"],
-  "github-actions": {
-    "fileMatch": ["^\\.forgejo/workflows/[^/]+\\.ya?ml$"]
-  },
-  "packageRules": [
-    {
-      "matchUpdateTypes": ["minor", "patch", "pin", "digest", "lockFileMaintenance"],
-      "addLabels": ["automerge"]
-    }
-  ]
-}
@@ -8,25 +8,21 @@ Flow
   a. Age > 1 h  → kill it, set its issue to State/Question, exit 1
   b. Age ≤ 1 h  → print status, exit 0  (let it keep working)
 2. No agent running → extract pending_issue from state (if any), then check CI
-   a. pending_issue type=="plan" → post resume comment, set State/Planned, exit 0
-   b. pending_issue + open PR → check PR branch CI, merge/fix/wait as needed
-   c. Catch-up: orphaned issue-N-fix PRs with passing CI → merge them
-   d. Main CI running         → save pending-ci state, exit 0
-   e. Main CI failed          → start fix-CI agent (pushes fix to main), exit 0
-   f. Main CI ok + pending_issue → close the issue, exit 0  (dead code path —
-                                   section 2b always returns first)
-   g. Main CI ok (or no run yet) → find oldest ToPlan issue, start plan agent,
+   a. pending_issue + open PR → check PR branch CI, merge/fix/wait as needed
+   b. Catch-up: orphaned issue-N-fix PRs with passing CI → merge them
+   c. Main CI running         → save pending-ci state, exit 0
+   d. Main CI failed          → start fix-CI agent (pushes fix to main), exit 0
+   e. Main CI ok + pending_issue → close the issue, exit 0  (dead code path —
+                                   section 2a always returns first)
+   f. Main CI ok (or no run yet) → find oldest Ready issue, start issue agent,
                                   save state, exit 0
-   h. No ToPlan issues        → find oldest Ready issue, start issue agent,
-                                   save state, exit 0
-   i. No Ready issues         → print "nothing to do", exit 0
+   g. No Ready issues         → print "nothing to do", exit 0

 Issue agents must NOT close the issue themselves; the loop closes it after CI passes.
-Plan agents must NOT write any code or create PRs; they only post a plan comment.

 State file: ~/.sharedinbox-agent-state.json
  { "pid": 12345, "issue": 91,
-    "started_at": "2026-05-15T12:00:00+00:00", "type": "issue|plan|ci-fix|pending-ci" }
+    "started_at": "2026-05-15T12:00:00+00:00", "type": "issue" }

 Output is written to ~/.sharedinbox-agent-logs/<session>-<timestamp>.log.
 To resume the Claude conversation, look up the session UUID first:
@@ -42,11 +38,10 @@ import re
 import shlex
 import subprocess
 import sys
-import time
 from datetime import datetime, timezone
 from pathlib import Path

-# Cron runs with a minimal PATH; ensure Nix profile binaries (claude) and ~/go/bin (fgj) are found.
+# Cron runs with a minimal PATH; ensure Nix profile binaries (tea, claude) and ~/go/bin (fgj) are found.
 os.environ["PATH"] = (
    f"{Path.home()}/.nix-profile/bin"
    f":{Path.home()}/go/bin"
@@ -58,9 +53,7 @@ os.environ["PATH"] = (
 REPO = "guettli/sharedinbox"
 REPO_URL = f"https://codeberg.org/{REPO}"
 STATE_FILE = Path.home() / ".sharedinbox-agent-state.json"
-HEARTBEAT_FILE = Path.home() / ".sharedinbox-agent-heartbeat"
 MAX_AGENT_AGE_SECONDS = 3600  # 1 hour
-MAX_HEARTBEAT_AGE_SECONDS = 7200  # 2 hours
 CLAUDE_PROJECTS_DIR = Path.home() / ".claude" / "projects" / (
    "-" + str(Path.home())[1:].replace("/", "-")
 )
@@ -70,8 +63,6 @@ LABEL_READY = "State/Ready"
 LABEL_IN_PROGRESS = "State/InProgress"
 LABEL_QUESTION = "State/Question"
 LABEL_PRIO_HIGH = "Prio/High"
-LABEL_TO_PLAN = "State/ToPlan"
-LABEL_PLANNED = "State/Planned"

 # Only pick up issues filed by these accounts.
 ALLOWED_ISSUE_AUTHORS = {"guettli", "guettlibot", "guettlibot2"}
@@ -97,27 +88,22 @@ def _fgj(*args: str) -> None:
        )


-def _fgj_run_list(limit: int = 20) -> list[dict]:
-    """Return workflow runs via fgj actions run list."""
-    result = subprocess.run(
-        ["fgj", "--hostname", "codeberg.org", "actions", "run", "list",
-         "--repo", REPO, "--json", "-L", str(limit)],
-        capture_output=True, text=True,
-    )
+def _tea_get(path: str) -> dict | list | None:
+    """Run a tea api GET and return parsed JSON. Only use for reads — tea PATCH/PUT
+    silently fails (exits 0) when unauthenticated, so writes must go via fgj."""
+    cmd = ["tea", "api", path]
+    result = subprocess.run(cmd, capture_output=True, text=True)
    if result.returncode != 0:
        raise RuntimeError(
-            f"fgj actions run list failed:\n{result.stderr or result.stdout}"
+            f"tea api {path} failed:\n{result.stderr or result.stdout}"
        )
    out = result.stdout.strip()
    if not out:
-        return []
-    try:
-        data = json.loads(out)
-    except json.JSONDecodeError as exc:
-        raise RuntimeError(
-            f"fgj actions run list returned non-JSON:\n{out[:500]}"
-        ) from exc
-    return data if isinstance(data, list) else []
+        return None
+    data = json.loads(out)
+    if isinstance(data, dict) and "message" in data and "url" in data:
+        raise RuntimeError(f"tea api {path} returned error: {data['message']}")
+    return data


 def _set_labels(issue: int, add: list[str], remove: list[str]) -> None:
@@ -159,26 +145,6 @@ def _ready_issues() -> list[dict]:
    return ready


-def _to_plan_issues() -> list[dict]:
-    """Return open issues with State/ToPlan, Prio/High first, then oldest."""
-    result = subprocess.run(
-        ["fgj", "--hostname", "codeberg.org", "issue", "list",
-         "--repo", REPO, "--state", "open", "--json"],
-        capture_output=True, text=True, check=True,
-    )
-    data = json.loads(result.stdout) if result.stdout.strip() else []
-    to_plan = [
-        i for i in data
-        if any(lbl["name"] == LABEL_TO_PLAN for lbl in i.get("labels", []))
-        and i.get("user", {}).get("login", "") in ALLOWED_ISSUE_AUTHORS
-    ]
-    to_plan.sort(key=lambda i: (
-        0 if any(lbl["name"] == LABEL_PRIO_HIGH for lbl in i.get("labels", [])) else 1,
-        i["number"],
-    ))
-    return to_plan
-
-
 def _latest_main_ci_run() -> dict | None:
    """Return the latest ci.yml run on the main branch.

@@ -186,7 +152,9 @@ def _latest_main_ci_run() -> dict | None:
    event=push and prettyref=main, so filtering by event alone is not enough.
    We also require workflow_id == "ci.yml".
    """
-    for run in _fgj_run_list(limit=20):
+    data = _tea_get(f"repos/{REPO}/actions/runs?limit=20")
+    runs = (data or {}).get("workflow_runs", [])
+    for run in runs:
        if (run.get("event") == "push"
                and run.get("prettyref") == "main"
                and run.get("workflow_id") == "ci.yml"):
@@ -197,16 +165,20 @@ def _latest_main_ci_run() -> dict | None:
 def _latest_ci_run_for_branch(branch: str) -> dict | None:
    """Return the latest CI run for a specific branch, or None.

-    For push events fgj reports the branch in ``prettyref``; for pull_request
-    events ``prettyref`` is ``#N``, so we resolve the PR number first.
+    Forgejo's workflow_runs API has no top-level head_branch field.
+    For push events the branch is in ``prettyref``; for pull_request
+    events it lives inside ``event_payload["pull_request"]["head"]["ref"]``.
    """
-    runs = _fgj_run_list(limit=20)
-    pr_data = _find_pr_for_branch(branch)
-    pr_ref = f"#{pr_data['number']}" if pr_data else None
+    data = _tea_get(f"repos/{REPO}/actions/runs?limit=20")
+    runs = (data or {}).get("workflow_runs", [])
    for run in runs:
        if run.get("event") == "pull_request":
-            if pr_ref and run.get("prettyref") == pr_ref:
-                return run
+            try:
+                payload = json.loads(run.get("event_payload", "{}"))
+                if payload.get("pull_request", {}).get("head", {}).get("ref") == branch:
+                    return run
+            except (json.JSONDecodeError, AttributeError):
+                pass
        elif run.get("event") == "push":
            if run.get("prettyref") == branch:
                return run
@@ -253,79 +225,23 @@ def _open_issue_prs() -> list[dict]:

 def _latest_ci_run_for_pr(pr_number: int) -> dict | None:
    """Return the latest CI run triggered by a pull_request event for the given PR number."""
-    pr_ref = f"#{pr_number}"
-    for run in _fgj_run_list(limit=50):
-        if run.get("event") == "pull_request" and run.get("prettyref") == pr_ref:
-            return run
+    data = _tea_get(f"repos/{REPO}/actions/runs?event=pull_request&limit=50")
+    runs = (data or {}).get("workflow_runs", [])
+    for run in runs:
+        try:
+            payload = json.loads(run.get("event_payload", "{}"))
+            if payload.get("pull_request", {}).get("number") == pr_number:
+                return run
+        except (json.JSONDecodeError, AttributeError):
+            pass
    return None


-def _get_issue_labels(issue: int) -> list[str]:
-    """Return label names for an issue."""
-    result = subprocess.run(
-        ["fgj", "--hostname", "codeberg.org", "issue", "view", str(issue),
-         "--repo", REPO, "--json"],
-        capture_output=True, text=True,
-    )
-    if result.returncode != 0 or not result.stdout.strip():
-        return []
-    try:
-        data = json.loads(result.stdout)
-    except json.JSONDecodeError:
-        return []
-    return [lbl["name"] for lbl in data.get("issue", {}).get("labels", [])]
-
-
 def _merge_pr(pr_number: int) -> None:
    """Squash-merge a PR via fgj."""
    _fgj("pr", "merge", str(pr_number), "--repo", REPO, "--merge-method", "squash")


-def _handle_pr_still_open_after_merge(pr_number: int, branch: str, issue_num: int | None) -> str:
-    """Handle a PR that is still open after a successful _merge_pr() call.
-
-    Returns one of:
-      "rebase-spawned" — merge conflict detected; rebase agent started, state written
-      "merged"         — PR closed after a retry
-      "fallback"       — all options exhausted; caller should set State/Question
-    """
-    result = subprocess.run(
-        ["fgj", "--hostname", "codeberg.org", "pr", "view", str(pr_number),
-         "--repo", REPO, "--json"],
-        capture_output=True, text=True,
-    )
-    pr_data: dict = {}
-    if result.returncode == 0 and result.stdout.strip():
-        try:
-            pr_data = json.loads(result.stdout)
-        except json.JSONDecodeError:
-            pass
-    mergeable = pr_data.get("mergeable")
-
-    if mergeable is False:
-        prompt = (
-            f"Rebase branch `{branch}` onto main to resolve merge conflicts, then push. "
-            "Do not change any logic — only resolve conflicts and push."
-        )
-        session_name = f"rebase-pr-{pr_number}"
-        pid = _start_agent(prompt, session_name)
-        _write_state(pid, issue_num, "pending-ci", session_name=session_name)
-        print(f"PR #{pr_number} has merge conflicts — spawned rebase agent (pid={pid}).")
-        return "rebase-spawned"
-
-    for attempt in range(1, 3):
-        time.sleep(5)
-        try:
-            _merge_pr(pr_number)
-        except RuntimeError as e:
-            print(f"PR #{pr_number} merge retry {attempt} failed: {e}")
-        if not _find_pr_for_branch(branch):
-            print(f"PR #{pr_number} merged on retry {attempt}.")
-            return "merged"
-
-    return "fallback"
-
-
 # ── state file ────────────────────────────────────────────────────────────────


@@ -359,12 +275,6 @@ def _clear_state() -> None:
    STATE_FILE.unlink(missing_ok=True)


-def _update_heartbeat() -> None:
-    """Record that the agent loop ran right now."""
-    HEARTBEAT_FILE.write_text(datetime.now(timezone.utc).isoformat())
-    HEARTBEAT_FILE.chmod(0o600)
-
-
 def _find_session_uuid(session_name: str) -> str | None:
    """Return the Claude session UUID for *session_name*, or None if not found.

@@ -534,44 +444,12 @@ def cmd_list() -> int:
    return 0


-# ── monitor subcommand ────────────────────────────────────────────────────────
-
-
-def cmd_monitor() -> int:
-    """Check that the agent loop has run within the last 2 hours.
-
-    Exits 0 if healthy, 1 if the heartbeat is missing or stale.
-    Intended to be called from a scheduled CI job or cron every 2 hours.
-    """
-    if not HEARTBEAT_FILE.exists():
-        print(
-            f"WARNING: Agent loop heartbeat file missing — "
-            f"the loop may not have run yet or the file was deleted ({HEARTBEAT_FILE})."
-        )
-        return 1
-    try:
-        last_run = datetime.fromisoformat(HEARTBEAT_FILE.read_text().strip())
-    except ValueError:
-        print(f"WARNING: Agent loop heartbeat file is corrupted: {HEARTBEAT_FILE}")
-        return 1
-    age = (datetime.now(timezone.utc) - last_run).total_seconds()
-    if age > MAX_HEARTBEAT_AGE_SECONDS:
-        print(
-            f"WARNING: Agent loop last ran {age / 3600:.1f}h ago "
-            f"(limit: {MAX_HEARTBEAT_AGE_SECONDS // 3600}h) — the loop may be stalled."
-        )
-        return 1
-    print(f"Agent loop is healthy. Last run: {age / 60:.0f} min ago.")
-    return 0
-
-
 # ── main flow ─────────────────────────────────────────────────────────────────


 def _run_loop() -> int:
    now = datetime.now(timezone.utc)
    print(f"---------------------- Starting {now.strftime('%Y-%m-%d %H:%MZ')}")
-    _update_heartbeat()

    state = _read_state()

@@ -626,29 +504,13 @@ def _run_loop() -> int:

    # Agent not running (or no state) — extract any pending issue, then clean up.
    pending_issue: int | None = None
-    pending_type: str | None = None
    ci_run_id_at_start: int | None = None
    if state:
        pending_issue = state.get("issue")
-        pending_type = state.get("type")
        ci_run_id_at_start = state.get("ci_run_id_at_start")
        _clear_state()

-    # ── 2a. Finished planning agent ───────────────────────────────────────────
-    if pending_issue and pending_type == "plan":
-        session_name = f"plan-issue-{pending_issue}"
-        uuid = _find_session_uuid(session_name)
-        if uuid:
-            resume_cmd = f"claude --resume {shlex.quote(uuid)}"
-            _comment_issue(
-                pending_issue,
-                f"Planning complete. To resume this session:\n\n```\n{resume_cmd}\n```",
-            )
-        _set_labels(pending_issue, add=[LABEL_PLANNED], remove=[LABEL_IN_PROGRESS])
-        print(f"Planning done for {_issue_url(pending_issue)} — set State/Planned.")
-        return 0
-
-    # ── 2b. Check for a PR opened by the agent ───────────────────────────────
+    # ── 2. Check for a PR opened by the agent ────────────────────────────────
    if pending_issue:
        branch = f"issue-{pending_issue}-fix"
        pr = _find_pr_for_branch(branch)
@@ -724,13 +586,6 @@ def _run_loop() -> int:
                )
                return 0
            if _find_pr_for_branch(branch):
-                merge_result = _handle_pr_still_open_after_merge(pr_number, branch, pending_issue)
-                if merge_result == "rebase-spawned":
-                    return 0
-                if merge_result == "merged":
-                    _close_issue(pending_issue)
-                    print(f"Merged PR #{pr_number} and closed {_issue_url(pending_issue)}.")
-                    return 0
                print(f"PR #{pr_number} is still open after merge attempt — setting to State/Question.")
                _set_labels(pending_issue, add=[LABEL_QUESTION], remove=[LABEL_IN_PROGRESS])
                _comment_issue(
@@ -787,9 +642,6 @@ def _run_loop() -> int:
            continue

        if pr_run and pr_run.get("status") == "success":
-            if issue_num and LABEL_QUESTION in _get_issue_labels(issue_num):
-                print(f"Catch-up: PR #{pr_number} — issue #{issue_num} is State/Question, skipping.")
-                continue
            print(f"Catch-up: CI passed on PR #{pr_number} ({pr_url}) — merging.")
            try:
                _merge_pr(pr_number)
@@ -799,16 +651,6 @@ def _run_loop() -> int:
            # Verify the merge actually happened; fgj can exit 0 without merging
            # (e.g. branch-protection rules not satisfied).
            if _find_pr_for_branch(branch):
-                merge_result = _handle_pr_still_open_after_merge(pr_number, branch, issue_num)
-                if merge_result == "rebase-spawned":
-                    return 0
-                if merge_result == "merged":
-                    if issue_num:
-                        _close_issue(issue_num)
-                        print(f"Catch-up: merged PR #{pr_number} and closed issue #{issue_num} after retry.")
-                    else:
-                        print(f"Catch-up: merged PR #{pr_number} after retry.")
-                    return 0
                print(
                    f"Catch-up: PR #{pr_number} is still open after merge attempt "
                    "— skipping to avoid infinite retry."
@@ -843,8 +685,9 @@ def _run_loop() -> int:
        # spawning another agent, check whether any CI run is currently in
        # progress (the branch run) and wait if so.
        if ci_run_id_at_start is not None and run["id"] == ci_run_id_at_start:
+            check = _tea_get(f"repos/{REPO}/actions/runs?limit=5")
            in_flight = [
-                r for r in _fgj_run_list(limit=5)
+                r for r in (check or {}).get("workflow_runs", [])
                if r.get("status") == "running"
            ]
            if in_flight:
@@ -895,44 +738,10 @@ def _run_loop() -> int:
        print(f"CI passed{ci_run_part} — closed {_issue_url(pending_issue)}.")
        return 0

-    # Find a ToPlan issue — planning takes priority over implementation.
-    to_plan = _to_plan_issues()
-    if to_plan:
-        issue = to_plan[0]
-        issue_number = issue["number"]
-        issue_title = issue["title"]
-        issue_body = issue.get("body", "")
-
-        print(f"Starting planning agent for {_issue_url(issue_number)} {issue_title}")
-        _set_labels(issue_number, add=[LABEL_IN_PROGRESS], remove=[LABEL_TO_PLAN])
-
-        plan_prompt = f"""Analyze Codeberg issue #{issue_number} in the guettli/sharedinbox repository and write a detailed implementation plan.
-
-Issue title: {issue_title}
-
-Issue body:
-{issue_body}
-
-Instructions:
- Read and understand the issue thoroughly.
- Explore the relevant parts of the codebase to understand the current structure.
- Write a detailed implementation plan as a comment on the issue using:
-      fgj issue comment {issue_number} --repo {REPO} --body "..."
-  The plan should cover: which files to change, what approach to take, and any risks or open questions.
- Do NOT write any code, do NOT create any branches or PRs, do NOT modify any files.
- If the issue is unclear or you need more information, set the label to State/Question
-  and stop (do NOT close the issue).
- When you have posted the plan as an issue comment, stop.
-"""
-        session_name = f"plan-issue-{issue_number}"
-        pid = _start_agent(plan_prompt, session_name)
-        _write_state(pid, issue_number, "plan", issue_title, session_name=session_name)
-        return 0
-
    # Find a Ready issue.
    issues = _ready_issues()
    if not issues:
-        print("No issues with State/ToPlan or State/Ready. Nothing to do.")
+        print("No issues with State/Ready. Nothing to do.")
        return 0

    issue = issues[0]
@@ -988,13 +797,10 @@ def main() -> int:
    parser = argparse.ArgumentParser(prog="agent_loop")
    sub = parser.add_subparsers(dest="cmd")
    sub.add_parser("list", help="List recent agent sessions")
-    sub.add_parser("monitor", help="Check that the loop ran within the last 2 hours")
    args = parser.parse_args()

    if args.cmd == "list":
        return cmd_list()
-    if args.cmd == "monitor":
-        return cmd_monitor()
    return _run_loop()


@@ -11,7 +11,6 @@ const _minCoveragePercent = 80;

 // Pure-abstract interfaces: no executable code, Dart VM never instruments them.
 const _noCode = {
-  'lib/core/db_schema_version.dart',
  'lib/core/repositories/account_repository.dart',
  'lib/core/repositories/draft_repository.dart',
  'lib/core/repositories/email_repository.dart',
@@ -58,7 +57,6 @@ const _excluded = {
  'lib/ui/widgets/try_connection_button.dart',
  'lib/ui/widgets/undo_shell.dart',
  'lib/ui/screens/about_screen.dart',
-  'lib/ui/utils/about_markdown.dart',
  'lib/ui/widgets/email_tile.dart',
  'lib/core/sync/account_sync_manager.dart',
  'lib/core/sync/background_sync.dart',
@@ -6,7 +6,6 @@ import json
 import os
 import tempfile
 import unittest
-from datetime import datetime, timedelta, timezone
 from pathlib import Path
 from unittest.mock import MagicMock, patch

@@ -745,194 +744,5 @@ class TestRunLoopResumeCommand(unittest.TestCase):
        self.assertNotIn("Resume:", output)


-
-class TestCatchupSkipsQuestionIssues(unittest.TestCase):
-    """Catch-up must not retry merging a PR whose issue is already State/Question."""
-
-    def _make_pr(self, pr_number=50, branch="issue-10-fix"):
-        return {"number": pr_number, "head": {"ref": branch}}
-
-    def test_skips_merge_when_issue_has_question_label(self):
-        pr = self._make_pr()
-        ci_run = {"id": 999, "status": "success"}
-        with patch("agent_loop._read_state", return_value=None), \
-             patch("agent_loop._open_issue_prs", return_value=[pr]), \
-             patch("agent_loop._latest_ci_run_for_pr", return_value=ci_run), \
-             patch("agent_loop._get_issue_labels", return_value=[agent_loop.LABEL_QUESTION]), \
-             patch("agent_loop._merge_pr") as mock_merge, \
-             patch("agent_loop._comment_issue") as mock_comment, \
-             patch("agent_loop._set_labels") as mock_labels, \
-             patch("agent_loop._latest_main_ci_run", return_value=None), \
-             patch("agent_loop._ready_issues", return_value=[]):
-            result = agent_loop._run_loop()
-        self.assertEqual(result, 0)
-        mock_merge.assert_not_called()
-        mock_comment.assert_not_called()
-        mock_labels.assert_not_called()
-
-    def test_proceeds_with_merge_when_issue_lacks_question_label(self):
-        pr = self._make_pr()
-        ci_run = {"id": 999, "status": "success"}
-        with patch("agent_loop._read_state", return_value=None), \
-             patch("agent_loop._open_issue_prs", return_value=[pr]), \
-             patch("agent_loop._latest_ci_run_for_pr", return_value=ci_run), \
-             patch("agent_loop._get_issue_labels", return_value=[agent_loop.LABEL_IN_PROGRESS]), \
-             patch("agent_loop._merge_pr") as mock_merge, \
-             patch("agent_loop._find_pr_for_branch", return_value=None), \
-             patch("agent_loop._close_issue"):
-            result = agent_loop._run_loop()
-        self.assertEqual(result, 0)
-        mock_merge.assert_called_once_with(50)
-
-
-class TestMergeFailsOpen(unittest.TestCase):
-    """Tests for auto-resolution when a PR is still open after the merge command."""
-
-    def _dead_state(self, issue: int, kind: str = "issue") -> dict:
-        return {
-            "pid": 999999999,
-            "issue": issue,
-            "started_at": "2026-01-01T00:00:00+00:00",
-            "type": kind,
-        }
-
-    def _open_pr(self, branch: str = "issue-10-fix") -> dict:
-        return {"number": 5, "head": {"ref": branch}, "created_at": "2026-01-01T00:00:00+00:00"}
-
-    def test_merge_fails_open_with_conflicts_spawns_rebase_agent(self):
-        """mergeable=false → rebase agent spawned, state written as pending-ci."""
-        written_state = {}
-
-        def fake_write_state(pid, issue, kind, issue_title=None, session_name=None, ci_run_id=None):
-            written_state["pid"] = pid
-            written_state["issue"] = issue
-            written_state["kind"] = kind
-            written_state["session_name"] = session_name
-
-        with patch("agent_loop._read_state", return_value=self._dead_state(10)), \
-             patch("agent_loop._find_pr_for_branch", side_effect=[self._open_pr(), self._open_pr()]), \
-             patch("agent_loop._latest_ci_run_for_branch", return_value={"id": 1, "status": "success"}), \
-             patch("agent_loop._merge_pr"), \
-             patch("agent_loop._tea_get", return_value={"mergeable": False}), \
-             patch("agent_loop._start_agent", return_value=77) as mock_start, \
-             patch("agent_loop._write_state", side_effect=fake_write_state), \
-             patch("agent_loop._clear_state"):
-            result = agent_loop._run_loop()
-
-        self.assertEqual(result, 0)
-        mock_start.assert_called_once()
-        prompt = mock_start.call_args[0][0]
-        self.assertIn("Rebase branch", prompt)
-        self.assertIn("issue-10-fix", prompt)
-        self.assertEqual(written_state.get("kind"), "pending-ci")
-        self.assertEqual(written_state.get("issue"), 10)
-
-    def test_merge_fails_open_no_conflicts_retries_and_succeeds(self):
-        """mergeable=true, second attempt succeeds → issue closed."""
-        with patch("agent_loop._read_state", return_value=self._dead_state(10)), \
-             patch("agent_loop._find_pr_for_branch",
-                   side_effect=[self._open_pr(), self._open_pr(), None]), \
-             patch("agent_loop._latest_ci_run_for_branch", return_value={"id": 1, "status": "success"}), \
-             patch("agent_loop._merge_pr"), \
-             patch("agent_loop._tea_get", return_value={"mergeable": True}), \
-             patch("agent_loop.time.sleep"), \
-             patch("agent_loop._close_issue") as mock_close, \
-             patch("agent_loop._clear_state"):
-            result = agent_loop._run_loop()
-
-        self.assertEqual(result, 0)
-        mock_close.assert_called_once_with(10)
-
-    def test_merge_fails_open_no_conflicts_all_retries_exhausted(self):
-        """All retries exhausted with PR still open → falls through to State/Question."""
-        with patch("agent_loop._read_state", return_value=self._dead_state(10)), \
-             patch("agent_loop._find_pr_for_branch",
-                   side_effect=[self._open_pr(), self._open_pr(),
-                                 self._open_pr(), self._open_pr()]), \
-             patch("agent_loop._latest_ci_run_for_branch", return_value={"id": 1, "status": "success"}), \
-             patch("agent_loop._merge_pr"), \
-             patch("agent_loop._tea_get", return_value={"mergeable": True}), \
-             patch("agent_loop.time.sleep"), \
-             patch("agent_loop._set_labels") as mock_labels, \
-             patch("agent_loop._comment_issue") as mock_comment, \
-             patch("agent_loop._close_issue") as mock_close, \
-             patch("agent_loop._clear_state"):
-            result = agent_loop._run_loop()
-
-        self.assertEqual(result, 0)
-        mock_close.assert_not_called()
-        mock_labels.assert_called_once_with(
-            10,
-            add=[agent_loop.LABEL_QUESTION],
-            remove=[agent_loop.LABEL_IN_PROGRESS],
-        )
-        mock_comment.assert_called_once()
-
-
-class TestHeartbeat(unittest.TestCase):
-    """Tests for _update_heartbeat() and cmd_monitor()."""
-
-    def setUp(self):
-        self._tmp = tempfile.NamedTemporaryFile(delete=False, suffix=".heartbeat")
-        self._tmp.close()
-        self._orig = agent_loop.HEARTBEAT_FILE
-        agent_loop.HEARTBEAT_FILE = Path(self._tmp.name)
-        Path(self._tmp.name).unlink()  # Start with no heartbeat file.
-
-    def tearDown(self):
-        agent_loop.HEARTBEAT_FILE = self._orig
-        Path(self._tmp.name).unlink(missing_ok=True)
-
-    def test_update_heartbeat_writes_timestamp(self):
-        agent_loop._update_heartbeat()
-        content = Path(self._tmp.name).read_text().strip()
-        dt = datetime.fromisoformat(content)
-        age = (datetime.now(timezone.utc) - dt).total_seconds()
-        self.assertLess(age, 5)
-
-    def test_update_heartbeat_creates_file(self):
-        self.assertFalse(Path(self._tmp.name).exists())
-        agent_loop._update_heartbeat()
-        self.assertTrue(Path(self._tmp.name).exists())
-
-    def test_monitor_healthy_when_recent(self):
-        agent_loop._update_heartbeat()
-        result = agent_loop.cmd_monitor()
-        self.assertEqual(result, 0)
-
-    def test_monitor_warns_when_heartbeat_missing(self):
-        buf = io.StringIO()
-        with contextlib.redirect_stdout(buf):
-            result = agent_loop.cmd_monitor()
-        self.assertEqual(result, 1)
-        self.assertIn("WARNING", buf.getvalue())
-
-    def test_monitor_warns_when_stale(self):
-        stale = (datetime.now(timezone.utc) - timedelta(hours=3)).isoformat()
-        Path(self._tmp.name).write_text(stale)
-        buf = io.StringIO()
-        with contextlib.redirect_stdout(buf):
-            result = agent_loop.cmd_monitor()
-        self.assertEqual(result, 1)
-        self.assertIn("WARNING", buf.getvalue())
-
-    def test_monitor_warns_when_corrupted(self):
-        Path(self._tmp.name).write_text("not-a-timestamp")
-        buf = io.StringIO()
-        with contextlib.redirect_stdout(buf):
-            result = agent_loop.cmd_monitor()
-        self.assertEqual(result, 1)
-        self.assertIn("WARNING", buf.getvalue())
-
-    def test_run_loop_updates_heartbeat(self):
-        self.assertFalse(Path(self._tmp.name).exists())
-        with patch("agent_loop._read_state", return_value=None), \
-             patch("agent_loop._open_issue_prs", return_value=[]), \
-             patch("agent_loop._latest_main_ci_run", return_value=None), \
-             patch("agent_loop._ready_issues", return_value=[]):
-            agent_loop._run_loop()
-        self.assertTrue(Path(self._tmp.name).exists())
-
-
 if __name__ == "__main__":
    unittest.main()
@@ -149,22 +149,6 @@ class _FakeMailboxes implements MailboxRepository {

  @override
  Future<void> clearForResync(String accountId) async {}
-
-  @override
-  Future<Mailbox> createMailboxWithRole(
-    String accountId,
-    String name,
-    String role,
-  ) async =>
-      Mailbox(
-        id: '$accountId:$name',
-        accountId: accountId,
-        path: name,
-        name: name,
-        role: role,
-        unreadCount: 0,
-        totalCount: 0,
-      );
 }

 class _FakeEmails implements EmailRepository {
@@ -304,8 +288,6 @@ class _FakeLogs implements SyncLogRepository {
    required String accountId,
    required bool success,
    String? errorMessage,
-    String? stackTrace,
-    bool isPermanent = false,
    required String protocol,
    required int emailsFetched,
    required int emailsSkipped,
@@ -181,8 +181,6 @@ class FakeSyncLogRepository implements SyncLogRepository {
    required String accountId,
    required bool success,
    String? errorMessage,
-    String? stackTrace,
-    bool isPermanent = false,
    required String protocol,
    required int emailsFetched,
    required int emailsSkipped,
@@ -224,21 +222,6 @@ class FakeMailboxRepositoryWithInbox implements MailboxRepository {
  Future<Mailbox?> findMailboxByRole(String id, String role) async => null;
  @override
  Future<void> clearForResync(String accountId) async {}
-  @override
-  Future<Mailbox> createMailboxWithRole(
-    String accountId,
-    String name,
-    String role,
-  ) async =>
-      Mailbox(
-        id: '$accountId:$name',
-        accountId: accountId,
-        path: name,
-        name: name,
-        role: role,
-        unreadCount: 0,
-        totalCount: 0,
-      );
 }

 class _AccountRepositoryWithMissingPlugin implements AccountRepository {
@@ -3,16 +3,16 @@
 // Do not manually edit this file.

 // ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i5;
+import 'dart:async' as _i4;

 import 'package:mockito/mockito.dart' as _i1;
-import 'package:mockito/src/dummies.dart' as _i7;
-import 'package:sharedinbox/core/models/account.dart' as _i6;
-import 'package:sharedinbox/core/models/email.dart' as _i3;
-import 'package:sharedinbox/core/models/mailbox.dart' as _i2;
-import 'package:sharedinbox/core/repositories/account_repository.dart' as _i4;
+import 'package:mockito/src/dummies.dart' as _i6;
+import 'package:sharedinbox/core/models/account.dart' as _i5;
+import 'package:sharedinbox/core/models/email.dart' as _i2;
+import 'package:sharedinbox/core/models/mailbox.dart' as _i8;
+import 'package:sharedinbox/core/repositories/account_repository.dart' as _i3;
 import 'package:sharedinbox/core/repositories/email_repository.dart' as _i9;
-import 'package:sharedinbox/core/repositories/mailbox_repository.dart' as _i8;
+import 'package:sharedinbox/core/repositories/mailbox_repository.dart' as _i7;

 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -29,8 +29,8 @@ import 'package:sharedinbox/core/repositories/mailbox_repository.dart' as _i8;
 // ignore_for_file: subtype_of_sealed_class
 // ignore_for_file: invalid_use_of_internal_member

-class _FakeMailbox_0 extends _i1.SmartFake implements _i2.Mailbox {
-  _FakeMailbox_0(
+class _FakeEmailBody_0 extends _i1.SmartFake implements _i2.EmailBody {
+  _FakeEmailBody_0(
    Object parent,
    Invocation parentInvocation,
  ) : super(
@@ -39,8 +39,9 @@ class _FakeMailbox_0 extends _i1.SmartFake implements _i2.Mailbox {
        );
 }

-class _FakeEmailBody_1 extends _i1.SmartFake implements _i3.EmailBody {
-  _FakeEmailBody_1(
+class _FakeSyncEmailsResult_1 extends _i1.SmartFake
+    implements _i2.SyncEmailsResult {
+  _FakeSyncEmailsResult_1(
    Object parent,
    Invocation parentInvocation,
  ) : super(
@@ -49,20 +50,9 @@ class _FakeEmailBody_1 extends _i1.SmartFake implements _i3.EmailBody {
        );
 }

-class _FakeSyncEmailsResult_2 extends _i1.SmartFake
-    implements _i3.SyncEmailsResult {
-  _FakeSyncEmailsResult_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeReliabilityResult_3 extends _i1.SmartFake
-    implements _i3.ReliabilityResult {
-  _FakeReliabilityResult_3(
+class _FakeReliabilityResult_2 extends _i1.SmartFake
+    implements _i2.ReliabilityResult {
+  _FakeReliabilityResult_2(
    Object parent,
    Invocation parentInvocation,
  ) : super(
@@ -74,32 +64,32 @@ class _FakeReliabilityResult_3 extends _i1.SmartFake
 /// A class which mocks [AccountRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockAccountRepository extends _i1.Mock implements _i4.AccountRepository {
+class MockAccountRepository extends _i1.Mock implements _i3.AccountRepository {
  MockAccountRepository() {
    _i1.throwOnMissingStub(this);
  }

  @override
-  _i5.Stream<List<_i6.Account>> observeAccounts() => (super.noSuchMethod(
+  _i4.Stream<List<_i5.Account>> observeAccounts() => (super.noSuchMethod(
        Invocation.method(
          #observeAccounts,
          [],
        ),
-        returnValue: _i5.Stream<List<_i6.Account>>.empty(),
-      ) as _i5.Stream<List<_i6.Account>>);
+        returnValue: _i4.Stream<List<_i5.Account>>.empty(),
+      ) as _i4.Stream<List<_i5.Account>>);

  @override
-  _i5.Future<_i6.Account?> getAccount(String? id) => (super.noSuchMethod(
+  _i4.Future<_i5.Account?> getAccount(String? id) => (super.noSuchMethod(
        Invocation.method(
          #getAccount,
          [id],
        ),
-        returnValue: _i5.Future<_i6.Account?>.value(),
-      ) as _i5.Future<_i6.Account?>);
+        returnValue: _i4.Future<_i5.Account?>.value(),
+      ) as _i4.Future<_i5.Account?>);

  @override
-  _i5.Future<void> addAccount(
-    _i6.Account? account,
+  _i4.Future<void> addAccount(
+    _i5.Account? account,
    String? password,
  ) =>
      (super.noSuchMethod(
@@ -110,13 +100,13 @@ class MockAccountRepository extends _i1.Mock implements _i4.AccountRepository {
            password,
          ],
        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);

  @override
-  _i5.Future<void> updateAccount(
-    _i6.Account? account, {
+  _i4.Future<void> updateAccount(
+    _i5.Account? account, {
    String? password,
  }) =>
      (super.noSuchMethod(
@@ -125,65 +115,65 @@ class MockAccountRepository extends _i1.Mock implements _i4.AccountRepository {
          [account],
          {#password: password},
        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);

  @override
-  _i5.Future<void> removeAccount(String? id) => (super.noSuchMethod(
+  _i4.Future<void> removeAccount(String? id) => (super.noSuchMethod(
        Invocation.method(
          #removeAccount,
          [id],
        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);

  @override
-  _i5.Future<String> getPassword(String? accountId) => (super.noSuchMethod(
+  _i4.Future<String> getPassword(String? accountId) => (super.noSuchMethod(
        Invocation.method(
          #getPassword,
          [accountId],
        ),
-        returnValue: _i5.Future<String>.value(_i7.dummyValue<String>(
+        returnValue: _i4.Future<String>.value(_i6.dummyValue<String>(
          this,
          Invocation.method(
            #getPassword,
            [accountId],
          ),
        )),
-      ) as _i5.Future<String>);
+      ) as _i4.Future<String>);
 }

 /// A class which mocks [MailboxRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockMailboxRepository extends _i1.Mock implements _i8.MailboxRepository {
+class MockMailboxRepository extends _i1.Mock implements _i7.MailboxRepository {
  MockMailboxRepository() {
    _i1.throwOnMissingStub(this);
  }

  @override
-  _i5.Stream<List<_i2.Mailbox>> observeMailboxes(String? accountId) =>
+  _i4.Stream<List<_i8.Mailbox>> observeMailboxes(String? accountId) =>
      (super.noSuchMethod(
        Invocation.method(
          #observeMailboxes,
          [accountId],
        ),
-        returnValue: _i5.Stream<List<_i2.Mailbox>>.empty(),
-      ) as _i5.Stream<List<_i2.Mailbox>>);
+        returnValue: _i4.Stream<List<_i8.Mailbox>>.empty(),
+      ) as _i4.Stream<List<_i8.Mailbox>>);

  @override
-  _i5.Future<int> syncMailboxes(String? accountId) => (super.noSuchMethod(
+  _i4.Future<int> syncMailboxes(String? accountId) => (super.noSuchMethod(
        Invocation.method(
          #syncMailboxes,
          [accountId],
        ),
-        returnValue: _i5.Future<int>.value(0),
-      ) as _i5.Future<int>);
+        returnValue: _i4.Future<int>.value(0),
+      ) as _i4.Future<int>);

  @override
-  _i5.Future<_i2.Mailbox?> findMailboxByRole(
+  _i4.Future<_i8.Mailbox?> findMailboxByRole(
    String? accountId,
    String? role,
  ) =>
@@ -195,46 +185,18 @@ class MockMailboxRepository extends _i1.Mock implements _i8.MailboxRepository {
            role,
          ],
        ),
-        returnValue: _i5.Future<_i2.Mailbox?>.value(),
-      ) as _i5.Future<_i2.Mailbox?>);
+        returnValue: _i4.Future<_i8.Mailbox?>.value(),
+      ) as _i4.Future<_i8.Mailbox?>);

  @override
-  _i5.Future<void> clearForResync(String? accountId) => (super.noSuchMethod(
+  _i4.Future<void> clearForResync(String? accountId) => (super.noSuchMethod(
        Invocation.method(
          #clearForResync,
          [accountId],
        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-
-  @override
-  _i5.Future<_i2.Mailbox> createMailboxWithRole(
-    String? accountId,
-    String? name,
-    String? role,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #createMailboxWithRole,
-          [
-            accountId,
-            name,
-            role,
-          ],
-        ),
-        returnValue: _i5.Future<_i2.Mailbox>.value(_FakeMailbox_0(
-          this,
-          Invocation.method(
-            #createMailboxWithRole,
-            [
-              accountId,
-              name,
-              role,
-            ],
-          ),
-        )),
-      ) as _i5.Future<_i2.Mailbox>);
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
 }

 /// A class which mocks [EmailRepository].
@@ -246,13 +208,13 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
  }

  @override
-  _i5.Stream<String> get onChangesQueued => (super.noSuchMethod(
+  _i4.Stream<String> get onChangesQueued => (super.noSuchMethod(
        Invocation.getter(#onChangesQueued),
-        returnValue: _i5.Stream<String>.empty(),
-      ) as _i5.Stream<String>);
+        returnValue: _i4.Stream<String>.empty(),
+      ) as _i4.Stream<String>);

  @override
-  _i5.Stream<List<_i3.Email>> observeEmails(
+  _i4.Stream<List<_i2.Email>> observeEmails(
    String? accountId,
    String? mailboxPath, {
    int? limit = 50,
@@ -266,11 +228,11 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
          ],
          {#limit: limit},
        ),
-        returnValue: _i5.Stream<List<_i3.Email>>.empty(),
-      ) as _i5.Stream<List<_i3.Email>>);
+        returnValue: _i4.Stream<List<_i2.Email>>.empty(),
+      ) as _i4.Stream<List<_i2.Email>>);

  @override
-  _i5.Stream<List<_i3.EmailThread>> observeThreads(
+  _i4.Stream<List<_i2.EmailThread>> observeThreads(
    String? accountId,
    String? mailboxPath, {
    int? limit = 50,
@@ -284,11 +246,11 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
          ],
          {#limit: limit},
        ),
-        returnValue: _i5.Stream<List<_i3.EmailThread>>.empty(),
-      ) as _i5.Stream<List<_i3.EmailThread>>);
+        returnValue: _i4.Stream<List<_i2.EmailThread>>.empty(),
+      ) as _i4.Stream<List<_i2.EmailThread>>);

  @override
-  _i5.Stream<List<_i3.Email>> observeEmailsInThread(
+  _i4.Stream<List<_i2.Email>> observeEmailsInThread(
    String? accountId,
    String? mailboxPath,
    String? threadId,
@@ -302,36 +264,36 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
            threadId,
          ],
        ),
-        returnValue: _i5.Stream<List<_i3.Email>>.empty(),
-      ) as _i5.Stream<List<_i3.Email>>);
+        returnValue: _i4.Stream<List<_i2.Email>>.empty(),
+      ) as _i4.Stream<List<_i2.Email>>);

  @override
-  _i5.Future<_i3.Email?> getEmail(String? emailId) => (super.noSuchMethod(
+  _i4.Future<_i2.Email?> getEmail(String? emailId) => (super.noSuchMethod(
        Invocation.method(
          #getEmail,
          [emailId],
        ),
-        returnValue: _i5.Future<_i3.Email?>.value(),
-      ) as _i5.Future<_i3.Email?>);
+        returnValue: _i4.Future<_i2.Email?>.value(),
+      ) as _i4.Future<_i2.Email?>);

  @override
-  _i5.Future<_i3.EmailBody> getEmailBody(String? emailId) =>
+  _i4.Future<_i2.EmailBody> getEmailBody(String? emailId) =>
      (super.noSuchMethod(
        Invocation.method(
          #getEmailBody,
          [emailId],
        ),
-        returnValue: _i5.Future<_i3.EmailBody>.value(_FakeEmailBody_1(
+        returnValue: _i4.Future<_i2.EmailBody>.value(_FakeEmailBody_0(
          this,
          Invocation.method(
            #getEmailBody,
            [emailId],
          ),
        )),
-      ) as _i5.Future<_i3.EmailBody>);
+      ) as _i4.Future<_i2.EmailBody>);

  @override
-  _i5.Future<_i3.SyncEmailsResult> syncEmails(
+  _i4.Future<_i2.SyncEmailsResult> syncEmails(
    String? accountId,
    String? mailboxPath,
  ) =>
@@ -344,7 +306,7 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
          ],
        ),
        returnValue:
-            _i5.Future<_i3.SyncEmailsResult>.value(_FakeSyncEmailsResult_2(
+            _i4.Future<_i2.SyncEmailsResult>.value(_FakeSyncEmailsResult_1(
          this,
          Invocation.method(
            #syncEmails,
@@ -354,10 +316,10 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
            ],
          ),
        )),
-      ) as _i5.Future<_i3.SyncEmailsResult>);
+      ) as _i4.Future<_i2.SyncEmailsResult>);

  @override
-  _i5.Future<void> setFlag(
+  _i4.Future<void> setFlag(
    String? emailId, {
    bool? seen,
    bool? flagged,
@@ -371,12 +333,12 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
            #flagged: flagged,
          },
        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);

  @override
-  _i5.Future<void> markAllAsRead(
+  _i4.Future<void> markAllAsRead(
    String? accountId,
    String? mailboxPath,
  ) =>
@@ -388,12 +350,12 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
            mailboxPath,
          ],
        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);

  @override
-  _i5.Future<void> moveEmail(
+  _i4.Future<void> moveEmail(
    String? emailId,
    String? destMailboxPath,
  ) =>
@@ -405,23 +367,23 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
            destMailboxPath,
          ],
        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);

  @override
-  _i5.Future<String?> deleteEmail(String? emailId) => (super.noSuchMethod(
+  _i4.Future<String?> deleteEmail(String? emailId) => (super.noSuchMethod(
        Invocation.method(
          #deleteEmail,
          [emailId],
        ),
-        returnValue: _i5.Future<String?>.value(),
-      ) as _i5.Future<String?>);
+        returnValue: _i4.Future<String?>.value(),
+      ) as _i4.Future<String?>);

  @override
-  _i5.Future<void> sendEmail(
+  _i4.Future<void> sendEmail(
    String? accountId,
-    _i3.EmailDraft? draft,
+    _i2.EmailDraft? draft,
  ) =>
      (super.noSuchMethod(
        Invocation.method(
@@ -431,14 +393,14 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
            draft,
          ],
        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);

  @override
-  _i5.Future<String> downloadAttachment(
+  _i4.Future<String> downloadAttachment(
    String? emailId,
-    _i3.EmailAttachment? attachment,
+    _i2.EmailAttachment? attachment,
  ) =>
      (super.noSuchMethod(
        Invocation.method(
@@ -448,7 +410,7 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
            attachment,
          ],
        ),
-        returnValue: _i5.Future<String>.value(_i7.dummyValue<String>(
+        returnValue: _i4.Future<String>.value(_i6.dummyValue<String>(
          this,
          Invocation.method(
            #downloadAttachment,
@@ -458,25 +420,25 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
            ],
          ),
        )),
-      ) as _i5.Future<String>);
+      ) as _i4.Future<String>);

  @override
-  _i5.Future<String> fetchRawRfc822(String? emailId) => (super.noSuchMethod(
+  _i4.Future<String> fetchRawRfc822(String? emailId) => (super.noSuchMethod(
        Invocation.method(
          #fetchRawRfc822,
          [emailId],
        ),
-        returnValue: _i5.Future<String>.value(_i7.dummyValue<String>(
+        returnValue: _i4.Future<String>.value(_i6.dummyValue<String>(
          this,
          Invocation.method(
            #fetchRawRfc822,
            [emailId],
          ),
        )),
-      ) as _i5.Future<String>);
+      ) as _i4.Future<String>);

  @override
-  _i5.Future<List<_i3.Email>> searchEmails(
+  _i4.Future<List<_i2.Email>> searchEmails(
    String? accountId,
    String? mailboxPath,
    String? query,
@@ -490,11 +452,11 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
            query,
          ],
        ),
-        returnValue: _i5.Future<List<_i3.Email>>.value(<_i3.Email>[]),
-      ) as _i5.Future<List<_i3.Email>>);
+        returnValue: _i4.Future<List<_i2.Email>>.value(<_i2.Email>[]),
+      ) as _i4.Future<List<_i2.Email>>);

  @override
-  _i5.Future<List<_i3.Email>> searchEmailsGlobal(
+  _i4.Future<List<_i2.Email>> searchEmailsGlobal(
    String? accountId,
    String? query,
  ) =>
@@ -506,11 +468,11 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
            query,
          ],
        ),
-        returnValue: _i5.Future<List<_i3.Email>>.value(<_i3.Email>[]),
-      ) as _i5.Future<List<_i3.Email>>);
+        returnValue: _i4.Future<List<_i2.Email>>.value(<_i2.Email>[]),
+      ) as _i4.Future<List<_i2.Email>>);

  @override
-  _i5.Future<List<_i3.Email>> getEmailsByAddress(
+  _i4.Future<List<_i2.Email>> getEmailsByAddress(
    String? accountId,
    String? address,
  ) =>
@@ -522,11 +484,11 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
            address,
          ],
        ),
-        returnValue: _i5.Future<List<_i3.Email>>.value(<_i3.Email>[]),
-      ) as _i5.Future<List<_i3.Email>>);
+        returnValue: _i4.Future<List<_i2.Email>>.value(<_i2.Email>[]),
+      ) as _i4.Future<List<_i2.Email>>);

  @override
-  _i5.Future<List<_i3.EmailAddress>> searchAddresses(
+  _i4.Future<List<_i2.EmailAddress>> searchAddresses(
    String? accountId,
    String? query, {
    int? limit = 10,
@@ -541,11 +503,11 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
          {#limit: limit},
        ),
        returnValue:
-            _i5.Future<List<_i3.EmailAddress>>.value(<_i3.EmailAddress>[]),
-      ) as _i5.Future<List<_i3.EmailAddress>>);
+            _i4.Future<List<_i2.EmailAddress>>.value(<_i2.EmailAddress>[]),
+      ) as _i4.Future<List<_i2.EmailAddress>>);

  @override
-  _i5.Future<int> flushPendingChanges(
+  _i4.Future<int> flushPendingChanges(
    String? accountId,
    String? password,
  ) =>
@@ -557,42 +519,42 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
            password,
          ],
        ),
-        returnValue: _i5.Future<int>.value(0),
-      ) as _i5.Future<int>);
+        returnValue: _i4.Future<int>.value(0),
+      ) as _i4.Future<int>);

  @override
-  _i5.Stream<List<_i3.FailedMutation>> observeFailedMutations(
+  _i4.Stream<List<_i2.FailedMutation>> observeFailedMutations(
          String? accountId) =>
      (super.noSuchMethod(
        Invocation.method(
          #observeFailedMutations,
          [accountId],
        ),
-        returnValue: _i5.Stream<List<_i3.FailedMutation>>.empty(),
-      ) as _i5.Stream<List<_i3.FailedMutation>>);
+        returnValue: _i4.Stream<List<_i2.FailedMutation>>.empty(),
+      ) as _i4.Stream<List<_i2.FailedMutation>>);

  @override
-  _i5.Future<void> discardMutation(int? id) => (super.noSuchMethod(
+  _i4.Future<void> discardMutation(int? id) => (super.noSuchMethod(
        Invocation.method(
          #discardMutation,
          [id],
        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);

  @override
-  _i5.Future<void> retryMutation(int? id) => (super.noSuchMethod(
+  _i4.Future<void> retryMutation(int? id) => (super.noSuchMethod(
        Invocation.method(
          #retryMutation,
          [id],
        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);

  @override
-  _i5.Future<bool> cancelPendingChange(
+  _i4.Future<bool> cancelPendingChange(
    String? emailId,
    String? changeType,
  ) =>
@@ -604,11 +566,11 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
            changeType,
          ],
        ),
-        returnValue: _i5.Future<bool>.value(false),
-      ) as _i5.Future<bool>);
+        returnValue: _i4.Future<bool>.value(false),
+      ) as _i4.Future<bool>);

  @override
-  _i5.Future<void> snoozeEmail(
+  _i4.Future<void> snoozeEmail(
    String? emailId,
    DateTime? until,
  ) =>
@@ -620,32 +582,32 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
            until,
          ],
        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);

  @override
-  _i5.Future<int> wakeUpEmails(String? accountId) => (super.noSuchMethod(
+  _i4.Future<int> wakeUpEmails(String? accountId) => (super.noSuchMethod(
        Invocation.method(
          #wakeUpEmails,
          [accountId],
        ),
-        returnValue: _i5.Future<int>.value(0),
-      ) as _i5.Future<int>);
+        returnValue: _i4.Future<int>.value(0),
+      ) as _i4.Future<int>);

  @override
-  _i5.Future<void> restoreEmails(List<_i3.Email>? emails) =>
+  _i4.Future<void> restoreEmails(List<_i2.Email>? emails) =>
      (super.noSuchMethod(
        Invocation.method(
          #restoreEmails,
          [emails],
        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);

  @override
-  _i5.Future<_i3.Email?> findEmailByMessageId(
+  _i4.Future<_i2.Email?> findEmailByMessageId(
    String? accountId,
    String? messageId,
  ) =>
@@ -657,20 +619,20 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
            messageId,
          ],
        ),
-        returnValue: _i5.Future<_i3.Email?>.value(),
-      ) as _i5.Future<_i3.Email?>);
+        returnValue: _i4.Future<_i2.Email?>.value(),
+      ) as _i4.Future<_i2.Email?>);

  @override
-  _i5.Future<int> applySieveRules(String? accountId) => (super.noSuchMethod(
+  _i4.Future<int> applySieveRules(String? accountId) => (super.noSuchMethod(
        Invocation.method(
          #applySieveRules,
          [accountId],
        ),
-        returnValue: _i5.Future<int>.value(0),
-      ) as _i5.Future<int>);
+        returnValue: _i4.Future<int>.value(0),
+      ) as _i4.Future<int>);

  @override
-  _i5.Stream<void> watchJmapPush(
+  _i4.Stream<void> watchJmapPush(
    String? accountId,
    String? password,
  ) =>
@@ -682,11 +644,11 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
            password,
          ],
        ),
-        returnValue: _i5.Stream<void>.empty(),
-      ) as _i5.Stream<void>);
+        returnValue: _i4.Stream<void>.empty(),
+      ) as _i4.Stream<void>);

  @override
-  _i5.Future<_i3.ReliabilityResult> verifySyncReliability(
+  _i4.Future<_i2.ReliabilityResult> verifySyncReliability(
    String? accountId,
    String? mailboxPath,
  ) =>
@@ -699,7 +661,7 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
          ],
        ),
        returnValue:
-            _i5.Future<_i3.ReliabilityResult>.value(_FakeReliabilityResult_3(
+            _i4.Future<_i2.ReliabilityResult>.value(_FakeReliabilityResult_2(
          this,
          Invocation.method(
            #verifySyncReliability,
@@ -709,15 +671,15 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
            ],
          ),
        )),
-      ) as _i5.Future<_i3.ReliabilityResult>);
+      ) as _i4.Future<_i2.ReliabilityResult>);

  @override
-  _i5.Future<void> clearForResync(String? accountId) => (super.noSuchMethod(
+  _i4.Future<void> clearForResync(String? accountId) => (super.noSuchMethod(
        Invocation.method(
          #clearForResync,
          [accountId],
        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
 }
@@ -14,7 +14,6 @@ import 'package:sharedinbox/data/repositories/mailbox_repository_impl.dart';

 import 'account_repository_impl_test.dart' show MapSecureStorage;
 import 'db_test_helper.dart';
-import 'fake_imap.dart' show SnoozeSpyImapClient;
 // ── Helpers ───────────────────────────────────────────────────────────────────

 const _account = Account(
@@ -433,177 +432,5 @@ void main() {
      expect(result, isNotNull);
      expect(result!.role, 'inbox');
    });
-
-    group('createMailboxWithRole', () {
-      test('IMAP: creates mailbox on server and persists with role', () async {
-        final spy = SnoozeSpyImapClient();
-        final db = openTestDatabase();
-        final accounts = AccountRepositoryImpl(db, MapSecureStorage());
-        final mailboxes = MailboxRepositoryImpl(
-          db,
-          accounts,
-          imapConnect: (_, __, ___) async => spy,
-        );
-        await accounts.addAccount(_account, 'pw');
-
-        final result = await mailboxes.createMailboxWithRole(
-          'acc-1',
-          'Archive',
-          'archive',
-        );
-
-        expect(spy.createdMailbox, 'Archive');
-        expect(result.name, 'Archive');
-        expect(result.role, 'archive');
-        expect(result.path, 'Archive');
-
-        final found = await mailboxes.findMailboxByRole('acc-1', 'archive');
-        expect(found, isNotNull);
-        expect(found!.name, 'Archive');
-      });
-
-      test('JMAP: creates mailbox on server and persists with role', () async {
-        final r = _makeRepos(
-          httpClient: _mockJmap(
-            apiResponses: [
-              {
-                'sessionState': 'sess1',
-                'methodResponses': [
-                  [
-                    'Mailbox/set',
-                    {
-                      'accountId': 'acct1',
-                      'created': {
-                        'new-mailbox': {'id': 'mbx-archive'},
-                      },
-                    },
-                    '0',
-                  ],
-                ],
-              },
-            ],
-          ),
-        );
-        await r.accounts.addAccount(_jmapAccount, 'pw');
-
-        final result = await r.mailboxes
-            .createMailboxWithRole('jmap-1', 'Archive', 'archive');
-
-        expect(result.name, 'Archive');
-        expect(result.role, 'archive');
-        expect(result.path, 'mbx-archive');
-
-        final found = await r.mailboxes.findMailboxByRole('jmap-1', 'archive');
-        expect(found, isNotNull);
-        expect(found!.name, 'Archive');
-      });
-
-      test(
-        'JMAP: throws when server returns no created ID',
-        () async {
-          final r = _makeRepos(
-            httpClient: _mockJmap(
-              apiResponses: [
-                {
-                  'sessionState': 'sess1',
-                  'methodResponses': [
-                    [
-                      'Mailbox/set',
-                      {
-                        'accountId': 'acct1',
-                        'created': null,
-                        'notCreated': {
-                          'new-mailbox': {'type': 'serverFail'},
-                        },
-                      },
-                      '0',
-                    ],
-                  ],
-                },
-              ],
-            ),
-          );
-          await r.accounts.addAccount(_jmapAccount, 'pw');
-
-          await expectLater(
-            r.mailboxes.createMailboxWithRole('jmap-1', 'Archive', 'archive'),
-            throwsA(isA<Exception>()),
-          );
-        },
-      );
-    });
-
-    group('syncMailboxes IMAP preserves manually-set role', () {
-      test('existing role is kept when server returns no special-use flag',
-          () async {
-        final spy = SnoozeSpyImapClient();
-        // Make listMailboxes return a plain folder without \Archive.
-        final db = openTestDatabase();
-        final accounts = AccountRepositoryImpl(db, MapSecureStorage());
-
-        // Override listMailboxes to return one plain folder.
-        final fakeClient = _PlainArchiveImapClient();
-        final mailboxes = MailboxRepositoryImpl(
-          db,
-          accounts,
-          imapConnect: (_, __, ___) async => fakeClient,
-        );
-        await accounts.addAccount(_account, 'pw');
-
-        // Pre-seed the DB with role='archive' (as if user created the folder).
-        await db.into(db.mailboxes).insert(
-              MailboxesCompanion.insert(
-                id: 'acc-1:Archive',
-                accountId: 'acc-1',
-                path: 'Archive',
-                name: 'Archive',
-                role: const Value('archive'),
-              ),
-            );
-
-        await mailboxes.syncMailboxes('acc-1');
-
-        final found = await mailboxes.findMailboxByRole('acc-1', 'archive');
-        expect(
-          found,
-          isNotNull,
-          reason: 'Manually-set role should be preserved after sync',
-        );
-        expect(found!.path, 'Archive');
-        // Suppress unused warning on spy.
-        expect(spy, isNotNull);
-      });
-    });
  });
 }
-
-/// Fake IMAP client that lists one mailbox named 'Archive' without any
-/// special-use flags, and logs out cleanly.
-class _PlainArchiveImapClient extends SnoozeSpyImapClient {
-  @override
-  Future<List<imap.Mailbox>> listMailboxes({
-    String path = '""',
-    bool recursive = false,
-    List<String>? mailboxPatterns,
-    List<String>? selectionOptions,
-    List<imap.ReturnOption>? returnOptions,
-  }) async =>
-      [
-        imap.Mailbox(
-          encodedName: 'Archive',
-          encodedPath: 'Archive',
-          pathSeparator: '/',
-          flags: [], // No \Archive special-use flag
-        ),
-      ];
-
-  @override
-  Future<imap.Mailbox> statusMailbox(
-    imap.Mailbox mailbox,
-    List<imap.StatusFlags> flags,
-  ) async =>
-      mailbox;
-
-  @override
-  Future<dynamic> logout() async {}
-}
@@ -14,7 +14,7 @@ void main() {
  group('Migration', () {
    test('schemaVersion matches expected value', () async {
      final db = AppDatabase(NativeDatabase.memory());
-      expect(db.schemaVersion, 33);
+      expect(db.schemaVersion, 32);
      await db.close();
    });

@@ -194,11 +194,6 @@ void main() {
      // v32: local_sieve_applied table.
      await db.customSelect('SELECT count(*) FROM local_sieve_applied').get();

-      // v33: error_stack_trace and is_permanent columns on sync_logs.
-      final syncLogColumns = await _tableColumns(db, 'sync_logs');
-      expect(syncLogColumns, contains('error_stack_trace'));
-      expect(syncLogColumns, contains('is_permanent'));
-
      await db.close();
      if (dbFile.existsSync()) dbFile.deleteSync();
    });
@@ -386,16 +381,11 @@ void main() {
          await _tableColumns(db, 'sync_log_mailboxes');
      expect(syncLogMailboxColumns, contains('duration_ms'));

-      // v33: error_stack_trace and is_permanent columns on sync_logs.
-      final syncLogColumns = await _tableColumns(db, 'sync_logs');
-      expect(syncLogColumns, contains('error_stack_trace'));
-      expect(syncLogColumns, contains('is_permanent'));
-
      await db.close();
      if (dbFile.existsSync()) dbFile.deleteSync();
    });

-    test('fresh install creates all tables at schemaVersion 33', () async {
+    test('fresh install creates all tables at schemaVersion 32', () async {
      final db = AppDatabase(NativeDatabase.memory());
      await db.select(db.accounts).get();

@@ -436,11 +426,6 @@ void main() {
          await _tableColumns(db, 'sync_log_mailboxes');
      expect(syncLogMailboxColumns, contains('duration_ms'));

-      // v33: error_stack_trace and is_permanent columns on sync_logs.
-      final syncLogColumns = await _tableColumns(db, 'sync_logs');
-      expect(syncLogColumns, contains('error_stack_trace'));
-      expect(syncLogColumns, contains('is_permanent'));
-
      await db.close();
    });
  });
@@ -62,21 +62,6 @@ class _FakeMailboxes implements MailboxRepository {
      null;
  @override
  Future<void> clearForResync(String accountId) async {}
-  @override
-  Future<Mailbox> createMailboxWithRole(
-    String accountId,
-    String name,
-    String role,
-  ) async =>
-      Mailbox(
-        id: '$accountId:$name',
-        accountId: accountId,
-        path: name,
-        name: name,
-        role: role,
-        unreadCount: 0,
-        totalCount: 0,
-      );
 }

 class _FakeEmails implements EmailRepository {
@@ -54,21 +54,6 @@ class _FakeMailboxes implements MailboxRepository {
      null;
  @override
  Future<void> clearForResync(String accountId) async {}
-  @override
-  Future<Mailbox> createMailboxWithRole(
-    String accountId,
-    String name,
-    String role,
-  ) async =>
-      Mailbox(
-        id: '$accountId:$name',
-        accountId: accountId,
-        path: name,
-        name: name,
-        role: role,
-        unreadCount: 0,
-        totalCount: 0,
-      );
 }

 class _CountingEmails implements EmailRepository {
@@ -185,8 +170,6 @@ class _FakeSyncLog implements SyncLogRepository {
    required String accountId,
    required bool success,
    String? errorMessage,
-    String? stackTrace,
-    bool isPermanent = false,
    required String protocol,
    required int emailsFetched,
    required int emailsSkipped,
@@ -126,34 +126,4 @@ void main() {
    expect(rows.first.result, 'error');
    expect(rows.first.errorMessage, 'Connection refused');
  });
-
-  test('stores and retrieves stackTrace and isPermanent on error entries',
-      () async {
-    final repo = SyncLogRepositoryImpl(db);
-    final start = DateTime(2024, 3, 1, 9);
-    final end = DateTime(2024, 3, 1, 9, 0, 1);
-    const fakeTrace = '#0 main (file:///app/lib/main.dart:10:5)';
-
-    await repo.log(
-      accountId: 'acc1',
-      success: false,
-      errorMessage: 'MissingPluginException',
-      stackTrace: fakeTrace,
-      isPermanent: true,
-      protocol: 'imap',
-      emailsFetched: 0,
-      emailsSkipped: 0,
-      mailboxesSynced: 0,
-      pendingFlushed: 0,
-      bytesTransferred: 0,
-      startedAt: start,
-      finishedAt: end,
-    );
-
-    final entries = await repo.observeSyncLogs('acc1').first;
-    final entry = entries.firstWhere((e) => e.startedAt == start);
-    expect(entry.stackTrace, fakeTrace);
-    expect(entry.isPermanent, true);
-    expect(entry.errorMessage, 'MissingPluginException');
-  });
 }
@@ -27,22 +27,6 @@ class MockUrlLauncher extends Mock
  }
 }

-class ThrowingUrlLauncher extends Mock
-    with MockPlatformInterfaceMixin
-    implements UrlLauncherPlatform {
-  @override
-  Future<bool> canLaunch(String? url) async => true;
-
-  @override
-  Future<bool> launchUrl(String? url, LaunchOptions? options) async {
-    throw PlatformException(
-      code: 'channel-error',
-      message: 'Unable to establish connection on channel: '
-          '"dev.flutter.pigeon.url_launcher_android.UrlLauncherApi.launchUrl".',
-    );
-  }
-}
-
 Widget _buildScreen({List<Account> accounts = const []}) {
  return ProviderScope(
    overrides: [
@@ -80,9 +64,6 @@ void main() {
    expect(find.textContaining('Dark Mode'), findsWidgets);
    expect(find.textContaining('IMAP Accounts'), findsWidgets);
    expect(find.textContaining('JMAP Accounts'), findsWidgets);
-    expect(find.textContaining('Locale'), findsWidgets);
-    expect(find.textContaining('Text Scale'), findsWidgets);
-    expect(find.textContaining('DB Schema Version'), findsWidgets);
    // Buttons are in the body, not in the AppBar actions
    expect(find.byIcon(Icons.copy), findsOneWidget);
    expect(find.byIcon(Icons.bug_report), findsOneWidget);
@@ -170,9 +151,6 @@ void main() {
    expect(clipboardText, contains('Dark Mode'));
    expect(clipboardText, contains('IMAP Accounts'));
    expect(clipboardText, contains('JMAP Accounts'));
-    expect(clipboardText, contains('Locale'));
-    expect(clipboardText, contains('Text Scale'));
-    expect(clipboardText, contains('DB Schema Version'));
    expect(
      clipboardText,
      contains('[sharedinbox.de](https://sharedinbox.de)'),
@@ -202,24 +180,4 @@ void main() {
    );
    expect(mock.launchedUrl, contains('1.2.3%2B99'));
  });
-
-  testWidgets(
-    'AboutScreen link tap with failed url_launcher shows error snackbar',
-    (tester) async {
-      tester.view.physicalSize = const Size(800, 1200);
-      tester.view.devicePixelRatio = 1.0;
-      addTearDown(tester.view.resetPhysicalSize);
-      addTearDown(tester.view.resetDevicePixelRatio);
-
-      UrlLauncherPlatform.instance = ThrowingUrlLauncher();
-
-      await tester.pumpWidget(_buildScreen());
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.textContaining('sharedinbox.de').first);
-      await tester.pumpAndSettle();
-
-      expect(find.textContaining('Error:'), findsOneWidget);
-    },
-  );
 }
@@ -34,104 +34,6 @@ void main() {

      expect(find.textContaining('expires in'), findsOneWidget);
    });
-
-    testWidgets(
-      'step 2 button shows text-input fallback on platforms without camera',
-      (tester) async {
-        await tester.pumpWidget(
-          buildApp(
-            initialLocation: '/accounts/receive',
-            overrides: baseOverrides(),
-          ),
-        );
-        await tester.pumpAndSettle();
-
-        await tester.tap(find.byKey(const Key('scanEncryptedButton')));
-        await tester.pumpAndSettle();
-
-        // On Linux (desktop, no camera) the text fallback field must appear.
-        expect(find.byKey(const Key('encryptedCodeField')), findsOneWidget);
-      },
-    );
-
-    testWidgets(
-      'step 2 — valid encrypted QR imports account via text fallback',
-      (tester) async {
-        // Pre-generate a key pair so we can encrypt a QR code with the same
-        // material the screen will use for decryption.
-        final material = await ShareEncryptionService.generateKeyPair();
-        final repo = FakeShareKeyRepository(material: material);
-
-        const account = Account(
-          id: 'src-1',
-          displayName: 'Alice',
-          email: 'alice@example.com',
-          imapHost: 'imap.example.com',
-          smtpHost: 'smtp.example.com',
-        );
-
-        final encryptedQr = await ShareEncryptionService.encryptAccounts(
-          recipientKeyId: material.keyId,
-          recipientPublicKeyBytes: material.publicKeyBytes,
-          accounts: [
-            AccountPayload(
-              accountJson: account.toJson(),
-              password: 'secret',
-            ),
-          ],
-        );
-
-        await tester.pumpWidget(
-          buildApp(
-            initialLocation: '/accounts/receive',
-            overrides: baseOverrides(shareKeyRepository: repo),
-          ),
-        );
-        await tester.pumpAndSettle(); // key generation completes
-
-        await tester.tap(find.byKey(const Key('scanEncryptedButton')));
-        await tester.pumpAndSettle();
-
-        await tester.enterText(
-          find.byKey(const Key('encryptedCodeField')),
-          encryptedQr,
-        );
-        await tester.tap(find.text('Import'));
-        await tester.pumpAndSettle();
-
-        expect(
-          find.text('Imported 1 account successfully.'),
-          findsOneWidget,
-        );
-      },
-    );
-
-    testWidgets(
-      'step 2 — invalid encrypted QR shows error and returns to pub-key step',
-      (tester) async {
-        await tester.pumpWidget(
-          buildApp(
-            initialLocation: '/accounts/receive',
-            overrides: baseOverrides(),
-          ),
-        );
-        await tester.pumpAndSettle();
-
-        await tester.tap(find.byKey(const Key('scanEncryptedButton')));
-        await tester.pumpAndSettle();
-
-        await tester.enterText(
-          find.byKey(const Key('encryptedCodeField')),
-          'not-a-valid-qr-code',
-        );
-        await tester.tap(find.text('Import'));
-        await tester.pumpAndSettle();
-
-        // Screen returns to the pub-key step with an error message visible.
-        expect(find.byKey(const Key('pubKeyQrCode')), findsOneWidget);
-        expect(find.textContaining('Import failed:'), findsWidgets);
-      },
-    );
  });

  group('AccountSendScreen', () {
@@ -1,54 +0,0 @@
-import 'dart:convert';
-
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:sharedinbox/ui/screens/changelog_screen.dart';
-
-class _FakeAssetBundle extends CachingAssetBundle {
-  final Map<String, String> _assets;
-  _FakeAssetBundle(this._assets);
-
-  @override
-  Future<ByteData> load(String key) async {
-    if (_assets.containsKey(key)) {
-      final encoded = utf8.encode(_assets[key]!);
-      return ByteData.view(Uint8List.fromList(encoded).buffer);
-    }
-    throw FlutterError('Asset not found: "$key"');
-  }
-}
-
-const _fakeChangelog =
-    '* 2024-01-01 feat: initial release\n* 2024-01-02 fix: resolve crash\n';
-
-void main() {
-  testWidgets('ChangeLogScreen shows changelog content', (tester) async {
-    await tester.pumpWidget(
-      DefaultAssetBundle(
-        bundle: _FakeAssetBundle({'assets/changelog.txt': _fakeChangelog}),
-        child: const MaterialApp(home: ChangeLogScreen()),
-      ),
-    );
-    await tester.pumpAndSettle();
-
-    expect(find.text('ChangeLog'), findsOneWidget);
-    expect(find.textContaining('initial release'), findsOneWidget);
-    expect(find.textContaining('resolve crash'), findsOneWidget);
-    expect(find.textContaining('Error loading changelog'), findsNothing);
-  });
-
-  testWidgets('ChangeLogScreen shows error when asset is missing', (
-    tester,
-  ) async {
-    await tester.pumpWidget(
-      DefaultAssetBundle(
-        bundle: _FakeAssetBundle({}),
-        child: const MaterialApp(home: ChangeLogScreen()),
-      ),
-    );
-    await tester.pumpAndSettle();
-
-    expect(find.textContaining('Error loading changelog'), findsOneWidget);
-  });
-}
@@ -116,10 +116,7 @@ void main() {

      expect(clipboardText, isNotNull);
      expect(clipboardText, contains('App Version: 1.0.0+42'));
-      expect(clipboardText, contains('Build Mode:'));
      expect(clipboardText, contains('Platform:'));
-      expect(clipboardText, contains('Dart:'));
-      expect(clipboardText, contains('Timestamp:'));
      expect(clipboardText, contains('TestException: clipboard test'));
      // GIT_HASH is empty in test builds — no Git Commit line expected
      expect(clipboardText, isNot(contains('Git Commit:')));
@@ -147,7 +144,6 @@ void main() {
          gitHash: testHash,
        ),
      );
-      await tester.pumpAndSettle();

      // Git hash link should be present
      final gitLinkFinder = find.textContaining('Git Commit: abc1234');
@@ -171,138 +167,6 @@ void main() {
    },
  );

-  testWidgets(
-    'CrashScreen shows version, build mode, and platform in the UI',
-    (tester) async {
-      tester.view.physicalSize = const Size(800, 1200);
-      tester.view.devicePixelRatio = 1.0;
-      addTearDown(() => tester.view.resetPhysicalSize());
-
-      const exception = 'TestException: info row test';
-      final stackTrace = StackTrace.current;
-
-      await tester.pumpWidget(
-        MaterialApp(
-          home: CrashScreen(exception: exception, stackTrace: stackTrace),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      // Info row shows app version (from mock), build mode, and platform OS.
-      expect(find.textContaining('1.0.0+42'), findsWidgets);
-      // In test builds kDebugMode is true.
-      expect(find.textContaining('debug'), findsOneWidget);
-      // Platform OS is always present (linux in CI, android/ios on device).
-      expect(
-        find.textContaining(RegExp(r'linux|android|ios|windows|macos')),
-        findsWidgets,
-      );
-    },
-  );
-
-  testWidgets(
-    'CrashScreen shows app version as clickable link when git hash is set',
-    (tester) async {
-      tester.view.physicalSize = const Size(800, 1200);
-      tester.view.devicePixelRatio = 1.0;
-      addTearDown(() => tester.view.resetPhysicalSize());
-
-      final mock = MockUrlLauncher();
-      UrlLauncherPlatform.instance = mock;
-
-      const exception = 'TestException: version link test';
-      final stackTrace = StackTrace.current;
-      const testHash = 'abc1234';
-
-      await tester.pumpWidget(
-        CrashScreen(
-          exception: exception,
-          stackTrace: stackTrace,
-          gitHash: testHash,
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      // App version link should be present (mocked as 1.0.0+42)
-      final versionLinkFinder = find.textContaining('App Version: 1.0.0+42');
-      expect(versionLinkFinder, findsOneWidget);
-
-      // It must appear above the git hash link
-      final gitLinkFinder = find.textContaining('Git Commit: abc1234');
-      expect(
-        tester.getTopLeft(versionLinkFinder).dy,
-        lessThan(tester.getTopLeft(gitLinkFinder).dy),
-      );
-
-      // Tapping it should open the Codeberg commit URL
-      await tester.tap(versionLinkFinder);
-      await tester.pumpAndSettle();
-
-      expect(
-        mock.launchedUrl,
-        equals('https://codeberg.org/guettli/sharedinbox/commit/abc1234'),
-      );
-    },
-  );
-
-  testWidgets(
-    'CrashScreen copy-to-clipboard includes app version as markdown link when git hash is set',
-    (tester) async {
-      tester.view.physicalSize = const Size(800, 1200);
-      tester.view.devicePixelRatio = 1.0;
-      addTearDown(() => tester.view.resetPhysicalSize());
-
-      String? clipboardText;
-      tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(
-        SystemChannels.platform,
-        (MethodCall call) async {
-          if (call.method == 'Clipboard.setData') {
-            clipboardText =
-                (call.arguments as Map<dynamic, dynamic>)['text'] as String?;
-          }
-          return null;
-        },
-      );
-      addTearDown(
-        () => tester.binding.defaultBinaryMessenger
-            .setMockMethodCallHandler(SystemChannels.platform, null),
-      );
-
-      const exception = 'TestException: version link clipboard test';
-      final stackTrace = StackTrace.current;
-      const testHash = 'abc1234';
-
-      await tester.pumpWidget(
-        CrashScreen(
-          exception: exception,
-          stackTrace: stackTrace,
-          gitHash: testHash,
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.text('Copy to Clipboard'));
-      await tester.pump();
-      await tester.pump();
-      await tester.pumpAndSettle();
-
-      expect(clipboardText, isNotNull);
-      // App Version must be a markdown link pointing to the commit
-      expect(
-        clipboardText,
-        contains(
-          'App Version: [1.0.0+42](https://codeberg.org/guettli/sharedinbox/commit/abc1234)',
-        ),
-      );
-      expect(
-        clipboardText,
-        contains(
-          'Git Commit: [abc1234](https://codeberg.org/guettli/sharedinbox/commit/abc1234)',
-        ),
-      );
-    },
-  );
-
  testWidgets(
    'CrashScreen used as root widget — buttons work without ScaffoldMessenger crash',
    (tester) async {
@@ -105,88 +105,6 @@ void main() {
      expect(find.text('Edit account'), findsNothing);
    });

-    testWidgets(
-        'try connection button is disabled when no password stored or entered',
-        (
-      tester,
-    ) async {
-      tester.view.physicalSize = const Size(800, 1400);
-      tester.view.devicePixelRatio = 1.0;
-      addTearDown(tester.view.resetPhysicalSize);
-      addTearDown(tester.view.resetDevicePixelRatio);
-
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/acc-1/edit',
-          overrides: baseOverrides(
-            accounts: [kTestAccount],
-            hasStoredPassword: false,
-          ),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      final button = tester.widget<OutlinedButton>(
-        find.byKey(const Key('editTryConnectionButton')),
-      );
-      expect(button.onPressed, isNull);
-    });
-
-    testWidgets(
-        'try connection button is enabled after typing password with no stored password',
-        (tester) async {
-      tester.view.physicalSize = const Size(800, 1400);
-      tester.view.devicePixelRatio = 1.0;
-      addTearDown(tester.view.resetPhysicalSize);
-      addTearDown(tester.view.resetDevicePixelRatio);
-
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/acc-1/edit',
-          overrides: baseOverrides(
-            accounts: [kTestAccount],
-            hasStoredPassword: false,
-          ),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await tester.enterText(
-        find.byKey(const Key('editPasswordField')),
-        'mypassword',
-      );
-      await tester.pump();
-
-      final button = tester.widget<OutlinedButton>(
-        find.byKey(const Key('editTryConnectionButton')),
-      );
-      expect(button.onPressed, isNotNull);
-    });
-
-    testWidgets('save button is disabled when no password stored or entered', (
-      tester,
-    ) async {
-      tester.view.physicalSize = const Size(800, 1400);
-      tester.view.devicePixelRatio = 1.0;
-      addTearDown(tester.view.resetPhysicalSize);
-      addTearDown(tester.view.resetDevicePixelRatio);
-
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/acc-1/edit',
-          overrides: baseOverrides(
-            accounts: [kTestAccount],
-            hasStoredPassword: false,
-          ),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      final button = tester
-          .widget<FilledButton>(find.widgetWithText(FilledButton, 'Save'));
-      expect(button.onPressed, isNull);
-    });
-
    testWidgets('connection error shows error message', (tester) async {
      tester.view.physicalSize = const Size(800, 1400);
      tester.view.devicePixelRatio = 1.0;
@@ -179,142 +179,6 @@ void main() {
      expect(find.text('report.pdf'), findsOneWidget);
    });

-    testWidgets('Reply All button is not present in app bar', (tester) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
-          overrides: _overrides(
-            body: const EmailBody(emailId: 'acc-1:42', attachments: []),
-          ),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      expect(
-        find.byWidgetPredicate(
-          (w) => w is Tooltip && w.message == 'Reply all',
-        ),
-        findsNothing,
-      );
-    });
-
-    testWidgets('Reply on single-recipient email navigates directly to compose',
-        (tester) async {
-      // testEmail has from=[bob], to=[alice]. After removing alice (own),
-      // only bob remains → no dialog, navigate straight to compose.
-      final email = testEmail();
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
-          overrides: [
-            ..._overrides(
-              body: const EmailBody(emailId: 'acc-1:42', attachments: []),
-              email: email,
-            ),
-            draftRepositoryProvider.overrideWithValue(FakeDraftRepository()),
-          ],
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await tester.tap(
-        find.byWidgetPredicate(
-          (w) => w is Tooltip && w.message == 'Reply',
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      // No dialog shown — straight navigation to compose.
-      expect(find.text('Reply All'), findsNothing);
-    });
-
-    testWidgets('Reply on multi-recipient email shows Reply All dialog',
-        (tester) async {
-      // Email with an extra Cc recipient so the dialog is triggered.
-      final email = Email(
-        id: 'acc-1:42',
-        accountId: 'acc-1',
-        mailboxPath: 'INBOX',
-        uid: 42,
-        subject: 'Hello world',
-        receivedAt: DateTime(2024, 6),
-        sentAt: DateTime(2024, 6),
-        from: const [EmailAddress(name: 'Bob', email: 'bob@example.com')],
-        to: const [EmailAddress(email: 'alice@example.com')],
-        cc: const [EmailAddress(name: 'Carol', email: 'carol@example.com')],
-        isSeen: false,
-        isFlagged: false,
-        hasAttachment: false,
-      );
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
-          overrides: _overrides(
-            body: const EmailBody(emailId: 'acc-1:42', attachments: []),
-            email: email,
-          ),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await tester.tap(
-        find.byWidgetPredicate(
-          (w) => w is Tooltip && w.message == 'Reply',
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      // Dialog must appear with title 'Reply All'.
-      expect(find.text('Reply All'), findsOneWidget);
-      // Both non-own addresses should be listed in the dialog.
-      expect(find.textContaining('bob@example.com'), findsAtLeastNWidgets(1));
-      expect(find.textContaining('carol@example.com'), findsAtLeastNWidgets(1));
-    });
-
-    testWidgets('Mark as spam button is present in app bar', (tester) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
-          overrides: _overrides(
-            body: const EmailBody(emailId: 'acc-1:42', attachments: []),
-          ),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      expect(
-        find.byWidgetPredicate(
-          (w) => w is Tooltip && w.message == 'Mark as spam',
-        ),
-        findsOneWidget,
-      );
-    });
-
-    testWidgets(
-        'Mark as spam moves email to junk and shows snackbar when no junk folder',
-        (tester) async {
-      // FakeMailboxRepository has no mailboxes by default → findMailboxByRole
-      // returns null → snackbar shown.
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
-          overrides: _overrides(
-            body: const EmailBody(emailId: 'acc-1:42', attachments: []),
-          ),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await tester.tap(
-        find.byWidgetPredicate(
-          (w) => w is Tooltip && w.message == 'Mark as spam',
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      expect(find.text('No Junk folder found'), findsOneWidget);
-    });
-
    testWidgets('Show Raw Email dialog shows size of email', (tester) async {
      // 'A' * 2048 → fmtSize(2048) == '2.0 KB'
      final rawContent = 'A' * 2048;
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';

 import 'package:sharedinbox/core/models/email.dart';
-import 'package:sharedinbox/core/models/mailbox.dart';
 import 'package:sharedinbox/di.dart';
 import 'package:sharedinbox/ui/screens/email_detail_screen.dart';
 import 'package:sharedinbox/ui/screens/email_list_screen.dart';
@@ -632,150 +631,5 @@ void main() {

      expect(find.text('This is the preview text'), findsOneWidget);
    });
-
-    group('archive with missing folder', () {
-      testWidgets('shows dialog when archive folder is not found', (
-        tester,
-      ) async {
-        final email = testEmail(subject: 'To archive');
-        await tester.pumpWidget(
-          buildApp(
-            initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails',
-            overrides: [
-              accountRepositoryProvider.overrideWithValue(
-                FakeAccountRepository([kTestAccount]),
-              ),
-              // No archive folder in the repo.
-              mailboxRepositoryProvider.overrideWithValue(
-                FakeMailboxRepository(),
-              ),
-              emailRepositoryProvider.overrideWithValue(
-                FakeEmailRepository(emails: [email]),
-              ),
-            ],
-          ),
-        );
-        await tester.pumpAndSettle();
-
-        // Enter selection mode and tap archive.
-        await tester.longPress(find.text('To archive'));
-        await tester.pumpAndSettle();
-        await tester.tap(find.byIcon(Icons.archive));
-        await tester.pumpAndSettle();
-
-        expect(find.text('No archive folder found'), findsOneWidget);
-        expect(find.text('Choose existing folder'), findsOneWidget);
-        expect(find.text('Create "Archive"'), findsOneWidget);
-      });
-
-      testWidgets('tapping Create creates the folder and moves emails', (
-        tester,
-      ) async {
-        final email = testEmail(subject: 'To archive');
-        final movedTo = <String>[];
-
-        final fakeEmailRepo = _SpyEmailRepository(
-          emails: [email],
-          onMove: (id, path) => movedTo.add(path),
-        );
-
-        await tester.pumpWidget(
-          buildApp(
-            initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails',
-            overrides: [
-              accountRepositoryProvider.overrideWithValue(
-                FakeAccountRepository([kTestAccount]),
-              ),
-              mailboxRepositoryProvider.overrideWithValue(
-                FakeMailboxRepository(),
-              ),
-              emailRepositoryProvider.overrideWithValue(fakeEmailRepo),
-            ],
-          ),
-        );
-        await tester.pumpAndSettle();
-
-        await tester.longPress(find.text('To archive'));
-        await tester.pumpAndSettle();
-        await tester.tap(find.byIcon(Icons.archive));
-        await tester.pumpAndSettle();
-
-        // Tap "Create Archive".
-        await tester.tap(find.text('Create "Archive"'));
-        await tester.pumpAndSettle();
-
-        expect(movedTo, contains('Archive'));
-      });
-
-      testWidgets(
-        'tapping Choose existing opens folder picker and moves emails',
-        (tester) async {
-          final email = testEmail(subject: 'To archive');
-          final movedTo = <String>[];
-
-          final fakeEmailRepo = _SpyEmailRepository(
-            emails: [email],
-            onMove: (id, path) => movedTo.add(path),
-          );
-          const archiveFolder = Mailbox(
-            id: 'acc-1:OldArchive',
-            accountId: 'acc-1',
-            path: 'OldArchive',
-            name: 'OldArchive',
-            unreadCount: 0,
-            totalCount: 0,
-          );
-
-          await tester.pumpWidget(
-            buildApp(
-              initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails',
-              overrides: [
-                accountRepositoryProvider.overrideWithValue(
-                  FakeAccountRepository([kTestAccount]),
-                ),
-                // Repo has a folder but it has no 'archive' role.
-                mailboxRepositoryProvider.overrideWithValue(
-                  FakeMailboxRepository([archiveFolder]),
-                ),
-                emailRepositoryProvider.overrideWithValue(fakeEmailRepo),
-              ],
-            ),
-          );
-          await tester.pumpAndSettle();
-
-          await tester.longPress(find.text('To archive'));
-          await tester.pumpAndSettle();
-          await tester.tap(find.byIcon(Icons.archive));
-          await tester.pumpAndSettle();
-
-          // Tap "Choose existing folder".
-          await tester.tap(find.text('Choose existing folder'));
-          await tester.pumpAndSettle();
-
-          // Bottom sheet with folder list appears.
-          expect(find.text('OldArchive'), findsOneWidget);
-
-          await tester.tap(find.text('OldArchive'));
-          await tester.pumpAndSettle();
-
-          expect(movedTo, contains('OldArchive'));
-        },
-      );
-    });
  });
 }
-
-/// Email repository spy that records [moveEmail] calls.
-class _SpyEmailRepository extends FakeEmailRepository {
-  _SpyEmailRepository({
-    super.emails,
-    required void Function(String emailId, String path) onMove,
-  }) : _onMove = onMove;
-
-  final void Function(String emailId, String path) _onMove;
-
-  @override
-  Future<void> moveEmail(String emailId, String destMailboxPath) async {
-    _onMove(emailId, destMailboxPath);
-  }
-}
@@ -44,12 +44,11 @@ import 'package:sharedinbox/ui/screens/thread_detail_screen.dart';
 // ---------------------------------------------------------------------------

 class FakeAccountRepository implements AccountRepository {
+  final List<Account> _accounts;
+
  FakeAccountRepository([List<Account>? accounts])
      : _accounts = List.of(accounts ?? []);

-  final List<Account> _accounts;
-  bool hasPassword = true;
-
  @override
  Stream<List<Account>> observeAccounts() => Stream.value(List.of(_accounts));

@@ -76,22 +75,15 @@ class FakeAccountRepository implements AccountRepository {
      _accounts.removeWhere((a) => a.id == id);

  @override
-  Future<String> getPassword(String accountId) async {
-    if (!hasPassword) {
-      throw StateError('No password stored for account $accountId');
-    }
-    return 'test-password';
-  }
+  Future<String> getPassword(String accountId) async => 'test-password';
 }

 class FakeShareKeyRepository implements ShareKeyRepository {
-  FakeShareKeyRepository({ShareKeyMaterial? material}) : _material = material;
-
  ShareKeyMaterial? _material;

  @override
  Future<ShareKeyMaterial> createKeyPair() async {
-    _material ??= await ShareEncryptionService.generateKeyPair();
+    _material = await ShareEncryptionService.generateKeyPair();
    return _material!;
  }

@@ -164,28 +156,8 @@ class FakeMailboxRepository implements MailboxRepository {
  @override
  Future<Mailbox?> findMailboxByRole(String accountId, String role) async =>
      _mailboxes.where((m) => m.role == role).firstOrNull;
-
  @override
  Future<void> clearForResync(String accountId) async {}
-
-  @override
-  Future<Mailbox> createMailboxWithRole(
-    String accountId,
-    String name,
-    String role,
-  ) async {
-    final mailbox = Mailbox(
-      id: '$accountId:$name',
-      accountId: accountId,
-      path: name,
-      name: name,
-      role: role,
-      unreadCount: 0,
-      totalCount: 0,
-    );
-    _mailboxes.add(mailbox);
-    return mailbox;
-  }
 }

 class FakeEmailRepository implements EmailRepository {
@@ -539,13 +511,10 @@ List<Override> baseOverrides({
  List<Mailbox>? mailboxes,
  DiscoveryResult? discovery,
  Exception? connectionError,
-  ShareKeyRepository? shareKeyRepository,
-  bool hasStoredPassword = true,
 }) =>
    [
-      accountRepositoryProvider.overrideWithValue(
-        FakeAccountRepository(accounts)..hasPassword = hasStoredPassword,
-      ),
+      accountRepositoryProvider
+          .overrideWithValue(FakeAccountRepository(accounts)),
      mailboxRepositoryProvider
          .overrideWithValue(FakeMailboxRepository(mailboxes)),
      emailRepositoryProvider.overrideWithValue(FakeEmailRepository()),
@@ -556,9 +525,7 @@ List<Override> baseOverrides({
      connectionTestServiceProvider.overrideWithValue(
        FakeConnectionTestService(error: connectionError),
      ),
-      shareKeyRepositoryProvider.overrideWithValue(
-        shareKeyRepository ?? FakeShareKeyRepository(),
-      ),
+      shareKeyRepositoryProvider.overrideWithValue(FakeShareKeyRepository()),
    ];

 // ---------------------------------------------------------------------------
@@ -25,8 +25,7 @@ The app processes the following data **exclusively on your device**:
  device's secure storage and never transmitted to us.
 - **Email messages and attachments** — fetched directly from your email provider's IMAP server and
  displayed in the app. We never receive, store, or process your emails.
- **App settings and configuration** — stored locally on your device. The app will never upload
-  this data to sharedinbox.de or any third-party service.
+- **App settings and configuration** — stored locally on your device.

 ### Network connections