chore: v1.23

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SW5iVXkZ2JBHgyweMCRymY

.gitea/workflows/release.yml

@@ -5,60 +5,81 @@ on:
     branches: [main]
 
 jobs:
-  build:
-    # RN/NDK builds starve the 4-core VPS — run on the desktop runner
-    # (marcusDesktop). Jobs queue while the desktop is off and start when it
-    # comes online; switch back to ubuntu-latest to build on the VPS.
-    runs-on: desktop
-    container:
-      image: eclipse-temurin:21-jdk
+  check:
+    # Fast fail: lockfile sync, types, lint — catches in ~2 min what would
+    # otherwise kill the APK build twenty minutes in.
+    runs-on: macbook
     steps:
-      # actions/checkout needs node, which this container lacks — clone directly
       - name: Checkout
         run: |
-          apt-get update -qq && apt-get install -y -qq git unzip curl >/dev/null
           git init -q .
           git fetch -q --depth 1 "https://git.rehbock.xyz/${{ github.repository }}.git" "${{ github.sha }}"
-          git checkout -q FETCH_HEAD
-
-      - name: Install Node.js
+          git checkout -q -f FETCH_HEAD
+          git clean -qfd
+      - name: Lockfile + typecheck + lint
         run: |
-          curl -fsSL https://deb.nodesource.com/setup_22.x | bash - >/dev/null 2>&1
-          apt-get install -y -qq nodejs >/dev/null
+          export PATH="$HOME/.hermes/node/bin:$PATH"
+          cd app
+          npm ci --no-audit --no-fund
+          npx tsc --noEmit
+          npx eslint .
+      - name: Notify failure
+        if: failure()
+        env:
+          NTFY_TOKEN: ${{ secrets.NTFY_TOKEN }}
+        run: |
+          [ -n "$NTFY_TOKEN" ] || { echo "NTFY_TOKEN not set — skipping notification"; exit 0; }
+          curl -s -H "Authorization: Bearer $NTFY_TOKEN" -H "Title: gtd CI: check failed" -H "Priority: high" \
+            -d "typecheck/lint/lockfile failed at ${{ github.sha }} — https://git.rehbock.xyz/marcus/gtd/actions" \
+            https://ntfy.rehbock.xyz/gtd-ci
+
+  build:
+    needs: check
+    # Runs natively on the MacBook Air (gitea-runner in host mode, label
+    # "macbook"): Java 21 from Homebrew, the Android SDK from Android Studio,
+    # node 22 from ~/.hermes. No container, no SDK download.
+    runs-on: macbook
+    env:
+      ANDROID_HOME: /Users/marcus/Library/Android/sdk
+      JAVA_HOME: /opt/homebrew/opt/openjdk@21/libexec/openjdk.jdk/Contents/Home
+    steps:
+      - name: Checkout
+        run: |
+          git init -q .
+          git fetch -q --depth 1 "https://git.rehbock.xyz/${{ github.repository }}.git" "${{ github.sha }}"
+          git checkout -q -f FETCH_HEAD
+          git clean -qfd
+
+      - name: Toolchain
+        run: |
+          export PATH="$HOME/.hermes/node/bin:$PATH"
           node --version
-
-      - name: Install Android SDK
-        # $HOME/android-sdk is a persistent runner volume — skip when warm.
-        run: |
-          if [ ! -d "$HOME/android-sdk/platforms/android-36" ]; then
-            mkdir -p "$HOME/android-sdk/cmdline-tools"
-            curl -sLo /tmp/ct.zip https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip
-            unzip -q /tmp/ct.zip -d /tmp
-            mv /tmp/cmdline-tools "$HOME/android-sdk/cmdline-tools/latest"
-            yes | "$HOME/android-sdk/cmdline-tools/latest/bin/sdkmanager" --sdk_root="$HOME/android-sdk" --licenses >/dev/null 2>&1 || true
-            "$HOME/android-sdk/cmdline-tools/latest/bin/sdkmanager" --sdk_root="$HOME/android-sdk" \
-              "platform-tools" "platforms;android-36" "build-tools;36.0.0" >/dev/null
-          else
-            echo "SDK cache warm — skipping install"
-          fi
+          "$JAVA_HOME/bin/java" -version
+          test -d "$ANDROID_HOME/platforms/android-36"
+          test -d "$ANDROID_HOME/build-tools/36.0.0"
 
       - name: Install app dependencies
-        run: cd app && npm ci --no-audit --no-fund
+        run: |
+          export PATH="$HOME/.hermes/node/bin:$PATH"
+          cd app && npm ci --no-audit --no-fund
 
       - name: Decode signing keystore
         env:
           KEYSTORE_B64: ${{ secrets.KEYSTORE_B64 }}
-        run: echo "$KEYSTORE_B64" | base64 -d > /tmp/release.jks
+        run: echo "$KEYSTORE_B64" | base64 --decode > /tmp/release.jks
 
       - name: Build signed release APK
         env:
           KEYSTORE_FILE: /tmp/release.jks
           KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
-          KEY_ALIAS: gtd
+          # EAS-managed keystore (since v1.16) — alias is EAS-generated, and the
+          # key password can differ from the store password.
+          KEY_ALIAS: a5ff13aa8571055bcaecbaca29a548ae
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
           VERSION_CODE: ${{ github.run_number }}
           VERSION_NAME: 1.${{ github.run_number }}
         run: |
-          export ANDROID_HOME="$HOME/android-sdk"
+          export PATH="$HOME/.hermes/node/bin:$PATH"
           cd app/android
           echo "sdk.dir=$ANDROID_HOME" > local.properties
           ./gradlew assembleRelease --no-daemon --console=plain
@@ -81,3 +102,13 @@ jobs:
             -H "Authorization: token $TOKEN" \
             -F "attachment=@$APK;type=application/vnd.android.package-archive" >/dev/null
           echo "published $TAG"
+
+      - name: Notify failure
+        if: failure()
+        env:
+          NTFY_TOKEN: ${{ secrets.NTFY_TOKEN }}
+        run: |
+          [ -n "$NTFY_TOKEN" ] || { echo "NTFY_TOKEN not set — skipping notification"; exit 0; }
+          curl -s -H "Authorization: Bearer $NTFY_TOKEN" -H "Title: gtd CI: APK build failed" -H "Priority: high" \
+            -d "release build failed at ${{ github.sha }} — https://git.rehbock.xyz/marcus/gtd/actions" \
+            https://ntfy.rehbock.xyz/gtd-ci

.githooks/pre-push

@@ -0,0 +1,12 @@
+#!/bin/sh
+# Reject pushes whose lockfile CI's npm (node 22) would refuse — a lock
+# written by a newer local npm fails `npm ci` on the runner half a build in.
+# Enable with: git config core.hooksPath .githooks
+set -e
+root=$(git rev-parse --show-toplevel)
+if git diff --quiet origin/main...HEAD -- app/package.json app/package-lock.json 2>/dev/null; then
+  exit 0
+fi
+echo "pre-push: package.json/lock changed — validating with CI's npm (node:22)…"
+docker run --rm -v "$root/app:/w" -w /w node:22 npm ci --dry-run --no-audit --no-fund >/dev/null
+echo "pre-push: lockfile OK"

.gitignore

@@ -5,3 +5,5 @@ server/.env
 server/.env.token.local
 *.log
 .DS_Store
+credentials.json
+*.jks

README.md

@@ -9,7 +9,8 @@ Minimal Getting Things Done app. One Expo/React Native codebase for iPhone, Andr
 
 ## Layout
 
-- `app/` — Expo app (expo-router, TypeScript). Home shows the top 3 next actions plus a launcher menu: Today / Next / Waiting / Someday / Projects / Review. There is no inbox — every task is born fully scoped (title, priority, due date). Tap a task to clarify (list, project, context, waiting-for, due/defer dates, repeat).
+- `app/` — Expo app (expo-router, TypeScript). Home shows the top 3 next actions plus a launcher menu: Today / Next / Waiting / Someday / Projects / Review.
+  - **Personal / Work**: the toggle in the home header is a global lens — every list, Today, Projects and Review show only the active area, and new tasks/projects are born into it. Tasks and projects carry an `area` column (`personal` default); the task form's Area chip re-files a task across areas. The choice persists locally (`area_v1`). There is no inbox — every task is born fully scoped (title, priority, due date). Tap a task to clarify (list, project, context, waiting-for, due/defer dates, repeat).
   - **Quick add**: the title field parses tokens live — `Pay rent tmr p1 @home #Sydney ~30m monthly` — and mirrors them into the form.
   - **Repeat**: daily / weekdays / weekly / monthly / yearly; completing spawns the next occurrence (lapsed tasks catch up to today).
   - **Defer**: deferred tasks are hidden from action lists until their date; a footer link reveals them.
