feat(nav): three tabs and a Lists board; drop Review

Next up, Today and Lists replace the six-button launcher. Lists is a 2x2
board (Next up / Waiting / Someday / Projects): full scrolling panes on a
desktop window, preview cards on a phone, each header opening its list and
each project opening its tasks. The Needs-attention card collapses to one
row of status pills under the title. Review and its screen are gone; Done
and Trash move under the Settings gear. v1.24.

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

.gitea/workflows/release.yml

@@ -8,17 +8,17 @@ jobs:
   check:
     # Fast fail: lockfile sync, types, lint — catches in ~2 min what would
     # otherwise kill the APK build twenty minutes in.
-    runs-on: desktop
-    container:
-      image: node:22
+    runs-on: macbook
     steps:
       - name: Checkout
         run: |
           git init -q .
           git fetch -q --depth 1 "https://git.rehbock.xyz/${{ github.repository }}.git" "${{ github.sha }}"
-          git checkout -q FETCH_HEAD
+          git checkout -q -f FETCH_HEAD
+          git clean -qfd
       - name: Lockfile + typecheck + lint
         run: |
+          export PATH="$HOME/.hermes/node/bin:$PATH"
           cd app
           npm ci --no-audit --no-fund
           npx tsc --noEmit
@@ -35,59 +35,51 @@ jobs:
 
   build:
     needs: check
-    # 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
+    # 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:
-      # 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
+          git checkout -q -f FETCH_HEAD
+          git clean -qfd
 
-      - name: Install Node.js
+      - name: Toolchain
         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"
           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

.gitignore

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

README.md

@@ -9,11 +9,11 @@ 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.
-  - **Weekly review**: overdue, stalled (14d), aging waiting-fors (7d), someday sweep, deferred preview, stuck projects — with one-tap triage per row. Done and Trash (restorable) live at the bottom of Review.
 - `server/` — Bun API + Dockerfile + compose. Deployed at `~/personal/gtd` on rehbock.xyz, joined to `personal-db_default` + `caddy_net`.
 
 ## Develop

app/.gitignore

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

app/app.json

