Merge branch 'main' into issue-494-website-change-detection

Adds a check-changes job to website.yml that queries the Forgejo API for
the last successful website.yml run, compares its head_sha to HEAD, and
diffs for website-relevant paths before deploying. Eliminates ~23 wasteful
hourly rebuilds per day when no website content has changed. Push and
workflow_dispatch triggers are unaffected — they always deploy.

Closes #494

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

.devcontainer/devcontainer.json

@@ -1,10 +0,0 @@
-{
-    "name": "SharedInbox Dev",
-    "build": {
-        "dockerfile": "../Dockerfile.dev",
-        "context": ".."
-    },
-    "workspaceFolder": "/src",
-    "workspaceMount": "source=${localWorkspaceFolder},target=/src,type=bind,consistency=cached",
-    "remoteUser": "ci"
-}

.forgejo/workflows/ci.yml

@@ -19,14 +19,14 @@ jobs:
           RUN_NUMBER: ${{ github.run_number }}
         run: |
           runner_start=$(date +%s)
-          created=$(curl -sf --max-time 30 \
+          created_at=$(curl -sf \
             -H "Authorization: token $FORGEJO_TOKEN" \
-            "${{ github.server_url }}/api/v1/repos/${{ github.repository }}/actions/runs?run_number=$RUN_NUMBER" \
+            "${{ github.server_url }}/api/v1/repos/${{ github.repository }}/actions/tasks?limit=100" \
-            | python3 -c "import sys,json;rs=json.load(sys.stdin).get('workflow_runs',[]);print(rs[0]['created'] if rs else '')" 2>/dev/null) || true
+            | python3 -c "import sys,json;data=json.load(sys.stdin);rs=[r for r in data.get('workflow_runs',[]) if r.get('run_number')==$RUN_NUMBER];print(rs[0]['created_at'] if rs else '')" 2>/dev/null)
-          if [ -n "$created" ]; then
+          if [ -n "$created_at" ]; then
-            queued_epoch=$(date -d "$created" +%s)
+            queued_epoch=$(date -d "$created_at" +%s)
             wait_seconds=$((runner_start - queued_epoch))
-            echo "Runner wait time: ${wait_seconds}s (queued at $created)"
+            echo "Runner wait time: ${wait_seconds}s (queued at $created_at)"
           else
             echo "Runner wait time: unknown (API lookup failed)"
           fi

.forgejo/workflows/deploy.yml

@@ -21,14 +21,14 @@ jobs:
           RUN_NUMBER: ${{ github.run_number }}
         run: |
           runner_start=$(date +%s)
-          created=$(curl -sf --max-time 30 \
+          created_at=$(curl -sf \
             -H "Authorization: token $FORGEJO_TOKEN" \
-            "${{ github.server_url }}/api/v1/repos/${{ github.repository }}/actions/runs?run_number=$RUN_NUMBER" \
+            "${{ github.server_url }}/api/v1/repos/${{ github.repository }}/actions/tasks?limit=100" \
-            | python3 -c "import sys,json;rs=json.load(sys.stdin).get('workflow_runs',[]);print(rs[0]['created'] if rs else '')" 2>/dev/null) || true
+            | python3 -c "import sys,json;data=json.load(sys.stdin);rs=[r for r in data.get('workflow_runs',[]) if r.get('run_number')==$RUN_NUMBER];print(rs[0]['created_at'] if rs else '')" 2>/dev/null)
-          if [ -n "$created" ]; then
+          if [ -n "$created_at" ]; then
-            queued_epoch=$(date -d "$created" +%s)
+            queued_epoch=$(date -d "$created_at" +%s)
             wait_seconds=$((runner_start - queued_epoch))
-            echo "Runner wait time: ${wait_seconds}s (queued at $created)"
+            echo "Runner wait time: ${wait_seconds}s (queued at $created_at)"
           else
             echo "Runner wait time: unknown (API lookup failed)"
           fi
@@ -51,27 +51,43 @@ jobs:
 
           HEAD_SHA=$(git rev-parse HEAD)
 
-          # Find the most recent successful "Build & Deploy to Play Store" task. Forgejo's API
+          # Find the most recent workflow run where deploy-playstore actually succeeded
-          # does not expose per-run jobs (/runs/{id}/jobs returns 404), so query /actions/tasks
+          # (not merely skipped). Bug fix: previous code used commit_sha (always None in
-          # (per-job records) directly and filter for the task we care about. Filtering at the
+          # Forgejo's API) instead of head_sha, causing LAST_DEPLOYED_SHA to be empty on
-          # task level also distinguishes runs where the Play Store job actually ran from runs
+          # every run and the fallback diff to only cover HEAD~1..HEAD.
-          # where it was skipped — at the run level both show status=success.
           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/tasks?status=success&limit=100"
+          base_api = f"{server}/api/v1/repos/{repo}/actions"
+          url = f"{base_api}/runs?workflow_id=deploy.yml&status=success&limit=10"
           req = urllib.request.Request(url, headers={"Authorization": f"token {token}"})
           try:
-              with urllib.request.urlopen(req, timeout=60) as r:
+              with urllib.request.urlopen(req) as r:
                   data = json.loads(r.read())
-              for t in data.get("workflow_runs", []):
+              runs = [
-                  if (t.get("workflow_id") == "deploy.yml"
+                  r for r in data.get("workflow_runs", [])
-                      and t.get("name") == "Build & Deploy to Play Store"
+                  if r.get("status") == "success"
-                      and t.get("status") == "success"):
+              ]
-                      print(t.get("head_sha") or "")
+              # Walk runs newest-first; pick the first one where deploy-playstore
-                      sys.exit(0)
+              # actually ran (conclusion=success), not just skipped.
+              for run in runs:
+                  run_id = run.get("id")
+                  jobs_url = f"{base_api}/runs/{run_id}/jobs"
+                  jobs_req = urllib.request.Request(jobs_url, headers={"Authorization": f"token {token}"})
+                  try:
+                      with urllib.request.urlopen(jobs_req) as jr:
+                          jobs_data = json.loads(jr.read())
+                      for job in jobs_data.get("workflow_jobs", []):
+                          if "Deploy to Play Store" in job.get("name", "") and (
+                              job.get("conclusion") == "success" or
+                              job.get("status") == "success"
+                          ):
+                              print(run.get("head_sha") or "")
+                              sys.exit(0)
+                  except Exception:
+                      pass  # skip this run if jobs API fails
               print("")
           except Exception as e:
               print(f"::error::LAST_DEPLOYED_SHA lookup failed ({type(e).__name__}: {e})")
@@ -148,14 +164,14 @@ jobs:
           RUN_NUMBER: ${{ github.run_number }}
         run: |
           runner_start=$(date +%s)
-          created=$(curl -sf --max-time 30 \
+          created_at=$(curl -sf \
             -H "Authorization: token $FORGEJO_TOKEN" \
-            "${{ github.server_url }}/api/v1/repos/${{ github.repository }}/actions/runs?run_number=$RUN_NUMBER" \
+            "${{ github.server_url }}/api/v1/repos/${{ github.repository }}/actions/tasks?limit=100" \
-            | python3 -c "import sys,json;rs=json.load(sys.stdin).get('workflow_runs',[]);print(rs[0]['created'] if rs else '')" 2>/dev/null) || true
+            | python3 -c "import sys,json;data=json.load(sys.stdin);rs=[r for r in data.get('workflow_runs',[]) if r.get('run_number')==$RUN_NUMBER];print(rs[0]['created_at'] if rs else '')" 2>/dev/null)
-          if [ -n "$created" ]; then
+          if [ -n "$created_at" ]; then
-            queued_epoch=$(date -d "$created" +%s)
+            queued_epoch=$(date -d "$created_at" +%s)
             wait_seconds=$((runner_start - queued_epoch))
-            echo "Runner wait time: ${wait_seconds}s (queued at $created)"
+            echo "Runner wait time: ${wait_seconds}s (queued at $created_at)"
           else
             echo "Runner wait time: unknown (API lookup failed)"
           fi
@@ -199,14 +215,14 @@ jobs:
           RUN_NUMBER: ${{ github.run_number }}
         run: |
           runner_start=$(date +%s)
-          created=$(curl -sf --max-time 30 \
+          created_at=$(curl -sf \
             -H "Authorization: token $FORGEJO_TOKEN" \
-            "${{ github.server_url }}/api/v1/repos/${{ github.repository }}/actions/runs?run_number=$RUN_NUMBER" \
+            "${{ github.server_url }}/api/v1/repos/${{ github.repository }}/actions/tasks?limit=100" \
-            | python3 -c "import sys,json;rs=json.load(sys.stdin).get('workflow_runs',[]);print(rs[0]['created'] if rs else '')" 2>/dev/null) || true
+            | python3 -c "import sys,json;data=json.load(sys.stdin);rs=[r for r in data.get('workflow_runs',[]) if r.get('run_number')==$RUN_NUMBER];print(rs[0]['created_at'] if rs else '')" 2>/dev/null)
-          if [ -n "$created" ]; then
+          if [ -n "$created_at" ]; then
-            queued_epoch=$(date -d "$created" +%s)
+            queued_epoch=$(date -d "$created_at" +%s)
             wait_seconds=$((runner_start - queued_epoch))
-            echo "Runner wait time: ${wait_seconds}s (queued at $created)"
+            echo "Runner wait time: ${wait_seconds}s (queued at $created_at)"
           else
             echo "Runner wait time: unknown (API lookup failed)"
           fi
@@ -244,14 +260,14 @@ jobs:
           RUN_NUMBER: ${{ github.run_number }}
         run: |
           runner_start=$(date +%s)
-          created=$(curl -sf --max-time 30 \
+          created_at=$(curl -sf \
             -H "Authorization: token $FORGEJO_TOKEN" \
-            "${{ github.server_url }}/api/v1/repos/${{ github.repository }}/actions/runs?run_number=$RUN_NUMBER" \
+            "${{ github.server_url }}/api/v1/repos/${{ github.repository }}/actions/tasks?limit=100" \
-            | python3 -c "import sys,json;rs=json.load(sys.stdin).get('workflow_runs',[]);print(rs[0]['created'] if rs else '')" 2>/dev/null) || true
+            | python3 -c "import sys,json;data=json.load(sys.stdin);rs=[r for r in data.get('workflow_runs',[]) if r.get('run_number')==$RUN_NUMBER];print(rs[0]['created_at'] if rs else '')" 2>/dev/null)
-          if [ -n "$created" ]; then
+          if [ -n "$created_at" ]; then
-            queued_epoch=$(date -d "$created" +%s)
+            queued_epoch=$(date -d "$created_at" +%s)
             wait_seconds=$((runner_start - queued_epoch))
-            echo "Runner wait time: ${wait_seconds}s (queued at $created)"
+            echo "Runner wait time: ${wait_seconds}s (queued at $created_at)"
           else
             echo "Runner wait time: unknown (API lookup failed)"
           fi
@@ -294,14 +310,14 @@ jobs:
           RUN_NUMBER: ${{ github.run_number }}
         run: |
           runner_start=$(date +%s)