@@ -22,6 +23,15 @@ Minimal Getting Things Done app. One Expo/React Native codebase for iPhone, Andr
 cd app && npx expo start        # scan QR with Expo Go (iPhone or Pixel)
 ```
 
+- **Node 22 only** (`app/.nvmrc`): CI's npm 10 rejects lockfiles written by newer npm. Never run bare `npm install` to change deps — use `npm run lock` (regenerates the lock via a `node:22` container), or run npm from node 22.
+- **Hook**: `git config core.hooksPath .githooks` enables a pre-push check that validates the lockfile against CI's npm before it can break a build.
+- **Local Android builds** need JDK 21 (AGP chokes on newer): pinned via `org.gradle.java.home` in `~/.gradle/gradle.properties` → `~/.local/share/java/jdk-21.0.12+8`.
+- **`expo prebuild` is safe to re-run**: `app/plugins/withAndroidRelease.js` re-injects the release signing, env-driven versionCode/Name, and gradle.properties tuning into the committed `android/`.
+
+## Release (Android APK → Obtainium)
+
+Every push to `main` runs `.gitea/workflows/release.yml` on the desktop runner: fast check job (lockfile/types/lint), then a signed `assembleRelease`, published as Gitea release `v1.<run>` with the APK attached. Phones track it with Obtainium → source `https://git.rehbock.xyz/marcus/gtd` (Forgejo/Gitea source type). CI failures push to ntfy topic `gtd-ci` when the `NTFY_TOKEN` repo secret is set.
+
 ## Deploy
 
 ```sh

app/.gitignore

@@ -40,3 +40,4 @@ example
 
 # generated native folders (android/ is committed — CI builds it)
 /ios
+*.apk

app/.nvmrc

@@ -0,0 +1 @@
+22

app/android/app/src/main/res/drawable/ic_launcher_background.xml

@@ -1,18 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M0,0h108v108H0z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:type="linear"
-                android:startX="54" android:startY="0"
-                android:endX="54" android:endY="108"
-                android:startColor="#1A1F2B"
-                android:endColor="#0B0D12" />
-        </aapt:attr>
-    </path>
-</vector>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:drawable="@color/splashscreen_background"/>
+  <item>
+    <bitmap android:gravity="center" android:src="@drawable/splashscreen_logo"/>
+  </item>
+</layer-list>

app/android/app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- The four GTD quadrants (next/waiting/someday/projects) with a check in
-     "next" — matches the app's home screen. Grid spans 32..76 to stay inside
-     the adaptive-icon safe zone. -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <!-- top-left: next (green) -->
-    <path android:pathData="M37,32 h11 a5,5 0 0 1 5,5 v11 a5,5 0 0 1 -5,5 h-11 a5,5 0 0 1 -5,-5 v-11 a5,5 0 0 1 5,-5 z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:type="linear"
-                android:startX="34" android:startY="34"
-                android:endX="53" android:endY="53"
-                android:startColor="#4FD48C"
-                android:endColor="#2E9E60" />
-        </aapt:attr>
-    </path>
-    <!-- top-right: waiting (amber) -->
-    <path android:pathData="M60,32 h11 a5,5 0 0 1 5,5 v11 a5,5 0 0 1 -5,5 h-11 a5,5 0 0 1 -5,-5 v-11 a5,5 0 0 1 5,-5 z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:type="linear"
-                android:startX="57" android:startY="34"
-                android:endX="76" android:endY="53"
-                android:startColor="#EDBB55"
-                android:endColor="#C8912B" />
-        </aapt:attr>
-    </path>
-    <!-- bottom-left: someday (violet) -->
-    <path android:pathData="M37,55 h11 a5,5 0 0 1 5,5 v11 a5,5 0 0 1 -5,5 h-11 a5,5 0 0 1 -5,-5 v-11 a5,5 0 0 1 5,-5 z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:type="linear"
-                android:startX="34" android:startY="57"
-                android:endX="53" android:endY="76"
-                android:startColor="#AC9FF0"
-                android:endColor="#7E6DD6" />
-        </aapt:attr>
-    </path>
-    <!-- bottom-right: projects (blue) -->
-    <path android:pathData="M60,55 h11 a5,5 0 0 1 5,5 v11 a5,5 0 0 1 -5,5 h-11 a5,5 0 0 1 -5,-5 v-11 a5,5 0 0 1 5,-5 z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:type="linear"
-                android:startX="57" android:startY="57"
-                android:endX="76" android:endY="76"
-                android:startColor="#6FAAEE"
-                android:endColor="#3F7DC4" />
-        </aapt:attr>
-    </path>
-    <!-- checkmark in the green quadrant -->
-    <path
-        android:pathData="M38,42.8 L42,46.8 L48.5,38.8"
-        android:strokeColor="#FFFFFF"
-        android:strokeWidth="3"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round"
-        android:fillColor="#00000000" />
-</vector>

app/android/app/src/main/res/drawable/ic_launcher_monochrome.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:pathData="M37,33.5 h11 a3.5,3.5 0 0 1 3.5,3.5 v11 a3.5,3.5 0 0 1 -3.5,3.5 h-11 a3.5,3.5 0 0 1 -3.5,-3.5 v-11 a3.5,3.5 0 0 1 3.5,-3.5 z"
-        android:strokeColor="#FFFFFF"
-        android:strokeWidth="3"
-        android:fillColor="#00000000" />
-    <path
-        android:pathData="M60,33.5 h11 a3.5,3.5 0 0 1 3.5,3.5 v11 a3.5,3.5 0 0 1 -3.5,3.5 h-11 a3.5,3.5 0 0 1 -3.5,-3.5 v-11 a3.5,3.5 0 0 1 3.5,-3.5 z"
-        android:strokeColor="#FFFFFF"
-        android:strokeWidth="3"
-        android:fillColor="#00000000" />
-    <path
-        android:pathData="M37,56.5 h11 a3.5,3.5 0 0 1 3.5,3.5 v11 a3.5,3.5 0 0 1 -3.5,3.5 h-11 a3.5,3.5 0 0 1 -3.5,-3.5 v-11 a3.5,3.5 0 0 1 3.5,-3.5 z"
-        android:strokeColor="#FFFFFF"
-        android:strokeWidth="3"
-        android:fillColor="#00000000" />
-    <path
-        android:pathData="M60,56.5 h11 a3.5,3.5 0 0 1 3.5,3.5 v11 a3.5,3.5 0 0 1 -3.5,3.5 h-11 a3.5,3.5 0 0 1 -3.5,-3.5 v-11 a3.5,3.5 0 0 1 3.5,-3.5 z"
-        android:strokeColor="#FFFFFF"
-        android:strokeWidth="3"
-        android:fillColor="#FFFFFF" />
-</vector>

app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
+    <background android:drawable="@mipmap/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
 </adaptive-icon>

app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
+    <background android:drawable="@mipmap/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
 </adaptive-icon>

app/android/gradle.properties

@@ -28,8 +28,6 @@ android.enablePngCrunchInReleaseBuilds=true
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using
 # ./gradlew <task> -PreactNativeArchitectures=x86_64
-# arm64 only: Pixel is arm64-v8a; x86/v7a builds are wasted time + APK bloat.
-# Add back x86_64 temporarily if an emulator build is ever needed.
 reactNativeArchitectures=arm64-v8a
 
 # Use this property to enable support to the new architecture.

app/app.json

@@ -25,6 +25,7 @@
       "favicon": "./assets/images/favicon.png"
     },
     "plugins": [
+      "./plugins/withAndroidRelease",
       "expo-router",
       [
         "react-native-android-widget",
@@ -56,6 +57,12 @@
     "experiments": {
       "typedRoutes": true,
       "reactCompiler": true
+    },
+    "extra": {
+      "router": {},
+      "eas": {
+        "projectId": "7a0325dd-ba60-415e-b367-e414890bacb3"
+      }
     }
   }
 }

app/eas.json

@@ -0,0 +1,18 @@
+{
+  "cli": {
+    "version": ">= 20.0.0",
+    "appVersionSource": "local"
+  },
+  "build": {
+    "production": {
+      "android": {
+        "buildType": "apk"
+      },
+      "env": {
+        "VERSION_CODE": "23",
+        "VERSION_NAME": "1.23"
+      },
+      "node": "22.20.0"
+    }
+  }
+}

app/package-lock.json

@@ -12,6 +12,7 @@
         "@react-native-async-storage/async-storage": "2.2.0",
         "@react-native-community/netinfo": "12.0.1",
         "expo": "~57.0.11",
+        "expo-application": "~57.0.2",
         "expo-constants": "~57.0.9",
         "expo-crypto": "~57.0.1",
         "expo-device": "~57.0.1",
@@ -43,6 +44,9 @@
         "eslint": "^9.0.0",
         "eslint-config-expo": "~57.0.1",
         "typescript": "~6.0.3"
+      },
+      "engines": {
+        "node": "22.x"
       }
     },
     "node_modules/@adobe/css-tools": {
@@ -79,7 +83,6 @@
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz",
       "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.29.7",
         "@babel/generator": "^7.29.7",
@@ -964,6 +967,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.29.7.tgz",
       "integrity": "sha512-TL0hMc9xzy86VD31nUiwzd5otRAcyEPcsegCxolO0PvcXuH1v0kECe/UIznYFihpkvU5wg/jk4v0TTEFfm53fw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.29.7"
       },
@@ -979,6 +983,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.29.7.tgz",
       "integrity": "sha512-06IyK09H3wi4cGbhDBwp5gUGo0IKtnYa8tyTiephirPCK6fbobVGiXMMI5zLQ4aKEYP3wZ3ArU44o+8KMrSG/Q==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.29.7"
       },
@@ -1010,6 +1015,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.29.8.tgz",
       "integrity": "sha512-0UpIXPtdDtMXfnV2OJAVMLpj3H/92vmkA6lpSRakmycJvj3VUy6Xs1dM8tXRugupykr5WB+LpiVl0J8LMVg2mg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.29.7"
       },
@@ -1199,6 +1205,31 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/@emnapi/core": {
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.3.tgz",
+      "integrity": "sha512-zLpS5asjEb7lq8jYLq37N6XKaE41DIexlY1rF/z4/tIl3wo13Sqm28fRyfIsKZD+NZ8mM5RoKkpW/rBcuoSZSg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@emnapi/wasi-threads": "1.2.3",
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@emnapi/runtime": {
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.3.tgz",
+      "integrity": "sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
     "node_modules/@emnapi/wasi-threads": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.3.tgz",
@@ -1206,6 +1237,7 @@
       "dev": true,
       "license": "MIT",
       "optional": true,
+      "peer": true,
       "dependencies": {
         "tslib": "^2.4.0"
       }
@@ -2560,6 +2592,7 @@
       "resolved": "https://registry.npmjs.org/@react-native/babel-preset/-/babel-preset-0.86.2.tgz",
       "integrity": "sha512-4XKEJ6jKW9lXMB1O5o47gBoGgolde1fbX13gLW/erlcn+1ky+MHHo5UjuM3RWGdPJHIvIzekDDumSUHhB9x5iQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/core": "^7.25.2",
         "@babel/plugin-proposal-export-default-from": "^7.24.7",
@@ -2722,6 +2755,7 @@
       "resolved": "https://registry.npmjs.org/@react-native/metro-babel-transformer/-/metro-babel-transformer-0.86.2.tgz",
       "integrity": "sha512-mX1wgLErdb2hDgXJr9zM9SWLe+ZteZTFTwRWGOQ53yEJwc9DVSnxdTlAtVdMeOj2ntycKh0R8jYdat2Am43cwQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/core": "^7.25.2",
         "@react-native/babel-preset": "0.86.2",
@@ -2740,6 +2774,7 @@
       "resolved": "https://registry.npmjs.org/@react-native/metro-config/-/metro-config-0.86.2.tgz",
       "integrity": "sha512-hJno256j+MS0b3JD1aD3ouTGZVacKNVBuXL2atMQQ8BZ060vl1ptnZ83y569aDW+/rgFSOcqn6ydKeSz4uUKQQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@react-native/js-polyfills": "0.86.2",
         "@react-native/metro-babel-transformer": "0.86.2",
@@ -2797,6 +2832,7 @@
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz",
       "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
@@ -2816,6 +2852,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -2828,6 +2865,7 @@
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
       "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "ansi-regex": "^5.0.1",
         "ansi-styles": "^5.0.0",
@@ -2841,7 +2879,8 @@
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@testing-library/jest-dom": {
       "version": "6.9.1",
@@ -2896,7 +2935,8 @@
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
       "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@types/estree": {
       "version": "1.0.9",
@@ -2963,7 +3003,6 @@
       "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.18.tgz",
       "integrity": "sha512-AnzbBERsrLKtk2XSfTbYRLjQPdy116Sty4q+T+Bp3IC4l6jNBvreVPAHmpq9qhXQM7CXZPjLVmGMw9sy+hxQ3w==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "csstype": "^3.2.2"
       }
@@ -3037,7 +3076,6 @@
       "integrity": "sha512-fUBfTuuEulWqX6V8+O3PtScV01tzYYRUDTAirHFKoRAt7nOzoGiPt0M/bB47wWNy0coOOcgEwAMUtBpykMxl6w==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.67.0",
         "@typescript-eslint/types": "8.67.0",
@@ -3628,7 +3666,6 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.18.0.tgz",
       "integrity": "sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ==",
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -4228,7 +4265,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.10.44",
         "caniuse-lite": "^1.0.30001806",
@@ -4882,7 +4918,8 @@
       "version": "0.5.16",
       "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
       "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/dunder-proto": {
       "version": "1.0.1",
@@ -5166,7 +5203,6 @@
       "integrity": "sha512-DgZS62aPLXKlnxILS/AYCoRvHaZeXceIzlXPkkGGzJWSow1aEk0lbTlxUSlyjC8jcaKxAdOnTDz+o1JFSBsyjw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -5387,7 +5423,6 @@
       "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@rtsao/scc": "^1.1.0",
         "array-includes": "^3.1.9",
@@ -5750,7 +5785,6 @@
       "resolved": "https://registry.npmjs.org/expo/-/expo-57.0.11.tgz",
       "integrity": "sha512-R97257N39Dw0kQFuI4/RvYx95GQ+dmePdo8hxcMOjDxAT4VcCckjILJeAWCE19Jxjb92hZ5NDXAfDPkkV1RB9w==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.20.0",
         "@expo/cli": "^57.0.13",
@@ -5808,6 +5842,15 @@
         }
       }
     },
+    "node_modules/expo-application": {
+      "version": "57.0.2",
+      "resolved": "https://registry.npmjs.org/expo-application/-/expo-application-57.0.2.tgz",
+      "integrity": "sha512-q31YwcXyymviAmdrtDfAg3Dld4VMxLCNAfgMHip7vZpPX4lzF/AfwsywqBJUAjQnJknzaNAkzqvMVjO5XmKYDA==",
+      "license": "MIT",
+      "peerDependencies": {
+        "expo": "*"
+      }
+    },
     "node_modules/expo-asset": {
       "version": "57.0.9",
       "resolved": "https://registry.npmjs.org/expo-asset/-/expo-asset-57.0.9.tgz",
@@ -5828,7 +5871,6 @@
       "resolved": "https://registry.npmjs.org/expo-constants/-/expo-constants-57.0.9.tgz",
       "integrity": "sha512-Y47sGiF+U8fwicUSPdJPjB27PuU+FgLK4Mpai0ksZF5hv8jNN3HBqKuDNxsiu70uHBKf80TaR4gwMPh0pmETiQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@expo/env": "~2.4.2"
       },
@@ -5873,7 +5915,6 @@
       "resolved": "https://registry.npmjs.org/expo-font/-/expo-font-57.0.1.tgz",
       "integrity": "sha512-QyS9L1Kh9sKJg4gfU6rdbpxpmH+DyzBX8z6jVvXMUDoqLr1GqmkO/Wu379KCXjL///kWbhpNlbi7AgBuj4VdIQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fontfaceobserver": "^2.1.0"
       },
@@ -5938,7 +5979,6 @@
       "resolved": "https://registry.npmjs.org/expo-linking/-/expo-linking-57.0.5.tgz",
       "integrity": "sha512-SmJI3wr0EVfeKPGf+Qgr9gUbrXk8mM0ATqYLvAX/EAzawDjohPzMJ5pTt7TYMX0Wknj4XCtyCQrGhnERMXT6cQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "expo-constants": "~57.0.9",
         "invariant": "^2.2.4"
@@ -5998,7 +6038,6 @@
       "resolved": "https://registry.npmjs.org/expo-router/-/expo-router-57.0.11.tgz",
       "integrity": "sha512-kE2hz4lLkddZ94vN4nmbq5aXeo0t6FaZ8xJn/Hyn8/dQPsGlvDK0j4ZVayEUUdNmkNHsBVihgf1bl/2rCsYEzA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@expo/log-box": "^57.0.2",
         "@expo/metro-runtime": "^57.0.8",
@@ -6073,7 +6112,6 @@
       "resolved": "https://registry.npmjs.org/expo-server/-/expo-server-57.0.1.tgz",
       "integrity": "sha512-sBfVDH6dmKVHZxqUxbfkzS00PZELMZt1IpnHKxcOTMZtR/t7CtRAFrbXcisG+EyzeqHSVDacZT+1tbYfZt5D8w==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=20.16.0"
       }
@@ -6337,7 +6375,6 @@
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.3.tgz",
       "integrity": "sha512-201TZ/kPWxoPr/OKWjquZR1SWKXcvxdH+e1xrx89b3YbmzLMFCLfnaG1HFIgWzJOEWZ7MvpK++odZufgYR50Rw==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -8331,6 +8368,7 @@
       "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
       "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
       "license": "MIT",
+      "peer": true,
       "bin": {
         "lz-string": "bin/bin.js"
       }
@@ -9655,7 +9693,6 @@
       "resolved": "https://registry.npmjs.org/react/-/react-19.2.3.tgz",
       "integrity": "sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9675,7 +9712,6 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.3.tgz",
       "integrity": "sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "scheduler": "^0.27.0"
       },
@@ -9712,7 +9748,6 @@
       "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.86.2.tgz",
       "integrity": "sha512-zbJXGZpwfZGA79Z9ob6Atvfx4nAQL8yJBa35s58E4Oo+khPykfQP2sTeumkKbjwajFYfVayg8pj7Il9nIfTk7A==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@react-native/assets-registry": "0.86.2",
         "@react-native/codegen": "0.86.2",
@@ -9818,7 +9853,6 @@
       "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.32.0.tgz",
       "integrity": "sha512-uYIMOKlKENORq2SABE+jIjbPU+h5I/sQKcq2v16zRq848nwEp1fWRVwML4QWqijc8UcXJC25o54S8GQd4Mf2OA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@egjs/hammerjs": "^2.0.17",
         "@types/react-test-renderer": "^19.1.0",
@@ -9845,7 +9879,6 @@
       "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-4.5.1.tgz",
       "integrity": "sha512-RnMvtDuR+68ig864gAvZCOdZehqhC5rFmMo0kn+ARfgVSTvFeF6IFLBVgMPUu0KwihaapEyW24WRi6nEyy1kSA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "react-native-is-edge-to-edge": "^1.3.1",
         "semver": "^7.7.3"
@@ -9861,7 +9894,6 @@
       "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-5.7.0.tgz",
       "integrity": "sha512-/9/MtQz8ODphjsLdZ+GZAIcC/RtoqW9EeShf7Uvnfgm/pzYrJ75y3PV/J1wuAV1T5Dye5ygq4EAW20RoBq0ABQ==",
       "license": "MIT",
-      "peer": true,
       "peerDependencies": {
         "react": "*",
         "react-native": "*"
@@ -9886,7 +9918,6 @@
       "resolved": "https://registry.npmjs.org/react-native-web/-/react-native-web-0.21.2.tgz",
       "integrity": "sha512-SO2t9/17zM4iEnFvlu2DA9jqNbzNhoUP+AItkoCOyFmDMOhUnBBznBDCYN92fGdfAkfQlWzPoez6+zLxFNsZEg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.18.6",
         "@react-native/normalize-colors": "^0.74.1",
@@ -9919,7 +9950,6 @@
       "resolved": "https://registry.npmjs.org/react-native-worklets/-/react-native-worklets-0.10.1.tgz",
       "integrity": "sha512-62mRM19bDpfpdI8HLkEErcdOsrAPDtE9lA/sw+5lLRpzBHNhxaoj9QyY2KjXqUmirelxkX4zuPGTC3VdA0feJA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/plugin-transform-arrow-functions": "^7.27.1",
         "@babel/plugin-transform-class-properties": "^7.28.6",
@@ -9955,7 +9985,6 @@
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz",
       "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -11228,7 +11257,6 @@
       "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==",
       "devOptional": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -11846,7 +11874,6 @@
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
       "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
       "license": "MIT",
-      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }

app/package.json

@@ -7,6 +7,7 @@
     "@react-native-async-storage/async-storage": "2.2.0",
     "@react-native-community/netinfo": "12.0.1",
     "expo": "~57.0.11",
+    "expo-application": "~57.0.2",
     "expo-constants": "~57.0.9",
     "expo-crypto": "~57.0.1",
     "expo-device": "~57.0.1",
@@ -39,7 +40,11 @@
     "eslint-config-expo": "~57.0.1",
     "typescript": "~6.0.3"
   },
+  "engines": {
+    "node": "22.x"
+  },
   "scripts": {
+    "lock": "docker run --rm -v $PWD:/w -w /w node:22 npm install --package-lock-only --no-audit --no-fund",
     "start": "expo start",
     "reset-project": "node ./scripts/reset-project.js",
     "android": "expo run:android",

app/plugins/withAndroidRelease.js

@@ -0,0 +1,59 @@
+// Makes `expo prebuild` safe to re-run: re-applies the hand-maintained Android
+// release config that a fresh prebuild would otherwise reset to template
+// defaults (android/ is committed; CI builds it and relies on all of this).
+const { withAppBuildGradle, withGradleProperties } = require("expo/config-plugins");
+
+const RELEASE_SIGNING = `        release {
+            // Keystore path + password come from env (CI) or ~/.android-keys (local).
+            def ksPath = System.getenv("KEYSTORE_FILE") ?: "\${System.properties['user.home']}/.android-keys/gtd-release.jks"
+            def passFile = new File("\${System.properties['user.home']}/.android-keys/gtd-release.password")
+            def ksPass = System.getenv("KEYSTORE_PASSWORD") ?: (passFile.exists() ? passFile.text.trim() : null)
+            if (new File(ksPath).exists() && ksPass != null) {
+                storeFile file(ksPath)
+                storePassword ksPass
+                keyAlias System.getenv("KEY_ALIAS") ?: "gtd"
+                keyPassword System.getenv("KEY_PASSWORD") ?: ksPass
+            }
+        }
+`;
+
+function patchBuildGradle(gradle) {
+  gradle = gradle.replace(/versionCode \d+\n/, 'versionCode ((System.getenv("VERSION_CODE") ?: "1").toInteger())\n');
+  gradle = gradle.replace(/versionName "[^"]*"\n/, 'versionName (System.getenv("VERSION_NAME") ?: "1.0-dev")\n');
+  if (!gradle.includes("KEYSTORE_FILE")) {
+    // Insert the release signing config right after the debug one.
+    gradle = gradle.replace(
+      /(signingConfigs \{\n        debug \{[\s\S]*?\n        \}\n)/,
+      `$1${RELEASE_SIGNING}`,
+    );
+  }
+  // Release builds use the release key when present, debug key otherwise.
+  gradle = gradle.replace(
+    /(release \{\n)(?:\s*\/\/[^\n]*\n)*\s*signingConfig signingConfigs\.debug\n/,
+    "$1            signingConfig signingConfigs.release.storeFile ? signingConfigs.release : signingConfigs.debug\n",
+  );
+  return gradle;
+}
+
+const GRADLE_PROPS = [
+  // RN/NDK builds want headroom; the template default is 2 GB.
+  { key: "org.gradle.jvmargs", value: "-Xmx8192m -XX:MaxMetaspaceSize=1024m" },
+  // arm64 only: Pixel is arm64-v8a; x86/v7a builds are wasted time + APK bloat.
+  { key: "reactNativeArchitectures", value: "arm64-v8a" },
+];
+
+module.exports = function withAndroidRelease(config) {
+  config = withAppBuildGradle(config, (c) => {
+    c.modResults.contents = patchBuildGradle(c.modResults.contents);
+    return c;
+  });
+  config = withGradleProperties(config, (c) => {
+    for (const { key, value } of GRADLE_PROPS) {
+      const existing = c.modResults.find((p) => p.type === "property" && p.key === key);
+      if (existing) existing.value = value;
+      else c.modResults.push({ type: "property", key, value });
+    }
+    return c;
+  });
+  return config;
+};

app/public/manifest.json

@@ -0,0 +1,16 @@
+{
+  "name": "GTD",
+  "short_name": "GTD",
+  "description": "Capture, clarify, do.",
+  "start_url": "/today",
+  "scope": "/",
+  "display": "standalone",
+  "orientation": "portrait",
+  "background_color": "#F7F7F9",
+  "theme_color": "#F7F7F9",
+  "icons": [
+    { "src": "/icon-192.png", "sizes": "192x192", "type": "image/png", "purpose": "any" },
+    { "src": "/icon-512.png", "sizes": "512x512", "type": "image/png", "purpose": "any" },
+    { "src": "/icon-512.png", "sizes": "512x512", "type": "image/png", "purpose": "maskable" }
+  ]
+}

app/src/app/+html.tsx

@@ -0,0 +1,49 @@
+// The HTML shell for the web build.
+//
+// The web export is the iPhone story — there is no iOS binary, so Safari's "Add
+// to Home Screen" has to produce something that opens full-screen and looks
+// installed rather than a bookmark with a browser chrome on top. That takes the
+// manifest, the apple-* meta tags and a viewport that covers the notch; none of
+// them are reachable from app.json, so the shell is written out by hand.
+import { ScrollViewStyleReset } from "expo-router/html";
+import type { PropsWithChildren } from "react";
+
+// Match the app background on both schemes so the status bar and the rubber-band
+// overscroll never flash white against a dark list.
+const background = `
+:root { color-scheme: light dark; }
+body { background-color: #F7F7F9; overscroll-behavior-y: none; }
+@media (prefers-color-scheme: dark) { body { background-color: #0C0C0F; } }
+`;
+
+export default function Root({ children }: PropsWithChildren) {
+  return (
+    <html lang="en">
+      <head>
+        <meta charSet="utf-8" />
+        <meta httpEquiv="X-UA-Compatible" content="IE=edge" />
+        {/* viewport-fit=cover lets the layout run under the notch; disabling
+            user scaling stops iOS zooming in every time a title field focuses. */}
+        <meta
+          name="viewport"
+          content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover"
+        />
+
+        <link rel="manifest" href="/manifest.json" />
+        <meta name="application-name" content="GTD" />
+        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="mobile-web-app-capable" content="yes" />
+        <meta name="apple-mobile-web-app-title" content="GTD" />
+        {/* "default" keeps the iOS status bar legible over a light header. */}
+        <meta name="apple-mobile-web-app-status-bar-style" content="default" />
+        <link rel="apple-touch-icon" sizes="180x180" href="/icon-180.png" />
+        <meta name="theme-color" media="(prefers-color-scheme: light)" content="#F7F7F9" />
+        <meta name="theme-color" media="(prefers-color-scheme: dark)" content="#0C0C0F" />
+
+        <ScrollViewStyleReset />
+        <style dangerouslySetInnerHTML={{ __html: background }} />
+      </head>
+      <body>{children}</body>
+    </html>
+  );
+}

app/src/app/_layout.tsx

@@ -2,10 +2,13 @@ import NetInfo from "@react-native-community/netinfo";
 import { Link, Stack } from "expo-router";
 import { StatusBar } from "expo-status-bar";
 import { useEffect } from "react";
-import { AppState } from "react-native";
+import { AppState, Pressable } from "react-native";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
 import { getState, hydrate, subscribe, sync } from "../lib/store";
-import { C } from "../lib/theme";
+import AreaToggle from "../components/AreaToggle";
+import Icon from "../components/Icon";
+import { ToastHost } from "../components/Toast";
+import { C, space } from "../lib/theme";
 import { refreshNextUpWidget } from "../widget/refresh";
 
 export default function RootLayout() {
@@ -35,12 +38,16 @@ export default function RootLayout() {
 
   return (
     <GestureHandlerRootView style={{ flex: 1 }}>
-      <StatusBar style="light" />
+      <StatusBar style="dark" />
       <Stack
         screenOptions={{
           headerStyle: { backgroundColor: C.bg },
           headerTintColor: C.text,
+          // No hairline under the bar: the header should melt into the grouped
+          // background so the in-content Title carries the hierarchy instead.
           headerShadowVisible: false,
+          headerTitleStyle: { fontSize: 17, fontWeight: "600", color: C.text },
+          headerBackButtonDisplayMode: "minimal",
           contentStyle: { backgroundColor: C.bg },
         }}
       >
@@ -48,9 +55,19 @@ export default function RootLayout() {
           name="index"
           options={{
             title: "GTD",
+            // The personal/work switch sits where the title would be: it is
+            // the screen's identity, and it must be reachable from the top of
+            // every visit without scrolling.
+            headerTitle: () => <AreaToggle />,
+            headerTitleAlign: "center",
             headerRight: () => (
-              <Link href="/settings" style={{ paddingHorizontal: 8, fontSize: 18 }}>
-                ⚙️
+              <Link href="/settings" asChild>
+                <Pressable
+                  hitSlop={12}
+                  style={({ pressed }) => [{ paddingHorizontal: space.sm }, pressed && { opacity: 0.5 }]}
+                >
+                  <Icon name="settings" size={22} color={C.textSecondary} />
+                </Pressable>
               </Link>
             ),
           }}
@@ -64,6 +81,7 @@ export default function RootLayout() {
         <Stack.Screen name="review" options={{ title: "Weekly review" }} />
         <Stack.Screen name="settings" options={{ title: "Settings", presentation: "modal" }} />
       </Stack>
+      <ToastHost />
     </GestureHandlerRootView>
   );
 }

app/src/app/add.tsx

@@ -1,160 +1,108 @@
 import { useRouter } from "expo-router";
 import { useRef, useState } from "react";
 import { Pressable, ScrollView, StyleSheet, Text } from "react-native";
-import DateField from "../components/DateField";
-import EstimateChips from "../components/EstimateChips";
-import PriorityChips from "../components/PriorityChips";
-import { Chips, Field } from "../components/ui";
+import TaskForm, { BOX_LABEL, emptyDraft, type TaskDraft } from "../components/TaskForm";
 import { haptic } from "../lib/haptics";
 import { parseQuickAdd, type ParsedQuickAdd } from "../lib/quickadd";
-import { REPEAT_LABEL, REPEATS } from "../lib/repeat";
 import { activeProjects, createTask } from "../lib/store";
-import { C } from "../lib/theme";
+import { C, radius, space } from "../lib/theme";
 import { useStore } from "../lib/useStore";
-import type { Repeat, Task, TaskStatus } from "../lib/types";
-
-const BOXES: { key: TaskStatus; label: string }[] = [
-  { key: "next", label: "Next up" },
-  { key: "waiting", label: "Waiting" },
-  { key: "someday", label: "Someday" },
-];
 
+/**
+ * Capture screen.
+ *
+ * Deliberately one card and one row of chips. Everything optional lives behind
+ * a chip that shows its own value, so the common case — type a title, hit Add —
+ * is two interactions and never scrolls, while a fully specified task is still
+ * reachable without leaving the screen.
+ */
 export default function AddTask() {
   const router = useRouter();
   const store = useStore();
-  const [raw, setRaw] = useState("");
-  const [notes, setNotes] = useState("");
-  const [priority, setPriority] = useState<Task["priority"] | null>(null);
-  const [estimate, setEstimate] = useState<number | null>(null);
-  const [due, setDue] = useState("");
-  const [repeat, setRepeat] = useState<Repeat | null>(null);
-  const [box, setBox] = useState<TaskStatus>("next");
-  const [waitingFor, setWaitingFor] = useState("");
-  const [projectId, setProjectId] = useState<string | null>(null);
-  const [context, setContext] = useState<string | null>(null);
+  const [draft, setDraft] = useState<TaskDraft>(emptyDraft);
 
   const projects = activeProjects(store).filter((p) => p.status === "active");
-  const projectOptions = ["none", ...projects.map((p) => p.id)];
-  const projectLabels = Object.fromEntries([["none", "None"], ...projects.map((p) => [p.id, p.name])]);
 
   // The title field understands tokens ("Pay rent tmr p1 @home ~30m monthly")
-  // and mirrors each one into the form controls below as you type, so capture
-  // is one line but every inference stays visible and correctable. A token
-  // only writes its field when it changes — chips tapped by hand stick.
+  // and mirrors each one into the chips below as you type, so capture is one
+  // line but every inference stays visible and correctable. A token only
+  // writes its field when it changes — chips tapped by hand stick.
   const prevParsed = useRef<ParsedQuickAdd>({ title: "" });
-  const onTitleChange = (text: string) => {
-    setRaw(text);
-    const p = parseQuickAdd(text, projects);
+  const change = (patch: Partial<TaskDraft>) => {
+    if (patch.title === undefined) return setDraft((d) => ({ ...d, ...patch }));
+
+    const p = parseQuickAdd(patch.title, projects);
     const prev = prevParsed.current;
-    if (p.priority !== prev.priority && p.priority) setPriority(p.priority);
-    if (p.due_date !== prev.due_date && p.due_date) setDue(p.due_date);
-    if (p.estimate_min !== prev.estimate_min && p.estimate_min) setEstimate(p.estimate_min);
-    if (p.repeat !== prev.repeat && p.repeat) setRepeat(p.repeat);
-    if (p.project_id !== prev.project_id && p.project_id) setProjectId(p.project_id);
-    if (p.context !== prev.context) setContext(p.context ?? null);
+    const mirrored: Partial<TaskDraft> = {};
+    if (p.priority !== prev.priority && p.priority) mirrored.priority = p.priority;
+    if (p.due_date !== prev.due_date && p.due_date) mirrored.due_date = p.due_date;
+    if (p.estimate_min !== prev.estimate_min && p.estimate_min) mirrored.estimate_min = p.estimate_min;
+    if (p.repeat !== prev.repeat && p.repeat) mirrored.repeat = p.repeat;
+    if (p.project_id !== prev.project_id && p.project_id) mirrored.project_id = p.project_id;
+    if (p.context !== prev.context) mirrored.context = p.context ?? null;
     prevParsed.current = p;
+    setDraft((d) => ({ ...d, ...patch, ...mirrored }));
   };
 
-  const cleanTitle = parseQuickAdd(raw, projects).title.trim() || raw.trim();
-  const tokensUsed = raw.trim() !== cleanTitle;
-
-  // Every task must be born fully scoped: title + priority + due date.
-  const dueValid = /^\d{4}-\d{2}-\d{2}$/.test(due.trim());
-  const ready = cleanTitle.length > 0 && priority !== null && dueValid;
+  // The field keeps the tokens visible; only the saved task loses them.
+  const cleanTitle = parseQuickAdd(draft.title, projects).title.trim() || draft.title.trim();
+  const tokensUsed = draft.title.trim() !== cleanTitle;
+  const ready = cleanTitle.length > 0;
 
   const save = () => {
-    if (!ready || priority === null) return;
+    if (!ready) return;
     createTask({
+      ...draft,
       title: cleanTitle,
-      notes,
-      status: box,
-      priority,
-      estimate_min: estimate,
-      due_date: due.trim(),
-      repeat,
-      project_id: projectId,
-      context,
-      waiting_for: box === "waiting" ? waitingFor.trim() || null : null,
+      // Unset priority means "ordinary", not "urgent" — pick the middle rung
+      // rather than blocking capture on a decision that can wait for review.
+      priority: draft.priority ?? 3,
+      waiting_for: draft.status === "waiting" ? draft.waiting_for?.trim() || null : null,
     });
     haptic.success();
     router.back();
   };
 
   return (
-    <ScrollView style={{ flex: 1, backgroundColor: C.bg }} contentContainerStyle={{ padding: 16 }}>
-      <Field
-        label="Task"
-        value={raw}
-        onChangeText={onTitleChange}
-        placeholder="Pay rent tmr p1 @home ~30m"
+    <ScrollView
+      style={{ flex: 1, backgroundColor: C.bg }}
+      contentContainerStyle={s.content}
+      keyboardShouldPersistTaps="handled"
+      showsVerticalScrollIndicator={false}
+    >
+      <TaskForm
+        value={draft}
+        onChange={change}
         autoFocus
+        onSubmitTitle={save}
+        hint={
+          tokensUsed
+            ? `Saving as “${cleanTitle}” — tokens moved into the chips below.`
+            : "Type p1 · tmr · @home · ~30m · #project to fill these in as you go."
+        }
       />
-      {tokensUsed && (
-        <Text style={s.parsedHint}>
-          → {cleanTitle || "…"}
-          {context ? `  ·  ${context}` : ""}
-        </Text>
-      )}
-      <PriorityChips value={priority} onChange={setPriority} />
-      <DateField label="Due date" value={due || null} onChange={(v) => setDue(v ?? "")} />
-      <Chips
-        label="Repeat"
-        options={["none", ...REPEATS]}
-        labels={{ none: "None", ...REPEAT_LABEL }}
-        value={repeat ?? "none"}
-        onChange={(v) => {
-          haptic.select();
-          setRepeat(v === "none" ? null : (v as Repeat));
-        }}
-      />
-      <EstimateChips value={estimate} onChange={setEstimate} />
-      <Chips
-        label="Box"
-        options={BOXES.map((b) => b.key)}
-        labels={Object.fromEntries(BOXES.map((b) => [b.key, b.label]))}
-        value={box}
-        onChange={(b) => {
-          haptic.select();
-          setBox(b);
-        }}
-      />
-      {box === "waiting" && (
-        <Field label="Waiting for" value={waitingFor} onChangeText={setWaitingFor} placeholder="Who or what?" />
-      )}
-      <Chips
-        label="Project"
-        options={projectOptions}
-        labels={projectLabels}
-        value={projectId ?? "none"}
-        onChange={(v) => setProjectId(v === "none" ? null : v)}
-      />
-      <Field
-        label="Description"
-        value={notes}
-        onChangeText={setNotes}
-        placeholder="Details, links, notes…"
-        multiline
-        style={{ minHeight: 64, textAlignVertical: "top" }}
-      />
-      <Pressable style={[s.save, !ready && s.saveDisabled]} onPress={save} disabled={!ready}>
-        <Text style={[s.saveText, !ready && { color: C.muted }]}>
-          {ready ? "Add task" : "Needs a title, priority & due date"}
-        </Text>
+
+      <Pressable
+        style={({ pressed }) => [s.save, !ready && s.saveDisabled, pressed && ready && { opacity: 0.85 }]}
+        onPress={save}
+        disabled={!ready}
+      >
+        <Text style={[s.saveText, !ready && s.saveTextDisabled]}>Add to {BOX_LABEL[draft.status]}</Text>
       </Pressable>
     </ScrollView>
   );
 }
 
 const s = StyleSheet.create({
-  parsedHint: { color: C.accent, fontSize: 13, marginTop: -8, marginBottom: 12 },
+  content: { padding: space.lg, paddingBottom: space.xxl },
   save: {
     backgroundColor: C.accent,
-    borderRadius: 10,
-    padding: 14,
+    borderRadius: radius.md,
+    paddingVertical: space.lg - 2,
     alignItems: "center",
-    marginTop: 8,
-    marginBottom: 24,
+    marginTop: space.xl,
   },
-  saveDisabled: { backgroundColor: C.surface },
-  saveText: { color: C.text, fontSize: 16, fontWeight: "600" },
+  saveDisabled: { backgroundColor: C.surface2 },
+  saveText: { fontSize: 16, fontWeight: "600", color: C.onAccent },
+  saveTextDisabled: { color: C.muted },
 });

app/src/app/index.tsx

@@ -1,20 +1,47 @@
 import { useFocusEffect, useRouter } from "expo-router";
-import { Pressable, StyleSheet, Text, View } from "react-native";
-import TaskRow from "../components/TaskRow";
+import { Platform, Pressable, StyleSheet, Text, View } from "react-native";
+import { NestableDraggableFlatList, NestableScrollContainer, ScaleDecorator } from "react-native-draggable-flatlist";
+import WebSortableList from "../components/WebSortableList";
+import Icon, { type IconName } from "../components/Icon";
+import TaskRow, { TaskSeparator } from "../components/TaskRow";
+import { Card, cardEdges, Empty, Screen, SectionHeader, Title } from "../components/ui";
 import { haptic } from "../lib/haptics";
 import { daysSince, useLastReview } from "../lib/review";
-import { todayTasks, visibleTasksByStatus } from "../lib/store";
-import { C } from "../lib/theme";
+import { reorderTask, todayTasks, visibleTasksByStatus } from "../lib/store";
+import { C, radius, shadow, space, type } from "../lib/theme";
 import { useStore } from "../lib/useStore";
 
-const MENU = [
-  { icon: "📅", label: "Today", href: "/today" },
-  { icon: "▶️", label: "Next", href: "/list/next" },
-  { icon: "⏳", label: "Waiting", href: "/list/waiting" },
-  { icon: "💭", label: "Someday", href: "/list/someday" },
-  { icon: "📁", label: "Projects", href: "/projects" },
-  { icon: "🔄", label: "Review", href: "/review" },
-] as const;
+const MENU: { icon: IconName; label: string; href: string }[] = [
+  { icon: "today", label: "Today", href: "/today" },
+  { icon: "next", label: "Next", href: "/list/next" },
+  { icon: "waiting", label: "Waiting", href: "/list/waiting" },
+  { icon: "someday", label: "Someday", href: "/list/someday" },
+  { icon: "projects", label: "Projects", href: "/projects" },
+  { icon: "review", label: "Review", href: "/review" },
+];
+
+const PREVIEW = 3;
+
+/**
+ * One tappable line of status — overdue, review due, sync trouble. Rendered as
+ * a real row with a chevron rather than coloured micro-text, so it reads as
+ * something you can act on.
+ */
+function Alert({ tone, text, onPress }: { tone: string; text: string; onPress?: () => void }) {
+  const body = (
+    <View style={s.alert}>
+      <View style={[s.dot, { backgroundColor: tone }]} />
+      <Text style={[s.alertText, { color: tone }]}>{text}</Text>
+      {!!onPress && <Icon name="chevron" size={16} color={tone} />}
+    </View>
+  );
+  if (!onPress) return body;
+  return (
+    <Pressable onPress={onPress} style={({ pressed }) => pressed && { opacity: 0.6 }}>
+      {body}
+    </Pressable>
+  );
+}
 
 export default function Home() {
   const router = useRouter();
@@ -25,103 +52,176 @@ export default function Home() {
   useFocusEffect(reloadReview);
   const reviewDays = daysSince(lastReview);
   const reviewDue = lastReview === null || (reviewDays !== null && reviewDays >= 7);
+  const preview = next.slice(0, PREVIEW);
 
   return (
-    <View style={s.screen}>
-      <View style={{ flex: 1 }}>
-        <Text style={s.sectionTitle}>Next up</Text>
-        {next.slice(0, 3).map((t) => (
-          <TaskRow key={t.id} task={t} />
-        ))}
-        {next.length === 0 && <Text style={s.empty}>Nothing next. Tap ＋ to add.</Text>}
-        {next.length > 3 && (
-          <Pressable onPress={() => router.push("/list/next")}>
-            <Text style={s.viewAll}>all next actions ({next.length}) →</Text>
+    <Screen>
+      <NestableScrollContainer contentContainerStyle={s.content} showsVerticalScrollIndicator={false}>
+        <Title count={next.length}>Next up</Title>
+
+        {preview.length === 0 ? (
+          <Empty>Nothing queued. Add the next thing on your mind.</Empty>
+        ) : Platform.OS === "web" ? (
+          <WebSortableList
+            data={preview}
+            onReorder={(id, to) => reorderTask(id, "next", to)}
+            separator={<TaskSeparator />}
+            renderItem={(t, i) => (
+              <View style={cardEdges(i, preview.length)}>
+                <TaskRow task={t} emphasized={i === 0} />
+              </View>
+            )}
+          />
+        ) : (
+          // Draggable so the "do this now" slot is a hand-picked choice, not
+          // just whatever sorted first. Preview indices are next[0..N], so a
+          // drop reorders the real Next list.
+          <NestableDraggableFlatList
+            data={preview}
+            keyExtractor={(t) => t.id}
+            activationDistance={12}
+            onDragBegin={() => haptic.pickup()}
+            onDragEnd={({ data, from, to }) => {
+              if (from !== to) {
+                haptic.success();
+                reorderTask(data[to].id, "next", to);
+              }
+            }}
+            renderItem={({ item, drag, isActive, getIndex }) => {
+              const i = getIndex() ?? 0;
+              return (
+                <ScaleDecorator activeScale={1.02}>
+                  <View style={[...cardEdges(i, preview.length), isActive && s.lifted]}>
+                    <TaskRow task={item} emphasized={i === 0} onLongPress={drag} />
+                  </View>
+                </ScaleDecorator>
+              );
+            }}
+            ItemSeparatorComponent={TaskSeparator}
+          />
+        )}
+
+        {next.length > PREVIEW && (
+          <Pressable
+            onPress={() => router.push("/list/next")}
+            style={({ pressed }) => [s.viewAll, pressed && { opacity: 0.6 }]}
+          >
+            <Text style={s.viewAllText}>All {next.length} next actions</Text>
+            <Icon name="chevron" size={16} color={C.accent} />
           </Pressable>
         )}
+
+        {(overdue.length > 0 || reviewDue || store.offline || !!store.syncError) && (
+          <>
+            <SectionHeader>Needs attention</SectionHeader>
+            <Card>
               {overdue.length > 0 && (
-          <Pressable onPress={() => router.push("/today")}>
-            <Text style={s.overdue}>{overdue.length} overdue →</Text>
-          </Pressable>
+                <Alert
+                  tone={C.danger}
+                  text={`${overdue.length} overdue`}
+                  onPress={() => router.push("/today")}
+                />
               )}
               {reviewDue && (
-          <Pressable onPress={() => router.push("/review")}>
-            <Text style={s.reviewNudge}>
-              {lastReview === null ? "no review yet — start one →" : `review overdue (${reviewDays}d) →`}
-            </Text>
-          </Pressable>
+                <Alert
+                  tone={C.warn}
+                  text={
+                    lastReview === null
+                      ? "No weekly review yet"
+                      : `Weekly review is ${reviewDays} days overdue`
+                  }
+                  onPress={() => router.push("/review")}
+                />
               )}
               {store.offline && (
-          <Text style={s.offline}>
-            offline{store.pending > 0 ? ` — ${store.pending} change${store.pending === 1 ? "" : "s"} queued` : ""}
-          </Text>
+                <Alert
+                  tone={C.textSecondary}
+                  text={
+                    store.pending > 0
+                      ? `Offline — ${store.pending} change${store.pending === 1 ? "" : "s"} queued`
+                      : "Offline"
+                  }
+                />
               )}
-        {store.syncError && <Text style={s.error}>{store.syncError}</Text>}
-      </View>
-      <View style={s.menu}>
+              {!!store.syncError && <Alert tone={C.danger} text={store.syncError} />}
+            </Card>
+          </>
+        )}
+      </NestableScrollContainer>
+
+      <View style={s.tabBar}>
         {MENU.map((m) => (
-          <Pressable key={m.label} style={s.menuItem} onPress={() => router.push(m.href)}>
-            <Text style={s.menuIcon}>{m.icon}</Text>
-            <Text style={s.menuLabel}>{m.label}</Text>
+          <Pressable
+            key={m.label}
+            style={({ pressed }) => [s.tab, pressed && { opacity: 0.5 }]}
+            onPress={() => {
+              haptic.tap();
+              router.push(m.href);
+            }}
+          >
+            <Icon name={m.icon} size={21} color={C.textSecondary} bg={C.surface} />
+            <Text style={s.tabLabel}>{m.label}</Text>
           </Pressable>
         ))}
       </View>
+
       <Pressable
-        style={s.fab}
+        style={({ pressed }) => [s.fab, pressed && { transform: [{ scale: 0.94 }] }]}
         onPress={() => {
           haptic.tap();
           router.push("/add");
         }}
       >
-        <Text style={s.fabText}>＋</Text>
+        <Icon name="plus" size={26} color={C.onAccent} />
       </Pressable>
-    </View>
+    </Screen>
   );
 }
 
 const s = StyleSheet.create({
-  screen: { flex: 1, backgroundColor: C.bg },
-  sectionTitle: {
-    color: C.muted,
-    fontSize: 13,
-    textTransform: "uppercase",
-    letterSpacing: 1,
-    paddingHorizontal: 16,
-    paddingTop: 18,
-    paddingBottom: 6,
-  },
-  empty: { color: C.muted, textAlign: "center", marginTop: 48, fontSize: 15 },
-  viewAll: { color: C.muted, fontSize: 14, padding: 16 },
-  overdue: { color: C.danger, fontSize: 14, paddingHorizontal: 16, paddingBottom: 8 },
-  reviewNudge: { color: C.warn, fontSize: 14, paddingHorizontal: 16, paddingBottom: 8 },
-  error: { color: C.danger, paddingHorizontal: 16, paddingTop: 8 },
-  offline: { color: C.muted, fontSize: 13, paddingHorizontal: 16, paddingTop: 8 },
-  menu: {
+  content: { paddingHorizontal: space.lg, paddingBottom: 120 },
+  lifted: { borderRadius: radius.lg, ...shadow.fab },
+
+  viewAll: {
     flexDirection: "row",
+    alignItems: "center",
+    gap: space.xs,
+    paddingVertical: space.md,
+    paddingHorizontal: space.xs,
+  },
+  viewAllText: { ...type.body, color: C.accent, fontWeight: "500" },
+
+  alert: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: space.md,
+    paddingVertical: space.md + 1,
+    paddingHorizontal: space.lg,
+  },
+  dot: { width: 7, height: 7, borderRadius: 999 },
+  alertText: { ...type.body, flex: 1, fontWeight: "500" },
+
+  tabBar: {
+    flexDirection: "row",
+    backgroundColor: C.surface,
     borderTopWidth: StyleSheet.hairlineWidth,
     borderTopColor: C.border,
-    paddingTop: 10,
-    paddingBottom: 18,
-    backgroundColor: C.bg,
+    paddingTop: space.md,
+    paddingBottom: space.xxl,
   },
-  menuItem: { flex: 1, alignItems: "center", gap: 3 },
-  menuIcon: { fontSize: 20 },
-  menuLabel: { color: C.muted, fontSize: 11 },
+  tab: { flex: 1, alignItems: "center", gap: 5 },
+  tabLabel: { fontSize: 11, color: C.textSecondary, letterSpacing: 0.1 },
+
   fab: {
     position: "absolute",
-    right: 20,
-    bottom: 92,
-    width: 58,
-    height: 58,
-    borderRadius: 29,
+    right: space.xl,
+    bottom: 104,
+    width: 56,
+    height: 56,
+    borderRadius: 28,
     backgroundColor: C.accent,
     alignItems: "center",
     justifyContent: "center",
-    elevation: 6,
-    shadowColor: "#000",
-    shadowOpacity: 0.35,
-    shadowRadius: 8,
-    shadowOffset: { width: 0, height: 4 },
+    ...shadow.fab,
   },
-  fabText: { color: "#FFFFFF", fontSize: 28, lineHeight: 32, fontWeight: "600" },
 });

app/src/app/project/[id].tsx

@@ -1,9 +1,12 @@
 import { Stack, useLocalSearchParams, useRouter } from "expo-router";
 import { useState } from "react";
 import { FlatList, Pressable, StyleSheet, Text, TextInput, View } from "react-native";
-import { Button, Chips } from "../../components/ui";
-import { createTask, dropProject, updateProject, updateTask } from "../../lib/store";
-import { C } from "../../lib/theme";
+import Icon from "../../components/Icon";
+import { Button, cardEdges, Chips, Empty, Separator } from "../../components/ui";
+import { haptic } from "../../lib/haptics";
+import { createTask, dropProject, updateProject } from "../../lib/store";
+import { completeWithUndo } from "../../lib/undo";
+import { C, radius, space, type } from "../../lib/theme";
 import { useStore } from "../../lib/useStore";
 import type { ProjectStatus } from "../../lib/types";
 
@@ -16,7 +19,7 @@ export default function ProjectDetail() {
   const [draft, setDraft] = useState("");
 
   const project = store.projects.find((p) => p.id === id);
-  if (!project) return <Text style={{ color: C.muted, margin: 16 }}>Project not found.</Text>;
+  if (!project) return <Empty>Project not found.</Empty>;
 
   const tasks = store.tasks
     .filter((t) => t.project_id === id && t.status !== "done" && t.status !== "trashed")
@@ -26,13 +29,14 @@ export default function ProjectDetail() {
     const title = draft.trim();
     if (!title) return;
     setDraft("");
-    createTask({ title, status: "next", project_id: id });
+    haptic.success();
+    createTask({ title, status: "next", project_id: id, area: project.area ?? "personal" });
   };
 
   return (
     <View style={{ flex: 1, backgroundColor: C.bg }}>
       <Stack.Screen options={{ title: project.name }} />
-      <View style={{ padding: 16, paddingBottom: 0 }}>
+      <View style={{ paddingHorizontal: space.lg, paddingTop: space.md }}>
         <Chips
           label="Status"
           options={STATUSES}
@@ -53,22 +57,35 @@ export default function ProjectDetail() {
       <FlatList
         data={tasks}
         keyExtractor={(t) => t.id}
-        renderItem={({ item }) => (
-          <Pressable style={s.row} onPress={() => router.push(`/task/${item.id}`)}>
+        renderItem={({ item, index }) => (
+          <Pressable
+            style={({ pressed }) => [
+              s.row,
+              ...cardEdges(index, tasks.length),
+              pressed && { backgroundColor: C.surface2 },
+            ]}
+            onPress={() => router.push(`/task/${item.id}`)}
+          >
             <Pressable
               style={s.checkbox}
               hitSlop={10}
-              onPress={() => updateTask(item.id, { status: "done" })}
+              onPress={() => completeWithUndo(item)}
             />
             <View style={{ flex: 1 }}>
-              <Text style={s.title}>{item.title}</Text>
+              <Text style={s.title} numberOfLines={2}>
+                {item.title}
+              </Text>
               <Text style={s.meta}>{[item.status, item.context].filter(Boolean).join("  ·  ")}</Text>
             </View>
+            <Icon name="chevron" size={16} color={C.muted} />
           </Pressable>
         )}
-        ListEmptyComponent={<Text style={s.empty}>No open tasks in this project.</Text>}
+        ItemSeparatorComponent={() => <Separator inset={space.lg + 21 + space.md} />}
+        ListEmptyComponent={<Empty>No open tasks in this project.</Empty>}
+        contentContainerStyle={s.listContent}
+        showsVerticalScrollIndicator={false}
       />
-      <View style={{ padding: 16 }}>
+      <View style={{ paddingHorizontal: space.lg, paddingBottom: space.lg }}>
         <Button
           title="Drop project"
           danger
@@ -84,27 +101,26 @@ export default function ProjectDetail() {
 
 const s = StyleSheet.create({
   capture: {
-    margin: 12,
-    marginBottom: 4,
-    padding: 14,
-    borderRadius: 12,
+    marginHorizontal: space.lg,
+    marginBottom: space.lg,
+    paddingHorizontal: space.lg,
+    paddingVertical: space.md + 2,
+    borderRadius: radius.md,
     backgroundColor: C.surface,
     color: C.text,
     fontSize: 16,
-    borderWidth: 1,
+    borderWidth: StyleSheet.hairlineWidth,
     borderColor: C.border,
   },
+  listContent: { paddingHorizontal: space.lg, paddingBottom: space.lg },
   row: {
     flexDirection: "row",
     alignItems: "center",
-    gap: 12,
-    paddingVertical: 14,
-    paddingHorizontal: 16,
-    borderBottomWidth: StyleSheet.hairlineWidth,
-    borderBottomColor: C.border,
+    gap: space.md,
+    paddingVertical: space.md + 2,
+    paddingHorizontal: space.lg,
   },
-  checkbox: { width: 22, height: 22, borderRadius: 11, borderWidth: 2, borderColor: C.muted },
-  title: { color: C.text, fontSize: 16 },
-  meta: { color: C.muted, fontSize: 13, marginTop: 2 },
-  empty: { color: C.muted, textAlign: "center", marginTop: 48 },
+  checkbox: { width: 21, height: 21, borderRadius: 7, borderWidth: 1.5, borderColor: C.muted },
+  title: { ...type.row, color: C.text },
+  meta: { ...type.meta, color: C.muted, marginTop: 2 },
 });

app/src/app/projects.tsx

@@ -1,8 +1,11 @@
 import { useRouter } from "expo-router";
 import { useState } from "react";
 import { FlatList, Pressable, StyleSheet, Text, TextInput, View } from "react-native";
+import Icon from "../components/Icon";
+import { cardEdges, Empty, Pill, Separator } from "../components/ui";
+import { haptic } from "../lib/haptics";
 import { activeProjects, createProject, openTaskCount } from "../lib/store";
-import { C } from "../lib/theme";
+import { C, radius, space, type } from "../lib/theme";
 import { useStore } from "../lib/useStore";
 
 export default function Projects() {
@@ -15,6 +18,7 @@ export default function Projects() {
     const name = draft.trim();
     if (!name) return;
     setDraft("");
+    haptic.success();
     createProject({ name });
   };
 
@@ -32,18 +36,34 @@ export default function Projects() {
       <FlatList
         data={projects}
         keyExtractor={(p) => p.id}
-        renderItem={({ item }) => (
-          <Pressable style={s.row} onPress={() => router.push(`/project/${item.id}`)}>
+        renderItem={({ item, index }) => {
+          const open = openTaskCount(store, item.id);
+          return (
+            <Pressable
+              style={({ pressed }) => [
+                s.row,
+                ...cardEdges(index, projects.length),
+                pressed && { backgroundColor: C.surface2 },
+              ]}
+              onPress={() => router.push(`/project/${item.id}`)}
+            >
               <View style={{ flex: 1 }}>
-              <Text style={s.title}>{item.name}</Text>
+                <Text style={s.title} numberOfLines={1}>
+                  {item.name}
+                </Text>
                 <Text style={s.meta}>
-                {item.status}  ·  {openTaskCount(store, item.id)} open
+                  {open === 0 ? "Nothing open" : `${open} open`}
                 </Text>
               </View>
-            <Text style={{ color: C.muted }}>›</Text>
+              {item.status !== "active" && <Pill label={item.status} />}
+              <Icon name="chevron" size={16} color={C.muted} />
             </Pressable>
-        )}
-        ListEmptyComponent={<Text style={s.empty}>No projects yet.</Text>}
+          );
+        }}
+        ItemSeparatorComponent={() => <Separator inset={space.lg} />}
+        ListEmptyComponent={<Empty>No projects yet. Name one above.</Empty>}
+        contentContainerStyle={s.content}
+        showsVerticalScrollIndicator={false}
       />
     </View>
   );
@@ -51,26 +71,27 @@ export default function Projects() {
 
 const s = StyleSheet.create({
   screen: { flex: 1, backgroundColor: C.bg },
+  content: { paddingHorizontal: space.lg, paddingBottom: 40 },
   capture: {
-    margin: 12,
-    marginBottom: 4,
-    padding: 14,
-    borderRadius: 12,
+    marginHorizontal: space.lg,
+    marginTop: space.md,
+    marginBottom: space.lg,
+    paddingHorizontal: space.lg,
+    paddingVertical: space.md + 2,
+    borderRadius: radius.md,
     backgroundColor: C.surface,
     color: C.text,
     fontSize: 16,
-    borderWidth: 1,
+    borderWidth: StyleSheet.hairlineWidth,
     borderColor: C.border,
   },
   row: {
     flexDirection: "row",
     alignItems: "center",
-    paddingVertical: 14,
-    paddingHorizontal: 16,
-    borderBottomWidth: StyleSheet.hairlineWidth,
-    borderBottomColor: C.border,
+    gap: space.md,
+    paddingVertical: space.md + 2,
+    paddingHorizontal: space.lg,
   },
-  title: { color: C.text, fontSize: 16 },
-  meta: { color: C.muted, fontSize: 13, marginTop: 2 },
-  empty: { color: C.muted, textAlign: "center", marginTop: 48 },
+  title: { ...type.row, color: C.text },
+  meta: { ...type.meta, color: C.muted, marginTop: 2 },
 });

app/src/app/review.tsx

@@ -3,33 +3,41 @@
 // done on the checkbox, so nothing needs a trip through the edit modal.
 import { useRouter } from "expo-router";
 import { Pressable, ScrollView, StyleSheet, Text, View } from "react-native";
-import { Button } from "../components/ui";
+import Icon from "../components/Icon";
+import { Button, Card, Empty, SectionHeader } from "../components/ui";
 import { friendlyDate } from "../lib/dates";
 import { haptic } from "../lib/haptics";
 import { PRIORITY_COLOR } from "../lib/priority";
 import { daysSince, markReviewed, useLastReview } from "../lib/review";
 import { reviewBuckets, trashTask, updateTask } from "../lib/store";
-import { C } from "../lib/theme";
+import { completeWithUndo } from "../lib/undo";
+import { C, radius, space, type } from "../lib/theme";
 import { useStore } from "../lib/useStore";
 import type { Task } from "../lib/types";
 
-function ReviewRow({ task, showDefer }: { task: Task; showDefer?: boolean }) {
+function ReviewRow({
+  task,
+  showDefer,
+  last,
+}: {
+  task: Task;
+  showDefer?: boolean;
+  /** The card already draws the bottom edge — don't double it up. */
+  last?: boolean;
+}) {
   const router = useRouter();
   const act = (fn: () => void) => () => {
     haptic.select();
     fn();
   };
   return (
-    <View style={s.row}>
+    <View style={[s.row, last && s.rowLast]}>
       <Pressable
         style={s.check}
         hitSlop={8}
-        onPress={act(() => {
-          haptic.success();
-          updateTask(task.id, { status: "done" });
-        })}
+        onPress={() => completeWithUndo(task)}
       >
-        <View style={[s.checkCircle, { borderColor: PRIORITY_COLOR[task.priority] }]} />
+        <View style={[s.checkbox, { borderColor: PRIORITY_COLOR[task.priority] }]} />
       </Pressable>
       <Pressable style={{ flex: 1 }} onPress={() => router.push(`/task/${task.id}`)}>
         <Text style={s.title} numberOfLines={2}>
@@ -46,17 +54,29 @@ function ReviewRow({ task, showDefer }: { task: Task; showDefer?: boolean }) {
         </Text>
       </Pressable>
       {task.status !== "next" && (
-        <Pressable style={s.action} hitSlop={6} onPress={act(() => updateTask(task.id, { status: "next" }))}>
-          <Text style={s.actionText}>▶️</Text>
+        <Pressable
+          style={({ pressed }) => [s.action, pressed && s.actionPressed]}
+          hitSlop={6}
+          onPress={act(() => updateTask(task.id, { status: "next" }))}
+        >
+          <Icon name="next" size={14} color={C.accent} />
         </Pressable>
       )}
       {task.status !== "someday" && (
-        <Pressable style={s.action} hitSlop={6} onPress={act(() => updateTask(task.id, { status: "someday" }))}>
-          <Text style={s.actionText}>💭</Text>
+        <Pressable
+          style={({ pressed }) => [s.action, pressed && s.actionPressed]}
+          hitSlop={6}
+          onPress={act(() => updateTask(task.id, { status: "someday" }))}
+        >
+          <Icon name="someday" size={14} color={C.textSecondary} bg={C.surface} />
         </Pressable>
       )}
-      <Pressable style={s.action} hitSlop={6} onPress={act(() => trashTask(task.id))}>
-        <Text style={s.actionText}>🗑️</Text>
+      <Pressable
+        style={({ pressed }) => [s.action, pressed && s.actionPressed]}
+        hitSlop={6}
+        onPress={act(() => trashTask(task.id))}
+      >
+        <Text style={s.dropText}>Drop</Text>
       </Pressable>
     </View>
   );
@@ -65,14 +85,16 @@ function ReviewRow({ task, showDefer }: { task: Task; showDefer?: boolean }) {
 function Section({ title, hint, tasks, showDefer }: { title: string; hint: string; tasks: Task[]; showDefer?: boolean }) {
   if (tasks.length === 0) return null;
   return (
-    <View style={{ marginBottom: 8 }}>
-      <Text style={s.sectionTitle}>
+    <View>
+      <SectionHeader>
         {title} ({tasks.length})
-      </Text>
+      </SectionHeader>
       <Text style={s.sectionHint}>{hint}</Text>
-      {tasks.map((t) => (
-        <ReviewRow key={t.id} task={t} showDefer={showDefer} />
+      <Card>
+        {tasks.map((t, i) => (
+          <ReviewRow key={t.id} task={t} showDefer={showDefer} last={i === tasks.length - 1} />
         ))}
+      </Card>
     </View>
   );
 }
@@ -93,7 +115,7 @@ export default function Review() {
     !buckets.stuckProjects.length;
 
   return (
-    <ScrollView style={{ flex: 1, backgroundColor: C.bg }} contentContainerStyle={{ padding: 16, paddingBottom: 48 }}>
+    <ScrollView style={{ flex: 1, backgroundColor: C.bg }} contentContainerStyle={s.content}>
       <Text style={s.lastReview}>
         {last ? (days === 0 ? "Last review: today" : `Last review: ${days}d ago`) : "First review — welcome."}
       </Text>
@@ -105,22 +127,32 @@ export default function Review() {
       <Section title="Deferred" hint="Hidden from lists — just so you know they're coming." tasks={buckets.deferred} showDefer />
 
       {buckets.stuckProjects.length > 0 && (
-        <View style={{ marginBottom: 8 }}>
-          <Text style={s.sectionTitle}>Stuck projects ({buckets.stuckProjects.length})</Text>
+        <View>
+          <SectionHeader>Stuck projects ({buckets.stuckProjects.length})</SectionHeader>
           <Text style={s.sectionHint}>Active, but no next action — decide the next step or park them.</Text>
-          {buckets.stuckProjects.map((p) => (
-            <Pressable key={p.id} style={s.row} onPress={() => router.push(`/project/${p.id}`)}>
+          <Card>
+            {buckets.stuckProjects.map((p, i) => (
+              <Pressable
+                key={p.id}
+                style={({ pressed }) => [
+                  s.row,
+                  i === buckets.stuckProjects.length - 1 && s.rowLast,
+                  pressed && { backgroundColor: C.surface2 },
+                ]}
+                onPress={() => router.push(`/project/${p.id}`)}
+              >
                 <Text style={[s.title, { flex: 1 }]}>{p.name}</Text>
-              <Text style={s.meta}>open →</Text>
+                <Icon name="chevron" size={16} color={C.muted} />
               </Pressable>
             ))}
+          </Card>
         </View>
       )}
 
-      {empty && <Text style={s.empty}>All clear. Nothing needs a decision.</Text>}
+      {empty && <Empty>All clear. Nothing needs a decision.</Empty>}
 
       <Button
-        title="✓ Mark review complete"
+        title="Mark review complete"
         onPress={async () => {
           haptic.success();
           await markReviewed();
@@ -142,30 +174,35 @@ export default function Review() {
 }
 
 const s = StyleSheet.create({
-  lastReview: { color: C.muted, fontSize: 13, marginBottom: 12 },
-  sectionTitle: {
-    color: C.text,
-    fontSize: 15,
-    fontWeight: "700",
-    paddingTop: 12,
-  },
-  sectionHint: { color: C.muted, fontSize: 13, marginBottom: 4 },
+  content: { padding: space.lg, paddingBottom: 48 },
+  lastReview: { ...type.meta, color: C.textSecondary, marginBottom: space.xs },
+  sectionHint: { ...type.meta, color: C.muted, paddingHorizontal: space.xs, marginBottom: space.sm },
   row: {
     flexDirection: "row",
     alignItems: "center",
-    gap: 10,
-    paddingVertical: 12,
+    gap: space.md,
+    paddingVertical: space.md,
+    paddingHorizontal: space.lg,
     borderBottomWidth: StyleSheet.hairlineWidth,
-    borderBottomColor: C.border,
+    borderBottomColor: C.separator,
+    backgroundColor: C.surface,
   },
+  rowLast: { borderBottomWidth: 0 },
   check: { paddingRight: 2 },
-  checkCircle: { width: 20, height: 20, borderRadius: 10, borderWidth: 2 },
-  title: { color: C.text, fontSize: 15 },
-  meta: { color: C.muted, fontSize: 12, marginTop: 2 },
-  action: { paddingHorizontal: 4 },
-  actionText: { fontSize: 17 },
-  empty: { color: C.muted, textAlign: "center", marginVertical: 32, fontSize: 15 },
-  archiveRow: { flexDirection: "row", justifyContent: "center", gap: 8, marginTop: 4 },
-  archiveLink: { color: C.muted, fontSize: 14, padding: 6 },
+  checkbox: { width: 21, height: 21, borderRadius: 7, borderWidth: 1.5 },
+  title: { ...type.body, color: C.text },
+  meta: { ...type.meta, fontSize: 12, color: C.muted, marginTop: 2 },
+  action: {
+    minWidth: 30,
+    height: 28,
+    paddingHorizontal: space.sm,
+    borderRadius: radius.sm,
+    alignItems: "center",
+    justifyContent: "center",
+  },
+  actionPressed: { backgroundColor: C.surface2 },
+  dropText: { ...type.meta, color: C.danger, fontWeight: "500" },
+  archiveRow: { flexDirection: "row", justifyContent: "center", gap: space.sm, marginTop: space.xs },
+  archiveLink: { ...type.meta, color: C.textSecondary, padding: space.sm },
   archiveDot: { color: C.muted, alignSelf: "center" },
 });

app/src/app/settings.tsx

@@ -1,11 +1,12 @@
+import * as Application from "expo-application";
 import { useRouter } from "expo-router";
 import { useEffect, useState } from "react";
-import { ScrollView, Text } from "react-native";
+import { ScrollView, StyleSheet, Text } from "react-native";
 import { Button, Field } from "../components/ui";
 import { api } from "../lib/api";
 import { DEFAULT_URL, getConfig, setConfig } from "../lib/config";
 import { sync } from "../lib/store";
-import { C } from "../lib/theme";
+import { C, space, type } from "../lib/theme";
 
 export default function Settings() {
   const router = useRouter();
@@ -32,7 +33,7 @@ export default function Settings() {
   };
 
   return (
-    <ScrollView style={{ flex: 1, backgroundColor: C.bg }} contentContainerStyle={{ padding: 16 }}>
+    <ScrollView style={{ flex: 1, backgroundColor: C.bg }} contentContainerStyle={s.content}>
       <Field label="Server" value={url} onChangeText={setUrl} autoCapitalize="none" autoCorrect={false} />
       <Field
         label="API token"
@@ -43,7 +44,15 @@ export default function Settings() {
         secureTextEntry
       />
       <Button title="Save & test" onPress={save} />
-      {status && <Text style={{ color: C.danger }}>{status}</Text>}
+      {status && <Text style={s.error}>{status}</Text>}
+      {/* CI stamps versionName from the release tag — confirms which build Obtainium installed. */}
+      <Text style={s.version}>GTD v{Application.nativeApplicationVersion ?? "dev"}</Text>
     </ScrollView>
   );
 }
+
+const s = StyleSheet.create({
+  content: { padding: space.lg },
+  error: { ...type.meta, color: C.danger, marginTop: space.xs },
+  version: { ...type.meta, color: C.muted, textAlign: "center", marginTop: space.xxl },
+});

app/src/app/task/[id].tsx

@@ -1,18 +1,32 @@
 import { useLocalSearchParams, useRouter } from "expo-router";
 import { useState } from "react";
-import { Pressable, ScrollView, StyleSheet, Text, View } from "react-native";
-import DateField from "../../components/DateField";
-import EstimateChips from "../../components/EstimateChips";
-import PriorityChips from "../../components/PriorityChips";
-import { Button, Chips, Field } from "../../components/ui";
+import { ScrollView, StyleSheet, Text } from "react-native";
+import TaskForm, { CAPTURE_BOXES, type TaskDraft } from "../../components/TaskForm";
+import { Button, Empty } from "../../components/ui";
 import { haptic } from "../../lib/haptics";
-import { REPEAT_LABEL, REPEATS } from "../../lib/repeat";
-import { activeProjects, knownContexts, trashTask, updateTask } from "../../lib/store";
-import { C } from "../../lib/theme";
+import { trashTask, updateTask } from "../../lib/store";
+import { completeWithUndo } from "../../lib/undo";
+import { C, space, type } from "../../lib/theme";
 import { useStore } from "../../lib/useStore";
-import type { Repeat, Task, TaskStatus } from "../../lib/types";
+import type { Task, TaskStatus } from "../../lib/types";
 
-const STATUSES: TaskStatus[] = ["next", "waiting", "someday", "done"];
+// Clarify can also finish a task outright; capture never needs to.
+const BOXES: TaskStatus[] = [...CAPTURE_BOXES, "done"];
+
+const toDraft = (t: Task): TaskDraft => ({
+  title: t.title,
+  notes: t.notes,
+  status: t.status,
+  project_id: t.project_id,
+  context: t.context,
+  waiting_for: t.waiting_for,
+  due_date: t.due_date,
+  defer_date: t.defer_date,
+  estimate_min: t.estimate_min,
+  repeat: t.repeat,
+  priority: t.priority,
+  area: t.area ?? "personal",
+});
 
 export default function TaskDetail() {
   const { id } = useLocalSearchParams<{ id: string }>();
@@ -20,44 +34,31 @@ export default function TaskDetail() {
   const store = useStore();
   const original = store.tasks.find((t) => t.id === id);
   // Draft is local to the screen; nothing is written until Save.
-  const [draft, setDraft] = useState<Task | null>(original ?? null);
+  const [draft, setDraft] = useState<TaskDraft | null>(original ? toDraft(original) : null);
 
-  if (!draft) return <Text style={{ color: C.muted, margin: 16 }}>Task not found.</Text>;
-
-  const set = (patch: Partial<Task>) => setDraft({ ...draft, ...patch });
+  if (!original || !draft) return <Empty>Task not found.</Empty>;
 
   const save = () => {
-    updateTask(draft.id, {
-      title: draft.title,
-      notes: draft.notes,
-      status: draft.status,
-      project_id: draft.project_id,
-      context: draft.context,
-      waiting_for: draft.waiting_for,
-      due_date: draft.due_date,
-      defer_date: draft.defer_date,
-      priority: draft.priority,
-      estimate_min: draft.estimate_min,
-      repeat: draft.repeat,
-    });
+    const { status, ...rest } = draft;
+    const completing = status === "done" && original.status !== "done";
+    // Completing from Clarify gets the same Undo as a checkbox; the toast
+    // lives in the root layout so it outlives this modal.
+    updateTask(original.id, { ...rest, ...(completing ? {} : { status }), priority: draft.priority ?? 3 });
+    if (completing) completeWithUndo(original, original.status);
+    else haptic.success();
     router.back();
   };
 
-  const projects = activeProjects(store).filter((p) => p.status === "active" || p.id === draft.project_id);
-  const projectOptions = ["none", ...projects.map((p) => p.id)];
-  const projectLabels = Object.fromEntries([["none", "None"], ...projects.map((p) => [p.id, p.name])]);
-  const contexts = knownContexts(store);
-
-  if (draft.status === "trashed") {
+  if (original.status === "trashed") {
     return (
-      <ScrollView style={{ flex: 1, backgroundColor: C.bg }} contentContainerStyle={{ padding: 16 }}>
-        <Text style={s.trashedTitle}>{draft.title}</Text>
+      <ScrollView style={{ flex: 1, backgroundColor: C.bg }} contentContainerStyle={s.content}>
+        <Text style={s.trashedTitle}>{original.title}</Text>
         <Text style={s.trashedMeta}>In the trash.</Text>
         <Button
           title="Restore to Next"
           onPress={() => {
             haptic.success();
-            updateTask(draft.id, { status: "next" });
+            updateTask(original.id, { status: "next" });
             router.back();
           }}
         />
@@ -66,74 +67,25 @@ export default function TaskDetail() {
   }
 
   return (
-    <ScrollView style={{ flex: 1, backgroundColor: C.bg }} contentContainerStyle={{ padding: 16 }}>
-      <Field label="Title" value={draft.title} onChangeText={(v) => set({ title: v })} />
-      <PriorityChips value={draft.priority} onChange={(priority) => set({ priority })} />
-      <EstimateChips value={draft.estimate_min} onChange={(estimate_min) => set({ estimate_min })} />
-      <Chips label="List" options={STATUSES} value={draft.status} onChange={(status) => set({ status })} />
-      <Chips
-        label="Project"
-        options={projectOptions}
-        labels={projectLabels}
-        value={draft.project_id ?? "none"}
-        onChange={(v) => set({ project_id: v === "none" ? null : v })}
-      />
-      <Field
-        label="Context"
-        value={draft.context ?? ""}
-        onChangeText={(v) => set({ context: v || null })}
-        placeholder="@home, @computer, @errands…"
-        autoCapitalize="none"
-      />
-      {contexts.length > 0 && (
-        <View style={s.contextRow}>
-          {contexts.map((c) => (
-            <Pressable
-              key={c}
-              style={[s.contextChip, draft.context === c && s.contextChipActive]}
-              onPress={() => {
-                haptic.select();
-                set({ context: draft.context === c ? null : c });
-              }}
+    <ScrollView
+      style={{ flex: 1, backgroundColor: C.bg }}
+      contentContainerStyle={s.content}
+      keyboardShouldPersistTaps="handled"
+      showsVerticalScrollIndicator={false}
     >
-              <Text style={[s.contextText, draft.context === c && { color: C.text }]}>{c}</Text>
-            </Pressable>
-          ))}
-        </View>
-      )}
-      {draft.status === "waiting" && (
-        <Field
-          label="Waiting for"
-          value={draft.waiting_for ?? ""}
-          onChangeText={(v) => set({ waiting_for: v || null })}
-          placeholder="Who or what?"
+      <TaskForm
+        value={draft}
+        onChange={(patch) => setDraft({ ...draft, ...patch })}
+        boxes={BOXES}
+        showDefer
+        onSubmitTitle={save}
       />
-      )}
-      <DateField label="Due date" value={draft.due_date} onChange={(v) => set({ due_date: v })} clearable />
-      <Chips
-        label="Repeat"
-        options={["none", ...REPEATS]}
-        labels={{ none: "None", ...REPEAT_LABEL }}
-        value={draft.repeat ?? "none"}
-        onChange={(v) => set({ repeat: v === "none" ? null : (v as Repeat) })}
-      />
-      <DateField label="Defer until" value={draft.defer_date} onChange={(v) => set({ defer_date: v })} clearable />
-      {!!draft.defer_date && (
-        <Text style={s.deferHint}>Hidden from lists until then — it resurfaces on the day.</Text>
-      )}
-      <Field
-        label="Notes"
-        value={draft.notes}
-        onChangeText={(v) => set({ notes: v })}
-        multiline
-        style={{ minHeight: 80, textAlignVertical: "top" }}
-      />
-      <Button title="Save" onPress={save} />
+      <Button title="Save" onPress={save} style={s.save} />
       <Button
         title="Delete"
         danger
         onPress={() => {
-          trashTask(draft.id);
+          trashTask(original.id);
           router.back();
         }}
       />
@@ -142,18 +94,8 @@ export default function TaskDetail() {
 }
 
 const s = StyleSheet.create({
-  trashedTitle: { color: C.text, fontSize: 18, marginBottom: 6 },
-  trashedMeta: { color: C.muted, fontSize: 14, marginBottom: 18 },
-  contextRow: { flexDirection: "row", flexWrap: "wrap", gap: 8, marginTop: -6, marginBottom: 14 },
-  contextChip: {
-    paddingVertical: 6,
-    paddingHorizontal: 12,
-    borderRadius: 16,
-    backgroundColor: C.surface,
-    borderWidth: 1,
-    borderColor: C.border,
-  },
-  contextChipActive: { backgroundColor: C.surface2, borderColor: C.accent },
-  contextText: { color: C.muted, fontSize: 13 },
-  deferHint: { color: C.muted, fontSize: 13, marginTop: -8, marginBottom: 12 },
+  content: { padding: space.lg, paddingBottom: space.xxl },
+  save: { marginTop: space.xl },
+  trashedTitle: { ...type.title, fontSize: 22, color: C.text, marginBottom: space.xs },
+  trashedMeta: { ...type.body, color: C.muted, marginBottom: space.xl },
 });

app/src/app/today.tsx

@@ -1,7 +1,8 @@
-import { SectionList, StyleSheet, Text } from "react-native";
-import TaskRow from "../components/TaskRow";
+import { SectionList, StyleSheet, View } from "react-native";
+import TaskRow, { TaskSeparator } from "../components/TaskRow";
+import { cardEdges, Empty, SectionHeader } from "../components/ui";
 import { todayTasks } from "../lib/store";
-import { C } from "../lib/theme";
+import { C, space } from "../lib/theme";
 import { useStore } from "../lib/useStore";
 
 export default function Today() {
@@ -9,26 +10,35 @@ export default function Today() {
   const { overdue, today } = todayTasks(store);
   const sections = [
     ...(overdue.length ? [{ title: "Overdue", data: overdue, color: C.danger }] : []),
-    { title: "Today", data: today, color: C.text },
+    { title: "Today", data: today, color: C.textSecondary },
   ];
+  const empty = overdue.length === 0 && today.length === 0;
 
   return (
     <SectionList
-      style={{ flex: 1, backgroundColor: C.bg }}
+      style={s.screen}
       sections={sections}
       keyExtractor={(t) => t.id}
-      renderItem={({ item }) => <TaskRow task={item} showStatus />}
-      renderSectionHeader={({ section }) => (
-        <Text style={[s.header, { color: section.color }]}>{section.title}</Text>
+      // Each section is its own rounded card, so the first and last rows in a
+      // section round their outer corners.
+      renderItem={({ item, index, section }) => (
+        <View style={cardEdges(index, section.data.length)}>
+          <TaskRow task={item} showStatus />
+        </View>
       )}
-      ListEmptyComponent={<Text style={s.empty}>Nothing due. Clear runway.</Text>}
-      contentContainerStyle={{ paddingBottom: 32 }}
+      renderSectionHeader={({ section }) => (
+        <SectionHeader tone={section.color}>{section.title}</SectionHeader>
+      )}
+      ItemSeparatorComponent={TaskSeparator}
+      ListFooterComponent={empty ? <Empty>Nothing due. Clear runway.</Empty> : null}
+      contentContainerStyle={s.content}
       stickySectionHeadersEnabled={false}
+      showsVerticalScrollIndicator={false}
     />
   );
 }
 
 const s = StyleSheet.create({
-  header: { fontSize: 15, fontWeight: "700", paddingHorizontal: 16, paddingTop: 18, paddingBottom: 6 },
-  empty: { color: C.muted, textAlign: "center", marginTop: 48, fontSize: 15 },
+  screen: { flex: 1, backgroundColor: C.bg },
+  content: { paddingHorizontal: space.lg, paddingBottom: 40 },
 });

app/src/components/AreaToggle.tsx

@@ -0,0 +1,64 @@
+// The personal / work switch that lives in the home header.
+//
+// A two-segment pill rather than a menu or a settings row: the whole point is
+// that flipping halves of your life is one tap and its state is always
+// visible. Work gets its own tone so a glance at the header tells you which
+// lens is on even before you read the label.
+import { Pressable, StyleSheet, Text, View } from "react-native";
+import { haptic } from "../lib/haptics";
+import { setArea } from "../lib/store";
+import { C, radius, type } from "../lib/theme";
+import { useStore } from "../lib/useStore";
+import { AREA_LABEL, AREAS, type Area } from "../lib/types";
+
+export const AREA_TONE: Record<Area, string> = { personal: C.accent, work: C.work };
+
+export default function AreaToggle() {
+  const { area } = useStore();
+  return (
+    <View style={s.track} accessibilityRole="tablist">
+      {AREAS.map((a) => {
+        const active = a === area;
+        return (
+          <Pressable
+            key={a}
+            accessibilityRole="tab"
+            accessibilityState={{ selected: active }}
+            hitSlop={6}
+            onPress={() => {
+              if (active) return;
+              haptic.select();
+              setArea(a);
+            }}
+            style={({ pressed }) => [
+              s.segment,
+              active && { backgroundColor: AREA_TONE[a] },
+              pressed && !active && s.segmentPressed,
+            ]}
+          >
+            <Text style={[s.label, active && s.labelActive]}>{AREA_LABEL[a]}</Text>
+          </Pressable>
+        );
+      })}
+    </View>
+  );
+}
+
+const s = StyleSheet.create({
+  track: {
+    flexDirection: "row",
+    padding: 3,
+    borderRadius: radius.pill,
+    backgroundColor: C.surface2,
+    borderWidth: StyleSheet.hairlineWidth,
+    borderColor: C.border,
+  },
+  segment: {
+    paddingVertical: 5,
+    paddingHorizontal: 16,
+    borderRadius: radius.pill,
+  },
+  segmentPressed: { backgroundColor: C.border },
+  label: { ...type.chip, color: C.textSecondary },
+  labelActive: { color: C.onAccent, fontWeight: "600" },
+});

app/src/components/AttrBar.tsx

@@ -0,0 +1,126 @@
+// The attribute bar: one wrapping row of chips that doubles as the task's
+// summary and as the entry point to every optional field.
+//
+// The old form stacked seven labelled control groups down the screen, so
+// capturing "call Sam" meant scrolling past a calendar, a repeat picker and an
+// estimate picker to reach the save button. Here each field collapses to a
+// single chip: unset chips read as a quiet placeholder, set chips show their
+// value in the accent. Exactly one panel is open at a time, so the screen
+// never grows past roughly a phone height.
+import { useState } from "react";
+import { Pressable, StyleSheet, Text, View } from "react-native";
+import { haptic } from "../lib/haptics";
+import { C, radius, space, type } from "../lib/theme";
+import Icon, { type IconName } from "./Icon";
+
+export type Attr = {
+  key: string;
+  icon: IconName;
+  /** Chip label while the field is unset. */
+  placeholder: string;
+  /** Chip label once set — this is what makes the bar readable as a summary. */
+  value?: string | null;
+  /** Chip accent when set. Defaults to the app accent. */
+  tone?: string;
+  /** Revealed under the bar when the chip is tapped. */
+  panel: React.ReactNode;
+  /** Offered as "Clear" in the open panel's header. Omit for required fields. */
+  onClear?: () => void;
+};
+
+export default function AttrBar({ attrs }: { attrs: Attr[] }) {
+  const [open, setOpen] = useState<string | null>(null);
+  const active = attrs.find((a) => a.key === open) ?? null;
+
+  return (
+    <View>
+      <View style={s.row}>
+        {attrs.map((a) => {
+          const set = !!a.value;
+          const tone = a.tone ?? C.accent;
+          const isOpen = a.key === open;
+          return (
+            <Pressable
+              key={a.key}
+              onPress={() => {
+                haptic.tap();
+                setOpen(isOpen ? null : a.key);
+              }}
+              style={({ pressed }) => [
+                s.chip,
+                set && { borderColor: tone, backgroundColor: `${tone}14` },
+                isOpen && { borderColor: tone, backgroundColor: `${tone}22` },
+                pressed && { opacity: 0.7 },
+              ]}
+            >
+              <Icon name={a.icon} size={15} color={set || isOpen ? tone : C.muted} bg={C.bg} />
+              <Text style={[s.chipText, (set || isOpen) && { color: tone, fontWeight: "600" }]}>
+                {a.value || a.placeholder}
+              </Text>
+            </Pressable>
+          );
+        })}
+      </View>
+
+      {!!active && (
+        <View style={s.panel}>
+          <View style={s.panelHead}>
+            <Text style={s.panelTitle}>{active.placeholder}</Text>
+            {!!active.onClear && !!active.value && (
+              <Pressable
+                onPress={() => {
+                  haptic.select();
+                  active.onClear?.();
+                }}
+                hitSlop={8}
+                style={({ pressed }) => pressed && { opacity: 0.6 }}
+              >
+                <Text style={s.clear}>Clear</Text>
+              </Pressable>
+            )}
+            <Pressable onPress={() => setOpen(null)} hitSlop={10} style={({ pressed }) => pressed && { opacity: 0.6 }}>
+              <Icon name="close" size={17} color={C.muted} />
+            </Pressable>
+          </View>
+          {active.panel}
+        </View>
+      )}
+    </View>
+  );
+}
+
+const s = StyleSheet.create({
+  row: { flexDirection: "row", flexWrap: "wrap", gap: space.sm },
+  chip: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: 6,
+    paddingVertical: space.sm - 1,
+    paddingLeft: space.md - 2,
+    paddingRight: space.lg - 2,
+    borderRadius: radius.pill,
+    borderWidth: StyleSheet.hairlineWidth,
+    borderColor: C.border,
+    backgroundColor: C.surface,
+  },
+  chipText: { ...type.chip, color: C.textSecondary },
+
+  panel: {
+    marginTop: space.md,
+    backgroundColor: C.surface,
+    borderRadius: radius.lg,
+    borderWidth: StyleSheet.hairlineWidth,
+    borderColor: C.border,
+    paddingHorizontal: space.lg,
+    paddingBottom: space.md,
+  },
+  panelHead: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: space.md,
+    paddingTop: space.md,
+    paddingBottom: space.xs,
+  },
+  panelTitle: { ...type.section, color: C.textSecondary, flex: 1 },
+  clear: { ...type.meta, color: C.accent, fontWeight: "600" },
+});

app/src/components/DateField.tsx

@@ -1,9 +1,12 @@
-// Interactive date field: quick chips (Today / Tomorrow / Next week) plus an
-// expandable month calendar. Pure RN views — identical on Android, iOS, web.
+// Interactive date field: quick chips (Today / Tomorrow / Next week, plus an
+// optional Someday) and an expandable month calendar. Pure RN views —
+// identical on Android, iOS, web.
 import { useMemo, useState } from "react";
 import { Pressable, StyleSheet, Text, View } from "react-native";
 import { haptic } from "../lib/haptics";
-import { C } from "../lib/theme";
+import { friendlyDate, fromIso, toIso as iso, todayIso } from "../lib/dates";
+import { C, radius, space, type } from "../lib/theme";
+import { ChipRow, OptionChip, SectionHeader } from "./ui";
 
 const DAY_MS = 86_400_000;
 const WEEKDAYS = ["M", "T", "W", "T", "F", "S", "S"];
@@ -12,31 +15,11 @@ const MONTHS = [
   "July", "August", "September", "October", "November", "December",
 ];
 
-function iso(d: Date): string {
-  return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`;
-}
-
-function fromIso(s: string): Date {
-  const [y, m, d] = s.split("-").map(Number);
-  return new Date(y, m - 1, d);
-}
-
-function pretty(s: string): string {
-  const d = fromIso(s);
-  const today = new Date();
-  const diff = Math.round((d.getTime() - new Date(today.getFullYear(), today.getMonth(), today.getDate()).getTime()) / DAY_MS);
-  if (diff === 0) return "Today";
-  if (diff === 1) return "Tomorrow";
-  if (diff === -1) return "Yesterday";
-  const wd = d.toLocaleDateString("en-AU", { weekday: "short" });
-  return `${wd} ${d.getDate()} ${MONTHS[d.getMonth()].slice(0, 3)}${d.getFullYear() !== today.getFullYear() ? ` ${d.getFullYear()}` : ""}`;
-}
-
 function Calendar({ value, onPick }: { value: string | null; onPick: (v: string) => void }) {
   const initial = value ? fromIso(value) : new Date();
   const [year, setYear] = useState(initial.getFullYear());
   const [month, setMonth] = useState(initial.getMonth());
-  const todayIso = iso(new Date());
+  const today = todayIso();
 
   const weeks = useMemo(() => {
     const first = new Date(year, month, 1);
@@ -84,7 +67,7 @@ function Calendar({ value, onPick }: { value: string | null; onPick: (v: string)
             const dIso = iso(d);
             const inMonth = d.getMonth() === month;
             const selected = dIso === value;
-            const isToday = dIso === todayIso;
+            const isToday = dIso === today;
             return (
               <Pressable
                 key={dIso}
@@ -97,8 +80,8 @@ function Calendar({ value, onPick }: { value: string | null; onPick: (v: string)
                 <Text
                   style={[
                     s.dayText,
-                    !inMonth && { color: C.border },
-                    selected && { color: "#FFFFFF", fontWeight: "700" },
+                    !inMonth && { color: C.muted, opacity: 0.45 },
+                    selected && { color: C.onAccent, fontWeight: "700" },
                     !selected && isToday && { color: C.accent },
                   ]}
                 >
@@ -118,11 +101,14 @@ export default function DateField({
   value,
   onChange,
   clearable,
+  someday,
 }: {
-  label: string;
+  label?: string;
   value: string | null;
   onChange: (v: string | null) => void;
   clearable?: boolean;
+  /** Offers a dateless "Someday" chip — the pile, not a day on the calendar. */
+  someday?: { active: boolean; onPress: () => void };
 }) {
   const [open, setOpen] = useState(false);
   const today = new Date();
@@ -133,45 +119,51 @@ export default function DateField({
   ];
 
   return (
-    <View style={{ marginBottom: 14 }}>
+    <View style={label ? { marginBottom: space.lg } : undefined}>
+      {!!label && (
         <View style={s.labelRow}>
-        <Text style={s.label}>{label}</Text>
-        {value != null && <Text style={s.chosen}>{pretty(value)}</Text>}
+          <SectionHeader>{label}</SectionHeader>
+          {value != null && <Text style={s.chosen}>{friendlyDate(value)}</Text>}
         </View>
-      <View style={s.rowWrap}>
+      )}
+      <ChipRow>
         {quick.map((q) => (
-          <Pressable
+          <OptionChip
             key={q.label}
-            style={[s.chip, value === q.v && s.chipActive]}
+            label={q.label}
+            active={value === q.v}
             onPress={() => {
               haptic.select();
               onChange(value === q.v && clearable ? null : q.v);
             }}
-          >
-            <Text style={[s.chipText, value === q.v && { color: C.text }]}>{q.label}</Text>
-          </Pressable>
+          />
         ))}
-        <Pressable
-          style={[s.chip, open && s.chipActive]}
+        {someday && (
+          <OptionChip
+            label="Someday"
+            active={someday.active}
+            onPress={() => {
+              haptic.select();
+              someday.onPress();
+            }}
+          />
+        )}
+        <OptionChip
+          label={value && !quick.some((q) => q.v === value) ? friendlyDate(value) : "Pick a date…"}
+          active={open}
           onPress={() => {
             haptic.select();
             setOpen(!open);
           }}
-        >
-          <Text style={[s.chipText, open && { color: C.text }]}>📆 Pick…</Text>
-        </Pressable>
-        {clearable && value != null && (
-          <Pressable
-            style={s.chip}
-            onPress={() => {
+        />
+        {/* Standalone only — inside an AttrBar panel the header owns "Clear". */}
+        {clearable && !!label && value != null && (
+          <OptionChip label="Clear" onPress={() => {
             haptic.tap();
             onChange(null);
-            }}
-          >
-            <Text style={s.chipText}>Clear</Text>
-          </Pressable>
+          }} />
         )}
-      </View>
+      </ChipRow>
       {open && (
         <Calendar
           value={value}
@@ -186,34 +178,22 @@ export default function DateField({
 }
 
 const s = StyleSheet.create({
-  labelRow: { flexDirection: "row", justifyContent: "space-between", alignItems: "baseline", marginBottom: 6 },
-  label: { color: C.muted, fontSize: 13, textTransform: "uppercase", letterSpacing: 0.5 },
-  chosen: { color: C.accent, fontSize: 14, fontWeight: "600" },
-  rowWrap: { flexDirection: "row", flexWrap: "wrap", gap: 8 },
-  chip: {
-    paddingVertical: 8,
-    paddingHorizontal: 14,
-    borderRadius: 20,
-    backgroundColor: C.surface,
-    borderWidth: 1,
-    borderColor: C.border,
-  },
-  chipActive: { backgroundColor: C.surface2, borderColor: C.accent },
-  chipText: { color: C.muted, fontSize: 14 },
+  labelRow: { flexDirection: "row", justifyContent: "space-between", alignItems: "center" },
+  chosen: { ...type.chip, color: C.accent, fontWeight: "600" },
   calendar: {
-    marginTop: 10,
+    marginTop: space.md,
     backgroundColor: C.surface,
-    borderRadius: 14,
+    borderRadius: radius.lg,
     borderWidth: 1,
     borderColor: C.border,
-    padding: 10,
+    padding: space.md,
   },
-  calHead: { flexDirection: "row", justifyContent: "space-between", alignItems: "center", marginBottom: 6 },
-  calTitle: { color: C.text, fontSize: 15, fontWeight: "600" },
+  calHead: { flexDirection: "row", justifyContent: "space-between", alignItems: "center", marginBottom: space.sm },
+  calTitle: { color: C.text, fontSize: 16, fontWeight: "600", letterSpacing: -0.2 },
   arrow: { paddingHorizontal: 14, paddingVertical: 4 },
-  arrowText: { color: C.accent, fontSize: 22, fontWeight: "600" },
+  arrowText: { color: C.accent, fontSize: 24, fontWeight: "500" },
   week: { flexDirection: "row" },
-  weekday: { flex: 1, textAlign: "center", color: C.muted, fontSize: 11, paddingVertical: 4 },
+  weekday: { flex: 1, textAlign: "center", color: C.muted, fontSize: 11, fontWeight: "600", letterSpacing: 0.4, paddingVertical: 6 },
   day: {
     flex: 1,
     aspectRatio: 1.15,
@@ -223,6 +203,6 @@ const s = StyleSheet.create({
     margin: 1,
   },
   daySelected: { backgroundColor: C.accent },
-  dayToday: { borderWidth: 1, borderColor: C.accent },
-  dayText: { color: C.text, fontSize: 14 },
+  dayToday: { backgroundColor: C.accentSoft },
+  dayText: { color: C.text, fontSize: 15 },
 });

app/src/components/EstimateChips.tsx

@@ -1,56 +1,41 @@
 // Preset estimate chips — one tap beats a numeric keyboard. A non-preset
 // value (from quick-add, e.g. ~25m) shows up as its own chip so it's never
 // invisible or lost.
-import { Pressable, StyleSheet, Text, View } from "react-native";
+import { View } from "react-native";
 import { haptic } from "../lib/haptics";
 import { formatEstimate } from "../lib/priority";
-import { C } from "../lib/theme";
+import { space } from "../lib/theme";
+import { ChipRow, OptionChip, SectionHeader } from "./ui";
 
 const PRESETS = [15, 30, 45, 60, 90, 120];
 
+/** Omit `label` when the surrounding panel already titles the group. */
 export default function EstimateChips({
   value,
   onChange,
+  label,
 }: {
   value: number | null;
   onChange: (v: number | null) => void;
+  label?: string;
 }) {
   const options = value && !PRESETS.includes(value) ? [...PRESETS, value].sort((a, b) => a - b) : PRESETS;
   return (
-    <View style={{ marginBottom: 14 }}>
-      <Text style={s.label}>Estimated time</Text>
-      <View style={s.rowWrap}>
-        {options.map((m) => {
-          const active = value === m;
-          return (
-            <Pressable
+    <View style={label ? { marginBottom: space.lg } : undefined}>
+      {!!label && <SectionHeader>{label}</SectionHeader>}
+      <ChipRow>
+        {options.map((m) => (
+          <OptionChip
             key={m}
-              style={[s.chip, active && s.chipActive]}
+            label={formatEstimate(m) ?? ""}
+            active={value === m}
             onPress={() => {
               haptic.select();
-                onChange(active ? null : m);
+              onChange(value === m ? null : m);
             }}
-            >
-              <Text style={[s.chipText, active && { color: C.text }]}>{formatEstimate(m)}</Text>
-            </Pressable>
-          );
-        })}
-      </View>
+          />
+        ))}
+      </ChipRow>
     </View>
   );
 }
-
-const s = StyleSheet.create({
-  label: { color: C.muted, fontSize: 13, marginBottom: 6, textTransform: "uppercase", letterSpacing: 0.5 },
-  rowWrap: { flexDirection: "row", flexWrap: "wrap", gap: 8 },
-  chip: {
-    paddingVertical: 8,
-    paddingHorizontal: 14,
-    borderRadius: 20,
-    backgroundColor: C.surface,
-    borderWidth: 1,
-    borderColor: C.border,
-  },
-  chipActive: { backgroundColor: C.surface2, borderColor: C.accent },
-  chipText: { color: C.muted, fontSize: 14 },
-});

app/src/components/Icon.tsx

@@ -0,0 +1,355 @@
+// A tiny geometric icon set drawn from plain Views.
+//
+// The app ships no vector-icon dependency and emoji render differently on
+// every platform (and can't take the accent colour), so these are built from
+// borders and rectangles instead: monochrome, tintable, pixel-identical on
+// Android and web, and zero bytes of new dependency.
+import { StyleSheet, View } from "react-native";
+import { C } from "../lib/theme";
+
+export type IconName =
+  | "today"
+  | "next"
+  | "waiting"
+  | "someday"
+  | "projects"
+  | "review"
+  | "settings"
+  | "flag"
+  | "repeat"
+  | "tag"
+  | "area"
+  | "plus"
+  | "close"
+  | "chevron";
+
+type Props = {
+  name: IconName;
+  size?: number;
+  color?: string;
+  /** Used to carve the crescent out of the "someday" moon. */
+  bg?: string;
+};
+
+export default function Icon({ name, size = 22, color = C.textSecondary, bg = C.bg }: Props) {
+  const box = { width: size, height: size };
+  const w = 1.7; // one consistent stroke weight across the whole set
+
+  switch (name) {
+    case "today":
+      return (
+        <View style={[box, s.center]}>
+          <View
+            style={{
+              width: size * 0.86,
+              height: size * 0.82,
+              borderWidth: w,
+              borderColor: color,
+              borderRadius: 5,
+              overflow: "hidden",
+            }}
+          >
+            <View style={{ height: size * 0.2, backgroundColor: color }} />
+            <View style={[s.center, { flex: 1 }]}>
+              <View
+                style={{ width: w * 2, height: w * 2, borderRadius: 999, backgroundColor: color }}
+              />
+            </View>
+          </View>
+        </View>
+      );
+
+    case "next":
+      return (
+        <View style={[box, s.center]}>
+          <View
+            style={{
+              width: 0,
+              height: 0,
+              borderTopWidth: size * 0.32,
+              borderBottomWidth: size * 0.32,
+              borderLeftWidth: size * 0.52,
+              borderTopColor: "transparent",
+              borderBottomColor: "transparent",
+              borderLeftColor: color,
+              marginLeft: size * 0.12,
+            }}
+          />
+        </View>
+      );
+
+    case "waiting":
+      return (
+        <View style={[box, s.center]}>
+          <View
+            style={{
+              width: size * 0.84,
+              height: size * 0.84,
+              borderRadius: 999,
+              borderWidth: w,
+              borderColor: color,
+            }}
+          >
+            {/* hour hand, then minute hand — anchored at the dial centre */}
+            <View
+              style={{
+                position: "absolute",
+                left: size * 0.42 - w / 2,
+                top: size * 0.2,
+                width: w,
+                height: size * 0.22,
+                backgroundColor: color,
+                borderRadius: w,
+              }}
+            />
+            <View
+              style={{
+                position: "absolute",
+                left: size * 0.42 - w / 2,
+                top: size * 0.42 - w / 2,
+                width: size * 0.24,
+                height: w,
+                backgroundColor: color,
+                borderRadius: w,
+              }}
+            />
+          </View>
+        </View>
+      );
+
+    case "someday":
+      return (
+        <View style={[box, s.center]}>
+          <View
+            style={{
+              width: size * 0.84,
+              height: size * 0.84,
+              borderRadius: 999,
+              backgroundColor: color,
+              overflow: "hidden",
+            }}
+          >
+            <View
+              style={{
+                position: "absolute",
+                right: -size * 0.22,
+                top: -size * 0.26,
+                width: size * 0.84,
+                height: size * 0.84,
+                borderRadius: 999,
+                backgroundColor: bg,
+              }}
+            />
+          </View>
+        </View>
+      );
+
+    case "projects":
+      return (
+        <View style={[box, s.center]}>
+          <View style={{ width: size * 0.86, height: size * 0.78 }}>
+            <View
+              style={{
+                width: size * 0.4,
+                height: size * 0.16,
+                borderTopLeftRadius: 3,
+                borderTopRightRadius: 3,
+                backgroundColor: color,
+              }}
+            />
+            <View
+              style={{
+                flex: 1,
+                borderWidth: w,
+                borderColor: color,
+                borderRadius: 5,
+                borderTopLeftRadius: 0,
+              }}
+            />
+          </View>
+        </View>
+      );
+
+    case "review":
+      return (
+        <View style={[box, s.center]}>
+          {/* an open ring plus an arrowhead reads as "cycle" without an SVG path */}
+          <View
+            style={{
+              width: size * 0.82,
+              height: size * 0.82,
+              borderRadius: 999,
+              borderWidth: w,
+              borderColor: color,
+              borderTopColor: "transparent",
+              transform: [{ rotate: "45deg" }],
+            }}
+          />
+          <View
+            style={{
+              position: "absolute",
+              top: size * 0.06,
+              right: size * 0.12,
+              width: 0,
+              height: 0,
+              borderLeftWidth: size * 0.16,
+              borderRightWidth: size * 0.16,
+              borderBottomWidth: size * 0.2,
+              borderLeftColor: "transparent",
+              borderRightColor: "transparent",
+              borderBottomColor: color,
+              transform: [{ rotate: "115deg" }],
+            }}
+          />
+        </View>
+      );
+
+    case "settings":
+      // Sliders, not a cog: three strokes with offset knobs stays legible at 20px.
+      return (
+        <View style={[box, s.center]}>
+          <View style={{ width: size * 0.88, gap: size * 0.16 }}>
+            {[0.62, 0.3, 0.48].map((knob, i) => (
+              <View key={i} style={s.sliderRow}>
+                <View style={{ flex: 1, height: w, backgroundColor: color, borderRadius: w }} />
+                <View
+                  style={{
+                    position: "absolute",
+                    left: `${knob * 100}%`,
+                    width: w * 3,
+                    height: w * 3,
+                    marginLeft: -w * 1.5,
+                    marginTop: -w,
+                    borderRadius: 999,
+                    borderWidth: w,
+                    borderColor: color,
+                    backgroundColor: bg,
+                  }}
+                />
+              </View>
+            ))}
+          </View>
+        </View>
+      );
+
+    case "flag":
+      return (
+        <View style={box}>
+          {/* Pole plus a pennant — reads as a priority flag at 20px where a
+              detailed banner outline would smear into a blob. */}
+          <View style={{ position: "absolute", left: size * 0.26, top: size * 0.12, width: w, height: size * 0.76, borderRadius: 1, backgroundColor: color }} />
+          <View
+            style={{
+              position: "absolute",
+              left: size * 0.26 + w,
+              top: size * 0.14,
+              width: size * 0.44,
+              height: size * 0.34,
+              borderTopRightRadius: 2,
+              borderBottomRightRadius: 2,
+              backgroundColor: color,
+            }}
+          />
+        </View>
+      );
+
+    case "repeat":
+      return (
+        <View style={box}>
+          {/* Two offset bars with opposing arrowheads: a loop, without the
+              anti-aliasing mush a thin circular arc gets at this size. */}
+          <View style={{ position: "absolute", left: size * 0.2, top: size * 0.3, width: size * 0.5, height: w, backgroundColor: color }} />
+          <View style={{ position: "absolute", left: size * 0.62, top: size * 0.3 - size * 0.09 + w / 2, width: size * 0.18, height: size * 0.18, borderRightWidth: w, borderTopWidth: w, borderColor: color, transform: [{ rotate: "45deg" }] }} />
+          <View style={{ position: "absolute", left: size * 0.3, top: size * 0.66, width: size * 0.5, height: w, backgroundColor: color }} />
+          <View style={{ position: "absolute", left: size * 0.2, top: size * 0.66 - size * 0.09 + w / 2, width: size * 0.18, height: size * 0.18, borderLeftWidth: w, borderBottomWidth: w, borderColor: color, transform: [{ rotate: "45deg" }] }} />
+        </View>
+      );
+
+    case "tag":
+      return (
+        <View style={[box, s.center]}>
+          <View
+            style={{
+              width: size * 0.6,
+              height: size * 0.6,
+              borderWidth: w,
+              borderColor: color,
+              borderRadius: 3,
+              transform: [{ rotate: "45deg" }],
+            }}
+          />
+          <View style={{ position: "absolute", left: size * 0.3, top: size * 0.3, width: w + 0.6, height: w + 0.6, borderRadius: 999, backgroundColor: color }} />
+        </View>
+      );
+
+    case "area":
+      // Briefcase: a body with a short handle on top.
+      return (
+        <View style={[box, s.center]}>
+          <View
+            style={{
+              position: "absolute",
+              top: size * 0.12,
+              width: size * 0.36,
+              height: size * 0.26,
+              borderWidth: w,
+              borderBottomWidth: 0,
+              borderColor: color,
+              borderTopLeftRadius: 3,
+              borderTopRightRadius: 3,
+            }}
+          />
+          <View
+            style={{
+              position: "absolute",
+              top: size * 0.32,
+              width: size * 0.84,
+              height: size * 0.56,
+              borderWidth: w,
+              borderColor: color,
+              borderRadius: 4,
+            }}
+          />
+          <View style={{ position: "absolute", top: size * 0.32 + size * 0.2, width: size * 0.84, height: w, backgroundColor: color }} />
+        </View>
+      );
+
+    case "close":
+      return (
+        <View style={[box, s.center]}>
+          <View style={{ position: "absolute", width: size * 0.6, height: w, borderRadius: 2, backgroundColor: color, transform: [{ rotate: "45deg" }] }} />
+          <View style={{ position: "absolute", width: size * 0.6, height: w, borderRadius: 2, backgroundColor: color, transform: [{ rotate: "-45deg" }] }} />
+        </View>
+      );
+
+    case "plus":
+      return (
+        <View style={[box, s.center]}>
+          <View style={{ position: "absolute", width: size * 0.7, height: w + 0.5, borderRadius: 2, backgroundColor: color }} />
+          <View style={{ position: "absolute", width: w + 0.5, height: size * 0.7, borderRadius: 2, backgroundColor: color }} />
+        </View>
+      );
+
+    case "chevron":
+      return (
+        <View style={[box, s.center]}>
+          <View
+            style={{
+              width: size * 0.34,
+              height: size * 0.34,
+              borderRightWidth: w,
+              borderTopWidth: w,
+              borderColor: color,
+              transform: [{ rotate: "45deg" }],
+              marginLeft: -size * 0.06,
+            }}
+          />
+        </View>
+      );
+  }
+}
+
+const s = StyleSheet.create({
+  center: { alignItems: "center", justifyContent: "center" },
+  sliderRow: { justifyContent: "center" },
+});

app/src/components/PriorityChips.tsx

@@ -1,56 +1,43 @@
-import { Pressable, StyleSheet, Text, View } from "react-native";
+import { StyleSheet, View } from "react-native";
 import { haptic } from "../lib/haptics";
-import { PRIORITIES, PRIORITY_COLOR, PRIORITY_LABEL } from "../lib/priority";
-import { C } from "../lib/theme";
+import { PRIORITIES, PRIORITY_COLOR, PRIORITY_LABEL, PRIORITY_TINT } from "../lib/priority";
+import { C, space } from "../lib/theme";
 import type { Task } from "../lib/types";
+import { ChipRow, OptionChip, SectionHeader } from "./ui";
 
+/** Omit `label` when the surrounding panel already titles the group. */
 export default function PriorityChips({
   value,
   onChange,
+  label,
 }: {
   value: Task["priority"] | null;
   onChange: (p: Task["priority"]) => void;
+  label?: string;
 }) {
   return (
-    <View style={{ marginBottom: 14 }}>
-      <Text style={s.label}>Priority</Text>
-      <View style={s.rowWrap}>
-        {PRIORITIES.map((p) => {
-          const active = value === p;
-          const color = PRIORITY_COLOR[p];
-          return (
-            <Pressable
+    <View style={label ? { marginBottom: space.lg } : undefined}>
+      {!!label && <SectionHeader>{label}</SectionHeader>}
+      <ChipRow>
+        {PRIORITIES.map((p) => (
+          <OptionChip
             key={p}
-              style={[s.chip, active && { borderColor: color, backgroundColor: `${color}22` }]}
+            label={PRIORITY_LABEL[p]}
+            active={value === p}
+            tone={PRIORITY_COLOR[p]}
+            tint={PRIORITY_TINT[p]}
+            leading={<View style={[s.flag, { backgroundColor: PRIORITY_COLOR[p] }]} />}
             onPress={() => {
               haptic.select();
               onChange(p);
             }}
-            >
-              <View style={[s.flag, { backgroundColor: color }]} />
-              <Text style={[s.text, active && { color: C.text }]}>{PRIORITY_LABEL[p]}</Text>
-            </Pressable>
-          );
-        })}
-      </View>
+          />
+        ))}
+      </ChipRow>
     </View>
   );
 }
 
 const s = StyleSheet.create({
-  label: { color: C.muted, fontSize: 13, marginBottom: 6, textTransform: "uppercase", letterSpacing: 0.5 },
-  rowWrap: { flexDirection: "row", flexWrap: "wrap", gap: 8 },
-  chip: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: 7,
-    paddingVertical: 8,
-    paddingHorizontal: 13,
-    borderRadius: 20,
-    backgroundColor: C.surface,
-    borderWidth: 1,
-    borderColor: C.border,
-  },
-  flag: { width: 10, height: 10, borderRadius: 5 },
-  text: { color: C.muted, fontSize: 14 },
+  flag: { width: 9, height: 9, borderRadius: 999, backgroundColor: C.muted },
 });

app/src/components/TaskForm.tsx

@@ -0,0 +1,334 @@
+// The task editor, shared by capture and clarify.
+//
+// Both screens are the same object seen at two moments, so they get the same
+// shape: a title/notes card, then one wrapping row of attribute chips. Keeping
+// it in one file means a change to how "When" or "Repeat" is picked lands in
+// both places at once, and the two screens can never drift into looking like
+// different apps.
+import { StyleSheet, Text, TextInput, View } from "react-native";
+import AttrBar, { type Attr } from "./AttrBar";
+import DateField from "./DateField";
+import EstimateChips from "./EstimateChips";
+import PriorityChips from "./PriorityChips";
+import { Chips, Separator } from "./ui";
+import { friendlyDate } from "../lib/dates";
+import { haptic } from "../lib/haptics";
+import { formatEstimate, PRIORITY_COLOR, PRIORITY_LABEL } from "../lib/priority";
+import { REPEAT_LABEL, REPEATS } from "../lib/repeat";
+import { getState, knownContexts } from "../lib/store";
+import { C, radius, space, type } from "../lib/theme";
+import { useStore } from "../lib/useStore";
+import { AREA_LABEL, AREAS, type Task, type TaskStatus } from "../lib/types";
+import { AREA_TONE } from "./AreaToggle";
+
+/** Everything a task screen edits. Priority is nullable while undecided. */
+export type TaskDraft = Pick<
+  Task,
+  "title" | "notes" | "status" | "project_id" | "context" | "waiting_for" | "due_date" | "defer_date" | "estimate_min" | "repeat" | "area"
+> & { priority: Task["priority"] | null };
+
+export const BOX_LABEL: Record<string, string> = {
+  next: "Next up",
+  waiting: "Waiting",
+  someday: "Someday",
+  done: "Done",
+};
+
+/** The boxes a task can be filed into by hand. */
+export const CAPTURE_BOXES: TaskStatus[] = ["next", "waiting", "someday"];
+
+export const emptyDraft = (): TaskDraft => ({
+  title: "",
+  notes: "",
+  status: "next",
+  project_id: null,
+  context: null,
+  waiting_for: null,
+  due_date: null,
+  defer_date: null,
+  estimate_min: null,
+  repeat: null,
+  priority: null,
+  // Born into whichever lens is on — that's what "add" means in work mode.
+  area: getState().area,
+});
+
+export default function TaskForm({
+  value: d,
+  onChange,
+  boxes = CAPTURE_BOXES,
+  showDefer = false,
+  autoFocus = false,
+  onSubmitTitle,
+  hint,
+}: {
+  value: TaskDraft;
+  onChange: (patch: Partial<TaskDraft>) => void;
+  boxes?: TaskStatus[];
+  /** Clarify offers a start date; capture keeps the bar short. */
+  showDefer?: boolean;
+  autoFocus?: boolean;
+  onSubmitTitle?: () => void;
+  hint?: string;
+}) {
+  const store = useStore();
+  // Keep a project that has since been archived visible, or editing an old task
+  // would silently drop it.
+  // Projects follow the draft's area, not the global lens, so re-filing a task
+  // to Work offers Work projects. An archived project stays visible while the
+  // task still points at it.
+  const projects = store.projects
+    .filter((p) => (p.status === "active" && (p.area ?? "personal") === d.area) || p.id === d.project_id)
+    .sort((a, b) => a.sort_order - b.sort_order || b.created_at.localeCompare(a.created_at));
+  const contexts = knownContexts(store);
+  const projectName = projects.find((p) => p.id === d.project_id)?.name ?? null;
+
+  const attrs: Attr[] = [
+    {
+      key: "when",
+      icon: "today",
+      placeholder: "When",
+      value: d.due_date ? friendlyDate(d.due_date) : null,
+      panel: (
+        <DateField
+          value={d.due_date}
+          onChange={(due_date) => onChange({ due_date })}
+          clearable
+          someday={{
+            active: d.status === "someday",
+            onPress: () =>
+              d.status === "someday"
+                ? onChange({ status: "next" })
+                : onChange({ status: "someday", due_date: null }),
+          }}
+        />
+      ),
+      onClear: () => onChange({ due_date: null }),
+    },
+    {
+      key: "priority",
+      icon: "flag",
+      placeholder: "Priority",
+      value: d.priority ? PRIORITY_LABEL[d.priority] : null,
+      tone: d.priority ? PRIORITY_COLOR[d.priority] : undefined,
+      panel: <PriorityChips value={d.priority} onChange={(priority) => onChange({ priority })} />,
+      onClear: () => onChange({ priority: null }),
+    },
+    {
+      key: "box",
+      icon: "next",
+      // "Next up" is the default, so it reads as a placeholder until changed —
+      // only a deliberate choice earns the accent.
+      placeholder: BOX_LABEL.next,
+      value: d.status === "next" ? null : BOX_LABEL[d.status],
+      panel: (
+        <View>
+          <Chips
+            options={boxes}
+            labels={BOX_LABEL}
+            value={d.status}
+            onChange={(status) => {
+              haptic.select();
+              onChange({ status });
+            }}
+          />
+          {d.status === "waiting" && (
+            <TextInput
+              style={s.panelInput}
+              value={d.waiting_for ?? ""}
+              onChangeText={(v) => onChange({ waiting_for: v || null })}
+              placeholder="Waiting for who or what?"
+              placeholderTextColor={C.muted}
+            />
+          )}
+        </View>
+      ),
+    },
+    {
+      key: "project",
+      icon: "projects",
+      placeholder: "Project",
+      value: projectName,
+      panel:
+        projects.length === 0 ? (
+          <Text style={s.panelEmpty}>No active projects yet.</Text>
+        ) : (
+          <Chips
+            options={projects.map((p) => p.id)}
+            labels={Object.fromEntries(projects.map((p) => [p.id, p.name]))}
+            value={d.project_id}
+            onChange={(v) => {
+              haptic.select();
+              onChange({ project_id: v === d.project_id ? null : v });
+            }}
+          />
+        ),
+      onClear: () => onChange({ project_id: null }),
+    },
+    {
+      key: "estimate",
+      icon: "waiting",
+      placeholder: "Estimate",
+      value: formatEstimate(d.estimate_min),
+      panel: <EstimateChips value={d.estimate_min} onChange={(estimate_min) => onChange({ estimate_min })} />,
+      onClear: () => onChange({ estimate_min: null }),
+    },
+    {
+      key: "repeat",
+      icon: "repeat",
+      placeholder: "Repeat",
+      value: d.repeat ? REPEAT_LABEL[d.repeat] : null,
+      panel: (
+        <Chips
+          options={REPEATS}
+          labels={REPEAT_LABEL}
+          value={d.repeat}
+          onChange={(v) => {
+            haptic.select();
+            onChange({ repeat: v === d.repeat ? null : v });
+          }}
+        />
+      ),
+      onClear: () => onChange({ repeat: null }),
+    },
+  ];
+
+  // Area reads as a placeholder while it matches the lens you're in — only a
+  // deliberate cross-filing (a work task captured from personal) earns colour.
+  attrs.push({
+    key: "area",
+    icon: "area",
+    placeholder: AREA_LABEL[store.area],
+    value: d.area === store.area ? null : AREA_LABEL[d.area],
+    tone: AREA_TONE[d.area],
+    panel: (
+      <View>
+        <Chips
+          options={AREAS}
+          labels={AREA_LABEL}
+          value={d.area}
+          onChange={(area) => {
+            if (area === d.area) return;
+            haptic.select();
+            // A project belongs to one area; drop it when the task moves.
+            onChange({ area, project_id: null });
+          }}
+        />
+        <Text style={s.panelEmpty}>Only shows up when that lens is on.</Text>
+      </View>
+    ),
+  });
+
+  if (showDefer) {
+    attrs.push({
+      key: "defer",
+      icon: "someday",
+      placeholder: "Start",
+      value: d.defer_date ? friendlyDate(d.defer_date) : null,
+      panel: (
+        <View>
+          <DateField value={d.defer_date} onChange={(defer_date) => onChange({ defer_date })} clearable />
+          <Text style={s.panelEmpty}>Hidden from lists until then — it resurfaces on the day.</Text>
+        </View>
+      ),
+      onClear: () => onChange({ defer_date: null }),
+    });
+  }
+
+  // Only offer the tag picker once there's something to pick — an empty chip
+  // that opens an empty panel is worse than no chip.
+  if (contexts.length > 0 || d.context) {
+    const options = d.context && !contexts.includes(d.context) ? [...contexts, d.context] : contexts;
+    attrs.push({
+      key: "context",
+      icon: "tag",
+      placeholder: "Tag",
+      value: d.context,
+      panel: (
+        <Chips
+          options={options}
+          value={d.context}
+          onChange={(v) => {
+            haptic.select();
+            onChange({ context: v === d.context ? null : v });
+          }}
+        />
+      ),
+      onClear: () => onChange({ context: null }),
+    });
+  }
+
+  return (
+    <View>
+      <View style={s.card}>
+        <TextInput
+          style={s.titleInput}
+          value={d.title}
+          onChangeText={(title) => onChange({ title })}
+          placeholder="New to-do"
+          placeholderTextColor={C.muted}
+          autoFocus={autoFocus}
+          returnKeyType="done"
+          onSubmitEditing={onSubmitTitle}
+        />
+        <Separator />
+        <TextInput
+          style={s.notesInput}
+          value={d.notes}
+          onChangeText={(notes) => onChange({ notes })}
+          placeholder="Notes"
+          placeholderTextColor={C.muted}
+          multiline
+        />
+      </View>
+
+      {!!hint && <Text style={s.hint}>{hint}</Text>}
+
+      <AttrBar attrs={attrs} />
+    </View>
+  );
+}
+
+const s = StyleSheet.create({
+  card: {
+    backgroundColor: C.surface,
+    borderRadius: radius.lg,
+    borderWidth: StyleSheet.hairlineWidth,
+    borderColor: C.border,
+    overflow: "hidden",
+  },
+  titleInput: {
+    color: C.text,
+    fontSize: 20,
+    fontWeight: "600",
+    letterSpacing: -0.3,
+    paddingHorizontal: space.lg,
+    paddingVertical: space.lg - 2,
+  },
+  notesInput: {
+    color: C.text,
+    fontSize: 15,
+    minHeight: 76,
+    textAlignVertical: "top",
+    paddingHorizontal: space.lg,
+    paddingVertical: space.md,
+  },
+
+  hint: {
+    ...type.meta,
+    color: C.muted,
+    paddingHorizontal: space.xs,
+    paddingVertical: space.md,
+  },
+
+  panelInput: {
+    backgroundColor: C.surface2,
+    color: C.text,
+    borderRadius: radius.md,
+    paddingHorizontal: space.md,
+    paddingVertical: space.md - 2,
+    fontSize: 15,
+    marginTop: space.md,
+  },
+  panelEmpty: { ...type.meta, color: C.muted, paddingBottom: space.sm },
+});

app/src/components/TaskListScreen.tsx

@@ -1,12 +1,14 @@
 import { useState } from "react";
-import { Pressable, RefreshControl, StyleSheet, Text, View } from "react-native";
+import { Platform, Pressable, RefreshControl, ScrollView, StyleSheet, Text, View } from "react-native";
 import DraggableFlatList, { ScaleDecorator } from "react-native-draggable-flatlist";
+import WebSortableList from "./WebSortableList";
 import { haptic } from "../lib/haptics";
 import { reorderTask, sync, tasksByStatus, visibleTasksByStatus } from "../lib/store";
-import { C } from "../lib/theme";
+import { C, radius, shadow, space, type } from "../lib/theme";
 import { useStore } from "../lib/useStore";
 import type { TaskStatus } from "../lib/types";
-import TaskRow from "./TaskRow";
+import TaskRow, { TaskSeparator } from "./TaskRow";
+import { cardEdges } from "./ui";
 
 // Deferred tasks are hidden from these lists until their date — you can't act
 // on them yet, so they shouldn't cost attention. A one-line footer keeps them
@@ -37,6 +39,42 @@ export default function TaskListScreen({
   }
   const hiddenCount = all.length - tasks.length;
 
+  const deferredFooter =
+    hidesDeferred && (hiddenCount > 0 || showDeferred) ? (
+      <Pressable
+        onPress={() => setShowDeferred((v) => !v)}
+        style={({ pressed }) => [s.deferredBtn, pressed && { opacity: 0.6 }]}
+      >
+        <Text style={s.deferredText}>
+          {showDeferred ? "Hide deferred" : `${hiddenCount} deferred — show`}
+        </Text>
+      </Pressable>
+    ) : null;
+
+  // The native drag library's drop handling is dead on react-native-web, so
+  // the web build reorders through WebSortableList's grab handles instead.
+  if (Platform.OS === "web") {
+    return (
+      <View style={s.screen}>
+        <ScrollView contentContainerStyle={s.content} showsVerticalScrollIndicator={false}>
+          {tasks.length === 0 && <Text style={s.empty}>{emptyHint}</Text>}
+          <WebSortableList
+            data={tasks}
+            disabled={archive}
+            onReorder={(id, to) => reorderTask(id, status, to)}
+            separator={<TaskSeparator />}
+            renderItem={(item, i) => (
+              <View style={cardEdges(i, tasks.length)}>
+                <TaskRow task={item} uncheckTo={status === "done" ? "next" : status} />
+              </View>
+            )}
+          />
+          {deferredFooter}
+        </ScrollView>
+      </View>
+    );
+  }
+
   return (
     <View style={s.screen}>
       <DraggableFlatList
@@ -50,13 +88,24 @@ export default function TaskListScreen({
             reorderTask(data[to].id, status, to);
           }
         }}
-        renderItem={({ item, drag, isActive }) => (
-          <ScaleDecorator activeScale={1.03}>
-            <View style={isActive && s.activeRow}>
-              <TaskRow task={item} uncheckTo={status === "done" ? "next" : status} onLongPress={archive ? undefined : drag} />
+        // The card is drawn by the rows themselves so drag-and-drop still owns
+        // the whole list: first/last rows round their outer corners, and a
+        // lifted row goes full-radius so it reads as detached from the stack.
+        renderItem={({ item, drag, isActive, getIndex }) => {
+          const i = getIndex() ?? 0;
+          return (
+            <ScaleDecorator activeScale={1.02}>
+              <View style={[...cardEdges(i, tasks.length), isActive && s.lifted]}>
+                <TaskRow
+                  task={item}
+                  uncheckTo={status === "done" ? "next" : status}
+                  onLongPress={archive ? undefined : drag}
+                />
               </View>
             </ScaleDecorator>
-        )}
+          );
+        }}
+        ItemSeparatorComponent={TaskSeparator}
         refreshControl={
           <RefreshControl
             refreshing={refreshing}
@@ -69,16 +118,8 @@ export default function TaskListScreen({
           />
         }
         ListEmptyComponent={<Text style={s.empty}>{emptyHint}</Text>}
-        ListFooterComponent={
-          hidesDeferred && (hiddenCount > 0 || showDeferred) ? (
-            <Pressable onPress={() => setShowDeferred((v) => !v)}>
-              <Text style={s.deferredFooter}>
-                {showDeferred ? "hide deferred" : `⏸ ${hiddenCount} deferred — show`}
-              </Text>
-            </Pressable>
-          ) : null
-        }
-        contentContainerStyle={{ paddingBottom: 32 }}
+        ListFooterComponent={deferredFooter}
+        contentContainerStyle={s.content}
       />
     </View>
   );
@@ -86,7 +127,16 @@ export default function TaskListScreen({
 
 const s = StyleSheet.create({
   screen: { flex: 1, backgroundColor: C.bg },
-  activeRow: { backgroundColor: C.surface2, borderRadius: 12 },
-  empty: { color: C.muted, textAlign: "center", marginTop: 48, fontSize: 15 },
-  deferredFooter: { color: C.muted, fontSize: 13, textAlign: "center", paddingVertical: 14 },
+  content: { paddingHorizontal: space.lg, paddingTop: space.md, paddingBottom: 96 },
+  lifted: { borderRadius: radius.lg, ...shadow.fab },
+  empty: {
+    ...type.body,
+    color: C.muted,
+    textAlign: "center",
+    marginTop: 72,
+    paddingHorizontal: space.xxl,
+    lineHeight: 22,
+  },
+  deferredBtn: { paddingVertical: space.lg, alignItems: "center" },
+  deferredText: { ...type.meta, color: C.textSecondary, fontWeight: "500" },
 });

app/src/components/TaskRow.tsx

@@ -5,7 +5,8 @@ import { dueMeta, friendlyDate, isDeferred } from "../lib/dates";
 import { haptic } from "../lib/haptics";
 import { formatEstimate, PRIORITY_COLOR } from "../lib/priority";
 import { updateTask } from "../lib/store";
-import { C } from "../lib/theme";
+import { C, radius, space, type } from "../lib/theme";
+import { completeWithUndo } from "../lib/undo";
 import type { Task, TaskStatus } from "../lib/types";
 
 export default function TaskRow({
@@ -13,6 +14,7 @@ export default function TaskRow({
   uncheckTo = "next",
   showStatus,
   onLongPress,
+  emphasized,
 }: {
   task: Task;
   /** Status to revert to when un-checking a done task. */
@@ -20,8 +22,11 @@ export default function TaskRow({
   showStatus?: boolean;
   /** Drag handle for reorderable lists. */
   onLongPress?: () => void;
+  /** The one thing to do now — bigger, tinted, labelled. */
+  emphasized?: boolean;
 }) {
   const router = useRouter();
+  const done = task.status === "done";
   // Due date is rendered separately so it can carry a tone color; the reader
   // sees "due today" in amber, never does date math on an ISO string.
   const due = task.due_date ? dueMeta(task.due_date) : null;
@@ -37,33 +42,50 @@ export default function TaskRow({
     .filter(Boolean)
     .join("  ·  ");
   const meta = base || due;
+  const flag = PRIORITY_COLOR[task.priority];
 
   const toggle = () => {
-    const done = task.status !== "done";
-    if (done) haptic.success();
-    else haptic.tap();
-    updateTask(task.id, { status: done ? "done" : uncheckTo });
+    if (!done) {
+      completeWithUndo(task);
+      return;
+    }
+    haptic.tap();
+    updateTask(task.id, { status: uncheckTo });
   };
 
   return (
     <Animated.View entering={FadeIn.duration(150)}>
-      <Pressable style={s.row} onPress={() => router.push(`/task/${task.id}`)} onLongPress={onLongPress} delayLongPress={200}>
       <Pressable
-          style={[s.checkbox, { borderColor: PRIORITY_COLOR[task.priority] }]}
+        style={({ pressed }) => [s.row, emphasized && s.rowEmphasized, pressed && s.rowPressed]}
+        onPress={() => router.push(`/task/${task.id}`)}
+        onLongPress={onLongPress}
+        delayLongPress={200}
+      >
+        {/* Rounded square rather than a circle — the Things checkbox shape.
+            The border carries the priority colour, so priority is legible at a
+            glance without spending a whole column on a flag. */}
+        <Pressable
+          style={[
+            s.checkbox,
+            emphasized && s.checkboxEmphasized,
+            { borderColor: done ? C.done : flag },
+            done && s.checkboxDone,
+          ]}
           hitSlop={10}
           onPress={toggle}
         >
-          {task.status === "done" && <View style={s.checkboxFill} />}
+          {done && <Text style={s.check}>✓</Text>}
         </Pressable>
         <View style={{ flex: 1 }}>
-          <Text style={s.title} numberOfLines={2}>
+          {emphasized && <Text style={s.nowLabel}>NOW</Text>}
+          <Text style={[s.title, emphasized && s.titleEmphasized, done && s.titleDone]} numberOfLines={2}>
             {task.title}
           </Text>
           {!!meta && (
-            <Text style={s.meta}>
+            <Text style={s.meta} numberOfLines={1}>
               {base}
               {!!base && !!due && "  ·  "}
-              {due && <Text style={{ color: dueColor }}>{due.label}</Text>}
+              {due && <Text style={{ color: dueColor, fontWeight: "500" }}>{due.label}</Text>}
             </Text>
           )}
         </View>
@@ -76,21 +98,44 @@ const s = StyleSheet.create({
   row: {
     flexDirection: "row",
     alignItems: "center",
-    gap: 12,
-    paddingVertical: 14,
-    paddingHorizontal: 16,
-    borderBottomWidth: StyleSheet.hairlineWidth,
-    borderBottomColor: C.border,
+    gap: space.md,
+    paddingVertical: space.md + 2,
+    paddingHorizontal: space.lg,
+    backgroundColor: C.surface,
   },
+  rowPressed: { backgroundColor: C.surface2 },
+  rowEmphasized: { backgroundColor: C.accentSoft, paddingVertical: space.lg + 2 },
+  checkboxEmphasized: { width: 26, height: 26, borderRadius: 8 },
+  nowLabel: { fontSize: 10, fontWeight: "700", letterSpacing: 1.2, color: C.accent, marginBottom: 2 },
+  titleEmphasized: { fontSize: 19, fontWeight: "600", lineHeight: 24 },
   checkbox: {
     width: 22,
     height: 22,
-    borderRadius: 11,
-    borderWidth: 2,
+    borderRadius: 7,
+    borderWidth: 1.5,
     alignItems: "center",
     justifyContent: "center",
   },
-  checkboxFill: { width: 12, height: 12, borderRadius: 6, backgroundColor: C.done },
-  title: { color: C.text, fontSize: 16 },
-  meta: { color: C.muted, fontSize: 13, marginTop: 2 },
+  checkboxDone: { backgroundColor: C.done },
+  check: { color: C.onAccent, fontSize: 13, lineHeight: 16, fontWeight: "700" },
+  title: { ...type.row, color: C.text },
+  titleDone: { color: C.muted, textDecorationLine: "line-through" },
+  meta: { ...type.meta, color: C.muted, marginTop: 3 },
 });
+
+/** Inset hairline sized to line up under the task title, not the checkbox. */
+export const TASK_ROW_INSET = space.lg + 22 + space.md;
+
+export function TaskSeparator() {
+  return (
+    <View
+      style={{
+        height: StyleSheet.hairlineWidth,
+        backgroundColor: C.separator,
+        marginLeft: TASK_ROW_INSET,
+        // Keeps the hairline from showing through a card's rounded corner.
+        borderRadius: radius.sm,
+      }}
+    />
+  );
+}

app/src/components/Toast.tsx

@@ -0,0 +1,98 @@
+// One app-wide snackbar, mounted once in the root layout. `showToast` is a
+// plain function so stores and rows can call it without a context hop. A new
+// toast replaces the current one (last action wins) and the timer restarts.
+import { useEffect, useState } from "react";
+import { Pressable, StyleSheet, Text } from "react-native";
+import Animated, { FadeInDown, FadeOutDown } from "react-native-reanimated";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { haptic } from "../lib/haptics";
+import { C, radius, shadow, space, type } from "../lib/theme";
+
+export interface ToastSpec {
+  message: string;
+  action?: { label: string; onPress: () => void };
+}
+
+const DURATION_MS = 5000;
+// Sits on the home FAB's baseline (index.tsx `fab.bottom`) — above the
+// launcher bar, and the right padding leaves the FAB itself uncovered.
+const FAB_BOTTOM = 104;
+const FAB_CLEARANCE = space.xl + 56 + space.md;
+
+let setCurrent: ((t: ToastSpec | null) => void) | null = null;
+
+export function showToast(spec: ToastSpec) {
+  setCurrent?.(spec);
+}
+
+export function ToastHost() {
+  const [toast, setToast] = useState<ToastSpec | null>(null);
+  const insets = useSafeAreaInsets();
+
+  useEffect(() => {
+    setCurrent = setToast;
+    return () => {
+      if (setCurrent === setToast) setCurrent = null;
+    };
+  }, []);
+
+  useEffect(() => {
+    if (!toast) return;
+    const timer = setTimeout(() => setToast(null), DURATION_MS);
+    return () => clearTimeout(timer);
+  }, [toast]);
+
+  if (!toast) return null;
+  const { action } = toast;
+  return (
+    <Animated.View
+      entering={FadeInDown.duration(180)}
+      exiting={FadeOutDown.duration(150)}
+      style={[s.wrap, { bottom: FAB_BOTTOM + insets.bottom }]}
+      pointerEvents="box-none"
+    >
+      <Pressable style={s.toast} onPress={() => setToast(null)}>
+        <Text style={s.message} numberOfLines={1}>
+          {toast.message}
+        </Text>
+        {action && (
+          <Pressable
+            hitSlop={12}
+            onPress={() => {
+              haptic.tap();
+              setToast(null);
+              action.onPress();
+            }}
+            style={({ pressed }) => [s.action, pressed && { opacity: 0.6 }]}
+          >
+            <Text style={s.actionText}>{action.label}</Text>
+          </Pressable>
+        )}
+      </Pressable>
+    </Animated.View>
+  );
+}
+
+const s = StyleSheet.create({
+  wrap: {
+    position: "absolute",
+    left: space.lg,
+    right: FAB_CLEARANCE,
+    alignItems: "flex-start",
+  },
+  toast: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: space.lg,
+    maxWidth: 420,
+    paddingVertical: space.md,
+    paddingLeft: space.lg,
+    paddingRight: space.md,
+    borderRadius: radius.pill,
+    backgroundColor: C.text,
+    ...shadow.fab,
+  },
+  message: { ...type.row, color: C.bg, flexShrink: 1 },
+  action: { paddingVertical: space.xs, paddingHorizontal: space.sm },
+  actionText: { ...type.row, color: C.accentSoft, fontWeight: "600" },
+});

app/src/components/WebSortableList.tsx

@@ -0,0 +1,115 @@
+// Web-only reorderable list. react-native-draggable-flatlist's drop handling
+// never completes on react-native-web (onDragEnd doesn't fire), and the
+// PanResponder path is unreliable there too — so each row gets a grab handle
+// driven by raw pointer events: pointerdown on the handle, window-level
+// move/up listeners, and on release the target slot is computed from measured
+// row heights and handed to onReorder (the same store mutation native uses).
+import { useState, type ReactNode } from "react";
+import { StyleSheet, Text, View, type GestureResponderEvent } from "react-native";
+import { C, space } from "../lib/theme";
+
+export default function WebSortableList<T extends { id: string }>({
+  data,
+  renderItem,
+  onReorder,
+  separator,
+  disabled,
+}: {
+  data: T[];
+  renderItem: (item: T, index: number) => ReactNode;
+  /** Called with the dragged row's id and the index it was dropped at. */
+  onReorder: (id: string, to: number) => void;
+  separator?: ReactNode;
+  disabled?: boolean;
+}) {
+  // Stable mutable array (not a ref: refs may not be read during render).
+  const [heights] = useState<number[]>([]);
+  const [drag, setDrag] = useState<{ index: number; dy: number } | null>(null);
+
+  const targetIndex = (from: number, dy: number) => {
+    let idx = from;
+    let acc = 0;
+    while (dy > 0 && idx < data.length - 1 && dy > acc + (heights[idx + 1] ?? 48) / 2) {
+      acc += heights[idx + 1] ?? 48;
+      idx++;
+    }
+    while (dy < 0 && idx > 0 && -dy > acc + (heights[idx - 1] ?? 48) / 2) {
+      acc += heights[idx - 1] ?? 48;
+      idx--;
+    }
+    return idx;
+  };
+
+  const startDrag = (i: number, e: GestureResponderEvent) => {
+    if (disabled) return;
+    // RNW delivers a real PointerEvent; keep it off the row's Pressable.
+    e.stopPropagation();
+    e.preventDefault();
+    const native = e.nativeEvent as unknown as { clientY?: number; pageY: number };
+    const startY = native.clientY ?? native.pageY;
+    setDrag({ index: i, dy: 0 });
+    let dy = 0;
+    const move = (ev: PointerEvent) => {
+      dy = ev.clientY - startY;
+      setDrag({ index: i, dy });
+    };
+    const up = () => {
+      window.removeEventListener("pointermove", move);
+      window.removeEventListener("pointerup", up);
+      setDrag(null);
+      const to = targetIndex(i, dy);
+      if (to !== i) onReorder(data[i].id, to);
+    };
+    window.addEventListener("pointermove", move);
+    window.addEventListener("pointerup", up);
+  };
+
+  return (
+    <View>
+      {data.map((item, i) => {
+        const dragging = drag?.index === i;
+        return (
+          <View key={item.id}>
+            {i > 0 && separator}
+            <View
+              onLayout={(e) => (heights[i] = e.nativeEvent.layout.height)}
+              style={dragging && [s.dragging, { transform: [{ translateY: drag.dy }] }]}
+            >
+              {renderItem(item, i)}
+              {!disabled && (
+                <View onPointerDown={(e) => startDrag(i, e as unknown as GestureResponderEvent)} style={s.handle}>
+                  <Text style={s.handleGlyph}>⠿</Text>
+                </View>
+              )}
+            </View>
+          </View>
+        );
+      })}
+    </View>
+  );
+}
+
+const s = StyleSheet.create({
+  dragging: {
+    zIndex: 10,
+    elevation: 10,
+    shadowColor: "#000",
+    shadowOpacity: 0.15,
+    shadowRadius: 12,
+    shadowOffset: { width: 0, height: 6 },
+  },
+  handle: {
+    position: "absolute",
+    right: 0,
+    top: 0,
+    bottom: 0,
+    width: 44,
+    alignItems: "center",
+    justifyContent: "center",
+    // @ts-expect-error web-only style
+    cursor: "grab",
+    touchAction: "none",
+    userSelect: "none",
+  },
+  handleGlyph: { color: C.muted, fontSize: 15, paddingHorizontal: space.sm },
+});

app/src/components/ui.tsx

@@ -1,15 +1,121 @@
-import { Pressable, StyleSheet, Text, TextInput, View, type TextInputProps } from "react-native";
-import { C } from "../lib/theme";
+import { Pressable, StyleSheet, Text, TextInput, View, type TextInputProps, type StyleProp, type ViewStyle } from "react-native";
+import { C, radius, shadow, space, type } from "../lib/theme";
 
-export function Field({ label, ...props }: TextInputProps & { label: string }) {
+/**
+ * Screen background + consistent gutter. Every screen sits on the grouped
+ * background so white cards read as raised paper.
+ */
+export function Screen({ children, style }: { children: React.ReactNode; style?: ViewStyle }) {
+  return <View style={[u.screen, style]}>{children}</View>;
+}
+
+/**
+ * Large in-content heading. Nav-bar titles are tiny and centred; Things puts
+ * the screen name in the content at display size, which is what gives each
+ * screen its sense of place.
+ */
+export function Title({ children, count }: { children: React.ReactNode; count?: number }) {
   return (
-    <View style={{ marginBottom: 14 }}>
-      <Text style={u.label}>{label}</Text>
-      <TextInput style={u.input} placeholderTextColor={C.muted} {...props} />
+    <View style={u.titleRow}>
+      <Text style={u.title}>{children}</Text>
+      {count !== undefined && count > 0 && <Text style={u.titleCount}>{count}</Text>}
     </View>
   );
 }
 
+/** Small caps label above a group. Sentence case — SHOUTING CAPS reads dated. */
+export function SectionHeader({ children, tone }: { children: React.ReactNode; tone?: string }) {
+  return <Text style={[u.sectionHeader, !!tone && { color: tone }]}>{children}</Text>;
+}
+
+/**
+ * Rounded white group. Rows inside are separated by inset hairlines rather
+ * than full-bleed dividers, so the card keeps a clean silhouette.
+ */
+export function Card({ children, style }: { children: React.ReactNode; style?: ViewStyle }) {
+  return <View style={[u.card, style]}>{children}</View>;
+}
+
+/**
+ * Row background plus rounded outer corners for the first and last row of a
+ * list, so a plain FlatList reads as one card without wrapping it in a `Card`
+ * (which would break drag-and-drop and section headers).
+ */
+export function cardEdges(index: number, count: number) {
+  return [u.cardRow, index === 0 && u.cardTop, index === count - 1 && u.cardBottom];
+}
+
+/** Inset hairline for use between rows inside a `Card`. */
+export function Separator({ inset = 0 }: { inset?: number }) {
+  return <View style={[u.separator, { marginLeft: inset }]} />;
+}
+
+/** Compact count/status pill. */
+export function Pill({ label, tone }: { label: string; tone?: string }) {
+  return (
+    <View style={[u.pill, !!tone && { backgroundColor: `${tone}18` }]}>
+      <Text style={[u.pillText, !!tone && { color: tone }]}>{label}</Text>
+    </View>
+  );
+}
+
+/** Centred empty state. One quiet line — no illustration, no exclamation. */
+export function Empty({ children }: { children: React.ReactNode }) {
+  return <Text style={u.empty}>{children}</Text>;
+}
+
+export function Field({ label, style, ...props }: TextInputProps & { label: string }) {
+  return (
+    <View style={{ marginBottom: space.lg }}>
+      <Text style={u.label}>{label}</Text>
+      {/* style last so callers can extend the input (e.g. multiline height)
+          without silently dropping the base styling. */}
+      <TextInput style={[u.input, style]} placeholderTextColor={C.muted} {...props} />
+    </View>
+  );
+}
+
+/** One wrapping row of option chips. The single source of chip geometry. */
+export function ChipRow({ children }: { children: React.ReactNode }) {
+  return <View style={u.chipRow}>{children}</View>;
+}
+
+/**
+ * A single selectable chip. `tone` colours the selected border/text and `tint`
+ * its fill — priority chips pass their flag colour, everything else falls back
+ * to the app accent.
+ */
+export function OptionChip({
+  label,
+  active,
+  onPress,
+  tone = C.accent,
+  tint = C.accentSoft,
+  leading,
+}: {
+  label: string;
+  active?: boolean;
+  onPress: () => void;
+  tone?: string;
+  tint?: string;
+  leading?: React.ReactNode;
+}) {
+  return (
+    <Pressable
+      style={({ pressed }) => [
+        u.chip,
+        active && { borderColor: tone, backgroundColor: tint },
+        pressed && !active && u.chipPressed,
+      ]}
+      onPress={onPress}
+    >
+      {leading}
+      <Text style={[u.chipText, active && { color: tone, fontWeight: "600" }]}>{label}</Text>
+    </Pressable>
+  );
+}
+
+/** Labelled chip group. Omit `label` when the surrounding panel already titles it. */
 export function Chips<T extends string>({
   label,
   options,
@@ -17,26 +123,25 @@ export function Chips<T extends string>({
   onChange,
   labels,
 }: {
-  label: string;
+  label?: string;
   options: T[];
   value: T | null;
   onChange: (v: T) => void;
   labels?: Record<string, string>;
 }) {
   return (
-    <View style={{ marginBottom: 14 }}>
-      <Text style={u.label}>{label}</Text>
-      <View style={u.chipRow}>
+    <View style={label ? { marginBottom: space.lg } : undefined}>
+      {!!label && <Text style={u.label}>{label}</Text>}
+      <ChipRow>
         {options.map((o) => (
-          <Pressable
+          <OptionChip
             key={o}
-            style={[u.chip, value === o && u.chipActive]}
+            label={labels?.[o] ?? o}
+            active={value === o}
             onPress={() => onChange(o)}
-          >
-            <Text style={[u.chipText, value === o && { color: C.text }]}>{labels?.[o] ?? o}</Text>
-          </Pressable>
+          />
         ))}
-      </View>
+      </ChipRow>
     </View>
   );
 }
@@ -45,50 +150,119 @@ export function Button({
   title,
   onPress,
   danger,
+  secondary,
+  style,
 }: {
   title: string;
   onPress: () => void;
   danger?: boolean;
+  secondary?: boolean;
+  style?: StyleProp<ViewStyle>;
 }) {
+  const variant = danger ? u.buttonDanger : secondary ? u.buttonSecondary : null;
+  const textVariant = danger ? u.buttonTextDanger : secondary ? u.buttonTextSecondary : null;
   return (
     <Pressable
-      style={[u.button, danger && { backgroundColor: "transparent", borderColor: C.danger, borderWidth: 1 }]}
+      style={({ pressed }) => [u.button, variant, style, pressed && { opacity: 0.75 }]}
       onPress={onPress}
     >
-      <Text style={[u.buttonText, danger && { color: C.danger }]}>{title}</Text>
+      <Text style={[u.buttonText, textVariant]}>{title}</Text>
     </Pressable>
   );
 }
 
 const u = StyleSheet.create({
-  label: { color: C.muted, fontSize: 13, marginBottom: 6, textTransform: "uppercase", letterSpacing: 0.5 },
+  screen: { flex: 1, backgroundColor: C.bg },
+
+  cardRow: { backgroundColor: C.surface },
+  cardTop: { borderTopLeftRadius: radius.lg, borderTopRightRadius: radius.lg },
+  cardBottom: {
+    borderBottomLeftRadius: radius.lg,
+    borderBottomRightRadius: radius.lg,
+    ...shadow.card,
+  },
+
+  titleRow: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: space.md,
+    paddingHorizontal: space.lg,
+    paddingTop: space.md,
+    paddingBottom: space.lg,
+  },
+  title: { ...type.title, color: C.text },
+  titleCount: { ...type.title, color: C.muted, fontWeight: "600" },
+
+  sectionHeader: {
+    ...type.section,
+    color: C.textSecondary,
+    paddingHorizontal: space.xs,
+    paddingTop: space.xl,
+    paddingBottom: space.sm,
+  },
+
+  card: {
+    backgroundColor: C.surface,
+    borderRadius: radius.lg,
+    borderWidth: StyleSheet.hairlineWidth,
+    borderColor: C.border,
+    overflow: "hidden",
+    ...shadow.card,
+  },
+  separator: { height: StyleSheet.hairlineWidth, backgroundColor: C.separator },
+
+  pill: {
+    paddingHorizontal: space.sm,
+    paddingVertical: 3,
+    borderRadius: radius.pill,
+    backgroundColor: C.surface2,
+  },
+  pillText: { ...type.meta, color: C.textSecondary, fontWeight: "500" },
+
+  empty: { color: C.muted, textAlign: "center", marginTop: 56, ...type.body },
+
+  label: {
+    ...type.section,
+    color: C.textSecondary,
+    marginBottom: space.sm,
+  },
   input: {
     backgroundColor: C.surface,
     color: C.text,
-    borderRadius: 10,
-    borderWidth: 1,
+    borderRadius: radius.md,
+    borderWidth: StyleSheet.hairlineWidth,
     borderColor: C.border,
-    padding: 12,
+    paddingHorizontal: space.md,
+    paddingVertical: space.md,
     fontSize: 16,
   },
-  chipRow: { flexDirection: "row", flexWrap: "wrap", gap: 8 },
+
+  chipRow: { flexDirection: "row", flexWrap: "wrap", gap: space.sm },
   chip: {
-    paddingVertical: 8,
-    paddingHorizontal: 14,
-    borderRadius: 20,
+    flexDirection: "row",
+    alignItems: "center",
+    gap: 7,
+    paddingVertical: 9,
+    paddingHorizontal: 15,
+    borderRadius: radius.pill,
     backgroundColor: C.surface,
-    borderWidth: 1,
+    borderWidth: StyleSheet.hairlineWidth,
     borderColor: C.border,
   },
-  chipActive: { backgroundColor: C.surface2, borderColor: C.accent },
-  chipText: { color: C.muted, fontSize: 14 },
+  chipPressed: { backgroundColor: C.surface2 },
+  chipText: { ...type.chip, color: C.textSecondary },
+
   button: {
     backgroundColor: C.accent,
-    borderRadius: 10,
-    padding: 14,
+    borderRadius: radius.md,
+    paddingVertical: space.lg - 2,
     alignItems: "center",
-    marginTop: 8,
-    marginBottom: 12,
+    marginTop: space.sm,
+    marginBottom: space.md,
   },
-  buttonText: { color: C.text, fontSize: 16, fontWeight: "600" },
+  buttonDanger: { backgroundColor: "transparent", borderWidth: StyleSheet.hairlineWidth, borderColor: C.danger },
+  buttonSecondary: { backgroundColor: C.surface, borderWidth: StyleSheet.hairlineWidth, borderColor: C.border },
+  buttonText: { fontSize: 16, fontWeight: "600", color: C.onAccent },
+  buttonTextDanger: { color: C.danger },
+  buttonTextSecondary: { color: C.text },
 });

app/src/lib/priority.ts

@@ -9,11 +9,21 @@ export const PRIORITY_LABEL: Record<Task["priority"], string> = {
   4: "Low",
 };
 
+// Todoist's flag mapping (urgent red → low grey), retuned to sit calmly on a
+// light canvas. `PRIORITY_TINT` is the same hue at wash strength, for the
+// selected state of a chip — a saturated fill would shout on a white card.
 export const PRIORITY_COLOR: Record<Task["priority"], `#${string}`> = {
-  1: "#E05B5B",
-  2: "#E0A93E",
-  3: "#5B8DEF",
-  4: "#6B7280",
+  1: "#E5484D",
+  2: "#D98324",
+  3: "#2F6FED",
+  4: "#9A9AA2",
+};
+
+export const PRIORITY_TINT: Record<Task["priority"], `#${string}`> = {
+  1: "#FDECEC",
+  2: "#FBF0E2",
+  3: "#E8F0FE",
+  4: "#F0F0F3",
 };
 
 export function formatEstimate(min: number | null): string | null {

app/src/lib/store.test.ts

@@ -0,0 +1,127 @@
+// Store unit tests — run with `bun test src/lib`. Expo/native modules are
+// mocked so the local-first mutations run in plain Bun.
+import { beforeEach, describe, expect, mock, test } from "bun:test";
+
+const storage = new Map<string, string>();
+mock.module("@react-native-async-storage/async-storage", () => ({
+  default: {
+    getItem: async (k: string) => storage.get(k) ?? null,
+    setItem: async (k: string, v: string) => void storage.set(k, v),
+  },
+}));
+let seq = 0;
+mock.module("expo-crypto", () => ({
+  randomUUID: () => `00000000-0000-4000-8000-${String(++seq).padStart(12, "0")}`,
+}));
+mock.module("./api", () => ({ api: {} }));
+mock.module("./config", () => ({ getConfig: async () => ({ token: "" }) }));
+
+const store = await import("./store");
+
+beforeEach(async () => {
+  storage.clear();
+  await store.hydrate();
+  store.setArea("personal");
+});
+
+const find = (id: string) => store.getState().tasks.find((t) => t.id === id)!;
+
+describe("completeTask", () => {
+  test("marks done and undo restores the original status in place", () => {
+    const a = store.createTask({ title: "a", status: "waiting", sort_order: 5 });
+    const undo = store.completeTask(a.id);
+    expect(find(a.id).status).toBe("done");
+    expect(find(a.id).completed_at).not.toBeNull();
+    undo!();
+    expect(find(a.id).status).toBe("waiting");
+    expect(find(a.id).completed_at).toBeNull();
+    expect(find(a.id).sort_order).toBe(5);
+  });
+
+  test("revertTo overrides the status undo returns to", () => {
+    const a = store.createTask({ title: "a", status: "next" });
+    store.completeTask(a.id, "someday")!();
+    expect(find(a.id).status).toBe("someday");
+  });
+
+  test("undo of a repeating task trashes the spawned occurrence", () => {
+    const a = store.createTask({ title: "rent", repeat: "monthly", due_date: "2026-09-01" });
+    const known = new Set(store.getState().tasks.map((t) => t.id));
+    const undo = store.completeTask(a.id)!;
+    const spawned = store.getState().tasks.filter((t) => !known.has(t.id));
+    expect(spawned).toHaveLength(1);
+    expect(spawned[0].status).toBe("next");
+    undo();
+    expect(find(a.id).status).toBe("next");
+    expect(find(spawned[0].id).status).toBe("trashed");
+  });
+
+  test("returns null for an already-done or unknown task", () => {
+    const a = store.createTask({ title: "a", status: "done" });
+    expect(store.completeTask(a.id)).toBeNull();
+    expect(store.completeTask("nope")).toBeNull();
+  });
+});
+
+describe("area lens", () => {
+  test("new rows are born into the active area and selectors filter by it", () => {
+    const home = store.createTask({ title: "home" });
+    store.setArea("work");
+    const office = store.createTask({ title: "office" });
+    const proj = store.createProject({ name: "Q4" });
+    expect(home.area).toBe("personal");
+    expect(office.area).toBe("work");
+    expect(proj.area).toBe("work");
+
+    // The store is module state shared across tests, so assert on membership
+    // and on every visible row's area rather than on exact lists.
+    const ids = (s: ReturnType<typeof store.getState>) => store.tasksByStatus(s, "next").map((t) => t.id);
+    let s = store.getState();
+    expect(ids(s)).toContain(office.id);
+    expect(ids(s)).not.toContain(home.id);
+    expect(store.tasksByStatus(s, "next").every((t) => t.area === "work")).toBe(true);
+    expect(store.activeProjects(s).map((p) => p.id)).toEqual([proj.id]);
+
+    store.setArea("personal");
+    s = store.getState();
+    expect(ids(s)).toContain(home.id);
+    expect(ids(s)).not.toContain(office.id);
+    expect(store.activeProjects(s).some((p) => p.id === proj.id)).toBe(false);
+  });
+
+  test("area persists across hydrate", async () => {
+    store.setArea("work");
+    expect(storage.get("area_v1")).toBe("work");
+  });
+
+  test("rows cached without an area count as personal", () => {
+    // Simulate a pre-migration cache row.
+    const legacy = store.createTask({ title: "old" });
+    delete (legacy as { area?: string }).area;
+    store.setArea("work");
+    expect(store.todayTasks(store.getState()).overdue).toEqual([]);
+    store.setArea("personal");
+    expect(store.tasksByStatus(store.getState(), "next").some((t) => t.id === legacy.id)).toBe(true);
+  });
+
+  test("today, review and contexts respect the lens", () => {
+    store.createTask({ title: "p", due_date: "2000-01-01", context: "@home" });
+    store.setArea("work");
+    store.createTask({ title: "w", due_date: "2000-01-01", context: "@office" });
+    const s = store.getState();
+    expect(store.todayTasks(s).overdue.every((t) => t.area === "work")).toBe(true);
+    expect(store.todayTasks(s).overdue.map((t) => t.title)).toContain("w");
+    expect(store.reviewBuckets(s).overdue.map((t) => t.title)).toContain("w");
+    expect(store.reviewBuckets(s).overdue.map((t) => t.title)).not.toContain("p");
+    expect(store.knownContexts(s)).toEqual(["@office"]);
+  });
+
+  test("completing a repeating work task spawns into work", () => {
+    store.setArea("work");
+    const t = store.createTask({ title: "standup", repeat: "daily", due_date: "2000-01-01" });
+    store.setArea("personal");
+    store.completeTask(t.id);
+    const spawned = store.getState().tasks.find((x) => x.title === "standup" && x.status === "next")!;
+    expect(spawned.area).toBe("work");
+  });
+});

app/src/lib/store.ts

@@ -12,11 +12,17 @@ import { api } from "./api";
 import { getConfig } from "./config";
 import { daysFromToday, isDeferred, todayIso } from "./dates";
 import { nextOccurrence, shiftDays } from "./repeat";
-import type { Project, Task } from "./types";
+import type { Area, Project, Task } from "./types";
 
 export interface State {
   tasks: Task[];
   projects: Project[];
+  /**
+   * Which half of life is on screen. Every selector filters by it, so the
+   * toggle acts as a global lens: work mode shows no personal rows and vice
+   * versa. New tasks and projects are born into the active area.
+   */
+  area: Area;
   hydrated: boolean;
   syncing: boolean;
   pending: number;
@@ -31,10 +37,12 @@ type Op =
 
 const DATA_KEY = "store_v1";
 const QUEUE_KEY = "queue_v1";
+const AREA_KEY = "area_v1";
 
 let state: State = {
   tasks: [],
   projects: [],
+  area: "personal",
   hydrated: false,
   syncing: false,
   pending: 0,
@@ -68,13 +76,39 @@ function persistQueue() {
 
 export async function hydrate() {
   if (state.hydrated) return;
-  const [data, q] = await Promise.all([AsyncStorage.getItem(DATA_KEY), AsyncStorage.getItem(QUEUE_KEY)]);
+  const [data, q, area] = await Promise.all([
+    AsyncStorage.getItem(DATA_KEY),
+    AsyncStorage.getItem(QUEUE_KEY),
+    AsyncStorage.getItem(AREA_KEY),
+  ]);
   if (q) queue = JSON.parse(q);
   const parsed = data ? JSON.parse(data) : { tasks: [], projects: [] };
-  setState({ tasks: parsed.tasks, projects: parsed.projects, hydrated: true });
+  setState({
+    tasks: parsed.tasks,
+    projects: parsed.projects,
+    area: area === "work" ? "work" : "personal",
+    hydrated: true,
+  });
   void sync();
 }
 
+/** Flip the personal/work lens. Persists so the app reopens where you left it. */
+export function setArea(area: Area) {
+  if (area === state.area) return;
+  setState({ area });
+  void AsyncStorage.setItem(AREA_KEY, area);
+}
+
+// Rows cached before the area column existed have no `area`; they are
+// personal, matching the server's column default.
+function areaOf(row: { area?: Area }): Area {
+  return row.area ?? "personal";
+}
+
+function inArea<T extends { area?: Area }>(s: State, rows: T[]): T[] {
+  return rows.filter((r) => areaOf(r) === s.area);
+}
+
 // ---- mutations (instant; network happens later) ----
 
 function now() {
@@ -83,8 +117,8 @@ function now() {
 
 // Fields the API accepts — everything else (timestamps, completed_at) is local
 // bookkeeping until the server's authoritative row arrives via pull().
-const TASK_FIELDS = ["title", "notes", "status", "project_id", "context", "waiting_for", "due_date", "defer_date", "priority", "estimate_min", "repeat", "sort_order"] as const;
-const PROJECT_FIELDS = ["name", "status", "notes", "sort_order"] as const;
+const TASK_FIELDS = ["title", "notes", "status", "project_id", "context", "waiting_for", "due_date", "defer_date", "priority", "estimate_min", "repeat", "sort_order", "area"] as const;
+const PROJECT_FIELDS = ["name", "status", "notes", "sort_order", "area"] as const;
 
 function pickFields<T>(data: Partial<T>, fields: readonly (keyof T & string)[]): Partial<T> {
   const out: Partial<T> = {};
@@ -122,6 +156,7 @@ export function createTask(data: Partial<Task> & { title: string }): Task {
     estimate_min: data.estimate_min ?? null,
     repeat: data.repeat ?? null,
     completed_at: null,
+    area: data.area ?? state.area,
     // New tasks land at the top of their list.
     sort_order:
       data.sort_order ??
@@ -136,6 +171,11 @@ export function createTask(data: Partial<Task> & { title: string }): Task {
 }
 
 export function updateTask(id: string, patch: Partial<Task>) {
+  applyTaskUpdate(id, patch);
+}
+
+/** Applies a patch; returns the next occurrence if completing spawned one. */
+function applyTaskUpdate(id: string, patch: Partial<Task>): Task | null {
   const before = state.tasks.find((t) => t.id === id);
   setState({
     tasks: state.tasks.map((t) => {
@@ -152,11 +192,28 @@ export function updateTask(id: string, patch: Partial<Task>) {
   // done row later leaves the spawn in place — it's one tap to trash, versus
   // silently deleting a row the user may have edited.
   if (before && before.repeat && before.status !== "done" && patch.status === "done") {
-    spawnNextOccurrence(before);
+    return spawnNextOccurrence(before);
   }
+  return null;
 }
 
-function spawnNextOccurrence(t: Task) {
+/**
+ * Complete a task and hand back an undo. Undo puts the task back where it was
+ * (same status and sort slot) and trashes the occurrence a repeat spawned, so
+ * a mis-tap leaves no trace. Returns null when there's nothing to complete.
+ */
+export function completeTask(id: string, revertTo?: Task["status"]): (() => void) | null {
+  const before = state.tasks.find((t) => t.id === id);
+  if (!before || before.status === "done") return null;
+  const spawned = applyTaskUpdate(id, { status: "done" });
+  const back = revertTo ?? before.status;
+  return () => {
+    updateTask(id, { status: back });
+    if (spawned) trashTask(spawned.id);
+  };
+}
+
+function spawnNextOccurrence(t: Task): Task {
   const today = todayIso();
   const due = t.due_date ? nextOccurrence(t.due_date, t.repeat!, today) : null;
   // Keep the same lead time between defer and due (e.g. "surfaces 3 days before").
@@ -168,7 +225,7 @@ function spawnNextOccurrence(t: Task) {
         : t.defer_date
           ? nextOccurrence(t.defer_date, t.repeat!, today)
           : null;
-  createTask({
+  return createTask({
     title: t.title,
     notes: t.notes,
     status: t.status,
@@ -180,6 +237,7 @@ function spawnNextOccurrence(t: Task) {
     priority: t.priority,
     estimate_min: t.estimate_min,
     repeat: t.repeat,
+    area: areaOf(t),
   });
 }
 
@@ -194,6 +252,7 @@ export function createProject(data: Partial<Project> & { name: string }): Projec
     status: data.status ?? "active",
     notes: data.notes ?? "",
     sort_order: data.sort_order ?? 0,
+    area: data.area ?? state.area,
     created_at: now(),
     updated_at: now(),
   };
@@ -311,7 +370,7 @@ function byManualOrder(a: Task, b: Task): number {
 }
 
 export function tasksByStatus(s: State, status: Task["status"]): Task[] {
-  return s.tasks.filter((t) => t.status === status).sort(byManualOrder);
+  return inArea(s, s.tasks).filter((t) => t.status === status).sort(byManualOrder);
 }
 
 /**
@@ -340,7 +399,7 @@ export function reorderTask(id: string, status: Task["status"], index: number) {
 export function todayTasks(s: State): { overdue: Task[]; today: Task[] } {
   const now = new Date();
   const todayIso = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}-${String(now.getDate()).padStart(2, "0")}`;
-  const open = s.tasks.filter((t) => t.status !== "done" && t.status !== "trashed");
+  const open = inArea(s, s.tasks).filter((t) => t.status !== "done" && t.status !== "trashed");
   return {
     overdue: open.filter((t) => t.due_date && t.due_date < todayIso).sort(byPriorityDue),
     today: open
@@ -350,7 +409,7 @@ export function todayTasks(s: State): { overdue: Task[]; today: Task[] } {
 }
 
 export function activeProjects(s: State): Project[] {
-  return s.projects
+  return inArea(s, s.projects)
     .filter((p) => p.status !== "dropped")
     .sort((a, b) => a.sort_order - b.sort_order || b.created_at.localeCompare(a.created_at));
 }
@@ -362,7 +421,7 @@ export function openTaskCount(s: State, projectId: string): number {
 /** Distinct contexts on open tasks — suggestion chips beat retyping "@homr". */
 export function knownContexts(s: State): string[] {
   const set = new Set<string>();
-  for (const t of s.tasks) {
+  for (const t of inArea(s, s.tasks)) {
     if (t.context && t.status !== "done" && t.status !== "trashed") set.add(t.context);
   }
   return [...set].sort();
@@ -388,7 +447,7 @@ export interface ReviewBuckets {
 
 export function reviewBuckets(s: State): ReviewBuckets {
   const today = todayIso();
-  const open = s.tasks.filter((t) => t.status !== "done" && t.status !== "trashed");
+  const open = inArea(s, s.tasks).filter((t) => t.status !== "done" && t.status !== "trashed");
   const overdue = open.filter((t) => t.due_date && t.due_date < today).sort(byPriorityDue);
   const overdueIds = new Set(overdue.map((t) => t.id));
   const actionable = new Set(["next", "waiting"]);

app/src/lib/theme.ts

@@ -1,12 +1,118 @@
-export const C = {
-  bg: "#0F1115",
-  surface: "#1A1D24",
-  surface2: "#232733",
-  border: "#2C313D",
-  text: "#E6E8EC",
-  muted: "#8A909C",
-  accent: "#5B8DEF",
-  done: "#4CAF7D",
-  danger: "#E05B5B",
-  warn: "#E0A93E",
+// Design tokens.
+//
+// The look is modelled on Things 3: a light, calm canvas, generous whitespace,
+// hairline inset separators instead of boxes, and exactly one accent colour
+// used sparingly. Everything visual in the app resolves through this file —
+// no component hard-codes a hex value (priority flags are the one exception,
+// and they live in `priority.ts` alongside their labels).
+
+/** Named palette. `dark` is complete and ready to wire to a theme toggle. */
+const light = {
+  /** Screen background behind grouped content. */
+  bg: "#F7F7F9",
+  /** Card / row surface that sits on `bg`. */
+  surface: "#FFFFFF",
+  /** Inputs, pressed states, subtle fills. */
+  surface2: "#EFEFF3",
+  /** Card outline. Deliberately barely-there. */
+  border: "#E6E6EB",
+  /** Inset hairline between rows inside a card. */
+  separator: "#ECECF0",
+  /** Primary reading colour. Near-black, never pure #000. */
+  text: "#16161A",
+  /** Supporting copy that should still be comfortably readable. */
+  textSecondary: "#6E6E76",
+  /** Metadata, placeholders, de-emphasised chrome. */
+  muted: "#9A9AA2",
+  accent: "#2F6FED",
+  /** Tinted accent wash for selected chips and active states. */
+  accentSoft: "#E8F0FE",
+  /** Accent for the work lens — the one place the app changes colour. */
+  work: "#0F766E",
+  done: "#2FA36B",
+  danger: "#E5484D",
+  warn: "#D98324",
+  /** Text that sits on top of `accent`. */
+  onAccent: "#FFFFFF",
+} as const;
+
+const dark = {
+  bg: "#0C0C0F",
+  surface: "#17171B",
+  surface2: "#212127",
+  border: "#2A2A31",
+  separator: "#26262C",
+  text: "#F2F2F5",
+  textSecondary: "#A6A6B0",
+  muted: "#7A7A85",
+  accent: "#4C86F0",
+  accentSoft: "#1B2740",
+  work: "#2DD4BF",
+  done: "#3FBF84",
+  danger: "#F0605F",
+  warn: "#E0A93E",
+  onAccent: "#FFFFFF",
+} as const;
+
+export const PALETTES = { light, dark } as const;
+
+/**
+ * Active palette. Styles are created at module scope (StyleSheet.create) so
+ * this is a static choice rather than a hook — switching themes at runtime
+ * would mean moving every stylesheet inside its component.
+ */
+export const C = light;
+
+/** 4pt spacing grid. Screen gutter is `space.lg`. */
+export const space = {
+  xs: 4,
+  sm: 8,
+  md: 12,
+  lg: 16,
+  xl: 20,
+  xxl: 28,
+} as const;
+
+export const radius = {
+  sm: 8,
+  md: 12,
+  /** Cards and grouped lists. */
+  lg: 16,
+  /** Chips and pills. */
+  pill: 999,
+} as const;
+
+/**
+ * Type scale. `title` is the large in-content screen heading that replaces a
+ * cramped nav-bar title; `row` is the task title size — 17pt, matching the
+ * platform body size Things and Todoist both settle on.
+ */
+export const type = {
+  title: { fontSize: 30, fontWeight: "700", letterSpacing: -0.6 },
+  section: { fontSize: 13, fontWeight: "600", letterSpacing: 0.3 },
+  row: { fontSize: 17, letterSpacing: -0.2 },
+  body: { fontSize: 15 },
+  meta: { fontSize: 13 },
+  chip: { fontSize: 14, fontWeight: "500" },
+} as const;
+
+/**
+ * Card elevation. Kept extremely soft — a Things-like surface reads as paper,
+ * not as a floating panel.
+ */
+export const shadow = {
+  card: {
+    shadowColor: "#0B0B12",
+    shadowOpacity: 0.05,
+    shadowRadius: 10,
+    shadowOffset: { width: 0, height: 2 },
+    elevation: 1,
+  },
+  fab: {
+    shadowColor: "#0B0B12",
+    shadowOpacity: 0.22,
+    shadowRadius: 14,
+    shadowOffset: { width: 0, height: 6 },
+    elevation: 6,
+  },
 } as const;

app/src/lib/types.ts

@@ -1,6 +1,11 @@
 export type TaskStatus = "inbox" | "next" | "waiting" | "scheduled" | "someday" | "done" | "trashed";
 export type ProjectStatus = "active" | "someday" | "completed" | "dropped";
 export type Repeat = "daily" | "weekdays" | "weekly" | "monthly" | "yearly";
+/** Personal vs work — the app-wide toggle shows one area at a time. */
+export type Area = "personal" | "work";
+
+export const AREAS: Area[] = ["personal", "work"];
+export const AREA_LABEL: Record<Area, string> = { personal: "Personal", work: "Work" };
 
 export interface Task {
   id: string;
@@ -17,6 +22,7 @@ export interface Task {
   repeat: Repeat | null;
   completed_at: string | null;
   sort_order: number;
+  area: Area;
   created_at: string;
   updated_at: string;
 }
@@ -27,6 +33,7 @@ export interface Project {
   status: ProjectStatus;
   notes: string;
   sort_order: number;
+  area: Area;
   created_at: string;
   updated_at: string;
   open_tasks?: number;

app/src/lib/undo.ts

@@ -0,0 +1,13 @@
+// Complete + "Undo" toast, shared by every checkbox in the app so a mis-tap
+// is one tap to take back wherever it happened.
+import { showToast } from "../components/Toast";
+import { haptic } from "./haptics";
+import { completeTask } from "./store";
+import type { Task, TaskStatus } from "./types";
+
+export function completeWithUndo(task: Pick<Task, "id" | "title">, revertTo?: TaskStatus) {
+  const undo = completeTask(task.id, revertTo);
+  if (!undo) return;
+  haptic.success();
+  showToast({ message: `Completed “${task.title}”`, action: { label: "Undo", onPress: undo } });
+}

app/src/widget/NextUpWidget.tsx

@@ -3,7 +3,7 @@
 // Built only from react-native-android-widget primitives (no RN views, no
 // hooks) — it renders to Android RemoteViews in a headless task.
 //
-// Interactions mirror the app: tap the circle to complete, tap the row to
+// Interactions mirror the app: tap the checkbox to complete, tap the row to
 // open Clarify, tap ＋ to capture, tap anywhere else to open the app.
 import { FlexWidget, TextWidget } from "react-native-android-widget";
 import { dueMeta, type DueTone } from "../lib/dates";
@@ -31,7 +31,7 @@ function Row({ task }: { task: Task }) {
         style={{ width: 32, height: 32, alignItems: "center", justifyContent: "center" }}
       >
         <FlexWidget
-          style={{ width: 19, height: 19, borderRadius: 10, borderWidth: 2, borderColor: PRIORITY_COLOR[task.priority] }}
+          style={{ width: 19, height: 19, borderRadius: 6, borderWidth: 2, borderColor: PRIORITY_COLOR[task.priority] }}
         />
       </FlexWidget>
       <FlexWidget style={{ flex: 1, marginLeft: 6 }}>
@@ -60,7 +60,7 @@ export function NextUpWidget({ tasks, totalNext, overdueCount }: { tasks: Task[]
         style={{ width: "match_parent", flexDirection: "row", alignItems: "center", justifyContent: "space-between", marginBottom: 4 }}
       >
         <FlexWidget style={{ flexDirection: "row", alignItems: "center" }}>
-          <TextWidget text="NEXT UP" style={{ fontSize: 12, letterSpacing: 1, color: C.muted }} />
+          <TextWidget text="Next up" style={{ fontSize: 13, fontWeight: "600", letterSpacing: 0.3, color: C.textSecondary }} />
           {totalNext > tasks.length && (
             <TextWidget text={`  +${totalNext - tasks.length} more`} style={{ fontSize: 12, color: C.muted }} />
           )}
@@ -79,7 +79,7 @@ export function NextUpWidget({ tasks, totalNext, overdueCount }: { tasks: Task[]
           accessibilityLabel="Add task"
           style={{ width: 28, height: 28, borderRadius: 14, backgroundColor: C.accent, alignItems: "center", justifyContent: "center" }}
         >
-          <TextWidget text="＋" style={{ fontSize: 16, color: "#FFFFFF" }} />
+          <TextWidget text="＋" style={{ fontSize: 16, color: C.onAccent }} />
         </FlexWidget>
       </FlexWidget>
       {tasks.length === 0 ? (

app/tsconfig.json

@@ -16,5 +16,8 @@
     "**/*.tsx",
     ".expo/types/**/*.ts",
     "expo-env.d.ts"
+  ],
+  "exclude": [
+    "**/*.test.ts"
   ]
 }

desktop/scripts/dev-web.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+# Start the Expo web dev server for `tauri dev`.
+#
+# Runs from src-tauri/ as Tauri's beforeDevCommand, or from desktop/ by hand.
+# Serves the GTD web UI on :8081 (devUrl in tauri.conf.json) with hot reload;
+# the Tauri window loads it and talks to https://gtd.rehbock.xyz/api.
+set -eu
+
+if [ -x "$HOME/.hermes/node/bin/node" ]; then
+  export PATH="$HOME/.hermes/node/bin:$PATH"
+fi
+
+HERE="$(cd "$(dirname "$0")" && pwd)"
+case "$HERE" in
+  */desktop/src-tauri/scripts) REPO="$(cd "$HERE/../../.." && pwd)" ;;
+  */desktop/scripts) REPO="$(cd "$HERE/../.." && pwd)" ;;
+  *) REPO="$(cd "$HERE/../.." && pwd)" ;;
+esac
+APP_DIR="$REPO/app"
+
+cd "$APP_DIR"
+exec npx expo start --web --port 8081

desktop/scripts/export-web.sh

@@ -0,0 +1,37 @@
+#!/bin/sh
+# Re-export the Expo web frontend for the Tauri desktop shell.
+#
+# Runs from src-tauri/ as Tauri's beforeBuildCommand, or from desktop/ by hand.
+# `frontendDist` points at ../app/dist in the repo root, so a plain release
+# build of an unchanged tree simply re-bundles the last committed export —
+# exactly like the web deploy copies app/dist to the VPS.
+#
+# Node 22 only (matches app/.nvmrc and CI): newer npm writes lockfiles that
+# CI's npm 10 refuses, so force the hermes node 22 toolchain if present.
+set -eu
+
+HERE="$(cd "$(dirname "$0")" && pwd)"
+case "$HERE" in
+  */desktop/src-tauri/scripts)
+    # invoked as src-tauri/scripts/export-web.sh (Tauri hook cwd): repo is two up
+    ROOT="$(cd "$HERE/../../.." && pwd)" ;;
+  */desktop/scripts)
+    # invoked as desktop/scripts/export-web.sh: repo is two up
+    ROOT="$(cd "$HERE/../.." && pwd)" ;;
+  *)
+    ROOT="$(cd "$HERE/../.." && pwd)" ;;
+esac
+
+if [ -x "$HOME/.hermes/node/bin/node" ]; then
+  export PATH="$HOME/.hermes/node/bin:$PATH"
+fi
+
+NODE_MAJOR="$(node -p 'process.versions.node.split(".")[0]')"
+if [ "$NODE_MAJOR" != "22" ]; then
+  echo "export-web.sh: need node 22 (have $(node -v)); refusing to run" >&2
+  exit 1
+fi
+
+cd "$ROOT/app"
+npx expo export --platform web
+echo "export-web.sh: exported to $ROOT/app/dist"

desktop/src-tauri/.gitignore

@@ -0,0 +1,2 @@
+/target/
+/gen/schemas

desktop/src-tauri/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "gtd"
+version = "1.0.0"
+description = "GTD desktop app — Tauri shell around the Expo web export"
+edition = "2021"
+authors = ["Marcus"]
+
+[build-dependencies]
+tauri-build = { version = "2", features = [] }
+
+[dependencies]
+tauri = { version = "2", features = [] }
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"

desktop/src-tauri/build.rs

@@ -0,0 +1,3 @@
+fn main() {
+    tauri_build::build()
+}

desktop/src-tauri/capabilities/main.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "../gen/schemas/desktop-schema.json",
+  "identifier": "main-capability",
+  "description": "Capabilities for the GTD main window. The Expo web frontend needs no Tauri plugin APIs — it only talks to the remote API over fetch — so this grants the read-only core defaults (window/event/app metadata) and nothing privileged.",
+  "windows": ["main"],
+  "permissions": ["core:default"]
+}

desktop/src-tauri/scripts/dev-web.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+# Start the Expo web dev server for `tauri dev`.
+#
+# Runs from src-tauri/ as Tauri's beforeDevCommand, or from desktop/ by hand.
+# Serves the GTD web UI on :8081 (devUrl in tauri.conf.json) with hot reload;
+# the Tauri window loads it and talks to https://gtd.rehbock.xyz/api.
+set -eu
+
+if [ -x "$HOME/.hermes/node/bin/node" ]; then
+  export PATH="$HOME/.hermes/node/bin:$PATH"
+fi
+
+HERE="$(cd "$(dirname "$0")" && pwd)"
+case "$HERE" in
+  */desktop/src-tauri/scripts) REPO="$(cd "$HERE/../../.." && pwd)" ;;
+  */desktop/scripts) REPO="$(cd "$HERE/../.." && pwd)" ;;
+  *) REPO="$(cd "$HERE/../.." && pwd)" ;;
+esac
+APP_DIR="$REPO/app"
+
+cd "$APP_DIR"
+exec npx expo start --web --port 8081

desktop/src-tauri/scripts/export-web.sh

@@ -0,0 +1,37 @@
+#!/bin/sh
+# Re-export the Expo web frontend for the Tauri desktop shell.
+#
+# Runs from src-tauri/ as Tauri's beforeBuildCommand, or from desktop/ by hand.
+# `frontendDist` points at ../app/dist in the repo root, so a plain release
+# build of an unchanged tree simply re-bundles the last committed export —
+# exactly like the web deploy copies app/dist to the VPS.
+#
+# Node 22 only (matches app/.nvmrc and CI): newer npm writes lockfiles that
+# CI's npm 10 refuses, so force the hermes node 22 toolchain if present.
+set -eu
+
+HERE="$(cd "$(dirname "$0")" && pwd)"
+case "$HERE" in
+  */desktop/src-tauri/scripts)
+    # invoked as src-tauri/scripts/export-web.sh (Tauri hook cwd): repo is two up
+    ROOT="$(cd "$HERE/../../.." && pwd)" ;;
+  */desktop/scripts)
+    # invoked as desktop/scripts/export-web.sh: repo is two up
+    ROOT="$(cd "$HERE/../.." && pwd)" ;;
+  *)
+    ROOT="$(cd "$HERE/../.." && pwd)" ;;
+esac
+
+if [ -x "$HOME/.hermes/node/bin/node" ]; then
+  export PATH="$HOME/.hermes/node/bin:$PATH"
+fi
+
+NODE_MAJOR="$(node -p 'process.versions.node.split(".")[0]')"
+if [ "$NODE_MAJOR" != "22" ]; then
+  echo "export-web.sh: need node 22 (have $(node -v)); refusing to run" >&2
+  exit 1
+fi
+
+cd "$ROOT/app"
+npx expo export --platform web
+echo "export-web.sh: exported to $ROOT/app/dist"

desktop/src-tauri/src/main.rs

@@ -0,0 +1,22 @@
+// GTD desktop shell — Tauri 2 backend.
+//
+// The UI is the Expo web export (rebuilt from `app/` by
+// `scripts/export-web.sh` into `app/dist`, which this crate bundles via
+// `frontendDist`). All app logic, offline queueing, and API sync live in
+// that frontend; Rust only hosts the window. Native hooks (global
+// quick-add, menu-bar toggle) can attach to the builder below later
+// without touching the web code.
+//
+// CSP note (tauri.conf.json > app.security): `dangerousDisableAssetCspModification`
+// lists "style-src" because Tauri otherwise injects nonces into that directive,
+// which makes WebKit ignore 'unsafe-inline' and block every react-native-web
+// inline `style=""` attribute plus Reanimated's runtime <style> tags. The
+// result is a collapsed, unstyled page — a black screen in dark mode.
+// script-src still receives Tauri's hashes/nonces.
+#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
+
+fn main() {
+    tauri::Builder::default()
+        .run(tauri::generate_context!())
+        .expect("failed to run GTD");
+}

desktop/src-tauri/tauri.conf.json

@@ -0,0 +1,48 @@
+{
+  "$schema": "https://schema.tauri.app/config/2",
+  "productName": "GTD",
+  "version": "1.0.0",
+  "identifier": "xyz.rehbock.gtd",
+  "build": {
+    "devUrl": "http://localhost:8081",
+    "beforeDevCommand": "scripts/dev-web.sh",
+    "beforeBuildCommand": "scripts/export-web.sh",
+    "frontendDist": "../../app/dist"
+  },
+  "app": {
+    "windows": [
+      {
+        "label": "main",
+        "title": "GTD",
+        "url": "index.html",
+        "width": 1100,
+        "height": 750,
+        "minWidth": 800,
+        "minHeight": 600,
+        "center": true
+      }
+    ],
+    "security": {
+      "dangerousDisableAssetCspModification": ["style-src"],
+      "csp": {
+        "default-src": "'self' tauri: asset: http://asset.localhost",
+        "script-src": "'self' 'unsafe-inline' 'unsafe-eval' tauri: asset: http://asset.localhost blob: data:",
+        "style-src": "'self' 'unsafe-inline' tauri: asset: http://asset.localhost blob: data:",
+        "img-src": "'self' tauri: asset: http://asset.localhost blob: data:",
+        "font-src": "'self' tauri: asset: http://asset.localhost blob: data:",
+        "connect-src": "'self' ipc: http://ipc.localhost tauri: asset: http://asset.localhost https://gtd.rehbock.xyz",
+        "media-src": "'self' tauri: asset: http://asset.localhost blob: data:"
+      }
+    }
+  },
+  "bundle": {
+    "active": true,
+    "targets": ["app", "dmg"],
+    "icon": ["icons/icon.icns", "icons/icon.ico", "icons/32x32.png", "icons/128x128.png", "icons/128x128@2x.png"],
+    "category": "Productivity",
+    "macOS": {
+      "minimumSystemVersion": "11.0",
+      "hardenedRuntime": true
+    }
+  }
+}

server/index.ts

@@ -11,12 +11,13 @@ await sql.unsafe(await Bun.file(new URL("schema.sql", import.meta.url)).text());
 
 const TASK_COLS = `id, title, notes, status, project_id, context, waiting_for,
   due_date::text as due_date, defer_date::text as defer_date,
-  priority, estimate_min, repeat, completed_at, sort_order, created_at, updated_at`;
-const PROJECT_COLS = `id, name, status, notes, sort_order, created_at, updated_at`;
+  priority, estimate_min, repeat, completed_at, sort_order, area, created_at, updated_at`;
+const PROJECT_COLS = `id, name, status, notes, sort_order, area, created_at, updated_at`;
 
 const TASK_STATUSES = ["inbox", "next", "waiting", "scheduled", "someday", "done", "trashed"];
 const REPEATS = ["daily", "weekdays", "weekly", "monthly", "yearly"];
 const PROJECT_STATUSES = ["active", "someday", "completed", "dropped"];
+const AREAS = ["personal", "work"];
 const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
 
 const CORS = {
@@ -33,8 +34,8 @@ function err(message: string, status: number) {
 }
 
 // Fields a client may set. completed_at is derived from status server-side.
-const TASK_FIELDS = ["title", "notes", "status", "project_id", "context", "waiting_for", "due_date", "defer_date", "priority", "estimate_min", "repeat", "sort_order"];
-const PROJECT_FIELDS = ["name", "status", "notes", "sort_order"];
+const TASK_FIELDS = ["title", "notes", "status", "project_id", "context", "waiting_for", "due_date", "defer_date", "priority", "estimate_min", "repeat", "sort_order", "area"];
+const PROJECT_FIELDS = ["name", "status", "notes", "sort_order", "area"];
 
 // Only these may be cleared to NULL; notes/title are NOT NULL and keep "".
 const NULLABLE = new Set(["project_id", "context", "waiting_for", "due_date", "defer_date", "estimate_min", "repeat"]);
@@ -62,12 +63,15 @@ async function handle(req: Request): Promise<Response> {
   if (path === "/v1/tasks" && method === "GET") {
     const status = url.searchParams.get("status");
     const projectId = url.searchParams.get("project_id");
+    const area = url.searchParams.get("area");
     if (status && !TASK_STATUSES.includes(status)) return err("bad status", 400);
+    if (area && !AREAS.includes(area)) return err("bad area", 400);
     const where: string[] = [];
     const params: unknown[] = [];
     if (status) { params.push(status); where.push(`status = $${params.length}`); }
     else where.push(`status != 'trashed'`);
     if (projectId) { params.push(projectId); where.push(`project_id = $${params.length}`); }
+    if (area) { params.push(area); where.push(`area = $${params.length}`); }
     const rows = await sql.unsafe(
       `select ${TASK_COLS} from tasks where ${where.join(" and ")}
        order by sort_order, created_at desc`, params);
@@ -79,16 +83,17 @@ async function handle(req: Request): Promise<Response> {
     if (typeof t.title !== "string" || !t.title.trim()) return err("title required", 400);
     if (t.status && !TASK_STATUSES.includes(t.status as string)) return err("bad status", 400);
     if (t.repeat && !REPEATS.includes(t.repeat as string)) return err("bad repeat", 400);
+    if (t.area && !AREAS.includes(t.area as string)) return err("bad area", 400);
     const id = typeof body.id === "string" && UUID_RE.test(body.id) ? body.id : null;
     // Client-supplied id + on-conflict no-op make offline-queue retries idempotent.
     const rows = await sql.unsafe(
-      `insert into tasks (id, title, notes, status, project_id, context, waiting_for, due_date, defer_date, priority, estimate_min, repeat, sort_order)
-       values (coalesce($1::uuid, gen_random_uuid()), $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)
+      `insert into tasks (id, title, notes, status, project_id, context, waiting_for, due_date, defer_date, priority, estimate_min, repeat, sort_order, area)
+       values (coalesce($1::uuid, gen_random_uuid()), $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)
        on conflict (id) do nothing
        returning ${TASK_COLS}`,
       [id, t.title, t.notes ?? "", t.status ?? "next", t.project_id ?? null, t.context ?? null,
        t.waiting_for ?? null, t.due_date ?? null, t.defer_date ?? null, t.priority ?? 4,
-       t.estimate_min ?? null, t.repeat ?? null, t.sort_order ?? 0]);
+       t.estimate_min ?? null, t.repeat ?? null, t.sort_order ?? 0, t.area ?? "personal"]);
     if (rows.length) return json(rows[0], 201);
     const existing = await sql.unsafe(`select ${TASK_COLS} from tasks where id = $1`, [id]);
     return json(existing[0], 200);
@@ -104,6 +109,7 @@ async function handle(req: Request): Promise<Response> {
     const patch = method === "DELETE" ? { status: "trashed" } : pick(body, TASK_FIELDS);
     if (patch.status && !TASK_STATUSES.includes(patch.status as string)) return err("bad status", 400);
     if (patch.repeat && !REPEATS.includes(patch.repeat as string)) return err("bad repeat", 400);
+    if (patch.area && !AREAS.includes(patch.area as string)) return err("bad area", 400);
     const existing = await sql.unsafe(`select ${TASK_COLS} from tasks where id = $1`, [id]);
     if (!existing.length) return err("not found", 404);
     const cur = { ...existing[0], ...patch };
@@ -111,10 +117,10 @@ async function handle(req: Request): Promise<Response> {
     const rows = await sql.unsafe(
       `update tasks set title=$2, notes=$3, status=$4, project_id=$5, context=$6, waiting_for=$7,
          due_date=$8, defer_date=$9, priority=$10, estimate_min=$11, repeat=$12, completed_at=$13,
-         sort_order=$14, updated_at=now()
+         sort_order=$14, area=$15, updated_at=now()
        where id=$1 returning ${TASK_COLS}`,
       [id, cur.title, cur.notes, cur.status, cur.project_id, cur.context, cur.waiting_for,
-       cur.due_date, cur.defer_date, cur.priority, cur.estimate_min, cur.repeat, completedAt, cur.sort_order]);
+       cur.due_date, cur.defer_date, cur.priority, cur.estimate_min, cur.repeat, completedAt, cur.sort_order, cur.area]);
     return json(rows[0]);
   }
 
@@ -133,13 +139,14 @@ async function handle(req: Request): Promise<Response> {
     const p = pick(body, PROJECT_FIELDS);
     if (typeof p.name !== "string" || !p.name.trim()) return err("name required", 400);
     if (p.status && !PROJECT_STATUSES.includes(p.status as string)) return err("bad status", 400);
+    if (p.area && !AREAS.includes(p.area as string)) return err("bad area", 400);
     const id = typeof body.id === "string" && UUID_RE.test(body.id) ? body.id : null;
     const rows = await sql.unsafe(
-      `insert into projects (id, name, status, notes, sort_order)
-       values (coalesce($1::uuid, gen_random_uuid()), $2, $3, $4, $5)
+      `insert into projects (id, name, status, notes, sort_order, area)
+       values (coalesce($1::uuid, gen_random_uuid()), $2, $3, $4, $5, $6)
        on conflict (id) do nothing
        returning ${PROJECT_COLS}`,
-      [id, p.name, p.status ?? "active", p.notes ?? "", p.sort_order ?? 0]);
+      [id, p.name, p.status ?? "active", p.notes ?? "", p.sort_order ?? 0, p.area ?? "personal"]);
     if (rows.length) return json(rows[0], 201);
     const existing = await sql.unsafe(`select ${PROJECT_COLS} from projects where id = $1`, [id]);
     return json(existing[0], 200);
@@ -150,13 +157,14 @@ async function handle(req: Request): Promise<Response> {
     const id = m[1];
     const patch = method === "DELETE" ? { status: "dropped" } : pick(body, PROJECT_FIELDS);
     if (patch.status && !PROJECT_STATUSES.includes(patch.status as string)) return err("bad status", 400);
+    if (patch.area && !AREAS.includes(patch.area as string)) return err("bad area", 400);
     const existing = await sql.unsafe(`select ${PROJECT_COLS} from projects where id = $1`, [id]);
     if (!existing.length) return err("not found", 404);
     const cur = { ...existing[0], ...patch };
     const rows = await sql.unsafe(
-      `update projects set name=$2, status=$3, notes=$4, sort_order=$5, updated_at=now()
+      `update projects set name=$2, status=$3, notes=$4, sort_order=$5, area=$6, updated_at=now()
        where id=$1 returning ${PROJECT_COLS}`,
-      [id, cur.name, cur.status, cur.notes, cur.sort_order]);
+      [id, cur.name, cur.status, cur.notes, cur.sort_order, cur.area]);
     return json(rows[0]);
   }
 

server/schema.sql

@@ -38,3 +38,10 @@ create index if not exists tasks_project_idx on tasks (project_id);
 -- Columns added after the initial deploy (create-if-not-exists won't alter).
 alter table tasks add column if not exists repeat text
     check (repeat in ('daily', 'weekdays', 'weekly', 'monthly', 'yearly'));
+
+-- Personal vs work: the app's top-level toggle filters every list by area.
+alter table tasks add column if not exists area text not null default 'personal'
+    check (area in ('personal', 'work'));
+alter table projects add column if not exists area text not null default 'personal'
+    check (area in ('personal', 'work'));
+create index if not exists tasks_area_idx on tasks (area);