@@ -2,13 +2,19 @@
   "expo": {
     "name": "GTD",
     "slug": "gtd",
-    "version": "1.0.0",
+    "version": "1.24",
     "orientation": "portrait",
     "icon": "./assets/images/icon.png",
     "scheme": "gtd",
     "userInterfaceStyle": "automatic",
     "ios": {
-      "icon": "./assets/expo.icon"
+      "icon": "./assets/expo.icon",
+      "bundleIdentifier": "xyz.rehbock.gtd",
+      "buildNumber": "24",
+      "supportsTablet": false,
+      "infoPlist": {
+        "ITSAppUsesNonExemptEncryption": false
+      }
     },
     "android": {
       "adaptiveIcon": {
@@ -33,7 +39,7 @@
           "widgets": [
             {
               "name": "NextUp",
-              "label": "GTD — Next up",
+              "label": "GTD \u2014 Next up",
               "description": "Your top three next actions",
               "minWidth": "250dp",
               "minHeight": "110dp",
@@ -57,6 +63,12 @@
     "experiments": {
       "typedRoutes": true,
       "reactCompiler": true
+    },
+    "extra": {
+      "router": {},
+      "eas": {
+        "projectId": "7a0325dd-ba60-415e-b367-e414890bacb3"
+      }
     }
   }
 }

app/eas.json

@@ -0,0 +1,26 @@
+{
+  "cli": {
+    "version": ">= 20.0.0",
+    "appVersionSource": "local"
+  },
+  "build": {
+    "production": {
+      "android": {
+        "buildType": "apk"
+      },
+      "env": {
+        "VERSION_CODE": "24",
+        "VERSION_NAME": "1.24"
+      },
+      "node": "22.20.0",
+      "ios": {
+        "autoIncrement": false
+      }
+    }
+  },
+  "submit": {
+    "production": {
+      "ios": {}
+    }
+  }
+}

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/(tabs)/_layout.tsx

@@ -0,0 +1,78 @@
+import { Link, useRouter } from "expo-router";
+import { Tabs } from "expo-router/js-tabs";
+import { Pressable, StyleSheet, View } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import AreaToggle from "../../components/AreaToggle";
+import Icon from "../../components/Icon";
+import TabBar, { TAB_BAR_CONTENT_HEIGHT, tabBarInset } from "../../components/TabBar";
+import { haptic } from "../../lib/haptics";
+import { C, shadow, space } from "../../lib/theme";
+
+/**
+ * The three top-level screens share one header (the personal/work pill plus
+ * the settings gear) and one capture button. The FAB lives here rather than
+ * on each screen so it never moves: same spot above the bar whichever tab is
+ * open, which is what makes it a reflex.
+ */
+export default function TabsLayout() {
+  const router = useRouter();
+  const insets = useSafeAreaInsets();
+  return (
+    <View style={{ flex: 1 }}>
+      <Tabs
+        tabBar={(props) => <TabBar {...props} />}
+        screenOptions={{
+          headerStyle: { backgroundColor: C.bg },
+          headerTintColor: C.text,
+          headerShadowVisible: false,
+          headerTitle: () => <AreaToggle />,
+          headerTitleAlign: "center",
+          headerRight: () => (
+            <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>
+          ),
+          sceneStyle: { backgroundColor: C.bg },
+        }}
+      >
+        <Tabs.Screen name="index" options={{ title: "Next up" }} />
+        <Tabs.Screen name="today" options={{ title: "Today" }} />
+        <Tabs.Screen name="lists" options={{ title: "Lists" }} />
+      </Tabs>
+
+      <Pressable
+        accessibilityLabel="New task"
+        style={({ pressed }) => [
+          s.fab,
+          { bottom: TAB_BAR_CONTENT_HEIGHT + tabBarInset(insets.bottom) + space.lg },
+          pressed && { transform: [{ scale: 0.94 }] },
+        ]}
+        onPress={() => {
+          haptic.tap();
+          router.push("/add");
+        }}
+      >
+        <Icon name="plus" size={26} color={C.onAccent} />
+      </Pressable>
+    </View>
+  );
+}
+
+const s = StyleSheet.create({
+  fab: {
+    position: "absolute",
+    right: space.xl,
+    width: 56,
+    height: 56,
+    borderRadius: 28,
+    backgroundColor: C.accent,
+    alignItems: "center",
+    justifyContent: "center",
+    ...shadow.fab,
+  },
+});

app/src/app/(tabs)/index.tsx

@@ -0,0 +1,144 @@
+import { useRouter } from "expo-router";
+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 from "../../components/Icon";
+import TaskRow, { TaskSeparator } from "../../components/TaskRow";
+import { cardEdges, Empty, Screen, Title } from "../../components/ui";
+import { haptic } from "../../lib/haptics";
+import { reorderTask, todayTasks, visibleTasksByStatus } from "../../lib/store";
+import { C, radius, shadow, space, type } from "../../lib/theme";
+import { useStore } from "../../lib/useStore";
+
+const PREVIEW = 3;
+
+/**
+ * One small pill of status — overdue count, offline, sync trouble. Sits under
+ * the title instead of in its own section, so a bad day costs one line, not a
+ * card, and a good day costs nothing.
+ */
+function StatusPill({ tone, text, onPress }: { tone: string; text: string; onPress?: () => void }) {
+  return (
+    <Pressable
+      disabled={!onPress}
+      onPress={onPress}
+      style={({ pressed }) => [s.pill, { backgroundColor: `${tone}14` }, pressed && { opacity: 0.6 }]}
+    >
+      <View style={[s.dot, { backgroundColor: tone }]} />
+      <Text style={[s.pillText, { color: tone }]}>{text}</Text>
+      {!!onPress && <Icon name="chevron" size={12} color={tone} />}
+    </Pressable>
+  );
+}
+
+export default function Home() {
+  const router = useRouter();
+  const store = useStore();
+  const next = visibleTasksByStatus(store, "next");
+  const { overdue } = todayTasks(store);
+  const preview = next.slice(0, PREVIEW);
+  const attention = overdue.length > 0 || store.offline || !!store.syncError;
+
+  return (
+    <Screen>
+      <NestableScrollContainer contentContainerStyle={s.content} showsVerticalScrollIndicator={false}>
+        <Title count={next.length}>Next up</Title>
+
+        {attention && (
+          <View style={s.strip}>
+            {overdue.length > 0 && (
+              <StatusPill tone={C.danger} text={`${overdue.length} overdue`} onPress={() => router.push("/today")} />
+            )}
+            {store.offline && (
+              <StatusPill
+                tone={C.textSecondary}
+                text={store.pending > 0 ? `Offline · ${store.pending} queued` : "Offline"}
+              />
+            )}
+            {!!store.syncError && (
+              <StatusPill tone={C.danger} text="Sync failed" onPress={() => router.push("/settings")} />
+            )}
+          </View>
+        )}
+
+        {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>
+        )}
+      </NestableScrollContainer>
+    </Screen>
+  );
+}
+
+const s = StyleSheet.create({
+  content: { paddingHorizontal: space.lg, paddingBottom: 96 },
+  lifted: { borderRadius: radius.lg, ...shadow.fab },
+
+  strip: { flexDirection: "row", flexWrap: "wrap", gap: space.sm, marginBottom: space.md },
+  pill: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: 6,
+    paddingVertical: 5,
+    paddingHorizontal: space.md,
+    borderRadius: radius.pill,
+  },
+  dot: { width: 6, height: 6, borderRadius: 999 },
+  pillText: { ...type.meta, fontWeight: "600" },
+
+  viewAll: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: space.xs,
+    paddingVertical: space.md,
+    paddingHorizontal: space.xs,
+  },
+  viewAllText: { ...type.body, color: C.accent, fontWeight: "500" },
+});

app/src/app/(tabs)/lists.tsx