-          created=$(curl -sf --max-time 30 \
+          created_at=$(curl -sf \
             -H "Authorization: token $FORGEJO_TOKEN" \
-            "${{ github.server_url }}/api/v1/repos/${{ github.repository }}/actions/runs?run_number=$RUN_NUMBER" \
+            "${{ github.server_url }}/api/v1/repos/${{ github.repository }}/actions/tasks?limit=100" \
-            | python3 -c "import sys,json;rs=json.load(sys.stdin).get('workflow_runs',[]);print(rs[0]['created'] if rs else '')" 2>/dev/null) || true
+            | python3 -c "import sys,json;data=json.load(sys.stdin);rs=[r for r in data.get('workflow_runs',[]) if r.get('run_number')==$RUN_NUMBER];print(rs[0]['created_at'] if rs else '')" 2>/dev/null)
-          if [ -n "$created" ]; then
+          if [ -n "$created_at" ]; then
-            queued_epoch=$(date -d "$created" +%s)
+            queued_epoch=$(date -d "$created_at" +%s)
             wait_seconds=$((runner_start - queued_epoch))
-            echo "Runner wait time: ${wait_seconds}s (queued at $created)"
+            echo "Runner wait time: ${wait_seconds}s (queued at $created_at)"
           else
             echo "Runner wait time: unknown (API lookup failed)"
           fi

.forgejo/workflows/firebase-tests.yml

@@ -20,14 +20,14 @@ jobs:
           RUN_NUMBER: ${{ github.run_number }}
         run: |
           runner_start=$(date +%s)
-          created=$(curl -sf --max-time 30 \
+          created_at=$(curl -sf \
             -H "Authorization: token $FORGEJO_TOKEN" \
-            "${{ github.server_url }}/api/v1/repos/${{ github.repository }}/actions/runs?run_number=$RUN_NUMBER" \
+            "${{ github.server_url }}/api/v1/repos/${{ github.repository }}/actions/tasks?limit=100" \
-            | python3 -c "import sys,json;rs=json.load(sys.stdin).get('workflow_runs',[]);print(rs[0]['created'] if rs else '')" 2>/dev/null) || true
+            | python3 -c "import sys,json;data=json.load(sys.stdin);rs=[r for r in data.get('workflow_runs',[]) if r.get('run_number')==$RUN_NUMBER];print(rs[0]['created_at'] if rs else '')" 2>/dev/null)
-          if [ -n "$created" ]; then
+          if [ -n "$created_at" ]; then
-            queued_epoch=$(date -d "$created" +%s)
+            queued_epoch=$(date -d "$created_at" +%s)
             wait_seconds=$((runner_start - queued_epoch))
-            echo "Runner wait time: ${wait_seconds}s (queued at $created)"
+            echo "Runner wait time: ${wait_seconds}s (queued at $created_at)"
           else
             echo "Runner wait time: unknown (API lookup failed)"
           fi
@@ -73,14 +73,14 @@ jobs:
           RUN_NUMBER: ${{ github.run_number }}
         run: |
           runner_start=$(date +%s)
-          created=$(curl -sf --max-time 30 \
+          created_at=$(curl -sf \
             -H "Authorization: token $FORGEJO_TOKEN" \
-            "${{ github.server_url }}/api/v1/repos/${{ github.repository }}/actions/runs?run_number=$RUN_NUMBER" \
+            "${{ github.server_url }}/api/v1/repos/${{ github.repository }}/actions/tasks?limit=100" \
-            | python3 -c "import sys,json;rs=json.load(sys.stdin).get('workflow_runs',[]);print(rs[0]['created'] if rs else '')" 2>/dev/null) || true
+            | python3 -c "import sys,json;data=json.load(sys.stdin);rs=[r for r in data.get('workflow_runs',[]) if r.get('run_number')==$RUN_NUMBER];print(rs[0]['created_at'] if rs else '')" 2>/dev/null)
-          if [ -n "$created" ]; then
+          if [ -n "$created_at" ]; then
-            queued_epoch=$(date -d "$created" +%s)
+            queued_epoch=$(date -d "$created_at" +%s)
             wait_seconds=$((runner_start - queued_epoch))
-            echo "Runner wait time: ${wait_seconds}s (queued at $created)"
+            echo "Runner wait time: ${wait_seconds}s (queued at $created_at)"
           else
             echo "Runner wait time: unknown (API lookup failed)"
           fi
@@ -135,7 +135,7 @@ jobs:
           repo_labels = api_get("/labels")
           label_map = {l["name"]: l["id"] for l in repo_labels}
 
-          label_ids = [label_map["loop/code"]] if "loop/code" in label_map else []
+          label_ids = [label_map["Ready"]] if "Ready" in label_map else []
 
           title = "Firebase Tests failed — find root cause and fix"
           body = (

.forgejo/workflows/publish-dev-container.yml

@@ -1,44 +0,0 @@
-name: Publish Dev Container
-
-on:
-  push:
-    branches: [main]
-    paths:
-      - 'Dockerfile.dev'
-      - '.devcontainer/devcontainer.json'
-      - '.forgejo/workflows/publish-dev-container.yml'
-  workflow_dispatch:
-
-jobs:
-  publish:
-    name: Build & Push sharedinbox-dev
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    env:
-      REGISTRY: codeberg.org
-      IMAGE: codeberg.org/guettli/sharedinbox-dev
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Log in to Codeberg container registry
-        env:
-          FORGEJO_TOKEN: ${{ github.token }}
-        run: |
-          echo "$FORGEJO_TOKEN" \
-            | docker login "$REGISTRY" -u "${{ github.actor }}" --password-stdin
-
-      - name: Build image
-        run: |
-          SHORT_SHA="${GITHUB_SHA:0:7}"
-          docker build \
-            -t "$IMAGE:latest" \
-            -t "$IMAGE:$SHORT_SHA" \
-            -f Dockerfile.dev \
-            .
-
-      - name: Push image
-        run: |
-          SHORT_SHA="${GITHUB_SHA:0:7}"
-          docker push "$IMAGE:latest"
-          docker push "$IMAGE:$SHORT_SHA"

.forgejo/workflows/website.yml

@@ -38,27 +38,40 @@ jobs:
 
           HEAD_SHA=$(git rev-parse HEAD)
 
-          # Find the most recent successful "Build & Update Website" task. Forgejo's API
+          # Find the most recent successful website.yml run where the deploy job
-          # does not expose per-run jobs (/runs/{id}/jobs returns 404), so query /actions/tasks
+          # actually ran (not merely skipped). Uses head_sha (not commit_sha which
-          # (per-job records) directly and filter for the task we care about. Filtering at the
+          # is always None in Forgejo's API).
-          # task level also distinguishes runs where the deploy job actually ran from runs
-          # where it was skipped — at the run level both show status=success.
           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/tasks?status=success&limit=100"
+          base_api = f"{server}/api/v1/repos/{repo}/actions"
+          url = f"{base_api}/runs?workflow_id=website.yml&status=success&limit=10"
           req = urllib.request.Request(url, headers={"Authorization": f"token {token}"})
           try:
-              with urllib.request.urlopen(req, timeout=60) as r:
+              with urllib.request.urlopen(req) as r:
                   data = json.loads(r.read())
-              for t in data.get("workflow_runs", []):
+              runs = [
-                  if (t.get("workflow_id") == "website.yml"
+                  r for r in data.get("workflow_runs", [])
-                      and t.get("name") == "Build & Update Website"
+                  if r.get("status") == "success"
-                      and t.get("status") == "success"):
+              ]
-                      print(t.get("head_sha") or "")
+              for run in runs:
-                      sys.exit(0)
+                  run_id = run.get("id")
+                  jobs_url = f"{base_api}/runs/{run_id}/jobs"
+                  jobs_req = urllib.request.Request(jobs_url, headers={"Authorization": f"token {token}"})
+                  try:
+                      with urllib.request.urlopen(jobs_req) as jr:
+                          jobs_data = json.loads(jr.read())
+                      for job in jobs_data.get("workflow_jobs", []):
+                          if "Build & Update Website" in job.get("name", "") and (
+                              job.get("conclusion") == "success" or
+                              job.get("status") == "success"
+                          ):
+                              print(run.get("head_sha") or "")
+                              sys.exit(0)
+                  except Exception:
+                      pass  # skip this run if jobs API fails
               print("")
           except Exception as e:
               print(f"::error::LAST_DEPLOYED_SHA lookup failed ({type(e).__name__}: {e})")
@@ -117,14 +130,14 @@ jobs:
           RUN_NUMBER: ${{ github.run_number }}
         run: |
           runner_start=$(date +%s)
-          created=$(curl -sf --max-time 30 \
+          created_at=$(curl -sf \
             -H "Authorization: token $FORGEJO_TOKEN" \
-            "${{ github.server_url }}/api/v1/repos/${{ github.repository }}/actions/runs?run_number=$RUN_NUMBER" \
+            "${{ github.server_url }}/api/v1/repos/${{ github.repository }}/actions/tasks?limit=100" \
-            | python3 -c "import sys,json;rs=json.load(sys.stdin).get('workflow_runs',[]);print(rs[0]['created'] if rs else '')" 2>/dev/null) || true
+            | python3 -c "import sys,json;data=json.load(sys.stdin);rs=[r for r in data.get('workflow_runs',[]) if r.get('run_number')==$RUN_NUMBER];print(rs[0]['created_at'] if rs else '')" 2>/dev/null)
-          if [ -n "$created" ]; then
+          if [ -n "$created_at" ]; then
-            queued_epoch=$(date -d "$created" +%s)
+            queued_epoch=$(date -d "$created_at" +%s)
             wait_seconds=$((runner_start - queued_epoch))
-            echo "Runner wait time: ${wait_seconds}s (queued at $created)"
+            echo "Runner wait time: ${wait_seconds}s (queued at $created_at)"
           else
             echo "Runner wait time: unknown (API lookup failed)"
           fi

.fvmrc

@@ -1,3 +1,3 @@
 {
   "flutter": "3.44.0"
-}
+}

.gitignore

@@ -123,4 +123,3 @@ dagger-certs
 /go
 .last_deployed_sha
 .fail_count