@@ -0,0 +1,230 @@
+// The Lists board: four quadrants, one screen.
+//
+// Next up, Waiting, Someday and Projects used to be four separate launcher
+// buttons. Here they share a 2×2 board so the whole open-loop picture fits
+// in one glance. On a desktop window each quadrant is a full pane with its
+// own scroll; on a phone each is a card showing the first few rows, and the
+// quadrant header opens the full list.
+import { useRouter, type Href } from "expo-router";
+import { Pressable, ScrollView, StyleSheet, Text, useWindowDimensions, View, type StyleProp, type ViewStyle } from "react-native";
+import Icon, { type IconName } from "../../components/Icon";
+import { Card, Separator } from "../../components/ui";
+import { dueMeta } from "../../lib/dates";
+import { haptic } from "../../lib/haptics";
+import { PRIORITY_COLOR } from "../../lib/priority";
+import { activeProjects, openTaskCount, visibleTasksByStatus } from "../../lib/store";
+import { C, space, type } from "../../lib/theme";
+import { completeWithUndo } from "../../lib/undo";
+import { useStore } from "../../lib/useStore";
+import type { Project, Task } from "../../lib/types";
+
+/** Two panes side by side need roughly this much to stay readable. */
+const WIDE = 720;
+/** Rows a phone-sized quadrant shows before handing off to the full list. */
+const PREVIEW = 4;
+
+function TaskMini({ task, wide }: { task: Task; wide: boolean }) {
+  const router = useRouter();
+  const due = task.due_date ? dueMeta(task.due_date) : null;
+  const dueColor = due?.tone === "overdue" ? C.danger : due?.tone === "today" ? C.warn : C.muted;
+  return (
+    <Pressable
+      style={({ pressed }) => [s.row, pressed && s.rowPressed]}
+      onPress={() => router.push(`/task/${task.id}`)}
+    >
+      <Pressable
+        accessibilityRole="checkbox"
+        accessibilityState={{ checked: false }}
+        style={[s.check, { borderColor: PRIORITY_COLOR[task.priority] }]}
+        hitSlop={10}
+        onPress={() => completeWithUndo(task)}
+      />
+      <Text style={s.rowTitle} numberOfLines={1}>
+        {task.title}
+      </Text>
+      {/* Phone-width cards can't spare the room; overdue still shows as a dot. */}
+      {due && wide ? (
+        <Text style={[s.rowMeta, { color: dueColor }]}>{due.label}</Text>
+      ) : due?.tone === "overdue" ? (
+        <View style={[s.dueDot, { backgroundColor: C.danger }]} />
+      ) : null}
+    </Pressable>
+  );
+}
+
+function ProjectMini({ project, open }: { project: Project; open: number }) {
+  const router = useRouter();
+  return (
+    <Pressable
+      style={({ pressed }) => [s.row, pressed && s.rowPressed]}
+      onPress={() => router.push(`/project/${project.id}`)}
+    >
+      <View style={s.projectDot} />
+      <Text style={s.rowTitle} numberOfLines={1}>
+        {project.name}
+      </Text>
+      <Text style={s.rowMeta}>{open === 0 ? "" : String(open)}</Text>
+      <Icon name="chevron" size={13} color={C.muted} />
+    </Pressable>
+  );
+}
+
+type Pane = {
+  key: string;
+  icon: IconName;
+  title: string;
+  /** Full-screen list the header opens. */
+  href: Href;
+  count: number;
+  empty: string;
+  rows: React.ReactNode[];
+};
+
+function Quadrant({ pane, wide, style }: { pane: Pane; wide: boolean; style?: StyleProp<ViewStyle> }) {
+  const router = useRouter();
+  const shown = wide ? pane.rows : pane.rows.slice(0, PREVIEW);
+  const hidden = pane.rows.length - shown.length;
+  const open = () => {
+    haptic.tap();
+    router.push(pane.href);
+  };
+  const body = (
+    <>
+      {shown.length === 0 && <Text style={s.empty}>{pane.empty}</Text>}
+      {shown.map((row, i) => (
+        <View key={i}>
+          {i > 0 && <Separator inset={space.lg + 18 + space.sm} />}
+          {row}
+        </View>
+      ))}
+    </>
+  );
+  return (
+    <Card style={[s.pane, style]}>
+      <Pressable
+        accessibilityRole="button"
+        onPress={open}
+        style={({ pressed }) => [s.paneHeader, pressed && { backgroundColor: C.surface2 }]}
+      >
+        <Icon name={pane.icon} size={16} color={C.textSecondary} bg={C.surface} />
+        <Text style={s.paneTitle}>{pane.title}</Text>
+        {pane.count > 0 && <Text style={s.paneCount}>{pane.count}</Text>}
+        <View style={{ flex: 1 }} />
+        <Icon name="chevron" size={14} color={C.muted} />
+      </Pressable>
+      <Separator />
+      {wide ? (
+        <ScrollView style={{ flex: 1 }} showsVerticalScrollIndicator={false}>
+          {body}
+        </ScrollView>
+      ) : (
+        <View>
+          {body}
+          {hidden > 0 && (
+            <Pressable onPress={open} style={({ pressed }) => [s.more, pressed && { opacity: 0.6 }]}>
+              <Text style={s.moreText}>{hidden} more</Text>
+            </Pressable>
+          )}
+        </View>
+      )}
+    </Card>
+  );
+}
+
+export default function Lists() {
+  const store = useStore();
+  const { width } = useWindowDimensions();
+  const wide = width >= WIDE;
+
+  const next = visibleTasksByStatus(store, "next");
+  const waiting = visibleTasksByStatus(store, "waiting");
+  const someday = visibleTasksByStatus(store, "someday");
+  const projects = activeProjects(store).filter((p) => p.status === "active");
+  const taskRows = (tasks: Task[]) => tasks.map((t) => <TaskMini key={t.id} task={t} wide={wide} />);
+
+  const panes: Pane[] = [
+    { key: "next", icon: "next", title: "Next up", href: "/list/next", count: next.length, empty: "Nothing next.", rows: taskRows(next) },
+    { key: "waiting", icon: "waiting", title: "Waiting", href: "/list/waiting", count: waiting.length, empty: "Not waiting on anyone.", rows: taskRows(waiting) },
+    { key: "someday", icon: "someday", title: "Someday", href: "/list/someday", count: someday.length, empty: "No someday items.", rows: taskRows(someday) },
+    {
+      key: "projects",
+      icon: "projects",
+      title: "Projects",
+      href: "/projects",
+      count: projects.length,
+      empty: "No projects yet.",
+      rows: projects.map((p) => <ProjectMini key={p.id} project={p} open={openTaskCount(store, p.id)} />),
+    },
+  ];
+
+  if (wide) {
+    return (
+      <View style={s.board}>
+        <View style={s.boardRow}>
+          <Quadrant pane={panes[0]} wide style={{ flex: 1 }} />
+          <Quadrant pane={panes[1]} wide style={{ flex: 1 }} />
+        </View>
+        <View style={s.boardRow}>
+          <Quadrant pane={panes[2]} wide style={{ flex: 1 }} />
+          <Quadrant pane={panes[3]} wide style={{ flex: 1 }} />
+        </View>
+      </View>
+    );
+  }
+
+  // Two columns that wrap. The container grows to the viewport and the two
+  // lines share its height (alignContent: stretch), so the board always looks
+  // like four quadrants — even when every list is empty.
+  const col = (width - space.lg * 2 - space.md) / 2;
+  return (
+    <ScrollView contentContainerStyle={s.grid} showsVerticalScrollIndicator={false}>
+      {panes.map((p) => (
+        <Quadrant key={p.key} pane={p} wide={false} style={{ width: col }} />
+      ))}
+    </ScrollView>
+  );
+}
+
+const s = StyleSheet.create({
+  board: { flex: 1, padding: space.lg, gap: space.md },
+  boardRow: { flex: 1, flexDirection: "row", gap: space.md },
+  grid: {
+    flexGrow: 1,
+    flexDirection: "row",
+    flexWrap: "wrap",
+    alignContent: "stretch",
+    gap: space.md,
+    paddingHorizontal: space.lg,
+    paddingTop: space.md,
+    paddingBottom: 96,
+  },
+
+  pane: { minHeight: 150 },
+  paneHeader: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: space.sm,
+    paddingHorizontal: space.lg,
+    paddingVertical: space.md,
+  },
+  paneTitle: { fontSize: 15, fontWeight: "600", letterSpacing: -0.1, color: C.text },
+  paneCount: { ...type.meta, color: C.muted, fontWeight: "600" },
+
+  row: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: space.sm,
+    paddingHorizontal: space.lg,
+    paddingVertical: space.sm + 3,
+  },
+  rowPressed: { backgroundColor: C.surface2 },
+  check: { width: 18, height: 18, borderRadius: 6, borderWidth: 1.5 },
+  projectDot: { width: 18, height: 18, borderRadius: 5, backgroundColor: C.surface2 },
+  rowTitle: { flex: 1, fontSize: 15, letterSpacing: -0.1, color: C.text },
+  rowMeta: { ...type.meta, color: C.muted },
+  dueDot: { width: 6, height: 6, borderRadius: 999 },
+
+  empty: { ...type.meta, color: C.muted, paddingHorizontal: space.lg, paddingVertical: space.md },
+  more: { paddingHorizontal: space.lg, paddingVertical: space.sm + 2 },
+  moreText: { ...type.meta, color: C.accent, fontWeight: "500" },
+});

app/src/app/(tabs)/today.tsx

@@ -1,16 +1,16 @@
 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, space } from "../lib/theme";
-import { useStore } from "../lib/useStore";
+import TaskRow, { TaskSeparator } from "../../components/TaskRow";
+import { cardEdges, Empty, SectionHeader, Title } from "../../components/ui";
+import { todayTasks } from "../../lib/store";
+import { C, space } from "../../lib/theme";
+import { useStore } from "../../lib/useStore";
 
 export default function Today() {
   const store = useStore();
   const { overdue, today } = todayTasks(store);
   const sections = [
     ...(overdue.length ? [{ title: "Overdue", data: overdue, color: C.danger }] : []),
-    { title: "Today", data: today, color: C.textSecondary },
+    { title: "Due today", data: today, color: C.textSecondary },
   ];
   const empty = overdue.length === 0 && today.length === 0;
 
@@ -19,6 +19,7 @@ export default function Today() {
       style={s.screen}
       sections={sections}
       keyExtractor={(t) => t.id}
+      ListHeaderComponent={<Title count={overdue.length + today.length}>Today</Title>}
       // Each section is its own rounded card, so the first and last rows in a
       // section round their outer corners.
       renderItem={({ item, index, section }) => (
@@ -40,5 +41,5 @@ export default function Today() {
 
 const s = StyleSheet.create({
   screen: { flex: 1, backgroundColor: C.bg },
-  content: { paddingHorizontal: space.lg, paddingBottom: 40 },
+  content: { paddingHorizontal: space.lg, paddingBottom: 96 },
 });

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

@@ -1,12 +1,12 @@
 import NetInfo from "@react-native-community/netinfo";
-import { Link, Stack } from "expo-router";
+import { Stack } from "expo-router";
 import { StatusBar } from "expo-status-bar";
 import { useEffect } from "react";
-import { AppState, Pressable } from "react-native";
+import { AppState } from "react-native";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
 import { getState, hydrate, subscribe, sync } from "../lib/store";
-import Icon from "../components/Icon";
-import { C, space } from "../lib/theme";
+import { ToastHost } from "../components/Toast";
+import { C } from "../lib/theme";
 import { refreshNextUpWidget } from "../widget/refresh";
 
 export default function RootLayout() {
@@ -49,31 +49,15 @@ export default function RootLayout() {
           contentStyle: { backgroundColor: C.bg },
         }}
       >
-        <Stack.Screen
-          name="index"
-          options={{
-            title: "GTD",
-            headerRight: () => (
-              <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>
-            ),
-          }}
-        />
+        <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
         <Stack.Screen name="list/[status]" />
-        <Stack.Screen name="today" options={{ title: "Today" }} />
         <Stack.Screen name="add" options={{ title: "New task", presentation: "modal" }} />
         <Stack.Screen name="projects" options={{ title: "Projects" }} />
         <Stack.Screen name="task/[id]" options={{ title: "Clarify", presentation: "modal" }} />
         <Stack.Screen name="project/[id]" options={{ title: "Project" }} />
-        <Stack.Screen name="review" options={{ title: "Weekly review" }} />
         <Stack.Screen name="settings" options={{ title: "Settings", presentation: "modal" }} />
       </Stack>
+      <ToastHost />
     </GestureHandlerRootView>
   );
 }

app/src/app/index.tsx

@@ -1,195 +0,0 @@
-import { useFocusEffect, useRouter } from "expo-router";
-import { Pressable, ScrollView, StyleSheet, Text, View } from "react-native";
-import Icon, { type IconName } from "../components/Icon";
-import TaskRow, { TaskSeparator } from "../components/TaskRow";
-import { Card, 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, shadow, space, type } from "../lib/theme";
-import { useStore } from "../lib/useStore";
-
-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();
-  const store = useStore();
-  const next = visibleTasksByStatus(store, "next");
-  const { overdue } = todayTasks(store);
-  const [lastReview, reloadReview] = useLastReview();
-  useFocusEffect(reloadReview);
-  const reviewDays = daysSince(lastReview);
-  const reviewDue = lastReview === null || (reviewDays !== null && reviewDays >= 7);
-  const preview = next.slice(0, PREVIEW);
-
-  return (
-    <Screen>
-      <ScrollView 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>
-        ) : (
-          <Card>
-            {preview.map((t, i) => (
-              <View key={t.id}>
-                {i > 0 && <TaskSeparator />}
-                <TaskRow task={t} />
-              </View>
-            ))}
-          </Card>
-        )}
-
-        {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 && (
-                <Alert
-                  tone={C.danger}
-                  text={`${overdue.length} overdue`}
-                  onPress={() => router.push("/today")}
-                />
-              )}
-              {reviewDue && (
-                <Alert
-                  tone={C.warn}
-                  text={
-                    lastReview === null
-                      ? "No weekly review yet"
-                      : `Weekly review is ${reviewDays} days overdue`
-                  }
-                  onPress={() => router.push("/review")}
-                />
-              )}
-              {store.offline && (
-                <Alert
-                  tone={C.textSecondary}
-                  text={
-                    store.pending > 0
-                      ? `Offline — ${store.pending} change${store.pending === 1 ? "" : "s"} queued`
-                      : "Offline"
-                  }
-                />
-              )}
-              {!!store.syncError && <Alert tone={C.danger} text={store.syncError} />}
-            </Card>
-          </>
-        )}
-      </ScrollView>
-
-      <View style={s.tabBar}>
-        {MENU.map((m) => (
-          <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={({ pressed }) => [s.fab, pressed && { transform: [{ scale: 0.94 }] }]}
-        onPress={() => {
-          haptic.tap();
-          router.push("/add");
-        }}
-      >
-        <Icon name="plus" size={26} color={C.onAccent} />
-      </Pressable>
-    </Screen>
-  );
-}
-
-const s = StyleSheet.create({
-  content: { paddingHorizontal: space.lg, paddingBottom: 120 },
-
-  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: space.md,
-    paddingBottom: space.xxl,
-  },
-  tab: { flex: 1, alignItems: "center", gap: 5 },
-  tabLabel: { fontSize: 11, color: C.textSecondary, letterSpacing: 0.1 },
-
-  fab: {
-    position: "absolute",
-    right: space.xl,
-    bottom: 104,
-    width: 56,
-    height: 56,
-    borderRadius: 28,
-    backgroundColor: C.accent,
-    alignItems: "center",
-    justifyContent: "center",
-    ...shadow.fab,
-  },
-});

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