-/*.kubeconfig

.pre-commit-config.yaml

@@ -26,13 +26,13 @@ repos:
       - id: forbidden-files-hook
         name: check for forbidden home-directory files
         language: system
-        entry: bash -c 'cd "$(git rev-parse --show-toplevel)" && task check-hygiene'
+        entry: bash -c 'cd "$(git rev-parse --show-toplevel)" && nix develop --command task check-hygiene'
         pass_filenames: false
         always_run: true
       - id: dart-check
         name: dart format (autofix) + check-fast (parallel)
         language: system
-        entry: bash -c 'cd "$(git rev-parse --show-toplevel)" && dagger call --progress=plain -q -m ci --source=. check-fast'
+        entry: bash -c 'cd "$(git rev-parse --show-toplevel)" && nix develop --command dagger call --progress=plain -q -m ci --source=. check-fast'
         pass_filenames: false
         always_run: true
       - id: ci-no-direct-dagger
@@ -50,12 +50,6 @@ repos:
       - id: ci-image-exists
         name: verify container images in ci/main.go are reachable
         language: system
-        entry: bash -c 'cd "$(git rev-parse --show-toplevel)" && task check-ci-images'
+        entry: bash -c 'cd "$(git rev-parse --show-toplevel)" && nix develop --command task check-ci-images'
         pass_filenames: false
         files: ^(ci/main\.go|\.fvmrc)$
-      - id: dagger-versions-aligned
-        name: verify Dagger version is consistent across dagger.json, Dockerfile and DAGGER.md
-        language: system
-        entry: bash -c 'cd "$(git rev-parse --show-toplevel)" && scripts/check_dagger_versions.sh'
-        pass_filenames: false
-        files: ^(ci/dagger\.json|\.forgejo/Dockerfile|DAGGER\.md)$

Dockerfile.dev

@@ -1,59 +0,0 @@
-# Development and Testing Container for SharedInbox
-# Replaces the Nix shell environment.
-FROM ghcr.io/cirruslabs/flutter:3.44.0
-
-# Install Linux desktop build and test dependencies, Go, NodeJS, python3, and utilities
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    clang \
-    cmake \
-    ninja-build \
-    pkg-config \
-    libgtk-3-dev \
-    liblzma-dev \
-    libsecret-1-dev \
-    libgcrypt20-dev \
-    libjsoncpp-dev \
-    sqlite3 \
-    iproute2 \
-    netcat-openbsd \
-    xvfb \
-    libosmesa6 \
-    libegl1 \
-    lld \
-    git \
-    curl \
-    jq \
-    python3-pip \
-    nodejs \
-    npm \
-    hugo \
-    lcov \
-    rsync \
-    openssh-client \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install Task runner
-RUN curl -fsSL https://taskfile.dev/install.sh \
-    | sh -s -- -b /usr/local/bin v3.48.0
-
-# Install Dagger CLI
-RUN curl -fsSL https://dl.dagger.io/dagger/install.sh \
-    | DAGGER_VERSION=0.20.8 BIN_DIR=/usr/local/bin sh
-
-# Install python packages (Play Store API clients + pre-commit)
-RUN pip install --break-system-packages --no-cache-dir \
-    google-api-python-client \
-    google-auth-httplib2 \
-    httplib2 \
-    pre-commit==4.5.1
-
-# Install acpx CLI globally
-RUN npm install -g acpx@0.10.0
-
-# Setup user "ci"
-RUN useradd -m -s /bin/bash ci
-USER ci
-ENV HOME=/home/ci
-ENV PATH=/home/ci/.pub-cache/bin:$PATH
-
-WORKDIR /src

Taskfile.yml

@@ -544,7 +544,7 @@ tasks:
       - sops exec-env secrets.enc.yaml 'bash scripts/build_android_bundle_local.sh'
 
   deploy-android-bundle:
-    desc: Build release AAB and upload to Play Store internal + closed-testing tracks (local/fvm)
+    desc: Build release AAB and upload to Play Store internal track (local/fvm)
     deps: [build-android-bundle-local]
     dotenv: [".env"]
     cmds:
@@ -712,11 +712,6 @@ tasks:
     cmds:
       - scripts/check_ci_images.sh
 
-  check-dagger-versions:
-    desc: Verify ci/dagger.json, flake.nix, .forgejo/Dockerfile and DAGGER.md pin the same Dagger version
-    cmds:
-      - scripts/check_dagger_versions.sh
-
   _integrations:
     internal: true
     run: once

agentloop-validation.txt

@@ -1 +0,0 @@
-Agentloop is working on sialoop!

ci/main.go

@@ -503,19 +503,23 @@ func (m *Ci) CheckFast(ctx context.Context) (string, error) {
 }
 
 // CheckGenerated verifies that all generated files (*.g.dart, *.mocks.dart) are up to date.
-// It reuses the codegenBase() output instead of running build_runner a second time,
+// It snapshots the committed source (including any stale generated files) before
-// diffing committed generated files against the freshly built ones.
+// running build_runner, so git diff detects real staleness instead of always
+// comparing two freshly-generated outputs.
 func (m *Ci) CheckGenerated(ctx context.Context) (string, error) {
-	fresh := m.codegenBase().Directory("/src")
 	return m.pubGetLayer().
-		WithDirectory("/committed", m.checkSrc(), dagger.ContainerWithDirectoryOpts{Owner: "ci"}).
+		WithDirectory("/src", m.checkSrc(), dagger.ContainerWithDirectoryOpts{Owner: "ci"}).
-		WithDirectory("/generated", fresh, dagger.ContainerWithDirectoryOpts{Owner: "ci"}).
+		WithWorkdir("/src").
+		WithExec([]string{"git", "init"}).
+		WithExec([]string{"git", "config", "user.email", "ci@sharedinbox.de"}).
+		WithExec([]string{"git", "config", "user.name", "CI"}).
+		WithExec([]string{"git", "add", "."}).
+		WithExec([]string{"git", "commit", "-q", "-m", "baseline"}).
 		WithExec([]string{"/bin/bash", "-c",
-			`stale=$(find /committed -name '*.g.dart' -o -name '*.mocks.dart' | ` +
+			`tmp=$(mktemp); trap 'rm -f "$tmp"' EXIT; ` +
-				`while IFS= read -r f; do rel="${f#/committed/}"; diff -q "$f" "/generated/$rel" >/dev/null 2>&1 || echo "$rel"; done); ` +
+				`flutter pub run build_runner build --delete-conflicting-outputs >"$tmp" 2>&1 || { cat "$tmp"; exit 1; }; ` +
-				`if [ -n "$stale" ]; then ` +
+				`grep -vE '^\[.*s\] \|' "$tmp" || true`}).
-				`echo "ERROR: Generated files are out of date — run: dart run build_runner build"; echo "$stale"; exit 1; ` +
+		WithExec([]string{"/bin/bash", "-c", "CHANGED=$(find . \\( -name '*.g.dart' -o -name '*.mocks.dart' \\) | xargs -r git diff --exit-code); if [ $? -ne 0 ]; then echo \"ERROR: Generated files are out of date — run: dart run build_runner build\"; exit 1; fi; echo \"Generated files are up to date.\""}).
-				`else echo "Generated files are up to date."; fi`}).
 		Stdout(ctx)
 }
 
@@ -814,14 +818,7 @@ func (m *Ci) DeployApk(
 // Returns a flat directory with app-debug.apk and app-debug-androidTest.apk.
 func (m *Ci) BuildAndroidDebugApks() *dagger.Directory {
 	built := m.firebaseBase().
-		// `flutter build apk` spawns a Gradle daemon. When this WithExec ends the
+		WithExec([]string{"flutter", "build", "apk", "--debug", "--no-pub"}).
-		// container is torn down and the daemon is killed, but its journal-cache
-		// lock file on the persistent gradle-cache volume keeps its dead PID — the
-		// next gradlew invocation then times out waiting for that lock. `gradlew
-		// --stop` shuts the daemon down gracefully so the lock is released before
-		// Dagger snapshots the layer.
-		WithExec([]string{"/bin/bash", "-c",
-			`flutter build apk --debug --no-pub && (cd android && ./gradlew --stop)`}).
 		WithWorkdir("/src/android").
 		// --no-daemon avoids connecting to a stale daemon whose registry file was
 		// preserved in the Dagger layer snapshot but whose process no longer exists.
@@ -903,7 +900,7 @@ func withGoCache(c *dagger.Container) *dagger.Container {
 		WithEnvVariable("GOMODCACHE", "/home/ci/go/pkg/mod")
 }
 
-// UploadToPlayStore uploads a pre-built AAB to the Play Store internal and closed-testing (alpha) tracks.
+// UploadToPlayStore uploads a pre-built AAB to the Play Store internal track.
 func (m *Ci) UploadToPlayStore(
 	ctx context.Context,
 	aab *dagger.File,

flake.lock

@@ -0,0 +1,82 @@
+{
+  "nodes": {
+    "dagger": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1778107833,
+        "narHash": "sha256-q5XQep2mpgTPiWwuYB1+L2dsFeACT6sHx8J939iM+HE=",
+        "owner": "dagger",
+        "repo": "nix",
+        "rev": "873cc22ba46b73d4a6c1aa6c102ef3aabc736496",
+        "type": "github"
+      },
+      "original": {
+        "owner": "dagger",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1778737229,
+        "narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "dagger": "dagger",
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,164 @@
+{
+  description = "SharedInbox — IMAP/SMTP Flutter client";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
+    flake-utils.url = "github:numtide/flake-utils";
+    dagger.url = "github:dagger/nix";
+    dagger.inputs.nixpkgs.follows = "nixpkgs";
+  };
+
+  outputs = { self, nixpkgs, flake-utils, dagger }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+
+        # All Linux desktop runtime libraries needed by flutter build linux and
+        # the UI integration tests (xvfb-run).  Kept as a list so we can reuse
+        # it for both buildInputs and LD_LIBRARY_PATH / PKG_CONFIG_PATH.
+        linuxDesktopLibs = with pkgs; [
+          gtk3
+          libsecret
+          fontconfig
+          libepoxy
+          mesa
+          libGL        # libglvnd — vendor-neutral GL/EGL/GLX dispatch layer
+          at-spi2-core
+          glib
+          pango
+          cairo
+          gdk-pixbuf
+          harfbuzz
+        # Dagger remote setup dependencies
+        stunnel
+        netcat
+        ];
+
+        fgj = pkgs.stdenv.mkDerivation {
+          pname = "fgj";
+          version = "0.4.0";
+          src = pkgs.fetchurl {
+            url = "https://codeberg.org/romaintb/fgj/releases/download/v0.4.0/fgj_linux_amd64";
+            sha256 = "07pia03facvvxq9i1dgl7p47ccv1iqj4drpkp45gvw26d4afkbj7";
+          };
+          dontUnpack = true;
+          installPhase = ''
+            mkdir -p $out/bin
+            cp $src $out/bin/fgj
+            chmod +x $out/bin/fgj
+          '';
+        };
+
+        # The dagger/nix flake pins 0.20.8, whose Nix wrapper is a broken self-exec
+        # loop.  Fetch 0.21.4 directly so the pre-commit dart-check hook can run.
+        dagger021 = pkgs.stdenv.mkDerivation {
+          pname = "dagger";
+          version = "0.21.4";
+          src = pkgs.fetchurl {
+            url = "https://dl.dagger.io/dagger/releases/0.21.4/dagger_v0.21.4_linux_amd64.tar.gz";
+            sha256 = "0wlnbr4g5069755131yjp2a6alacn64f1c8b27xn0cbynq3zicjd";
+          };
+          sourceRoot = ".";
+          installPhase = ''
+            mkdir -p $out/bin
+            cp dagger $out/bin/dagger
+            chmod +x $out/bin/dagger
+          '';
+        };
+      in {
+        devShells.default = pkgs.mkShell {
+          buildInputs = with pkgs; [
+            # Dagger CLI
+            dagger021
+
+            # Go compiler — for Dagger development
+            go
+
+            # Java JDK — required by Gradle for Android builds
+
+            # Task runner
+            go-task
+
+            # Flutter version manager — needed for host builds (task build-linux, task run)
+            fvm
+
+            # Git hooks
+            pre-commit
+
+            # Linux desktop build + runtime dependencies (flutter build linux / task run)
+          ] ++ linuxDesktopLibs ++ (with pkgs; [
+            pkg-config
+            clang
+            cmake
+            ninja
+
+            # Local IMAP/SMTP dev server for integration tests
+            stalwart-mail
+
+            # Headless display for UI integration tests
+            xvfb-run          # wraps Xvfb; xvfb-run --auto-servernum ...
+
+            # Coverage merging (flutter test --merge-coverage requires lcov)
+            lcov
+
+            # Website
+            hugo
+
+            # Utilities
+            git
+            curl
+            jq
+            sqlite
+            # python3 base + Google Play API client (for scripts/deploy_playstore.py)
+            (python3.withPackages (ps: with ps; [
+              google-api-python-client
+              google-auth-httplib2
+              httplib2
+            ]))  # used by stalwart-dev/start and deploy_playstore.py
+            fgj      # Codeberg/Forgejo CLI (like gh for GitHub)
+            skopeo   # inspect OCI image manifests without pulling layers (used by check-ci-images)
+            librsvg  # rsvg-convert — SVG→PNG for generate-icons task
+          ]);
+
+          shellHook = ''
+            # nix develop --command does not set IN_NIX_SHELL; set it so _preflight passes in CI
+            export IN_NIX_SHELL=1
+
+            # Point Dagger client at the running engine socket
+            export DAGGER_HOST=unix:///run/dagger/engine.sock
+
+            # Disable Flutter telemetry inside dev shell
+            export FLUTTER_SUPPRESS_ANALYTICS=true
+
+            # Expose dev headers to cmake's FindPkgConfig.
+            # The nix pkg-config wrapper works in bash but cmake invokes pkg-config
+            # as a subprocess and needs PKG_CONFIG_PATH set explicitly.
+            export PKG_CONFIG_PATH="${pkgs.gtk3.dev}/lib/pkgconfig:${pkgs.glib.dev}/lib/pkgconfig:${pkgs.pango.dev}/lib/pkgconfig:${pkgs.cairo.dev}/lib/pkgconfig:${pkgs.gdk-pixbuf.dev}/lib/pkgconfig:${pkgs.at-spi2-core.dev}/lib/pkgconfig:${pkgs.harfbuzz.dev}/lib/pkgconfig:${pkgs.libsecret}/lib/pkgconfig:${pkgs.fontconfig.dev}/lib/pkgconfig:${pkgs.libepoxy}/lib/pkgconfig:$PKG_CONFIG_PATH"
+
+            # Nix ld uses --no-copy-dt-needed-entries (strict mode): transitive shared-lib
+            # deps are not followed automatically, so link them explicitly.
+            export LDFLAGS="-L${pkgs.fontconfig.lib}/lib -lfontconfig $LDFLAGS"
+
+            # Make nix-built runtime libs visible to the dynamic linker so the
+            # Flutter Linux bundle and integration-ui tests can run.
+            export LD_LIBRARY_PATH="${pkgs.lib.makeLibraryPath linuxDesktopLibs}:$LD_LIBRARY_PATH"
+
+            # Wire the libglvnd dispatch to the nix mesa vendor ICDs so GTK/Flutter
+            # can create an OpenGL (EGL + GLX) context under Xvfb without a real GPU.
+            export __EGL_VENDOR_LIBRARY_DIRS="${pkgs.mesa}/share/glvnd/egl_vendor.d"
+            export __GLX_VENDOR_LIBRARY_DIRS="${pkgs.mesa}/lib"
+            export LIBGL_ALWAYS_SOFTWARE=1
+            export MESA_LOADER_DRIVER_OVERRIDE=softpipe
+
+            echo "SharedInbox Flutter dev environment ready."
+            echo "  Analyze        : task analyze"
+            echo "  Unit tests     : task test"
+            echo "  Integration    : task integration"
+            echo "  All checks     : task check"
+            echo "  Run (Linux)    : task run"
+            echo "  Start Stalwart : stalwart-dev/start"
+          '';
+        };
+      }
+    );
+}

lib/core/db_schema_version.dart

@@ -1 +1 @@
-const int dbSchemaVersion = 41;
+const int dbSchemaVersion = 40;

lib/data/db/database.dart

@@ -679,116 +679,6 @@ class AppDatabase extends _$AppDatabase {
           if (from < 40) {
             await m.createTable(installedVersions);
           }
-          if (from < 41) {
-            // Fix IMAP email IDs to include mailboxPath, preventing UID
-            // collisions across mailboxes (IMAP UIDs are mailbox-scoped).
-            // New format: "accountId:mailboxPath:uid" (was "accountId:uid").
-            //
-            // defer_foreign_keys defers the email_bodies→emails FK check
-            // to COMMIT so the two tables can be updated sequentially inside
-            // the migration transaction without a transient FK violation.
-            await customStatement('PRAGMA defer_foreign_keys = ON');
-
-            // 1. Remap email_bodies.email_id before emails.id changes.
-            await customStatement('''
-              UPDATE email_bodies
-              SET email_id = (
-                SELECT e.account_id || ':' || e.mailbox_path || ':' || CAST(e.uid AS TEXT)
-                FROM emails e
-                JOIN accounts a ON a.id = e.account_id
-                WHERE e.id = email_bodies.email_id
-                  AND a.account_type = 'imap'
-              )
-              WHERE EXISTS (
-                SELECT 1 FROM emails e
-                JOIN accounts a ON a.id = e.account_id
-                WHERE e.id = email_bodies.email_id
-                  AND a.account_type = 'imap'
-              )
-            ''');
-
-            // 2. Update emails.thread_id where it was set to the email's own
-            //    id (fallback for messages with no Message-ID header).
-            await customStatement('''
-              UPDATE emails
-              SET thread_id = account_id || ':' || mailbox_path || ':' || CAST(uid AS TEXT)
-              WHERE account_id IN (SELECT id FROM accounts WHERE account_type = 'imap')
-                AND thread_id = id
-            ''');
-
-            // 3. Update the primary key on emails.
-            await customStatement('''
-              UPDATE emails
-              SET id = account_id || ':' || mailbox_path || ':' || CAST(uid AS TEXT)
-              WHERE account_id IN (
-                SELECT id FROM accounts WHERE account_type = 'imap'
-              )
-            ''');
-
-            // 5. Rebuild threads for IMAP accounts from the updated email rows.
-            //    The threads table stores denormalised data (latest_email_id,
-            //    email_ids_json) that references email IDs, so it is simpler to
-            //    delete and reconstruct than to patch the JSON in SQL.
-            await customStatement('''
-              DELETE FROM threads
-              WHERE account_id IN (SELECT id FROM accounts WHERE account_type = 'imap')
-            ''');
-
-            final imapAccounts = await (select(accounts)
-                  ..where((t) => t.accountType.equals('imap')))
-                .get();
-            for (final acct in imapAccounts) {
-              final emailRows = await (select(emails)
-                    ..where((t) => t.accountId.equals(acct.id)))
-                  .get();
-
-              final groups = <String, List<Email>>{};
-              for (final row in emailRows) {
-                final key = '${row.mailboxPath}:${row.threadId ?? row.id}';
-                groups.putIfAbsent(key, () => []).add(row);
-              }
-
-              for (final threadEmails in groups.values) {
-                threadEmails.sort((a, b) {
-                  final da = a.sentAt ?? a.receivedAt;
-                  final db = b.sentAt ?? b.receivedAt;
-                  return da.compareTo(db);
-                });
-                final latest = threadEmails.last;
-
-                final seen = <String>{};
-                final participants = <Map<String, dynamic>>[];
-                for (final e in threadEmails) {
-                  final from = jsonDecode(e.fromJson) as List<dynamic>;
-                  for (final a in from.cast<Map<String, dynamic>>()) {
-                    final email = a['email'] as String;
-                    if (seen.add(email)) {
-                      participants.add({'name': a['name'], 'email': email});
-                    }
-                  }
-                }
-
-                await into(threads).insert(
-                  ThreadsCompanion.insert(
-                    id: latest.threadId ?? latest.id,
-                    accountId: latest.accountId,
-                    mailboxPath: latest.mailboxPath,
-                    subject: Value(latest.subject),
-                    latestDate: latest.sentAt ?? latest.receivedAt,
-                    messageCount: Value(threadEmails.length),
-                    hasUnread: Value(threadEmails.any((e) => !e.isSeen)),
-                    isFlagged: Value(threadEmails.any((e) => e.isFlagged)),
-                    participantsJson: Value(jsonEncode(participants)),
-                    preview: Value(latest.preview),
-                    latestEmailId: latest.id,
-                    emailIdsJson: Value(
-                      jsonEncode(threadEmails.map((e) => e.id).toList()),
-                    ),
-                  ),
-                );
-              }
-            }
-          }
         },
       );
 

lib/data/repositories/email_repository_impl.dart

@@ -561,7 +561,7 @@ class EmailRepositoryImpl implements EmailRepository {
     for (final msg in result.messages) {
       final uid = msg.uid;
       if (uid == null) continue;
-      final emailId = '${account.id}:$mailboxPath:$uid';
+      final emailId = '${account.id}:$uid';
       await (_db.update(_db.emails)..where((t) => t.id.equals(emailId))).write(
         EmailsCompanion(
           isSeen: Value(msg.flags?.contains(r'\Seen') ?? false),
@@ -616,7 +616,7 @@ class EmailRepositoryImpl implements EmailRepository {
           continue;
         }
         bytes += msg.size ?? 0;
-        final emailId = '${account.id}:$mailboxPath:$uid';
+        final emailId = '${account.id}:$uid';
         final msgId = envelope.messageId?.trim();
         final inReplyTo = envelope.inReplyTo?.trim();
         final refs = msg.getHeaderValue('References')?.trim();

lib/ui/screens/email_detail_screen.dart

@@ -74,6 +74,10 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
     return Scaffold(
       appBar: AppBar(
         automaticallyImplyLeading: !isMobile,
+        title: Text(
+          header?.subject ?? '(loading…)',
+          overflow: TextOverflow.ellipsis,
+        ),
         actions: [
           IconButton(
             icon: const Icon(Icons.reply),
@@ -129,20 +133,12 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
               if (mounted) setState(() => _isFlagged = next);
             },
           ),
-          IconButton(
-            icon: const Icon(Icons.report_outlined),
-            tooltip: 'Mark as spam',
-            onPressed: header == null
-                ? null
-                : () {
-                    unawaited(_markAsSpam(context, header));
-                  },
-          ),
           PopupMenuButton<String>(
             itemBuilder: (ctx) => [
               const PopupMenuItem(value: 'forward', child: Text('Forward')),
               const PopupMenuItem(value: 'move', child: Text('Move to folder')),
               const PopupMenuItem(value: 'snooze', child: Text('Snooze')),
+              const PopupMenuItem(value: 'spam', child: Text('Mark as spam')),
               const PopupMenuItem(
                 value: 'mark_unread',
                 child: Text('Mark as unread'),
@@ -170,6 +166,8 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
                 unawaited(_moveTo(context, header));
               } else if (value == 'snooze' && header != null) {
                 unawaited(_snooze(context, header));
+              } else if (value == 'spam' && header != null) {
+                unawaited(_markAsSpam(context, header));
               } else if (value == 'mark_unread') {
                 final nextEmailId = await _getNextEmailIdIfNeeded(header);
                 await repo.setFlag(widget.emailId, seen: false);
@@ -239,10 +237,6 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
                       ScaffoldMessenger.of(ctx).showSnackBar(
                         SnackBar(
                           duration: const Duration(seconds: 3),
-                          // SnackBar defaults to persist=true when an action
-                          // is set, which disables the auto-dismiss timer.
-                          // Explicitly opt back into duration-based dismiss.
-                          persist: false,
                           content: const Text(
                             'Images will be loaded automatically for this sender.',
                           ),

lib/ui/screens/thread_detail_screen.dart

@@ -214,10 +214,6 @@ class _EmailMessageCardState extends ConsumerState<_EmailMessageCard> {
                             ScaffoldMessenger.of(context).showSnackBar(
                               SnackBar(
                                 duration: const Duration(seconds: 3),
-                                // SnackBar defaults to persist=true when an
-                                // action is set, which disables auto-dismiss.
-                                // Explicitly opt into duration-based dismiss.
-                                persist: false,
                                 content: const Text(
                                   'Images will be loaded automatically for this sender.',
                                 ),

lib/ui/screens/undo_log_detail_screen.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:go_router/go_router.dart';
 import 'package:intl/intl.dart';
 import 'package:sharedinbox/core/models/email.dart';
 import 'package:sharedinbox/core/models/undo_action.dart';
@@ -94,9 +93,7 @@ class UndoLogDetailScreen extends ConsumerWidget {
                 style: theme.textTheme.bodySmall,
               ),
             ),
-          ...action.originalEmails.map(
+          ...action.originalEmails.map((email) => _EmailTile(email: email)),
-            (email) => _EmailTile(email: email, accountId: action.accountId),
-          ),
         ],
       ),
     );
@@ -123,14 +120,13 @@ class _SectionHeader extends StatelessWidget {
   }
 }
 
-class _EmailTile extends ConsumerWidget {
+class _EmailTile extends StatelessWidget {
-  const _EmailTile({required this.email, required this.accountId});
+  const _EmailTile({required this.email});
 
   final Email email;
-  final String accountId;
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
+  Widget build(BuildContext context) {
     final sender = email.from.isNotEmpty
         ? (email.from.first.name ?? email.from.first.email)
         : '(Unknown Sender)';
@@ -138,43 +134,6 @@ class _EmailTile extends ConsumerWidget {
       leading: const Icon(Icons.email_outlined),
       title: Text(email.subject ?? '(No Subject)'),
       subtitle: Text(sender, maxLines: 1, overflow: TextOverflow.ellipsis),
-      trailing: const Icon(Icons.chevron_right),
-      onTap: () => _openEmail(context, ref),
-    );
-  }
-
-  Future<void> _openEmail(BuildContext context, WidgetRef ref) async {
-    final messageId = email.messageId;
-    final messenger = ScaffoldMessenger.of(context);
-    if (messageId == null) {
-      messenger.showSnackBar(
-        const SnackBar(
-          duration: Duration(seconds: 5),
-          content: Text('Cannot locate this email — no Message-ID.'),
-        ),
-      );
-      return;
-    }
-    final found = await ref
-        .read(emailRepositoryProvider)
-        .findEmailByMessageId(accountId, messageId);
-    if (!context.mounted) return;
-    if (found == null) {
-      messenger.showSnackBar(
-        const SnackBar(
-          duration: Duration(seconds: 5),
-          content: Text(
-            'Email no longer exists at its previous location. '
-            'Use Undo to restore it.',
-          ),
-        ),
-      );
-      return;
-    }
-    context.go(
-      '/accounts/$accountId'
-      '/mailboxes/${Uri.encodeComponent(found.mailboxPath)}'
-      '/emails/${Uri.encodeComponent(found.id)}',
     );
   }
 }

pubspec.lock

@@ -5,18 +5,18 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: a49d6cf99e8d8e7a8e93668d09ced0bbdb954d0b4fccc2f5f9241c6b87fad95c
+      sha256: "8d7ff3948166b8ec5da0fbb5962000926b8e02f2ed9b3e51d1738905fbd4c98d"
       url: "https://pub.dev"
     source: hosted
-    version: "99.0.0"
+    version: "93.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "663efa951fb8a45e06f491223a604c93820598f20e6a99c25617a1576065e8b7"
+      sha256: de7148ed2fcec579b19f122c1800933dfa028f6d9fd38a152b04b1516cec120b
       url: "https://pub.dev"
     source: hosted
-    version: "12.1.0"
+    version: "10.0.1"
   archive:
     dependency: transitive
     description:
@@ -165,10 +165,10 @@ packages:
     dependency: transitive
     description:
       name: code_assets
-      sha256: bf394f466ba9205f1812a0433b392d6af280f155f56651eda7c18cc32ed493b8
+      sha256: "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.0.0"
   code_builder:
     dependency: transitive
     description:
@@ -237,18 +237,18 @@ packages:
     dependency: transitive
     description:
       name: dart_style
-      sha256: a4c1ccfee44c7e75ed80484071a5c142a385345e658fd8bd7c4b5c97e7198f98
+      sha256: "29f7ecc274a86d32920b1d9cfc7502fa87220da41ec60b55f329559d5732e2b2"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.8"
+    version: "3.1.7"
   dbus:
     dependency: transitive
     description:
       name: dbus
-      sha256: "0ce9b0a839e6dee59a37a623d2fc26a35bbbe6404213e419b0d6411023d62645"
+      sha256: d0c98dcd4f5169878b6cf8f6e0a52403a9dff371a3e2f019697accbf6f44a270
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.14"
+    version: "0.7.12"
   device_info_plus:
     dependency: "direct main"
     description:
@@ -349,10 +349,10 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: fc83774ce5bd7ce08168333b5e53dbe9090ec04eb21e7aa7cd7bac921032c934
+      sha256: "0204695694b687b167fd497da5252e9f4aaa162e8d274d6fa1e757380f2a5f46"
       url: "https://pub.dev"
     source: hosted
-    version: "12.0.0-beta.5"
+    version: "12.0.0-beta.4"
   fixnum:
     dependency: transitive
     description:
@@ -391,42 +391,34 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      sha256: be38e3854d2baabcda8e16966a5fe8748cebb655bb94701494da0f052c2fc352
+      sha256: "0d9035862236fe38250fe1644d7ed3b8254e34a21b2c837c9f539fbb3bba5ef1"
       url: "https://pub.dev"
     source: hosted
-    version: "22.0.0"
+    version: "21.0.0"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
       name: flutter_local_notifications_linux
-      sha256: "9ca97e63776f29ab1b955725c09999fc2c150523269db150c39274f2a43c5a8b"
+      sha256: e0f25e243c6c44c825bbbc6b2b2e76f7d9222362adcfe9fd780bf01923c840bd
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.1"
+    version: "8.0.0"
   flutter_local_notifications_platform_interface:
     dependency: transitive
     description:
       name: flutter_local_notifications_platform_interface
-      sha256: ff0013eae795e8dc8fad4a8992a209e64d3ba2fbd8bf5e43c36bf448f95bd814
+      sha256: e7db3d5b49c2b7ecc68deba4aaaa67a348f92ee0fef34c8e4b4459dbef0d7307
       url: "https://pub.dev"
     source: hosted
-    version: "12.0.0"
+    version: "11.0.0"
-  flutter_local_notifications_web:
-    dependency: transitive
-    description:
-      name: flutter_local_notifications_web
-      sha256: "516afaf97a2d1e67a036c6617321b00d205d72f7a67b6eccf936cd565f985878"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
   flutter_local_notifications_windows:
     dependency: transitive
     description:
       name: flutter_local_notifications_windows
-      sha256: "5aeed973a0c1480706784fad05c5c3a911335ebb561b2274b47fe80b375201e1"
+      sha256: "3a2654ba104fbb52c618ebed9def24ef270228470718c43b3a6afcd5c81bef0c"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.0.0"
   flutter_markdown_plus:
     dependency: "direct main"
     description:
@@ -439,10 +431,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: "3854fe5e3bff0b113c658f260b90c95dea17c92db0f2addeac2e343dd9969785"
+      sha256: "38d1c268de9097ff59cf0e844ac38759fc78f76836d37edad06fa21e182055a0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.35"
+    version: "2.0.34"
   flutter_riverpod:
     dependency: "direct main"
     description:
@@ -455,10 +447,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_secure_storage
-      sha256: "7686b1d6a29985dcbb808c59518226e603e3bfa7c0ddfd1a0d00e4cda77c868e"
+      sha256: d2a6ac2df7353f5ca47eb159a5407c1dba7ec48ca0e02dc38c9ff4d29447b261
       url: "https://pub.dev"
     source: hosted
-    version: "10.3.1"
+    version: "10.3.0"
   flutter_secure_storage_darwin:
     dependency: transitive
     description:
@@ -534,10 +526,10 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: "5922b2861e2235a3504896f0d6fa07d84141b480cf52eecd2f42cd25585a9e8a"
+      sha256: "92d8cee7c57dff0a6c409c05597b460002434eccf7424a712283225b3962d03f"
       url: "https://pub.dev"
     source: hosted
-    version: "17.3.0"
+    version: "17.2.3"
   graphs:
     dependency: transitive
     description:
@@ -550,10 +542,10 @@ packages:
     dependency: transitive
     description:
       name: hooks
-      sha256: "9a62a50b50b769a737bc0a8ff381f333529df3ab746b2f6b02e83760231455ba"
+      sha256: "025f060e86d2d4c3c47b56e33caf7f93bf9283340f26d23424ebcfccf34f621e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "1.0.3"
   http:
     dependency: "direct main"
     description:
@@ -683,10 +675,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
+      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.17.0"
   mime:
     dependency: "direct main"
     description:
@@ -715,10 +707,10 @@ packages:
     dependency: transitive
     description:
       name: native_toolchain_c
-      sha256: f59351d28f49520cd3a74eb1f41c5f19ae15e53c65a3231d14af672e46510a96
+      sha256: "6ba77bb18063eebe9de401f5e6437e95e1438af0a87a3a39084fbd37c90df572"
       url: "https://pub.dev"
     source: hosted
-    version: "0.19.1"
+    version: "0.17.6"
   node_preamble:
     dependency: transitive
     description:
@@ -731,10 +723,10 @@ packages:
     dependency: transitive
     description:
       name: objective_c
-      sha256: "6cb691c686fa2838c6deb34980d426145c2a5d537491cb83d463c33cdbc726ed"
+      sha256: "100a1c87616ab6ed41ec263b083c0ef3261ee6cd1dc3b0f35f8ddfa4f996fe52"
       url: "https://pub.dev"
     source: hosted
-    version: "9.4.1"
+    version: "9.3.0"
   open_filex:
     dependency: "direct main"
     description:
@@ -1021,13 +1013,13 @@ packages:
     source: hosted
     version: "1.10.2"
   sqlite3:
-    dependency: "direct main"
+    dependency: "direct dev"
     description:
       name: sqlite3
-      sha256: "9488c7d2cdb1091c91cacf7e207cff81b28bff8e366f042bad3afe7d34afe189"
+      sha256: "56da3e13ed7d28a66f930aa2b2b29db6736a233f08283326e96321dd812030f5"
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.2"
+    version: "3.3.1"
   sqlite3_flutter_libs:
     dependency: "direct main"
     description:
@@ -1096,10 +1088,10 @@ packages:
     dependency: transitive
     description:
       name: synchronized
-      sha256: "93b153dcb6a26dcddee6ca087dd634b53e38c10b5aa163e8e49501a776456153"
+      sha256: "63896c27e81b28f8cb4e69ead0d3e8f03f1d1e5fc531a3e579cabed6a2c7c9e5"
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.1"
+    version: "3.4.0+1"
   term_glyph:
     dependency: transitive
     description:
@@ -1112,26 +1104,26 @@ packages:
     dependency: "direct dev"
     description:
       name: test
-      sha256: "8d9ceddbab833f180fbefed08afa76d7c03513dfdba87ffcec2718b02bbcbf20"
+      sha256: "280d6d890011ca966ad08df7e8a4ddfab0fb3aa49f96ed6de56e3521347a9ae7"
       url: "https://pub.dev"
     source: hosted
-    version: "1.31.0"
+    version: "1.30.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e"
+      sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.11"
+    version: "0.7.10"
   test_core:
     dependency: transitive
     description:
       name: test_core
-      sha256: "1991d4cfe85d5043241acac92962c3977c8d2f2add1ee73130c7b286417d1d34"
+      sha256: "0381bd1585d1a924763c308100f2138205252fb90c9d4eeaf28489ee65ccde51"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.17"
+    version: "0.6.16"
   timezone:
     dependency: transitive
     description:
@@ -1296,10 +1288,10 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: a97db7a44f8e71af2f3971c45550a08cce1fb60059c1b8e534251e6cfb753490
+      sha256: ad5182eff9a550925330cb9f0cb038eddfdd5712aba8b77aa0f0400e50f6e688
       url: "https://pub.dev"
     source: hosted
-    version: "4.13.0"
+    version: "4.12.0"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
@@ -1312,10 +1304,10 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: c879dd64b87c452aa84381b244d5469da57ba7e8cca6884c7b1e0d406372c12d
+      sha256: "82648217f537573e1ca9ae9952d3eacedca6ab5aee69dc84445fc763766dcea2"
       url: "https://pub.dev"
     source: hosted
-    version: "3.26.0"
+    version: "3.25.1"
   win32:
     dependency: transitive
     description:
@@ -1389,5 +1381,5 @@ packages:
     source: hosted
     version: "3.1.3"
 sdks:
-  dart: ">=3.12.0 <4.0.0"
+  dart: ">=3.11.0 <4.0.0"
-  flutter: ">=3.44.0"
+  flutter: ">=3.38.4"

pubspec.yaml

@@ -28,7 +28,7 @@ dependencies:
   flutter_riverpod: ^3.0.0
 
   # Navigation
-  go_router: ^17.3.0
+  go_router: ^17.2.3
 
   # Secure credential storage (passwords)
   flutter_secure_storage: ^10.0.0
@@ -37,7 +37,7 @@ dependencies:
   intl: ^0.20.2
 
   # File picking (compose attachments) and opening downloaded attachments
-  file_picker: ^12.0.0-beta.5
+  file_picker: ^12.0.0-beta.4
   open_filex: ^4.6.0
   mime: ^2.0.0
 
@@ -56,7 +56,7 @@ dependencies:
   flutter_markdown_plus: ^1.0.7
 
   # Background sync and local notifications
-  flutter_local_notifications: ^22.0.0
+  flutter_local_notifications: ^21.0.0
   workmanager: ^0.9.0
 
   # Stack trace chain-to-VM conversion for FlutterError.demangleStackTrace

scripts/check_dagger_versions.sh

@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-# Verify that the Dagger version is consistent across the project.
-#
-# The Dagger CLI must speak the same protocol as the engine it talks to.  We
-# pin the version in four places (engine image in DAGGER.md, the CLI in
-# flake.nix, the CLI in the Forgejo runner Dockerfile, and the module
-# engineVersion in ci/dagger.json).  This script fails if any of them drift.
-set -euo pipefail
-
-ROOT=$(git rev-parse --show-toplevel)
-
-# ci/dagger.json — strip leading "v" for comparison.
-dagger_json=$(grep -oE '"engineVersion"[[:space:]]*:[[:space:]]*"[^"]+"' "$ROOT/ci/dagger.json" \
-  | sed -E 's/.*"v?([^"]+)"$/\1/')
-
-# .forgejo/Dockerfile — DAGGER_VERSION env on the install line.
-dockerfile=$(grep -oE 'DAGGER_VERSION=[0-9]+\.[0-9]+\.[0-9]+' "$ROOT/.forgejo/Dockerfile" \
-  | head -n1 \
-  | cut -d= -f2)
-
-# DAGGER.md — engine image tag in the example systemd unit.
-dagger_md=$(grep -oE 'dagger/nix/v[0-9]+\.[0-9]+\.[0-9]+' "$ROOT/DAGGER.md" \
-  | head -n1 \
-  | sed -E 's@.*/v@@')
-
-printf 'ci/dagger.json    engineVersion = v%s\n' "$dagger_json"
-printf '.forgejo/Dockerf. DAGGER_VERSION= %s\n'  "$dockerfile"
-printf 'DAGGER.md         engine tag    = v%s\n' "$dagger_md"
-
-for v in "$dockerfile" "$dagger_md"; do
-  if [ -z "$v" ]; then
-    echo "ERROR: failed to parse a Dagger version reference." >&2
-    exit 1
-  fi
-  if [ "$v" != "$dagger_json" ]; then
-    echo "" >&2
-    echo "ERROR: Dagger versions are out of sync." >&2
-    echo "  Align ci/dagger.json, .forgejo/Dockerfile and DAGGER.md to the same version." >&2
-    exit 1
-  fi
-done
-
-echo "Dagger versions aligned (v$dagger_json)."

scripts/deploy_playstore.py

@@ -1,11 +1,5 @@
 #!/usr/bin/env python3
-"""Upload an Android App Bundle to the Google Play Store.
+"""Upload an Android App Bundle to the Google Play Store internal track."""
-
-The bundle is published to every track in ``TRACKS`` within a single Play edit,
-so internal testing and closed testing share the same version code. ``alpha``
-is what the Play Console labels "Closed testing"; publishing there removes the
-need to manually drag-and-drop the AAB into the closed-testing release form.
-"""
 
 import json
 import os
@@ -17,7 +11,7 @@ from google.oauth2 import service_account
 
 PACKAGE_NAME = "de.sharedinbox.mua"
 AAB_PATH = "build/app/outputs/bundle/release/app-release.aab"
-TRACKS = ("internal", "alpha")
+TRACK = "internal"
 _BASE = "https://androidpublisher.googleapis.com/androidpublisher/v3/applications"
 _UPLOAD_BASE = "https://androidpublisher.googleapis.com/upload/androidpublisher/v3/applications"
 _MAX_UPLOAD_ATTEMPTS = 3
@@ -100,20 +94,19 @@ def main():
     version_code = bundle["versionCode"]
     print(f"Uploaded AAB, version code: {version_code}")
 
-    for track in TRACKS:
+    track_resp = session.put(
-        track_resp = session.put(
+        f"{_BASE}/{PACKAGE_NAME}/edits/{edit_id}/tracks/{TRACK}",
-            f"{_BASE}/{PACKAGE_NAME}/edits/{edit_id}/tracks/{track}",
+        json={"releases": [{"versionCodes": [version_code], "status": "completed"}]},
-            json={"releases": [{"versionCodes": [version_code], "status": "completed"}]},
+        timeout=30,
-            timeout=30,
+    )
-        )
+    track_resp.raise_for_status()
-        track_resp.raise_for_status()
 
     commit_resp = session.post(
         f"{_BASE}/{PACKAGE_NAME}/edits/{edit_id}:commit",
         timeout=30,
     )
     commit_resp.raise_for_status()