@@ -4,7 +4,8 @@ import { FlatList, Pressable, StyleSheet, Text, TextInput, View } from "react-na
 import Icon from "../../components/Icon";
 import { Button, cardEdges, Chips, Empty, Separator } from "../../components/ui";
 import { haptic } from "../../lib/haptics";
-import { createTask, dropProject, updateProject, updateTask } from "../../lib/store";
+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";
@@ -29,7 +30,7 @@ export default function ProjectDetail() {
     if (!title) return;
     setDraft("");
     haptic.success();
-    createTask({ title, status: "next", project_id: id });
+    createTask({ title, status: "next", project_id: id, area: project.area ?? "personal" });
   };
 
   return (
@@ -68,10 +69,7 @@ export default function ProjectDetail() {
             <Pressable
               style={s.checkbox}
               hitSlop={10}
-              onPress={() => {
-                haptic.success();
-                updateTask(item.id, { status: "done" });
-              }}
+              onPress={() => completeWithUndo(item)}
             />
             <View style={{ flex: 1 }}>
               <Text style={s.title} numberOfLines={2}>

app/src/app/review.tsx

@@ -1,210 +0,0 @@
-// Weekly review — GTD's keystone habit. One pass, one decision per row:
-// each row has exactly three quick actions (do next / someday / trash) plus
-// 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 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, radius, space, type } from "../lib/theme";
-import { useStore } from "../lib/useStore";
-import type { Task } from "../lib/types";
-
-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, last && s.rowLast]}>
-      <Pressable
-        style={s.check}
-        hitSlop={8}
-        onPress={act(() => {
-          haptic.success();
-          updateTask(task.id, { status: "done" });
-        })}
-      >
-        <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}>
-          {task.title}
-        </Text>
-        <Text style={s.meta}>
-          {[
-            task.status,
-            task.waiting_for && `→ ${task.waiting_for}`,
-            showDefer && task.defer_date && `resurfaces ${friendlyDate(task.defer_date)}`,
-          ]
-            .filter(Boolean)
-            .join("  ·  ")}
-        </Text>
-      </Pressable>
-      {task.status !== "next" && (
-        <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={({ 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={({ pressed }) => [s.action, pressed && s.actionPressed]}
-        hitSlop={6}
-        onPress={act(() => trashTask(task.id))}
-      >
-        <Text style={s.dropText}>Drop</Text>
-      </Pressable>
-    </View>
-  );
-}
-
-function Section({ title, hint, tasks, showDefer }: { title: string; hint: string; tasks: Task[]; showDefer?: boolean }) {
-  if (tasks.length === 0) return null;
-  return (
-    <View>
-      <SectionHeader>
-        {title} ({tasks.length})
-      </SectionHeader>
-      <Text style={s.sectionHint}>{hint}</Text>
-      <Card>
-        {tasks.map((t, i) => (
-          <ReviewRow key={t.id} task={t} showDefer={showDefer} last={i === tasks.length - 1} />
-        ))}
-      </Card>
-    </View>
-  );
-}
-
-export default function Review() {
-  const router = useRouter();
-  const store = useStore();
-  const buckets = reviewBuckets(store);
-  const [last, reload] = useLastReview();
-  const days = daysSince(last);
-
-  const empty =
-    !buckets.overdue.length &&
-    !buckets.staleNext.length &&
-    !buckets.agingWaiting.length &&
-    !buckets.someday.length &&
-    !buckets.deferred.length &&
-    !buckets.stuckProjects.length;
-
-  return (
-    <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>
-
-      <Section title="Overdue" hint="Reschedule, do, or let go." tasks={buckets.overdue} />
-      <Section title="Stalled" hint="Next actions untouched for 2+ weeks — still the real next step?" tasks={buckets.staleNext} />
-      <Section title="Waiting too long" hint="A week without movement — time to nudge?" tasks={buckets.agingWaiting} />
-      <Section title="Someday sweep" hint="Promote what's ripe, trash what's dead." tasks={buckets.someday} />
-      <Section title="Deferred" hint="Hidden from lists — just so you know they're coming." tasks={buckets.deferred} showDefer />
-
-      {buckets.stuckProjects.length > 0 && (
-        <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>
-          <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>
-                <Icon name="chevron" size={16} color={C.muted} />
-              </Pressable>
-            ))}
-          </Card>
-        </View>
-      )}
-
-      {empty && <Empty>All clear. Nothing needs a decision.</Empty>}
-
-      <Button
-        title="Mark review complete"
-        onPress={async () => {
-          haptic.success();
-          await markReviewed();
-          reload();
-          router.back();
-        }}
-      />
-      <View style={s.archiveRow}>
-        <Pressable onPress={() => router.push("/list/done")}>
-          <Text style={s.archiveLink}>Done</Text>
-        </Pressable>
-        <Text style={s.archiveDot}>·</Text>
-        <Pressable onPress={() => router.push("/list/trashed")}>
-          <Text style={s.archiveLink}>Trash</Text>
-        </Pressable>
-      </View>
-    </ScrollView>
-  );
-}
-
-const s = StyleSheet.create({
-  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: space.md,
-    paddingVertical: space.md,
-    paddingHorizontal: space.lg,
-    borderBottomWidth: StyleSheet.hairlineWidth,
-    borderBottomColor: C.separator,
-    backgroundColor: C.surface,
-  },
-  rowLast: { borderBottomWidth: 0 },
-  check: { paddingRight: 2 },
-  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,8 +1,9 @@
 import * as Application from "expo-application";
 import { useRouter } from "expo-router";
 import { useEffect, useState } from "react";
-import { ScrollView, StyleSheet, Text } from "react-native";
-import { Button, Field } from "../components/ui";
+import { Pressable, ScrollView, StyleSheet, Text, View } from "react-native";
+import Icon from "../components/Icon";
+import { Button, Card, Field, SectionHeader, Separator } from "../components/ui";
 import { api } from "../lib/api";
 import { DEFAULT_URL, getConfig, setConfig } from "../lib/config";
 import { sync } from "../lib/store";
@@ -45,6 +46,24 @@ export default function Settings() {
       />
       <Button title="Save & test" onPress={save} />
       {status && <Text style={s.error}>{status}</Text>}
+
+      {/* Done and Trash are archives, not lists you work from — they live
+          behind the gear rather than on the bar. */}
+      <SectionHeader>Archive</SectionHeader>
+      <Card>
+        {(["done", "trashed"] as const).map((st, i) => (
+          <View key={st}>
+            {i > 0 && <Separator inset={space.lg} />}
+            <Pressable
+              onPress={() => router.push(`/list/${st}`)}
+              style={({ pressed }) => [s.archiveRow, pressed && { backgroundColor: C.surface2 }]}
+            >
+              <Text style={s.archiveText}>{st === "done" ? "Done" : "Trash"}</Text>
+              <Icon name="chevron" size={16} color={C.muted} />
+            </Pressable>
+          </View>
+        ))}
+      </Card>
       {/* CI stamps versionName from the release tag — confirms which build Obtainium installed. */}
       <Text style={s.version}>GTD v{Application.nativeApplicationVersion ?? "dev"}</Text>
     </ScrollView>
@@ -54,5 +73,13 @@ export default function Settings() {
 const s = StyleSheet.create({
   content: { padding: space.lg },
   error: { ...type.meta, color: C.danger, marginTop: space.xs },
+  archiveRow: {
+    flexDirection: "row",
+    alignItems: "center",
+    justifyContent: "space-between",
+    paddingHorizontal: space.lg,
+    paddingVertical: space.md + 2,
+  },
+  archiveText: { ...type.body, color: C.text },
   version: { ...type.meta, color: C.muted, textAlign: "center", marginTop: space.xxl },
 });

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

@@ -5,6 +5,7 @@ import TaskForm, { CAPTURE_BOXES, type TaskDraft } from "../../components/TaskFo
 import { Button, Empty } from "../../components/ui";
 import { haptic } from "../../lib/haptics";
 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 { Task, TaskStatus } from "../../lib/types";
@@ -24,6 +25,7 @@ const toDraft = (t: Task): TaskDraft => ({
   estimate_min: t.estimate_min,
   repeat: t.repeat,
   priority: t.priority,
+  area: t.area ?? "personal",
 });
 
 export default function TaskDetail() {
@@ -37,8 +39,13 @@ export default function TaskDetail() {
   if (!original || !draft) return <Empty>Task not found.</Empty>;
 
   const save = () => {
-    updateTask(original.id, { ...draft, priority: draft.priority ?? 3 });
-    haptic.success();
+    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();
   };
 

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/DateField.tsx

@@ -1,5 +1,6 @@
-// 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";
@@ -100,11 +101,14 @@ export default function DateField({
   value,
   onChange,
   clearable,
+  someday,
 }: {
   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();
@@ -134,6 +138,16 @@ export default function DateField({
             }}
           />
         ))}
+        {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}

app/src/components/Icon.tsx

@@ -13,11 +13,12 @@ export type IconName =
   | "waiting"
   | "someday"
   | "projects"
-  | "review"
+  | "grid"
   | "settings"
   | "flag"
   | "repeat"
   | "tag"
+  | "area"
   | "plus"
   | "close"
   | "chevron";
@@ -169,37 +170,18 @@ export default function Icon({ name, size = 22, color = C.textSecondary, bg = C.
         </View>
       );
 
-    case "review":
+    case "grid":
+      // Four squares — the Lists board's own shape.
       return (
         <View style={[box, s.center]}>
-          {/* an open ring plus an arrowhead reads as "cycle" without an SVG path */}
+          <View style={{ width: size * 0.8, height: size * 0.8, flexDirection: "row", flexWrap: "wrap", gap: size * 0.1 }}>
+            {[0, 1, 2, 3].map((i) => (
               <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" }],
-            }}
+                key={i}
+                style={{ width: size * 0.35, height: size * 0.35, borderWidth: w, borderColor: color, borderRadius: 3 }}
               />
+            ))}
+          </View>
         </View>
       );
 
@@ -281,6 +263,38 @@ export default function Icon({ name, size = 22, color = C.textSecondary, bg = C.
         </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]}>

app/src/components/TabBar.tsx

@@ -0,0 +1,70 @@
+// The three-tab bar under every top-level screen: Next up, Today, Lists.
+//
+// Three is the number a thumb can hit without looking. The old launcher had
+// six buttons and a second row of alerts; everything that was there is still
+// reachable, but through the Lists board or the header, so the bar only
+// carries the places you go many times a day.
+import type { BottomTabBarProps } from "expo-router/js-tabs";
+import { Pressable, StyleSheet, Text, View } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { haptic } from "../lib/haptics";
+import { C, space } from "../lib/theme";
+import { useStore } from "../lib/useStore";
+import { AREA_TONE } from "./AreaToggle";
+import Icon, { type IconName } from "./Icon";
+
+const TABS: Record<string, { icon: IconName; label: string }> = {
+  index: { icon: "next", label: "Next up" },
+  today: { icon: "today", label: "Today" },
+  lists: { icon: "grid", label: "Lists" },
+};
+
+const ICON = 22;
+const LABEL = 14;
+/** Bar height above the safe-area inset — the FAB sits this far up plus a gutter. */
+export const TAB_BAR_CONTENT_HEIGHT = space.md + ICON + 5 + LABEL;
+export const tabBarInset = (bottom: number) => Math.max(bottom, space.md);
+
+export default function TabBar({ state, navigation }: BottomTabBarProps) {
+  const insets = useSafeAreaInsets();
+  // The active tab takes the lens colour, so Work mode reads as Work all the
+  // way down the screen, not just in the header pill.
+  const tone = AREA_TONE[useStore().area];
+  return (
+    <View style={[s.bar, { paddingBottom: tabBarInset(insets.bottom) }]}>
+      {state.routes.map((route, i) => {
+        const focused = state.index === i;
+        const tab = TABS[route.name] ?? { icon: "next" as IconName, label: route.name };
+        return (
+          <Pressable
+            key={route.key}
+            accessibilityRole="tab"
+            accessibilityState={{ selected: focused }}
+            style={({ pressed }) => [s.tab, pressed && { opacity: 0.5 }]}
+            onPress={() => {
+              const e = navigation.emit({ type: "tabPress", target: route.key, canPreventDefault: true });
+              if (focused || e.defaultPrevented) return;
+              haptic.tap();
+              navigation.navigate(route.name);
+            }}
+          >
+            <Icon name={tab.icon} size={ICON} color={focused ? tone : C.textSecondary} bg={C.surface} />
+            <Text style={[s.label, focused && { color: tone, fontWeight: "600" }]}>{tab.label}</Text>
+          </Pressable>
+        );
+      })}
+    </View>
+  );
+}
+
+const s = StyleSheet.create({
+  bar: {
+    flexDirection: "row",
+    backgroundColor: C.surface,
+    borderTopWidth: StyleSheet.hairlineWidth,
+    borderTopColor: C.border,
+    paddingTop: space.md,
+  },
+  tab: { flex: 1, alignItems: "center", gap: 5 },
+  label: { fontSize: 11, lineHeight: LABEL, color: C.textSecondary, letterSpacing: 0.1 },
+});

app/src/components/TaskForm.tsx

@@ -15,15 +15,16 @@ 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 { activeProjects, knownContexts } from "../lib/store";
+import { getState, knownContexts } from "../lib/store";
 import { C, radius, space, type } from "../lib/theme";
 import { useStore } from "../lib/useStore";
-import type { Task, TaskStatus } from "../lib/types";
+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"
+  "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> = {
@@ -48,6 +49,8 @@ export const emptyDraft = (): TaskDraft => ({
   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({
@@ -71,7 +74,12 @@ export default function TaskForm({
   const store = useStore();
   // Keep a project that has since been archived visible, or editing an old task
   // would silently drop it.
-  const projects = activeProjects(store).filter((p) => p.status === "active" || p.id === d.project_id);
+  // 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;
 
@@ -81,7 +89,20 @@ export default function TaskForm({
       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 />,
+      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 }),
     },
     {
@@ -172,6 +193,32 @@ export default function TaskForm({
     },
   ];
 
+  // 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",

app/src/components/TaskListScreen.tsx

@@ -1,6 +1,7 @@
 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, radius, shadow, space, type } from "../lib/theme";
@@ -38,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
@@ -81,18 +118,7 @@ export default function TaskListScreen({
           />
         }
         ListEmptyComponent={<Text style={s.empty}>{emptyHint}</Text>}
-        ListFooterComponent={
-          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
-        }
+        ListFooterComponent={deferredFooter}
         contentContainerStyle={s.content}
       />
     </View>

app/src/components/TaskRow.tsx

@@ -6,6 +6,7 @@ import { haptic } from "../lib/haptics";
 import { formatEstimate, PRIORITY_COLOR } from "../lib/priority";
 import { updateTask } from "../lib/store";
 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,6 +22,8 @@ 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";
@@ -41,16 +45,18 @@ export default function TaskRow({
   const flag = PRIORITY_COLOR[task.priority];
 
   const toggle = () => {
-    const next = task.status !== "done";
-    if (next) haptic.success();
-    else haptic.tap();
-    updateTask(task.id, { status: next ? "done" : uncheckTo });
+    if (!done) {
+      completeWithUndo(task);
+      return;
+    }
+    haptic.tap();
+    updateTask(task.id, { status: uncheckTo });
   };
 
   return (
     <Animated.View entering={FadeIn.duration(150)}>
       <Pressable
-        style={({ pressed }) => [s.row, pressed && s.rowPressed]}
+        style={({ pressed }) => [s.row, emphasized && s.rowEmphasized, pressed && s.rowPressed]}
         onPress={() => router.push(`/task/${task.id}`)}
         onLongPress={onLongPress}
         delayLongPress={200}
@@ -59,14 +65,20 @@ export default function TaskRow({
             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, { borderColor: done ? C.done : flag }, done && s.checkboxDone]}
+          style={[
+            s.checkbox,
+            emphasized && s.checkboxEmphasized,
+            { borderColor: done ? C.done : flag },
+            done && s.checkboxDone,
+          ]}
           hitSlop={10}
           onPress={toggle}
         >
           {done && <Text style={s.check}>✓</Text>}
         </Pressable>
         <View style={{ flex: 1 }}>
-          <Text style={[s.title, done && s.titleDone]} 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 && (
@@ -92,6 +104,10 @@ const s = StyleSheet.create({
     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,

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, type ViewStyle } 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={handleStyle}>
+                  <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",
+  },
+  handleGlyph: { color: C.muted, fontSize: 15, paddingHorizontal: space.sm },
+});
+
+// Pointer affordances react-native-web honours but RN's ViewStyle doesn't
+// type ("grab" is not a CursorValue) — cast once, here, instead of per use.
+const handleStyle = { ...s.handle, cursor: "grab", touchAction: "none", userSelect: "none" } as unknown as ViewStyle;

app/src/components/ui.tsx

@@ -5,7 +5,7 @@ import { C, radius, shadow, space, type } from "../lib/theme";
  * 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 }) {
+export function Screen({ children, style }: { children: React.ReactNode; style?: StyleProp<ViewStyle> }) {
   return <View style={[u.screen, style]}>{children}</View>;
 }
 
@@ -32,7 +32,7 @@ export function SectionHeader({ children, tone }: { children: React.ReactNode; t
  * 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 }) {
+export function Card({ children, style }: { children: React.ReactNode; style?: StyleProp<ViewStyle> }) {
   return <View style={[u.card, style]}>{children}</View>;
 }
 

app/src/lib/review.ts

@@ -1,29 +0,0 @@
-// Last-completed-review timestamp, local only — the review is a habit, not
-// synced data.
-import AsyncStorage from "@react-native-async-storage/async-storage";
-import { useCallback, useEffect, useState } from "react";
-
-const KEY = "review_last_v1";
-
-export async function getLastReview(): Promise<string | null> {
-  return AsyncStorage.getItem(KEY);
-}
-
-export async function markReviewed(): Promise<void> {
-  await AsyncStorage.setItem(KEY, new Date().toISOString());
-}
-
-export function daysSince(iso: string | null): number | null {
-  if (!iso) return null;
-  return Math.floor((Date.now() - new Date(iso).getTime()) / 86_400_000);
-}
-
-/** [lastReviewIso, reload] — call reload on focus to pick up changes. */
-export function useLastReview(): [string | null, () => void] {
-  const [last, setLast] = useState<string | null>(null);
-  const reload = useCallback(() => {
-    void getLastReview().then(setLast);
-  }, []);
-  useEffect(reload, [reload]);
-  return [last, reload];
-}

app/src/lib/store.test.ts

@@ -0,0 +1,126 @@
+// 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 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.todayTasks(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,48 +421,8 @@ 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();
 }
-
-// ---- weekly review ----
-
-const STALE_DAYS = 14;
-const WAITING_DAYS = 7;
-
-function olderThanDays(ts: string, days: number): boolean {
-  return Date.now() - new Date(ts).getTime() > days * 86_400_000;
-}
-
-export interface ReviewBuckets {
-  overdue: Task[];
-  staleNext: Task[];
-  agingWaiting: Task[];
-  someday: Task[];
-  deferred: Task[];
-  stuckProjects: Project[];
-}
-
-export function reviewBuckets(s: State): ReviewBuckets {
-  const today = todayIso();
-  const open = 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"]);
-  return {
-    overdue,
-    staleNext: open
-      .filter((t) => t.status === "next" && !overdueIds.has(t.id) && olderThanDays(t.updated_at, STALE_DAYS))
-      .sort(byPriorityDue),
-    agingWaiting: open
-      .filter((t) => t.status === "waiting" && olderThanDays(t.updated_at, WAITING_DAYS))
-      .sort((a, b) => a.updated_at.localeCompare(b.updated_at)),
-    someday: tasksByStatus(s, "someday"),
-    deferred: open.filter((t) => isDeferred(t.defer_date, today)).sort((a, b) => a.defer_date!.localeCompare(b.defer_date!)),
-    stuckProjects: activeProjects(s).filter(
-      (p) => p.status === "active" && !s.tasks.some((t) => t.project_id === p.id && actionable.has(t.status)),
-    ),
-  };
-}

app/src/lib/theme.ts

@@ -27,6 +27,8 @@ const light = {
   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",
@@ -45,6 +47,7 @@ const dark = {
   muted: "#7A7A85",
   accent: "#4C86F0",
   accentSoft: "#1B2740",
+  work: "#2DD4BF",
   done: "#3FBF84",
   danger: "#F0605F",
   warn: "#E0A93E",

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/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);