-    print(f"Deployed version {version_code} to tracks: {', '.join(TRACKS)}")
+    print(f"Deployed version {version_code} to {TRACK} track")
 
 
 if __name__ == "__main__":

scripts/test_deploy_playstore.py

@@ -95,30 +95,6 @@ class TestMainHappyPath(unittest.TestCase):
         track_call = session.put.call_args_list[0]
         self.assertIn("/tracks/", track_call[0][0])
 
-    def test_updates_all_configured_tracks(self):
-        session = self._run_main()
-        track_urls = [c[0][0] for c in session.put.call_args_list]
-        self.assertEqual(len(track_urls), len(deploy_playstore.TRACKS))
-        for track in deploy_playstore.TRACKS:
-            self.assertTrue(
-                any(url.endswith(f"/tracks/{track}") for url in track_urls),
-                f"no PUT to /tracks/{track} (saw {track_urls})",
-            )
-
-    def test_commits_after_all_track_updates(self):
-        session = self._run_main()
-        # All PUTs are track updates; commit is the second POST after the
-        # initial edit-create. Verify PUTs precede the commit by checking
-        # mock_calls order across both methods.
-        method_order = [c[0] for c in session.method_calls]
-        commit_idx = next(
-            i for i, m in enumerate(method_order)
-            if m == "post" and ":commit" in session.method_calls[i][1][0]
-        )
-        put_indices = [i for i, m in enumerate(method_order) if m == "put"]
-        self.assertEqual(len(put_indices), len(deploy_playstore.TRACKS))
-        self.assertTrue(all(i < commit_idx for i in put_indices))
-
 
 class TestUploadRetry(unittest.TestCase):
     def _run_main(self, upload_side_effects, sleep_mock=None):

test/unit/email_repository_impl_test.dart

@@ -7,7 +7,6 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart';
 
-import 'package:sharedinbox/core/filter/filter_expression.dart';
 import 'package:sharedinbox/core/models/account.dart';
 import 'package:sharedinbox/core/models/email.dart';
 import 'package:sharedinbox/data/db/database.dart' hide Account;
@@ -263,50 +262,6 @@ void main() {
       expect(emails.map((e) => e.uid).toList(), [3, 2, 1]);
     });
 
-    test('same UID in different mailboxes yields independent emails', () async {
-      // Regression test for the UID collision bug: IMAP UIDs are mailbox-scoped,
-      // so UID 50 in INBOX and UID 50 in Archive must get distinct local IDs.
-      final r = _makeRepos();
-      await r.accounts.addAccount(_account, 'pw');
-
-      // New ID format: accountId:mailboxPath:uid
-      await r.db.into(r.db.emails).insert(
-            EmailsCompanion.insert(
-              id: 'acc-1:INBOX:50',
-              accountId: 'acc-1',
-              mailboxPath: 'INBOX',
-              uid: 50,
-              receivedAt: DateTime(2024),
-            ),
-          );
-      await r.db.into(r.db.emails).insert(
-            EmailsCompanion.insert(
-              id: 'acc-1:Archive:50',
-              accountId: 'acc-1',
-              mailboxPath: 'Archive',
-              uid: 50,
-              receivedAt: DateTime(2024, 1, 2),
-            ),
-          );
-
-      final inboxEmail = await r.emails.getEmail('acc-1:INBOX:50');
-      expect(inboxEmail, isNotNull);
-      expect(inboxEmail!.mailboxPath, 'INBOX');
-
-      final archiveEmail = await r.emails.getEmail('acc-1:Archive:50');
-      expect(archiveEmail, isNotNull);
-      expect(archiveEmail!.mailboxPath, 'Archive');
-
-      final inboxEmails = await r.emails.observeEmails('acc-1', 'INBOX').first;
-      expect(inboxEmails, hasLength(1));
-      expect(inboxEmails.first.id, 'acc-1:INBOX:50');
-
-      final archiveEmails =
-          await r.emails.observeEmails('acc-1', 'Archive').first;
-      expect(archiveEmails, hasLength(1));
-      expect(archiveEmails.first.id, 'acc-1:Archive:50');
-    });
-
     test('syncEmails propagates IMAP error', () async {
       final r = _makeRepos();
       await r.accounts.addAccount(_account, 'pw');
@@ -683,91 +638,6 @@ void main() {
       expect(results[1].subject, 'Older meeting');
     });
 
-    test(
-      'searchEmailsStructured returns results sorted by receivedAt descending',
-      () async {
-        final r = _makeRepos();
-        await r.accounts.addAccount(_account, 'pw');
-
-        await r.db.into(r.db.emails).insert(
-              EmailsCompanion.insert(
-                id: 'acc-1:1',
-                accountId: 'acc-1',
-                mailboxPath: 'INBOX',
-                uid: 1,
-                subject: const Value('Older invoice'),
-                receivedAt: DateTime(2024),
-              ),
-            );
-        await r.db.into(r.db.emails).insert(
-              EmailsCompanion.insert(
-                id: 'acc-1:2',
-                accountId: 'acc-1',
-                mailboxPath: 'INBOX',
-                uid: 2,
-                subject: const Value('Newer invoice'),
-                receivedAt: DateTime(2024, 6),
-              ),
-            );
-
-        final filter = FilterGroup(
-          operator: FilterOperator.and_,
-          children: [
-            FilterLeaf(
-              field: FilterField.subject,
-              comparison: FilterComparison.contains,
-              value: 'invoice',
-            ),
-          ],
-        );
-        final results = await r.emails.searchEmailsStructured(null, filter);
-        expect(results, hasLength(2));
-        expect(results[0].subject, 'Newer invoice');
-        expect(results[1].subject, 'Older invoice');
-      },
-    );
-
-    test(
-      'getEmailsByAddress returns results sorted by receivedAt descending',
-      () async {
-        final r = _makeRepos();
-        await r.accounts.addAccount(_account, 'pw');
-
-        await r.db.into(r.db.emails).insert(
-              EmailsCompanion.insert(
-                id: 'acc-1:1',
-                accountId: 'acc-1',
-                mailboxPath: 'INBOX',
-                uid: 1,
-                subject: const Value('Older hello'),
-                receivedAt: DateTime(2024),
-                fromJson: const Value(
-                  '[{"name":"Bob","email":"bob@example.com"}]',
-                ),
-              ),
-            );
-        await r.db.into(r.db.emails).insert(
-              EmailsCompanion.insert(
-                id: 'acc-1:2',
-                accountId: 'acc-1',
-                mailboxPath: 'INBOX',
-                uid: 2,
-                subject: const Value('Newer hello'),
-                receivedAt: DateTime(2024, 6),
-                fromJson: const Value(
-                  '[{"name":"Bob","email":"bob@example.com"}]',
-                ),
-              ),
-            );
-
-        final results =
-            await r.emails.getEmailsByAddress(null, 'bob@example.com');
-        expect(results, hasLength(2));
-        expect(results[0].subject, 'Newer hello');
-        expect(results[1].subject, 'Older hello');
-      },
-    );
-
     test(
       'searchAddresses returns results sorted by most recently used',
       () async {

test/unit/migration_test.dart

@@ -14,7 +14,7 @@ void main() {
   group('Migration', () {
     test('schemaVersion matches expected value', () async {
       final db = AppDatabase(NativeDatabase.memory());
-      expect(db.schemaVersion, 41);
+      expect(db.schemaVersion, 40);
       await db.close();
     });
 
@@ -435,184 +435,7 @@ void main() {
       },
     );
 
-    test('v40→v41: IMAP email IDs gain mailboxPath segment', () async {
+    test('fresh install creates all tables at schemaVersion 40', () async {
-      final dbFile = File('test_migration_v40.db');
-      if (dbFile.existsSync()) dbFile.deleteSync();
-
-      final rawDb = sqlite.sqlite3.open(dbFile.path);
-      rawDb.execute('''
-        CREATE TABLE accounts (
-          id TEXT NOT NULL PRIMARY KEY,
-          display_name TEXT NOT NULL,
-          email TEXT NOT NULL,
-          imap_host TEXT NOT NULL DEFAULT '',
-          imap_port INTEGER NOT NULL DEFAULT 993,
-          imap_ssl INTEGER NOT NULL DEFAULT 1,
-          smtp_host TEXT NOT NULL DEFAULT '',
-          smtp_port INTEGER NOT NULL DEFAULT 465,
-          smtp_ssl INTEGER NOT NULL DEFAULT 1,
-          account_type TEXT NOT NULL DEFAULT 'imap',
-          jmap_url TEXT NULL,
-          username TEXT NOT NULL DEFAULT '',
-          verbose INTEGER NOT NULL DEFAULT 0,
-          manage_sieve_host TEXT NOT NULL DEFAULT '',
-          manage_sieve_port INTEGER NOT NULL DEFAULT 4190,
-          manage_sieve_ssl INTEGER NOT NULL DEFAULT 1,
-          manage_sieve_available INTEGER NULL
-        )
-      ''');
-      rawDb.execute('''
-        CREATE TABLE emails (
-          id TEXT NOT NULL PRIMARY KEY,
-          account_id TEXT NOT NULL REFERENCES accounts (id) ON DELETE CASCADE,
-          mailbox_path TEXT NOT NULL,
-          uid INTEGER NOT NULL,
-          subject TEXT NULL,
-          sent_at INTEGER NULL,
-          received_at INTEGER NOT NULL,
-          from_json TEXT NOT NULL DEFAULT '[]',
-          to_addresses TEXT NOT NULL DEFAULT '[]',
-          cc_json TEXT NOT NULL DEFAULT '[]',
-          preview TEXT NULL,
-          is_seen INTEGER NOT NULL DEFAULT 0,
-          is_flagged INTEGER NOT NULL DEFAULT 0,
-          has_attachment INTEGER NOT NULL DEFAULT 0,
-          thread_id TEXT NULL,
-          message_id TEXT NULL,
-          in_reply_to TEXT NULL,
-          "references" TEXT NULL,
-          snoozed_until INTEGER NULL,
-          snoozed_from_mailbox_path TEXT NULL,
-          list_unsubscribe_header TEXT NULL
-        )
-      ''');
-      rawDb.execute('''
-        CREATE TABLE email_bodies (
-          email_id TEXT NOT NULL PRIMARY KEY REFERENCES emails (id) ON DELETE CASCADE,
-          text_body TEXT NULL,
-          html_body TEXT NULL,
-          attachments_json TEXT NOT NULL DEFAULT '[]',
-          cached_at INTEGER NULL,
-          headers_json TEXT NULL,
-          mime_tree_json TEXT NULL
-        )
-      ''');
-      rawDb.execute('''
-        CREATE TABLE threads (
-          account_id TEXT NOT NULL REFERENCES accounts (id) ON DELETE CASCADE,
-          mailbox_path TEXT NOT NULL,
-          id TEXT NOT NULL,
-          subject TEXT NULL,
-          latest_date INTEGER NOT NULL,
-          message_count INTEGER NOT NULL DEFAULT 1,
-          has_unread INTEGER NOT NULL DEFAULT 0,
-          is_flagged INTEGER NOT NULL DEFAULT 0,
-          participants_json TEXT NOT NULL DEFAULT '[]',
-          preview TEXT NULL,
-          latest_email_id TEXT NOT NULL,
-          email_ids_json TEXT NOT NULL DEFAULT '[]',
-          PRIMARY KEY (account_id, mailbox_path, id)
-        )
-      ''');
-      rawDb.execute('''
-        CREATE TABLE pending_changes (
-          id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-          account_id TEXT NOT NULL REFERENCES accounts (id) ON DELETE CASCADE,
-          resource_type TEXT NOT NULL,
-          resource_id TEXT NOT NULL,
-          change_type TEXT NOT NULL,
-          payload TEXT NOT NULL,
-          created_at INTEGER NOT NULL,
-          attempts INTEGER NOT NULL DEFAULT 0,
-          last_error TEXT NULL
-        )
-      ''');
-
-      // Insert an IMAP account.
-      rawDb.execute(
-        "INSERT INTO accounts (id, display_name, email) VALUES ('acc-1', 'Alice', 'alice@example.com')",
-      );
-
-      // Two emails with the same UID but in different mailboxes — old format.
-      final now = DateTime.now().millisecondsSinceEpoch ~/ 1000;
-      rawDb.execute(
-        'INSERT INTO emails (id, account_id, mailbox_path, uid, received_at, thread_id) '
-        "VALUES ('acc-1:50', 'acc-1', 'INBOX', 50, $now, 'acc-1:50')",
-      );
-      rawDb.execute(
-        'INSERT INTO emails (id, account_id, mailbox_path, uid, received_at) '
-        "VALUES ('acc-1:50-arch', 'acc-1', 'Archive', 50, $now)",
-      );
-      // A third email with a Message-ID-based thread_id (should not be changed).
-      rawDb.execute(
-        'INSERT INTO emails (id, account_id, mailbox_path, uid, received_at, thread_id) '
-        "VALUES ('acc-1:99', 'acc-1', 'INBOX', 99, $now, '<original@example.com>')",
-      );
-
-      // Email body for the first email.
-      rawDb.execute(
-        "INSERT INTO email_bodies (email_id, text_body) VALUES ('acc-1:50', 'body text')",
-      );
-
-      // Thread for the first email (old-format IDs).
-      rawDb.execute(
-        'INSERT INTO threads (account_id, mailbox_path, id, latest_date, latest_email_id, email_ids_json) '
-        "VALUES ('acc-1', 'INBOX', 'acc-1:50', $now, 'acc-1:50', '[\"acc-1:50\"]')",
-      );
-
-      // A pending change referencing the first email's old ID.
-      rawDb.execute(
-        'INSERT INTO pending_changes (account_id, resource_type, resource_id, change_type, payload, created_at) '
-        "VALUES ('acc-1', 'Email', 'acc-1:50', 'flag_seen', '{\"seen\":true}', $now)",
-      );
-
-      rawDb.execute('PRAGMA user_version = 40');
-      rawDb.close();
-
-      // Open with Drift to trigger the migration.
-      final db = AppDatabase(NativeDatabase(dbFile));
-      await db.select(db.accounts).get();
-
-      // emails.id should now use the accountId:mailboxPath:uid format.
-      final emailRows = await db.select(db.emails).get();
-      final emailIds = emailRows.map((r) => r.id).toSet();
-      expect(emailIds, contains('acc-1:INBOX:50'));
-      expect(emailIds, contains('acc-1:Archive:50'));
-      expect(emailIds, contains('acc-1:INBOX:99'));
-      // Old-format IDs must be gone.
-      expect(emailIds, isNot(contains('acc-1:50')));
-      expect(emailIds, isNot(contains('acc-1:99')));
-
-      // email_bodies.email_id must be updated.
-      final bodyRows = await db.select(db.emailBodies).get();
-      expect(bodyRows, hasLength(1));
-      expect(bodyRows.first.emailId, 'acc-1:INBOX:50');
-
-      // thread_id where it was the email's own ID should be updated.
-      final inboxEmail = emailRows.firstWhere((r) => r.id == 'acc-1:INBOX:50');
-      expect(inboxEmail.threadId, 'acc-1:INBOX:50');
-
-      // thread_id based on a real Message-ID must be left unchanged.
-      final inboxEmail99 =
-          emailRows.firstWhere((r) => r.id == 'acc-1:INBOX:99');
-      expect(inboxEmail99.threadId, '<original@example.com>');
-
-      // threads must be rebuilt with new-format IDs.
-      final threadRows = await db.select(db.threads).get();
-      final thread = threadRows.firstWhere((t) => t.mailboxPath == 'INBOX');
-      expect(thread.latestEmailId, 'acc-1:INBOX:50');
-      expect(thread.emailIdsJson, contains('acc-1:INBOX:50'));
-
-      // pending_changes.resource_id is not updated by the migration
-      // (IMAP operations use payload uid/mailboxPath, so this is safe).
-      final changeRows = await db.select(db.pendingChanges).get();
-      expect(changeRows, hasLength(1));
-
-      await db.close();
-      if (dbFile.existsSync()) dbFile.deleteSync();
-    });
-
-    test('fresh install creates all tables at schemaVersion 41', () async {
       final db = AppDatabase(NativeDatabase.memory());
       await db.select(db.accounts).get();
 

test/widget/email_detail_screen_test.dart

@@ -81,7 +81,7 @@ void main() {
       expect(find.byType(CircularProgressIndicator), findsOneWidget);
     });
 
-    testWidgets('shows subject in email header section', (tester) async {
+    testWidgets('shows subject in app bar after data loads', (tester) async {
       final email = testEmail(subject: 'Project update');
       const body = EmailBody(
         emailId: 'acc-1:42',
@@ -106,8 +106,8 @@ void main() {
       );
       await tester.pumpAndSettle();
 
-      // Subject appears only in the email header section, not in the app bar.
+      // Subject appears in both the app bar and the email header section.
-      expect(find.text('Project update'), findsOneWidget);
+      expect(find.text('Project update'), findsAtLeastNWidgets(1));
       expect(find.text('See attached slides.'), findsOneWidget);
     });
 
@@ -266,7 +266,7 @@ void main() {
       expect(find.textContaining('carol@example.com'), findsAtLeastNWidgets(1));
     });
 
-    testWidgets('Mark as spam is a standalone button, not in popup menu', (
+    testWidgets('Mark as spam is in popup menu, not a standalone button', (
       tester,
     ) async {
       await tester.pumpWidget(
@@ -279,19 +279,19 @@ void main() {
       );
       await tester.pumpAndSettle();
 
-      // Standalone icon button for mark as spam is in the app bar.
+      // No standalone icon button for mark as spam.
       expect(
         find.byWidgetPredicate(
           (w) => w is Tooltip && w.message == 'Mark as spam',
         ),
-        findsOneWidget,
+        findsNothing,
       );
 
-      // It does NOT appear in the popup menu.
+      // It appears in the popup menu.
       await tester.tap(find.byType(PopupMenuButton<String>));
       await tester.pumpAndSettle();
 
-      expect(find.text('Mark as spam'), findsNothing);
+      expect(find.text('Mark as spam'), findsOneWidget);
     });
 
     testWidgets('Mark as spam shows dialog when no junk folder', (
@@ -309,11 +309,11 @@ void main() {
       );
       await tester.pumpAndSettle();
 
-      await tester.tap(
+      // Open the popup menu first, then tap Mark as spam.
-        find.byWidgetPredicate(
+      await tester.tap(find.byType(PopupMenuButton<String>));
-          (w) => w is Tooltip && w.message == 'Mark as spam',
+      await tester.pumpAndSettle();
-        ),
+
-      );
+      await tester.tap(find.text('Mark as spam'));
       await tester.pumpAndSettle();
 
       expect(find.text('No spam folder found'), findsOneWidget);
@@ -582,54 +582,6 @@ void main() {
 
       expect(find.textContaining('Structure not available'), findsOneWidget);
     });
-
-    testWidgets(
-      'Load remote images snack bar auto-dismisses after 3 seconds',
-      (tester) async {
-        const body = EmailBody(
-          emailId: 'acc-1:42',
-          htmlBody: '<p>Hello <img src="https://example.com/x.png"/></p>',
-          attachments: [],
-        );
-        await tester.pumpWidget(
-          buildApp(
-            initialLocation:
-                '/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
-            overrides: _overrides(body: body),
-          ),
-        );
-        await tester.pumpAndSettle();
-
-        // The "Load remote images" button is visible because the sender is
-        // not yet trusted.
-        expect(find.text('Load remote images'), findsOneWidget);
-
-        await tester.tap(find.text('Load remote images'));
-        // Settle the snack bar enter animation and the setState rebuild
-        // that swaps in the image-loading WebView.
-        await tester.pump();
-        await tester.pump(const Duration(milliseconds: 500));
-
-        // Snack bar must be visible.
-        expect(
-          find.text('Images will be loaded automatically for this sender.'),
-          findsOneWidget,
-        );
-
-        // After 3 seconds (the snack bar's duration) plus the reverse
-        // animation, the snack bar must be gone.
-        // Regression test for #484: SnackBar with an action defaults to
-        // persist=true, which disables auto-dismiss — explicit persist:false
-        // restores duration-based dismissal.
-        await tester.pump(const Duration(seconds: 4));
-        await tester.pumpAndSettle();
-
-        expect(
-          find.text('Images will be loaded automatically for this sender.'),
-          findsNothing,
-        );
-      },
-    );
   });
 }
 

test/widget/email_list_screen_test.dart

@@ -446,10 +446,10 @@ void main() {
         await tester.pumpAndSettle();
 
         expect(find.byType(EmailDetailScreen), findsOneWidget);
-        // The detail body header shows the first email's subject.
+        // The detail AppBar title shows the first email's subject.
         expect(
           find.descendant(
-            of: find.byType(EmailDetailScreen),
+            of: find.byType(AppBar),
             matching: find.text('Alpha Match'),
           ),
           findsOneWidget,

test/widget/thread_detail_screen_test.dart

@@ -249,59 +249,5 @@ void main() {
 
       expect(find.text('Body content here'), findsOneWidget);
     });
-
-    testWidgets(
-      'Load remote images snack bar auto-dismisses after 3 seconds',
-      (tester) async {
-        final email = _threadEmail();
-        await tester.pumpWidget(
-          buildApp(
-            initialLocation: '/accounts/acc-1/mailboxes/INBOX/threads/thread-1',
-            overrides: [
-              accountRepositoryProvider.overrideWithValue(
-                FakeAccountRepository([kTestAccount]),
-              ),
-              mailboxRepositoryProvider.overrideWithValue(
-                FakeMailboxRepository(),
-              ),
-              emailRepositoryProvider.overrideWithValue(
-                FakeEmailRepository(
-                  emails: [email],
-                  emailBody: const EmailBody(
-                    emailId: 'acc-1:10',
-                    htmlBody:
-                        '<p>Hi <img src="https://example.com/x.png"/></p>',
-                    attachments: [],
-                  ),
-                ),
-              ),
-            ],
-          ),
-        );
-        await tester.pumpAndSettle();
-
-        expect(find.text('Load remote images'), findsOneWidget);
-
-        await tester.tap(find.text('Load remote images'));
-        await tester.pump();
-        await tester.pump(const Duration(milliseconds: 500));
-
-        expect(
-          find.text('Images will be loaded automatically for this sender.'),
-          findsOneWidget,
-        );
-
-        // Regression test for #484: SnackBar with an action defaults to
-        // persist=true, which disables auto-dismiss — explicit persist:false
-        // restores duration-based dismissal.
-        await tester.pump(const Duration(seconds: 4));
-        await tester.pumpAndSettle();
-
-        expect(
-          find.text('Images will be loaded automatically for this sender.'),
-          findsNothing,
-        );
-      },
-    );
   });
 }

test/widget/undo_log_detail_screen_test.dart

@@ -1,176 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:go_router/go_router.dart';
-
-import 'package:sharedinbox/core/models/email.dart';
-import 'package:sharedinbox/core/models/undo_action.dart';
-import 'package:sharedinbox/di.dart';
-import 'package:sharedinbox/ui/screens/undo_log_detail_screen.dart';
-
-import 'helpers.dart';
-
-// FakeEmailRepository subclass that returns a pre-configured email from
-// findEmailByMessageId, so the tap handler in UndoLogDetailScreen can be
-// exercised without a real database.
-class _LookupEmailRepository extends FakeEmailRepository {
-  _LookupEmailRepository(this._lookup);
-
-  final Email? _lookup;
-
-  @override
-  Future<Email?> findEmailByMessageId(
-    String accountId,
-    String messageId,
-  ) async =>
-      _lookup;
-}
-
-UndoAction _action({
-  required List<Email> originalEmails,
-  String accountId = 'acc-1',
-}) =>
-    UndoAction(
-      id: 'undo-1',
-      accountId: accountId,
-      type: UndoType.move,
-      emailIds: originalEmails.map((e) => e.id).toList(),
-      sourceMailboxPath: 'INBOX',
-      destinationMailboxPath: 'Archive',
-      originalEmails: originalEmails,
-      timestamp: DateTime(2024, 6),
-    );
-
-Email _emailWith({
-  String id = 'acc-1:42',
-  String mailboxPath = 'INBOX',
-  String? messageId = '<msg-1@example.com>',
-}) =>
-    Email(
-      id: id,
-      accountId: 'acc-1',
-      mailboxPath: mailboxPath,
-      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 [],
-      isSeen: false,
-      isFlagged: false,
-      hasAttachment: false,
-      messageId: messageId,
-    );
-
-// Builds a minimal app whose initial location is the undo log detail screen
-// for [action]. A placeholder email-detail route records its visit so the
-// test can assert which path the tap navigated to.
-Widget _buildApp({
-  required UndoAction action,
-  required FakeEmailRepository emailRepo,
-  ValueNotifier<String?>? lastEmailRoute,
-}) {
-  final router = GoRouter(
-    initialLocation: '/undo-detail',
-    routes: [
-      GoRoute(
-        path: '/undo-detail',
-        builder: (ctx, state) => UndoLogDetailScreen(action: action),
-      ),
-      GoRoute(
-        path: '/accounts/:accountId/mailboxes/:mailboxPath/emails/:emailId',
-        builder: (ctx, state) {
-          lastEmailRoute?.value = state.uri.toString();
-          return const Scaffold(body: Text('email-detail-route'));
-        },
-      ),
-    ],
-  );
-
-  return ProviderScope(
-    overrides: [
-      emailRepositoryProvider.overrideWithValue(emailRepo),
-    ],
-    child: MaterialApp.router(routerConfig: router),
-  );
-}
-
-void main() {
-  group('UndoLogDetailScreen email row tap', () {
-    testWidgets('navigates to the current location returned by lookup', (
-      tester,
-    ) async {
-      // Original row recorded INBOX/42; after the move it now lives in
-      // Archive with a fresh UID — the lookup is what bridges that gap.
-      final original = _emailWith();
-      final current = _emailWith(id: 'acc-1:77', mailboxPath: 'Archive');
-      final lastRoute = ValueNotifier<String?>(null);
-
-      await tester.pumpWidget(
-        _buildApp(
-          action: _action(originalEmails: [original]),
-          emailRepo: _LookupEmailRepository(current),
-          lastEmailRoute: lastRoute,
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.text('Hello world'));
-      await tester.pumpAndSettle();
-
-      expect(find.text('email-detail-route'), findsOneWidget);
-      expect(
-        lastRoute.value,
-        '/accounts/acc-1/mailboxes/Archive/emails/acc-1%3A77',
-      );
-    });
-
-    testWidgets('shows snackbar when lookup returns null', (tester) async {
-      final original = _emailWith();
-      final lastRoute = ValueNotifier<String?>(null);
-
-      await tester.pumpWidget(
-        _buildApp(
-          action: _action(originalEmails: [original]),
-          emailRepo: _LookupEmailRepository(null),
-          lastEmailRoute: lastRoute,
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.text('Hello world'));
-      await tester.pump();
-
-      expect(
-        find.textContaining('Email no longer exists'),
-        findsOneWidget,
-      );
-      expect(lastRoute.value, isNull);
-      expect(find.text('email-detail-route'), findsNothing);
-    });
-
-    testWidgets('shows snackbar when email has no Message-ID', (tester) async {
-      final original = _emailWith(messageId: null);
-      final lastRoute = ValueNotifier<String?>(null);
-
-      await tester.pumpWidget(
-        _buildApp(
-          action: _action(originalEmails: [original]),
-          // Lookup would succeed if called, but with no Message-ID the
-          // tap handler must short-circuit before reaching it.
-          emailRepo: _LookupEmailRepository(_emailWith()),
-          lastEmailRoute: lastRoute,
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.text('Hello world'));
-      await tester.pump();
-
-      expect(find.textContaining('no Message-ID'), findsOneWidget);
-      expect(lastRoute.value, isNull);
-      expect(find.text('email-detail-route'), findsNothing);
-    });
-  });
-}