diff --git a/.github/workflows/electron-build.yml b/.github/workflows/electron-build.yml
index 787e28e6..6566f105 100644
--- a/.github/workflows/electron-build.yml
+++ b/.github/workflows/electron-build.yml
@@ -16,14 +16,14 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/action-setup@v4
         with:
-          version: 10
+          version: 9
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 24.15.0
+          node-version: 24
           cache: 'pnpm'
           cache-dependency-path: 'apps/x/pnpm-lock.yaml'
 
@@ -39,17 +39,17 @@ jobs:
           node -e "
             const fs = require('fs');
             const version = '${{ steps.version.outputs.version }}';
-
+            
             // Update apps/x/package.json
             const rootPackage = JSON.parse(fs.readFileSync('apps/x/package.json', 'utf8'));
             rootPackage.version = version;
             fs.writeFileSync('apps/x/package.json', JSON.stringify(rootPackage, null, 2) + '\n');
-
+            
             // Update apps/x/apps/main/package.json
             const mainPackage = JSON.parse(fs.readFileSync('apps/x/apps/main/package.json', 'utf8'));
             mainPackage.version = version;
             fs.writeFileSync('apps/x/apps/main/package.json', JSON.stringify(mainPackage, null, 2) + '\n');
-
+            
             console.log('Updated version to:', version);
           "
 
@@ -61,25 +61,25 @@ jobs:
           # Create a temporary keychain
           KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
           KEYCHAIN_PASSWORD=$(openssl rand -base64 32)
-
+          
           # Create keychain
           security create-keychain -p "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
           security set-keychain-settings -lut 21600 "$KEYCHAIN_PATH"
           security unlock-keychain -p "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
-
+          
           # Decode and import certificate
           echo "$APPLE_CERTIFICATE" | base64 --decode > $RUNNER_TEMP/certificate.p12
           security import $RUNNER_TEMP/certificate.p12 -P "$APPLE_CERTIFICATE_PASSWORD" -A -t cert -f pkcs12 -k "$KEYCHAIN_PATH"
-
+          
           # Allow codesign to access the keychain
           security set-key-partition-list -S apple-tool:,apple: -s -k "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
-
+          
           # Add keychain to search list
           security list-keychains -d user -s "$KEYCHAIN_PATH" login.keychain
-
+          
           # Verify certificate was imported
           security find-identity -v "$KEYCHAIN_PATH"
-
+          
           # Clean up certificate file
           rm -f $RUNNER_TEMP/certificate.p12
 
@@ -111,7 +111,6 @@ jobs:
         with:
           name: distributables
           path: apps/x/apps/main/out/make/*
-          if-no-files-found: error
           retention-days: 30
 
   build-linux:
@@ -122,14 +121,14 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/action-setup@v4
         with:
-          version: 10
+          version: 9
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 24.15.0
+          node-version: 24
           cache: 'pnpm'
           cache-dependency-path: 'apps/x/pnpm-lock.yaml'
 
@@ -145,17 +144,17 @@ jobs:
           node -e "
             const fs = require('fs');
             const version = '${{ steps.version.outputs.version }}';
-
+            
             // Update apps/x/package.json
             const rootPackage = JSON.parse(fs.readFileSync('apps/x/package.json', 'utf8'));
             rootPackage.version = version;
             fs.writeFileSync('apps/x/package.json', JSON.stringify(rootPackage, null, 2) + '\n');
-
+            
             // Update apps/x/apps/main/package.json
             const mainPackage = JSON.parse(fs.readFileSync('apps/x/apps/main/package.json', 'utf8'));
             mainPackage.version = version;
             fs.writeFileSync('apps/x/apps/main/package.json', JSON.stringify(mainPackage, null, 2) + '\n');
-
+            
             console.log('Updated version to:', version);
           "
 
@@ -176,7 +175,6 @@ jobs:
         with:
           name: distributables-linux
           path: apps/x/apps/main/out/make/*
-          if-no-files-found: error
           retention-days: 30
 
   build-windows:
@@ -187,14 +185,14 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/action-setup@v4
         with:
-          version: 10
+          version: 9
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 24.15.0
+          node-version: 24
           cache: 'pnpm'
           cache-dependency-path: 'apps/x/pnpm-lock.yaml'
 
@@ -212,17 +210,17 @@ jobs:
           node -e "
             const fs = require('fs');
             const version = '${{ steps.version.outputs.version }}';
-
+            
             // Update apps/x/package.json
             const rootPackage = JSON.parse(fs.readFileSync('apps/x/package.json', 'utf8'));
             rootPackage.version = version;
             fs.writeFileSync('apps/x/package.json', JSON.stringify(rootPackage, null, 2) + '\n');
-
+            
             // Update apps/x/apps/main/package.json
             const mainPackage = JSON.parse(fs.readFileSync('apps/x/apps/main/package.json', 'utf8'));
             mainPackage.version = version;
             fs.writeFileSync('apps/x/apps/main/package.json', JSON.stringify(mainPackage, null, 2) + '\n');
-
+            
             console.log('Updated version to:', version);
           "
 
@@ -243,5 +241,4 @@ jobs:
         with:
           name: distributables-windows
           path: apps/x/apps/main/out/make/*
-          if-no-files-found: error
           retention-days: 30
diff --git a/apps/x/ANALYTICS.md b/apps/x/ANALYTICS.md
index 2d9816d0..572e9a6f 100644
--- a/apps/x/ANALYTICS.md
+++ b/apps/x/ANALYTICS.md
@@ -16,8 +16,6 @@
 
 ## Event catalog
 
-All PostHog events include `app_version` automatically. Main-process events add it in `packages/core/src/analytics/posthog.ts`; renderer events get it from the `analytics:bootstrap` IPC payload and an initialization-time `before_send` hook.
-
 ### `llm_usage`
 
 Emitted whenever ai-sdk returns token usage (one event per LLM call, not per run).
@@ -103,7 +101,6 @@ Persistent across sessions for the same user. Set via `posthog.people.set` or as
 | `email` | main on identify | From `/v1/me`; powers PostHog cohort match + integrations |
 | `plan`, `status` | main on identify | Subscription state |
 | `api_url` | both processes (init + identify) | Distinguishes prod / staging / custom — assign meaning in PostHog dashboard. `https://api.x.rowboatlabs.com` = production |
-| `app_version` | both processes (init + identify) | Electron app version; also included automatically on every event |
 | `signed_in` | renderer | `true` while rowboat OAuth is connected |
 | `{provider}_connected` | renderer | One of `gmail`, `calendar`, `slack`, `rowboat` |
 | `total_notes` | renderer (init) | Workspace size signal |
diff --git a/apps/x/LIVE_NOTE.md b/apps/x/LIVE_NOTE.md
index d8a157d7..2fc43786 100644
--- a/apps/x/LIVE_NOTE.md
+++ b/apps/x/LIVE_NOTE.md
@@ -70,7 +70,7 @@ The `once` trigger from the prior model has been **dropped** — it didn't fit t
 Two paths, both producing identical on-disk YAML:
 
 1. **Hand-written** — type the `live:` block directly into the note's frontmatter. The scheduler picks it up on its next 15-second tick.
-2. **Sidebar chat** — mention a note (or have it attached) and ask Copilot for something dynamic. Copilot is tuned to recognize a wide range of phrasings beyond "live" or "track" (see "Prompts Catalog → Copilot trigger paragraph"); it loads the `live-note` skill, edits the frontmatter via `file-editText`, then **runs the agent once by default** so the user immediately sees content. The auto-run is skipped only when the user explicitly says not to run yet.
+2. **Sidebar chat** — mention a note (or have it attached) and ask Copilot for something dynamic. Copilot is tuned to recognize a wide range of phrasings beyond "live" or "track" (see "Prompts Catalog → Copilot trigger paragraph"); it loads the `live-note` skill, edits the frontmatter via `workspace-edit`, then **runs the agent once by default** so the user immediately sees content. The auto-run is skipped only when the user explicitly says not to run yet.
 
 When the note is **already live** and the user asks to track something new, Copilot extends the existing `live.objective` in natural-language prose. It does not create a second `live:` block.
 
@@ -92,8 +92,8 @@ When a trigger fires, the live-note agent receives a short message:
 - For event runs only: the matching `eventMatchCriteria` text and the event payload, with a Pass-2 decision directive ("only edit if the event genuinely warrants it").
 
 The agent's system prompt tells it to:
-1. Call `file-readText` to read the current note (the body may be long; no body snapshot is passed in the message — fetch fresh).
-2. Make small, **patch-style** edits with `file-editText` — change one region, re-read, change the next region — rather than one-shot rewrites.
+1. Call `workspace-readFile` to read the current note (the body may be long; no body snapshot is passed in the message — fetch fresh).
+2. Make small, **patch-style** edits with `workspace-edit` — change one region, re-read, change the next region — rather than one-shot rewrites.
 3. Follow default body structure unless the objective overrides: H1 stays the title; a 1-3 sentence rolling summary at the top; H2 sub-topic sections below, freshest first.
 4. Never modify YAML frontmatter — that's owned by the user and the runtime.
 5. End with a 1-2 sentence summary stored as `lastRunSummary`.
@@ -115,7 +115,7 @@ Backend (main process)
   ├─ Event processor (5 s)  ──┼──► runLiveNoteAgent() ──► live-note-agent
   └─ Builtin tool             │                                     │
      run-live-note-agent  ────┘                                     ▼
-                                                  file-readText / -edit
+                                                  workspace-readFile / -edit
                                                                     │
                                                                     ▼
                                                   body region(s) rewritten on disk
@@ -175,7 +175,7 @@ Internal trigger enum (`LiveNoteTriggerType`) is `'manual' | 'cron' | 'window' |
 
 `buildMessage` always emits a `**Trigger:**` paragraph in the agent's run message — one paragraph per kind. `manual` and the two timed variants (`cron`, `window`) include any optional `context` as a `**Context:**` block. `event` includes the eventMatchCriteria + payload + Pass 2 decision directive (no `**Context:**`; the payload *is* the context).
 
-This lets the user-authored objective branch on trigger kind when warranted (for example, an email digest can scan `gmail_sync/` from scratch on cron/window runs, while event runs integrate just the new thread). The skill teaches the pattern under "Per-trigger guidance (advanced)".
+This lets the user-authored objective branch on trigger kind when warranted (the canonical example is the Today.md emails section: cron/window scans `gmail_sync/` from scratch, event integrates the new thread). The skill teaches the pattern under "Per-trigger guidance (advanced)".
 
 ### Run flow (`runLiveNoteAgent`)
 
@@ -249,20 +249,22 @@ The contract (defined in the run-agent system prompt — `packages/core/src/know
   - Then content organized by sub-topic under H2 headings, freshest/most-important first.
   - Tightness over decoration.
 - **Override** — if the objective specifies a different layout (e.g. "show the top 5 stories at the top, with a one-paragraph summary above them"), follow that exactly.
-- **Patch-style updates** — make small, incremental `file-editText` calls (read → edit one region → re-read → next), not one-shot whole-body rewrites. This preserves user-added content the agent didn't account for and keeps diffs reviewable.
+- **Patch-style updates** — make small, incremental `workspace-edit` calls (read → edit one region → re-read → next), not one-shot whole-body rewrites. This preserves user-added content the agent didn't account for and keeps diffs reviewable.
 - **Boundaries**: never modify the frontmatter; the agent is the sole writer of the body below the H1.
 
 ---
 
-## Default Note Policy
+## Daily-Note Template & Migrations
 
-Rowboat no longer creates a default `Today.md` live dashboard for new users. Live notes are user-created notes with an explicit `live:` frontmatter block.
+`Today.md` is the canonical demo of what a live note can do. It ships with one objective covering an Overview / Calendar / Emails / What you missed / Priorities layout — driven by three windows and an event-match criterion for in-day signals.
 
-**Deprecated Today.md migration** — `packages/core/src/knowledge/deprecate_today_note.ts` runs once per workspace on app start:
+**Versioning** — `packages/core/src/knowledge/ensure_daily_note.ts` carries a `CANONICAL_DAILY_NOTE_VERSION` constant and a `templateVersion` scalar in the frontmatter. On app start, `ensureDailyNote()`:
 
-- File missing → mark processed and do nothing.
-- File present → set `live.active: false` if a `live:` block exists, prepend a user-facing deprecation notice once, and preserve the note body.
-- Future launches → no-op via `config/today-note-deprecation.json`, so a user who re-enables the note is not paused again.
+- File missing → fresh write at canonical version.
+- File at-or-above canonical → no-op.
+- File below canonical → rename existing to `Today.md.bkp.<ISO-stamp>` (which doesn't end in `.md`, so the scheduler/event router skip it), then write the canonical template body-from-scratch (live notes regenerate their own body).
+
+The bump from v1 (the old `track:` array model) to v2 (the live-note rewrite) is handled by this same path. Pre-v2 notes get backed up and replaced.
 
 ---
 
@@ -316,7 +318,7 @@ Every LLM-facing prompt in the feature, with file pointers. After any edit: `cd
 - **Purpose**: the user message seeded into each agent run.
 - **File**: `packages/core/src/knowledge/live-note/runner.ts` (`buildMessage`).
 - **Inputs**: `filePath` (presented as `knowledge/${filePath}` in the message), `live.objective`, `live.triggers?.eventMatchCriteria` (only on event runs), `trigger`, optional `context`, plus `localNow` / `tz`.
-- **Behavior**: tells the agent to call `file-readText` itself (no body snapshot included, since the body can be long and may have been edited by a concurrent run) and to make patch-style edits.
+- **Behavior**: tells the agent to call `workspace-readFile` itself (no body snapshot included, since the body can be long and may have been edited by a concurrent run) and to make patch-style edits.
 
 Three branches by `trigger`:
 - **`manual`** — base message. If `context` is passed, it's appended as a `**Context:**` section. The `run-live-note-agent` tool uses this path for both plain refreshes and context-biased backfills.
@@ -391,7 +393,7 @@ Conventions:
 | Run orchestrator (`runLiveNoteAgent`, `buildMessage`) | `packages/core/src/knowledge/live-note/runner.ts` |
 | Live-note agent definition (`LIVE_NOTE_AGENT_INSTRUCTIONS`, `buildLiveNoteAgent`) | `packages/core/src/knowledge/live-note/agent.ts` |
 | Live-note bus (pub-sub for lifecycle events) | `packages/core/src/knowledge/live-note/bus.ts` |
-| Deprecated Today.md one-time migration | `packages/core/src/knowledge/deprecate_today_note.ts` |
+| Daily-note template + version migration | `packages/core/src/knowledge/ensure_daily_note.ts` |
 | Gmail event producer | `packages/core/src/knowledge/sync_gmail.ts` |
 | Calendar event producer + digest | `packages/core/src/knowledge/sync_calendar.ts` |
 | Copilot skill | `packages/core/src/application/assistant/skills/live-note/skill.ts` |
diff --git a/apps/x/apps/main/bundle.mjs b/apps/x/apps/main/bundle.mjs
index 976e8db3..9ae77e0e 100644
--- a/apps/x/apps/main/bundle.mjs
+++ b/apps/x/apps/main/bundle.mjs
@@ -10,13 +10,11 @@
  */
 
 import * as esbuild from 'esbuild';
-import { readFile } from 'node:fs/promises';
 
 // In CommonJS, import.meta.url doesn't exist. We need to polyfill it.
 // The banner defines __import_meta_url at the top of the bundle,
 // and we use define to replace all import.meta.url references with it.
 const cjsBanner = `var __import_meta_url = require('url').pathToFileURL(__filename).href;`;
-const pkg = JSON.parse(await readFile(new URL('./package.json', import.meta.url), 'utf8'));
 
 await esbuild.build({
   entryPoints: ['./dist/main.js'],
@@ -38,7 +36,6 @@ await esbuild.build({
     // Empty strings disable analytics gracefully.
     'process.env.POSTHOG_KEY': JSON.stringify(process.env.VITE_PUBLIC_POSTHOG_KEY ?? ''),
     'process.env.POSTHOG_HOST': JSON.stringify(process.env.VITE_PUBLIC_POSTHOG_HOST ?? 'https://us.i.posthog.com'),
-    'process.env.ROWBOAT_APP_VERSION': JSON.stringify(pkg.version ?? ''),
   },
 });
 
diff --git a/apps/x/apps/main/forge.config.cjs b/apps/x/apps/main/forge.config.cjs
index 7806f6cd..ad639a86 100644
--- a/apps/x/apps/main/forge.config.cjs
+++ b/apps/x/apps/main/forge.config.cjs
@@ -56,7 +56,6 @@ module.exports = {
                 description: 'AI coworker with memory',
                 name: `Rowboat-win32-${arch}`,
                 setupExe: `Rowboat-win32-${arch}-${pkg.version}-setup.exe`,
-                setupIcon: path.join(__dirname, 'icons/icon.ico'),
             })
         },
         {
@@ -67,9 +66,7 @@ module.exports = {
                     bin: "rowboat",
                     description: 'AI coworker with memory',
                     maintainer: 'rowboatlabs',
-                    homepage: 'https://rowboatlabs.com',
-                    icon: path.join(__dirname, 'icons/icon.png'),
-                    mimeType: ['x-scheme-handler/rowboat'],
+                    homepage: 'https://rowboatlabs.com'
                 }
             })
         },
@@ -80,9 +77,7 @@ module.exports = {
                     name: `Rowboat-linux`,
                     bin: "rowboat",
                     description: 'AI coworker with memory',
-                    homepage: 'https://rowboatlabs.com',
-                    icon: path.join(__dirname, 'icons/icon.png'),
-                    mimeType: ['x-scheme-handler/rowboat'],
+                    homepage: 'https://rowboatlabs.com'
                 }
             }
         },
diff --git a/apps/x/apps/main/icons/icon.ico b/apps/x/apps/main/icons/icon.ico
deleted file mode 100644
index 0e5ac870..00000000
Binary files a/apps/x/apps/main/icons/icon.ico and /dev/null differ
diff --git a/apps/x/apps/main/package.json b/apps/x/apps/main/package.json
index 3330c3c0..74cb1598 100644
--- a/apps/x/apps/main/package.json
+++ b/apps/x/apps/main/package.json
@@ -13,8 +13,6 @@
         "make": "electron-forge make"
     },
     "dependencies": {
-        "@agentclientprotocol/claude-agent-acp": "^0.39.0",
-        "@agentclientprotocol/codex-acp": "^0.0.44",
         "@x/core": "workspace:*",
         "@x/shared": "workspace:*",
         "chokidar": "^4.0.3",
diff --git a/apps/x/apps/main/src/auth-server.ts b/apps/x/apps/main/src/auth-server.ts
index 5c46ca3f..ad184451 100644
--- a/apps/x/apps/main/src/auth-server.ts
+++ b/apps/x/apps/main/src/auth-server.ts
@@ -2,8 +2,7 @@ import { createServer, Server } from 'http';
 import { URL } from 'url';
 
 const OAUTH_CALLBACK_PATH = '/oauth/callback';
-export const DEFAULT_PORT = 8080;
-export const PORT_RANGE_SIZE = 10;
+const DEFAULT_PORT = 8080;
 
 /** Escape HTML special characters to prevent XSS */
 function escapeHtml(str: string): string {
@@ -20,8 +19,13 @@ export interface AuthServerResult {
   port: number;
 }
 
-function tryBindPort(
-  port: number,
+/**
+ * Create a local HTTP server to handle OAuth callback
+ * Listens on http://localhost:8080/oauth/callback
+ * Passes the full callback URL (including iss, scope, etc.) so openid-client validation succeeds.
+ */
+export function createAuthServer(
+  port: number = DEFAULT_PORT,
   onCallback: (callbackUrl: URL) => void | Promise<void>
 ): Promise<AuthServerResult> {
   return new Promise((resolve, reject) => {
@@ -33,7 +37,7 @@ function tryBindPort(
       }
 
       const url = new URL(req.url, `http://localhost:${port}`);
-
+      
       if (url.pathname === OAUTH_CALLBACK_PATH) {
         const error = url.searchParams.get('error');
 
@@ -92,10 +96,8 @@ function tryBindPort(
     });
 
     server.on('error', (err: NodeJS.ErrnoException) => {
-      server.close();
-      if (err.code === 'EADDRINUSE' || err.code === 'EACCES') {
-        // Signal caller to try next port
-        reject(Object.assign(new Error(err.code), { code: err.code }));
+      if (err.code === 'EADDRINUSE') {
+        reject(new Error(`Port ${port} is already in use`));
       } else {
         reject(err);
       }
@@ -103,51 +105,3 @@ function tryBindPort(
   });
 }
 
-/**
- * Create a local HTTP server to handle OAuth callback.
- *
- * Defaults to fixed-port behaviour: only `port` is tried, and a clear error is
- * thrown if it cannot be bound. This is the right behaviour for any provider
- * whose redirect URI is pre-registered (Google BYOK, Composio, etc.) — those
- * callers must keep using the exact port they've handed to the provider.
- *
- * Opt into `{ fallback: true }` only when the caller is prepared to use the
- * port returned in `AuthServerResult` (i.e. the redirect URI is built from the
- * actual bound port, not hard-coded). With fallback enabled, scans `port`
- * through `port + PORT_RANGE_SIZE - 1` and binds the first available, handling
- * both EADDRINUSE and EACCES (the latter is common on Windows when
- * Hyper-V/WSL2 reserve the port).
- */
-export async function createAuthServer(
-  port: number = DEFAULT_PORT,
-  onCallback: (callbackUrl: URL) => void | Promise<void>,
-  opts: { fallback?: boolean } = {},
-): Promise<AuthServerResult> {
-  const fallback = opts.fallback === true;
-  const limit = fallback ? port + PORT_RANGE_SIZE - 1 : port;
-
-  for (let p = port; p <= limit; p++) {
-    try {
-      return await tryBindPort(p, onCallback);
-    } catch (err) {
-      const code = (err as NodeJS.ErrnoException).code;
-      if (fallback && (code === 'EADDRINUSE' || code === 'EACCES') && p < limit) {
-        console.warn(`[OAuth] Port ${p} unavailable (${code}), trying ${p + 1}…`);
-        continue;
-      }
-      if (!fallback) {
-        const reason = code === 'EACCES' || code === 'EADDRINUSE'
-          ? `Port ${port} is unavailable (${code}). This port must be free for sign-in to work — close any app using it and try again.`
-          : (err instanceof Error ? err.message : String(err));
-        throw new Error(reason);
-      }
-      throw new Error(
-        `No available port found in range ${port}–${limit}. Free a port in that range and try again.`
-      );
-    }
-  }
-
-  // Unreachable — loop always returns or throws — but satisfies TypeScript
-  throw new Error(`No available port found in range ${port}–${limit}.`);
-}
-
diff --git a/apps/x/apps/main/src/ipc.ts b/apps/x/apps/main/src/ipc.ts
index e5d407f8..a667b512 100644
--- a/apps/x/apps/main/src/ipc.ts
+++ b/apps/x/apps/main/src/ipc.ts
@@ -1,4 +1,4 @@
-import { ipcMain, BrowserWindow, shell, dialog, systemPreferences, desktopCapturer, app } from 'electron';
+import { ipcMain, BrowserWindow, shell, dialog, systemPreferences, desktopCapturer } from 'electron';
 import { ipc } from '@x/shared';
 import path from 'node:path';
 import os from 'node:os';
@@ -8,7 +8,6 @@ import {
   listProviders,
 } from './oauth-handler.js';
 import { watcher as watcherCore, workspace } from '@x/core';
-import { WorkDir } from '@x/core/dist/config/config.js';
 import { workspace as workspaceShared } from '@x/shared';
 import * as mcpCore from '@x/core/dist/mcp/mcp.js';
 import * as runsCore from '@x/core/dist/runs/runs.js';
@@ -31,10 +30,6 @@ import { listGatewayModels } from '@x/core/dist/models/gateway.js';
 import type { IModelConfigRepo } from '@x/core/dist/models/repo.js';
 import type { IOAuthRepo } from '@x/core/dist/auth/repo.js';
 import { IGranolaConfigRepo } from '@x/core/dist/knowledge/granola/repo.js';
-import { ICodeModeConfigRepo } from '@x/core/dist/code-mode/repo.js';
-import { CodePermissionRegistry } from '@x/core/dist/code-mode/acp/permission-registry.js';
-import { checkCodeModeAgentStatus } from '@x/core/dist/code-mode/status.js';
-import { invalidateCopilotInstructionsCache } from '@x/core/dist/application/assistant/instructions.js';
 import { triggerSync as triggerGranolaSync } from '@x/core/dist/knowledge/granola/sync.js';
 import { ISlackConfigRepo } from '@x/core/dist/slack/repo.js';
 import { isOnboardingComplete, markOnboardingComplete } from '@x/core/dist/config/note_creation_config.js';
@@ -52,7 +47,6 @@ import { summarizeMeeting } from '@x/core/dist/knowledge/summarize_meeting.js';
 import { getAccessToken } from '@x/core/dist/auth/tokens.js';
 import { getRowboatConfig } from '@x/core/dist/config/rowboat.js';
 import { runLiveNoteAgent } from '@x/core/dist/knowledge/live-note/runner.js';
-import { listImportantThreads, listEverythingElseThreads, saveMessageBodyHeight, triggerSync as triggerGmailSync, sendThreadReply, archiveThread, trashThread, markThreadRead, getAccountEmail, getConnectionStatus as getGmailConnectionStatus } from '@x/core/dist/knowledge/sync_gmail.js';
 import { liveNoteBus } from '@x/core/dist/knowledge/live-note/bus.js';
 import { getInstallationId } from '@x/core/dist/analytics/installation.js';
 import { API_URL } from '@x/core/dist/config/env.js';
@@ -63,16 +57,6 @@ import {
   deleteLiveNote,
   listLiveNotes,
 } from '@x/core/dist/knowledge/live-note/fileops.js';
-import { runBackgroundTask } from '@x/core/dist/background-tasks/runner.js';
-import { backgroundTaskBus } from '@x/core/dist/background-tasks/bus.js';
-import {
-  fetchTask,
-  patchTask,
-  createTask,
-  deleteTask,
-  listTasks,
-  readRunIds as readTaskRunIds,
-} from '@x/core/dist/background-tasks/fileops.js';
 import { browserIpcHandlers } from './browser/ipc.js';
 
 /**
@@ -405,19 +389,6 @@ export function startLiveNoteAgentWatcher(): void {
   });
 }
 
-let backgroundTaskAgentWatcher: (() => void) | null = null;
-export function startBackgroundTaskAgentWatcher(): void {
-  if (backgroundTaskAgentWatcher) return;
-  backgroundTaskAgentWatcher = backgroundTaskBus.subscribe((event) => {
-    const windows = BrowserWindow.getAllWindows();
-    for (const win of windows) {
-      if (!win.isDestroyed() && win.webContents) {
-        win.webContents.send('bg-task-agent:events', event);
-      }
-    }
-  });
-}
-
 export function stopRunsWatcher(): void {
   if (runsWatcher) {
     runsWatcher();
@@ -456,7 +427,6 @@ export function setupIpcHandlers() {
       return {
         installationId: getInstallationId(),
         apiUrl: API_URL,
-        appVersion: app.getVersion(),
       };
     },
     'workspace:getRoot': async () => {
@@ -489,38 +459,6 @@ export function setupIpcHandlers() {
     'workspace:remove': async (_event, args) => {
       return workspace.remove(args.path, args.opts);
     },
-    'gmail:getImportant': async (_event, args) => {
-      return listImportantThreads({ cursor: args.cursor, limit: args.limit });
-    },
-    'gmail:getEverythingElse': async (_event, args) => {
-      return listEverythingElseThreads({ cursor: args.cursor, limit: args.limit });
-    },
-    'gmail:triggerSync': async () => {
-      triggerGmailSync();
-      return {};
-    },
-    'gmail:sendReply': async (_event, args) => {
-      return sendThreadReply(args);
-    },
-    'gmail:getConnectionStatus': async () => {
-      return getGmailConnectionStatus();
-    },
-    'gmail:getAccountEmail': async () => {
-      return { email: await getAccountEmail() };
-    },
-    'gmail:archiveThread': async (_event, args) => {
-      return archiveThread(args.threadId);
-    },
-    'gmail:trashThread': async (_event, args) => {
-      return trashThread(args.threadId);
-    },
-    'gmail:markThreadRead': async (_event, args) => {
-      return markThreadRead(args.threadId);
-    },
-    'gmail:saveMessageHeight': async (_event, args) => {
-      saveMessageBodyHeight(args.threadId, args.messageId, args.height);
-      return {};
-    },
     'mcp:listTools': async (_event, args) => {
       return mcpCore.listTools(args.serverName, args.cursor);
     },
@@ -531,17 +469,12 @@ export function setupIpcHandlers() {
       return runsCore.createRun(args);
     },
     'runs:createMessage': async (_event, args) => {
-      return { messageId: await runsCore.createMessage(args.runId, args.message, args.voiceInput, args.voiceOutput, args.searchEnabled, args.middlePaneContext, args.codeMode) };
+      return { messageId: await runsCore.createMessage(args.runId, args.message, args.voiceInput, args.voiceOutput, args.searchEnabled, args.middlePaneContext) };
     },
     'runs:authorizePermission': async (_event, args) => {
       await runsCore.authorizePermission(args.runId, args.authorization);
       return { success: true };
     },
-    'codeRun:resolvePermission': async (_event, args) => {
-      const registry = container.resolve<CodePermissionRegistry>('codePermissionRegistry');
-      registry.resolve(args.requestId, args.decision);
-      return { success: true };
-    },
     'runs:provideHumanInput': async (_event, args) => {
       await runsCore.replyToHumanInputRequest(args.runId, args.reply);
       return { success: true };
@@ -560,35 +493,6 @@ export function setupIpcHandlers() {
       await runsCore.deleteRun(args.runId);
       return { success: true };
     },
-    'runs:downloadLog': async (event, args) => {
-      const runFileName = `${args.runId}.jsonl`;
-      if (path.basename(runFileName) !== runFileName) {
-        return { success: false, error: 'Invalid run id' };
-      }
-
-      const sourcePath = path.join(WorkDir, 'runs', runFileName);
-      const win = BrowserWindow.fromWebContents(event.sender);
-      const result = await dialog.showSaveDialog(win!, {
-        defaultPath: `${runFileName}.log`,
-        filters: [
-          { name: 'Chat Log', extensions: ['log'] },
-          { name: 'JSONL', extensions: ['jsonl'] },
-          { name: 'All Files', extensions: ['*'] },
-        ],
-      });
-
-      if (result.canceled || !result.filePath) {
-        return { success: false };
-      }
-
-      try {
-        await fs.copyFile(sourcePath, result.filePath);
-        return { success: true };
-      } catch (err) {
-        const message = err instanceof Error ? err.message : 'Failed to download chat log';
-        return { success: false, error: message };
-      }
-    },
     'models:list': async () => {
       if (await isSignedIn()) {
         return await listGatewayModels();
@@ -640,20 +544,6 @@ export function setupIpcHandlers() {
       const config = await repo.getConfig();
       return { enabled: config.enabled };
     },
-    'codeMode:getConfig': async () => {
-      const repo = container.resolve<ICodeModeConfigRepo>('codeModeConfigRepo');
-      const config = await repo.getConfig();
-      return { enabled: config.enabled, approvalPolicy: config.approvalPolicy };
-    },
-    'codeMode:setConfig': async (_event, args) => {
-      const repo = container.resolve<ICodeModeConfigRepo>('codeModeConfigRepo');
-      await repo.setConfig({ enabled: args.enabled, approvalPolicy: args.approvalPolicy });
-      invalidateCopilotInstructionsCache();
-      return { success: true };
-    },
-    'codeMode:checkAgentStatus': async () => {
-      return await checkCodeModeAgentStatus();
-    },
     'granola:setConfig': async (_event, args) => {
       const repo = container.resolve<IGranolaConfigRepo>('granolaConfigRepo');
       await repo.setConfig({ enabled: args.enabled });
@@ -766,11 +656,6 @@ export function setupIpcHandlers() {
       const error = await shell.openPath(filePath);
       return { error: error || undefined };
     },
-    'shell:showItemInFolder': async (_event, args) => {
-      const filePath = resolveShellPath(args.path);
-      shell.showItemInFolder(filePath);
-      return { success: true };
-    },
     'shell:readFileBase64': async (_event, args) => {
       const filePath = resolveShellPath(args.path);
       const stat = await fs.stat(filePath);
@@ -981,73 +866,6 @@ export function setupIpcHandlers() {
       const notes = await listLiveNotes();
       return { notes };
     },
-    // Bg-task handlers
-    'bg-task:run': async (_event, args) => {
-      const result = await runBackgroundTask(args.slug, 'manual', args.context);
-      return {
-        success: !result.error,
-        runId: result.runId,
-        summary: result.summary,
-        error: result.error,
-      };
-    },
-    'bg-task:get': async (_event, args) => {
-      try {
-        const task = await fetchTask(args.slug);
-        return { success: true, task };
-      } catch (err) {
-        return { success: false, error: err instanceof Error ? err.message : String(err) };
-      }
-    },
-    'bg-task:patch': async (_event, args) => {
-      try {
-        const task = await patchTask(args.slug, args.partial);
-        return { success: true, task };
-      } catch (err) {
-        return { success: false, error: err instanceof Error ? err.message : String(err) };
-      }
-    },
-    'bg-task:create': async (_event, args) => {
-      try {
-        const { slug } = await createTask({
-          name: args.name,
-          instructions: args.instructions,
-          ...(args.triggers ? { triggers: args.triggers } : {}),
-          ...(args.model ? { model: args.model } : {}),
-          ...(args.provider ? { provider: args.provider } : {}),
-        });
-        return { success: true, slug };
-      } catch (err) {
-        return { success: false, error: err instanceof Error ? err.message : String(err) };
-      }
-    },
-    'bg-task:delete': async (_event, args) => {
-      try {
-        await deleteTask(args.slug);
-        return { success: true };
-      } catch (err) {
-        return { success: false, error: err instanceof Error ? err.message : String(err) };
-      }
-    },
-    'bg-task:stop': async (_event, args) => {
-      try {
-        const task = await fetchTask(args.slug);
-        if (!task?.lastRunId) {
-          return { success: false, error: 'No active run for this task' };
-        }
-        await runsCore.stop(task.lastRunId, false);
-        return { success: true };
-      } catch (err) {
-        return { success: false, error: err instanceof Error ? err.message : String(err) };
-      }
-    },
-    'bg-task:list': async (_event, args) => {
-      return listTasks(args);
-    },
-    'bg-task:listRunIds': async (_event, args) => {
-      const runIds = await readTaskRunIds(args.slug, args.limit);
-      return { runIds };
-    },
     // Billing handler
     'billing:getInfo': async () => {
       return await getBillingInfo();
diff --git a/apps/x/apps/main/src/main.ts b/apps/x/apps/main/src/main.ts
index f4415b5d..accc971e 100644
--- a/apps/x/apps/main/src/main.ts
+++ b/apps/x/apps/main/src/main.ts
@@ -5,7 +5,6 @@ import {
   startRunsWatcher,
   startServicesWatcher,
   startLiveNoteAgentWatcher,
-  startBackgroundTaskAgentWatcher,
   startWorkspaceWatcher,
   stopRunsWatcher,
   stopServicesWatcher,
@@ -26,10 +25,7 @@ import { init as initAgentRunner } from "@x/core/dist/agent-schedule/runner.js";
 import { init as initAgentNotes } from "@x/core/dist/knowledge/agent_notes.js";
 import { init as initCalendarNotifications } from "@x/core/dist/knowledge/notify_calendar_meetings.js";
 import { init as initLiveNoteScheduler } from "@x/core/dist/knowledge/live-note/scheduler.js";
-import { init as initEventProcessor, registerConsumer } from "@x/core/dist/events/init.js";
-import { liveNoteEventConsumer } from "@x/core/dist/knowledge/live-note/event-consumer.js";
-import { init as initBackgroundTaskScheduler } from "@x/core/dist/background-tasks/scheduler.js";
-import { backgroundTaskEventConsumer } from "@x/core/dist/background-tasks/event-consumer.js";
+import { init as initLiveNoteEventProcessor } from "@x/core/dist/knowledge/live-note/events.js";
 import { init as initLocalSites, shutdown as shutdownLocalSites } from "@x/core/dist/local-sites/server.js";
 import { shutdown as shutdownAnalytics } from "@x/core/dist/analytics/posthog.js";
 import { identifyIfSignedIn } from "@x/core/dist/analytics/identify.js";
@@ -40,8 +36,7 @@ import started from "electron-squirrel-startup";
 import { execSync, exec, execFileSync } from "node:child_process";
 import { promisify } from "node:util";
 import { init as initChromeSync } from "@x/core/dist/knowledge/chrome-extension/server/server.js";
-import container, { registerBrowserControlService, registerNotificationService } from "@x/core/dist/di/container.js";
-import type { CodeModeManager } from "@x/core/dist/code-mode/acp/manager.js";
+import { registerBrowserControlService, registerNotificationService } from "@x/core/dist/di/container.js";
 import { browserViewManager, BROWSER_PARTITION } from "./browser/view.js";
 import { setupBrowserEventForwarding } from "./browser/ipc.js";
 import { ElectronBrowserControlService } from "./browser/control-service.js";
@@ -52,7 +47,6 @@ import {
   extractDeepLinkFromArgv,
   setMainWindowForDeepLinks,
 } from "./deeplink.js";
-import { disconnectGoogleIfScopesStale } from "./oauth-handler.js";
 
 const execAsync = promisify(exec);
 
@@ -64,7 +58,7 @@ if (started) app.quit();
 
 // Single-instance lock: route a second launch (e.g. clicking a rowboat:// link)
 // back into the existing process via the 'second-instance' event.
-if (app.isPackaged && !app.requestSingleInstanceLock()) {
+if (!app.requestSingleInstanceLock()) {
   console.error('[Main] Another Rowboat instance is already running; exiting this process.');
   app.quit();
   process.exit(0);
@@ -221,7 +215,6 @@ function createWindow() {
     backgroundColor: "#252525", // Prevent white flash (matches dark mode)
     titleBarStyle: "hiddenInset",
     trafficLightPosition: { x: 12, y: 12 },
-    icon: process.platform !== "darwin" ? path.join(__dirname, "../../icons/icon.png") : undefined,
     webPreferences: {
       // IMPORTANT: keep Node out of renderer
       nodeIntegration: false,
@@ -338,26 +331,11 @@ app.whenReady().then(async () => {
   // start live-note agent event watcher (forwards bus → renderer)
   startLiveNoteAgentWatcher();
 
-  // start bg-task agent event watcher (forwards bus → renderer)
-  startBackgroundTaskAgentWatcher();
-
   // start live-note scheduler (cron / window)
   initLiveNoteScheduler();
 
-  // start bg-task scheduler (cron / window)
-  initBackgroundTaskScheduler();
-
-  // register event consumers and start the shared event processor
-  // (consumes $WorkDir/events/pending/, routes events to all consumers
-  // concurrently for Pass-1, then fires each consumer's candidates in parallel)
-  registerConsumer(liveNoteEventConsumer);
-  registerConsumer(backgroundTaskEventConsumer);
-  initEventProcessor();
-
-  // If the stored Google grant predates a scope change (only old scopes),
-  // disconnect it now so the user re-connects with the current scopes before
-  // any Google sync runs against the stale grant.
-  await disconnectGoogleIfScopesStale();
+  // start live-note event processor (consumes events/pending/, routes to matching live notes)
+  initLiveNoteEventProcessor();
 
   // start gmail sync
   initGmailSync();
@@ -418,12 +396,6 @@ app.on("before-quit", () => {
   stopWorkspaceWatcher();
   stopRunsWatcher();
   stopServicesWatcher();
-  // Tear down any live ACP coding-agent adapter processes so they don't outlive the app.
-  try {
-    container.resolve<CodeModeManager>('codeModeManager').disposeAll();
-  } catch {
-    // nothing live to dispose
-  }
   shutdownLocalSites().catch((error) => {
     console.error('[LocalSites] Failed to shut down cleanly:', error);
   });
diff --git a/apps/x/apps/main/src/oauth-handler.ts b/apps/x/apps/main/src/oauth-handler.ts
index 1048d9b8..f61b59cc 100644
--- a/apps/x/apps/main/src/oauth-handler.ts
+++ b/apps/x/apps/main/src/oauth-handler.ts
@@ -1,7 +1,6 @@
 import { shell } from 'electron';
 import type { Server } from 'http';
 import { createAuthServer } from './auth-server.js';
-import { DEFAULT_CALLBACK_PORT } from '@x/core/dist/auth/client-repo.js';
 import * as oauthClient from '@x/core/dist/auth/oauth-client.js';
 import type { Configuration } from '@x/core/dist/auth/oauth-client.js';
 import { getProviderConfig, getAvailableProviders } from '@x/core/dist/auth/providers.js';
@@ -18,9 +17,7 @@ import { isSignedIn } from '@x/core/dist/account/account.js';
 import { getWebappUrl } from '@x/core/dist/config/remote-config.js';
 import { claimTokensViaBackend } from '@x/core/dist/auth/google-backend-oauth.js';
 
-function buildRedirectUri(port: number): string {
-  return `http://localhost:${port}/oauth/callback`;
-}
+const REDIRECT_URI = 'http://localhost:8080/oauth/callback';
 
 /** Top-level openid-client messages that often wrap a more specific cause. */
 const OPAQUE_OAUTH_TOP_MESSAGES = new Set(['invalid response encountered']);
@@ -117,15 +114,9 @@ function getClientRegistrationRepo(): IClientRegistrationRepo {
 }
 
 /**
- * Get or create OAuth configuration for a provider.
- * `redirectUri` is required for DCR providers — it is the actual callback URI
- * (including port) that was just bound, so the registration and auth URL stay in sync.
+ * Get or create OAuth configuration for a provider
  */
-async function getProviderConfiguration(
-  provider: string,
-  redirectUri: string = buildRedirectUri(DEFAULT_CALLBACK_PORT),
-  credentialsOverride?: { clientId: string; clientSecret: string },
-): Promise<Configuration> {
+async function getProviderConfiguration(provider: string, credentialsOverride?: { clientId: string; clientSecret: string }): Promise<Configuration> {
   const config = await getProviderConfig(provider);
   const resolveClientCredentials = async (): Promise<{ clientId: string; clientSecret?: string }> => {
     if (config.client.mode === 'static' && config.client.clientId) {
@@ -157,7 +148,7 @@ async function getProviderConfiguration(
       console.log(`[OAuth] ${provider}: Discovery from issuer with DCR`);
       const clientRepo = getClientRegistrationRepo();
       const existingRegistration = await clientRepo.getClientRegistration(provider);
-
+      
       if (existingRegistration) {
         console.log(`[OAuth] ${provider}: Using existing DCR registration`);
         return await oauthClient.discoverConfiguration(
@@ -166,21 +157,18 @@ async function getProviderConfiguration(
         );
       }
 
-      // Register new client with the actual redirect URI (port already bound)
+      // Register new client
       const scopes = config.scopes || [];
       const { config: oauthConfig, registration } = await oauthClient.registerClient(
         config.discovery.issuer,
-        [redirectUri],
+        [REDIRECT_URI],
         scopes
       );
-
-      // Parse port from redirectUri (e.g. "http://localhost:8081/...") and save
-      const boundPort = new URL(redirectUri).port
-        ? parseInt(new URL(redirectUri).port, 10)
-        : DEFAULT_CALLBACK_PORT;
-      await clientRepo.saveClientRegistration(provider, registration, boundPort);
-      console.log(`[OAuth] ${provider}: DCR registration saved (port ${boundPort})`);
-
+      
+      // Save registration for future use
+      await clientRepo.saveClientRegistration(provider, registration);
+      console.log(`[OAuth] ${provider}: DCR registration saved`);
+      
       return oauthConfig;
     }
   } else {
@@ -188,7 +176,7 @@ async function getProviderConfiguration(
     if (config.client.mode !== 'static') {
       throw new Error('DCR requires discovery mode "issuer", not "static"');
     }
-
+    
     console.log(`[OAuth] ${provider}: Using static endpoints (no discovery)`);
     const { clientId, clientSecret } = await resolveClientCredentials();
     return oauthClient.createStaticConfiguration(
@@ -201,37 +189,6 @@ async function getProviderConfiguration(
   }
 }
 
-/**
- * Determine which port to start the OAuth callback server on for a DCR provider.
- *
- * If the provider has an existing registration, probes the port it was registered
- * on. If that port is still available, returns it so the existing client_id keeps
- * working. If it is blocked, clears the stale registration (forcing re-registration
- * on the next available port) and returns DEFAULT_CALLBACK_PORT as the scan base.
- *
- * Exported for unit testing.
- */
-export async function resolveStartPort(
-  provider: string,
-  clientRepo: IClientRegistrationRepo,
-): Promise<number> {
-  const existingReg = await clientRepo.getClientRegistration(provider);
-  if (!existingReg) return DEFAULT_CALLBACK_PORT;
-
-  const registeredPort = await clientRepo.getRegisteredPort(provider);
-  try {
-    // Probe — fixed-port (no fallback) so we know whether the exact registered port is free
-    const probe = await createAuthServer(registeredPort, () => { /* probe */ });
-    probe.server.close();
-    console.log(`[OAuth] ${provider}: registered port ${registeredPort} still available`);
-    return registeredPort;
-  } catch {
-    console.log(`[OAuth] ${provider}: registered port ${registeredPort} blocked, clearing DCR registration`);
-    await clientRepo.clearClientRegistration(provider);
-    return DEFAULT_CALLBACK_PORT;
-  }
-}
-
 /**
  * Initiate OAuth flow for a provider
  */
@@ -268,188 +225,154 @@ export async function connectProvider(provider: string, credentials?: { clientId
       }
     }
 
-    // For static-client providers (Google BYOK) the redirect URI is pre-registered
-    // at the OAuth provider console on a fixed port — we must not scan.
-    // For DCR providers, resolveStartPort handles the re-registration trap.
-    const isStaticClient = providerConfig.client.mode === 'static';
-    const startPort = isStaticClient
-      ? DEFAULT_CALLBACK_PORT
-      : await resolveStartPort(provider, getClientRegistrationRepo());
+    // Get or create OAuth configuration
+    const config = await getProviderConfiguration(provider, credentials);
 
-    // --- Callback server ---
-    // Declare `state` before the closure so the callback can close over its binding.
-    // The variable is assigned below, before shell.openExternal, so it is always
-    // set by the time any browser request arrives.
-    let state = '';
+    // Generate PKCE codes
+    const { verifier: codeVerifier, challenge: codeChallenge } = await oauthClient.generatePKCE();
+    const state = oauthClient.generateState();
+
+    // Get scopes from config
+    const scopes = providerConfig.scopes || [];
+
+    // Store flow state
+    activeFlows.set(state, { codeVerifier, provider, config });
+
+    // Build authorization URL
+    const authUrl = oauthClient.buildAuthorizationUrl(config, {
+      redirect_uri: REDIRECT_URI,
+      scope: scopes.join(' '),
+      code_challenge: codeChallenge,
+      state,
+    });
+
+    // Create callback server
     let callbackHandled = false;
-
-    const { server, port: boundPort } = await createAuthServer(
-      startPort,
-      async (callbackUrl) => {
-        // Guard against duplicate callbacks (browser may send multiple requests)
-        if (callbackHandled) return;
-        callbackHandled = true;
-        const receivedState = callbackUrl.searchParams.get('state');
-        if (receivedState == null || receivedState === '') {
-          throw new Error(
-            'OAuth callback missing state parameter. Complete sign-in in the browser or check the redirect URI.'
-          );
-        }
-        if (receivedState !== state) {
-          throw new Error('Invalid state parameter - possible CSRF attack');
-        }
-
-        const flow = activeFlows.get(state);
-        if (!flow || flow.provider !== provider) {
-          throw new Error('Invalid OAuth flow state');
-        }
-
-        try {
-          // Use full callback URL (includes iss, scope, etc.) so openid-client validation succeeds
-          console.log(`[OAuth] Exchanging authorization code for tokens (${provider})...`);
-          const tokens = await oauthClient.exchangeCodeForTokens(
-            flow.config,
-            callbackUrl,
-            flow.codeVerifier,
-            state
-          );
-
-          // Save tokens and credentials. For Google, BYOK is the only path
-          // that reaches this token exchange (rowboat path returns above
-          // before any local server runs); stamp mode: 'byok' so a future
-          // refresh / reconnect can't get confused with a rowboat entry.
-          console.log(`[OAuth] Token exchange successful for ${provider}`);
-          await oauthRepo.upsert(provider, {
-            tokens,
-            ...(credentials ? { clientId: credentials.clientId, clientSecret: credentials.clientSecret } : {}),
-            ...(provider === 'google' ? { mode: 'byok' as const } : {}),
-            error: null,
-          });
-
-          // Trigger immediate sync for relevant providers
-          if (provider === 'google') {
-            triggerGmailSync();
-            triggerCalendarSync();
-          } else if (provider === 'fireflies-ai') {
-            triggerFirefliesSync();
-          }
-
-          // For Rowboat sign-in, ensure user + Stripe customer exist before
-          // notifying the renderer. Without this, parallel API calls from
-          // multiple renderer hooks race to create the user, causing duplicates.
-          let signedInUserId: string | undefined;
-          if (provider === 'rowboat') {
-            try {
-              const billing = await getBillingInfo();
-              if (billing.userId) {
-                signedInUserId = billing.userId;
-                analyticsIdentify(billing.userId, {
-                  ...(billing.userEmail ? { email: billing.userEmail } : {}),
-                  plan: billing.subscriptionPlan,
-                  status: billing.subscriptionStatus,
-                });
-                analyticsCapture('user_signed_in', {
-                  plan: billing.subscriptionPlan,
-                  status: billing.subscriptionStatus,
-                });
-              }
-            } catch (meError) {
-              console.error('[OAuth] Failed to initialize user via /v1/me:', meError);
-            }
-          }
-
-          // Emit success event to renderer
-          emitOAuthEvent({
-            provider,
-            success: true,
-            ...(signedInUserId ? { userId: signedInUserId } : {}),
-          });
-        } catch (error) {
-          console.error('OAuth token exchange failed:', error);
-          // Log cause chain for debugging (e.g. OAUTH_INVALID_RESPONSE -> OperationProcessingError)
-          let cause: unknown = error;
-          while (cause != null && typeof cause === 'object' && 'cause' in cause) {
-            cause = (cause as { cause?: unknown }).cause;
-            if (cause != null) {
-              console.error('[OAuth] Caused by:', cause);
-            }
-          }
-          const errorMessage = getOAuthErrorMessage(error);
-          emitOAuthEvent({ provider, success: false, error: errorMessage });
-          throw error;
-        } finally {
-          // Clean up
-          activeFlows.delete(state);
-          if (activeFlow && activeFlow.state === state) {
-            clearTimeout(activeFlow.cleanupTimeout);
-            activeFlow.server.close();
-            activeFlow = null;
-          }
-        }
-      },
-      // Static providers (Google BYOK) keep fixed-port behaviour to match the
-      // pre-registered redirect URI at the provider's console. DCR providers
-      // can fall back since we register the actual bound port below.
-      { fallback: !isStaticClient },
-    );
-
-    // Server is bound. Any throw between here and `activeFlow = ...` would
-    // leak the port — `cancelActiveFlow` only closes it once activeFlow is set.
-    try {
-      // TOCTOU guard: resolveStartPort probed the registered port and found it
-      // free, but the port could have been grabbed between probe and real bind,
-      // causing fallback to a different port. The cached client_id is registered
-      // for the old port — clear it so getProviderConfiguration re-registers
-      // with the actual bound port.
-      if (!isStaticClient && boundPort !== startPort) {
-        console.log(`[OAuth] ${provider}: bound port ${boundPort} differs from start port ${startPort}, clearing stale DCR registration`);
-        await getClientRegistrationRepo().clearClientRegistration(provider);
+    const { server } = await createAuthServer(8080, async (callbackUrl) => {
+      // Guard against duplicate callbacks (browser may send multiple requests)
+      if (callbackHandled) return;
+      callbackHandled = true;
+      const receivedState = callbackUrl.searchParams.get('state');
+      if (receivedState == null || receivedState === '') {
+        throw new Error(
+          'OAuth callback missing state parameter. Complete sign-in in the browser or check the redirect URI.'
+        );
+      }
+      if (receivedState !== state) {
+        throw new Error('Invalid state parameter - possible CSRF attack');
       }
 
-      const redirectUri = buildRedirectUri(boundPort);
-      const config = await getProviderConfiguration(provider, redirectUri, credentials);
+      const flow = activeFlows.get(state);
+      if (!flow || flow.provider !== provider) {
+        throw new Error('Invalid OAuth flow state');
+      }
 
-      const { verifier: codeVerifier, challenge: codeChallenge } = await oauthClient.generatePKCE();
-      state = oauthClient.generateState();
+      try {
+        // Use full callback URL (includes iss, scope, etc.) so openid-client validation succeeds
+        console.log(`[OAuth] Exchanging authorization code for tokens (${provider})...`);
+        const tokens = await oauthClient.exchangeCodeForTokens(
+          flow.config,
+          callbackUrl,
+          flow.codeVerifier,
+          state
+        );
 
-      const scopes = providerConfig.scopes || [];
-      activeFlows.set(state, { codeVerifier, provider, config });
+        // Save tokens and credentials. For Google, BYOK is the only path
+        // that reaches this token exchange (rowboat path returns above
+        // before any local server runs); stamp mode: 'byok' so a future
+        // refresh / reconnect can't get confused with a rowboat entry.
+        console.log(`[OAuth] Token exchange successful for ${provider}`);
+        await oauthRepo.upsert(provider, {
+          tokens,
+          ...(credentials ? { clientId: credentials.clientId, clientSecret: credentials.clientSecret } : {}),
+          ...(provider === 'google' ? { mode: 'byok' as const } : {}),
+          error: null,
+        });
 
-      const authUrl = oauthClient.buildAuthorizationUrl(config, {
-        redirect_uri: redirectUri,
-        scope: scopes.join(' '),
-        code_challenge: codeChallenge,
-        state,
-      });
-
-      // Set timeout to clean up abandoned flows (2 minutes)
-      const cleanupTimeout = setTimeout(() => {
-        if (activeFlow?.state === state) {
-          console.log(`[OAuth] Cleaning up abandoned OAuth flow for ${provider} (timeout)`);
-          cancelActiveFlow('timed_out');
+        // Trigger immediate sync for relevant providers
+        if (provider === 'google') {
+          triggerGmailSync();
+          triggerCalendarSync();
+        } else if (provider === 'fireflies-ai') {
+          triggerFirefliesSync();
         }
-      }, 2 * 60 * 1000);
 
-      activeFlow = {
-        provider,
-        state,
-        server,
-        cleanupTimeout,
-      };
+        // For Rowboat sign-in, ensure user + Stripe customer exist before
+        // notifying the renderer. Without this, parallel API calls from
+        // multiple renderer hooks race to create the user, causing duplicates.
+        let signedInUserId: string | undefined;
+        if (provider === 'rowboat') {
+          try {
+            const billing = await getBillingInfo();
+            if (billing.userId) {
+              signedInUserId = billing.userId;
+              analyticsIdentify(billing.userId, {
+                ...(billing.userEmail ? { email: billing.userEmail } : {}),
+                plan: billing.subscriptionPlan,
+                status: billing.subscriptionStatus,
+              });
+              analyticsCapture('user_signed_in', {
+                plan: billing.subscriptionPlan,
+                status: billing.subscriptionStatus,
+              });
+            }
+          } catch (meError) {
+            console.error('[OAuth] Failed to initialize user via /v1/me:', meError);
+          }
+        }
 
-      // Open in system browser (shares cookies/sessions with user's regular browser)
-      shell.openExternal(authUrl.toString());
-
-      return { success: true };
-    } catch (setupError) {
-      // Post-bind setup failed — close the server so the port is released and
-      // a retry isn't blocked by our own zombie listener.
-      server.close();
-      if (state) {
+        // Emit success event to renderer
+        emitOAuthEvent({
+          provider,
+          success: true,
+          ...(signedInUserId ? { userId: signedInUserId } : {}),
+        });
+      } catch (error) {
+        console.error('OAuth token exchange failed:', error);
+        // Log cause chain for debugging (e.g. OAUTH_INVALID_RESPONSE -> OperationProcessingError)
+        let cause: unknown = error;
+        while (cause != null && typeof cause === 'object' && 'cause' in cause) {
+          cause = (cause as { cause?: unknown }).cause;
+          if (cause != null) {
+            console.error('[OAuth] Caused by:', cause);
+          }
+        }
+        const errorMessage = getOAuthErrorMessage(error);
+        emitOAuthEvent({ provider, success: false, error: errorMessage });
+        throw error;
+      } finally {
+        // Clean up
         activeFlows.delete(state);
+        if (activeFlow && activeFlow.state === state) {
+          clearTimeout(activeFlow.cleanupTimeout);
+          activeFlow.server.close();
+          activeFlow = null;
+        }
       }
-      throw setupError;
-    }
+    });
+
+    // Set timeout to clean up abandoned flows (2 minutes)
+    // This prevents memory leaks if user never completes the OAuth flow
+    const cleanupTimeout = setTimeout(() => {
+      if (activeFlow?.state === state) {
+        console.log(`[OAuth] Cleaning up abandoned OAuth flow for ${provider} (timeout)`);
+        cancelActiveFlow('timed_out');
+      }
+    }, 2 * 60 * 1000); // 2 minutes
+
+    // Store complete flow state for cleanup
+    activeFlow = {
+      provider,
+      state,
+      server,
+      cleanupTimeout,
+    };
+
+    // Open in system browser (shares cookies/sessions with user's regular browser)
+    shell.openExternal(authUrl.toString());
+
+    // Wait for callback (server will handle it)
+    return { success: true };
   } catch (error) {
     console.error('OAuth connection failed:', error);
     return {
@@ -508,7 +431,7 @@ export async function disconnectProvider(provider: string): Promise<{ success: b
       if (connection.mode === 'rowboat' && connection.tokens?.access_token) {
         try {
           const revokeUrl = `https://oauth2.googleapis.com/revoke?token=${encodeURIComponent(connection.tokens.access_token)}`;
-          const res = await fetch(revokeUrl, { method: 'POST', signal: AbortSignal.timeout(5000) });
+          const res = await fetch(revokeUrl, { method: 'POST' });
           if (!res.ok) {
             console.warn(`[OAuth] Google revoke returned ${res.status}; continuing with local disconnect`);
           }
@@ -532,81 +455,6 @@ export async function disconnectProvider(provider: string): Promise<{ success: b
   }
 }
 
-/**
- * Startup migration for Google scope changes. When a connected Google grant was
- * issued before a scope was added (e.g. old installs on gmail.readonly that
- * never received gmail.modify), invalidate it so the user is prompted to
- * reconnect and re-grant with the current scopes. The currently-requested
- * scopes in the provider config are the source of truth: a grant missing any
- * of them is treated as stale.
- *
- * We revoke + clear the stale token but DELIBERATELY keep the provider entry
- * with an `error` set rather than calling disconnectProvider (which deletes the
- * whole entry). The renderer's reconnect prompts — the sidebar "Reconnect your
- * accounts" alert and the connectors "Reconnect" row — key off this `error`
- * field, not off the connected flag. A fully deleted entry has no error and is
- * indistinguishable from "never connected", so no prompt would ever appear.
- *
- * Tokens with no recorded scopes (very old installs that never persisted them)
- * are also treated as stale. Safe to call on every startup — it's a no-op once
- * the grant covers all current scopes, and once invalidated the early return on
- * the missing token keeps it from re-running until the user reconnects.
- */
-export async function disconnectGoogleIfScopesStale(): Promise<void> {
-  try {
-    const oauthRepo = getOAuthRepo();
-    const connection = await oauthRepo.read('google');
-
-    // Not connected (or already invalidated) — nothing to migrate.
-    if (!connection.tokens) {
-      return;
-    }
-
-    const providerConfig = await getProviderConfig('google');
-    const requiredScopes = providerConfig.scopes ?? [];
-    if (requiredScopes.length === 0) {
-      return;
-    }
-
-    const granted = new Set(connection.tokens.scopes ?? []);
-    const missingScopes = requiredScopes.filter((scope) => !granted.has(scope));
-    if (missingScopes.length === 0) {
-      return;
-    }
-
-    console.log(
-      `[OAuth] Google grant is missing current scopes [${missingScopes.join(', ')}]; ` +
-      'invalidating it so the user is prompted to reconnect with the new scopes.'
-    );
-
-    // Best-effort revoke at Google for rowboat-mode grants (mirrors disconnectProvider).
-    if (connection.mode === 'rowboat' && connection.tokens.access_token) {
-      try {
-        const revokeUrl = `https://oauth2.googleapis.com/revoke?token=${encodeURIComponent(connection.tokens.access_token)}`;
-        const res = await fetch(revokeUrl, { method: 'POST', signal: AbortSignal.timeout(5000) });
-        if (!res.ok) {
-          console.warn(`[OAuth] Google revoke returned ${res.status}; continuing with local invalidation`);
-        }
-      } catch (error) {
-        console.warn('[OAuth] Google revoke failed; continuing with local invalidation:', error);
-      }
-    }
-
-    // Drop the stale token but keep the entry with an error so the reconnect
-    // prompt fires (see the note above).
-    await oauthRepo.upsert('google', {
-      tokens: null,
-      error: 'Google permissions changed. Please reconnect to continue.',
-    });
-
-    // Nudge any already-open window to re-read state. The renderer's initial
-    // mount also re-reads, so the prompt shows even if no window is up yet.
-    emitOAuthEvent({ provider: 'google', success: false });
-  } catch (error) {
-    console.error('[OAuth] Google scope migration check failed:', error);
-  }
-}
-
 /**
  * Get access token for a provider (internal use only)
  * Refreshes token if expired
diff --git a/apps/x/apps/renderer/DESIGN_LANGUAGE.md b/apps/x/apps/renderer/DESIGN_LANGUAGE.md
deleted file mode 100644
index cf412593..00000000
--- a/apps/x/apps/renderer/DESIGN_LANGUAGE.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# Rowboat Design Language
-
-Rowboat should feel like a command center for people who live in notes, agents, email, meetings, and files all day. The launch direction is quiet, fast, and prosumer: dense enough for repeated work, warm enough to feel personal, and explicit about what the AI is doing.
-
-## Principles
-
-1. **Calm density**
-   Keep the interface compact and scannable. Use tighter rows, restrained borders, and low-contrast panels so users can keep many contexts open without the app feeling heavy.
-
-2. **Command first**
-   Primary actions should feel like instant commands, not marketing CTAs. Side navigation, search, model selection, and composer controls use compact icon-led affordances with clear hover and selected states.
-
-3. **Visible work state**
-   AI actions, sync, saving, meeting capture, and background tasks need clear status surfaces. Prefer small persistent indicators over large banners.
-
-4. **Notes as the canvas**
-   The editor and conversation stay visually dominant. Chrome is supportive, not decorative. Avoid nested cards and oversized empty states in work surfaces.
-
-5. **Neutral precision**
-   The palette follows the dev color system: white and graphite surfaces, black/white primary actions, neutral command tools, and reserved semantic colors for destructive and chart states.
-
-## Tokens
-
-- Radius: `8px` for controls and cards, smaller where density matters.
-- Backgrounds: dev defaults in light and dark mode.
-- Borders: one-step darker than surfaces, quiet enough to separate panels without tinting them.
-- Shadows: reserved for the composer, menus, dialogs, and active segmented controls.
-- Type: system sans with tabular-feeling OpenType features enabled; no negative tracking.
-- Accent use: primary and command affordances use the neutral dev palette. Extra hues are reserved for semantic states and charts.
-
-## Core Surfaces
-
-- **Sidebar:** persistent workflow switcher with calm selected states. Quick-action icons use neutral ink from the dev palette.
-- **Titlebar/tabs:** slim, scan-first navigation. Active tabs get a bottom signal line, not a bulky filled pill.
-- **Composer:** the highest-emphasis control outside the active canvas. It is slightly raised, flat, bordered by the primary tone, and sharp enough to feel like an input terminal.
-- **Messages:** user messages are compact structured blocks; assistant messages remain full-width and readable.
-- **Status:** sync, saving, recording, and task activity stay small but always visible near the surface they affect.
-
-## Launch Positioning
-
-The visual story is: **Rowboat is the personal AI workspace for people whose work already spans meetings, mail, notes, browser tasks, and agents.** It should feel closer to a focused desktop tool than a chat website.
diff --git a/apps/x/apps/renderer/package.json b/apps/x/apps/renderer/package.json
index 67876189..a193b3f1 100644
--- a/apps/x/apps/renderer/package.json
+++ b/apps/x/apps/renderer/package.json
@@ -9,7 +9,6 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@eigenpal/docx-editor-react": "^1.0.3",
     "@radix-ui/react-avatar": "^1.1.11",
     "@radix-ui/react-collapsible": "^1.1.12",
     "@radix-ui/react-context-menu": "^2.2.16",
@@ -47,15 +46,6 @@
     "motion": "^12.23.26",
     "nanoid": "^5.1.6",
     "posthog-js": "^1.332.0",
-    "prosemirror-commands": "^1.7.1",
-    "prosemirror-dropcursor": "^1.8.2",
-    "prosemirror-history": "^1.5.0",
-    "prosemirror-keymap": "^1.2.3",
-    "prosemirror-model": "^1.25.7",
-    "prosemirror-state": "^1.4.4",
-    "prosemirror-tables": "^1.8.5",
-    "prosemirror-transform": "^1.12.0",
-    "prosemirror-view": "^1.41.8",
     "radix-ui": "^1.4.3",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
diff --git a/apps/x/apps/renderer/src/App.css b/apps/x/apps/renderer/src/App.css
index 86c6535d..5c1eabb2 100644
--- a/apps/x/apps/renderer/src/App.css
+++ b/apps/x/apps/renderer/src/App.css
@@ -35,30 +35,6 @@
   }
 }
 
-/* Radix Collapsible expand/collapse — animate height (via the radix CSS var)
-   plus a subtle fade. Used by the web search card. */
-@keyframes collapsible-down {
-  from {
-    height: 0;
-    opacity: 0;
-  }
-  to {
-    height: var(--radix-collapsible-content-height);
-    opacity: 1;
-  }
-}
-
-@keyframes collapsible-up {
-  from {
-    height: var(--radix-collapsible-content-height);
-    opacity: 1;
-  }
-  to {
-    height: 0;
-    opacity: 0;
-  }
-}
-
 @media (prefers-reduced-motion: no-preference) {
   a:nth-of-type(2) .logo {
     animation: logo-spin infinite 20s linear;
@@ -82,1047 +58,6 @@
   background-image: radial-gradient(circle, oklch(0.7 0 0 / 0.06) 1px, transparent 1px);
 }
 
-.gmail-shell {
-  --gm-bg: #0f0f12;
-  --gm-bg-card: #131317;
-  --gm-bg-input: #1c1c20;
-  --gm-bg-row-hover: #16161a;
-  --gm-bg-row-selected: #1a1620;
-  --gm-bg-row-selected-hover: #1d1825;
-  --gm-bg-iframe: #fafafa;
-  --gm-bg-pill: #1c1c20;
-  --gm-bg-pill-hover: #232328;
-  --gm-text: #e4e4e7;
-  --gm-text-strong: #fafafa;
-  --gm-text-muted: #71717a;
-  --gm-text-faint: #52525b;
-  --gm-text-body: #d4d4d8;
-  --gm-border: #1f1f24;
-  --gm-border-strong: #2e2e35;
-  --gm-accent: #a78bfa;
-  --gm-accent-hover: #b9a6ff;
-  --gm-accent-glow: rgba(167, 139, 250, 0.45);
-  --gm-accent-fg: #18181b;
-  --gm-icon-hover-bg: #1f1f24;
-  --gm-placeholder: #52525b;
-
-  display: flex;
-  height: 100%;
-  min-height: 0;
-  width: 100%;
-  overflow: hidden;
-  background: var(--gm-bg);
-  color: var(--gm-text);
-  font-family: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
-  font-feature-settings: "ss01", "cv11";
-}
-
-.light .gmail-shell {
-  --gm-bg: #ffffff;
-  --gm-bg-card: #ffffff;
-  --gm-bg-input: #f4f4f7;
-  --gm-bg-row-hover: #f7f7f9;
-  --gm-bg-row-selected: #f5f0ff;
-  --gm-bg-row-selected-hover: #ece4ff;
-  --gm-bg-iframe: #ffffff;
-  --gm-bg-pill: #ffffff;
-  --gm-bg-pill-hover: #f4f4f7;
-  --gm-text: #27272a;
-  --gm-text-strong: #09090b;
-  --gm-text-muted: #71717a;
-  --gm-text-faint: #a1a1aa;
-  --gm-text-body: #3f3f46;
-  --gm-border: #e4e4e7;
-  --gm-border-strong: #d4d4d8;
-  --gm-accent: #7c3aed;
-  --gm-accent-hover: #6d28d9;
-  --gm-accent-glow: rgba(124, 58, 237, 0.3);
-  --gm-accent-fg: #ffffff;
-  --gm-icon-hover-bg: #f4f4f7;
-  --gm-placeholder: #a1a1aa;
-}
-
-.gmail-main {
-  display: flex;
-  min-width: 0;
-  min-height: 0;
-  flex: 1;
-  flex-direction: column;
-  padding: 0;
-}
-
-.gmail-topbar {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  height: 52px;
-  padding: 0 20px;
-  border-bottom: 1px solid var(--gm-border);
-}
-
-.gmail-search {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  width: min(520px, 100%);
-  height: 32px;
-  padding: 0 12px;
-  border-radius: 8px;
-  background: var(--gm-bg-input);
-  color: var(--gm-text-muted);
-}
-
-.gmail-search input {
-  flex: 1;
-  border: none;
-  outline: none;
-  background: transparent;
-  color: var(--gm-text);
-  font-size: 13px;
-  letter-spacing: 0.01em;
-}
-
-.gmail-search input::placeholder {
-  color: var(--gm-placeholder);
-}
-
-.gmail-icon-button {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  width: 30px;
-  height: 30px;
-  border: none;
-  border-radius: 6px;
-  background: transparent;
-  color: var(--gm-text-muted);
-  cursor: pointer;
-  transition: background 120ms ease, color 120ms ease;
-}
-
-.gmail-icon-button:hover {
-  background: var(--gm-icon-hover-bg);
-  color: var(--gm-text);
-}
-
-.gmail-list {
-  display: flex;
-  flex-direction: column;
-  min-width: 0;
-  min-height: 0;
-  flex: 1;
-  overflow: auto;
-  background: var(--gm-bg);
-  border: none;
-  border-radius: 0;
-}
-
-.gmail-row-group {
-  display: flex;
-  flex-direction: column;
-}
-
-.gmail-list-header {
-  position: sticky;
-  top: 0;
-  z-index: 1;
-  display: flex;
-  justify-content: space-between;
-  height: 32px;
-  padding: 0 24px;
-  align-items: center;
-  background: var(--gm-bg);
-  border-bottom: 1px solid var(--gm-border);
-  color: var(--gm-text-faint);
-  font-size: 11px;
-  text-transform: uppercase;
-  letter-spacing: 0.08em;
-}
-
-.gmail-section {
-  display: flex;
-  flex-direction: column;
-}
-
-.gmail-section + .gmail-section {
-  margin-top: 28px;
-}
-
-.gmail-section-sentinel {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 28px;
-  color: var(--gm-text-faint);
-}
-
-.gmail-row-shell {
-  position: relative;
-}
-
-.gmail-row {
-  display: grid;
-  grid-template-columns: 12px minmax(140px, 0.22fr) minmax(0, 1fr) 60px;
-  align-items: center;
-  gap: 16px;
-  width: 100%;
-  min-height: 40px;
-  padding: 0 24px;
-  border: none;
-  background: transparent;
-  color: var(--gm-text-muted);
-  text-align: left;
-  cursor: pointer;
-  font-family: inherit;
-  transition: background 120ms ease;
-}
-
-.gmail-row-actions {
-  position: absolute;
-  right: 16px;
-  top: 50%;
-  transform: translateY(-50%);
-  display: flex;
-  align-items: center;
-  gap: 2px;
-  opacity: 0;
-  pointer-events: none;
-  transition: opacity 120ms ease;
-}
-
-.gmail-row-shell:hover .gmail-row-actions {
-  opacity: 1;
-  pointer-events: auto;
-}
-
-.gmail-row-shell:hover .gmail-row-date {
-  visibility: hidden;
-}
-
-.gmail-row-action {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  width: 26px;
-  height: 26px;
-  border: none;
-  border-radius: 4px;
-  background: transparent;
-  color: var(--gm-text-muted);
-  cursor: pointer;
-  transition: background 120ms ease, color 120ms ease;
-}
-
-.gmail-row-action:hover {
-  background: var(--gm-bg-pill-hover);
-  color: var(--gm-text-strong);
-}
-
-.gmail-row-action-danger:hover {
-  color: #e8453c;
-}
-
-.gmail-row:hover {
-  background: var(--gm-bg-row-hover);
-  box-shadow: none;
-}
-
-.gmail-row-selected {
-  background: var(--gm-bg-row-selected);
-  box-shadow: inset 2px 0 0 var(--gm-accent);
-}
-
-.gmail-row-selected:hover {
-  background: var(--gm-bg-row-selected-hover);
-}
-
-.gmail-row-unread {
-  color: var(--gm-text);
-}
-
-.gmail-row-dot {
-  width: 6px;
-  height: 6px;
-  border-radius: 50%;
-  background: transparent;
-}
-
-.gmail-row-unread .gmail-row-dot {
-  background: var(--gm-accent);
-  box-shadow: 0 0 8px var(--gm-accent-glow);
-}
-
-.gmail-row-sender,
-.gmail-row-content strong,
-.gmail-row-date {
-  font-size: 13px;
-  font-weight: 400;
-  letter-spacing: -0.005em;
-}
-
-.gmail-row-unread .gmail-row-sender,
-.gmail-row-unread .gmail-row-content strong {
-  font-weight: 600;
-  color: var(--gm-text-strong);
-}
-
-.gmail-row-unread .gmail-row-date {
-  color: var(--gm-text);
-}
-
-.gmail-row-sender,
-.gmail-row-content,
-.gmail-row-content span {
-  min-width: 0;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-
-.gmail-row-content {
-  display: flex;
-  gap: 8px;
-  color: var(--gm-text-faint);
-  font-size: 13px;
-}
-
-.gmail-row-content strong {
-  flex-shrink: 0;
-  color: inherit;
-  font-weight: 400;
-}
-
-.gmail-row-date {
-  justify-self: end;
-  color: var(--gm-text-faint);
-  white-space: nowrap;
-  font-variant-numeric: tabular-nums;
-}
-
-.gmail-detail {
-  display: flex;
-  min-width: 0;
-  flex-direction: column;
-  background: transparent;
-}
-
-.gmail-detail-inline {
-  background: var(--gm-bg-card);
-  border-top: 1px solid var(--gm-border);
-  border-bottom: 1px solid var(--gm-border);
-  box-shadow: inset 2px 0 0 var(--gm-accent);
-}
-
-.gmail-detail-hidden {
-  display: none;
-}
-
-.gmail-detail-toolbar {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 12px;
-  height: 48px;
-  padding: 0 24px;
-  border-bottom: 1px solid var(--gm-border);
-  background: transparent;
-}
-
-.gmail-thread-subject-inline {
-  flex: 1;
-  min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  color: var(--gm-text-strong);
-  font-size: 15px;
-  font-weight: 500;
-  letter-spacing: -0.01em;
-}
-
-.gmail-thread-body {
-  padding: 20px 24px 28px;
-  background: transparent;
-}
-
-.gmail-thread-summary {
-  margin-bottom: 20px;
-  padding-bottom: 16px;
-  border-bottom: 1px solid var(--gm-border);
-}
-
-.gmail-thread-summary-label {
-  display: block;
-  margin-bottom: 6px;
-  color: var(--gm-text-faint);
-  font-size: 10px;
-  font-weight: 600;
-  letter-spacing: 0.08em;
-  text-transform: uppercase;
-}
-
-.gmail-thread-summary-text {
-  display: block;
-  color: var(--gm-text);
-  font-size: 13px;
-  line-height: 1.55;
-}
-
-.gmail-message-stack {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-}
-
-.gmail-message {
-  display: grid;
-  grid-template-columns: 28px minmax(0, 1fr);
-  gap: 12px;
-  padding: 12px 0;
-  border-top: 1px solid var(--gm-border);
-}
-
-.gmail-message:first-child {
-  border-top: 0;
-  padding-top: 4px;
-}
-
-.gmail-message-header {
-  display: block;
-  width: 100%;
-  padding: 0;
-  margin: 0;
-  border: none;
-  background: transparent;
-  color: inherit;
-  font: inherit;
-  text-align: left;
-  cursor: pointer;
-}
-
-.gmail-message-snippet {
-  margin-top: 2px;
-  color: var(--gm-text-muted);
-  font-size: 12px;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-
-.gmail-message:not(.gmail-message-expanded) .gmail-message-header:hover .gmail-message-from strong {
-  color: var(--gm-accent);
-}
-
-.gmail-message-avatar {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 28px;
-  height: 28px;
-  border-radius: 50%;
-  color: #fafafa;
-  font-weight: 600;
-  font-size: 11px;
-  letter-spacing: 0.02em;
-}
-
-.gmail-message-main {
-  min-width: 0;
-}
-
-.gmail-message-meta {
-  display: flex;
-  align-items: baseline;
-  justify-content: space-between;
-  gap: 12px;
-}
-
-.gmail-message-from {
-  display: flex;
-  align-items: baseline;
-  gap: 8px;
-  min-width: 0;
-}
-
-.gmail-message-from strong,
-.gmail-message-from span {
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-
-.gmail-message-from strong {
-  font-size: 13px;
-  font-weight: 600;
-  color: var(--gm-text-strong);
-  letter-spacing: -0.005em;
-}
-
-.gmail-message-from span,
-.gmail-message-to,
-.gmail-message-cc,
-.gmail-message-date {
-  color: var(--gm-text-muted);
-  font-size: 12px;
-}
-
-.gmail-message-date {
-  flex-shrink: 0;
-  font-variant-numeric: tabular-nums;
-}
-
-.gmail-message-iframe {
-  display: block;
-  width: 100%;
-  max-width: 820px;
-  margin-top: 12px;
-  border: 0;
-  background: var(--gm-bg-iframe);
-  border-radius: 6px;
-}
-
-.gmail-message-iframe-adaptive {
-  background: var(--gm-bg-card);
-}
-
-.gmail-message-plain {
-  max-width: 820px;
-  margin-top: 12px;
-  padding: 10px 14px;
-  background: var(--gm-bg-iframe);
-  border-radius: 6px;
-  color: var(--gm-text);
-}
-
-.gmail-message-pre {
-  margin: 0;
-  font: 14px/1.6 Arial, sans-serif;
-  white-space: pre-wrap;
-  word-wrap: break-word;
-}
-
-.gmail-message-pre-quoted {
-  margin-top: 12px;
-  color: var(--gm-text-muted);
-}
-
-.gmail-quote-toggle {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  margin-top: 8px;
-  height: 22px;
-  padding: 0 10px;
-  border: 1px solid var(--gm-border-strong);
-  border-radius: 4px;
-  background: var(--gm-bg-pill);
-  color: var(--gm-text-muted);
-  font: inherit;
-  font-size: 12px;
-  letter-spacing: 0.04em;
-  cursor: pointer;
-  transition: background 120ms ease, color 120ms ease, border-color 120ms ease;
-}
-
-.gmail-quote-toggle:hover {
-  background: var(--gm-bg-pill-hover);
-  color: var(--gm-text-strong);
-  border-color: var(--gm-border-strong);
-}
-
-.gmail-quote-toggle[aria-expanded="true"] {
-  background: var(--gm-bg-row-selected);
-  color: var(--gm-accent);
-  border-color: var(--gm-accent);
-}
-
-.gmail-message-attachments {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 8px;
-  margin-top: 14px;
-  max-width: 820px;
-}
-
-.gmail-attachment {
-  display: inline-flex;
-  align-items: center;
-  gap: 8px;
-  max-width: 320px;
-  padding: 6px 10px;
-  border: 1px solid var(--gm-border-strong);
-  border-radius: 6px;
-  background: var(--gm-bg-pill);
-  color: var(--gm-text);
-  font: inherit;
-  font-size: 12px;
-  cursor: pointer;
-  transition: background 120ms ease, border-color 120ms ease, color 120ms ease;
-}
-
-.gmail-attachment:hover {
-  background: var(--gm-bg-pill-hover);
-  border-color: var(--gm-accent);
-  color: var(--gm-accent);
-}
-
-.gmail-attachment-name {
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  font-weight: 500;
-}
-
-.gmail-attachment-size {
-  flex-shrink: 0;
-  color: var(--gm-text-muted);
-  font-size: 11px;
-  font-variant-numeric: tabular-nums;
-}
-
-.gmail-thread-actions {
-  display: flex;
-  gap: 8px;
-  margin: 20px 0 12px 40px;
-}
-
-.gmail-thread-actions button {
-  display: inline-flex;
-  align-items: center;
-  gap: 8px;
-  height: 30px;
-  padding: 0 14px;
-  border: 1px solid var(--gm-border-strong);
-  border-radius: 6px;
-  background: var(--gm-bg-pill);
-  color: var(--gm-text-body);
-  font: inherit;
-  font-size: 12px;
-  cursor: pointer;
-  transition: background 120ms ease, border-color 120ms ease;
-}
-
-.gmail-thread-actions button:hover {
-  background: var(--gm-bg-pill-hover);
-  border-color: var(--gm-border-strong);
-}
-
-.gmail-compose-card {
-  max-width: 720px;
-  margin-left: 40px;
-  border: 1px solid var(--gm-border-strong);
-  border-radius: 8px;
-  overflow: hidden;
-  background: var(--gm-bg-card);
-}
-
-.gmail-compose-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  height: 32px;
-  padding: 0 12px;
-  background: var(--gm-bg-input);
-  color: var(--gm-text-body);
-  font-size: 12px;
-  font-weight: 500;
-  letter-spacing: 0.01em;
-  text-transform: uppercase;
-}
-
-.gmail-compose-header button,
-.gmail-compose-link {
-  border: none;
-  background: transparent;
-  color: var(--gm-text-muted);
-  cursor: pointer;
-}
-
-.gmail-compose-line {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  min-height: 32px;
-  padding: 0 12px;
-  border-bottom: 1px solid var(--gm-border);
-  color: var(--gm-text-muted);
-  font-size: 12px;
-}
-
-.gmail-compose-line input {
-  min-width: 0;
-  flex: 1;
-  border: none;
-  outline: none;
-  background: transparent;
-  color: var(--gm-text);
-  font: inherit;
-}
-
-.gmail-compose-label {
-  flex: none;
-  min-width: 28px;
-  color: var(--gm-text-muted);
-}
-
-.gmail-compose-subject-input {
-  min-width: 0;
-  flex: 1;
-  border: none;
-  outline: none;
-  background: transparent;
-  color: var(--gm-text);
-  font: inherit;
-}
-
-/* Recipient (To / Cc / Bcc) rows with editable chips */
-.gmail-recipient-row {
-  display: flex;
-  align-items: flex-start;
-  gap: 8px;
-  min-height: 34px;
-  padding: 5px 12px;
-  border-bottom: 1px solid var(--gm-border);
-  font-size: 13px;
-}
-
-.gmail-recipient-label {
-  flex: none;
-  min-width: 28px;
-  padding-top: 5px;
-  color: var(--gm-text-muted);
-}
-
-.gmail-recipient-field {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  gap: 4px;
-  flex: 1;
-  min-width: 0;
-}
-
-.gmail-recipient-chip {
-  display: inline-flex;
-  align-items: center;
-  gap: 4px;
-  max-width: 100%;
-  height: 24px;
-  padding: 0 4px 0 10px;
-  border-radius: 12px;
-  background: var(--gm-bg-pill);
-  color: var(--gm-text);
-  font-size: 12px;
-  line-height: 1;
-}
-
-.gmail-recipient-chip-label {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  max-width: 240px;
-}
-
-.gmail-recipient-chip-remove {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  width: 16px;
-  height: 16px;
-  border: none;
-  border-radius: 50%;
-  background: transparent;
-  color: var(--gm-text-muted);
-  font-size: 14px;
-  line-height: 1;
-  cursor: pointer;
-}
-
-.gmail-recipient-chip-remove:hover {
-  background: var(--gm-bg-pill-hover);
-  color: var(--gm-text);
-}
-
-.gmail-recipient-input {
-  flex: 1 1 80px;
-  min-width: 80px;
-  height: 24px;
-  border: none;
-  outline: none;
-  background: transparent;
-  color: var(--gm-text);
-  font: inherit;
-  font-size: 13px;
-}
-
-.gmail-recipient-trailing {
-  flex: none;
-  padding-top: 5px;
-}
-
-.gmail-recipient-toggles {
-  display: flex;
-  gap: 10px;
-}
-
-.gmail-recipient-toggles button {
-  border: none;
-  background: transparent;
-  color: var(--gm-text-muted);
-  font: inherit;
-  font-size: 12px;
-  cursor: pointer;
-}
-
-.gmail-recipient-toggles button:hover {
-  color: var(--gm-text);
-  text-decoration: underline;
-}
-
-.gmail-compose-toolbar {
-  display: flex;
-  align-items: center;
-  gap: 2px;
-  flex: 1;
-  min-width: 0;
-  justify-content: center;
-}
-
-.gmail-compose-link-popover {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  padding: 8px 12px;
-  border-top: 1px solid var(--gm-border);
-  background: var(--gm-bg-input);
-}
-
-.gmail-compose-link-popover input {
-  flex: 1;
-  min-width: 0;
-  height: 28px;
-  padding: 0 8px;
-  border: 1px solid var(--gm-border-strong);
-  border-radius: 4px;
-  background: var(--gm-bg-card);
-  color: var(--gm-text);
-  font: inherit;
-  font-size: 12px;
-  outline: none;
-}
-
-.gmail-compose-link-popover input:focus {
-  border-color: var(--gm-accent);
-}
-
-.gmail-compose-link-popover button {
-  height: 26px;
-  padding: 0 10px;
-  border: 1px solid var(--gm-border-strong);
-  border-radius: 4px;
-  background: var(--gm-bg-pill);
-  color: var(--gm-text);
-  font: inherit;
-  font-size: 12px;
-  cursor: pointer;
-}
-
-.gmail-compose-link-popover button:hover {
-  background: var(--gm-bg-pill-hover);
-}
-
-.gmail-compose-link-popover-apply {
-  background: var(--gm-accent) !important;
-  border-color: var(--gm-accent) !important;
-  color: var(--gm-accent-fg) !important;
-  font-weight: 600;
-}
-
-.gmail-compose-link-popover-apply:hover {
-  background: var(--gm-accent-hover) !important;
-  border-color: var(--gm-accent-hover) !important;
-}
-
-.gmail-compose-tool {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  width: 26px;
-  height: 26px;
-  border: none;
-  border-radius: 4px;
-  background: transparent;
-  color: var(--gm-text-muted);
-  cursor: pointer;
-  transition: background 120ms ease, color 120ms ease;
-}
-
-.gmail-compose-tool:hover {
-  background: var(--gm-bg-pill-hover);
-  color: var(--gm-text);
-}
-
-.gmail-compose-tool.is-active {
-  background: var(--gm-bg-pill-hover);
-  color: var(--gm-accent);
-}
-
-.gmail-compose-tool-sep {
-  display: inline-block;
-  width: 1px;
-  height: 18px;
-  margin: 0 6px;
-  background: var(--gm-border-strong);
-}
-
-.gmail-compose-editor {
-  display: block;
-  width: 100%;
-  max-height: 360px;
-  overflow-y: auto;
-}
-
-.gmail-compose-content {
-  outline: none;
-  min-height: 120px;
-  padding: 12px;
-  background: transparent;
-  color: var(--gm-text);
-  font: 13px/1.55 inherit;
-}
-
-.gmail-compose-content p {
-  margin: 0;
-}
-
-.gmail-compose-content p + p,
-.gmail-compose-content p + ul,
-.gmail-compose-content p + ol,
-.gmail-compose-content p + blockquote {
-  margin-top: 8px;
-}
-
-.gmail-compose-content ul,
-.gmail-compose-content ol {
-  margin: 0;
-  padding-left: 22px;
-}
-
-.gmail-compose-content ul {
-  list-style: disc;
-}
-
-.gmail-compose-content ol {
-  list-style: decimal;
-}
-
-.gmail-compose-content li {
-  margin: 2px 0;
-}
-
-.gmail-compose-content li > p {
-  margin: 0;
-}
-
-.gmail-compose-content blockquote {
-  margin: 4px 0;
-  padding-left: 12px;
-  border-left: 2px solid var(--gm-border-strong);
-  color: var(--gm-text-muted);
-}
-
-.gmail-compose-content a {
-  color: var(--gm-accent);
-  text-decoration: underline;
-}
-
-.gmail-compose-content code {
-  padding: 1px 4px;
-  border-radius: 3px;
-  background: var(--gm-bg-pill-hover);
-  font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
-  font-size: 12px;
-}
-
-.gmail-compose-content p.is-editor-empty:first-child::before {
-  content: attr(data-placeholder);
-  color: var(--gm-placeholder);
-  float: left;
-  height: 0;
-  pointer-events: none;
-}
-
-.gmail-compose-actions {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  padding: 10px 12px;
-  border-top: 1px solid var(--gm-border);
-}
-
-.gmail-compose-actions-primary {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  flex-shrink: 0;
-}
-
-.gmail-refine-button {
-  display: inline-flex;
-  align-items: center;
-  gap: 8px;
-  box-sizing: border-box;
-  height: 30px;
-  padding: 0 14px;
-  border: 1px solid var(--gm-border-strong);
-  border-radius: 6px;
-  background: var(--gm-bg-pill);
-  color: var(--gm-text);
-  font: inherit;
-  font-size: 12px;
-  font-weight: 500;
-  cursor: pointer;
-  transition: background 120ms ease, border-color 120ms ease, color 120ms ease;
-}
-
-.gmail-refine-button:hover {
-  background: var(--gm-bg-pill-hover);
-  border-color: var(--gm-accent);
-  color: var(--gm-accent);
-}
-
-.gmail-send-button {
-  display: inline-flex;
-  align-items: center;
-  gap: 8px;
-  box-sizing: border-box;
-  height: 30px;
-  padding: 0 14px;
-  border: 1px solid transparent;
-  border-radius: 6px;
-  background: var(--gm-accent);
-  color: var(--gm-accent-fg);
-  font: inherit;
-  font-size: 12px;
-  font-weight: 600;
-  cursor: pointer;
-}
-
-.gmail-send-button:hover {
-  background: var(--gm-accent-hover);
-}
-
-.gmail-empty-state {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  flex: 1;
-  min-height: 0;
-  background: transparent;
-  color: var(--gm-text-faint);
-  font-size: 13px;
-}
-
 @theme inline {
   --radius-sm: calc(var(--radius) - 4px);
   --radius-md: calc(var(--radius) - 2px);
@@ -1165,7 +100,7 @@
 }
 
 :root {
-  --radius: 0.5rem;
+  --radius: 0.625rem;
   --background: var(--bg-color, oklch(1 0 0));
   --foreground: var(--text-color, oklch(0.145 0 0));
   --card: var(--bg-color, oklch(1 0 0));
@@ -1193,25 +128,13 @@
   --sidebar-foreground: var(--text-color, oklch(0.145 0 0));
   --sidebar-primary: var(--main-color, oklch(0.205 0 0));
   --sidebar-primary-foreground: var(--bg-color, oklch(0.985 0 0));
-  --sidebar-accent: var(--sub-color, oklch(0.9 0 0));
+  --sidebar-accent: var(--sub-color, oklch(0.90 0 0));
   --sidebar-accent-foreground: var(--text-color, oklch(0.205 0 0));
   --sidebar-border: var(--sub-alt-color, oklch(0.922 0 0));
   --sidebar-ring: var(--main-color, oklch(0.708 0 0));
   --scrollbar-track: oklch(0.95 0 0);
   --scrollbar-thumb: oklch(0.75 0 0);
   --scrollbar-thumb-hover: oklch(0.65 0 0);
-  /* Subtle raised-card surface: tints toward foreground, so it reads a hair
-     darker than the background in light mode and a hair lighter in dark mode.
-     Shared by the web search card and tool-call group. */
-  --card-surface: color-mix(in oklab, var(--background) 98.5%, var(--foreground));
-  --rowboat-panel: oklch(0.97 0 0);
-  --rowboat-raised: oklch(1 0 0);
-  --rowboat-wash: color-mix(in oklab, var(--background) 88%, var(--primary) 12%);
-  --rowboat-hairline: color-mix(in oklab, var(--border) 78%, var(--foreground) 22%);
-  --rowboat-command: oklch(0.205 0 0);
-  --rowboat-attention: oklch(0.646 0.222 41.116);
-  --rowboat-shadow: 0 1px 2px rgb(31 38 48 / 0.07), 0 18px 40px rgb(31 38 48 / 0.08);
-  --rowboat-shadow-soft: 0 1px 2px rgb(31 38 48 / 0.05), 0 8px 24px rgb(31 38 48 / 0.06);
 }
 
 .dark {
@@ -1249,14 +172,6 @@
   --scrollbar-track: oklch(0.2 0 0);
   --scrollbar-thumb: oklch(0.4 0 0);
   --scrollbar-thumb-hover: oklch(0.5 0 0);
-  --rowboat-panel: oklch(0.269 0 0);
-  --rowboat-raised: oklch(0.205 0 0);
-  --rowboat-wash: color-mix(in oklab, var(--background) 80%, var(--primary) 20%);
-  --rowboat-hairline: color-mix(in oklab, var(--border) 70%, var(--foreground) 30%);
-  --rowboat-command: oklch(0.922 0 0);
-  --rowboat-attention: oklch(0.769 0.188 70.08);
-  --rowboat-shadow: 0 1px 2px rgb(0 0 0 / 0.24), 0 22px 44px rgb(0 0 0 / 0.28);
-  --rowboat-shadow-soft: 0 1px 2px rgb(0 0 0 / 0.2), 0 12px 28px rgb(0 0 0 / 0.18);
 }
 
 @layer base {
@@ -1268,9 +183,6 @@
 
   body {
     @apply bg-background text-foreground;
-    font-family: Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
-    font-feature-settings: "cv02", "cv03", "cv04", "cv11";
-    text-rendering: optimizeLegibility;
   }
 
   ::-webkit-scrollbar {
@@ -1292,94 +204,6 @@
   }
 }
 
-.rowboat-shell {
-  background: var(--background);
-}
-
-.rowboat-sidebar [data-sidebar="sidebar"] {
-  background: var(--sidebar);
-  border-right: 1px solid var(--sidebar-border);
-}
-
-.rowboat-sidebar [data-sidebar="header"] {
-  gap: 0.625rem;
-  border-bottom: 1px solid color-mix(in oklab, var(--sidebar-border) 76%, transparent);
-  background: var(--sidebar);
-}
-
-.rowboat-section-switcher {
-  border: 1px solid color-mix(in oklab, var(--sidebar-border) 78%, transparent);
-  background: color-mix(in oklab, var(--sidebar-accent) 58%, var(--sidebar) 42%);
-  box-shadow: inset 0 1px 0 color-mix(in oklab, var(--foreground) 9%, transparent);
-}
-
-.rowboat-section-switcher button {
-  letter-spacing: 0;
-}
-
-.rowboat-section-switcher button[class*="shadow-sm"] {
-  background: var(--rowboat-raised);
-  box-shadow: var(--rowboat-shadow-soft);
-}
-
-.rowboat-quick-actions button {
-  min-height: 2rem;
-}
-
-.rowboat-quick-actions button svg {
-  color: color-mix(in oklab, var(--rowboat-command) 72%, var(--sidebar-foreground) 28%);
-}
-
-.rowboat-tabbar {
-  background: color-mix(in oklab, var(--background) 78%, var(--muted) 22%);
-}
-
-.rowboat-titlebar {
-  background: var(--background);
-  border-bottom-color: color-mix(in oklab, var(--border) 82%, transparent);
-}
-
-.rowboat-tab {
-  min-height: 2.5rem;
-  border-bottom: 1px solid transparent;
-}
-
-.rowboat-tab[class*="bg-background"] {
-  border-bottom-color: var(--primary);
-  background: var(--rowboat-raised);
-  box-shadow: inset 0 1px 0 color-mix(in oklab, var(--foreground) 8%, transparent);
-}
-
-.rowboat-composer-dock {
-  box-shadow: 0 -20px 44px color-mix(in oklab, var(--background) 78%, transparent);
-}
-
-.rowboat-chat-input {
-  border-color: color-mix(in oklab, var(--border) 74%, var(--primary) 26%);
-  background: var(--rowboat-raised);
-  box-shadow: var(--rowboat-shadow);
-}
-
-.rowboat-chat-input:focus-within {
-  border-color: color-mix(in oklab, var(--ring) 76%, var(--border) 24%);
-  box-shadow:
-    0 0 0 1px color-mix(in oklab, var(--ring) 38%, transparent),
-    var(--rowboat-shadow);
-}
-
-[data-slot="message-content"] {
-  line-height: 1.62;
-}
-
-.is-user [data-slot="message-content"] {
-  background: color-mix(in oklab, var(--secondary) 88%, var(--rowboat-wash) 12%);
-  border: 1px solid color-mix(in oklab, var(--border) 68%, transparent);
-}
-
-.is-assistant [data-slot="message-content"] {
-  color: color-mix(in oklab, var(--foreground) 94%, var(--muted-foreground) 6%);
-}
-
 /* Markdown content base styles for Streamdown/MessageResponse */
 @layer components {
   /* Target elements inside MessageResponse wrapper */
diff --git a/apps/x/apps/renderer/src/App.tsx b/apps/x/apps/renderer/src/App.tsx
index b850b57f..5ec8476b 100644
--- a/apps/x/apps/renderer/src/App.tsx
+++ b/apps/x/apps/renderer/src/App.tsx
@@ -5,20 +5,17 @@ import { RunEvent, ListRunsResponse } from '@x/shared/src/runs.js';
 import type { LanguageModelUsage, ToolUIPart } from 'ai';
 import './App.css'
 import z from 'zod';
-import { CheckIcon, LoaderIcon, PanelLeftIcon, ArrowLeft, ArrowRight, MessageSquare, ChevronLeftIcon, ChevronRightIcon, Plus, HistoryIcon } from 'lucide-react';
+import { CheckIcon, LoaderIcon, PanelLeftIcon, Maximize2, Minimize2, ChevronLeftIcon, ChevronRightIcon, SquarePen, HistoryIcon } from 'lucide-react';
 import { cn } from '@/lib/utils';
 import { MarkdownEditor, type MarkdownEditorHandle } from './components/markdown-editor';
 import { ChatSidebar } from './components/chat-sidebar';
-import { ChatHeader } from './components/chat-header';
-import { ChatEmptyState } from './components/chat-empty-state';
-import { ChatInputWithMentions, type PermissionMode, type StagedAttachment } from './components/chat-input-with-mentions';
+import { ChatInputWithMentions, type StagedAttachment } from './components/chat-input-with-mentions';
 import { ChatMessageAttachments } from '@/components/chat-message-attachments'
 import { GraphView, type GraphEdge, type GraphNode } from '@/components/graph-view';
 import { BasesView, type BaseConfig, DEFAULT_BASE_CONFIG } from '@/components/bases-view';
 import { ImageFileViewer } from '@/components/image-file-viewer';
 import { VideoFileViewer } from '@/components/video-file-viewer';
 import { AudioFileViewer } from '@/components/audio-file-viewer';
-import { DocxFileViewer } from '@/components/docx-file-viewer';
 import { PersistentViewerCache } from '@/components/persistent-viewer-cache';
 import { UnsupportedFileViewer } from '@/components/unsupported-file-viewer';
 import { getViewerType, isCacheableViewerPath } from '@/lib/file-types';
@@ -26,18 +23,11 @@ import { useDebounce } from './hooks/use-debounce';
 import { SidebarContentPanel } from '@/components/sidebar-content';
 import { SuggestedTopicsView } from '@/components/suggested-topics-view';
 import { LiveNotesView } from '@/components/live-notes-view';
-import { BgTasksView } from '@/components/bg-tasks-view';
-import { EmailView } from '@/components/email-view';
-import { WorkspaceView } from '@/components/workspace-view';
-import { CodingRunBlock } from '@/components/coding-run';
-import { KnowledgeView } from '@/components/knowledge-view';
-import { ChatHistoryView } from '@/components/chat-history-view';
-import { HomeView } from '@/components/home-view';
-import { MeetingsView } from '@/components/meetings-view';
 import { SidebarSectionProvider } from '@/contexts/sidebar-context';
 import {
   Conversation,
   ConversationContent,
+  ConversationEmptyState,
   ConversationScrollButton,
 } from '@/components/ai-elements/conversation';
 import {
@@ -57,10 +47,10 @@ import { WebSearchResult } from '@/components/ai-elements/web-search-result';
 import { AppActionCard } from '@/components/ai-elements/app-action-card';
 import { ComposioConnectCard } from '@/components/ai-elements/composio-connect-card';
 import { PermissionRequest } from '@/components/ai-elements/permission-request';
-import { AutoPermissionDecision } from '@/components/ai-elements/auto-permission-decision';
 import { TerminalOutput } from '@/components/terminal-output';
 import { AskHumanRequest } from '@/components/ai-elements/ask-human-request';
-import { ToolPermissionAutoDecisionEvent, ToolPermissionRequestEvent, AskHumanRequestEvent } from '@x/shared/src/runs.js';
+import { Suggestions } from '@/components/ai-elements/suggestions';
+import { ToolPermissionRequestEvent, AskHumanRequestEvent } from '@x/shared/src/runs.js';
 import {
   SidebarInset,
   SidebarProvider,
@@ -70,14 +60,12 @@ import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/comp
 import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription, DialogFooter } from "@/components/ui/dialog"
 import { Button } from "@/components/ui/button"
 import { Toaster } from "@/components/ui/sonner"
-import { BillingErrorDialog } from "@/components/billing-error-dialog"
-import { matchBillingError, type BillingErrorMatch } from "@/lib/billing-error"
-import { ensureMarkdownExtension, normalizeWikiPath, splitWikiFragment, stripKnowledgePrefix, toKnowledgePath, wikiLabel } from '@/lib/wiki-links'
+import { stripKnowledgePrefix, toKnowledgePath, wikiLabel } from '@/lib/wiki-links'
 import { splitFrontmatter, joinFrontmatter } from '@/lib/frontmatter'
 import { extractConferenceLink } from '@/lib/calendar-event'
 import { OnboardingModal } from '@/components/onboarding'
 import { ComposioGoogleMigrationModal } from '@/components/composio-google-migration-modal'
-import { CommandPalette, type CommandPaletteMention, type SearchType } from '@/components/search-dialog'
+import { CommandPalette, type CommandPaletteMention } from '@/components/search-dialog'
 import { LiveNoteSidebar } from '@/components/live-note-sidebar'
 import { BackgroundTaskDetail } from '@/components/background-task-detail'
 import { BrowserPane } from '@/components/browser-pane/BrowserPane'
@@ -118,7 +106,6 @@ import { useVoiceTTS } from '@/hooks/useVoiceTTS'
 import { useMeetingTranscription, type CalendarEventMeta } from '@/hooks/useMeetingTranscription'
 import { useAnalyticsIdentity } from '@/hooks/useAnalyticsIdentity'
 import * as analytics from '@/lib/analytics'
-import { useTheme } from '@/contexts/theme-context'
 
 type DirEntry = z.infer<typeof workspace.DirEntry>
 type RunEventType = z.infer<typeof RunEvent>
@@ -167,7 +154,6 @@ function AutoScrollPre({ className, children }: { className?: string; children:
 }
 
 const DEFAULT_SIDEBAR_WIDTH = 256
-const DEFAULT_CHAT_PANE_WIDTH = 460
 const wikiLinkRegex = /\[\[([^[\]]+)\]\]/g
 const graphPalette = [
   { hue: 210, sat: 72, light: 52 },
@@ -189,15 +175,7 @@ const TITLEBAR_BUTTONS_COLLAPSED = 1
 const TITLEBAR_BUTTON_GAPS_COLLAPSED = 0
 const GRAPH_TAB_PATH = '__rowboat_graph_view__'
 const SUGGESTED_TOPICS_TAB_PATH = '__rowboat_suggested_topics__'
-const MEETINGS_TAB_PATH = '__rowboat_meetings__'
 const LIVE_NOTES_TAB_PATH = '__rowboat_live_notes__'
-const BG_TASKS_TAB_PATH = '__rowboat_bg_tasks__'
-const EMAIL_TAB_PATH = '__rowboat_email__'
-const WORKSPACE_TAB_PATH = '__rowboat_workspace__'
-const WORKSPACE_ROOT = 'knowledge/Workspace'
-const KNOWLEDGE_VIEW_TAB_PATH = '__rowboat_knowledge_view__'
-const CHAT_HISTORY_TAB_PATH = '__rowboat_chat_history__'
-const HOME_TAB_PATH = '__rowboat_home__'
 const BASES_DEFAULT_TAB_PATH = '__rowboat_bases_default__'
 
 const clampNumber = (value: number, min: number, max: number) =>
@@ -327,14 +305,7 @@ const getAncestorDirectoryPaths = (path: string): string[] => {
 
 const isGraphTabPath = (path: string) => path === GRAPH_TAB_PATH
 const isSuggestedTopicsTabPath = (path: string) => path === SUGGESTED_TOPICS_TAB_PATH
-const isMeetingsTabPath = (path: string) => path === MEETINGS_TAB_PATH
 const isLiveNotesTabPath = (path: string) => path === LIVE_NOTES_TAB_PATH
-const isBgTasksTabPath = (path: string) => path === BG_TASKS_TAB_PATH
-const isEmailTabPath = (path: string) => path === EMAIL_TAB_PATH
-const isWorkspaceTabPath = (path: string) => path === WORKSPACE_TAB_PATH
-const isKnowledgeViewTabPath = (path: string) => path === KNOWLEDGE_VIEW_TAB_PATH
-const isChatHistoryTabPath = (path: string) => path === CHAT_HISTORY_TAB_PATH
-const isHomeTabPath = (path: string) => path === HOME_TAB_PATH
 const isBaseFilePath = (path: string) => path.endsWith('.base') || path === BASES_DEFAULT_TAB_PATH
 
 const getSuggestedTopicTargetFolder = (category?: string) => {
@@ -394,12 +365,6 @@ const buildSuggestedTopicExplorePrompt = ({
 const buildLiveNoteSetupPrompt = () =>
   'I want to set up a Live note / task.'
 
-const buildBgTaskSetupPrompt = (description: string) =>
-  `Create a background task for me. Here's what I want it to do:\n\n${description}`
-
-const buildBgTaskEditPrompt = (slug: string) =>
-  `Let's tweak the background task \`${slug}\`. Please load the \`background-task\` skill first, read the task's current \`bg-tasks/${slug}/task.yaml\`, then ask me what I want to change.`
-
 const normalizeUsage = (usage?: Partial<LanguageModelUsage> | null): LanguageModelUsage | null => {
   if (!usage) return null
   const hasNumbers = Object.values(usage).some((value) => typeof value === 'number')
@@ -582,21 +547,13 @@ type ViewState =
   | { type: 'graph' }
   | { type: 'task'; name: string }
   | { type: 'suggested-topics' }
-  | { type: 'meetings' }
   | { type: 'live-notes' }
-  | { type: 'email' }
-  | { type: 'workspace'; path?: string }
-  | { type: 'knowledge-view'; folderPath?: string }
-  | { type: 'chat-history' }
-  | { type: 'home' }
 
 function viewStatesEqual(a: ViewState, b: ViewState): boolean {
   if (a.type !== b.type) return false
   if (a.type === 'chat' && b.type === 'chat') return a.runId === b.runId
   if (a.type === 'file' && b.type === 'file') return a.path === b.path
   if (a.type === 'task' && b.type === 'task') return a.name === b.name
-  if (a.type === 'workspace' && b.type === 'workspace') return (a.path ?? '') === (b.path ?? '')
-  if (a.type === 'knowledge-view' && b.type === 'knowledge-view') return (a.folderPath ?? '') === (b.folderPath ?? '')
   return true // both graph
 }
 
@@ -604,13 +561,12 @@ function viewStatesEqual(a: ViewState, b: ViewState): boolean {
  * Parse a rowboat:// deep link into a ViewState. Returns null if the URL is
  * malformed or names an unknown target.
  *
- * Shape: rowboat://open?type=<file|chat|graph|task|suggested-topics|meetings|live-notes>&...
+ * Shape: rowboat://open?type=<file|chat|graph|task|suggested-topics|live-notes>&...
  *   file:             ?type=file&path=knowledge/foo.md
  *   chat:             ?type=chat&runId=abc123        (runId optional)
  *   graph:            ?type=graph
  *   task:             ?type=task&name=daily-brief
  *   suggested-topics: ?type=suggested-topics
- *   meetings:         ?type=meetings
  *   live-notes:       ?type=live-notes
  */
 function parseDeepLink(input: string): ViewState | null {
@@ -636,22 +592,8 @@ function parseDeepLink(input: string): ViewState | null {
     }
     case 'suggested-topics':
       return { type: 'suggested-topics' }
-    case 'meetings':
-      return { type: 'meetings' }
     case 'live-notes':
       return { type: 'live-notes' }
-    case 'workspace': {
-      const path = params.get('path')
-      return { type: 'workspace', path: path ?? undefined }
-    }
-    case 'knowledge-view': {
-      const folderPath = params.get('folderPath')
-      return { type: 'knowledge-view', folderPath: folderPath ?? undefined }
-    }
-    case 'chat-history':
-      return { type: 'chat-history' }
-    case 'home':
-      return { type: 'home' }
     default:
       return null
   }
@@ -665,7 +607,7 @@ function FixedSidebarToggle({
 }) {
   const { toggleSidebar } = useSidebar()
   return (
-    <div className="fixed left-0 top-0 z-50 flex h-10 items-center gap-1" style={{ WebkitAppRegion: 'no-drag' } as React.CSSProperties}>
+    <div className="fixed left-0 top-0 z-50 flex h-10 items-center" style={{ WebkitAppRegion: 'no-drag' } as React.CSSProperties}>
       <div aria-hidden="true" className="h-10 shrink-0" style={{ width: leftInsetPx }} />
       {/* Sidebar toggle */}
       <button
@@ -701,7 +643,7 @@ function ContentHeader({
   const isCollapsed = state === "collapsed"
   return (
     <header
-      className="rowboat-titlebar titlebar-drag-region flex h-10 shrink-0 items-stretch border-b border-border bg-sidebar overflow-hidden"
+      className="titlebar-drag-region flex h-10 shrink-0 items-stretch border-b border-border bg-sidebar overflow-hidden"
       style={{
         paddingLeft: isCollapsed ? (collapsedLeftPaddingPx ?? 196) : 12,
         paddingRight: 12,
@@ -739,9 +681,6 @@ function ContentHeader({
 }
 
 function App() {
-  const { chatPanePlacement, chatPaneSize } = useTheme()
-  const isChatPaneInMiddle = chatPanePlacement === 'middle'
-
   type ShortcutPane = 'left' | 'right'
   type MarkdownHistoryHandlers = { undo: () => boolean; redo: () => boolean }
 
@@ -760,29 +699,12 @@ function App() {
   const [isGraphOpen, setIsGraphOpen] = useState(false)
   const [isBrowserOpen, setIsBrowserOpen] = useState(false)
   const [isSuggestedTopicsOpen, setIsSuggestedTopicsOpen] = useState(false)
-  const [isMeetingsOpen, setIsMeetingsOpen] = useState(false)
   const [isLiveNotesOpen, setIsLiveNotesOpen] = useState(false)
-  const [isBgTasksOpen, setIsBgTasksOpen] = useState(false)
-  const [isEmailOpen, setIsEmailOpen] = useState(false)
-  const [isWorkspaceOpen, setIsWorkspaceOpen] = useState(false)
-  const [workspaceInitialPath, setWorkspaceInitialPath] = useState<string | null>(null)
-  const [isKnowledgeViewOpen, setIsKnowledgeViewOpen] = useState(false)
-  // Folder being browsed inside the knowledge view (null = root overview).
-  // Lives in ViewState so folder drill-down participates in back/forward history.
-  const [knowledgeViewFolderPath, setKnowledgeViewFolderPath] = useState<string | null>(null)
-  const [isChatHistoryOpen, setIsChatHistoryOpen] = useState(false)
-  // Default landing view: Home with the chat docked according to appearance settings.
-  const [isHomeOpen, setIsHomeOpen] = useState(true)
-  const [emailInitialThreadId, setEmailInitialThreadId] = useState<string | null>(null)
-  const [emailThreadIdVersion, setEmailThreadIdVersion] = useState(0)
   const [expandedFrom, setExpandedFrom] = useState<{
     path: string | null
     graph: boolean
     suggestedTopics: boolean
-    meetings: boolean
     liveNotes: boolean
-    bgTasks: boolean
-    email: boolean
   } | null>(null)
   const [baseConfigByPath, setBaseConfigByPath] = useState<Record<string, BaseConfig>>({})
   const [graphData, setGraphData] = useState<{ nodes: GraphNode[]; edges: GraphEdge[] }>({
@@ -793,14 +715,6 @@ function App() {
   const [graphError, setGraphError] = useState<string | null>(null)
   const [isChatSidebarOpen, setIsChatSidebarOpen] = useState(true)
   const [isRightPaneMaximized, setIsRightPaneMaximized] = useState(false)
-  // Middle-pane collapse animation. Animating its max-width from 100% is janky:
-  // 100% is relative to the parent (far wider than the pane's real width), so the
-  // transition spends its first frames non-binding (nothing moves) then snaps shut.
-  // Instead we snapshot the pane's real px width before it collapses and drive the
-  // transition from that value.
-  const [insetCollapseFromPx, setInsetCollapseFromPx] = useState<number | null>(null)
-  const [insetMaxWidth, setInsetMaxWidth] = useState<string>('100%')
-  const [insetAnimateMaxWidth, setInsetAnimateMaxWidth] = useState(true)
   // Live-note panel: bound to a single note path. Mounted as a sibling of the
   // markdown editor so it shares the layout (no overlap with chat) and
   // auto-closes when the active note changes.
@@ -853,25 +767,7 @@ function App() {
   // Chat state
   const [, setMessage] = useState<string>('')
   const [conversation, setConversation] = useState<ConversationItem[]>([])
-  const [billingErrorMatch, setBillingErrorMatch] = useState<BillingErrorMatch | null>(null)
-  const [billingErrorOpen, setBillingErrorOpen] = useState(false)
-  const lastHandledBillingErrorIdRef = useRef<string | null>(null)
   const [currentAssistantMessage, setCurrentAssistantMessage] = useState<string>('')
-
-  useEffect(() => {
-    for (let i = conversation.length - 1; i >= 0; i--) {
-      const item = conversation[i]
-      if (!isErrorMessage(item)) continue
-      if (item.id === lastHandledBillingErrorIdRef.current) return
-      const match = matchBillingError(item.message)
-      if (match) {
-        lastHandledBillingErrorIdRef.current = item.id
-        setBillingErrorMatch(match)
-        setBillingErrorOpen(true)
-      }
-      return
-    }
-  }, [conversation])
   const [, setModelUsage] = useState<LanguageModelUsage | null>(null)
   const [runId, setRunId] = useState<string | null>(null)
   const runIdRef = useRef<string | null>(null)
@@ -968,7 +864,7 @@ function App() {
     voice.start()
   }, [voice])
 
-  const handlePromptSubmitRef = useRef<((message: PromptInputMessage, mentions?: FileMention[], stagedAttachments?: StagedAttachment[], searchEnabled?: boolean, codeMode?: 'claude' | 'codex', permissionMode?: PermissionMode) => Promise<void>) | null>(null)
+  const handlePromptSubmitRef = useRef<((message: PromptInputMessage, mentions?: FileMention[], stagedAttachments?: StagedAttachment[], searchEnabled?: boolean) => Promise<void>) | null>(null)
   const pendingVoiceInputRef = useRef(false)
 
   // Palette: per-tab editor handles for capturing cursor context on Cmd+K, and pending payload
@@ -1039,19 +935,15 @@ function App() {
 
   // Chat tab state
   const [chatTabs, setChatTabs] = useState<ChatTab[]>([{ id: 'default-chat-tab', runId: null }])
-  const chatTabsRef = useRef(chatTabs)
-  chatTabsRef.current = chatTabs
   const [activeChatTabId, setActiveChatTabId] = useState('default-chat-tab')
   const [chatViewStateByTab, setChatViewStateByTab] = useState<Record<string, ChatTabViewState>>({
     'default-chat-tab': createEmptyChatTabViewState(),
   })
   const chatViewStateByTabRef = useRef(chatViewStateByTab)
+  const chatTabIdCounterRef = useRef(0)
+  const newChatTabId = () => `chat-tab-${++chatTabIdCounterRef.current}`
   const chatDraftsRef = useRef(new Map<string, string>())
   const selectedModelByTabRef = useRef(new Map<string, { provider: string; model: string }>())
-  // Work directory is per-chat. Keyed by tab id; null/absent means none set.
-  const [workDirByTab, setWorkDirByTab] = useState<Record<string, string | null>>({})
-  const workDirByTabRef = useRef(workDirByTab)
-  workDirByTabRef.current = workDirByTab
   const chatScrollTopByTabRef = useRef(new Map<string, number>())
   const [toolOpenByTab, setToolOpenByTab] = useState<Record<string, Record<string, boolean>>>({})
   const [chatViewportAnchorByTab, setChatViewportAnchorByTab] = useState<Record<string, ChatViewportAnchorState>>({})
@@ -1064,36 +956,6 @@ function App() {
       chatDraftsRef.current.delete(tabId)
     }
   }, [])
-  // Persist a run's work directory to its per-run sidecar config file. The agent
-  // runtime reads this same file (config/workdir-<runId>.json) on each turn.
-  const persistRunWorkDir = useCallback(async (runId: string, value: string | null) => {
-    try {
-      await window.ipc.invoke('workspace:writeFile', {
-        path: `config/workdir-${runId}.json`,
-        data: JSON.stringify(value ? { path: value } : {}, null, 2),
-      })
-    } catch (err) {
-      console.error('Failed to persist work directory for run', runId, err)
-    }
-  }, [])
-  // Read a run's persisted work directory (used when (re)opening a run into a tab).
-  const loadRunWorkDir = useCallback(async (runId: string): Promise<string | null> => {
-    try {
-      const result = await window.ipc.invoke('workspace:readFile', { path: `config/workdir-${runId}.json` })
-      const parsed = JSON.parse(result.data)
-      const value = typeof parsed?.path === 'string' ? parsed.path.trim() : ''
-      return value || null
-    } catch {
-      return null
-    }
-  }, [])
-  const setTabWorkDir = useCallback((tabId: string, value: string | null) => {
-    setWorkDirByTab((prev) => ({ ...prev, [tabId]: value }))
-    // If the tab is already bound to a run, persist immediately so the change
-    // applies to that chat's subsequent messages.
-    const runId = chatTabsRef.current.find((t) => t.id === tabId)?.runId
-    if (runId) void persistRunWorkDir(runId, value)
-  }, [persistRunWorkDir])
   const isToolOpenForTab = useCallback((tabId: string, toolId: string): boolean => {
     return toolOpenByTab[tabId]?.[toolId] ?? false
   }, [toolOpenByTab])
@@ -1155,8 +1017,8 @@ function App() {
   }, [processingRunIds])
 
   // File tab state
-  const [fileTabs, setFileTabs] = useState<FileTab[]>([{ id: 'home-tab', path: HOME_TAB_PATH }])
-  const [activeFileTabId, setActiveFileTabId] = useState<string | null>('home-tab')
+  const [fileTabs, setFileTabs] = useState<FileTab[]>([])
+  const [activeFileTabId, setActiveFileTabId] = useState<string | null>(null)
   const activeFileTabIdRef = useRef(activeFileTabId)
   activeFileTabIdRef.current = activeFileTabId
   const [editorSessionByTabId, setEditorSessionByTabId] = useState<Record<string, number>>({})
@@ -1167,14 +1029,7 @@ function App() {
   const getFileTabTitle = useCallback((tab: FileTab) => {
     if (isGraphTabPath(tab.path)) return 'Graph View'
     if (isSuggestedTopicsTabPath(tab.path)) return 'Suggested Topics'
-    if (isMeetingsTabPath(tab.path)) return 'Meetings'
     if (isLiveNotesTabPath(tab.path)) return 'Live notes'
-    if (isBgTasksTabPath(tab.path)) return 'Background tasks'
-    if (isEmailTabPath(tab.path)) return 'Email'
-    if (isWorkspaceTabPath(tab.path)) return 'Workspace'
-    if (isKnowledgeViewTabPath(tab.path)) return 'Notes'
-    if (isChatHistoryTabPath(tab.path)) return 'Chat history'
-    if (isHomeTabPath(tab.path)) return 'Home'
     if (tab.path === BASES_DEFAULT_TAB_PATH) return 'Bases'
     if (tab.path.endsWith('.base')) return tab.path.split('/').pop()?.replace(/\.base$/i, '') || 'Base'
     return tab.path.split('/').pop()?.replace(/\.md$/i, '') || tab.path
@@ -1187,7 +1042,6 @@ function App() {
   const [allPermissionRequests, setAllPermissionRequests] = useState<Map<string, z.infer<typeof ToolPermissionRequestEvent>>>(new Map())
   // Track permission responses (toolCallId -> response)
   const [permissionResponses, setPermissionResponses] = useState<Map<string, 'approve' | 'deny'>>(new Map())
-  const [autoPermissionDecisions, setAutoPermissionDecisions] = useState<Map<string, z.infer<typeof ToolPermissionAutoDecisionEvent>>>(new Map())
 
   useEffect(() => {
     chatViewStateByTabRef.current = chatViewStateByTab
@@ -1201,7 +1055,6 @@ function App() {
       pendingAskHumanRequests: new Map(pendingAskHumanRequests),
       allPermissionRequests: new Map(allPermissionRequests),
       permissionResponses: new Map(permissionResponses),
-      autoPermissionDecisions: new Map(autoPermissionDecisions),
     }
     setChatViewStateByTab((prev) => ({ ...prev, [activeChatTabId]: snapshot }))
   }, [
@@ -1212,7 +1065,6 @@ function App() {
     pendingAskHumanRequests,
     allPermissionRequests,
     permissionResponses,
-    autoPermissionDecisions,
   ])
 
   useEffect(() => {
@@ -1264,8 +1116,6 @@ function App() {
 
   // Search state
   const [isSearchOpen, setIsSearchOpen] = useState(false)
-  // Optional scope override for the next time search opens (cleared on close).
-  const [searchDefaultScope, setSearchDefaultScope] = useState<SearchType | undefined>(undefined)
 
   // Background tasks state
   type BackgroundTaskItem = {
@@ -1468,13 +1318,6 @@ function App() {
         loadBackgroundTasks()
       }
 
-      // Reload bg-task summaries if anything under bg-tasks/ changed
-      if (
-        eventPaths.some((p) => p === 'bg-tasks' || p.startsWith('bg-tasks/'))
-      ) {
-        loadBgTaskSummaries()
-      }
-
       // Invalidate cached content for files changed outside the active editor.
       // This prevents stale backlinks after rename-rewrite passes touch many files.
       for (const path of eventPaths) {
@@ -1820,39 +1663,6 @@ function App() {
     loadRuns()
   }, [loadRuns])
 
-  const [bgTaskSummaries, setBgTaskSummaries] = useState<Array<{
-    slug: string
-    name: string
-    active: boolean
-    createdAt: string
-    lastAttemptAt?: string
-    lastRunAt?: string
-    lastRunError?: string
-  }>>([])
-  const [bgTaskInitialSlug, setBgTaskInitialSlug] = useState<string | null>(null)
-  const [bgTaskSlugVersion, setBgTaskSlugVersion] = useState(0)
-
-  const loadBgTaskSummaries = useCallback(async () => {
-    try {
-      const result = await window.ipc.invoke('bg-task:list', { limit: 200 })
-      setBgTaskSummaries(result.items.map((it) => ({
-        slug: it.slug,
-        name: it.name,
-        active: it.active,
-        createdAt: it.createdAt,
-        lastAttemptAt: it.lastAttemptAt,
-        lastRunAt: it.lastRunAt,
-        lastRunError: it.lastRunError,
-      })))
-    } catch (err) {
-      console.error('Failed to load bg-task summaries:', err)
-    }
-  }, [])
-
-  useEffect(() => {
-    loadBgTaskSummaries()
-  }, [loadBgTaskSummaries])
-
   // Load background tasks
   const loadBackgroundTasks = useCallback(async () => {
     try {
@@ -2036,7 +1846,6 @@ function App() {
       // Track permission requests and responses from history
       const allPermissionRequests = new Map<string, z.infer<typeof ToolPermissionRequestEvent>>()
       const permResponseMap = new Map<string, 'approve' | 'deny'>()
-      const autoPermissionDecisions = new Map<string, z.infer<typeof ToolPermissionAutoDecisionEvent>>()
       const askHumanRequests = new Map<string, z.infer<typeof AskHumanRequestEvent>>()
       const respondedAskHumanIds = new Set<string>()
 
@@ -2045,8 +1854,6 @@ function App() {
           allPermissionRequests.set(event.toolCall.toolCallId, event)
         } else if (event.type === 'tool-permission-response') {
           permResponseMap.set(event.toolCallId, event.response)
-        } else if (event.type === 'tool-permission-auto-decision') {
-          autoPermissionDecisions.set(event.toolCallId, event)
         } else if (event.type === 'ask-human-request') {
           askHumanRequests.set(event.toolCallId, event)
         } else if (event.type === 'ask-human-response') {
@@ -2079,17 +1886,10 @@ function App() {
       setPendingAskHumanRequests(pendingAsks)
       setAllPermissionRequests(allPermissionRequests)
       setPermissionResponses(permResponseMap)
-      setAutoPermissionDecisions(autoPermissionDecisions)
-
-      // Restore the run's per-chat work directory into the tab it was loaded into.
-      const tabId = activeChatTabIdRef.current
-      const wd = await loadRunWorkDir(id)
-      if (loadRunRequestIdRef.current !== requestId) return
-      setWorkDirByTab((prev) => ({ ...prev, [tabId]: wd }))
     } catch (err) {
       console.error('Failed to load run:', err)
     }
-  }, [loadRunWorkDir])
+  }, [])
 
   const getStreamingBuffer = useCallback((id: string) => {
     const existing = streamingBuffersRef.current.get(id)
@@ -2296,8 +2096,6 @@ function App() {
                   ...item,
                   result: event.result as ToolUIPart['output'],
                   status: 'completed' as const,
-                  // a code_agent_run finished — drop any lingering permission card
-                  pendingCodePermission: null,
                 }
               }
               return item
@@ -2315,7 +2113,7 @@ function App() {
             return next
           })
 
-          if (event.toolCallId) {
+          if (event.toolCallId && event.toolName !== 'executeCommand') {
             setToolOpenForTab(activeChatTabIdRef.current, event.toolCallId, false)
           }
 
@@ -2378,43 +2176,6 @@ function App() {
         break
       }
 
-      case 'code-run-event': {
-        if (!isActiveRun) return
-        setConversation(prev => prev.map(item => {
-          if (isToolCall(item) && item.id === event.toolCallId) {
-            const existing = item.codeRunEvents ?? []
-            if (existing.length === 0) {
-              setToolOpenForTab(activeChatTabIdRef.current, item.id, true)
-            }
-            return { ...item, codeRunEvents: [...existing, event.event] }
-          }
-          return item
-        }))
-        break
-      }
-
-      case 'code-run-permission-request': {
-        if (!isActiveRun) return
-        setConversation(prev => prev.map(item => {
-          if (isToolCall(item) && item.id === event.toolCallId) {
-            setToolOpenForTab(activeChatTabIdRef.current, item.id, true)
-            return { ...item, pendingCodePermission: { requestId: event.requestId, ask: event.ask } }
-          }
-          return item
-        }))
-        break
-      }
-
-      case 'tool-permission-auto-decision': {
-        if (!isActiveRun) return
-        setAutoPermissionDecisions(prev => {
-          const next = new Map(prev)
-          next.set(event.toolCallId, event)
-          return next
-        })
-        break
-      }
-
       case 'ask-human-request': {
         if (!isActiveRun) return
         const key = event.toolCallId
@@ -2481,9 +2242,7 @@ function App() {
           message: event.error,
           timestamp: Date.now(),
         }])
-        if (!matchBillingError(event.error)) {
-          toast.error(event.error.split('\n')[0] || 'Model error')
-        }
+        toast.error(event.error.split('\n')[0] || 'Model error')
         console.error('Run error:', event.error)
         break
     }
@@ -2530,8 +2289,6 @@ function App() {
     mentions?: FileMention[],
     stagedAttachments: StagedAttachment[] = [],
     searchEnabled?: boolean,
-    codeMode?: 'claude' | 'codex',
-    permissionMode?: PermissionMode,
   ) => {
     if (isProcessing) return
 
@@ -2571,7 +2328,6 @@ function App() {
         const run = await window.ipc.invoke('runs:create', {
           agentId,
           ...(selected ? { model: selected.model, provider: selected.provider } : {}),
-          permissionMode: permissionMode ?? 'manual',
         })
         currentRunId = run.id
         newRunCreatedAt = run.createdAt
@@ -2583,10 +2339,6 @@ function App() {
             ? { ...tab, runId: currentRunId }
             : tab
         )))
-        // Flush this tab's pending work directory onto the freshly created run so
-        // the agent picks it up on the first turn. Done before createMessage below.
-        const pendingWorkDir = workDirByTabRef.current[submitTabId] ?? null
-        if (pendingWorkDir) await persistRunWorkDir(currentRunId, pendingWorkDir)
         isNewRun = true
       }
 
@@ -2644,7 +2396,6 @@ function App() {
           voiceInput: pendingVoiceInputRef.current || undefined,
           voiceOutput: ttsEnabledRef.current ? ttsModeRef.current : undefined,
           searchEnabled: searchEnabled || undefined,
-          codeMode: codeMode || undefined,
           middlePaneContext,
         })
         analytics.chatMessageSent({
@@ -2660,7 +2411,6 @@ function App() {
           voiceInput: pendingVoiceInputRef.current || undefined,
           voiceOutput: ttsEnabledRef.current ? ttsModeRef.current : undefined,
           searchEnabled: searchEnabled || undefined,
-          codeMode: codeMode || undefined,
           middlePaneContext,
         })
         analytics.chatMessageSent({
@@ -2747,26 +2497,6 @@ function App() {
     }
   }, [runId])
 
-  // Answer a mid-run permission request from a code_agent_run coding turn. The
-  // pending ask lives on the tool call itself, so we optimistically clear it and
-  // tell main which decision the user picked (keyed by the request id).
-  const handleCodePermissionResponse = useCallback(async (
-    toolCallId: string,
-    requestId: string,
-    decision: 'allow_once' | 'allow_always' | 'reject',
-  ) => {
-    setConversation(prev => prev.map(item =>
-      isToolCall(item) && item.id === toolCallId
-        ? { ...item, pendingCodePermission: null }
-        : item
-    ))
-    try {
-      await window.ipc.invoke('codeRun:resolvePermission', { requestId, decision })
-    } catch (error) {
-      console.error('Failed to resolve code permission:', error)
-    }
-  }, [])
-
   const handleAskHumanResponse = useCallback(async (toolCallId: string, subflow: string[], response: string) => {
     if (!runId) return
     try {
@@ -2796,15 +2526,12 @@ function App() {
     setPendingAskHumanRequests(new Map())
     setAllPermissionRequests(new Map())
     setPermissionResponses(new Map())
-    setAutoPermissionDecisions(new Map())
     setSelectedBackgroundTask(null)
     setChatViewportAnchor(activeChatTabIdRef.current, null)
     setChatViewStateByTab(prev => ({
       ...prev,
       [activeChatTabIdRef.current]: createEmptyChatTabViewState(),
     }))
-    // A brand-new chat starts with no work directory.
-    setWorkDirByTab(prev => ({ ...prev, [activeChatTabIdRef.current]: null }))
   }, [setChatViewportAnchor])
 
   // Chat tab operations
@@ -2823,7 +2550,6 @@ function App() {
       setPendingAskHumanRequests(new Map())
       setAllPermissionRequests(new Map())
       setPermissionResponses(new Map())
-      setAutoPermissionDecisions(new Map())
       setChatViewportAnchor(tab.id, null)
     }
   }, [loadRun, setChatViewportAnchor])
@@ -2849,11 +2575,29 @@ function App() {
     setPendingAskHumanRequests(new Map(cached.pendingAskHumanRequests))
     setAllPermissionRequests(new Map(cached.allPermissionRequests))
     setPermissionResponses(new Map(cached.permissionResponses))
-    setAutoPermissionDecisions(new Map(cached.autoPermissionDecisions))
     setIsProcessing(Boolean(resolvedRunId && processingRunIdsRef.current.has(resolvedRunId)))
     return true
   }, [])
 
+  const openChatInNewTab = useCallback((targetRunId: string) => {
+    cancelRecordingIfActive()
+    const existingTab = chatTabs.find(t => t.runId === targetRunId)
+    if (existingTab) {
+      // Cancel stale in-flight loads from previously focused tabs.
+      loadRunRequestIdRef.current += 1
+      setActiveChatTabId(existingTab.id)
+      const restored = restoreChatTabState(existingTab.id, existingTab.runId)
+      if (processingRunIdsRef.current.has(targetRunId) || !restored) {
+        loadRun(targetRunId)
+      }
+      return
+    }
+    const id = newChatTabId()
+    setChatTabs(prev => [...prev, { id, runId: targetRunId }])
+    setActiveChatTabId(id)
+    loadRun(targetRunId)
+  }, [chatTabs, loadRun, restoreChatTabState, cancelRecordingIfActive])
+
   const switchChatTab = useCallback((tabId: string) => {
     const tab = chatTabs.find(t => t.id === tabId)
     if (!tab) return
@@ -2894,12 +2638,6 @@ function App() {
     chatDraftsRef.current.delete(tabId)
     selectedModelByTabRef.current.delete(tabId)
     chatScrollTopByTabRef.current.delete(tabId)
-    setWorkDirByTab((prev) => {
-      if (!(tabId in prev)) return prev
-      const next = { ...prev }
-      delete next[tabId]
-      return next
-    })
     setToolOpenByTab((prev) => {
       if (!(tabId in prev)) return prev
       const next = { ...prev }
@@ -3004,7 +2742,7 @@ function App() {
       setActiveFileTabId(existingTab.id)
       setIsGraphOpen(false)
       setIsSuggestedTopicsOpen(false)
-      setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
+      setIsLiveNotesOpen(false)
       setSelectedPath(path)
       return
     }
@@ -3013,7 +2751,7 @@ function App() {
     setActiveFileTabId(id)
     setIsGraphOpen(false)
     setIsSuggestedTopicsOpen(false)
-    setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
+    setIsLiveNotesOpen(false)
     setSelectedPath(path)
   }, [fileTabs, dismissBrowserOverlay])
 
@@ -3032,130 +2770,32 @@ function App() {
       setSelectedPath(null)
       setIsGraphOpen(true)
       setIsSuggestedTopicsOpen(false)
-      setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
+      setIsLiveNotesOpen(false)
       return
     }
     if (isSuggestedTopicsTabPath(tab.path)) {
       setSelectedPath(null)
       setIsGraphOpen(false)
       setIsSuggestedTopicsOpen(true)
-      setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
+      setIsLiveNotesOpen(false)
       return
     }
     if (isLiveNotesTabPath(tab.path)) {
       setSelectedPath(null)
       setIsGraphOpen(false)
       setIsSuggestedTopicsOpen(false)
-      setIsMeetingsOpen(false)
-      setIsBgTasksOpen(false)
-      setIsEmailOpen(false)
-      setIsWorkspaceOpen(false)
-      setIsKnowledgeViewOpen(false)
-      setIsChatHistoryOpen(false)
-      setIsHomeOpen(false)
       setIsLiveNotesOpen(true)
       return
     }
-    if (isBgTasksTabPath(tab.path)) {
-      setSelectedPath(null)
-      setIsGraphOpen(false)
-      setIsSuggestedTopicsOpen(false)
-      setIsMeetingsOpen(false)
-      setIsLiveNotesOpen(false)
-      setIsEmailOpen(false)
-      setIsWorkspaceOpen(false)
-      setIsKnowledgeViewOpen(false)
-      setIsChatHistoryOpen(false)
-      setIsHomeOpen(false)
-      setIsBgTasksOpen(true)
-      return
-    }
-    if (isMeetingsTabPath(tab.path)) {
-      setSelectedPath(null)
-      setIsGraphOpen(false)
-      setIsSuggestedTopicsOpen(false)
-      setIsMeetingsOpen(true)
-      setIsLiveNotesOpen(false)
-      setIsBgTasksOpen(false)
-      setIsEmailOpen(false)
-      setIsWorkspaceOpen(false)
-      setIsKnowledgeViewOpen(false)
-      setIsChatHistoryOpen(false)
-      setIsHomeOpen(false)
-      return
-    }
-    if (isEmailTabPath(tab.path)) {
-      setSelectedPath(null)
-      setIsGraphOpen(false)
-      setIsSuggestedTopicsOpen(false)
-      setIsMeetingsOpen(false)
-      setIsLiveNotesOpen(false)
-      setIsBgTasksOpen(false)
-      setIsWorkspaceOpen(false)
-      setIsKnowledgeViewOpen(false)
-      setIsChatHistoryOpen(false)
-      setIsHomeOpen(false)
-      setIsEmailOpen(true)
-      return
-    }
-    if (isWorkspaceTabPath(tab.path)) {
-      setSelectedPath(null)
-      setIsGraphOpen(false)
-      setIsSuggestedTopicsOpen(false)
-      setIsMeetingsOpen(false)
-      setIsLiveNotesOpen(false)
-      setIsBgTasksOpen(false)
-      setIsEmailOpen(false)
-      setIsKnowledgeViewOpen(false)
-      setIsChatHistoryOpen(false)
-      setIsHomeOpen(false)
-      setIsWorkspaceOpen(true)
-      return
-    }
-    if (isKnowledgeViewTabPath(tab.path)) {
-      setSelectedPath(null)
-      setIsGraphOpen(false)
-      setIsSuggestedTopicsOpen(false)
-      setIsMeetingsOpen(false)
-      setIsLiveNotesOpen(false)
-      setIsBgTasksOpen(false)
-      setIsEmailOpen(false)
-      setIsWorkspaceOpen(false)
-      setIsChatHistoryOpen(false)
-      setIsHomeOpen(false)
-      setIsKnowledgeViewOpen(true)
-      return
-    }
-    if (isChatHistoryTabPath(tab.path)) {
-      setSelectedPath(null)
-      setIsGraphOpen(false)
-      setIsSuggestedTopicsOpen(false)
-      setIsMeetingsOpen(false)
-      setIsLiveNotesOpen(false)
-      setIsBgTasksOpen(false)
-      setIsEmailOpen(false)
-      setIsWorkspaceOpen(false)
-      setIsKnowledgeViewOpen(false)
-      setIsChatHistoryOpen(true); setIsHomeOpen(false)
-      return
-    }
-    if (isHomeTabPath(tab.path)) {
-      setSelectedPath(null)
-      setIsGraphOpen(false)
-      setIsSuggestedTopicsOpen(false)
-      setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false)
-      setIsHomeOpen(true)
-      return
-    }
     setIsGraphOpen(false)
     setIsSuggestedTopicsOpen(false)
-    setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
+    setIsLiveNotesOpen(false)
     setSelectedPath(tab.path)
   }, [fileTabs, isRightPaneMaximized, dismissBrowserOverlay])
 
   const closeFileTab = useCallback((tabId: string) => {
     const closingTab = fileTabs.find(t => t.id === tabId)
-    if (closingTab && !isGraphTabPath(closingTab.path) && !isSuggestedTopicsTabPath(closingTab.path) && !isLiveNotesTabPath(closingTab.path) && !isBgTasksTabPath(closingTab.path) && !isEmailTabPath(closingTab.path) && !isWorkspaceTabPath(closingTab.path) && !isKnowledgeViewTabPath(closingTab.path) && !isChatHistoryTabPath(closingTab.path) && !isHomeTabPath(closingTab.path) && !isBaseFilePath(closingTab.path)) {
+    if (closingTab && !isGraphTabPath(closingTab.path) && !isBaseFilePath(closingTab.path)) {
       removeEditorCacheForPath(closingTab.path)
       initialContentByPathRef.current.delete(closingTab.path)
       untitledRenameReadyPathsRef.current.delete(closingTab.path)
@@ -3178,7 +2818,7 @@ function App() {
         setSelectedPath(null)
         setIsGraphOpen(false)
         setIsSuggestedTopicsOpen(false)
-        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
+        setIsLiveNotesOpen(false)
           return []
       }
       const idx = prev.findIndex(t => t.id === tabId)
@@ -3192,105 +2832,21 @@ function App() {
           setSelectedPath(null)
           setIsGraphOpen(true)
           setIsSuggestedTopicsOpen(false)
-          setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
+          setIsLiveNotesOpen(false)
         } else if (isSuggestedTopicsTabPath(newActiveTab.path)) {
           setSelectedPath(null)
           setIsGraphOpen(false)
           setIsSuggestedTopicsOpen(true)
-          setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
-        } else if (isMeetingsTabPath(newActiveTab.path)) {
-          setSelectedPath(null)
-          setIsGraphOpen(false)
-          setIsSuggestedTopicsOpen(false)
-          setIsMeetingsOpen(true)
           setIsLiveNotesOpen(false)
-          setIsBgTasksOpen(false)
-          setIsEmailOpen(false)
-          setIsWorkspaceOpen(false)
-          setIsKnowledgeViewOpen(false)
-          setIsChatHistoryOpen(false)
-      setIsHomeOpen(false)
         } else if (isLiveNotesTabPath(newActiveTab.path)) {
           setSelectedPath(null)
           setIsGraphOpen(false)
           setIsSuggestedTopicsOpen(false)
-          setIsMeetingsOpen(false)
-          setIsBgTasksOpen(false)
-          setIsEmailOpen(false)
-          setIsWorkspaceOpen(false)
-          setIsKnowledgeViewOpen(false)
-          setIsChatHistoryOpen(false)
-      setIsHomeOpen(false)
           setIsLiveNotesOpen(true)
-        } else if (isBgTasksTabPath(newActiveTab.path)) {
-          setSelectedPath(null)
-          setIsGraphOpen(false)
-          setIsSuggestedTopicsOpen(false)
-          setIsMeetingsOpen(false)
-          setIsLiveNotesOpen(false)
-          setIsBgTasksOpen(true)
-          setIsEmailOpen(false)
-          setIsWorkspaceOpen(false)
-          setIsKnowledgeViewOpen(false)
-          setIsChatHistoryOpen(false)
-      setIsHomeOpen(false)
-        } else if (isEmailTabPath(newActiveTab.path)) {
-          setSelectedPath(null)
-          setIsGraphOpen(false)
-          setIsSuggestedTopicsOpen(false)
-          setIsMeetingsOpen(false)
-          setIsLiveNotesOpen(false)
-          setIsBgTasksOpen(false)
-          setIsWorkspaceOpen(false)
-          setIsKnowledgeViewOpen(false)
-          setIsChatHistoryOpen(false)
-      setIsHomeOpen(false)
-          setIsEmailOpen(true)
-        } else if (isWorkspaceTabPath(newActiveTab.path)) {
-          setSelectedPath(null)
-          setIsGraphOpen(false)
-          setIsSuggestedTopicsOpen(false)
-          setIsMeetingsOpen(false)
-          setIsLiveNotesOpen(false)
-          setIsBgTasksOpen(false)
-          setIsEmailOpen(false)
-          setIsKnowledgeViewOpen(false)
-          setIsChatHistoryOpen(false)
-      setIsHomeOpen(false)
-          setIsWorkspaceOpen(true)
-        } else if (isKnowledgeViewTabPath(newActiveTab.path)) {
-          setSelectedPath(null)
-          setIsGraphOpen(false)
-          setIsSuggestedTopicsOpen(false)
-          setIsMeetingsOpen(false)
-          setIsLiveNotesOpen(false)
-          setIsBgTasksOpen(false)
-          setIsEmailOpen(false)
-          setIsWorkspaceOpen(false)
-          setIsChatHistoryOpen(false)
-      setIsHomeOpen(false)
-          setIsKnowledgeViewOpen(true)
-        } else if (isChatHistoryTabPath(newActiveTab.path)) {
-          setSelectedPath(null)
-          setIsGraphOpen(false)
-          setIsSuggestedTopicsOpen(false)
-          setIsMeetingsOpen(false)
-          setIsLiveNotesOpen(false)
-          setIsBgTasksOpen(false)
-          setIsEmailOpen(false)
-          setIsWorkspaceOpen(false)
-          setIsKnowledgeViewOpen(false)
-          setIsChatHistoryOpen(true); setIsHomeOpen(false)
-        } else if (isHomeTabPath(newActiveTab.path)) {
-          setSelectedPath(null)
-          setIsGraphOpen(false)
-          setIsSuggestedTopicsOpen(false)
-          setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false)
-          setIsHomeOpen(true)
         } else {
           setIsGraphOpen(false)
           setIsSuggestedTopicsOpen(false)
-          setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
+          setIsLiveNotesOpen(false)
               setSelectedPath(newActiveTab.path)
         }
       }
@@ -3306,21 +2862,27 @@ function App() {
   }, [activeFileTabId, fileTabs, removeEditorCacheForPath])
 
   const handleNewChatTab = useCallback(() => {
-    // Single-chat model: reset the one conversation in place instead of
-    // opening a new tab.
-    setChatTabs([{ id: activeChatTabIdRef.current, runId: null }])
+    // If there's already an empty "New chat" tab, switch to it
+    const emptyTab = chatTabs.find(t => !t.runId)
+    if (emptyTab) {
+      if (emptyTab.id !== activeChatTabId) {
+        setActiveChatTabId(emptyTab.id)
+      }
+    } else {
+      // Create a new tab
+      const id = newChatTabId()
+      setChatTabs(prev => [...prev, { id, runId: null }])
+        setActiveChatTabId(id)
+    }
     dismissBrowserOverlay()
     handleNewChat()
     // Left-pane "new chat" should always open full chat view.
-    if (selectedPath || isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen || isWorkspaceOpen || isKnowledgeViewOpen || isChatHistoryOpen || isHomeOpen) {
+    if (selectedPath || isGraphOpen || isSuggestedTopicsOpen || isLiveNotesOpen) {
       setExpandedFrom({
         path: selectedPath,
         graph: isGraphOpen,
         suggestedTopics: isSuggestedTopicsOpen,
-        meetings: isMeetingsOpen,
         liveNotes: isLiveNotesOpen,
-        bgTasks: isBgTasksOpen,
-        email: isEmailOpen,
       })
     } else {
       setExpandedFrom(null)
@@ -3329,14 +2891,23 @@ function App() {
     setSelectedPath(null)
     setIsGraphOpen(false)
     setIsSuggestedTopicsOpen(false)
-    setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
-  }, [dismissBrowserOverlay, handleNewChat, selectedPath, isGraphOpen, isSuggestedTopicsOpen, isMeetingsOpen, isLiveNotesOpen, isBgTasksOpen, isEmailOpen, isWorkspaceOpen, isKnowledgeViewOpen, isChatHistoryOpen, isHomeOpen])
+    setIsLiveNotesOpen(false)
+  }, [chatTabs, activeChatTabId, dismissBrowserOverlay, handleNewChat, selectedPath, isGraphOpen, isSuggestedTopicsOpen, isLiveNotesOpen])
 
-  // Sidebar variant: reset the chat in place without leaving file/graph context.
+  // Sidebar variant: create/switch chat tab without leaving file/graph context.
   const handleNewChatTabInSidebar = useCallback(() => {
-    setChatTabs([{ id: activeChatTabIdRef.current, runId: null }])
+    const emptyTab = chatTabs.find(t => !t.runId)
+    if (emptyTab) {
+      if (emptyTab.id !== activeChatTabId) {
+        setActiveChatTabId(emptyTab.id)
+      }
+    } else {
+      const id = newChatTabId()
+      setChatTabs(prev => [...prev, { id, runId: null }])
+      setActiveChatTabId(id)
+    }
     handleNewChat()
-  }, [handleNewChat])
+  }, [chatTabs, activeChatTabId, handleNewChat])
 
   // Palette → sidebar submission. Opens the sidebar (if closed), forces a fresh chat tab,
   // queues the message; the pending-submit effect (below) flushes it once state has settled
@@ -3423,10 +2994,9 @@ function App() {
     return () => window.removeEventListener('rowboat:open-copilot-prompt', handler as EventListener)
   }, [submitFromPalette])
 
-  // Reveal the chat in the right side pane (from the middle-panel chat icon).
-  const openChatSidePane = useCallback(() => {
+  const toggleKnowledgePane = useCallback(() => {
     setIsRightPaneMaximized(false)
-    setIsChatSidebarOpen(true)
+    setIsChatSidebarOpen(prev => !prev)
   }, [])
 
   // Browser is an overlay on the middle pane: opening it forces the chat
@@ -3449,28 +3019,17 @@ function App() {
 
   const toggleRightPaneMaximize = useCallback(() => {
     setIsChatSidebarOpen(true)
-    setIsRightPaneMaximized(prev => {
-      if (!prev) {
-        // About to collapse the middle pane: capture its real width now, while it's
-        // still laid out, so the collapse can animate from a binding px value.
-        const px = document.querySelector('[data-slot="sidebar-inset"]')?.getBoundingClientRect().width
-        setInsetCollapseFromPx(px && px > 0 ? px : null)
-      }
-      return !prev
-    })
+    setIsRightPaneMaximized(prev => !prev)
   }, [])
 
   const handleOpenFullScreenChat = useCallback(() => {
     // Remember where we came from so the close button can return
-    if (selectedPath || isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen || isWorkspaceOpen || isKnowledgeViewOpen || isChatHistoryOpen || isHomeOpen) {
+    if (selectedPath || isGraphOpen || isSuggestedTopicsOpen || isLiveNotesOpen) {
       setExpandedFrom({
         path: selectedPath,
         graph: isGraphOpen,
         suggestedTopics: isSuggestedTopicsOpen,
-        meetings: isMeetingsOpen,
         liveNotes: isLiveNotesOpen,
-        bgTasks: isBgTasksOpen,
-        email: isEmailOpen,
       })
     }
     dismissBrowserOverlay()
@@ -3478,80 +3037,42 @@ function App() {
     setSelectedPath(null)
     setIsGraphOpen(false)
     setIsSuggestedTopicsOpen(false)
-    setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
-  }, [selectedPath, isGraphOpen, isSuggestedTopicsOpen, isMeetingsOpen, isLiveNotesOpen, isBgTasksOpen, isEmailOpen, isWorkspaceOpen, isKnowledgeViewOpen, isChatHistoryOpen, dismissBrowserOverlay])
+    setIsLiveNotesOpen(false)
+  }, [selectedPath, isGraphOpen, isSuggestedTopicsOpen, isLiveNotesOpen, dismissBrowserOverlay])
 
-  const handleCloseFullScreenChat = useCallback((): boolean => {
-    let restored = false
+  const handleCloseFullScreenChat = useCallback(() => {
     if (expandedFrom) {
-      restored = true
       if (expandedFrom.graph) {
         setIsGraphOpen(true)
         setIsSuggestedTopicsOpen(false)
-        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
+        setIsLiveNotesOpen(false)
       } else if (expandedFrom.suggestedTopics) {
         setIsGraphOpen(false)
         setIsSuggestedTopicsOpen(true)
-        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
-      } else if (expandedFrom.meetings) {
-        setIsGraphOpen(false)
-        setIsSuggestedTopicsOpen(false)
-        setIsMeetingsOpen(true)
         setIsLiveNotesOpen(false)
-        setIsBgTasksOpen(false)
-        setIsEmailOpen(false)
       } else if (expandedFrom.liveNotes) {
         setIsGraphOpen(false)
         setIsSuggestedTopicsOpen(false)
-        setIsMeetingsOpen(false)
-        setIsBgTasksOpen(false)
-        setIsEmailOpen(false)
         setIsLiveNotesOpen(true)
-      } else if (expandedFrom.bgTasks) {
-        setIsGraphOpen(false)
-        setIsSuggestedTopicsOpen(false)
-        setIsMeetingsOpen(false)
-        setIsLiveNotesOpen(false)
-        setIsBgTasksOpen(true)
-        setIsEmailOpen(false)
-      } else if (expandedFrom.email) {
-        setIsGraphOpen(false)
-        setIsSuggestedTopicsOpen(false)
-        setIsMeetingsOpen(false)
-        setIsLiveNotesOpen(false)
-        setIsBgTasksOpen(false)
-        setIsEmailOpen(true)
       } else if (expandedFrom.path) {
         setIsGraphOpen(false)
         setIsSuggestedTopicsOpen(false)
-        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
+        setIsLiveNotesOpen(false)
         setSelectedPath(expandedFrom.path)
-      } else {
-        // expandedFrom was captured from a view this restorer doesn't track
-        // (e.g. Home): there's nothing to re-open, so report it and let the
-        // caller fall back instead of leaving a blank full-screen chat.
-        restored = false
       }
       setExpandedFrom(null)
       setIsRightPaneMaximized(false)
     }
-    return restored
   }, [expandedFrom])
 
   const currentViewState = React.useMemo<ViewState>(() => {
     if (selectedBackgroundTask) return { type: 'task', name: selectedBackgroundTask }
-    if (isEmailOpen) return { type: 'email' }
-    if (isMeetingsOpen) return { type: 'meetings' }
     if (isLiveNotesOpen) return { type: 'live-notes' }
     if (isSuggestedTopicsOpen) return { type: 'suggested-topics' }
-    if (isWorkspaceOpen) return { type: 'workspace', path: workspaceInitialPath ?? undefined }
-    if (isKnowledgeViewOpen) return { type: 'knowledge-view', folderPath: knowledgeViewFolderPath ?? undefined }
-    if (isChatHistoryOpen) return { type: 'chat-history' }
-    if (isHomeOpen) return { type: 'home' }
     if (selectedPath) return { type: 'file', path: selectedPath }
     if (isGraphOpen) return { type: 'graph' }
     return { type: 'chat', runId }
-  }, [selectedBackgroundTask, isEmailOpen, isMeetingsOpen, isLiveNotesOpen, isBgTasksOpen, isSuggestedTopicsOpen, selectedPath, isGraphOpen, isWorkspaceOpen, isKnowledgeViewOpen, knowledgeViewFolderPath, isChatHistoryOpen, isHomeOpen, workspaceInitialPath, runId])
+  }, [selectedBackgroundTask, isLiveNotesOpen, isSuggestedTopicsOpen, selectedPath, isGraphOpen, runId])
 
   const appendUnique = useCallback((stack: ViewState[], entry: ViewState) => {
     const last = stack[stack.length - 1]
@@ -3619,138 +3140,6 @@ function App() {
     setActiveFileTabId(id)
   }, [fileTabs])
 
-  const ensureMeetingsFileTab = useCallback(() => {
-    const existing = fileTabs.find((tab) => isMeetingsTabPath(tab.path))
-    if (existing) {
-      setActiveFileTabId(existing.id)
-      return
-    }
-    const id = newFileTabId()
-    setFileTabs((prev) => [...prev, { id, path: MEETINGS_TAB_PATH }])
-    setActiveFileTabId(id)
-  }, [fileTabs])
-
-  const ensureBgTasksFileTab = useCallback(() => {
-    const existing = fileTabs.find((tab) => isBgTasksTabPath(tab.path))
-    if (existing) {
-      setActiveFileTabId(existing.id)
-      return
-    }
-    const id = newFileTabId()
-    setFileTabs((prev) => [...prev, { id, path: BG_TASKS_TAB_PATH }])
-    setActiveFileTabId(id)
-  }, [fileTabs])
-
-  const ensureEmailFileTab = useCallback(() => {
-    const existing = fileTabs.find((tab) => isEmailTabPath(tab.path))
-    if (existing) {
-      setActiveFileTabId(existing.id)
-      return
-    }
-    const id = newFileTabId()
-    setFileTabs((prev) => [...prev, { id, path: EMAIL_TAB_PATH }])
-    setActiveFileTabId(id)
-  }, [fileTabs])
-
-  const ensureWorkspaceFileTab = useCallback(() => {
-    const existing = fileTabs.find((tab) => isWorkspaceTabPath(tab.path))
-    if (existing) {
-      setActiveFileTabId(existing.id)
-      return
-    }
-    const id = newFileTabId()
-    setFileTabs((prev) => [...prev, { id, path: WORKSPACE_TAB_PATH }])
-    setActiveFileTabId(id)
-  }, [fileTabs])
-
-  const ensureKnowledgeViewFileTab = useCallback(() => {
-    const existing = fileTabs.find((tab) => isKnowledgeViewTabPath(tab.path))
-    if (existing) {
-      setActiveFileTabId(existing.id)
-      return
-    }
-    const id = newFileTabId()
-    setFileTabs((prev) => [...prev, { id, path: KNOWLEDGE_VIEW_TAB_PATH }])
-    setActiveFileTabId(id)
-  }, [fileTabs])
-
-  const ensureChatHistoryFileTab = useCallback(() => {
-    const existing = fileTabs.find((tab) => isChatHistoryTabPath(tab.path))
-    if (existing) {
-      setActiveFileTabId(existing.id)
-      return
-    }
-    const id = newFileTabId()
-    setFileTabs((prev) => [...prev, { id, path: CHAT_HISTORY_TAB_PATH }])
-    setActiveFileTabId(id)
-  }, [fileTabs])
-
-  const ensureHomeFileTab = useCallback(() => {
-    const existing = fileTabs.find((tab) => isHomeTabPath(tab.path))
-    if (existing) {
-      setActiveFileTabId(existing.id)
-      return
-    }
-    const id = newFileTabId()
-    setFileTabs((prev) => [...prev, { id, path: HOME_TAB_PATH }])
-    setActiveFileTabId(id)
-  }, [fileTabs])
-
-  const openEmailView = useCallback((threadId?: string) => {
-    setSelectedPath(null)
-    setIsGraphOpen(false)
-    setIsBrowserOpen(false)
-    setIsSuggestedTopicsOpen(false)
-    setIsMeetingsOpen(false)
-    setIsLiveNotesOpen(false)
-    setIsBgTasksOpen(false)
-    setIsWorkspaceOpen(false)
-    setIsKnowledgeViewOpen(false)
-    setIsChatHistoryOpen(false)
-    setIsHomeOpen(false)
-    setSelectedBackgroundTask(null)
-    setExpandedFrom(null)
-    setIsRightPaneMaximized(false)
-    setIsEmailOpen(true)
-    if (threadId) {
-      setEmailInitialThreadId(threadId)
-      setEmailThreadIdVersion((v) => v + 1)
-    }
-    ensureEmailFileTab()
-  }, [ensureEmailFileTab])
-
-  const openBgTasksView = useCallback(() => {
-    setSelectedPath(null)
-    setIsGraphOpen(false)
-    setIsBrowserOpen(false)
-    setIsSuggestedTopicsOpen(false)
-    setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
-    setSelectedBackgroundTask(null)
-    setExpandedFrom(null)
-    setIsRightPaneMaximized(false)
-    setIsBgTasksOpen(true)
-    ensureBgTasksFileTab()
-  }, [ensureBgTasksFileTab])
-
-  const openMeetingsView = useCallback(() => {
-    setSelectedPath(null)
-    setIsGraphOpen(false)
-    setIsBrowserOpen(false)
-    setIsSuggestedTopicsOpen(false)
-    setIsMeetingsOpen(true)
-    setIsLiveNotesOpen(false)
-    setIsBgTasksOpen(false)
-    setIsEmailOpen(false)
-    setIsWorkspaceOpen(false)
-    setIsKnowledgeViewOpen(false)
-    setIsChatHistoryOpen(false)
-    setIsHomeOpen(false)
-    setSelectedBackgroundTask(null)
-    setExpandedFrom(null)
-    setIsRightPaneMaximized(false)
-    ensureMeetingsFileTab()
-  }, [ensureMeetingsFileTab])
-
   const applyViewState = useCallback(async (view: ViewState) => {
     switch (view.type) {
       case 'file':
@@ -3760,7 +3149,7 @@ function App() {
         // visible in the middle pane.
         setIsBrowserOpen(false)
         setIsSuggestedTopicsOpen(false)
-        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
+        setIsLiveNotesOpen(false)
         setExpandedFrom(null)
         // Preserve split vs knowledge-max mode when navigating knowledge files.
         // Only exit chat-only maximize, because that would hide the selected file.
@@ -3775,7 +3164,7 @@ function App() {
         setSelectedPath(null)
         setIsBrowserOpen(false)
         setIsSuggestedTopicsOpen(false)
-        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
+        setIsLiveNotesOpen(false)
         setExpandedFrom(null)
         setIsGraphOpen(true)
         ensureGraphFileTab()
@@ -3788,7 +3177,7 @@ function App() {
         setIsGraphOpen(false)
         setIsBrowserOpen(false)
         setIsSuggestedTopicsOpen(false)
-        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
+        setIsLiveNotesOpen(false)
         setExpandedFrom(null)
         setIsRightPaneMaximized(false)
         setSelectedBackgroundTask(view.name)
@@ -3801,26 +3190,8 @@ function App() {
         setIsRightPaneMaximized(false)
         setSelectedBackgroundTask(null)
         setIsSuggestedTopicsOpen(true)
-        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
-        ensureSuggestedTopicsFileTab()
-        return
-      case 'meetings':
-        setSelectedPath(null)
-        setIsGraphOpen(false)
-        setIsBrowserOpen(false)
-        setExpandedFrom(null)
-        setIsRightPaneMaximized(false)
-        setSelectedBackgroundTask(null)
-        setIsSuggestedTopicsOpen(false)
-        setIsMeetingsOpen(true)
         setIsLiveNotesOpen(false)
-        setIsBgTasksOpen(false)
-        setIsEmailOpen(false)
-        setIsWorkspaceOpen(false)
-        setIsKnowledgeViewOpen(false)
-        setIsChatHistoryOpen(false)
-      setIsHomeOpen(false)
-        ensureMeetingsFileTab()
+        ensureSuggestedTopicsFileTab()
         return
       case 'live-notes':
         setSelectedPath(null)
@@ -3830,107 +3201,9 @@ function App() {
         setIsRightPaneMaximized(false)
         setSelectedBackgroundTask(null)
         setIsSuggestedTopicsOpen(false)
-        setIsMeetingsOpen(false)
-        setIsBgTasksOpen(false)
-        setIsEmailOpen(false)
-        setIsWorkspaceOpen(false)
-        setIsKnowledgeViewOpen(false)
-        setIsChatHistoryOpen(false)
-      setIsHomeOpen(false)
         setIsLiveNotesOpen(true)
         ensureLiveNotesFileTab()
         return
-      case 'email':
-        setSelectedPath(null)
-        setIsGraphOpen(false)
-        setIsBrowserOpen(false)
-        setExpandedFrom(null)
-        setIsRightPaneMaximized(false)
-        setSelectedBackgroundTask(null)
-        setIsSuggestedTopicsOpen(false)
-        setIsMeetingsOpen(false)
-        setIsLiveNotesOpen(false)
-        setIsBgTasksOpen(false)
-        setIsEmailOpen(true)
-        setIsWorkspaceOpen(false)
-        setIsKnowledgeViewOpen(false)
-        setIsChatHistoryOpen(false)
-      setIsHomeOpen(false)
-        ensureEmailFileTab()
-        return
-      case 'workspace':
-        setSelectedPath(null)
-        setIsGraphOpen(false)
-        setIsBrowserOpen(false)
-        setExpandedFrom(null)
-        setIsRightPaneMaximized(false)
-        setSelectedBackgroundTask(null)
-        setIsSuggestedTopicsOpen(false)
-        setIsMeetingsOpen(false)
-        setIsLiveNotesOpen(false)
-        setIsBgTasksOpen(false)
-        setIsEmailOpen(false)
-        setIsWorkspaceOpen(true)
-        setIsKnowledgeViewOpen(false)
-        setIsChatHistoryOpen(false)
-      setIsHomeOpen(false)
-        setWorkspaceInitialPath(view.path ?? null)
-        ensureWorkspaceFileTab()
-        return
-      case 'knowledge-view':
-        setSelectedPath(null)
-        setIsGraphOpen(false)
-        setIsBrowserOpen(false)
-        setExpandedFrom(null)
-        setIsRightPaneMaximized(false)
-        setSelectedBackgroundTask(null)
-        setIsSuggestedTopicsOpen(false)
-        setIsMeetingsOpen(false)
-        setIsLiveNotesOpen(false)
-        setIsBgTasksOpen(false)
-        setIsEmailOpen(false)
-        setIsWorkspaceOpen(false)
-        setIsKnowledgeViewOpen(true)
-        setKnowledgeViewFolderPath(view.folderPath ?? null)
-        setIsChatHistoryOpen(false)
-      setIsHomeOpen(false)
-        ensureKnowledgeViewFileTab()
-        return
-      case 'chat-history':
-        setSelectedPath(null)
-        setIsGraphOpen(false)
-        setIsBrowserOpen(false)
-        setExpandedFrom(null)
-        setIsRightPaneMaximized(false)
-        setSelectedBackgroundTask(null)
-        setIsSuggestedTopicsOpen(false)
-        setIsMeetingsOpen(false)
-        setIsLiveNotesOpen(false)
-        setIsBgTasksOpen(false)
-        setIsEmailOpen(false)
-        setIsWorkspaceOpen(false)
-        setIsKnowledgeViewOpen(false)
-        setIsChatHistoryOpen(true); setIsHomeOpen(false)
-        ensureChatHistoryFileTab()
-        return
-      case 'home':
-        setSelectedPath(null)
-        setIsGraphOpen(false)
-        setIsBrowserOpen(false)
-        setExpandedFrom(null)
-        setIsRightPaneMaximized(false)
-        setSelectedBackgroundTask(null)
-        setIsSuggestedTopicsOpen(false)
-        setIsMeetingsOpen(false)
-        setIsLiveNotesOpen(false)
-        setIsBgTasksOpen(false)
-        setIsEmailOpen(false)
-        setIsWorkspaceOpen(false)
-        setIsKnowledgeViewOpen(false)
-        setIsChatHistoryOpen(false)
-        setIsHomeOpen(true)
-        ensureHomeFileTab()
-        return
       case 'chat':
         setSelectedPath(null)
         setIsGraphOpen(false)
@@ -3939,27 +3212,15 @@ function App() {
         setIsRightPaneMaximized(false)
         setSelectedBackgroundTask(null)
         setIsSuggestedTopicsOpen(false)
-        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
+        setIsLiveNotesOpen(false)
         if (view.runId) {
-          const targetRunId = view.runId
-          // Bind the loaded run to a chat tab so its title (derived from
-          // tab.runId) updates. Reuse an existing tab for this run if one is
-          // open, otherwise rebind the active tab.
-          const existingTab = chatTabsRef.current.find((tab) => tab.runId === targetRunId)
-          if (existingTab) {
-            setActiveChatTabId(existingTab.id)
-          } else {
-            setChatTabs((prev) => prev.map((tab) => (
-              tab.id === activeChatTabIdRef.current ? { ...tab, runId: targetRunId } : tab
-            )))
-          }
-          await loadRun(targetRunId)
+          await loadRun(view.runId)
         } else {
           handleNewChat()
         }
         return
     }
-  }, [ensureEmailFileTab, ensureMeetingsFileTab, ensureLiveNotesFileTab, ensureFileTabForPath, ensureGraphFileTab, ensureSuggestedTopicsFileTab, ensureWorkspaceFileTab, ensureKnowledgeViewFileTab, ensureChatHistoryFileTab, ensureHomeFileTab, handleNewChat, isRightPaneMaximized, loadRun])
+  }, [ensureLiveNotesFileTab, ensureFileTabForPath, ensureGraphFileTab, ensureSuggestedTopicsFileTab, handleNewChat, isRightPaneMaximized, loadRun])
 
   const navigateToView = useCallback(async (nextView: ViewState) => {
     const current = currentViewState
@@ -3979,19 +3240,6 @@ function App() {
     await applyViewState(nextView)
   }, [appendUnique, applyViewState, cancelRecordingIfActive, currentViewState, setHistory, isBrowserOpen, dismissBrowserOverlay])
 
-  // Move the maximized/full-screen chat into the right side pane: restore the
-  // view we expanded from (or fall back to Home) and dock the chat on the right.
-  const pushChatToSidePane = useCallback(() => {
-    setIsRightPaneMaximized(false)
-    setIsChatSidebarOpen(true)
-    // Restore the view we expanded from; if there was nothing to restore
-    // (e.g. the chat was started fresh from Home), fall back to Home so a
-    // single click always docks the chat instead of needing two.
-    if (!handleCloseFullScreenChat()) {
-      void navigateToView({ type: 'home' })
-    }
-  }, [handleCloseFullScreenChat, navigateToView])
-
   const navigateBack = useCallback(async () => {
     const { back, forward } = historyRef.current
     if (back.length === 0) return
@@ -4294,7 +3542,7 @@ function App() {
   }, [])
 
   // Keyboard shortcut: Ctrl+L to toggle main chat view
-  const isFullScreenChat = !selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isMeetingsOpen && !isLiveNotesOpen && !isBgTasksOpen && !isEmailOpen && !isWorkspaceOpen && !isKnowledgeViewOpen && !isChatHistoryOpen && !isHomeOpen && !selectedBackgroundTask && !isBrowserOpen
+  const isFullScreenChat = !selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isLiveNotesOpen && !selectedBackgroundTask && !isBrowserOpen
   useEffect(() => {
     const handleKeyDown = (e: KeyboardEvent) => {
       if ((e.ctrlKey || e.metaKey) && e.key === 'l') {
@@ -4322,18 +3570,6 @@ function App() {
     return () => document.removeEventListener('keydown', handleKeyDown)
   }, [])
 
-  // Keyboard shortcut: Cmd+N / Ctrl+N opens a new chat tab.
-  useEffect(() => {
-    const handleKeyDown = (e: KeyboardEvent) => {
-      if ((e.ctrlKey || e.metaKey) && !e.shiftKey && !e.altKey && e.key.toLowerCase() === 'n') {
-        e.preventDefault()
-        handleNewChatTab()
-      }
-    }
-    document.addEventListener('keydown', handleKeyDown)
-    return () => document.removeEventListener('keydown', handleKeyDown)
-  }, [handleNewChatTab])
-
   // Route undo/redo to the active markdown tab only (prevents cross-tab browser undo behavior).
   useEffect(() => {
     const handleHistoryKeyDown = (e: KeyboardEvent) => {
@@ -4379,31 +3615,17 @@ function App() {
     const handleTabKeyDown = (e: KeyboardEvent) => {
       const mod = e.metaKey || e.ctrlKey
       if (!mod) return
-      const rightPaneAvailable = Boolean((selectedPath || isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen || isWorkspaceOpen || isKnowledgeViewOpen || isChatHistoryOpen || isHomeOpen) && isChatSidebarOpen)
+      const rightPaneAvailable = Boolean((selectedPath || isGraphOpen || isSuggestedTopicsOpen || isLiveNotesOpen) && isChatSidebarOpen)
       const targetPane: ShortcutPane = rightPaneAvailable
         ? (isRightPaneMaximized ? 'right' : activeShortcutPane)
         : 'left'
-      const inFileView = targetPane === 'left' && Boolean(selectedPath || isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen || isWorkspaceOpen || isKnowledgeViewOpen || isChatHistoryOpen || isHomeOpen)
+      const inFileView = targetPane === 'left' && Boolean(selectedPath || isGraphOpen || isSuggestedTopicsOpen || isLiveNotesOpen)
       const selectedKnowledgePath = isGraphOpen
         ? GRAPH_TAB_PATH
         : isSuggestedTopicsOpen
           ? SUGGESTED_TOPICS_TAB_PATH
-          : isMeetingsOpen
-            ? MEETINGS_TAB_PATH
           : isLiveNotesOpen
             ? LIVE_NOTES_TAB_PATH
-          : isBgTasksOpen
-            ? BG_TASKS_TAB_PATH
-          : isEmailOpen
-            ? EMAIL_TAB_PATH
-          : isWorkspaceOpen
-            ? WORKSPACE_TAB_PATH
-          : isKnowledgeViewOpen
-            ? KNOWLEDGE_VIEW_TAB_PATH
-          : isChatHistoryOpen
-            ? CHAT_HISTORY_TAB_PATH
-          : isHomeOpen
-            ? HOME_TAB_PATH
           : selectedPath
       const targetFileTabId = activeFileTabId ?? (
         selectedKnowledgePath
@@ -4458,7 +3680,7 @@ function App() {
     }
     document.addEventListener('keydown', handleTabKeyDown)
     return () => document.removeEventListener('keydown', handleTabKeyDown)
-  }, [selectedPath, isGraphOpen, isSuggestedTopicsOpen, isMeetingsOpen, isLiveNotesOpen, isBgTasksOpen, isEmailOpen, isWorkspaceOpen, isKnowledgeViewOpen, isChatHistoryOpen, isChatSidebarOpen, isRightPaneMaximized, activeShortcutPane, chatTabs, fileTabs, activeChatTabId, activeFileTabId, closeChatTab, closeFileTab, switchChatTab, switchFileTab])
+  }, [selectedPath, isGraphOpen, isSuggestedTopicsOpen, isLiveNotesOpen, isChatSidebarOpen, isRightPaneMaximized, activeShortcutPane, chatTabs, fileTabs, activeChatTabId, activeFileTabId, closeChatTab, closeFileTab, switchChatTab, switchFileTab])
 
   const toggleExpand = (path: string, kind: 'file' | 'dir') => {
     if (kind === 'file') {
@@ -4483,7 +3705,7 @@ function App() {
           }),
         },
       }))
-      if (!selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isMeetingsOpen && !isLiveNotesOpen && !isBgTasksOpen && !isEmailOpen && !isWorkspaceOpen && !isKnowledgeViewOpen && !isChatHistoryOpen && !selectedBackgroundTask) {
+      if (!selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isLiveNotesOpen && !selectedBackgroundTask) {
         setIsChatSidebarOpen(false)
         setIsRightPaneMaximized(false)
       }
@@ -4594,23 +3816,14 @@ function App() {
       }
     },
     createFolder: async (parentPath: string = 'knowledge'): Promise<string> => {
+      const newPath = `${parentPath}/new-folder-${Date.now()}`
       try {
-        let index = 1
-        let name = 'New folder'
-        let fullPath = `${parentPath}/${name}`
-        while (index < 1000) {
-          const exists = await window.ipc.invoke('workspace:exists', { path: fullPath })
-          if (!exists.exists) break
-          index += 1
-          name = `New folder ${index}`
-          fullPath = `${parentPath}/${name}`
-        }
         await window.ipc.invoke('workspace:mkdir', {
-          path: fullPath,
+          path: newPath,
           recursive: true
         })
         setExpandedPaths(prev => new Set([...prev, parentPath]))
-        return fullPath
+        return newPath
       } catch (err) {
         console.error('Failed to create folder:', err)
         throw err
@@ -4618,47 +3831,19 @@ function App() {
     },
     openGraph: () => {
       // From chat-only landing state, open graph directly in full knowledge view.
-      if (!selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isMeetingsOpen && !isLiveNotesOpen && !isBgTasksOpen && !isEmailOpen && !isWorkspaceOpen && !isKnowledgeViewOpen && !isChatHistoryOpen && !selectedBackgroundTask) {
+      if (!selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isLiveNotesOpen && !selectedBackgroundTask) {
         setIsChatSidebarOpen(false)
         setIsRightPaneMaximized(false)
       }
       void navigateToView({ type: 'graph' })
     },
     openBases: () => {
-      if (!selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isMeetingsOpen && !isLiveNotesOpen && !isBgTasksOpen && !isEmailOpen && !isWorkspaceOpen && !isKnowledgeViewOpen && !isChatHistoryOpen && !selectedBackgroundTask) {
+      if (!selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isLiveNotesOpen && !selectedBackgroundTask) {
         setIsChatSidebarOpen(false)
         setIsRightPaneMaximized(false)
       }
       void navigateToView({ type: 'file', path: BASES_DEFAULT_TAB_PATH })
     },
-    openWorkspaceAt: (path?: string) => {
-      if (!selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isMeetingsOpen && !isLiveNotesOpen && !isBgTasksOpen && !isEmailOpen && !isWorkspaceOpen && !isKnowledgeViewOpen && !isChatHistoryOpen && !selectedBackgroundTask) {
-        setIsChatSidebarOpen(false)
-        setIsRightPaneMaximized(false)
-      }
-      void navigateToView({ type: 'workspace', path })
-    },
-    openKnowledgeView: () => {
-      // Open in the middle pane without touching the chat sidebar — leave it
-      // open or closed exactly as the user had it (matches Email/Meetings).
-      void navigateToView({ type: 'knowledge-view' })
-    },
-    createWorkspace: async (name: string): Promise<string> => {
-      const trimmed = name.trim()
-      if (!trimmed) throw new Error('Name is required')
-      if (trimmed.includes('/')) throw new Error('Name cannot contain "/"')
-      const rootExists = await window.ipc.invoke('workspace:exists', { path: WORKSPACE_ROOT })
-      if (!rootExists.exists) {
-        await window.ipc.invoke('workspace:mkdir', { path: WORKSPACE_ROOT, recursive: true })
-      }
-      const target = `${WORKSPACE_ROOT}/${trimmed}`
-      const exists = await window.ipc.invoke('workspace:exists', { path: target })
-      if (exists.exists) {
-        throw new Error(`A workspace named "${trimmed}" already exists`)
-      }
-      await window.ipc.invoke('workspace:mkdir', { path: target, recursive: true })
-      return target
-    },
     expandAll: () => setExpandedPaths(new Set(collectDirPaths(tree))),
     collapseAll: () => setExpandedPaths(new Set()),
     rename: async (oldPath: string, newName: string, isDir: boolean) => {
@@ -4744,12 +3929,6 @@ function App() {
         document.body.removeChild(textarea)
       })
     },
-    revealInFileManager: (path: string, isDir: boolean) => {
-      const channel = isDir ? 'shell:openPath' : 'shell:showItemInFolder'
-      void window.ipc.invoke(channel, { path }).catch((err) => {
-        console.error('Failed to open in file manager:', err)
-      })
-    },
     onOpenInNewTab: (path: string) => {
       openFileInNewTab(path)
     },
@@ -4810,14 +3989,12 @@ function App() {
   const pendingCalendarEventRef = useRef<CalendarEventMeta | undefined>(undefined)
   const [meetingSummarizing, setMeetingSummarizing] = useState(false)
   const [showMeetingPermissions, setShowMeetingPermissions] = useState(false)
-  const [recordingMeetingSource, setRecordingMeetingSource] = useState<string | null>(null)
 
   const [checkingPermission, setCheckingPermission] = useState(false)
 
   const startMeetingNow = useCallback(async () => {
     const calEvent = pendingCalendarEventRef.current
     pendingCalendarEventRef.current = undefined
-    setRecordingMeetingSource(calEvent?.source ?? null)
     const notePath = await meetingTranscription.start(calEvent)
     if (notePath) {
       meetingNotePathRef.current = notePath
@@ -4845,7 +4022,6 @@ function App() {
   const handleToggleMeeting = useCallback(async () => {
     if (meetingTranscription.state === 'recording') {
       await meetingTranscription.stop()
-      setRecordingMeetingSource(null)
 
       // Read the final transcript and generate meeting notes via LLM
       const notePath = meetingNotePathRef.current
@@ -4942,30 +4118,8 @@ function App() {
     return () => window.removeEventListener('email-block:draft-with-assistant', handler)
   }, [])
 
-  const resolveWikiFilePath = useCallback((wikiPath: string) => {
-    const normalized = normalizeWikiPath(wikiPath)
-    const { path: basePath } = splitWikiFragment(normalized)
-    if (!basePath) return null
-
-    const targetPath = ensureMarkdownExtension(basePath)
-    const targetKey = targetPath.toLowerCase()
-    const exactMatch = knowledgeFiles.find((filePath) => normalizeWikiPath(filePath).toLowerCase() === targetKey)
-    if (exactMatch) return toKnowledgePath(exactMatch)
-
-    if (!basePath.includes('/')) {
-      const targetBaseName = targetPath.split('/').pop()?.toLowerCase()
-      const basenameMatches = knowledgeFiles.filter((filePath) => {
-        const normalizedFile = normalizeWikiPath(filePath)
-        return normalizedFile.split('/').pop()?.toLowerCase() === targetBaseName
-      })
-      if (basenameMatches.length === 1) return toKnowledgePath(basenameMatches[0])
-    }
-
-    return toKnowledgePath(basePath)
-  }, [knowledgeFiles])
-
   const ensureWikiFile = useCallback(async (wikiPath: string) => {
-    const resolvedPath = resolveWikiFilePath(wikiPath)
+    const resolvedPath = toKnowledgePath(wikiPath)
     if (!resolvedPath) return null
     try {
       const exists = await window.ipc.invoke('workspace:exists', { path: resolvedPath })
@@ -4982,11 +4136,9 @@ function App() {
       console.error('Failed to ensure wiki link target:', err)
       return null
     }
-  }, [resolveWikiFilePath])
+  }, [])
 
   const openWikiLink = useCallback(async (wikiPath: string) => {
-    const { path: basePath } = splitWikiFragment(normalizeWikiPath(wikiPath))
-    if (!basePath) return
     const resolvedPath = await ensureWikiFile(wikiPath)
     if (resolvedPath) {
       navigateToFile(resolvedPath)
@@ -5122,11 +4274,7 @@ function App() {
     }
   }, [isGraphOpen, knowledgeFilePaths])
 
-  const renderConversationItem = (
-    item: ConversationItem,
-    tabId: string,
-    options?: { autoPermissionDetail?: { decision: 'allow'; reason: string } },
-  ) => {
+  const renderConversationItem = (item: ConversationItem, tabId: string) => {
     if (isChatMessage(item)) {
       if (item.role === 'user') {
         if (item.attachments && item.attachments.length > 0) {
@@ -5184,21 +4332,6 @@ function App() {
     }
 
     if (isToolCall(item)) {
-      if (item.name === 'code_agent_run') {
-        return (
-          <CodingRunBlock
-            key={item.id}
-            item={item}
-            open={isToolOpenForTab(tabId, item.id)}
-            onOpenChange={(open) => setToolOpenForTab(tabId, item.id, open)}
-            onPermissionDecision={(decision) => {
-              if (item.pendingCodePermission) {
-                handleCodePermissionResponse(item.id, item.pendingCodePermission.requestId, decision)
-              }
-            }}
-          />
-        )
-      }
       const appActionData = getAppActionCardData(item)
       if (appActionData) {
         return <AppActionCard key={item.id} data={appActionData} status={item.status} />
@@ -5239,7 +4372,6 @@ function App() {
           key={item.id}
           open={isToolOpenForTab(tabId, item.id)}
           onOpenChange={(open) => setToolOpenForTab(tabId, item.id, open)}
-          autoPermissionDetail={options?.autoPermissionDetail}
         >
           <ToolHeader
             title={toolTitle}
@@ -5260,9 +4392,6 @@ function App() {
     }
 
     if (isErrorMessage(item)) {
-      if (matchBillingError(item.message)) {
-        return null
-      }
       return (
         <Message key={item.id} from="assistant" data-message-id={item.id}>
           <MessageContent className="rounded-lg border border-destructive/30 bg-destructive/10 px-4 py-3 text-destructive">
@@ -5282,7 +4411,6 @@ function App() {
     pendingAskHumanRequests,
     allPermissionRequests,
     permissionResponses,
-    autoPermissionDecisions,
   }), [
     runId,
     conversation,
@@ -5290,51 +4418,19 @@ function App() {
     pendingAskHumanRequests,
     allPermissionRequests,
     permissionResponses,
-    autoPermissionDecisions,
   ])
   const emptyChatTabState = React.useMemo<ChatTabViewState>(() => createEmptyChatTabViewState(), [])
   const getChatTabStateForRender = useCallback((tabId: string): ChatTabViewState => {
     if (tabId === activeChatTabId) return activeChatTabState
     return chatViewStateByTab[tabId] ?? emptyChatTabState
   }, [activeChatTabId, activeChatTabState, chatViewStateByTab, emptyChatTabState])
+  const hasConversation = activeChatTabState.conversation.length > 0 || activeChatTabState.currentAssistantMessage
   const selectedTask = selectedBackgroundTask
     ? backgroundTasks.find(t => t.name === selectedBackgroundTask)
     : null
-  const isRightPaneContext = Boolean(selectedPath || isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen || isWorkspaceOpen || isKnowledgeViewOpen || isChatHistoryOpen || isHomeOpen || isBrowserOpen)
+  const isRightPaneContext = Boolean(selectedPath || isGraphOpen || isSuggestedTopicsOpen || isLiveNotesOpen || isBrowserOpen)
   const isRightPaneOnlyMode = isRightPaneContext && isChatSidebarOpen && isRightPaneMaximized
   const shouldCollapseLeftPane = isRightPaneOnlyMode
-  const nonChatPaneStyle = React.useMemo<React.CSSProperties>(() => {
-    const style: React.CSSProperties = { maxWidth: insetMaxWidth }
-    if (!isRightPaneContext || !isChatSidebarOpen || isRightPaneMaximized) return style
-    if (chatPaneSize === 'chat-equal') {
-      return { ...style, width: 0, flex: '1 1 0' }
-    }
-    if (chatPaneSize === 'chat-bigger') {
-      return { ...style, width: DEFAULT_CHAT_PANE_WIDTH, flex: '0 0 auto' }
-    }
-    return style
-  }, [chatPaneSize, insetMaxWidth, isChatSidebarOpen, isRightPaneContext, isRightPaneMaximized])
-  // Collapsing: pin max-width to the snapshot px (no transition) for one frame so it's
-  // binding immediately (no flex jump), then animate to 0. Expanding goes back to 100%
-  // — its non-binding range lands at the end of the range, where it isn't visible.
-  useLayoutEffect(() => {
-    if (!shouldCollapseLeftPane) {
-      setInsetAnimateMaxWidth(true)
-      setInsetMaxWidth('100%')
-      return
-    }
-    if (insetCollapseFromPx == null) {
-      setInsetMaxWidth('0px')
-      return
-    }
-    setInsetAnimateMaxWidth(false)
-    setInsetMaxWidth(`${insetCollapseFromPx}px`)
-    const id = requestAnimationFrame(() => {
-      setInsetAnimateMaxWidth(true)
-      setInsetMaxWidth('0px')
-    })
-    return () => cancelAnimationFrame(id)
-  }, [shouldCollapseLeftPane, insetCollapseFromPx])
   const openMarkdownTabs = React.useMemo(() => {
     const markdownTabs = fileTabs.filter(tab => tab.path.endsWith('.md'))
     if (selectedPath?.endsWith('.md')) {
@@ -5349,11 +4445,11 @@ function App() {
   return (
     <TooltipProvider delayDuration={0}>
       <SidebarSectionProvider defaultSection="tasks" onSectionChange={(section) => {
-        if (section === 'knowledge' && !selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isMeetingsOpen && !isLiveNotesOpen && !isBgTasksOpen && !isEmailOpen && !isWorkspaceOpen && !isKnowledgeViewOpen && !isChatHistoryOpen && !isHomeOpen) {
+        if (section === 'knowledge' && !selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isLiveNotesOpen) {
           void navigateToView({ type: 'file', path: BASES_DEFAULT_TAB_PATH })
         }
       }}>
-        <div className="rowboat-shell flex h-svh w-full overflow-hidden">
+        <div className="flex h-svh w-full overflow-hidden">
           {/* Content sidebar with SidebarProvider for collapse functionality */}
           <SidebarProvider
             style={{
@@ -5362,40 +4458,107 @@ function App() {
           >
             <SidebarContentPanel
               tree={tree}
+              selectedPath={selectedPath}
+              expandedPaths={expandedPaths}
               onSelectFile={toggleExpand}
+              onToggleFolder={(path) => {
+                setExpandedPaths((prev) => {
+                  const next = new Set(prev)
+                  if (next.has(path)) next.delete(path)
+                  else next.add(path)
+                  return next
+                })
+              }}
               knowledgeActions={knowledgeActions}
-              bgTaskSummaries={bgTaskSummaries}
-              activeNav={
-                isHomeOpen ? 'home'
-                : isEmailOpen ? 'email'
-                : isMeetingsOpen ? 'meetings'
-                : (isKnowledgeViewOpen || isGraphOpen || (selectedPath != null && selectedPath.startsWith('knowledge/'))) ? 'knowledge'
-                : isBgTasksOpen ? 'agents'
-                : isWorkspaceOpen ? 'workspaces'
-                : null
-              }
-              onOpenMeetings={openMeetingsView}
-              onOpenBgTasks={() => { setBgTaskInitialSlug(null); setBgTaskSlugVersion((v) => v + 1); openBgTasksView() }}
-              onOpenAgent={(slug) => { setBgTaskInitialSlug(slug); setBgTaskSlugVersion((v) => v + 1); openBgTasksView() }}
-              recentRuns={runs}
-              onOpenRun={(rid) => void navigateToView({ type: 'chat', runId: rid })}
-              onOpenEmail={(threadId) => openEmailView(threadId)}
-              onOpenHome={() => void navigateToView({ type: 'home' })}
-              onNewChat={handleNewChatTab}
-              onToggleBrowser={handleToggleBrowser}
               onVoiceNoteCreated={handleVoiceNoteCreated}
-              meetingRecordingState={meetingTranscription.state}
-              recordingMeetingSource={recordingMeetingSource}
-              onToggleMeetingRecording={() => { void handleToggleMeeting() }}
+              runs={runs}
+              currentRunId={runId}
+              processingRunIds={processingRunIds}
+              tasksActions={{
+                onNewChat: handleNewChatTab,
+                onSelectRun: (runIdToLoad) => {
+                  cancelRecordingIfActive()
+                  if (selectedPath || isGraphOpen || isSuggestedTopicsOpen || isLiveNotesOpen || isBrowserOpen) {
+                    setIsChatSidebarOpen(true)
+                  }
+
+                  // If already open in a chat tab, switch to it
+                  const existingTab = chatTabs.find(t => t.runId === runIdToLoad)
+                  if (existingTab) {
+                    switchChatTab(existingTab.id)
+                    return
+                  }
+                  // In two-pane mode (file/graph/browser), keep the middle pane and just swap chat context in the right sidebar.
+                  if (selectedPath || isGraphOpen || isSuggestedTopicsOpen || isLiveNotesOpen || isBrowserOpen) {
+                    setChatTabs(prev => prev.map(t => t.id === activeChatTabId ? { ...t, runId: runIdToLoad } : t))
+                    loadRun(runIdToLoad)
+                    return
+                  }
+
+                  // Outside two-pane mode, navigate to chat.
+                  setChatTabs(prev => prev.map(t => t.id === activeChatTabId ? { ...t, runId: runIdToLoad } : t))
+                  void navigateToView({ type: 'chat', runId: runIdToLoad })
+                },
+                onOpenInNewTab: (targetRunId) => {
+                  openChatInNewTab(targetRunId)
+                },
+                onDeleteRun: async (runIdToDelete) => {
+                  try {
+                    await window.ipc.invoke('runs:delete', { runId: runIdToDelete })
+                    // Close any chat tab showing the deleted run
+                    const tabForRun = chatTabs.find(t => t.runId === runIdToDelete)
+                    if (tabForRun) {
+                      if (chatTabs.length > 1) {
+                        closeChatTab(tabForRun.id)
+                      } else {
+                        // Only one tab, reset it to new chat
+                        setChatTabs([{ id: tabForRun.id, runId: null }])
+                        if (selectedPath || isGraphOpen || isSuggestedTopicsOpen || isLiveNotesOpen || isBrowserOpen) {
+                          handleNewChat()
+                        } else {
+                          void navigateToView({ type: 'chat', runId: null })
+                        }
+                      }
+                    } else if (runId === runIdToDelete) {
+                      if (selectedPath || isGraphOpen || isSuggestedTopicsOpen || isLiveNotesOpen || isBrowserOpen) {
+                        setChatTabs(prev => prev.map(t => t.id === activeChatTabId ? { ...t, runId: null } : t))
+                        handleNewChat()
+                      } else {
+                        void navigateToView({ type: 'chat', runId: null })
+                      }
+                    }
+                    await loadRuns()
+                  } catch (err) {
+                    console.error('Failed to delete run:', err)
+                  }
+                },
+                onSelectBackgroundTask: (taskName) => {
+                  void navigateToView({ type: 'task', name: taskName })
+                },
+              }}
+              backgroundTasks={backgroundTasks}
+              selectedBackgroundTask={selectedBackgroundTask}
+              onNewChat={handleNewChatTab}
+              onOpenSearch={() => setIsSearchOpen(true)}
+              meetingState={meetingTranscription.state}
+              meetingSummarizing={meetingSummarizing}
+              meetingAvailable={voiceAvailable}
+              onToggleMeeting={() => { void handleToggleMeeting() }}
+              isSearchOpen={isSearchOpen}
+              isMeetingActionActive={showMeetingPermissions || meetingSummarizing || meetingTranscription.state !== 'idle'}
+              isBrowserOpen={isBrowserOpen}
+              onToggleBrowser={handleToggleBrowser}
+              isSuggestedTopicsOpen={isSuggestedTopicsOpen}
+              onOpenSuggestedTopics={() => void navigateToView({ type: 'suggested-topics' })}
+              isLiveNotesOpen={isLiveNotesOpen}
+              onOpenLiveNotes={() => void navigateToView({ type: 'live-notes' })}
             />
             <SidebarInset
               className={cn(
-                "overflow-hidden! min-h-0 min-w-0",
-                isRightPaneContext && isChatPaneInMiddle && "order-3",
-                insetAnimateMaxWidth && "transition-[max-width] duration-200 ease-linear",
+                "overflow-hidden! min-h-0 min-w-0 transition-[max-width] duration-200 ease-linear",
                 shouldCollapseLeftPane && "pointer-events-none select-none"
               )}
-              style={nonChatPaneStyle}
+              style={shouldCollapseLeftPane ? { maxWidth: 0 } : { maxWidth: '100%' }}
               aria-hidden={shouldCollapseLeftPane}
               onMouseDownCapture={() => setActiveShortcutPane('left')}
               onFocusCapture={() => setActiveShortcutPane('left')}
@@ -5408,7 +4571,7 @@ function App() {
                 canNavigateForward={canNavigateForward}
                 collapsedLeftPaddingPx={collapsedLeftPaddingPx}
               >
-                {(selectedPath || isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen || isWorkspaceOpen || isKnowledgeViewOpen || isChatHistoryOpen || isHomeOpen) && fileTabs.length >= 1 ? (
+                {(selectedPath || isGraphOpen || isSuggestedTopicsOpen || isLiveNotesOpen) && fileTabs.length >= 1 ? (
                   <TabBar
                     tabs={fileTabs}
                     activeTabId={activeFileTabId ?? ''}
@@ -5416,19 +4579,7 @@ function App() {
                     getTabId={(t) => t.id}
                     onSwitchTab={switchFileTab}
                     onCloseTab={closeFileTab}
-                    allowSingleTabClose={fileTabs.length === 1 && (isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen || isWorkspaceOpen || isKnowledgeViewOpen || isChatHistoryOpen || isHomeOpen || (selectedPath != null && isBaseFilePath(selectedPath)))}
-                  />
-                ) : isFullScreenChat ? (
-                  <ChatHeader
-                    activeTitle={(() => {
-                      const activeTab = chatTabs.find((t) => t.id === activeChatTabId)
-                      return activeTab ? getChatTabTitle(activeTab) : 'New chat'
-                    })()}
-                    onNewChatTab={handleNewChatTab}
-                    recentRuns={runs}
-                    activeRunId={runId}
-                    onSelectRun={(rid) => void navigateToView({ type: 'chat', runId: rid })}
-                    onOpenChatHistory={() => void navigateToView({ type: 'chat-history' })}
+                    allowSingleTabClose={fileTabs.length === 1 && (isGraphOpen || isSuggestedTopicsOpen || isLiveNotesOpen || (selectedPath != null && isBaseFilePath(selectedPath)))}
                   />
                 ) : (
                   <TabBar
@@ -5481,59 +4632,53 @@ function App() {
                     <TooltipContent side="bottom">Version history</TooltipContent>
                   </Tooltip>
                 )}
-                {!isFullScreenChat && !selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isMeetingsOpen && !isLiveNotesOpen && !isBgTasksOpen && !isEmailOpen && !isWorkspaceOpen && !isKnowledgeViewOpen && !isChatHistoryOpen && !selectedTask && !isBrowserOpen && (
+                {!selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isLiveNotesOpen && !selectedTask && !isBrowserOpen && (
                   <Tooltip>
                     <TooltipTrigger asChild>
                       <button
                         type="button"
                         onClick={handleNewChatTab}
                         className="titlebar-no-drag flex h-8 w-8 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground transition-colors self-center shrink-0"
-                        aria-label="New chat"
+                        aria-label="New chat tab"
                       >
-                        <Plus className="size-5" />
+                        <SquarePen className="size-5" />
                       </button>
                     </TooltipTrigger>
-                    <TooltipContent side="bottom">New chat</TooltipContent>
+                    <TooltipContent side="bottom">New chat tab</TooltipContent>
+                  </Tooltip>
+                )}
+                {!selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isLiveNotesOpen && !isBrowserOpen && expandedFrom && (
+                  <Tooltip>
+                    <TooltipTrigger asChild>
+                      <button
+                        type="button"
+                        onClick={handleCloseFullScreenChat}
+                        className="titlebar-no-drag flex h-8 w-8 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground transition-colors self-center shrink-0"
+                        aria-label="Restore two-pane view"
+                      >
+                        <Minimize2 className="size-5" />
+                      </button>
+                    </TooltipTrigger>
+                    <TooltipContent side="bottom">Restore two-pane view</TooltipContent>
+                  </Tooltip>
+                )}
+                {(selectedPath || isGraphOpen || isSuggestedTopicsOpen || isLiveNotesOpen) && (
+                  <Tooltip>
+                    <TooltipTrigger asChild>
+                      <button
+                        type="button"
+                        onClick={toggleKnowledgePane}
+                        className="titlebar-no-drag flex h-8 w-8 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground transition-colors -mr-1 self-center shrink-0"
+                        aria-label={isChatSidebarOpen ? "Maximize knowledge view" : "Restore two-pane view"}
+                      >
+                        {isChatSidebarOpen ? <Maximize2 className="size-5" /> : <Minimize2 className="size-5" />}
+                      </button>
+                    </TooltipTrigger>
+                    <TooltipContent side="bottom">
+                      {isChatSidebarOpen ? "Maximize knowledge view" : "Restore two-pane view"}
+                    </TooltipContent>
                   </Tooltip>
                 )}
-                {/* Trailing layout control. Always mounted (just toggled invisible
-                    when inactive) so its -webkit-app-region:no-drag rect is stable —
-                    a freshly-mounted no-drag button inside the drag-region header
-                    otherwise has its first click swallowed by the window drag. */}
-                {(() => {
-                  const viewOpen = selectedPath || isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen || isWorkspaceOpen || isKnowledgeViewOpen || isChatHistoryOpen || isHomeOpen
-                  const action = isFullScreenChat
-                    ? { onClick: pushChatToSidePane, icon: <ArrowRight className="size-5" />, label: 'Dock chat to side pane' }
-                    : (viewOpen && !isChatSidebarOpen)
-                      ? { onClick: openChatSidePane, icon: <MessageSquare className="size-5" />, label: 'Open chat' }
-                      : (viewOpen && isChatSidebarOpen && !isRightPaneMaximized)
-                        ? {
-                            onClick: () => setIsChatSidebarOpen(false),
-                            icon: isChatPaneInMiddle ? <ArrowLeft className="size-5" /> : <ArrowRight className="size-5" />,
-                            label: 'Expand pane'
-                          }
-                        : null
-                  return (
-                    <Tooltip>
-                      <TooltipTrigger asChild>
-                        <button
-                          type="button"
-                          onClick={action ? action.onClick : undefined}
-                          disabled={!action}
-                          aria-hidden={!action}
-                          aria-label={action?.label}
-                          className={cn(
-                            'titlebar-no-drag flex h-8 w-8 items-center justify-center rounded-md text-muted-foreground transition-colors -mr-1 self-center shrink-0',
-                            action ? 'hover:bg-accent hover:text-foreground' : 'invisible pointer-events-none',
-                          )}
-                        >
-                          {action?.icon}
-                        </button>
-                      </TooltipTrigger>
-                      {action && <TooltipContent side="bottom">{action.label}</TooltipContent>}
-                    </Tooltip>
-                  )
-                })()}
               </ContentHeader>
 
               {isBrowserOpen ? (
@@ -5541,22 +4686,6 @@ function App() {
                   onClose={handleCloseBrowser}
                   forceHidden={isSearchOpen || showMeetingPermissions}
                 />
-              ) : isHomeOpen ? (
-                <div className="flex-1 min-h-0 flex flex-col overflow-hidden">
-                  <HomeView
-                    tree={tree}
-                    runs={runs}
-                    bgTaskSummaries={bgTaskSummaries}
-                    onOpenEmail={() => openEmailView()}
-                    onOpenMeetings={openMeetingsView}
-                    onOpenAgents={() => { setBgTaskInitialSlug(null); setBgTaskSlugVersion((v) => v + 1); openBgTasksView() }}
-                    onOpenAgent={(slug) => { setBgTaskInitialSlug(slug); setBgTaskSlugVersion((v) => v + 1); openBgTasksView() }}
-                    onOpenNote={(path) => navigateToFile(path)}
-                    onOpenRun={(rid) => void navigateToView({ type: 'chat', runId: rid })}
-                    onTakeMeetingNotes={() => { void handleToggleMeeting() }}
-                    onOpenChat={handleNewChatTab}
-                  />
-                </div>
               ) : isSuggestedTopicsOpen ? (
                 <div className="flex-1 min-h-0 flex flex-col overflow-hidden">
                   <SuggestedTopicsView
@@ -5566,15 +4695,6 @@ function App() {
                     }}
                   />
                 </div>
-              ) : isMeetingsOpen ? (
-                <div className="flex-1 min-h-0 flex flex-col overflow-hidden">
-                  <MeetingsView
-                    onOpenNote={(path) => navigateToFile(path)}
-                    onTakeMeetingNotes={() => { void handleToggleMeeting() }}
-                    meetingState={meetingTranscription.state}
-                    meetingSummarizing={meetingSummarizing}
-                  />
-                </div>
               ) : isLiveNotesOpen ? (
                 <div className="flex-1 min-h-0 flex flex-col overflow-hidden">
                   <LiveNotesView
@@ -5584,82 +4704,6 @@ function App() {
                     }}
                   />
                 </div>
-              ) : isBgTasksOpen ? (
-                <div className="flex-1 min-h-0 flex flex-col overflow-hidden">
-                  <BgTasksView
-                    initialSlug={bgTaskInitialSlug}
-                    slugVersion={bgTaskSlugVersion}
-                    onCreateWithCopilot={(description) => {
-                      submitFromPalette(buildBgTaskSetupPrompt(description), null)
-                    }}
-                    onEditWithCopilot={(slug) => {
-                      submitFromPalette(buildBgTaskEditPrompt(slug), null)
-                    }}
-                  />
-                </div>
-              ) : isEmailOpen ? (
-                <div className="flex-1 min-h-0 flex flex-col overflow-hidden">
-                  <EmailView initialThreadId={emailInitialThreadId} threadIdVersion={emailThreadIdVersion} />
-                </div>
-              ) : isWorkspaceOpen ? (
-                <div className="flex-1 min-h-0 flex flex-col overflow-hidden">
-                  <WorkspaceView
-                    tree={tree}
-                    initialPath={workspaceInitialPath}
-                    actions={{
-                      remove: knowledgeActions.remove,
-                      copyPath: knowledgeActions.copyPath,
-                      revealInFileManager: knowledgeActions.revealInFileManager,
-                      createNote: knowledgeActions.createNote,
-                      createFolder: knowledgeActions.createFolder,
-                      onOpenInNewTab: knowledgeActions.onOpenInNewTab,
-                    }}
-                    onNavigate={(path) => { void navigateToView({ type: 'workspace', path: path === WORKSPACE_ROOT ? undefined : path }) }}
-                    onOpenNote={(path) => navigateToFile(path)}
-                    onCreateWorkspace={async (name) => { await knowledgeActions.createWorkspace(name) }}
-                  />
-                </div>
-              ) : isKnowledgeViewOpen ? (
-                <div className="flex-1 min-h-0 flex flex-col overflow-hidden">
-                  <KnowledgeView
-                    tree={tree}
-                    actions={{
-                      createNote: knowledgeActions.createNote,
-                      createFolder: knowledgeActions.createFolder,
-                      rename: knowledgeActions.rename,
-                      remove: knowledgeActions.remove,
-                      copyPath: knowledgeActions.copyPath,
-                      revealInFileManager: knowledgeActions.revealInFileManager,
-                      onOpenInNewTab: knowledgeActions.onOpenInNewTab,
-                    }}
-                    folderPath={knowledgeViewFolderPath}
-                    onNavigateFolder={(path) => { void navigateToView({ type: 'knowledge-view', folderPath: path ?? undefined }) }}
-                    onOpenNote={(path) => navigateToFile(path)}
-                    onOpenGraph={() => knowledgeActions.openGraph()}
-                    onOpenSearch={() => { setSearchDefaultScope('knowledge'); setIsSearchOpen(true) }}
-                    onOpenBases={() => knowledgeActions.openBases()}
-                    onVoiceNoteCreated={handleVoiceNoteCreated}
-                  />
-                </div>
-              ) : isChatHistoryOpen ? (
-                <div className="flex-1 min-h-0 flex flex-col overflow-hidden">
-                  <ChatHistoryView
-                    runs={runs}
-                    currentRunId={runId}
-                    processingRunIds={processingRunIds}
-                    onSelectRun={(rid) => void navigateToView({ type: 'chat', runId: rid })}
-                    onDeleteRun={async (rid) => {
-                      try {
-                        await window.ipc.invoke('runs:delete', { runId: rid })
-                        await loadRuns()
-                      } catch (err) {
-                        console.error('Failed to delete run:', err)
-                      }
-                    }}
-                    onNewChat={handleNewChatTab}
-                    onOpenSearch={() => setIsSearchOpen(true)}
-                  />
-                </div>
               ) : selectedPath && isBaseFilePath(selectedPath) ? (
                 <div className="flex-1 min-h-0 flex flex-col overflow-hidden">
                   <BasesView
@@ -5675,7 +4719,6 @@ function App() {
                       rename: knowledgeActions.rename,
                       remove: knowledgeActions.remove,
                       copyPath: knowledgeActions.copyPath,
-                      revealInFileManager: knowledgeActions.revealInFileManager,
                     }}
                   />
                 </div>
@@ -5826,10 +4869,6 @@ function App() {
                   <div className="flex-1 min-h-0 overflow-hidden">
                     <AudioFileViewer path={selectedPath} />
                   </div>
-                ) : selectedPath && getViewerType(selectedPath) === 'docx' ? (
-                  <div className="flex-1 min-h-0 overflow-hidden">
-                    <DocxFileViewer path={selectedPath} />
-                  </div>
                 ) : (
                   <div className="flex-1 min-h-0 overflow-hidden">
                     <UnsupportedFileViewer path={selectedPath} />
@@ -5882,18 +4921,16 @@ function App() {
                         >
                           <ConversationContent className={tabConversationContentClassName}>
                             {!tabHasConversation ? (
-                              <ChatEmptyState
-                                wide
-                                recentRuns={runs}
-                                onSelectRun={(rid) => void navigateToView({ type: 'chat', runId: rid })}
-                                onOpenChatHistory={() => void navigateToView({ type: 'chat-history' })}
-                                onPickPrompt={setPresetMessage}
-                              />
+                              <ConversationEmptyState className="h-auto">
+                                <div className="text-2xl font-semibold tracking-tight text-foreground/80 sm:text-3xl md:text-4xl">
+                                  What are we working on?
+                                </div>
+                              </ConversationEmptyState>
                             ) : (
                               <>
                                 {groupConversationItems(
                                   tabState.conversation,
-                                  (id) => !!tabState.allPermissionRequests.get(id) || !!tabState.autoPermissionDecisions.get(id)
+                                  (id) => !!tabState.allPermissionRequests.get(id)
                                 ).map(item => {
                                   if (isToolGroup(item)) {
                                     return (
@@ -5905,44 +4942,23 @@ function App() {
                                       />
                                     )
                                   }
-                                  const autoDecision = isToolCall(item)
-                                    ? tabState.autoPermissionDecisions.get(item.id)
-                                    : undefined
-                                  const rendered = renderConversationItem(
-                                    item,
-                                    tab.id,
-                                    autoDecision?.decision === 'allow'
-                                      ? { autoPermissionDetail: { decision: 'allow', reason: autoDecision.reason } }
-                                      : undefined,
-                                  )
+                                  const rendered = renderConversationItem(item, tab.id)
                                   if (isToolCall(item)) {
-                                    const deniedAutoDecision = autoDecision?.decision === 'deny' ? autoDecision : null
                                     const permRequest = tabState.allPermissionRequests.get(item.id)
-                                    if (deniedAutoDecision || permRequest) {
+                                    if (permRequest) {
                                       const response = tabState.permissionResponses.get(item.id) || null
                                       return (
                                         <React.Fragment key={item.id}>
-                                          {deniedAutoDecision && (
-                                            <AutoPermissionDecision
-                                              toolCall={deniedAutoDecision.toolCall}
-                                              permission={deniedAutoDecision.permission}
-                                              decision={deniedAutoDecision.decision}
-                                              reason={deniedAutoDecision.reason}
-                                            />
-                                          )}
-                                          {permRequest && (
-                                            <PermissionRequest
-                                              toolCall={permRequest.toolCall}
-                                              permission={permRequest.permission}
-                                              onApprove={() => handlePermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'approve')}
-                                              onApproveSession={() => handlePermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'approve', 'session')}
-                                              onApproveAlways={() => handlePermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'approve', 'always')}
-                                              onDeny={() => handlePermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'deny')}
-                                              isProcessing={isActive && isProcessing}
-                                              response={response}
-                                            />
-                                          )}
                                           {rendered}
+                                          <PermissionRequest
+                                            toolCall={permRequest.toolCall}
+                                            onApprove={() => handlePermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'approve')}
+                                            onApproveSession={() => handlePermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'approve', 'session')}
+                                            onApproveAlways={() => handlePermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'approve', 'always')}
+                                            onDeny={() => handlePermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'deny')}
+                                            isProcessing={isActive && isProcessing}
+                                            response={response}
+                                          />
                                         </React.Fragment>
                                       )
                                     }
@@ -5954,7 +4970,6 @@ function App() {
                                   <AskHumanRequest
                                     key={request.toolCallId}
                                     query={request.query}
-                                    options={request.options}
                                     onResponse={(response) => handleAskHumanResponse(request.toolCallId, request.subflow, response)}
                                     isProcessing={isActive && isProcessing}
                                   />
@@ -5985,9 +5000,12 @@ function App() {
                   })}
                 </div>
 
-                <div className="rowboat-composer-dock sticky bottom-0 z-10 bg-background pb-12 pt-0 shadow-lg">
+                <div className="sticky bottom-0 z-10 bg-background pb-12 pt-0 shadow-lg">
                   <div className="pointer-events-none absolute inset-x-0 -top-6 h-6 bg-linear-to-t from-background to-transparent" />
                   <div className="mx-auto w-full max-w-4xl px-4">
+                    {!hasConversation && (
+                      <Suggestions onSelect={setPresetMessage} className="mb-3 justify-center" />
+                    )}
                     {chatTabs.map((tab) => {
                       const isActive = tab.id === activeChatTabId
                       const tabState = getChatTabStateForRender(tab.id)
@@ -6019,8 +5037,6 @@ function App() {
                                 selectedModelByTabRef.current.delete(tab.id)
                               }
                             }}
-                            workDir={workDirByTab[tab.id] ?? null}
-                            onWorkDirChange={(v) => setTabWorkDir(tab.id, v)}
                             isRecording={isActive && isRecording}
                             recordingText={isActive ? voice.interimText : undefined}
                             recordingState={isActive ? (voice.state === 'connecting' ? 'connecting' : 'listening') : undefined}
@@ -6044,30 +5060,19 @@ function App() {
               )}
             </SidebarInset>
 
-            {/* Chat pane - shown when viewing files/graph */}
+            {/* Chat sidebar - shown when viewing files/graph */}
             {isRightPaneContext && (
               <ChatSidebar
-                placement={chatPanePlacement}
-                paneSize={chatPaneSize}
-                className={isChatPaneInMiddle ? "order-2" : undefined}
-                defaultWidth={DEFAULT_CHAT_PANE_WIDTH}
+                defaultWidth={460}
                 isOpen={isChatSidebarOpen}
                 isMaximized={isRightPaneMaximized}
                 chatTabs={chatTabs}
                 activeChatTabId={activeChatTabId}
                 getChatTabTitle={getChatTabTitle}
+                isChatTabProcessing={isChatTabProcessing}
+                onSwitchChatTab={switchChatTab}
+                onCloseChatTab={closeChatTab}
                 onNewChatTab={handleNewChatTabInSidebar}
-                recentRuns={runs}
-                onSelectRun={(rid) => {
-                  const existingTab = chatTabs.find((t) => t.runId === rid)
-                  if (existingTab) {
-                    switchChatTab(existingTab.id)
-                    return
-                  }
-                  setChatTabs((prev) => prev.map((t) => (t.id === activeChatTabId ? { ...t, runId: rid } : t)))
-                  loadRun(rid)
-                }}
-                onOpenChatHistory={() => void navigateToView({ type: 'chat-history' })}
                 onOpenFullScreen={toggleRightPaneMaximize}
                 conversation={conversation}
                 currentAssistantMessage={currentAssistantMessage}
@@ -6092,12 +5097,9 @@ function App() {
                     selectedModelByTabRef.current.delete(tabId)
                   }
                 }}
-                workDirByTab={workDirByTab}
-                onWorkDirChangeForTab={setTabWorkDir}
                 pendingAskHumanRequests={pendingAskHumanRequests}
                 allPermissionRequests={allPermissionRequests}
                 permissionResponses={permissionResponses}
-                autoPermissionDecisions={autoPermissionDecisions}
                 onPermissionResponse={handlePermissionResponse}
                 onAskHumanResponse={handleAskHumanResponse}
                 isToolOpenForTab={isToolOpenForTab}
@@ -6128,18 +5130,12 @@ function App() {
         </div>
         <CommandPalette
           open={isSearchOpen}
-          onOpenChange={(o) => { setIsSearchOpen(o); if (!o) setSearchDefaultScope(undefined) }}
-          defaultScope={searchDefaultScope}
+          onOpenChange={setIsSearchOpen}
           onSelectFile={navigateToFile}
           onSelectRun={(id) => { void navigateToView({ type: 'chat', runId: id }) }}
         />
       </SidebarSectionProvider>
       <Toaster />
-      <BillingErrorDialog
-        open={billingErrorOpen}
-        match={billingErrorMatch}
-        onOpenChange={setBillingErrorOpen}
-      />
       <OnboardingModal
         open={showOnboarding}
         onComplete={handleOnboardingComplete}
diff --git a/apps/x/apps/renderer/src/components/ai-elements/ask-human-request.tsx b/apps/x/apps/renderer/src/components/ai-elements/ask-human-request.tsx
index 6571e54e..2e92e2ca 100644
--- a/apps/x/apps/renderer/src/components/ai-elements/ask-human-request.tsx
+++ b/apps/x/apps/renderer/src/components/ai-elements/ask-human-request.tsx
@@ -9,7 +9,6 @@ import { useState, useRef, useEffect } from "react";
 
 export type AskHumanRequestProps = ComponentProps<"div"> & {
   query: string;
-  options?: string[];
   onResponse: (response: string) => void;
   isProcessing?: boolean;
 };
@@ -17,21 +16,17 @@ export type AskHumanRequestProps = ComponentProps<"div"> & {
 export const AskHumanRequest = ({
   className,
   query,
-  options,
   onResponse,
   isProcessing = false,
   ...props
 }: AskHumanRequestProps) => {
   const [response, setResponse] = useState("");
   const textareaRef = useRef<HTMLTextAreaElement>(null);
-  const hasOptions = Array.isArray(options) && options.length > 0;
 
   useEffect(() => {
-    // Auto-focus the textarea when in free-text mode; nothing to focus for buttons.
-    if (!hasOptions) {
-      textareaRef.current?.focus();
-    }
-  }, [hasOptions]);
+    // Auto-focus the textarea when component mounts
+    textareaRef.current?.focus();
+  }, []);
 
   const handleSubmit = () => {
     const trimmed = response.trim();
@@ -41,11 +36,6 @@ export const AskHumanRequest = ({
     }
   };
 
-  const handleOptionClick = (option: string) => {
-    if (isProcessing) return;
-    onResponse(option);
-  };
-
   const handleKeyDown = (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
     if (e.key === "Enter" && !e.shiftKey) {
       e.preventDefault();
@@ -75,47 +65,30 @@ export const AskHumanRequest = ({
                 {query}
               </p>
             </div>
-            {hasOptions ? (
-              <div className="flex flex-wrap gap-2">
-                {options!.map((option) => (
-                  <Button
-                    key={option}
-                    variant="outline"
-                    size="sm"
-                    onClick={() => handleOptionClick(option)}
-                    disabled={isProcessing}
-                    className="bg-background"
-                  >
-                    {option}
-                  </Button>
-                ))}
+            <div className="space-y-2">
+              <Textarea
+                ref={textareaRef}
+                value={response}
+                onChange={(e) => setResponse(e.target.value)}
+                onKeyDown={handleKeyDown}
+                placeholder="Type your response..."
+                disabled={isProcessing}
+                rows={3}
+                className="resize-none"
+              />
+              <div className="flex justify-end">
+                <Button
+                  variant="default"
+                  size="sm"
+                  onClick={handleSubmit}
+                  disabled={!canSubmit}
+                  className="gap-2"
+                >
+                  <ArrowUpIcon className="size-4" />
+                  Send Response
+                </Button>
               </div>
-            ) : (
-              <div className="space-y-2">
-                <Textarea
-                  ref={textareaRef}
-                  value={response}
-                  onChange={(e) => setResponse(e.target.value)}
-                  onKeyDown={handleKeyDown}
-                  placeholder="Type your response..."
-                  disabled={isProcessing}
-                  rows={3}
-                  className="resize-none"
-                />
-                <div className="flex justify-end">
-                  <Button
-                    variant="default"
-                    size="sm"
-                    onClick={handleSubmit}
-                    disabled={!canSubmit}
-                    className="gap-2"
-                  >
-                    <ArrowUpIcon className="size-4" />
-                    Send Response
-                  </Button>
-                </div>
-              </div>
-            )}
+            </div>
           </div>
         </div>
       </div>
diff --git a/apps/x/apps/renderer/src/components/ai-elements/auto-permission-decision.tsx b/apps/x/apps/renderer/src/components/ai-elements/auto-permission-decision.tsx
deleted file mode 100644
index 3c34aaec..00000000
--- a/apps/x/apps/renderer/src/components/ai-elements/auto-permission-decision.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-"use client";
-
-import { Badge } from "@/components/ui/badge";
-import { cn } from "@/lib/utils";
-import { CheckCircle2Icon, ShieldAlertIcon, Terminal } from "lucide-react";
-import type { ComponentProps } from "react";
-import { ToolCallPart } from "@x/shared/dist/message.js";
-import { ToolPermissionMetadata } from "@x/shared/dist/runs.js";
-import z from "zod";
-
-export type AutoPermissionDecisionProps = ComponentProps<"div"> & {
-  toolCall: z.infer<typeof ToolCallPart>;
-  decision: "allow" | "deny";
-  reason: string;
-  permission?: z.infer<typeof ToolPermissionMetadata>;
-};
-
-const fileActionLabels: Record<string, string> = {
-  read: "Read file",
-  list: "List folder",
-  search: "Search files",
-  write: "Write files",
-  delete: "Delete path",
-};
-
-export function AutoPermissionDecision({
-  className,
-  toolCall,
-  decision,
-  reason,
-  permission,
-  ...props
-}: AutoPermissionDecisionProps) {
-  const command = permission?.kind === "command" || toolCall.toolName === "executeCommand"
-    ? (typeof toolCall.arguments === "object" && toolCall.arguments !== null && "command" in toolCall.arguments
-        ? String(toolCall.arguments.command)
-        : JSON.stringify(toolCall.arguments))
-    : null;
-  const filePermission = permission?.kind === "file" ? permission : null;
-  const allowed = decision === "allow";
-
-  return (
-    <div
-      className={cn(
-        "not-prose mb-4 w-full rounded-md border",
-        allowed
-          ? "border-green-500/50 bg-green-50/80 dark:border-green-500/35 dark:bg-green-950/30"
-          : "border-[#fa2525]/60 bg-[#fa2525]/15 dark:border-[#fa2525]/50 dark:bg-[#fa2525]/20",
-        className,
-      )}
-      {...props}
-    >
-      <div className="space-y-3 p-4">
-        <div className="flex items-start gap-3">
-          {allowed ? (
-            <CheckCircle2Icon className="mt-0.5 size-5 shrink-0 text-green-600 dark:text-green-400" />
-          ) : (
-            <ShieldAlertIcon className="mt-0.5 size-5 shrink-0 text-destructive" />
-          )}
-          <div className="min-w-0 flex-1">
-            <div className="flex flex-wrap items-center gap-2">
-              <h3 className="text-sm font-semibold text-foreground">
-                {allowed ? "Auto Allowed" : "Auto Denied"}
-              </h3>
-              <Badge variant="secondary" className="bg-secondary text-foreground">
-                <Terminal className="mr-1 size-3" />
-                {toolCall.toolName}
-              </Badge>
-            </div>
-            <p className="mt-1 text-sm text-muted-foreground">{reason}</p>
-          </div>
-        </div>
-        {command && (
-          <div className="rounded-md border bg-background/50 p-3">
-            <p className="mb-1.5 text-xs font-medium uppercase tracking-wide text-muted-foreground">Command</p>
-            <pre className="whitespace-pre-wrap break-all font-mono text-xs text-foreground">{command}</pre>
-          </div>
-        )}
-        {filePermission && (
-          <div className="space-y-3 rounded-md border bg-background/50 p-3">
-            <div>
-              <p className="mb-1.5 text-xs font-medium uppercase tracking-wide text-muted-foreground">Action</p>
-              <p className="text-xs font-medium text-foreground">
-                {fileActionLabels[filePermission.operation] ?? filePermission.operation}
-              </p>
-            </div>
-            <div>
-              <p className="mb-1.5 text-xs font-medium uppercase tracking-wide text-muted-foreground">
-                Path{filePermission.paths.length === 1 ? "" : "s"}
-              </p>
-              <pre className="whitespace-pre-wrap break-all font-mono text-xs text-foreground">
-                {filePermission.paths.join("\n")}
-              </pre>
-            </div>
-          </div>
-        )}
-      </div>
-    </div>
-  );
-}
diff --git a/apps/x/apps/renderer/src/components/ai-elements/permission-request.tsx b/apps/x/apps/renderer/src/components/ai-elements/permission-request.tsx
index cdcafc27..e9cef6dc 100644
--- a/apps/x/apps/renderer/src/components/ai-elements/permission-request.tsx
+++ b/apps/x/apps/renderer/src/components/ai-elements/permission-request.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import {
   DropdownMenu,
@@ -8,10 +9,9 @@ import {
   DropdownMenuItem,
 } from "@/components/ui/dropdown-menu";
 import { cn } from "@/lib/utils";
-import { AlertTriangleIcon, CheckIcon, ChevronDownIcon, XIcon } from "lucide-react";
-import { useState, type ComponentProps } from "react";
+import { AlertTriangleIcon, CheckCircleIcon, CheckIcon, ChevronDownIcon, XCircleIcon, XIcon } from "lucide-react";
+import type { ComponentProps } from "react";
 import { ToolCallPart } from "@x/shared/dist/message.js";
-import { ToolPermissionMetadata } from "@x/shared/dist/runs.js";
 import z from "zod";
 
 export type PermissionRequestProps = ComponentProps<"div"> & {
@@ -22,15 +22,6 @@ export type PermissionRequestProps = ComponentProps<"div"> & {
   onDeny?: () => void;
   isProcessing?: boolean;
   response?: 'approve' | 'deny' | null;
-  permission?: z.infer<typeof ToolPermissionMetadata>;
-};
-
-const fileActionLabels: Record<string, string> = {
-  read: "Read file",
-  list: "List folder",
-  search: "Search files",
-  write: "Write files",
-  delete: "Delete path",
 };
 
 export const PermissionRequest = ({
@@ -42,33 +33,26 @@ export const PermissionRequest = ({
   onDeny,
   isProcessing = false,
   response = null,
-  permission,
   ...props
 }: PermissionRequestProps) => {
   // Extract command from arguments if it's executeCommand
-  const command = permission?.kind === "command" || toolCall.toolName === "executeCommand"
+  const command = toolCall.toolName === "executeCommand" 
     ? (typeof toolCall.arguments === "object" && toolCall.arguments !== null && "command" in toolCall.arguments
         ? String(toolCall.arguments.command)
         : JSON.stringify(toolCall.arguments))
     : null;
-  const filePermission = permission?.kind === "file" ? permission : null;
 
   const isResponded = response !== null;
   const isApproved = response === 'approve';
 
-  // Once a response is chosen, collapse the details to just the header.
-  // Users can click the header to expand them again.
-  const [expanded, setExpanded] = useState(false);
-  const showDetails = !isResponded || expanded;
-
   return (
     <div
       className={cn(
         "not-prose mb-4 w-full rounded-md border",
         isResponded
           ? isApproved
-            ? "border-green-500/60 bg-green-200/80 dark:border-green-500/40 dark:bg-green-900/40"
-            : "border-[#fa2525]/70 bg-[#fa2525]/30 dark:border-[#fa2525]/60 dark:bg-[#fa2525]/30"
+            ? "border-green-500/50 bg-green-50/50 dark:bg-green-950/20"
+            : "border-red-500/50 bg-red-50/50 dark:bg-red-950/20"
           : "border-amber-500/50 bg-amber-50/50 dark:bg-amber-950/20",
         className
       )}
@@ -76,14 +60,17 @@ export const PermissionRequest = ({
     >
       <div className="p-4 space-y-4">
         <div className="flex items-start gap-3">
-          {!isResponded && (
+          {isResponded ? (
+            isApproved ? (
+              <CheckCircleIcon className="size-5 text-green-600 dark:text-green-500 shrink-0 mt-0.5" />
+            ) : (
+              <XCircleIcon className="size-5 text-red-600 dark:text-red-500 shrink-0 mt-0.5" />
+            )
+          ) : (
             <AlertTriangleIcon className="size-5 text-amber-600 dark:text-amber-500 shrink-0 mt-0.5" />
           )}
           <div className="flex-1 space-y-2">
-            <div
-              className={cn("flex items-center gap-2", isResponded && "cursor-pointer select-none")}
-              onClick={isResponded ? () => setExpanded((v) => !v) : undefined}
-            >
+            <div className="flex items-center gap-2">
               <div className="flex-1">
                 <h3 className="font-semibold text-sm text-foreground">
                   {isResponded ? (isApproved ? "Permission Granted" : "Permission Denied") : "Permission Required"}
@@ -93,15 +80,30 @@ export const PermissionRequest = ({
                 </p>
               </div>
               {isResponded && (
-                <ChevronDownIcon
+                <Badge 
+                  variant="secondary" 
                   className={cn(
-                    "size-4 shrink-0 text-muted-foreground transition-transform",
-                    expanded ? "rotate-180" : "rotate-0"
+                    "shrink-0",
+                    isApproved 
+                      ? "bg-green-100 text-green-700 dark:bg-green-900/50 dark:text-green-400" 
+                      : "bg-red-100 text-red-700 dark:bg-red-900/50 dark:text-red-400"
                   )}
-                />
+                >
+                  {isApproved ? (
+                    <>
+                      <CheckIcon className="size-3 mr-1" />
+                      Approved
+                    </>
+                  ) : (
+                    <>
+                      <XIcon className="size-3 mr-1" />
+                      Denied
+                    </>
+                  )}
+                </Badge>
               )}
             </div>
-            {showDetails && command && (
+            {command && (
               <div className="rounded-md border bg-background/50 p-3 mt-3">
                 <p className="text-xs font-medium text-muted-foreground mb-1.5 uppercase tracking-wide">
                   Command
@@ -111,35 +113,7 @@ export const PermissionRequest = ({
                 </pre>
               </div>
             )}
-            {showDetails && filePermission && (
-              <div className="rounded-md border bg-background/50 p-3 mt-3 space-y-3">
-                <div>
-                  <p className="text-xs font-medium text-muted-foreground mb-1.5 uppercase tracking-wide">
-                    Action
-                  </p>
-                  <p className="text-xs font-medium text-foreground">
-                    {fileActionLabels[filePermission.operation] ?? filePermission.operation}
-                  </p>
-                </div>
-                <div>
-                  <p className="text-xs font-medium text-muted-foreground mb-1.5 uppercase tracking-wide">
-                    Path{filePermission.paths.length === 1 ? "" : "s"}
-                  </p>
-                  <pre className="whitespace-pre-wrap text-xs font-mono text-foreground break-all">
-                    {filePermission.paths.join("\n")}
-                  </pre>
-                </div>
-                <div>
-                  <p className="text-xs font-medium text-muted-foreground mb-1.5 uppercase tracking-wide">
-                    Approval Scope
-                  </p>
-                  <pre className="whitespace-pre-wrap text-xs font-mono text-foreground break-all">
-                    {filePermission.pathPrefix}
-                  </pre>
-                </div>
-              </div>
-            )}
-            {showDetails && !command && !filePermission && toolCall.arguments && (
+            {!command && toolCall.arguments && (
               <div className="rounded-md border bg-background/50 p-3 mt-3">
                 <p className="text-xs font-medium text-muted-foreground mb-1.5 uppercase tracking-wide">
                   Arguments
@@ -159,12 +133,12 @@ export const PermissionRequest = ({
                 size="sm"
                 onClick={onApprove}
                 disabled={isProcessing}
-                className={cn("flex-1", (command || filePermission) && "rounded-r-none")}
+                className={cn("flex-1", command && "rounded-r-none")}
               >
                 <CheckIcon className="size-4" />
                 Approve
               </Button>
-              {(command || filePermission) && (
+              {command && (
                 <DropdownMenu>
                   <DropdownMenuTrigger asChild>
                     <Button
diff --git a/apps/x/apps/renderer/src/components/ai-elements/tool.tsx b/apps/x/apps/renderer/src/components/ai-elements/tool.tsx
index 9635b244..5f65fa32 100644
--- a/apps/x/apps/renderer/src/components/ai-elements/tool.tsx
+++ b/apps/x/apps/renderer/src/components/ai-elements/tool.tsx
@@ -1,28 +1,25 @@
 "use client";
 
+import { Badge } from "@/components/ui/badge";
 import {
   Collapsible,
   CollapsibleContent,
   CollapsibleTrigger,
 } from "@/components/ui/collapsible";
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipTrigger,
-} from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
 import type { ToolUIPart } from "ai";
 import {
+  CheckCircleIcon,
   ChevronDownIcon,
-  CircleCheck,
-  LoaderIcon,
-  ShieldCheckIcon,
+  CircleIcon,
+  ClockIcon,
+  WrenchIcon,
   XCircleIcon,
 } from "lucide-react";
 import { type ComponentProps, type ReactNode, isValidElement, useState } from "react";
 import { AnimatePresence, motion } from "motion/react";
 import type { ToolCall, ToolGroup as ToolGroupType } from "@/lib/chat-conversation";
-import { getToolActionsSummary, getToolDisplayName, getToolGroupSummary, toToolState } from "@/lib/chat-conversation";
+import { getToolDisplayName, getToolGroupSummary, toToolState } from "@/lib/chat-conversation";
 
 const formatToolValue = (value: unknown) => {
   if (typeof value === "string") return value;
@@ -51,68 +48,51 @@ const ToolCode = ({
   </pre>
 );
 
-export type ToolAutoPermissionDetail = {
-  decision: "allow";
-  reason: string;
-};
+export type ToolProps = ComponentProps<typeof Collapsible>;
 
-export type ToolProps = ComponentProps<typeof Collapsible> & {
-  autoPermissionDetail?: ToolAutoPermissionDetail;
-};
-
-export const Tool = ({ className, children, autoPermissionDetail, ...props }: ToolProps) => {
-  const toolCard = (
-    <Collapsible
-      className={cn(
-        autoPermissionDetail
-          ? "w-full rounded-[28px] border bg-[var(--card-surface)] transition-colors duration-150 ease-out hover:border-foreground/30"
-          : "not-prose mb-4 w-full rounded-[28px] border bg-[var(--card-surface)] transition-colors duration-150 ease-out hover:border-foreground/30",
-        className
-      )}
-      {...props}
-    >
-      {children}
-    </Collapsible>
-  );
-
-  if (!autoPermissionDetail) return toolCard;
-
-  return (
-    <div className="not-prose mb-4 w-full">
-      {toolCard}
-      <div className="mt-1 flex justify-end px-3">
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <span className="inline-flex cursor-help items-center gap-1 text-[11px] text-muted-foreground/70">
-              <ShieldCheckIcon className="size-3 text-muted-foreground/70" />
-              Auto-approved
-            </span>
-          </TooltipTrigger>
-          <TooltipContent side="bottom" align="end" className="max-w-sm">
-            {autoPermissionDetail.reason}
-          </TooltipContent>
-        </Tooltip>
-      </div>
-    </div>
-  );
-};
+export const Tool = ({ className, ...props }: ToolProps) => (
+  <Collapsible
+    className={cn("not-prose mb-4 w-full rounded-md border", className)}
+    {...props}
+  />
+);
 
 export type ToolHeaderProps = {
   title?: string;
   type: ToolUIPart["type"];
   state: ToolUIPart["state"];
   className?: string;
-  /** Hide the leading status icon (used for child rows inside a tool group). */
-  hideLeadIcon?: boolean;
 };
 
-// Lead icon shown to the left of the tool label: spinner while running, a
-// green check when done, a red cross on error. Shared by ToolHeader (single
-// tools) and the tool-call group.
-const getLeadIcon = (state: ToolUIPart["state"]): ReactNode => {
-  if (state === "output-available") return <CircleCheck className="size-4 shrink-0 text-green-600" />;
-  if (state === "output-error") return <XCircleIcon className="size-4 shrink-0 text-red-600" />;
-  return <LoaderIcon className="size-4 shrink-0 animate-spin text-muted-foreground" />;
+const getStatusBadge = (status: ToolUIPart["state"]) => {
+  const labels: Record<ToolUIPart["state"], string> = {
+    "input-streaming": "Pending",
+    "input-available": "Running",
+    // @ts-expect-error state only available in AI SDK v6
+    "approval-requested": "Awaiting Approval",
+    "approval-responded": "Responded",
+    "output-available": "Completed",
+    "output-error": "Error",
+    "output-denied": "Denied",
+  };
+
+  const icons: Record<ToolUIPart["state"], ReactNode> = {
+    "input-streaming": <CircleIcon className="size-4" />,
+    "input-available": <ClockIcon className="size-4 animate-pulse" />,
+    // @ts-expect-error state only available in AI SDK v6
+    "approval-requested": <ClockIcon className="size-4 text-yellow-600" />,
+    "approval-responded": <CheckCircleIcon className="size-4 text-blue-600" />,
+    "output-available": <CheckCircleIcon className="size-4 text-green-600" />,
+    "output-error": <XCircleIcon className="size-4 text-red-600" />,
+    "output-denied": <XCircleIcon className="size-4 text-orange-600" />,
+  };
+
+  return (
+    <Badge className="gap-1.5 rounded-full text-xs" variant="secondary">
+      {icons[status]}
+      {labels[status]}
+    </Badge>
+  );
 };
 
 export const ToolHeader = ({
@@ -120,7 +100,6 @@ export const ToolHeader = ({
   title,
   type,
   state,
-  hideLeadIcon,
   ...props
 }: ToolHeaderProps) => {
   const displayTitle = title ?? type.split("-").slice(1).join("-")
@@ -128,13 +107,13 @@ export const ToolHeader = ({
   return (
     <CollapsibleTrigger
       className={cn(
-        "group flex w-full cursor-pointer items-center justify-between gap-3 px-4 py-2.5",
+        "flex w-full items-center justify-between gap-4 p-3",
         className
       )}
       {...props}
     >
       <div className="flex min-w-0 flex-1 items-center gap-2">
-        {!hideLeadIcon && getLeadIcon(state)}
+        <WrenchIcon className="size-4 shrink-0 text-muted-foreground" />
         <span
           className="min-w-0 flex-1 truncate text-left font-medium text-sm"
           title={displayTitle}
@@ -142,7 +121,10 @@ export const ToolHeader = ({
           {displayTitle}
         </span>
       </div>
-      <ChevronDownIcon className="size-4 shrink-0 text-muted-foreground transition-transform group-data-[state=open]:rotate-180" />
+      <div className="flex shrink-0 items-center gap-3">
+        {getStatusBadge(state)}
+        <ChevronDownIcon className="size-4 text-muted-foreground transition-transform group-data-[state=open]:rotate-180" />
+      </div>
     </CollapsibleTrigger>
   )
 };
@@ -152,7 +134,7 @@ export type ToolContentProps = ComponentProps<typeof CollapsibleContent>;
 export const ToolContent = ({ className, ...props }: ToolContentProps) => (
   <CollapsibleContent
     className={cn(
-      "overflow-hidden text-popover-foreground outline-none data-[state=open]:animate-[collapsible-down_0.09s_ease-out] data-[state=closed]:animate-[collapsible-up_0.08s_ease-in]",
+      "data-[state=closed]:fade-out-0 data-[state=closed]:slide-out-to-top-2 data-[state=open]:slide-in-from-top-2 text-popover-foreground outline-none data-[state=closed]:animate-out data-[state=open]:animate-in",
       className
     )}
     {...props}
@@ -265,48 +247,41 @@ export const ToolGroupComponent = ({ group, isToolOpen, onToolOpenChange }: Tool
   const isCompleted = state === 'output-available' || state === 'output-error'
   const runningTool = group.items.find(t => t.status === 'running' || t.status === 'pending')
   const currentTool = runningTool ?? group.items[group.items.length - 1]
-  const toolCount = group.items.length
-  const ranLabel = `Ran ${toolCount} tool${toolCount !== 1 ? 's' : ''}`
-  const actions = isCompleted ? getToolActionsSummary(group.items) : ''
-  // Plain string used as the AnimatePresence key + tooltip; the rendered node
-  // shows the action summary in a lighter gray than the "Ran N tools" prefix.
-  const summaryText = isCompleted
-    ? `${ranLabel} · ${actions}`
+  const summary = isCompleted
+    ? `Ran ${group.items.length} tool${group.items.length !== 1 ? 's' : ''}`
     : currentTool ? getToolDisplayName(currentTool) : getToolGroupSummary(group.items)
-  const summaryNode: ReactNode = isCompleted
-    ? <>{ranLabel} <span className="font-normal text-muted-foreground">{`· ${actions}`}</span></>
-    : summaryText
-
-  const leadIcon = getLeadIcon(state)
 
   return (
     <Collapsible
       open={open}
       onOpenChange={setOpen}
-      className="not-prose mb-4 w-full rounded-[28px] border bg-[var(--card-surface)] transition-colors duration-150 ease-out hover:border-foreground/30"
+      className="not-prose mb-4 w-full rounded-md border"
     >
-      <CollapsibleTrigger className="flex w-full cursor-pointer items-center justify-between gap-3 px-4 py-2.5">
+      <CollapsibleTrigger className="flex w-full items-center justify-between gap-4 p-3">
         <div className="flex min-w-0 flex-1 items-center gap-2">
-          {leadIcon}
+          <WrenchIcon className="size-4 shrink-0 text-muted-foreground" />
           <div className="relative min-w-0 flex-1 overflow-hidden" style={{ height: '1.25rem' }}>
             <AnimatePresence mode="popLayout" initial={false}>
               <motion.span
-                key={summaryText}
+                key={summary}
                 initial={{ opacity: 0, y: 10 }}
                 animate={{ opacity: 1, y: 0 }}
                 exit={{ opacity: 0, y: -10 }}
                 transition={{ duration: 0.18, ease: 'easeOut' }}
                 className="absolute inset-0 truncate text-left font-medium text-sm leading-5"
-                title={summaryText}
+                title={summary}
               >
-                {summaryNode}
+                {summary}
               </motion.span>
             </AnimatePresence>
           </div>
         </div>
-        <ChevronDownIcon className={cn("size-4 shrink-0 text-muted-foreground transition-transform", open && "rotate-180")} />
+        <div className="flex shrink-0 items-center gap-3">
+          {getStatusBadge(state)}
+          <ChevronDownIcon className={cn("size-4 text-muted-foreground transition-transform", open && "rotate-180")} />
+        </div>
       </CollapsibleTrigger>
-      <CollapsibleContent className="overflow-hidden data-[state=open]:animate-[collapsible-down_0.09s_ease-out] data-[state=closed]:animate-[collapsible-up_0.08s_ease-in]">
+      <CollapsibleContent className="border-t">
         <div className="flex flex-col gap-2 p-2">
           {group.items.map((tool) => {
             const toolState = toToolState(tool.status)
@@ -316,14 +291,12 @@ export const ToolGroupComponent = ({ group, isToolOpen, onToolOpenChange }: Tool
                 key={tool.id}
                 open={isOpen}
                 onOpenChange={(o) => onToolOpenChange(tool.id, o)}
-                className="mb-0 rounded-[20px] border-border/60 bg-transparent hover:border-border/60"
+                className="mb-0 border-border/60"
               >
                 <ToolHeader
                   title={getToolDisplayName(tool)}
                   type={`tool-${tool.name}`}
                   state={toolState}
-                  className="text-muted-foreground"
-                  hideLeadIcon
                 />
                 <ToolContent>
                   <ToolTabbedContent
diff --git a/apps/x/apps/renderer/src/components/ai-elements/web-search-result.tsx b/apps/x/apps/renderer/src/components/ai-elements/web-search-result.tsx
index f9fe311a..30e5c002 100644
--- a/apps/x/apps/renderer/src/components/ai-elements/web-search-result.tsx
+++ b/apps/x/apps/renderer/src/components/ai-elements/web-search-result.tsx
@@ -5,14 +5,12 @@ import {
   CollapsibleContent,
   CollapsibleTrigger,
 } from "@/components/ui/collapsible";
-import { cn } from "@/lib/utils";
 import {
+  CheckCircleIcon,
   ChevronDownIcon,
   GlobeIcon,
   LoaderIcon,
 } from "lucide-react";
-import { useEffect, useMemo, useState } from "react";
-import { AnimatePresence, motion } from "motion/react";
 
 interface WebSearchResultProps {
   query: string;
@@ -21,219 +19,39 @@ interface WebSearchResultProps {
   title?: string;
 }
 
-// How long each fetched website stays on the rolling header before the
-// next one slides in. Kept slow enough to read the domain + title.
-const ROLL_INTERVAL_MS = 700;
-
-// How many favicons to show in the settled stack before the rest collapse
-// into a "+N" chip. The text names this many domains too, so the chip count
-// (total - MAX_STACK) lines up with the "and N others" in the summary.
-const MAX_STACK = 3;
-
 function getDomain(url: string): string {
   try {
-    return new URL(url).hostname.replace(/^www\./, "");
+    return new URL(url).hostname;
   } catch {
     return url;
   }
 }
 
-function faviconUrl(domain: string, size = 32): string {
-  return `https://www.google.com/s2/favicons?domain=${domain}&sz=${size}`;
-}
-
-// Collapse the result list into unique domains, preserving order.
-function uniqueDomains(results: WebSearchResultProps["results"]): string[] {
-  const seen = new Set<string>();
-  const out: string[] = [];
-  for (const result of results) {
-    const domain = getDomain(result.url);
-    if (seen.has(domain)) continue;
-    seen.add(domain);
-    out.push(domain);
-  }
-  return out;
-}
-
-// Summary with text hierarchy: "Searched" + "and N others" are secondary
-// weight/color, the domain names are primary text at medium weight.
-function buildSearchedSummary(domains: string[]): React.ReactNode {
-  const muted = "font-normal text-muted-foreground";
-  const name = (d: string) => <span className="font-medium text-foreground">{d}</span>;
-  if (domains.length === 1) {
-    return (
-      <>
-        <span className={muted}>Searched </span>
-        {name(domains[0])}
-      </>
-    );
-  }
-  if (domains.length === 2) {
-    return (
-      <>
-        <span className={muted}>Searched </span>
-        {name(domains[0])}
-        <span className={muted}> and </span>
-        {name(domains[1])}
-      </>
-    );
-  }
-  const others = domains.length - 2;
-  return (
-    <>
-      <span className={muted}>Searched </span>
-      {name(domains[0])}
-      <span className={muted}>, </span>
-      {name(domains[1])}
-      <span className={muted}>{` and ${others} other${others !== 1 ? "s" : ""}`}</span>
-    </>
-  );
-}
-
-type RollPhase = "searching" | "rolling" | "settled";
-
 export function WebSearchResult({ query, results, status, title = "Searched the web" }: WebSearchResultProps) {
   const isRunning = status === "pending" || status === "running";
-  const [open, setOpen] = useState(false);
-
-  const domains = useMemo(() => uniqueDomains(results), [results]);
-
-  // Drive the one-shot rolling reveal. Results arrive all at once, so we
-  // simulate "fetching one site at a time" by stepping through them with the
-  // same slide animation the tool group uses, then settle on a summary.
-  // `settled` is seeded from the initial status so a card loaded already-
-  // complete from history skips straight to the summary (no roll).
-  const [settled, setSettled] = useState(() => !isRunning);
-  const [rollIndex, setRollIndex] = useState(0);
-
-  // Phase is fully derived: searching while the tool runs, rolling once
-  // results land, then settled. No setState-in-effect needed for transitions.
-  const phase: RollPhase = isRunning
-    ? "searching"
-    : !settled && results.length > 0
-      ? "rolling"
-      : "settled";
-
-  // Warm the browser cache for every favicon the moment results arrive, so
-  // each icon is already loaded by the time its row rolls in (~700ms each).
-  // Without this the network fetch lags the text and rows flash icon-less.
-  useEffect(() => {
-    for (const result of results) {
-      const img = new Image();
-      img.src = faviconUrl(getDomain(result.url));
-    }
-  }, [results]);
-
-  // Advance the roll, then settle after the last site has had its moment.
-  // setState only fires inside the timeout callback, never synchronously.
-  useEffect(() => {
-    if (phase !== "rolling") return;
-    const isLast = rollIndex >= results.length - 1;
-    const timer = setTimeout(
-      () => (isLast ? setSettled(true) : setRollIndex((i) => i + 1)),
-      ROLL_INTERVAL_MS,
-    );
-    return () => clearTimeout(timer);
-  }, [phase, rollIndex, results.length]);
-
-  // Build the content for the compact (collapsed) header line. Each distinct
-  // value gets a unique key so AnimatePresence runs the slide transition.
-  let headerKey: string;
-  let headerContent: React.ReactNode;
-  if (phase === "searching") {
-    headerKey = "searching";
-    headerContent = (
-      <span className="flex min-w-0 flex-1 items-center gap-2 text-muted-foreground">
-        <LoaderIcon className="size-4 shrink-0 animate-spin" />
-        <span className="truncate">Searching the web&hellip;</span>
-      </span>
-    );
-  } else if (phase === "rolling") {
-    const result = results[rollIndex];
-    const domain = getDomain(result.url);
-    headerKey = `roll-${rollIndex}`;
-    headerContent = (
-      <span className="flex min-w-0 flex-1 items-center gap-2">
-        <img src={faviconUrl(domain)} alt="" className="size-4 shrink-0 rounded-sm bg-muted/60" />
-        <span className="truncate">
-          <span className="text-muted-foreground">{domain}</span>
-          <span className="text-muted-foreground/50"> &middot; </span>
-          <span>{result.title}</span>
-        </span>
-      </span>
-    );
-  } else {
-    headerKey = "settled";
-    const stack = domains.slice(0, MAX_STACK);
-    // Chip count matches the "and N others" in the text (total minus the 2
-    // named domains), shown only when there are sites beyond the stack.
-    const overflow = domains.length > MAX_STACK ? domains.length - 2 : 0;
-    headerContent = (
-      <span className="flex min-w-0 flex-1 items-center gap-2.5">
-        {domains.length > 0 ? (
-          <span className="flex shrink-0 items-center">
-            {stack.map((domain, i) => (
-              <img
-                key={domain}
-                src={faviconUrl(domain)}
-                alt=""
-                className="size-5 rounded-full bg-muted object-cover -ml-[5px] first:ml-0"
-                style={{ zIndex: stack.length - i }}
-              />
-            ))}
-            {overflow > 0 && (
-              <span className="ml-0.5 flex size-5 shrink-0 items-center justify-center rounded-full bg-foreground/10 dark:bg-muted text-[10px] font-medium text-muted-foreground">
-                +{overflow}
-              </span>
-            )}
-          </span>
-        ) : (
-          <GlobeIcon className="size-4 shrink-0 text-muted-foreground" />
-        )}
-        <span className="truncate text-sm">
-          {domains.length > 0 ? buildSearchedSummary(domains) : title}
-        </span>
-      </span>
-    );
-  }
 
   return (
-    <Collapsible
-      open={open}
-      onOpenChange={setOpen}
-      className="not-prose mb-4 w-full rounded-[28px] border bg-[var(--card-surface)] transition-colors duration-150 ease-out hover:border-foreground/30"
-    >
-      <CollapsibleTrigger className="flex w-full cursor-pointer items-center justify-between gap-3 px-4 py-2.5">
-        {/* Rolling header: clipped, fixed height so sliding lines stay contained */}
-        <div className="relative min-w-0 flex-1 overflow-hidden" style={{ height: "1.5rem" }}>
-          <AnimatePresence mode="popLayout" initial={false}>
-            <motion.span
-              key={headerKey}
-              initial={{ opacity: 0, y: 10 }}
-              animate={{ opacity: 1, y: 0 }}
-              exit={{ opacity: 0, y: -10 }}
-              transition={{ duration: 0.18, ease: "easeOut" }}
-              className="absolute inset-0 flex items-center text-left font-medium text-sm"
-            >
-              {headerContent}
-            </motion.span>
-          </AnimatePresence>
-        </div>
-        <div className="flex shrink-0 items-center gap-2">
-          {phase === "settled" && domains.length > 0 && (
-            <span className="whitespace-nowrap text-xs text-muted-foreground">
-              {domains.length} source{domains.length !== 1 ? "s" : ""}
-            </span>
-          )}
-          <ChevronDownIcon className={cn("size-4 text-muted-foreground transition-transform", open && "rotate-180")} />
+    <Collapsible defaultOpen className="not-prose mb-4 w-full rounded-md border">
+      <CollapsibleTrigger className="flex w-full items-center justify-between gap-4 p-3">
+        <div className="flex items-center gap-2">
+          <GlobeIcon className="size-4 text-muted-foreground" />
+          <span className="font-medium text-sm">{title}</span>
         </div>
+        <ChevronDownIcon className="size-4 text-muted-foreground transition-transform group-data-[state=open]:rotate-180" />
       </CollapsibleTrigger>
-      <CollapsibleContent className="overflow-hidden data-[state=open]:animate-[collapsible-down_0.09s_ease-out] data-[state=closed]:animate-[collapsible-up_0.08s_ease-in]">
-        <div className="px-4 pb-3 space-y-3">
-          {/* Query */}
-          <div className="flex items-center gap-2 text-sm text-muted-foreground min-w-0">
-            <GlobeIcon className="size-3.5 shrink-0" />
-            <span className="truncate">{query}</span>
+      <CollapsibleContent>
+        <div className="px-3 pb-3 space-y-3">
+          {/* Query + result count */}
+          <div className="flex items-center justify-between gap-2">
+            <div className="flex items-center gap-2 text-sm text-muted-foreground min-w-0">
+              <GlobeIcon className="size-3.5 shrink-0" />
+              <span className="truncate">{query}</span>
+            </div>
+            {results.length > 0 && (
+              <span className="text-xs text-muted-foreground whitespace-nowrap">
+                {results.length} result{results.length !== 1 ? "s" : ""}
+              </span>
+            )}
           </div>
 
           {/* Results list */}
@@ -255,7 +73,7 @@ export function WebSearchResult({ query, results, status, title = "Searched the
                   >
                     <div className="flex items-center gap-2 min-w-0">
                       <img
-                        src={faviconUrl(domain)}
+                        src={`https://www.google.com/s2/favicons?domain=${domain}&sz=16`}
                         alt=""
                         className="size-4 shrink-0"
                       />
@@ -270,13 +88,20 @@ export function WebSearchResult({ query, results, status, title = "Searched the
             </div>
           )}
 
-          {/* Status — only while the search is still running. */}
-          {isRunning && (
-            <div className="flex items-center gap-1.5 text-xs text-muted-foreground">
-              <LoaderIcon className="size-3.5 animate-spin" />
-              <span>Searching...</span>
-            </div>
-          )}
+          {/* Status */}
+          <div className="flex items-center gap-1.5 text-xs text-muted-foreground">
+            {isRunning ? (
+              <>
+                <LoaderIcon className="size-3.5 animate-spin" />
+                <span>Searching...</span>
+              </>
+            ) : (
+              <>
+                <CheckCircleIcon className="size-3.5 text-green-600" />
+                <span>Done</span>
+              </>
+            )}
+          </div>
         </div>
       </CollapsibleContent>
     </Collapsible>
diff --git a/apps/x/apps/renderer/src/components/bases-view.tsx b/apps/x/apps/renderer/src/components/bases-view.tsx
index b1f5413c..a68eb360 100644
--- a/apps/x/apps/renderer/src/components/bases-view.tsx
+++ b/apps/x/apps/renderer/src/components/bases-view.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { useEffect, useState, useMemo, useCallback, useRef } from 'react'
-import { ArrowDown, ArrowUp, ChevronLeft, ChevronRight, X, Check, ListFilter, Filter, Search, Save, Copy, FolderOpen, Pencil, Trash2 } from 'lucide-react'
+import { ArrowDown, ArrowUp, ChevronLeft, ChevronRight, X, Check, ListFilter, Filter, Search, Save, Copy, Pencil, Trash2 } from 'lucide-react'
 import { Badge } from '@/components/ui/badge'
 import { Popover, PopoverTrigger, PopoverContent } from '@/components/ui/popover'
 import { Command, CommandInput, CommandList, CommandItem, CommandEmpty, CommandGroup } from '@/components/ui/command'
@@ -103,18 +103,9 @@ type BasesViewProps = {
     rename: (oldPath: string, newName: string, isDir: boolean) => Promise<void>
     remove: (path: string) => Promise<void>
     copyPath: (path: string) => void
-    revealInFileManager: (path: string, isDir: boolean) => void
   }
 }
 
-function getFileManagerName(): string {
-  if (typeof navigator === 'undefined') return 'File Manager'
-  const platform = navigator.platform.toLowerCase()
-  if (platform.includes('mac')) return 'Finder'
-  if (platform.includes('win')) return 'Explorer'
-  return 'File Manager'
-}
-
 function collectFiles(nodes: TreeNode[]): { path: string; name: string; mtimeMs: number }[] {
   return nodes.flatMap((n) =>
     n.kind === 'file' && n.name.endsWith('.md')
@@ -928,10 +919,6 @@ function NoteRow({
           <Copy className="mr-2 size-4" />
           Copy Path
         </ContextMenuItem>
-        <ContextMenuItem onClick={() => actions?.revealInFileManager(note.path, false)}>
-          <FolderOpen className="mr-2 size-4" />
-          Open in {getFileManagerName()}
-        </ContextMenuItem>
         <ContextMenuSeparator />
         <ContextMenuItem onClick={() => { setNewName(baseName); isSubmittingRef.current = false; setIsRenaming(true) }}>
           <Pencil className="mr-2 size-4" />
diff --git a/apps/x/apps/renderer/src/components/bg-tasks-view.tsx b/apps/x/apps/renderer/src/components/bg-tasks-view.tsx
deleted file mode 100644
index 4ba7479f..00000000
--- a/apps/x/apps/renderer/src/components/bg-tasks-view.tsx
+++ /dev/null
@@ -1,1722 +0,0 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { Streamdown } from 'streamdown'
-import {
-    ListChecks, Play, Square, Loader2, Trash2, Plus, X, AlertCircle,
-    Repeat, Clock, Zap, ChevronLeft, ChevronDown, ChevronRight,
-    Pencil, Check, PanelRightClose, PanelRightOpen, Sparkles,
-} from 'lucide-react'
-import type { z } from 'zod'
-import type { BackgroundTask, BackgroundTaskSummary, Triggers } from '@x/shared/dist/background-task.js'
-import type { Run } from '@x/shared/dist/runs.js'
-import { Button } from '@/components/ui/button'
-import { Switch } from '@/components/ui/switch'
-import { Input } from '@/components/ui/input'
-import { Textarea } from '@/components/ui/textarea'
-import { useBackgroundTaskAgentStatus } from '@/hooks/use-bg-task-agent-status'
-import { formatRelativeTime } from '@/lib/relative-time'
-import { toast } from '@/lib/toast'
-import type { ConversationItem } from '@/lib/chat-conversation'
-import { runLogToConversation } from '@/lib/run-to-conversation'
-import { CompactConversation } from '@/components/compact-conversation'
-import { RichMarkdownViewer } from '@/components/rich-markdown-viewer'
-
-// ---------------------------------------------------------------------------
-// Trigger helpers (inlined; extract to shared <TriggersEditor> as a follow-up)
-// ---------------------------------------------------------------------------
-
-const HH_MM = /^([01]\d|2[0-3]):[0-5]\d$/
-
-const CRON_PHRASES: Record<string, string> = {
-    '* * * * *': 'Every minute',
-    '*/5 * * * *': 'Every 5 minutes',
-    '*/15 * * * *': 'Every 15 minutes',
-    '*/30 * * * *': 'Every 30 minutes',
-    '0 * * * *': 'Hourly, on the hour',
-    '0 */2 * * *': 'Every 2 hours',
-    '0 */6 * * *': 'Every 6 hours',
-    '0 */12 * * *': 'Every 12 hours',
-    '0 0 * * *': 'Daily at midnight',
-    '0 8 * * *': 'Daily at 8 AM',
-    '0 9 * * *': 'Daily at 9 AM',
-    '0 12 * * *': 'Daily at noon',
-    '0 18 * * *': 'Daily at 6 PM',
-    '0 9 * * 1-5': 'Weekdays at 9 AM',
-    '0 17 * * 1-5': 'Weekdays at 5 PM',
-}
-
-function describeCron(expr: string): string {
-    return CRON_PHRASES[expr.trim()] ?? expr
-}
-
-function summarizeSchedule(triggers: Triggers | undefined): string {
-    if (!triggers) return 'Manual only'
-    const parts: string[] = []
-    if (triggers.cronExpr) parts.push(describeCron(triggers.cronExpr))
-    if (triggers.windows && triggers.windows.length > 0) {
-        parts.push(triggers.windows.length === 1
-            ? `${triggers.windows[0].startTime}–${triggers.windows[0].endTime}`
-            : `${triggers.windows.length} windows`)
-    }
-    if (triggers.eventMatchCriteria) parts.push('events')
-    return parts.length === 0 ? 'Manual only' : parts.join(' · ')
-}
-
-function formatRunAt(iso: string): string {
-    const d = new Date(iso)
-    const date = d.toLocaleString('en-US', { month: 'short', day: 'numeric' })
-    const time = d.toLocaleTimeString('en-US', { hour: 'numeric', minute: '2-digit', hour12: true })
-    return `${date} · ${time}`
-}
-
-// `formatRelativeTime` returns "just now" for sub-minute, otherwise compact
-// units like "5 m" / "3 h" / "2 d". Naively appending " ago" reads wrong for
-// "just now"; this helper handles both shapes.
-function relativeLabel(iso: string | undefined | null): string | null {
-    if (!iso) return null
-    const rel = formatRelativeTime(iso)
-    if (!rel) return null
-    if (rel === 'just now') return rel
-    return `${rel} ago`
-}
-
-function TriggersEditor({
-    value,
-    onChange,
-}: {
-    value: Triggers | undefined
-    onChange: (next: Triggers | undefined) => void
-}) {
-    const triggers: Triggers = value ?? {}
-    const [editingEvents, setEditingEvents] = useState(false)
-    const hasCron = typeof triggers.cronExpr === 'string'
-    const hasWindows = Array.isArray(triggers.windows) && triggers.windows.length > 0
-    const hasEvent = typeof triggers.eventMatchCriteria === 'string'
-
-    const updateTriggers = (next: Partial<Triggers>) => {
-        const merged: Triggers = { ...triggers, ...next }
-        ;(Object.keys(merged) as (keyof Triggers)[]).forEach(key => {
-            if (merged[key] === undefined) delete merged[key]
-        })
-        onChange(Object.keys(merged).length === 0 ? undefined : merged)
-    }
-
-    return (
-        <div className="grid grid-cols-[74px_1fr] items-start gap-x-3 gap-y-4">
-            <div className="flex items-center gap-1.5 pt-1.5 text-xs text-muted-foreground">
-                <Repeat className="size-3.5" /> Cron
-            </div>
-            <div>
-                {hasCron ? (
-                    <div className="space-y-1">
-                        <div className="flex items-center gap-1.5">
-                            <Input
-                                value={triggers.cronExpr ?? ''}
-                                onChange={e => updateTriggers({ cronExpr: e.target.value })}
-                                placeholder="0 * * * *"
-                                className="h-7 max-w-[160px] font-mono text-xs"
-                            />
-                            <button
-                                type="button"
-                                onClick={() => updateTriggers({ cronExpr: undefined })}
-                                className="inline-flex size-6 items-center justify-center rounded text-muted-foreground hover:bg-accent hover:text-foreground"
-                                aria-label="Remove cron"
-                            >
-                                <X className="size-3" />
-                            </button>
-                        </div>
-                        {triggers.cronExpr && (
-                            <div className="text-[11px] text-muted-foreground">{describeCron(triggers.cronExpr)}</div>
-                        )}
-                    </div>
-                ) : (
-                    <button
-                        type="button"
-                        onClick={() => updateTriggers({ cronExpr: '0 * * * *' })}
-                        className="inline-flex items-center gap-1 pt-1.5 text-[11px] text-muted-foreground hover:text-foreground"
-                    >
-                        <Plus className="size-3" /> Cron
-                    </button>
-                )}
-            </div>
-
-            <div className="flex items-center gap-1.5 pt-1.5 text-xs text-muted-foreground">
-                <Clock className="size-3.5" /> Windows
-            </div>
-            <div>
-                {hasWindows && triggers.windows ? (
-                    <div className="space-y-1.5">
-                        {triggers.windows.map((w, idx) => (
-                            <div key={idx} className="flex items-center gap-1.5">
-                                <Input
-                                    value={w.startTime}
-                                    onChange={e => {
-                                        const next = [...(triggers.windows ?? [])]
-                                        next[idx] = { ...next[idx], startTime: e.target.value }
-                                        updateTriggers({ windows: next })
-                                    }}
-                                    placeholder="09:00"
-                                    className={`h-7 w-20 font-mono text-xs ${HH_MM.test(w.startTime) ? '' : 'border-destructive'}`}
-                                />
-                                <span className="text-xs text-muted-foreground">–</span>
-                                <Input
-                                    value={w.endTime}
-                                    onChange={e => {
-                                        const next = [...(triggers.windows ?? [])]
-                                        next[idx] = { ...next[idx], endTime: e.target.value }
-                                        updateTriggers({ windows: next })
-                                    }}
-                                    placeholder="12:00"
-                                    className={`h-7 w-20 font-mono text-xs ${HH_MM.test(w.endTime) ? '' : 'border-destructive'}`}
-                                />
-                                <button
-                                    type="button"
-                                    onClick={() => {
-                                        const next = (triggers.windows ?? []).filter((_, i) => i !== idx)
-                                        updateTriggers({ windows: next.length === 0 ? undefined : next })
-                                    }}
-                                    className="ml-auto inline-flex size-6 items-center justify-center rounded text-muted-foreground hover:bg-accent hover:text-foreground"
-                                    aria-label="Remove window"
-                                >
-                                    <X className="size-3" />
-                                </button>
-                            </div>
-                        ))}
-                        <button
-                            type="button"
-                            onClick={() => updateTriggers({
-                                windows: [...(triggers.windows ?? []), { startTime: '13:00', endTime: '15:00' }],
-                            })}
-                            className="inline-flex items-center gap-1 text-[11px] text-muted-foreground hover:text-foreground"
-                        >
-                            <Plus className="size-3" /> Window
-                        </button>
-                    </div>
-                ) : (
-                    <button
-                        type="button"
-                        onClick={() => updateTriggers({ windows: [{ startTime: '09:00', endTime: '12:00' }] })}
-                        className="inline-flex items-center gap-1 pt-1.5 text-[11px] text-muted-foreground hover:text-foreground"
-                    >
-                        <Plus className="size-3" /> Window
-                    </button>
-                )}
-            </div>
-
-            <div className="flex items-center gap-1.5 pt-1.5 text-xs text-muted-foreground">
-                <Zap className="size-3.5" /> Events
-            </div>
-            <div>
-                {hasEvent ? (
-                    editingEvents ? (
-                        <div className="space-y-1.5">
-                            <Textarea
-                                value={triggers.eventMatchCriteria ?? ''}
-                                onChange={e => updateTriggers({ eventMatchCriteria: e.target.value })}
-                                rows={5}
-                                autoFocus
-                                placeholder="Emails or calendar events about…"
-                                className="text-xs"
-                            />
-                            <div className="flex items-center gap-2">
-                                <button
-                                    type="button"
-                                    onClick={() => setEditingEvents(false)}
-                                    className="text-[11px] font-medium text-foreground hover:underline"
-                                >
-                                    Done
-                                </button>
-                                <button
-                                    type="button"
-                                    onClick={() => {
-                                        updateTriggers({ eventMatchCriteria: undefined })
-                                        setEditingEvents(false)
-                                    }}
-                                    className="text-[11px] text-muted-foreground hover:text-destructive"
-                                >
-                                    Remove
-                                </button>
-                            </div>
-                        </div>
-                    ) : (
-                        <div className="text-xs leading-relaxed text-foreground/85">
-                            {triggers.eventMatchCriteria || <span className="italic text-muted-foreground">No criteria yet.</span>}
-                            <button
-                                type="button"
-                                onClick={() => setEditingEvents(true)}
-                                className="ml-1 text-[11px] font-medium text-muted-foreground hover:text-foreground"
-                            >
-                                {triggers.eventMatchCriteria ? 'Edit rule →' : 'Add →'}
-                            </button>
-                        </div>
-                    )
-                ) : (
-                    <button
-                        type="button"
-                        onClick={() => {
-                            updateTriggers({ eventMatchCriteria: '' })
-                            setEditingEvents(true)
-                        }}
-                        className="inline-flex items-center gap-1 pt-1.5 text-[11px] text-muted-foreground hover:text-foreground"
-                    >
-                        <Plus className="size-3" /> Event rule
-                    </button>
-                )}
-            </div>
-        </div>
-    )
-}
-
-// ---------------------------------------------------------------------------
-// New Task dialog
-// ---------------------------------------------------------------------------
-
-type DialogMode = 'describe' | 'manual'
-
-function NewTaskDialog({
-    open,
-    onClose,
-    onCreated,
-    onCreateWithCopilot,
-}: {
-    open: boolean
-    onClose: () => void
-    onCreated: (slug: string) => void
-    /**
-     * Optional Copilot hand-off. When provided, the dialog opens in
-     * free-form "describe" mode and the user can punt to Copilot with a
-     * single-sentence description. Falls back to the manual form if absent.
-     */
-    onCreateWithCopilot?: (description: string) => void
-}) {
-    const copilotEnabled = Boolean(onCreateWithCopilot)
-    const [mode, setMode] = useState<DialogMode>(copilotEnabled ? 'describe' : 'manual')
-    const [description, setDescription] = useState('')
-    const [name, setName] = useState('')
-    const [instructions, setInstructions] = useState('')
-    const [triggers, setTriggers] = useState<Triggers | undefined>(undefined)
-    const [submitting, setSubmitting] = useState(false)
-
-    useEffect(() => {
-        if (open) {
-            setMode(copilotEnabled ? 'describe' : 'manual')
-            setDescription('')
-            setName('')
-            setInstructions('')
-            setTriggers(undefined)
-        }
-    }, [open, copilotEnabled])
-
-    const canSubmitDescribe = description.trim().length > 0 && !submitting
-    const canSubmitManual = name.trim().length > 0 && instructions.trim().length > 0 && !submitting
-
-    const submitDescribe = () => {
-        if (!canSubmitDescribe || !onCreateWithCopilot) return
-        onCreateWithCopilot(description.trim())
-        onClose()
-    }
-
-    const submitManual = async () => {
-        if (!canSubmitManual) return
-        setSubmitting(true)
-        try {
-            const result = await window.ipc.invoke('bg-task:create', {
-                name: name.trim(),
-                instructions: instructions.trim(),
-                ...(triggers ? { triggers } : {}),
-            })
-            if (result.success && result.slug) {
-                onCreated(result.slug)
-            } else {
-                toast(result.error ?? 'Failed to create task', 'error')
-            }
-        } catch (err) {
-            toast(err instanceof Error ? err.message : String(err), 'error')
-        } finally {
-            setSubmitting(false)
-        }
-    }
-
-    if (!open) return null
-
-    return (
-        <div
-            className="fixed inset-0 z-50 flex items-center justify-center bg-black/40"
-            onClick={onClose}
-        >
-            <div
-                className="w-full max-w-xl rounded-md border bg-background p-5 shadow-xl"
-                onClick={e => e.stopPropagation()}
-            >
-                <div className="mb-4 flex items-center justify-between">
-                    <h2 className="text-base font-semibold">New background task</h2>
-                    <button
-                        type="button"
-                        onClick={onClose}
-                        className="inline-flex size-7 items-center justify-center rounded text-muted-foreground hover:bg-accent hover:text-foreground"
-                    >
-                        <X className="size-4" />
-                    </button>
-                </div>
-
-                {mode === 'describe' ? (
-                    <>
-                        <Textarea
-                            value={description}
-                            onChange={e => setDescription(e.target.value)}
-                            onKeyDown={e => {
-                                if ((e.metaKey || e.ctrlKey) && e.key === 'Enter') {
-                                    e.preventDefault()
-                                    submitDescribe()
-                                }
-                            }}
-                            placeholder="Describe what this task should do — when it should fire, what it should produce or which action it should take. Copilot will fill in the rest.
-
-Example: every morning at 7, summarize my unread Gmail into a one-paragraph brief plus a bulleted list of action items."
-                            rows={8}
-                            autoFocus
-                            className="resize-y text-[13px] leading-relaxed"
-                        />
-                        <p className="mt-2 text-[11px] text-muted-foreground">
-                            Tip: be specific about the cadence and the format you want. <kbd className="rounded border bg-muted px-1 py-0.5 text-[10px] font-mono">⌘↵</kbd> to submit.
-                        </p>
-
-                        <div className="mt-5 flex items-center justify-between gap-2">
-                            <button
-                                type="button"
-                                onClick={() => setMode('manual')}
-                                className="text-[11px] text-muted-foreground hover:text-foreground"
-                            >
-                                Configure manually →
-                            </button>
-                            <div className="flex items-center gap-2">
-                                <Button variant="outline" size="sm" onClick={onClose} disabled={submitting}>Cancel</Button>
-                                <Button size="sm" onClick={submitDescribe} disabled={!canSubmitDescribe}>
-                                    <Sparkles className="size-3" /> Set up with Copilot
-                                </Button>
-                            </div>
-                        </div>
-                    </>
-                ) : (
-                    <>
-                        <div className="space-y-4">
-                            <div>
-                                <label className="mb-1 block text-[10px] font-medium uppercase tracking-wider text-muted-foreground">Name</label>
-                                <Input
-                                    value={name}
-                                    onChange={e => setName(e.target.value)}
-                                    placeholder="Morning weather brief"
-                                    autoFocus
-                                />
-                            </div>
-                            <div>
-                                <label className="mb-1 block text-[10px] font-medium uppercase tracking-wider text-muted-foreground">Instructions</label>
-                                <Textarea
-                                    value={instructions}
-                                    onChange={e => setInstructions(e.target.value)}
-                                    placeholder="Show SF weather as one line: `<temp>°F, <conditions>`"
-                                    rows={4}
-                                    className="font-mono text-[12.5px]"
-                                />
-                                <p className="mt-1 text-[11px] text-muted-foreground">
-                                    The agent reads the verbs each run to decide whether to update <code className="font-mono">index.md</code> (OUTPUT) or perform an action and journal it (ACTION).
-                                </p>
-                            </div>
-                            <div>
-                                <label className="mb-2 block text-[10px] font-medium uppercase tracking-wider text-muted-foreground">Triggers</label>
-                                <TriggersEditor value={triggers} onChange={setTriggers} />
-                                <p className="mt-2 text-[11px] text-muted-foreground">
-                                    No triggers = manual-only.
-                                </p>
-                            </div>
-                        </div>
-
-                        <div className="mt-5 flex items-center justify-between gap-2">
-                            {copilotEnabled ? (
-                                <button
-                                    type="button"
-                                    onClick={() => setMode('describe')}
-                                    className="text-[11px] text-muted-foreground hover:text-foreground"
-                                >
-                                    ← Describe instead
-                                </button>
-                            ) : <span />}
-                            <div className="flex items-center gap-2">
-                                <Button variant="outline" size="sm" onClick={onClose} disabled={submitting}>Cancel</Button>
-                                <Button size="sm" onClick={submitManual} disabled={!canSubmitManual}>
-                                    {submitting && <Loader2 className="mr-1 size-3 animate-spin" />}
-                                    Create
-                                </Button>
-                            </div>
-                        </div>
-                    </>
-                )}
-            </div>
-        </div>
-    )
-}
-
-// ---------------------------------------------------------------------------
-// Shared UI bits
-// ---------------------------------------------------------------------------
-
-function TabButton({
-    active,
-    onClick,
-    disabled,
-    children,
-}: {
-    active: boolean
-    onClick: () => void
-    disabled?: boolean
-    children: React.ReactNode
-}) {
-    return (
-        <button
-            type="button"
-            onClick={onClick}
-            disabled={disabled}
-            className={`relative px-3 py-2.5 text-xs font-medium transition-colors ${
-                active
-                    ? 'text-foreground after:absolute after:inset-x-2 after:bottom-0 after:h-0.5 after:bg-foreground'
-                    : disabled
-                        ? 'text-muted-foreground/50 cursor-not-allowed'
-                        : 'text-muted-foreground hover:text-foreground'
-            }`}
-        >
-            {children}
-        </button>
-    )
-}
-
-function SectionRegion({ label, children }: { label?: string; children: React.ReactNode }) {
-    return (
-        <div className="border-b border-sidebar-border px-4 py-4 last:border-b-0">
-            {label && (
-                <div className="mb-3 text-[10px] font-medium uppercase tracking-wider text-muted-foreground">
-                    {label}
-                </div>
-            )}
-            {children}
-        </div>
-    )
-}
-
-// ---------------------------------------------------------------------------
-// Output pane — index.md (main pane content)
-//
-// Renders the task's `index.md` like a note: max-width 720px centered, same
-// typography (~16px, 1.5 line-height, generous padding) as the note editor's
-// ProseMirror rule in `editor.css`. No chrome above the body — just the
-// markdown, with a small floating Source ⇄ Rendered toggle in the top-right.
-// ---------------------------------------------------------------------------
-
-function OutputPane({ slug, taskName, refreshKey }: { slug: string; taskName: string; refreshKey: number }) {
-    const [body, setBody] = useState<string>('')
-    const [loading, setLoading] = useState(true)
-    const [viewSource, setViewSource] = useState(false)
-
-    useEffect(() => {
-        let cancelled = false
-        setLoading(true)
-        void (async () => {
-            try {
-                const result = await window.ipc.invoke('workspace:readFile', {
-                    path: `bg-tasks/${slug}/index.md`,
-                })
-                if (!cancelled) setBody(result.data)
-            } catch {
-                if (!cancelled) setBody('')
-            } finally {
-                if (!cancelled) setLoading(false)
-            }
-        })()
-        return () => { cancelled = true }
-    }, [slug, refreshKey])
-
-    const isEmpty = !body.trim() || body.trim() === `# ${taskName}`
-
-    return (
-        <div className="relative flex-1 overflow-hidden bg-background">
-            {!isEmpty && !loading && (
-                <button
-                    type="button"
-                    onClick={() => setViewSource(v => !v)}
-                    className="absolute right-4 top-3 z-10 rounded-md bg-background/70 px-2 py-0.5 text-[11px] text-muted-foreground backdrop-blur hover:bg-accent hover:text-foreground"
-                    aria-label={viewSource ? 'Show rendered output' : 'Show source markdown'}
-                >
-                    {viewSource ? 'Rendered' : 'Source'}
-                </button>
-            )}
-
-            <div className="h-full overflow-y-auto">
-                <div className="mx-auto max-w-[720px] px-16 py-8">
-                    {loading ? (
-                        <div className="flex items-center gap-2 text-xs text-muted-foreground">
-                            <Loader2 className="size-3 animate-spin" /> Loading…
-                        </div>
-                    ) : isEmpty ? (
-                        <p className="text-sm italic text-muted-foreground">
-                            No output yet. Click <span className="font-medium text-foreground">Run now</span> in the sidebar, or wait for a trigger to fire.
-                        </p>
-                    ) : viewSource ? (
-                        <pre className="overflow-x-auto whitespace-pre-wrap font-mono text-[13px] leading-relaxed">{body}</pre>
-                    ) : (
-                        <RichMarkdownViewer content={body} />
-                    )}
-                </div>
-            </div>
-        </div>
-    )
-}
-
-// ---------------------------------------------------------------------------
-// Setup tab — Instructions + Triggers + Advanced
-// ---------------------------------------------------------------------------
-
-function InstructionsBlock({
-    draft,
-    setDraft,
-    editing,
-    setEditing,
-    onCancel,
-    onSave,
-    saving,
-    dirty,
-}: {
-    draft: BackgroundTask
-    setDraft: (next: BackgroundTask) => void
-    editing: boolean
-    setEditing: (v: boolean) => void
-    onCancel: () => void
-    onSave: () => void
-    saving: boolean
-    dirty: boolean
-}) {
-    const textareaRef = useRef<HTMLTextAreaElement>(null)
-
-    useEffect(() => {
-        if (!editing) return
-        const el = textareaRef.current
-        if (!el) return
-        el.focus()
-        const len = el.value.length
-        el.setSelectionRange(len, len)
-    }, [editing])
-
-    if (editing) {
-        return (
-            <div className="space-y-2">
-                <Textarea
-                    ref={textareaRef}
-                    value={draft.instructions}
-                    onChange={e => setDraft({ ...draft, instructions: e.target.value })}
-                    onKeyDown={e => {
-                        if (e.key === 'Escape') {
-                            e.preventDefault()
-                            onCancel()
-                        }
-                    }}
-                    spellCheck
-                    placeholder="What should this task keep doing?"
-                    rows={8}
-                    className="resize-y font-mono text-[12.5px] leading-relaxed"
-                />
-                <div className="flex items-center gap-2">
-                    <Button size="sm" onClick={onSave} disabled={saving || !dirty}>
-                        {saving ? <Loader2 className="size-3 animate-spin" /> : <Check className="size-3" />} Save
-                    </Button>
-                    <Button variant="ghost" size="sm" onClick={onCancel} disabled={saving}>
-                        Cancel
-                    </Button>
-                </div>
-            </div>
-        )
-    }
-
-    return (
-        <div>
-            <div className="mb-2 flex items-center justify-between">
-                <div className="text-[10px] font-medium uppercase tracking-wider text-muted-foreground">Instructions</div>
-                <button
-                    type="button"
-                    onClick={() => setEditing(true)}
-                    className="inline-flex items-center gap-1 text-[11px] text-muted-foreground hover:text-foreground"
-                >
-                    <Pencil className="size-3" /> Edit
-                </button>
-            </div>
-            {draft.instructions.trim() ? (
-                <Streamdown className="prose prose-sm dark:prose-invert max-w-none [&>*:first-child]:mt-0 [&>*:last-child]:mb-0">
-                    {draft.instructions}
-                </Streamdown>
-            ) : (
-                <p className="text-sm italic text-muted-foreground">No instructions yet. Click Edit to write some.</p>
-            )}
-        </div>
-    )
-}
-
-function SetupTab({
-    draft,
-    setDraft,
-    editingInstructions,
-    setEditingInstructions,
-    onCancelInstructions,
-    onSave,
-    saving,
-    dirty,
-    showAdvanced,
-    setShowAdvanced,
-    confirmingDelete,
-    setConfirmingDelete,
-    onDelete,
-}: {
-    draft: BackgroundTask
-    setDraft: (next: BackgroundTask) => void
-    editingInstructions: boolean
-    setEditingInstructions: (v: boolean) => void
-    onCancelInstructions: () => void
-    onSave: () => void
-    saving: boolean
-    dirty: boolean
-    showAdvanced: boolean
-    setShowAdvanced: (v: boolean) => void
-    confirmingDelete: boolean
-    setConfirmingDelete: (v: boolean) => void
-    onDelete: () => void
-}) {
-    return (
-        <div className="flex-1 overflow-auto">
-            <SectionRegion>
-                <InstructionsBlock
-                    draft={draft}
-                    setDraft={setDraft}
-                    editing={editingInstructions}
-                    setEditing={setEditingInstructions}
-                    onCancel={onCancelInstructions}
-                    onSave={onSave}
-                    saving={saving}
-                    dirty={dirty}
-                />
-            </SectionRegion>
-
-            <SectionRegion label="Triggers">
-                <TriggersEditor
-                    value={draft.triggers}
-                    onChange={(next) => setDraft({ ...draft, triggers: next })}
-                />
-            </SectionRegion>
-
-            <div className="border-b border-sidebar-border px-4 py-3">
-                <button
-                    type="button"
-                    onClick={() => setShowAdvanced(!showAdvanced)}
-                    className="flex w-full items-center gap-1.5 text-[10px] font-medium uppercase tracking-wider text-muted-foreground hover:text-foreground"
-                    aria-expanded={showAdvanced}
-                >
-                    {showAdvanced ? <ChevronDown className="size-3" /> : <ChevronRight className="size-3" />}
-                    Advanced
-                </button>
-                {showAdvanced && (
-                    <div className="mt-3">
-                        <div className="grid grid-cols-[74px_1fr] gap-x-3 gap-y-2.5 text-xs">
-                            <span className="pt-1.5 text-muted-foreground">Model</span>
-                            <Input
-                                value={draft.model ?? ''}
-                                onChange={e => setDraft({ ...draft, model: e.target.value || undefined })}
-                                placeholder="(global default)"
-                                className="h-7 font-mono text-xs"
-                            />
-                            <span className="pt-1.5 text-muted-foreground">Provider</span>
-                            <Input
-                                value={draft.provider ?? ''}
-                                onChange={e => setDraft({ ...draft, provider: e.target.value || undefined })}
-                                placeholder="(global default)"
-                                className="h-7 font-mono text-xs"
-                            />
-                        </div>
-                        <div className="mt-4">
-                            {confirmingDelete ? (
-                                <div className="flex flex-wrap items-center justify-between gap-2 rounded-md border border-destructive/30 bg-destructive/5 px-3 py-2.5 text-sm">
-                                    <span className="text-destructive">Delete this task and all its runs?</span>
-                                    <div className="flex gap-2">
-                                        <Button variant="outline" size="sm" onClick={() => setConfirmingDelete(false)} disabled={saving}>
-                                            Cancel
-                                        </Button>
-                                        <Button variant="destructive" size="sm" onClick={onDelete} disabled={saving}>
-                                            {saving ? <Loader2 className="size-3 animate-spin" /> : <Trash2 className="size-3" />} Delete
-                                        </Button>
-                                    </div>
-                                </div>
-                            ) : (
-                                <button
-                                    type="button"
-                                    onClick={() => setConfirmingDelete(true)}
-                                    className="text-xs font-medium text-destructive hover:underline"
-                                >
-                                    Delete task →
-                                </button>
-                            )}
-                        </div>
-                    </div>
-                )}
-            </div>
-        </div>
-    )
-}
-
-// ---------------------------------------------------------------------------
-// Runs history tab — list + drill-down transcript view
-//
-// Source of truth: `bg-tasks/<slug>/runs.log` — a plain-text file with one
-// runId per line (newest first). The actual transcripts live at the global
-// `$WorkDir/runs/<runId>.jsonl`, so this tab fetches runIds via the bg-task
-// IPC, then loads each Run through the standard `runs:fetch`. No bg-task-
-// specific transcript path or schema needed.
-// ---------------------------------------------------------------------------
-
-interface RunRowSummary {
-    runId: string
-    createdAt?: string
-    trigger?: string
-    summary?: string
-    error?: string
-}
-
-// Pull the bits we want to display for a row out of a full Run's event log.
-function summarizeRun(run: z.infer<typeof Run>): RunRowSummary {
-    const out: RunRowSummary = { runId: run.id, createdAt: run.createdAt, trigger: run.subUseCase }
-    for (const event of run.log) {
-        if (event.type === 'error' && typeof event.error === 'string') {
-            out.error = event.error
-        } else if (event.type === 'message' && event.message?.role === 'assistant') {
-            const content = event.message.content
-            if (typeof content === 'string') {
-                out.summary = content
-            } else if (Array.isArray(content)) {
-                const text = content
-                    .filter((p) => p.type === 'text')
-                    .map((p) => ('text' in p ? p.text : ''))
-                    .join('')
-                if (text) out.summary = text
-            }
-        }
-    }
-    return out
-}
-
-function RunsHistoryTab({ slug, task }: { slug: string; task: BackgroundTask }) {
-    const [rows, setRows] = useState<RunRowSummary[]>([])
-    const [loading, setLoading] = useState(true)
-    const [selectedRunId, setSelectedRunId] = useState<string | null>(null)
-    const agentStatus = useBackgroundTaskAgentStatus()
-
-    const load = useCallback(async () => {
-        setLoading(true)
-        try {
-            const { runIds } = await window.ipc.invoke('bg-task:listRunIds', { slug, limit: 100 })
-            // Fetch each Run in parallel via the canonical IPC. Runs whose
-            // jsonl no longer exists (deleted manually, never written, …) are
-            // dropped silently.
-            const settled = await Promise.allSettled(
-                runIds.map(runId => window.ipc.invoke('runs:fetch', { runId }))
-            )
-            const next: RunRowSummary[] = []
-            for (let i = 0; i < settled.length; i++) {
-                const r = settled[i]
-                if (r.status === 'fulfilled' && r.value) {
-                    next.push(summarizeRun(r.value))
-                } else {
-                    // Keep the row visible with just the id so the user knows it exists.
-                    next.push({ runId: runIds[i] })
-                }
-            }
-            setRows(next)
-        } finally {
-            setLoading(false)
-        }
-    }, [slug])
-
-    useEffect(() => {
-        void load()
-    }, [load])
-
-    // Re-load whenever a new attempt starts or finishes (flat-field changes).
-    useEffect(() => {
-        void load()
-    }, [task.lastRunId, task.lastAttemptAt, task.lastRunAt, load])
-
-    // Bus events are the ONLY source of truth for in-flight status. If the
-    // renderer received a `start` event for this task and hasn't yet received
-    // its `complete`, the run with that runId is running. Disk-derived signals
-    // (lastAttemptAt vs lastRunAt) are deliberately ignored — even if it means
-    // the UI is briefly out of sync after a late start or a missed event.
-    const liveStatus = agentStatus.get(slug)
-    const currentInFlightRunId = liveStatus?.status === 'running' ? liveStatus.runId ?? null : null
-
-    if (selectedRunId) {
-        return (
-            <RunTranscriptView
-                runId={selectedRunId}
-                isInFlight={selectedRunId === currentInFlightRunId}
-                onBack={() => setSelectedRunId(null)}
-            />
-        )
-    }
-
-    return (
-        <div className="flex-1 overflow-auto">
-            {loading ? (
-                <div className="flex items-center gap-2 px-4 py-4 text-xs text-muted-foreground">
-                    <Loader2 className="size-3 animate-spin" /> Loading…
-                </div>
-            ) : rows.length === 0 ? (
-                <div className="px-6 py-12 text-center">
-                    <p className="text-xs text-muted-foreground">
-                        No runs yet. Click <span className="font-medium text-foreground">Run now</span> below.
-                    </p>
-                </div>
-            ) : (
-                <div className="divide-y divide-sidebar-border">
-                    {rows.map(row => {
-                        const inFlight = row.runId === currentInFlightRunId
-                        const isError = !!row.error
-                        return (
-                            <button
-                                key={row.runId}
-                                type="button"
-                                onClick={() => setSelectedRunId(row.runId)}
-                                className="flex w-full items-center gap-3 px-4 py-2.5 text-left transition-colors hover:bg-accent/30"
-                            >
-                                <div className={`size-1.5 shrink-0 rounded-full ${
-                                    inFlight ? 'bg-amber-500 animate-pulse'
-                                        : isError ? 'bg-destructive'
-                                            : 'bg-emerald-500'
-                                }`} />
-                                <div className="flex min-w-0 flex-1 flex-col gap-0.5">
-                                    <div className="flex items-center gap-2 text-xs">
-                                        <span className="font-mono text-[10.5px] text-muted-foreground">
-                                            {row.createdAt ? formatRunAt(row.createdAt) : row.runId}
-                                        </span>
-                                        {row.trigger && (
-                                            <>
-                                                <span className="text-[10.5px] text-muted-foreground">·</span>
-                                                <span className="text-[10.5px] text-muted-foreground">{row.trigger}</span>
-                                            </>
-                                        )}
-                                        {inFlight && (
-                                            <span className="text-[10.5px] text-amber-600">· running</span>
-                                        )}
-                                    </div>
-                                    {(row.error || row.summary) && (
-                                        <div className={`truncate text-[11px] ${row.error ? 'text-destructive' : 'text-foreground/70'}`}>
-                                            {row.error ?? row.summary}
-                                        </div>
-                                    )}
-                                </div>
-                                <ChevronRight className="size-3 shrink-0 text-muted-foreground" />
-                            </button>
-                        )
-                    })}
-                </div>
-            )}
-        </div>
-    )
-}
-
-function RunTranscriptView({
-    runId,
-    isInFlight,
-    onBack,
-}: {
-    runId: string
-    isInFlight: boolean
-    onBack: () => void
-}) {
-    const [run, setRun] = useState<z.infer<typeof Run> | null>(null)
-    const [loading, setLoading] = useState(true)
-    const [error, setError] = useState<string | null>(null)
-
-    useEffect(() => {
-        let cancelled = false
-        setLoading(true)
-        setError(null)
-        void (async () => {
-            try {
-                // Bg-task transcripts now live at the global runs/ location —
-                // same path resolution as every other run, no special handling.
-                const r = await window.ipc.invoke('runs:fetch', { runId })
-                if (cancelled) return
-                setRun(r)
-            } catch (err) {
-                if (cancelled) return
-                setError(err instanceof Error ? err.message : String(err))
-                setRun(null)
-            } finally {
-                if (!cancelled) setLoading(false)
-            }
-        })()
-        return () => { cancelled = true }
-    }, [runId])
-
-    const summary = run ? summarizeRun(run) : undefined
-    const items: ConversationItem[] = run ? runLogToConversation(run.log) : []
-
-    return (
-        <div className="flex flex-1 flex-col overflow-hidden">
-            <div className="flex shrink-0 items-center gap-2 border-b border-sidebar-border px-3 py-2">
-                <button
-                    type="button"
-                    onClick={onBack}
-                    className="inline-flex size-6 items-center justify-center rounded text-muted-foreground hover:bg-accent hover:text-foreground"
-                    aria-label="Back to runs"
-                >
-                    <ChevronLeft className="size-3.5" />
-                </button>
-                <div className="min-w-0 flex-1">
-                    <div className="font-mono text-[10.5px] text-muted-foreground">
-                        {summary?.createdAt ? formatRunAt(summary.createdAt) : runId}
-                        {summary?.trigger && ` · ${summary.trigger}`}
-                        {isInFlight && <span className="ml-1 text-amber-600">· running</span>}
-                    </div>
-                </div>
-            </div>
-
-            <div className="flex-1 space-y-4 overflow-auto px-4 py-4">
-                {/* Summary header — error or summary, mirrors live-note LastRunTab. */}
-                <div>
-                    {summary?.error && (
-                        <div className="mb-3 flex items-start gap-2 rounded-md border border-destructive/30 bg-destructive/5 px-2.5 py-2">
-                            <AlertCircle className="mt-0.5 size-3.5 shrink-0 text-destructive" />
-                            <code className="break-all font-mono text-[11px] leading-relaxed text-destructive">
-                                {summary.error}
-                            </code>
-                        </div>
-                    )}
-                    {summary?.summary && (
-                        <Streamdown className="prose prose-sm dark:prose-invert max-w-none text-foreground/85 [&>*:first-child]:mt-0 [&>*:last-child]:mb-0 [&_p]:my-2 [&_ul]:my-2 [&_ol]:my-2">
-                            {summary.summary}
-                        </Streamdown>
-                    )}
-                    {!summary?.error && !summary?.summary && !loading && (
-                        <p className="text-xs italic text-muted-foreground">No summary recorded.</p>
-                    )}
-                </div>
-
-                <div className="border-t border-sidebar-border" />
-
-                {/* Transcript */}
-                <div>
-                    <div className="mb-2 text-[10px] font-medium uppercase tracking-wider text-muted-foreground">
-                        Transcript
-                    </div>
-                    {loading && (
-                        <div className="flex items-center gap-2 text-xs text-muted-foreground">
-                            <Loader2 className="size-3 animate-spin" /> Loading…
-                        </div>
-                    )}
-                    {error && !loading && (
-                        <div className="rounded-md border border-destructive/30 bg-destructive/10 px-3 py-2 text-xs text-destructive">
-                            Couldn&apos;t load transcript: {error}
-                        </div>
-                    )}
-                    {run && !loading && items.length === 0 && (
-                        <p className="text-xs italic text-muted-foreground">No messages or tool calls recorded.</p>
-                    )}
-                    {run && !loading && items.length > 0 && (
-                        <CompactConversation items={items} />
-                    )}
-                </div>
-            </div>
-        </div>
-    )
-}
-
-
-// ---------------------------------------------------------------------------
-// Right sidebar — header + status strip + tabs + footer (mirror of live-note)
-// ---------------------------------------------------------------------------
-
-type Tab = 'setup' | 'runs'
-
-function ControlSidebar({
-    slug,
-    task,
-    draft,
-    setDraft,
-    isRunning,
-    paused,
-    saving,
-    dirty,
-    editingInstructions,
-    setEditingInstructions,
-    onCancelInstructions,
-    onSave,
-    showAdvanced,
-    setShowAdvanced,
-    confirmingDelete,
-    setConfirmingDelete,
-    onToggleActive,
-    onRunNow,
-    onStop,
-    onDelete,
-    onCollapse,
-    onEditWithCopilot,
-}: {
-    slug: string
-    task: BackgroundTask
-    draft: BackgroundTask
-    setDraft: (next: BackgroundTask) => void
-    isRunning: boolean
-    paused: boolean
-    saving: boolean
-    dirty: boolean
-    editingInstructions: boolean
-    setEditingInstructions: (v: boolean) => void
-    onCancelInstructions: () => void
-    onSave: () => void
-    showAdvanced: boolean
-    setShowAdvanced: (v: boolean) => void
-    confirmingDelete: boolean
-    setConfirmingDelete: (v: boolean) => void
-    onToggleActive: (v: boolean) => void
-    onRunNow: () => void
-    onStop: () => void
-    onDelete: () => void
-    onCollapse: () => void
-    onEditWithCopilot?: () => void
-}) {
-    const [tab, setTab] = useState<Tab>('setup')
-
-    const lastRunLabel = task.lastRunAt
-        ? relativeLabel(task.lastRunAt) ?? 'recently'
-        : task.lastAttemptAt
-            ? `started ${relativeLabel(task.lastAttemptAt) ?? 'just now'}`
-            : 'Never'
-
-    return (
-        <aside className="flex w-[400px] max-w-[40vw] shrink-0 flex-col overflow-hidden border-l border-sidebar-border bg-sidebar text-sidebar-foreground">
-            {/* Header */}
-            <div className="flex h-12 shrink-0 items-center gap-2.5 border-b border-sidebar-border px-4">
-                <ListChecks
-                    className={`size-4 shrink-0 ${paused ? 'text-muted-foreground' : 'text-emerald-600 dark:text-emerald-400'}`}
-                />
-                <span className="truncate text-sm font-semibold">{task.name}</span>
-                <span className={`inline-flex shrink-0 items-center gap-1 rounded-full px-2 py-0.5 text-[10px] font-medium ${
-                    paused
-                        ? 'bg-muted text-muted-foreground'
-                        : 'bg-emerald-500/10 text-emerald-700 dark:text-emerald-400'
-                }`}>
-                    <span className={`size-1.5 rounded-full ${paused ? 'bg-muted-foreground/60' : 'bg-emerald-500'} ${isRunning ? 'animate-pulse' : ''}`} aria-hidden />
-                    {paused ? 'Paused' : 'Active'}
-                </span>
-                <span className="ml-auto" />
-                <Switch
-                    checked={!paused}
-                    onCheckedChange={onToggleActive}
-                    disabled={saving}
-                    aria-label="Active"
-                />
-                <button
-                    type="button"
-                    onClick={onCollapse}
-                    className="inline-flex size-7 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground"
-                    aria-label="Hide sidebar"
-                    title="Hide sidebar"
-                >
-                    <PanelRightClose className="size-4" />
-                </button>
-            </div>
-
-            {/* Status strip */}
-            <div className="shrink-0 border-b border-sidebar-border px-4 py-3">
-                <div className="grid grid-cols-2 gap-4">
-                    <div className="min-w-0">
-                        <div className="text-[10px] font-medium uppercase tracking-wider text-muted-foreground">Last run</div>
-                        <div className="mt-0.5 truncate text-xs text-foreground">
-                            {task.lastRunAt || task.lastAttemptAt ? (
-                                <>
-                                    {lastRunLabel}
-                                    {task.lastRunError && <span className="text-destructive"> · error</span>}
-                                </>
-                            ) : (
-                                <span className="text-muted-foreground">Never</span>
-                            )}
-                        </div>
-                    </div>
-                    <div className="min-w-0">
-                        <div className="text-[10px] font-medium uppercase tracking-wider text-muted-foreground">Schedule</div>
-                        <div className="mt-0.5 truncate text-xs text-foreground">{summarizeSchedule(task.triggers)}</div>
-                    </div>
-                </div>
-            </div>
-
-            {/* Tabs */}
-            <div className="flex shrink-0 border-b border-sidebar-border px-4">
-                <TabButton active={tab === 'setup'} onClick={() => setTab('setup')}>Setup</TabButton>
-                <TabButton active={tab === 'runs'} onClick={() => setTab('runs')}>Runs history</TabButton>
-            </div>
-
-            {tab === 'setup' && (
-                <SetupTab
-                    draft={draft}
-                    setDraft={setDraft}
-                    editingInstructions={editingInstructions}
-                    setEditingInstructions={setEditingInstructions}
-                    onCancelInstructions={onCancelInstructions}
-                    onSave={onSave}
-                    saving={saving}
-                    dirty={dirty}
-                    showAdvanced={showAdvanced}
-                    setShowAdvanced={setShowAdvanced}
-                    confirmingDelete={confirmingDelete}
-                    setConfirmingDelete={setConfirmingDelete}
-                    onDelete={onDelete}
-                />
-            )}
-            {tab === 'runs' && (
-                <RunsHistoryTab slug={slug} task={task} />
-            )}
-
-            {/* Footer — Edit with Copilot · Save (when dirty) · Run / Stop. */}
-            <div className="flex shrink-0 items-center gap-2 border-t border-sidebar-border bg-sidebar-accent/20 px-4 py-2.5">
-                {isRunning ? (
-                    <>
-                        <span className="inline-flex items-center gap-1.5 text-xs text-sidebar-foreground">
-                            <Loader2 className="size-3 animate-spin" /> Running
-                        </span>
-                        <span className="ml-auto" />
-                        <Button variant="destructive" size="sm" onClick={onStop} disabled={saving}>
-                            <Square className="size-3" /> Stop
-                        </Button>
-                    </>
-                ) : (
-                    <>
-                        {onEditWithCopilot && (
-                            <Button variant="ghost" size="sm" onClick={onEditWithCopilot} disabled={saving}>
-                                <Sparkles className="size-3" /> Edit with Copilot
-                            </Button>
-                        )}
-                        {dirty && !editingInstructions && tab === 'setup' && (
-                            <Button variant="outline" size="sm" onClick={onSave} disabled={saving}>
-                                {saving ? <Loader2 className="size-3 animate-spin" /> : <Check className="size-3" />} Save
-                            </Button>
-                        )}
-                        <span className="ml-auto" />
-                        <Button size="sm" onClick={onRunNow} disabled={saving}>
-                            <Play className="size-3" /> Run now
-                        </Button>
-                    </>
-                )}
-            </div>
-        </aside>
-    )
-}
-
-// ---------------------------------------------------------------------------
-// Detail view — 2-pane layout
-// ---------------------------------------------------------------------------
-
-function TaskDetail({
-    slug,
-    onBack,
-    onDeleted,
-    onEditWithCopilot,
-}: {
-    slug: string
-    onBack: () => void
-    onDeleted: () => void
-    onEditWithCopilot?: (slug: string) => void
-}) {
-    const [task, setTask] = useState<BackgroundTask | null>(null)
-    const [draft, setDraft] = useState<BackgroundTask | null>(null)
-    const [loading, setLoading] = useState(true)
-    const [saving, setSaving] = useState(false)
-    const [editingInstructions, setEditingInstructions] = useState(false)
-    const [showAdvanced, setShowAdvanced] = useState(false)
-    const [confirmingDelete, setConfirmingDelete] = useState(false)
-    const [sidebarOpen, setSidebarOpen] = useState(true)
-    const [outputRefreshKey, setOutputRefreshKey] = useState(0)
-    // Whether we've already chosen the initial sidebar state for this task.
-    const sidebarInitialized = useRef(false)
-
-    const agentStatus = useBackgroundTaskAgentStatus()
-    const liveStatus = agentStatus.get(slug)
-    // Bus events are the only source of truth for "is this task currently
-    // running" — see RunsHistoryTab for the rationale.
-    const isRunning = liveStatus?.status === 'running'
-    const paused = task ? !task.active : false
-
-    const load = useCallback(async () => {
-        setLoading(true)
-        try {
-            const result = await window.ipc.invoke('bg-task:get', { slug })
-            if (result.success && result.task) {
-                setTask(result.task)
-                setDraft(result.task)
-                // On first open, collapse the details sidebar when the agent
-                // already has output — let the user read it without chrome.
-                // Resolved before `loading` clears so the sidebar never flashes.
-                if (!sidebarInitialized.current) {
-                    sidebarInitialized.current = true
-                    try {
-                        const out = await window.ipc.invoke('workspace:readFile', {
-                            path: `bg-tasks/${slug}/index.md`,
-                        })
-                        const body = (out.data ?? '').trim()
-                        if (body && body !== `# ${result.task.name}`) {
-                            setSidebarOpen(false)
-                        }
-                    } catch {
-                        // No output file yet — keep the sidebar open.
-                    }
-                }
-            }
-        } finally {
-            setLoading(false)
-        }
-    }, [slug])
-
-    useEffect(() => {
-        void load()
-    }, [load])
-
-    // Refetch when the agent completes a run — fresh flat fields, fresh index.md.
-    useEffect(() => {
-        if (liveStatus?.status === 'done' || liveStatus?.status === 'error') {
-            void load()
-            setOutputRefreshKey(k => k + 1)
-        }
-    }, [liveStatus?.status, load])
-
-    const isDirty = useMemo(() => {
-        if (!task || !draft) return false
-        return JSON.stringify(task) !== JSON.stringify(draft)
-    }, [task, draft])
-
-    const save = async () => {
-        if (!draft || !task) return
-        setSaving(true)
-        try {
-            const partial: Partial<BackgroundTask> = {}
-            if (draft.instructions !== task.instructions) partial.instructions = draft.instructions
-            if (JSON.stringify(draft.triggers) !== JSON.stringify(task.triggers)) partial.triggers = draft.triggers
-            if (draft.model !== task.model) partial.model = draft.model
-            if (draft.provider !== task.provider) partial.provider = draft.provider
-            const result = await window.ipc.invoke('bg-task:patch', { slug, partial })
-            if (result.success && result.task) {
-                setTask(result.task)
-                setDraft(result.task)
-                setEditingInstructions(false)
-            } else {
-                toast(result.error ?? 'Failed to save', 'error')
-            }
-        } finally {
-            setSaving(false)
-        }
-    }
-
-    const cancelInstructions = () => {
-        if (!task) return
-        setDraft(d => d ? { ...d, instructions: task.instructions } : d)
-        setEditingInstructions(false)
-    }
-
-    const toggleActive = async (active: boolean) => {
-        if (!task) return
-        const result = await window.ipc.invoke('bg-task:patch', { slug, partial: { active } })
-        if (result.success && result.task) {
-            setTask(result.task)
-            setDraft(result.task)
-        }
-    }
-
-    const runNow = async () => {
-        const result = await window.ipc.invoke('bg-task:run', { slug })
-        if (!result.success) {
-            toast(result.error ?? 'Run failed', 'error')
-        }
-    }
-
-    const stopRun = async () => {
-        await window.ipc.invoke('bg-task:stop', { slug })
-    }
-
-    const deleteTask = async () => {
-        const result = await window.ipc.invoke('bg-task:delete', { slug })
-        if (result.success) {
-            onDeleted()
-        } else {
-            toast(result.error ?? 'Delete failed', 'error')
-        }
-    }
-
-    if (loading || !task || !draft) {
-        return (
-            <div className="flex h-full items-center justify-center">
-                <Loader2 className="size-6 animate-spin text-muted-foreground" />
-            </div>
-        )
-    }
-
-    return (
-        <div className="flex h-full flex-col overflow-hidden">
-            {/* Top bar — back to list, sidebar toggle when collapsed */}
-            <div className="flex h-12 shrink-0 items-center gap-2 border-b border-border px-3">
-                <button
-                    type="button"
-                    onClick={onBack}
-                    className="inline-flex size-7 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground"
-                    aria-label="Back to background tasks"
-                >
-                    <ChevronLeft className="size-4" />
-                </button>
-                <span className="truncate text-sm font-medium text-muted-foreground">Background tasks</span>
-                <span className="ml-auto" />
-                {!sidebarOpen && (
-                    <button
-                        type="button"
-                        onClick={() => setSidebarOpen(true)}
-                        className="inline-flex items-center gap-1.5 rounded-md border bg-background px-2 py-1 text-xs text-foreground hover:bg-accent hover:text-foreground"
-                        aria-label="Show sidebar"
-                    >
-                        <PanelRightOpen className="size-3.5" />
-                        <span>Show details</span>
-                    </button>
-                )}
-            </div>
-
-            {/* Body: main (output) + right sidebar */}
-            <div className="flex flex-1 min-h-0">
-                <OutputPane slug={slug} taskName={task.name} refreshKey={outputRefreshKey} />
-                {sidebarOpen && (
-                    <ControlSidebar
-                        slug={slug}
-                        task={task}
-                        draft={draft}
-                        setDraft={setDraft}
-                        isRunning={isRunning}
-                        paused={paused}
-                        saving={saving}
-                        dirty={isDirty}
-                        editingInstructions={editingInstructions}
-                        setEditingInstructions={setEditingInstructions}
-                        onCancelInstructions={cancelInstructions}
-                        onSave={save}
-                        showAdvanced={showAdvanced}
-                        setShowAdvanced={setShowAdvanced}
-                        confirmingDelete={confirmingDelete}
-                        setConfirmingDelete={setConfirmingDelete}
-                        onToggleActive={toggleActive}
-                        onRunNow={runNow}
-                        onStop={stopRun}
-                        onDelete={deleteTask}
-                        onCollapse={() => setSidebarOpen(false)}
-                        onEditWithCopilot={onEditWithCopilot ? () => onEditWithCopilot(slug) : undefined}
-                    />
-                )}
-            </div>
-        </div>
-    )
-}
-
-// ---------------------------------------------------------------------------
-// List view
-// ---------------------------------------------------------------------------
-
-export interface BgTasksViewProps {
-    /**
-     * Optional Copilot hand-off. When provided, the "New task" dialog opens
-     * in free-form "describe" mode and the user can punt to Copilot with a
-     * single-sentence description. Hosted in App.tsx so it routes through
-     * the same chat-submit pipeline as the rest of the app.
-     */
-    onCreateWithCopilot?: (description: string) => void
-    /**
-     * Optional Copilot hand-off for editing an existing task. Wired to the
-     * "Edit with Copilot" button in the detail-view sidebar footer.
-     */
-    onEditWithCopilot?: (slug: string) => void
-    /**
-     * If provided, the view opens with this task already selected. Updates to
-     * this prop sync into internal state so the sidebar can swap which task is
-     * focused without remounting the view.
-     */
-    initialSlug?: string | null
-    /**
-     * Bump this counter to force a re-focus on `initialSlug` even when the
-     * slug value itself didn't change (e.g. user clicks the same task in the
-     * sidebar twice after navigating away inside the view).
-     */
-    slugVersion?: number
-}
-
-function formatLastRanLabel(iso: string | null | undefined): string {
-    if (!iso) return 'Never'
-    return formatRelativeTime(iso) || 'Never'
-}
-
-export function BgTasksView({ onCreateWithCopilot, onEditWithCopilot, initialSlug, slugVersion }: BgTasksViewProps = {}) {
-    const [items, setItems] = useState<BackgroundTaskSummary[]>([])
-    const [selectedSlug, setSelectedSlug] = useState<string | null>(initialSlug ?? null)
-    useEffect(() => {
-      setSelectedSlug(initialSlug ?? null)
-    }, [initialSlug, slugVersion])
-    const [loading, setLoading] = useState(true)
-    const [error, setError] = useState<string | null>(null)
-    const [showNewDialog, setShowNewDialog] = useState(false)
-    // Per-row spinners while the corresponding IPC is in flight — same pattern
-    // as `LiveNotesView` uses for its toggle / stop buttons.
-    const [updatingSlugs, setUpdatingSlugs] = useState<Set<string>>(new Set())
-    const [stoppingSlugs, setStoppingSlugs] = useState<Set<string>>(new Set())
-    const agentStatus = useBackgroundTaskAgentStatus()
-
-    const load = useCallback(async () => {
-        setLoading(true)
-        try {
-            const result = await window.ipc.invoke('bg-task:list', { limit: 200 })
-            setItems(result.items)
-            setError(null)
-        } catch (err) {
-            console.error('Failed to load background tasks:', err)
-            setError('Could not load background tasks.')
-        } finally {
-            setLoading(false)
-        }
-    }, [])
-
-    useEffect(() => {
-        void load()
-    }, [load])
-
-    useEffect(() => {
-        if (agentStatus.size > 0) {
-            void load()
-        }
-    }, [agentStatus, load])
-
-    const handleToggleActive = useCallback(async (slug: string, active: boolean) => {
-        setUpdatingSlugs(prev => new Set(prev).add(slug))
-        try {
-            const result = await window.ipc.invoke('bg-task:patch', { slug, partial: { active } })
-            if (!result.success) {
-                toast(result.error ?? 'Failed to update task', 'error')
-                return
-            }
-            // Optimistically reflect the new state without re-fetching the whole list.
-            setItems(prev => prev.map(t => t.slug === slug ? { ...t, active } : t))
-        } catch (err) {
-            toast(err instanceof Error ? err.message : 'Failed to update task', 'error')
-        } finally {
-            setUpdatingSlugs(prev => {
-                const next = new Set(prev)
-                next.delete(slug)
-                return next
-            })
-        }
-    }, [])
-
-    const handleStop = useCallback(async (slug: string) => {
-        setStoppingSlugs(prev => new Set(prev).add(slug))
-        try {
-            const result = await window.ipc.invoke('bg-task:stop', { slug })
-            if (!result.success && result.error) {
-                toast(result.error, 'error')
-            }
-        } catch (err) {
-            toast(err instanceof Error ? err.message : 'Failed to stop run', 'error')
-        } finally {
-            setStoppingSlugs(prev => {
-                const next = new Set(prev)
-                next.delete(slug)
-                return next
-            })
-        }
-    }, [])
-
-    if (selectedSlug) {
-        return (
-            <TaskDetail
-                slug={selectedSlug}
-                onBack={() => {
-                    setSelectedSlug(null)
-                    void load()
-                }}
-                onDeleted={() => {
-                    setSelectedSlug(null)
-                    void load()
-                }}
-                onEditWithCopilot={onEditWithCopilot}
-            />
-        )
-    }
-
-    return (
-        <div className="flex h-full flex-col overflow-hidden">
-            <div className="shrink-0 border-b border-border px-6 py-5">
-                <div className="flex items-center justify-between gap-4">
-                    <div className="flex items-center gap-2">
-                        <ListChecks className="size-5 text-primary" />
-                        <h2 className="text-base font-semibold text-foreground">Background tasks</h2>
-                    </div>
-                    <Button size="sm" onClick={() => setShowNewDialog(true)}>
-                        New task
-                    </Button>
-                </div>
-                <p className="mt-1 text-xs text-muted-foreground">
-                    Persistent agents that fire on a schedule or in response to events. Toggle a task inactive to pause it.
-                </p>
-            </div>
-            <div className="flex-1 overflow-auto p-6">
-                {loading ? (
-                    <div className="flex h-full items-center justify-center">
-                        <Loader2 className="size-5 animate-spin text-muted-foreground" />
-                    </div>
-                ) : error ? (
-                    <div className="flex h-full flex-col items-center justify-center gap-3 px-8 text-center">
-                        <div className="rounded-full bg-muted p-3">
-                            <ListChecks className="size-6 text-muted-foreground" />
-                        </div>
-                        <p className="text-sm text-muted-foreground">{error}</p>
-                    </div>
-                ) : items.length === 0 ? (
-                    <div className="flex h-full flex-col items-center justify-center gap-3 px-8 text-center">
-                        <div className="rounded-full bg-muted p-3">
-                            <ListChecks className="size-6 text-muted-foreground" />
-                        </div>
-                        <p className="text-sm text-muted-foreground">
-                            No background tasks yet.
-                        </p>
-                        <Button size="sm" onClick={() => setShowNewDialog(true)}>
-                            <Plus className="size-3" /> Create your first task
-                        </Button>
-                    </div>
-                ) : (
-                    <div className="overflow-hidden rounded-xl border border-border/60 bg-card">
-                        <table className="w-full table-fixed border-collapse">
-                            <colgroup>
-                                <col className="w-[45%]" />
-                                <col className="w-[17%]" />
-                                <col className="w-[13%]" />
-                                <col className="w-[25%]" />
-                            </colgroup>
-                            <thead>
-                                <tr className="border-b border-border/60 bg-muted/30 text-left">
-                                    <th className="px-4 py-3 text-xs font-medium uppercase tracking-wide text-muted-foreground">Task</th>
-                                    <th className="px-4 py-3 text-xs font-medium uppercase tracking-wide text-muted-foreground">Schedule</th>
-                                    <th className="px-4 py-3 text-xs font-medium uppercase tracking-wide text-muted-foreground">Last ran</th>
-                                    <th className="px-4 py-3 text-xs font-medium uppercase tracking-wide text-muted-foreground">State</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {items.map(task => {
-                                    const live = agentStatus.get(task.slug)
-                                    const isRunning = live?.status === 'running'
-                                    const isUpdating = updatingSlugs.has(task.slug)
-                                    const isStopping = stoppingSlugs.has(task.slug)
-                                    const hasError = !isRunning && !!task.lastRunError
-                                    const instructionsPreview = task.instructions.split('\n')[0].trim()
-                                    return (
-                                        <tr
-                                            key={task.slug}
-                                            className={`border-b border-border/50 last:border-b-0 transition-colors ${isRunning ? 'bg-primary/5' : 'hover:bg-muted/20'}`}
-                                        >
-                                            <td className="px-4 py-3 align-top">
-                                                <div className="flex min-w-0 flex-col gap-1">
-                                                    <div className="flex items-center gap-1.5">
-                                                        {hasError && (
-                                                            <AlertCircle
-                                                                className="size-3.5 shrink-0 text-amber-600 dark:text-amber-400"
-                                                                aria-label="Last run failed"
-                                                            >
-                                                                <title>Last run failed: {task.lastRunError}</title>
-                                                            </AlertCircle>
-                                                        )}
-                                                        <button
-                                                            type="button"
-                                                            onClick={() => setSelectedSlug(task.slug)}
-                                                            className="truncate text-left text-sm font-medium text-foreground hover:text-primary"
-                                                            title={task.name}
-                                                        >
-                                                            {task.name}
-                                                        </button>
-                                                    </div>
-                                                    <div className="truncate font-mono text-[11px] text-muted-foreground">
-                                                        {task.slug}
-                                                    </div>
-                                                    {instructionsPreview && (
-                                                        <div className="truncate text-xs text-muted-foreground/80" title={task.instructions}>
-                                                            {instructionsPreview}
-                                                        </div>
-                                                    )}
-                                                    {hasError && task.lastRunError && (
-                                                        <div className="truncate text-xs text-amber-600 dark:text-amber-400" title={task.lastRunError}>
-                                                            {task.lastRunError}
-                                                        </div>
-                                                    )}
-                                                </div>
-                                            </td>
-                                            <td className="px-4 py-3 text-sm text-foreground/80">
-                                                {summarizeSchedule(task.triggers)}
-                                            </td>
-                                            <td className="px-4 py-3 text-sm text-foreground/80">
-                                                {formatLastRanLabel(task.lastRunAt)}
-                                            </td>
-                                            <td className="px-4 py-3">
-                                                {isRunning ? (
-                                                    <div className="flex items-center gap-2">
-                                                        <span className="inline-flex items-center gap-1.5 rounded-md bg-primary/10 px-2 py-0.5 text-xs font-medium text-foreground animate-pulse">
-                                                            <Loader2 className="size-3 animate-spin" />
-                                                            Updating…
-                                                        </span>
-                                                        <Button
-                                                            variant="destructive"
-                                                            size="sm"
-                                                            onClick={() => handleStop(task.slug)}
-                                                            disabled={isStopping}
-                                                        >
-                                                            {isStopping ? <Loader2 className="size-3 animate-spin" /> : <Square className="size-3" />}
-                                                            Stop
-                                                        </Button>
-                                                    </div>
-                                                ) : (
-                                                    <div className="flex items-center gap-3">
-                                                        {isUpdating ? (
-                                                            <Loader2 className="size-4 animate-spin text-muted-foreground" />
-                                                        ) : (
-                                                            <span className="size-4 shrink-0" aria-hidden="true" />
-                                                        )}
-                                                        <Switch
-                                                            checked={task.active}
-                                                            onCheckedChange={(checked) => { void handleToggleActive(task.slug, checked) }}
-                                                            disabled={isUpdating}
-                                                        />
-                                                        <span className="min-w-16 text-xs font-medium text-foreground/80">
-                                                            {task.active ? 'Active' : 'Inactive'}
-                                                        </span>
-                                                    </div>
-                                                )}
-                                            </td>
-                                        </tr>
-                                    )
-                                })}
-                            </tbody>
-                        </table>
-                    </div>
-                )}
-            </div>
-
-            <NewTaskDialog
-                open={showNewDialog}
-                onClose={() => setShowNewDialog(false)}
-                onCreated={(slug) => {
-                    setShowNewDialog(false)
-                    void load()
-                    void window.ipc.invoke('bg-task:run', { slug })
-                    setSelectedSlug(slug)
-                }}
-                onCreateWithCopilot={onCreateWithCopilot}
-            />
-        </div>
-    )
-}
diff --git a/apps/x/apps/renderer/src/components/billing-error-dialog.tsx b/apps/x/apps/renderer/src/components/billing-error-dialog.tsx
deleted file mode 100644
index e93b2661..00000000
--- a/apps/x/apps/renderer/src/components/billing-error-dialog.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import { useEffect, useState } from "react"
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog"
-import { Button } from "@/components/ui/button"
-import type { BillingErrorMatch } from "@/lib/billing-error"
-
-interface BillingRowboatAccount {
-  config?: {
-    appUrl?: string | null
-  } | null
-}
-
-interface BillingErrorDialogProps {
-  open: boolean
-  match: BillingErrorMatch | null
-  onOpenChange: (open: boolean) => void
-}
-
-export function BillingErrorDialog({ open, match, onOpenChange }: BillingErrorDialogProps) {
-  const [appUrl, setAppUrl] = useState<string | null>(null)
-
-  useEffect(() => {
-    if (!open) return
-    window.ipc
-      .invoke('account:getRowboat', null)
-      .then((account: BillingRowboatAccount) => setAppUrl(account.config?.appUrl ?? null))
-      .catch(() => {})
-  }, [open])
-
-  if (!match) return null
-
-  const handleUpgrade = () => {
-    if (appUrl) window.open(`${appUrl}?intent=upgrade`)
-    onOpenChange(false)
-  }
-
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="sm:max-w-md">
-        <DialogHeader>
-          <DialogTitle>{match.title}</DialogTitle>
-          <DialogDescription>{match.subtitle}</DialogDescription>
-        </DialogHeader>
-        <DialogFooter className="gap-2 sm:gap-2">
-          <Button variant="outline" onClick={() => onOpenChange(false)}>
-            Dismiss
-          </Button>
-          <Button onClick={handleUpgrade} disabled={!appUrl}>
-            {match.cta}
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  )
-}
diff --git a/apps/x/apps/renderer/src/components/chat-empty-state.tsx b/apps/x/apps/renderer/src/components/chat-empty-state.tsx
deleted file mode 100644
index bb9cea8d..00000000
--- a/apps/x/apps/renderer/src/components/chat-empty-state.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-import { ArrowUpRight, Bot, Mail, MessageSquare, Sparkles, Telescope } from 'lucide-react'
-
-import { cn } from '@/lib/utils'
-import { formatRelativeTime } from '@/lib/relative-time'
-
-export interface ChatEmptyStateRun {
-  id: string
-  title?: string
-  createdAt: string
-}
-
-interface ChatEmptyStateProps {
-  recentRuns?: ChatEmptyStateRun[]
-  onSelectRun?: (runId: string) => void
-  onOpenChatHistory?: () => void
-  /** Fill the composer with a starter prompt (does not submit). */
-  onPickPrompt: (prompt: string) => void
-  /** Use a wider column — for the full-screen chat where the narrow column looks cramped. */
-  wide?: boolean
-}
-
-const SUGGESTED_ACTIONS: { icon: typeof Mail; title: string; sub: string; prompt: string }[] = [
-  { icon: Mail, title: 'Draft a reply', sub: 'to an email', prompt: "Let's draft a reply to [name]'s email" },
-  { icon: Bot, title: 'Set up a background agent', sub: 'that automates tasks', prompt: 'Set up a background agent that automates [task]' },
-  { icon: Telescope, title: 'Research a topic', sub: 'create a local wiki for me', prompt: 'Research [topic] and create a local wiki for me' },
-]
-
-/**
- * Empty-state body for the chat surface: greeting, recent chats, and starter
- * action cards. Shown in both the side-pane copilot and full-screen chat.
- */
-export function ChatEmptyState({
-  recentRuns = [],
-  onSelectRun,
-  onOpenChatHistory,
-  onPickPrompt,
-  wide = false,
-}: ChatEmptyStateProps) {
-  return (
-    <div className={cn('mx-auto flex w-full flex-col gap-6 px-2 py-6', wide ? 'max-w-2xl' : 'max-w-md')}>
-      <div className="flex items-center gap-3">
-        <div className="flex size-9 shrink-0 items-center justify-center rounded-[10px] border border-border bg-background text-foreground">
-          <Sparkles className="size-[17px]" />
-        </div>
-        <div>
-          <div className="text-base font-semibold tracking-tight">What are we working on?</div>
-          <div className="text-xs text-muted-foreground">Ask anything, or pick up where you left off.</div>
-        </div>
-      </div>
-
-      {recentRuns.length > 0 && (
-        <div>
-          <div className="flex items-center px-1 pb-2 text-[10.5px] font-semibold uppercase tracking-wider text-muted-foreground">
-            <span className="flex-1">Recent chats</span>
-            {onOpenChatHistory && (
-              <button
-                type="button"
-                onClick={onOpenChatHistory}
-                className="inline-flex items-center gap-0.5 text-[11px] font-medium normal-case tracking-normal text-primary hover:underline"
-              >
-                View all
-                <ArrowUpRight className="size-3" />
-              </button>
-            )}
-          </div>
-          <div className="flex flex-col gap-0.5">
-            {recentRuns.slice(0, 4).map((run) => (
-              <button
-                key={run.id}
-                type="button"
-                onClick={() => onSelectRun?.(run.id)}
-                className="flex items-center gap-2.5 rounded-md px-2.5 py-2 text-left hover:bg-accent"
-              >
-                <MessageSquare className="size-3.5 shrink-0 text-muted-foreground" />
-                <span className="min-w-0 flex-1 truncate text-[13px]">{run.title || '(Untitled chat)'}</span>
-                <span className="shrink-0 text-[11px] text-muted-foreground">{formatRelativeTime(run.createdAt)}</span>
-              </button>
-            ))}
-          </div>
-        </div>
-      )}
-
-      <div>
-        <div className="px-1 pb-2 text-[10.5px] font-semibold uppercase tracking-wider text-muted-foreground">
-          {recentRuns.length > 0 ? 'Or start fresh' : 'Get started'}
-        </div>
-        <div className="flex flex-col gap-2">
-          {SUGGESTED_ACTIONS.map((action) => (
-            <button
-              key={action.title}
-              type="button"
-              onClick={() => onPickPrompt(action.prompt)}
-              className="flex items-start gap-2.5 rounded-lg border border-border bg-background px-3 py-2.5 text-left transition-colors hover:bg-accent"
-            >
-              <action.icon className="mt-0.5 size-3.5 shrink-0 text-muted-foreground" />
-              <div className="min-w-0 flex-1">
-                <div className="text-[12.8px] font-medium">{action.title}</div>
-                <div className="mt-0.5 text-[11.5px] text-muted-foreground">{action.sub}</div>
-              </div>
-            </button>
-          ))}
-        </div>
-      </div>
-    </div>
-  )
-}
diff --git a/apps/x/apps/renderer/src/components/chat-header.tsx b/apps/x/apps/renderer/src/components/chat-header.tsx
deleted file mode 100644
index 0350f895..00000000
--- a/apps/x/apps/renderer/src/components/chat-header.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import { ArrowUpRight, ChevronDown, MessageSquare, Plus } from 'lucide-react'
-
-import { Button } from '@/components/ui/button'
-import { cn } from '@/lib/utils'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuLabel,
-  DropdownMenuSeparator,
-  DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu'
-import { formatRelativeTime } from '@/lib/relative-time'
-
-export interface ChatHeaderRecentRun {
-  id: string
-  title?: string
-  createdAt: string
-}
-
-export interface ChatHeaderProps {
-  activeTitle: string
-  onNewChatTab: () => void
-  recentRuns?: ChatHeaderRecentRun[]
-  activeRunId?: string | null
-  onSelectRun?: (runId: string) => void
-  onOpenChatHistory?: () => void
-}
-
-/**
- * Header controls for the copilot/chat surface: the active-chat title with a
- * recent-chats history dropdown, plus the new-chat button. Rendered identically
- * whether the chat lives in the side pane (ChatSidebar) or full screen (App
- * content header). There is a single chat conversation at a time — switching
- * between chats happens through the history dropdown.
- */
-export function ChatHeader({
-  activeTitle,
-  onNewChatTab,
-  recentRuns = [],
-  activeRunId,
-  onSelectRun,
-  onOpenChatHistory,
-}: ChatHeaderProps) {
-  const hasHistory = recentRuns.length > 0 || Boolean(onOpenChatHistory)
-
-  return (
-    <>
-      {hasHistory ? (
-        <DropdownMenu>
-          <DropdownMenuTrigger asChild>
-            <button
-              type="button"
-              className="titlebar-no-drag flex min-w-0 flex-1 items-center gap-2 rounded-md px-3 text-sm font-medium text-foreground outline-none hover:bg-accent/60"
-              aria-label="Chat history"
-            >
-              <MessageSquare className="size-4 shrink-0 text-muted-foreground" />
-              <span className="truncate">{activeTitle}</span>
-              <ChevronDown className="size-3.5 shrink-0 text-muted-foreground" />
-            </button>
-          </DropdownMenuTrigger>
-          <DropdownMenuContent align="start" className="w-72">
-            {recentRuns.length > 0 && (
-              <DropdownMenuLabel className="text-[10.5px] font-semibold uppercase tracking-wider text-muted-foreground">
-                Recent
-              </DropdownMenuLabel>
-            )}
-            {recentRuns.slice(0, 6).map((run) => (
-              <DropdownMenuItem
-                key={run.id}
-                onClick={() => onSelectRun?.(run.id)}
-                className={cn('gap-2', activeRunId === run.id && 'bg-accent')}
-              >
-                <span className="min-w-0 flex-1 truncate">{run.title || '(Untitled chat)'}</span>
-                <span className="shrink-0 text-[11px] text-muted-foreground">
-                  {formatRelativeTime(run.createdAt)}
-                </span>
-              </DropdownMenuItem>
-            ))}
-            {onOpenChatHistory && (
-              <>
-                {recentRuns.length > 0 && <DropdownMenuSeparator />}
-                <DropdownMenuItem onClick={onOpenChatHistory} className="gap-2 text-primary">
-                  <ArrowUpRight className="size-4" />
-                  View all chats
-                </DropdownMenuItem>
-              </>
-            )}
-          </DropdownMenuContent>
-        </DropdownMenu>
-      ) : (
-        <div className="flex min-w-0 flex-1 items-center gap-2 px-3 text-sm font-medium text-foreground">
-          <MessageSquare className="size-4 shrink-0 text-muted-foreground" />
-          <span className="truncate">{activeTitle}</span>
-        </div>
-      )}
-      <Tooltip>
-        <TooltipTrigger asChild>
-          <Button
-            variant="ghost"
-            size="icon"
-            onClick={onNewChatTab}
-            className="titlebar-no-drag my-1 h-8 w-8 shrink-0 text-muted-foreground hover:text-foreground"
-            aria-label="New chat"
-          >
-            <Plus className="size-5" />
-          </Button>
-        </TooltipTrigger>
-        <TooltipContent side="bottom">New chat</TooltipContent>
-      </Tooltip>
-    </>
-  )
-}
diff --git a/apps/x/apps/renderer/src/components/chat-history-view.tsx b/apps/x/apps/renderer/src/components/chat-history-view.tsx
deleted file mode 100644
index 44ab9f4c..00000000
--- a/apps/x/apps/renderer/src/components/chat-history-view.tsx
+++ /dev/null
@@ -1,177 +0,0 @@
-import { useCallback, useMemo, useState } from 'react'
-import { ExternalLink, MessageSquare, SearchIcon, SquarePen, Trash2 } from 'lucide-react'
-
-import { Button } from '@/components/ui/button'
-import {
-  ContextMenu,
-  ContextMenuContent,
-  ContextMenuItem,
-  ContextMenuSeparator,
-  ContextMenuTrigger,
-} from '@/components/ui/context-menu'
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from '@/components/ui/dialog'
-import { formatRelativeTime } from '@/lib/relative-time'
-
-type Run = {
-  id: string
-  title?: string
-  createdAt: string
-  agentId: string
-}
-
-type ChatHistoryViewProps = {
-  runs: Run[]
-  currentRunId?: string | null
-  processingRunIds?: Set<string>
-  onSelectRun: (runId: string) => void
-  onOpenInNewTab?: (runId: string) => void
-  onDeleteRun: (runId: string) => Promise<void> | void
-  onNewChat?: () => void
-  onOpenSearch?: () => void
-}
-
-export function ChatHistoryView({
-  runs,
-  currentRunId,
-  processingRunIds,
-  onSelectRun,
-  onOpenInNewTab,
-  onDeleteRun,
-  onNewChat,
-  onOpenSearch,
-}: ChatHistoryViewProps) {
-  const [pendingDeleteId, setPendingDeleteId] = useState<string | null>(null)
-
-  const sortedRuns = useMemo(() => {
-    return [...runs].sort((a, b) => {
-      const at = new Date(a.createdAt).getTime()
-      const bt = new Date(b.createdAt).getTime()
-      return (Number.isNaN(bt) ? 0 : bt) - (Number.isNaN(at) ? 0 : at)
-    })
-  }, [runs])
-
-  const handleConfirmDelete = useCallback(async () => {
-    if (!pendingDeleteId) return
-    const id = pendingDeleteId
-    setPendingDeleteId(null)
-    await onDeleteRun(id)
-  }, [pendingDeleteId, onDeleteRun])
-
-  return (
-    <div className="flex h-full flex-col overflow-hidden">
-      <div className="shrink-0 flex items-center justify-between gap-3 border-b border-border px-8 py-6">
-        <h1 className="text-2xl font-bold tracking-tight">Chat history</h1>
-        <div className="flex items-center gap-2">
-          {onOpenSearch && (
-            <button
-              type="button"
-              onClick={onOpenSearch}
-              className="inline-flex items-center gap-1.5 rounded-md border border-border bg-background px-3 py-1.5 text-sm text-foreground transition-colors hover:bg-accent"
-            >
-              <SearchIcon className="size-4" />
-              <span>Search</span>
-            </button>
-          )}
-          {onNewChat && (
-            <Button size="sm" onClick={onNewChat}>
-              <SquarePen className="size-4" />
-              New chat
-            </Button>
-          )}
-        </div>
-      </div>
-
-      <div className="flex-1 overflow-y-auto">
-        <div className="min-w-[480px]">
-          <div className="sticky top-0 z-10 flex items-center border-b border-border bg-background px-6 py-2 text-xs font-medium text-muted-foreground">
-            <div className="flex-1">Title</div>
-            <div className="w-32 shrink-0">Created</div>
-          </div>
-
-          {sortedRuns.length === 0 ? (
-            <div className="px-6 py-8 text-sm text-muted-foreground">No chats yet.</div>
-          ) : (
-            sortedRuns.map((run) => {
-              const isActive = currentRunId === run.id
-              const isProcessing = processingRunIds?.has(run.id)
-              return (
-                <ContextMenu key={run.id}>
-                  <ContextMenuTrigger asChild>
-                    <button
-                      type="button"
-                      onClick={(e) => {
-                        if (e.metaKey && onOpenInNewTab) {
-                          onOpenInNewTab(run.id)
-                        } else {
-                          onSelectRun(run.id)
-                        }
-                      }}
-                      className={[
-                        'flex w-full items-center border-b border-border/60 px-6 py-1.5 text-left text-sm transition-colors hover:bg-accent',
-                        isActive ? 'bg-accent/60' : '',
-                      ].join(' ')}
-                    >
-                      <div className="flex flex-1 items-center gap-2 min-w-0">
-                        <MessageSquare className="size-4 shrink-0 text-muted-foreground" />
-                        <span className="min-w-0 truncate">{run.title || '(Untitled chat)'}</span>
-                      </div>
-                      <div className="w-32 shrink-0 text-xs text-muted-foreground tabular-nums">
-                        {formatRelativeTime(run.createdAt)}
-                      </div>
-                    </button>
-                  </ContextMenuTrigger>
-                  <ContextMenuContent className="w-48">
-                    {onOpenInNewTab && (
-                      <>
-                        <ContextMenuItem onClick={() => onOpenInNewTab(run.id)}>
-                          <ExternalLink className="mr-2 size-4" />
-                          Open in new tab
-                        </ContextMenuItem>
-                        <ContextMenuSeparator />
-                      </>
-                    )}
-                    {!isProcessing && (
-                      <ContextMenuItem
-                        variant="destructive"
-                        onClick={() => setPendingDeleteId(run.id)}
-                      >
-                        <Trash2 className="mr-2 size-4" />
-                        Delete
-                      </ContextMenuItem>
-                    )}
-                  </ContextMenuContent>
-                </ContextMenu>
-              )
-            })
-          )}
-        </div>
-      </div>
-
-      <Dialog open={!!pendingDeleteId} onOpenChange={(open) => { if (!open) setPendingDeleteId(null) }}>
-        <DialogContent showCloseButton={false} className="sm:max-w-sm">
-          <DialogHeader>
-            <DialogTitle>Delete chat</DialogTitle>
-            <DialogDescription>
-              Are you sure you want to delete this chat?
-            </DialogDescription>
-          </DialogHeader>
-          <DialogFooter>
-            <Button variant="outline" onClick={() => setPendingDeleteId(null)}>
-              Cancel
-            </Button>
-            <Button variant="destructive" onClick={() => void handleConfirmDelete()}>
-              Delete
-            </Button>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
-    </div>
-  )
-}
diff --git a/apps/x/apps/renderer/src/components/chat-input-with-mentions.tsx b/apps/x/apps/renderer/src/components/chat-input-with-mentions.tsx
index 0254cdfd..9d552905 100644
--- a/apps/x/apps/renderer/src/components/chat-input-with-mentions.tsx
+++ b/apps/x/apps/renderer/src/components/chat-input-with-mentions.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react'
+import { useCallback, useEffect, useRef, useState } from 'react'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import {
   ArrowUp,
@@ -10,34 +10,25 @@ import {
   FileSpreadsheet,
   FileText,
   FileVideo,
-  FolderCheck,
-  FolderClock,
   FolderCog,
-  FolderOpen,
   Globe,
   Headphones,
   ImagePlus,
   LoaderIcon,
   Mic,
-  MoreHorizontal,
   Plus,
-  ShieldCheck,
   Square,
-  Terminal,
   X,
 } from 'lucide-react'
 
 import { Button } from '@/components/ui/button'
 import {
   DropdownMenu,
-  DropdownMenuCheckboxItem,
   DropdownMenuContent,
   DropdownMenuItem,
   DropdownMenuRadioGroup,
   DropdownMenuRadioItem,
-  DropdownMenuSub,
-  DropdownMenuSubContent,
-  DropdownMenuSubTrigger,
+  DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from '@/components/ui/dropdown-menu'
 import {
@@ -69,12 +60,6 @@ export type StagedAttachment = {
 }
 
 const MAX_ATTACHMENT_SIZE = 10 * 1024 * 1024 // 10MB
-const MAX_VISIBLE_RECENT_WORK_DIRS = 3
-const MAX_STORED_RECENT_WORK_DIRS = 8
-// Stored in the workspace (~/.rowboat/config) so it travels with the workspace and
-// stays consistent with the other config/*.json files (e.g. coding-agents.json).
-const RECENT_WORK_DIRS_CONFIG_PATH = 'config/recent-work-dirs.json'
-const RECENT_WORK_DIRS_CHANGED_EVENT = 'rowboat-chat-recent-work-dirs-changed'
 
 
 const providerDisplayNames: Record<string, string> = {
@@ -95,18 +80,11 @@ interface ConfiguredModel {
   model: string
 }
 
-type RecentWorkDir = {
-  path: string
-  lastUsedAt: number
-}
-
 export interface SelectedModel {
   provider: string
   model: string
 }
 
-export type PermissionMode = 'manual' | 'auto'
-
 function getSelectedModelDisplayName(model: string) {
   return model.split('/').pop() || model
 }
@@ -130,86 +108,8 @@ function getAttachmentIcon(kind: AttachmentIconKind) {
   }
 }
 
-function normalizeRecentWorkDir(value: unknown): RecentWorkDir | null {
-  if (typeof value === 'string') {
-    const path = value.trim()
-    return path ? { path, lastUsedAt: 0 } : null
-  }
-  if (!value || typeof value !== 'object') return null
-  const entry = value as Record<string, unknown>
-  const path = typeof entry.path === 'string' ? entry.path.trim() : ''
-  const lastUsedAt = typeof entry.lastUsedAt === 'number' && Number.isFinite(entry.lastUsedAt)
-    ? entry.lastUsedAt
-    : 0
-  return path ? { path, lastUsedAt } : null
-}
-
-async function readRecentWorkDirs(): Promise<RecentWorkDir[]> {
-  try {
-    const result = await window.ipc.invoke('workspace:readFile', { path: RECENT_WORK_DIRS_CONFIG_PATH })
-    const parsed = JSON.parse(result.data)
-    if (!Array.isArray(parsed)) return []
-    const seen = new Set<string>()
-    const dirs: RecentWorkDir[] = []
-    for (const value of parsed) {
-      const entry = normalizeRecentWorkDir(value)
-      if (!entry || seen.has(entry.path)) continue
-      seen.add(entry.path)
-      dirs.push(entry)
-      if (dirs.length >= MAX_STORED_RECENT_WORK_DIRS) break
-    }
-    return dirs
-  } catch {
-    // File missing or invalid — no recents yet.
-    return []
-  }
-}
-
-async function writeRecentWorkDirs(dirs: RecentWorkDir[]) {
-  try {
-    await window.ipc.invoke('workspace:writeFile', {
-      path: RECENT_WORK_DIRS_CONFIG_PATH,
-      data: JSON.stringify(dirs.slice(0, MAX_STORED_RECENT_WORK_DIRS), null, 2),
-    })
-  } catch (err) {
-    console.error('Failed to persist recent work directories', err)
-  }
-  // Notify other mounted chat inputs in this window to re-read.
-  window.dispatchEvent(new CustomEvent(RECENT_WORK_DIRS_CHANGED_EVENT))
-}
-
-function formatRecentWorkDirTime(lastUsedAt: number) {
-  if (!lastUsedAt) return ''
-  const now = Date.now()
-  const diffMs = Math.max(0, now - lastUsedAt)
-  const minute = 60 * 1000
-  const hour = 60 * minute
-  const day = 24 * hour
-  if (diffMs < minute) return 'now'
-  if (diffMs < hour) return `${Math.max(1, Math.floor(diffMs / minute))}m ago`
-  if (diffMs < day) return `${Math.floor(diffMs / hour)}h ago`
-
-  const used = new Date(lastUsedAt)
-  const yesterday = new Date(now - day)
-  if (
-    used.getFullYear() === yesterday.getFullYear() &&
-    used.getMonth() === yesterday.getMonth() &&
-    used.getDate() === yesterday.getDate()
-  ) {
-    return 'Yesterday'
-  }
-  if (diffMs < 7 * day) {
-    return used.toLocaleDateString(undefined, { weekday: 'short' })
-  }
-  return used.toLocaleDateString(undefined, { month: 'short', day: 'numeric' })
-}
-
-function compactWorkDirPath(path: string) {
-  return path.replace(/^\/Users\/[^/]+/, '~')
-}
-
 interface ChatInputInnerProps {
-  onSubmit: (message: PromptInputMessage, mentions?: FileMention[], attachments?: StagedAttachment[], searchEnabled?: boolean, codeMode?: 'claude' | 'codex', permissionMode?: PermissionMode) => void
+  onSubmit: (message: PromptInputMessage, mentions?: FileMention[], attachments?: StagedAttachment[], searchEnabled?: boolean) => void
   onStop?: () => void
   isProcessing: boolean
   isStopping?: boolean
@@ -233,10 +133,6 @@ interface ChatInputInnerProps {
   onTtsModeChange?: (mode: 'summary' | 'full') => void
   /** Fired when the user picks a different model in the dropdown (only when no run exists yet). */
   onSelectedModelChange?: (model: SelectedModel | null) => void
-  /** Work directory for this chat (per-chat). Null when none is set. */
-  workDir?: string | null
-  /** Fired when the user sets/changes/clears the work directory for this chat. */
-  onWorkDirChange?: (value: string | null) => void
 }
 
 function ChatInputInner({
@@ -263,8 +159,6 @@ function ChatInputInner({
   onToggleTts,
   onTtsModeChange,
   onSelectedModelChange,
-  workDir = null,
-  onWorkDirChange,
 }: ChatInputInnerProps) {
   const controller = usePromptInputController()
   const message = controller.textInput.value
@@ -279,62 +173,12 @@ function ChatInputInner({
   const [searchEnabled, setSearchEnabled] = useState(false)
   const [searchAvailable, setSearchAvailable] = useState(false)
   const [isRowboatConnected, setIsRowboatConnected] = useState(false)
-  const [codingAgent, setCodingAgent] = useState<'claude' | 'codex'>('claude')
-  const [codeModeEnabled, setCodeModeEnabled] = useState(false)
-  const [codeModeFeatureEnabled, setCodeModeFeatureEnabled] = useState(false)
-  const [permissionMode, setPermissionMode] = useState<PermissionMode>('auto')
-  const [recentWorkDirs, setRecentWorkDirs] = useState<RecentWorkDir[]>([])
-
-  // Responsive toolbar: measure real overflow and progressively collapse items
-  // right→left until everything fits. Stages:
-  //   1 code→icon · 2 perm→icon · 3 search label hidden · 4 workDir→icon
-  //   5 code→menu · 6 perm→menu · 7 search→menu · 8 workDir→menu
-  // Once items move into the "⋯" overflow menu (≥5) no icon is ever hidden.
-  // overflow-hidden on the left group is the hard guarantee against any overlap.
-  const toolbarRef = useRef<HTMLDivElement>(null)
-  const leftGroupRef = useRef<HTMLDivElement>(null)
-  const lastWidthRef = useRef(0)
-  const [collapseLevel, setCollapseLevel] = useState(0)
-
-  // Re-evaluate from scratch (level 0) whenever the available width changes…
-  useEffect(() => {
-    const outer = toolbarRef.current
-    if (!outer) return
-    const ro = new ResizeObserver(() => {
-      const w = outer.clientWidth
-      if (w !== lastWidthRef.current) {
-        lastWidthRef.current = w
-        setCollapseLevel(0)
-      }
-    })
-    ro.observe(outer)
-    return () => ro.disconnect()
-  }, [])
-
-  // …or when the *set* of items changes (an item appears/disappears, or the model
-  // name width changes). Deliberately excludes the in-place toggles (searchEnabled,
-  // permissionMode, codeModeEnabled, codingAgent): those fire from the overflow menu
-  // for items already inside it, so resetting here would unmount the open menu. The
-  // no-dep effect below still re-collapses if any toggle happens to widen the row.
-  useLayoutEffect(() => {
-    setCollapseLevel(0)
-  }, [workDir, searchAvailable, codeModeFeatureEnabled, lockedModel, activeModelKey])
-
-  // After each render, if the left group still overflows, collapse one more step.
-  // Runs before paint, so the intermediate (overflowing) state is never visible.
-  useLayoutEffect(() => {
-    const el = leftGroupRef.current
-    if (!el) return
-    if (el.scrollWidth > el.clientWidth + 1 && collapseLevel < 8) {
-      setCollapseLevel((l) => Math.min(8, l + 1))
-    }
-  })
+  const [workDir, setWorkDir] = useState<string | null>(null)
 
   // When a run exists, freeze the dropdown to the run's resolved model+provider.
   useEffect(() => {
     if (!runId) {
       setLockedModel(null)
-      setPermissionMode('auto')
       return
     }
     let cancelled = false
@@ -343,20 +187,10 @@ function ChatInputInner({
       if (run.provider && run.model) {
         setLockedModel({ provider: run.provider, model: run.model })
       }
-      setPermissionMode(run.permissionMode ?? 'manual')
     }).catch(() => { /* legacy run or fetch failure — leave unlocked */ })
     return () => { cancelled = true }
   }, [runId])
 
-  useEffect(() => {
-    const syncRecentWorkDirs = () => { void readRecentWorkDirs().then(setRecentWorkDirs) }
-    syncRecentWorkDirs()
-    window.addEventListener(RECENT_WORK_DIRS_CHANGED_EVENT, syncRecentWorkDirs)
-    return () => {
-      window.removeEventListener(RECENT_WORK_DIRS_CHANGED_EVENT, syncRecentWorkDirs)
-    }
-  }, [])
-
   // Check Rowboat sign-in state
   useEffect(() => {
     window.ipc.invoke('oauth:getState', null).then((result) => {
@@ -422,146 +256,54 @@ function ChatInputInner({
     return () => window.removeEventListener('models-config-changed', handler)
   }, [loadModelConfig])
 
-  // Load the global code-mode feature flag (from settings) and stay in sync.
-  useEffect(() => {
-    const load = () => {
-      window.ipc.invoke('codeMode:getConfig', null)
-        .then((r) => setCodeModeFeatureEnabled(r.enabled))
-        .catch(() => setCodeModeFeatureEnabled(false))
-    }
-    load()
-    window.addEventListener('code-mode-config-changed', load)
-    return () => window.removeEventListener('code-mode-config-changed', load)
-  }, [])
-
-  // If the feature is turned off in settings, also turn off any per-conversation chip.
-  useEffect(() => {
-    if (!codeModeFeatureEnabled && codeModeEnabled) {
-      setCodeModeEnabled(false)
-    }
-  }, [codeModeFeatureEnabled, codeModeEnabled])
-
-
-  // Cross-platform basename — handles both / and \ separators.
-  const basename = useCallback((p: string): string => {
-    const trimmed = p.replace(/[\\/]+$/, '')
-    const idx = Math.max(trimmed.lastIndexOf('/'), trimmed.lastIndexOf('\\'))
-    return idx >= 0 ? trimmed.slice(idx + 1) : trimmed
-  }, [])
-
-  const rememberWorkDir = useCallback(async (dir: string) => {
-    const trimmed = dir.trim()
-    if (!trimmed) return
-    const next = [
-      { path: trimmed, lastUsedAt: Date.now() },
-      ...(await readRecentWorkDirs()).filter((item) => item.path !== trimmed),
-    ].slice(0, MAX_STORED_RECENT_WORK_DIRS)
-    setRecentWorkDirs(next)
-    await writeRecentWorkDirs(next)
-  }, [])
-
-  // Load coding-agent preference for a given workdir.
-  // Storage: config/coding-agents.json — { [workDirPath]: 'claude' | 'codex' }
-  const loadCodingAgentFor = useCallback(async (dir: string | null): Promise<'claude' | 'codex'> => {
-    if (!dir) return 'claude'
+  // Load currently configured work directory
+  const loadWorkDir = useCallback(async () => {
     try {
-      const result = await window.ipc.invoke('workspace:readFile', { path: 'config/coding-agents.json' })
-      const parsed = JSON.parse(result.data) as Record<string, unknown>
-      const value = parsed?.[dir]
-      if (value === 'codex' || value === 'claude') return value
+      const result = await window.ipc.invoke('workspace:readFile', { path: 'config/workdir.json' })
+      const parsed = JSON.parse(result.data)
+      const value = typeof parsed?.path === 'string' ? parsed.path.trim() : ''
+      setWorkDir(value || null)
     } catch {
-      /* file missing or invalid — fall through to default */
+      setWorkDir(null)
     }
-    return 'claude'
   }, [])
 
-  const persistCodingAgent = useCallback(async (dir: string, agent: 'claude' | 'codex') => {
-    const existing: Record<string, 'claude' | 'codex'> = {}
-    try {
-      const result = await window.ipc.invoke('workspace:readFile', { path: 'config/coding-agents.json' })
-      const parsed = JSON.parse(result.data) as Record<string, unknown>
-      for (const [k, v] of Object.entries(parsed ?? {})) {
-        if (v === 'claude' || v === 'codex') existing[k] = v
-      }
-    } catch { /* start fresh */ }
-    existing[dir] = agent
-    await window.ipc.invoke('workspace:writeFile', {
-      path: 'config/coding-agents.json',
-      data: JSON.stringify(existing, null, 2),
-    })
-  }, [])
-
-  // Work directory is owned per-chat by the parent (App). This component only
-  // drives the picker dialog and reports changes up via onWorkDirChange. Whenever
-  // the work directory changes, load its persisted coding-agent preference.
   useEffect(() => {
-    let cancelled = false
-    loadCodingAgentFor(workDir).then((agent) => {
-      if (!cancelled) setCodingAgent(agent)
-    })
-    return () => { cancelled = true }
-  }, [workDir, loadCodingAgentFor])
-
-  useEffect(() => {
-    if (isActive && workDir) void rememberWorkDir(workDir)
-  }, [isActive, workDir, rememberWorkDir])
+    loadWorkDir()
+  }, [isActive, loadWorkDir])
 
   const handleSetWorkDir = useCallback(async () => {
     try {
-      let defaultPath: string | undefined = workDir ?? undefined
-      try {
-        const { root } = await window.ipc.invoke('workspace:getRoot', null)
-        const workspaceRel = 'knowledge/Workspace'
-        const exists = await window.ipc.invoke('workspace:exists', { path: workspaceRel })
-        if (!exists.exists) {
-          await window.ipc.invoke('workspace:mkdir', { path: workspaceRel, recursive: true })
-        }
-        defaultPath = `${root.replace(/\/$/, '')}/${workspaceRel}`
-      } catch (err) {
-        console.error('Failed to resolve Workspace path; falling back to current workDir', err)
-      }
       const { path: chosen } = await window.ipc.invoke('dialog:openDirectory', {
         title: 'Choose work directory',
-        defaultPath,
+        defaultPath: workDir ?? undefined,
       })
       if (!chosen) return
-      onWorkDirChange?.(chosen)
-      await rememberWorkDir(chosen)
-      setCodingAgent(await loadCodingAgentFor(chosen))
+      await window.ipc.invoke('workspace:writeFile', {
+        path: 'config/workdir.json',
+        data: JSON.stringify({ path: chosen }, null, 2),
+      })
+      setWorkDir(chosen)
       toast.success(`Work directory set: ${chosen}`)
     } catch (err) {
       console.error('Failed to set work directory', err)
       toast.error('Failed to set work directory')
     }
-  }, [workDir, onWorkDirChange, rememberWorkDir, loadCodingAgentFor])
+  }, [workDir])
 
-  const handleSelectRecentWorkDir = useCallback(async (dir: string) => {
-    onWorkDirChange?.(dir)
-    await rememberWorkDir(dir)
-    setCodingAgent(await loadCodingAgentFor(dir))
-    toast.success(`Work directory set: ${dir}`)
-  }, [onWorkDirChange, rememberWorkDir, loadCodingAgentFor])
-
-  const handleClearWorkDir = useCallback(() => {
-    onWorkDirChange?.(null)
-    setCodingAgent('claude')
-    toast.success('Work directory cleared')
-  }, [onWorkDirChange])
-
-  const handleToggleCodingAgent = useCallback(async () => {
-    const next: 'claude' | 'codex' = codingAgent === 'claude' ? 'codex' : 'claude'
-    setCodingAgent(next)
-    // Persist only when scoped to a workdir; without one there's nothing to key on.
-    if (!workDir) return
+  const handleClearWorkDir = useCallback(async () => {
     try {
-      await persistCodingAgent(workDir, next)
+      await window.ipc.invoke('workspace:writeFile', {
+        path: 'config/workdir.json',
+        data: JSON.stringify({}, null, 2),
+      })
+      setWorkDir(null)
+      toast.success('Work directory cleared')
     } catch (err) {
-      console.error('Failed to save coding agent', err)
-      toast.error('Failed to save coding agent')
-      // revert on failure
-      setCodingAgent(codingAgent)
+      console.error('Failed to clear work directory', err)
+      toast.error('Failed to clear work directory')
     }
-  }, [workDir, codingAgent, persistCodingAgent])
+  }, [])
 
   // Check search tool availability (exa or signed-in via gateway)
   useEffect(() => {
@@ -647,15 +389,12 @@ function ChatInputInner({
 
   const handleSubmit = useCallback(() => {
     if (!canSubmit) return
-    // codeMode is sticky per conversation — don't reset after send.
-    const effectiveCodeMode = codeModeEnabled ? codingAgent : undefined
-    onSubmit({ text: message.trim(), files: [] }, controller.mentions.mentions, attachments, searchEnabled || undefined, effectiveCodeMode, permissionMode)
+    onSubmit({ text: message.trim(), files: [] }, controller.mentions.mentions, attachments, searchEnabled || undefined)
     controller.textInput.clear()
     controller.mentions.clearMentions()
     setAttachments([])
-    // Web search toggle stays on for the rest of the chat session; the user
-    // turns it off explicitly. (Not persisted across app restarts.)
-  }, [attachments, canSubmit, controller, message, onSubmit, searchEnabled, codeModeEnabled, codingAgent, permissionMode, workDir])
+    setSearchEnabled(false)
+  }, [attachments, canSubmit, controller, message, onSubmit, searchEnabled])
 
   const handleKeyDown = useCallback((e: React.KeyboardEvent) => {
     if (e.key === 'Enter' && !e.shiftKey) {
@@ -694,14 +433,8 @@ function ChatInputInner({
     }
   }, [addFiles, isActive])
 
-  const visibleRecentWorkDirs = recentWorkDirs
-    .filter((entry) => entry.path !== workDir)
-    .slice(0, MAX_VISIBLE_RECENT_WORK_DIRS)
-  const currentWorkDirLabel = workDir ? basename(workDir) || workDir : 'Not set'
-  const currentWorkDirPath = workDir ? compactWorkDirPath(workDir) : ''
-
   return (
-    <div className="rowboat-chat-input rounded-lg border border-border bg-background shadow-none">
+    <div className="rounded-lg border border-border bg-background shadow-none">
       {attachments.length > 0 && (
         <div className="flex flex-wrap gap-2 px-4 pb-1 pt-3">
           {attachments.map((attachment) => {
@@ -804,344 +537,95 @@ function ChatInputInner({
           className="min-h-6 rounded-none border-0 py-0 shadow-none focus-visible:ring-0"
         />
       </div>
-      <div ref={toolbarRef} className="flex items-center gap-2 px-4 pb-3">
-        <div ref={leftGroupRef} className="flex min-w-0 items-center gap-2 overflow-hidden">
+      <div className="flex items-center gap-2 px-4 pb-3">
         <DropdownMenu>
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <DropdownMenuTrigger asChild>
-                <button
-                  type="button"
-                  className="flex h-7 w-7 shrink-0 items-center justify-center rounded-full text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
-                  aria-label="Add"
-                >
-                  <Plus className="h-4 w-4" />
-                </button>
-              </DropdownMenuTrigger>
-            </TooltipTrigger>
-            <TooltipContent side="top">
-              {workDir ? 'Add files or change work directory' : 'Add files or set work directory'}
-            </TooltipContent>
-          </Tooltip>
-          <DropdownMenuContent align="start" className="w-72 max-w-[calc(100vw-2rem)] p-2">
-            <div className="rounded-[14px] border border-border/80 bg-background p-1">
-              <DropdownMenuItem onSelect={() => fileInputRef.current?.click()} className="h-9 rounded-[9px] px-2.5">
-                <ImagePlus className="size-4" />
-                <span>Add files or photos</span>
-              </DropdownMenuItem>
-
-              {/* Working directory lives behind a submenu so the main menu stays to two
-                  items. One hover/click away for power users; out of the way otherwise. */}
-              <DropdownMenuSub>
-                <DropdownMenuSubTrigger className="h-9 rounded-[9px] px-2.5">
-                  <FolderCog className="size-4" />
-                  <span className="flex min-w-0 flex-1 items-center justify-between gap-3">
-                    <span>Set working directory</span>
-                    <span className="min-w-0 max-w-[110px] truncate text-xs text-muted-foreground">
-                      {currentWorkDirLabel}
-                    </span>
-                  </span>
-                </DropdownMenuSubTrigger>
-                <DropdownMenuSubContent className="w-72 max-w-[calc(100vw-2rem)] p-1">
-                  {/* Current selection — shown for context only when one is set. */}
-                  {workDir && (
-                    <div
-                      title={workDir}
-                      className="mb-1 flex items-center gap-2 rounded-[9px] bg-blue-50/80 px-2.5 py-2 text-blue-700 dark:bg-blue-950/30 dark:text-blue-300"
-                    >
-                      <FolderCheck className="size-4 shrink-0 text-blue-600 dark:text-blue-300" />
-                      <span className="flex min-w-0 flex-1 flex-col gap-0.5">
-                        <span className="truncate text-sm font-medium">{currentWorkDirLabel}</span>
-                        <span className="truncate text-xs text-blue-700/70 dark:text-blue-300/70">
-                          {currentWorkDirPath}
-                        </span>
-                      </span>
-                    </div>
-                  )}
-
-                  {/* Primary action: choose when unset, change when set. Always on top. */}
-                  <DropdownMenuItem
-                    onSelect={() => { void handleSetWorkDir() }}
-                    className="h-9 rounded-[9px] px-2.5"
-                  >
-                    <FolderOpen className="size-4" />
-                    <span>{workDir ? 'Change folder…' : 'Choose a folder…'}</span>
-                  </DropdownMenuItem>
-
-                  {visibleRecentWorkDirs.length > 0 && (
-                    <>
-                      <div className="px-2.5 pb-1 pt-2 text-[10.5px] font-semibold uppercase tracking-wider text-muted-foreground">
-                        Recent
-                      </div>
-                      {visibleRecentWorkDirs.map((entry) => {
-                        const name = basename(entry.path) || entry.path
-                        const when = formatRecentWorkDirTime(entry.lastUsedAt)
-                        return (
-                          <DropdownMenuItem
-                            key={entry.path}
-                            title={entry.path}
-                            onSelect={() => { void handleSelectRecentWorkDir(entry.path) }}
-                            className="h-8 rounded-[9px] px-2.5"
-                          >
-                            <FolderClock className="size-4" />
-                            <span className="min-w-0 flex-1 truncate">{name}</span>
-                            {when && <span className="shrink-0 text-xs text-muted-foreground">{when}</span>}
-                          </DropdownMenuItem>
-                        )
-                      })}
-                    </>
-                  )}
-
-                  {/* Clear — only meaningful once a directory is set. Kept at the bottom. */}
-                  {workDir && (
-                    <>
-                      <div className="my-1 h-px bg-border/60" />
-                      <DropdownMenuItem
-                        onSelect={handleClearWorkDir}
-                        className="h-8 rounded-[9px] px-2.5 text-red-600 focus:bg-red-50 focus:text-red-600 dark:text-red-400 dark:focus:bg-red-950/30"
-                      >
-                        <X className="size-4" />
-                        <span>Clear folder</span>
-                      </DropdownMenuItem>
-                    </>
-                  )}
-                </DropdownMenuSubContent>
-              </DropdownMenuSub>
-            </div>
+          <DropdownMenuTrigger asChild>
+            <button
+              type="button"
+              className="flex h-7 w-7 shrink-0 items-center justify-center rounded-full text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
+              aria-label="Add"
+            >
+              <Plus className="h-4 w-4" />
+            </button>
+          </DropdownMenuTrigger>
+          <DropdownMenuContent align="start" className="min-w-56">
+            <DropdownMenuItem onSelect={() => fileInputRef.current?.click()}>
+              <ImagePlus className="size-4" />
+              <span>Add files or photos</span>
+            </DropdownMenuItem>
+            <DropdownMenuItem onSelect={() => { void handleSetWorkDir() }}>
+              <FolderCog className="size-4" />
+              <span>{workDir ? 'Change work directory' : 'Set work directory'}</span>
+            </DropdownMenuItem>
+            {workDir && (
+              <>
+                <DropdownMenuSeparator />
+                <DropdownMenuItem onSelect={() => { void handleClearWorkDir() }}>
+                  <X className="size-4" />
+                  <span>Clear work directory</span>
+                </DropdownMenuItem>
+              </>
+            )}
           </DropdownMenuContent>
         </DropdownMenu>
-        {workDir && collapseLevel < 8 && (
+        {workDir && (
           <Tooltip>
             <TooltipTrigger asChild>
-              {/* Level 4: collapse to a square icon */}
-              <div className={cn(
-                "group flex h-7 shrink-0 items-center rounded-full border border-border bg-muted/40 text-xs text-muted-foreground transition-colors hover:bg-muted hover:text-foreground",
-                collapseLevel >= 4 ? "w-7 justify-center" : "max-w-[180px] pl-2.5 pr-2"
-              )}>
-                <button
-                  type="button"
-                  onClick={handleSetWorkDir}
-                  className="flex min-w-0 items-center gap-1.5"
-                >
-                  <FolderCog className="h-3.5 w-3.5 shrink-0" />
-                  {collapseLevel < 4 && <span className="truncate">{basename(workDir) || workDir}</span>}
-                </button>
-                {collapseLevel < 4 && (
-                  <button
-                    type="button"
-                    onClick={handleClearWorkDir}
-                    aria-label="Remove work directory"
-                    className="flex h-3.5 w-0 shrink-0 items-center justify-center overflow-hidden opacity-0 transition-all duration-150 ease-out hover:text-red-500 group-hover:ml-1 group-hover:w-3.5 group-hover:opacity-100"
-                  >
-                    <X className="h-3.5 w-3.5 shrink-0" />
-                  </button>
-                )}
-              </div>
+              <button
+                type="button"
+                onClick={handleSetWorkDir}
+                className="flex h-7 max-w-[180px] shrink-0 items-center gap-1.5 rounded-full border border-border bg-muted/40 px-2.5 text-xs text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
+              >
+                <FolderCog className="h-3.5 w-3.5" />
+                <span className="truncate">{workDir.split('/').pop() || workDir}</span>
+              </button>
             </TooltipTrigger>
             <TooltipContent side="top">
               Work directory: {workDir}
             </TooltipContent>
           </Tooltip>
         )}
-        {searchAvailable && collapseLevel < 7 && (
-          <button
-            type="button"
-            onClick={() => setSearchEnabled((v) => !v)}
-            aria-label="Search"
-            aria-pressed={searchEnabled}
-            className={cn(
-              'flex h-7 shrink-0 items-center rounded-full border px-1.5 transition-colors duration-150 ease-out',
-              searchEnabled
-                ? 'border-blue-200 bg-blue-50 text-blue-600 hover:bg-blue-100 dark:border-blue-800 dark:bg-blue-950 dark:text-blue-400 dark:hover:bg-blue-900'
-                : 'border-transparent text-muted-foreground hover:bg-muted hover:text-foreground'
-            )}
-          >
-            <Globe className="h-4 w-4 shrink-0" />
-            {searchEnabled && collapseLevel < 3 && (
-              <span className="ml-1.5 whitespace-nowrap text-xs font-medium">
-                Search
-              </span>
-            )}
-          </button>
-        )}
-        {collapseLevel < 6 && (
-        <Tooltip>
-          <TooltipTrigger asChild>
+        {searchAvailable && (
+          searchEnabled ? (
             <button
               type="button"
-              onClick={() => {
-                if (runId) return
-                setPermissionMode((mode) => mode === 'auto' ? 'manual' : 'auto')
-              }}
-              disabled={Boolean(runId)}
-              className={cn(
-                "flex h-7 shrink-0 items-center gap-1.5 rounded-full text-xs font-medium transition-colors",
-                collapseLevel >= 2 ? "w-7 justify-center" : "px-2.5",
-                permissionMode === 'auto'
-                  ? "bg-secondary text-foreground hover:bg-secondary/70"
-                  : "text-muted-foreground hover:bg-muted hover:text-foreground",
-                runId && "cursor-not-allowed opacity-70 hover:bg-secondary"
-              )}
-              aria-label="Permission mode"
+              onClick={() => setSearchEnabled(false)}
+              className="flex h-7 shrink-0 items-center gap-1.5 rounded-full border border-blue-200 bg-blue-50 px-2.5 text-blue-600 transition-colors hover:bg-blue-100 dark:border-blue-800 dark:bg-blue-950 dark:text-blue-400 dark:hover:bg-blue-900"
             >
-              <ShieldCheck className="h-3.5 w-3.5 shrink-0" />
-              {collapseLevel < 2 && <span>{permissionMode === 'auto' ? 'Auto' : 'Manual'}</span>}
+              <Globe className="h-3.5 w-3.5" />
+              <span className="text-xs font-medium">Search</span>
+              <X className="h-3 w-3" />
             </button>
-          </TooltipTrigger>
-          <TooltipContent side="top">
-            {runId
-              ? `Permission mode is fixed for this run: ${permissionMode === 'auto' ? 'Auto' : 'Manual'}`
-              : permissionMode === 'auto'
-                ? 'Auto-permission on — click for manual approval prompts'
-                : 'Manual approval prompts — click for auto-permission'}
-          </TooltipContent>
-        </Tooltip>
-        )}
-        {codeModeFeatureEnabled && collapseLevel < 5 && (codeModeEnabled ? (
-          collapseLevel >= 1 ? (
-            /* Level 1: collapse the pill to a single icon */
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <button
-                  type="button"
-                  onClick={() => setCodeModeEnabled(false)}
-                  className="flex h-7 w-7 shrink-0 items-center justify-center rounded-full bg-secondary text-foreground transition-colors hover:bg-secondary/70"
-                >
-                  <Terminal className="h-3.5 w-3.5" />
-                </button>
-              </TooltipTrigger>
-              <TooltipContent side="top">Code mode on ({codingAgent === 'claude' ? 'Claude Code' : 'Codex'}) — click to disable</TooltipContent>
-            </Tooltip>
           ) : (
-            <div className="flex h-7 shrink-0 items-center rounded-full bg-secondary text-xs font-medium text-foreground">
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <button
-                    type="button"
-                    onClick={() => setCodeModeEnabled(false)}
-                    className="flex h-full items-center gap-1.5 rounded-l-full pl-2.5 pr-2 transition-colors hover:bg-secondary/70"
-                  >
-                    <Terminal className="h-3.5 w-3.5" />
-                    <span>Code</span>
-                  </button>
-                </TooltipTrigger>
-                <TooltipContent side="top">Code mode on — click to disable</TooltipContent>
-              </Tooltip>
-              <span className="text-foreground/30">·</span>
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <button
-                    type="button"
-                    onClick={handleToggleCodingAgent}
-                    className="flex h-full items-center rounded-r-full pl-2 pr-2.5 transition-colors hover:bg-secondary/70"
-                  >
-                    <span>{codingAgent === 'claude' ? 'Claude' : 'Codex'}</span>
-                  </button>
-                </TooltipTrigger>
-                <TooltipContent side="top">
-                  Coding agent: {codingAgent === 'claude' ? 'Claude Code' : 'Codex'} — click to swap
-                </TooltipContent>
-              </Tooltip>
-            </div>
+            <button
+              type="button"
+              onClick={() => setSearchEnabled(true)}
+              className="flex h-7 w-7 shrink-0 items-center justify-center rounded-full text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
+              aria-label="Search"
+            >
+              <Globe className="h-4 w-4" />
+            </button>
           )
-        ) : (
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <button
-                type="button"
-                onClick={() => setCodeModeEnabled(true)}
-                className="flex h-7 w-7 shrink-0 items-center justify-center rounded-full text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
-                aria-label="Code mode"
-              >
-                <Terminal className="h-4 w-4" />
-              </button>
-            </TooltipTrigger>
-            <TooltipContent side="top">Use a coding agent (Claude Code or Codex)</TooltipContent>
-          </Tooltip>
-        ))}
-        </div>
-        {collapseLevel >= 5 && (
-          <DropdownMenu>
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <DropdownMenuTrigger asChild>
-                  <button
-                    type="button"
-                    aria-label="More options"
-                    className="flex h-7 w-7 shrink-0 items-center justify-center rounded-full text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
-                  >
-                    <MoreHorizontal className="h-4 w-4" />
-                  </button>
-                </DropdownMenuTrigger>
-              </TooltipTrigger>
-              <TooltipContent side="top">More options</TooltipContent>
-            </Tooltip>
-            <DropdownMenuContent align="start" side="top" className="min-w-52">
-              {workDir && collapseLevel >= 8 && (
-                <DropdownMenuItem onSelect={() => { void handleSetWorkDir() }}>
-                  <FolderCog className="size-4" />
-                  <span className="min-w-0 flex-1 truncate">{basename(workDir) || workDir}</span>
-                </DropdownMenuItem>
-              )}
-              {searchAvailable && collapseLevel >= 7 && (
-                <DropdownMenuCheckboxItem
-                  checked={searchEnabled}
-                  onSelect={(e) => e.preventDefault()}
-                  onCheckedChange={(c) => setSearchEnabled(Boolean(c))}
-                >
-                  Web search
-                </DropdownMenuCheckboxItem>
-              )}
-              {collapseLevel >= 6 && (
-                <DropdownMenuCheckboxItem
-                  checked={permissionMode === 'auto'}
-                  disabled={Boolean(runId)}
-                  onSelect={(e) => e.preventDefault()}
-                  onCheckedChange={(c) => setPermissionMode(c ? 'auto' : 'manual')}
-                >
-                  Auto-approve actions
-                </DropdownMenuCheckboxItem>
-              )}
-              {codeModeFeatureEnabled && collapseLevel >= 5 && (
-                <>
-                  <DropdownMenuCheckboxItem
-                    checked={codeModeEnabled}
-                    onSelect={(e) => e.preventDefault()}
-                    onCheckedChange={(c) => setCodeModeEnabled(Boolean(c))}
-                  >
-                    Code mode
-                  </DropdownMenuCheckboxItem>
-                  {codeModeEnabled && (
-                    <DropdownMenuItem onSelect={(e) => { e.preventDefault(); handleToggleCodingAgent() }}>
-                      <Terminal className="size-4" />
-                      <span className="min-w-0 flex-1">Coding agent</span>
-                      <span className="text-xs text-muted-foreground">{codingAgent === 'claude' ? 'Claude' : 'Codex'}</span>
-                    </DropdownMenuItem>
-                  )}
-                </>
-              )}
-            </DropdownMenuContent>
-          </DropdownMenu>
         )}
         <div className="flex-1" />
         {lockedModel ? (
           <span
-            className="flex h-7 min-w-0 items-center gap-1 rounded-full px-2 text-xs text-muted-foreground"
+            className="flex h-7 shrink-0 items-center gap-1 rounded-full px-2 text-xs text-muted-foreground"
             title={`${providerDisplayNames[lockedModel.provider] || lockedModel.provider} — fixed for this chat`}
           >
-            <span className="min-w-0 truncate">{getSelectedModelDisplayName(lockedModel.model)}</span>
+            <span className="max-w-[150px] truncate">{getSelectedModelDisplayName(lockedModel.model)}</span>
           </span>
         ) : configuredModels.length > 0 ? (
           <DropdownMenu>
             <DropdownMenuTrigger asChild>
               <button
                 type="button"
-                className="flex h-7 min-w-0 items-center gap-1 rounded-full px-2 text-xs text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
+                className="flex h-7 shrink-0 items-center gap-1 rounded-full px-2 text-xs text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
               >
-                <span className="min-w-0 truncate">
+                <span className="max-w-[150px] truncate">
                   {getSelectedModelDisplayName(configuredModels.find((m) => `${m.provider}/${m.model}` === activeModelKey)?.model || configuredModels[0]?.model || 'Model')}
                 </span>
-                <ChevronDown className="h-3 w-3 shrink-0" />
+                <ChevronDown className="h-3 w-3" />
               </button>
             </DropdownMenuTrigger>
             <DropdownMenuContent align="end">
@@ -1283,7 +767,7 @@ export interface ChatInputWithMentionsProps {
   knowledgeFiles: string[]
   recentFiles: string[]
   visibleFiles: string[]
-  onSubmit: (message: PromptInputMessage, mentions?: FileMention[], attachments?: StagedAttachment[], searchEnabled?: boolean, codeMode?: 'claude' | 'codex', permissionMode?: PermissionMode) => void
+  onSubmit: (message: PromptInputMessage, mentions?: FileMention[], attachments?: StagedAttachment[]) => void
   onStop?: () => void
   isProcessing: boolean
   isStopping?: boolean
@@ -1306,8 +790,6 @@ export interface ChatInputWithMentionsProps {
   onToggleTts?: () => void
   onTtsModeChange?: (mode: 'summary' | 'full') => void
   onSelectedModelChange?: (model: SelectedModel | null) => void
-  workDir?: string | null
-  onWorkDirChange?: (value: string | null) => void
 }
 
 export function ChatInputWithMentions({
@@ -1337,8 +819,6 @@ export function ChatInputWithMentions({
   onToggleTts,
   onTtsModeChange,
   onSelectedModelChange,
-  workDir,
-  onWorkDirChange,
 }: ChatInputWithMentionsProps) {
   return (
     <PromptInputProvider knowledgeFiles={knowledgeFiles} recentFiles={recentFiles} visibleFiles={visibleFiles}>
@@ -1366,8 +846,6 @@ export function ChatInputWithMentions({
         onToggleTts={onToggleTts}
         onTtsModeChange={onTtsModeChange}
         onSelectedModelChange={onSelectedModelChange}
-        workDir={workDir}
-        onWorkDirChange={onWorkDirChange}
       />
     </PromptInputProvider>
   )
diff --git a/apps/x/apps/renderer/src/components/chat-sidebar.tsx b/apps/x/apps/renderer/src/components/chat-sidebar.tsx
index 6300f4cc..a7551757 100644
--- a/apps/x/apps/renderer/src/components/chat-sidebar.tsx
+++ b/apps/x/apps/renderer/src/components/chat-sidebar.tsx
@@ -1,21 +1,13 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { ArrowLeft, ArrowRight, Bug, MoreHorizontal } from 'lucide-react'
-import { toast } from 'sonner'
+import { Maximize2, Minimize2, SquarePen } from 'lucide-react'
 
 import { Button } from '@/components/ui/button'
 import { cn } from '@/lib/utils'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
-import { ChatHeader } from '@/components/chat-header'
-import { ChatEmptyState } from '@/components/chat-empty-state'
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu'
 import {
   Conversation,
   ConversationContent,
+  ConversationEmptyState,
   ConversationScrollButton,
 } from '@/components/ai-elements/conversation'
 import {
@@ -28,20 +20,19 @@ import { Tool, ToolContent, ToolGroupComponent, ToolHeader, ToolTabbedContent }
 import { WebSearchResult } from '@/components/ai-elements/web-search-result'
 import { ComposioConnectCard } from '@/components/ai-elements/composio-connect-card'
 import { PermissionRequest } from '@/components/ai-elements/permission-request'
-import { AutoPermissionDecision } from '@/components/ai-elements/auto-permission-decision'
 import { TerminalOutput } from '@/components/terminal-output'
 import { AskHumanRequest } from '@/components/ai-elements/ask-human-request'
+import { Suggestions } from '@/components/ai-elements/suggestions'
 import { type PromptInputMessage, type FileMention } from '@/components/ai-elements/prompt-input'
 import { FileCardProvider } from '@/contexts/file-card-context'
 import { MarkdownPreOverride } from '@/components/ai-elements/markdown-code-override'
 import { defaultRemarkPlugins } from 'streamdown'
 import remarkBreaks from 'remark-breaks'
-import { type ChatTab } from '@/components/tab-bar'
-import { ChatInputWithMentions, type PermissionMode, type StagedAttachment, type SelectedModel } from '@/components/chat-input-with-mentions'
+import { TabBar, type ChatTab } from '@/components/tab-bar'
+import { ChatInputWithMentions, type StagedAttachment, type SelectedModel } from '@/components/chat-input-with-mentions'
 import { ChatMessageAttachments } from '@/components/chat-message-attachments'
 import { useSidebar } from '@/components/ui/sidebar'
 import { wikiLabel } from '@/lib/wiki-links'
-import type { ChatPaneSize } from '@/contexts/theme-context'
 import {
   type ChatViewportAnchorState,
   type ChatTabViewState,
@@ -61,7 +52,6 @@ import {
   parseAttachedFiles,
   toToolState,
 } from '@/lib/chat-conversation'
-import { matchBillingError } from '@/lib/billing-error'
 
 const streamdownComponents = { pre: MarkdownPreOverride }
 
@@ -95,6 +85,60 @@ function AutoScrollPre({ className, children }: { className?: string; children:
   )
 }
 
+/* ─── Billing error helpers ─── */
+
+const BILLING_ERROR_PATTERNS = [
+  {
+    pattern: /upgrade required/i,
+    title: 'A subscription is required',
+    subtitle: 'Get started with a plan to access AI features in Rowboat.',
+    cta: 'Subscribe',
+  },
+  {
+    pattern: /not enough credits/i,
+    title: 'You\'ve run out of credits',
+    subtitle: 'Upgrade your plan for more credits, or wait for your billing cycle to reset.',
+    cta: 'Upgrade plan',
+  },
+  {
+    pattern: /subscription not active/i,
+    title: 'Your subscription is inactive',
+    subtitle: 'Reactivate your subscription to continue using AI features.',
+    cta: 'Reactivate',
+  },
+] as const
+
+function matchBillingError(message: string) {
+  return BILLING_ERROR_PATTERNS.find(({ pattern }) => pattern.test(message)) ?? null
+}
+
+interface BillingRowboatAccount {
+  config?: {
+    appUrl?: string | null
+  } | null
+}
+
+function BillingErrorCTA({ label }: { label: string }) {
+  const [appUrl, setAppUrl] = useState<string | null>(null)
+
+  useEffect(() => {
+    window.ipc.invoke('account:getRowboat', null)
+      .then((account: BillingRowboatAccount) => setAppUrl(account.config?.appUrl ?? null))
+      .catch(() => {})
+  }, [])
+
+  if (!appUrl) return null
+
+  return (
+    <button
+      onClick={() => window.open(`${appUrl}?intent=upgrade`)}
+      className="mt-1 rounded-md bg-amber-500/20 px-3 py-1.5 text-xs font-medium text-amber-100 transition-colors hover:bg-amber-500/30"
+    >
+      {label}
+    </button>
+  )
+}
+
 const MIN_WIDTH = 360
 const MAX_WIDTH = 1600
 const MIN_MAIN_PANE_WIDTH = 420
@@ -126,16 +170,13 @@ interface ChatSidebarProps {
   defaultWidth?: number
   isOpen?: boolean
   isMaximized?: boolean
-  placement?: 'middle' | 'right'
-  paneSize?: ChatPaneSize
-  className?: string
   chatTabs: ChatTab[]
   activeChatTabId: string
   getChatTabTitle: (tab: ChatTab) => string
+  isChatTabProcessing: (tab: ChatTab) => boolean
+  onSwitchChatTab: (tabId: string) => void
+  onCloseChatTab: (tabId: string) => void
   onNewChatTab: () => void
-  recentRuns?: { id: string; title?: string; createdAt: string }[]
-  onSelectRun?: (runId: string) => void
-  onOpenChatHistory?: () => void
   onOpenFullScreen?: () => void
   conversation: ConversationItem[]
   currentAssistantMessage: string
@@ -144,7 +185,7 @@ interface ChatSidebarProps {
   isProcessing: boolean
   isStopping?: boolean
   onStop?: () => void
-  onSubmit: (message: PromptInputMessage, mentions?: FileMention[], attachments?: StagedAttachment[], searchEnabled?: boolean, codeMode?: 'claude' | 'codex', permissionMode?: PermissionMode) => void
+  onSubmit: (message: PromptInputMessage, mentions?: FileMention[], attachments?: StagedAttachment[]) => void
   knowledgeFiles?: string[]
   recentFiles?: string[]
   visibleFiles?: string[]
@@ -154,12 +195,9 @@ interface ChatSidebarProps {
   getInitialDraft?: (tabId: string) => string | undefined
   onDraftChangeForTab?: (tabId: string, text: string) => void
   onSelectedModelChangeForTab?: (tabId: string, model: SelectedModel | null) => void
-  workDirByTab?: Record<string, string | null>
-  onWorkDirChangeForTab?: (tabId: string, value: string | null) => void
   pendingAskHumanRequests?: ChatTabViewState['pendingAskHumanRequests']
   allPermissionRequests?: ChatTabViewState['allPermissionRequests']
   permissionResponses?: ChatTabViewState['permissionResponses']
-  autoPermissionDecisions?: ChatTabViewState['autoPermissionDecisions']
   onPermissionResponse?: (toolCallId: string, subflow: string[], response: PermissionResponse, scope?: 'once' | 'session' | 'always') => void
   onAskHumanResponse?: (toolCallId: string, subflow: string[], response: string) => void
   isToolOpenForTab?: (tabId: string, toolId: string) => boolean
@@ -187,16 +225,13 @@ export function ChatSidebar({
   defaultWidth = DEFAULT_WIDTH,
   isOpen = true,
   isMaximized = false,
-  placement = 'right',
-  paneSize = 'chat-smaller',
-  className,
   chatTabs,
   activeChatTabId,
   getChatTabTitle,
+  isChatTabProcessing,
+  onSwitchChatTab,
+  onCloseChatTab,
   onNewChatTab,
-  recentRuns = [],
-  onSelectRun,
-  onOpenChatHistory,
   onOpenFullScreen,
   conversation,
   currentAssistantMessage,
@@ -215,12 +250,9 @@ export function ChatSidebar({
   getInitialDraft,
   onDraftChangeForTab,
   onSelectedModelChangeForTab,
-  workDirByTab = {},
-  onWorkDirChangeForTab,
   pendingAskHumanRequests = new Map(),
   allPermissionRequests = new Map(),
   permissionResponses = new Map(),
-  autoPermissionDecisions = new Map(),
   onPermissionResponse,
   onAskHumanResponse,
   isToolOpenForTab,
@@ -253,8 +285,6 @@ export function ChatSidebar({
   const startWidthRef = useRef(0)
   const prevIsMaximizedRef = useRef(isMaximized)
   const justToggledMaximize = prevIsMaximizedRef.current !== isMaximized
-  const isMiddlePlacement = placement === 'middle'
-  const isResizable = paneSize === 'chat-smaller'
 
   const getMaxAllowedWidth = useCallback(() => {
     if (typeof window === 'undefined') return MAX_WIDTH
@@ -315,9 +345,7 @@ export function ChatSidebar({
     setIsResizing(true)
 
     const handleMouseMove = (event: MouseEvent) => {
-      const delta = isMiddlePlacement
-        ? event.clientX - startXRef.current
-        : startXRef.current - event.clientX
+      const delta = startXRef.current - event.clientX
       const maxAllowedWidth = getMaxAllowedWidth()
       setWidth(clampPaneWidth(startWidthRef.current + delta, maxAllowedWidth))
     }
@@ -330,7 +358,7 @@ export function ChatSidebar({
 
     document.addEventListener('mousemove', handleMouseMove)
     document.addEventListener('mouseup', handleMouseUp)
-  }, [width, getMaxAllowedWidth, isMiddlePlacement])
+  }, [width, getMaxAllowedWidth])
 
   const activeTabState = useMemo<ChatTabViewState>(() => ({
     runId: runId ?? null,
@@ -339,7 +367,6 @@ export function ChatSidebar({
     pendingAskHumanRequests,
     allPermissionRequests,
     permissionResponses,
-    autoPermissionDecisions,
   }), [
     runId,
     conversation,
@@ -347,38 +374,15 @@ export function ChatSidebar({
     pendingAskHumanRequests,
     allPermissionRequests,
     permissionResponses,
-    autoPermissionDecisions,
   ])
   const emptyTabState = useMemo<ChatTabViewState>(() => createEmptyChatTabViewState(), [])
   const getTabState = useCallback((tabId: string): ChatTabViewState => {
     if (tabId === activeChatTabId) return activeTabState
     return chatTabStates[tabId] ?? emptyTabState
   }, [activeChatTabId, activeTabState, chatTabStates, emptyTabState])
-  const activeRunId = activeTabState.runId
-  const handleDownloadChatLog = useCallback(async () => {
-    if (!activeRunId) {
-      toast.error('No chat log available yet')
-      return
-    }
+  const hasConversation = activeTabState.conversation.length > 0 || Boolean(activeTabState.currentAssistantMessage)
 
-    try {
-      const result = await window.ipc.invoke('runs:downloadLog', { runId: activeRunId })
-      if (result.success) {
-        toast.success('Chat log saved')
-      } else if (result.error) {
-        toast.error(result.error)
-      }
-    } catch (err) {
-      console.error('Download chat log failed:', err)
-      toast.error('Failed to download chat log')
-    }
-  }, [activeRunId])
-
-  const renderConversationItem = (
-    item: ConversationItem,
-    tabId: string,
-    options?: { autoPermissionDetail?: { decision: 'allow'; reason: string } },
-  ) => {
+  const renderConversationItem = (item: ConversationItem, tabId: string) => {
     if (isChatMessage(item)) {
       if (item.role === 'user') {
         if (item.attachments && item.attachments.length > 0) {
@@ -471,7 +475,6 @@ export function ChatSidebar({
           key={item.id}
           open={isToolOpenForTab?.(tabId, item.id) ?? false}
           onOpenChange={(open) => onToolOpenChangeForTab?.(tabId, item.id, open)}
-          autoPermissionDetail={options?.autoPermissionDetail}
         >
           <ToolHeader title={toolTitle} type={`tool-${item.name}`} state={toToolState(item.status)} />
           <ToolContent>
@@ -488,8 +491,19 @@ export function ChatSidebar({
     }
 
     if (isErrorMessage(item)) {
-      if (matchBillingError(item.message)) {
-        return null
+      const billingError = matchBillingError(item.message)
+      if (billingError) {
+        return (
+          <Message key={item.id} from="assistant" data-message-id={item.id}>
+            <MessageContent className="rounded-lg border border-amber-500/30 bg-amber-500/10 px-4 py-3">
+              <div className="space-y-2">
+                <p className="text-sm font-medium text-amber-200">{billingError.title}</p>
+                <p className="text-xs text-amber-300/80">{billingError.subtitle}</p>
+                <BillingErrorCTA label={billingError.cta} />
+              </div>
+            </MessageContent>
+          </Message>
+        )
       }
       return (
         <Message key={item.id} from="assistant" data-message-id={item.id}>
@@ -512,11 +526,8 @@ export function ChatSidebar({
       // not add extra width to the right and overflow the app viewport.
       return { width: 0, flex: '1 1 auto' }
     }
-    if (paneSize === 'chat-equal' || paneSize === 'chat-bigger') {
-      return { width: 0, flex: '1 1 0' }
-    }
     return { width, flex: '0 0 auto' }
-  }, [isOpen, isMaximized, paneSize, width])
+  }, [isOpen, isMaximized, width])
 
   return (
     <div
@@ -525,19 +536,16 @@ export function ChatSidebar({
       onMouseDownCapture={onActivate}
       onFocusCapture={onActivate}
       className={cn(
-        'relative flex min-w-0 flex-col overflow-hidden bg-background',
-        isMiddlePlacement ? 'border-r border-border' : 'border-l border-border',
-        !isResizing && !justToggledMaximize && 'transition-[width] duration-200 ease-linear',
-        className
+        'relative flex min-w-0 flex-col overflow-hidden border-l border-border bg-background',
+        !isResizing && !justToggledMaximize && 'transition-[width] duration-200 ease-linear'
       )}
       style={paneStyle}
     >
-      {!isMaximized && isResizable && (
+      {!isMaximized && (
         <div
           onMouseDown={handleMouseDown}
           className={cn(
-            'absolute inset-y-0 z-20 w-4 cursor-col-resize',
-            isMiddlePlacement ? 'right-0 translate-x-1/2' : 'left-0 -translate-x-1/2',
+            'absolute inset-y-0 left-0 z-20 w-4 -translate-x-1/2 cursor-col-resize',
             'after:absolute after:inset-y-0 after:left-1/2 after:w-[2px] after:transition-colors',
             'hover:after:bg-sidebar-border',
             isResizing && 'after:bg-primary'
@@ -555,45 +563,28 @@ export function ChatSidebar({
               transition: isMaximized ? 'padding-left 200ms linear' : undefined,
             }}
           >
-            <ChatHeader
-              activeTitle={(() => {
-                const activeTab = chatTabs.find((tab) => tab.id === activeChatTabId)
-                return activeTab ? getChatTabTitle(activeTab) : 'New chat'
-              })()}
-              onNewChatTab={onNewChatTab}
-              recentRuns={recentRuns}
-              activeRunId={runId}
-              onSelectRun={onSelectRun}
-              onOpenChatHistory={onOpenChatHistory}
+            <TabBar
+              tabs={chatTabs}
+              activeTabId={activeChatTabId}
+              getTabTitle={getChatTabTitle}
+              getTabId={(tab) => tab.id}
+              isProcessing={isChatTabProcessing}
+              onSwitchTab={onSwitchChatTab}
+              onCloseTab={onCloseChatTab}
             />
-            <DropdownMenu>
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <DropdownMenuTrigger asChild>
-                    <Button
-                      variant="ghost"
-                      size="icon"
-                      className="titlebar-no-drag my-1 h-8 w-8 shrink-0 text-muted-foreground hover:text-foreground"
-                      aria-label="Chat options"
-                    >
-                      <MoreHorizontal className="size-5" />
-                    </Button>
-                  </DropdownMenuTrigger>
-                </TooltipTrigger>
-                <TooltipContent side="bottom">Chat options</TooltipContent>
-              </Tooltip>
-              <DropdownMenuContent align="end" className="min-w-48">
-                <DropdownMenuItem
-                  disabled={!activeRunId}
-                  onSelect={() => {
-                    void handleDownloadChatLog()
-                  }}
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <Button
+                  variant="ghost"
+                  size="icon"
+                  onClick={onNewChatTab}
+                  className="titlebar-no-drag my-1 h-8 w-8 shrink-0 text-muted-foreground hover:text-foreground"
                 >
-                  <Bug className="size-4" />
-                  Download chat log
-                </DropdownMenuItem>
-              </DropdownMenuContent>
-            </DropdownMenu>
+                  <SquarePen className="size-5" />
+                </Button>
+              </TooltipTrigger>
+              <TooltipContent side="bottom">New chat tab</TooltipContent>
+            </Tooltip>
             {onOpenFullScreen && (
               <Tooltip>
                 <TooltipTrigger asChild>
@@ -602,14 +593,14 @@ export function ChatSidebar({
                     size="icon"
                     onClick={onOpenFullScreen}
                     className="titlebar-no-drag my-1 mr-2 h-8 w-8 shrink-0 text-muted-foreground hover:text-foreground"
-                    aria-label={isMaximized ? 'Dock chat to side pane' : 'Expand chat'}
+                    aria-label={isMaximized ? 'Restore two-pane view' : 'Maximize chat view'}
                   >
-                    {isMaximized
-                      ? (isMiddlePlacement ? <ArrowLeft className="size-5" /> : <ArrowRight className="size-5" />)
-                      : (isMiddlePlacement ? <ArrowRight className="size-5" /> : <ArrowLeft className="size-5" />)}
+                    {isMaximized ? <Minimize2 className="size-5" /> : <Maximize2 className="size-5" />}
                   </Button>
                 </TooltipTrigger>
-                <TooltipContent side="bottom">{isMaximized ? 'Dock to side pane' : 'Expand chat'}</TooltipContent>
+                <TooltipContent side="bottom">
+                  {isMaximized ? 'Restore two-pane view' : 'Maximize chat view'}
+                </TooltipContent>
               </Tooltip>
             )}
           </header>
@@ -638,24 +629,16 @@ export function ChatSidebar({
                           anchorRequestKey={viewportAnchors[tab.id]?.requestKey}
                           className="relative flex-1"
                       >
-                        <ConversationContent className={cn(
-                          'mx-auto w-full max-w-4xl px-3',
-                          tabHasConversation ? 'pb-28' : 'pb-0',
-                          !tabHasConversation && isMaximized && 'min-h-full items-center justify-center',
-                        )}>
+                        <ConversationContent className={tabHasConversation ? 'mx-auto w-full max-w-4xl px-3 pb-28' : 'mx-auto w-full max-w-4xl min-h-full items-center justify-center px-3 pb-0'}>
                           {!tabHasConversation ? (
-                            <ChatEmptyState
-                              wide={isMaximized}
-                              recentRuns={recentRuns}
-                              onSelectRun={onSelectRun}
-                              onOpenChatHistory={onOpenChatHistory}
-                              onPickPrompt={setLocalPresetMessage}
-                            />
+                            <ConversationEmptyState className="h-auto">
+                              <div className="text-sm text-muted-foreground">Ask anything...</div>
+                            </ConversationEmptyState>
                           ) : (
                             <>
                               {groupConversationItems(
                                 tabState.conversation,
-                                (id) => !!tabState.allPermissionRequests.get(id) || !!tabState.autoPermissionDecisions.get(id)
+                                (id) => !!tabState.allPermissionRequests.get(id)
                               ).map((item) => {
                                 if (isToolGroup(item)) {
                                   return (
@@ -667,44 +650,23 @@ export function ChatSidebar({
                                     />
                                   )
                                 }
-                                const autoDecision = isToolCall(item)
-                                  ? tabState.autoPermissionDecisions.get(item.id)
-                                  : undefined
-                                const rendered = renderConversationItem(
-                                  item,
-                                  tab.id,
-                                  autoDecision?.decision === 'allow'
-                                    ? { autoPermissionDetail: { decision: 'allow', reason: autoDecision.reason } }
-                                    : undefined,
-                                )
-                                if (isToolCall(item)) {
-                                  const deniedAutoDecision = autoDecision?.decision === 'deny' ? autoDecision : null
+                                const rendered = renderConversationItem(item, tab.id)
+                                if (isToolCall(item) && onPermissionResponse) {
                                   const permRequest = tabState.allPermissionRequests.get(item.id)
-                                  if (deniedAutoDecision || (permRequest && onPermissionResponse)) {
+                                  if (permRequest) {
                                     const response = tabState.permissionResponses.get(item.id) || null
                                     return (
                                       <React.Fragment key={item.id}>
-                                        {deniedAutoDecision && (
-                                          <AutoPermissionDecision
-                                            toolCall={deniedAutoDecision.toolCall}
-                                            permission={deniedAutoDecision.permission}
-                                            decision={deniedAutoDecision.decision}
-                                            reason={deniedAutoDecision.reason}
-                                          />
-                                        )}
-                                        {permRequest && onPermissionResponse && (
-                                          <PermissionRequest
-                                            toolCall={permRequest.toolCall}
-                                            permission={permRequest.permission}
-                                            onApprove={() => onPermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'approve')}
-                                            onApproveSession={() => onPermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'approve', 'session')}
-                                            onApproveAlways={() => onPermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'approve', 'always')}
-                                            onDeny={() => onPermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'deny')}
-                                            isProcessing={isActive && isProcessing}
-                                            response={response}
-                                          />
-                                        )}
                                         {rendered}
+                                        <PermissionRequest
+                                          toolCall={permRequest.toolCall}
+                                          onApprove={() => onPermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'approve')}
+                                          onApproveSession={() => onPermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'approve', 'session')}
+                                          onApproveAlways={() => onPermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'approve', 'always')}
+                                          onDeny={() => onPermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'deny')}
+                                          isProcessing={isActive && isProcessing}
+                                          response={response}
+                                        />
                                       </React.Fragment>
                                     )
                                   }
@@ -749,6 +711,9 @@ export function ChatSidebar({
               <div className="sticky bottom-0 z-10 bg-background pb-12 pt-0 shadow-lg">
                 <div className="pointer-events-none absolute inset-x-0 -top-6 h-6 bg-linear-to-t from-background to-transparent" />
                 <div className="mx-auto w-full max-w-4xl px-3">
+                  {!hasConversation && (
+                    <Suggestions onSelect={setLocalPresetMessage} className="mb-3 justify-center" />
+                  )}
                   {chatTabs.map((tab) => {
                     const isActive = tab.id === activeChatTabId
                     const tabState = getTabState(tab.id)
@@ -777,8 +742,6 @@ export function ChatSidebar({
                           initialDraft={getInitialDraft?.(tab.id)}
                           onDraftChange={onDraftChangeForTab ? (text) => onDraftChangeForTab(tab.id, text) : undefined}
                           onSelectedModelChange={onSelectedModelChangeForTab ? (m) => onSelectedModelChangeForTab(tab.id, m) : undefined}
-                          workDir={workDirByTab[tab.id] ?? null}
-                          onWorkDirChange={onWorkDirChangeForTab ? (v) => onWorkDirChangeForTab(tab.id, v) : undefined}
                           isRecording={isActive && isRecording}
                           recordingText={isActive ? recordingText : undefined}
                           recordingState={isActive ? recordingState : undefined}
diff --git a/apps/x/apps/renderer/src/components/coding-run.tsx b/apps/x/apps/renderer/src/components/coding-run.tsx
deleted file mode 100644
index 4d5dd33b..00000000
--- a/apps/x/apps/renderer/src/components/coding-run.tsx
+++ /dev/null
@@ -1,253 +0,0 @@
-import { useMemo, useState } from 'react'
-import {
-  CheckCircle2,
-  Circle,
-  CircleDot,
-  Eye,
-  FileText,
-  Loader,
-  Pencil,
-  Search,
-  ShieldQuestion,
-  Terminal,
-  Trash2,
-  Wrench,
-} from 'lucide-react'
-import type { CodeRunEvent, PermissionAsk, PermissionDecision } from '@x/shared/src/code-mode.js'
-import { cn } from '@/lib/utils'
-import { Tool, ToolContent, ToolHeader } from '@/components/ai-elements/tool'
-import { toToolState, type ToolCall } from '@/lib/chat-conversation'
-
-// ── Timeline reduction ──────────────────────────────────────────────
-// The raw ACP stream is a flat list of events; collapse it into ordered rows,
-// folding tool_call + tool_call_update (by id) and the latest plan in place.
-
-type TextRow = { kind: 'text'; id: string; text: string }
-type ToolRow = { kind: 'tool'; id: string; title?: string; toolKind?: string; status?: string; diffs: string[] }
-type PlanRow = { kind: 'plan'; id: string; entries: { content: string; status?: string }[] }
-type PermRow = { kind: 'perm'; id: string; title: string; decision: string }
-type Row = TextRow | ToolRow | PlanRow | PermRow
-
-function reduceEvents(events: CodeRunEvent[]): Row[] {
-  const rows: Row[] = []
-  const toolIdx = new Map<string, number>()
-  let planIdx = -1
-
-  events.forEach((e, i) => {
-    switch (e.type) {
-      case 'message': {
-        if (e.role !== 'agent' || !e.text) return
-        const last = rows[rows.length - 1]
-        if (last && last.kind === 'text') last.text += e.text
-        else rows.push({ kind: 'text', id: `t${i}`, text: e.text })
-        break
-      }
-      case 'tool_call': {
-        const id = e.id ?? `tc${i}`
-        const at = toolIdx.get(id)
-        if (at != null) {
-          const r = rows[at] as ToolRow
-          r.title = e.title ?? r.title
-          r.toolKind = e.kind ?? r.toolKind
-          r.status = e.status ?? r.status
-        } else {
-          toolIdx.set(id, rows.length)
-          rows.push({ kind: 'tool', id, title: e.title, toolKind: e.kind, status: e.status, diffs: [] })
-        }
-        break
-      }
-      case 'tool_call_update': {
-        const id = e.id ?? `tu${i}`
-        let at = toolIdx.get(id)
-        if (at == null) {
-          at = rows.length
-          toolIdx.set(id, at)
-          rows.push({ kind: 'tool', id, diffs: [] })
-        }
-        const r = rows[at] as ToolRow
-        if (e.status) r.status = e.status
-        for (const d of e.diffs) if (!r.diffs.includes(d)) r.diffs.push(d)
-        break
-      }
-      case 'plan': {
-        if (planIdx >= 0) (rows[planIdx] as PlanRow).entries = e.entries
-        else {
-          planIdx = rows.length
-          rows.push({ kind: 'plan', id: 'plan', entries: e.entries })
-        }
-        break
-      }
-      case 'permission':
-        rows.push({ kind: 'perm', id: `p${i}`, title: e.ask.title, decision: e.decision })
-        break
-      default:
-        break
-    }
-  })
-  return rows
-}
-
-function toolKindIcon(kind?: string) {
-  switch (kind) {
-    case 'read': return <Eye className="size-3.5 shrink-0 text-muted-foreground" />
-    case 'edit': return <Pencil className="size-3.5 shrink-0 text-muted-foreground" />
-    case 'delete': return <Trash2 className="size-3.5 shrink-0 text-muted-foreground" />
-    case 'search': return <Search className="size-3.5 shrink-0 text-muted-foreground" />
-    case 'execute': return <Terminal className="size-3.5 shrink-0 text-muted-foreground" />
-    case 'fetch': return <FileText className="size-3.5 shrink-0 text-muted-foreground" />
-    default: return <Wrench className="size-3.5 shrink-0 text-muted-foreground" />
-  }
-}
-
-function planMarker(status?: string) {
-  if (status === 'completed') return <CheckCircle2 className="size-3.5 shrink-0 text-green-600" />
-  if (status === 'in_progress') return <CircleDot className="size-3.5 shrink-0 text-blue-500" />
-  return <Circle className="size-3.5 shrink-0 text-muted-foreground" />
-}
-
-const basename = (p: string) => p.split(/[\\/]/).pop() || p
-
-function CodingRunTimeline({ events }: { events: CodeRunEvent[] }) {
-  const rows = useMemo(() => reduceEvents(events), [events])
-  if (rows.length === 0) {
-    return <div className="px-4 py-3 text-xs text-muted-foreground">Starting the agent…</div>
-  }
-  return (
-    <div className="flex flex-col gap-2 px-4 py-3">
-      {rows.map((row) => {
-        if (row.kind === 'text') {
-          return (
-            <p key={row.id} className="whitespace-pre-wrap text-sm leading-relaxed text-foreground/90">
-              {row.text}
-            </p>
-          )
-        }
-        if (row.kind === 'tool') {
-          const running = row.status !== 'completed' && row.status !== 'failed'
-          return (
-            <div key={row.id} className="flex flex-col gap-1">
-              <div className="flex items-center gap-2 text-sm">
-                {running
-                  ? <Loader className="size-3.5 shrink-0 animate-spin text-muted-foreground" />
-                  : <CheckCircle2 className="size-3.5 shrink-0 text-green-600" />}
-                {toolKindIcon(row.toolKind)}
-                <span className="truncate text-foreground/90">{row.title ?? row.toolKind ?? 'Tool call'}</span>
-              </div>
-              {row.diffs.length > 0 && (
-                <div className="ml-7 flex flex-col gap-0.5">
-                  {row.diffs.map((d) => (
-                    <span key={d} className="truncate font-mono text-xs text-muted-foreground" title={d}>
-                      {basename(d)}
-                    </span>
-                  ))}
-                </div>
-              )}
-            </div>
-          )
-        }
-        if (row.kind === 'plan') {
-          return (
-            <div key={row.id} className="flex flex-col gap-1 rounded-lg border bg-muted/30 p-2">
-              {row.entries.map((entry, idx) => (
-                <div key={idx} className="flex items-center gap-2 text-sm text-foreground/90">
-                  {planMarker(entry.status)}
-                  <span className={cn('truncate', entry.status === 'completed' && 'text-muted-foreground line-through')}>
-                    {entry.content}
-                  </span>
-                </div>
-              ))}
-            </div>
-          )
-        }
-        // resolved permission
-        const denied = row.decision === 'reject' || row.decision === 'cancelled'
-        return (
-          <div key={row.id} className={cn('flex items-center gap-2 text-xs', denied ? 'text-red-600' : 'text-green-600')}>
-            {denied ? '✕' : '✓'}
-            <span className="truncate">{denied ? 'Denied' : 'Allowed'}: {row.title}</span>
-          </div>
-        )
-      })}
-    </div>
-  )
-}
-
-// ── In-run permission card ──────────────────────────────────────────
-
-export function CodeRunPermissionRequest({
-  ask,
-  onDecide,
-}: {
-  ask: PermissionAsk
-  onDecide: (decision: PermissionDecision) => void
-}) {
-  const [busy, setBusy] = useState(false)
-  const decide = (d: PermissionDecision) => {
-    if (busy) return
-    setBusy(true)
-    onDecide(d)
-  }
-  const btn = 'rounded-full px-3 py-1.5 text-xs font-medium transition-colors disabled:opacity-50'
-  return (
-    <div className="mb-4 rounded-[20px] border border-amber-500/40 bg-amber-500/5 p-4">
-      <div className="flex items-center gap-2 text-sm font-medium text-foreground">
-        <ShieldQuestion className="size-4 shrink-0 text-amber-600" />
-        Permission needed
-      </div>
-      <p className="mt-1 text-sm text-muted-foreground">
-        The agent wants to: <span className="font-medium text-foreground">{ask.title}</span>
-      </p>
-      <div className="mt-3 flex flex-wrap gap-2">
-        <button type="button" disabled={busy} onClick={() => decide('allow_once')}
-          className={cn(btn, 'bg-foreground text-background hover:bg-foreground/90')}>
-          Allow
-        </button>
-        <button type="button" disabled={busy} onClick={() => decide('allow_always')}
-          className={cn(btn, 'border hover:bg-muted')}>
-          Always allow{ask.kind ? ` (${ask.kind})` : ''}
-        </button>
-        <button type="button" disabled={busy} onClick={() => decide('reject')}
-          className={cn(btn, 'border border-red-500/40 text-red-600 hover:bg-red-500/10')}>
-          Deny
-        </button>
-      </div>
-    </div>
-  )
-}
-
-// ── Block wrapper (rendered in the chat for a code_agent_run tool call) ──
-
-const AGENT_LABEL: Record<string, string> = { claude: 'Claude Code', codex: 'Codex' }
-
-export function CodingRunBlock({
-  item,
-  open,
-  onOpenChange,
-  onPermissionDecision,
-}: {
-  item: ToolCall
-  open: boolean
-  onOpenChange: (open: boolean) => void
-  onPermissionDecision: (decision: PermissionDecision) => void
-}) {
-  // Prefer the agent the backend actually ran (the chip) once the run returns; fall
-  // back to the requested input agent while it's still in flight. Never trust only the
-  // model's input — it can pass a stale agent the backend overrode with the chip.
-  const agent =
-    (item.result as { agent?: string } | undefined)?.agent ??
-    (item.input as { agent?: string } | undefined)?.agent
-  const title = AGENT_LABEL[agent ?? ''] ?? 'Coding agent'
-  return (
-    <>
-      <Tool open={open} onOpenChange={onOpenChange}>
-        <ToolHeader title={title} type="tool-code_agent_run" state={toToolState(item.status)} />
-        <ToolContent>
-          <CodingRunTimeline events={item.codeRunEvents ?? []} />
-        </ToolContent>
-      </Tool>
-      {item.pendingCodePermission && (
-        <CodeRunPermissionRequest ask={item.pendingCodePermission.ask} onDecide={onPermissionDecision} />
-      )}
-    </>
-  )
-}
diff --git a/apps/x/apps/renderer/src/components/compact-conversation.tsx b/apps/x/apps/renderer/src/components/compact-conversation.tsx
deleted file mode 100644
index f1367d5f..00000000
--- a/apps/x/apps/renderer/src/components/compact-conversation.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import { useState } from 'react'
-import { Streamdown } from 'streamdown'
-import {
-    type ConversationItem,
-    type ToolCall,
-    isChatMessage,
-    isErrorMessage,
-    isToolCall,
-    getToolDisplayName,
-    toToolState,
-    normalizeToolOutput,
-} from '@/lib/chat-conversation'
-import { Tool, ToolHeader, ToolContent, ToolTabbedContent } from '@/components/ai-elements/tool'
-
-/**
- * Compact rendering of a run's conversation log — used by the live-note panel's
- * "Last run" tab and the bg-task sidebar's "Runs history" drill-down. Keep this
- * the single source of truth so the two surfaces stay visually aligned.
- *
- * - User messages: right-aligned secondary bubble, plain text.
- * - Assistant messages: full-width markdown.
- * - Tool calls: collapsible `Tool` row with tabbed input/output.
- * - Errors: destructive-tinted banner.
- */
-export function CompactConversation({ items }: { items: ConversationItem[] }) {
-    return (
-        <div className="flex flex-col gap-2.5">
-            {items.map((item) => {
-                if (isErrorMessage(item)) {
-                    return (
-                        <div key={item.id} className="rounded-md border border-destructive/30 bg-destructive/10 px-3 py-2 text-xs text-destructive">
-                            {item.message}
-                        </div>
-                    )
-                }
-                if (isToolCall(item)) return <CompactToolRow key={item.id} tool={item} />
-                if (isChatMessage(item)) {
-                    const isUser = item.role === 'user'
-                    return (
-                        <div key={item.id} className={isUser ? 'flex justify-end' : ''}>
-                            <div className={isUser
-                                ? 'max-w-[85%] rounded-lg bg-secondary px-3 py-2 text-xs text-foreground whitespace-pre-wrap break-words'
-                                : 'w-full text-xs text-foreground'}>
-                                {isUser ? (
-                                    item.content
-                                ) : (
-                                    <Streamdown className="prose prose-sm dark:prose-invert max-w-none [&>*:first-child]:mt-0 [&>*:last-child]:mb-0 [&_p]:my-1.5 [&_ul]:my-1.5 [&_ol]:my-1.5 [&_pre]:my-2 [&_pre]:text-[11px] [&_code]:text-[11px]">
-                                        {item.content}
-                                    </Streamdown>
-                                )}
-                            </div>
-                        </div>
-                    )
-                }
-                return null
-            })}
-        </div>
-    )
-}
-
-function CompactToolRow({ tool }: { tool: ToolCall }) {
-    const [open, setOpen] = useState(false)
-    const title = getToolDisplayName(tool)
-    const state = toToolState(tool.status)
-    const errorText = tool.status === 'error' && typeof tool.result === 'string' ? tool.result : undefined
-    return (
-        <Tool open={open} onOpenChange={setOpen} className="mb-0 text-xs">
-            <ToolHeader title={title} type={`tool-${tool.name}` as `tool-${string}`} state={state} />
-            <ToolContent>
-                <ToolTabbedContent
-                    input={tool.input}
-                    output={normalizeToolOutput(tool.result, tool.status) ?? undefined}
-                    errorText={errorText}
-                />
-            </ToolContent>
-        </Tool>
-    )
-}
diff --git a/apps/x/apps/renderer/src/components/docx-file-viewer.tsx b/apps/x/apps/renderer/src/components/docx-file-viewer.tsx
deleted file mode 100644
index 415ae4a0..00000000
--- a/apps/x/apps/renderer/src/components/docx-file-viewer.tsx
+++ /dev/null
@@ -1,196 +0,0 @@
-import { Suspense, lazy, useEffect, useRef, useState } from 'react'
-import { ExternalLinkIcon, FileTextIcon, Loader2Icon } from 'lucide-react'
-import type { DocxEditorRef } from '@eigenpal/docx-editor-react'
-
-// The editor (and its CSS) is heavy and only needed when a .docx is open, so it
-// loads in its own chunk the first time a Word document is viewed.
-const LazyDocxEditor = lazy(async () => {
-  const [mod] = await Promise.all([
-    import('@eigenpal/docx-editor-react'),
-    import('@eigenpal/docx-editor-react/styles.css'),
-  ])
-  return { default: mod.DocxEditor }
-})
-
-interface DocxFileViewerProps {
-  path: string
-}
-
-type LoadState = 'loading' | 'ready' | 'error'
-type SaveState = 'idle' | 'saving' | 'saved' | 'error'
-
-const SAVE_DEBOUNCE_MS = 800
-// onChange fires for the editor's own load-time normalization. Ignore changes
-// until shortly after the document settles so opening a file never rewrites it.
-const ARM_DELAY_MS = 500
-
-function base64ToArrayBuffer(base64: string): ArrayBuffer {
-  const binary = atob(base64)
-  const len = binary.length
-  const bytes = new Uint8Array(len)
-  for (let i = 0; i < len; i++) bytes[i] = binary.charCodeAt(i)
-  return bytes.buffer
-}
-
-function arrayBufferToBase64(buffer: ArrayBuffer): string {
-  const bytes = new Uint8Array(buffer)
-  let binary = ''
-  const chunk = 0x8000
-  for (let i = 0; i < bytes.length; i += chunk) {
-    binary += String.fromCharCode(...bytes.subarray(i, i + chunk))
-  }
-  return btoa(binary)
-}
-
-function baseName(path: string): string {
-  const segs = path.split('/')
-  return segs[segs.length - 1] || path
-}
-
-export function DocxFileViewer({ path }: DocxFileViewerProps) {
-  const [loadState, setLoadState] = useState<LoadState>('loading')
-  const [buffer, setBuffer] = useState<ArrayBuffer | null>(null)
-  const [saveState, setSaveState] = useState<SaveState>('idle')
-
-  const editorRef = useRef<DocxEditorRef>(null)
-  const saveTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
-  const armTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
-  const armedRef = useRef(false)
-  const dirtyRef = useRef(false)
-  const savingRef = useRef(false)
-
-  // Load the .docx bytes whenever the path changes.
-  useEffect(() => {
-    let cancelled = false
-    setLoadState('loading')
-    setBuffer(null)
-    setSaveState('idle')
-    armedRef.current = false
-    dirtyRef.current = false
-    savingRef.current = false
-
-    ;(async () => {
-      try {
-        const result = await window.ipc.invoke('workspace:readFile', { path, encoding: 'base64' })
-        if (cancelled) return
-        setBuffer(base64ToArrayBuffer(result.data))
-        setLoadState('ready')
-        if (armTimerRef.current) clearTimeout(armTimerRef.current)
-        armTimerRef.current = setTimeout(() => { armedRef.current = true }, ARM_DELAY_MS)
-      } catch (err) {
-        console.error('Failed to load docx:', err)
-        if (!cancelled) setLoadState('error')
-      }
-    })()
-
-    return () => {
-      cancelled = true
-      if (armTimerRef.current) clearTimeout(armTimerRef.current)
-    }
-  }, [path])
-
-  // Serialize the current document and write it back to disk.
-  const persist = async () => {
-    const editor = editorRef.current
-    if (!editor || savingRef.current) return
-    savingRef.current = true
-    dirtyRef.current = false
-    setSaveState('saving')
-    try {
-      const out = await editor.save()
-      if (out) {
-        await window.ipc.invoke('workspace:writeFile', {
-          path,
-          data: arrayBufferToBase64(out),
-          opts: { encoding: 'base64' },
-        })
-      }
-      setSaveState('saved')
-    } catch (err) {
-      console.error('Failed to save docx:', err)
-      dirtyRef.current = true
-      setSaveState('error')
-    } finally {
-      savingRef.current = false
-      // A change landed while we were saving — flush it.
-      if (dirtyRef.current) scheduleSave()
-    }
-  }
-
-  const scheduleSave = () => {
-    if (saveTimerRef.current) clearTimeout(saveTimerRef.current)
-    saveTimerRef.current = setTimeout(() => { void persist() }, SAVE_DEBOUNCE_MS)
-  }
-
-  const handleChange = () => {
-    if (!armedRef.current) return
-    dirtyRef.current = true
-    scheduleSave()
-  }
-
-  // Flush a pending save when navigating away or unmounting.
-  useEffect(() => {
-    return () => {
-      if (saveTimerRef.current) clearTimeout(saveTimerRef.current)
-      if (dirtyRef.current) void persist()
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [path])
-
-  if (loadState === 'error') {
-    return (
-      <div className="flex h-full w-full flex-col items-center justify-center gap-3 px-6 text-center text-muted-foreground">
-        <FileTextIcon className="size-6" />
-        <p className="text-sm font-medium text-foreground">Cannot open this document</p>
-        <p className="max-w-md text-xs">The file may be corrupted or not a valid Word document.</p>
-        <button
-          type="button"
-          onClick={() => { void window.ipc.invoke('shell:openPath', { path }) }}
-          className="inline-flex items-center gap-1.5 rounded-md border border-border bg-background px-3 py-1.5 text-xs font-medium text-foreground hover:bg-accent"
-        >
-          <ExternalLinkIcon className="size-3.5" />
-          Open in system
-        </button>
-      </div>
-    )
-  }
-
-  if (loadState === 'loading' || !buffer) {
-    return (
-      <div className="flex h-full w-full flex-col items-center justify-center gap-3 text-muted-foreground">
-        <Loader2Icon className="size-6 animate-spin" />
-        <p className="text-sm">Loading document…</p>
-      </div>
-    )
-  }
-
-  return (
-    <div className="relative flex h-full w-full flex-col overflow-hidden">
-      <Suspense
-        fallback={
-          <div className="flex h-full w-full flex-col items-center justify-center gap-3 text-muted-foreground">
-            <Loader2Icon className="size-6 animate-spin" />
-            <p className="text-sm">Loading editor…</p>
-          </div>
-        }
-      >
-        <LazyDocxEditor
-          key={path}
-          ref={editorRef}
-          documentBuffer={buffer}
-          mode="editing"
-          documentName={baseName(path)}
-          documentNameEditable={false}
-          onChange={handleChange}
-          onError={(err) => { console.error('docx editor error:', err) }}
-          className="flex-1 min-h-0"
-        />
-      </Suspense>
-      {saveState !== 'idle' && (
-        <div className="pointer-events-none absolute bottom-3 right-4 z-10 rounded-md bg-background/80 px-2 py-1 text-xs text-muted-foreground shadow-sm backdrop-blur">
-          {saveState === 'saving' ? 'Saving…' : saveState === 'saved' ? 'Saved' : 'Save failed'}
-        </div>
-      )}
-    </div>
-  )
-}
diff --git a/apps/x/apps/renderer/src/components/email-view.tsx b/apps/x/apps/renderer/src/components/email-view.tsx
deleted file mode 100644
index dea0561e..00000000
--- a/apps/x/apps/renderer/src/components/email-view.tsx
+++ /dev/null
@@ -1,1673 +0,0 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { Archive, Bold, CheckCheck, Forward, Italic, Link as LinkIcon, List, ListOrdered, LoaderIcon, Mail, Paperclip, Quote, RefreshCw, Reply, ReplyAll, Search, Send, Sparkles, Strikethrough, Trash2 } from 'lucide-react'
-import { useEditor, EditorContent, type Editor } from '@tiptap/react'
-import StarterKit from '@tiptap/starter-kit'
-import Link from '@tiptap/extension-link'
-import Placeholder from '@tiptap/extension-placeholder'
-import type { blocks } from '@x/shared'
-import { cn } from '@/lib/utils'
-import { toast } from '@/lib/toast'
-import { useTheme } from '@/contexts/theme-context'
-import { SettingsDialog } from '@/components/settings-dialog'
-
-type GmailThread = blocks.GmailThread
-type GmailThreadMessage = blocks.GmailThreadMessage
-type GmailConnectionStatus = {
-  connected: boolean
-  hasRequiredScope: boolean
-  missingScopes: string[]
-  email: string | null
-}
-
-function formatInboxTime(value?: string): string {
-  if (!value) return ''
-  const date = new Date(value)
-  if (Number.isNaN(date.getTime())) return value
-  const now = new Date()
-  const diffMs = now.getTime() - date.getTime()
-  const diffMin = Math.round(diffMs / 60000)
-  if (diffMin < 1) return 'now'
-  if (diffMin < 60) return `${diffMin}m`
-  const sameDay = date.toDateString() === now.toDateString()
-  if (sameDay) return `${Math.round(diffMin / 60)}h`
-  const yesterday = new Date(now)
-  yesterday.setDate(now.getDate() - 1)
-  if (date.toDateString() === yesterday.toDateString()) return 'Yest'
-  if (diffMs < 7 * 24 * 60 * 60 * 1000) return date.toLocaleDateString([], { weekday: 'short' })
-  if (date.getFullYear() === now.getFullYear()) return date.toLocaleDateString([], { month: 'short', day: 'numeric' })
-  return date.toLocaleDateString([], { month: 'short', day: 'numeric', year: '2-digit' })
-}
-
-function formatFullDate(value?: string): string {
-  if (!value) return ''
-  const date = new Date(value)
-  if (Number.isNaN(date.getTime())) return value
-  return date.toLocaleString([], {
-    weekday: 'short',
-    month: 'short',
-    day: 'numeric',
-    year: 'numeric',
-    hour: 'numeric',
-    minute: '2-digit',
-  })
-}
-
-function extractName(from?: string): string {
-  if (!from) return 'Unknown'
-  const match = from.match(/^([^<]+)</)
-  if (match?.[1]) return match[1].replace(/^["']|["']$/g, '').trim()
-  const address = from.match(/<?([^<>\s]+@[^<>\s]+)>?/)?.[1] ?? from
-  return address.replace(/@.*/, '').replace(/[._+]/g, ' ').replace(/\b\w/g, c => c.toUpperCase())
-}
-
-function extractAddress(from?: string): string {
-  if (!from) return ''
-  return from.match(/<([^>]+)>/)?.[1] ?? from
-}
-
-function snippet(text?: string): string {
-  return (text || '').replace(/\s+/g, ' ').trim().slice(0, 180)
-}
-
-function isReplyQuoteBoundary(lines: string[], index: number): boolean {
-  const line = lines[index]?.trim() || ''
-  if (/^On\b.+\bwrote:\s*$/i.test(line)) return true
-  if (/^-{2,}\s*(Original Message|Forwarded message)\s*-{2,}$/i.test(line)) return true
-  if (/^From:\s+\S/i.test(line)) {
-    const next = lines.slice(index + 1, index + 6).map((value) => value.trim())
-    return next.some((value) => /^(Sent|Date):\s+\S/i.test(value))
-      && next.some((value) => /^To:\s+\S/i.test(value))
-      && next.some((value) => /^Subject:\s+\S/i.test(value))
-  }
-  return false
-}
-
-function stripQuotedReplyText(text: string): string {
-  const lines = text.replace(/\r\n/g, '\n').replace(/\r/g, '\n').split('\n')
-  const boundary = lines.findIndex((line, index) => {
-    if (isReplyQuoteBoundary(lines, index)) return true
-    return index > 0
-      && line.trim().startsWith('>')
-      && (lines[index - 1]?.trim() === '' || lines[index - 1]?.trim().startsWith('>'))
-  })
-  const visible = boundary >= 0 ? lines.slice(0, boundary) : lines
-  return visible.join('\n').replace(/[ \t]+\n/g, '\n').replace(/\n{3,}/g, '\n\n').trim()
-}
-
-function getInitial(from?: string): string {
-  return (extractName(from)[0] || '?').toUpperCase()
-}
-
-const AVATAR_COLORS = ['#1a73e8', '#e8453c', '#34a853', '#8430ce', '#f29900', '#00796b', '#c62828', '#1565c0']
-
-function avatarColor(from?: string): string {
-  const value = from || 'unknown'
-  let hash = 0
-  for (let i = 0; i < value.length; i += 1) hash = (hash * 31 + value.charCodeAt(i)) >>> 0
-  return AVATAR_COLORS[hash % AVATAR_COLORS.length]
-}
-
-function latestMessage(thread: GmailThread): GmailThreadMessage | undefined {
-  return thread.messages[thread.messages.length - 1]
-}
-
-// Split a raw header recipient string (e.g. `"Jo Bloggs" <jo@x.com>, b@y.com`) into
-// individual address tokens, respecting commas inside quotes/angle brackets.
-function splitAddresses(raw?: string): string[] {
-  if (!raw) return []
-  const tokens: string[] = []
-  let buf = ''
-  let inQuote = false
-  let depth = 0
-  for (const ch of raw) {
-    if (ch === '"') inQuote = !inQuote
-    else if (ch === '<') depth += 1
-    else if (ch === '>') depth = Math.max(0, depth - 1)
-    if ((ch === ',' || ch === ';' || ch === '\n') && !inQuote && depth === 0) {
-      const token = buf.trim()
-      if (token) tokens.push(token)
-      buf = ''
-      continue
-    }
-    buf += ch
-  }
-  const last = buf.trim()
-  if (last) tokens.push(last)
-  return tokens
-}
-
-// Display label for a recipient chip: the display name if present, else the bare address.
-function recipientLabel(token: string): string {
-  const named = token.match(/^\s*"?([^"<]+?)"?\s*<[^>]+>\s*$/)
-  if (named?.[1]?.trim()) return named[1].trim()
-  return extractAddress(token)
-}
-
-// Dedupe tokens by lowercased email address, dropping any whose address is in `exclude`.
-function dedupeRecipients(tokens: string[], exclude: Set<string>): string[] {
-  const seen = new Set<string>(exclude)
-  const out: string[] = []
-  for (const token of tokens) {
-    const addr = extractAddress(token).toLowerCase()
-    if (!addr || seen.has(addr)) continue
-    seen.add(addr)
-    out.push(token)
-  }
-  return out
-}
-
-// Compute the To / Cc recipients for a reply, reply-all, or forward, excluding "me".
-function buildRecipients(
-  mode: ComposeMode,
-  thread: GmailThread,
-  selfEmail: string,
-): { to: string[]; cc: string[] } {
-  if (mode === 'forward') return { to: [], cc: [] }
-
-  const latest = latestMessage(thread)
-  const self = selfEmail.toLowerCase()
-  const fromAddr = latest?.from ? extractAddress(latest.from).toLowerCase() : ''
-  const iAmSender = Boolean(self) && fromAddr === self
-
-  // If my own message is the latest, reply to whoever I sent it to; otherwise reply to the sender.
-  const rawTo = iAmSender ? splitAddresses(latest?.to) : (latest?.from ? [latest.from] : [])
-  const ccPool = iAmSender
-    ? splitAddresses(latest?.cc)
-    : [...splitAddresses(latest?.to), ...splitAddresses(latest?.cc)]
-
-  const selfSet = new Set<string>(self ? [self] : [])
-  const to = dedupeRecipients(rawTo, selfSet)
-  if (iAmSender && to.length === 0 && self && rawTo.some((token) => extractAddress(token).toLowerCase() === self)) {
-    to.push(self)
-  }
-
-  if (mode === 'reply') return { to, cc: [] }
-
-  const ccExclude = new Set<string>(selfSet)
-  for (const token of to) ccExclude.add(extractAddress(token).toLowerCase())
-  const cc = dedupeRecipients(ccPool, ccExclude)
-  return { to, cc }
-}
-
-// Subject line for a reply ("Re: …") or forward ("Fwd: …"), avoiding double prefixes.
-function composeSubject(mode: ComposeMode, rawSubject?: string): string {
-  const raw = (rawSubject || '').trim()
-  if (mode === 'forward') return /^fwd:/i.test(raw) ? raw : `Fwd: ${raw}`.trim()
-  return /^re:/i.test(raw) ? raw : `Re: ${raw}`.trim()
-}
-
-function buildForwardedContent(thread: GmailThread): string {
-  const message = latestMessage(thread)
-  if (!message) return ''
-  const rows = [
-    '---------- Forwarded message ---------',
-    message.from ? `From: ${message.from}` : null,
-    message.date ? `Date: ${formatFullDate(message.date)}` : null,
-    message.subject || thread.subject ? `Subject: ${message.subject || thread.subject}` : null,
-    message.to ? `To: ${message.to}` : null,
-    message.cc ? `Cc: ${message.cc}` : null,
-  ].filter((line): line is string => Boolean(line))
-  const body = (message.body || snippet(message.bodyHtml)).trim()
-  return [
-    '<p></p>',
-    '<blockquote>',
-    ...rows.map((line) => `<p>${escapeHtml(line)}</p>`),
-    body ? `<p>${escapeHtml(body).replace(/\n/g, '<br />')}</p>` : '',
-    '</blockquote>',
-  ].join('')
-}
-
-const PREFETCH_HOVER_MS = 180
-const PREFETCH_MAX_IMAGES_PER_THREAD = 12
-
-function extractImageUrls(html: string): string[] {
-  const urls: string[] = []
-  const re = /<img\b[^>]*\bsrc=["']([^"']+)["']/gi
-  let match: RegExpExecArray | null
-  while ((match = re.exec(html)) !== null) {
-    const url = match[1]
-    if (url && (url.startsWith('http://') || url.startsWith('https://'))) {
-      urls.push(url)
-    }
-  }
-  return urls
-}
-
-function prefetchThreadImages(thread: GmailThread): void {
-  const seen = new Set<string>()
-  for (const msg of thread.messages) {
-    if (!msg.bodyHtml) continue
-    for (const url of extractImageUrls(msg.bodyHtml)) {
-      if (seen.has(url)) continue
-      seen.add(url)
-      if (seen.size > PREFETCH_MAX_IMAGES_PER_THREAD) return
-      const img = new Image()
-      img.decoding = 'async'
-      img.referrerPolicy = 'no-referrer'
-      img.src = url
-    }
-  }
-}
-
-function escapeHtml(text: string): string {
-  return text
-    .replace(/&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&#39;')
-}
-
-function splitPlainTextQuote(text: string): { visible: string; quoted: string | null } {
-  const re = /(?:^|\n)On\s+.+?\swrote:\s*(?:\n|$)/
-  const match = re.exec(text)
-  if (!match) return { visible: text, quoted: null }
-  const start = match.index === 0 ? 0 : match.index + 1
-  const visible = text.slice(0, start).trimEnd()
-  const quoted = text.slice(start)
-  if (!quoted.trim()) return { visible: text, quoted: null }
-  return { visible, quoted }
-}
-
-// True if the HTML — after stripping quoted/hidden content — defines its
-// own visual layout (real images, tables, explicit backgrounds). Unstyled
-// HTML (Gmail replies, Outlook one-liners wrapped in MsoNormal boilerplate,
-// outreach emails with only a tracking pixel, reply HTML whose only image
-// lives inside the inline-quoted thread) gets an iframe that adapts to the
-// app theme; styled HTML keeps the white "paper" look so newsletters /
-// branded designs render as their senders intended.
-function isStyledHtml(html: string): boolean {
-  const doc = new DOMParser().parseFromString(html, 'text/html')
-  doc.querySelectorAll('.gmail_quote, .gmail_attr, blockquote[type="cite"]').forEach((n) => n.remove())
-  if (doc.querySelector('table')) return true
-  for (const img of Array.from(doc.querySelectorAll('img'))) {
-    const w = parseInt(img.getAttribute('width') || '0', 10)
-    const h = parseInt(img.getAttribute('height') || '0', 10)
-    if (w === 1 && h === 1) continue
-    const style = img.getAttribute('style') || ''
-    if (/display\s*:\s*none/i.test(style)) continue
-    if (/visibility\s*:\s*hidden/i.test(style)) continue
-    return true
-  }
-  const visible = doc.body?.innerHTML || ''
-  if (/bgcolor\s*=/i.test(visible)) return true
-  if (/background-(color|image)\s*:/i.test(visible)) return true
-  return false
-}
-
-function buildEmailDocument(
-  html: string,
-  opts: { theme: 'light' | 'dark'; adaptToTheme: boolean },
-): string {
-  const useDark = opts.theme === 'dark' && opts.adaptToTheme
-  const colorScheme = opts.theme === 'dark' ? 'light dark' : 'light'
-  const bodyColor = useDark ? '#d4d4d8' : '#202124'
-  const linkColor = useDark ? '#a78bfa' : '#1a73e8'
-  const quoteBorder = useDark ? '#2e2e35' : '#dadce0'
-  const quoteColor = useDark ? '#71717a' : '#5f6368'
-  return `<!doctype html>
-<html><head>
-<meta charset="utf-8">
-<meta name="color-scheme" content="${colorScheme}">
-<base target="_blank">
-<style>
-  :root { color-scheme: ${colorScheme}; }
-  html, body { margin: 0; padding: 0; }
-  body {
-    font: 14px/1.6 Arial, sans-serif;
-    background: transparent;
-    color: ${bodyColor};
-    overflow-x: auto;
-    overflow-y: hidden;
-    word-wrap: break-word;
-    padding-bottom: 4px;
-  }
-  body > *:last-child { margin-bottom: 0; }
-  img { max-width: 100%; height: auto; }
-  table { max-width: 100%; }
-  a { color: ${linkColor}; }
-  blockquote {
-    margin: 0 0 0 6px;
-    padding-left: 12px;
-    border-left: 2px solid ${quoteBorder};
-    color: ${quoteColor};
-  }
-  .gmail_quote,
-  .gmail_attr,
-  blockquote[type="cite"] { display: none; }
-  [data-show-quotes="true"] .gmail_quote,
-  [data-show-quotes="true"] .gmail_attr,
-  [data-show-quotes="true"] blockquote[type="cite"] { display: block; }
-</style>
-</head><body>${html}</body></html>`
-}
-
-function MessageBody({ message, threadId }: { message: GmailThreadMessage; threadId: string }) {
-  const isPlainText = !(message.bodyHtml && message.bodyHtml.trim())
-  return isPlainText
-    ? <PlainTextBody message={message} />
-    : <HtmlMessageBody message={message} threadId={threadId} />
-}
-
-function PlainTextBody({ message }: { message: GmailThreadMessage }) {
-  const text = (message.body || '(No message body)').trim()
-  const { visible, quoted } = splitPlainTextQuote(text)
-  const [showQuote, setShowQuote] = useState(false)
-  return (
-    <>
-      <div className="gmail-message-plain">
-        <pre className="gmail-message-pre">{visible}</pre>
-        {quoted && showQuote && <pre className="gmail-message-pre gmail-message-pre-quoted">{quoted}</pre>}
-      </div>
-      {quoted && (
-        <button
-          type="button"
-          className="gmail-quote-toggle"
-          onClick={() => setShowQuote((v) => !v)}
-          aria-label={showQuote ? 'Hide quoted text' : 'Show quoted text'}
-          aria-expanded={showQuote}
-        >
-          <span>•••</span>
-        </button>
-      )}
-      {message.attachments && message.attachments.length > 0 && (
-        <MessageAttachments attachments={message.attachments} />
-      )}
-    </>
-  )
-}
-
-function HtmlMessageBody({ message, threadId }: { message: GmailThreadMessage; threadId: string }) {
-  const { resolvedTheme } = useTheme()
-  const iframeRef = useRef<HTMLIFrameElement>(null)
-  const observerRef = useRef<ResizeObserver | null>(null)
-  const saveTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
-  const lastSavedHeightRef = useRef<number>(message.bodyHeight ?? 0)
-  const [height, setHeight] = useState(message.bodyHeight ?? 80)
-  const [hasQuote, setHasQuote] = useState(false)
-  const [showQuotes, setShowQuotes] = useState(false)
-
-  const adaptToTheme = useMemo(() => !isStyledHtml(message.bodyHtml!), [message.bodyHtml])
-  const srcDoc = useMemo(
-    () => buildEmailDocument(message.bodyHtml!, { theme: resolvedTheme, adaptToTheme }),
-    [message.bodyHtml, resolvedTheme, adaptToTheme],
-  )
-
-  const handleLoad = useCallback(() => {
-    const iframe = iframeRef.current
-    const doc = iframe?.contentDocument
-    if (!doc?.body) return
-    setHasQuote(!!doc.querySelector('.gmail_quote, .gmail_attr, blockquote[type="cite"]'))
-    const measure = () => {
-      // Measure off body only. documentElement.scrollHeight stretches to fill
-      // the iframe viewport, so once we size the iframe up (e.g. user expanded
-      // the quote) it never shrinks back when the body collapses. The body's
-      // own padding-bottom + last-child margin reset (see buildEmailDocument)
-      // already prevent under-reporting from collapsed bottom margins.
-      const next = Math.max(40, doc.body.scrollHeight, doc.body.offsetHeight)
-      setHeight((current) => (current === next ? current : next))
-      if (!message.id) return
-      if (Math.abs(next - lastSavedHeightRef.current) < 4) return
-      if (saveTimerRef.current) clearTimeout(saveTimerRef.current)
-      saveTimerRef.current = setTimeout(() => {
-        lastSavedHeightRef.current = next
-        void window.ipc.invoke('gmail:saveMessageHeight', {
-          threadId,
-          messageId: message.id!,
-          height: next,
-        }).catch(() => {})
-      }, 500)
-    }
-    measure()
-    observerRef.current?.disconnect()
-    if (typeof ResizeObserver !== 'undefined') {
-      observerRef.current = new ResizeObserver(measure)
-      observerRef.current.observe(doc.body)
-    }
-  }, [message.id, threadId])
-
-  const toggleQuotes = useCallback(() => {
-    setShowQuotes((prev) => {
-      const next = !prev
-      const doc = iframeRef.current?.contentDocument
-      if (doc) doc.documentElement.dataset.showQuotes = next ? 'true' : ''
-      return next
-    })
-  }, [])
-
-  useEffect(() => () => {
-    observerRef.current?.disconnect()
-    if (saveTimerRef.current) clearTimeout(saveTimerRef.current)
-  }, [])
-
-  return (
-    <>
-      <iframe
-        ref={iframeRef}
-        srcDoc={srcDoc}
-        sandbox="allow-same-origin allow-popups allow-popups-to-escape-sandbox"
-        title="Email content"
-        className={cn('gmail-message-iframe', adaptToTheme && 'gmail-message-iframe-adaptive')}
-        style={{ height }}
-        onLoad={handleLoad}
-      />
-      {hasQuote && (
-        <button
-          type="button"
-          className="gmail-quote-toggle"
-          onClick={toggleQuotes}
-          aria-label={showQuotes ? 'Hide quoted text' : 'Show quoted text'}
-          aria-expanded={showQuotes}
-        >
-          <span>•••</span>
-        </button>
-      )}
-      {message.attachments && message.attachments.length > 0 && (
-        <MessageAttachments attachments={message.attachments} />
-      )}
-    </>
-  )
-}
-
-function formatAttachmentSize(bytes?: number): string {
-  if (!bytes || bytes <= 0) return ''
-  if (bytes < 1024) return `${bytes} B`
-  if (bytes < 1024 * 1024) return `${Math.round(bytes / 1024)} KB`
-  return `${(bytes / 1024 / 1024).toFixed(1)} MB`
-}
-
-function MessageAttachments({ attachments }: { attachments: NonNullable<GmailThreadMessage['attachments']> }) {
-  const openAttachment = (path: string, filename: string) => {
-    void window.ipc
-      .invoke('shell:openPath', { path })
-      .then((result) => {
-        if (result?.error) toast(`Could not open ${filename}: ${result.error}`, 'error')
-      })
-      .catch((err) => {
-        const message = err instanceof Error ? err.message : String(err)
-        toast(`Could not open ${filename}: ${message}`, 'error')
-      })
-  }
-
-  return (
-    <div className="gmail-message-attachments">
-      {attachments.map((att) => {
-        const size = formatAttachmentSize(att.sizeBytes)
-        return (
-          <button
-            key={att.savedPath}
-            type="button"
-            className="gmail-attachment"
-            onClick={() => openAttachment(att.savedPath, att.filename)}
-            title={`Open ${att.filename}`}
-          >
-            <Paperclip size={13} />
-            <span className="gmail-attachment-name">{att.filename}</span>
-            {size && <span className="gmail-attachment-size">{size}</span>}
-          </button>
-        )
-      })}
-    </div>
-  )
-}
-
-type ComposeMode = 'reply' | 'replyAll' | 'forward'
-
-function ComposeToolbarButton({
-  editor,
-  command,
-  isActive,
-  label,
-  children,
-}: {
-  editor: Editor
-  command: () => void
-  isActive: boolean
-  label: string
-  children: React.ReactNode
-}) {
-  return (
-    <button
-      type="button"
-      className={cn('gmail-compose-tool', isActive && 'is-active')}
-      onMouseDown={(event) => event.preventDefault()}
-      onClick={() => {
-        command()
-        editor.chain().focus().run()
-      }}
-      aria-label={label}
-      aria-pressed={isActive}
-      title={label}
-    >
-      {children}
-    </button>
-  )
-}
-
-function ComposeToolbar({ editor, onOpenLink }: { editor: Editor; onOpenLink: () => void }) {
-  return (
-    <div className="gmail-compose-toolbar">
-      <ComposeToolbarButton
-        editor={editor}
-        command={() => editor.chain().focus().toggleBold().run()}
-        isActive={editor.isActive('bold')}
-        label="Bold"
-      >
-        <Bold size={14} />
-      </ComposeToolbarButton>
-      <ComposeToolbarButton
-        editor={editor}
-        command={() => editor.chain().focus().toggleItalic().run()}
-        isActive={editor.isActive('italic')}
-        label="Italic"
-      >
-        <Italic size={14} />
-      </ComposeToolbarButton>
-      <ComposeToolbarButton
-        editor={editor}
-        command={() => editor.chain().focus().toggleStrike().run()}
-        isActive={editor.isActive('strike')}
-        label="Strikethrough"
-      >
-        <Strikethrough size={14} />
-      </ComposeToolbarButton>
-      <span className="gmail-compose-tool-sep" />
-      <ComposeToolbarButton
-        editor={editor}
-        command={() => editor.chain().focus().toggleBulletList().run()}
-        isActive={editor.isActive('bulletList')}
-        label="Bulleted list"
-      >
-        <List size={14} />
-      </ComposeToolbarButton>
-      <ComposeToolbarButton
-        editor={editor}
-        command={() => editor.chain().focus().toggleOrderedList().run()}
-        isActive={editor.isActive('orderedList')}
-        label="Numbered list"
-      >
-        <ListOrdered size={14} />
-      </ComposeToolbarButton>
-      <ComposeToolbarButton
-        editor={editor}
-        command={() => editor.chain().focus().toggleBlockquote().run()}
-        isActive={editor.isActive('blockquote')}
-        label="Quote"
-      >
-        <Quote size={14} />
-      </ComposeToolbarButton>
-      <span className="gmail-compose-tool-sep" />
-      <button
-        type="button"
-        className={cn('gmail-compose-tool', editor.isActive('link') && 'is-active')}
-        onMouseDown={(event) => event.preventDefault()}
-        onClick={onOpenLink}
-        aria-label="Link"
-        aria-pressed={editor.isActive('link')}
-        title="Link"
-      >
-        <LinkIcon size={14} />
-      </button>
-    </div>
-  )
-}
-
-function RecipientField({
-  label,
-  value,
-  onChange,
-  autoFocus,
-  trailing,
-}: {
-  label: string
-  value: string[]
-  onChange: (next: string[]) => void
-  autoFocus?: boolean
-  trailing?: React.ReactNode
-}) {
-  const [draft, setDraft] = useState('')
-  const inputRef = useRef<HTMLInputElement>(null)
-
-  useEffect(() => {
-    if (autoFocus) inputRef.current?.focus()
-  }, [autoFocus])
-
-  const commit = (raw: string) => {
-    const additions = splitAddresses(raw)
-    if (additions.length === 0) return
-    onChange(dedupeRecipients([...value, ...additions], new Set()))
-    setDraft('')
-  }
-
-  const onKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
-    if (event.key === 'Enter' || event.key === ',' || event.key === ';' || (event.key === 'Tab' && draft.trim())) {
-      if (draft.trim()) {
-        event.preventDefault()
-        commit(draft)
-      }
-    } else if (event.key === 'Backspace' && !draft && value.length > 0) {
-      onChange(value.slice(0, -1))
-    }
-  }
-
-  return (
-    <div className="gmail-recipient-row">
-      <span className="gmail-recipient-label">{label}</span>
-      <div className="gmail-recipient-field">
-        {value.map((token, index) => (
-          <span key={`${token}-${index}`} className="gmail-recipient-chip" title={extractAddress(token)}>
-            <span className="gmail-recipient-chip-label">{recipientLabel(token)}</span>
-            <button
-              type="button"
-              className="gmail-recipient-chip-remove"
-              aria-label={`Remove ${extractAddress(token)}`}
-              onMouseDown={(event) => event.preventDefault()}
-              onClick={() => onChange(value.filter((_, idx) => idx !== index))}
-            >
-              ×
-            </button>
-          </span>
-        ))}
-        <input
-          ref={inputRef}
-          className="gmail-recipient-input"
-          value={draft}
-          onChange={(event) => setDraft(event.target.value)}
-          onKeyDown={onKeyDown}
-          onBlur={() => { if (draft.trim()) commit(draft) }}
-          onPaste={(event) => {
-            const text = event.clipboardData.getData('text')
-            if (text && /[,;\n]/.test(text)) {
-              event.preventDefault()
-              commit(text)
-            }
-          }}
-        />
-      </div>
-      {trailing && <div className="gmail-recipient-trailing">{trailing}</div>}
-    </div>
-  )
-}
-
-function ComposeBox({
-  mode,
-  thread,
-  selfEmail,
-  onClose,
-}: {
-  mode: ComposeMode
-  thread: GmailThread
-  selfEmail: string
-  onClose: () => void
-}) {
-  const latest = latestMessage(thread)
-  const initialRecipients = useMemo(
-    () => buildRecipients(mode, thread, selfEmail),
-    [mode, thread, selfEmail],
-  )
-
-  const [toList, setToList] = useState<string[]>(initialRecipients.to)
-  const [ccList, setCcList] = useState<string[]>(initialRecipients.cc)
-  const [bccList, setBccList] = useState<string[]>([])
-  const [showCc, setShowCc] = useState<boolean>(initialRecipients.cc.length > 0)
-  const [showBcc, setShowBcc] = useState<boolean>(false)
-  const [subject, setSubject] = useState<string>(() => composeSubject(mode, thread.subject))
-  const modeLabel = mode === 'forward' ? 'Forward' : mode === 'replyAll' ? 'Reply all' : 'Reply'
-
-  const initialContent = useMemo(() => {
-    if (mode === 'forward') return buildForwardedContent(thread)
-    // Gmail-side draft (user's own work) wins over the AI-generated draft.
-    const source = stripQuotedReplyText(thread.gmail_draft || thread.draft_response || '')
-    if (!source) return ''
-    return source
-      .split(/\n{2,}/)
-      .map((para) => `<p>${escapeHtml(para).replace(/\n/g, '<br />')}</p>`)
-      .join('')
-  }, [mode, thread])
-
-  const editor = useEditor({
-    extensions: [
-      StarterKit.configure({ link: false }),
-      Link.configure({ openOnClick: false, autolink: true }),
-      Placeholder.configure({
-        placeholder: mode === 'forward' ? 'Write a message…' : 'Write your reply…',
-      }),
-    ],
-    editorProps: {
-      attributes: { class: 'gmail-compose-content' },
-    },
-    content: initialContent,
-  })
-
-  const [linkOpen, setLinkOpen] = useState(false)
-  const [linkUrl, setLinkUrl] = useState('')
-  const savedSelectionRef = useRef<{ from: number; to: number } | null>(null)
-  const linkInputRef = useRef<HTMLInputElement>(null)
-
-  const openLink = () => {
-    if (!editor) return
-    const { from, to: selTo } = editor.state.selection
-    savedSelectionRef.current = { from, to: selTo }
-    const existing = editor.getAttributes('link').href as string | undefined
-    setLinkUrl(existing || 'https://')
-    setLinkOpen(true)
-  }
-
-  useEffect(() => {
-    if (!linkOpen) return
-    const id = window.setTimeout(() => linkInputRef.current?.select(), 0)
-    return () => window.clearTimeout(id)
-  }, [linkOpen])
-
-  const applyLink = () => {
-    if (!editor) {
-      setLinkOpen(false)
-      return
-    }
-    const sel = savedSelectionRef.current
-    setLinkOpen(false)
-    if (!sel) return
-    const trimmed = linkUrl.trim()
-    if (!trimmed || trimmed === 'https://') {
-      editor.chain().focus().setTextSelection(sel).extendMarkRange('link').unsetLink().run()
-      return
-    }
-    const href = /^[a-z]+:\/\//i.test(trimmed) ? trimmed : `https://${trimmed}`
-    editor.chain().focus().setTextSelection(sel).extendMarkRange('link').setLink({ href }).run()
-  }
-
-  const cancelLink = () => {
-    setLinkOpen(false)
-    const sel = savedSelectionRef.current
-    if (editor && sel) editor.chain().focus().setTextSelection(sel).run()
-  }
-
-  const [sending, setSending] = useState(false)
-  const sendInGmail = async () => {
-    if (!editor || sending) return
-    const html = editor.getHTML()
-    const text = editor.getText().trim()
-    if (!text) {
-      toast('Draft is empty.', 'error')
-      return
-    }
-
-    if (toList.length === 0) {
-      toast('Add at least one recipient.', 'error')
-      return
-    }
-
-    // Build References chain from all known message ids (newest last).
-    const messageIds = thread.messages
-      .map((m) => m.messageIdHeader)
-      .filter((v): v is string => Boolean(v))
-    const references = messageIds.join(' ')
-    const inReplyTo = latest?.messageIdHeader
-    const isForward = mode === 'forward'
-
-    setSending(true)
-    try {
-      const result = await window.ipc.invoke('gmail:sendReply', {
-        threadId: isForward ? undefined : thread.threadId,
-        to: toList.join(', '),
-        cc: ccList.length ? ccList.join(', ') : undefined,
-        bcc: bccList.length ? bccList.join(', ') : undefined,
-        subject: subject.trim() || composeSubject(mode, thread.subject),
-        bodyHtml: html,
-        bodyText: text,
-        inReplyTo: isForward ? undefined : inReplyTo,
-        references: isForward ? undefined : references || undefined,
-      })
-      if (result.error) {
-        toast(`Send failed: ${result.error}`, 'error')
-        return
-      }
-      toast('Sent.', 'success')
-      onClose()
-    } catch (err) {
-      toast(`Send failed: ${err instanceof Error ? err.message : String(err)}`, 'error')
-    } finally {
-      setSending(false)
-    }
-  }
-
-  const refineWithCopilot = () => {
-    if (!editor) return
-    const currentDraft = editor.getText().trim()
-    const threadSubject = thread.subject || '(No subject)'
-
-    const lines: string[] = []
-    lines.push(`Help me refine this draft email response. **Please ask me how I want to refine it before making any changes** — wait for my answer, then apply the edits.`)
-    lines.push('')
-    lines.push(`**Mode:** ${modeLabel}`)
-    lines.push(`**Subject:** ${threadSubject}`)
-    lines.push('')
-    lines.push(`## Thread (${thread.messages.length} message${thread.messages.length === 1 ? '' : 's'})`)
-    lines.push('')
-    thread.messages.forEach((message, index) => {
-      lines.push(`### Message ${index + 1}`)
-      if (message.from) lines.push(`**From:** ${message.from}`)
-      if (message.to) lines.push(`**To:** ${message.to}`)
-      if (message.date) lines.push(`**Date:** ${message.date}`)
-      lines.push('')
-      lines.push((message.body || '(empty)').trim())
-      lines.push('')
-    })
-
-    lines.push(`## Current draft`)
-    lines.push('')
-    lines.push(currentDraft || '(empty — no draft yet)')
-
-    window.__pendingEmailDraft = { prompt: lines.join('\n') }
-    window.dispatchEvent(new Event('email-block:draft-with-assistant'))
-  }
-
-  return (
-    <div className="gmail-compose-card">
-      <div className="gmail-compose-header">
-        <span>{modeLabel}</span>
-        <button type="button" onClick={onClose} aria-label="Close compose">×</button>
-      </div>
-      <RecipientField
-        label="To"
-        value={toList}
-        onChange={setToList}
-        autoFocus={mode === 'forward'}
-        trailing={
-          <div className="gmail-recipient-toggles">
-            {!showCc && <button type="button" onClick={() => setShowCc(true)}>Cc</button>}
-            {!showBcc && <button type="button" onClick={() => setShowBcc(true)}>Bcc</button>}
-          </div>
-        }
-      />
-      {showCc && <RecipientField label="Cc" value={ccList} onChange={setCcList} />}
-      {showBcc && <RecipientField label="Bcc" value={bccList} onChange={setBccList} />}
-      {mode === 'forward' && (
-        <div className="gmail-compose-line">
-          <span className="gmail-compose-label">Subject</span>
-          <input
-            className="gmail-compose-subject-input"
-            value={subject}
-            onChange={(event) => setSubject(event.target.value)}
-            placeholder="Subject"
-          />
-        </div>
-      )}
-      <EditorContent editor={editor} className="gmail-compose-editor" />
-      {linkOpen && (
-        <div className="gmail-compose-link-popover" onMouseDown={(event) => event.preventDefault()}>
-          <input
-            ref={linkInputRef}
-            value={linkUrl}
-            onChange={(event) => setLinkUrl(event.target.value)}
-            placeholder="https://example.com"
-            onKeyDown={(event) => {
-              if (event.key === 'Enter') {
-                event.preventDefault()
-                applyLink()
-              } else if (event.key === 'Escape') {
-                event.preventDefault()
-                cancelLink()
-              }
-            }}
-          />
-          <button type="button" className="gmail-compose-link-popover-apply" onClick={applyLink}>Apply</button>
-          <button type="button" className="gmail-compose-link-popover-cancel" onClick={cancelLink}>Cancel</button>
-        </div>
-      )}
-      <div className="gmail-compose-actions">
-        <div className="gmail-compose-actions-primary">
-          <button
-            type="button"
-            className="gmail-send-button"
-            onClick={() => { void sendInGmail() }}
-            disabled={sending}
-            title="Send this reply via Gmail"
-          >
-            {sending ? <LoaderIcon size={15} className="animate-spin" /> : <Send size={15} />}
-            {sending ? 'Sending…' : 'Send'}
-          </button>
-          <button
-            type="button"
-            className="gmail-refine-button"
-            onClick={refineWithCopilot}
-            title="Refine this draft with Copilot"
-          >
-            <Sparkles size={15} />
-            Refine
-          </button>
-        </div>
-        {editor && <ComposeToolbar editor={editor} onOpenLink={openLink} />}
-        <button type="button" className="gmail-compose-link" onClick={onClose}>Discard</button>
-      </div>
-    </div>
-  )
-}
-
-function ThreadDetail({
-  thread,
-  onClose,
-  hidden,
-}: {
-  thread: GmailThread
-  onClose: () => void
-  hidden?: boolean
-}) {
-  const [composeMode, setComposeMode] = useState<ComposeMode | null>(null)
-  const [selfEmail, setSelfEmail] = useState<string>('')
-  const [expandedIndices, setExpandedIndices] = useState<Set<number>>(
-    () => new Set(thread.messages.length > 0 ? [thread.messages.length - 1] : [])
-  )
-
-  // The connected Gmail address, so reply-all can exclude "me".
-  useEffect(() => {
-    let cancelled = false
-    window.ipc.invoke('gmail:getAccountEmail', {})
-      .then((res) => { if (!cancelled && res?.email) setSelfEmail(res.email) })
-      .catch(() => {})
-    return () => { cancelled = true }
-  }, [])
-
-  const canReplyAll = useMemo(() => {
-    const { to, cc } = buildRecipients('replyAll', thread, selfEmail)
-    return cc.length > 0 || to.length > 1
-  }, [thread, selfEmail])
-
-  const toggleExpand = useCallback((index: number) => {
-    setExpandedIndices((prev) => {
-      const next = new Set(prev)
-      if (next.has(index)) next.delete(index)
-      else next.add(index)
-      return next
-    })
-  }, [])
-
-  return (
-    <div className={cn('gmail-detail gmail-detail-inline', hidden && 'gmail-detail-hidden')}>
-      <div className="gmail-detail-toolbar">
-        <div className="gmail-thread-subject-inline">{thread.subject || '(No subject)'}</div>
-        <button type="button" className="gmail-icon-button" onClick={onClose} aria-label="Close thread">
-          <span>×</span>
-        </button>
-      </div>
-
-      <div className="gmail-thread-body">
-        {thread.summary && (
-          <div className="gmail-thread-summary">
-            <span className="gmail-thread-summary-label">Summary</span>
-            <span className="gmail-thread-summary-text">{thread.summary}</span>
-          </div>
-        )}
-        <div className="gmail-message-stack">
-          {thread.messages.map((message, index) => {
-            const isExpanded = expandedIndices.has(index)
-            return (
-              <div key={message.id || index} className={cn('gmail-message', isExpanded && 'gmail-message-expanded')}>
-                <div className="gmail-message-avatar" style={{ backgroundColor: avatarColor(message.from) }}>
-                  {getInitial(message.from)}
-                </div>
-                <div className="gmail-message-main">
-                  <button
-                    type="button"
-                    className="gmail-message-header"
-                    onClick={() => toggleExpand(index)}
-                    aria-expanded={isExpanded}
-                  >
-                    <div className="gmail-message-meta">
-                      <div className="gmail-message-from">
-                        <strong>{extractName(message.from)}</strong>
-                        {isExpanded && <span>{extractAddress(message.from)}</span>}
-                      </div>
-                      <div className="gmail-message-date">
-                        {isExpanded ? formatFullDate(message.date) : formatInboxTime(message.date)}
-                      </div>
-                    </div>
-                    {isExpanded ? (
-                      <>
-                        <div className="gmail-message-to">to {message.to || 'me'}</div>
-                        {message.cc && <div className="gmail-message-cc">cc {message.cc}</div>}
-                      </>
-                    ) : (
-                      <div className="gmail-message-snippet">{snippet(message.body)}</div>
-                    )}
-                  </button>
-                  {isExpanded && (
-                    <MessageBody message={message} threadId={thread.threadId} />
-                  )}
-                </div>
-              </div>
-            )
-          })}
-        </div>
-
-        <div className="gmail-thread-actions">
-          <button type="button" onClick={() => setComposeMode('reply')}>
-            <Reply size={16} />
-            Reply
-          </button>
-          {canReplyAll && (
-            <button type="button" onClick={() => setComposeMode('replyAll')}>
-              <ReplyAll size={16} />
-              Reply all
-            </button>
-          )}
-          <button type="button" onClick={() => setComposeMode('forward')}>
-            <Forward size={16} />
-            Forward
-          </button>
-        </div>
-
-        {composeMode && (
-          <ComposeBox
-            key={composeMode}
-            mode={composeMode}
-            thread={thread}
-            selfEmail={selfEmail}
-            onClose={() => setComposeMode(null)}
-          />
-        )}
-      </div>
-    </div>
-  )
-}
-
-const MAX_KEPT_OPEN = 5
-const PAGE_SIZE = 25
-type InboxSection = 'important' | 'other'
-
-interface SectionState {
-  threads: GmailThread[]
-  nextCursor: string | null
-  hasReachedEnd: boolean
-  loadingPage: boolean
-}
-
-const initialSectionState: SectionState = {
-  threads: [],
-  nextCursor: null,
-  hasReachedEnd: false,
-  loadingPage: false,
-}
-
-// Module-level survives unmount/remount within the renderer process — so switching
-// panels and coming back doesn't reload from scratch.
-let persistedImportant: SectionState | null = null
-let persistedOther: SectionState | null = null
-
-function clearLoadingFlag(state: SectionState | null): SectionState {
-  if (!state) return initialSectionState
-  return { ...state, loadingPage: false }
-}
-
-export type EmailViewProps = {
-  /** If provided, the view opens with this thread already expanded. */
-  initialThreadId?: string | null
-  /** Bump to re-focus on the same threadId after navigating away inside the view. */
-  threadIdVersion?: number
-}
-
-export function EmailView({ initialThreadId, threadIdVersion }: EmailViewProps = {}) {
-  const [important, setImportant] = useState<SectionState>(() => clearLoadingFlag(persistedImportant))
-  const [other, setOther] = useState<SectionState>(() => clearLoadingFlag(persistedOther))
-  const hadPersistedDataOnMount = useRef(persistedImportant !== null)
-  const [selectedThreadId, setSelectedThreadId] = useState<string | null>(initialThreadId ?? null)
-  const [openedThreadIds, setOpenedThreadIds] = useState<string[]>(initialThreadId ? [initialThreadId] : [])
-  useEffect(() => {
-    setSelectedThreadId(initialThreadId ?? null)
-    if (initialThreadId) {
-      setOpenedThreadIds((prev) => {
-        const without = prev.filter((id) => id !== initialThreadId)
-        return [...without, initialThreadId].slice(-MAX_KEPT_OPEN)
-      })
-    }
-  }, [initialThreadId, threadIdVersion])
-  const [refreshing, setRefreshing] = useState(!hadPersistedDataOnMount.current)
-  const [error, setError] = useState<string | null>(null)
-  const [query, setQuery] = useState('')
-  // Gmail sync uses the native Google OAuth connection.
-  const [emailConnection, setEmailConnection] = useState<GmailConnectionStatus | null>(null)
-  const [settingsOpen, setSettingsOpen] = useState(false)
-
-  useEffect(() => {
-    let cancelled = false
-    const check = async () => {
-      try {
-        const status = await window.ipc.invoke('gmail:getConnectionStatus', {})
-        if (!cancelled) setEmailConnection(status)
-      } catch {
-        if (!cancelled) {
-          setEmailConnection({
-            connected: false,
-            hasRequiredScope: false,
-            missingScopes: [],
-            email: null,
-          })
-        }
-      }
-    }
-    void check()
-    const cleanupOAuthConnect = window.ipc.on('oauth:didConnect', () => { void check() })
-    return () => {
-      cancelled = true
-      cleanupOAuthConnect()
-    }
-  }, [])
-
-  useEffect(() => { persistedImportant = important }, [important])
-  useEffect(() => { persistedOther = other }, [other])
-
-  const setSection = useCallback((section: InboxSection, updater: (prev: SectionState) => SectionState) => {
-    if (section === 'important') setImportant(updater)
-    else setOther(updater)
-  }, [])
-
-  const updateThreadInState = useCallback((threadId: string, updater: (t: GmailThread) => GmailThread) => {
-    const mapSection = (prev: SectionState): SectionState => ({
-      ...prev,
-      threads: prev.threads.map((t) => (t.threadId === threadId ? updater(t) : t)),
-    })
-    setImportant(mapSection)
-    setOther(mapSection)
-  }, [])
-
-  const removeThreadFromState = useCallback((threadId: string) => {
-    const filterSection = (prev: SectionState): SectionState => ({
-      ...prev,
-      threads: prev.threads.filter((t) => t.threadId !== threadId),
-    })
-    setImportant(filterSection)
-    setOther(filterSection)
-    setSelectedThreadId((current) => (current === threadId ? null : current))
-    setOpenedThreadIds((prev) => prev.filter((id) => id !== threadId))
-  }, [])
-
-  const markThreadReadAction = useCallback(async (threadId: string) => {
-    updateThreadInState(threadId, (t) => ({
-      ...t,
-      unread: false,
-      messages: t.messages.map((m) => ({ ...m, unread: false })),
-    }))
-    try {
-      const result = await window.ipc.invoke('gmail:markThreadRead', { threadId })
-      if (!result.ok && result.error) console.warn('[Gmail] mark-read failed:', result.error)
-    } catch (err) {
-      console.warn('[Gmail] mark-read failed:', err)
-    }
-  }, [updateThreadInState])
-
-  const archiveThreadAction = useCallback(async (threadId: string) => {
-    try {
-      const result = await window.ipc.invoke('gmail:archiveThread', { threadId })
-      if (result.ok) {
-        removeThreadFromState(threadId)
-      } else if (result.error) {
-        toast(`Archive failed: ${result.error}`, 'error')
-      }
-    } catch (err) {
-      toast(`Archive failed: ${err instanceof Error ? err.message : String(err)}`, 'error')
-    }
-  }, [removeThreadFromState])
-
-  const trashThreadAction = useCallback(async (threadId: string) => {
-    try {
-      const result = await window.ipc.invoke('gmail:trashThread', { threadId })
-      if (result.ok) {
-        removeThreadFromState(threadId)
-      } else if (result.error) {
-        toast(`Delete failed: ${result.error}`, 'error')
-      }
-    } catch (err) {
-      toast(`Delete failed: ${err instanceof Error ? err.message : String(err)}`, 'error')
-    }
-  }, [removeThreadFromState])
-
-  const toggleThread = useCallback((thread: GmailThread) => {
-    setSelectedThreadId((current) => {
-      const next = current === thread.threadId ? null : thread.threadId
-      if (next) {
-        setOpenedThreadIds((prev) => {
-          const without = prev.filter((id) => id !== next)
-          return [...without, next].slice(-MAX_KEPT_OPEN)
-        })
-        if (thread.unread) {
-          void markThreadReadAction(thread.threadId)
-        }
-      }
-      return next
-    })
-  }, [markThreadReadAction])
-
-  const prefetchedRef = useRef<Set<string>>(new Set())
-  const hoverTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
-
-  const cancelHoverPrefetch = useCallback(() => {
-    if (hoverTimerRef.current) {
-      clearTimeout(hoverTimerRef.current)
-      hoverTimerRef.current = null
-    }
-  }, [])
-
-  const scheduleHoverPrefetch = useCallback((thread: GmailThread) => {
-    cancelHoverPrefetch()
-    if (prefetchedRef.current.has(thread.threadId)) return
-    hoverTimerRef.current = setTimeout(() => {
-      hoverTimerRef.current = null
-      prefetchedRef.current.add(thread.threadId)
-      prefetchThreadImages(thread)
-    }, PREFETCH_HOVER_MS)
-  }, [cancelHoverPrefetch])
-
-  useEffect(() => () => {
-    if (hoverTimerRef.current) clearTimeout(hoverTimerRef.current)
-  }, [])
-
-  // Per-section load epochs so concurrent reloads of different sections don't
-  // trample each other. (A single shared epoch caused Important's silent
-  // reload to be discarded whenever Other was reloaded in the same tick.)
-  const epochsRef = useRef<Record<InboxSection, number>>({ important: 0, other: 0 })
-
-  const sectionChannel = (section: InboxSection) =>
-    section === 'important' ? 'gmail:getImportant' as const : 'gmail:getEverythingElse' as const
-
-  const loadNextPage = useCallback(async (section: InboxSection) => {
-    const current = section === 'important' ? important : other
-    if (current.loadingPage || current.hasReachedEnd) return
-
-    const epoch = epochsRef.current[section]
-    setSection(section, (prev) => ({ ...prev, loadingPage: true }))
-    try {
-      const result = await window.ipc.invoke(sectionChannel(section), {
-        cursor: current.nextCursor ?? undefined,
-        limit: PAGE_SIZE,
-      })
-      if (epoch !== epochsRef.current[section]) return
-      setSection(section, (prev) => ({
-        threads: [...prev.threads, ...result.threads],
-        nextCursor: result.nextCursor,
-        hasReachedEnd: result.nextCursor === null,
-        loadingPage: false,
-      }))
-    } catch (err) {
-      if (epoch !== epochsRef.current[section]) return
-      console.warn(`[Gmail] page load failed for ${section}:`, err)
-      setSection(section, (prev) => ({ ...prev, loadingPage: false }))
-    }
-  }, [important, other, setSection])
-
-  const reloadFirstPage = useCallback(async (section: InboxSection, options: { silent?: boolean } = {}) => {
-    const epoch = ++epochsRef.current[section]
-    if (options.silent) {
-      setSection(section, (prev) => ({ ...prev, loadingPage: true }))
-    } else {
-      setSection(section, () => ({ ...initialSectionState, loadingPage: true }))
-    }
-    try {
-      const result = await window.ipc.invoke(sectionChannel(section), {
-        limit: PAGE_SIZE,
-      })
-      if (epoch !== epochsRef.current[section]) return
-      setSection(section, () => ({
-        threads: result.threads,
-        nextCursor: result.nextCursor,
-        hasReachedEnd: result.nextCursor === null,
-        loadingPage: false,
-      }))
-    } catch (err) {
-      if (epoch !== epochsRef.current[section]) return
-      console.warn(`[Gmail] initial page load failed for ${section}:`, err)
-      setSection(section, (prev) => ({ ...prev, loadingPage: false }))
-    }
-  }, [setSection])
-
-  // Initial load — fetch page 1 of Important. On first-ever mount we do a
-  // non-silent load (shows loading state). On re-mount with persisted state we
-  // do a silent reconcile against the cache — necessary because the watcher
-  // subscription only runs while mounted, so any cache changes that happened
-  // while the panel was unmounted would otherwise stay invisible.
-  useEffect(() => {
-    if (hadPersistedDataOnMount.current) {
-      void reloadFirstPage('important', { silent: true })
-      // Reconcile Other too if it had been loaded before the unmount.
-      if (other.threads.length > 0) {
-        void reloadFirstPage('other', { silent: true })
-      }
-    } else {
-      void reloadFirstPage('important')
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
-
-  // Once Important is exhausted, kick off page 1 of Everything else.
-  useEffect(() => {
-    if (!important.hasReachedEnd) return
-    if (other.threads.length > 0) return
-    if (other.loadingPage) return
-    void reloadFirstPage('other')
-  }, [important.hasReachedEnd, other.threads.length, other.loadingPage, reloadFirstPage])
-
-  // Live updates: watcher on inbox_lists/ → silently refresh visible sections
-  // when files change. Throttled to at most one reload per ~3s so a burst of
-  // backend writes (sync processing many threads sequentially) coalesces into
-  // a small number of in-place updates rather than a flicker storm.
-  // Suppressed while a thread is open (composing/reading); deferred until close.
-  const pendingReloadRef = useRef(false)
-  const reloadDebounceRef = useRef<ReturnType<typeof setTimeout> | null>(null)
-  const lastReloadAtRef = useRef(0)
-  const isSelectedRef = useRef<string | null>(null)
-  isSelectedRef.current = selectedThreadId
-  const isRefreshingRef = useRef(false)
-  isRefreshingRef.current = refreshing
-  const otherHasThreadsRef = useRef(false)
-  otherHasThreadsRef.current = other.threads.length > 0
-
-  const RELOAD_THROTTLE_MS = 3000
-
-  const doReload = useCallback(() => {
-    if (isRefreshingRef.current) return
-    if (isSelectedRef.current !== null) {
-      pendingReloadRef.current = true
-      return
-    }
-    lastReloadAtRef.current = Date.now()
-    void reloadFirstPage('important', { silent: true })
-    // Only refresh Other if it had been loaded — otherwise the chained
-    // effect handles it once Important hits hasReachedEnd.
-    if (otherHasThreadsRef.current) {
-      void reloadFirstPage('other', { silent: true })
-    }
-  }, [reloadFirstPage])
-
-  // Leading-edge throttle:
-  // - First event after a quiet period (≥ THROTTLE) → fire immediately.
-  // - During an active burst → queue a trailing fire at the next throttle
-  //   boundary. Subsequent events while a trailing fire is pending do nothing
-  //   (so a continuous stream of writes can't starve the reload).
-  const triggerLiveReload = useCallback(() => {
-    const sinceLast = Date.now() - lastReloadAtRef.current
-    if (sinceLast >= RELOAD_THROTTLE_MS && !reloadDebounceRef.current) {
-      doReload()
-      return
-    }
-    if (reloadDebounceRef.current) return
-    const wait = Math.max(200, RELOAD_THROTTLE_MS - sinceLast)
-    reloadDebounceRef.current = setTimeout(() => {
-      reloadDebounceRef.current = null
-      doReload()
-    }, wait)
-  }, [doReload])
-
-  useEffect(() => {
-    const cleanup = window.ipc.on('workspace:didChange', (event) => {
-      const matches = (p: string) => p.startsWith('inbox_lists/')
-      switch (event.type) {
-        case 'created':
-        case 'changed':
-        case 'deleted':
-          if (event.path && matches(event.path)) triggerLiveReload()
-          break
-        case 'moved':
-          if ((event.from && matches(event.from)) || (event.to && matches(event.to))) triggerLiveReload()
-          break
-        case 'bulkChanged':
-          if (event.paths?.some(matches)) triggerLiveReload()
-          break
-      }
-    })
-    return () => {
-      cleanup()
-      if (reloadDebounceRef.current) clearTimeout(reloadDebounceRef.current)
-    }
-  }, [triggerLiveReload])
-
-  // When user closes a thread, if updates arrived while they were reading, flush now.
-  useEffect(() => {
-    if (selectedThreadId !== null) return
-    if (!pendingReloadRef.current) return
-    pendingReloadRef.current = false
-    lastReloadAtRef.current = Date.now()
-    void reloadFirstPage('important', { silent: true })
-    if (otherHasThreadsRef.current) {
-      void reloadFirstPage('other', { silent: true })
-    }
-  }, [selectedThreadId, reloadFirstPage])
-
-  // Manual refresh: wake the background sync loop. It updates inbox_lists/,
-  // the watcher fires, and triggerLiveReload picks up the changes. The
-  // spinner is a UX cue — we stop it shortly after the sync poke.
-  const refreshInFlightRef = useRef(false)
-  const refresh = useCallback(async () => {
-    if (refreshInFlightRef.current) return
-    refreshInFlightRef.current = true
-    setRefreshing(true)
-    setError(null)
-    try {
-      await window.ipc.invoke('gmail:triggerSync', {})
-    } catch (err) {
-      console.warn('[Gmail] triggerSync failed:', err)
-      setError(err instanceof Error ? err.message : String(err))
-    } finally {
-      // Leave the spinner on briefly so the user sees feedback; the watcher
-      // will refresh the visible state once the sync cycle writes new files.
-      setTimeout(() => {
-        refreshInFlightRef.current = false
-        setRefreshing(false)
-      }, 800)
-    }
-  }, [])
-
-  // Kick off a live refresh on mount only when there's no persisted data —
-  // otherwise we'd clobber the snapshot the user already had.
-  useEffect(() => {
-    if (hadPersistedDataOnMount.current) return
-    void refresh()
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
-
-  const filterThreads = useCallback((threads: GmailThread[]) => {
-    const normalized = query.trim().toLowerCase()
-    if (!normalized) return threads
-    return threads.filter((thread) => {
-      const latest = latestMessage(thread)
-      return [
-        thread.subject,
-        latest?.from,
-        latest?.to,
-        latest?.body,
-      ].some(value => (value || '').toLowerCase().includes(normalized))
-    })
-  }, [query])
-
-  const visibleImportant = useMemo(() => filterThreads(important.threads), [important.threads, filterThreads])
-  const visibleOther = useMemo(() => filterThreads(other.threads), [other.threads, filterThreads])
-
-  const hasAny = important.threads.length > 0 || other.threads.length > 0
-  const initialLoading = !hasAny && refreshing
-  const needsEmailConnect = emailConnection?.connected === false
-  const needsEmailReconnect = emailConnection?.connected === true && !emailConnection.hasRequiredScope
-
-  const renderRow = (thread: GmailThread) => {
-    const latest = latestMessage(thread)
-    const isSelected = thread.threadId === selectedThreadId
-    const isUnread = thread.unread === true
-    const isMounted = openedThreadIds.includes(thread.threadId)
-    const stop = (e: React.MouseEvent | React.KeyboardEvent) => {
-      e.stopPropagation()
-    }
-    return (
-      <div key={thread.threadId} className="gmail-row-group">
-        <div
-          className={cn('gmail-row-shell', isSelected && 'gmail-row-shell-selected')}
-          onMouseEnter={() => scheduleHoverPrefetch(thread)}
-          onMouseLeave={cancelHoverPrefetch}
-        >
-          <button
-            type="button"
-            className={cn('gmail-row', isSelected && 'gmail-row-selected', isUnread && 'gmail-row-unread')}
-            onClick={() => toggleThread(thread)}
-          >
-            <span className="gmail-row-dot" aria-hidden />
-            <span className="gmail-row-sender">{extractName(latest?.from || thread.from)}</span>
-            <span className="gmail-row-content">
-              <strong>{thread.summary || thread.subject || '(No subject)'}</strong>
-              <span>{thread.summary ? thread.subject : snippet(latest?.body || thread.latest_email)}</span>
-            </span>
-            <span className="gmail-row-date">{formatInboxTime(latest?.date || thread.date)}</span>
-          </button>
-          <div className="gmail-row-actions" onMouseDown={stop} onClick={stop}>
-            {isUnread && (
-              <button
-                type="button"
-                className="gmail-row-action"
-                title="Mark as read"
-                aria-label="Mark as read"
-                onClick={(e) => { stop(e); void markThreadReadAction(thread.threadId) }}
-              >
-                <CheckCheck size={15} />
-              </button>
-            )}
-            <button
-              type="button"
-              className="gmail-row-action"
-              title="Archive"
-              aria-label="Archive"
-              onClick={(e) => { stop(e); void archiveThreadAction(thread.threadId) }}
-            >
-              <Archive size={15} />
-            </button>
-            <button
-              type="button"
-              className="gmail-row-action gmail-row-action-danger"
-              title="Delete"
-              aria-label="Delete"
-              onClick={(e) => { stop(e); void trashThreadAction(thread.threadId) }}
-            >
-              <Trash2 size={15} />
-            </button>
-          </div>
-        </div>
-        {isMounted && (
-          <ThreadDetail
-            thread={thread}
-            onClose={() => setSelectedThreadId(null)}
-            hidden={!isSelected}
-          />
-        )}
-      </div>
-    )
-  }
-
-  return (
-    <div className="gmail-shell">
-      <div className="gmail-main">
-        <div className="gmail-topbar">
-          <div className="gmail-search">
-            <Search size={18} />
-            <input
-              value={query}
-              onChange={(event) => setQuery(event.target.value)}
-              placeholder="Search loaded mail"
-            />
-          </div>
-          <button type="button" className="gmail-icon-button" onClick={() => void refresh()} aria-label="Refresh">
-            {refreshing ? <LoaderIcon size={18} className="animate-spin" /> : <RefreshCw size={18} />}
-          </button>
-        </div>
-
-        {error && !hasAny ? (
-          <div className="gmail-empty-state">Could not load mail: {error}</div>
-        ) : hasAny ? (
-          <div className="gmail-list" aria-label="Recent emails">
-            {important.threads.length > 0 && (
-              <section className="gmail-section">
-                <div className="gmail-list-header">
-                  <span>Important</span>
-                  <span>
-                    {important.threads.length}{important.hasReachedEnd ? '' : '+'} thread{important.threads.length === 1 ? '' : 's'}
-                  </span>
-                </div>
-                {visibleImportant.map(renderRow)}
-                {!important.hasReachedEnd && (
-                  <SectionSentinel
-                    disabled={important.loadingPage || important.hasReachedEnd}
-                    onIntersect={() => loadNextPage('important')}
-                    loading={important.loadingPage}
-                  />
-                )}
-              </section>
-            )}
-            {important.hasReachedEnd && other.threads.length > 0 && (
-              <section className="gmail-section">
-                <div className="gmail-list-header">
-                  <span>Everything else</span>
-                  <span>
-                    {other.threads.length}{other.hasReachedEnd ? '' : '+'} thread{other.threads.length === 1 ? '' : 's'}
-                  </span>
-                </div>
-                {visibleOther.map(renderRow)}
-                {!other.hasReachedEnd && (
-                  <SectionSentinel
-                    disabled={other.loadingPage || other.hasReachedEnd}
-                    onIntersect={() => loadNextPage('other')}
-                    loading={other.loadingPage}
-                  />
-                )}
-              </section>
-            )}
-          </div>
-        ) : needsEmailConnect || needsEmailReconnect ? (
-          <div className="gmail-empty-state flex flex-col items-center gap-3 py-16 text-center">
-            <Mail size={28} className="opacity-50" />
-            <p>
-              {needsEmailReconnect
-                ? 'Reconnect your email to enable Gmail sync and actions.'
-                : 'Connect your email to see your inbox here.'}
-            </p>
-            <button
-              type="button"
-              onClick={() => setSettingsOpen(true)}
-              className="inline-flex items-center gap-1.5 rounded-md border border-border bg-background px-3.5 py-1.5 text-sm font-medium text-foreground transition-colors hover:bg-accent"
-            >
-              <Mail size={15} />
-              {needsEmailReconnect ? 'Reconnect your email' : 'Connect your email'}
-            </button>
-          </div>
-        ) : (
-          <div className="gmail-empty-state">
-            {initialLoading ? 'Loading Gmail threads…' : 'No Gmail threads in your inbox cache yet.'}
-          </div>
-        )}
-      </div>
-      <SettingsDialog open={settingsOpen} onOpenChange={setSettingsOpen} defaultTab="connections" />
-    </div>
-  )
-}
-
-function SectionSentinel({
-  disabled,
-  onIntersect,
-  loading,
-}: {
-  disabled: boolean
-  onIntersect: () => void
-  loading: boolean
-}) {
-  const sentinelRef = useRef<HTMLDivElement>(null)
-  useEffect(() => {
-    if (disabled) return
-    const el = sentinelRef.current
-    if (!el) return
-    const observer = new IntersectionObserver((entries) => {
-      if (entries.some((entry) => entry.isIntersecting)) {
-        onIntersect()
-      }
-    }, { rootMargin: '200px' })
-    observer.observe(el)
-    return () => observer.disconnect()
-  }, [disabled, onIntersect])
-
-  return (
-    <div ref={sentinelRef} className="gmail-section-sentinel" aria-hidden>
-      {loading ? <LoaderIcon size={14} className="animate-spin" /> : null}
-    </div>
-  )
-}
diff --git a/apps/x/apps/renderer/src/components/help-popover.tsx b/apps/x/apps/renderer/src/components/help-popover.tsx
new file mode 100644
index 00000000..3ff08a5c
--- /dev/null
+++ b/apps/x/apps/renderer/src/components/help-popover.tsx
@@ -0,0 +1,100 @@
+"use client"
+
+import * as React from "react"
+import { useState } from "react"
+import { MessageCircle } from "lucide-react"
+
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover"
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "@/components/ui/tooltip"
+import { Button } from "@/components/ui/button"
+
+interface HelpPopoverProps {
+  children: React.ReactNode
+  tooltip?: string
+}
+
+export function HelpPopover({ children, tooltip }: HelpPopoverProps) {
+  const [open, setOpen] = useState(false)
+
+  const handleDiscordClick = () => {
+    window.open("https://discord.com/invite/wajrgmJQ6b", "_blank")
+  }
+
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      {tooltip ? (
+        <Tooltip open={open ? false : undefined}>
+          <TooltipTrigger asChild>
+            <PopoverTrigger asChild>
+              {children}
+            </PopoverTrigger>
+          </TooltipTrigger>
+          <TooltipContent side="right" sideOffset={8}>
+            {tooltip}
+          </TooltipContent>
+        </Tooltip>
+      ) : (
+        <PopoverTrigger asChild>
+          {children}
+        </PopoverTrigger>
+      )}
+      <PopoverContent
+        side="right"
+        align="end"
+        sideOffset={4}
+        className="w-80 p-0"
+      >
+        <div className="p-4 border-b">
+          <h4 className="font-semibold text-sm">Help & Support</h4>
+          <p className="text-xs text-muted-foreground mt-1">
+            Get help from our community
+          </p>
+        </div>
+        <div className="p-2">
+          <Button
+            variant="ghost"
+            className="w-full justify-start gap-3 h-auto py-3"
+            onClick={handleDiscordClick}
+          >
+            <div className="flex size-8 items-center justify-center rounded-md bg-[#5865F2]">
+              <MessageCircle className="size-4 text-white" />
+            </div>
+            <div className="flex flex-col items-start">
+              <span className="text-sm font-medium">Join our Discord</span>
+              <span className="text-xs text-muted-foreground">
+                Chat with the community
+              </span>
+            </div>
+          </Button>
+        </div>
+        <div className="px-4 py-3 border-t flex justify-center gap-3 text-xs text-muted-foreground">
+          <a
+            href="https://www.rowboatlabs.com/terms-of-service"
+            target="_blank"
+            rel="noopener noreferrer"
+            className="hover:text-foreground transition-colors"
+          >
+            Terms of Service
+          </a>
+          <span>·</span>
+          <a
+            href="https://www.rowboatlabs.com/privacy-policy"
+            target="_blank"
+            rel="noopener noreferrer"
+            className="hover:text-foreground transition-colors"
+          >
+            Privacy Policy
+          </a>
+        </div>
+      </PopoverContent>
+    </Popover>
+  )
+}
diff --git a/apps/x/apps/renderer/src/components/home-view.tsx b/apps/x/apps/renderer/src/components/home-view.tsx
deleted file mode 100644
index bfcc0a33..00000000
--- a/apps/x/apps/renderer/src/components/home-view.tsx
+++ /dev/null
@@ -1,593 +0,0 @@
-import { useCallback, useEffect, useMemo, useState } from 'react'
-import { ArrowRight, Bot, Calendar, Clock, FileText, Mail, MessageSquare, Mic, Plug, Plus, Video } from 'lucide-react'
-import { extractConferenceLink } from '@/lib/calendar-event'
-import { SettingsDialog } from '@/components/settings-dialog'
-
-interface TreeNode {
-  path: string
-  name: string
-  kind: 'file' | 'dir'
-  children?: TreeNode[]
-  stat?: { size: number; mtimeMs: number }
-}
-
-type RunItem = { id: string; title?: string; createdAt: string }
-type TaskItem = { slug: string; name: string; active: boolean; lastRunAt?: string; lastAttemptAt?: string }
-
-type HomeViewProps = {
-  tree: TreeNode[]
-  runs: RunItem[]
-  bgTaskSummaries: TaskItem[]
-  onOpenEmail: () => void
-  onOpenMeetings: () => void
-  onOpenAgents: () => void
-  onOpenAgent: (slug: string) => void
-  onOpenNote: (path: string) => void
-  onOpenRun: (runId: string) => void
-  onTakeMeetingNotes: () => void
-  onOpenChat?: () => void
-}
-
-type CalEvent = {
-  id: string
-  summary: string
-  start: Date
-  end: Date | null
-  isAllDay: boolean
-  conferenceLink: string | null
-  rawStart: { dateTime?: string; date?: string } | undefined
-  rawEnd: { dateTime?: string; date?: string } | undefined
-  location: string | null
-  htmlLink: string | null
-  source: string
-}
-
-type RawCalEvent = {
-  id?: string
-  summary?: string
-  start?: { dateTime?: string; date?: string }
-  end?: { dateTime?: string; date?: string }
-  location?: string
-  htmlLink?: string
-  status?: string
-  attendees?: Array<{ self?: boolean; responseStatus?: string }>
-}
-
-type EmailThread = { threadId: string; subject: string; from: string }
-type ToolkitPreview = { slug: string; logo: string; name: string; description: string }
-
-function greeting(): string {
-  const h = new Date().getHours()
-  if (h < 12) return 'Good morning'
-  if (h < 18) return 'Good afternoon'
-  return 'Good evening'
-}
-
-function todayLabel(): string {
-  return new Date().toLocaleDateString([], { weekday: 'short', day: 'numeric', month: 'short' })
-}
-
-function timeOfDay(d: Date): string {
-  return d.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })
-}
-
-function relativeFromNow(start: Date): string {
-  const ms = start.getTime() - Date.now()
-  if (ms <= 0) return 'now'
-  const min = Math.round(ms / 60000)
-  if (min < 60) return `in ${min}m`
-  const hr = Math.round(min / 60)
-  if (hr < 24) return `in ${hr}h`
-  return start.toLocaleDateString([], { weekday: 'short' })
-}
-
-function relativeAgo(iso?: string): string {
-  if (!iso) return ''
-  const t = new Date(iso).getTime()
-  if (Number.isNaN(t)) return ''
-  const min = Math.round((Date.now() - t) / 60000)
-  if (min < 1) return 'just now'
-  if (min < 60) return `${min}m ago`
-  const hr = Math.round(min / 60)
-  if (hr < 24) return `${hr}h ago`
-  const d = Math.round(hr / 24)
-  return `${d}d ago`
-}
-
-function parseAllDay(s: string): Date | null {
-  const m = /^(\d{4})-(\d{2})-(\d{2})/.exec(s)
-  if (!m) return null
-  return new Date(Number(m[1]), Number(m[2]) - 1, Number(m[3]))
-}
-
-function normalizeCalEvent(raw: RawCalEvent, sourcePath: string): CalEvent | null {
-  if (raw.status === 'cancelled') return null
-  const declined = raw.attendees?.find((a) => a.self)?.responseStatus === 'declined'
-  if (declined) return null
-  const timed = raw.start?.dateTime
-  const allDay = raw.start?.date
-  const isAllDay = !timed && Boolean(allDay)
-  let start: Date | null = null
-  let end: Date | null = null
-  if (timed) {
-    start = new Date(timed)
-    end = raw.end?.dateTime ? new Date(raw.end.dateTime) : null
-  } else if (allDay) {
-    start = parseAllDay(allDay)
-    end = raw.end?.date ? parseAllDay(raw.end.date) : null
-  }
-  if (!start || Number.isNaN(start.getTime())) return null
-  return {
-    id: raw.id ?? sourcePath,
-    summary: raw.summary?.trim() || '(No title)',
-    start,
-    end,
-    isAllDay,
-    conferenceLink: extractConferenceLink(raw as unknown as Record<string, unknown>) ?? null,
-    rawStart: raw.start,
-    rawEnd: raw.end,
-    location: raw.location?.trim() || null,
-    htmlLink: raw.htmlLink ?? null,
-    source: sourcePath,
-  }
-}
-
-function noteLabel(node: TreeNode): string {
-  if (node.kind === 'file' && node.name.toLowerCase().endsWith('.md')) return node.name.slice(0, -3)
-  return node.name
-}
-
-function triggerMeetingCapture(event: CalEvent, openConference: boolean) {
-  window.__pendingCalendarEvent = {
-    summary: event.summary,
-    start: event.rawStart,
-    end: event.rawEnd,
-    location: event.location ?? undefined,
-    htmlLink: event.htmlLink ?? undefined,
-    conferenceLink: event.conferenceLink ?? undefined,
-    source: event.source,
-  }
-  if (openConference && event.conferenceLink) {
-    window.open(event.conferenceLink, '_blank')
-  }
-  window.dispatchEvent(new Event('calendar-block:join-meeting'))
-}
-
-const CARD = 'rounded-xl border border-border bg-card p-4'
-const TOOLKIT_PREVIEW_LIMIT = 8
-
-let cachedToolkitPreviews: ToolkitPreview[] | null = null
-let cachedToolkitLogosLoaded = false
-
-function ToolkitPreviewIcon({
-  toolkit,
-  onInvalid,
-}: {
-  toolkit: ToolkitPreview
-  onInvalid: (slug: string) => void
-}) {
-  const [loaded, setLoaded] = useState(false)
-
-  if (!loaded) {
-    return (
-      <img
-        src={toolkit.logo}
-        alt=""
-        className="hidden"
-        onLoad={(event) => {
-          const img = event.currentTarget
-          if (img.naturalWidth > 1 && img.naturalHeight > 1) {
-            setLoaded(true)
-          } else {
-            onInvalid(toolkit.slug)
-          }
-        }}
-        onError={() => onInvalid(toolkit.slug)}
-      />
-    )
-  }
-
-  return (
-    <div
-      title={`${toolkit.name}: ${toolkit.description}`}
-      aria-label={toolkit.name}
-      className="flex size-6 shrink-0 items-center justify-center rounded-md border border-border bg-muted/60"
-    >
-      <img
-        src={toolkit.logo}
-        alt=""
-        className="size-5 shrink-0 object-contain"
-        onError={() => onInvalid(toolkit.slug)}
-      />
-    </div>
-  )
-}
-
-export function HomeView({
-  tree,
-  runs,
-  bgTaskSummaries,
-  onOpenEmail,
-  onOpenMeetings,
-  onOpenAgents,
-  onOpenAgent,
-  onOpenNote,
-  onOpenRun,
-  onTakeMeetingNotes,
-  onOpenChat,
-}: HomeViewProps) {
-  const [events, setEvents] = useState<CalEvent[]>([])
-  const [emails, setEmails] = useState<EmailThread[]>([])
-  const [toolkitPreviews, setToolkitPreviews] = useState<ToolkitPreview[]>(cachedToolkitPreviews ?? [])
-  const [toolkitLogosLoaded, setToolkitLogosLoaded] = useState(cachedToolkitLogosLoaded)
-  const [connectionsSettingsOpen, setConnectionsSettingsOpen] = useState(false)
-
-  const loadEvents = useCallback(async () => {
-    try {
-      const exists = await window.ipc.invoke('workspace:exists', { path: 'calendar_sync' })
-      if (!exists.exists) { setEvents([]); return }
-      const entries = await window.ipc.invoke('workspace:readdir', {
-        path: 'calendar_sync',
-        opts: { recursive: false, includeHidden: false, includeStats: false },
-      })
-      const jsonEntries = entries.filter((e) => e.kind === 'file' && e.name.endsWith('.json'))
-      const settled = await Promise.allSettled(
-        jsonEntries.map(async (entry): Promise<CalEvent | null> => {
-          const result = await window.ipc.invoke('workspace:readFile', { path: entry.path, encoding: 'utf8' })
-          return normalizeCalEvent(JSON.parse(result.data) as RawCalEvent, entry.path)
-        }),
-      )
-      const out: CalEvent[] = []
-      for (const r of settled) if (r.status === 'fulfilled' && r.value) out.push(r.value)
-      out.sort((a, b) => a.start.getTime() - b.start.getTime())
-      setEvents(out)
-    } catch (err) {
-      console.error('Home: failed to load events', err)
-    }
-  }, [])
-
-  const loadEmails = useCallback(async () => {
-    try {
-      const result = await window.ipc.invoke('gmail:getImportant', { limit: 25 })
-      setEmails(
-        result.threads
-          .filter((t) => t.unread === true)
-          .slice(0, 3)
-          .map((t) => ({ threadId: t.threadId, subject: t.subject ?? '(No subject)', from: t.from ?? '' })),
-      )
-    } catch (err) {
-      console.error('Home: failed to load emails', err)
-    }
-  }, [])
-
-  const loadConnectorLogos = useCallback(async () => {
-    if (cachedToolkitLogosLoaded) return
-    try {
-      const configured = await window.ipc.invoke('composio:is-configured', null)
-      if (!configured.configured) return
-      const toolkits = await window.ipc.invoke('composio:list-toolkits', {})
-      const previews = toolkits.items
-        .filter((toolkit) => Boolean(toolkit.meta.logo))
-        .slice(0, TOOLKIT_PREVIEW_LIMIT)
-        .map((toolkit) => ({
-          slug: toolkit.slug,
-          logo: toolkit.meta.logo,
-          name: toolkit.name,
-          description: toolkit.meta.description,
-        }))
-      cachedToolkitPreviews = previews
-      setToolkitPreviews(previews)
-    } catch {
-      cachedToolkitPreviews = []
-    } finally {
-      cachedToolkitLogosLoaded = true
-      setToolkitLogosLoaded(true)
-    }
-  }, [])
-
-  const removeToolkitPreview = useCallback((slug: string) => {
-    setToolkitPreviews((prev) => {
-      const next = prev.filter((toolkit) => toolkit.slug !== slug)
-      cachedToolkitPreviews = next
-      return next
-    })
-  }, [])
-
-  useEffect(() => { void loadEvents(); void loadEmails(); void loadConnectorLogos() }, [loadEvents, loadEmails, loadConnectorLogos])
-
-  // Upcoming (not-yet-ended) events, soonest first.
-  const upcoming = useMemo(() => {
-    const now = Date.now()
-    return events.filter((e) => {
-      const end = e.end ?? (e.isAllDay ? new Date(e.start.getTime() + 864e5) : e.start)
-      return end.getTime() > now
-    })
-  }, [events])
-
-  const nextEvent = upcoming[0]
-
-  const todaysEvents = useMemo(() => {
-    const now = new Date()
-    return upcoming.filter((e) =>
-      e.start.getFullYear() === now.getFullYear() &&
-      e.start.getMonth() === now.getMonth() &&
-      e.start.getDate() === now.getDate(),
-    )
-  }, [upcoming])
-
-  const activeAgents = useMemo(() => bgTaskSummaries.filter((t) => t.active), [bgTaskSummaries])
-  const recentAgent = useMemo(() => {
-    const t = (s?: string) => (s ? new Date(s).getTime() || 0 : 0)
-    return [...bgTaskSummaries].sort((a, b) =>
-      Math.max(t(b.lastRunAt), t(b.lastAttemptAt)) - Math.max(t(a.lastRunAt), t(a.lastAttemptAt)),
-    )[0]
-  }, [bgTaskSummaries])
-
-  const recentNotes = useMemo<TreeNode[]>(() => {
-    const out: TreeNode[] = []
-    const walk = (nodes: TreeNode[]) => {
-      for (const n of nodes) {
-        if (n.path === 'knowledge/Meetings' || n.path === 'knowledge/Workspace') continue
-        if (n.kind === 'file') out.push(n)
-        else if (n.children?.length) walk(n.children)
-      }
-    }
-    walk(tree)
-    return out
-      .filter((n) => n.stat?.mtimeMs)
-      .sort((a, b) => (b.stat?.mtimeMs ?? 0) - (a.stat?.mtimeMs ?? 0))
-      .slice(0, 2)
-  }, [tree])
-
-  const recentActivity = useMemo(() => {
-    const items: Array<{ key: string; icon: 'note' | 'chat'; label: string; kind: string; when: number; open: () => void }> = []
-    for (const n of recentNotes) {
-      items.push({ key: `n:${n.path}`, icon: 'note', label: noteLabel(n), kind: 'note', when: n.stat?.mtimeMs ?? 0, open: () => onOpenNote(n.path) })
-    }
-    for (const r of runs.slice(0, 4)) {
-      items.push({ key: `r:${r.id}`, icon: 'chat', label: r.title || '(Untitled chat)', kind: 'chat', when: new Date(r.createdAt).getTime() || 0, open: () => onOpenRun(r.id) })
-    }
-    return items.sort((a, b) => b.when - a.when).slice(0, 4)
-  }, [recentNotes, runs, onOpenNote, onOpenRun])
-
-  return (
-    <div className="flex h-full flex-col overflow-hidden bg-muted/30">
-      <div className="flex-1 overflow-y-auto px-9 py-7">
-        <div className="mx-auto flex max-w-[760px] flex-col gap-[18px]">
-
-          {/* Greeting */}
-          <div className="flex items-baseline gap-3">
-            <h1 className="text-[28px] font-semibold tracking-tight">{greeting()}</h1>
-            <span className="text-sm text-muted-foreground">{todayLabel()}</span>
-          </div>
-
-          {/* Up-next hero */}
-          {nextEvent && (
-            <div className="flex items-center gap-[18px] rounded-xl bg-foreground p-[18px] text-background">
-              <div className="flex size-[52px] shrink-0 items-center justify-center rounded-xl bg-background/10">
-                <Mic className="size-[22px]" />
-              </div>
-              <div className="min-w-0 flex-1">
-                <div className="mb-1 text-[11px] uppercase tracking-wide text-background/55">
-                  Up next · {nextEvent.isAllDay ? 'today' : relativeFromNow(nextEvent.start)}
-                </div>
-                <div className="mb-0.5 truncate text-[17px] font-medium">{nextEvent.summary}</div>
-                <div className="truncate text-[13px] text-background/70">
-                  {nextEvent.isAllDay ? 'All day' : `${timeOfDay(nextEvent.start)}${nextEvent.end ? ` – ${timeOfDay(nextEvent.end)}` : ''}`}
-                  {nextEvent.location ? ` · ${nextEvent.location}` : ''}
-                </div>
-              </div>
-              <div className="flex shrink-0 gap-2">
-                <button
-                  type="button"
-                  onClick={onTakeMeetingNotes}
-                  className="rounded-md bg-background px-3.5 py-2 text-[13px] font-medium text-foreground"
-                >
-                  Take notes
-                </button>
-                {nextEvent.conferenceLink && (
-                  <button
-                    type="button"
-                    onClick={() => window.open(nextEvent.conferenceLink!, '_blank')}
-                    className="rounded-md border border-background/20 px-3 py-2 text-background"
-                    aria-label="Join meeting"
-                  >
-                    <Video className="size-[13px]" />
-                  </button>
-                )}
-              </div>
-            </div>
-          )}
-
-          {/* Inbox + Background agents */}
-          <div className="grid grid-cols-2 gap-[18px]">
-            <div className={CARD}>
-              <div className="mb-3 flex items-center gap-2">
-                <Mail className="size-[15px]" />
-                <span className="text-sm font-medium">Inbox</span>
-                {emails.length > 0 && (
-                  <span className="rounded-lg bg-destructive px-1.5 py-px text-[10.5px] font-semibold uppercase tracking-wide text-white">
-                    {emails.length} new
-                  </span>
-                )}
-                <span className="flex-1" />
-                <button type="button" onClick={onOpenEmail} className="text-xs text-primary hover:underline">Open →</button>
-              </div>
-              {emails.length === 0 ? (
-                <div className="py-1 text-[12.5px] text-muted-foreground">No unread important email.</div>
-              ) : emails.map((e, i) => (
-                <button
-                  key={e.threadId}
-                  type="button"
-                  onClick={onOpenEmail}
-                  className={`flex w-full gap-2.5 py-[7px] text-left text-[12.5px] ${i ? 'border-t border-border' : ''}`}
-                >
-                  <span className="w-[92px] shrink-0 truncate text-muted-foreground">{formatFrom(e.from)}</span>
-                  <span className="flex-1 truncate">{e.subject}</span>
-                </button>
-              ))}
-            </div>
-
-            <div className={CARD}>
-              <div className="mb-3 flex items-center gap-2">
-                <Bot className="size-[15px]" />
-                <span className="text-sm font-medium">Background agents</span>
-                <span className="flex-1" />
-                <span className="text-xs text-muted-foreground">{activeAgents.length} active</span>
-                <button type="button" onClick={onOpenAgents} className="text-xs text-primary hover:underline">Open →</button>
-              </div>
-              {recentAgent ? (
-                <button
-                  type="button"
-                  onClick={() => onOpenAgent(recentAgent.slug)}
-                  className="flex w-full items-center gap-2.5 py-[7px] text-left text-[13px]"
-                >
-                  <span className={`size-2 shrink-0 rounded-full ${recentAgent.active ? 'bg-emerald-500' : 'bg-muted-foreground'}`} />
-                  <span className="flex-1 truncate font-medium">{recentAgent.name}</span>
-                  <span className="text-[11.5px] text-muted-foreground">{relativeAgo(recentAgent.lastRunAt) || '—'}</span>
-                </button>
-              ) : (
-                <div className="py-1 text-[12.5px] text-muted-foreground">No agents yet.</div>
-              )}
-              <button
-                type="button"
-                onClick={onOpenAgents}
-                className="mt-3.5 flex items-center gap-2 border-t border-border pt-3 text-[12.5px] text-primary"
-              >
-                <Plus className="size-3" />
-                Create an agent
-              </button>
-            </div>
-          </div>
-
-          {/* Today's schedule */}
-          <div className={CARD}>
-            <div className="mb-3.5 flex items-center gap-2">
-              <Calendar className="size-[14px]" />
-              <span className="text-sm font-medium">Today's schedule</span>
-              <span className="flex-1" />
-              <button type="button" onClick={onOpenMeetings} className="text-xs text-primary hover:underline">All meetings →</button>
-            </div>
-            {todaysEvents.length === 0 ? (
-              <div className="py-1 text-[13px] italic text-muted-foreground">No more events today.</div>
-            ) : todaysEvents.map((e, i) => (
-              <div key={e.id} className={`group flex items-center gap-3.5 py-2 text-[13px] ${i ? 'border-t border-border' : ''}`}>
-                <span className="w-[90px] shrink-0 font-mono text-[11.5px] text-muted-foreground">
-                  {e.isAllDay ? 'All day' : `${timeOfDay(e.start)}${e.end ? ` – ${timeOfDay(e.end)}` : ''}`}
-                </span>
-                <span className={`size-2 shrink-0 rounded-full ${i === 0 ? 'bg-emerald-500' : 'bg-border'}`} />
-                <span className="min-w-0 flex-1 truncate font-medium">{e.summary}</span>
-                <div className="flex shrink-0 items-center gap-1 opacity-0 transition-opacity group-hover:opacity-100 focus-within:opacity-100">
-                  <button
-                    type="button"
-                    onClick={() => triggerMeetingCapture(e, false)}
-                    className="inline-flex items-center gap-1 rounded-md border border-border px-2 py-1 text-[11.5px] text-foreground transition-colors hover:bg-accent"
-                  >
-                    <Mic className="size-3" />
-                    Take notes
-                  </button>
-                  {e.conferenceLink && (
-                    <button
-                      type="button"
-                      onClick={() => triggerMeetingCapture(e, true)}
-                      className="inline-flex items-center gap-1 rounded-md border border-border px-2 py-1 text-[11.5px] text-foreground transition-colors hover:bg-accent"
-                    >
-                      <Video className="size-3" />
-                      Join &amp; take notes
-                    </button>
-                  )}
-                </div>
-              </div>
-            ))}
-          </div>
-
-          {/* Recent activity */}
-          {recentActivity.length > 0 && (
-            <div className={CARD}>
-              <div className="mb-3 flex items-center gap-2">
-                <Clock className="size-[14px]" />
-                <span className="text-sm font-medium">Recent activity</span>
-              </div>
-              {recentActivity.map((a, i) => (
-                <button
-                  key={a.key}
-                  type="button"
-                  onClick={a.open}
-                  className={`flex w-full items-center gap-3 py-2 text-left text-[13px] ${i ? 'border-t border-border' : ''}`}
-                >
-                  {a.icon === 'note' ? <FileText className="size-[13px] shrink-0 text-muted-foreground" /> : <MessageSquare className="size-[13px] shrink-0 text-muted-foreground" />}
-                  <span className="flex-1 truncate">{a.label}</span>
-                  <span className="w-[60px] text-right text-[11px] text-muted-foreground">{a.kind}</span>
-                </button>
-              ))}
-            </div>
-          )}
-
-          {/* Tool connections */}
-          <div className={CARD}>
-            <div className="flex items-start gap-3">
-              <div className="flex size-8 shrink-0 items-center justify-center rounded-lg border border-border bg-muted text-muted-foreground">
-                <Plug className="size-[14px]" />
-              </div>
-              <div className="min-w-0 flex-1">
-                <div className="text-[13.5px] leading-snug">
-                  <span className="font-medium">Connect your tools.</span>
-                  <span className="text-muted-foreground"> Bring context from the apps you already use.</span>
-                </div>
-                <div className="mt-3 flex min-h-5 flex-wrap items-center gap-1.5">
-                  {toolkitLogosLoaded && toolkitPreviews.map((toolkit) => (
-                    <ToolkitPreviewIcon
-                      key={toolkit.slug}
-                      toolkit={toolkit}
-                      onInvalid={removeToolkitPreview}
-                    />
-                  ))}
-                  <button
-                    type="button"
-                    onClick={() => setConnectionsSettingsOpen(true)}
-                    className="ml-1 flex h-5 shrink-0 items-center gap-1 rounded-md px-1 text-[12px] font-medium text-primary hover:underline"
-                  >
-                    Connections
-                    <ArrowRight className="size-3" />
-                  </button>
-                </div>
-              </div>
-            </div>
-          </div>
-          <SettingsDialog
-            defaultTab="connections"
-            open={connectionsSettingsOpen}
-            onOpenChange={setConnectionsSettingsOpen}
-          />
-
-          {/* Open chat CTA */}
-          {onOpenChat && (
-            <button
-              type="button"
-              onClick={onOpenChat}
-              className="flex items-center gap-3.5 rounded-xl border border-border bg-card p-4 text-left transition-colors hover:bg-accent"
-            >
-              <div className="flex size-9 shrink-0 items-center justify-center rounded-lg border border-border bg-card text-muted-foreground">
-                <MessageSquare className="size-[15px]" />
-              </div>
-              <div className="min-w-0 flex-1 text-[13.5px] leading-snug">
-                <span className="font-medium">Ask anything</span>
-                <span className="text-muted-foreground"> — create presentations, do research, collaborate on docs.</span>
-              </div>
-              <span className="flex shrink-0 items-center gap-1 text-[12.5px] font-medium text-primary">
-                New chat
-                <ArrowRight className="size-3.5" />
-              </span>
-            </button>
-          )}
-
-        </div>
-      </div>
-    </div>
-  )
-}
-
-function formatFrom(from: string): string {
-  const m = /^\s*"?([^"<]+?)"?\s*<.+>\s*$/.exec(from)
-  return (m ? m[1] : from).trim()
-}
diff --git a/apps/x/apps/renderer/src/components/html-file-viewer.tsx b/apps/x/apps/renderer/src/components/html-file-viewer.tsx
index 8343af28..994ab73e 100644
--- a/apps/x/apps/renderer/src/components/html-file-viewer.tsx
+++ b/apps/x/apps/renderer/src/components/html-file-viewer.tsx
@@ -1,11 +1,33 @@
-import { useEffect, useMemo, useState } from 'react'
+import { useEffect, useState } from 'react'
 import { AlertCircleIcon, ExternalLinkIcon, FileTextIcon, Loader2Icon } from 'lucide-react'
 
 const MAX_SIZE_BYTES = 5 * 1024 * 1024
+const CACHE_MAX_ENTRIES = 20
+
+type CacheEntry = { html: string; mtimeMs: number; size: number }
+const htmlCache = new Map<string, CacheEntry>()
+
+function getCached(path: string, mtimeMs: number, size: number): string | null {
+  const entry = htmlCache.get(path)
+  if (!entry || entry.mtimeMs !== mtimeMs || entry.size !== size) return null
+  // Refresh LRU position
+  htmlCache.delete(path)
+  htmlCache.set(path, entry)
+  return entry.html
+}
+
+function setCached(path: string, html: string, mtimeMs: number, size: number) {
+  htmlCache.set(path, { html, mtimeMs, size })
+  while (htmlCache.size > CACHE_MAX_ENTRIES) {
+    const oldest = htmlCache.keys().next().value
+    if (oldest === undefined) break
+    htmlCache.delete(oldest)
+  }
+}
 
 type ViewerState =
   | { kind: 'loading' }
-  | { kind: 'loaded' }
+  | { kind: 'loaded'; html: string }
   | { kind: 'empty' }
   | { kind: 'tooLarge'; sizeMB: number }
   | { kind: 'error'; message: string }
@@ -14,15 +36,9 @@ interface HtmlFileViewerProps {
   path: string
 }
 
-function toAppWorkspaceUrl(path: string): string {
-  const segments = path.split('/').filter(Boolean).map((seg) => encodeURIComponent(seg))
-  return `app://workspace/${segments.join('/')}`
-}
-
 export function HtmlFileViewer({ path }: HtmlFileViewerProps) {
   const [state, setState] = useState<ViewerState>({ kind: 'loading' })
   const [iframeLoaded, setIframeLoaded] = useState(false)
-  const iframeSrc = useMemo(() => toAppWorkspaceUrl(path), [path])
 
   useEffect(() => {
     let cancelled = false
@@ -41,11 +57,19 @@ export function HtmlFileViewer({ path }: HtmlFileViewerProps) {
           setState({ kind: 'tooLarge', sizeMB: stat.size / (1024 * 1024) })
           return
         }
-        if (stat.size === 0) {
+        const cachedHtml = getCached(path, stat.mtimeMs, stat.size)
+        if (cachedHtml !== null) {
+          setState(cachedHtml.trim() === '' ? { kind: 'empty' } : { kind: 'loaded', html: cachedHtml })
+          return
+        }
+        const result = await window.ipc.invoke('workspace:readFile', { path })
+        if (cancelled) return
+        setCached(path, result.data, stat.mtimeMs, stat.size)
+        if (!result.data || result.data.trim() === '') {
           setState({ kind: 'empty' })
           return
         }
-        setState({ kind: 'loaded' })
+        setState({ kind: 'loaded', html: result.data })
       } catch (err) {
         if (cancelled) return
         const message = err instanceof Error ? err.message : String(err)
@@ -100,16 +124,20 @@ export function HtmlFileViewer({ path }: HtmlFileViewerProps) {
     )
   }
 
-  // Serve via the `app://workspace/<rel-path>` protocol so the iframe has a
-  // proper base URL — relative `<link>`, `<img>`, `<script>` references next
-  // to the file resolve correctly (the path-traversal guard in
-  // resolveWorkspacePath already gates the protocol handler).
+  // We use `srcDoc` here (not `src=app://workspace/<path>`) so the iframe
+  // gets a null origin with no base URL. Trade-off: relative assets inside
+  // the file — `<link href="./style.css">`, `<img src="./pic.png">`,
+  // `<script src="./foo.js">` — will silently 404. Self-contained HTML
+  // works fine; HTML that ships next to sibling assets will look broken.
+  // TODO: switch to `src=app://workspace/<path>` if we want relative-asset
+  // support; that path also resolves through the existing path-traversal
+  // guard in resolveWorkspacePath.
   return (
     <div className="relative h-full w-full">
       {state.kind === 'loaded' && (
         <iframe
           key={path}
-          src={iframeSrc}
+          srcDoc={state.html}
           sandbox="allow-scripts"
           className="h-full w-full border-0 bg-white"
           title="HTML preview"
diff --git a/apps/x/apps/renderer/src/components/knowledge-view.tsx b/apps/x/apps/renderer/src/components/knowledge-view.tsx
deleted file mode 100644
index e7ebe780..00000000
--- a/apps/x/apps/renderer/src/components/knowledge-view.tsx
+++ /dev/null
@@ -1,803 +0,0 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import {
-  ArrowLeft,
-  ChevronRight,
-  Copy,
-  ExternalLink,
-  FilePlus,
-  FileText,
-  FolderOpen,
-  FolderPlus,
-  Network,
-  Pencil,
-  SearchIcon,
-  Table2,
-  Trash2,
-} from 'lucide-react'
-
-import {
-  ContextMenu,
-  ContextMenuContent,
-  ContextMenuItem,
-  ContextMenuSeparator,
-  ContextMenuTrigger,
-} from '@/components/ui/context-menu'
-import { Input } from '@/components/ui/input'
-import { VoiceNoteButton } from '@/components/sidebar-content'
-import { formatRelativeTime } from '@/lib/relative-time'
-import { toast } from '@/lib/toast'
-import { cn } from '@/lib/utils'
-
-interface TreeNode {
-  path: string
-  name: string
-  kind: 'file' | 'dir'
-  children?: TreeNode[]
-  stat?: { size: number; mtimeMs: number }
-}
-
-export type KnowledgeViewActions = {
-  createNote: (parentPath?: string) => void
-  createFolder: (parentPath?: string) => Promise<string>
-  rename: (path: string, newName: string, isDir: boolean) => Promise<void>
-  remove: (path: string) => Promise<void>
-  copyPath: (path: string) => void
-  revealInFileManager: (path: string, isDir: boolean) => void
-  onOpenInNewTab?: (path: string) => void
-}
-
-type KnowledgeViewProps = {
-  tree: TreeNode[]
-  actions: KnowledgeViewActions
-  // Folder currently being browsed (null = root overview). Controlled by the
-  // app so drill-down participates in the global back/forward history.
-  folderPath: string | null
-  onNavigateFolder: (path: string | null) => void
-  onOpenNote: (path: string) => void
-  onOpenGraph: () => void
-  onOpenSearch: () => void
-  onOpenBases: () => void
-  onVoiceNoteCreated?: (path: string) => void
-}
-
-// Folders that have their own dedicated destinations elsewhere in the app.
-const HIDDEN_PATHS = new Set(['knowledge/Meetings', 'knowledge/Workspace'])
-
-// Theme-aware accent palette for folder avatars — colored letter on a faint
-// tint of the same hue. Mirrors the design's six-colour rotation.
-const AVATAR_PALETTE = [
-  'bg-indigo-500/10 text-indigo-600 dark:text-indigo-400',
-  'bg-violet-500/10 text-violet-600 dark:text-violet-400',
-  'bg-amber-500/10 text-amber-600 dark:text-amber-400',
-  'bg-rose-500/10 text-rose-600 dark:text-rose-400',
-  'bg-emerald-500/10 text-emerald-600 dark:text-emerald-400',
-  'bg-sky-500/10 text-sky-600 dark:text-sky-400',
-] as const
-
-function avatarClass(name: string): string {
-  let hash = 0
-  for (let i = 0; i < name.length; i++) hash = (hash * 31 + name.charCodeAt(i)) >>> 0
-  return AVATAR_PALETTE[hash % AVATAR_PALETTE.length]
-}
-
-function isMarkdown(node: TreeNode): boolean {
-  return node.kind === 'file' && node.name.toLowerCase().endsWith('.md')
-}
-
-// All markdown notes within a node (recurses into subfolders).
-function collectNotes(node: TreeNode): TreeNode[] {
-  if (node.kind === 'file') return isMarkdown(node) ? [node] : []
-  const out: TreeNode[] = []
-  for (const child of node.children ?? []) out.push(...collectNotes(child))
-  return out
-}
-
-function recentNotes(node: TreeNode, limit: number): TreeNode[] {
-  return collectNotes(node)
-    .sort((a, b) => (b.stat?.mtimeMs ?? 0) - (a.stat?.mtimeMs ?? 0))
-    .slice(0, limit)
-}
-
-function latestMtime(node: TreeNode): number {
-  let max = node.stat?.mtimeMs ?? 0
-  for (const child of node.children ?? []) max = Math.max(max, latestMtime(child))
-  return max
-}
-
-function sortNodes(nodes: TreeNode[]): TreeNode[] {
-  return [...nodes].sort((a, b) => {
-    if (a.kind !== b.kind) return a.kind === 'dir' ? -1 : 1
-    return a.name.localeCompare(b.name)
-  })
-}
-
-function findNode(nodes: TreeNode[], path: string): TreeNode | null {
-  for (const node of nodes) {
-    if (node.path === path) return node
-    if (node.children) {
-      const found = findNode(node.children, path)
-      if (found) return found
-    }
-  }
-  return null
-}
-
-function formatModified(mtimeMs?: number): string {
-  if (!mtimeMs) return ''
-  const rel = formatRelativeTime(new Date(mtimeMs).toISOString())
-  if (!rel || rel === 'just now') return rel
-  return `${rel} ago`
-}
-
-function getFileManagerName(): string {
-  if (typeof navigator === 'undefined') return 'File Manager'
-  const platform = navigator.platform.toLowerCase()
-  if (platform.includes('mac')) return 'Finder'
-  if (platform.includes('win')) return 'Explorer'
-  return 'File Manager'
-}
-
-function displayName(node: TreeNode): string {
-  if (isMarkdown(node)) return node.name.slice(0, -3)
-  return node.name
-}
-
-export function KnowledgeView({
-  tree,
-  actions,
-  folderPath,
-  onNavigateFolder,
-  onOpenNote,
-  onOpenGraph,
-  onOpenSearch,
-  onOpenBases,
-  onVoiceNoteCreated,
-}: KnowledgeViewProps) {
-  const [renameTarget, setRenameTarget] = useState<string | null>(null)
-
-  const topLevel = useMemo(
-    () => tree.filter((n) => !HIDDEN_PATHS.has(n.path)),
-    [tree],
-  )
-
-  const folders = useMemo(
-    () => sortNodes(topLevel.filter((n) => n.kind === 'dir')),
-    [topLevel],
-  )
-  const looseNotes = useMemo(
-    () => sortNodes(topLevel.filter((n) => isMarkdown(n))),
-    [topLevel],
-  )
-
-  const totalNotes = useMemo(
-    () => topLevel.reduce((sum, n) => sum + collectNotes(n).length, 0),
-    [topLevel],
-  )
-
-  const openFolder = useCallback((path: string) => onNavigateFolder(path), [onNavigateFolder])
-
-  // When the open folder no longer exists (deleted/renamed externally), fall
-  // back to the root overview rather than holding a dangling drill-down.
-  const currentFolder = folderPath ? findNode(tree, folderPath) : null
-
-  return (
-    <div className="flex h-full flex-col overflow-hidden">
-      <div className="shrink-0 flex items-start justify-between gap-4 border-b border-border px-8 py-6">
-        <div className="min-w-0">
-          <h1 className="text-2xl font-bold tracking-tight">Notes</h1>
-          <p className="mt-1 text-sm text-muted-foreground">
-            {totalNotes} {totalNotes === 1 ? 'note' : 'notes'} across {folders.length}{' '}
-            {folders.length === 1 ? 'folder' : 'folders'}
-          </p>
-        </div>
-        <div className="flex shrink-0 items-center gap-2">
-          <VoiceNoteButton onNoteCreated={onVoiceNoteCreated} />
-          <SecondaryButton icon={SearchIcon} label="Search" onClick={onOpenSearch} />
-          <SecondaryButton icon={Network} label="Graph" onClick={onOpenGraph} />
-          <button
-            type="button"
-            onClick={() => actions.createNote(currentFolder?.path)}
-            className="inline-flex items-center gap-1.5 rounded-lg bg-primary px-3 py-1.5 text-sm font-medium text-primary-foreground transition-colors hover:bg-primary/90"
-          >
-            <FilePlus className="size-4" />
-            <span>New note</span>
-          </button>
-        </div>
-      </div>
-
-      <div className="flex-1 overflow-y-auto">
-        <div className="mx-auto w-full max-w-3xl px-8 py-6">
-          {currentFolder ? (
-            <FolderDetail
-              folder={currentFolder}
-              actions={actions}
-              renameTarget={renameTarget}
-              onRequestRename={setRenameTarget}
-              onClearRename={() => setRenameTarget(null)}
-              onNavigate={onNavigateFolder}
-              onOpenFolder={openFolder}
-              onOpenNote={onOpenNote}
-            />
-          ) : (
-            <>
-              <SectionHeader label={`Folders · ${folders.length}`} aside="Sorted by name" />
-              {folders.length === 0 ? (
-                <EmptyState text="No folders yet." />
-              ) : (
-                <div className="overflow-hidden rounded-xl border border-border">
-                  {folders.map((node, i) => (
-                    <div key={node.path} className={cn(i > 0 && 'border-t border-border/60')}>
-                      <FolderCard
-                        node={node}
-                        actions={actions}
-                        renameTarget={renameTarget}
-                        onRequestRename={setRenameTarget}
-                        onClearRename={() => setRenameTarget(null)}
-                        onOpenFolder={openFolder}
-                        onOpenNote={onOpenNote}
-                      />
-                    </div>
-                  ))}
-                </div>
-              )}
-
-              {looseNotes.length > 0 && (
-                <div className="mt-8">
-                  <SectionHeader label={`Loose notes · ${looseNotes.length}`} />
-                  <div className="overflow-hidden rounded-xl border border-border">
-                    {looseNotes.map((node, i) => (
-                      <div key={node.path} className={cn(i > 0 && 'border-t border-border/60')}>
-                        <ItemRow
-                          node={node}
-                          actions={actions}
-                          renameTarget={renameTarget}
-                          onRequestRename={setRenameTarget}
-                          onClearRename={() => setRenameTarget(null)}
-                          onOpenFolder={openFolder}
-                          onOpenNote={onOpenNote}
-                        />
-                      </div>
-                    ))}
-                  </div>
-                </div>
-              )}
-            </>
-          )}
-
-          <QuickActions
-            actions={actions}
-            currentFolder={currentFolder}
-            onOpenBases={onOpenBases}
-            onFolderCreated={setRenameTarget}
-          />
-        </div>
-      </div>
-    </div>
-  )
-}
-
-function QuickActions({
-  actions,
-  currentFolder,
-  onOpenBases,
-  onFolderCreated,
-}: {
-  actions: KnowledgeViewActions
-  currentFolder: TreeNode | null
-  onOpenBases: () => void
-  onFolderCreated: (path: string) => void
-}) {
-  // Inside a folder these target that folder; at the root they target knowledge/.
-  const parent = currentFolder?.path
-  return (
-    <div className="mt-8">
-      <SectionHeader label="Quick actions" />
-      <div className="flex flex-wrap gap-2">
-        <QuickAction icon={FilePlus} label="New note" onClick={() => actions.createNote(parent)} />
-        <QuickAction
-          icon={FolderPlus}
-          label="New folder"
-          onClick={async () => {
-            try {
-              const path = await actions.createFolder(parent)
-              onFolderCreated(path)
-            } catch { /* ignore */ }
-          }}
-        />
-        <QuickAction icon={Table2} label="Open as base" onClick={onOpenBases} />
-        <QuickAction
-          icon={FolderOpen}
-          label={`Reveal in ${getFileManagerName()}`}
-          onClick={() => actions.revealInFileManager(parent ?? 'knowledge', true)}
-        />
-      </div>
-    </div>
-  )
-}
-
-function SecondaryButton({
-  icon: Icon,
-  label,
-  onClick,
-}: {
-  icon: typeof SearchIcon
-  label: string
-  onClick: () => void
-}) {
-  return (
-    <button
-      type="button"
-      onClick={onClick}
-      className="inline-flex items-center gap-1.5 rounded-lg border border-border bg-background px-3 py-1.5 text-sm text-foreground transition-colors hover:bg-accent"
-    >
-      <Icon className="size-4" />
-      <span>{label}</span>
-    </button>
-  )
-}
-
-function QuickAction({
-  icon: Icon,
-  label,
-  onClick,
-}: {
-  icon: typeof FilePlus
-  label: string
-  onClick: () => void
-}) {
-  return (
-    <button
-      type="button"
-      onClick={onClick}
-      className="inline-flex items-center gap-2 rounded-lg border border-border bg-background px-3 py-2 text-sm text-foreground transition-colors hover:bg-accent"
-    >
-      <Icon className="size-4 text-muted-foreground" />
-      <span>{label}</span>
-    </button>
-  )
-}
-
-function SectionHeader({ label, aside }: { label: string; aside?: string }) {
-  return (
-    <div className="mb-2.5 flex items-center justify-between">
-      <span className="text-[11px] font-semibold uppercase tracking-wider text-muted-foreground">
-        {label}
-      </span>
-      {aside && <span className="text-xs text-muted-foreground">{aside}</span>}
-    </div>
-  )
-}
-
-function EmptyState({ text }: { text: string }) {
-  return (
-    <div className="rounded-xl border border-dashed border-border px-6 py-10 text-center text-sm text-muted-foreground">
-      {text}
-    </div>
-  )
-}
-
-function FolderAvatar({ name, className }: { name: string; className?: string }) {
-  return (
-    <div
-      className={cn(
-        'flex size-8 shrink-0 items-center justify-center rounded-md text-[13px] font-bold',
-        avatarClass(name),
-        className,
-      )}
-    >
-      {name.charAt(0).toUpperCase() || '?'}
-    </div>
-  )
-}
-
-function FolderCard({
-  node,
-  actions,
-  renameTarget,
-  onRequestRename,
-  onClearRename,
-  onOpenFolder,
-  onOpenNote,
-}: {
-  node: TreeNode
-  actions: KnowledgeViewActions
-  renameTarget: string | null
-  onRequestRename: (path: string) => void
-  onClearRename: () => void
-  onOpenFolder: (path: string) => void
-  onOpenNote: (path: string) => void
-}) {
-  const count = useMemo(() => collectNotes(node).length, [node])
-  const peek = useMemo(() => recentNotes(node, 3), [node])
-  const modified = formatModified(latestMtime(node))
-  const renameActive = renameTarget === node.path
-
-  const card = (
-    <div
-      role="button"
-      tabIndex={0}
-      onClick={() => onOpenFolder(node.path)}
-      onKeyDown={(e) => {
-        if (e.key === 'Enter' || e.key === ' ') {
-          e.preventDefault()
-          onOpenFolder(node.path)
-        }
-      }}
-      className="group flex w-full cursor-pointer items-start gap-3 px-4 py-3 text-left transition-colors hover:bg-accent/50"
-    >
-      <FolderAvatar name={node.name} className="mt-0.5" />
-      <div className="min-w-0 flex-1">
-        {renameActive ? (
-          <RenameField
-            initial={node.name}
-            isDir
-            path={node.path}
-            actions={actions}
-            onDone={onClearRename}
-          />
-        ) : (
-          <span className="block truncate text-sm font-semibold text-foreground">
-            {node.name}
-          </span>
-        )}
-        <div className="mt-0.5 text-xs text-muted-foreground">
-          {count} {count === 1 ? 'note' : 'notes'}
-        </div>
-        {peek.length > 0 && (
-          <div className="mt-2 flex flex-wrap gap-1.5">
-            {peek.map((n) => (
-              <button
-                key={n.path}
-                type="button"
-                onClick={(e) => {
-                  e.stopPropagation()
-                  onOpenNote(n.path)
-                }}
-                className="max-w-[200px] truncate rounded-full border border-border/60 bg-muted px-2.5 py-0.5 text-xs text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
-              >
-                {displayName(n)}
-              </button>
-            ))}
-          </div>
-        )}
-      </div>
-      <div className="flex shrink-0 items-center gap-2 pt-1">
-        <span className="text-xs text-muted-foreground tabular-nums whitespace-nowrap">
-          {modified}
-        </span>
-        <ChevronRight className="size-4 text-muted-foreground/40 opacity-0 transition-opacity group-hover:opacity-100" />
-      </div>
-    </div>
-  )
-
-  return (
-    <RowContextMenu node={node} actions={actions} onRequestRename={onRequestRename}>
-      {card}
-    </RowContextMenu>
-  )
-}
-
-function FolderDetail({
-  folder,
-  actions,
-  renameTarget,
-  onRequestRename,
-  onClearRename,
-  onNavigate,
-  onOpenFolder,
-  onOpenNote,
-}: {
-  folder: TreeNode
-  actions: KnowledgeViewActions
-  renameTarget: string | null
-  onRequestRename: (path: string) => void
-  onClearRename: () => void
-  onNavigate: (path: string | null) => void
-  onOpenFolder: (path: string) => void
-  onOpenNote: (path: string) => void
-}) {
-  const items = useMemo(() => sortNodes(folder.children ?? []), [folder])
-
-  // Breadcrumb segments from "knowledge/A/B" → [{ name: 'A', path }, ...].
-  const crumbs = useMemo(() => {
-    const rel = folder.path.startsWith('knowledge/')
-      ? folder.path.slice('knowledge/'.length)
-      : folder.path
-    const parts = rel.split('/').filter(Boolean)
-    const out: { name: string; path: string }[] = []
-    let acc = 'knowledge'
-    for (const part of parts) {
-      acc = `${acc}/${part}`
-      out.push({ name: part, path: acc })
-    }
-    return out
-  }, [folder.path])
-
-  return (
-    <>
-      <div className="mb-4 flex min-w-0 items-center gap-1.5 text-sm">
-        <button
-          type="button"
-          onClick={() => {
-            const parent = crumbs.length >= 2 ? crumbs[crumbs.length - 2].path : null
-            onNavigate(parent)
-          }}
-          className="inline-flex items-center gap-1 rounded-md px-1.5 py-1 text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
-          aria-label="Back"
-        >
-          <ArrowLeft className="size-4" />
-        </button>
-        <button
-          type="button"
-          onClick={() => onNavigate(null)}
-          className="rounded-md px-1.5 py-1 text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
-        >
-          Notes
-        </button>
-        {crumbs.map((c, i) => (
-          <span key={c.path} className="flex min-w-0 items-center gap-1.5">
-            <ChevronRight className="size-3.5 shrink-0 text-muted-foreground/50" />
-            {i === crumbs.length - 1 ? (
-              <span className="truncate font-medium text-foreground">{c.name}</span>
-            ) : (
-              <button
-                type="button"
-                onClick={() => onNavigate(c.path)}
-                className="truncate rounded-md px-1.5 py-1 text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
-              >
-                {c.name}
-              </button>
-            )}
-          </span>
-        ))}
-      </div>
-
-      <SectionHeader label={`${items.length} ${items.length === 1 ? 'item' : 'items'}`} />
-      {items.length === 0 ? (
-        <EmptyState text="This folder is empty." />
-      ) : (
-        <div className="overflow-hidden rounded-xl border border-border">
-          {items.map((node, i) => (
-            <div key={node.path} className={cn(i > 0 && 'border-t border-border/60')}>
-              <ItemRow
-                node={node}
-                actions={actions}
-                renameTarget={renameTarget}
-                onRequestRename={onRequestRename}
-                onClearRename={onClearRename}
-                onOpenFolder={onOpenFolder}
-                onOpenNote={onOpenNote}
-              />
-            </div>
-          ))}
-        </div>
-      )}
-    </>
-  )
-}
-
-function ItemRow({
-  node,
-  actions,
-  renameTarget,
-  onRequestRename,
-  onClearRename,
-  onOpenFolder,
-  onOpenNote,
-}: {
-  node: TreeNode
-  actions: KnowledgeViewActions
-  renameTarget: string | null
-  onRequestRename: (path: string) => void
-  onClearRename: () => void
-  onOpenFolder: (path: string) => void
-  onOpenNote: (path: string) => void
-}) {
-  const isDir = node.kind === 'dir'
-  const renameActive = renameTarget === node.path
-  const modified = formatModified(isDir ? latestMtime(node) : node.stat?.mtimeMs)
-  const count = useMemo(() => (isDir ? collectNotes(node).length : 0), [isDir, node])
-
-  const handleOpen = useCallback(() => {
-    if (isDir) onOpenFolder(node.path)
-    else onOpenNote(node.path)
-  }, [isDir, node.path, onOpenFolder, onOpenNote])
-
-  const row = (
-    <div
-      role="button"
-      tabIndex={0}
-      onClick={handleOpen}
-      onKeyDown={(e) => {
-        if (e.key === 'Enter' || e.key === ' ') {
-          e.preventDefault()
-          handleOpen()
-        }
-      }}
-      className="group flex w-full cursor-pointer items-center gap-3 px-4 py-2.5 text-left transition-colors hover:bg-accent/50"
-    >
-      {isDir ? (
-        <FolderAvatar name={node.name} />
-      ) : (
-        <div className="flex size-8 shrink-0 items-center justify-center rounded-md bg-muted text-muted-foreground">
-          <FileText className="size-4" />
-        </div>
-      )}
-      <div className="min-w-0 flex-1">
-        {renameActive ? (
-          <RenameField
-            initial={displayName(node)}
-            isDir={isDir}
-            path={node.path}
-            actions={actions}
-            onDone={onClearRename}
-          />
-        ) : (
-          <span className="block truncate text-sm text-foreground">{displayName(node)}</span>
-        )}
-        {isDir && (
-          <div className="mt-0.5 text-xs text-muted-foreground">
-            {count} {count === 1 ? 'note' : 'notes'}
-          </div>
-        )}
-      </div>
-      <div className="flex shrink-0 items-center gap-2">
-        <span className="text-xs text-muted-foreground tabular-nums whitespace-nowrap">
-          {modified}
-        </span>
-        {isDir && (
-          <ChevronRight className="size-4 text-muted-foreground/40 opacity-0 transition-opacity group-hover:opacity-100" />
-        )}
-      </div>
-    </div>
-  )
-
-  return (
-    <RowContextMenu node={node} actions={actions} onRequestRename={onRequestRename}>
-      {row}
-    </RowContextMenu>
-  )
-}
-
-function RenameField({
-  initial,
-  isDir,
-  path,
-  actions,
-  onDone,
-}: {
-  initial: string
-  isDir: boolean
-  path: string
-  actions: KnowledgeViewActions
-  onDone: () => void
-}) {
-  const [value, setValue] = useState(initial)
-  const inputRef = useRef<HTMLInputElement | null>(null)
-  const isSubmittingRef = useRef(false)
-
-  useEffect(() => {
-    requestAnimationFrame(() => {
-      inputRef.current?.focus()
-      inputRef.current?.select()
-    })
-  }, [])
-
-  const submit = useCallback(async () => {
-    if (isSubmittingRef.current) return
-    isSubmittingRef.current = true
-    const trimmed = value.trim()
-    if (trimmed && trimmed !== initial) {
-      try {
-        await actions.rename(path, trimmed, isDir)
-        toast('Renamed successfully', 'success')
-      } catch {
-        toast('Failed to rename', 'error')
-      }
-    }
-    onDone()
-  }, [actions, initial, isDir, onDone, path, value])
-
-  const cancel = useCallback(() => {
-    isSubmittingRef.current = true
-    onDone()
-  }, [onDone])
-
-  return (
-    <Input
-      ref={inputRef}
-      value={value}
-      onChange={(e) => setValue(e.target.value)}
-      onClick={(e) => e.stopPropagation()}
-      onKeyDown={(e) => {
-        e.stopPropagation()
-        if (e.key === 'Enter') {
-          e.preventDefault()
-          void submit()
-        } else if (e.key === 'Escape') {
-          e.preventDefault()
-          cancel()
-        }
-      }}
-      onBlur={() => {
-        if (!isSubmittingRef.current) void submit()
-      }}
-      className="h-7 text-sm"
-    />
-  )
-}
-
-function RowContextMenu({
-  node,
-  actions,
-  onRequestRename,
-  children,
-}: {
-  node: TreeNode
-  actions: KnowledgeViewActions
-  onRequestRename: (path: string) => void
-  children: React.ReactNode
-}) {
-  const isDir = node.kind === 'dir'
-
-  const handleDelete = useCallback(async () => {
-    try {
-      await actions.remove(node.path)
-      toast('Moved to trash', 'success')
-    } catch {
-      toast('Failed to delete', 'error')
-    }
-  }, [actions, node.path])
-
-  const handleCopyPath = useCallback(() => {
-    actions.copyPath(node.path)
-    toast('Path copied', 'success')
-  }, [actions, node.path])
-
-  return (
-    <ContextMenu>
-      <ContextMenuTrigger asChild>{children}</ContextMenuTrigger>
-      <ContextMenuContent className="w-48" onCloseAutoFocus={(e) => e.preventDefault()}>
-        {isDir && (
-          <>
-            <ContextMenuItem onClick={() => actions.createNote(node.path)}>
-              <FilePlus className="mr-2 size-4" />
-              New Note
-            </ContextMenuItem>
-            <ContextMenuItem onClick={() => void actions.createFolder(node.path)}>
-              <FolderPlus className="mr-2 size-4" />
-              New Folder
-            </ContextMenuItem>
-            <ContextMenuSeparator />
-          </>
-        )}
-        {!isDir && actions.onOpenInNewTab && (
-          <>
-            <ContextMenuItem onClick={() => actions.onOpenInNewTab!(node.path)}>
-              <ExternalLink className="mr-2 size-4" />
-              Open in new tab
-            </ContextMenuItem>
-            <ContextMenuSeparator />
-          </>
-        )}
-        <ContextMenuItem onClick={handleCopyPath}>
-          <Copy className="mr-2 size-4" />
-          Copy Path
-        </ContextMenuItem>
-        <ContextMenuItem onClick={() => actions.revealInFileManager(node.path, isDir)}>
-          <FolderOpen className="mr-2 size-4" />
-          Open in {getFileManagerName()}
-        </ContextMenuItem>
-        <ContextMenuSeparator />
-        <ContextMenuItem onClick={() => onRequestRename(node.path)}>
-          <Pencil className="mr-2 size-4" />
-          Rename
-        </ContextMenuItem>
-        <ContextMenuItem variant="destructive" onClick={handleDelete}>
-          <Trash2 className="mr-2 size-4" />
-          Delete
-        </ContextMenuItem>
-      </ContextMenuContent>
-    </ContextMenu>
-  )
-}
diff --git a/apps/x/apps/renderer/src/components/live-note-sidebar.tsx b/apps/x/apps/renderer/src/components/live-note-sidebar.tsx
index 1510e6c9..3aa9cf2c 100644
--- a/apps/x/apps/renderer/src/components/live-note-sidebar.tsx
+++ b/apps/x/apps/renderer/src/components/live-note-sidebar.tsx
@@ -15,8 +15,13 @@ import type { Run } from '@x/shared/dist/runs.js'
 import type z from 'zod'
 import { useLiveNoteAgentStatus } from '@/hooks/use-live-note-agent-status'
 import { formatRelativeTime } from '@/lib/relative-time'
+import {
+  type ConversationItem, type ToolCall,
+  isChatMessage, isToolCall, isErrorMessage,
+  getToolDisplayName, toToolState, normalizeToolOutput,
+} from '@/lib/chat-conversation'
 import { runLogToConversation } from '@/lib/run-to-conversation'
-import { CompactConversation } from '@/components/compact-conversation'
+import { Tool, ToolHeader, ToolContent, ToolTabbedContent } from '@/components/ai-elements/tool'
 
 export type OpenLiveNotePanelDetail = {
   filePath: string
@@ -762,6 +767,60 @@ function LastRunTab({ live }: { live: LiveNote }) {
   )
 }
 
+function CompactConversation({ items }: { items: ConversationItem[] }) {
+  return (
+    <div className="flex flex-col gap-2.5">
+      {items.map((item) => {
+        if (isErrorMessage(item)) {
+          return (
+            <div key={item.id} className="rounded-md border border-destructive/30 bg-destructive/10 px-3 py-2 text-xs text-destructive">
+              {item.message}
+            </div>
+          )
+        }
+        if (isToolCall(item)) return <CompactToolRow key={item.id} tool={item} />
+        if (isChatMessage(item)) {
+          const isUser = item.role === 'user'
+          return (
+            <div key={item.id} className={isUser ? 'flex justify-end' : ''}>
+              <div className={isUser
+                ? 'max-w-[85%] rounded-lg bg-secondary px-3 py-2 text-xs text-foreground whitespace-pre-wrap break-words'
+                : 'w-full text-xs text-foreground'}>
+                {isUser ? (
+                  item.content
+                ) : (
+                  <Streamdown className="prose prose-sm dark:prose-invert max-w-none [&>*:first-child]:mt-0 [&>*:last-child]:mb-0 [&_p]:my-1.5 [&_ul]:my-1.5 [&_ol]:my-1.5 [&_pre]:my-2 [&_pre]:text-[11px] [&_code]:text-[11px]">
+                    {item.content}
+                  </Streamdown>
+                )}
+              </div>
+            </div>
+          )
+        }
+        return null
+      })}
+    </div>
+  )
+}
+
+function CompactToolRow({ tool }: { tool: ToolCall }) {
+  const [open, setOpen] = useState(false)
+  const title = getToolDisplayName(tool)
+  const state = toToolState(tool.status)
+  const errorText = tool.status === 'error' && typeof tool.result === 'string' ? tool.result : undefined
+  return (
+    <Tool open={open} onOpenChange={setOpen} className="mb-0 text-xs">
+      <ToolHeader title={title} type={`tool-${tool.name}` as `tool-${string}`} state={state} />
+      <ToolContent>
+        <ToolTabbedContent
+          input={tool.input}
+          output={normalizeToolOutput(tool.result, tool.status) ?? undefined}
+          errorText={errorText}
+        />
+      </ToolContent>
+    </Tool>
+  )
+}
 
 function TriggersEditor({
   draft,
diff --git a/apps/x/apps/renderer/src/components/markdown-editor.tsx b/apps/x/apps/renderer/src/components/markdown-editor.tsx
index 7b742008..3666f446 100644
--- a/apps/x/apps/renderer/src/components/markdown-editor.tsx
+++ b/apps/x/apps/renderer/src/components/markdown-editor.tsx
@@ -1,5 +1,5 @@
 import { useEditor, EditorContent, Extension, Editor } from '@tiptap/react'
-import { Plugin, PluginKey, TextSelection } from '@tiptap/pm/state'
+import { Plugin, PluginKey } from '@tiptap/pm/state'
 import { Decoration, DecorationSet, EditorView } from '@tiptap/pm/view'
 import StarterKit from '@tiptap/starter-kit'
 import Link from '@tiptap/extension-link'
@@ -83,8 +83,7 @@ function nodeToText(node: JsonNode): string {
       return text
     } else if (child.type === 'wikiLink') {
       const path = (child.attrs?.path as string) || ''
-      const label = (child.attrs?.label as string | null | undefined) || ''
-      return path ? `[[${path}${label ? `|${label}` : ''}]]` : ''
+      return path ? `[[${path}]]` : ''
     } else if (child.type === 'hardBreak') {
       return '\n'
     }
@@ -190,8 +189,7 @@ function blockToMarkdown(node: JsonNode): string {
       return '---'
     case 'wikiLink': {
       const path = (node.attrs?.path as string) || ''
-      const label = (node.attrs?.label as string | null | undefined) || ''
-      return `[[${path}${label ? `|${label}` : ''}]]`
+      return `[[${path}]]`
     }
     case 'image': {
       const src = (node.attrs?.src as string) || ''
@@ -299,7 +297,7 @@ import { FrontmatterProperties } from './frontmatter-properties'
 import { WikiLink } from '@/extensions/wiki-link'
 import { Popover, PopoverAnchor, PopoverContent } from '@/components/ui/popover'
 import { Command, CommandEmpty, CommandItem, CommandList } from '@/components/ui/command'
-import { ensureMarkdownExtension, normalizeWikiPath, splitWikiFragment, wikiLabel } from '@/lib/wiki-links'
+import { ensureMarkdownExtension, normalizeWikiPath, wikiLabel } from '@/lib/wiki-links'
 import { extractAllFrontmatterValues, buildFrontmatter } from '@/lib/frontmatter'
 import { RowboatMentionPopover } from './rowboat-mention-popover'
 import '@/styles/editor.css'
@@ -525,106 +523,6 @@ const TabIndentExtension = Extension.create({
   },
 })
 
-const slugifyHeading = (text: string) =>
-  text
-    .trim()
-    .toLowerCase()
-    .replace(/[^\w\s-]/g, '')
-    .replace(/\s+/g, '-')
-    .replace(/-+/g, '-')
-
-const decodeLinkTarget = (target: string) => {
-  try {
-    return decodeURIComponent(target)
-  } catch {
-    return target
-  }
-}
-
-const scrollToHeading = (view: EditorView, rawTarget: string) => {
-  const target = decodeLinkTarget(rawTarget.replace(/^#/, '')).trim()
-  if (!target) return false
-
-  const targetSlug = slugifyHeading(target)
-  let foundPos: number | null = null
-  view.state.doc.descendants((node, pos) => {
-    if (node.type.name !== 'heading') return true
-    const headingText = node.textContent.trim()
-    if (
-      headingText.toLowerCase() === target.toLowerCase()
-      || slugifyHeading(headingText) === targetSlug
-    ) {
-      foundPos = pos
-      return false
-    }
-    return true
-  })
-
-  if (foundPos === null) return false
-
-  const selectionPos = Math.min(foundPos + 1, view.state.doc.content.size)
-  view.dispatch(
-    view.state.tr.setSelection(TextSelection.near(view.state.doc.resolve(selectionPos)))
-  )
-  view.focus()
-
-  const domAtPos = view.domAtPos(foundPos + 1)
-  const node = domAtPos.node
-  const headingEl = node.nodeType === Node.ELEMENT_NODE
-    ? (node as HTMLElement)
-    : node.parentElement
-  headingEl?.scrollIntoView({ block: 'start', behavior: 'smooth' })
-  return true
-}
-
-const stripMarkdownExtension = (path: string) =>
-  path.toLowerCase().endsWith('.md') ? path.slice(0, -3) : path
-
-const isSameNotePath = (linkPath: string, notePath?: string) => {
-  if (!notePath) return false
-  const normalizedLink = stripMarkdownExtension(normalizeWikiPath(linkPath)).toLowerCase()
-  const normalizedNote = stripMarkdownExtension(normalizeWikiPath(notePath)).toLowerCase()
-  return normalizedLink === normalizedNote
-}
-
-const isExternalHref = (href: string) =>
-  /^(https?:|mailto:|tel:)/i.test(href)
-
-const collapseRelativeSegments = (relPath: string) => {
-  const parts = relPath.split('/').filter((part) => part !== '' && part !== '.')
-  const stack: string[] = []
-  for (const part of parts) {
-    if (part === '..') {
-      if (stack.length === 0) return null
-      stack.pop()
-    } else {
-      stack.push(part)
-    }
-  }
-  return stack.join('/')
-}
-
-const resolveWorkspaceLinkPath = (href: string, notePath?: string) => {
-  const withoutHash = href.split('#')[0]
-  const withoutQuery = withoutHash.split('?')[0]
-  const decoded = decodeLinkTarget(withoutQuery)
-  if (!decoded) return null
-
-  if (/^file:\/\//i.test(decoded)) {
-    try {
-      return decodeURIComponent(new URL(decoded).pathname)
-    } catch {
-      return decoded
-    }
-  }
-
-  if (/^[a-zA-Z]:[\\/]/.test(decoded) || decoded.startsWith('/')) return decoded
-  if (decoded.startsWith('knowledge/') || !notePath) return collapseRelativeSegments(decoded.replace(/^\.\//, ''))
-
-  const noteDir = notePath.split('/').slice(0, -1).join('/')
-  return collapseRelativeSegments(`${noteDir}/${decoded.replace(/^\.\//, '')}`)
-}
-
 export interface MarkdownEditorHandle {
   /** Returns {path, lineNumber} for the cursor's current position, or null if no notePath / no editor. */
   getCursorContext: () => { path: string; lineNumber: number } | null
@@ -648,13 +546,6 @@ export const MarkdownEditor = forwardRef<MarkdownEditorHandle, MarkdownEditorPro
 }, ref) {
   const isInternalUpdate = useRef(false)
   const wrapperRef = useRef<HTMLDivElement>(null)
-  // Read wikiLinks lazily inside the editor config via this ref. wikiLinks changes
-  // identity whenever the workspace directory tree changes (file watcher → new file
-  // list), and it used to be a useEditor() dependency — so any background write to
-  // the workspace destroyed and recreated the entire editor, resetting scroll to the
-  // top. Keeping it off the dep array (and reading the ref at event time) means the
-  // editor instance survives directory changes.
-  const wikiLinksRef = useRef(wikiLinks)
   const [activeWikiLink, setActiveWikiLink] = useState<WikiLinkMatch | null>(null)
   const [anchorPosition, setAnchorPosition] = useState<{ left: number; top: number } | null>(null)
   const [selectionHighlight, setSelectionHighlight] = useState<SelectionHighlightRange>(null)
@@ -677,7 +568,6 @@ export const MarkdownEditor = forwardRef<MarkdownEditorHandle, MarkdownEditorPro
 
   // Keep ref in sync with state for the plugin to access
   selectionHighlightRef.current = selectionHighlight
-  wikiLinksRef.current = wikiLinks
 
   // Memoize the selection highlight extension
   const selectionHighlightExtension = useMemo(
@@ -754,7 +644,6 @@ export const MarkdownEditor = forwardRef<MarkdownEditorHandle, MarkdownEditorPro
         heading: {
           levels: [1, 2, 3],
         },
-        link: false,
       }),
       Link.configure({
         openOnClick: false,
@@ -784,9 +673,11 @@ export const MarkdownEditor = forwardRef<MarkdownEditorHandle, MarkdownEditorPro
       TranscriptBlockExtension,
       MermaidBlockExtension,
       WikiLink.configure({
-        onCreate: (path: string) => {
-          void wikiLinksRef.current?.onCreate?.(path)
-        },
+        onCreate: wikiLinks?.onCreate
+          ? (path: string) => {
+              void wikiLinks.onCreate(path)
+            }
+          : undefined,
       }),
       TaskList,
       TaskItem.configure({
@@ -913,57 +804,15 @@ export const MarkdownEditor = forwardRef<MarkdownEditorHandle, MarkdownEditorPro
       handleClickOn: (_view, _pos, node, _nodePos, event) => {
         if (node.type.name === 'wikiLink') {
           event.preventDefault()
-          const wikiPath = String(node.attrs.path ?? '')
-          const { path: linkedNotePath, heading } = splitWikiFragment(wikiPath)
-          if (heading && (!linkedNotePath || isSameNotePath(linkedNotePath, notePath))) {
-            return scrollToHeading(_view, heading)
-          }
-          wikiLinksRef.current?.onOpen?.(node.attrs.path)
+          wikiLinks?.onOpen?.(node.attrs.path)
           return true
         }
         return false
       },
-      handleDOMEvents: {
-        click: (view, event) => {
-          const target = event.target as Element | null
-          const link = target?.closest('a[href]') as HTMLAnchorElement | null
-          if (!link) return false
-          if (link.dataset.type === 'wiki-link') return false
-
-          const href = link.getAttribute('href') ?? ''
-          if (!href) return false
-
-          if (href.startsWith('#')) {
-            event.preventDefault()
-            return scrollToHeading(view, href)
-          }
-
-          if (isExternalHref(href)) {
-            event.preventDefault()
-            window.open(href, '_blank')
-            return true
-          }
-
-          const workspacePath = resolveWorkspaceLinkPath(href, notePath)
-          if (!workspacePath) return false
-
-          event.preventDefault()
-          void window.ipc.invoke('shell:openPath', { path: workspacePath }).then((result) => {
-            if (result.error) console.error('Failed to open linked file:', result.error)
-          }).catch((err) => {
-            console.error('Failed to open linked file:', err)
-          })
-          return true
-        },
-      },
     },
-    // NOTE: wikiLinks is intentionally NOT a dependency — it's read via wikiLinksRef
-    // at event time. Including it rebuilds the whole editor on every directory change
-    // (file watcher), which resets scroll to the top. See wikiLinksRef declaration.
   }, [
     editorSessionKey,
     maybeCommitPrimaryHeading,
-    notePath,
     preventTitleHeadingDemotion,
     promoteFirstParagraphToTitleHeading,
   ])
@@ -1211,37 +1060,11 @@ export const MarkdownEditor = forwardRef<MarkdownEditorHandle, MarkdownEditorPro
       // Normalize for comparison (trim trailing whitespace from lines)
       const normalizeForCompare = (s: string) => s.split('\n').map(line => line.trimEnd()).join('\n').trim()
       if (normalizeForCompare(currentContent) !== normalizeForCompare(content)) {
-        // Preserve scroll + selection across an external content sync. setContent()
-        // resets the selection to the top of the doc and ProseMirror scrolls it into
-        // view; without restoring, a background writer touching the open file (graph
-        // builder, live-note runner, version-history commit) yanks the viewport back
-        // to the top repeatedly — making the note impossible to scroll. This editor
-        // instance is bound to a single note path, so the prior scrollTop is always
-        // valid for the reloaded content.
-        const wrapper = wrapperRef.current
-        const prevScrollTop = wrapper?.scrollTop ?? 0
-        const hadFocus = editor.isFocused
-        const { from: prevFrom, to: prevTo } = editor.state.selection
-
         isInternalUpdate.current = true
         const preprocessed = preprocessMarkdown(content)
         // Treat tab-open content as baseline: do not add hydration to undo history.
         editor.chain().setMeta('addToHistory', false).setContent(preprocessed).run()
-
-        // Only restore the caret for a focused editor, so we never steal focus or
-        // scroll for a passive viewer. Clamp to the (possibly shorter) new doc.
-        if (hadFocus) {
-          const docSize = editor.state.doc.content.size
-          const from = Math.min(prevFrom, docSize)
-          const to = Math.min(prevTo, docSize)
-          try {
-            editor.chain().setMeta('addToHistory', false).setTextSelection({ from, to }).run()
-          } catch { /* selection no longer valid in the new doc — ignore */ }
-        }
         isInternalUpdate.current = false
-
-        // Restore scroll last so it wins over any scrollIntoView triggered above.
-        if (wrapper) wrapper.scrollTop = prevScrollTop
       }
     }
   }, [editor, content])
diff --git a/apps/x/apps/renderer/src/components/meetings-view.tsx b/apps/x/apps/renderer/src/components/meetings-view.tsx
deleted file mode 100644
index ef9a5864..00000000
--- a/apps/x/apps/renderer/src/components/meetings-view.tsx
+++ /dev/null
@@ -1,1080 +0,0 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { createPortal } from 'react-dom'
-import { Calendar, ChevronDown, Clock, ExternalLink, Loader2, MapPin, Mic, Square, UserRound, UsersRound, Video, X } from 'lucide-react'
-
-import { Button } from '@/components/ui/button'
-import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
-import { SettingsDialog } from '@/components/settings-dialog'
-import { formatRelativeTime } from '@/lib/relative-time'
-import { extractConferenceLink } from '@/lib/calendar-event'
-import { cn } from '@/lib/utils'
-import type { MeetingTranscriptionState } from '@/hooks/useMeetingTranscription'
-
-const MEETINGS_ROOT = 'knowledge/Meetings'
-const CALENDAR_DIR = 'calendar_sync'
-const UPCOMING_MAX_DAYS = 4 // today + next 3
-
-type MeetingNoteRow = {
-  path: string
-  name: string
-  dateLabel: string
-  mtimeMs: number
-}
-
-type MeetingsViewProps = {
-  onOpenNote: (path: string) => void
-  onTakeMeetingNotes: () => void
-  meetingState: MeetingTranscriptionState
-  meetingSummarizing?: boolean
-}
-
-function isMeetingPath(path: string | undefined): boolean {
-  return typeof path === 'string' && (path === MEETINGS_ROOT || path.startsWith(`${MEETINGS_ROOT}/`))
-}
-
-function isCalendarPath(path: string | undefined): boolean {
-  return typeof path === 'string' && (path === CALENDAR_DIR || path.startsWith(`${CALENDAR_DIR}/`))
-}
-
-type RawCalendarEvent = {
-  id?: string
-  summary?: string
-  start?: { dateTime?: string; date?: string }
-  end?: { dateTime?: string; date?: string }
-  location?: string
-  description?: string
-  htmlLink?: string
-  status?: string
-  creator?: CalendarPerson
-  organizer?: CalendarPerson
-  attendees?: CalendarAttendee[]
-  conferenceData?: { entryPoints?: Array<{ entryPointType?: string; uri?: string }> }
-  hangoutLink?: string
-  conferenceLink?: string
-}
-
-type CalendarPerson = {
-  email?: string
-  displayName?: string
-  self?: boolean
-}
-
-type CalendarAttendee = CalendarPerson & {
-  responseStatus?: string
-  optional?: boolean
-}
-
-type DescriptionPart =
-  | { type: 'text'; text: string }
-  | { type: 'link'; text: string; href: string }
-
-type UpcomingEvent = {
-  id: string
-  summary: string
-  start: Date
-  end: Date | null
-  isAllDay: boolean
-  location: string | null
-  description: string | null
-  htmlLink: string | null
-  conferenceLink: string | null
-  creator: CalendarPerson | null
-  organizer: CalendarPerson | null
-  attendees: CalendarAttendee[]
-  source: string // workspace path to the calendar_sync JSON
-  rawStart: { dateTime?: string; date?: string } | undefined
-  rawEnd: { dateTime?: string; date?: string } | undefined
-  dateKey: string // YYYY-MM-DD (local)
-}
-
-type DayGroup = {
-  dateKey: string
-  date: Date // local start-of-day
-  events: UpcomingEvent[]
-}
-
-function startOfDay(d: Date): Date {
-  const out = new Date(d)
-  out.setHours(0, 0, 0, 0)
-  return out
-}
-
-function addDays(d: Date, n: number): Date {
-  const out = new Date(d)
-  out.setDate(out.getDate() + n)
-  return out
-}
-
-function localDateKey(d: Date): string {
-  const y = d.getFullYear()
-  const m = String(d.getMonth() + 1).padStart(2, '0')
-  const day = String(d.getDate()).padStart(2, '0')
-  return `${y}-${m}-${day}`
-}
-
-// Parse an all-day calendar date string ("YYYY-MM-DD") into a local Date at midnight.
-function parseAllDayDate(s: string): Date | null {
-  const m = /^(\d{4})-(\d{2})-(\d{2})/.exec(s)
-  if (!m) return null
-  return new Date(Number(m[1]), Number(m[2]) - 1, Number(m[3]))
-}
-
-function normalizeEvent(raw: RawCalendarEvent, sourcePath: string): UpcomingEvent | null {
-  if (raw.status === 'cancelled') return null
-  const declined = raw.attendees?.find((a) => a.self)?.responseStatus === 'declined'
-  if (declined) return null
-
-  const allDayStart = raw.start?.date
-  const timedStart = raw.start?.dateTime
-  const isAllDay = !timedStart && Boolean(allDayStart)
-
-  let start: Date | null = null
-  let end: Date | null = null
-  if (timedStart) {
-    start = new Date(timedStart)
-    end = raw.end?.dateTime ? new Date(raw.end.dateTime) : null
-  } else if (allDayStart) {
-    start = parseAllDayDate(allDayStart)
-    // Google's all-day end is exclusive (next day at 00:00) — keep as-is.
-    end = raw.end?.date ? parseAllDayDate(raw.end.date) : null
-  }
-  if (!start || Number.isNaN(start.getTime())) return null
-
-  const conferenceLink = extractConferenceLink(raw as unknown as Record<string, unknown>) ?? null
-
-  return {
-    id: raw.id ?? sourcePath,
-    summary: raw.summary?.trim() || '(No title)',
-    start,
-    end,
-    isAllDay,
-    location: raw.location?.trim() || null,
-    description: raw.description?.trim() || null,
-    htmlLink: raw.htmlLink ?? null,
-    conferenceLink,
-    creator: raw.creator ?? null,
-    organizer: raw.organizer ?? null,
-    attendees: raw.attendees ?? [],
-    source: sourcePath,
-    rawStart: raw.start,
-    rawEnd: raw.end,
-    dateKey: localDateKey(start),
-  }
-}
-
-function triggerMeetingCapture(event: UpcomingEvent, openConference: boolean) {
-  window.__pendingCalendarEvent = {
-    summary: event.summary,
-    start: event.rawStart,
-    end: event.rawEnd,
-    location: event.location ?? undefined,
-    htmlLink: event.htmlLink ?? undefined,
-    conferenceLink: event.conferenceLink ?? undefined,
-    source: event.source,
-  }
-  if (openConference && event.conferenceLink) {
-    window.open(event.conferenceLink, '_blank')
-  }
-  window.dispatchEvent(new Event('calendar-block:join-meeting'))
-}
-
-// Always show today (anchor). For days within the window after today, include
-// only those that actually have events — skip empty days.
-function selectVisibleDays(allDays: DayGroup[]): DayGroup[] {
-  if (allDays.length === 0) return []
-  const out: DayGroup[] = [allDays[0]]
-  const cap = Math.min(allDays.length, UPCOMING_MAX_DAYS)
-  for (let i = 1; i < cap; i++) {
-    if (allDays[i].events.length > 0) out.push(allDays[i])
-  }
-  return out
-}
-
-function buildDayWindow(now: Date): DayGroup[] {
-  const today = startOfDay(now)
-  return Array.from({ length: UPCOMING_MAX_DAYS }, (_, i) => {
-    const date = addDays(today, i)
-    return { dateKey: localDateKey(date), date, events: [] }
-  })
-}
-
-function formatEventTimeRange(event: UpcomingEvent): string {
-  if (event.isAllDay) return 'All day'
-  const start = event.start.toLocaleTimeString([], { hour: 'numeric', minute: '2-digit' })
-  if (!event.end) return start
-  // If start and end are on different days, show date+time on both ends.
-  const sameDay = localDateKey(event.start) === localDateKey(event.end)
-  if (!sameDay) {
-    const startLong = event.start.toLocaleString([], { month: 'numeric', day: 'numeric', year: 'numeric', hour: 'numeric', minute: '2-digit' })
-    const endLong = event.end.toLocaleString([], { month: 'numeric', day: 'numeric', year: 'numeric', hour: 'numeric', minute: '2-digit' })
-    return `${startLong} – ${endLong}`
-  }
-  const end = event.end.toLocaleTimeString([], { hour: 'numeric', minute: '2-digit' })
-  return `${start} – ${end}`
-}
-
-// Compact range for the upcoming list: drops the leading meridiem when both
-// ends share it ("9:00 – 11:00 AM" instead of "9:00 AM – 11:00 AM").
-function formatEventTimeRangeCompact(event: UpcomingEvent): string {
-  if (event.isAllDay) return 'All day'
-  const startStr = event.start.toLocaleTimeString([], { hour: 'numeric', minute: '2-digit' })
-  if (!event.end) return startStr
-  const sameDay = localDateKey(event.start) === localDateKey(event.end)
-  if (!sameDay) return formatEventTimeRange(event)
-  const endStr = event.end.toLocaleTimeString([], { hour: 'numeric', minute: '2-digit' })
-  const meridiemRe = /\s*[AP]M$/i
-  const startMer = startStr.match(meridiemRe)?.[0]?.trim().toUpperCase()
-  const endMer = endStr.match(meridiemRe)?.[0]?.trim().toUpperCase()
-  if (startMer && endMer && startMer === endMer) {
-    return `${startStr.replace(meridiemRe, '')} – ${endStr}`
-  }
-  return `${startStr} – ${endStr}`
-}
-
-// Whether a timed event is happening right now.
-function isEventNow(event: UpcomingEvent): boolean {
-  if (event.isAllDay) return false
-  const now = Date.now()
-  const start = event.start.getTime()
-  const end = event.end ? event.end.getTime() : start + 30 * 60 * 1000
-  return start <= now && now < end
-}
-
-// Human label for the conferencing provider behind an event's join link.
-function meetingPlatformLabel(link: string | null): string | null {
-  if (!link) return null
-  if (/zoom\.us|zoomgov\.com/i.test(link)) return 'Zoom'
-  if (/teams\.(?:microsoft|live)\.com/i.test(link)) return 'Teams'
-  if (/meet\.google\.com/i.test(link)) return 'Meet'
-  return 'Video call'
-}
-
-function formatEventDetailTime(event: UpcomingEvent): string {
-  if (!event.isAllDay) {
-    const date = event.start.toLocaleDateString([], { weekday: 'long', month: 'long', day: 'numeric' })
-    return `${date}, ${formatEventTimeRange(event)}`
-  }
-
-  const start = event.start.toLocaleDateString([], { weekday: 'long', month: 'long', day: 'numeric' })
-  if (!event.end) return `${start}, all day`
-
-  const exclusiveEnd = addDays(event.end, -1)
-  if (localDateKey(exclusiveEnd) === localDateKey(event.start)) return `${start}, all day`
-
-  const end = exclusiveEnd.toLocaleDateString([], { weekday: 'long', month: 'long', day: 'numeric' })
-  return `${start} – ${end}, all day`
-}
-
-function personLabel(person: CalendarPerson | null | undefined): string | null {
-  if (!person) return null
-  return person.displayName?.trim() || person.email?.trim() || null
-}
-
-function attendeeLabel(attendee: CalendarAttendee): string | null {
-  const label = personLabel(attendee)
-  if (!label) return null
-  if (attendee.self) return `${label} (you)`
-  return label
-}
-
-function normalizeDescriptionParts(parts: DescriptionPart[]): DescriptionPart[] {
-  const normalized: DescriptionPart[] = []
-  for (const part of parts) {
-    const text = part.text.replace(/\n{3,}/g, '\n\n')
-    if (!text) continue
-    const previous = normalized[normalized.length - 1]
-    if (previous?.type === 'text' && part.type === 'text') {
-      previous.text += text
-    } else if (part.type === 'link') {
-      normalized.push({ ...part, text })
-    } else {
-      normalized.push({ type: 'text', text })
-    }
-  }
-  return normalized
-}
-
-function isSafeDescriptionHref(value: string): boolean {
-  try {
-    const url = new URL(value, window.location.href)
-    return url.protocol === 'http:' || url.protocol === 'https:' || url.protocol === 'mailto:'
-  } catch {
-    return false
-  }
-}
-
-function linkifyText(value: string): DescriptionPart[] {
-  const parts: DescriptionPart[] = []
-  const urlRe = /\bhttps?:\/\/[^\s<>"')\]]+|\bwww\.[^\s<>"')\]]+/gi
-  let lastIndex = 0
-  for (const match of value.matchAll(urlRe)) {
-    const raw = match[0]
-    const index = match.index ?? 0
-    if (index > lastIndex) parts.push({ type: 'text', text: value.slice(lastIndex, index) })
-    const href = raw.startsWith('www.') ? `https://${raw}` : raw
-    parts.push({ type: 'link', text: raw, href })
-    lastIndex = index + raw.length
-  }
-  if (lastIndex < value.length) parts.push({ type: 'text', text: value.slice(lastIndex) })
-  return parts
-}
-
-function parseDescriptionParts(value: string): DescriptionPart[] {
-  const withLineBreaks = value.replace(/<\s*br\s*\/?>/gi, '\n').replace(/<\/\s*(p|div|li|tr|h[1-6])\s*>/gi, '\n')
-  if (typeof DOMParser === 'undefined') {
-    return normalizeDescriptionParts(linkifyText(withLineBreaks.replace(/<[^>]*>/g, '').trim()))
-  }
-  const doc = new DOMParser().parseFromString(withLineBreaks, 'text/html')
-  const parts: DescriptionPart[] = []
-
-  const visit = (node: Node) => {
-    if (node.nodeType === Node.TEXT_NODE) {
-      parts.push(...linkifyText(node.textContent ?? ''))
-      return
-    }
-    if (!(node instanceof HTMLElement)) return
-    if (node.tagName === 'A') {
-      const href = node.getAttribute('href') ?? ''
-      const text = node.textContent?.trim() || href
-      if (href && isSafeDescriptionHref(href)) {
-        parts.push({ type: 'link', text, href })
-        return
-      }
-    }
-    if (node.tagName === 'BR') {
-      parts.push({ type: 'text', text: '\n' })
-      return
-    }
-    node.childNodes.forEach(visit)
-    if (/^(P|DIV|LI|TR|H[1-6])$/.test(node.tagName)) {
-      parts.push({ type: 'text', text: '\n' })
-    }
-  }
-
-  doc.body.childNodes.forEach(visit)
-  return normalizeDescriptionParts(parts).map((part, index, all) => {
-    if (index === 0 || index === all.length - 1) return { ...part, text: part.text.trim() }
-    return part
-  }).filter((part) => part.text.length > 0)
-}
-
-function UpcomingEvents() {
-  const [events, setEvents] = useState<UpcomingEvent[]>([])
-  const [loading, setLoading] = useState(true)
-  const [error, setError] = useState<string | null>(null)
-  const [refreshTick, setRefreshTick] = useState(0)
-  // Calendar sync uses the native Google OAuth connection.
-  const [calendarConnected, setCalendarConnected] = useState<boolean | null>(null)
-  const [settingsOpen, setSettingsOpen] = useState(false)
-
-  useEffect(() => {
-    let cancelled = false
-    const check = async () => {
-      try {
-        const oauthState = await window.ipc.invoke('oauth:getState', null)
-        if (!cancelled) setCalendarConnected(oauthState.config?.google?.connected ?? false)
-      } catch {
-        if (!cancelled) setCalendarConnected(false)
-      }
-    }
-    void check()
-    const cleanupOAuthConnect = window.ipc.on('oauth:didConnect', () => { void check() })
-    return () => {
-      cancelled = true
-      cleanupOAuthConnect()
-    }
-  }, [])
-
-  const loadEvents = useCallback(async () => {
-    setLoading(true)
-    try {
-      const exists = await window.ipc.invoke('workspace:exists', { path: CALENDAR_DIR })
-      if (!exists.exists) {
-        setEvents([])
-        setError(null)
-        return
-      }
-      const entries = await window.ipc.invoke('workspace:readdir', {
-        path: CALENDAR_DIR,
-        opts: { recursive: false, includeHidden: false, includeStats: false },
-      })
-      const jsonEntries = entries.filter((e) => e.kind === 'file' && e.name.endsWith('.json'))
-
-      const now = new Date()
-      const todayStart = startOfDay(now)
-      const windowEnd = addDays(todayStart, UPCOMING_MAX_DAYS) // exclusive
-
-      const settled = await Promise.allSettled(
-        jsonEntries.map(async (entry): Promise<UpcomingEvent | null> => {
-          const result = await window.ipc.invoke('workspace:readFile', {
-            path: entry.path,
-            encoding: 'utf8',
-          })
-          const raw = JSON.parse(result.data) as RawCalendarEvent
-          const ev = normalizeEvent(raw, entry.path)
-          if (!ev) return null
-          // Event must overlap the [now, windowEnd) range — i.e. not already ended,
-          // and not start after the window closes.
-          const effectiveEnd = ev.end ?? (ev.isAllDay ? addDays(ev.start, 1) : ev.start)
-          if (effectiveEnd <= now) return null
-          if (ev.start >= windowEnd) return null
-          return ev
-        }),
-      )
-
-      const collected: UpcomingEvent[] = []
-      for (const r of settled) {
-        if (r.status === 'fulfilled' && r.value) collected.push(r.value)
-      }
-      collected.sort((a, b) => {
-        if (a.isAllDay !== b.isAllDay) return a.isAllDay ? -1 : 1
-        return a.start.getTime() - b.start.getTime()
-      })
-      setEvents(collected)
-      setError(null)
-    } catch (err) {
-      console.error('Failed to load upcoming events:', err)
-      setError('Could not load upcoming events.')
-    } finally {
-      setLoading(false)
-    }
-  }, [])
-
-  useEffect(() => {
-    void loadEvents()
-  }, [loadEvents, refreshTick])
-
-  useEffect(() => {
-    let timeout: ReturnType<typeof setTimeout> | null = null
-    const scheduleReload = () => {
-      if (timeout) clearTimeout(timeout)
-      timeout = setTimeout(() => {
-        timeout = null
-        setRefreshTick((t) => t + 1)
-      }, 250)
-    }
-    const cleanup = window.ipc.on('workspace:didChange', (event) => {
-      switch (event.type) {
-        case 'created':
-        case 'changed':
-        case 'deleted':
-          if (isCalendarPath(event.path)) scheduleReload()
-          break
-        case 'moved':
-          if (isCalendarPath(event.from) || isCalendarPath(event.to)) scheduleReload()
-          break
-        case 'bulkChanged':
-          if (!event.paths || event.paths.some(isCalendarPath)) scheduleReload()
-          break
-      }
-    })
-    // Refresh every minute so the "now" highlight, day labels, and "ended"
-    // filtering stay current without waiting on a calendar sync.
-    const tick = setInterval(() => setRefreshTick((t) => t + 1), 60 * 1000)
-    return () => {
-      cleanup()
-      clearInterval(tick)
-      if (timeout) clearTimeout(timeout)
-    }
-  }, [])
-
-  const visibleDays = useMemo(() => {
-    const window = buildDayWindow(new Date())
-    const byKey = new Map(window.map((d) => [d.dateKey, d]))
-    for (const ev of events) {
-      byKey.get(ev.dateKey)?.events.push(ev)
-    }
-    return selectVisibleDays(window)
-  }, [events])
-
-  const totalVisible = visibleDays.reduce((s, d) => s + d.events.length, 0)
-  const now = new Date()
-  const todayKey = localDateKey(now)
-
-  return (
-    <section className="border-b border-border/60 px-6 pb-6 pt-5">
-      <div className="mx-auto w-full max-w-[760px]">
-        <div className="mb-3 flex items-baseline justify-between">
-          <h3 className="text-sm font-semibold text-foreground flex items-center gap-2">
-            <Calendar className="size-4 text-muted-foreground" />
-            Coming up
-          </h3>
-          {loading && events.length === 0 ? null : (
-            <span className="text-[11px] uppercase tracking-wider text-muted-foreground">
-              {totalVisible} {totalVisible === 1 ? 'event' : 'events'}
-            </span>
-          )}
-        </div>
-
-        {calendarConnected === false && events.length === 0 ? (
-          <div className="flex flex-col items-center gap-3 py-12 text-center">
-            <Calendar className="size-7 text-muted-foreground opacity-50" />
-            <p className="text-sm text-muted-foreground">Connect your calendar to see upcoming meetings here.</p>
-            <button
-              type="button"
-              onClick={() => setSettingsOpen(true)}
-              className="inline-flex items-center gap-1.5 rounded-md border border-border bg-background px-3.5 py-1.5 text-sm font-medium text-foreground transition-colors hover:bg-accent"
-            >
-              <Calendar className="size-4" />
-              Connect your calendar
-            </button>
-          </div>
-        ) : loading && events.length === 0 ? (
-          <div className="flex items-center justify-center py-6">
-            <Loader2 className="size-4 animate-spin text-muted-foreground" />
-          </div>
-        ) : error ? (
-          <div className="py-4 text-sm text-muted-foreground">{error}</div>
-        ) : (
-          <div className="flex flex-col gap-3">
-            {visibleDays.map((day) => (
-              <UpcomingDayCard
-                key={day.dateKey}
-                day={day}
-                isToday={day.dateKey === todayKey}
-              />
-            ))}
-          </div>
-        )}
-      </div>
-      <SettingsDialog open={settingsOpen} onOpenChange={setSettingsOpen} defaultTab="connections" />
-    </section>
-  )
-}
-
-function UpcomingDayCard({ day, isToday }: { day: DayGroup; isToday: boolean }) {
-  const dayNum = day.date.getDate()
-  const month = day.date.toLocaleDateString([], { month: 'short' })
-  const weekday = day.date.toLocaleDateString([], { weekday: 'short' })
-  const count = day.events.length
-
-  return (
-    <div className="overflow-hidden rounded-xl border bg-card">
-      <div className="flex items-center justify-between gap-3 border-b bg-muted px-5 py-3.5">
-        <div className="flex min-w-0 items-baseline gap-2">
-          <span className="text-[22px] font-bold leading-none text-foreground">{dayNum}</span>
-          <span className="truncate text-[13px] text-muted-foreground">
-            {month} · {weekday}
-          </span>
-          {isToday ? (
-            <span className="shrink-0 rounded-md bg-foreground px-1.5 py-0.5 text-[10px] font-semibold uppercase tracking-wide text-background">
-              Today
-            </span>
-          ) : null}
-        </div>
-        <span className="shrink-0 text-xs text-muted-foreground">
-          {count} {count === 1 ? 'event' : 'events'}
-        </span>
-      </div>
-
-      {count === 0 ? (
-        <div className="px-5 py-4 text-sm text-muted-foreground">
-          {isToday ? 'No events today' : 'No events'}
-        </div>
-      ) : (
-        day.events.map((ev, idx) => (
-          <UpcomingEventItem key={ev.id} event={ev} isLast={idx === count - 1} />
-        ))
-      )}
-    </div>
-  )
-}
-
-function NowBadge() {
-  return (
-    <span className="shrink-0 rounded bg-green-600 px-1.5 py-px text-[10px] font-bold uppercase leading-[1.5] tracking-wide text-white">
-      Now
-    </span>
-  )
-}
-
-function UpcomingEventItem({ event, isLast }: { event: UpcomingEvent; isLast: boolean }) {
-  const [open, setOpen] = useState(false)
-  const isNow = isEventNow(event)
-  const platform = meetingPlatformLabel(event.conferenceLink)
-  const subtitle = platform ?? event.location
-  const titleAndLocation = event.location ? `${event.summary} · ${event.location}` : event.summary
-
-  return (
-    <Popover open={open} onOpenChange={setOpen}>
-      <PopoverTrigger asChild>
-        <div
-          role="button"
-          tabIndex={0}
-          title={titleAndLocation}
-          className={cn(
-            'group flex w-full cursor-pointer items-center gap-4 px-5 py-3 text-left transition-colors',
-            !isLast && 'border-b',
-            isNow ? 'bg-muted' : 'hover:bg-muted/50',
-          )}
-        >
-          <span className="shrink-0 text-[13px] tabular-nums text-muted-foreground" style={{ width: 118 }}>
-            {formatEventTimeRangeCompact(event)}
-          </span>
-          <span className="flex min-w-0 flex-1 flex-col">
-            <span className="flex items-center gap-2">
-              <span className="truncate text-sm font-semibold text-foreground">
-                {event.summary}
-              </span>
-              {isNow ? <NowBadge /> : null}
-            </span>
-            {subtitle ? (
-              <span className="mt-0.5 flex items-center gap-1.5 text-xs text-muted-foreground">
-                {platform ? <Video className="size-3.5 shrink-0" /> : <MapPin className="size-3.5 shrink-0" />}
-                <span className="truncate">{subtitle}</span>
-              </span>
-            ) : null}
-          </span>
-          <div className="shrink-0">
-            {event.conferenceLink ? (
-              <SplitJoinButton
-                onJoinAndNotes={() => triggerMeetingCapture(event, true)}
-                onNotesOnly={() => triggerMeetingCapture(event, false)}
-              />
-            ) : (
-              <button
-                type="button"
-                onClick={(e) => { e.stopPropagation(); triggerMeetingCapture(event, false) }}
-                onMouseDown={(e) => e.stopPropagation()}
-                className="inline-flex items-center gap-1.5 rounded-md border bg-background px-2.5 py-1.5 text-xs font-medium text-foreground transition-colors hover:bg-accent"
-              >
-                <Mic className="size-3.5" />
-                Take notes
-              </button>
-            )}
-          </div>
-        </div>
-      </PopoverTrigger>
-      <EventDetailsPopover event={event} onClose={() => setOpen(false)} />
-    </Popover>
-  )
-}
-
-function EventDetailsPopover({ event, onClose }: { event: UpcomingEvent; onClose: () => void }) {
-  const organizer = personLabel(event.organizer) ?? personLabel(event.creator)
-  const attendees = event.attendees.map(attendeeLabel).filter((label): label is string => Boolean(label))
-  const descriptionParts = event.description ? parseDescriptionParts(event.description) : []
-  const handleMeetingCapture = (openConference: boolean) => {
-    onClose()
-    triggerMeetingCapture(event, openConference)
-  }
-
-  return (
-    <PopoverContent
-      align="start"
-      side="bottom"
-      sideOffset={6}
-      className="w-[min(380px,calc(100vw-32px))] rounded-lg p-0 shadow-xl"
-      style={{
-        backgroundColor: 'var(--muted, #f4f4f5)',
-        borderColor: 'var(--border, #e4e4e7)',
-        color: 'var(--popover-foreground, #09090b)',
-      }}
-    >
-      <div className="flex items-center justify-end gap-1 border-b px-3 py-2" style={{ borderColor: 'var(--border, #e4e4e7)' }}>
-        {event.htmlLink ? (
-          <button
-            type="button"
-            onClick={() => window.open(event.htmlLink!, '_blank')}
-            className="inline-flex size-8 items-center justify-center rounded-md transition-colors"
-            style={{ color: 'var(--muted-foreground, #71717a)' }}
-            aria-label="Open in Google Calendar"
-            title="Open in Google Calendar"
-            onMouseEnter={(e) => { (e.currentTarget as HTMLButtonElement).style.background = 'var(--background, #ffffff)' }}
-            onMouseLeave={(e) => { (e.currentTarget as HTMLButtonElement).style.background = 'transparent' }}
-          >
-            <ExternalLink className="size-4" />
-          </button>
-        ) : null}
-        <button
-          type="button"
-          onClick={onClose}
-          className="inline-flex size-8 items-center justify-center rounded-md transition-colors"
-          style={{ color: 'var(--muted-foreground, #71717a)' }}
-          aria-label="Close event details"
-          title="Close"
-          onMouseEnter={(e) => { (e.currentTarget as HTMLButtonElement).style.background = 'var(--background, #ffffff)' }}
-          onMouseLeave={(e) => { (e.currentTarget as HTMLButtonElement).style.background = 'transparent' }}
-        >
-          <X className="size-4" />
-        </button>
-      </div>
-      <div className="space-y-4 px-5 py-4">
-        <div className="flex gap-3">
-          <span
-            aria-hidden
-            className="mt-1.5 h-3 w-3 shrink-0 rounded-sm"
-            style={{ background: 'var(--primary, #18181b)' }}
-          />
-          <div className="min-w-0">
-            <h4 className="break-words text-[20px] font-normal leading-6" style={{ color: 'var(--foreground, #09090b)' }}>
-              {event.summary}
-            </h4>
-          </div>
-        </div>
-
-        <EventDetailRow icon={<Clock className="size-4" />} value={formatEventDetailTime(event)} />
-        {event.location ? <EventDetailRow icon={<MapPin className="size-4" />} value={event.location} /> : null}
-        {organizer ? <EventDetailRow icon={<UserRound className="size-4" />} value={`Organizer: ${organizer}`} /> : null}
-        {attendees.length > 0 ? (
-          <EventDetailRow
-            icon={<UsersRound className="size-4" />}
-            value={attendees.slice(0, 8).join(', ') + (attendees.length > 8 ? `, +${attendees.length - 8} more` : '')}
-          />
-        ) : null}
-
-        {event.conferenceLink ? (
-          <div className="flex gap-3">
-            <Video className="mt-1 size-4 shrink-0" style={{ color: 'var(--muted-foreground, #71717a)' }} />
-            <div className="flex flex-wrap gap-2">
-              <Button type="button" size="sm" onClick={() => handleMeetingCapture(true)}>
-                Join & take notes
-              </Button>
-              <Button type="button" size="sm" variant="outline" onClick={() => handleMeetingCapture(false)}>
-                Take notes only
-              </Button>
-            </div>
-          </div>
-        ) : (
-          <div className="flex gap-3">
-            <Mic className="mt-1 size-4 shrink-0" style={{ color: 'var(--muted-foreground, #71717a)' }} />
-            <Button type="button" size="sm" variant="outline" onClick={() => handleMeetingCapture(false)}>
-              Take notes
-            </Button>
-          </div>
-        )}
-
-        {descriptionParts.length > 0 ? (
-          <div className="flex gap-3">
-            <span className="mt-1 size-4 shrink-0" />
-            <div className="max-h-40 overflow-auto whitespace-pre-wrap break-words text-sm leading-5" style={{ color: 'var(--foreground, #27272a)' }}>
-              {descriptionParts.map((part, index) => {
-                if (part.type === 'text') return <span key={index}>{part.text}</span>
-                return (
-                  <a
-                    key={index}
-                    href={part.href}
-                    onClick={(e) => {
-                      e.preventDefault()
-                      window.open(part.href, '_blank')
-                    }}
-                    className="underline underline-offset-2"
-                    style={{ color: 'var(--primary, #18181b)' }}
-                  >
-                    {part.text}
-                  </a>
-                )
-              })}
-            </div>
-          </div>
-        ) : null}
-      </div>
-    </PopoverContent>
-  )
-}
-
-function EventDetailRow({ icon, value }: { icon: React.ReactNode; value: string }) {
-  return (
-    <div className="flex gap-3 text-sm leading-5">
-      <span className="mt-0.5 shrink-0" style={{ color: 'var(--muted-foreground, #71717a)' }}>{icon}</span>
-      <span className="min-w-0 break-words" style={{ color: 'var(--foreground, #27272a)' }}>{value}</span>
-    </div>
-  )
-}
-
-function SplitJoinButton({ onJoinAndNotes, onNotesOnly }: {
-  onJoinAndNotes: () => void
-  onNotesOnly: () => void
-}) {
-  const [open, setOpen] = useState(false)
-  const containerRef = useRef<HTMLDivElement>(null)
-  const menuRef = useRef<HTMLDivElement>(null)
-  // Fixed-position coords for the portaled menu so it isn't clipped by the
-  // calendar card's `overflow-hidden`.
-  const [menuPos, setMenuPos] = useState<{ top: number; right: number } | null>(null)
-
-  const updatePos = useCallback(() => {
-    const rect = containerRef.current?.getBoundingClientRect()
-    if (!rect) return
-    setMenuPos({ top: rect.bottom + 4, right: window.innerWidth - rect.right })
-  }, [])
-
-  useEffect(() => {
-    if (!open) return
-    updatePos()
-    const handler = (e: MouseEvent) => {
-      const target = e.target
-      if (!(target instanceof globalThis.Node)) return
-      if (containerRef.current?.contains(target) || menuRef.current?.contains(target)) return
-      setOpen(false)
-    }
-    document.addEventListener('mousedown', handler)
-    window.addEventListener('resize', updatePos)
-    window.addEventListener('scroll', updatePos, true)
-    return () => {
-      document.removeEventListener('mousedown', handler)
-      window.removeEventListener('resize', updatePos)
-      window.removeEventListener('scroll', updatePos, true)
-    }
-  }, [open, updatePos])
-
-  return (
-    <div ref={containerRef} className="relative inline-flex items-stretch">
-      <button
-        type="button"
-        onMouseDown={(e) => e.stopPropagation()}
-        onClick={(e) => { e.stopPropagation(); onJoinAndNotes() }}
-        className="inline-flex items-center gap-1.5 rounded-l-md border bg-background px-2.5 py-1.5 text-xs font-medium text-foreground transition-colors hover:bg-accent"
-      >
-        <Video className="size-3.5" />
-        Join & take notes
-      </button>
-      <button
-        type="button"
-        onMouseDown={(e) => e.stopPropagation()}
-        onClick={(e) => { e.stopPropagation(); setOpen((v) => !v) }}
-        aria-label="More meeting options"
-        className="inline-flex items-center justify-center rounded-r-md border border-l-0 bg-background px-1.5 py-1.5 text-foreground transition-colors hover:bg-accent"
-      >
-        <ChevronDown className="size-3" />
-      </button>
-      {open && menuPos
-        ? createPortal(
-            <div
-              ref={menuRef}
-              style={{ position: 'fixed', top: menuPos.top, right: menuPos.right, zIndex: 60 }}
-              className="min-w-36 overflow-hidden rounded-md border bg-popover text-popover-foreground shadow-lg"
-            >
-              <button
-                type="button"
-                onMouseDown={(e) => e.stopPropagation()}
-                onClick={(e) => { e.stopPropagation(); setOpen(false); onNotesOnly() }}
-                className="flex w-full items-center gap-1.5 whitespace-nowrap px-2.5 py-1.5 text-xs transition-colors hover:bg-accent"
-              >
-                <Mic className="size-3" />
-                Take notes only
-              </button>
-            </div>,
-            document.body,
-          )
-        : null}
-    </div>
-  )
-}
-
-function formatMeetingName(name: string): string {
-  return name.replace(/\.md$/i, '').replace(/_/g, ' ')
-}
-
-function formatDateLabel(label: string): string {
-  if (!/^\d{4}-\d{2}-\d{2}$/.test(label)) return label || '—'
-  const date = new Date(`${label}T00:00:00`)
-  if (Number.isNaN(date.getTime())) return label
-  return date.toLocaleDateString(undefined, {
-    month: 'short',
-    day: 'numeric',
-    year: 'numeric',
-  })
-}
-
-function getMeetingButtonLabel(state: MeetingTranscriptionState): string {
-  switch (state) {
-    case 'connecting':
-      return 'Starting...'
-    case 'recording':
-      return 'Stop recording'
-    case 'stopping':
-      return 'Stopping...'
-    case 'idle':
-    default:
-      return 'Take meeting notes'
-  }
-}
-
-export function MeetingsView({ onOpenNote, onTakeMeetingNotes, meetingState, meetingSummarizing = false }: MeetingsViewProps) {
-  const [notes, setNotes] = useState<MeetingNoteRow[]>([])
-  const [loading, setLoading] = useState(true)
-  const [error, setError] = useState<string | null>(null)
-
-  const loadNotes = useCallback(async () => {
-    setLoading(true)
-    try {
-      const exists = await window.ipc.invoke('workspace:exists', { path: MEETINGS_ROOT })
-      if (!exists.exists) {
-        setNotes([])
-        setError(null)
-        return
-      }
-
-      const entries = await window.ipc.invoke('workspace:readdir', {
-        path: MEETINGS_ROOT,
-        opts: {
-          recursive: true,
-          includeHidden: false,
-          includeStats: true,
-        },
-      })
-
-      const rows = entries
-	        .filter((entry) => entry.kind === 'file' && entry.name.endsWith('.md'))
-	        .map((entry) => {
-	          const relative = entry.path.slice(`${MEETINGS_ROOT}/`.length)
-	          const parts = relative.split('/')
-	          const dateFolder = parts.find((part) => /^\d{4}-\d{2}-\d{2}$/.test(part)) ?? ''
-	          return {
-	            path: entry.path,
-	            name: formatMeetingName(entry.name),
-	            dateLabel: formatDateLabel(dateFolder),
-	            mtimeMs: entry.stat?.mtimeMs ?? 0,
-	          } satisfies MeetingNoteRow
-        })
-        .sort((a, b) => {
-          if (b.mtimeMs !== a.mtimeMs) return b.mtimeMs - a.mtimeMs
-          return b.path.localeCompare(a.path)
-        })
-
-      setNotes(rows)
-      setError(null)
-    } catch (err) {
-      console.error('Failed to load meetings:', err)
-      setError('Could not load meeting notes.')
-    } finally {
-      setLoading(false)
-    }
-  }, [])
-
-  useEffect(() => {
-    void loadNotes()
-  }, [loadNotes])
-
-  useEffect(() => {
-    let timeout: ReturnType<typeof setTimeout> | null = null
-
-    const scheduleReload = () => {
-      if (timeout) clearTimeout(timeout)
-      timeout = setTimeout(() => {
-        timeout = null
-        void loadNotes()
-      }, 200)
-    }
-
-    const cleanup = window.ipc.on('workspace:didChange', (event) => {
-      switch (event.type) {
-        case 'created':
-        case 'changed':
-        case 'deleted':
-          if (isMeetingPath(event.path)) scheduleReload()
-          break
-        case 'moved':
-          if (isMeetingPath(event.from) || isMeetingPath(event.to)) {
-            scheduleReload()
-          }
-          break
-        case 'bulkChanged':
-          if (!event.paths || event.paths.some(isMeetingPath)) {
-            scheduleReload()
-          }
-          break
-      }
-    })
-
-    return () => {
-      cleanup()
-      if (timeout) clearTimeout(timeout)
-    }
-  }, [loadNotes])
-
-  const isBusy = meetingState === 'connecting' || meetingState === 'stopping' || meetingSummarizing
-  const isRecording = meetingState === 'recording'
-
-  return (
-    <div className="flex h-full flex-col overflow-hidden">
-      <div className="shrink-0 border-b border-border px-6 py-5">
-        <div className="flex items-center justify-between gap-4">
-          <div className="flex items-center gap-2">
-            <Mic className="size-5 text-primary" />
-            <h2 className="text-base font-semibold text-foreground">Meetings</h2>
-          </div>
-          <Button
-            type="button"
-            size="sm"
-            variant={isRecording ? 'destructive' : 'default'}
-            disabled={isBusy}
-            onClick={onTakeMeetingNotes}
-          >
-            {meetingSummarizing || meetingState === 'connecting' || meetingState === 'stopping' ? (
-              <Loader2 className="mr-2 size-4 animate-spin" />
-            ) : isRecording ? (
-              <Square className="mr-2 size-3.5" />
-            ) : (
-              <Mic className="mr-2 size-4" />
-            )}
-            {meetingSummarizing ? 'Generating notes...' : getMeetingButtonLabel(meetingState)}
-          </Button>
-	        </div>
-        <p className="mt-1 text-xs text-muted-foreground">
-          Upcoming events and meeting notes.
-        </p>
-      </div>
-      <div className="flex-1 overflow-auto">
-        <UpcomingEvents />
-        <div className="p-6">
-        {loading ? (
-          <div className="flex items-center justify-center py-10">
-            <Loader2 className="size-5 animate-spin text-muted-foreground" />
-          </div>
-        ) : error ? (
-          <div className="flex items-center justify-center px-8 py-10 text-center text-sm text-muted-foreground">
-            {error}
-          </div>
-        ) : notes.length === 0 ? (
-          <div className="flex flex-col items-center justify-center gap-3 px-8 py-10 text-center">
-            <div className="rounded-full bg-muted p-3">
-              <Mic className="size-6 text-muted-foreground" />
-            </div>
-            <p className="text-sm text-muted-foreground">
-              No meeting notes yet. Use <strong>Take meeting notes</strong> to start one.
-            </p>
-          </div>
-        ) : (
-          <div className="overflow-hidden rounded-xl border border-border/60 bg-card">
-            <table className="w-full table-fixed border-collapse">
-              <colgroup>
-                <col className="w-[56%]" />
-                <col className="w-[20%]" />
-                <col className="w-[24%]" />
-              </colgroup>
-              <thead>
-                <tr className="border-b border-border/60 bg-muted/30 text-left">
-                  <th className="px-4 py-3 text-xs font-medium uppercase tracking-wide text-muted-foreground">Note</th>
-                  <th className="px-4 py-3 text-xs font-medium uppercase tracking-wide text-muted-foreground">Date</th>
-                  <th className="px-4 py-3 text-xs font-medium uppercase tracking-wide text-muted-foreground">Updated</th>
-                </tr>
-              </thead>
-              <tbody>
-                {notes.map((note) => (
-                  <tr key={note.path} className="border-b border-border/50 last:border-b-0 hover:bg-muted/20">
-                    <td className="px-4 py-3 align-top">
-                      <button
-                        type="button"
-                        onClick={() => onOpenNote(note.path)}
-                        className="min-w-0 text-left text-sm font-medium text-foreground hover:underline"
-                      >
-                        <span className="block truncate">{note.name}</span>
-                      </button>
-                    </td>
-                    <td className="px-4 py-3 align-top text-sm text-muted-foreground">{note.dateLabel}</td>
-                    <td className="px-4 py-3 align-top text-sm text-muted-foreground">
-                      {note.mtimeMs > 0 ? (formatRelativeTime(new Date(note.mtimeMs).toISOString()) || '—') : '—'}
-                    </td>
-                  </tr>
-                ))}
-              </tbody>
-            </table>
-          </div>
-        )}
-        </div>
-      </div>
-    </div>
-  )
-}
diff --git a/apps/x/apps/renderer/src/components/rich-markdown-viewer.tsx b/apps/x/apps/renderer/src/components/rich-markdown-viewer.tsx
deleted file mode 100644
index 6c3c79b5..00000000
--- a/apps/x/apps/renderer/src/components/rich-markdown-viewer.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-import { useEffect } from 'react'
-import { EditorContent, useEditor } from '@tiptap/react'
-import StarterKit from '@tiptap/starter-kit'
-import Link from '@tiptap/extension-link'
-import Image from '@tiptap/extension-image'
-import TaskList from '@tiptap/extension-task-list'
-import TaskItem from '@tiptap/extension-task-item'
-import { TableKit } from '@tiptap/extension-table'
-import { Markdown } from 'tiptap-markdown'
-import { TaskBlockExtension } from '@/extensions/task-block'
-import { PromptBlockExtension } from '@/extensions/prompt-block'
-import { ImageBlockExtension } from '@/extensions/image-block'
-import { EmbedBlockExtension } from '@/extensions/embed-block'
-import { IframeBlockExtension } from '@/extensions/iframe-block'
-import { ChartBlockExtension } from '@/extensions/chart-block'
-import { TableBlockExtension } from '@/extensions/table-block'
-import { CalendarBlockExtension } from '@/extensions/calendar-block'
-import { EmailBlockExtension, EmailsBlockExtension } from '@/extensions/email-block'
-import { TranscriptBlockExtension } from '@/extensions/transcript-block'
-import { MermaidBlockExtension } from '@/extensions/mermaid-block'
-import { WikiLink } from '@/extensions/wiki-link'
-import '@/styles/editor.css'
-
-const BLANK_LINE_MARKER = '\u200B'
-
-function preprocessMarkdown(markdown: string): string {
-  return markdown.replace(/\n{3,}/g, (match) => {
-    const emptyParagraphs = match.length - 2
-    let result = '\n\n'
-    for (let i = 0; i < emptyParagraphs; i += 1) {
-      result += BLANK_LINE_MARKER + '\n\n'
-    }
-    return result
-  })
-}
-
-export function RichMarkdownViewer({ content }: { content: string }) {
-  const editor = useEditor({
-    editable: false,
-    extensions: [
-      StarterKit.configure({
-        heading: {
-          levels: [1, 2, 3],
-        },
-        link: false,
-      }),
-      Link.configure({
-        openOnClick: true,
-        HTMLAttributes: {
-          rel: 'noopener noreferrer',
-          target: '_blank',
-        },
-      }),
-      Image.configure({
-        inline: false,
-        allowBase64: true,
-        HTMLAttributes: {
-          class: 'editor-image',
-        },
-      }),
-      TaskBlockExtension,
-      PromptBlockExtension,
-      ImageBlockExtension,
-      EmbedBlockExtension,
-      IframeBlockExtension,
-      ChartBlockExtension,
-      TableBlockExtension,
-      CalendarBlockExtension,
-      EmailsBlockExtension,
-      EmailBlockExtension,
-      TranscriptBlockExtension,
-      MermaidBlockExtension,
-      WikiLink,
-      TaskList,
-      TaskItem.configure({
-        nested: true,
-      }),
-      TableKit.configure({
-        table: { resizable: false },
-      }),
-      Markdown.configure({
-        html: true,
-        breaks: true,
-        tightLists: false,
-        transformCopiedText: false,
-        transformPastedText: false,
-      }),
-    ],
-    content: preprocessMarkdown(content),
-    editorProps: {
-      attributes: {
-        class: 'prose prose-sm max-w-none focus:outline-none',
-      },
-    },
-  })
-
-  useEffect(() => {
-    if (!editor) return
-    editor.chain().setMeta('addToHistory', false).setContent(preprocessMarkdown(content)).run()
-  }, [content, editor])
-
-  return (
-    <div className="tiptap-editor rich-markdown-viewer">
-      <EditorContent editor={editor} />
-    </div>
-  )
-}
diff --git a/apps/x/apps/renderer/src/components/search-dialog.tsx b/apps/x/apps/renderer/src/components/search-dialog.tsx
index 4e50fa0b..56f0875a 100644
--- a/apps/x/apps/renderer/src/components/search-dialog.tsx
+++ b/apps/x/apps/renderer/src/components/search-dialog.tsx
@@ -21,7 +21,7 @@ interface SearchResult {
   path: string
 }
 
-export type SearchType = 'knowledge' | 'chat'
+type SearchType = 'knowledge' | 'chat'
 
 function activeTabToTypes(section: ActiveSection): SearchType[] {
   if (section === 'knowledge') return ['knowledge']
@@ -46,9 +46,6 @@ interface CommandPaletteProps {
   onOpenChange: (open: boolean) => void
   onSelectFile: (path: string) => void
   onSelectRun: (runId: string) => void
-  // Overrides the sidebar-section default for the initial scope (e.g. the
-  // knowledge view opens search scoped to knowledge).
-  defaultScope?: SearchType
 }
 
 export function CommandPalette({
@@ -56,7 +53,6 @@ export function CommandPalette({
   onOpenChange,
   onSelectFile,
   onSelectRun,
-  defaultScope,
 }: CommandPaletteProps) {
   const { activeSection } = useSidebarSection()
   const searchInputRef = useRef<HTMLInputElement>(null)
@@ -65,7 +61,7 @@ export function CommandPalette({
   const [results, setResults] = useState<SearchResult[]>([])
   const [isSearching, setIsSearching] = useState(false)
   const [activeTypes, setActiveTypes] = useState<Set<SearchType>>(
-    () => new Set(defaultScope ? [defaultScope] : activeTabToTypes(activeSection))
+    () => new Set(activeTabToTypes(activeSection))
   )
   const debouncedQuery = useDebounce(query, 250)
 
@@ -73,9 +69,9 @@ export function CommandPalette({
   useEffect(() => {
     if (open) {
       setQuery('')
-      setActiveTypes(new Set(defaultScope ? [defaultScope] : activeTabToTypes(activeSection)))
+      setActiveTypes(new Set(activeTabToTypes(activeSection)))
     }
-  }, [open, activeSection, defaultScope])
+  }, [open, activeSection])
 
   useEffect(() => {
     if (!open) return
diff --git a/apps/x/apps/renderer/src/components/settings-dialog.tsx b/apps/x/apps/renderer/src/components/settings-dialog.tsx
index c45ed64e..a1554a56 100644
--- a/apps/x/apps/renderer/src/components/settings-dialog.tsx
+++ b/apps/x/apps/renderer/src/components/settings-dialog.tsx
@@ -2,7 +2,7 @@
 
 import * as React from "react"
 import { useState, useEffect, useCallback, useMemo } from "react"
-import { Server, Key, Shield, Palette, Monitor, Sun, Moon, Loader2, CheckCircle2, Plus, X, Wrench, Search, ChevronRight, Link2, Tags, Mail, BookOpen, User, Plug, HelpCircle, MessageCircle, Bug, Terminal, AlertTriangle, RefreshCw, PanelRight } from "lucide-react"
+import { Server, Key, Shield, Palette, Monitor, Sun, Moon, Loader2, CheckCircle2, Plus, X, Wrench, Search, ChevronRight, Link2, Tags, Mail, BookOpen, User, Plug } from "lucide-react"
 
 import {
   Dialog,
@@ -11,7 +11,6 @@ import {
 } from "@/components/ui/dialog"
 import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
-import { Separator } from "@/components/ui/separator"
 import {
   Select,
   SelectContent,
@@ -25,9 +24,8 @@ import { useTheme } from "@/contexts/theme-context"
 import { toast } from "sonner"
 import { AccountSettings } from "@/components/settings/account-settings"
 import { ConnectedAccountsSettings } from "@/components/settings/connected-accounts-settings"
-import type { ApprovalPolicy } from "@x/shared/src/code-mode.js"
 
-type ConfigTab = "account" | "connections" | "models" | "mcp" | "security" | "code-mode" | "appearance" | "note-tagging" | "help"
+type ConfigTab = "account" | "connected-accounts" | "models" | "mcp" | "security" | "appearance" | "tools" | "note-tagging"
 
 interface TabConfig {
   id: ConfigTab
@@ -45,10 +43,10 @@ const tabs: TabConfig[] = [
     description: "Manage your Rowboat account",
   },
   {
-    id: "connections",
-    label: "Connections",
+    id: "connected-accounts",
+    label: "Connected Accounts",
     icon: Plug,
-    description: "Manage accounts and tools",
+    description: "Manage connected services",
   },
   {
     id: "models",
@@ -71,18 +69,18 @@ const tabs: TabConfig[] = [
     path: "config/security.json",
     description: "Configure allowed shell commands",
   },
-  {
-    id: "code-mode",
-    label: "Code Mode",
-    icon: Terminal,
-    description: "Delegate coding tasks to Claude Code or Codex",
-  },
   {
     id: "appearance",
     label: "Appearance",
     icon: Palette,
     description: "Customize the look and feel",
   },
+  {
+    id: "tools",
+    label: "Tools Library",
+    icon: Wrench,
+    description: "Browse and enable toolkits",
+  },
   {
     id: "note-tagging",
     label: "Note Tagging",
@@ -90,93 +88,10 @@ const tabs: TabConfig[] = [
     path: "config/tags.json",
     description: "Configure tags for notes and emails",
   },
-  {
-    id: "help",
-    label: "Help",
-    icon: HelpCircle,
-    description: "Get help and support",
-  },
 ]
 
 interface SettingsDialogProps {
-  /** Optional trigger element. Omit when controlling `open` externally. */
-  children?: React.ReactNode
-  /** Tab to open on when the dialog is shown. Defaults to "account". */
-  defaultTab?: ConfigTab
-  /** Controlled open state. When provided, the dialog is fully controlled. */
-  open?: boolean
-  onOpenChange?: (open: boolean) => void
-}
-
-// --- Help & Support tab ---
-
-function HelpSettings() {
-  return (
-    <div className="space-y-4">
-      <div>
-        <h4 className="text-sm font-medium">Help &amp; Support</h4>
-        <p className="text-xs text-muted-foreground mt-0.5">Get help from our community</p>
-      </div>
-      <Button
-        variant="outline"
-        className="w-full justify-start gap-3 h-auto py-3"
-        onClick={() => window.open("https://github.com/rowboatlabs/rowboat/issues/new", "_blank")}
-      >
-        <div className="flex size-8 items-center justify-center rounded-md bg-destructive/10">
-          <Bug className="size-4 text-destructive" />
-        </div>
-        <div className="flex flex-col items-start">
-          <span className="text-sm font-medium">Report a bug</span>
-          <span className="text-xs text-muted-foreground">Send feedback to the Rowboat team</span>
-        </div>
-      </Button>
-      <Button
-        variant="outline"
-        className="w-full justify-start gap-3 h-auto py-3"
-        onClick={() => window.open("https://discord.com/invite/wajrgmJQ6b", "_blank")}
-      >
-        <div className="flex size-8 items-center justify-center rounded-md bg-[#5865F2]">
-          <MessageCircle className="size-4 text-white" />
-        </div>
-        <div className="flex flex-col items-start">
-          <span className="text-sm font-medium">Join our Discord</span>
-          <span className="text-xs text-muted-foreground">Chat with the community</span>
-        </div>
-      </Button>
-      <Button
-        variant="outline"
-        className="w-full justify-start gap-3 h-auto py-3"
-        onClick={() => window.open("mailto:contact@rowboatlabs.com", "_blank")}
-      >
-        <div className="flex size-8 items-center justify-center rounded-md bg-muted">
-          <Mail className="size-4" />
-        </div>
-        <div className="flex flex-col items-start">
-          <span className="text-sm font-medium">Contact us</span>
-          <span className="text-xs text-muted-foreground">contact@rowboatlabs.com</span>
-        </div>
-      </Button>
-      <div className="flex gap-3 text-xs text-muted-foreground">
-        <a
-          href="https://www.rowboatlabs.com/terms-of-service"
-          target="_blank"
-          rel="noopener noreferrer"
-          className="hover:text-foreground transition-colors"
-        >
-          Terms of Service
-        </a>
-        <span>·</span>
-        <a
-          href="https://www.rowboatlabs.com/privacy-policy"
-          target="_blank"
-          rel="noopener noreferrer"
-          className="hover:text-foreground transition-colors"
-        >
-          Privacy Policy
-        </a>
-      </div>
-    </div>
-  )
+  children: React.ReactNode
 }
 
 // --- Theme option for Appearance tab ---
@@ -211,7 +126,7 @@ function ThemeOption({
 }
 
 function AppearanceSettings() {
-  const { theme, setTheme, chatPanePlacement, setChatPanePlacement, chatPaneSize, setChatPaneSize } = useTheme()
+  const { theme, setTheme } = useTheme()
 
   return (
     <div className="space-y-6">
@@ -241,50 +156,6 @@ function AppearanceSettings() {
           />
         </div>
       </div>
-      <div>
-        <h4 className="text-sm font-medium mb-3">Chat</h4>
-        <p className="text-xs text-muted-foreground mb-4">
-          Choose where chat sits when another pane is open
-        </p>
-        <div className="grid grid-cols-2 gap-3">
-          <ThemeOption
-            label="Chat right"
-            icon={PanelRight}
-            isSelected={chatPanePlacement === "right"}
-            onClick={() => setChatPanePlacement("right")}
-          />
-          <ThemeOption
-            label="Chat middle"
-            icon={MessageCircle}
-            isSelected={chatPanePlacement === "middle"}
-            onClick={() => setChatPanePlacement("middle")}
-          />
-        </div>
-        <h4 className="mt-6 text-sm font-medium mb-3">Chat size</h4>
-        <p className="text-xs text-muted-foreground mb-4">
-          Choose how much width chat gets when another pane is open
-        </p>
-        <div className="grid grid-cols-3 gap-3">
-          <ThemeOption
-            label="Chat smaller"
-            icon={MessageCircle}
-            isSelected={chatPaneSize === "chat-smaller"}
-            onClick={() => setChatPaneSize("chat-smaller")}
-          />
-          <ThemeOption
-            label="Chat equal"
-            icon={Monitor}
-            isSelected={chatPaneSize === "chat-equal"}
-            onClick={() => setChatPaneSize("chat-equal")}
-          />
-          <ThemeOption
-            label="Chat bigger"
-            icon={PanelRight}
-            isSelected={chatPaneSize === "chat-bigger"}
-            onClick={() => setChatPaneSize("chat-bigger")}
-          />
-        </div>
-      </div>
     </div>
   )
 }
@@ -322,27 +193,17 @@ const defaultBaseURLs: Partial<Record<LlmProviderFlavor, string>> = {
   "openai-compatible": "http://localhost:1234/v1",
 }
 
-type ProviderModelConfig = {
-  apiKey: string
-  baseURL: string
-  models: string[]
-  knowledgeGraphModel: string
-  meetingNotesModel: string
-  liveNoteAgentModel: string
-  autoPermissionDecisionModel: string
-}
-
 function ModelSettings({ dialogOpen }: { dialogOpen: boolean }) {
   const [provider, setProvider] = useState<LlmProviderFlavor>("openai")
   const [defaultProvider, setDefaultProvider] = useState<LlmProviderFlavor | null>(null)
-  const [providerConfigs, setProviderConfigs] = useState<Record<LlmProviderFlavor, ProviderModelConfig>>({
-    openai: { apiKey: "", baseURL: "", models: [""], knowledgeGraphModel: "", meetingNotesModel: "", liveNoteAgentModel: "", autoPermissionDecisionModel: "" },
-    anthropic: { apiKey: "", baseURL: "", models: [""], knowledgeGraphModel: "", meetingNotesModel: "", liveNoteAgentModel: "", autoPermissionDecisionModel: "" },
-    google: { apiKey: "", baseURL: "", models: [""], knowledgeGraphModel: "", meetingNotesModel: "", liveNoteAgentModel: "", autoPermissionDecisionModel: "" },
-    openrouter: { apiKey: "", baseURL: "", models: [""], knowledgeGraphModel: "", meetingNotesModel: "", liveNoteAgentModel: "", autoPermissionDecisionModel: "" },
-    aigateway: { apiKey: "", baseURL: "", models: [""], knowledgeGraphModel: "", meetingNotesModel: "", liveNoteAgentModel: "", autoPermissionDecisionModel: "" },
-    ollama: { apiKey: "", baseURL: "http://localhost:11434", models: [""], knowledgeGraphModel: "", meetingNotesModel: "", liveNoteAgentModel: "", autoPermissionDecisionModel: "" },
-    "openai-compatible": { apiKey: "", baseURL: "http://localhost:1234/v1", models: [""], knowledgeGraphModel: "", meetingNotesModel: "", liveNoteAgentModel: "", autoPermissionDecisionModel: "" },
+  const [providerConfigs, setProviderConfigs] = useState<Record<LlmProviderFlavor, { apiKey: string; baseURL: string; models: string[]; knowledgeGraphModel: string; meetingNotesModel: string; liveNoteAgentModel: string }>>({
+    openai: { apiKey: "", baseURL: "", models: [""], knowledgeGraphModel: "", meetingNotesModel: "", liveNoteAgentModel: "" },
+    anthropic: { apiKey: "", baseURL: "", models: [""], knowledgeGraphModel: "", meetingNotesModel: "", liveNoteAgentModel: "" },
+    google: { apiKey: "", baseURL: "", models: [""], knowledgeGraphModel: "", meetingNotesModel: "", liveNoteAgentModel: "" },
+    openrouter: { apiKey: "", baseURL: "", models: [""], knowledgeGraphModel: "", meetingNotesModel: "", liveNoteAgentModel: "" },
+    aigateway: { apiKey: "", baseURL: "", models: [""], knowledgeGraphModel: "", meetingNotesModel: "", liveNoteAgentModel: "" },
+    ollama: { apiKey: "", baseURL: "http://localhost:11434", models: [""], knowledgeGraphModel: "", meetingNotesModel: "", liveNoteAgentModel: "" },
+    "openai-compatible": { apiKey: "", baseURL: "http://localhost:1234/v1", models: [""], knowledgeGraphModel: "", meetingNotesModel: "", liveNoteAgentModel: "" },
   })
   const [modelsCatalog, setModelsCatalog] = useState<Record<string, LlmModelOption[]>>({})
   const [modelsLoading, setModelsLoading] = useState(false)
@@ -368,7 +229,7 @@ function ModelSettings({ dialogOpen }: { dialogOpen: boolean }) {
     (!requiresBaseURL || activeConfig.baseURL.trim().length > 0)
 
   const updateConfig = useCallback(
-    (prov: LlmProviderFlavor, updates: Partial<ProviderModelConfig>) => {
+    (prov: LlmProviderFlavor, updates: Partial<{ apiKey: string; baseURL: string; models: string[]; knowledgeGraphModel: string; meetingNotesModel: string; liveNoteAgentModel: string }>) => {
       setProviderConfigs(prev => ({
         ...prev,
         [prov]: { ...prev[prov], ...updates },
@@ -443,7 +304,6 @@ function ModelSettings({ dialogOpen }: { dialogOpen: boolean }) {
                     knowledgeGraphModel: e.knowledgeGraphModel || "",
                     meetingNotesModel: e.meetingNotesModel || "",
                     liveNoteAgentModel: e.liveNoteAgentModel || "",
-                    autoPermissionDecisionModel: e.autoPermissionDecisionModel || "",
                   };
                 }
               }
@@ -462,7 +322,6 @@ function ModelSettings({ dialogOpen }: { dialogOpen: boolean }) {
                 knowledgeGraphModel: parsed.knowledgeGraphModel || "",
                 meetingNotesModel: parsed.meetingNotesModel || "",
                 liveNoteAgentModel: parsed.liveNoteAgentModel || "",
-                autoPermissionDecisionModel: parsed.autoPermissionDecisionModel || "",
               };
             }
             return next;
@@ -538,7 +397,6 @@ function ModelSettings({ dialogOpen }: { dialogOpen: boolean }) {
         knowledgeGraphModel: activeConfig.knowledgeGraphModel.trim() || undefined,
         meetingNotesModel: activeConfig.meetingNotesModel.trim() || undefined,
         liveNoteAgentModel: activeConfig.liveNoteAgentModel.trim() || undefined,
-        autoPermissionDecisionModel: activeConfig.autoPermissionDecisionModel.trim() || undefined,
       }
       const result = await window.ipc.invoke("models:test", providerConfig)
       if (result.success) {
@@ -573,7 +431,6 @@ function ModelSettings({ dialogOpen }: { dialogOpen: boolean }) {
         knowledgeGraphModel: config.knowledgeGraphModel.trim() || undefined,
         meetingNotesModel: config.meetingNotesModel.trim() || undefined,
         liveNoteAgentModel: config.liveNoteAgentModel.trim() || undefined,
-        autoPermissionDecisionModel: config.autoPermissionDecisionModel.trim() || undefined,
       })
       setDefaultProvider(prov)
       window.dispatchEvent(new Event('models-config-changed'))
@@ -605,7 +462,6 @@ function ModelSettings({ dialogOpen }: { dialogOpen: boolean }) {
         parsed.knowledgeGraphModel = defConfig.knowledgeGraphModel.trim() || undefined
         parsed.meetingNotesModel = defConfig.meetingNotesModel.trim() || undefined
         parsed.liveNoteAgentModel = defConfig.liveNoteAgentModel.trim() || undefined
-        parsed.autoPermissionDecisionModel = defConfig.autoPermissionDecisionModel.trim() || undefined
       }
       await window.ipc.invoke("workspace:writeFile", {
         path: "config/models.json",
@@ -613,7 +469,7 @@ function ModelSettings({ dialogOpen }: { dialogOpen: boolean }) {
       })
       setProviderConfigs(prev => ({
         ...prev,
-        [prov]: { apiKey: "", baseURL: defaultBaseURLs[prov] || "", models: [""], knowledgeGraphModel: "", meetingNotesModel: "", liveNoteAgentModel: "", autoPermissionDecisionModel: "" },
+        [prov]: { apiKey: "", baseURL: defaultBaseURLs[prov] || "", models: [""], knowledgeGraphModel: "", meetingNotesModel: "", liveNoteAgentModel: "" },
       }))
       setTestState({ status: "idle" })
       window.dispatchEvent(new Event('models-config-changed'))
@@ -871,40 +727,6 @@ function ModelSettings({ dialogOpen }: { dialogOpen: boolean }) {
             </Select>
           )}
         </div>
-
-        {/* Auto-permission model */}
-        <div className="space-y-2">
-          <span className="text-xs font-medium text-muted-foreground uppercase tracking-wider">Auto-permission model</span>
-          {modelsLoading ? (
-            <div className="flex items-center gap-2 text-sm text-muted-foreground">
-              <Loader2 className="size-4 animate-spin" />
-              Loading...
-            </div>
-          ) : showModelInput ? (
-            <Input
-              value={activeConfig.autoPermissionDecisionModel}
-              onChange={(e) => updateConfig(provider, { autoPermissionDecisionModel: e.target.value })}
-              placeholder={primaryModel || "Enter model"}
-            />
-          ) : (
-            <Select
-              value={activeConfig.autoPermissionDecisionModel || "__same__"}
-              onValueChange={(value) => updateConfig(provider, { autoPermissionDecisionModel: value === "__same__" ? "" : value })}
-            >
-              <SelectTrigger>
-                <SelectValue placeholder="Select a model" />
-              </SelectTrigger>
-              <SelectContent>
-                <SelectItem value="__same__">Same as assistant</SelectItem>
-                {modelsForProvider.map((m) => (
-                  <SelectItem key={m.id} value={m.id}>
-                    {m.name || m.id}
-                  </SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
-          )}
-        </div>
       </div>
 
       {/* API Key */}
@@ -1748,255 +1570,11 @@ function NoteTaggingSettings({ dialogOpen }: { dialogOpen: boolean }) {
   )
 }
 
-// --- Code Mode Settings ---
-
-type AgentStatus = { installed: boolean; signedIn: boolean }
-type CodeModeAgentStatus = { claude: AgentStatus; codex: AgentStatus }
-
-function AgentStatusRow({
-  name,
-  installLink,
-  signInCommand,
-  status,
-}: {
-  name: string
-  installLink: string
-  signInCommand: string
-  status: AgentStatus | null
-}) {
-  const ready = status?.installed && status?.signedIn
-  const needsSignInOnly = status?.installed && !status?.signedIn
-  return (
-    <div className="rounded-md border px-3 py-2.5 flex items-center gap-3">
-      <Terminal className="size-4 text-muted-foreground shrink-0" />
-      <div className="flex-1 min-w-0">
-        <div className="text-sm font-medium">{name}</div>
-        <div className="text-xs text-muted-foreground mt-0.5 flex items-center gap-3">
-          <span className={cn("inline-flex items-center gap-1", status?.installed ? "text-green-600" : "text-muted-foreground")}>
-            {status?.installed ? <CheckCircle2 className="size-3" /> : <X className="size-3" />}
-            Installed
-          </span>
-          <span className={cn("inline-flex items-center gap-1", status?.signedIn ? "text-green-600" : "text-muted-foreground")}>
-            {status?.signedIn ? <CheckCircle2 className="size-3" /> : <X className="size-3" />}
-            Signed in
-          </span>
-        </div>
-      </div>
-      {ready ? (
-        <span className="rounded-full bg-green-500/10 px-2 py-0.5 text-[10px] font-medium leading-none text-green-600">
-          Ready
-        </span>
-      ) : needsSignInOnly ? (
-        <span className="text-xs text-muted-foreground shrink-0">
-          Run <code className="rounded bg-muted px-1 py-0.5 font-mono text-[11px] text-foreground">{signInCommand}</code>
-        </span>
-      ) : (
-        <a
-          href={installLink}
-          target="_blank"
-          rel="noopener noreferrer"
-          className="text-xs text-primary hover:underline shrink-0"
-        >
-          Install &amp; sign in
-        </a>
-      )}
-    </div>
-  )
-}
-
-function CodeModeSettings({ dialogOpen }: { dialogOpen: boolean }) {
-  const [enabled, setEnabled] = useState(false)
-  const [approvalPolicy, setApprovalPolicy] = useState<ApprovalPolicy>('ask')
-  const [loading, setLoading] = useState(true)
-  const [saving, setSaving] = useState(false)
-  const [status, setStatus] = useState<CodeModeAgentStatus | null>(null)
-  const [statusLoading, setStatusLoading] = useState(false)
-
-  const loadStatus = useCallback(async () => {
-    setStatusLoading(true)
-    try {
-      const result = await window.ipc.invoke("codeMode:checkAgentStatus", null)
-      setStatus(result)
-    } catch {
-      setStatus(null)
-    } finally {
-      setStatusLoading(false)
-    }
-  }, [])
-
-  useEffect(() => {
-    if (!dialogOpen) return
-    let cancelled = false
-    async function load() {
-      setLoading(true)
-      try {
-        const result = await window.ipc.invoke("codeMode:getConfig", null)
-        if (!cancelled) {
-          setEnabled(result.enabled)
-          setApprovalPolicy(result.approvalPolicy ?? 'ask')
-        }
-      } catch {
-        if (!cancelled) setEnabled(false)
-      } finally {
-        if (!cancelled) setLoading(false)
-      }
-    }
-    load()
-    loadStatus()
-    return () => { cancelled = true }
-  }, [dialogOpen, loadStatus])
-
-  const handleToggle = useCallback(async (next: boolean) => {
-    setSaving(true)
-    setEnabled(next)
-    try {
-      await window.ipc.invoke("codeMode:setConfig", { enabled: next, approvalPolicy })
-      window.dispatchEvent(new Event("code-mode-config-changed"))
-      toast.success(next ? "Code mode enabled" : "Code mode disabled")
-    } catch {
-      setEnabled(!next)
-      toast.error("Failed to update code mode")
-    } finally {
-      setSaving(false)
-    }
-  }, [approvalPolicy])
-
-  const handlePolicyChange = useCallback(async (next: ApprovalPolicy) => {
-    const prev = approvalPolicy
-    setSaving(true)
-    setApprovalPolicy(next)
-    try {
-      await window.ipc.invoke("codeMode:setConfig", { enabled, approvalPolicy: next })
-      window.dispatchEvent(new Event("code-mode-config-changed"))
-    } catch {
-      setApprovalPolicy(prev)
-      toast.error("Failed to update approval policy")
-    } finally {
-      setSaving(false)
-    }
-  }, [enabled, approvalPolicy])
-
-  const anyReady = status?.claude.installed && status?.claude.signedIn
-    || status?.codex.installed && status?.codex.signedIn
-
-  if (loading) {
-    return (
-      <div className="h-full flex items-center justify-center text-muted-foreground text-sm">
-        <Loader2 className="size-4 animate-spin mr-2" />
-        Loading...
-      </div>
-    )
-  }
-
-  return (
-    <div className="space-y-5">
-      <div className="space-y-2 text-sm text-muted-foreground leading-relaxed">
-        <p>
-          <strong className="text-foreground">Code mode</strong> lets the assistant delegate coding tasks
-          to <strong className="text-foreground">Claude Code</strong> or <strong className="text-foreground">Codex</strong> running
-          on your machine. Pick the agent inline from the composer; the assistant runs it on-device
-          and streams its work — tool calls, file diffs, and approvals — back into chat.
-        </p>
-        <p>
-          Requires an active <strong className="text-foreground">Claude Code</strong> subscription or
-          a <strong className="text-foreground">ChatGPT/Codex</strong> subscription. You can have one or both.
-        </p>
-      </div>
-
-      <div className="space-y-2">
-        <div className="flex items-center justify-between">
-          <span className="text-xs font-medium text-muted-foreground uppercase tracking-wider">Agent status</span>
-          <button
-            onClick={() => { void loadStatus() }}
-            disabled={statusLoading}
-            className="inline-flex items-center gap-1 text-xs text-muted-foreground hover:text-foreground transition-colors"
-          >
-            {statusLoading ? <Loader2 className="size-3 animate-spin" /> : <RefreshCw className="size-3" />}
-            Re-check
-          </button>
-        </div>
-        <div className="space-y-2">
-          <AgentStatusRow
-            name="Claude Code"
-            installLink="https://claude.ai/code"
-            signInCommand="claude login"
-            status={status?.claude ?? null}
-          />
-          <AgentStatusRow
-            name="Codex"
-            installLink="https://developers.openai.com/codex/cli"
-            signInCommand="codex login"
-            status={status?.codex ?? null}
-          />
-        </div>
-      </div>
-
-      <div className="rounded-md border px-3 py-3 flex items-start gap-3">
-        <div className="flex-1 min-w-0">
-          <div className="text-sm font-medium">Enable code mode</div>
-          <div className="text-xs text-muted-foreground mt-0.5">
-            Shows the code mode chip in the composer and lets the assistant delegate to your installed agents.
-          </div>
-        </div>
-        <Switch
-          checked={enabled}
-          onCheckedChange={handleToggle}
-          disabled={saving}
-        />
-      </div>
-
-      {enabled && (
-        <div className="rounded-md border px-3 py-3 space-y-2">
-          <div className="text-sm font-medium">Approvals</div>
-          <div className="text-xs text-muted-foreground">
-            How the coding agent checks in before changing files or running commands. You always see
-            everything it does in the timeline — this only controls the prompts.
-          </div>
-          <Select
-            value={approvalPolicy}
-            onValueChange={(v) => handlePolicyChange(v as ApprovalPolicy)}
-            disabled={saving}
-          >
-            <SelectTrigger className="w-full">
-              <SelectValue />
-            </SelectTrigger>
-            <SelectContent>
-              <SelectItem value="ask">Ask every time</SelectItem>
-              <SelectItem value="auto-approve-reads">Auto-approve reads</SelectItem>
-              <SelectItem value="yolo">Auto-approve everything (YOLO)</SelectItem>
-            </SelectContent>
-          </Select>
-          <div className="text-xs text-muted-foreground">
-            {approvalPolicy === 'ask' && 'You approve every file change and command the agent wants to run.'}
-            {approvalPolicy === 'auto-approve-reads' && 'Reading and searching run automatically; you still approve writes, edits, and commands.'}
-            {approvalPolicy === 'yolo' && 'The agent runs everything — writes, edits, and commands — without asking. Use only in folders you trust.'}
-          </div>
-        </div>
-      )}
-
-      {enabled && status && !anyReady && (
-        <div className="rounded-md border border-amber-500/40 bg-amber-50/60 dark:bg-amber-950/20 px-3 py-2.5 flex items-start gap-2 text-xs">
-          <AlertTriangle className="size-4 text-amber-600 dark:text-amber-500 shrink-0 mt-0.5" />
-          <div className="text-amber-900 dark:text-amber-200">
-            Neither Claude Code nor Codex is ready. Install at least one and sign in with a subscription
-            account, then click Re-check.
-          </div>
-        </div>
-      )}
-    </div>
-  )
-}
-
 // --- Main Settings Dialog ---
 
-export function SettingsDialog({ children, defaultTab = "account", open: controlledOpen, onOpenChange }: SettingsDialogProps) {
-  const [internalOpen, setInternalOpen] = useState(false)
-  const open = controlledOpen ?? internalOpen
-  const setOpen = useCallback((next: boolean) => {
-    if (onOpenChange) onOpenChange(next)
-    else setInternalOpen(next)
-  }, [onOpenChange])
-  const [activeTab, setActiveTab] = useState<ConfigTab>(defaultTab)
+export function SettingsDialog({ children }: SettingsDialogProps) {
+  const [open, setOpen] = useState(false)
+  const [activeTab, setActiveTab] = useState<ConfigTab>("account")
   const [content, setContent] = useState("")
   const [originalContent, setOriginalContent] = useState("")
   const [loading, setLoading] = useState(false)
@@ -2004,11 +1582,6 @@ export function SettingsDialog({ children, defaultTab = "account", open: control
   const [error, setError] = useState<string | null>(null)
   const [rowboatConnected, setRowboatConnected] = useState(false)
 
-  // Reset to the requested default tab each time the dialog is opened
-  useEffect(() => {
-    if (open) setActiveTab(defaultTab)
-  }, [open, defaultTab])
-
   // Check if user is signed in to Rowboat
   useEffect(() => {
     if (!open) return
@@ -2034,7 +1607,7 @@ export function SettingsDialog({ children, defaultTab = "account", open: control
   }
 
   const loadConfig = useCallback(async (tab: ConfigTab) => {
-    if (tab === "appearance" || tab === "models" || tab === "note-tagging" || tab === "account" || tab === "connections" || tab === "help" || tab === "code-mode") return
+    if (tab === "appearance" || tab === "models" || tab === "note-tagging" || tab === "account" || tab === "connected-accounts") return
     const tabConfig = tabs.find((t) => t.id === tab)!
     if (!tabConfig.path) return
     setLoading(true)
@@ -2100,7 +1673,7 @@ export function SettingsDialog({ children, defaultTab = "account", open: control
 
   return (
     <Dialog open={open} onOpenChange={setOpen}>
-      {children && <DialogTrigger asChild>{children}</DialogTrigger>}
+      <DialogTrigger asChild>{children}</DialogTrigger>
       <DialogContent
         className="max-w-[900px]! w-[900px] h-[600px] p-0 gap-0 overflow-hidden"
       >
@@ -2142,21 +1715,11 @@ export function SettingsDialog({ children, defaultTab = "account", open: control
             </div>
 
             {/* Content */}
-            <div className={cn("flex-1 p-4 min-h-0", (activeTab === "models" || activeTab === "connections" || activeTab === "account" || activeTab === "code-mode") ? "overflow-y-auto" : activeTab === "note-tagging" ? "overflow-hidden flex flex-col" : "overflow-hidden")}>
+            <div className={cn("flex-1 p-4 min-h-0", (activeTab === "models" || activeTab === "tools" || activeTab === "account" || activeTab === "connected-accounts") ? "overflow-y-auto" : activeTab === "note-tagging" ? "overflow-hidden flex flex-col" : "overflow-hidden")}>
               {activeTab === "account" ? (
                 <AccountSettings dialogOpen={open} />
-              ) : activeTab === "connections" ? (
-                <div className="space-y-6">
-                  <div className="space-y-2">
-                    <h4 className="text-sm font-semibold">Primary accounts</h4>
-                    <ConnectedAccountsSettings dialogOpen={open} />
-                  </div>
-                  <Separator />
-                  <div className="space-y-2">
-                    <h4 className="text-sm font-semibold">Library</h4>
-                    <ToolsLibrarySettings dialogOpen={open} rowboatConnected={rowboatConnected} />
-                  </div>
-                </div>
+              ) : activeTab === "connected-accounts" ? (
+                <ConnectedAccountsSettings dialogOpen={open} />
               ) : activeTab === "models" ? (
                 rowboatConnected
                   ? <RowboatModelSettings dialogOpen={open} />
@@ -2165,10 +1728,8 @@ export function SettingsDialog({ children, defaultTab = "account", open: control
                 <NoteTaggingSettings dialogOpen={open} />
               ) : activeTab === "appearance" ? (
                 <AppearanceSettings />
-              ) : activeTab === "help" ? (
-                <HelpSettings />
-              ) : activeTab === "code-mode" ? (
-                <CodeModeSettings dialogOpen={open} />
+              ) : activeTab === "tools" ? (
+                <ToolsLibrarySettings dialogOpen={open} rowboatConnected={rowboatConnected} />
               ) : loading ? (
                 <div className="h-full flex items-center justify-center text-muted-foreground text-sm">
                   Loading...
diff --git a/apps/x/apps/renderer/src/components/settings/account-settings.tsx b/apps/x/apps/renderer/src/components/settings/account-settings.tsx
index 66f2b682..1860305d 100644
--- a/apps/x/apps/renderer/src/components/settings/account-settings.tsx
+++ b/apps/x/apps/renderer/src/components/settings/account-settings.tsx
@@ -17,44 +17,11 @@ import {
 import { Separator } from "@/components/ui/separator"
 import { useBilling } from "@/hooks/useBilling"
 import { toast } from "sonner"
-import type { BillingUsageBucket } from "@x/shared/dist/billing.js"
 
 interface AccountSettingsProps {
   dialogOpen: boolean
 }
 
-function formatPlanName(plan: string | null | undefined) {
-  if (!plan) return 'No Plan'
-  return `${plan.charAt(0).toUpperCase()}${plan.slice(1)} Plan`
-}
-
-function CreditUsageBar({ label, bucket, helper }: {
-  label: string
-  bucket: BillingUsageBucket
-  helper?: string
-}) {
-  const pct = bucket.sanctionedCredits > 0
-    ? Math.min(100, Math.max(0, Math.round((bucket.usedCredits / bucket.sanctionedCredits) * 100)))
-    : 0
-
-  return (
-    <div className="space-y-1.5">
-      <div className="flex items-start justify-between gap-3">
-        <div>
-          <p className="text-xs font-medium text-muted-foreground">{label}</p>
-          {helper ? <p className="text-[11px] text-muted-foreground">{helper}</p> : null}
-        </div>
-        <p className="shrink-0 text-xs font-medium tabular-nums">
-          {pct}%
-        </p>
-      </div>
-      <div className="h-2 overflow-hidden rounded-full bg-muted">
-        <div className="h-full rounded-full bg-primary transition-all" style={{ width: `${pct}%` }} />
-      </div>
-    </div>
-  )
-}
-
 export function AccountSettings({ dialogOpen }: AccountSettingsProps) {
   const [isRowboatConnected, setIsRowboatConnected] = useState(false)
   const [connectionLoading, setConnectionLoading] = useState(true)
@@ -62,7 +29,6 @@ export function AccountSettings({ dialogOpen }: AccountSettingsProps) {
   const [connecting, setConnecting] = useState(false)
   const [appUrl, setAppUrl] = useState<string | null>(null)
   const { billing, isLoading: billingLoading } = useBilling(isRowboatConnected)
-  const hasPaidSubscription = billing?.subscriptionPlan === 'starter' || billing?.subscriptionPlan === 'pro'
 
   const checkConnection = useCallback(async () => {
     try {
@@ -197,7 +163,7 @@ export function AccountSettings({ dialogOpen }: AccountSettingsProps) {
             <div className="flex items-center justify-between">
               <div>
                 <p className="text-sm font-medium capitalize">
-                  {formatPlanName(billing.subscriptionPlan)}
+                  {billing.subscriptionPlan ? `${billing.subscriptionPlan} Plan` : 'No Plan'}
                 </p>
                 {billing.subscriptionStatus === 'trialing' && billing.trialExpiresAt ? (() => {
                   const days = Math.max(0, Math.ceil((new Date(billing.trialExpiresAt).getTime() - Date.now()) / (1000 * 60 * 60 * 24)))
@@ -214,17 +180,9 @@ export function AccountSettings({ dialogOpen }: AccountSettingsProps) {
                 )}
               </div>
               <Button variant="outline" size="sm" onClick={() => appUrl && window.open(`${appUrl}?intent=upgrade`)}>
-                {!billing.subscriptionPlan ? 'Subscribe' : billing.subscriptionPlan === 'free' ? 'Upgrade' : 'Change plan'}
+                {!billing.subscriptionPlan ? 'Subscribe' : 'Change plan'}
               </Button>
             </div>
-            <div className="space-y-3 border-t pt-3">
-              <CreditUsageBar label="Plan usage" bucket={billing.monthly} />
-              <CreditUsageBar
-                label="Daily use"
-                bucket={billing.daily}
-                helper="Daily usage resets at 00:00 UTC"
-              />
-            </div>
           </div>
         ) : (
           <p className="text-xs text-muted-foreground">Unable to load plan details</p>
@@ -245,15 +203,15 @@ export function AccountSettings({ dialogOpen }: AccountSettingsProps) {
         <Button
           variant="outline"
           size="sm"
-          disabled={!hasPaidSubscription}
+          disabled={!billing?.subscriptionPlan}
           onClick={() => appUrl && window.open(appUrl)}
           className="gap-1.5"
         >
           <ExternalLink className="size-3" />
           Manage in Stripe
         </Button>
-        {!hasPaidSubscription && (
-          <p className="text-[11px] text-muted-foreground">Upgrade to a paid plan first</p>
+        {!billing?.subscriptionPlan && (
+          <p className="text-[11px] text-muted-foreground">Subscribe to a plan first</p>
         )}
       </div>
 
diff --git a/apps/x/apps/renderer/src/components/settings/connected-accounts-settings.tsx b/apps/x/apps/renderer/src/components/settings/connected-accounts-settings.tsx
index e0c0b900..8b90f619 100644
--- a/apps/x/apps/renderer/src/components/settings/connected-accounts-settings.tsx
+++ b/apps/x/apps/renderer/src/components/settings/connected-accounts-settings.tsx
@@ -26,10 +26,10 @@ export function ConnectedAccountsSettings({ dialogOpen }: ConnectedAccountsSetti
     return (
       <div
         key={provider}
-        className="flex items-center justify-between gap-2 rounded-md px-3 py-2 hover:bg-accent/50 transition-colors"
+        className="flex items-center justify-between gap-3 rounded-lg px-4 py-3 hover:bg-accent/50 transition-colors"
       >
-        <div className="flex items-center gap-2.5 min-w-0">
-          <div className="flex size-8 items-center justify-center rounded-md bg-muted">
+        <div className="flex items-center gap-3 min-w-0">
+          <div className="flex size-9 items-center justify-center rounded-lg bg-muted">
             {icon}
           </div>
           <div className="flex flex-col min-w-0">
@@ -119,15 +119,15 @@ export function ConnectedAccountsSettings({ dialogOpen }: ConnectedAccountsSetti
         {/* Email & Calendar Section */}
         {(c.useComposioForGoogle || c.useComposioForGoogleCalendar || c.providers.includes('google')) && (
           <>
-            <div className="px-3 pt-1 pb-0.5">
+            <div className="px-4 py-2">
               <span className="text-xs font-medium text-muted-foreground uppercase tracking-wider">
                 Email & Calendar
               </span>
             </div>
             {c.useComposioForGoogle ? (
-              <div className="flex items-center justify-between gap-2 rounded-md px-3 py-2 hover:bg-accent/50 transition-colors">
-                <div className="flex items-center gap-2.5 min-w-0">
-                  <div className="flex size-8 items-center justify-center rounded-md bg-muted">
+              <div className="flex items-center justify-between gap-3 rounded-lg px-4 py-3 hover:bg-accent/50 transition-colors">
+                <div className="flex items-center gap-3 min-w-0">
+                  <div className="flex size-9 items-center justify-center rounded-lg bg-muted">
                     <Mail className="size-4" />
                   </div>
                   <div className="flex flex-col min-w-0">
@@ -174,9 +174,9 @@ export function ConnectedAccountsSettings({ dialogOpen }: ConnectedAccountsSetti
               c.providers.includes('google') && renderOAuthProvider('google', 'Google', <Mail className="size-4" />, 'Sync emails and calendar')
             )}
             {c.useComposioForGoogleCalendar && (
-              <div className="flex items-center justify-between gap-2 rounded-md px-3 py-2 hover:bg-accent/50 transition-colors">
-                <div className="flex items-center gap-2.5 min-w-0">
-                  <div className="flex size-8 items-center justify-center rounded-md bg-muted">
+              <div className="flex items-center justify-between gap-3 rounded-lg px-4 py-3 hover:bg-accent/50 transition-colors">
+                <div className="flex items-center gap-3 min-w-0">
+                  <div className="flex size-9 items-center justify-center rounded-lg bg-muted">
                     <Calendar className="size-4" />
                   </div>
                   <div className="flex flex-col min-w-0">
@@ -220,14 +220,14 @@ export function ConnectedAccountsSettings({ dialogOpen }: ConnectedAccountsSetti
                 </div>
               </div>
             )}
-            <Separator className="my-2" />
+            <Separator className="my-3" />
           </>
         )}
 
         {/* Meeting Notes Section */}
         {c.providers.includes('fireflies-ai') && (
           <>
-            <div className="px-3 pt-1 pb-0.5">
+            <div className="px-4 py-2">
               <span className="text-xs font-medium text-muted-foreground uppercase tracking-wider">
                 Meeting Notes
               </span>
diff --git a/apps/x/apps/renderer/src/components/sidebar-content.tsx b/apps/x/apps/renderer/src/components/sidebar-content.tsx
index f5870ec4..75193884 100644
--- a/apps/x/apps/renderer/src/components/sidebar-content.tsx
+++ b/apps/x/apps/renderer/src/components/sidebar-content.tsx
@@ -5,22 +5,44 @@ import { useCallback, useEffect, useRef, useState } from "react"
 import {
   Bot,
   ChevronRight,
-  FileText,
+  ChevronsDownUp,
+  ChevronsUpDown,
+  Copy,
+  ExternalLink,
   FilePlus,
   Folder,
+  FolderPlus,
   Globe,
   AlertTriangle,
-  Home,
+  HelpCircle,
   Mic,
+  Network,
+  Pencil,
+  Radio,
+  SearchIcon,
   SquarePen,
+  Table2,
   Plug,
+  Lightbulb,
   LoaderIcon,
-  Mail,
-  MessageSquare,
   Settings,
   Square,
-  Video,
+  Trash2,
 } from "lucide-react"
+
+import {
+  Collapsible,
+  CollapsibleContent,
+  CollapsibleTrigger,
+} from "@/components/ui/collapsible"
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog"
 import {
   AlertDialog,
   AlertDialogAction,
@@ -32,6 +54,7 @@ import {
   AlertDialogTitle,
   AlertDialogTrigger,
 } from "@/components/ui/alert-dialog"
+import { Button } from "@/components/ui/button"
 import {
   Sidebar,
   SidebarContent,
@@ -40,8 +63,10 @@ import {
   SidebarGroupContent,
   SidebarHeader,
   SidebarMenu,
+  SidebarMenuAction,
   SidebarMenuButton,
   SidebarMenuItem,
+  SidebarMenuSub,
   SidebarRail,
   useSidebar,
 } from "@/components/ui/sidebar"
@@ -55,12 +80,24 @@ import {
   TooltipContent,
   TooltipTrigger,
 } from "@/components/ui/tooltip"
+import {
+  ContextMenu,
+  ContextMenuContent,
+  ContextMenuItem,
+  ContextMenuSeparator,
+  ContextMenuTrigger,
+} from "@/components/ui/context-menu"
+import { Input } from "@/components/ui/input"
 import { cn } from "@/lib/utils"
+import { type ActiveSection, useSidebarSection } from "@/contexts/sidebar-context"
+import { ConnectorsPopover } from "@/components/connectors-popover"
+import { HelpPopover } from "@/components/help-popover"
 import { SettingsDialog } from "@/components/settings-dialog"
-import { extractConferenceLink } from "@/lib/calendar-event"
-import { useBilling } from "@/hooks/useBilling"
 import { toast } from "@/lib/toast"
+import { formatRelativeTime as formatRunTime } from "@/lib/relative-time"
+import { useBilling } from "@/hooks/useBilling"
 import { ServiceEvent } from "@x/shared/src/service-events.js"
+import type { MeetingTranscriptionState } from "@/hooks/useMeetingTranscription"
 import z from "zod"
 
 interface TreeNode {
@@ -69,7 +106,6 @@ interface TreeNode {
   kind: "file" | "dir"
   children?: TreeNode[]
   loaded?: boolean
-  stat?: { size: number; mtimeMs: number }
 }
 
 type KnowledgeActions = {
@@ -77,53 +113,36 @@ type KnowledgeActions = {
   createFolder: (parentPath?: string) => Promise<string>
   openGraph: () => void
   openBases: () => void
-  openKnowledgeView: () => void
-  openWorkspaceAt: (path?: string) => void
-  createWorkspace: (name: string) => Promise<string>
   expandAll: () => void
   collapseAll: () => void
   rename: (path: string, newName: string, isDir: boolean) => Promise<void>
   remove: (path: string) => Promise<void>
   copyPath: (path: string) => void
-  revealInFileManager: (path: string, isDir: boolean) => void
   onOpenInNewTab?: (path: string) => void
 }
 
-function displayNoteName(node: TreeNode): string {
-  if (node.kind === 'file' && node.name.toLowerCase().endsWith('.md')) {
-    return node.name.slice(0, -3)
-  }
-  return node.name
-}
-
-function formatBillingPlanName(plan: string | null | undefined) {
-  if (!plan) return 'No plan'
-  return `${plan.charAt(0).toUpperCase()}${plan.slice(1)} plan`
-}
-
-function formatAgo(ms: number): string {
-  const diffMs = Math.max(0, Date.now() - ms)
-  const min = Math.floor(diffMs / 60000)
-  if (min < 1) return 'just now'
-  if (min < 60) return `${min}m ago`
-  const hr = Math.floor(min / 60)
-  if (hr < 24) return `${hr}h ago`
-  const day = Math.floor(hr / 24)
-  if (day < 7) return `${day}d ago`
-  const wk = Math.floor(day / 7)
-  if (wk < 4) return `${wk}w ago`
-  const mo = Math.max(1, Math.floor(day / 30))
-  return `${mo}mo ago`
-}
-
-type TaskSummary = {
-  slug: string
-  name: string
-  active: boolean
+type RunListItem = {
+  id: string
+  title?: string
   createdAt: string
-  lastAttemptAt?: string
-  lastRunAt?: string
-  lastRunError?: string
+  agentId: string
+}
+
+type BackgroundTaskItem = {
+  name: string
+  description?: string
+  schedule: {
+    type: "cron" | "window" | "once"
+    expression?: string
+    cron?: string
+    startTime?: string
+    endTime?: string
+    runAt?: string
+  }
+  enabled: boolean
+  status?: "scheduled" | "running" | "finished" | "failed" | "triggered"
+  nextRunAt?: string | null
+  lastRunAt?: string | null
 }
 
 type ServiceEventType = z.infer<typeof ServiceEvent>
@@ -162,29 +181,49 @@ function collectServiceErrors(events: ServiceEventType[]): Map<string, string> {
   return errors
 }
 
+type TasksActions = {
+  onNewChat: () => void
+  onSelectRun: (runId: string) => void
+  onDeleteRun: (runId: string) => void
+  onOpenInNewTab?: (runId: string) => void
+  onSelectBackgroundTask?: (taskName: string) => void
+}
+
 type SidebarContentPanelProps = {
   tree: TreeNode[]
+  selectedPath: string | null
+  expandedPaths: Set<string>
   onSelectFile: (path: string, kind: "file" | "dir") => void
+  onToggleFolder?: (path: string) => void
   knowledgeActions: KnowledgeActions
-  bgTaskSummaries?: TaskSummary[]
-  onOpenMeetings?: () => void
-  onOpenBgTasks?: () => void
-  onOpenAgent?: (slug: string) => void
-  recentRuns?: { id: string; title?: string; createdAt: string }[]
-  onOpenRun?: (runId: string) => void
-  onOpenEmail?: (threadId?: string) => void
-  onOpenHome?: () => void
-  onNewChat?: () => void
-  onToggleBrowser?: () => void
   onVoiceNoteCreated?: (path: string) => void
-  /** Which primary destination is currently active, for nav highlighting. */
-  activeNav?: 'home' | 'email' | 'meetings' | 'knowledge' | 'agents' | 'workspaces' | null
-  /** Live meeting recording state, so the recording row can show its indicator/stop. */
-  meetingRecordingState?: 'idle' | 'connecting' | 'recording' | 'stopping'
-  recordingMeetingSource?: string | null
-  onToggleMeetingRecording?: () => void
+  runs?: RunListItem[]
+  currentRunId?: string | null
+  processingRunIds?: Set<string>
+  tasksActions?: TasksActions
+  backgroundTasks?: BackgroundTaskItem[]
+  selectedBackgroundTask?: string | null
+  onNewChat?: () => void
+  onOpenSearch?: () => void
+  meetingState?: MeetingTranscriptionState
+  meetingSummarizing?: boolean
+  meetingAvailable?: boolean
+  onToggleMeeting?: () => void
+  isSearchOpen?: boolean
+  isMeetingActionActive?: boolean
+  isBrowserOpen?: boolean
+  onToggleBrowser?: () => void
+  isSuggestedTopicsOpen?: boolean
+  onOpenSuggestedTopics?: () => void
+  isLiveNotesOpen?: boolean
+  onOpenLiveNotes?: () => void
 } & React.ComponentProps<typeof Sidebar>
 
+const sectionTabs: { id: ActiveSection; label: string }[] = [
+  { id: "tasks", label: "Chat" },
+  { id: "knowledge", label: "Knowledge" },
+]
+
 function formatEventTime(ts: string): string {
   const date = new Date(ts)
   if (Number.isNaN(date.getTime())) return ""
@@ -412,225 +451,48 @@ function SyncStatusBar() {
 
 export function SidebarContentPanel({
   tree,
+  selectedPath,
+  expandedPaths,
   onSelectFile,
+  onToggleFolder,
   knowledgeActions,
-  bgTaskSummaries = [],
-  onOpenMeetings,
-  onOpenBgTasks,
-  onOpenAgent,
-  recentRuns = [],
-  onOpenRun,
-  onOpenEmail,
-  onOpenHome,
-  onNewChat,
-  onToggleBrowser,
   onVoiceNoteCreated,
-  activeNav,
-  meetingRecordingState = 'idle',
-  recordingMeetingSource = null,
-  onToggleMeetingRecording,
+  runs = [],
+  currentRunId,
+  processingRunIds,
+  tasksActions,
+  backgroundTasks = [],
+  selectedBackgroundTask,
+  onNewChat,
+  onOpenSearch,
+  meetingState = 'idle',
+  meetingSummarizing = false,
+  meetingAvailable = false,
+  onToggleMeeting,
+  isSearchOpen = false,
+  isMeetingActionActive = false,
+  isBrowserOpen = false,
+  onToggleBrowser,
+  isSuggestedTopicsOpen = false,
+  onOpenSuggestedTopics,
+  isLiveNotesOpen = false,
+  onOpenLiveNotes,
   ...props
 }: SidebarContentPanelProps) {
+  const { activeSection, setActiveSection } = useSidebarSection()
   const [hasOauthError, setHasOauthError] = useState(false)
   const [showOauthAlert, setShowOauthAlert] = useState(true)
-  const [connectionsSettingsOpen, setConnectionsSettingsOpen] = useState(false)
-  const [openConnectionsAfterClose, setOpenConnectionsAfterClose] = useState(false)
+  const [connectorsOpen, setConnectorsOpen] = useState(false)
+  const [openConnectorsAfterClose, setOpenConnectorsAfterClose] = useState(false)
   const connectorsButtonRef = useRef<HTMLButtonElement | null>(null)
   const [isRowboatConnected, setIsRowboatConnected] = useState(false)
   const [loggingIn, setLoggingIn] = useState(false)
   const [appUrl, setAppUrl] = useState<string | null>(null)
   const { billing } = useBilling(isRowboatConnected)
-
-  // Nav previews: unread important emails + next upcoming meetings (top 2 each).
-  const [unreadEmailCount, setUnreadEmailCount] = useState(0)
-  const [emailThreads, setEmailThreads] = useState<SidebarEmailThread[]>([])
-  const [meetings, setMeetings] = useState<UpcomingMeeting[]>([])
-  const [quickAccessExpanded, setQuickAccessExpanded] = useState(true)
-
-  useEffect(() => {
-    let cancelled = false
-    const loadEmail = async () => {
-      try {
-        const result = await window.ipc.invoke('gmail:getImportant', { limit: 50 })
-        if (cancelled) return
-        const unread = result.threads.filter((t) => t.unread === true)
-        setUnreadEmailCount(unread.length)
-        setEmailThreads(unread.slice(0, 1).map((t) => ({
-          threadId: t.threadId,
-          subject: t.subject ?? '(No subject)',
-          from: t.from ?? '',
-          date: t.date ?? '',
-        })))
-      } catch { /* ignore */ }
-    }
-    void loadEmail()
-    const cleanup = window.ipc.on('workspace:didChange', (event) => {
-      const paths = event.type === 'bulkChanged' ? (event.paths ?? [])
-        : event.type === 'moved' ? [event.from, event.to]
-        : 'path' in event ? [event.path] : []
-      if (paths.some((p) => typeof p === 'string' && p.startsWith('gmail_sync'))) void loadEmail()
-    })
-    return () => { cancelled = true; cleanup() }
-  }, [])
-
-  useEffect(() => {
-    let cancelled = false
-    const loadNext = async () => {
-      try {
-        const exists = await window.ipc.invoke('workspace:exists', { path: 'calendar_sync' })
-        if (!exists.exists) { if (!cancelled) setMeetings([]); return }
-        const entries = await window.ipc.invoke('workspace:readdir', {
-          path: 'calendar_sync',
-          opts: { recursive: false, includeHidden: false, includeStats: false },
-        })
-        const jsonEntries = entries.filter((e) => e.kind === 'file' && e.name.endsWith('.json'))
-        const settled = await Promise.allSettled(jsonEntries.map(async (entry) => {
-          const result = await window.ipc.invoke('workspace:readFile', { path: entry.path, encoding: 'utf8' })
-          return normalizeUpcomingMeeting(JSON.parse(result.data) as RawCalendarEvent, entry.path)
-        }))
-        const items: UpcomingMeeting[] = []
-        for (const r of settled) if (r.status === 'fulfilled' && r.value) items.push(r.value)
-        items.sort((a, b) => {
-          if (a.isAllDay !== b.isAllDay) return a.isAllDay ? -1 : 1
-          return a.start.getTime() - b.start.getTime()
-        })
-        if (!cancelled) setMeetings(items.slice(0, 1))
-      } catch { /* ignore */ }
-    }
-    void loadNext()
-    const cleanup = window.ipc.on('workspace:didChange', (event) => {
-      const paths = event.type === 'bulkChanged' ? (event.paths ?? [])
-        : event.type === 'moved' ? [event.from, event.to]
-        : 'path' in event ? [event.path] : []
-      if (paths.some((p) => typeof p === 'string' && p.startsWith('calendar_sync'))) void loadNext()
-    })
-    const tick = setInterval(() => void loadNext(), 60 * 60 * 1000)
-    return () => { cancelled = true; clearInterval(tick); cleanup() }
-  }, [])
-
-  const recentNotes = React.useMemo<TreeNode[]>(() => {
-    const out: TreeNode[] = []
-    const walk = (nodes: TreeNode[]) => {
-      for (const n of nodes) {
-        if (n.path === 'knowledge/Meetings' || n.path === 'knowledge/Workspace' || n.path === 'knowledge/Agent Notes') continue
-        if (n.kind === 'file') out.push(n)
-        else if (n.children?.length) walk(n.children)
-      }
-    }
-    walk(tree)
-    return out
-      .filter((n) => n.stat?.mtimeMs)
-      .sort((a, b) => (b.stat?.mtimeMs ?? 0) - (a.stat?.mtimeMs ?? 0))
-      .slice(0, 10)
-  }, [tree])
-
-  // Recents: most recently touched notes / agents / chats, interleaved by
-  // recency. Capped per type (4 notes, 4 agents, 4 chats) and 12 overall.
-  type QuickAccessItem = {
-    key: string
-    label: string
-    recency: number
-    type: 'note' | 'agent' | 'chat'
-    onClick: () => void
-  }
-  const quickAccessItems = React.useMemo<QuickAccessItem[]>(() => {
-    const items: QuickAccessItem[] = []
-
-    for (const note of recentNotes.slice(0, 4)) {
-      items.push({
-        key: `note:${note.path}`,
-        label: displayNoteName(note),
-        recency: note.stat?.mtimeMs ?? 0,
-        type: 'note',
-        onClick: () => onSelectFile(note.path, 'file'),
-      })
-    }
-
-    const agentRecency = (t: TaskSummary) => {
-      const ts = t.lastRunAt ?? t.lastAttemptAt ?? t.createdAt
-      const ms = ts ? new Date(ts).getTime() : 0
-      return Number.isFinite(ms) ? ms : 0
-    }
-    for (const t of [...bgTaskSummaries].sort((a, b) => agentRecency(b) - agentRecency(a)).slice(0, 4)) {
-      items.push({
-        key: `agent:${t.slug}`,
-        label: t.name,
-        recency: agentRecency(t),
-        type: 'agent',
-        onClick: () => onOpenAgent?.(t.slug),
-      })
-    }
-
-    const chatRecency = (r: { createdAt: string }) => {
-      const ms = new Date(r.createdAt).getTime()
-      return Number.isFinite(ms) ? ms : 0
-    }
-    for (const r of [...recentRuns].sort((a, b) => chatRecency(b) - chatRecency(a)).slice(0, 4)) {
-      items.push({
-        key: `chat:${r.id}`,
-        label: r.title || '(Untitled chat)',
-        recency: chatRecency(r),
-        type: 'chat',
-        onClick: () => onOpenRun?.(r.id),
-      })
-    }
-
-    return items.sort((a, b) => b.recency - a.recency).slice(0, 12)
-  }, [recentNotes, bgTaskSummaries, recentRuns, onSelectFile, onOpenAgent, onOpenRun])
-
-  // Workspace count for the Workspaces sublabel — top-level dir children of
-  // knowledge/Workspace (matches WorkspaceView's root listing).
-  const workspaceCount = React.useMemo(() => {
-    const find = (nodes: TreeNode[]): TreeNode | null => {
-      for (const n of nodes) {
-        if (n.path === 'knowledge/Workspace') return n
-        if (n.kind === 'dir' && n.children?.length) {
-          const found = find(n.children)
-          if (found) return found
-        }
-      }
-      return null
-    }
-    const node = find(tree)
-    return node?.children?.filter((c) => c.kind === 'dir').length ?? 0
-  }, [tree])
-
-  // "Updated 4m ago" sublabel under Knowledge, based on the most recently
-  // modified note. Recomputed in an effect (not during render) and ticked so
-  // the relative time stays fresh.
-  const latestNoteMtime = recentNotes[0]?.stat?.mtimeMs ?? null
-  const [knowledgeUpdatedLabel, setKnowledgeUpdatedLabel] = useState<string | null>(null)
-  useEffect(() => {
-    if (!latestNoteMtime) { setKnowledgeUpdatedLabel(null); return }
-    const update = () => setKnowledgeUpdatedLabel(`Updated ${formatAgo(latestNoteMtime)}`)
-    update()
-    const tick = setInterval(update, 60 * 1000)
-    return () => clearInterval(tick)
-  }, [latestNoteMtime])
-
-  // "2 active · Last run 3m ago" sublabel under Background agents, overridden by
-  // "N failed · Needs review" when any task's last run errored.
-  const [bgAgentsLabel, setBgAgentsLabel] = useState<string | null>(null)
-  useEffect(() => {
-    const update = () => {
-      const failed = bgTaskSummaries.filter((t) => t.lastRunError).length
-      if (failed > 0) {
-        setBgAgentsLabel(`${failed} failed · Needs review`)
-        return
-      }
-      const active = bgTaskSummaries.filter((t) => t.active).length
-      const lastRunMs = bgTaskSummaries.reduce((max, t) => {
-        const ms = t.lastRunAt ? new Date(t.lastRunAt).getTime() : 0
-        return Number.isFinite(ms) && ms > max ? ms : max
-      }, 0)
-      const parts: string[] = [active > 0 ? `${active} active` : 'No active agents']
-      if (lastRunMs > 0) parts.push(`Last run ${formatAgo(lastRunMs)}`)
-      setBgAgentsLabel(parts.join(' · '))
-    }
-    update()
-    const tick = setInterval(update, 60 * 1000)
-    return () => clearInterval(tick)
-  }, [bgTaskSummaries])
+  const isMeetingQuickActionSelected = isMeetingActionActive
+  const isBrowserQuickActionSelected = isBrowserOpen && !isSearchOpen && !isMeetingQuickActionSelected
+  const isSuggestedTopicsQuickActionSelected = isSuggestedTopicsOpen && !isBrowserOpen
+  const isLiveNotesQuickActionSelected = isLiveNotesOpen && !isBrowserOpen
 
   const handleRowboatLogin = useCallback(async () => {
     try {
@@ -688,250 +550,161 @@ export function SidebarContentPanel({
     }
   }, [])
 
-  // Single preview shown as a sublabel on the Email / Meetings nav buttons.
-  const previewEmail = emailThreads[0]
-  const previewMeeting = meetings[0]
-  // Drive the recording indicator off the global recording state — there is only
-  // one active recording, so it must show even for ad-hoc recordings or meetings
-  // that aren't the upcoming one previewed here.
-  const meetingIsRecording = meetingRecordingState === 'recording'
-    || meetingRecordingState === 'connecting'
-    || meetingRecordingState === 'stopping'
-  const meetingIsBusy = meetingRecordingState === 'connecting' || meetingRecordingState === 'stopping'
-  // Title of the meeting being recorded, when it's the upcoming one we preview.
-  const recordingMeeting = previewMeeting != null && recordingMeetingSource === previewMeeting.source
-    ? previewMeeting
-    : null
-  const meetingSublabel = meetingIsRecording
-    ? (recordingMeeting?.summary ?? 'Recording…')
-    : (previewMeeting ? `${previewMeeting.summary} · ${formatMeetingTime(previewMeeting)}` : null)
-
   return (
-    <Sidebar className="rowboat-sidebar border-r-0" {...props}>
+    <Sidebar className="border-r-0" {...props}>
       <SidebarHeader className="titlebar-drag-region">
         {/* Top spacer to clear the traffic lights + fixed toggle row */}
         <div className="h-8" />
-        {/* Quick actions */}
-        <div className="titlebar-no-drag flex items-center gap-1.5 px-3 pb-2">
+        {/* Tab switcher - centered below the traffic lights row */}
+        <div className="flex items-center px-2 py-1.5">
+          <div className="titlebar-no-drag flex w-full rounded-lg bg-sidebar-accent/50 p-0.5">
+            {sectionTabs.map((tab) => (
+              <button
+                key={tab.id}
+                onClick={() => setActiveSection(tab.id)}
+                className={cn(
+                  "flex-1 rounded-md px-3 py-1 text-sm font-medium transition-colors",
+                  activeSection === tab.id
+                    ? "bg-sidebar-accent text-sidebar-accent-foreground shadow-sm"
+                    : "text-sidebar-foreground/70 hover:text-sidebar-foreground"
+                )}
+              >
+                {tab.label}
+              </button>
+            ))}
+          </div>
+        </div>
+        {/* Quick action buttons */}
+        <div className="titlebar-no-drag flex flex-col gap-0.5 px-2 pb-1">
           {onNewChat && (
-            <ActionButton icon={SquarePen} label="New chat" onClick={onNewChat} />
+            <button
+              type="button"
+              onClick={onNewChat}
+              className="flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-sm text-sidebar-foreground/80 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground transition-colors"
+            >
+              <SquarePen className="size-4" />
+              <span>New chat</span>
+            </button>
+          )}
+          {onOpenSearch && (
+            <button
+              type="button"
+              onClick={onOpenSearch}
+              className={cn(
+                "flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-sm transition-colors",
+                isSearchOpen
+                  ? "bg-sidebar-accent text-sidebar-accent-foreground"
+                  : "text-sidebar-foreground/80 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"
+              )}
+            >
+              <SearchIcon className="size-4" />
+              <span>Search</span>
+            </button>
+          )}
+          {meetingAvailable && onToggleMeeting && (
+            <button
+              type="button"
+              onClick={onToggleMeeting}
+              disabled={meetingState === 'connecting' || meetingState === 'stopping' || meetingSummarizing}
+              className={cn(
+                "flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-sm transition-colors disabled:pointer-events-none",
+                isMeetingQuickActionSelected
+                  ? "bg-sidebar-accent"
+                  : "hover:bg-sidebar-accent",
+                meetingState === 'recording'
+                  ? "text-red-500"
+                  : isMeetingQuickActionSelected
+                    ? "text-sidebar-accent-foreground"
+                    : "text-sidebar-foreground/80 hover:text-sidebar-accent-foreground"
+              )}
+            >
+              {meetingSummarizing || meetingState === 'connecting' ? (
+                <LoaderIcon className="size-4 animate-spin" />
+              ) : meetingState === 'recording' ? (
+                <Square className="size-4 animate-pulse" />
+              ) : (
+                <Radio className="size-4" />
+              )}
+              <span>
+                {meetingSummarizing
+                  ? 'Generating notes…'
+                  : meetingState === 'connecting'
+                    ? 'Starting…'
+                    : meetingState === 'recording'
+                      ? 'Stop recording'
+                      : 'Take meeting notes'}
+              </span>
+            </button>
           )}
-          <ActionButton icon={FilePlus} label="New note" onClick={() => knowledgeActions.createNote()} />
-          <VoiceNoteButton onNoteCreated={onVoiceNoteCreated} variant="action" />
           {onToggleBrowser && (
-            <ActionButton icon={Globe} label="Run browser task" onClick={onToggleBrowser} />
+            <button
+              type="button"
+              onClick={onToggleBrowser}
+              className={cn(
+                "flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-sm transition-colors",
+                isBrowserQuickActionSelected
+                  ? "bg-sidebar-accent text-sidebar-accent-foreground"
+                  : "text-sidebar-foreground/80 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"
+              )}
+            >
+              <Globe className="size-4" />
+              <span>Run browser task</span>
+            </button>
+          )}
+          {onOpenSuggestedTopics && (
+            <button
+              type="button"
+              onClick={onOpenSuggestedTopics}
+              className={cn(
+                "flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-sm transition-colors",
+                isSuggestedTopicsQuickActionSelected
+                  ? "bg-sidebar-accent text-sidebar-accent-foreground"
+                  : "text-sidebar-foreground/80 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"
+              )}
+            >
+              <Lightbulb className="size-4" />
+              <span>Suggested Topics</span>
+            </button>
+          )}
+          {onOpenLiveNotes && (
+            <button
+              type="button"
+              onClick={onOpenLiveNotes}
+              className={cn(
+                "flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-sm transition-colors",
+                isLiveNotesQuickActionSelected
+                  ? "bg-sidebar-accent text-sidebar-accent-foreground"
+                  : "text-sidebar-foreground/80 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"
+              )}
+            >
+              <Radio className="size-4" />
+              <span>Live notes</span>
+            </button>
           )}
         </div>
       </SidebarHeader>
       <SidebarContent>
-        {/* Primary navigation */}
-        <SidebarGroup className="flex flex-col">
-          <SidebarGroupContent>
-            <SidebarMenu>
-              <SidebarMenuItem>
-                <SidebarMenuButton isActive={activeNav === 'home'} onClick={onOpenHome}>
-                  <Home className="size-4 shrink-0" />
-                  <span className="flex-1 truncate">Home</span>
-                </SidebarMenuButton>
-              </SidebarMenuItem>
-              <SidebarMenuItem>
-                <SidebarMenuButton
-                  isActive={activeNav === 'email'}
-                  onClick={() => onOpenEmail?.()}
-                  className={previewEmail ? 'h-auto py-1.5' : undefined}
-                >
-                  <Mail className="size-4 shrink-0" />
-                  <div className="flex min-w-0 flex-1 flex-col">
-                    <span className="truncate">Email</span>
-                    {previewEmail && (
-                      <span className="truncate text-[11px] text-muted-foreground">
-                        {formatEmailFrom(previewEmail.from)} · {previewEmail.subject}
-                      </span>
-                    )}
-                  </div>
-                  {unreadEmailCount > 0 && (
-                    <span className="shrink-0 self-center rounded-full bg-sidebar-accent px-1.5 text-[10px] font-medium text-sidebar-accent-foreground tabular-nums">
-                      {unreadEmailCount}
-                    </span>
-                  )}
-                </SidebarMenuButton>
-              </SidebarMenuItem>
-              <SidebarMenuItem>
-                <SidebarMenuButton
-                  isActive={activeNav === 'meetings'}
-                  onClick={onOpenMeetings}
-                  className={meetingSublabel ? 'h-auto py-1.5' : undefined}
-                >
-                  <Mic className={cn('size-4 shrink-0', meetingIsRecording && 'text-red-500')} />
-                  <div className="flex min-w-0 flex-1 flex-col">
-                    <span className="truncate">Meetings</span>
-                    {meetingSublabel && (
-                      <span className={cn(
-                        'truncate text-[11px]',
-                        meetingIsRecording ? 'text-red-500' : 'text-muted-foreground',
-                      )}>
-                        {meetingSublabel}
-                      </span>
-                    )}
-                  </div>
-                </SidebarMenuButton>
-                {meetingIsRecording ? (
-                  <div className="absolute inset-y-0 right-1 flex items-center gap-1.5">
-                    <span className="relative flex size-2">
-                      <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-red-500 opacity-75" />
-                      <span className="relative inline-flex size-2 rounded-full bg-red-500" />
-                    </span>
-                    <Tooltip>
-                      <TooltipTrigger asChild>
-                        <button
-                          type="button"
-                          aria-label="Stop recording"
-                          disabled={meetingIsBusy}
-                          onClick={(e) => { e.stopPropagation(); onToggleMeetingRecording?.() }}
-                          onMouseDown={(e) => e.stopPropagation()}
-                          className="flex aspect-square w-5 items-center justify-center rounded-md text-destructive hover:bg-destructive/10 disabled:opacity-50"
-                        >
-                          {meetingIsBusy ? <LoaderIcon className="size-4 animate-spin" /> : <Square className="size-3.5 fill-current" />}
-                        </button>
-                      </TooltipTrigger>
-                      <TooltipContent side="bottom">
-                        {meetingRecordingState === 'connecting' ? 'Starting…' : meetingRecordingState === 'stopping' ? 'Stopping…' : 'Stop recording'}
-                      </TooltipContent>
-                    </Tooltip>
-                  </div>
-                ) : previewMeeting ? (
-                  <div className="absolute inset-y-0 right-1 flex items-center gap-0.5 opacity-0 transition-opacity group-focus-within/menu-item:opacity-100 group-hover/menu-item:opacity-100">
-                    <Tooltip>
-                      <TooltipTrigger asChild>
-                        <button
-                          type="button"
-                          aria-label="Take notes"
-                          onClick={(e) => { e.stopPropagation(); triggerMeetingCapture(previewMeeting, false) }}
-                          onMouseDown={(e) => e.stopPropagation()}
-                          className="flex aspect-square w-5 items-center justify-center rounded-md text-sidebar-foreground hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"
-                        >
-                          <Mic className="size-4" />
-                        </button>
-                      </TooltipTrigger>
-                      <TooltipContent side="bottom">Take notes</TooltipContent>
-                    </Tooltip>
-                    {previewMeeting.conferenceLink && (
-                      <Tooltip>
-                        <TooltipTrigger asChild>
-                          <button
-                            type="button"
-                            aria-label="Join & take notes"
-                            onClick={(e) => { e.stopPropagation(); triggerMeetingCapture(previewMeeting, true) }}
-                            onMouseDown={(e) => e.stopPropagation()}
-                            className="flex aspect-square w-5 items-center justify-center rounded-md text-sidebar-foreground hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"
-                          >
-                            <Video className="size-4" />
-                          </button>
-                        </TooltipTrigger>
-                        <TooltipContent side="bottom">Join & take notes</TooltipContent>
-                      </Tooltip>
-                    )}
-                  </div>
-                ) : null}
-              </SidebarMenuItem>
-              <SidebarMenuItem>
-                <SidebarMenuButton
-                  isActive={activeNav === 'knowledge'}
-                  onClick={() => knowledgeActions.openKnowledgeView()}
-                  className={knowledgeUpdatedLabel ? 'h-auto py-1.5' : undefined}
-                >
-                  <FileText className="size-4 shrink-0" />
-                  <div className="flex min-w-0 flex-1 flex-col">
-                    <span className="truncate">Knowledge</span>
-                    {knowledgeUpdatedLabel && (
-                      <span className="truncate text-[11px] text-muted-foreground">{knowledgeUpdatedLabel}</span>
-                    )}
-                  </div>
-                </SidebarMenuButton>
-              </SidebarMenuItem>
-            </SidebarMenu>
-
-            <div className="mx-3 my-2 border-t border-sidebar-border" />
-
-            <SidebarMenu>
-              <SidebarMenuItem>
-                <SidebarMenuButton
-                  isActive={activeNav === 'agents'}
-                  onClick={onOpenBgTasks}
-                  className={bgAgentsLabel ? 'h-auto py-1.5' : undefined}
-                >
-                  <Bot className="size-4 shrink-0 text-muted-foreground" />
-                  <div className="flex min-w-0 flex-1 flex-col">
-                    <span className="truncate text-muted-foreground">Background agents</span>
-                    {bgAgentsLabel && (
-                      <span className={cn(
-                        'truncate text-[11px]',
-                        bgTaskSummaries.some((t) => t.lastRunError) ? 'text-destructive' : 'text-muted-foreground',
-                      )}>
-                        {bgAgentsLabel}
-                      </span>
-                    )}
-                  </div>
-                </SidebarMenuButton>
-              </SidebarMenuItem>
-              <SidebarMenuItem>
-                <SidebarMenuButton
-                  isActive={activeNav === 'workspaces'}
-                  onClick={() => knowledgeActions.openWorkspaceAt()}
-                  className="h-auto py-1.5"
-                >
-                  <Folder className="size-4 shrink-0 text-muted-foreground" />
-                  <div className="flex min-w-0 flex-1 flex-col">
-                    <span className="truncate text-muted-foreground">Workspaces</span>
-                    <span className="truncate text-[11px] text-muted-foreground">
-                      {workspaceCount === 0 ? 'No workspaces' : `${workspaceCount} workspace${workspaceCount === 1 ? '' : 's'}`}
-                    </span>
-                  </div>
-                </SidebarMenuButton>
-              </SidebarMenuItem>
-            </SidebarMenu>
-          </SidebarGroupContent>
-        </SidebarGroup>
-
-        <div className="mx-3 border-t border-sidebar-border" />
-
-        {/* Recents */}
-        <SidebarGroup className="flex flex-col">
-          <SidebarGroupContent>
-            <button
-              type="button"
-              onClick={() => setQuickAccessExpanded((v) => !v)}
-              className="flex w-full items-center gap-1.5 px-3 py-1 text-[10.5px] font-semibold uppercase tracking-wider text-muted-foreground"
-            >
-              <ChevronRight className={cn('size-3 transition-transform', quickAccessExpanded && 'rotate-90')} />
-              <span className="flex-1 text-left">Recents</span>
-            </button>
-            {quickAccessExpanded && (
-              quickAccessItems.length === 0 ? (
-                <div className="px-4 pb-2 text-[11.5px] italic text-muted-foreground">
-                  Recent notes and agents show up here.
-                </div>
-              ) : (
-                <SidebarMenu>
-                  {quickAccessItems.map((item) => (
-                    <SidebarMenuItem key={item.key}>
-                      <SidebarMenuButton onClick={item.onClick}>
-                        {item.type === 'agent' ? (
-                          <Bot className="size-4 shrink-0 text-muted-foreground" />
-                        ) : item.type === 'chat' ? (
-                          <MessageSquare className="size-4 shrink-0 text-muted-foreground" />
-                        ) : (
-                          <FileText className="size-4 shrink-0 text-muted-foreground" />
-                        )}
-                        <span className="flex-1 truncate">{item.label}</span>
-                      </SidebarMenuButton>
-                    </SidebarMenuItem>
-                  ))}
-                </SidebarMenu>
-              )
-            )}
-          </SidebarGroupContent>
-        </SidebarGroup>
+        {activeSection === "knowledge" && (
+          <KnowledgeSection
+            tree={tree}
+            selectedPath={selectedPath}
+            expandedPaths={expandedPaths}
+            onSelectFile={onSelectFile}
+            onToggleFolder={onToggleFolder}
+            actions={knowledgeActions}
+            onVoiceNoteCreated={onVoiceNoteCreated}
+          />
+        )}
+        {activeSection === "tasks" && (
+          <TasksSection
+            runs={runs}
+            currentRunId={currentRunId}
+            processingRunIds={processingRunIds}
+            actions={tasksActions}
+            backgroundTasks={backgroundTasks}
+            selectedBackgroundTask={selectedBackgroundTask}
+          />
+        )}
       </SidebarContent>
       {/* Billing / upgrade CTA or Log in CTA */}
       {isRowboatConnected && billing ? (
@@ -939,7 +712,7 @@ export function SidebarContentPanel({
           <div className="flex items-center justify-between rounded-lg border border-sidebar-border bg-sidebar-accent/20 px-3 py-2">
             <div className="min-w-0">
               <span className="text-xs font-medium capitalize text-sidebar-foreground">
-                {formatBillingPlanName(billing.subscriptionPlan)}
+                {billing.subscriptionPlan ? `${billing.subscriptionPlan} plan` : 'No plan'}
               </span>
               {billing.subscriptionStatus === 'trialing' && billing.trialExpiresAt && (() => {
                 const days = Math.max(0, Math.ceil((new Date(billing.trialExpiresAt).getTime() - Date.now()) / (1000 * 60 * 60 * 24)))
@@ -954,7 +727,7 @@ export function SidebarContentPanel({
               onClick={() => appUrl && window.open(`${appUrl}?intent=upgrade`)}
               className="shrink-0 rounded-md bg-sidebar-foreground/10 px-2.5 py-1 text-[11px] font-medium text-sidebar-foreground transition-colors hover:bg-sidebar-foreground/20"
             >
-              {!billing.subscriptionPlan || billing.subscriptionPlan === 'free' || billing.subscriptionPlan === 'starter' ? 'Upgrade' : 'Manage'}
+              {!billing.subscriptionPlan ? 'Subscribe' : billing.subscriptionPlan === 'starter' ? 'Upgrade' : 'Manage'}
             </button>
           </div>
         </div>
@@ -975,14 +748,15 @@ export function SidebarContentPanel({
       <div className="border-t border-sidebar-border px-2 py-2">
         <div className="flex flex-col gap-1">
           <div className="flex items-center gap-2">
-            <button
-              ref={connectorsButtonRef}
-              onClick={() => setConnectionsSettingsOpen(true)}
-              className="flex w-full items-center gap-2 rounded-md px-2 py-1 text-xs text-sidebar-foreground/70 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground transition-colors"
-            >
-              <Plug className="size-4" />
-              <span>Connect Accounts</span>
-            </button>
+            <ConnectorsPopover open={connectorsOpen} onOpenChange={setConnectorsOpen} mode="unconnected">
+              <button
+                ref={connectorsButtonRef}
+                className="flex w-full items-center gap-2 rounded-md px-2 py-1 text-xs text-sidebar-foreground/70 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground transition-colors"
+              >
+                <Plug className="size-4" />
+                <span>Connect Accounts</span>
+              </button>
+            </ConnectorsPopover>
             {hasOauthError && (
               <AlertDialog
                 open={showOauthAlert}
@@ -1000,9 +774,9 @@ export function SidebarContentPanel({
                 <AlertDialogContent
                   onCloseAutoFocus={(event) => {
                     event.preventDefault()
-                    if (openConnectionsAfterClose) {
-                      setOpenConnectionsAfterClose(false)
-                      setConnectionsSettingsOpen(true)
+                    if (openConnectorsAfterClose) {
+                      setOpenConnectorsAfterClose(false)
+                      setConnectorsOpen(true)
                     }
                     connectorsButtonRef.current?.focus()
                   }}
@@ -1017,7 +791,7 @@ export function SidebarContentPanel({
                   <AlertDialogFooter>
                     <AlertDialogCancel
                       onClick={() => {
-                        setOpenConnectionsAfterClose(false)
+                        setOpenConnectorsAfterClose(false)
                         setShowOauthAlert(false)
                       }}
                     >
@@ -1025,7 +799,7 @@ export function SidebarContentPanel({
                     </AlertDialogCancel>
                     <AlertDialogAction
                       onClick={() => {
-                        setOpenConnectionsAfterClose(true)
+                        setOpenConnectorsAfterClose(true)
                         setShowOauthAlert(false)
                       }}
                     >
@@ -1042,13 +816,14 @@ export function SidebarContentPanel({
               <span>Settings</span>
             </button>
           </SettingsDialog>
+          <HelpPopover>
+            <button className="flex w-full items-center gap-2 rounded-md px-2 py-1 text-xs text-sidebar-foreground/70 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground transition-colors">
+              <HelpCircle className="size-4" />
+              <span>Help</span>
+            </button>
+          </HelpPopover>
         </div>
       </div>
-      <SettingsDialog
-        defaultTab="connections"
-        open={connectionsSettingsOpen}
-        onOpenChange={setConnectionsSettingsOpen}
-      />
       <SyncStatusBar />
       <SidebarRail />
     </Sidebar>
@@ -1086,7 +861,7 @@ async function transcribeWithDeepgram(audioBlob: Blob): Promise<string | null> {
 }
 
 // Voice Note Recording Button
-export function VoiceNoteButton({ onNoteCreated, variant = 'icon' }: { onNoteCreated?: (path: string) => void; variant?: 'icon' | 'action' }) {
+function VoiceNoteButton({ onNoteCreated }: { onNoteCreated?: (path: string) => void }) {
   const [isRecording, setIsRecording] = React.useState(false)
   const [hasDeepgramKey, setHasDeepgramKey] = React.useState(false)
   const mediaRecorderRef = React.useRef<MediaRecorder | null>(null)
@@ -1277,17 +1052,12 @@ path: ${currentRelativePath}
 
   if (!hasDeepgramKey) return null
 
-  const actionClass = "flex h-9 flex-1 items-center justify-center rounded-md border border-sidebar-border text-sidebar-foreground/70 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground transition-colors"
-  const iconClass = "text-sidebar-foreground/70 hover:text-sidebar-foreground hover:bg-sidebar-accent rounded p-1.5 transition-colors"
-
   return (
     <Tooltip>
       <TooltipTrigger asChild>
         <button
-          type="button"
           onClick={isRecording ? stopRecording : startRecording}
-          className={variant === 'action' ? actionClass : iconClass}
-          aria-label={isRecording ? 'Stop recording' : 'New voice note'}
+          className="text-sidebar-foreground/70 hover:text-sidebar-foreground hover:bg-sidebar-accent rounded p-1.5 transition-colors"
         >
           {isRecording ? (
             <Square className="size-4 fill-red-500 text-red-500 animate-pulse" />
@@ -1303,129 +1073,634 @@ path: ${currentRelativePath}
   )
 }
 
-function ActionButton({ icon: Icon, label, onClick }: { icon: typeof Mic; label: string; onClick: () => void }) {
+// Knowledge Section
+function KnowledgeSection({
+  tree,
+  selectedPath,
+  expandedPaths,
+  onSelectFile,
+  onToggleFolder,
+  actions,
+  onVoiceNoteCreated,
+}: {
+  tree: TreeNode[]
+  selectedPath: string | null
+  expandedPaths: Set<string>
+  onSelectFile: (path: string, kind: "file" | "dir") => void
+  onToggleFolder?: (path: string) => void
+  actions: KnowledgeActions
+  onVoiceNoteCreated?: (path: string) => void
+}) {
+  const isExpanded = expandedPaths.size > 0
+  const treeContainerRef = React.useRef<HTMLDivElement | null>(null)
+  const [selectedFolderPath, setSelectedFolderPath] = useState<string | null>(null)
+  const [renameTarget, setRenameTarget] = useState<string | null>(null)
+
+  useEffect(() => {
+    if (!selectedPath) return
+
+    let cancelled = false
+    let rafId: number | null = null
+    let attempts = 0
+    const maxAttempts = 20
+
+    const revealActiveFile = () => {
+      if (cancelled) return
+      const container = treeContainerRef.current
+      if (!container) return
+      const activeRow = container.querySelector<HTMLElement>('[data-knowledge-active="true"]')
+      if (activeRow) {
+        activeRow.scrollIntoView({ block: "nearest", inline: "nearest" })
+        return
+      }
+      if (attempts >= maxAttempts) return
+      attempts += 1
+      rafId = requestAnimationFrame(revealActiveFile)
+    }
+
+    rafId = requestAnimationFrame(revealActiveFile)
+    return () => {
+      cancelled = true
+      if (rafId !== null) cancelAnimationFrame(rafId)
+    }
+  }, [selectedPath, expandedPaths, tree])
+
+  // Folder clicks highlight the folder; file clicks clear folder highlight
+  const handleSelect = React.useCallback((path: string, kind: "file" | "dir") => {
+    if (kind === 'dir') {
+      setSelectedFolderPath(path)
+    } else {
+      setSelectedFolderPath(null)
+    }
+    onSelectFile(path, kind)
+  }, [onSelectFile])
+
+  // Resolve the parent path for new items: explicit folder > open file's parent > root
+  const deriveParent = React.useCallback((): string => {
+    if (selectedFolderPath) return selectedFolderPath
+    if (selectedPath) {
+      const parts = selectedPath.split('/')
+      if (parts.length > 1) return parts.slice(0, -1).join('/')
+    }
+    return 'knowledge'
+  }, [selectedFolderPath, selectedPath])
+
+  // Wrap actions to inject context-aware parent and capture rename target
+  const wrappedActions = React.useMemo<KnowledgeActions>(() => ({
+    ...actions,
+    createNote: (parentPath?: string) => actions.createNote(parentPath ?? deriveParent()),
+    createFolder: async (parentPath?: string): Promise<string> => {
+      const newPath = await actions.createFolder(parentPath ?? deriveParent())
+      setRenameTarget(newPath)
+      return newPath
+    },
+  }), [actions, deriveParent])
+
+  const quickActions = [
+    { icon: FilePlus, label: "New Note", action: () => wrappedActions.createNote() },
+    { icon: FolderPlus, label: "New Folder", action: () => void wrappedActions.createFolder() },
+    { icon: Network, label: "Graph View", action: () => actions.openGraph() },
+    { icon: Table2, label: "Bases", action: () => actions.openBases() },
+  ]
+
   return (
-    <Tooltip>
-      <TooltipTrigger asChild>
-        <button
-          type="button"
-          onClick={onClick}
-          aria-label={label}
-          className="flex h-9 flex-1 items-center justify-center rounded-md border border-sidebar-border text-sidebar-foreground/70 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground transition-colors"
-        >
-          <Icon className="size-4" />
-        </button>
-      </TooltipTrigger>
-      <TooltipContent side="bottom">{label}</TooltipContent>
-    </Tooltip>
+    <ContextMenu>
+      <ContextMenuTrigger asChild>
+        <SidebarGroup className="flex-1 flex flex-col overflow-hidden">
+          <div className="flex items-center justify-center gap-1 py-1 sticky top-0 z-10 bg-sidebar border-b border-sidebar-border">
+            {quickActions.map((action) => (
+              <Tooltip key={action.label}>
+                <TooltipTrigger asChild>
+                  <button
+                    onClick={action.action}
+                    className="text-sidebar-foreground/70 hover:text-sidebar-foreground hover:bg-sidebar-accent rounded p-1.5 transition-colors"
+                  >
+                    <action.icon className="size-4" />
+                  </button>
+                </TooltipTrigger>
+                <TooltipContent side="bottom">{action.label}</TooltipContent>
+              </Tooltip>
+            ))}
+            <VoiceNoteButton onNoteCreated={onVoiceNoteCreated} />
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <button
+                  onClick={isExpanded ? actions.collapseAll : actions.expandAll}
+                  className="text-sidebar-foreground/70 hover:text-sidebar-foreground hover:bg-sidebar-accent rounded p-1.5 transition-colors"
+                >
+                  {isExpanded ? (
+                    <ChevronsDownUp className="size-4" />
+                  ) : (
+                    <ChevronsUpDown className="size-4" />
+                  )}
+                </button>
+              </TooltipTrigger>
+              <TooltipContent side="bottom">
+                {isExpanded ? "Collapse All" : "Expand All"}
+              </TooltipContent>
+            </Tooltip>
+          </div>
+          <SidebarGroupContent className="flex-1 overflow-y-auto">
+            <div ref={treeContainerRef}>
+              <SidebarMenu>
+                {tree.map((item, index) => (
+                  <Tree
+                    key={index}
+                    item={item}
+                    selectedPath={selectedPath}
+                    expandedPaths={expandedPaths}
+                    onSelect={handleSelect}
+                    onToggleFolder={onToggleFolder}
+                    actions={wrappedActions}
+                    selectedFolderPath={selectedFolderPath}
+                    renameTarget={renameTarget}
+                    onRenameTargetConsumed={() => setRenameTarget(null)}
+                  />
+                ))}
+              </SidebarMenu>
+            </div>
+          </SidebarGroupContent>
+        </SidebarGroup>
+      </ContextMenuTrigger>
+      <ContextMenuContent className="w-48">
+        <ContextMenuItem onClick={() => wrappedActions.createNote()}>
+          <FilePlus className="mr-2 size-4" />
+          New Note
+        </ContextMenuItem>
+        <ContextMenuItem onClick={() => void wrappedActions.createFolder()}>
+          <FolderPlus className="mr-2 size-4" />
+          New Folder
+        </ContextMenuItem>
+      </ContextMenuContent>
+    </ContextMenu>
   )
 }
 
-type UpcomingMeeting = {
-  id: string
-  summary: string
-  start: Date
-  isAllDay: boolean
-  location: string | null
-  htmlLink: string | null
-  conferenceLink: string | null
-  source: string
-  rawStart: { dateTime?: string; date?: string } | undefined
-  rawEnd: { dateTime?: string; date?: string } | undefined
+function countFiles(node: TreeNode): number {
+  if (node.kind === 'file') return 1
+  return (node.children ?? []).reduce((sum, child) => sum + countFiles(child), 0)
 }
 
-type RawCalendarEvent = {
-  id?: string
-  summary?: string
-  start?: { dateTime?: string; date?: string }
-  end?: { dateTime?: string; date?: string }
-  location?: string
-  htmlLink?: string
-  status?: string
-  attendees?: Array<{ self?: boolean; responseStatus?: string }>
-}
+/** Display name overrides for top-level knowledge folders */
+const FOLDER_DISPLAY_NAMES: Record<string, string> = {}
 
-function parseAllDayDate(s: string): Date | null {
-  const m = /^(\d{4})-(\d{2})-(\d{2})/.exec(s)
-  if (!m) return null
-  return new Date(Number(m[1]), Number(m[2]) - 1, Number(m[3]))
-}
+// Tree component for file browser
+function Tree({
+  item,
+  selectedPath,
+  expandedPaths,
+  onSelect,
+  onToggleFolder,
+  actions,
+  selectedFolderPath,
+  renameTarget,
+  onRenameTargetConsumed,
+}: {
+  item: TreeNode
+  selectedPath: string | null
+  expandedPaths: Set<string>
+  onSelect: (path: string, kind: "file" | "dir") => void
+  onToggleFolder?: (path: string) => void
+  actions: KnowledgeActions
+  selectedFolderPath?: string | null
+  renameTarget?: string | null
+  onRenameTargetConsumed?: () => void
+}) {
+  const isDir = item.kind === 'dir'
+  const isExpanded = expandedPaths.has(item.path)
+  const isSelected = selectedPath === item.path
+  const isFolderSelected = isDir && selectedFolderPath === item.path
+  const [isRenaming, setIsRenaming] = useState(false)
+  const isSubmittingRef = React.useRef(false)
+  const displayName = (isDir && FOLDER_DISPLAY_NAMES[item.name]) || item.name
 
-function normalizeUpcomingMeeting(raw: RawCalendarEvent, sourcePath: string): UpcomingMeeting | null {
-  if (raw.status === 'cancelled') return null
-  const declined = raw.attendees?.find((a) => a.self)?.responseStatus === 'declined'
-  if (declined) return null
-  const allDayStart = raw.start?.date
-  const timedStart = raw.start?.dateTime
-  const isAllDay = !timedStart && Boolean(allDayStart)
-  let start: Date | null = null
-  let end: Date | null = null
-  if (timedStart) {
-    start = new Date(timedStart)
-    end = raw.end?.dateTime ? new Date(raw.end.dateTime) : null
-  } else if (allDayStart) {
-    start = parseAllDayDate(allDayStart)
-    end = raw.end?.date ? parseAllDayDate(raw.end.date) : null
+  // For files, strip .md extension for editing
+  const baseName = !isDir && item.name.endsWith('.md')
+    ? item.name.slice(0, -3)
+    : item.name
+  const [newName, setNewName] = useState(baseName)
+
+  // Auto-enter rename mode when this node is the rename target
+  React.useEffect(() => {
+    if (renameTarget === item.path) {
+      setNewName(baseName)
+      isSubmittingRef.current = false
+      setIsRenaming(true)
+      onRenameTargetConsumed?.()
+    }
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [renameTarget, item.path])
+
+  // Sync newName when baseName changes (e.g., after external rename)
+  React.useEffect(() => {
+    setNewName(baseName)
+  }, [baseName])
+
+  const handleRename = async () => {
+    // Prevent double submission
+    if (isSubmittingRef.current) return
+    isSubmittingRef.current = true
+
+    const trimmedName = newName.trim()
+    if (trimmedName && trimmedName !== baseName) {
+      try {
+        await actions.rename(item.path, trimmedName, isDir)
+        toast('Renamed successfully', 'success')
+      } catch {
+        toast('Failed to rename', 'error')
+      }
+    }
+    setIsRenaming(false)
+    // Reset after a small delay to prevent blur from re-triggering
+    setTimeout(() => {
+      isSubmittingRef.current = false
+    }, 100)
   }
-  if (!start || Number.isNaN(start.getTime())) return null
-  const now = new Date()
-  const effectiveEnd = end ?? (isAllDay ? new Date(start.getTime() + 24 * 60 * 60 * 1000) : start)
-  if (effectiveEnd <= now) return null
-  const conferenceLink = extractConferenceLink(raw as unknown as Record<string, unknown>) ?? null
-  return {
-    id: raw.id ?? sourcePath,
-    summary: raw.summary?.trim() || '(No title)',
-    start,
-    isAllDay,
-    location: raw.location?.trim() || null,
-    htmlLink: raw.htmlLink ?? null,
-    conferenceLink,
-    source: sourcePath,
-    rawStart: raw.start,
-    rawEnd: raw.end,
+
+  const handleDelete = async () => {
+    try {
+      await actions.remove(item.path)
+      toast('Moved to trash', 'success')
+    } catch {
+      toast('Failed to delete', 'error')
+    }
+  }
+
+  const handleCopyPath = () => {
+    actions.copyPath(item.path)
+    toast('Path copied', 'success')
+  }
+
+  const cancelRename = () => {
+    isSubmittingRef.current = true // Prevent blur from triggering rename
+    setIsRenaming(false)
+    setNewName(baseName) // Reset to original name
+    setTimeout(() => {
+      isSubmittingRef.current = false
+    }, 100)
+  }
+
+  const contextMenuContent = (
+    <ContextMenuContent className="w-48">
+      {isDir && (
+        <>
+          <ContextMenuItem onClick={() => actions.createNote(item.path)}>
+            <FilePlus className="mr-2 size-4" />
+            New Note
+          </ContextMenuItem>
+          <ContextMenuItem onClick={() => actions.createFolder(item.path)}>
+            <FolderPlus className="mr-2 size-4" />
+            New Folder
+          </ContextMenuItem>
+          <ContextMenuSeparator />
+        </>
+      )}
+      {!isDir && actions.onOpenInNewTab && (
+        <>
+          <ContextMenuItem onClick={() => actions.onOpenInNewTab!(item.path)}>
+            <ExternalLink className="mr-2 size-4" />
+            Open in new tab
+          </ContextMenuItem>
+          <ContextMenuSeparator />
+        </>
+      )}
+      <ContextMenuItem onClick={handleCopyPath}>
+        <Copy className="mr-2 size-4" />
+        Copy Path
+      </ContextMenuItem>
+      <ContextMenuSeparator />
+      <ContextMenuItem onClick={() => { setNewName(baseName); isSubmittingRef.current = false; setIsRenaming(true) }}>
+        <Pencil className="mr-2 size-4" />
+        Rename
+      </ContextMenuItem>
+      <ContextMenuItem variant="destructive" onClick={handleDelete}>
+        <Trash2 className="mr-2 size-4" />
+        Delete
+      </ContextMenuItem>
+    </ContextMenuContent>
+  )
+
+  // Inline rename input
+  if (isRenaming) {
+    return (
+      <SidebarMenuItem>
+        <div className="flex items-center px-2 py-1">
+          <Input
+            value={newName}
+            onChange={(e) => setNewName(e.target.value)}
+            onKeyDown={async (e) => {
+              e.stopPropagation()
+              if (e.key === 'Enter') {
+                e.preventDefault()
+                await handleRename()
+              } else if (e.key === 'Escape') {
+                e.preventDefault()
+                cancelRename()
+              }
+            }}
+            onBlur={() => {
+              // Only trigger rename if not already submitting
+              if (!isSubmittingRef.current) {
+                handleRename()
+              }
+            }}
+            className="h-6 text-sm flex-1"
+            autoFocus
+          />
+        </div>
+      </SidebarMenuItem>
+    )
+  }
+
+  // Top-level knowledge folders open bases view — render as flat items
+  const parts = item.path.split('/')
+  const isBasesFolder = isDir && parts.length === 2 && parts[0] === 'knowledge'
+
+  if (isBasesFolder) {
+    return (
+      <ContextMenu>
+        <ContextMenuTrigger asChild>
+          <SidebarMenuItem className="group/file-item">
+            <SidebarMenuButton isActive={isFolderSelected} onClick={() => onSelect(item.path, item.kind)}>
+              <Folder className="size-4 shrink-0" />
+              <div className="flex w-full items-center gap-1 min-w-0">
+                <span className="min-w-0 flex-1 truncate">{displayName}</span>
+                <span className="text-xs text-sidebar-foreground/50 tabular-nums shrink-0">{countFiles(item)}</span>
+              </div>
+            </SidebarMenuButton>
+            {onToggleFolder && (item.children?.length ?? 0) > 0 && (
+              <SidebarMenuAction
+                showOnHover
+                aria-label={isExpanded ? "Collapse folder" : "Expand folder"}
+                onClick={(e) => {
+                  e.stopPropagation()
+                  onToggleFolder(item.path)
+                }}
+              >
+                <ChevronRight
+                  className={cn(
+                    "transition-transform",
+                    isExpanded && "rotate-90",
+                  )}
+                />
+              </SidebarMenuAction>
+            )}
+            {isExpanded && (
+              <SidebarMenuSub>
+                {(item.children ?? []).map((subItem, index) => (
+                  <Tree
+                    key={index}
+                    item={subItem}
+                    selectedPath={selectedPath}
+                    expandedPaths={expandedPaths}
+                    onSelect={onSelect}
+                    onToggleFolder={onToggleFolder}
+                    actions={actions}
+                    selectedFolderPath={selectedFolderPath}
+                    renameTarget={renameTarget}
+                    onRenameTargetConsumed={onRenameTargetConsumed}
+                  />
+                ))}
+              </SidebarMenuSub>
+            )}
+          </SidebarMenuItem>
+        </ContextMenuTrigger>
+        {contextMenuContent}
+      </ContextMenu>
+    )
+  }
+
+  if (!isDir) {
+    return (
+      <ContextMenu>
+        <ContextMenuTrigger asChild>
+          <SidebarMenuItem
+            className="group/file-item"
+            data-knowledge-file-path={item.path}
+            data-knowledge-active={isSelected ? "true" : "false"}
+          >
+            <SidebarMenuButton
+              isActive={isSelected}
+              onClick={(e) => {
+                if (e.metaKey && actions.onOpenInNewTab) {
+                  actions.onOpenInNewTab(item.path)
+                } else {
+                  onSelect(item.path, item.kind)
+                }
+              }}
+            >
+              <div className="flex w-full items-center gap-1 min-w-0">
+                <span className="min-w-0 flex-1 truncate">{item.name}</span>
+              </div>
+            </SidebarMenuButton>
+          </SidebarMenuItem>
+        </ContextMenuTrigger>
+        {contextMenuContent}
+      </ContextMenu>
+    )
+  }
+
+  return (
+    <ContextMenu>
+      <ContextMenuTrigger asChild>
+        <SidebarMenuItem>
+          <Collapsible
+            open={isExpanded}
+            onOpenChange={() => onSelect(item.path, item.kind)}
+            className="group/collapsible [&[data-state=open]>button>svg:first-child]:rotate-90"
+          >
+            <CollapsibleTrigger asChild>
+              <SidebarMenuButton isActive={isFolderSelected}>
+                <ChevronRight className="transition-transform size-4" />
+                <div className="flex w-full items-center gap-1 min-w-0">
+                  <span className="min-w-0 flex-1 truncate">{displayName}</span>
+                  <span className="text-xs text-sidebar-foreground/50 tabular-nums shrink-0">{countFiles(item)}</span>
+                </div>
+              </SidebarMenuButton>
+            </CollapsibleTrigger>
+            <CollapsibleContent>
+              <SidebarMenuSub>
+                {(item.children ?? []).map((subItem, index) => (
+                  <Tree
+                    key={index}
+                    item={subItem}
+                    selectedPath={selectedPath}
+                    expandedPaths={expandedPaths}
+                    onSelect={onSelect}
+                    onToggleFolder={onToggleFolder}
+                    actions={actions}
+                    selectedFolderPath={selectedFolderPath}
+                    renameTarget={renameTarget}
+                    onRenameTargetConsumed={onRenameTargetConsumed}
+                  />
+                ))}
+              </SidebarMenuSub>
+            </CollapsibleContent>
+          </Collapsible>
+        </SidebarMenuItem>
+      </ContextMenuTrigger>
+      {contextMenuContent}
+    </ContextMenu>
+  )
+}
+
+// Get status indicator color
+function getStatusColor(status?: string, enabled?: boolean): string {
+  // Disabled agents always show gray
+  if (enabled === false) {
+    return "bg-gray-400"
+  }
+  switch (status) {
+    case "running":
+      return "bg-blue-500"
+    case "finished":
+      return "bg-green-500"
+    case "failed":
+      return "bg-red-500"
+    case "triggered":
+      return "bg-gray-400"
+    case "scheduled":
+    default:
+      return "bg-yellow-500"
   }
 }
 
-function isSameLocalDay(a: Date, b: Date): boolean {
-  return a.getFullYear() === b.getFullYear() && a.getMonth() === b.getMonth() && a.getDate() === b.getDate()
-}
+// Tasks Section
+function TasksSection({
+  runs,
+  currentRunId,
+  processingRunIds,
+  actions,
+  backgroundTasks = [],
+  selectedBackgroundTask,
+}: {
+  runs: RunListItem[]
+  currentRunId?: string | null
+  processingRunIds?: Set<string>
+  actions?: TasksActions
+  backgroundTasks?: BackgroundTaskItem[]
+  selectedBackgroundTask?: string | null
+}) {
+  const [pendingDeleteRunId, setPendingDeleteRunId] = useState<string | null>(null)
 
-function formatMeetingTime(event: UpcomingMeeting): string {
-  if (event.isAllDay) return 'All day'
-  const now = new Date()
-  const tomorrow = new Date(now)
-  tomorrow.setDate(tomorrow.getDate() + 1)
-  const time = event.start.toLocaleTimeString([], { hour: 'numeric', minute: '2-digit' })
-  if (isSameLocalDay(event.start, now)) return time
-  if (isSameLocalDay(event.start, tomorrow)) return `Tmrw ${time}`
-  return event.start.toLocaleDateString([], { month: 'numeric', day: 'numeric' })
-}
+  return (
+    <SidebarGroup className="flex-1 flex flex-col overflow-hidden">
+      <SidebarGroupContent className="flex-1 overflow-y-auto">
+        {/* Background Tasks Section */}
+        {backgroundTasks.length > 0 && (
+          <>
+            <div className="px-3 py-1.5 text-xs font-medium text-muted-foreground">
+              Background Tasks
+            </div>
+            <SidebarMenu>
+              {backgroundTasks.map((task) => (
+                <SidebarMenuItem key={task.name}>
+                  <SidebarMenuButton
+                    isActive={selectedBackgroundTask === task.name}
+                    onClick={() => actions?.onSelectBackgroundTask?.(task.name)}
+                    className="gap-2"
+                  >
+                    <div className="relative">
+                      <Bot className="size-4 shrink-0" />
+                      <span
+                        className={`absolute -bottom-0.5 -right-0.5 size-2 rounded-full ${getStatusColor(task.status, task.enabled)} ${task.status === "running" && task.enabled ? "animate-pulse" : ""}`}
+                      />
+                    </div>
+                    <span className={`truncate text-sm ${!task.enabled ? "text-muted-foreground" : ""}`}>
+                      {task.name}
+                    </span>
+                  </SidebarMenuButton>
+                </SidebarMenuItem>
+              ))}
+            </SidebarMenu>
+          </>
+        )}
+        {runs.length > 0 && (
+          <>
+            <div className="px-3 py-1.5 mt-4 text-xs font-medium text-muted-foreground">
+              Chat history
+            </div>
+            <SidebarMenu>
+              {runs.map((run) => (
+                <ContextMenu key={run.id}>
+                  <ContextMenuTrigger asChild>
+                    <SidebarMenuItem className="group/chat-item">
+                      <SidebarMenuButton
+                        isActive={currentRunId === run.id}
+                        onClick={(e) => {
+                          if (e.metaKey && actions?.onOpenInNewTab) {
+                            actions.onOpenInNewTab(run.id)
+                          } else {
+                            actions?.onSelectRun(run.id)
+                          }
+                        }}
+                      >
+                        <div className="flex w-full items-center gap-2 min-w-0">
+                          <span className="min-w-0 flex-1 truncate text-sm">{run.title || '(Untitled chat)'}</span>
+                          {run.createdAt ? (
+                            <span className="shrink-0 text-[10px] text-muted-foreground">
+                              {formatRunTime(run.createdAt)}
+                            </span>
+                          ) : null}
+                        </div>
+                      </SidebarMenuButton>
+                    </SidebarMenuItem>
+                  </ContextMenuTrigger>
+                  <ContextMenuContent className="w-48">
+                    {actions?.onOpenInNewTab && (
+                      <ContextMenuItem onClick={() => actions.onOpenInNewTab!(run.id)}>
+                        <ExternalLink className="mr-2 size-4" />
+                        Open in new tab
+                      </ContextMenuItem>
+                    )}
+                    {!processingRunIds?.has(run.id) && (
+                      <>
+                        {actions?.onOpenInNewTab && <ContextMenuSeparator />}
+                        <ContextMenuItem
+                          variant="destructive"
+                          onClick={() => setPendingDeleteRunId(run.id)}
+                        >
+                          <Trash2 className="mr-2 size-4" />
+                          Delete
+                        </ContextMenuItem>
+                      </>
+                    )}
+                  </ContextMenuContent>
+                </ContextMenu>
+              ))}
+            </SidebarMenu>
+          </>
+        )}
+      </SidebarGroupContent>
 
-function triggerMeetingCapture(event: UpcomingMeeting, openConference: boolean) {
-  window.__pendingCalendarEvent = {
-    summary: event.summary,
-    start: event.rawStart,
-    end: event.rawEnd,
-    location: event.location ?? undefined,
-    htmlLink: event.htmlLink ?? undefined,
-    conferenceLink: event.conferenceLink ?? undefined,
-    source: event.source,
-  }
-  if (openConference && event.conferenceLink) {
-    window.open(event.conferenceLink, '_blank')
-  }
-  window.dispatchEvent(new Event('calendar-block:join-meeting'))
-}
-
-type SidebarEmailThread = {
-  threadId: string
-  subject: string
-  from: string
-  date: string
-}
-
-function formatEmailFrom(from: string): string {
-  const match = /^\s*"?([^"<]+?)"?\s*<.+>\s*$/.exec(from)
-  if (match) return match[1].trim()
-  return from
+      {/* Delete confirmation dialog */}
+      <Dialog open={!!pendingDeleteRunId} onOpenChange={(open) => { if (!open) setPendingDeleteRunId(null) }}>
+        <DialogContent showCloseButton={false} className="sm:max-w-sm">
+          <DialogHeader>
+            <DialogTitle>Delete chat</DialogTitle>
+            <DialogDescription>
+              Are you sure you want to delete this chat?
+            </DialogDescription>
+          </DialogHeader>
+          <DialogFooter>
+            <Button variant="outline" size="sm" onClick={() => setPendingDeleteRunId(null)}>
+              Cancel
+            </Button>
+            <Button
+              variant="destructive"
+              size="sm"
+              onClick={() => {
+                if (pendingDeleteRunId) {
+                  actions?.onDeleteRun(pendingDeleteRunId)
+                }
+                setPendingDeleteRunId(null)
+              }}
+            >
+              Delete
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+    </SidebarGroup>
+  )
 }
diff --git a/apps/x/apps/renderer/src/components/tab-bar.tsx b/apps/x/apps/renderer/src/components/tab-bar.tsx
index fd638429..a81c4ece 100644
--- a/apps/x/apps/renderer/src/components/tab-bar.tsx
+++ b/apps/x/apps/renderer/src/components/tab-bar.tsx
@@ -37,7 +37,7 @@ export function TabBar<T>({
   return (
     <div
       className={cn(
-        'rowboat-tabbar flex flex-1 self-stretch min-w-0',
+        'flex flex-1 self-stretch min-w-0',
         layout === 'scroll'
           ? 'overflow-x-auto overflow-y-hidden [scrollbar-width:none] [&::-webkit-scrollbar]:hidden'
           : 'overflow-hidden'
@@ -57,7 +57,7 @@ export function TabBar<T>({
               type="button"
               onClick={() => onSwitchTab(tabId)}
               className={cn(
-                'rowboat-tab titlebar-no-drag group/tab relative flex items-center gap-1.5 px-3 self-stretch text-xs transition-colors',
+                'titlebar-no-drag group/tab relative flex items-center gap-1.5 px-3 self-stretch text-xs transition-colors',
                 layout === 'scroll' ? 'min-w-[140px] max-w-[240px]' : 'min-w-0 max-w-[220px]',
                 isActive
                   ? 'bg-background text-foreground'
diff --git a/apps/x/apps/renderer/src/components/ui/sidebar.tsx b/apps/x/apps/renderer/src/components/ui/sidebar.tsx
index ffe40957..9c413735 100644
--- a/apps/x/apps/renderer/src/components/ui/sidebar.tsx
+++ b/apps/x/apps/renderer/src/components/ui/sidebar.tsx
@@ -380,7 +380,7 @@ function SidebarContent({ className, ...props }: React.ComponentProps<"div">) {
       data-slot="sidebar-content"
       data-sidebar="content"
       className={cn(
-        "flex min-h-0 flex-1 flex-col gap-1 overflow-auto group-data-[collapsible=icon]:overflow-hidden",
+        "flex min-h-0 flex-1 flex-col gap-2 overflow-auto group-data-[collapsible=icon]:overflow-hidden",
         className
       )}
       {...props}
@@ -393,7 +393,7 @@ function SidebarGroup({ className, ...props }: React.ComponentProps<"div">) {
     <div
       data-slot="sidebar-group"
       data-sidebar="group"
-      className={cn("relative flex w-full min-w-0 flex-col px-2 py-1", className)}
+      className={cn("relative flex w-full min-w-0 flex-col p-2", className)}
       {...props}
     />
   )
@@ -462,7 +462,7 @@ function SidebarMenu({ className, ...props }: React.ComponentProps<"ul">) {
     <ul
       data-slot="sidebar-menu"
       data-sidebar="menu"
-      className={cn("flex w-full min-w-0 flex-col gap-0", className)}
+      className={cn("flex w-full min-w-0 flex-col gap-1", className)}
       {...props}
     />
   )
diff --git a/apps/x/apps/renderer/src/components/workspace-view.tsx b/apps/x/apps/renderer/src/components/workspace-view.tsx
deleted file mode 100644
index 6923ac1c..00000000
--- a/apps/x/apps/renderer/src/components/workspace-view.tsx
+++ /dev/null
@@ -1,576 +0,0 @@
-import { useCallback, useMemo, useRef, useState } from 'react'
-import {
-  ChevronRight,
-  Copy,
-  ExternalLink,
-  File as FileIcon,
-  FilePlus,
-  Folder as FolderIcon,
-  FolderOpen,
-  FolderPlus,
-  Home,
-  Pencil,
-  Plus,
-  Trash2,
-  UploadCloud,
-} from 'lucide-react'
-
-import { Button } from '@/components/ui/button'
-import {
-  ContextMenu,
-  ContextMenuContent,
-  ContextMenuItem,
-  ContextMenuSeparator,
-  ContextMenuTrigger,
-} from '@/components/ui/context-menu'
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu'
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from '@/components/ui/dialog'
-import { Input } from '@/components/ui/input'
-import { toast } from '@/lib/toast'
-import { cn } from '@/lib/utils'
-
-const WORKSPACE_ROOT = 'knowledge/Workspace'
-
-interface TreeNode {
-  path: string
-  name: string
-  kind: 'file' | 'dir'
-  children?: TreeNode[]
-}
-
-type WorkspaceActions = {
-  remove: (path: string) => Promise<void>
-  copyPath: (path: string) => void
-  revealInFileManager: (path: string, isDir: boolean) => void
-  createNote: (parentPath?: string) => void
-  createFolder: (parentPath?: string) => Promise<string>
-  onOpenInNewTab?: (path: string) => void
-}
-
-type WorkspaceViewProps = {
-  tree: TreeNode[]
-  initialPath?: string | null
-  actions: WorkspaceActions
-  // Folder currently being browsed. Controlled by the app so drill-down
-  // participates in the global back/forward history.
-  onNavigate: (path: string) => void
-  onOpenNote: (path: string) => void
-  onCreateWorkspace: (name: string) => Promise<void>
-}
-
-function getFileManagerName(): string {
-  if (typeof navigator === 'undefined') return 'File Manager'
-  const platform = navigator.platform.toLowerCase()
-  if (platform.includes('mac')) return 'Finder'
-  if (platform.includes('win')) return 'Explorer'
-  return 'File Manager'
-}
-
-function fileExtensionLabel(name: string): string {
-  const dot = name.lastIndexOf('.')
-  if (dot <= 0 || dot === name.length - 1) return 'File'
-  return `${name.slice(dot + 1).toUpperCase()} file`
-}
-
-function findNode(nodes: TreeNode[] | undefined, path: string): TreeNode | null {
-  if (!nodes) return null
-  for (const node of nodes) {
-    if (node.path === path) return node
-    if (node.kind === 'dir' && path.startsWith(`${node.path}/`)) {
-      const found = findNode(node.children, path)
-      if (found) return found
-    }
-  }
-  return null
-}
-
-function countChildren(node: TreeNode | null): number {
-  if (!node || node.kind !== 'dir' || !node.children) return 0
-  return node.children.length
-}
-
-async function uniqueChildPath(parent: string, name: string): Promise<string> {
-  const dot = name.lastIndexOf('.')
-  const base = dot > 0 ? name.slice(0, dot) : name
-  const ext = dot > 0 ? name.slice(dot) : ''
-  let candidate = `${parent}/${name}`
-  let i = 1
-  while ((await window.ipc.invoke('workspace:exists', { path: candidate })).exists) {
-    candidate = `${parent}/${base} (${i})${ext}`
-    i += 1
-  }
-  return candidate
-}
-
-function readFileAsBase64(file: File): Promise<string> {
-  return new Promise((resolve, reject) => {
-    const reader = new FileReader()
-    reader.onload = () => {
-      const result = reader.result as string
-      resolve(result.split(',')[1] ?? '')
-    }
-    reader.onerror = reject
-    reader.readAsDataURL(file)
-  })
-}
-
-export function WorkspaceView({ tree, initialPath, actions, onNavigate, onOpenNote, onCreateWorkspace }: WorkspaceViewProps) {
-  const currentPath = initialPath || WORKSPACE_ROOT
-  const [addOpen, setAddOpen] = useState(false)
-  const [newName, setNewName] = useState('')
-  const [creating, setCreating] = useState(false)
-  const [error, setError] = useState<string | null>(null)
-  const [renameTarget, setRenameTarget] = useState<string | null>(null)
-  const [renameValue, setRenameValue] = useState('')
-  const [isDraggingOver, setIsDraggingOver] = useState(false)
-  const [uploading, setUploading] = useState(false)
-  const dragDepthRef = useRef(0)
-  const filesInputRef = useRef<HTMLInputElement | null>(null)
-  const folderInputRef = useRef<HTMLInputElement | null>(null)
-
-  const isRoot = currentPath === WORKSPACE_ROOT
-  const fileManagerName = getFileManagerName()
-
-  const currentNode = useMemo(() => findNode(tree, currentPath), [tree, currentPath])
-
-  const items = useMemo<TreeNode[]>(() => {
-    const children = currentNode?.children ?? []
-    const filtered = isRoot ? children.filter((c) => c.kind === 'dir') : children
-    return [...filtered].sort((a, b) => {
-      if (a.kind !== b.kind) return a.kind === 'dir' ? -1 : 1
-      return a.name.localeCompare(b.name)
-    })
-  }, [currentNode, isRoot])
-
-  const breadcrumbs = useMemo(() => {
-    if (isRoot) return [] as { path: string; name: string }[]
-    const rel = currentPath.slice(WORKSPACE_ROOT.length + 1)
-    const parts = rel.split('/').filter(Boolean)
-    let acc = WORKSPACE_ROOT
-    return parts.map((seg) => {
-      acc = `${acc}/${seg}`
-      return { path: acc, name: seg }
-    })
-  }, [currentPath, isRoot])
-
-  const handleItemClick = useCallback(
-    (item: TreeNode) => {
-      if (renameTarget) return
-      if (item.kind === 'dir') {
-        onNavigate(item.path)
-      } else {
-        onOpenNote(item.path)
-      }
-    },
-    [onNavigate, onOpenNote, renameTarget],
-  )
-
-  const beginRename = useCallback((item: TreeNode) => {
-    setRenameTarget(item.path)
-    setRenameValue(item.name)
-  }, [])
-
-  const commitRename = useCallback(async () => {
-    if (!renameTarget) return
-    const node = items.find((i) => i.path === renameTarget)
-    const trimmed = renameValue.trim()
-    setRenameTarget(null)
-    if (!node || !trimmed || trimmed === node.name || trimmed.includes('/')) return
-    const parent = renameTarget.slice(0, renameTarget.lastIndexOf('/'))
-    try {
-      await window.ipc.invoke('workspace:rename', { from: renameTarget, to: `${parent}/${trimmed}` })
-      toast('Renamed', 'success')
-    } catch {
-      toast('Failed to rename', 'error')
-    }
-  }, [renameTarget, renameValue, items])
-
-  const handleDelete = useCallback(async (item: TreeNode) => {
-    try {
-      await actions.remove(item.path)
-      toast('Moved to trash', 'success')
-    } catch {
-      toast('Failed to delete', 'error')
-    }
-  }, [actions])
-
-  const uploadFiles = useCallback(async (files: FileList | File[], preserveStructure = false) => {
-    const list = Array.from(files)
-    if (list.length === 0) return
-    setUploading(true)
-    try {
-      for (const file of list) {
-        const data = await readFileAsBase64(file)
-        const rel = (file as File & { webkitRelativePath?: string }).webkitRelativePath
-        const target = preserveStructure && rel
-          ? `${currentPath}/${rel}`
-          : await uniqueChildPath(currentPath, file.name)
-        await window.ipc.invoke('workspace:writeFile', {
-          path: target,
-          data,
-          opts: { encoding: 'base64', mkdirp: true },
-        })
-      }
-      toast(list.length === 1 ? 'Added' : `${list.length} items added`, 'success')
-    } catch (err) {
-      console.error('Failed to add files:', err)
-      toast('Failed to add', 'error')
-    } finally {
-      setUploading(false)
-    }
-  }, [currentPath])
-
-  // Drag-and-drop (only inside a workspace folder, not at the root grid).
-  // stopPropagation keeps the drop from also reaching the copilot's
-  // document-level drop listener when it lands on the workspace area.
-  const dropEnabled = !isRoot
-  const handleDragEnter = useCallback((e: React.DragEvent) => {
-    if (!dropEnabled) return
-    if (!Array.from(e.dataTransfer.types).includes('Files')) return
-    e.preventDefault()
-    e.stopPropagation()
-    dragDepthRef.current += 1
-    setIsDraggingOver(true)
-  }, [dropEnabled])
-  const handleDragOver = useCallback((e: React.DragEvent) => {
-    if (!dropEnabled) return
-    if (!Array.from(e.dataTransfer.types).includes('Files')) return
-    e.preventDefault()
-    e.stopPropagation()
-    e.dataTransfer.dropEffect = 'copy'
-  }, [dropEnabled])
-  const handleDragLeave = useCallback((e: React.DragEvent) => {
-    if (!dropEnabled) return
-    e.preventDefault()
-    e.stopPropagation()
-    dragDepthRef.current -= 1
-    if (dragDepthRef.current <= 0) {
-      dragDepthRef.current = 0
-      setIsDraggingOver(false)
-    }
-  }, [dropEnabled])
-  const handleDrop = useCallback((e: React.DragEvent) => {
-    if (!dropEnabled) return
-    e.preventDefault()
-    e.stopPropagation()
-    dragDepthRef.current = 0
-    setIsDraggingOver(false)
-    if (e.dataTransfer.files?.length) void uploadFiles(e.dataTransfer.files)
-  }, [dropEnabled, uploadFiles])
-
-  const resetAddDialog = useCallback(() => {
-    setNewName('')
-    setError(null)
-    setCreating(false)
-  }, [])
-
-  const handleCreate = useCallback(async () => {
-    const trimmed = newName.trim()
-    if (!trimmed) {
-      setError('Name is required')
-      return
-    }
-    if (trimmed.includes('/')) {
-      setError('Name cannot contain "/"')
-      return
-    }
-    setCreating(true)
-    setError(null)
-    try {
-      await onCreateWorkspace(trimmed)
-      setAddOpen(false)
-      resetAddDialog()
-    } catch (err) {
-      setError(err instanceof Error ? err.message : 'Failed to create workspace')
-      setCreating(false)
-    }
-  }, [newName, onCreateWorkspace, resetAddDialog])
-
-  return (
-    <div className="flex h-full flex-col overflow-hidden">
-      <div className="flex shrink-0 items-center justify-between gap-3 border-b border-border px-6 py-4">
-        <div className="flex min-w-0 items-center gap-1 text-sm">
-          <button
-            type="button"
-            onClick={() => onNavigate(WORKSPACE_ROOT)}
-            className={cn(
-              'inline-flex items-center gap-1.5 rounded-md px-2 py-1 transition-colors',
-              isRoot ? 'text-foreground' : 'text-muted-foreground hover:text-foreground hover:bg-accent',
-            )}
-          >
-            <Home className="size-4" />
-            <span className="font-medium">Workspace</span>
-          </button>
-          {breadcrumbs.map((crumb, idx) => {
-            const isLast = idx === breadcrumbs.length - 1
-            return (
-              <span key={crumb.path} className="flex items-center gap-1">
-                <ChevronRight className="size-4 text-muted-foreground/60" />
-                {isLast ? (
-                  <span className="rounded-md px-2 py-1 font-medium text-foreground truncate">
-                    {crumb.name}
-                  </span>
-                ) : (
-                  <button
-                    type="button"
-                    onClick={() => onNavigate(crumb.path)}
-                    className="rounded-md px-2 py-1 text-muted-foreground transition-colors hover:bg-accent hover:text-foreground truncate"
-                  >
-                    {crumb.name}
-                  </button>
-                )}
-              </span>
-            )
-          })}
-        </div>
-        <div className="grid shrink-0 grid-cols-2 items-center gap-2">
-          <Button
-            size="sm"
-            variant="outline"
-            className="w-full"
-            onClick={() => actions.revealInFileManager(currentPath, true)}
-          >
-            <FolderOpen className="size-4" />
-            Open in {fileManagerName}
-          </Button>
-          {isRoot ? (
-            <Button size="sm" className="w-full" onClick={() => setAddOpen(true)}>
-              <Plus className="size-4" />
-              Add workspace
-            </Button>
-          ) : (
-            <DropdownMenu>
-              <DropdownMenuTrigger asChild>
-                <Button size="sm" className="w-full">
-                  <Plus className="size-4" />
-                  Add
-                </Button>
-              </DropdownMenuTrigger>
-              <DropdownMenuContent align="end">
-                <DropdownMenuItem onClick={() => filesInputRef.current?.click()}>
-                  <FilePlus className="mr-2 size-4" />
-                  Add files…
-                </DropdownMenuItem>
-                <DropdownMenuItem onClick={() => folderInputRef.current?.click()}>
-                  <FolderPlus className="mr-2 size-4" />
-                  Add folder…
-                </DropdownMenuItem>
-              </DropdownMenuContent>
-            </DropdownMenu>
-          )}
-        </div>
-      </div>
-      <input
-        ref={filesInputRef}
-        type="file"
-        multiple
-        className="hidden"
-        onChange={(e) => {
-          if (e.target.files?.length) void uploadFiles(e.target.files, false)
-          e.target.value = ''
-        }}
-      />
-      <input
-        ref={folderInputRef}
-        type="file"
-        // @ts-expect-error non-standard but supported in Chromium/Electron
-        webkitdirectory=""
-        directory=""
-        multiple
-        className="hidden"
-        onChange={(e) => {
-          if (e.target.files?.length) void uploadFiles(e.target.files, true)
-          e.target.value = ''
-        }}
-      />
-
-      <div
-        className="relative flex-1 overflow-y-auto px-6 py-6"
-        onDragEnter={handleDragEnter}
-        onDragOver={handleDragOver}
-        onDragLeave={handleDragLeave}
-        onDrop={handleDrop}
-      >
-        {items.length === 0 ? (
-          <div className="flex h-full flex-col items-center justify-center gap-3 text-center text-muted-foreground">
-            <FolderIcon className="size-10 opacity-50" />
-            <div className="text-sm">
-              {isRoot
-                ? 'No workspaces yet. Create one to get started.'
-                : 'This folder is empty. Drag files in or use New note / New folder.'}
-            </div>
-            {isRoot && (
-              <Button size="sm" variant="outline" onClick={() => setAddOpen(true)}>
-                <Plus className="size-4" />
-                Add workspace
-              </Button>
-            )}
-          </div>
-        ) : (
-          <div className="grid grid-cols-[repeat(auto-fill,minmax(180px,1fr))] gap-3">
-            {items.map((item) => {
-              const childCount = item.kind === 'dir' ? countChildren(item) : 0
-              const Icon = item.kind === 'dir' ? FolderIcon : FileIcon
-              const isRenaming = renameTarget === item.path
-              const card = (
-                <button
-                  type="button"
-                  onClick={() => handleItemClick(item)}
-                  className="group flex w-full flex-col items-start gap-2 rounded-lg border border-border bg-card p-4 text-left transition-colors hover:border-foreground/20 hover:bg-accent"
-                >
-                  <Icon className="size-6 text-muted-foreground group-hover:text-foreground" />
-                  <div className="min-w-0 w-full">
-                    {isRenaming ? (
-                      <Input
-                        autoFocus
-                        value={renameValue}
-                        onClick={(e) => e.stopPropagation()}
-                        onChange={(e) => setRenameValue(e.target.value)}
-                        onBlur={() => void commitRename()}
-                        onKeyDown={(e) => {
-                          e.stopPropagation()
-                          if (e.key === 'Enter') { e.preventDefault(); void commitRename() }
-                          else if (e.key === 'Escape') { e.preventDefault(); setRenameTarget(null) }
-                        }}
-                        className="h-6 text-sm"
-                      />
-                    ) : (
-                      <div className="truncate text-sm font-medium">{item.name}</div>
-                    )}
-                    {!isRenaming && (
-                      <div className="truncate text-xs text-muted-foreground">
-                        {item.kind === 'dir'
-                          ? `${childCount} ${childCount === 1 ? 'item' : 'items'}`
-                          : fileExtensionLabel(item.name)}
-                      </div>
-                    )}
-                  </div>
-                </button>
-              )
-              const isDir = item.kind === 'dir'
-              return (
-                <ContextMenu key={item.path}>
-                  <ContextMenuTrigger asChild>{card}</ContextMenuTrigger>
-                  <ContextMenuContent className="w-48" onCloseAutoFocus={(e) => e.preventDefault()}>
-                    {isDir && (
-                      <>
-                        <ContextMenuItem onClick={() => actions.createNote(item.path)}>
-                          <FilePlus className="mr-2 size-4" />
-                          New Note
-                        </ContextMenuItem>
-                        <ContextMenuItem onClick={() => void actions.createFolder(item.path)}>
-                          <FolderPlus className="mr-2 size-4" />
-                          New Folder
-                        </ContextMenuItem>
-                        <ContextMenuSeparator />
-                      </>
-                    )}
-                    {!isDir && actions.onOpenInNewTab && (
-                      <>
-                        <ContextMenuItem onClick={() => actions.onOpenInNewTab!(item.path)}>
-                          <ExternalLink className="mr-2 size-4" />
-                          Open in new tab
-                        </ContextMenuItem>
-                        <ContextMenuSeparator />
-                      </>
-                    )}
-                    <ContextMenuItem onClick={() => { actions.copyPath(item.path); toast('Path copied', 'success') }}>
-                      <Copy className="mr-2 size-4" />
-                      Copy Path
-                    </ContextMenuItem>
-                    <ContextMenuItem onClick={() => actions.revealInFileManager(item.path, isDir)}>
-                      <FolderOpen className="mr-2 size-4" />
-                      Open in {fileManagerName}
-                    </ContextMenuItem>
-                    <ContextMenuSeparator />
-                    <ContextMenuItem onClick={() => beginRename(item)}>
-                      <Pencil className="mr-2 size-4" />
-                      Rename
-                    </ContextMenuItem>
-                    <ContextMenuItem variant="destructive" onClick={() => void handleDelete(item)}>
-                      <Trash2 className="mr-2 size-4" />
-                      Delete
-                    </ContextMenuItem>
-                  </ContextMenuContent>
-                </ContextMenu>
-              )
-            })}
-          </div>
-        )}
-
-        {dropEnabled && isDraggingOver && (
-          <div className="pointer-events-none absolute inset-3 z-10 flex flex-col items-center justify-center gap-2 rounded-xl border-2 border-dashed border-primary/60 bg-primary/5 text-primary">
-            <UploadCloud className="size-8" />
-            <span className="text-sm font-medium">Drop files to add to this folder</span>
-          </div>
-        )}
-        {uploading && (
-          <div className="pointer-events-none absolute bottom-4 right-4 z-10 rounded-md bg-foreground/80 px-3 py-1.5 text-xs text-background">
-            Adding files…
-          </div>
-        )}
-      </div>
-
-      <Dialog
-        open={addOpen}
-        onOpenChange={(open) => {
-          setAddOpen(open)
-          if (!open) resetAddDialog()
-        }}
-      >
-        <DialogContent>
-          <DialogHeader>
-            <DialogTitle>New workspace</DialogTitle>
-            <DialogDescription>
-              Workspaces are top-level folders inside knowledge/Workspace.
-            </DialogDescription>
-          </DialogHeader>
-          <div className="grid gap-2">
-            <label htmlFor="workspace-name" className="text-sm font-medium">Name</label>
-            <Input
-              id="workspace-name"
-              value={newName}
-              onChange={(e) => setNewName(e.target.value)}
-              placeholder="e.g. Alpha"
-              autoFocus
-              onKeyDown={(e) => {
-                if (e.key === 'Enter' && !creating) {
-                  e.preventDefault()
-                  void handleCreate()
-                }
-              }}
-            />
-            {error && <p className="text-xs text-destructive">{error}</p>}
-          </div>
-          <DialogFooter>
-            <Button
-              variant="outline"
-              onClick={() => {
-                setAddOpen(false)
-                resetAddDialog()
-              }}
-              disabled={creating}
-            >
-              Cancel
-            </Button>
-            <Button onClick={() => void handleCreate()} disabled={creating || !newName.trim()}>
-              {creating ? 'Creating…' : 'Create'}
-            </Button>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
-    </div>
-  )
-}
diff --git a/apps/x/apps/renderer/src/contexts/theme-context.tsx b/apps/x/apps/renderer/src/contexts/theme-context.tsx
index 04df59e7..1149cb42 100644
--- a/apps/x/apps/renderer/src/contexts/theme-context.tsx
+++ b/apps/x/apps/renderer/src/contexts/theme-context.tsx
@@ -3,32 +3,16 @@
 import * as React from "react"
 
 export type Theme = "light" | "dark" | "system"
-export type ChatPanePlacement = "right" | "middle"
-export type ChatPaneSize = "chat-smaller" | "chat-equal" | "chat-bigger"
 
 type ThemeContextProps = {
   theme: Theme
   resolvedTheme: "light" | "dark"
   setTheme: (theme: Theme) => void
-  chatPanePlacement: ChatPanePlacement
-  setChatPanePlacement: (placement: ChatPanePlacement) => void
-  chatPaneSize: ChatPaneSize
-  setChatPaneSize: (size: ChatPaneSize) => void
 }
 
 const ThemeContext = React.createContext<ThemeContextProps | null>(null)
 
 const STORAGE_KEY = "rowboat-theme"
-const CHAT_PANE_PLACEMENT_STORAGE_KEY = "rowboat-chat-pane-placement"
-const CHAT_PANE_SIZE_STORAGE_KEY = "rowboat-chat-pane-size"
-
-function isChatPanePlacement(value: string | null): value is ChatPanePlacement {
-  return value === "right" || value === "middle"
-}
-
-function isChatPaneSize(value: string | null): value is ChatPaneSize {
-  return value === "chat-smaller" || value === "chat-equal" || value === "chat-bigger"
-}
 
 function getSystemTheme(): "light" | "dark" {
   if (typeof window === "undefined") return "light"
@@ -55,16 +39,6 @@ export function ThemeProvider({
     const stored = localStorage.getItem(STORAGE_KEY) as Theme | null
     return stored || defaultTheme
   })
-  const [chatPanePlacement, setChatPanePlacementState] = React.useState<ChatPanePlacement>(() => {
-    if (typeof window === "undefined") return "right"
-    const stored = localStorage.getItem(CHAT_PANE_PLACEMENT_STORAGE_KEY)
-    return isChatPanePlacement(stored) ? stored : "right"
-  })
-  const [chatPaneSize, setChatPaneSizeState] = React.useState<ChatPaneSize>(() => {
-    if (typeof window === "undefined") return "chat-smaller"
-    const stored = localStorage.getItem(CHAT_PANE_SIZE_STORAGE_KEY)
-    return isChatPaneSize(stored) ? stored : "chat-smaller"
-  })
 
   const [resolvedTheme, setResolvedTheme] = React.useState<"light" | "dark">(() => {
     if (theme === "system") return getSystemTheme()
@@ -102,27 +76,13 @@ export function ThemeProvider({
     setThemeState(newTheme)
   }, [])
 
-  const setChatPanePlacement = React.useCallback((placement: ChatPanePlacement) => {
-    localStorage.setItem(CHAT_PANE_PLACEMENT_STORAGE_KEY, placement)
-    setChatPanePlacementState(placement)
-  }, [])
-
-  const setChatPaneSize = React.useCallback((size: ChatPaneSize) => {
-    localStorage.setItem(CHAT_PANE_SIZE_STORAGE_KEY, size)
-    setChatPaneSizeState(size)
-  }, [])
-
   const contextValue = React.useMemo<ThemeContextProps>(
     () => ({
       theme,
       resolvedTheme,
       setTheme,
-      chatPanePlacement,
-      setChatPanePlacement,
-      chatPaneSize,
-      setChatPaneSize,
     }),
-    [theme, resolvedTheme, setTheme, chatPanePlacement, setChatPanePlacement, chatPaneSize, setChatPaneSize]
+    [theme, resolvedTheme, setTheme]
   )
 
   return (
diff --git a/apps/x/apps/renderer/src/extensions/wiki-link.ts b/apps/x/apps/renderer/src/extensions/wiki-link.ts
index f49d6187..09b6d866 100644
--- a/apps/x/apps/renderer/src/extensions/wiki-link.ts
+++ b/apps/x/apps/renderer/src/extensions/wiki-link.ts
@@ -1,5 +1,5 @@
 import { InputRule, Node, mergeAttributes } from '@tiptap/core'
-import { ensureMarkdownExtension, normalizeWikiPath, splitWikiAlias, splitWikiFragment, wikiLabel } from '@/lib/wiki-links'
+import { ensureMarkdownExtension, normalizeWikiPath, wikiLabel } from '@/lib/wiki-links'
 
 const wikiLinkInputRegex = /\[\[([^[\]]+)\]\]$/
 const wikiLinkTokenRegex = /\[\[([^[\]]+)\]\]/g
@@ -25,12 +25,9 @@ const replaceWikiLinksInTextNode = (textNode: Text) => {
   for (const match of matches) {
     const matchIndex = match.index ?? 0
     const matchText = match[0] ?? ''
-    const rawLink = match[1]?.trim() ?? ''
-    const { label } = splitWikiAlias(rawLink)
-    const normalizedPath = rawLink ? normalizeWikiPath(rawLink) : ''
-    const { path: basePath, heading } = splitWikiFragment(normalizedPath)
-    const isHeadingOnlyLink = !basePath && Boolean(heading)
-    const isValidPath = isHeadingOnlyLink || (normalizedPath && !basePath.endsWith('/') && !basePath.includes('..'))
+    const rawPath = match[1]?.trim() ?? ''
+    const normalizedPath = rawPath ? normalizeWikiPath(rawPath) : ''
+    const isValidPath = normalizedPath && !normalizedPath.endsWith('/') && !normalizedPath.includes('..')
 
     if (matchIndex > lastIndex) {
       fragment.appendChild(document.createTextNode(text.slice(lastIndex, matchIndex)))
@@ -38,8 +35,7 @@ const replaceWikiLinksInTextNode = (textNode: Text) => {
 
     if (isValidPath) {
       const el = document.createElement('wiki-link')
-      el.setAttribute('data-path', isHeadingOnlyLink ? normalizedPath : ensureMarkdownExtension(normalizedPath))
-      if (label) el.setAttribute('data-label', label)
+      el.setAttribute('data-path', ensureMarkdownExtension(normalizedPath))
       fragment.appendChild(el)
     } else {
       fragment.appendChild(document.createTextNode(matchText))
@@ -84,9 +80,6 @@ export const WikiLink = Node.create<WikiLinkOptions>({
       path: {
         default: '',
       },
-      label: {
-        default: null,
-      },
     }
   },
 
@@ -96,34 +89,28 @@ export const WikiLink = Node.create<WikiLinkOptions>({
         tag: 'wiki-link[data-path]',
         getAttrs: (element: Element) => ({
           path: (element as HTMLElement).getAttribute('data-path') ?? '',
-          label: (element as HTMLElement).getAttribute('data-label'),
         }),
       },
       {
         tag: 'a[data-type="wiki-link"]',
         getAttrs: (element: Element) => ({
           path: (element as HTMLElement).getAttribute('data-path') ?? '',
-          label: (element as HTMLElement).getAttribute('data-label'),
         }),
       },
     ]
   },
 
   renderHTML({ node, HTMLAttributes }) {
-    const label = node.attrs.label || wikiLabel(node.attrs.path) || node.attrs.path
+    const label = wikiLabel(node.attrs.path) || node.attrs.path
     return [
       'a',
-      mergeAttributes(
-        HTMLAttributes,
-        {
-          'data-type': 'wiki-link',
-          'data-path': node.attrs.path,
-          'href': '#',
-          'class': 'wiki-link',
-          'aria-label': node.attrs.path,
-        },
-        node.attrs.label ? { 'data-label': node.attrs.label } : {}
-      ),
+      mergeAttributes(HTMLAttributes, {
+        'data-type': 'wiki-link',
+        'data-path': node.attrs.path,
+        'href': '#',
+        'class': 'wiki-link',
+        'aria-label': node.attrs.path,
+      }),
       label,
     ]
   },
@@ -133,8 +120,7 @@ export const WikiLink = Node.create<WikiLinkOptions>({
       markdown: {
         serialize(state: { write: (text: string) => void }, node: { attrs: { path?: string } }) {
           const path = node.attrs.path ?? ''
-          const label = (node.attrs as { label?: string }).label
-          state.write(`[[${path}${label ? `|${label}` : ''}]]`)
+          state.write(`[[${path}]]`)
         },
         parse: {
           updateDOM(element: HTMLElement) {
@@ -151,20 +137,14 @@ export const WikiLink = Node.create<WikiLinkOptions>({
       new InputRule({
         find: wikiLinkInputRegex,
         handler: ({ state, range, match }) => {
-          const rawLink = match[1]?.trim()
-          const { label } = splitWikiAlias(rawLink ?? '')
-          const normalizedPath = rawLink ? normalizeWikiPath(rawLink) : ''
-          const { path: basePath, heading } = splitWikiFragment(normalizedPath)
-          const isHeadingOnlyLink = !basePath && Boolean(heading)
-          if (
-            !normalizedPath
-            || (!isHeadingOnlyLink && (basePath.endsWith('/') || basePath.includes('..')))
-          ) return null
+          const rawPath = match[1]?.trim()
+          const normalizedPath = rawPath ? normalizeWikiPath(rawPath) : ''
+          if (!normalizedPath || normalizedPath.endsWith('/') || normalizedPath.includes('..')) return null
           if (state.selection.$from.parent.type.spec.code) return null
           if (state.selection.$from.marks().some((mark) => mark.type.spec.code)) return null
 
-          const finalPath = isHeadingOnlyLink ? normalizedPath : ensureMarkdownExtension(normalizedPath)
-          state.tr.replaceWith(range.from, range.to, this.type.create({ path: finalPath, label }))
+          const finalPath = ensureMarkdownExtension(normalizedPath)
+          state.tr.replaceWith(range.from, range.to, this.type.create({ path: finalPath }))
           onCreate?.(finalPath)
         },
       }),
diff --git a/apps/x/apps/renderer/src/hooks/use-bg-task-agent-status.ts b/apps/x/apps/renderer/src/hooks/use-bg-task-agent-status.ts
deleted file mode 100644
index b7de2ca1..00000000
--- a/apps/x/apps/renderer/src/hooks/use-bg-task-agent-status.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import z from 'zod';
-import { useSyncExternalStore } from 'react';
-import { BackgroundTaskAgentEvent } from '@x/shared/dist/background-task.js';
-
-export type BackgroundTaskAgentStatus = 'idle' | 'running' | 'done' | 'error';
-
-export interface BackgroundTaskAgentState {
-    status: BackgroundTaskAgentStatus;
-    runId?: string;
-    summary?: string | null;
-    error?: string | null;
-}
-
-// Module-level store — shared across all hook consumers, subscribed once.
-// We replace the Map on every mutation so useSyncExternalStore detects the change.
-let store = new Map<string, BackgroundTaskAgentState>();
-const listeners = new Set<() => void>();
-let subscribed = false;
-
-function updateStore(fn: (prev: Map<string, BackgroundTaskAgentState>) => void) {
-    store = new Map(store);
-    fn(store);
-    for (const listener of listeners) listener();
-}
-
-function ensureSubscription() {
-    if (subscribed) return;
-    subscribed = true;
-    window.ipc.on('bg-task-agent:events', ((event: z.infer<typeof BackgroundTaskAgentEvent>) => {
-        const key = event.slug;
-
-        if (event.type === 'background_task_agent_start') {
-            updateStore(s => s.set(key, { status: 'running', runId: event.runId }));
-        } else if (event.type === 'background_task_agent_complete') {
-            updateStore(s => s.set(key, {
-                status: event.error ? 'error' : 'done',
-                runId: event.runId,
-                summary: event.summary ?? null,
-                error: event.error ?? null,
-            }));
-            // Auto-clear after 5 seconds
-            setTimeout(() => {
-                updateStore(s => s.delete(key));
-            }, 5000);
-        }
-    }) as (event: z.infer<typeof BackgroundTaskAgentEvent>) => void);
-}
-
-function subscribe(onStoreChange: () => void): () => void {
-    ensureSubscription();
-    listeners.add(onStoreChange);
-    return () => { listeners.delete(onStoreChange); };
-}
-
-function getSnapshot(): Map<string, BackgroundTaskAgentState> {
-    return store;
-}
-
-/**
- * Returns a Map of all bg-task agent run states, keyed by `slug`.
- *
- * Usage in the detail view:
- *   const status = useBackgroundTaskAgentStatus();
- *   const state = status.get(slug) ?? { status: 'idle' };
- *
- * Usage for a global indicator:
- *   const status = useBackgroundTaskAgentStatus();
- *   const anyRunning = [...status.values()].some(s => s.status === 'running');
- */
-export function useBackgroundTaskAgentStatus(): Map<string, BackgroundTaskAgentState> {
-    return useSyncExternalStore(subscribe, getSnapshot);
-}
diff --git a/apps/x/apps/renderer/src/hooks/use-live-note-for-path.ts b/apps/x/apps/renderer/src/hooks/use-live-note-for-path.ts
index 6d43246c..013443d3 100644
--- a/apps/x/apps/renderer/src/hooks/use-live-note-for-path.ts
+++ b/apps/x/apps/renderer/src/hooks/use-live-note-for-path.ts
@@ -42,8 +42,8 @@ function isSamePath(a: string, b: string | undefined): boolean {
  * - Ticks every minute so callers using `formatRelativeTime` get a fresh label
  *   without the underlying data changing.
  *
- * `notePath` may be either knowledge-relative (`Digest.md`) or workspace-rooted
- * (`knowledge/Digest.md`); the hook normalises internally.
+ * `notePath` may be either knowledge-relative (`Today.md`) or workspace-rooted
+ * (`knowledge/Today.md`); the hook normalises internally.
  */
 export function useLiveNoteForPath(notePath: string | null | undefined): UseLiveNoteForPathResult {
   const knowledgeRelPath = stripKnowledgePrefix(notePath ?? null)
diff --git a/apps/x/apps/renderer/src/hooks/useAnalyticsIdentity.ts b/apps/x/apps/renderer/src/hooks/useAnalyticsIdentity.ts
index 5bc5cec0..82220782 100644
--- a/apps/x/apps/renderer/src/hooks/useAnalyticsIdentity.ts
+++ b/apps/x/apps/renderer/src/hooks/useAnalyticsIdentity.ts
@@ -1,6 +1,5 @@
 import { useEffect } from 'react'
 import posthog from 'posthog-js'
-import { identifyUser, resetAnalyticsIdentity } from '@/lib/analytics'
 
 /**
  * Identifies the user in PostHog when signed into Rowboat,
@@ -18,7 +17,7 @@ export function useAnalyticsIdentity() {
         // Identify if Rowboat account is connected
         const rowboat = config.rowboat
         if (rowboat?.connected && rowboat?.userId) {
-          identifyUser(rowboat.userId)
+          posthog.identify(rowboat.userId)
         }
 
         // Set provider connection flags
@@ -70,7 +69,7 @@ export function useAnalyticsIdentity() {
       // Rowboat sign-in
       if (event.success) {
         if (event.userId) {
-          identifyUser(event.userId)
+          posthog.identify(event.userId)
         }
         posthog.people.set({ signed_in: true, rowboat_connected: true })
         posthog.capture('user_signed_in')
@@ -81,7 +80,7 @@ export function useAnalyticsIdentity() {
       // future events on this device don't get attributed to the prior user.
       posthog.people.set({ signed_in: false, rowboat_connected: false })
       posthog.capture('user_signed_out')
-      resetAnalyticsIdentity()
+      posthog.reset()
     })
 
     return cleanup
diff --git a/apps/x/apps/renderer/src/hooks/useBilling.ts b/apps/x/apps/renderer/src/hooks/useBilling.ts
index 19c001cf..728c6c97 100644
--- a/apps/x/apps/renderer/src/hooks/useBilling.ts
+++ b/apps/x/apps/renderer/src/hooks/useBilling.ts
@@ -1,5 +1,14 @@
 import { useState, useEffect, useCallback } from 'react'
-import type { BillingInfo } from '@x/shared/dist/billing.js'
+
+interface BillingInfo {
+  userEmail: string | null
+  userId: string | null
+  subscriptionPlan: string | null
+  subscriptionStatus: string | null
+  trialExpiresAt: string | null
+  sanctionedCredits: number
+  availableCredits: number
+}
 
 export function useBilling(isRowboatConnected: boolean) {
   const [billing, setBilling] = useState<BillingInfo | null>(null)
diff --git a/apps/x/apps/renderer/src/lib/analytics.ts b/apps/x/apps/renderer/src/lib/analytics.ts
index de837bab..672ea0c3 100644
--- a/apps/x/apps/renderer/src/lib/analytics.ts
+++ b/apps/x/apps/renderer/src/lib/analytics.ts
@@ -1,42 +1,5 @@
 import posthog from 'posthog-js'
 
-let appVersion: string | undefined
-let apiUrl: string | undefined
-
-function appVersionProperties(): Record<string, string> {
-  return appVersion ? { app_version: appVersion } : {}
-}
-
-export function configureAnalyticsContext(props: { appVersion?: string; apiUrl?: string }) {
-  appVersion = props.appVersion?.trim() || undefined
-  apiUrl = props.apiUrl?.trim() || undefined
-
-  const eventProperties = appVersionProperties()
-  if (Object.keys(eventProperties).length > 0) {
-    posthog.register(eventProperties)
-  }
-
-  const personProperties = {
-    ...(apiUrl ? { api_url: apiUrl } : {}),
-    ...eventProperties,
-  }
-  if (Object.keys(personProperties).length > 0) {
-    posthog.people.set(personProperties)
-  }
-}
-
-export function identifyUser(userId: string, properties?: Record<string, unknown>) {
-  posthog.identify(userId, {
-    ...properties,
-    ...appVersionProperties(),
-  })
-}
-
-export function resetAnalyticsIdentity() {
-  posthog.reset()
-  configureAnalyticsContext({ appVersion, apiUrl })
-}
-
 export function chatSessionCreated(runId: string) {
   posthog.capture('chat_session_created', { run_id: runId })
 }
diff --git a/apps/x/apps/renderer/src/lib/billing-error.ts b/apps/x/apps/renderer/src/lib/billing-error.ts
deleted file mode 100644
index 2e6736ed..00000000
--- a/apps/x/apps/renderer/src/lib/billing-error.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-export const BILLING_ERROR_PATTERNS = [
-  {
-    pattern: /upgrade required/i,
-    title: 'A subscription is required',
-    subtitle: 'Get started with a plan to access AI features in Rowboat.',
-    cta: 'Subscribe',
-  },
-  {
-    pattern: /not enough credits/i,
-    title: "You've run out of credits",
-    subtitle: 'Upgrade your plan for more usage. Daily usage resets at 00:00 UTC.',
-    cta: 'Upgrade plan',
-  },
-  {
-    pattern: /subscription not active/i,
-    title: 'Your subscription is inactive',
-    subtitle: 'Reactivate your subscription to continue using AI features.',
-    cta: 'Reactivate',
-  },
-] as const
-
-export type BillingErrorMatch = (typeof BILLING_ERROR_PATTERNS)[number]
-
-export function matchBillingError(message: string): BillingErrorMatch | null {
-  return BILLING_ERROR_PATTERNS.find(({ pattern }) => pattern.test(message)) ?? null
-}
diff --git a/apps/x/apps/renderer/src/lib/calendar-event.ts b/apps/x/apps/renderer/src/lib/calendar-event.ts
index fd532963..b7ace75a 100644
--- a/apps/x/apps/renderer/src/lib/calendar-event.ts
+++ b/apps/x/apps/renderer/src/lib/calendar-event.ts
@@ -1,23 +1,7 @@
-/**
- * Matches a video-conference join URL for the providers we support (Zoom,
- * Microsoft Teams, Google Meet). Captures the full URL up to the first
- * whitespace, quote, or angle/round/square bracket.
- */
-const MEETING_URL_RE =
-  /https?:\/\/(?:[a-z0-9-]+\.)*(?:zoom\.us|zoomgov\.com|teams\.microsoft\.com|teams\.live\.com|meet\.google\.com)\/[^\s"'<>)\]]+/i
-
-function findMeetingUrl(value: unknown): string | undefined {
-  if (typeof value !== 'string') return undefined
-  const match = MEETING_URL_RE.exec(value)
-  // Calendar descriptions are often HTML, so decode &amp; back to & in the URL.
-  return match ? match[0].replace(/&amp;/g, '&') : undefined
-}
-
 /**
  * Extract a video conference link from raw Google Calendar event JSON.
- * Checks conferenceData.entryPoints (video type), hangoutLink, a top-level
- * conferenceLink, then falls back to scanning the location/description for a
- * known meeting URL (Zoom, Microsoft Teams, Google Meet).
+ * Checks conferenceData.entryPoints (video type), hangoutLink, then falls back
+ * to a top-level conferenceLink if present.
  */
 export function extractConferenceLink(raw: Record<string, unknown>): string | undefined {
   const confData = raw.conferenceData as { entryPoints?: { entryPointType?: string; uri?: string }[] } | undefined
@@ -27,5 +11,5 @@ export function extractConferenceLink(raw: Record<string, unknown>): string | un
   }
   if (typeof raw.hangoutLink === 'string') return raw.hangoutLink
   if (typeof raw.conferenceLink === 'string') return raw.conferenceLink
-  return findMeetingUrl(raw.location) ?? findMeetingUrl(raw.description)
+  return undefined
 }
diff --git a/apps/x/apps/renderer/src/lib/chat-conversation.ts b/apps/x/apps/renderer/src/lib/chat-conversation.ts
index 5fb28574..6ae88d93 100644
--- a/apps/x/apps/renderer/src/lib/chat-conversation.ts
+++ b/apps/x/apps/renderer/src/lib/chat-conversation.ts
@@ -1,8 +1,7 @@
 import type { ToolUIPart } from 'ai'
 import z from 'zod'
-import { AskHumanRequestEvent, ToolPermissionAutoDecisionEvent, ToolPermissionRequestEvent } from '@x/shared/src/runs.js'
+import { AskHumanRequestEvent, ToolPermissionRequestEvent } from '@x/shared/src/runs.js'
 import { COMPOSIO_DISPLAY_NAMES } from '@x/shared/src/composio.js'
-import type { CodeRunEvent, PermissionAsk } from '@x/shared/src/code-mode.js'
 
 export interface MessageAttachment {
   path: string
@@ -28,9 +27,6 @@ export interface ToolCall {
   streamingOutput?: string
   status: 'pending' | 'running' | 'completed' | 'error'
   timestamp: number
-  // code_agent_run only: structured ACP stream items + the in-flight permission ask.
-  codeRunEvents?: CodeRunEvent[]
-  pendingCodePermission?: { requestId: string; ask: PermissionAsk } | null
 }
 
 export interface ErrorMessage {
@@ -50,7 +46,6 @@ export type ChatTabViewState = {
   pendingAskHumanRequests: Map<string, z.infer<typeof AskHumanRequestEvent>>
   allPermissionRequests: Map<string, z.infer<typeof ToolPermissionRequestEvent>>
   permissionResponses: Map<string, PermissionResponse>
-  autoPermissionDecisions: Map<string, z.infer<typeof ToolPermissionAutoDecisionEvent>>
 }
 
 export type ChatViewportAnchorState = {
@@ -65,7 +60,6 @@ export const createEmptyChatTabViewState = (): ChatTabViewState => ({
   pendingAskHumanRequests: new Map(),
   allPermissionRequests: new Map(),
   permissionResponses: new Map(),
-  autoPermissionDecisions: new Map(),
 })
 
 export type ToolState = 'input-streaming' | 'input-available' | 'output-available' | 'output-error'
@@ -485,19 +479,19 @@ export const getComposioConnectCardData = (tool: ToolCall): ComposioConnectCardD
 
 // Human-friendly display names for builtin tools
 const TOOL_DISPLAY_NAMES: Record<string, string> = {
-  'file-readText': 'Reading file',
-  'file-writeText': 'Writing file',
-  'file-editText': 'Editing file',
-  'file-list': 'Reading directory',
-  'file-exists': 'Checking path',
-  'file-stat': 'Getting file info',
-  'file-glob': 'Finding files',
-  'file-grep': 'Searching files',
-  'file-mkdir': 'Creating directory',
-  'file-rename': 'Renaming',
-  'file-copy': 'Copying file',
-  'file-remove': 'Removing',
-  'file-getRoot': 'Getting file root',
+  'workspace-readFile': 'Reading file',
+  'workspace-writeFile': 'Writing file',
+  'workspace-edit': 'Editing file',
+  'workspace-readdir': 'Reading directory',
+  'workspace-exists': 'Checking path',
+  'workspace-stat': 'Getting file info',
+  'workspace-glob': 'Finding files',
+  'workspace-grep': 'Searching files',
+  'workspace-mkdir': 'Creating directory',
+  'workspace-rename': 'Renaming',
+  'workspace-copy': 'Copying file',
+  'workspace-remove': 'Removing',
+  'workspace-getRoot': 'Getting workspace root',
   'loadSkill': 'Loading skill',
   'parseFile': 'Parsing file',
   'LLMParse': 'Extracting content',
@@ -606,7 +600,6 @@ export const isToolGroup = (item: GroupedConversationItem): item is ToolGroup =>
 
 const isPlainToolCall = (item: ConversationItem): item is ToolCall => {
   if (!isToolCall(item)) return false
-  if (item.name === 'code_agent_run') return false // rich standalone block, never grouped
   if (getWebSearchCardData(item)) return false
   if (getComposioConnectCardData(item)) return false
   if (getAppActionCardData(item)) return false
@@ -660,63 +653,6 @@ export const getToolGroupSummary = (tools: ToolCall[]): string => {
   return names.join(' · ')
 }
 
-// Past-tense action phrases for summarizing a finished tool group, e.g.
-// "read 3 files, listed directory". Keyed by builtin tool name.
-const TOOL_ACTION_VERBS: Record<string, { verb: string; one: string; many: string }> = {
-  'file-readText': { verb: 'read', one: 'file', many: 'files' },
-  'file-writeText': { verb: 'wrote', one: 'file', many: 'files' },
-  'file-editText': { verb: 'edited', one: 'file', many: 'files' },
-  'file-list': { verb: 'listed', one: 'directory', many: 'directories' },
-  'file-exists': { verb: 'checked', one: 'path', many: 'paths' },
-  'file-stat': { verb: 'inspected', one: 'file', many: 'files' },
-  'file-glob': { verb: 'searched for', one: 'file', many: 'files' },
-  'file-grep': { verb: 'searched', one: 'file', many: 'files' },
-  'file-mkdir': { verb: 'created', one: 'directory', many: 'directories' },
-  'file-rename': { verb: 'renamed', one: 'file', many: 'files' },
-  'file-copy': { verb: 'copied', one: 'file', many: 'files' },
-  'file-remove': { verb: 'removed', one: 'file', many: 'files' },
-  'file-getRoot': { verb: 'resolved', one: 'file root', many: 'file roots' },
-  'executeCommand': { verb: 'ran', one: 'command', many: 'commands' },
-  'executeMcpTool': { verb: 'ran', one: 'MCP tool', many: 'MCP tools' },
-  'listMcpServers': { verb: 'listed', one: 'MCP server', many: 'MCP servers' },
-  'listMcpTools': { verb: 'listed', one: 'MCP tool', many: 'MCP tools' },
-  'save-to-memory': { verb: 'saved', one: 'memory', many: 'memories' },
-  'loadSkill': { verb: 'loaded', one: 'skill', many: 'skills' },
-  'parseFile': { verb: 'parsed', one: 'file', many: 'files' },
-}
-
-// Summarize what a group of tools actually did, grouping identical actions
-// and counting them: "read 3 files, listed directory". Unmapped tools fall
-// back to their lowercased display name.
-export const getToolActionsSummary = (tools: ToolCall[]): string => {
-  const order: string[] = []
-  const grouped = new Map<string, { phrase: typeof TOOL_ACTION_VERBS[string] | null; count: number; fallback: string }>()
-  for (const tool of tools) {
-    const phrase = TOOL_ACTION_VERBS[tool.name] ?? null
-    const key = phrase ? `${phrase.verb}|${phrase.one}` : tool.name
-    const existing = grouped.get(key)
-    if (existing) {
-      existing.count++
-    } else {
-      grouped.set(key, { phrase, count: 1, fallback: getToolDisplayName(tool) })
-      order.push(key)
-    }
-  }
-  const phrases = order.map((key) => {
-    const { phrase, count, fallback } = grouped.get(key)!
-    if (!phrase) return fallback.toLowerCase()
-    if (count > 1) return `${phrase.verb} ${count} ${phrase.many}`
-    const article = /^[aeiou]/i.test(phrase.one) ? 'an' : 'a'
-    return `${phrase.verb} ${article} ${phrase.one}`
-  })
-  // Show at most two operations; collapse the rest into "more...".
-  const MAX_ACTIONS = 2
-  if (phrases.length > MAX_ACTIONS) {
-    return `${phrases.slice(0, MAX_ACTIONS).join(', ')}, more...`
-  }
-  return phrases.join(', ')
-}
-
 export const inferRunTitleFromMessage = (content: string): string | undefined => {
   const { message } = parseAttachedFiles(content)
   const normalized = message.replace(/\s+/g, ' ').trim()
diff --git a/apps/x/apps/renderer/src/lib/file-types.ts b/apps/x/apps/renderer/src/lib/file-types.ts
index c293ac6f..d4477f7a 100644
--- a/apps/x/apps/renderer/src/lib/file-types.ts
+++ b/apps/x/apps/renderer/src/lib/file-types.ts
@@ -6,7 +6,7 @@
  * also uses it to decide what to keep mounted.
  */
 
-export type ViewerType = 'html' | 'image' | 'video' | 'audio' | 'pdf' | 'docx'
+export type ViewerType = 'html' | 'image' | 'video' | 'audio' | 'pdf'
 
 const VIEWER_BY_EXT: Record<string, ViewerType> = {
   html: 'html',
@@ -31,7 +31,6 @@ const VIEWER_BY_EXT: Record<string, ViewerType> = {
   flac: 'audio',
   aac: 'audio',
   pdf: 'pdf',
-  docx: 'docx',
 }
 
 function extensionOf(path: string): string {
diff --git a/apps/x/apps/renderer/src/lib/wiki-links.ts b/apps/x/apps/renderer/src/lib/wiki-links.ts
index 87f3b36b..0e376cc9 100644
--- a/apps/x/apps/renderer/src/lib/wiki-links.ts
+++ b/apps/x/apps/renderer/src/lib/wiki-links.ts
@@ -3,50 +3,24 @@ const KNOWLEDGE_PREFIX = 'knowledge/'
 export const stripKnowledgePrefix = (path: string) =>
   path.startsWith(KNOWLEDGE_PREFIX) ? path.slice(KNOWLEDGE_PREFIX.length) : path
 
-export const splitWikiAlias = (input: string) => {
-  const separatorIndex = input.indexOf('|')
-  if (separatorIndex === -1) return { target: input, label: undefined }
-  const target = input.slice(0, separatorIndex)
-  const label = input.slice(separatorIndex + 1).trim()
-  return { target, label: label || undefined }
-}
-
-export const splitWikiFragment = (path: string) => {
-  const hashIndex = path.indexOf('#')
-  if (hashIndex === -1) return { path: path, heading: undefined }
-  const basePath = path.slice(0, hashIndex)
-  const heading = path.slice(hashIndex + 1).trim()
-  return { path: basePath, heading: heading || undefined }
-}
-
 export const normalizeWikiPath = (input: string) => {
-  const { target } = splitWikiAlias(input)
-  const trimmed = target.trim().replace(/^\/+/, '').replace(/^\.\//, '')
+  const trimmed = input.trim().replace(/^\/+/, '').replace(/^\.\//, '')
   return stripKnowledgePrefix(trimmed)
 }
 
 export const ensureMarkdownExtension = (path: string) => {
-  const { path: basePath, heading } = splitWikiFragment(path)
-  if (!basePath) return heading ? `#${heading}` : path
-  const filePath = basePath.toLowerCase().endsWith('.md') ? basePath : `${basePath}.md`
-  return heading ? `${filePath}#${heading}` : filePath
+  if (path.toLowerCase().endsWith('.md')) return path
+  return `${path}.md`
 }
 
 export const toKnowledgePath = (wikiPath: string) => {
   const normalized = normalizeWikiPath(wikiPath)
-  const { path: basePath } = splitWikiFragment(normalized)
-  if (!basePath || basePath.includes('..') || basePath.endsWith('/')) return null
-  return `${KNOWLEDGE_PREFIX}${ensureMarkdownExtension(basePath)}`
+  if (!normalized || normalized.includes('..') || normalized.endsWith('/')) return null
+  return `${KNOWLEDGE_PREFIX}${ensureMarkdownExtension(normalized)}`
 }
 
 export const wikiLabel = (wikiPath: string) => {
-  const { label } = splitWikiAlias(wikiPath)
-  if (label) return label
-
   const normalized = normalizeWikiPath(wikiPath)
-  const { path: basePath, heading } = splitWikiFragment(normalized)
-  if (!basePath && heading) return heading
-
-  const name = (basePath || normalized).split('/').pop() || normalized
+  const name = normalized.split('/').pop() || normalized
   return name.replace(/\.md$/i, '')
 }
diff --git a/apps/x/apps/renderer/src/main.tsx b/apps/x/apps/renderer/src/main.tsx
index 7999061d..fedc029c 100644
--- a/apps/x/apps/renderer/src/main.tsx
+++ b/apps/x/apps/renderer/src/main.tsx
@@ -2,10 +2,9 @@ import { StrictMode } from 'react'
 import { createRoot } from 'react-dom/client'
 import './index.css'
 import App from './App.tsx'
+import posthog from 'posthog-js'
 import { PostHogProvider } from 'posthog-js/react'
-import type { CaptureResult } from 'posthog-js'
 import { ThemeProvider } from '@/contexts/theme-context'
-import { configureAnalyticsContext } from './lib/analytics'
 
 // Fetch the stable installation ID from main so renderer + main share one
 // PostHog distinct_id. Falls back to PostHog's auto-generated anonymous ID
@@ -13,36 +12,19 @@ import { configureAnalyticsContext } from './lib/analytics'
 async function bootstrap() {
   let installationId: string | undefined
   let apiUrl: string | undefined
-  let appVersion: string | undefined
   try {
     const result = await window.ipc.invoke('analytics:bootstrap', null)
     installationId = result.installationId
     apiUrl = result.apiUrl
-    appVersion = result.appVersion
   } catch (err) {
     console.error('[Analytics] Failed to bootstrap from main:', err)
   }
 
-  configureAnalyticsContext({ apiUrl, appVersion })
-
   const options = {
     api_host: import.meta.env.VITE_PUBLIC_POSTHOG_HOST,
-    defaults: '2025-11-30' as const,
+    defaults: '2025-11-30',
     ...(installationId ? { bootstrap: { distinctID: installationId } } : {}),
-    before_send: (event: CaptureResult | null) => {
-      if (!event) return event
-      if (appVersion) {
-        event.properties = {
-          ...event.properties,
-          app_version: appVersion,
-        }
-      }
-      return event
-    },
-    loaded: () => {
-      configureAnalyticsContext({ apiUrl, appVersion })
-    },
-  }
+  } as const
 
   createRoot(document.getElementById('root')!).render(
     <StrictMode>
@@ -54,7 +36,11 @@ async function bootstrap() {
     </StrictMode>,
   )
 
-  // The loaded callback applies api_url/app_version once PostHog has initialized.
+  // Tag the active person record with api_url so anonymous users are also
+  // segmentable by environment.
+  if (apiUrl) {
+    posthog.people.set({ api_url: apiUrl })
+  }
 }
 
 bootstrap()
diff --git a/apps/x/apps/renderer/src/styles/editor.css b/apps/x/apps/renderer/src/styles/editor.css
index dbf9f067..3d270bb2 100644
--- a/apps/x/apps/renderer/src/styles/editor.css
+++ b/apps/x/apps/renderer/src/styles/editor.css
@@ -2020,33 +2020,3 @@
 .dark .tiptap-editor .ProseMirror p.is-editor-empty:first-child::before {
   color: rgba(255, 255, 255, 0.3);
 }
-
-/* Read-only renderer used by surfaces that need rich blocks without editor chrome. */
-.rich-markdown-viewer {
-  display: block;
-  overflow: visible;
-  min-height: auto;
-}
-
-.rich-markdown-viewer .ProseMirror {
-  max-width: none;
-  margin: 0;
-  padding: 0;
-}
-
-.rich-markdown-viewer .ProseMirror:focus {
-  outline: none;
-}
-
-.rich-markdown-viewer .ProseMirror .task-block-delete,
-.rich-markdown-viewer .ProseMirror .image-block-delete,
-.rich-markdown-viewer .ProseMirror .embed-block-delete,
-.rich-markdown-viewer .ProseMirror .iframe-block-delete,
-.rich-markdown-viewer .ProseMirror .chart-block-delete,
-.rich-markdown-viewer .ProseMirror .table-block-delete,
-.rich-markdown-viewer .ProseMirror .calendar-block-delete,
-.rich-markdown-viewer .ProseMirror .email-block-delete,
-.rich-markdown-viewer .ProseMirror .email-draft-block-delete,
-.rich-markdown-viewer .ProseMirror .mermaid-block-delete {
-  display: none;
-}
diff --git a/apps/x/packages/core/package.json b/apps/x/packages/core/package.json
index 08c2644d..f8dbac06 100644
--- a/apps/x/packages/core/package.json
+++ b/apps/x/packages/core/package.json
@@ -5,15 +5,10 @@
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "scripts": {
-    "build": "rm -rf dist && tsc -p tsconfig.build.json",
-    "dev": "tsc -w -p tsconfig.build.json",
-    "test": "vitest run",
-    "test:watch": "vitest"
+    "build": "rm -rf dist && tsc",
+    "dev": "tsc -w"
   },
   "dependencies": {
-    "@agentclientprotocol/claude-agent-acp": "^0.39.0",
-    "@agentclientprotocol/codex-acp": "^0.0.44",
-    "@agentclientprotocol/sdk": "^0.22.1",
     "@ai-sdk/anthropic": "^2.0.63",
     "@ai-sdk/google": "^2.0.53",
     "@ai-sdk/openai": "^2.0.91",
@@ -34,8 +29,8 @@
     "express": "^5.2.1",
     "glob": "^13.0.0",
     "google-auth-library": "^10.5.0",
-    "googleapis": "^169.0.0",
     "isomorphic-git": "^1.29.0",
+    "googleapis": "^169.0.0",
     "mammoth": "^1.11.0",
     "node-html-markdown": "^2.0.0",
     "ollama-ai-provider-v2": "^1.5.4",
@@ -53,7 +48,6 @@
     "@types/express": "^5.0.6",
     "@types/node": "^25.0.3",
     "@types/papaparse": "^5.5.2",
-    "@types/pdf-parse": "^1.1.5",
-    "vitest": "catalog:"
+    "@types/pdf-parse": "^1.1.5"
   }
 }
diff --git a/apps/x/packages/core/src/agents/build-trigger-block.ts b/apps/x/packages/core/src/agents/build-trigger-block.ts
deleted file mode 100644
index 612f85d2..00000000
--- a/apps/x/packages/core/src/agents/build-trigger-block.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-import type { Triggers } from '@x/shared/dist/live-note.js';
-
-export type TriggerType = 'manual' | 'cron' | 'window' | 'event';
-
-export interface BuildTriggerBlockOptions {
-    trigger: TriggerType;
-    triggers?: Triggers;
-
-    /** For 'manual' / 'cron' / 'window' branches — extra context for THIS run. */
-    context?: string;
-
-    /** For 'event' branch — the matched event's payload. */
-    eventPayload?: string;
-
-    /**
-     * Noun for the target entity in the event-branch wording — "flagged this
-     * {targetNoun}", "Event match criteria for this {targetNoun}:". Live-note
-     * passes 'note'; bg-task passes 'task'. Default 'target'.
-     */
-    targetNoun?: string;
-
-    /**
-     * Noun for the user's persistent intent — "if your {instructionsNoun}
-     * specifies different behavior…" in the cron/window branches. Live-note
-     * passes 'objective'; bg-task uses the default 'instructions'.
-     */
-    instructionsNoun?: string;
-
-    /**
-     * Text shown inside the manual-trigger parenthetical, after "Manual run".
-     * Live-note passes:
-     *   "user-triggered — either the Run button in the Live Note panel or the
-     *   `run-live-note-agent` tool"
-     * Bg-task passes:
-     *   "user-triggered — either the Run button in the Background Task detail
-     *   view or the `run-background-task-agent` tool"
-     */
-    manualParen?: string;
-
-    /**
-     * The "**Decision:** …" paragraph appended to the event branch. Live-note
-     * and bg-task pass their own copies so the directive matches their
-     * domain (edit the file vs. act on the event).
-     */
-    eventDecisionDirective?: string;
-}
-
-function describeWindow(triggers: Triggers | undefined): string {
-    const ws = triggers?.windows;
-    if (!ws || ws.length === 0) return 'a configured window';
-    return ws.map(w => `${w.startTime}–${w.endTime}`).join(', ');
-}
-
-/**
- * Build the "**Trigger:** …" paragraph appended to a scheduled/event/manual
- * agent message. Shared between the live-note runner and the bg-task runner —
- * each passes domain-specific nouns and the event-branch decision directive.
- */
-export function buildTriggerBlock(opts: BuildTriggerBlockOptions): string {
-    const {
-        trigger,
-        triggers,
-        context,
-        eventPayload,
-        targetNoun = 'target',
-        instructionsNoun = 'instructions',
-        manualParen = 'user-triggered',
-        eventDecisionDirective,
-    } = opts;
-
-    if (trigger === 'event') {
-        const criteria = triggers?.eventMatchCriteria ?? '(none — should not happen for event-triggered runs)';
-        const decision = eventDecisionDirective ?? '';
-        return `
-
-**Trigger:** Event match — Pass 1 routing flagged this ${targetNoun} as potentially relevant to the event below.
-
-**Event match criteria for this ${targetNoun}:**
-${criteria}
-
-**Event payload:**
-${eventPayload ?? '(no payload)'}
-
-${decision}`;
-    }
-
-    if (trigger === 'cron') {
-        const expr = triggers?.cronExpr ?? '(unknown)';
-        return `
-
-**Trigger:** Scheduled refresh — the cron expression \`${expr}\` matched. This is a baseline refresh; if your ${instructionsNoun} specifies different behavior for cron vs window vs event runs, follow the cron branch.${context ? `\n\n**Context:**\n${context}` : ''}`;
-    }
-
-    if (trigger === 'window') {
-        return `
-
-**Trigger:** Scheduled refresh — fired inside the configured window (${describeWindow(triggers)}). This is a forgiving baseline refresh that runs once per day per window; reactive updates are handled by event triggers (when configured). If your ${instructionsNoun} specifies different behavior for cron vs window vs event runs, follow the window branch.${context ? `\n\n**Context:**\n${context}` : ''}`;
-    }
-
-    // manual
-    return `
-
-**Trigger:** Manual run (${manualParen}).${context ? `\n\n**Context:**\n${context}` : ''}`;
-}
diff --git a/apps/x/packages/core/src/agents/runtime.ts b/apps/x/packages/core/src/agents/runtime.ts
index 6f563a07..7c131482 100644
--- a/apps/x/packages/core/src/agents/runtime.ts
+++ b/apps/x/packages/core/src/agents/runtime.ts
@@ -3,19 +3,16 @@ import fs from "fs";
 import path from "path";
 import { WorkDir } from "../config/config.js";
 import { Agent, ToolAttachment } from "@x/shared/dist/agent.js";
-import { AssistantContentPart, AssistantMessage, Message, MessageList, ProviderOptions, ToolCallPart, ToolMessage, UserMessageContext } from "@x/shared/dist/message.js";
+import { AssistantContentPart, AssistantMessage, Message, MessageList, ProviderOptions, ToolCallPart, ToolMessage } from "@x/shared/dist/message.js";
 import { LanguageModel, stepCountIs, streamText, tool, Tool, ToolSet } from "ai";
 import { z } from "zod";
 import { LlmStepStreamEvent } from "@x/shared/dist/llm-step-events.js";
 import { execTool } from "../application/lib/exec-tool.js";
-import { AskHumanRequestEvent, RunEvent, ToolPermissionMetadata, ToolPermissionRequestEvent } from "@x/shared/dist/runs.js";
+import { AskHumanRequestEvent, RunEvent, ToolPermissionRequestEvent } from "@x/shared/dist/runs.js";
 import { BuiltinTools } from "../application/lib/builtin-tools.js";
 import { buildCopilotAgent } from "../application/assistant/agent.js";
 import { buildLiveNoteAgent } from "../knowledge/live-note/agent.js";
-import { buildBackgroundTaskAgent } from "../background-tasks/agent.js";
 import { isBlocked, extractCommandNames } from "../application/lib/command-executor.js";
-import { getFileAccessAllowList, type FileAccessGrant, type FileAccessOperation } from "../config/security.js";
-import { resolveFilePathForPermission } from "../filesystem/files.js";
 import container from "../di/container.js";
 import { IModelConfigRepo } from "../models/repo.js";
 import { createProvider } from "../models/models.js";
@@ -23,159 +20,27 @@ import { resolveProviderConfig } from "../models/defaults.js";
 import { IAgentsRepo } from "./repo.js";
 import { IMonotonicallyIncreasingIdGenerator } from "../application/lib/id-gen.js";
 import { IBus } from "../application/lib/bus.js";
-import { IMessageQueue, type MiddlePaneContext } from "../application/lib/message-queue.js";
+import { IMessageQueue } from "../application/lib/message-queue.js";
 import { IRunsRepo } from "../runs/repo.js";
 import { IRunsLock } from "../runs/lock.js";
 import { IAbortRegistry } from "../runs/abort-registry.js";
 import { PrefixLogger } from "@x/shared";
 import { parse } from "yaml";
 import { captureLlmUsage } from "../analytics/usage.js";
-import { enterUseCase, withUseCase, type UseCase } from "../analytics/use_case.js";
+import { enterUseCase, type UseCase } from "../analytics/use_case.js";
 import { getRaw as getNoteCreationRaw } from "../knowledge/note_creation.js";
 import { getRaw as getLabelingAgentRaw } from "../knowledge/labeling_agent.js";
 import { getRaw as getNoteTaggingAgentRaw } from "../knowledge/note_tagging_agent.js";
 import { getRaw as getInlineTaskAgentRaw } from "../knowledge/inline_task_agent.js";
 import { getRaw as getAgentNotesAgentRaw } from "../knowledge/agent_notes_agent.js";
-import { classifyToolPermissions, type AutoPermissionCandidate } from "../security/auto-permission-classifier.js";
 
 const AGENT_NOTES_DIR = path.join(WorkDir, 'knowledge', 'Agent Notes');
+const WORKDIR_CONFIG_FILE = path.join(WorkDir, 'config', 'workdir.json');
 
-// Work directory is scoped per run (per chat). Each run gets its own sidecar
-// config file so setting it in one chat does not leak into others.
-function workDirConfigFile(runId: string): string {
-    return path.join(WorkDir, 'config', `workdir-${runId}.json`);
-}
-
-type ToolPermissionMetadataValue = z.infer<typeof ToolPermissionMetadata>;
-
-function isPathInside(parent: string, child: string): boolean {
-    const relative = path.relative(parent, child);
-    return relative === '' || (!!relative && !relative.startsWith('..') && !path.isAbsolute(relative));
-}
-
-function fileGrantCoversPath(grant: FileAccessGrant, operation: FileAccessOperation, resolvedPath: string): boolean {
-    return grant.operation === operation && isPathInside(path.resolve(grant.pathPrefix), path.resolve(resolvedPath));
-}
-
-function commonPathPrefix(paths: string[]): string {
-    if (!paths.length) return path.resolve(WorkDir);
-    const split = paths.map(p => path.resolve(p).split(path.sep).filter(Boolean));
-    const first = split[0];
-    const common: string[] = [];
-    for (let i = 0; i < first.length; i++) {
-        if (split.every(parts => parts[i] === first[i])) {
-            common.push(first[i]);
-        } else {
-            break;
-        }
-    }
-    const prefix = `${path.sep}${common.join(path.sep)}`;
-    return prefix === path.sep ? prefix : path.resolve(prefix);
-}
-
-function grantPrefixForTool(toolName: string, resolvedPaths: string[]): string {
-    if (toolName === 'file-list' || toolName === 'file-glob' || toolName === 'file-grep' || toolName === 'file-mkdir') {
-        return commonPathPrefix(resolvedPaths);
-    }
-    const parentPaths = resolvedPaths.map(p => path.dirname(p));
-    return commonPathPrefix(parentPaths);
-}
-
-function filePermissionTargets(toolName: string, args: Record<string, unknown>): { operation: FileAccessOperation; paths: string[] } | null {
-    const pathArg = typeof args.path === 'string' ? args.path : undefined;
-    switch (toolName) {
-        case 'file-readText':
-        case 'parseFile':
-        case 'LLMParse':
-        case 'file-exists':
-        case 'file-stat':
-            return pathArg ? { operation: 'read', paths: [pathArg] } : null;
-        case 'file-list':
-            return pathArg ? { operation: 'list', paths: [pathArg || '.'] } : null;
-        case 'file-glob':
-            return { operation: 'search', paths: [typeof args.cwd === 'string' && args.cwd ? args.cwd : '.'] };
-        case 'file-grep':
-            return { operation: 'search', paths: [typeof args.searchPath === 'string' && args.searchPath ? args.searchPath : '.'] };
-        case 'file-writeText':
-        case 'file-editText':
-        case 'file-mkdir':
-            return pathArg ? { operation: 'write', paths: [pathArg] } : null;
-        case 'file-copy':
-        case 'file-rename': {
-            const from = typeof args.from === 'string' ? args.from : undefined;
-            const to = typeof args.to === 'string' ? args.to : undefined;
-            return from && to ? { operation: 'write', paths: [from, to] } : null;
-        }
-        case 'file-remove':
-            return pathArg ? { operation: 'delete', paths: [pathArg] } : null;
-        default:
-            return null;
-    }
-}
-
-async function getToolPermissionMetadata(
-    toolCall: z.infer<typeof ToolCallPart>,
-    underlyingTool: z.infer<typeof ToolAttachment>,
-    sessionAllowedCommands: Set<string>,
-    sessionAllowedFileAccess: FileAccessGrant[],
-): Promise<ToolPermissionMetadataValue | null> {
-    if (underlyingTool.type !== 'builtin') {
-        return null;
-    }
-
-    if (underlyingTool.name === 'executeCommand') {
-        const args = toolCall.arguments;
-        if (!args || typeof args !== 'object' || !('command' in args)) {
-            return null;
-        }
-        const command = String((args as { command: unknown }).command);
-        if (!isBlocked(command, sessionAllowedCommands)) {
-            return null;
-        }
-        return {
-            kind: 'command',
-            commandNames: extractCommandNames(command),
-        };
-    }
-
-    const args = toolCall.arguments && typeof toolCall.arguments === 'object'
-        ? toolCall.arguments as Record<string, unknown>
-        : {};
-    const targets = filePermissionTargets(underlyingTool.name, args);
-    if (!targets) {
-        return null;
-    }
-
-    const resolvedTargets = await Promise.all(targets.paths.map(p => resolveFilePathForPermission(p)));
-    const outsideWorkspacePaths = resolvedTargets
-        .filter(target => !target.isInsideWorkspace)
-        .map(target => target.canonicalPath);
-    if (!outsideWorkspacePaths.length) {
-        return null;
-    }
-
-    const persistentGrants = getFileAccessAllowList();
-    const allGrants = [...persistentGrants, ...sessionAllowedFileAccess];
-    const uncovered = outsideWorkspacePaths.filter(resolvedPath =>
-        !allGrants.some(grant => fileGrantCoversPath(grant, targets.operation, resolvedPath))
-    );
-    if (!uncovered.length) {
-        return null;
-    }
-
-    return {
-        kind: 'file',
-        operation: targets.operation,
-        paths: uncovered,
-        pathPrefix: grantPrefixForTool(underlyingTool.name, uncovered),
-    };
-}
-
-function loadUserWorkDir(runId: string): string | null {
+function loadUserWorkDir(): string | null {
     try {
-        const file = workDirConfigFile(runId);
-        if (!fs.existsSync(file)) return null;
-        const raw = fs.readFileSync(file, 'utf-8');
+        if (!fs.existsSync(WORKDIR_CONFIG_FILE)) return null;
+        const raw = fs.readFileSync(WORKDIR_CONFIG_FILE, 'utf-8');
         const parsed = JSON.parse(raw) as { path?: unknown };
         const value = typeof parsed.path === 'string' ? parsed.path.trim() : '';
         return value || null;
@@ -229,103 +94,13 @@ function loadAgentNotesContext(): string | null {
     } catch { /* ignore */ }
 
     if (otherFiles.length > 0) {
-        sections.push(`## More Specific Preferences\nFor more specific preferences, you can read these files using file-readText. Only read them when relevant to the current task.\n\n${otherFiles.map(f => `- knowledge/Agent Notes/${f}`).join('\n')}`);
+        sections.push(`## More Specific Preferences\nFor more specific preferences, you can read these files using workspace-readFile. Only read them when relevant to the current task.\n\n${otherFiles.map(f => `- knowledge/Agent Notes/${f}`).join('\n')}`);
     }
 
     if (sections.length === 0) return null;
     return `# Agent Memory\n\n${sections.join('\n\n')}`;
 }
 
-function isCopilotLikeAgent(agentName: string | null | undefined): boolean {
-    return agentName === 'copilot' || agentName === 'rowboatx';
-}
-
-function formatCurrentDateTime(now: Date): string {
-    return now.toLocaleString('en-US', {
-        weekday: 'long',
-        year: 'numeric',
-        month: 'long',
-        day: 'numeric',
-        hour: 'numeric',
-        minute: '2-digit',
-        timeZoneName: 'short',
-    });
-}
-
-function toUserMessageContextMiddlePane(middlePaneContext: MiddlePaneContext | null): z.infer<typeof UserMessageContext>['middlePane'] {
-    if (!middlePaneContext) {
-        return { kind: 'empty' };
-    }
-    if (middlePaneContext.kind === 'note') {
-        return {
-            kind: 'note',
-            path: middlePaneContext.path,
-            content: middlePaneContext.content,
-        };
-    }
-    return {
-        kind: 'browser',
-        url: middlePaneContext.url,
-        title: middlePaneContext.title,
-    };
-}
-
-function buildUserMessageContext({
-    agentName,
-    middlePaneContext,
-}: {
-    agentName: string | null | undefined;
-    middlePaneContext: MiddlePaneContext | null;
-}): z.infer<typeof UserMessageContext> {
-    return {
-        currentDateTime: formatCurrentDateTime(new Date()),
-        ...(isCopilotLikeAgent(agentName)
-            ? { middlePane: toUserMessageContextMiddlePane(middlePaneContext) }
-            : {}),
-    };
-}
-
-function formatUserMessageContextForLlm(userMessageContext: z.infer<typeof UserMessageContext>): string {
-    const sections: string[] = [];
-
-    if (userMessageContext.currentDateTime) {
-        sections.push(`Current date and time: ${userMessageContext.currentDateTime}`);
-    }
-
-    if (userMessageContext.middlePane) {
-        if (userMessageContext.middlePane.kind === 'empty') {
-            sections.push(`Middle pane:\nState: empty`);
-        } else if (userMessageContext.middlePane.kind === 'note') {
-            sections.push(`Middle pane:\nState: note\nPath: ${userMessageContext.middlePane.path}\n\nContent:\n\`\`\`\n${userMessageContext.middlePane.content}\n\`\`\``);
-        } else {
-            sections.push(`Middle pane:\nState: browser\nURL: ${userMessageContext.middlePane.url}\nTitle: ${userMessageContext.middlePane.title}`);
-        }
-    }
-
-    if (sections.length === 0) {
-        return '';
-    }
-
-    return `# User Context
-${sections.join('\n\n')}
-
-# User Message
-`;
-}
-
-const USER_CONTEXT_SYSTEM_INSTRUCTIONS = `# Hidden User Context
-User messages may include a hidden "# User Context" section before "# User Message". Treat it as runtime metadata captured when that specific user message was sent. The actual user-authored text starts under "# User Message".
-
-Use "Current date and time" for temporal reasoning.
-
-If Middle pane context is present, it reflects what the user had open at the time of that specific message and overrides earlier middle-pane references. If the conversation history references a different note or browser page, the user had since closed or navigated away from it. Do not treat earlier context as current.
-
-If Middle pane state is empty, the user was not looking at any relevant note or web page at that point. Answer the user's message on its own merits.
-
-If Middle pane state is note, the supplied path and content are available so you can reference the note when relevant. The user may or may not be talking about this note. Do NOT assume every message is about it. Only reference or act on this note when the user's message clearly relates to it, such as "this note", "what I'm looking at", "here", "above", "below", or questions whose subject is plainly the note's content. For unrelated questions, ignore this note entirely and answer normally. Do not mention that you can see this note unless it is relevant to the answer.
-
-If Middle pane state is browser, only the URL and page title are supplied; the page content itself is NOT included. If you need the page content to answer, use the browser tools available to you to read the page. The user may or may not be talking about this page. Only reference or act on this page when the user's message clearly relates to it, such as "this page", "this article", "what I'm looking at", "this site", or "summarize this". For unrelated questions, ignore this page entirely and answer normally. Do not mention that you can see the browser unless it is relevant to the answer.`;
-
 export interface IAgentRuntime {
     trigger(runId: string): Promise<void>;
 }
@@ -483,10 +258,9 @@ export async function mapAgentTool(t: z.infer<typeof ToolAttachment>): Promise<T
         case "builtin": {
             if (t.name === "ask-human") {
                 return tool({
-                    description: "Ask a human before proceeding. Optionally pass `options` (an array of short button labels) to render the question as a one-click choice; the user's response will be the chosen label verbatim.",
+                    description: "Ask a human before proceeding",
                     inputSchema: z.object({
                         question: z.string().describe("The question to ask the human"),
-                        options: z.array(z.string()).optional().describe("Optional short button labels (2-4 recommended). If provided, the user picks one with a single click instead of typing. The response you receive will be the chosen label."),
                     }),
                 });
             }
@@ -631,10 +405,6 @@ export async function loadAgent(id: string): Promise<z.infer<typeof Agent>> {
         return buildLiveNoteAgent();
     }
 
-    if (id === "background-task-agent") {
-        return buildBackgroundTaskAgent();
-    }
-
     if (id === 'note_creation') {
         const raw = getNoteCreationRaw();
         let agent: z.infer<typeof Agent> = {
@@ -813,18 +583,17 @@ export function convertFromMessages(messages: z.infer<typeof Message>[]): ModelM
                     providerOptions,
                 });
                 break;
-            case "user": {
-                const userMessageContextPrefix = msg.userMessageContext ? formatUserMessageContextForLlm(msg.userMessageContext) : '';
+            case "user":
                 if (typeof msg.content === 'string') {
                     // Legacy string — pass through unchanged
                     result.push({
                         role: "user",
-                        content: `${userMessageContextPrefix}${msg.content}`,
+                        content: msg.content,
                         providerOptions,
                     });
                 } else {
                     // New content parts array — collapse to text for LLM
-                    const textSegments: string[] = userMessageContextPrefix ? [userMessageContextPrefix] : [];
+                    const textSegments: string[] = [];
                     const attachmentLines: string[] = [];
 
                     for (const part of msg.content) {
@@ -838,11 +607,7 @@ export function convertFromMessages(messages: z.infer<typeof Message>[]): ModelM
                     }
 
                     if (attachmentLines.length > 0) {
-                        if (userMessageContextPrefix) {
-                            textSegments.push("User has attached the following files:", ...attachmentLines, "");
-                        } else {
-                            textSegments.unshift("User has attached the following files:", ...attachmentLines, "");
-                        }
+                        textSegments.unshift("User has attached the following files:", ...attachmentLines, "");
                     }
 
                     result.push({
@@ -852,7 +617,6 @@ export function convertFromMessages(messages: z.infer<typeof Message>[]): ModelM
                     });
                 }
                 break;
-            }
             case "tool":
                 result.push({
                     role: "tool",
@@ -902,7 +666,6 @@ export class AgentState {
     agentName: string | null = null;
     runModel: string | null = null;
     runProvider: string | null = null;
-    permissionMode: "manual" | "auto" = "manual";
     runUseCase: UseCase | null = null;
     runSubUseCase: string | null = null;
     messages: z.infer<typeof MessageList> = [];
@@ -914,10 +677,7 @@ export class AgentState {
     pendingAskHumanRequests: Record<string, z.infer<typeof AskHumanRequestEvent>> = {};
     allowedToolCallIds: Record<string, true> = {};
     deniedToolCallIds: Record<string, true> = {};
-    autoAllowedToolCalls: Record<string, { reason: string }> = {};
-    autoDeniedToolCalls: Record<string, { reason: string }> = {};
     sessionAllowedCommands: Set<string> = new Set();
-    sessionAllowedFileAccess: FileAccessGrant[] = [];
 
     getPendingPermissions(): z.infer<typeof ToolPermissionRequestEvent>[] {
         const response: z.infer<typeof ToolPermissionRequestEvent>[] = [];
@@ -1023,7 +783,6 @@ export class AgentState {
                 this.agentName = event.agentName;
                 this.runModel = event.model;
                 this.runProvider = event.provider;
-                this.permissionMode = event.permissionMode ?? "manual";
                 this.runUseCase = event.useCase ?? null;
                 this.runSubUseCase = event.subUseCase ?? null;
                 break;
@@ -1036,7 +795,6 @@ export class AgentState {
                 this.subflowStates[event.toolCallId].agentName = event.agentName;
                 this.subflowStates[event.toolCallId].runModel = this.runModel;
                 this.subflowStates[event.toolCallId].runProvider = this.runProvider;
-                this.subflowStates[event.toolCallId].permissionMode = this.permissionMode;
                 this.subflowStates[event.toolCallId].runUseCase = this.runUseCase;
                 this.subflowStates[event.toolCallId].runSubUseCase = this.runSubUseCase;
                 break;
@@ -1065,15 +823,6 @@ export class AgentState {
                 switch (event.response) {
                     case "approve":
                         this.allowedToolCallIds[event.toolCallId] = true;
-                        {
-                            const permissionRequest = this.pendingToolPermissionRequests[event.toolCallId];
-                            if (event.scope === "session" && permissionRequest?.permission?.kind === "file") {
-                                this.sessionAllowedFileAccess.push({
-                                    operation: permissionRequest.permission.operation,
-                                    pathPrefix: permissionRequest.permission.pathPrefix,
-                                });
-                            }
-                        }
                         // For session scope, extract command names and add to session allowlist
                         if (event.scope === "session") {
                             const toolCall = this.toolCallIdMap[event.toolCallId];
@@ -1087,22 +836,10 @@ export class AgentState {
                         break;
                     case "deny":
                         this.deniedToolCallIds[event.toolCallId] = true;
-                        delete this.autoDeniedToolCalls[event.toolCallId];
                         break;
                 }
                 delete this.pendingToolPermissionRequests[event.toolCallId];
                 break;
-            case "tool-permission-auto-decision":
-                switch (event.decision) {
-                    case "allow":
-                        this.allowedToolCallIds[event.toolCallId] = true;
-                        this.autoAllowedToolCalls[event.toolCallId] = { reason: event.reason };
-                        break;
-                    case "deny":
-                        this.autoDeniedToolCalls[event.toolCallId] = { reason: event.reason };
-                        break;
-                }
-                break;
             case "ask-human-request":
                 this.pendingAskHumanRequests[event.toolCallId] = event;
                 break;
@@ -1180,7 +917,6 @@ export async function* streamAgent({
     let voiceInput = false;
     let voiceOutput: 'summary' | 'full' | null = null;
     let searchEnabled = false;
-    let codeMode: 'claude' | 'codex' | null = null;
     let middlePaneContext:
         | { kind: 'note'; path: string; content: string }
         | { kind: 'browser'; url: string; title: string }
@@ -1208,19 +944,13 @@ export async function* streamAgent({
             // if tool has been denied, deny
             if (state.deniedToolCallIds[toolCallId]) {
                 _logger.log('returning denied tool message, reason: tool has been denied');
-                const autoDenied = state.autoDeniedToolCalls[toolCallId];
                 yield* processEvent({
                     runId,
                     messageId: await idGenerator.next(),
                     type: "message",
                     message: {
                         role: "tool",
-                        content: autoDenied
-                            ? JSON.stringify({
-                                success: false,
-                                error: `Auto-permission denied: ${autoDenied.reason}`,
-                            })
-                            : "Unable to execute this tool: Permission was denied.",
+                        content: "Unable to execute this tool: Permission was denied.",
                         toolCallId: toolCallId,
                         toolName: toolCall.toolName,
                     },
@@ -1279,7 +1009,6 @@ export async function* streamAgent({
                     signal,
                     abortRegistry,
                     publish: (event) => bus.publish(event),
-                    codeMode,
                 });
             }
             } catch (error) {
@@ -1336,9 +1065,6 @@ export async function* streamAgent({
             if (msg.searchEnabled) {
                 searchEnabled = true;
             }
-            // Code mode is per-message: latest message decides whether the assistant
-            // should route coding work through the code-with-agents skill / chosen agent.
-            codeMode = msg.codeMode ?? null;
             if (msg.voiceOutput) {
                 voiceOutput = msg.voiceOutput;
             }
@@ -1346,10 +1072,6 @@ export async function* streamAgent({
             // latest user message. If the user closed the pane between messages, clear it.
             middlePaneContext = msg.middlePaneContext ?? null;
             loopLogger.log('dequeued user message', msg.messageId);
-            const userMessageContext = buildUserMessageContext({
-                agentName: state.agentName,
-                middlePaneContext,
-            });
             yield* processEvent({
                 runId,
                 type: "message",
@@ -1357,7 +1079,6 @@ export async function* streamAgent({
                 message: {
                     role: "user",
                     content: msg.message,
-                    userMessageContext,
                 },
                 subflow: [],
             });
@@ -1379,14 +1100,24 @@ export async function* streamAgent({
         loopLogger.log('running llm turn');
         // stream agent response and build message
         const messageBuilder = new StreamStepMessageBuilder();
-        let instructionsWithDateTime = `${agent.instructions}\n\n${USER_CONTEXT_SYSTEM_INSTRUCTIONS}`;
+        const now = new Date();
+        const currentDateTime = now.toLocaleString('en-US', {
+            weekday: 'long',
+            year: 'numeric',
+            month: 'long',
+            day: 'numeric',
+            hour: 'numeric',
+            minute: '2-digit',
+            timeZoneName: 'short'
+        });
+        let instructionsWithDateTime = `Current date and time: ${currentDateTime}\n\n${agent.instructions}`;
         // Inject Agent Notes context for copilot
         if (state.agentName === 'copilot' || state.agentName === 'rowboatx') {
             const agentNotesContext = loadAgentNotesContext();
             if (agentNotesContext) {
                 instructionsWithDateTime += `\n\n${agentNotesContext}`;
             }
-            const userWorkDir = loadUserWorkDir(runId);
+            const userWorkDir = loadUserWorkDir();
             if (userWorkDir) {
                 loopLogger.log('injecting user work directory', userWorkDir);
                 instructionsWithDateTime += `\n\n# User Work Directory
@@ -1399,15 +1130,28 @@ Treat this as the **default location** for file operations whenever the user ref
 - "save this", "export it", "write that to a file" — write the output into the work directory unless the user names another location.
 - "open the file I was just working on", "the doc from earlier" — assume the work directory first.
 
-Use absolute paths rooted at this directory with the \`file-*\` tools. For example, list with \`file-list({ path: "${userWorkDir}" })\`, read text with \`file-readText\`, and write text with \`file-writeText\`. For PDFs, Office docs, images, scanned docs, and other non-text files, use \`parseFile\` or \`LLMParse\` with the absolute path; you do NOT need to copy the file into the workspace first.
+Use absolute paths rooted at this directory. On macOS/Linux call \`executeCommand\` with POSIX commands (\`ls\`, \`cat\`, \`cp\`, etc.) operating on \`${userWorkDir}\`. On Windows use the equivalent cmd syntax. For reading file contents use \`parseFile\` or \`LLMParse\` with the absolute path; you do NOT need to copy the file into the workspace first.
 
 **Exceptions — these ALWAYS take precedence over the work directory default:**
-1. **Knowledge base questions.** If the user asks about anything in the knowledge graph (notes, people, organizations, projects, topics) or paths starting with \`knowledge/\`, use file tools against \`knowledge/\` as documented above. Do NOT redirect those into the work directory.
+1. **Knowledge base questions.** If the user asks about anything in the knowledge graph (notes, people, organizations, projects, topics) or paths starting with \`knowledge/\`, use the workspace tools against \`knowledge/\` as documented above. Do NOT redirect those into the work directory.
 2. **Explicit paths.** If the user names a different directory or gives an absolute/relative path (e.g. "in ~/Downloads", "from /tmp/foo", "the Desktop"), honor that path exactly and ignore the work-directory default for that request.
 3. **Workspace-specific operations.** Anything that obviously belongs in the Rowboat workspace (config files, MCP servers, agent schedules, etc.) stays in the workspace, not the work directory.
 
 Do not announce the work directory unless it's relevant. Just use it.`;
             }
+            // Always inject a Middle Pane section so the LLM has a clear, up-to-date signal
+            // that supersedes any earlier middle-pane mention in the conversation history.
+            const middlePaneHeader = `\n\n# Middle Pane (Current State)\nThis section reflects what the user has open in the middle pane RIGHT NOW, at the time of their latest message. **This is authoritative and overrides any earlier mention of a note or web page in this conversation** — if the conversation history references a different note or browser page, the user has since closed or navigated away from it. Do not treat earlier context as current.\n\n`;
+            if (!middlePaneContext) {
+                loopLogger.log('injecting middle pane context (empty)');
+                instructionsWithDateTime += `${middlePaneHeader}**Nothing relevant is open in the middle pane right now.** The user is not looking at any note or web page. If earlier in this conversation you referenced a note or browser page as "what the user is viewing", that is no longer accurate — do not refer to it as currently open. Answer the user's latest message on its own merits.`;
+            } else if (middlePaneContext.kind === 'note') {
+                loopLogger.log('injecting middle pane context (note)', middlePaneContext.path);
+                instructionsWithDateTime += `${middlePaneHeader}The user has a note open. Its path and full content are provided below so you can reference it when relevant.\n\n**How to use this context:**\n- The user may or may not be talking about this note. Do NOT assume every message is about it.\n- Only reference or act on this note when the user's message clearly relates to it (e.g. "this note", "what I'm looking at", "here", "above", "below", or questions whose subject is plainly this note's content).\n- For unrelated questions (general chat, questions about other notes, tasks, emails, calendar, etc.), ignore this context entirely and answer normally.\n- Do not mention that you can see this note unless it is relevant to the answer.\n\n## Open note path\n${middlePaneContext.path}\n\n## Open note content\n\`\`\`\n${middlePaneContext.content}\n\`\`\``;
+            } else if (middlePaneContext.kind === 'browser') {
+                loopLogger.log('injecting middle pane context (browser)', middlePaneContext.url);
+                instructionsWithDateTime += `${middlePaneHeader}The user has the embedded browser open and is viewing a web page. Only the URL and page title are shown below — the page content itself is NOT included here. If you need the page content to answer, use the browser tools available to you to read the page.\n\n**How to use this context:**\n- The user may or may not be talking about this page. Do NOT assume every message is about it.\n- Only reference or act on this page when the user's message clearly relates to it (e.g. "this page", "this article", "what I'm looking at", "this site", "summarize this").\n- For unrelated questions (general chat, questions about other notes, tasks, emails, calendar, etc.), ignore this context entirely and answer normally.\n- Do not mention that you can see the browser unless it is relevant to the answer.\n\n## Current page\nURL: ${middlePaneContext.url}\nTitle: ${middlePaneContext.title}`;
+            }
         }
         if (voiceInput) {
             loopLogger.log('voice input enabled, injecting voice input prompt');
@@ -1424,25 +1168,6 @@ Do not announce the work directory unless it's relevant. Just use it.`;
             loopLogger.log('search enabled, injecting search prompt');
             instructionsWithDateTime += `\n\n# Search\nThe user has requested a search. Use the web-search tool to answer their query.`;
         }
-        if (codeMode) {
-            loopLogger.log('code mode enabled, injecting coding-agent context', codeMode);
-            const agentDisplay = codeMode === 'claude' ? 'Claude Code' : 'Codex';
-            instructionsWithDateTime += `\n\n# Code Mode (Active) — Agent: ${agentDisplay}
-The user has turned on **code mode** and the composer chip is set to **${agentDisplay}** (\`${codeMode}\`). For EVERY coding task this turn, use **${agentDisplay}**, and narrate that agent ("Using ${agentDisplay} to …").
-
-The chip is the single source of truth for which agent runs:
-- Do NOT carry over a different agent from earlier in this thread — even if a previous run used the other agent, use **${agentDisplay}** now.
-- Do NOT switch agents based on an in-chat text request ("use codex", "switch to claude"). The agent only changes when the user toggles the chip; if they ask in chat, tell them to toggle the chip.
-
-**How to run coding work — call the \`code_agent_run\` tool** with:
-- \`agent\`: \`${codeMode}\` (always — match the chip).
-- \`cwd\`: the absolute project/working directory (resolve it per the code-with-agents skill — a path the user named, the "# User Work Directory" block, or ask once).
-- \`prompt\`: a clear, self-contained coding instruction.
-
-The tool runs the agent on-device and streams its tool calls, file diffs, and plan into the chat; any action needing approval surfaces as an inline permission card, so you do NOT pre-confirm with an in-chat "reply yes". This chat keeps ONE persistent agent session, so follow-up coding requests automatically resume with full context — just call \`code_agent_run\` again. Do NOT shell out to \`acpx\` or \`executeCommand\` for coding, and do NOT fall back to your own file tools.
-
-If the user's message is clearly NOT a coding request (small talk, an unrelated question), answer directly without invoking the coding agent. Code mode signals readiness, not that every message must route through the agent.`;
-        }
         let streamError: string | null = null;
         for await (const event of streamLlm(
             model,
@@ -1493,33 +1218,30 @@ If the user's message is clearly NOT a coding request (small talk, an unrelated
 
         // if there were any ask-human calls, emit those events
         if (message.content instanceof Array) {
-            const permissionCandidates: AutoPermissionCandidate[] = [];
             for (const part of message.content) {
                 if (part.type === "tool-call") {
                     const underlyingTool = agent.tools![part.toolName];
                     if (underlyingTool.type === "builtin" && underlyingTool.name === "ask-human") {
                         loopLogger.log('emitting ask-human-request, toolCallId:', part.toolCallId);
-                        const rawOptions = (part.arguments as { options?: unknown }).options;
-                        const options = Array.isArray(rawOptions)
-                            ? rawOptions.filter((o): o is string => typeof o === 'string' && o.trim().length > 0)
-                            : undefined;
                         yield* processEvent({
                             runId,
                             type: "ask-human-request",
                             toolCallId: part.toolCallId,
                             query: part.arguments.question,
-                            ...(options && options.length > 0 ? { options } : {}),
                             subflow: [],
                         });
                     }
-                    const permission = await getToolPermissionMetadata(
-                        part,
-                        underlyingTool,
-                        state.sessionAllowedCommands,
-                        state.sessionAllowedFileAccess,
-                    );
-                    if (permission) {
-                        permissionCandidates.push({ toolCall: part, permission });
+                    if (underlyingTool.type === "builtin" && underlyingTool.name === "executeCommand") {
+                        // if command is blocked, then seek permission
+                        if (isBlocked(part.arguments.command, state.sessionAllowedCommands)) {
+                            loopLogger.log('emitting tool-permission-request, toolCallId:', part.toolCallId);
+                            yield* processEvent({
+                                runId,
+                                type: "tool-permission-request",
+                                toolCall: part,
+                                subflow: [],
+                            });
+                        }
                     }
                     if (underlyingTool.type === "agent" && underlyingTool.name) {
                         loopLogger.log('emitting spawn-subflow, toolCallId:', part.toolCallId);
@@ -1543,87 +1265,6 @@ If the user's message is clearly NOT a coding request (small talk, an unrelated
                     }
                 }
             }
-
-            if (permissionCandidates.length > 0) {
-                if (state.permissionMode === "auto") {
-                    let decisionsByToolCallId = new Map<string, { decision: "allow" | "deny"; reason: string }>();
-                    try {
-                        const decisions = await classifyToolPermissions({
-                            runId,
-                            agentName: state.agentName,
-                            messages: convertFromMessages(state.messages),
-                            candidates: permissionCandidates,
-                            useCase: state.runUseCase ?? "copilot_chat",
-                            subUseCase: state.runSubUseCase,
-                        });
-                        decisionsByToolCallId = new Map(decisions.map((decision) => [
-                            decision.toolCallId,
-                            { decision: decision.decision, reason: decision.reason },
-                        ]));
-                    } catch (error) {
-                        loopLogger.log(
-                            'auto-permission classifier failed:',
-                            error instanceof Error ? error.message : String(error),
-                        );
-                    }
-
-                    for (const candidate of permissionCandidates) {
-                        const decision = decisionsByToolCallId.get(candidate.toolCall.toolCallId);
-                        if (!decision) {
-                            loopLogger.log('auto-permission missing decision, falling back to prompt:', candidate.toolCall.toolCallId);
-                            yield* processEvent({
-                                runId,
-                                type: "tool-permission-request",
-                                toolCall: candidate.toolCall,
-                                permission: candidate.permission,
-                                subflow: [],
-                            });
-                            continue;
-                        }
-
-                        loopLogger.log(
-                            'emitting tool-permission-auto-decision, toolCallId:',
-                            candidate.toolCall.toolCallId,
-                            'decision:',
-                            decision.decision,
-                        );
-                        yield* processEvent({
-                            runId,
-                            type: "tool-permission-auto-decision",
-                            toolCallId: candidate.toolCall.toolCallId,
-                            toolCall: candidate.toolCall,
-                            permission: candidate.permission,
-                            decision: decision.decision,
-                            reason: decision.reason,
-                            subflow: [],
-                        });
-                        if (decision.decision === "deny") {
-                            loopLogger.log(
-                                'auto-permission denied, falling back to prompt:',
-                                candidate.toolCall.toolCallId,
-                            );
-                            yield* processEvent({
-                                runId,
-                                type: "tool-permission-request",
-                                toolCall: candidate.toolCall,
-                                permission: candidate.permission,
-                                subflow: [],
-                            });
-                        }
-                    }
-                } else {
-                    for (const candidate of permissionCandidates) {
-                        loopLogger.log('emitting tool-permission-request, toolCallId:', candidate.toolCall.toolCallId);
-                        yield* processEvent({
-                            runId,
-                            type: "tool-permission-request",
-                            toolCall: candidate.toolCall,
-                            permission: candidate.permission,
-                            subflow: [],
-                        });
-                    }
-                }
-            }
         }
     }
 }
@@ -1646,28 +1287,14 @@ async function* streamLlm(
 ): AsyncGenerator<z.infer<typeof LlmStepStreamEvent>, void, unknown> {
     const converted = convertFromMessages(messages);
     console.log(`! SENDING payload to model: `, JSON.stringify(converted))
-    const streamResult = analytics
-        ? withUseCase({
-            useCase: analytics.useCase,
-            ...(analytics.subUseCase ? { subUseCase: analytics.subUseCase } : {}),
-            ...(analytics.agentName ? { agentName: analytics.agentName } : {}),
-        }, () => streamText({
-            model,
-            messages: converted,
-            system: instructions,
-            tools,
-            stopWhen: stepCountIs(1),
-            abortSignal: signal,
-        }))
-        : streamText({
-            model,
-            messages: converted,
-            system: instructions,
-            tools,
-            stopWhen: stepCountIs(1),
-            abortSignal: signal,
-        });
-    const { fullStream } = streamResult;
+    const { fullStream } = streamText({
+        model,
+        messages: converted,
+        system: instructions,
+        tools,
+        stopWhen: stepCountIs(1),
+        abortSignal: signal,
+    });
     for await (const event of fullStream) {
         // Check abort on every chunk for responsiveness
         signal?.throwIfAborted();
diff --git a/apps/x/packages/core/src/agents/utils.ts b/apps/x/packages/core/src/agents/utils.ts
index cfc899d6..3e5f472e 100644
--- a/apps/x/packages/core/src/agents/utils.ts
+++ b/apps/x/packages/core/src/agents/utils.ts
@@ -32,7 +32,7 @@ export function getErrorDetails(error: unknown): string {
 
 /**
  * Extract the assistant's final text response from a run's log.
- * @param runId
+ * @param runId 
  * @returns The assistant's final text response or null if not found.
  */
 export async function extractAgentResponse(runId: string): Promise<string | null> {
diff --git a/apps/x/packages/core/src/analytics/posthog.ts b/apps/x/packages/core/src/analytics/posthog.ts
index d3d1e55c..156194d9 100644
--- a/apps/x/packages/core/src/analytics/posthog.ts
+++ b/apps/x/packages/core/src/analytics/posthog.ts
@@ -6,7 +6,6 @@ import { API_URL } from '../config/env.js';
 // In dev/tsc, fall back to process.env so local runs work too.
 const POSTHOG_KEY = process.env.POSTHOG_KEY ?? process.env.VITE_PUBLIC_POSTHOG_KEY ?? '';
 const POSTHOG_HOST = process.env.POSTHOG_HOST ?? process.env.VITE_PUBLIC_POSTHOG_HOST ?? 'https://us.i.posthog.com';
-const APP_VERSION = (process.env.ROWBOAT_APP_VERSION ?? process.env.npm_package_version ?? '').trim();
 
 let client: PostHog | null = null;
 let initAttempted = false;
@@ -30,7 +29,7 @@ function getClient(): PostHog | null {
     // distinguishes prod / staging / custom — meaning is assigned in PostHog).
     client.identify({
       distinctId: getInstallationId(),
-      properties: { api_url: API_URL, ...appVersionProperties() },
+      properties: { api_url: API_URL },
     });
   } catch (err) {
     console.error('[Analytics] Failed to init PostHog:', err);
@@ -43,10 +42,6 @@ function activeDistinctId(): string {
   return identifiedUserId ?? getInstallationId();
 }
 
-function appVersionProperties(): Record<string, string> {
-  return APP_VERSION ? { app_version: APP_VERSION } : {};
-}
-
 export function capture(event: string, properties?: Record<string, unknown>): void {
   const ph = getClient();
   if (!ph) return;
@@ -54,10 +49,7 @@ export function capture(event: string, properties?: Record<string, unknown>): vo
     ph.capture({
       distinctId: activeDistinctId(),
       event,
-      properties: {
-        ...properties,
-        ...appVersionProperties(),
-      },
+      properties,
     });
   } catch (err) {
     console.error('[Analytics] capture failed:', err);
@@ -76,7 +68,6 @@ export function identify(userId: string, properties?: Record<string, unknown>):
       properties: {
         ...properties,
         api_url: API_URL,
-        ...appVersionProperties(),
       },
     });
     identifiedUserId = userId;
diff --git a/apps/x/packages/core/src/analytics/use_case.ts b/apps/x/packages/core/src/analytics/use_case.ts
index a110dc19..8050c4ed 100644
--- a/apps/x/packages/core/src/analytics/use_case.ts
+++ b/apps/x/packages/core/src/analytics/use_case.ts
@@ -1,6 +1,6 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
 
-export type UseCase = 'copilot_chat' | 'live_note_agent' | 'background_task_agent' | 'meeting_note' | 'knowledge_sync';
+export type UseCase = 'copilot_chat' | 'live_note_agent' | 'meeting_note' | 'knowledge_sync';
 
 export interface UseCaseContext {
   useCase: UseCase;
diff --git a/apps/x/packages/core/src/application/assistant/instructions.ts b/apps/x/packages/core/src/application/assistant/instructions.ts
index b3611fe4..52e93f47 100644
--- a/apps/x/packages/core/src/application/assistant/instructions.ts
+++ b/apps/x/packages/core/src/application/assistant/instructions.ts
@@ -3,8 +3,6 @@ import { getRuntimeContext, getRuntimeContextPrompt } from "./runtime-context.js
 import { composioAccountsRepo } from "../../composio/repo.js";
 import { isConfigured as isComposioConfigured } from "../../composio/client.js";
 import { CURATED_TOOLKITS } from "@x/shared/dist/composio.js";
-import container from "../../di/container.js";
-import type { ICodeModeConfigRepo } from "../../code-mode/repo.js";
 
 const runtimeContextPrompt = getRuntimeContextPrompt(getRuntimeContext());
 
@@ -31,7 +29,7 @@ Load the \`composio-integration\` skill when the user asks to interact with any
 `;
 }
 
-function buildStaticInstructions(composioEnabled: boolean, catalog: string, codeModeEnabled: boolean = true): string {
+function buildStaticInstructions(composioEnabled: boolean, catalog: string): string {
     // Conditionally include Composio-related instruction sections
     const emailDraftSuffix = composioEnabled
         ? ` Do NOT load this skill for reading, fetching, or checking emails — use the \`composio-integration\` skill for that instead.`
@@ -82,19 +80,17 @@ ${thirdPartyBlock}**Meeting Prep:** When users ask you to prepare for a meeting,
 
 **Document Collaboration:** When users ask you to work on a document, collaborate on writing, create a new document, edit/refine existing notes, or say things like "let's work on [X]", "help me write [X]", "create a doc for [X]", or "let's draft [X]", you MUST load the \`doc-collab\` skill first. **This applies even for small one-off edits** — the skill carries the canonical *terse-and-scannable* writing style for the knowledge base, and that style applies whether you're authoring a fresh note or fixing a single section. Load it before writing anything into a note.
 
-${codeModeEnabled
-    ? `**Code with Agents:** When users ask you to write code, build a project, create a script, fix a bug, or do any software development task — **including simple things like "create a .c file" or "write a hello-world in Python"** — your FIRST action MUST be \`loadSkill('code-with-agents')\`. Do NOT reach for \`executeCommand\` (PowerShell / bash / shell) or any workspace file tool to do code work yourself before loading this skill. The skill decides whether to delegate to Claude Code / Codex (via acpx) or hand control back to you, and it presents the user a one-click choice when needed. Paths outside the Rowboat workspace root (e.g. \`G:/...\`, \`~/projects/...\`) are NORMAL for coding tasks — do NOT raise "outside workspace" concerns or fall back to your own tools.`
-    : `**Code with Agents (disabled):** Code mode is currently OFF in the user's settings. Do NOT load \`code-with-agents\` and do NOT call acpx. Handle coding requests yourself with your normal tools if you can. After answering, add a final line letting the user know they can delegate coding to Claude Code or Codex by enabling Code Mode in Settings → Code Mode.`}
+**Code with Agents:** When users ask you to write code, build a project, create a script, fix a bug, or do any software development task, load the \`code-with-agents\` skill first. It provides guidance for delegating coding work to Claude Code or Codex via acpx.
 
 **App Control:** When users ask you to open notes, show the bases or graph view, filter or search notes, or manage saved views, load the \`app-navigation\` skill first. It provides structured guidance for navigating the app UI and controlling the knowledge base view.
 
-**Background Tasks (Self-Running Work):** Rowboat can run *background tasks* — persistent instructions the agent fires on a schedule and/or in response to incoming emails / calendar events. A bg-task either maintains a snapshot in its \`index.md\` (digest, dashboard, rolling summary) or performs a recurring side-effect (send a Slack message, draft an email, post to a webhook, call an API). This is the flagship surface for *anything recurring*.
+**Live Notes (Self-Updating Knowledge):** A note's body can be agent-maintained — a *live* note refreshes on a schedule and/or reacts to incoming emails / calendar events to satisfy a single persistent **objective**. This is a flagship feature. **Listen for any signal that the user wants something to keep itself updated**, even when they don't use the words "live" or "track" — load the \`live-note\` skill the moment you spot one.
 
-*Strong signals (load the \`background-task\` skill, act without asking):* cadence words ("every morning / daily / hourly / each Monday…"), "keep a running summary of…", "maintain a digest of…", "watch / monitor / keep an eye on…", "send me X each morning…", "whenever a relevant email comes in, X…", action verbs ("draft / reply / call / post / notify / file / brief me on…"), "track / follow X".
+*Strong signals (load the skill, act without asking):* "every morning / daily / hourly…", "keep a running summary of…", "maintain a digest of…", "watch / monitor / keep an eye on…", "pin live updates of…", "track / follow X", "whenever a relevant email comes in…".
 
-*Medium signals (load the skill, answer the one-off, then offer):* one-off questions about decaying info ("what's the weather?", "top HN stories?"), "what's the latest on X / catch me up on X / any updates on X" about a person, company, project, or topic, recurring artifacts ("morning briefing", "weekly review", "Acme deal dashboard"). **Heuristic:** if you reach for \`web-search\` or a news tool to answer a recurring question, the answer is the kind of thing a bg-task would refresh on a schedule.
+*Medium signals (load the skill, answer the one-off question, then offer to keep it updated):* one-off questions about decaying info ("what's the weather?", "top HN stories?", "USD/INR right now?", "service X status?"), **"what's the latest [news/update/situation] on X" / "what's happening with X" / "any updates on X" / "catch me up on X"** about a person, company, project, or topic, note-anchored snapshots ("show me my schedule here", "put my open tasks here"), or recurring artifacts ("morning briefing", "weekly review", "Acme deal dashboard"). **Heuristic for the catch-all case:** if you reach for \`web-search\` or a news tool to answer a topic-following question, the answer is exactly the kind of thing a live note would refresh on a schedule — load the skill and offer at the end.
 
-**Live Notes:** If the user explicitly says "live note" or "live-note", load the \`live-note\` skill. Otherwise, do not propose live notes — prefer the \`background-task\` skill for anything recurring.
+A live note is a single \`live:\` block in a note's frontmatter — one objective, plus an optional \`triggers\` object (\`cronExpr\` / \`windows\` / \`eventMatchCriteria\`, each independently optional). Users manage live notes in the **Live Note panel** (Radio icon at the top-right of the editor). **If the note is already live**, extend its existing \`objective\` in natural language to absorb the new ask — never create a second objective. When you make a passive note live (or extend an objective), tell the user where to manage it.
 **Browser Control:** When users ask you to open a website, browse in-app, search the web in the embedded browser, or interact with a live webpage inside Rowboat, load the \`browser-control\` skill first. It explains the \`read-page -> indexed action -> refreshed page\` workflow for the browser pane.
 
 **Notifications:** When you need to send a desktop notification — completion alert after a long task, time-sensitive update, or a clickable result that lands the user on a specific note/view — load the \`notify-user\` skill first. It documents the \`notify-user\` tool and the \`rowboat://\` deep links you can attach to it.
@@ -144,39 +140,39 @@ Users can interact with the knowledge graph through you, open it directly in Obs
 **CRITICAL PATH REQUIREMENT:**
 - The workspace root is the configured workdir
 - The knowledge base is in the \`knowledge/\` subfolder
-- When searching knowledge, ALWAYS include \`knowledge/\` in the search path
-- **WRONG:** \`file-grep({ pattern: "John", searchPath: "" })\` or \`searchPath: "."\` or any absolute path to the workspace root
-- **CORRECT:** \`file-grep({ pattern: "John", searchPath: "knowledge/" })\`
+- When using workspace tools, ALWAYS include \`knowledge/\` in the path
+- **WRONG:** \`workspace-grep({ pattern: "John", path: "" })\` or \`path: "."\` or any absolute path to the workspace root
+- **CORRECT:** \`workspace-grep({ pattern: "John", path: "knowledge/" })\`
 
-Use the builtin file tools to search and read the knowledge base:
+Use the builtin workspace tools to search and read the knowledge base:
 
 **Finding notes:**
 \`\`\`
 # List all people notes
-file-list("knowledge/People")
+workspace-readdir("knowledge/People")
 
 # Search for a person by name - MUST include knowledge/ in path
-file-grep({ pattern: "Sarah Chen", searchPath: "knowledge/" })
+workspace-grep({ pattern: "Sarah Chen", path: "knowledge/" })
 
 # Find notes mentioning a company - MUST include knowledge/ in path
-file-grep({ pattern: "Acme Corp", searchPath: "knowledge/" })
+workspace-grep({ pattern: "Acme Corp", path: "knowledge/" })
 \`\`\`
 
 **Reading notes:**
 \`\`\`
 # Read a specific person's note
-file-readText("knowledge/People/Sarah Chen.md")
+workspace-readFile("knowledge/People/Sarah Chen.md")
 
 # Read an organization note
-file-readText("knowledge/Organizations/Acme Corp.md")
+workspace-readFile("knowledge/Organizations/Acme Corp.md")
 \`\`\`
 
 **When a user mentions someone by name:**
-1. First, search for them: \`file-grep({ pattern: "John", searchPath: "knowledge/" })\`
-2. Read their note to get full context: \`file-readText("knowledge/People/John Smith.md")\`
+1. First, search for them: \`workspace-grep({ pattern: "John", path: "knowledge/" })\`
+2. Read their note to get full context: \`workspace-readFile("knowledge/People/John Smith.md")\`
 3. Use the context (role, organization, past interactions, commitments) in your response
 
-**NEVER use an empty search path or root path for knowledge lookup. ALWAYS set searchPath to \`knowledge/\` or a subfolder like \`knowledge/People/\`.**
+**NEVER use an empty path or root path. ALWAYS set path to \`knowledge/\` or a subfolder like \`knowledge/People/\`.**
 
 ## When to Access the Knowledge Graph
 
@@ -241,23 +237,29 @@ ${toolPriority}
 
 ${runtimeContextPrompt}
 
-## File Access & Scope
-- Use builtin file tools (\`file-readText\`, \`file-writeText\`, \`file-editText\`, etc.) for normal file work anywhere on the user's machine.
-- Relative paths resolve against the Rowboat workspace root. Use paths like \`knowledge/People/Ada.md\` for knowledge files.
-- Use absolute paths or \`~/...\` paths when the user refers to Desktop, Downloads, Documents, the injected work directory, or any other location outside the Rowboat workspace.
-- File operations inside the Rowboat workspace normally run without approval. File operations outside the workspace may trigger a permission prompt; this is expected.
-- Do NOT use \`executeCommand\` just to read, write, edit, list, search, move, copy, or remove files. Use file tools and let the permission system handle access.
-- Do NOT read binary files as text. Use \`parseFile\` or \`LLMParse\` for PDFs, Office docs, images, scanned docs, presentations, and other non-text formats.
-- Do NOT access files outside the workspace unless the user explicitly asks you to or the current task clearly requires it.
+## Workspace Access & Scope
+- **Inside the workspace root:** Use builtin workspace tools (\`workspace-readFile\`, \`workspace-writeFile\`, etc.). These don't require security approval.
+- **Outside the workspace root (Desktop, Downloads, Documents, etc.):** Use \`executeCommand\` to run shell commands.
+- **IMPORTANT:** Do NOT access files outside the workspace root unless the user explicitly asks you to (e.g., "organize my Desktop", "find a file in Downloads").
+
+**CRITICAL - When the user asks you to work with files outside the workspace root:**
+- Follow the detected runtime platform above for shell syntax and filesystem path style.
+- On macOS/Linux, use POSIX-style commands and paths (e.g., \`~/Desktop\`, \`~/Downloads\`, \`open\` on macOS).
+- On Windows, use cmd-compatible commands and Windows paths (e.g., \`C:\\Users\\<name>\\Desktop\`).
+- You CAN access the user's full filesystem via \`executeCommand\` - there is no sandbox restriction on paths.
+- NEVER say "I can only run commands inside the workspace root" or "I don't have access to your Desktop" - just use \`executeCommand\`.
+- NEVER offer commands for the user to run manually - run them yourself with \`executeCommand\`.
+- NEVER say "I'll run shell commands equivalent to..." - just describe what you'll do in plain language (e.g., "I'll move 12 screenshots to a new Screenshots folder").
+- NEVER ask what OS the user is on if runtime platform is already available.
 - Load the \`organize-files\` skill for guidance on file organization tasks.
 
 ## Builtin Tools vs Shell Commands
 
-**IMPORTANT**: Rowboat provides builtin tools:
-- \`file-readText\`, \`file-writeText\`, \`file-editText\`, \`file-remove\` - File operations
-- \`file-list\`, \`file-exists\`, \`file-stat\`, \`file-glob\`, \`file-grep\` - Directory exploration and file search
-- \`file-mkdir\`, \`file-rename\`, \`file-copy\` - File/directory management
-- \`parseFile\` - Parse and extract text from files (PDF, Excel, CSV, Word .docx). Accepts absolute, ~/..., or relative paths — no need to copy files into the workspace first. Best for well-structured digital documents.
+**IMPORTANT**: Rowboat provides builtin tools that are internal and do NOT require any user approval:
+- \`workspace-readFile\`, \`workspace-writeFile\`, \`workspace-edit\`, \`workspace-remove\` - File operations
+- \`workspace-readdir\`, \`workspace-exists\`, \`workspace-stat\`, \`workspace-glob\`, \`workspace-grep\` - Directory exploration and file search
+- \`workspace-mkdir\`, \`workspace-rename\`, \`workspace-copy\` - File/directory management
+- \`parseFile\` - Parse and extract text from files (PDF, Excel, CSV, Word .docx). Accepts absolute paths or workspace-relative paths — no need to copy files into the workspace first. Best for well-structured digital documents.
 - \`LLMParse\` - Send a file to the configured LLM as a multimodal attachment to extract content as markdown. Use this instead of \`parseFile\` for scanned PDFs, images with text, complex layouts, presentations, or any format where local parsing falls short. Supports documents and images.
 - \`analyzeAgent\` - Agent analysis
 - \`addMcpServer\`, \`listMcpServers\`, \`listMcpTools\`, \`executeMcpTool\` - MCP server management and execution
@@ -268,21 +270,23 @@ ${slackToolsLine}- \`web-search\` - Search the web. Returns rich results with fu
 - \`save-to-memory\` - Save observations about the user to the agent memory system. Use this proactively during conversations.
 ${composioToolsLine}
 
-**Prefer these tools whenever possible.** For file operations anywhere on the machine, use file tools instead of \`executeCommand\`.
+**Prefer these tools whenever possible** — they work instantly with zero friction. For file operations inside the workspace root, always use these instead of \`executeCommand\`.
 
 **Shell commands via \`executeCommand\`:**
-- You can run shell commands via \`executeCommand\`. Some commands are pre-approved in \`config/security.json\` within the workspace root and run immediately.
+- You can run ANY shell command via \`executeCommand\`. Some commands are pre-approved in \`config/security.json\` within the workspace root and run immediately.
 - Commands not on the pre-approved list will trigger a one-time approval prompt for the user — this is fine and expected, just a minor friction. Do NOT let this stop you from running commands you need.
 - **Never say "I can't run this command"** or ask the user to run something manually. Just call \`executeCommand\` and let the approval flow handle it.
 - When calling \`executeCommand\`, do NOT provide the \`cwd\` parameter unless absolutely necessary. The default working directory is already set to the workspace root.
-- Always confirm with the user before executing commands that modify files outside the workspace root. Prefer file tools for file changes.
+- Always confirm with the user before executing commands that modify files outside the workspace root (e.g., "I'll move 12 screenshots to ~/Desktop/Screenshots. Proceed?").
 
 **CRITICAL: MCP Server Configuration**
 - ALWAYS use the \`addMcpServer\` builtin tool to add or update MCP servers—it validates the configuration before saving
-- NEVER manually edit \`config/mcp.json\` using \`file-writeText\` for MCP servers
+- NEVER manually edit \`config/mcp.json\` using \`workspace-writeFile\` for MCP servers
 - Invalid MCP configs will prevent the agent from starting with validation errors
 
-File tools and \`executeCommand\` can both go through the approval flow depending on the path or command. If you need to delete a file, use \`file-remove\`, not \`executeCommand\` with \`rm\`. If you need to create a file, use \`file-writeText\`, not \`executeCommand\` with \`touch\` or \`echo >\`.
+**Only \`executeCommand\` (shell/bash commands) goes through the approval flow.** If you need to delete a file, use the \`workspace-remove\` builtin tool, not \`executeCommand\` with \`rm\`. If you need to create a file, use \`workspace-writeFile\`, not \`executeCommand\` with \`touch\` or \`echo >\`.
+
+Rowboat's internal builtin tools never require approval — only shell commands via \`executeCommand\` do.
 
 ## File Path References
 
@@ -316,29 +320,30 @@ Never output raw file paths in plain text when they could be wrapped in a filepa
 /** Keep backward-compatible export for any external consumers */
 export const CopilotInstructions = buildStaticInstructions(true, skillCatalog);
 
+/**
+ * Cached Composio instructions. Invalidated by calling invalidateCopilotInstructionsCache().
+ */
 let cachedInstructions: string | null = null;
 
+/**
+ * Invalidate the cached instructions so the next buildCopilotInstructions() call
+ * regenerates the Composio section. Call this after connecting/disconnecting a toolkit.
+ */
 export function invalidateCopilotInstructionsCache(): void {
     cachedInstructions = null;
 }
 
+/**
+ * Build full copilot instructions with dynamic Composio tools section.
+ * Results are cached and reused until invalidated via invalidateCopilotInstructionsCache().
+ */
 export async function buildCopilotInstructions(): Promise<string> {
     if (cachedInstructions !== null) return cachedInstructions;
     const composioEnabled = await isComposioConfigured();
-    let codeModeEnabled = false;
-    try {
-        const repo = container.resolve<ICodeModeConfigRepo>('codeModeConfigRepo');
-        codeModeEnabled = (await repo.getConfig()).enabled;
-    } catch {
-        // repo unavailable — default to disabled
-    }
-    const excludeIds: string[] = [];
-    if (!composioEnabled) excludeIds.push('composio-integration');
-    if (!codeModeEnabled) excludeIds.push('code-with-agents');
-    const catalog = excludeIds.length > 0
-        ? buildSkillCatalog({ excludeIds })
-        : skillCatalog;
-    const baseInstructions = buildStaticInstructions(composioEnabled, catalog, codeModeEnabled);
+    const catalog = composioEnabled
+        ? skillCatalog
+        : buildSkillCatalog({ excludeIds: ['composio-integration'] });
+    const baseInstructions = buildStaticInstructions(composioEnabled, catalog);
     const composioPrompt = await getComposioToolsPrompt();
     cachedInstructions = composioPrompt
         ? baseInstructions + '\n' + composioPrompt
diff --git a/apps/x/packages/core/src/application/assistant/skills/app-navigation/skill.ts b/apps/x/packages/core/src/application/assistant/skills/app-navigation/skill.ts
index 98956d30..9dbbce84 100644
--- a/apps/x/packages/core/src/application/assistant/skills/app-navigation/skill.ts
+++ b/apps/x/packages/core/src/application/assistant/skills/app-navigation/skill.ts
@@ -14,7 +14,7 @@ Open a specific knowledge file in the editor pane.
 - ` + "`path`" + `: Full workspace-relative path (e.g., ` + "`knowledge/People/John Smith.md`" + `)
 
 **Tips:**
-- Use ` + "`file-grep`" + ` first to find the exact path if you're unsure of the filename.
+- Use ` + "`workspace-grep`" + ` first to find the exact path if you're unsure of the filename.
 - Always pass the full ` + "`knowledge/...`" + ` path, not just the filename.
 
 ### open-view
diff --git a/apps/x/packages/core/src/application/assistant/skills/background-task/skill.ts b/apps/x/packages/core/src/application/assistant/skills/background-task/skill.ts
deleted file mode 100644
index 7ebbd985..00000000
--- a/apps/x/packages/core/src/application/assistant/skills/background-task/skill.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-import { z } from 'zod';
-import { stringify as stringifyYaml } from 'yaml';
-import { BackgroundTaskSchema } from '@x/shared/dist/background-task.js';
-
-const schemaYaml = stringifyYaml(z.toJSONSchema(BackgroundTaskSchema)).trimEnd();
-
-export const skill = String.raw`
-# Background Tasks Skill
-
-A *background task* is a persistent agent the user configures once and the framework keeps firing — on a schedule, inside time-of-day windows, and/or in response to matching incoming events (Gmail threads, calendar changes). Each task lives at \`bg-tasks/<slug>/\` and owns two artifacts:
-
-- \`task.yaml\` — the spec (the user's **instructions**, triggers, runtime state). You and the user both treat this as the source of truth.
-- \`index.md\` — the agent-owned body. The runtime never writes here; the bg-task agent does, each run.
-
-A task is one of two shapes — the agent decides per run from the verbs in \`instructions\`:
-
-| Mode | Trigger verbs | Behavior |
-|---|---|---|
-| **OUTPUT** | "maintain / show / summarize / track / digest" | Rewrite \`index.md\` to reflect the current state. |
-| **ACTION** | "send / draft / post / notify / file / reply / call" | Perform the action, then append a one-line journal entry under \`## Journal\` in \`index.md\`. |
-
-Mixed instructions ("summarize and email it") trigger both.
-
-## Tools you'll use (and ones you WON'T)
-
-You have three dedicated builtin tools for this skill:
-
-- \`create-background-task\` — materializes a new task on disk. **Use this. Do not write \`task.yaml\` yourself with \`file-editText\`, and do not search the codebase for IPC channels like \`bg-task:create\`** — they're renderer-side and not callable from here.
-- \`patch-background-task\` — updates an existing task (instructions / triggers / active / model). Use this for the extend-don't-fork case.
-- \`run-background-task-agent\` — manually fires a task to run now. Always call this immediately after \`create-background-task\` so the user sees content.
-
-To inspect what tasks already exist, use \`file-glob\` on \`bg-tasks/*/task.yaml\` and \`file-readText\` on candidates. The user's bg-tasks folder is workspace-relative.
-
-## Mode: act-first
-
-Bg-task creation is **action-first**. Don't ask "should I?" — read the request, pick a name, call \`create-background-task\`, then call \`run-background-task-agent\` with the returned slug. Confirm in one line past-tense at the end. Tell the user the surface name: "Manage it from Background tasks in the sidebar."
-
-The only exception: if a related bg-task already exists, **extend its instructions** via \`patch-background-task\` rather than creating a duplicate (see "Extend, don't fork").
-
-## When you're loaded
-
-The host's trigger paragraph loads this skill on:
-
-- **Cadence**: "every morning", "daily", "hourly", "each Monday"
-- **Watch/monitor**: "watch / monitor / keep an eye on / track / follow X"
-- **Recurring artifact**: "morning briefing", "weekly review", "Acme deal dashboard"
-- **Event-conditional**: "whenever a relevant email comes in, …"
-- **Action verbs**: "draft / reply / call / post / notify / file / brief me on"
-- **Decay questions**: "what's the weather", "top HN stories", "latest on X" — answer the one-off, then offer
-
-If the user explicitly says "live note" / "live-note", the host loads the \`live-note\` skill instead — don't try to handle that case here.
-
-## Workflow
-
-1. **Check for existing tasks.** Before creating, glob \`bg-tasks/*/task.yaml\` and read any candidates whose intent might overlap with the user's ask. If a related task exists, jump to "Extend, don't fork" below.
-
-2. **Pick a name.** Use a short, friendly title in title-case: "Morning weather", "Q3 deal digest", "HN top stories". The framework slugifies it (lowercase, dashes) for the folder — you don't manage the slug.
-
-3. **Write the instructions.** Capture the user's intent in their own words, with concrete verbs. Bake any specifics (which source, which audience, output shape) into the instructions — the agent re-reads them on every run.
-
-   - Good: *"Summarize my unread emails since yesterday 6pm into a one-paragraph digest plus a bulleted list of action items. Skip newsletters and automated notifications."*
-   - Bad: *"Daily email summary."* (vague — agent will improvise unhelpfully)
-
-4. **Pick triggers.** All three are independently optional; mix freely.
-
-   - \`cronExpr\` — exact times. \`"0 7 * * *"\` = 7am daily.
-   - \`windows\` — time-of-day bands. Each fires once per day inside the band, anywhere — forgiving when the app was offline.
-   - \`eventMatchCriteria\` — a natural-language description of which incoming events should wake the task (e.g. "Emails about Q3 OKRs from the leadership team"). Pass-1 routing matches; the agent does Pass-2 before acting.
-
-   No triggers at all = manual-only. The user clicks Run.
-
-5. **Call \`create-background-task\`.** Required: \`name\`, \`instructions\`. Optional: \`triggers\`, \`model\`, \`provider\` (leave model/provider unset unless the user explicitly asked). The tool returns a slug.
-
-6. **Call \`run-background-task-agent\`** with the slug. The agent runs once and populates \`index.md\`.
-
-7. **Confirm.** One line. Name the task. Point at the sidebar. Done.
-
-## Extend, don't fork
-
-When the user's new ask overlaps with an existing task — e.g. they say "also include X" or the ask is a refinement of an existing task's intent — call \`patch-background-task\` instead of creating a duplicate.
-
-Signals that you should extend:
-- The user says "also …" / "and on top of that …" / "while you're at it …"
-- The new ask is a refinement of an existing task's intent (different threshold, additional source, slightly different output)
-
-When extending, pass the full rewritten \`instructions\` — don't try to surgical-edit a single sentence. The agent rereads instructions every run, so a clean rewrite is fine. After \`patch-background-task\` returns, call \`run-background-task-agent\` on the same slug so the user sees the updated output.
-
-## Worked examples
-
-### OUTPUT — morning briefing
-
-User: *"Every morning at 7, give me a one-paragraph summary of overnight news in AI agents."*
-
-1. \`create-background-task\` with:
-   - \`name\`: "AI agent overnight news"
-   - \`instructions\`: "Search the web and Hacker News for news about AI agents (autonomous LLM agents, agentic frameworks, agent benchmarks) published in the last 24 hours. Summarize the top developments in one paragraph (3-5 sentences) followed by a 3-5 item bulleted list of the most significant items with a single-sentence note each. Replace the body of index.md."
-   - \`triggers\`: { \`cronExpr\`: "0 7 * * *" }
-2. \`run-background-task-agent\` slug=ai-agent-overnight-news.
-3. "Done — created the **AI agent overnight news** task. It'll run every morning at 7 and you can find it in Background tasks in the sidebar."
-
-### ACTION — email auto-reply
-
-User: *"Whenever I get an email about Q3 planning, draft a reply asking when they're free this week."*
-
-1. \`create-background-task\` with:
-   - \`name\`: "Q3 email auto-reply drafts"
-   - \`instructions\`: "When an event arrives describing an email thread about Q3 planning, use the Gmail draft-create tool to draft a reply to the latest message asking the sender when they're free for a 30-minute call this week. Do not send the draft — leave it in Drafts for me to review. After drafting, append a journal entry to index.md noting the thread subject and the draft id."
-   - \`triggers\`: { \`eventMatchCriteria\`: "Emails about Q3 planning (roadmap, OKRs, headcount, exec priorities)" }
-2. \`run-background-task-agent\` slug=q3-email-auto-reply-drafts.
-3. "Done — created the **Q3 email auto-reply drafts** task. It'll fire on relevant Gmail threads. Manage it from Background tasks in the sidebar."
-
-### ACTION + journal — Slack watcher
-
-User: *"Every weekday morning at 9, post a summary of unresolved high-priority issues to #engineering on Slack."*
-
-1. \`create-background-task\` with:
-   - \`name\`: "Daily eng triage"
-   - \`instructions\`: "Each run, query <issue tracker> for unresolved issues labeled priority:high or above. Summarize counts by owner and the three oldest items. Send the summary to #engineering via the Slack tool. After sending, append a journal entry to index.md with the timestamp and the message id."
-   - \`triggers\`: { \`cronExpr\`: "0 9 * * 1-5" }
-2. \`run-background-task-agent\` slug=daily-eng-triage.
-
-## Canonical Schema
-
-\`\`\`yaml
-${schemaYaml}
-\`\`\`
-
-Notes:
-- \`active\` defaults to true. Patch \`{ active: false }\` to pause without deleting.
-- \`createdAt\` and \`lastRun\` are runtime-managed — never write them yourself.
-- The \`triggers\` block reuses Live Notes' \`Triggers\` schema verbatim. Cron grace and 5-minute backoff semantics are identical.
-
-## Exceptions
-
-The \`Background tasks\` sidebar view has a "New task" button that opens a form-driven flow. If the user is editing fields there or asking about a specific task from that view, *you* are not the right surface — the form is. Point at it ("You can also do this from the New task button in the Background tasks view") and step aside.
-`;
-
-export default skill;
diff --git a/apps/x/packages/core/src/application/assistant/skills/builtin-tools/skill.ts b/apps/x/packages/core/src/application/assistant/skills/builtin-tools/skill.ts
index ec9c4847..4187584e 100644
--- a/apps/x/packages/core/src/application/assistant/skills/builtin-tools/skill.ts
+++ b/apps/x/packages/core/src/application/assistant/skills/builtin-tools/skill.ts
@@ -158,26 +158,26 @@ Pass the paper URL to the summariser. Don't ask for human input.
 
 ## Additional Builtin Tools
 
-While \`executeCommand\` is useful for CLI tools and shell workflows, builtin file tools exist for normal file management. Use \`file-*\` tools for reading, writing, editing, listing, searching, moving, copying, and removing files instead of shell commands.
+While \`executeCommand\` is the most versatile, other builtin tools exist for specific Rowboat operations (file management, agent inspection, etc.). These are primarily used by the Rowboat copilot itself and are not typically needed in user agents. If you need file operations, consider using bash commands like \`cat\`, \`echo\`, \`tee\`, etc. through \`executeCommand\`.
 
 ### Copilot-Specific Builtin Tools
 
-The Rowboat copilot has access to special builtin tools that regular agents don't typically use. These tools help the copilot assist users with file management, app workflows, and MCP integration:
+The Rowboat copilot has access to special builtin tools that regular agents don't typically use. These tools help the copilot assist users with workspace management and MCP integration:
 
 #### File & Directory Operations
-- \`file-list\` - List directory contents (supports recursive exploration)
-- \`file-readText\` - Read file contents
-- \`file-writeText\` - Create or update file contents
-- \`file-editText\` - Make precise edits by replacing specific text (safer than full rewrites)
-- \`file-remove\` - Remove files or directories
-- \`file-exists\` - Check if a file or directory exists
-- \`file-stat\` - Get file/directory statistics
-- \`file-mkdir\` - Create directories
-- \`file-rename\` - Rename or move files/directories
-- \`file-copy\` - Copy files
-- \`file-getRoot\` - Get the default root for relative file paths
-- \`file-glob\` - Find files matching a glob pattern (e.g., "**/*.ts", "agents/*.md")
-- \`file-grep\` - Search file contents using regex, returns matching files and lines
+- \`workspace-readdir\` - List directory contents (supports recursive exploration)
+- \`workspace-readFile\` - Read file contents
+- \`workspace-writeFile\` - Create or update file contents
+- \`workspace-edit\` - Make precise edits by replacing specific text (safer than full rewrites)
+- \`workspace-remove\` - Remove files or directories
+- \`workspace-exists\` - Check if a file or directory exists
+- \`workspace-stat\` - Get file/directory statistics
+- \`workspace-mkdir\` - Create directories
+- \`workspace-rename\` - Rename or move files/directories
+- \`workspace-copy\` - Copy files
+- \`workspace-getRoot\` - Get workspace root directory path
+- \`workspace-glob\` - Find files matching a glob pattern (e.g., "**/*.ts", "agents/*.md")
+- \`workspace-grep\` - Search file contents using regex, returns matching files and lines
 
 #### Agent Operations
 - \`analyzeAgent\` - Read and analyze an agent file structure
diff --git a/apps/x/packages/core/src/application/assistant/skills/code-with-agents/skill.ts b/apps/x/packages/core/src/application/assistant/skills/code-with-agents/skill.ts
index d9f15dd8..c2879228 100644
--- a/apps/x/packages/core/src/application/assistant/skills/code-with-agents/skill.ts
+++ b/apps/x/packages/core/src/application/assistant/skills/code-with-agents/skill.ts
@@ -1,98 +1,90 @@
 export const skill = String.raw`
 # Code with Agents Skill
 
-Use this skill whenever the user asks you to write code, build a project, create scripts, fix bugs, read/explain code, or do any software development task — even simple file creations like "make a .c file".
+Use this skill when the user asks you to write code, build a project, create scripts, fix bugs, or do any software development task that should be delegated to a coding agent (Claude Code or Codex).
 
-Coding agents operate on **arbitrary file paths** (including paths outside the Rowboat workspace root, like \`G:/4th sem/CN\` or \`~/projects/foo\`). Do NOT raise "outside workspace" concerns, and do NOT fall back to your own \`executeCommand\` (PowerShell / bash) or workspace file tools to do code work yourself.
+## Important: delegate ALL coding work
 
-All coding work runs through the **\`code_agent_run\`** tool. It launches the selected on-device coding agent (Claude Code / Codex), streams its tool calls, file diffs, and plan into the chat, and surfaces any action needing approval as an inline permission card. One persistent session is kept per chat, so follow-up requests resume with full context automatically.
+Once the user has chosen to use Claude Code or Codex, you MUST delegate ALL code-related tasks to the coding agent. This includes:
+- Writing, editing, or refactoring code
+- Reading, summarizing, or explaining code
+- Debugging and fixing bugs
+- Running tests or build commands
+- Exploring project structure
+- Any other task that involves interacting with a codebase
 
----
+Do NOT attempt to do any of these yourself — no reading files, no running commands, no writing code. You are the coordinator; the coding agent does the work. Your job is to translate the user's request into a clear prompt and pass it to the agent.
 
-## STEP 1 — MANDATORY FIRST ACTION
+## Prerequisites
 
-Look in your **system context** for a section titled **"# Code Mode (Active)"**.
+The user must have one of the following installed on their machine:
+- **Claude Code** — https://claude.ai/code
+- **Codex** — https://codex.openai.com
 
-### Case A — "# Code Mode (Active)" IS present
+These are external tools that you cannot install for the user.
 
-Code mode is on and the user has selected an agent. Skip directly to Step 2. Do NOT call ask-human.
+## Workflow
 
-### Case B — "# Code Mode (Active)" is NOT present
+### Step 1: Gather requirements
 
-Your **very next tool call MUST be \`ask-human\`** with options. Do not write any explanation text first. Do not describe a plan. Do not check the workspace boundary. Just call:
+Before running anything, confirm the following with the user:
 
-\`\`\`
-ask-human({
-  question: "How should I handle this coding request?",
-  options: [
-    "Use code mode (Claude Code)",
-    "Use code mode (Codex)",
-    "Continue with default Rowboat"
-  ]
-})
-\`\`\`
+1. **Working directory** — Ask which folder the code should be written in, unless the user has already specified it. Example: "Which folder should I work in?"
+2. **Agent choice** — Ask whether to use **Claude Code** or **Codex**. Mention that the chosen agent must already be installed on their machine.
 
-This is non-negotiable. The user gets clickable buttons. Free-text "which agent?" questions are forbidden here.
+### Step 2: Confirm execution plan
 
-**Branch on the response:**
-- "Use code mode (Claude Code)" → proceed to Step 2 with agent = \`claude\`.
-- "Use code mode (Codex)" → proceed to Step 2 with agent = \`codex\`.
-- "Continue with default Rowboat" → ABANDON this skill. Handle the request yourself using your own tools (workspace file tools, \`executeCommand\` shell, etc.). The rest of this skill does not apply for this turn.
+Once you know the folder and agent, tell the user:
 
----
+> I'll use [Claude Code / Codex] to [description of the task] in \`[folder]\`. Permission requests from the coding agent itself (file writes, command execution, etc.) will be automatically approved once it starts. Wait for the user's confirmation before you execute anything.
 
-## STEP 2 — Resolve workdir, then run
+### Step 3: Execute with acpx
 
-**Resolve the workdir** (in this priority order):
-1. A path the user named in their original message (e.g. \`G:/4th sem/CN\`).
-2. The path from a "# User Work Directory" block in your context.
-3. Ask once in plain text: "Which folder should I work in?"
+Use the \`executeCommand\` tool to run the coding agent via acpx. The command format is:
 
-**Pick the agent** (\`claude\` or \`codex\`): use the agent from the "# Code Mode (Active)" block (the composer chip) / the Step 1 choice. The chip is authoritative — do NOT carry over a different agent from earlier in this thread, and do NOT switch on an in-chat text request ("use codex"); tell the user to toggle the chip instead.
+**For Claude Code:**
+` + "`" + `
+npx acpx@latest --approve-all --cwd <folder> claude exec "<prompt>"
+` + "`" + `
 
-**State your intent in one line, then call the tool immediately — do NOT wait for a "yes".** The tool's own permission cards are the user's confirmation, so an extra in-chat "reply yes to proceed" is redundant friction. Say something like:
+**For Codex:**
+` + "`" + `
+npx acpx@latest --approve-all --cwd <folder> codex exec "<prompt>"
+` + "`" + `
 
-> Using [Claude Code / Codex] to [task description] in \`[folder]\`.
+### Critical: flag order
 
-…and then immediately call:
+The \`--approve-all\` and \`--cwd\` flags are global flags and MUST come before the agent name (\`claude\` or \`codex\`). This is the correct order:
 
-\`\`\`
-code_agent_run({
-  agent: "<claude|codex>",
-  cwd: "<resolved absolute folder>",
-  prompt: "<clear, self-contained coding instruction>"
-})
-\`\`\`
+` + "`" + `
+npx acpx@latest [global flags] <agent> exec "<prompt>"
+` + "`" + `
 
-**Writing good prompts for the agent:**
-- Be specific: file names, function signatures, expected behavior.
-- Mention constraints (language, framework, style).
-- Expand short user requests into clear, actionable instructions.
+**Correct:**
+` + "`" + `
+npx acpx@latest --approve-all --cwd ~/projects/myapp claude exec "fix the bug"
+` + "`" + `
 
-**Follow-ups:** for every later coding request in this chat, just call \`code_agent_run\` again with the same \`cwd\` and the chip's current agent. The session resumes automatically — do NOT start over or re-explain prior context.
+**Wrong (will fail):**
+` + "`" + `
+npx acpx@latest claude --approve-all exec "fix the bug"
+` + "`" + `
 
----
+### Writing good prompts
 
-## STEP 3 — Report results
+When constructing the prompt for the coding agent:
+- Be specific and detailed about what to build or fix
+- Include file names, function signatures, and expected behavior
+- Mention any constraints (language, framework, style)
+- If the user gave you a short request, expand it into a clear, actionable prompt for the agent
 
-After \`code_agent_run\` returns:
-- Pass through the agent's \`summary\` as-is. Do not rewrite it.
-- Refer to file paths as plain text. Do NOT use \`\`\`file:path\`\`\` reference blocks. (This overrides the global "always wrap paths in filepath blocks" rule — for code-mode output, plain text.)
-- Only add your own explanation if it failed:
-  - \`success: false\` with a message — surface the message. If it mentions the agent isn't installed or signed in, tell the user to install or sign in via **Settings → Code Mode**.
-  - \`stopReason: "cancelled"\` — the run was stopped; acknowledge briefly and ask if they want to continue.
+### Step 4: Report results
 
----
+After the command finishes, look for the summary that the coding agent produced at the end of its output and pass that along to the user as-is. Do not rewrite or add to it. Only add your own explanation if the command failed or the exit code is non-zero.
 
-## Once delegating: delegate fully
+Do NOT use file reference blocks (e.g. \`\`\`file:path/to/file\`\`\`) when mentioning code files — they may not open correctly. Just refer to file paths as plain text.
 
-After Step 2 fires, delegate ALL related coding tasks for this turn to \`code_agent_run\` — writing, editing, reading, debugging, exploring structure, running tests. You are the coordinator; the agent does the work.
-
-## Prerequisites (informational)
-
-The user must have one of these installed locally — these are external tools you cannot install:
-- Claude Code — https://claude.ai/code
-- Codex — https://codex.openai.com
+- If the exit code is 5, it means permissions were denied — this should not happen with \`--approve-all\`, but if it does, let the user know
 `;
 
 export default skill;
diff --git a/apps/x/packages/core/src/application/assistant/skills/create-presentations/skill.ts b/apps/x/packages/core/src/application/assistant/skills/create-presentations/skill.ts
index 5c0529b1..f3dd4d03 100644
--- a/apps/x/packages/core/src/application/assistant/skills/create-presentations/skill.ts
+++ b/apps/x/packages/core/src/application/assistant/skills/create-presentations/skill.ts
@@ -78,19 +78,19 @@ Map each point to a slide layout from the Available Layout Types below. For a ty
 
 ## Workflow
 
-1. Use file-readText to check knowledge/ for relevant context about the company, product, team, etc.
+1. Use workspace-readFile to check knowledge/ for relevant context about the company, product, team, etc.
 2. Ensure Playwright is installed: \`npm install playwright && npx playwright install chromium\`
-3. Use file-getRoot to get the workspace root path.
+3. Use workspace-getRoot to get the workspace root path.
 4. Plan the narrative arc and slide outline (see Content Planning above).
-5. Use file-writeText to create the HTML file at tmp/presentation.html (workspace-relative) with slides (1280x720px each).
+5. Use workspace-writeFile to create the HTML file at tmp/presentation.html (workspace-relative) with slides (1280x720px each).
 6. **Perform the Post-Generation Validation (see below). Fix any issues before proceeding.**
-7. Use file-writeText to create the conversion script at tmp/convert.js (workspace-relative) — see Playwright Export section.
+7. Use workspace-writeFile to create the conversion script at tmp/convert.js (workspace-relative) — see Playwright Export section.
 8. Run it: \`node <WORKSPACE_ROOT>/tmp/convert.js\`
 9. Tell the user: "Your presentation is ready at ~/Desktop/presentation.pdf" and note the theme used.
 
 **Critical**: Never show HTML code to the user. Never ask the user to run commands, install packages, or make technical decisions. The entire pipeline from content to PDF must be invisible to the user.
 
-Use file-writeText and file-readText for ALL file operations. Do NOT use executeCommand to write or read files.
+Use workspace-writeFile and workspace-readFile for ALL file operations. Do NOT use executeCommand to write or read files.
 
 ## Post-Generation Validation (REQUIRED)
 
@@ -142,14 +142,14 @@ html { -webkit-print-color-adjust: exact !important; print-color-adjust: exact !
 ## Playwright Export
 
 \`\`\`javascript
-// save as tmp/convert.js via file-writeText
+// save as tmp/convert.js via workspace-writeFile
 const { chromium } = require('playwright');
 const path = require('path');
 
 (async () => {
   const browser = await chromium.launch();
   const page = await browser.newPage();
-  // Replace <WORKSPACE_ROOT> with the actual absolute path from file-getRoot
+  // Replace <WORKSPACE_ROOT> with the actual absolute path from workspace-getRoot
   await page.goto('file://<WORKSPACE_ROOT>/tmp/presentation.html', { waitUntil: 'networkidle' });
   await page.pdf({
     path: path.join(process.env.HOME, 'Desktop', 'presentation.pdf'),
@@ -162,7 +162,7 @@ const path = require('path');
 })();
 \`\`\`
 
-Replace \`<WORKSPACE_ROOT>\` with the actual absolute path returned by file-getRoot.
+Replace \`<WORKSPACE_ROOT>\` with the actual absolute path returned by workspace-getRoot.
 
 ## Available Layout Types (35 Templates)
 
diff --git a/apps/x/packages/core/src/application/assistant/skills/doc-collab/skill.ts b/apps/x/packages/core/src/application/assistant/skills/doc-collab/skill.ts
index 76eb404f..798fef65 100644
--- a/apps/x/packages/core/src/application/assistant/skills/doc-collab/skill.ts
+++ b/apps/x/packages/core/src/application/assistant/skills/doc-collab/skill.ts
@@ -22,7 +22,7 @@ You are an expert document assistant helping the user create, edit, and refine d
 
 ## CRITICAL: Re-read Before Every Response
 
-**Before every response, you MUST use file-readText to re-read the current document.** The user may have edited the file manually outside of this conversation. Always work with the latest version of the file, never rely on a cached or previous version.
+**Before every response, you MUST use workspace-readFile to re-read the current document.** The user may have edited the file manually outside of this conversation. Always work with the latest version of the file, never rely on a cached or previous version.
 
 ## Core Principles
 
@@ -55,12 +55,12 @@ When the user mentions a document name, search for it using multiple approaches:
 
 1. **Search by name pattern** (handles partial matches, different cases):
 \`\`\`
-file-glob({ pattern: "**/*[name]*", cwd: "knowledge/" })
+workspace-glob({ pattern: "knowledge/**/*[name]*", path: "knowledge/" })
 \`\`\`
 
 2. **Search by content** (finds docs that mention the topic):
 \`\`\`
-file-grep({ pattern: "[name]", searchPath: "knowledge/" })
+workspace-grep({ pattern: "[name]", path: "knowledge/" })
 \`\`\`
 
 3. **Try common variations:**
@@ -106,7 +106,7 @@ workspace-createFile({
 **Types of requests:**
 
 1. **Direct edits** - "Change the title to X", "Add a bullet point about Y", "Remove the pricing section"
-   → Make the edit immediately using file-editText
+   → Make the edit immediately using workspace-editFile
 
 2. **Content generation** - "Write an intro", "Draft the executive summary", "Add a section about our approach"
    → Generate the content and add it to the document
@@ -122,21 +122,21 @@ workspace-createFile({
 
 ### Step 3: Execute Changes
 
-**For edits, use file-editText:**
+**For edits, use workspace-editFile:**
 \`\`\`
-file-editText({
+workspace-editFile({
   path: "knowledge/[path].md",
-  oldString: "[exact text to replace]",
-  newString: "[new text]"
+  old_string: "[exact text to replace]",
+  new_string: "[new text]"
 })
 \`\`\`
 
 **For additions at the end:**
 \`\`\`
-file-editText({
+workspace-editFile({
   path: "knowledge/[path].md",
-  oldString: "[last line or section]",
-  newString: "[last line or section]\n\n[new content]"
+  old_string: "[last line or section]",
+  new_string: "[last line or section]\n\n[new content]"
 })
 \`\`\`
 
@@ -156,14 +156,14 @@ When the user mentions people, companies, or projects:
 
 **Search for relevant notes:**
 \`\`\`
-file-grep({ pattern: "[Name]", searchPath: "knowledge/" })
+workspace-grep({ pattern: "[Name]", path: "knowledge/" })
 \`\`\`
 
 **Read relevant notes:**
 \`\`\`
-file-readText("knowledge/People/[Person].md")
-file-readText("knowledge/Organizations/[Company].md")
-file-readText("knowledge/Projects/[Project].md")
+workspace-readFile("knowledge/People/[Person].md")
+workspace-readFile("knowledge/Organizations/[Company].md")
+workspace-readFile("knowledge/Projects/[Project].md")
 \`\`\`
 
 **Use the context:**
@@ -237,7 +237,7 @@ Renders a styled table from structured data.
 
 ### Block Guidelines
 - The JSON must be valid and on a single line (no pretty-printing)
-- Insert blocks using \`file-editText\` just like any other content
+- Insert blocks using \`workspace-editFile\` just like any other content
 - When the user asks for a chart, table, embed, or live dashboard — use blocks rather than plain Markdown tables or image links
 - When editing a note that already contains blocks, preserve them unless the user asks to change them
 - For local dashboards and mini apps, put the site files in \`sites/<slug>/\` and point an \`iframe\` block at \`http://localhost:3210/sites/<slug>/\`
diff --git a/apps/x/packages/core/src/application/assistant/skills/draft-emails/skill.ts b/apps/x/packages/core/src/application/assistant/skills/draft-emails/skill.ts
index 3a413ff6..208e9560 100644
--- a/apps/x/packages/core/src/application/assistant/skills/draft-emails/skill.ts
+++ b/apps/x/packages/core/src/application/assistant/skills/draft-emails/skill.ts
@@ -16,11 +16,11 @@ When the user says "draft an email to Monica" or mentions ANY person, organizati
 1. **STOP** - Do not draft anything yet
 2. **SEARCH** - Look them up in the knowledge base (path MUST be \`knowledge/\`):
    \`\`\`
-   file-grep({ pattern: "Monica", searchPath: "knowledge/" })
+   workspace-grep({ pattern: "Monica", path: "knowledge/" })
    \`\`\`
 3. **READ** - Read their note to understand who they are:
    \`\`\`
-   file-readText("knowledge/People/Monica Smith.md")
+   workspace-readFile("knowledge/People/Monica Smith.md")
    \`\`\`
 4. **UNDERSTAND** - Extract their role, organization, relationship history, past interactions, open items
 5. **THEN DRAFT** - Only now draft the email, using this context
@@ -133,19 +133,19 @@ Before drafting, gather relevant context. **Always check the knowledge base firs
 First, search for the sender and any mentioned entities (path MUST be \`knowledge/\`):
 \`\`\`
 # Search for the sender by name or email
-file-grep({ pattern: "sender_name_or_email", searchPath: "knowledge/" })
+workspace-grep({ pattern: "sender_name_or_email", path: "knowledge/" })
 
 # List all people to find potential matches
-file-list("knowledge/People")
+workspace-readdir("knowledge/People")
 \`\`\`
 
 Then read the relevant notes:
 \`\`\`
 # Read the sender's note
-file-readText("knowledge/People/Sender Name.md")
+workspace-readFile("knowledge/People/Sender Name.md")
 
 # Read their organization's note
-file-readText("knowledge/Organizations/Company Name.md")
+workspace-readFile("knowledge/Organizations/Company Name.md")
 \`\`\`
 
 Extract from these notes:
diff --git a/apps/x/packages/core/src/application/assistant/skills/index.ts b/apps/x/packages/core/src/application/assistant/skills/index.ts
index a06c153b..3e5aec21 100644
--- a/apps/x/packages/core/src/application/assistant/skills/index.ts
+++ b/apps/x/packages/core/src/application/assistant/skills/index.ts
@@ -14,7 +14,6 @@ import browserControlSkill from "./browser-control/skill.js";
 import codeWithAgentsSkill from "./code-with-agents/skill.js";
 import composioIntegrationSkill from "./composio-integration/skill.js";
 import liveNoteSkill from "./live-note/skill.js";
-import backgroundTaskSkill from "./background-task/skill.js";
 import notifyUserSkill from "./notify-user/skill.js";
 
 const CURRENT_DIR = path.dirname(fileURLToPath(import.meta.url));
@@ -99,19 +98,13 @@ const definitions: SkillDefinition[] = [
   {
     id: "code-with-agents",
     title: "Code with Agents",
-    summary: "Write code, build projects, create scripts, or fix bugs by delegating to Claude Code or Codex.",
+    summary: "Write code, build projects, create scripts, or fix bugs by delegating to Claude Code or Codex via acpx.",
     content: codeWithAgentsSkill,
   },
-  {
-    id: "background-task",
-    title: "Background Tasks",
-    summary: "Set up a recurring background task — persistent instructions the agent fires on a schedule and/or on matching events (Gmail, Calendar). Either maintains an `index.md` digest (OUTPUT mode) or performs a recurring side-effect like drafting a reply / posting to Slack / calling an API (ACTION mode). Flagship surface for anything recurring.",
-    content: backgroundTaskSkill,
-  },
   {
     id: "live-note",
     title: "Live Notes",
-    summary: "Make a specific markdown note self-updating — a single `live:` objective in the frontmatter that the live-note agent maintains on a schedule or on incoming events. Load only when the user explicitly says 'live note' / 'live-note'; for anything else recurring, prefer the background-task skill.",
+    summary: "Make notes self-updating — a single `live:` objective in the frontmatter that the live-note agent maintains on a schedule, on incoming events, or manually (weather, news, prices, status, dashboards).",
     content: liveNoteSkill,
   },
   {
diff --git a/apps/x/packages/core/src/application/assistant/skills/live-note/skill.ts b/apps/x/packages/core/src/application/assistant/skills/live-note/skill.ts
index 5dc96e1a..715c049d 100644
--- a/apps/x/packages/core/src/application/assistant/skills/live-note/skill.ts
+++ b/apps/x/packages/core/src/application/assistant/skills/live-note/skill.ts
@@ -34,7 +34,7 @@ When this skill is loaded, your job is: make a passive note live (or extend the
 
 ## Mode: act-first (non-negotiable on strong signals)
 
-Live-note creation and editing are **action-first**. Strong-signal asks (see below) get *executed*, not discussed. Read the file, write the \`live:\` block via \`file-editText\`, run the agent once, and confirm in one line at the end. Past tense, not future tense.
+Live-note creation and editing are **action-first**. Strong-signal asks (see below) get *executed*, not discussed. Read the file, write the \`live:\` block via \`workspace-edit\`, run the agent once, and confirm in one line at the end. Past tense, not future tense.
 
 What you must NOT do on a strong-signal ask:
 - Don't ask "Should I make edits directly, or show changes first for approval?" — that prompt belongs to generic doc editing, not live notes.
@@ -77,7 +77,7 @@ When a strong signal lands without a specific note attached, pick the folder by
 
 **Filename**: derive from the topic in title-case (\`News Feed.md\`, \`Coinbase News.md\`, \`SFO Weather.md\`).
 
-**Before creating**: \`file-grep\` and \`file-glob\` the chosen folder for an existing note that already covers the topic. If one exists with a \`live:\` block, **extend its objective** (see "Already-live notes — extend, don't fork"). If one exists without a \`live:\` block, **make that note live** (don't create a duplicate). Only create a new file when no match is found.
+**Before creating**: \`workspace-grep\` and \`workspace-glob\` the chosen folder for an existing note that already covers the topic. If one exists with a \`live:\` block, **extend its objective** (see "Already-live notes — extend, don't fork"). If one exists without a \`live:\` block, **make that note live** (don't create a duplicate). Only create a new file when no match is found.
 
 ### Default cadence picker (when the user didn't specify timing)
 
@@ -165,8 +165,8 @@ When skipping a re-run (because the user said not to or "later"):
 **User:** "i want to set up a news feed to track news for India and the world."
 
 **Right behaviour** (one turn):
-1. \`file-grep({ pattern: "News Feed", searchPath: "knowledge/Notes/" })\` — search for an existing match.
-2. \`file-grep({ pattern: "news", searchPath: "knowledge/Notes/" })\` — broader search to catch variants.
+1. \`workspace-grep({ pattern: "News Feed", path: "knowledge/Notes/" })\` — search for an existing match.
+2. \`workspace-grep({ pattern: "news", path: "knowledge/Notes/" })\` — broader search to catch variants.
 3. No match found → create \`knowledge/Notes/News Feed.md\` with a sensible \`live:\` block (objective covering India + world headlines, a windows trigger for "every morning"-style refresh, plus an \`eventMatchCriteria\` if news might come from synced data).
 4. Call \`run-live-note-agent\` with a backfill \`context\` so the body isn't empty.
 5. Reply: "Done — created \`knowledge/Notes/News Feed.md\` and made it live, refreshing every morning. Running it once now so you see content right away. Manage it from the Live notes view."
@@ -314,7 +314,7 @@ The agent always receives a \`**Trigger:**\` line in its run message telling it
 - \`Scheduled refresh — fired inside the configured window\` — forgiving once-per-day baseline refresh.
 - \`Event match — Pass 1 routing flagged this note\` — comes with the event payload and a Pass 2 decision directive.
 
-**When to branch in the objective:** there's a meaningful difference between the work to do on a *baseline* refresh (cron/window — pull a full snapshot from local data) and a *reactive* update (event — integrate one new signal). For example, an email digest can scan \`gmail_sync/\` for everything worth attention on a window run, then integrate one incoming thread on an event run without re-listing previously-seen threads. Same objective, two branches.
+**When to branch in the objective:** there's a meaningful difference between the work to do on a *baseline* refresh (cron/window — pull a full snapshot from local data) and a *reactive* update (event — integrate one new signal). The flagship case is the **Today.md emails section**: on a window run it scans \`gmail_sync/\` for everything worth attention; on an event run with an incoming email payload it integrates that one thread into the existing digest without re-listing previously-seen threads. Same objective, two branches.
 
 How to write it — use plain conditional language inside the objective:
 
@@ -460,16 +460,16 @@ live:
 
 ### Making a passive note live (no \`live:\` block yet)
 
-1. \`file-readText({ path })\` — re-read fresh.
+1. \`workspace-readFile({ path })\` — re-read fresh.
 2. Inspect existing frontmatter (the ` + "`" + `---` + "`" + `-fenced block at the top, if any).
-3. \`file-editText\`:
+3. \`workspace-edit\`:
    - **If the note has frontmatter without a \`live:\` block**: anchor on the closing \`---\` of the frontmatter and insert the \`live:\` block just before it.
    - **If the note has no frontmatter at all**: anchor on the very first line of the file. Replace it with a new frontmatter block (\`---\\n\` ... \`\\n---\\n\` followed by the original first line).
 
 ### Extending an already-live note
 
-1. \`file-readText({ path })\` — fetch the current \`live.objective\`.
-2. Edit the \`objective\` value via \`file-editText\` to absorb the new ask in natural language. Keep the \`|\` block scalar style.
+1. \`workspace-readFile({ path })\` — fetch the current \`live.objective\`.
+2. Edit the \`objective\` value via \`workspace-edit\` to absorb the new ask in natural language. Keep the \`|\` block scalar style.
 3. Don't touch other \`live:\` fields unless the user explicitly asked (e.g. "also run this hourly" → add/edit \`triggers.cronExpr\`).
 
 ### Sidebar chat with a specific note
@@ -606,17 +606,17 @@ The tool returns ` + "`" + `{ success, runId, action, summary, contentAfter, err
 - **Don't add \`triggers\`** if the user explicitly wants manual-only.
 - **Don't write** \`lastRunAt\`, \`lastRunId\`, or \`lastRunSummary\` — runtime-managed.
 - **Don't schedule** with ` + "`" + `"* * * * *"` + "`" + ` (every minute) unless the user explicitly asks.
-- **Don't use \`file-writeText\`** to rewrite the whole file — always \`file-editText\` with a unique anchor.
+- **Don't use \`workspace-writeFile\`** to rewrite the whole file — always \`workspace-edit\` with a unique anchor.
 
 ## Editing or Removing an Existing Live Note
 
-**Change the objective:** \`file-editText\` the \`objective\` value (use \`|\` block scalar).
+**Change the objective:** \`workspace-edit\` the \`objective\` value (use \`|\` block scalar).
 
-**Change triggers:** \`file-editText\` the relevant sub-field of the \`triggers\` object.
+**Change triggers:** \`workspace-edit\` the relevant sub-field of the \`triggers\` object.
 
 **Pause without removing:** flip \`active: false\`.
 
-**Make passive (remove the \`live:\` block):** \`file-editText\` with \`oldString\` = the entire \`live:\` block (from the \`live:\` line down to the next top-level key or the closing \`---\`), \`newString\` = empty. The note body is left alone — if you want to clear leftover agent output, do that as a separate edit.
+**Make passive (remove the \`live:\` block):** \`workspace-edit\` with \`oldString\` = the entire \`live:\` block (from the \`live:\` line down to the next top-level key or the closing \`---\`), \`newString\` = empty. The note body is left alone — if you want to clear leftover agent output, do that as a separate edit.
 
 ## Quick Reference
 
diff --git a/apps/x/packages/core/src/application/assistant/skills/mcp-integration/skill.ts b/apps/x/packages/core/src/application/assistant/skills/mcp-integration/skill.ts
index 6b012de0..cdebbfdd 100644
--- a/apps/x/packages/core/src/application/assistant/skills/mcp-integration/skill.ts
+++ b/apps/x/packages/core/src/application/assistant/skills/mcp-integration/skill.ts
@@ -38,7 +38,7 @@ export const skill = String.raw`
 
 **ALWAYS use the \`addMcpServer\` builtin tool** to add or update MCP server configurations. This tool validates the configuration before saving and prevents startup errors.
 
-**NEVER manually create or edit \`config/mcp.json\`** using \`file-writeText\` for MCP servers—this bypasses validation and will cause errors.
+**NEVER manually create or edit \`config/mcp.json\`** using \`workspace-writeFile\` for MCP servers—this bypasses validation and will cause errors.
 
 ### MCP Server Configuration Schema
 
diff --git a/apps/x/packages/core/src/application/assistant/skills/meeting-prep/skill.ts b/apps/x/packages/core/src/application/assistant/skills/meeting-prep/skill.ts
index 93dfd350..44453637 100644
--- a/apps/x/packages/core/src/application/assistant/skills/meeting-prep/skill.ts
+++ b/apps/x/packages/core/src/application/assistant/skills/meeting-prep/skill.ts
@@ -16,12 +16,12 @@ When the user asks to prep for a meeting or mentions attendees:
 1. **STOP** - Do not create a generic brief
 2. **SEARCH** - Look up each attendee in the knowledge base:
    \`\`\`
-   file-grep({ pattern: "Attendee Name", searchPath: "knowledge/" })
+   workspace-grep({ pattern: "Attendee Name", path: "knowledge/" })
    \`\`\`
 3. **READ** - Read their notes to understand who they are:
    \`\`\`
-   file-readText("knowledge/People/Attendee Name.md")
-   file-readText("knowledge/Organizations/Their Company.md")
+   workspace-readFile("knowledge/People/Attendee Name.md")
+   workspace-readFile("knowledge/Organizations/Their Company.md")
    \`\`\`
 4. **UNDERSTAND** - Extract their role, organization, relationship history, past interactions, open items
 5. **THEN BRIEF** - Only now create the meeting brief, using this context
@@ -68,13 +68,13 @@ For each attendee, search the knowledge base (path MUST be \`knowledge/\`):
 
 **Search People notes:**
 \`\`\`
-file-grep({ pattern: "attendee_name", searchPath: "knowledge/People/" })
-file-grep({ pattern: "attendee_email", searchPath: "knowledge/People/" })
+workspace-grep({ pattern: "attendee_name", path: "knowledge/People/" })
+workspace-grep({ pattern: "attendee_email", path: "knowledge/People/" })
 \`\`\`
 
 If a person note exists, read it:
 \`\`\`
-file-readText("knowledge/People/Attendee Name.md")
+workspace-readFile("knowledge/People/Attendee Name.md")
 \`\`\`
 
 Extract:
@@ -86,13 +86,13 @@ Extract:
 
 **Search Organization notes:**
 \`\`\`
-file-grep({ pattern: "company_name", searchPath: "knowledge/Organizations/" })
+workspace-grep({ pattern: "company_name", path: "knowledge/Organizations/" })
 \`\`\`
 
 **Search Projects:**
 \`\`\`
-file-grep({ pattern: "attendee_name", searchPath: "knowledge/Projects/" })
-file-grep({ pattern: "company_name", searchPath: "knowledge/Projects/" })
+workspace-grep({ pattern: "attendee_name", path: "knowledge/Projects/" })
+workspace-grep({ pattern: "company_name", path: "knowledge/Projects/" })
 \`\`\`
 
 ### Step 4: Create Meeting Brief
diff --git a/apps/x/packages/core/src/application/assistant/skills/notify-user/skill.ts b/apps/x/packages/core/src/application/assistant/skills/notify-user/skill.ts
index 22cb1dcc..3863b152 100644
--- a/apps/x/packages/core/src/application/assistant/skills/notify-user/skill.ts
+++ b/apps/x/packages/core/src/application/assistant/skills/notify-user/skill.ts
@@ -58,7 +58,7 @@ Use these as the \`link\` parameter to land the user on a specific view in Rowbo
 | Background task view | \`rowboat://open?type=task&name=<task-name>\` | \`rowboat://open?type=task&name=daily-brief\` |
 | Suggested topics | \`rowboat://open?type=suggested-topics\` | — |
 
-The \`type=file\` path is workspace-relative (the same path you'd pass to \`file-readText\`).
+The \`type=file\` path is workspace-relative (the same path you'd pass to \`workspace-readFile\`).
 
 ## Anti-patterns
 - **Don't notify per step** of a multi-step task. Notify on completion, not on progress.
diff --git a/apps/x/packages/core/src/application/lib/builtin-tools.ts b/apps/x/packages/core/src/application/lib/builtin-tools.ts
index 08e8334f..b0d9b773 100644
--- a/apps/x/packages/core/src/application/lib/builtin-tools.ts
+++ b/apps/x/packages/core/src/application/lib/builtin-tools.ts
@@ -1,56 +1,30 @@
 import { z, ZodType } from "zod";
 import * as path from "path";
 import * as fs from "fs/promises";
+import { createReadStream } from "fs";
+import { createInterface } from "readline";
+import { execSync } from "child_process";
+import { glob } from "glob";
 import { executeCommand, executeCommandAbortable } from "./command-executor.js";
 import { resolveSkill, availableSkills } from "../assistant/skills/index.js";
 import { executeTool, listServers, listTools } from "../../mcp/mcp.js";
 import container from "../../di/container.js";
 import { IMcpConfigRepo } from "../..//mcp/repo.js";
 import { McpServerDefinition } from "@x/shared/dist/mcp.js";
-import * as files from "../../filesystem/files.js";
+import * as workspace from "../../workspace/workspace.js";
 import { IAgentsRepo } from "../../agents/repo.js";
 import { WorkDir } from "../../config/config.js";
 import { composioAccountsRepo } from "../../composio/repo.js";
 import { executeAction as executeComposioAction, isConfigured as isComposioConfigured, searchTools as searchComposioTools } from "../../composio/client.js";
 import { CURATED_TOOLKITS, CURATED_TOOLKIT_SLUGS } from "@x/shared/dist/composio.js";
 import { BrowserControlInputSchema, type BrowserControlInput } from "@x/shared/dist/browser-control.js";
-import { BackgroundTaskSchema, TriggersSchema } from "@x/shared/dist/background-task.js";
-import type { CodeModeManager } from "../../code-mode/acp/manager.js";
-import type { CodePermissionRegistry } from "../../code-mode/acp/permission-registry.js";
-import { ICodeModeConfigRepo } from "../../code-mode/repo.js";
-import type { ApprovalPolicy } from "@x/shared/dist/code-mode.js";
-
-// Inputs for the bg-task builtin tools. Reuse the canonical schema field
-// descriptions; only `triggers` gets a tighter contextual override (the
-// shared TriggersSchema description is written from the live-note perspective).
-const CreateBackgroundTaskInput = BackgroundTaskSchema.pick({
-    name: true,
-    instructions: true,
-    triggers: true,
-    model: true,
-    provider: true,
-}).extend({
-    triggers: TriggersSchema.optional().describe('All three sub-fields (cronExpr, windows, eventMatchCriteria) are independently optional — mix freely. No triggers at all = manual-only (user clicks Run).'),
-});
-
-const PatchBackgroundTaskInput = BackgroundTaskSchema.pick({
-    name: true,
-    instructions: true,
-    active: true,
-    triggers: true,
-    model: true,
-    provider: true,
-}).partial().extend({
-    slug: z.string().describe('The slug of the task to update (the folder name under bg-tasks/).'),
-    triggers: TriggersSchema.optional().describe('Replace the triggers object. To remove all triggers (make manual-only) pass an empty object.'),
-});
 import { ensureLoaded as ensureBrowserSkillsLoaded, readSkillContent as readBrowserSkillContent, refreshFromRemote as refreshBrowserSkills } from "../browser-skills/index.js";
 import type { ToolContext } from "./exec-tool.js";
 import { generateText } from "ai";
 import { createProvider } from "../../models/models.js";
 import { getDefaultModelAndProvider, resolveProviderConfig } from "../../models/defaults.js";
 import { captureLlmUsage } from "../../analytics/usage.js";
-import { getCurrentUseCase, withUseCase } from "../../analytics/use_case.js";
+import { getCurrentUseCase } from "../../analytics/use_case.js";
 import { isSignedIn } from "../../account/account.js";
 import { getAccessToken } from "../../auth/tokens.js";
 import { API_URL } from "../../config/env.js";
@@ -93,7 +67,6 @@ const LLMPARSE_MIME_TYPES: Record<string, string> = {
     '.tiff': 'image/tiff',
 };
 
-
 export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
     loadSkill: {
         description: "Load a Rowboat skill definition into context by fetching its guidance string",
@@ -119,12 +92,12 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
         },
     },
 
-    'file-getRoot': {
-        description: 'Get the default root directory for relative file paths. Relative paths passed to file tools resolve against this directory.',
+    'workspace-getRoot': {
+        description: 'Get the workspace root directory path',
         inputSchema: z.object({}),
         execute: async () => {
             try {
-                return { root: WorkDir };
+                return await workspace.getRoot();
             } catch (error) {
                 return {
                     error: error instanceof Error ? error.message : 'Unknown error',
@@ -133,14 +106,14 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
         },
     },
 
-    'file-exists': {
-        description: 'Check if a file or directory exists. Accepts absolute paths, ~/ paths, or paths relative to the default root.',
+    'workspace-exists': {
+        description: 'Check if a file or directory exists in the workspace',
         inputSchema: z.object({
-            path: z.string().min(1).describe('File or directory path to check'),
+            path: z.string().min(1).describe('Workspace-relative path to check'),
         }),
-        execute: async ({ path: filePath }: { path: string }) => {
+        execute: async ({ path: relPath }: { path: string }) => {
             try {
-                return await files.exists(filePath);
+                return await workspace.exists(relPath);
             } catch (error) {
                 return {
                     error: error instanceof Error ? error.message : 'Unknown error',
@@ -149,14 +122,14 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
         },
     },
 
-    'file-stat': {
+    'workspace-stat': {
         description: 'Get file or directory statistics (size, modification time, etc.)',
         inputSchema: z.object({
-            path: z.string().min(1).describe('File or directory path to stat'),
+            path: z.string().min(1).describe('Workspace-relative path to stat'),
         }),
-        execute: async ({ path: filePath }: { path: string }) => {
+        execute: async ({ path: relPath }: { path: string }) => {
             try {
-                return await files.stat(filePath);
+                return await workspace.stat(relPath);
             } catch (error) {
                 return {
                     error: error instanceof Error ? error.message : 'Unknown error',
@@ -165,22 +138,22 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
         },
     },
 
-    'file-list': {
+    'workspace-readdir': {
         description: 'List directory contents. Can recursively explore directory structure with options.',
         inputSchema: z.object({
-            path: z.string().describe('Directory path to list. Use "." for the default root.'),
+            path: z.string().describe('Workspace-relative directory path (empty string for root)'),
             recursive: z.boolean().optional().describe('Recursively list all subdirectories (default: false)'),
             includeStats: z.boolean().optional().describe('Include file stats like size and modification time (default: false)'),
             includeHidden: z.boolean().optional().describe('Include hidden files starting with . (default: false)'),
             allowedExtensions: z.array(z.string()).optional().describe('Filter by file extensions (e.g., [".json", ".ts"])'),
         }),
-        execute: async ({
-            path: filePath,
-            recursive,
-            includeStats,
-            includeHidden,
-            allowedExtensions
-        }: {
+        execute: async ({ 
+            path: relPath, 
+            recursive, 
+            includeStats, 
+            includeHidden, 
+            allowedExtensions 
+        }: { 
             path: string;
             recursive?: boolean;
             includeStats?: boolean;
@@ -188,12 +161,13 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
             allowedExtensions?: string[];
         }) => {
             try {
-                return await files.list(filePath || '.', {
+                const entries = await workspace.readdir(relPath || '', {
                     recursive,
                     includeStats,
                     includeHidden,
                     allowedExtensions,
                 });
+                return entries;
             } catch (error) {
                 return {
                     error: error instanceof Error ? error.message : 'Unknown error',
@@ -202,24 +176,120 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
         },
     },
 
-    'file-readText': {
-        description: 'Read a UTF-8 text file. Returns content with each line prefixed by its 1-indexed line number (e.g. `12: some text`). Use `offset` and `limit` to page through large files; defaults read up to 2000 lines starting at line 1. Output is wrapped in `<path>`, `<resolvedPath>`, `<type>`, `<content>` tags and ends with a footer indicating whether the read reached end-of-file or was truncated. Line numbers are display-only — do NOT include them when later writing or editing the file. Refuses binary files; use parseFile or LLMParse for documents, PDFs, images, and other non-text formats.',
+    'workspace-readFile': {
+        description: 'Read a file from the workspace. For text files (utf8, the default), returns the content with each line prefixed by its 1-indexed line number (e.g. `12: some text`). Use the `offset` and `limit` parameters to page through large files; defaults read up to 2000 lines starting at line 1. Output is wrapped in `<path>`, `<type>`, `<content>` tags and ends with a footer indicating whether the read reached end-of-file or was truncated. Line numbers in the output are display-only — do NOT include them when later writing or editing the file. For `base64` / `binary` encodings, returns the raw bytes as a string and ignores `offset` / `limit`.',
         inputSchema: z.object({
-            path: z.string().min(1).describe('Text file path to read'),
-            offset: z.coerce.number().int().min(1).optional().describe('1-indexed line to start reading from (default: 1).'),
-            limit: z.coerce.number().int().min(1).optional().describe('Maximum number of lines to read (default: 2000).'),
+            path: z.string().min(1).describe('Workspace-relative file path'),
+            offset: z.coerce.number().int().min(1).optional().describe('1-indexed line to start reading from (default: 1). Utf8 only.'),
+            limit: z.coerce.number().int().min(1).optional().describe('Maximum number of lines to read (default: 2000). Utf8 only.'),
+            encoding: z.enum(['utf8', 'base64', 'binary']).optional().describe('File encoding (default: utf8)'),
         }),
         execute: async ({
-            path: filePath,
+            path: relPath,
             offset,
             limit,
+            encoding = 'utf8',
         }: {
             path: string;
             offset?: number;
             limit?: number;
+            encoding?: 'utf8' | 'base64' | 'binary';
         }) => {
             try {
-                return await files.readText(filePath, offset, limit);
+                if (encoding !== 'utf8') {
+                    return await workspace.readFile(relPath, encoding);
+                }
+
+                const DEFAULT_READ_LIMIT = 2000;
+                const MAX_LINE_LENGTH = 2000;
+                const MAX_LINE_SUFFIX = `... (line truncated to ${MAX_LINE_LENGTH} chars)`;
+                const MAX_BYTES = 50 * 1024;
+                const MAX_BYTES_LABEL = `${MAX_BYTES / 1024} KB`;
+
+                const absPath = workspace.resolveWorkspacePath(relPath);
+                const stats = await fs.lstat(absPath);
+                const stat = workspace.statToSchema(stats, 'file');
+                const etag = workspace.computeEtag(stats.size, stats.mtimeMs);
+
+                const effectiveOffset = offset ?? 1;
+                const effectiveLimit = limit ?? DEFAULT_READ_LIMIT;
+                const start = effectiveOffset - 1;
+
+                const stream = createReadStream(absPath, { encoding: 'utf8' });
+                const rl = createInterface({ input: stream, crlfDelay: Infinity });
+
+                const collected: string[] = [];
+                let totalLines = 0;
+                let bytes = 0;
+                let truncatedByBytes = false;
+                let hasMoreLines = false;
+
+                try {
+                    for await (const text of rl) {
+                        totalLines += 1;
+                        if (totalLines <= start) continue;
+
+                        if (collected.length >= effectiveLimit) {
+                            hasMoreLines = true;
+                            continue;
+                        }
+
+                        const line = text.length > MAX_LINE_LENGTH
+                            ? text.substring(0, MAX_LINE_LENGTH) + MAX_LINE_SUFFIX
+                            : text;
+                        const size = Buffer.byteLength(line, 'utf-8') + (collected.length > 0 ? 1 : 0);
+                        if (bytes + size > MAX_BYTES) {
+                            truncatedByBytes = true;
+                            hasMoreLines = true;
+                            break;
+                        }
+
+                        collected.push(line);
+                        bytes += size;
+                    }
+                } finally {
+                    rl.close();
+                    stream.destroy();
+                }
+
+                if (totalLines < effectiveOffset && !(totalLines === 0 && effectiveOffset === 1)) {
+                    return { error: `Offset ${effectiveOffset} is out of range for this file (${totalLines} lines)` };
+                }
+
+                const prefixed = collected.map((line, index) => `${index + effectiveOffset}: ${line}`);
+                const lastReadLine = effectiveOffset + collected.length - 1;
+                const nextOffset = lastReadLine + 1;
+
+                let footer: string;
+                if (truncatedByBytes) {
+                    footer = `(Output capped at ${MAX_BYTES_LABEL}. Showing lines ${effectiveOffset}-${lastReadLine}. Use offset=${nextOffset} to continue.)`;
+                } else if (hasMoreLines) {
+                    footer = `(Showing lines ${effectiveOffset}-${lastReadLine} of ${totalLines}. Use offset=${nextOffset} to continue.)`;
+                } else {
+                    footer = `(End of file - total ${totalLines} lines)`;
+                }
+
+                const content = [
+                    `<path>${relPath}</path>`,
+                    `<type>file</type>`,
+                    `<content>`,
+                    prefixed.join('\n'),
+                    '',
+                    footer,
+                    `</content>`,
+                ].join('\n');
+
+                return {
+                    path: relPath,
+                    encoding: 'utf8' as const,
+                    content,
+                    stat,
+                    etag,
+                    offset: effectiveOffset,
+                    limit: effectiveLimit,
+                    totalLines,
+                    hasMore: hasMoreLines || truncatedByBytes,
+                };
             } catch (error) {
                 return {
                     error: error instanceof Error ? error.message : 'Unknown error',
@@ -228,30 +298,34 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
         },
     },
 
-    'file-writeText': {
-        description: 'Write or update UTF-8 text file contents. Automatically creates parent directories and supports atomic writes.',
+    'workspace-writeFile': {
+        description: 'Write or update file contents in the workspace. Automatically creates parent directories and supports atomic writes.',
         inputSchema: z.object({
-            path: z.string().min(1).describe('Text file path to write'),
-            data: z.string().describe('UTF-8 text content to write'),
+            path: z.string().min(1).describe('Workspace-relative file path'),
+            data: z.string().describe('File content to write'),
+            encoding: z.enum(['utf8', 'base64', 'binary']).optional().describe('Data encoding (default: utf8)'),
             atomic: z.boolean().optional().describe('Use atomic write (default: true)'),
             mkdirp: z.boolean().optional().describe('Create parent directories if needed (default: true)'),
             expectedEtag: z.string().optional().describe('ETag to check for concurrent modifications (conflict detection)'),
         }),
         execute: async ({
-            path: filePath,
+            path: relPath,
             data,
+            encoding,
             atomic,
             mkdirp,
             expectedEtag
         }: {
             path: string;
             data: string;
+            encoding?: 'utf8' | 'base64' | 'binary';
             atomic?: boolean;
             mkdirp?: boolean;
             expectedEtag?: string;
         }) => {
             try {
-                return await files.writeText(filePath, data, {
+                return await workspace.writeFile(relPath, data, {
+                    encoding,
                     atomic,
                     mkdirp,
                     expectedEtag,
@@ -264,16 +338,16 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
         },
     },
 
-    'file-editText': {
-        description: 'Make precise edits to a UTF-8 text file by replacing specific text. Safer than rewriting entire files - produces smaller diffs and reduces risk of data loss. Refuses binary files.',
+    'workspace-edit': {
+        description: 'Make precise edits to a file by replacing specific text. Safer than rewriting entire files - produces smaller diffs and reduces risk of data loss.',
         inputSchema: z.object({
-            path: z.string().min(1).describe('Text file path to edit'),
+            path: z.string().min(1).describe('Workspace-relative file path'),
             oldString: z.string().describe('Exact text to find and replace'),
             newString: z.string().describe('Replacement text'),
             replaceAll: z.boolean().optional().describe('Replace all occurrences (default: false, fails if not unique)'),
         }),
         execute: async ({
-            path: filePath,
+            path: relPath,
             oldString,
             newString,
             replaceAll = false
@@ -284,22 +358,46 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
             replaceAll?: boolean;
         }) => {
             try {
-                return await files.editText(filePath, oldString, newString, replaceAll);
+                const result = await workspace.readFile(relPath, 'utf8');
+                const content = result.data;
+
+                const occurrences = content.split(oldString).length - 1;
+
+                if (occurrences === 0) {
+                    return { error: 'oldString not found in file' };
+                }
+
+                if (occurrences > 1 && !replaceAll) {
+                    return {
+                        error: `oldString found ${occurrences} times. Use replaceAll: true or provide more context to make it unique.`
+                    };
+                }
+
+                const newContent = replaceAll
+                    ? content.replaceAll(oldString, newString)
+                    : content.replace(oldString, newString);
+
+                await workspace.writeFile(relPath, newContent, { encoding: 'utf8' });
+
+                return {
+                    success: true,
+                    replacements: replaceAll ? occurrences : 1
+                };
             } catch (error) {
                 return { error: error instanceof Error ? error.message : 'Unknown error' };
             }
         },
     },
 
-    'file-mkdir': {
-        description: 'Create a directory',
+    'workspace-mkdir': {
+        description: 'Create a directory in the workspace',
         inputSchema: z.object({
-            path: z.string().min(1).describe('Directory path to create'),
+            path: z.string().min(1).describe('Workspace-relative directory path'),
             recursive: z.boolean().optional().describe('Create parent directories if needed (default: true)'),
         }),
-        execute: async ({ path: filePath, recursive = true }: { path: string; recursive?: boolean }) => {
+        execute: async ({ path: relPath, recursive = true }: { path: string; recursive?: boolean }) => {
             try {
-                return await files.mkdir(filePath, recursive);
+                return await workspace.mkdir(relPath, recursive);
             } catch (error) {
                 return {
                     error: error instanceof Error ? error.message : 'Unknown error',
@@ -308,16 +406,16 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
         },
     },
 
-    'file-rename': {
-        description: 'Rename or move a file or directory',
+    'workspace-rename': {
+        description: 'Rename or move a file or directory in the workspace',
         inputSchema: z.object({
-            from: z.string().min(1).describe('Source path'),
-            to: z.string().min(1).describe('Destination path'),
+            from: z.string().min(1).describe('Source workspace-relative path'),
+            to: z.string().min(1).describe('Destination workspace-relative path'),
             overwrite: z.boolean().optional().describe('Overwrite destination if it exists (default: false)'),
         }),
         execute: async ({ from, to, overwrite = false }: { from: string; to: string; overwrite?: boolean }) => {
             try {
-                return await files.rename(from, to, overwrite);
+                return await workspace.rename(from, to, overwrite);
             } catch (error) {
                 return {
                     error: error instanceof Error ? error.message : 'Unknown error',
@@ -326,16 +424,16 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
         },
     },
 
-    'file-copy': {
-        description: 'Copy a file (directories not supported)',
+    'workspace-copy': {
+        description: 'Copy a file in the workspace (directories not supported)',
         inputSchema: z.object({
-            from: z.string().min(1).describe('Source file path'),
-            to: z.string().min(1).describe('Destination file path'),
+            from: z.string().min(1).describe('Source workspace-relative file path'),
+            to: z.string().min(1).describe('Destination workspace-relative file path'),
             overwrite: z.boolean().optional().describe('Overwrite destination if it exists (default: false)'),
         }),
         execute: async ({ from, to, overwrite = false }: { from: string; to: string; overwrite?: boolean }) => {
             try {
-                return await files.copy(from, to, overwrite);
+                return await workspace.copy(from, to, overwrite);
             } catch (error) {
                 return {
                     error: error instanceof Error ? error.message : 'Unknown error',
@@ -344,16 +442,16 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
         },
     },
 
-    'file-remove': {
-        description: 'Remove a file or directory. Files are moved to the Rowboat trash by default for safety.',
+    'workspace-remove': {
+        description: 'Remove a file or directory from the workspace. Files are moved to trash by default for safety.',
         inputSchema: z.object({
-            path: z.string().min(1).describe('Path to remove'),
+            path: z.string().min(1).describe('Workspace-relative path to remove'),
             recursive: z.boolean().optional().describe('Required for directories (default: false)'),
             trash: z.boolean().optional().describe('Move to trash instead of permanent delete (default: true)'),
         }),
-        execute: async ({ path: filePath, recursive, trash }: { path: string; recursive?: boolean; trash?: boolean }) => {
+        execute: async ({ path: relPath, recursive, trash }: { path: string; recursive?: boolean; trash?: boolean }) => {
             try {
-                return await files.remove(filePath, {
+                return await workspace.remove(relPath, {
                     recursive,
                     trash,
                 });
@@ -365,26 +463,45 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
         },
     },
 
-    'file-glob': {
+    'workspace-glob': {
         description: 'Find files matching a glob pattern (e.g., "**/*.ts", "src/**/*.json"). Much faster than recursive readdir for finding files.',
         inputSchema: z.object({
             pattern: z.string().describe('Glob pattern to match files'),
-            cwd: z.string().optional().describe('Directory to search in (default: default root)'),
+            cwd: z.string().optional().describe('Subdirectory to search in, relative to workspace root (default: workspace root)'),
         }),
         execute: async ({ pattern, cwd }: { pattern: string; cwd?: string }) => {
             try {
-                return await files.glob(pattern, cwd);
+                const searchDir = cwd ? path.join(WorkDir, cwd) : WorkDir;
+
+                // Ensure search directory is within workspace
+                const resolvedSearchDir = path.resolve(searchDir);
+                if (!resolvedSearchDir.startsWith(WorkDir)) {
+                    return { error: 'Search directory must be within workspace' };
+                }
+
+                const files = await glob(pattern, {
+                    cwd: searchDir,
+                    nodir: true,
+                    ignore: ['node_modules/**', '.git/**'],
+                });
+
+                return {
+                    files,
+                    count: files.length,
+                    pattern,
+                    cwd: cwd || '.',
+                };
             } catch (error) {
                 return { error: error instanceof Error ? error.message : 'Unknown error' };
             }
         },
     },
 
-    'file-grep': {
-        description: 'Search text file contents using regex. Returns matching files and lines. Skips binary files.',
+    'workspace-grep': {
+        description: 'Search file contents using regex. Returns matching files and lines. Uses ripgrep if available, falls back to grep.',
         inputSchema: z.object({
             pattern: z.string().describe('Regex pattern to search for'),
-            searchPath: z.string().optional().describe('Directory or file to search (default: default root)'),
+            searchPath: z.string().optional().describe('Directory or file to search, relative to workspace root (default: workspace root)'),
             fileGlob: z.string().optional().describe('File pattern filter (e.g., "*.ts", "*.md")'),
             contextLines: z.number().optional().describe('Lines of context around matches (default: 0)'),
             maxResults: z.number().optional().describe('Maximum results to return (default: 100)'),
@@ -403,7 +520,90 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
             maxResults?: number;
         }) => {
             try {
-                return await files.grep({ pattern, searchPath, fileGlob, contextLines, maxResults });
+                const targetPath = searchPath ? path.join(WorkDir, searchPath) : WorkDir;
+
+                // Ensure target path is within workspace
+                const resolvedTargetPath = path.resolve(targetPath);
+                if (!resolvedTargetPath.startsWith(WorkDir)) {
+                    return { error: 'Search path must be within workspace' };
+                }
+
+                // Try ripgrep first
+                try {
+                    const rgArgs = [
+                        '--json',
+                        '-e', JSON.stringify(pattern),
+                        contextLines > 0 ? `-C ${contextLines}` : '',
+                        fileGlob ? `--glob ${JSON.stringify(fileGlob)}` : '',
+                        `--max-count ${maxResults}`,
+                        '--ignore-case',
+                        JSON.stringify(resolvedTargetPath),
+                    ].filter(Boolean).join(' ');
+
+                    const output = execSync(`rg ${rgArgs}`, {
+                        encoding: 'utf8',
+                        maxBuffer: 10 * 1024 * 1024,
+                        cwd: WorkDir,
+                    });
+
+                    const matches = output.trim().split('\n')
+                        .filter(Boolean)
+                        .map(line => {
+                            try {
+                                return JSON.parse(line);
+                            } catch {
+                                return null;
+                            }
+                        })
+                        .filter(m => m && m.type === 'match');
+
+                    return {
+                        matches: matches.map(m => ({
+                            file: path.relative(WorkDir, m.data.path.text),
+                            line: m.data.line_number,
+                            content: m.data.lines.text.trim(),
+                        })),
+                        count: matches.length,
+                        tool: 'ripgrep',
+                    };
+                } catch {
+                    // Fallback to basic grep if ripgrep not available or failed
+                    const grepArgs = [
+                        '-rn',
+                        fileGlob ? `--include=${JSON.stringify(fileGlob)}` : '',
+                        JSON.stringify(pattern),
+                        JSON.stringify(resolvedTargetPath),
+                        `| head -${maxResults}`,
+                    ].filter(Boolean).join(' ');
+
+                    try {
+                        const output = execSync(`grep ${grepArgs}`, {
+                            encoding: 'utf8',
+                            maxBuffer: 10 * 1024 * 1024,
+                            shell: '/bin/sh',
+                        });
+
+                        const lines = output.trim().split('\n').filter(Boolean);
+                        return {
+                            matches: lines.map(line => {
+                                const match = line.match(/^(.+?):(\d+):(.*)$/);
+                                if (match) {
+                                    return {
+                                        file: path.relative(WorkDir, match[1]),
+                                        line: parseInt(match[2], 10),
+                                        content: match[3].trim(),
+                                    };
+                                }
+                                return { file: '', line: 0, content: line };
+                            }),
+                            count: lines.length,
+                            tool: 'grep',
+                        };
+                    } catch {
+                        // No matches found (grep returns non-zero on no matches)
+                        return { matches: [], count: 0, tool: 'grep' };
+                    }
+                }
             } catch (error) {
                 return { error: error instanceof Error ? error.message : 'Unknown error' };
             }
@@ -413,7 +613,7 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
     'parseFile': {
         description: 'Parse and extract text content from files (PDF, Excel, CSV, Word .docx). Auto-detects format from file extension.',
         inputSchema: z.object({
-            path: z.string().min(1).describe('File path to parse. Can be absolute, ~/..., or relative to the default root.'),
+            path: z.string().min(1).describe('File path to parse. Can be an absolute path or a workspace-relative path.'),
         }),
         execute: async ({ path: filePath }: { path: string }) => {
             try {
@@ -428,7 +628,14 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
                     };
                 }
 
-                const { buffer, resolvedPath } = await files.readBuffer(filePath);
+                // Read file as buffer — support both absolute and workspace-relative paths
+                let buffer: Buffer;
+                if (path.isAbsolute(filePath)) {
+                    buffer = await fs.readFile(filePath);
+                } else {
+                    const result = await workspace.readFile(filePath, 'base64');
+                    buffer = Buffer.from(result.data, 'base64');
+                }
 
                 if (ext === '.pdf') {
                     const { PDFParse } = await _importDynamic("pdf-parse");
@@ -445,7 +652,6 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
                                 pages: textResult.total,
                                 title: infoResult.info?.Title || undefined,
                                 author: infoResult.info?.Author || undefined,
-                                resolvedPath,
                             },
                         };
                     } finally {
@@ -515,7 +721,7 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
     'LLMParse': {
         description: 'Send a file to the configured LLM as a multimodal attachment and ask it to extract content as markdown. Best for scanned PDFs, images with text, complex layouts, or any format where local parsing falls short. Supports documents (PDF, Word, Excel, PowerPoint, CSV, TXT, HTML) and images (PNG, JPG, GIF, WebP, SVG, BMP, TIFF).',
         inputSchema: z.object({
-            path: z.string().min(1).describe('File path to parse. Can be absolute, ~/..., or relative to the default root.'),
+            path: z.string().min(1).describe('File path to parse. Can be an absolute path or a workspace-relative path.'),
             prompt: z.string().optional().describe('Custom instruction for the LLM (defaults to "Convert this file to well-structured markdown.")'),
         }),
         execute: async ({ path: filePath, prompt }: { path: string; prompt?: string }) => {
@@ -531,7 +737,14 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
                     };
                 }
 
-                const { buffer } = await files.readBuffer(filePath);
+                // Read file as buffer — support both absolute and workspace-relative paths
+                let buffer: Buffer;
+                if (path.isAbsolute(filePath)) {
+                    buffer = await fs.readFile(filePath);
+                } else {
+                    const result = await workspace.readFile(filePath, 'base64');
+                    buffer = Buffer.from(result.data, 'base64');
+                }
 
                 const base64 = buffer.toString('base64');
 
@@ -541,12 +754,7 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
 
                 const userPrompt = prompt || 'Convert this file to well-structured markdown.';
 
-                const ctx = getCurrentUseCase();
-                const response = await withUseCase({
-                    useCase: ctx?.useCase ?? 'copilot_chat',
-                    subUseCase: 'file_parse',
-                    ...(ctx?.agentName ? { agentName: ctx.agentName } : {}),
-                }, () => generateText({
+                const response = await generateText({
                     model,
                     messages: [
                         {
@@ -557,8 +765,9 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
                             ],
                         },
                     ],
-                }));
+                });
 
+                const ctx = getCurrentUseCase();
                 captureLlmUsage({
                     useCase: ctx?.useCase ?? 'copilot_chat',
                     subUseCase: 'file_parse',
@@ -808,104 +1017,6 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
         },
     },
 
-    code_agent_run: {
-        description: 'Run a coding/software task with the selected on-device coding agent (Claude Code or Codex) inside a project folder. Streams the agent\'s tool calls, file diffs, and plan into the chat and surfaces permission requests inline. Use this for ALL code-mode work (writing/editing/reading code, running tests, debugging, exploring a repo). Reuses one persistent session per chat, so follow-up requests keep context.',
-        inputSchema: z.object({
-            agent: z.enum(['claude', 'codex']).describe('Which coding agent to use: "claude" (Claude Code) or "codex". Set this to the active code-mode chip agent. Note: when the chip is set, the backend uses the chip agent regardless of this value — this only takes effect in the ask-human flow where no chip is set.'),
-            cwd: z.string().describe('Absolute path to the working directory / project folder the agent should operate in.'),
-            prompt: z.string().describe('The full, self-contained coding instruction for the agent (file names, expected behavior, constraints).'),
-        }),
-        execute: async ({ agent, cwd, prompt }: { agent: 'claude' | 'codex', cwd: string, prompt: string }, ctx?: ToolContext) => {
-            if (!ctx) {
-                return { success: false, message: 'code_agent_run requires run context (runId / streaming).' };
-            }
-            // The composer chip is the source of truth for the agent. The model's `agent`
-            // argument is only a fallback for the ask-human flow (code mode not active, no
-            // chip set) — otherwise it can anchor on the thread's earlier agent and ignore a
-            // chip change. Honor the chip so switching it deterministically switches agents.
-            const effectiveAgent = ctx.codeMode ?? agent;
-            const manager = container.resolve<CodeModeManager>('codeModeManager');
-            const registry = container.resolve<CodePermissionRegistry>('codePermissionRegistry');
-
-            // Approval policy from settings; default to asking the user.
-            let policy: ApprovalPolicy = 'ask';
-            try {
-                const cfg = await container.resolve<ICodeModeConfigRepo>('codeModeConfigRepo').getConfig();
-                if (cfg.approvalPolicy) policy = cfg.approvalPolicy;
-            } catch {
-                // fall back to 'ask'
-            }
-
-            // On stop, unblock any pending approval card so the broker stops waiting for
-            // an answer that will never come. The ACP cancel + force-kill backstop that
-            // actually ends the turn is handled inside manager.runPrompt via the signal
-            // we pass below.
-            const onAbort = () => registry.cancelRun(ctx.runId);
-            if (ctx.signal.aborted) onAbort();
-            else ctx.signal.addEventListener('abort', onAbort, { once: true });
-
-            let finalText = '';
-            const changedFiles = new Set<string>();
-            try {
-                const result = await manager.runPrompt({
-                    runId: ctx.runId,
-                    agent: effectiveAgent,
-                    cwd,
-                    prompt,
-                    policy,
-                    signal: ctx.signal,
-                    onEvent: (event) => {
-                        if (event.type === 'message' && event.role === 'agent') finalText += event.text;
-                        if (event.type === 'tool_call_update') for (const f of event.diffs) changedFiles.add(f);
-                        void ctx.publish({
-                            runId: ctx.runId,
-                            type: 'code-run-event',
-                            toolCallId: ctx.toolCallId,
-                            event,
-                            subflow: [],
-                        });
-                    },
-                    ask: (permAsk) => registry.request(ctx.runId, (requestId) => {
-                        void ctx.publish({
-                            runId: ctx.runId,
-                            type: 'code-run-permission-request',
-                            toolCallId: ctx.toolCallId,
-                            requestId,
-                            ask: permAsk,
-                            subflow: [],
-                        });
-                    }),
-                });
-                return {
-                    success: result.stopReason === 'end_turn',
-                    stopReason: result.stopReason,
-                    // The agent that actually ran (the chip), so the UI can label the run
-                    // authoritatively rather than trusting the model's `agent` argument.
-                    agent: effectiveAgent,
-                    summary: finalText.trim(),
-                    changedFiles: [...changedFiles],
-                };
-            } catch (error) {
-                // A stop mid-run isn't a failure — report it as a clean cancellation.
-                if (ctx.signal.aborted) {
-                    return {
-                        success: false,
-                        stopReason: 'cancelled',
-                        agent: effectiveAgent,
-                        summary: finalText.trim(),
-                        changedFiles: [...changedFiles],
-                    };
-                }
-                return {
-                    success: false,
-                    message: `Coding agent failed: ${error instanceof Error ? error.message : String(error)}`,
-                };
-            } finally {
-                ctx.signal.removeEventListener('abort', onAbort);
-            }
-        },
-    },
-
     // ============================================================================
     // Browser Skills (browser-use/browser-harness domain-skills cache)
     // ============================================================================
@@ -1046,7 +1157,7 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
                 case 'open-note': {
                     const filePath = input.path as string;
                     try {
-                        const result = await files.exists(filePath);
+                        const result = await workspace.exists(filePath);
                         if (!result.exists) {
                             return { success: false, error: `File not found: ${filePath}` };
                         }
@@ -1074,15 +1185,15 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
                     // Scan knowledge/ files and extract frontmatter properties
                     try {
                         const { parseFrontmatter } = await import("@x/shared/dist/frontmatter.js");
-                        const entries = await files.list("knowledge", { recursive: true, allowedExtensions: [".md"] });
-                        const noteFiles = entries.filter(e => e.kind === 'file');
+                        const entries = await workspace.readdir("knowledge", { recursive: true, allowedExtensions: [".md"] });
+                        const files = entries.filter(e => e.kind === 'file');
                         const properties = new Map<string, Set<string>>();
                         let noteCount = 0;
 
-                        for (const file of noteFiles) {
+                        for (const file of files) {
                             try {
-                                const result = await fs.readFile(file.resolvedPath, 'utf8');
-                                const { fields } = parseFrontmatter(result);
+                                const { data } = await workspace.readFile(file.path);
+                                const { fields } = parseFrontmatter(data);
                                 noteCount++;
                                 for (const [key, value] of Object.entries(fields)) {
                                     if (!value) continue;
@@ -1127,7 +1238,7 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
                     const basePath = `bases/${safeName}.base`;
                     try {
                         const config = { name: safeName, filters: [], columns: [] };
-                        await files.writeText(basePath, JSON.stringify(config, null, 2), { mkdirp: true });
+                        await workspace.writeFile(basePath, JSON.stringify(config, null, 2), { mkdirp: true });
                         return { success: true, action: 'create-base', name: safeName, path: basePath };
                     } catch (error) {
                         return {
@@ -1472,70 +1583,6 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
         },
     },
 
-    'create-background-task': {
-        description: "Create a new background task on disk. This is the tool you call to materialize a bg-task — do NOT try to write `task.yaml` yourself with file-editText, and do NOT search the codebase for IPC channels like `bg-task:create`. The framework slugifies the name and lays out `bg-tasks/<slug>/{task.yaml,index.md,runs/}`. After this returns, immediately call `run-background-task-agent` with the returned slug so the user sees content right away.",
-        inputSchema: CreateBackgroundTaskInput,
-        execute: async (input: z.infer<typeof CreateBackgroundTaskInput>) => {
-            try {
-                const { createTask } = await import("../../background-tasks/fileops.js");
-                const result = await createTask({
-                    name: input.name,
-                    instructions: input.instructions,
-                    ...(input.triggers ? { triggers: input.triggers } : {}),
-                    ...(input.model ? { model: input.model } : {}),
-                    ...(input.provider ? { provider: input.provider } : {}),
-                });
-                return { success: true, slug: result.slug };
-            } catch (err) {
-                return { success: false, error: err instanceof Error ? err.message : String(err) };
-            }
-        },
-    },
-
-    'patch-background-task': {
-        description: "Update an existing background task — instructions, triggers, active, or model/provider. Use this when the user's new ask overlaps with an existing task (extend-don't-fork): rewrite the instructions in full to absorb the new ask rather than creating a duplicate sibling task. Look up existing tasks with `file-glob` on `bg-tasks/*/task.yaml` and `file-readText` on the candidates first.",
-        inputSchema: PatchBackgroundTaskInput,
-        execute: async (input: z.infer<typeof PatchBackgroundTaskInput>) => {
-            try {
-                const { patchTask } = await import("../../background-tasks/fileops.js");
-                const { slug, ...partial } = input;
-                const result = await patchTask(slug, partial);
-                return { success: true, task: result };
-            } catch (err) {
-                return { success: false, error: err instanceof Error ? err.message : String(err) };
-            }
-        },
-    },
-
-    'run-background-task-agent': {
-        description: "Manually trigger a background task to run now. Equivalent to the user clicking the Run button in the Background Task detail view. Pass extra `context` to bias what the agent does this run (e.g. a backfill instruction) — does NOT modify the task's persistent instructions.",
-        inputSchema: z.object({
-            slug: z.string().describe("The slug of the bg-task to run (e.g., 'morning-weather'). The slug is what `bg-task:create` returns."),
-            context: z.string().optional().describe(
-                "Optional extra context for THIS run only — does not modify the task's instructions. " +
-                "Use it for backfills (e.g. 'Backfill from emails received in the last 7 days') " +
-                "or focused refreshes (e.g. 'Focus on changes since yesterday'). " +
-                "Omit for a plain run."
-            ),
-        }),
-        execute: async ({ slug, context }: { slug: string; context?: string }) => {
-            try {
-                // Lazy import to break a module-init cycle, mirroring run-live-note-agent.
-                const { runBackgroundTask } = await import("../../background-tasks/runner.js");
-                const result = await runBackgroundTask(slug, 'manual', context);
-                return {
-                    success: !result.error,
-                    runId: result.runId,
-                    summary: result.summary,
-                    error: result.error,
-                };
-            } catch (err) {
-                const msg = err instanceof Error ? err.message : String(err);
-                return { success: false, error: msg };
-            }
-        },
-    },
-
     'notify-user': {
         description: "Show a native OS notification to the user. Clicking the notification opens the provided link in the default browser, or focuses the Rowboat app if no link is given.",
         inputSchema: z.object({
diff --git a/apps/x/packages/core/src/application/lib/command-executor.ts b/apps/x/packages/core/src/application/lib/command-executor.ts
index 357ce1a8..005bb7e8 100644
--- a/apps/x/packages/core/src/application/lib/command-executor.ts
+++ b/apps/x/packages/core/src/application/lib/command-executor.ts
@@ -80,7 +80,6 @@ export async function executeCommand(
     cwd?: string;
     timeout?: number; // timeout in milliseconds
     maxBuffer?: number; // max buffer size in bytes
-    env?: NodeJS.ProcessEnv; // override environment
   }
 ): Promise<CommandResult> {
   try {
@@ -90,7 +89,6 @@ export async function executeCommand(
       timeout: options?.timeout,
       maxBuffer: options?.maxBuffer || 1024 * 1024, // default 1MB
       shell,
-      env: options?.env,
     });
 
     return {
@@ -146,7 +144,6 @@ export function executeCommandAbortable(
     maxBuffer?: number;
     signal?: AbortSignal;
     onData?: (chunk: string) => void;
-    env?: NodeJS.ProcessEnv;
   }
 ): { promise: Promise<AbortableCommandResult>; process: ChildProcess } {
   // Check if already aborted before spawning
@@ -169,7 +166,6 @@ export function executeCommandAbortable(
   const proc = spawn(command, [], {
     shell,
     cwd: options?.cwd,
-    env: options?.env,
     detached: process.platform !== 'win32', // Create process group on Unix
     stdio: ['ignore', 'pipe', 'pipe'],
   });
diff --git a/apps/x/packages/core/src/application/lib/exec-tool.ts b/apps/x/packages/core/src/application/lib/exec-tool.ts
index b34f6ed4..92e87fa6 100644
--- a/apps/x/packages/core/src/application/lib/exec-tool.ts
+++ b/apps/x/packages/core/src/application/lib/exec-tool.ts
@@ -14,10 +14,6 @@ export interface ToolContext {
     signal: AbortSignal;
     abortRegistry: IAbortRegistry;
     publish: (event: z.infer<typeof RunEvent>) => Promise<void>;
-    // The composer code-mode chip for the message that triggered this turn. When set,
-    // it is the authoritative coding agent — code_agent_run uses it rather than the
-    // agent the model guessed, so switching the chip deterministically switches agents.
-    codeMode?: 'claude' | 'codex' | null;
 }
 
 async function execMcpTool(agentTool: z.infer<typeof ToolAttachment> & { type: "mcp" }, input: Record<string, unknown>): Promise<unknown> {
diff --git a/apps/x/packages/core/src/application/lib/knowledge-note-style.ts b/apps/x/packages/core/src/application/lib/knowledge-note-style.ts
index 8b1d566b..a70e4186 100644
--- a/apps/x/packages/core/src/application/lib/knowledge-note-style.ts
+++ b/apps/x/packages/core/src/application/lib/knowledge-note-style.ts
@@ -1,9 +1,9 @@
 /**
  * The canonical writing style for content written into the user's knowledge
- * base. Imported by the `doc-collab` skill (so Copilot picks it up on note
- * edits), the live-note run-agent prompt, and the background-task run-agent
- * prompt (so background runs use the same rules without having to load the
- * skill on every fire).
+ * base. Imported by both the `doc-collab` skill (so Copilot picks it up on
+ * note edits) and the live-note run-agent prompt (so background runs use the
+ * same rules without having to load the skill on every fire). One source of
+ * truth, two consumers.
  *
  * If you change this guide, restart the dev server / rebuild — both consumers
  * inline it at module load.
@@ -113,186 +113,6 @@ Common note types and the target shape for each:
 - **GitHub / issue digests**: \`- [<title>](<issue_url>) · <repo> · <state> · <updated>\`.
 - **Tweets / social digests**: \`- [<truncated text or topic>](<post_url>) · @<author> · <when>\`.
 
-## Rich Markdown block formats
-
-The renderer turns specially-tagged fenced code blocks into styled UI: tables, charts, calendars, emails, embeds, and more. Reach for these when the data has structure that benefits from a visual treatment; stay with plain markdown when prose, a markdown table, or bullets carry the meaning just as well. Pick **at most one block per output region** unless the user asks for a multi-section layout — and follow the exact fence language and shape, since anything unparseable renders as a small "Invalid X block" error card.
-
-Do **not** emit \`task\` blocks — those are user-authored input mechanisms, not agent outputs.
-
-### \`table\` — tabular data (JSON)
-
-Use for: scoreboards, leaderboards, comparisons, multi-row status digests.
-
-\`\`\`table
-{
-  "title": "Top stories on Hacker News",
-  "columns": ["Rank", "Title", "Points", "Comments"],
-  "data": [
-    {"Rank": 1, "Title": "Show HN: ...", "Points": 842, "Comments": 312},
-    {"Rank": 2, "Title": "...", "Points": 530, "Comments": 144}
-  ]
-}
-\`\`\`
-
-Required: \`columns\` (string[]), \`data\` (array of objects keyed by column name). Optional: \`title\`.
-
-### \`chart\` — line / bar / pie chart (JSON)
-
-Use for: time series, categorical breakdowns, share-of-total. Skip if a single sentence carries the meaning.
-
-\`\`\`chart
-{
-  "chart": "line",
-  "title": "USD/INR — last 7 days",
-  "x": "date",
-  "y": "rate",
-  "data": [
-    {"date": "2026-04-13", "rate": 83.41},
-    {"date": "2026-04-14", "rate": 83.38}
-  ]
-}
-\`\`\`
-
-Required: \`chart\` ("line" | "bar" | "pie"), \`x\` (field name on each row), \`y\` (field name on each row), and **either** \`data\` (inline array of objects) **or** \`source\` (workspace path to a JSON-array file). Optional: \`title\`.
-
-### \`mermaid\` — diagrams (raw Mermaid source)
-
-Use for: relationship maps, flowcharts, sequence diagrams, gantt charts, mind maps.
-
-\`\`\`mermaid
-graph LR
-  A[Project Alpha] --> B[Sarah Chen]
-  A --> C[Acme Corp]
-  B --> D[Q3 Launch]
-\`\`\`
-
-Body is plain Mermaid source — no JSON wrapper.
-
-### \`calendar\` — list of events (JSON)
-
-Use for: upcoming meetings, agenda digests, day/week views.
-
-\`\`\`calendar
-{
-  "title": "Today",
-  "events": [
-    {
-      "summary": "1:1 with Sarah",
-      "start": {"dateTime": "2026-04-20T10:00:00-07:00"},
-      "end": {"dateTime": "2026-04-20T10:30:00-07:00"},
-      "location": "Zoom",
-      "conferenceLink": "https://zoom.us/j/..."
-    }
-  ]
-}
-\`\`\`
-
-Required: \`events\` (array). Each event optionally has \`summary\`, \`start\`/\`end\` (object with \`dateTime\` ISO string OR \`date\` "YYYY-MM-DD" for all-day), \`location\`, \`htmlLink\`, \`conferenceLink\`, \`source\`. Optional top-level: \`title\`, \`showJoinButton\` (bool).
-
-### \`emails\` — multi-thread email digest (JSON)
-
-Use for: surfacing a compact inbox-style digest of several relevant threads.
-
-\`\`\`emails
-{
-  "title": "Q3 planning threads",
-  "emails": [
-    {
-      "subject": "Q3 launch readiness",
-      "from": "sarah@acme.com",
-      "date": "2026-04-19T16:42:00Z",
-      "summary": "Sarah confirms timeline; flagged blocker on infra capacity.",
-      "latest_email": "Hey — quick update on Q3...\\n\\nThanks,\\nSarah"
-    }
-  ]
-}
-\`\`\`
-
-Required: \`emails\` (array of \`email\` objects). Optional top-level: \`title\`.
-
-### \`email\` — single email or thread digest (JSON)
-
-Use for: surfacing one important thread — latest message body, summary of prior context, optional draft reply.
-
-\`\`\`email
-{
-  "subject": "Q3 launch readiness",
-  "from": "sarah@acme.com",
-  "date": "2026-04-19T16:42:00Z",
-  "summary": "Sarah confirms timeline; flagged blocker on infra capacity.",
-  "latest_email": "Hey — quick update on Q3...\\n\\nThanks,\\nSarah"
-}
-\`\`\`
-
-Required: \`latest_email\` (string). Optional: \`threadId\`, \`summary\`, \`subject\`, \`from\`, \`to\`, \`date\`, \`past_summary\`, \`draft_response\`, \`response_mode\` ("inline" | "assistant" | "both").
-
-For digests of **many** threads, prefer an \`emails\` block or a compact markdown table — \`email\` is for one thread at a time.
-
-### \`image\` — single image (JSON)
-
-Use for: charts, screenshots, photos you have a URL or workspace path for.
-
-\`\`\`image
-{
-  "src": "https://example.com/forecast.png",
-  "alt": "Weather forecast",
-  "caption": "Bay Area · April 20"
-}
-\`\`\`
-
-Required: \`src\` (URL or workspace path). Optional: \`alt\`, \`caption\`.
-
-### \`embed\` — YouTube / Figma / Tweet embed (JSON)
-
-Use for: linking to a video, design, or tweet that should render inline.
-
-\`\`\`embed
-{
-  "provider": "youtube",
-  "url": "https://www.youtube.com/watch?v=dQw4w9WgXcQ",
-  "caption": "Latest demo"
-}
-\`\`\`
-
-Required: \`provider\` ("youtube" | "figma" | "tweet" | "generic"), \`url\`. Optional: \`caption\`.
-
-### \`iframe\` — arbitrary embedded webpage (JSON)
-
-Use for: live dashboards, status pages, trackers — anything that has its own webpage and benefits from being live, not snapshotted.
-
-\`\`\`iframe
-{
-  "url": "https://status.example.com",
-  "title": "Service status",
-  "height": 600
-}
-\`\`\`
-
-Required: \`url\` (must be \`https://\` or \`http://localhost\`). Optional: \`title\`, \`caption\`, \`height\` (240–1600), \`allow\` (Permissions-Policy string).
-
-### \`transcript\` — long transcript (JSON)
-
-Use for: meeting transcripts, voice-note dumps — bodies that benefit from a collapsible UI.
-
-\`\`\`transcript
-{"transcript": "[00:00] Speaker A: Welcome everyone..."}
-\`\`\`
-
-Required: \`transcript\` (string).
-
-### \`prompt\` — starter Copilot prompt (YAML)
-
-Use for: end-of-output "next step" cards. The user clicks **Run** and the chat sidebar opens with the underlying instruction submitted to Copilot.
-
-\`\`\`prompt
-label: Draft replies to today's emails
-instruction: |
-  For each unanswered email in the digest above, draft a 2-line reply
-  in my voice and present them as a checklist for me to approve.
-\`\`\`
-
-Required: \`label\` (short title shown on the card), \`instruction\` (the longer prompt). Note: this block uses **YAML**, not JSON.
-
 ## When prose IS appropriate
 
 - A **1-3 sentence opening summary** at the top of a complex note (a "lede") — concise enough to scan.
diff --git a/apps/x/packages/core/src/application/lib/message-queue.ts b/apps/x/packages/core/src/application/lib/message-queue.ts
index a513b3ac..b3d2affa 100644
--- a/apps/x/packages/core/src/application/lib/message-queue.ts
+++ b/apps/x/packages/core/src/application/lib/message-queue.ts
@@ -8,20 +8,17 @@ export type MiddlePaneContext =
     | { kind: 'note'; path: string; content: string }
     | { kind: 'browser'; url: string; title: string };
 
-export type CodeMode = 'claude' | 'codex';
-
 type EnqueuedMessage = {
     messageId: string;
     message: UserMessageContentType;
     voiceInput?: boolean;
     voiceOutput?: VoiceOutputMode;
     searchEnabled?: boolean;
-    codeMode?: CodeMode;
     middlePaneContext?: MiddlePaneContext;
 };
 
 export interface IMessageQueue {
-    enqueue(runId: string, message: UserMessageContentType, voiceInput?: boolean, voiceOutput?: VoiceOutputMode, searchEnabled?: boolean, middlePaneContext?: MiddlePaneContext, codeMode?: CodeMode): Promise<string>;
+    enqueue(runId: string, message: UserMessageContentType, voiceInput?: boolean, voiceOutput?: VoiceOutputMode, searchEnabled?: boolean, middlePaneContext?: MiddlePaneContext): Promise<string>;
     dequeue(runId: string): Promise<EnqueuedMessage | null>;
 }
 
@@ -37,7 +34,7 @@ export class InMemoryMessageQueue implements IMessageQueue {
         this.idGenerator = idGenerator;
     }
 
-    async enqueue(runId: string, message: UserMessageContentType, voiceInput?: boolean, voiceOutput?: VoiceOutputMode, searchEnabled?: boolean, middlePaneContext?: MiddlePaneContext, codeMode?: CodeMode): Promise<string> {
+    async enqueue(runId: string, message: UserMessageContentType, voiceInput?: boolean, voiceOutput?: VoiceOutputMode, searchEnabled?: boolean, middlePaneContext?: MiddlePaneContext): Promise<string> {
         if (!this.store[runId]) {
             this.store[runId] = [];
         }
@@ -48,7 +45,6 @@ export class InMemoryMessageQueue implements IMessageQueue {
             voiceInput,
             voiceOutput,
             searchEnabled,
-            codeMode,
             middlePaneContext,
         });
         return id;
diff --git a/apps/x/packages/core/src/auth/client-repo.ts b/apps/x/packages/core/src/auth/client-repo.ts
index e444e3c2..62593469 100644
--- a/apps/x/packages/core/src/auth/client-repo.ts
+++ b/apps/x/packages/core/src/auth/client-repo.ts
@@ -3,21 +3,14 @@ import fs from 'fs/promises';
 import path from 'path';
 import { ClientRegistrationResponse } from './types.js';
 
-export const DEFAULT_CALLBACK_PORT = 8080;
-
 export interface IClientRegistrationRepo {
   getClientRegistration(provider: string): Promise<ClientRegistrationResponse | null>;
-  /** Returns the port that was used when DCR-registering this provider, or DEFAULT_CALLBACK_PORT if not stored. */
-  getRegisteredPort(provider: string): Promise<number>;
-  saveClientRegistration(provider: string, registration: ClientRegistrationResponse, port: number): Promise<void>;
+  saveClientRegistration(provider: string, registration: ClientRegistrationResponse): Promise<void>;
   clearClientRegistration(provider: string): Promise<void>;
 }
 
-// _registeredPort is our private field — stripped by Zod when we parse the RFC response fields
-type StoredEntry = Record<string, unknown> & { _registeredPort?: number };
-
 type ClientRegistrationStorage = {
-  [provider: string]: StoredEntry;
+  [provider: string]: ClientRegistrationResponse;
 };
 
 export class FSClientRegistrationRepo implements IClientRegistrationRepo {
@@ -52,14 +45,14 @@ export class FSClientRegistrationRepo implements IClientRegistrationRepo {
 
   async getClientRegistration(provider: string): Promise<ClientRegistrationResponse | null> {
     const config = await this.readConfig();
-    const entry = config[provider];
-    if (!entry) {
+    const registration = config[provider];
+    if (!registration) {
       return null;
     }
 
-    // Validate registration structure (Zod strips unknown fields like _registeredPort)
+    // Validate registration structure
     try {
-      return ClientRegistrationResponse.parse(entry);
+      return ClientRegistrationResponse.parse(registration);
     } catch {
       // Invalid registration, remove it
       await this.clearClientRegistration(provider);
@@ -67,14 +60,9 @@ export class FSClientRegistrationRepo implements IClientRegistrationRepo {
     }
   }
 
-  async getRegisteredPort(provider: string): Promise<number> {
+  async saveClientRegistration(provider: string, registration: ClientRegistrationResponse): Promise<void> {
     const config = await this.readConfig();
-    return config[provider]?._registeredPort ?? DEFAULT_CALLBACK_PORT;
-  }
-
-  async saveClientRegistration(provider: string, registration: ClientRegistrationResponse, port: number): Promise<void> {
-    const config = await this.readConfig();
-    config[provider] = { ...registration, _registeredPort: port };
+    config[provider] = registration;
     await this.writeConfig(config);
   }
 
diff --git a/apps/x/packages/core/src/auth/google-backend-oauth.ts b/apps/x/packages/core/src/auth/google-backend-oauth.ts
index b3d77c42..a441d205 100644
--- a/apps/x/packages/core/src/auth/google-backend-oauth.ts
+++ b/apps/x/packages/core/src/auth/google-backend-oauth.ts
@@ -26,25 +26,6 @@ export class ReconnectRequiredError extends Error {
     }
 }
 
-/**
- * Thrown when the api signals a transient failure (rate limit, in-flight dedup,
- * upstream 5xx) — caller should leave stored tokens untouched and retry on its
- * next tick rather than flagging the user for reconnect.
- *
- * In particular: the backend returns 429 with `Refresh in progress, retry shortly`
- * when two desktop clients race the same refresh; the proactive in-flight dedup
- * in GoogleClientFactory should make that unreachable, but this is the safety
- * net if it ever isn't.
- */
-export class TransientRefreshError extends Error {
-    readonly status: number;
-    constructor(message: string, status: number) {
-        super(message);
-        this.name = "TransientRefreshError";
-        this.status = status;
-    }
-}
-
 interface ApiTokenResponse {
     access_token: string;
     refresh_token?: string;
@@ -123,17 +104,6 @@ export async function refreshTokensViaBackend(
         }
         throw new Error(`refresh failed: 409 ${err.error ?? ""}`.trim());
     }
-    // 429 = backend dedup said another refresh is in flight; 5xx = upstream
-    // hiccup. Either way the local tokens are still valid for the next attempt
-    // — surface as TransientRefreshError so the factory doesn't write a stuck
-    // error into oauth.json.
-    if (res.status === 429 || res.status >= 500) {
-        const err = await readError(res);
-        throw new TransientRefreshError(
-            `refresh failed: ${res.status} ${err.error ?? ""}`.trim(),
-            res.status,
-        );
-    }
     if (!res.ok) {
         const err = await readError(res);
         throw new Error(`refresh failed: ${res.status} ${err.error ?? ""}`.trim());
diff --git a/apps/x/packages/core/src/auth/providers.ts b/apps/x/packages/core/src/auth/providers.ts
index 732d56ab..52bd0ab5 100644
--- a/apps/x/packages/core/src/auth/providers.ts
+++ b/apps/x/packages/core/src/auth/providers.ts
@@ -75,8 +75,9 @@ const providerConfigs: ProviderConfig = {
       mode: 'static',
     },
     scopes: [
-      'https://www.googleapis.com/auth/gmail.modify',
+      'https://www.googleapis.com/auth/gmail.readonly',
       'https://www.googleapis.com/auth/calendar.events.readonly',
+      'https://www.googleapis.com/auth/drive.readonly',
     ],
   },
   'fireflies-ai': {
@@ -118,3 +119,4 @@ export async function getProviderConfig(providerName: string): Promise<ProviderC
 export function getAvailableProviders(): string[] {
   return Object.keys(providerConfigs);
 }
+
diff --git a/apps/x/packages/core/src/background-tasks/agent.ts b/apps/x/packages/core/src/background-tasks/agent.ts
deleted file mode 100644
index 853c1ef0..00000000
--- a/apps/x/packages/core/src/background-tasks/agent.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import z from 'zod';
-import { Agent, ToolAttachment } from '@x/shared/dist/agent.js';
-import { BuiltinTools } from '../application/lib/builtin-tools.js';
-import { KNOWLEDGE_NOTE_STYLE_GUIDE } from '../application/lib/knowledge-note-style.js';
-import { WorkDir } from '../config/config.js';
-
-export const BACKGROUND_TASK_AGENT_INSTRUCTIONS = `You are the background-task agent — a self-running agent that fires on a schedule and/or in response to incoming events to act on persistent **instructions** the user wrote.
-
-You are running with **no user present** to clarify, approve, or watch.
-- Do NOT ask clarifying questions — make the most reasonable interpretation of the instructions and proceed.
-- Do NOT hedge or preamble ("I'll now...", "Let me..."). Just do the work.
-- Do NOT produce chat-style output. The user sees only the changes you make and your final summary line.
-
-# Task folder
-
-Your task folder is \`bg-tasks/<slug>/\` (the path is given in the run message). It contains:
-- \`task.yaml\` — the spec. **Never touch this.** The runtime owns it.
-- \`index.md\` — agent-owned. You read and write this freely via \`file-readText\` / \`file-editText\`.
-- \`runs/\` — your own run logs (jsonl). You don't write to it directly; the runtime does.
-
-You can also read and write anywhere else under the workspace (\`knowledge/\`, etc.) when your instructions call for it.
-
-# Two modes — decide each run from the verbs in your instructions
-
-OUTPUT MODE — keep \`index.md\` aligned to the instructions.
-Use when instructions imply a **current state** artifact:
-- "Maintain / show / summarize / track / digest of / dashboard for / brief on …"
-- "Keep me posted on …" / "What's the latest on …"
-On every run: \`file-readText\` \`index.md\`, decide the smallest patch that brings it into alignment with the instructions, apply with \`file-editText\`. Patch-style discipline: edit one region, re-read, then edit the next. Avoid one-shot rewrites.
-
-ACTION MODE — perform a side-effect, append a journal entry.
-Use when instructions imply a **recurring action**:
-- "Send / draft / post / notify / file / reply / publish / call / forward …"
-On every run: perform the action using the appropriate tool (Slack, email, web-fetch, MCP, …). Then **append a one-liner** to \`index.md\` under a \`## Journal\` heading describing what you did, with the local time. Example:
-
-    ## Journal
-
-    - 2026-05-12 14:00 — Sent the Q3 digest to #leadership (3 threads, 2 decisions).
-    - 2026-05-11 14:00 — No qualifying threads; nothing sent.
-
-If your instructions imply BOTH ("summarize and email it"), do both per run.
-
-# Triggers
-
-The run message tells you which trigger fired and how to interpret it:
-- **Manual** — the user clicked Run or called the \`run-background-task-agent\` tool. Optional \`Context:\` adds a one-off bias for THIS run.
-- **Cron / Window** — scheduled refresh. Use it as a baseline tick.
-- **Event** — Pass-1 routing flagged this task as potentially relevant to an event. Decide whether the event genuinely warrants acting. If on closer inspection it's not meaningfully relevant, **skip the action and the journal entry** — don't update \`index.md\` at all. Only act if the event provides information your instructions imply you should react to.
-
-# Workspace conventions
-
-${KNOWLEDGE_NOTE_STYLE_GUIDE}
-
-# Failure and fallback
-
-Do NOT fabricate. If a data source is unavailable (network error, missing API key, empty result), skip the run rather than write a misleading artifact. In ACTION mode, that means: no journal entry. In OUTPUT mode, leave \`index.md\` alone. Your final summary should explain what blocked the work.
-
-# Final summary
-
-End your run with a 1-2 sentence summary captured as \`lastRun.summary\`. State the action and the substance. Good:
-- "Updated — 3 new HN stories, top is 'Show HN: …' at 842 pts."
-- "Sent the digest to #leadership (2 deals updated)."
-- "Skipped — event was a calendar invite unrelated to Q3."
-- "Failed — web-search returned no results."
-
-Avoid: "I updated the file.", "Done!", "Here is the update:". The summary is a data point, not a sign-off.
-
-The workspace lives at \`${WorkDir}\`.
-`;
-
-export function buildBackgroundTaskAgent(): z.infer<typeof Agent> {
-    const tools: Record<string, z.infer<typeof ToolAttachment>> = {};
-    for (const name of Object.keys(BuiltinTools)) {
-        // code_agent_run requires an interactive UI for permission approvals — skip it
-        // here (headless) so it can't hang on an approval no one can answer.
-        if (name === 'executeCommand' || name === 'code_agent_run') continue;
-        tools[name] = { type: 'builtin', name };
-    }
-
-    return {
-        name: 'background-task-agent',
-        description: 'Background agent that runs on a schedule/event and either keeps a task\'s index.md current (OUTPUT mode) or performs a recurring side-effect and journals it (ACTION mode).',
-        instructions: BACKGROUND_TASK_AGENT_INSTRUCTIONS,
-        tools,
-    };
-}
diff --git a/apps/x/packages/core/src/background-tasks/bus.ts b/apps/x/packages/core/src/background-tasks/bus.ts
deleted file mode 100644
index 46fe226e..00000000
--- a/apps/x/packages/core/src/background-tasks/bus.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import type { BackgroundTaskAgentEventType } from '@x/shared/dist/background-task.js';
-
-type Handler = (event: BackgroundTaskAgentEventType) => void;
-
-class BackgroundTaskBus {
-    private subs: Handler[] = [];
-
-    publish(event: BackgroundTaskAgentEventType): void {
-        for (const handler of this.subs) {
-            handler(event);
-        }
-    }
-
-    subscribe(handler: Handler): () => void {
-        this.subs.push(handler);
-        return () => {
-            const idx = this.subs.indexOf(handler);
-            if (idx >= 0) this.subs.splice(idx, 1);
-        };
-    }
-}
-
-export const backgroundTaskBus = new BackgroundTaskBus();
diff --git a/apps/x/packages/core/src/background-tasks/event-consumer.ts b/apps/x/packages/core/src/background-tasks/event-consumer.ts
deleted file mode 100644
index 4d3e5f81..00000000
--- a/apps/x/packages/core/src/background-tasks/event-consumer.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import type { EventConsumer, EventConsumerTarget } from '../events/consumer.js';
-import { routeBatch } from '../events/routing.js';
-import { createProvider } from '../models/models.js';
-import {
-    getDefaultModelAndProvider,
-    getBackgroundTaskAgentModel,
-    resolveProviderConfig,
-} from '../models/defaults.js';
-import { listTasks } from './fileops.js';
-import { runBackgroundTask } from './runner.js';
-
-async function resolveRoutingModel() {
-    const modelId = await getBackgroundTaskAgentModel();
-    const { provider } = await getDefaultModelAndProvider();
-    const config = await resolveProviderConfig(provider);
-    return {
-        model: createProvider(config).languageModel(modelId),
-        modelId,
-        providerName: provider,
-    };
-}
-
-async function listEligibleTargets(): Promise<EventConsumerTarget[]> {
-    // Walk all tasks once; pagination doesn't apply to the routing pass — the
-    // classifier needs to see all event-eligible tasks together.
-    const result = await listTasks({ limit: 10_000 });
-    const out: EventConsumerTarget[] = [];
-    for (const summary of result.items) {
-        if (!summary.active) continue;
-        const eventMatchCriteria = summary.triggers?.eventMatchCriteria;
-        if (!eventMatchCriteria) continue;
-        out.push({
-            id: summary.slug,
-            instructions: summary.instructions,
-            eventMatchCriteria,
-        });
-    }
-    return out;
-}
-
-export const backgroundTaskEventConsumer: EventConsumer = {
-    name: 'bg-task',
-
-    listEligibleTargets,
-
-    findCandidates: async (event, targets) => {
-        // Targeted re-run from the UI — skip Pass-1.
-        if (event.target?.consumer === 'bg-task') {
-            return targets.some(t => t.id === event.target!.id) ? [event.target.id] : [];
-        }
-        return routeBatch(event, targets, {
-            entitySingular: 'background task',
-            entityPlural: 'background tasks',
-            useCase: 'background_task_agent',
-            resolveModel: resolveRoutingModel,
-        });
-    },
-
-    fireCandidate: async (event, slug) => {
-        const result = await runBackgroundTask(slug, 'event', event.payload);
-        return { runId: result.runId, error: result.error };
-    },
-};
diff --git a/apps/x/packages/core/src/background-tasks/fileops.ts b/apps/x/packages/core/src/background-tasks/fileops.ts
deleted file mode 100644
index d282a529..00000000
--- a/apps/x/packages/core/src/background-tasks/fileops.ts
+++ /dev/null
@@ -1,255 +0,0 @@
-import fs from 'fs/promises';
-import path from 'path';
-import { parse as parseYaml, stringify as stringifyYaml } from 'yaml';
-import {
-    BackgroundTaskSchema,
-    type BackgroundTask,
-    type BackgroundTaskSummary,
-} from '@x/shared/dist/background-task.js';
-import { WorkDir } from '../config/config.js';
-import { withFileLock } from '../knowledge/file-lock.js';
-
-const BG_TASKS_DIR = path.join(WorkDir, 'bg-tasks');
-
-function taskDir(slug: string): string {
-    return path.join(BG_TASKS_DIR, slug);
-}
-
-export function taskYamlPath(slug: string): string {
-    return path.join(taskDir(slug), 'task.yaml');
-}
-
-export function taskIndexPath(slug: string): string {
-    return path.join(taskDir(slug), 'index.md');
-}
-
-/**
- * Plain-text pointer file at `bg-tasks/<slug>/runs.log`. Each line is a runId
- * (the canonical id of a run whose jsonl lives at the global location
- * `$WorkDir/runs/<runId>.jsonl`). Newest first: the runner prepends on each
- * start, so reading top-down gives most-recent-first ordering without sorting.
- */
-export function taskRunsLogPath(slug: string): string {
-    return path.join(taskDir(slug), 'runs.log');
-}
-
-// ---------------------------------------------------------------------------
-// Slug
-// ---------------------------------------------------------------------------
-
-const MAX_SLUG_LEN = 60;
-
-export function slugify(name: string): string {
-    const base = name
-        .toLowerCase()
-        .normalize('NFKD')
-        .replace(/[^\w\s-]/g, '')
-        .trim()
-        .replace(/[\s_-]+/g, '-')
-        .replace(/^-+|-+$/g, '')
-        .slice(0, MAX_SLUG_LEN);
-    return base || 'task';
-}
-
-// ---------------------------------------------------------------------------
-// Read
-// ---------------------------------------------------------------------------
-
-export async function fetchTask(slug: string): Promise<BackgroundTask | null> {
-    let raw: string;
-    try {
-        raw = await fs.readFile(taskYamlPath(slug), 'utf-8');
-    } catch {
-        return null;
-    }
-    let parsed: unknown;
-    try {
-        parsed = parseYaml(raw);
-    } catch {
-        return null;
-    }
-    const result = BackgroundTaskSchema.safeParse(parsed);
-    return result.success ? result.data : null;
-}
-
-// ---------------------------------------------------------------------------
-// Write
-// ---------------------------------------------------------------------------
-
-/**
- * Merge a partial update into the task.yaml. Used by the renderer for
- * structural edits (active toggle, instructions, triggers, model) and by the
- * runner for the `lastRun*` runtime fields.
- */
-export async function patchTask(slug: string, partial: Partial<BackgroundTask>): Promise<BackgroundTask> {
-    return withFileLock(taskYamlPath(slug), async () => {
-        const current = await fetchTask(slug);
-        if (!current) {
-            throw new Error(`Task '${slug}' not found`);
-        }
-        const next: BackgroundTask = { ...current, ...partial };
-        await fs.writeFile(taskYamlPath(slug), stringifyYaml(next), 'utf-8');
-        return next;
-    });
-}
-
-export interface CreateTaskInput {
-    name: string;
-    instructions: string;
-    triggers?: BackgroundTask['triggers'];
-    model?: string;
-    provider?: string;
-}
-
-/**
- * Create a new bg-task folder + task.yaml + empty index.md. Returns the slug
- * assigned (which may include `-2`, `-3`, … suffix if the natural slug
- * collides with an existing folder). Slug collisions retry up to 50 times
- * before giving up. Note: runs.log is created lazily on the first run.
- */
-export async function createTask(input: CreateTaskInput): Promise<{ slug: string }> {
-    await fs.mkdir(BG_TASKS_DIR, { recursive: true });
-
-    const baseSlug = slugify(input.name);
-    let slug = baseSlug;
-    let attempt = 1;
-    while (true) {
-        try {
-            await fs.mkdir(taskDir(slug), { recursive: false });
-            break;
-        } catch (err: unknown) {
-            const e = err as { code?: string };
-            if (e.code === 'EEXIST') {
-                attempt += 1;
-                if (attempt > 50) {
-                    throw new Error(`Slug collision: could not find a free slug after ${attempt - 1} attempts`);
-                }
-                slug = `${baseSlug}-${attempt}`;
-                continue;
-            }
-            throw err;
-        }
-    }
-
-    const task: BackgroundTask = {
-        name: input.name,
-        instructions: input.instructions,
-        active: true,
-        ...(input.triggers ? { triggers: input.triggers } : {}),
-        ...(input.model ? { model: input.model } : {}),
-        ...(input.provider ? { provider: input.provider } : {}),
-        createdAt: new Date().toISOString(),
-    };
-
-    await fs.writeFile(taskYamlPath(slug), stringifyYaml(task), 'utf-8');
-    await fs.writeFile(taskIndexPath(slug), `# ${input.name}\n\n`, 'utf-8');
-
-    return { slug };
-}
-
-/** Delete a bg-task — removes the entire folder. */
-export async function deleteTask(slug: string): Promise<void> {
-    return withFileLock(taskYamlPath(slug), async () => {
-        await fs.rm(taskDir(slug), { recursive: true, force: true });
-    });
-}
-
-// ---------------------------------------------------------------------------
-// Listing tasks
-// ---------------------------------------------------------------------------
-
-export interface ListTasksOptions {
-    offset?: number;
-    limit?: number;
-    sort?: 'createdAt:desc' | 'createdAt:asc' | 'name:asc';
-}
-
-export interface ListTasksResult {
-    items: BackgroundTaskSummary[];
-    total: number;
-}
-
-export async function listTasks(opts: ListTasksOptions = {}): Promise<ListTasksResult> {
-    const offset = opts.offset ?? 0;
-    const limit = opts.limit ?? 50;
-    const sort = opts.sort ?? 'createdAt:desc';
-
-    let entries: string[];
-    try {
-        entries = await fs.readdir(BG_TASKS_DIR);
-    } catch (err: unknown) {
-        const e = err as { code?: string };
-        if (e.code === 'ENOENT') return { items: [], total: 0 };
-        throw err;
-    }
-
-    const all: BackgroundTaskSummary[] = [];
-    for (const slug of entries) {
-        if (slug.startsWith('.')) continue;
-        const task = await fetchTask(slug);
-        if (!task) continue;
-        all.push({
-            slug,
-            name: task.name,
-            instructions: task.instructions,
-            active: task.active,
-            ...(task.triggers ? { triggers: task.triggers } : {}),
-            createdAt: task.createdAt,
-            ...(task.lastAttemptAt ? { lastAttemptAt: task.lastAttemptAt } : {}),
-            ...(task.lastRunId ? { lastRunId: task.lastRunId } : {}),
-            ...(task.lastRunAt ? { lastRunAt: task.lastRunAt } : {}),
-            ...(task.lastRunSummary ? { lastRunSummary: task.lastRunSummary } : {}),
-            ...(task.lastRunError ? { lastRunError: task.lastRunError } : {}),
-        });
-    }
-
-    all.sort((a, b) => {
-        if (sort === 'name:asc') return a.name.localeCompare(b.name);
-        const aT = new Date(a.createdAt).getTime();
-        const bT = new Date(b.createdAt).getTime();
-        return sort === 'createdAt:asc' ? aT - bT : bT - aT;
-    });
-
-    return {
-        items: all.slice(offset, offset + limit),
-        total: all.length,
-    };
-}
-
-// ---------------------------------------------------------------------------
-// Runs pointer file (`runs.log`)
-//
-// One line per run, runId only. Prepended on each start so the newest is at
-// the top — no sorting needed on read. The actual transcript jsonl lives in
-// the global `$WorkDir/runs/<runId>.jsonl`; readers fetch via the standard
-// runs:fetch IPC. Read concurrency is unconstrained; write is serialized via
-// `withFileLock` on the task.yaml path (same lock as patches, so a run-start
-// patch and a prepend don't race).
-// ---------------------------------------------------------------------------
-
-export async function prependRunId(slug: string, runId: string): Promise<void> {
-    return withFileLock(taskYamlPath(slug), async () => {
-        const filePath = taskRunsLogPath(slug);
-        let existing = '';
-        try {
-            existing = await fs.readFile(filePath, 'utf-8');
-        } catch (err: unknown) {
-            const e = err as { code?: string };
-            if (e.code !== 'ENOENT') throw err;
-        }
-        await fs.writeFile(filePath, `${runId}\n${existing}`, 'utf-8');
-    });
-}
-
-export async function readRunIds(slug: string, limit?: number): Promise<string[]> {
-    let content = '';
-    try {
-        content = await fs.readFile(taskRunsLogPath(slug), 'utf-8');
-    } catch (err: unknown) {
-        const e = err as { code?: string };
-        if (e.code === 'ENOENT') return [];
-        throw err;
-    }
-    const ids = content.split('\n').map(s => s.trim()).filter(Boolean);
-    return limit ? ids.slice(0, limit) : ids;
-}
diff --git a/apps/x/packages/core/src/background-tasks/runner.ts b/apps/x/packages/core/src/background-tasks/runner.ts
deleted file mode 100644
index 7fb73bdb..00000000
--- a/apps/x/packages/core/src/background-tasks/runner.ts
+++ /dev/null
@@ -1,193 +0,0 @@
-import type { BackgroundTask, BackgroundTaskTriggerType } from '@x/shared/dist/background-task.js';
-import { PrefixLogger } from '@x/shared/dist/prefix-logger.js';
-import { fetchTask, patchTask, prependRunId } from './fileops.js';
-import { createRun, createMessage } from '../runs/runs.js';
-import { getBackgroundTaskAgentModel } from '../models/defaults.js';
-import { extractAgentResponse, waitForRunCompletion } from '../agents/utils.js';
-import { buildTriggerBlock } from '../agents/build-trigger-block.js';
-import { backgroundTaskBus } from './bus.js';
-
-const log = new PrefixLogger('BgTask:Agent');
-
-export interface BackgroundTaskAgentResult {
-    slug: string;
-    runId: string | null;
-    summary: string | null;
-    error?: string;
-}
-
-const SUMMARY_LOG_LIMIT = 120;
-
-function truncate(s: string | null | undefined, n = SUMMARY_LOG_LIMIT): string {
-    if (!s) return '';
-    return s.length <= n ? s : `${s.slice(0, n - 1)}…`;
-}
-
-// ---------------------------------------------------------------------------
-// Agent run message
-// ---------------------------------------------------------------------------
-
-const BG_TASK_EVENT_DECISION_DIRECTIVE = '**Decision:** Determine whether this event genuinely warrants taking the action your instructions describe. If the event is not meaningfully relevant on closer inspection, skip the run — do not modify `index.md` and do not perform any side-effect. Only act if the event provides new or changed information that the instructions imply you should react to.';
-
-const BG_TASK_MANUAL_PAREN = 'user-triggered — either the Run button in the Background Task detail view or the `run-background-task-agent` tool';
-
-function buildMessage(
-    slug: string,
-    task: BackgroundTask,
-    trigger: BackgroundTaskTriggerType,
-    context?: string,
-): string {
-    const now = new Date();
-    const localNow = now.toLocaleString('en-US', { dateStyle: 'full', timeStyle: 'long' });
-    const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
-
-    const wsFolder = `bg-tasks/${slug}/`;
-
-    const baseMessage = `Run the background task at \`${wsFolder}\`.
-
-**Time:** ${localNow} (${tz})
-
-**Instructions:**
-${task.instructions}
-
-Your task folder is \`${wsFolder}\`. The user-visible artifact is \`${wsFolder}index.md\` — read it with \`file-readText\` and update it with \`file-editText\` per the OUTPUT / ACTION mode rule. Do not touch \`${wsFolder}task.yaml\` (the runtime owns it).`;
-
-    return baseMessage + buildTriggerBlock({
-        trigger,
-        triggers: task.triggers,
-        // The 'event' branch passes the event payload as `context`; every
-        // other trigger uses `context` as a one-off bias for THIS run.
-        context: trigger === 'event' ? undefined : context,
-        eventPayload: trigger === 'event' ? context : undefined,
-        targetNoun: 'task',
-        instructionsNoun: 'instructions',
-        manualParen: BG_TASK_MANUAL_PAREN,
-        eventDecisionDirective: BG_TASK_EVENT_DECISION_DIRECTIVE,
-    });
-}
-
-// ---------------------------------------------------------------------------
-// Concurrency guard — keyed by slug
-// ---------------------------------------------------------------------------
-
-const runningTasks = new Set<string>();
-
-// ---------------------------------------------------------------------------
-// Public API
-// ---------------------------------------------------------------------------
-
-/**
- * Run the bg-task agent on a specific task.
- * Called by the scheduler ('cron' | 'window'), the event processor ('event'),
- * the renderer detail Run button ('manual'), or the `run-background-task-agent`
- * builtin tool ('manual').
- */
-export async function runBackgroundTask(
-    slug: string,
-    trigger: BackgroundTaskTriggerType = 'manual',
-    context?: string,
-): Promise<BackgroundTaskAgentResult> {
-    if (runningTasks.has(slug)) {
-        log.log(`${slug} — skip: already running`);
-        return { slug, runId: null, summary: null, error: 'Already running' };
-    }
-    runningTasks.add(slug);
-
-    try {
-        const task = await fetchTask(slug);
-        if (!task) {
-            log.log(`${slug} — skip: task not found`);
-            return { slug, runId: null, summary: null, error: 'Task not found' };
-        }
-
-        // `||` not `??`: an empty-string `task.model` (occasionally synthesized
-        // by an LLM call to create-background-task) should fall through to the
-        // default just like undefined does.
-        const model = task.model || await getBackgroundTaskAgentModel();
-        const agentRun = await createRun({
-            agentId: 'background-task-agent',
-            model,
-            ...(task.provider ? { provider: task.provider } : {}),
-            useCase: 'background_task_agent',
-            // Granular trigger as analytics sub-use-case — matches live-note's
-            // pattern at runner.ts:149.
-            subUseCase: trigger,
-        });
-
-        const runId = agentRun.id;
-        // Record this run in the task's runs.log pointer file (newest first).
-        // The transcript itself lives at the global $WorkDir/runs/<runId>.jsonl
-        // — runs.log is just an index that ties runIds to this task.
-        await prependRunId(slug, runId);
-        const startedAt = new Date().toISOString();
-
-        log.log(`${slug} — start trigger=${trigger} runId=${runId}`);
-
-        // Bump `lastAttemptAt` + `lastRunId` immediately (before the agent
-        // executes). `lastAttemptAt` is the scheduler's backoff anchor and the
-        // disk-persistent in-flight signal (lastAttemptAt > lastRunAt). Crucially
-        // we leave `lastRunAt` / `lastRunSummary` / `lastRunError` untouched —
-        // the previous successful run stays visible in the UI even while this
-        // new run is in-flight or fails.
-        await patchTask(slug, {
-            lastAttemptAt: startedAt,
-            lastRunId: runId,
-        });
-
-        backgroundTaskBus.publish({
-            type: 'background_task_agent_start',
-            slug,
-            trigger,
-            runId,
-        });
-
-        try {
-            await createMessage(runId, buildMessage(slug, task, trigger, context));
-            await waitForRunCompletion(runId, { throwOnError: true });
-            const summary = await extractAgentResponse(runId);
-
-            // Success — bump cycle anchor, refresh summary, clear any prior error.
-            await patchTask(slug, {
-                lastRunAt: new Date().toISOString(),
-                lastRunSummary: summary ?? undefined,
-                lastRunError: undefined,
-            });
-
-            log.log(`${slug} — done summary="${truncate(summary)}"`);
-
-            backgroundTaskBus.publish({
-                type: 'background_task_agent_complete',
-                slug,
-                runId,
-                ...(summary ? { summary } : {}),
-            });
-
-            return { slug, runId, summary };
-        } catch (err) {
-            const msg = err instanceof Error ? err.message : String(err);
-
-            // Failure — only record the error. `lastRunAt` and `lastRunSummary`
-            // are deliberately untouched so the user keeps seeing the last good
-            // state; the scheduler's backoff (lastAttemptAt + 5min) prevents
-            // retry-storming.
-            try {
-                await patchTask(slug, { lastRunError: msg });
-            } catch {
-                // don't mask the original error
-            }
-
-            log.log(`${slug} — failed: ${truncate(msg)}`);
-
-            backgroundTaskBus.publish({
-                type: 'background_task_agent_complete',
-                slug,
-                runId,
-                error: msg,
-            });
-
-            return { slug, runId, summary: null, error: msg };
-        }
-    } finally {
-        runningTasks.delete(slug);
-    }
-}
diff --git a/apps/x/packages/core/src/background-tasks/scheduler.ts b/apps/x/packages/core/src/background-tasks/scheduler.ts
deleted file mode 100644
index 52729f0b..00000000
--- a/apps/x/packages/core/src/background-tasks/scheduler.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { PrefixLogger } from '@x/shared';
-import { listTasks } from './fileops.js';
-import { runBackgroundTask } from './runner.js';
-import { backoffRemainingMs, dueTimedTrigger } from '../schedule/utils.js';
-
-const log = new PrefixLogger('BgTask:Scheduler');
-const POLL_INTERVAL_MS = 15_000; // 15 seconds — matches live-note scheduler
-
-function humanMs(ms: number): string {
-    const s = Math.round(ms / 1000);
-    if (s < 60) return `${s}s`;
-    const m = Math.round(s / 60);
-    return `${m}m`;
-}
-
-async function processScheduledTasks(): Promise<void> {
-    const { items } = await listTasks({ limit: 10_000 });
-
-    let scannedCount = items.length;
-    let activeCount = 0;
-    let pausedCount = 0;
-    let firedCount = 0;
-    let backoffCount = 0;
-    let inFlightCount = 0;
-
-    for (const task of items) {
-        if (!task.active) {
-            pausedCount++;
-            continue;
-        }
-        activeCount++;
-
-        // In-flight skip — `lastAttemptAt` set more recently than `lastRunAt`
-        // means the latest attempt never completed. The in-memory concurrency
-        // guard in the runner is the fast path; this is the disk-persistent
-        // backstop covering crashes mid-run.
-        const attemptAt = task.lastAttemptAt;
-        const completedAt = task.lastRunAt;
-        if (attemptAt && (!completedAt || attemptAt > completedAt)) {
-            // …but only treat as in-flight if the attempt is still within the
-            // backoff window. After backoff expires the next iteration is free
-            // to retry (matches the runner's fail/crash recovery story).
-            if (backoffRemainingMs(attemptAt) > 0) {
-                inFlightCount++;
-                continue;
-            }
-        }
-
-        // Cycle anchor: only successful runs advance the cycle. Failures
-        // leave the cycle unfired so the next natural occurrence retries
-        // (gated by backoff).
-        const source = dueTimedTrigger(task.triggers, completedAt ?? null);
-        if (!source) continue;
-
-        const backoffMs = backoffRemainingMs(attemptAt ?? null);
-        if (backoffMs > 0) {
-            backoffCount++;
-            log.log(`${task.slug} — skip (matched ${source}, backoff ${humanMs(backoffMs)} remaining)`);
-            continue;
-        }
-
-        firedCount++;
-        log.log(`${task.slug} — firing (matched ${source})`);
-        runBackgroundTask(task.slug, source).catch(err => {
-            log.log(`${task.slug} — fire error: ${err instanceof Error ? err.message : String(err)}`);
-        });
-    }
-
-    if (activeCount > 0 || firedCount > 0 || backoffCount > 0 || inFlightCount > 0) {
-        log.log(
-            `tick — scanned ${scannedCount} tasks, ${activeCount} active` +
-            (pausedCount > 0 ? `, ${pausedCount} paused` : '') +
-            (inFlightCount > 0 ? `, ${inFlightCount} in-flight` : '') +
-            (firedCount > 0 ? `, fired ${firedCount}` : '') +
-            (backoffCount > 0 ? `, backoff ${backoffCount}` : ''),
-        );
-    }
-}
-
-export async function init(): Promise<void> {
-    log.log(`starting, polling every ${POLL_INTERVAL_MS / 1000}s`);
-
-    await processScheduledTasks();
-
-    while (true) {
-        await new Promise(resolve => setTimeout(resolve, POLL_INTERVAL_MS));
-        try {
-            await processScheduledTasks();
-        } catch (err) {
-            log.log(`tick error: ${err instanceof Error ? err.message : String(err)}`);
-        }
-    }
-}
diff --git a/apps/x/packages/core/src/billing/billing.ts b/apps/x/packages/core/src/billing/billing.ts
index 0b088be4..2365364d 100644
--- a/apps/x/packages/core/src/billing/billing.ts
+++ b/apps/x/packages/core/src/billing/billing.ts
@@ -1,6 +1,15 @@
 import { getAccessToken } from '../auth/tokens.js';
 import { API_URL } from '../config/env.js';
-import type { BillingInfo, BillingPlan } from '@x/shared/dist/billing.js';
+
+export interface BillingInfo {
+  userEmail: string | null;
+  userId: string | null;
+  subscriptionPlan: string | null;
+  subscriptionStatus: string | null;
+  trialExpiresAt: string | null;
+  sanctionedCredits: number;
+  availableCredits: number;
+}
 
 export async function getBillingInfo(): Promise<BillingInfo> {
   const accessToken = await getAccessToken();
@@ -16,21 +25,12 @@ export async function getBillingInfo(): Promise<BillingInfo> {
       email: string;
     };
     billing: {
-      plan: BillingPlan | null;
+      plan: string | null;
       status: string | null;
       trialExpiresAt: string | null;
       usage: {
-        monthly: {
-          sanctionedCredits: number;
-          usedCredits: number;
-          availableCredits: number;
-        };
-        daily: {
-          sanctionedCredits: number;
-          usedCredits: number;
-          availableCredits: number;
-          usageDay: string;
-        };
+        sanctionedCredits: number;
+        availableCredits: number;
       };
     };
   };
@@ -40,7 +40,7 @@ export async function getBillingInfo(): Promise<BillingInfo> {
     subscriptionPlan: body.billing.plan,
     subscriptionStatus: body.billing.status,
     trialExpiresAt: body.billing.trialExpiresAt ?? null,
-    monthly: body.billing.usage.monthly,
-    daily: body.billing.usage.daily,
+    sanctionedCredits: body.billing.usage.sanctionedCredits,
+    availableCredits: body.billing.usage.availableCredits,
   };
 }
diff --git a/apps/x/packages/core/src/code-mode/acp/agents.ts b/apps/x/packages/core/src/code-mode/acp/agents.ts
deleted file mode 100644
index da06d8ea..00000000
--- a/apps/x/packages/core/src/code-mode/acp/agents.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { createRequire } from 'module';
-import * as path from 'path';
-import type { CodingAgent } from './types.js';
-import { resolveClaudeExecutable } from './claude-exec.js';
-
-const require = createRequire(import.meta.url);
-
-// The ACP adapter npm package that exposes each coding agent as an ACP server.
-const ADAPTER_PACKAGE: Record<CodingAgent, string> = {
-    claude: '@agentclientprotocol/claude-agent-acp',
-    codex: '@agentclientprotocol/codex-acp',
-};
-
-export interface AgentLaunchSpec {
-    /** Executable to spawn — always `node` so we never hit the Windows .cmd EINVAL. */
-    command: string;
-    /** Args = [adapter entry script]. */
-    args: string[];
-    /** Extra env merged over process.env (e.g. CLAUDE_CODE_EXECUTABLE on Windows). */
-    env: NodeJS.ProcessEnv;
-}
-
-// Resolve the adapter's executable ENTRY (its `bin`, not its library `main`) to an
-// absolute path so we can spawn it directly with `node <entry>`. createRequire lets
-// us resolve workspace/pnpm-installed packages from this module's location.
-function resolveAdapterEntry(pkg: string): string {
-    const pkgJsonPath = require.resolve(`${pkg}/package.json`);
-    const pkgDir = path.dirname(pkgJsonPath);
-    const pkgJson = require(`${pkg}/package.json`) as { bin?: string | Record<string, string> };
-    const bin = pkgJson.bin;
-    const rel = typeof bin === 'string' ? bin : bin ? Object.values(bin)[0] : undefined;
-    if (!rel) {
-        throw new Error(`ACP adapter ${pkg} has no bin entry to spawn`);
-    }
-    return path.join(pkgDir, rel);
-}
-
-export function getAgentLaunchSpec(agent: CodingAgent): AgentLaunchSpec {
-    const entry = resolveAdapterEntry(ADAPTER_PACKAGE[agent]);
-    const env: NodeJS.ProcessEnv = { ...process.env };
-
-    // Point the Claude adapter at the real claude executable. On Windows this is
-    // mandatory (Node can't spawn the .cmd shim — EINVAL); on macOS/Linux it's a
-    // PATH safety net for GUI launches. Resolver is a no-op when claude isn't found,
-    // leaving the adapter to do its own lookup. (Codex relies on PATH for now — wire
-    // an equivalent when we add Codex support.)
-    if (agent === 'claude' && !env.CLAUDE_CODE_EXECUTABLE) {
-        const exe = resolveClaudeExecutable();
-        if (exe) env.CLAUDE_CODE_EXECUTABLE = exe;
-    }
-
-    // We spawn the adapter with process.execPath. Inside Electron's main process
-    // that is the Electron binary, NOT node — so set ELECTRON_RUN_AS_NODE=1 to make
-    // it behave as a plain Node runtime. (Harmless under a real node process, which
-    // ignores the var.) Without this the child never runs as node and the ACP stdio
-    // stream closes immediately ("ACP connection closed").
-    env.ELECTRON_RUN_AS_NODE = '1';
-
-    return { command: process.execPath, args: [entry], env };
-}
diff --git a/apps/x/packages/core/src/code-mode/acp/claude-exec.ts b/apps/x/packages/core/src/code-mode/acp/claude-exec.ts
deleted file mode 100644
index ae6c9c51..00000000
--- a/apps/x/packages/core/src/code-mode/acp/claude-exec.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import { execSync } from 'child_process';
-import * as path from 'path';
-import { existsSync, readFileSync } from 'fs';
-import { commonInstallPaths } from '../status.js';
-
-// Windows-only: Node refuses to spawn `.cmd` files without `shell: true` (EINVAL),
-// and the Claude ACP adapter spawns its executable directly. So we pre-resolve
-// claude's real `.exe` from the npm-shim layout. Used by resolveClaudeExecutable below.
-export function resolveClaudeExeOnWindows(): string | undefined {
-    // Candidate dirs = everything on PATH, plus well-known npm/pnpm/volta global
-    // bin dirs. Electron's runtime PATH can omit these even when the user's shell
-    // includes them, which would otherwise leave us unable to find claude.exe and
-    // force a fallback to claude.cmd (which Node refuses to spawn — EINVAL).
-    const home = process.env.USERPROFILE ?? '';
-    const appData = process.env.APPDATA || (home && path.join(home, 'AppData', 'Roaming'));
-    const localAppData = process.env.LOCALAPPDATA || (home && path.join(home, 'AppData', 'Local'));
-    const programFiles = process.env.ProgramFiles || 'C:\\Program Files';
-    const knownDirs = [
-        appData && path.join(appData, 'npm'),
-        localAppData && path.join(localAppData, 'npm'),
-        appData && path.join(appData, 'pnpm'),
-        localAppData && path.join(localAppData, 'pnpm'),
-        home && path.join(home, '.volta', 'bin'),
-        path.join(programFiles, 'nodejs'),
-    ].filter(Boolean) as string[];
-
-    const pathDirs = (process.env.PATH ?? '').split(';').map((d) => d.trim()).filter(Boolean);
-    const seen = new Set<string>();
-    const candidates = [...pathDirs, ...knownDirs].filter((d) => {
-        const key = d.toLowerCase();
-        if (seen.has(key)) return false;
-        seen.add(key);
-        return true;
-    });
-
-    for (const dir of candidates) {
-        // Direct npm-shim layout: <dir>\node_modules\@anthropic-ai\claude-code\bin\claude.exe
-        const exeFromLayout = path.join(dir, 'node_modules', '@anthropic-ai', 'claude-code', 'bin', 'claude.exe');
-        if (existsSync(exeFromLayout)) return exeFromLayout;
-
-        // Otherwise parse the claude.cmd shim for the real exe path.
-        const cmdPath = path.join(dir, 'claude.cmd');
-        if (!existsSync(cmdPath)) continue;
-        try {
-            const content = readFileSync(cmdPath, 'utf-8');
-            const absMatch = content.match(/[A-Z]:[\\/][^\s"]*claude\.exe/i);
-            if (absMatch && existsSync(absMatch[0])) return absMatch[0];
-            const relMatch = content.match(/%~dp0[\\/]?([^\s"%]+claude\.exe)/i);
-            if (relMatch) {
-                const resolved = path.join(dir, relMatch[1]);
-                if (existsSync(resolved)) return resolved;
-            }
-        } catch {
-            // ignore shim parse failures
-        }
-    }
-    return undefined;
-}
-
-// macOS/Linux: find the real `claude` binary. Unlike Windows this isn't a spawn
-// requirement (no .cmd problem) — it's a PATH safety net. Electron apps launched
-// from the GUI (Dock/Finder) often don't inherit the login shell's PATH, so the
-// spawned adapter may fail to find `claude`. We resolve the path here so the adapter
-// can be pointed straight at it.
-function resolveClaudeBinaryUnix(): string | undefined {
-    // Primary: a login shell sees the user's full PATH (~/.zprofile, nvm, homebrew, …).
-    try {
-        const out = execSync("/bin/sh -lc 'command -v claude'", { timeout: 5000, encoding: 'utf-8' }).trim();
-        if (out && existsSync(out)) return out;
-    } catch {
-        // not found on the login-shell PATH
-    }
-    // Fallback: scan well-known install locations directly.
-    for (const candidate of commonInstallPaths('claude')) {
-        if (existsSync(candidate)) return candidate;
-    }
-    return undefined;
-}
-
-let cached: string | undefined;
-
-// Cross-platform: the real `claude` executable to hand the ACP adapter via
-// CLAUDE_CODE_EXECUTABLE (the adapter prefers this env var on every OS). Returns
-// undefined if it can't be found — callers then fall back to the adapter's own lookup.
-// Cached on first success so we don't re-probe the shell on every cold start.
-export function resolveClaudeExecutable(): string | undefined {
-    if (cached) return cached;
-    const resolved = process.platform === 'win32' ? resolveClaudeExeOnWindows() : resolveClaudeBinaryUnix();
-    if (resolved) cached = resolved;
-    return resolved;
-}
diff --git a/apps/x/packages/core/src/code-mode/acp/client.ts b/apps/x/packages/core/src/code-mode/acp/client.ts
deleted file mode 100644
index 5c2bd1ba..00000000
--- a/apps/x/packages/core/src/code-mode/acp/client.ts
+++ /dev/null
@@ -1,219 +0,0 @@
-import { spawn, type ChildProcess } from 'child_process';
-import { Writable, Readable } from 'node:stream';
-import fs from 'fs/promises';
-import {
-    ClientSideConnection,
-    ndJsonStream,
-    PROTOCOL_VERSION,
-    type Client,
-    type RequestPermissionRequest,
-    type RequestPermissionResponse,
-    type SessionNotification,
-    type SessionUpdate,
-    type PromptResponse,
-    type ReadTextFileRequest,
-    type ReadTextFileResponse,
-    type WriteTextFileRequest,
-    type WriteTextFileResponse,
-} from '@agentclientprotocol/sdk';
-import type { CodingAgent, CodeRunEvent } from './types.js';
-import type { PermissionBroker } from './permission-broker.js';
-import { getAgentLaunchSpec } from './agents.js';
-
-export interface AcpClientOptions {
-    agent: CodingAgent;
-    cwd: string;
-    broker: PermissionBroker;
-    onEvent: (event: CodeRunEvent) => void;
-}
-
-// Map a raw ACP session/update notification onto our small CodeRunEvent union.
-function toEvent(update: SessionUpdate): CodeRunEvent {
-    switch (update.sessionUpdate) {
-        case 'agent_message_chunk':
-        case 'user_message_chunk': {
-            const c = update.content;
-            const role = update.sessionUpdate === 'user_message_chunk' ? 'user' : 'agent';
-            return { type: 'message', role, text: c.type === 'text' ? c.text : `[${c.type}]` };
-        }
-        case 'agent_thought_chunk':
-            return { type: 'thought' };
-        case 'tool_call':
-            return {
-                type: 'tool_call',
-                id: update.toolCallId,
-                title: update.title,
-                kind: update.kind ?? undefined,
-                status: update.status ?? undefined,
-            };
-        case 'tool_call_update': {
-            const diffs = (update.content ?? [])
-                .filter((c): c is Extract<typeof c, { type: 'diff' }> => c.type === 'diff')
-                .map((c) => c.path);
-            return { type: 'tool_call_update', id: update.toolCallId, status: update.status ?? undefined, diffs };
-        }
-        case 'plan':
-            return {
-                type: 'plan',
-                entries: (update.entries ?? []).map((e) => ({
-                    content: e.content,
-                    status: e.status ?? undefined,
-                    priority: e.priority ?? undefined,
-                })),
-            };
-        default:
-            return { type: 'other', sessionUpdate: update.sessionUpdate };
-    }
-}
-
-// Owns one spawned adapter process + ACP connection. Stateless about sessions —
-// the manager decides whether to newSession or loadSession.
-//
-// The connection is long-lived and reused across follow-up prompts, but each prompt
-// may stream to a different message's UI, so broker + onEvent are swappable via
-// setHandlers() rather than fixed at construction.
-export class AcpClient {
-    readonly agent: CodingAgent;
-    readonly cwd: string;
-    private broker: PermissionBroker;
-    private onEvent: (event: CodeRunEvent) => void;
-    private child?: ChildProcess;
-    private connection?: ClientSideConnection;
-    private loadSession_ = false;
-    // Diagnostics: the adapter's stderr/exit are captured so a dropped connection
-    // reports WHY (e.g. a crash) instead of the SDK's bare "ACP connection closed".
-    private stderrTail = '';
-    private exitInfo: string | null = null;
-
-    constructor(opts: AcpClientOptions) {
-        this.agent = opts.agent;
-        this.cwd = opts.cwd;
-        this.broker = opts.broker;
-        this.onEvent = opts.onEvent;
-    }
-
-    get loadSupported(): boolean {
-        return this.loadSession_;
-    }
-
-    // Re-point the live connection at a new prompt's broker / event sink.
-    setHandlers(broker: PermissionBroker, onEvent: (event: CodeRunEvent) => void): void {
-        this.broker = broker;
-        this.onEvent = onEvent;
-    }
-
-    // Spawn the adapter and negotiate the protocol. Returns once initialized.
-    async start(): Promise<void> {
-        const spec = getAgentLaunchSpec(this.agent);
-        const child = spawn(spec.command, spec.args, {
-            cwd: this.cwd,
-            env: spec.env,
-            // Capture stderr (not inherit) so we can attribute a dropped connection.
-            stdio: ['pipe', 'pipe', 'pipe'],
-        });
-        this.child = child;
-        child.stderr?.on('data', (d: Buffer) => {
-            this.stderrTail = (this.stderrTail + d.toString()).slice(-4000);
-        });
-        child.on('exit', (code, signal) => {
-            this.exitInfo = `adapter exited (code ${code}${signal ? `, signal ${signal}` : ''})`;
-        });
-        child.on('error', (err) => {
-            this.stderrTail = (this.stderrTail + `\nspawn error: ${err.message}`).slice(-4000);
-        });
-
-        const stream = ndJsonStream(
-            Writable.toWeb(child.stdin!) as WritableStream<Uint8Array>,
-            Readable.toWeb(child.stdout!) as ReadableStream<Uint8Array>,
-        );
-        const client = this.buildClient();
-        this.connection = new ClientSideConnection(() => client, stream);
-
-        try {
-            const init = await this.connection.initialize({
-                protocolVersion: PROTOCOL_VERSION,
-                clientCapabilities: { fs: { readTextFile: true, writeTextFile: true } },
-            });
-            this.loadSession_ = init.agentCapabilities?.loadSession === true;
-        } catch (e) {
-            throw this.enrich(e, 'initialize');
-        }
-    }
-
-    async newSession(): Promise<string> {
-        try {
-            const res = await this.conn().newSession({ cwd: this.cwd, mcpServers: [] });
-            return res.sessionId;
-        } catch (e) {
-            throw this.enrich(e, 'newSession');
-        }
-    }
-
-    async loadSession(sessionId: string): Promise<void> {
-        try {
-            await this.conn().loadSession({ sessionId, cwd: this.cwd, mcpServers: [] });
-        } catch (e) {
-            throw this.enrich(e, 'loadSession');
-        }
-    }
-
-    async prompt(sessionId: string, text: string): Promise<PromptResponse> {
-        try {
-            return await this.conn().prompt({ sessionId, prompt: [{ type: 'text', text }] });
-        } catch (e) {
-            throw this.enrich(e, 'prompt');
-        }
-    }
-
-    // Wrap a connection error with the adapter's exit/stderr so failures are
-    // self-explanatory rather than the SDK's opaque "ACP connection closed".
-    private enrich(err: unknown, phase: string): Error {
-        const base = err instanceof Error ? err.message : String(err);
-        const parts = [
-            this.exitInfo,
-            this.stderrTail.trim() ? `adapter output: ${this.stderrTail.trim().slice(-1200)}` : '',
-        ].filter(Boolean);
-        return new Error(parts.length ? `${base} — ${parts.join(' | ')} [during ${phase}]` : `${base} [during ${phase}]`);
-    }
-
-    async cancel(sessionId: string): Promise<void> {
-        await this.conn().cancel({ sessionId });
-    }
-
-    dispose(): void {
-        try {
-            this.child?.kill();
-        } catch {
-            // already gone
-        }
-        this.child = undefined;
-        this.connection = undefined;
-    }
-
-    private conn(): ClientSideConnection {
-        if (!this.connection) throw new Error('AcpClient not started');
-        return this.connection;
-    }
-
-    // The client side of ACP: the agent calls these on us. These read the CURRENT
-    // handlers off `self` so follow-up prompts can swap them via setHandlers().
-    private buildClient(): Client {
-        const self = this;
-        return {
-            async requestPermission(params: RequestPermissionRequest): Promise<RequestPermissionResponse> {
-                return self.broker.resolve(params);
-            },
-            async sessionUpdate(params: SessionNotification): Promise<void> {
-                self.onEvent(toEvent(params.update));
-            },
-            async readTextFile(params: ReadTextFileRequest): Promise<ReadTextFileResponse> {
-                const content = await fs.readFile(params.path, 'utf8');
-                return { content };
-            },
-            async writeTextFile(params: WriteTextFileRequest): Promise<WriteTextFileResponse> {
-                await fs.writeFile(params.path, params.content);
-                return {};
-            },
-        };
-    }
-}
diff --git a/apps/x/packages/core/src/code-mode/acp/manager.ts b/apps/x/packages/core/src/code-mode/acp/manager.ts
deleted file mode 100644
index 04ccdebd..00000000
--- a/apps/x/packages/core/src/code-mode/acp/manager.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-import type { ApprovalPolicy, CodeRunEvent, CodingAgent, PermissionAsk, PermissionDecision, RunPromptResult } from './types.js';
-import { AcpClient } from './client.js';
-import { PermissionBroker } from './permission-broker.js';
-import { readStoredSession, writeStoredSession, clearStoredSession } from './session-store.js';
-
-export interface RunPromptArgs {
-    runId: string;
-    agent: CodingAgent;
-    cwd: string;
-    prompt: string;
-    policy: ApprovalPolicy;
-    /** Called when the policy needs the user to decide (the "ask" path). */
-    ask: (ask: PermissionAsk) => Promise<PermissionDecision>;
-    /** Stream sink for this prompt's run. */
-    onEvent: (event: CodeRunEvent) => void;
-    /** Aborts the turn on stop; the manager cancels then force-kills the adapter. */
-    signal?: AbortSignal;
-}
-
-interface ActiveRun {
-    client: AcpClient;
-    sessionId: string;
-    agent: CodingAgent;
-    cwd: string;
-    // Prompts currently streaming on this connection. Disposal is deferred while
-    // this is > 0 so we never tear down a connection mid-turn.
-    inflight: number;
-    // Pending grace-window teardown, cleared if the run is reused before it fires.
-    disposeTimer?: ReturnType<typeof setTimeout>;
-}
-
-// How long a connection stays warm after its last turn ends before we tear it down.
-// A coding "turn" is one code_agent_run tool call; we keep the adapter briefly so
-// back-to-back calls within one copilot turn (edit -> test -> fix) and quick user
-// follow-ups reuse the warm connection instead of cold-starting. Set to 0 for strict
-// per-turn teardown. Context is never lost either way: the next turn resumes the
-// persisted session via session/load.
-const DISPOSE_GRACE_MS = 60_000;
-
-// On stop, how long to let the adapter cancel gracefully (ACP session/cancel) before
-// we force-kill it. The kill guarantees the turn unwinds even if the adapter ignores
-// cancel or is blocked — otherwise a hung prompt would lock the chat indefinitely.
-const CANCEL_GRACE_MS = 2_000;
-
-// Drives ACP coding sessions. A connection's lifetime is scoped to the agent turn
-// (one code_agent_run): it is torn down a short grace window after the turn ends, so
-// idle chats hold no adapter processes. Turns that land within the grace window reuse
-// the warm connection; anything colder (grace elapsed, or after an app restart)
-// resumes the persisted session via session/load.
-export class CodeModeManager {
-    private readonly runs = new Map<string, ActiveRun>();
-
-    async runPrompt(args: RunPromptArgs): Promise<RunPromptResult> {
-        const { runId, agent, cwd, prompt, policy, ask, onEvent, signal } = args;
-
-        const broker = new PermissionBroker({
-            policy,
-            ask,
-            onResolved: (a, decision, auto) => onEvent({ type: 'permission', ask: a, decision, auto }),
-        });
-
-        const run = await this.ensureRun(runId, agent, cwd, broker, onEvent);
-        run.inflight++;
-
-        let graceTimer: ReturnType<typeof setTimeout> | undefined;
-        let onAbort: (() => void) | undefined;
-        try {
-            const promptP = run.client.prompt(run.sessionId, prompt);
-            // We may stop awaiting this prompt below (force-kill on stop rejects it);
-            // attach a no-op catch so the orphaned rejection isn't flagged.
-            promptP.catch(() => {});
-
-            // Stop handling: on abort, ask the adapter to cancel; if it hasn't unwound
-            // within the grace, force-kill it and resolve as cancelled. This guarantees
-            // the turn ends even if the adapter ignores cancel or is wedged — a hung
-            // prompt would otherwise lock the chat (no run-stopped, composer disabled).
-            const cancelledP = new Promise<{ stopReason: string }>((resolve) => {
-                if (!signal) return;
-                onAbort = () => {
-                    run.client.cancel(run.sessionId).catch(() => {});
-                    graceTimer = setTimeout(() => {
-                        this.dispose(runId);
-                        resolve({ stopReason: 'cancelled' });
-                    }, CANCEL_GRACE_MS);
-                    graceTimer.unref?.();
-                };
-                if (signal.aborted) onAbort();
-                else signal.addEventListener('abort', onAbort, { once: true });
-            });
-
-            const res = await Promise.race([promptP, cancelledP]);
-            return { stopReason: res.stopReason, sessionId: run.sessionId };
-        } catch (e) {
-            // A kill-induced "connection closed" during a stop is an expected cancel.
-            if (signal?.aborted) return { stopReason: 'cancelled', sessionId: run.sessionId };
-            throw e;
-        } finally {
-            if (signal && onAbort) signal.removeEventListener('abort', onAbort);
-            if (graceTimer) clearTimeout(graceTimer);
-            run.inflight--;
-            this.scheduleDispose(runId);
-        }
-    }
-
-    dispose(runId: string): void {
-        const run = this.runs.get(runId);
-        if (!run) return;
-        this.cancelDispose(run);
-        run.client.dispose();
-        this.runs.delete(runId);
-    }
-
-    // Tear down the connection a grace window after its last turn ends. Skipped while a
-    // prompt is still streaming, and re-armed when each turn ends so the window measures
-    // idle-since-last-activity. With grace 0 we dispose immediately (strict per-turn).
-    private scheduleDispose(runId: string): void {
-        const run = this.runs.get(runId);
-        if (!run || run.inflight > 0) return;
-        this.cancelDispose(run);
-        if (DISPOSE_GRACE_MS <= 0) {
-            this.dispose(runId);
-            return;
-        }
-        run.disposeTimer = setTimeout(() => {
-            const r = this.runs.get(runId);
-            if (r && r.inflight === 0) this.dispose(runId);
-        }, DISPOSE_GRACE_MS);
-        // A pending teardown timer must not keep the process alive at quit.
-        run.disposeTimer.unref?.();
-    }
-
-    private cancelDispose(run: ActiveRun): void {
-        if (run.disposeTimer) {
-            clearTimeout(run.disposeTimer);
-            run.disposeTimer = undefined;
-        }
-    }
-
-    disposeAll(): void {
-        for (const runId of [...this.runs.keys()]) this.dispose(runId);
-    }
-
-    // Reuse the warm connection if it matches; otherwise (cold start, or the user
-    // switched agent/cwd for this chat) build a fresh one and create-or-resume its session.
-    private async ensureRun(
-        runId: string,
-        agent: CodingAgent,
-        cwd: string,
-        broker: PermissionBroker,
-        onEvent: (event: CodeRunEvent) => void,
-    ): Promise<ActiveRun> {
-        const existing = this.runs.get(runId);
-        if (existing && existing.agent === agent && existing.cwd === cwd) {
-            this.cancelDispose(existing); // reused before its grace window elapsed
-            existing.client.setHandlers(broker, onEvent);
-            return existing;
-        }
-        if (existing) this.dispose(runId); // agent/cwd changed — start over
-
-        const client = new AcpClient({ agent, cwd, broker, onEvent });
-        await client.start();
-
-        const sessionId = await this.openSession(runId, agent, cwd, client);
-        const run: ActiveRun = { client, sessionId, agent, cwd, inflight: 0 };
-        this.runs.set(runId, run);
-        return run;
-    }
-
-    // Resume the persisted session for this chat when possible; else start a new one
-    // and persist its id so a later restart can resume it.
-    private async openSession(runId: string, agent: CodingAgent, cwd: string, client: AcpClient): Promise<string> {
-        const stored = await readStoredSession(runId);
-        if (stored && stored.agent === agent && stored.cwd === cwd && client.loadSupported) {
-            try {
-                await client.loadSession(stored.sessionId);
-                return stored.sessionId;
-            } catch {
-                // Stored session is stale/unloadable — fall through to a fresh one.
-                await clearStoredSession(runId);
-            }
-        }
-        const sessionId = await client.newSession();
-        await writeStoredSession({ runId, agent, cwd, sessionId });
-        return sessionId;
-    }
-}
diff --git a/apps/x/packages/core/src/code-mode/acp/permission-broker.ts b/apps/x/packages/core/src/code-mode/acp/permission-broker.ts
deleted file mode 100644
index 9699dec4..00000000
--- a/apps/x/packages/core/src/code-mode/acp/permission-broker.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import type {
-    RequestPermissionRequest,
-    RequestPermissionResponse,
-    PermissionOption,
-    PermissionOptionKind,
-} from '@agentclientprotocol/sdk';
-import type { ApprovalPolicy, PermissionDecision, PermissionAsk } from './types.js';
-
-// Tool kinds that don't mutate anything — eligible for `auto-approve-reads`.
-const READ_KINDS = new Set(['read', 'search', 'fetch', 'think']);
-
-function toAsk(request: RequestPermissionRequest): PermissionAsk {
-    const tc = request.toolCall;
-    const kind = tc.kind ?? undefined;
-    const title = tc.title ?? kind ?? 'Tool call';
-    return {
-        toolCallId: tc.toolCallId ?? undefined,
-        title,
-        kind,
-        isRead: kind ? READ_KINDS.has(kind) : false,
-    };
-}
-
-// Map a desired decision to one of the options the agent actually offered.
-// Agents may offer only a subset (e.g. allow_once + reject_once, no allow_always),
-// so we fall back within the same allow/reject family before giving up.
-function pickOption(options: PermissionOption[], decision: PermissionDecision): PermissionOption | undefined {
-    const order: Record<PermissionDecision, PermissionOptionKind[]> = {
-        allow_always: ['allow_always', 'allow_once'],
-        allow_once: ['allow_once', 'allow_always'],
-        reject: ['reject_once', 'reject_always'],
-    };
-    for (const kind of order[decision]) {
-        const found = options.find((o) => o.kind === kind);
-        if (found) return found;
-    }
-    return undefined;
-}
-
-function selected(optionId: string): RequestPermissionResponse {
-    return { outcome: { outcome: 'selected', optionId } };
-}
-
-// A request's identity for "always allow" memory: prefer tool kind, else title.
-function memoryKey(ask: PermissionAsk): string {
-    return ask.kind ? `kind:${ask.kind}` : `title:${ask.title}`;
-}
-
-export interface PermissionBrokerOptions {
-    policy: ApprovalPolicy;
-    // Called only when the policy can't decide on its own (the "ask" path).
-    ask: (ask: PermissionAsk) => Promise<PermissionDecision>;
-    // Notified of every resolved request so the engine can emit a stream event.
-    onResolved?: (ask: PermissionAsk, decision: PermissionDecision, auto: boolean) => void;
-}
-
-// Decides how to answer the agent's requestPermission calls. Holds per-session
-// "always allow" memory so a one-time approval sticks for the rest of the run.
-export class PermissionBroker {
-    private readonly opts: PermissionBrokerOptions;
-    private readonly alwaysAllow = new Set<string>();
-
-    constructor(opts: PermissionBrokerOptions) {
-        this.opts = opts;
-    }
-
-    async resolve(request: RequestPermissionRequest): Promise<RequestPermissionResponse> {
-        const ask = toAsk(request);
-        const key = memoryKey(ask);
-
-        const finish = (decision: PermissionDecision, auto: boolean): RequestPermissionResponse => {
-            if (decision === 'allow_always') this.alwaysAllow.add(key);
-            this.opts.onResolved?.(ask, decision, auto);
-            const opt = pickOption(request.options, decision);
-            // If the agent offered no matching option we fall back to its first one
-            // (don't deadlock the turn); decision precedence above keeps this rare.
-            return selected(opt?.optionId ?? request.options[0]?.optionId ?? '');
-        };
-
-        // 1. Sticky "always allow" from earlier this session.
-        if (this.alwaysAllow.has(key)) return finish('allow_always', true);
-
-        // 2. Policy-level auto decisions.
-        if (this.opts.policy === 'yolo') return finish('allow_always', true);
-        if (this.opts.policy === 'auto-approve-reads' && ask.isRead) return finish('allow_once', true);
-
-        // 3. Ask the user.
-        const decision = await this.opts.ask(ask);
-        return finish(decision, false);
-    }
-}
diff --git a/apps/x/packages/core/src/code-mode/acp/permission-registry.ts b/apps/x/packages/core/src/code-mode/acp/permission-registry.ts
deleted file mode 100644
index 862f2de4..00000000
--- a/apps/x/packages/core/src/code-mode/acp/permission-registry.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import type { PermissionDecision } from './types.js';
-
-interface Pending {
-    runId: string;
-    resolve: (decision: PermissionDecision) => void;
-}
-
-// Holds in-flight mid-run permission asks. The agent (via the broker) calls
-// request() which BLOCKS the coding turn until the user answers; the renderer's
-// answer arrives over IPC and calls resolve(). This is separate from the LLM
-// tool-loop's pre-call permission gate, which can't model a mid-execution wait.
-export class CodePermissionRegistry {
-    private readonly pending = new Map<string, Pending>();
-    private counter = 0;
-
-    // Register a pending ask, hand the generated requestId to `emit` (so the caller
-    // can publish the UI event), and resolve once the user answers.
-    request(runId: string, emit: (requestId: string) => void): Promise<PermissionDecision> {
-        const requestId = `cpr-${runId}-${++this.counter}`;
-        return new Promise<PermissionDecision>((resolve) => {
-            this.pending.set(requestId, { runId, resolve });
-            emit(requestId);
-        });
-    }
-
-    // Called from the IPC handler when the user answers a card.
-    resolve(requestId: string, decision: PermissionDecision): void {
-        const entry = this.pending.get(requestId);
-        if (!entry) return;
-        this.pending.delete(requestId);
-        entry.resolve(decision);
-    }
-
-    // On run stop/cancel: reject anything still waiting so the turn can unwind.
-    cancelRun(runId: string): void {
-        for (const [id, entry] of [...this.pending]) {
-            if (entry.runId === runId) {
-                this.pending.delete(id);
-                entry.resolve('reject');
-            }
-        }
-    }
-}
diff --git a/apps/x/packages/core/src/code-mode/acp/session-store.ts b/apps/x/packages/core/src/code-mode/acp/session-store.ts
deleted file mode 100644
index e5e45666..00000000
--- a/apps/x/packages/core/src/code-mode/acp/session-store.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import fs from 'fs/promises';
-import path from 'path';
-import { WorkDir } from '../../config/config.js';
-import type { CodingAgent } from './types.js';
-
-// One ACP session is pinned per chat run. We persist its sessionId (plus the agent
-// and cwd it belongs to) so reopening the chat after an app restart can resume the
-// same agent context via session/load instead of starting over.
-export interface StoredSession {
-    runId: string;
-    agent: CodingAgent;
-    cwd: string;
-    sessionId: string;
-}
-
-// Per-run ACP session state lives in its own directory (not WorkDir/config): it's
-// runtime state that accumulates one file per chat run, so it's kept separate from
-// user/app config to be listed and cleaned up on its own.
-const SESSIONS_DIR = path.join(WorkDir, 'code-mode', 'sessions');
-
-function sessionFile(runId: string): string {
-    return path.join(SESSIONS_DIR, `${runId}.json`);
-}
-
-export async function readStoredSession(runId: string): Promise<StoredSession | null> {
-    try {
-        const raw = await fs.readFile(sessionFile(runId), 'utf8');
-        const parsed = JSON.parse(raw) as StoredSession;
-        if (parsed && parsed.sessionId && parsed.agent && parsed.cwd) return parsed;
-        return null;
-    } catch {
-        return null;
-    }
-}
-
-export async function writeStoredSession(session: StoredSession): Promise<void> {
-    const file = sessionFile(session.runId);
-    await fs.mkdir(path.dirname(file), { recursive: true });
-    await fs.writeFile(file, JSON.stringify(session, null, 2));
-}
-
-export async function clearStoredSession(runId: string): Promise<void> {
-    try {
-        await fs.rm(sessionFile(runId), { force: true });
-    } catch {
-        // best effort
-    }
-}
diff --git a/apps/x/packages/core/src/code-mode/acp/types.ts b/apps/x/packages/core/src/code-mode/acp/types.ts
deleted file mode 100644
index 6fafd438..00000000
--- a/apps/x/packages/core/src/code-mode/acp/types.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Rowboat-facing types for the ACP code-mode engine. The schemas live in
-// @x/shared (so the IPC/renderer layers share them); we re-export the inferred
-// types here so the engine modules import from one local barrel.
-export type {
-    CodingAgent,
-    ApprovalPolicy,
-    PermissionDecision,
-    PermissionAsk,
-    CodeRunEvent,
-    RunPromptResult,
-} from '@x/shared/dist/code-mode.js';
diff --git a/apps/x/packages/core/src/code-mode/index.ts b/apps/x/packages/core/src/code-mode/index.ts
deleted file mode 100644
index bdf2eecb..00000000
--- a/apps/x/packages/core/src/code-mode/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { CodeModeConfig, CodeModeAgentStatus, AgentStatus } from './types.js';
-export { FSCodeModeConfigRepo, type ICodeModeConfigRepo } from './repo.js';
-export { checkCodeModeAgentStatus } from './status.js';
diff --git a/apps/x/packages/core/src/code-mode/repo.ts b/apps/x/packages/core/src/code-mode/repo.ts
deleted file mode 100644
index 78092db8..00000000
--- a/apps/x/packages/core/src/code-mode/repo.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import fs from 'fs/promises';
-import path from 'path';
-import { WorkDir } from '../config/config.js';
-import { CodeModeConfig } from './types.js';
-import { checkCodeModeAgentStatus } from './status.js';
-
-export interface ICodeModeConfigRepo {
-    getConfig(): Promise<CodeModeConfig>;
-    setConfig(config: CodeModeConfig): Promise<void>;
-}
-
-export class FSCodeModeConfigRepo implements ICodeModeConfigRepo {
-    private readonly configPath = path.join(WorkDir, 'config', 'code-mode.json');
-    private agentReadyPromise: Promise<boolean> | null = null;
-
-    // Reuse the existing agent check (Claude Code / Codex installed + signed in),
-    // cached for the process lifetime so we probe (shell + keychain) at most once
-    // per session rather than on every getConfig call.
-    private agentReady(): Promise<boolean> {
-        if (!this.agentReadyPromise) {
-            this.agentReadyPromise = checkCodeModeAgentStatus()
-                .then((s) =>
-                    (s.claude.installed && s.claude.signedIn)
-                    || (s.codex.installed && s.codex.signedIn))
-                .catch(() => false);
-        }
-        return this.agentReadyPromise;
-    }
-
-    async getConfig(): Promise<CodeModeConfig> {
-        try {
-            // The file only exists once the user has explicitly toggled code mode
-            // in settings — always honor that choice.
-            const content = await fs.readFile(this.configPath, 'utf8');
-            return CodeModeConfig.parse(JSON.parse(content));
-        } catch {
-            // No explicit choice yet: enable automatically when a coding agent is ready.
-            return { enabled: await this.agentReady() };
-        }
-    }
-
-    async setConfig(config: CodeModeConfig): Promise<void> {
-        const validated = CodeModeConfig.parse(config);
-        await fs.mkdir(path.dirname(this.configPath), { recursive: true });
-        await fs.writeFile(this.configPath, JSON.stringify(validated, null, 2));
-    }
-}
diff --git a/apps/x/packages/core/src/code-mode/status.ts b/apps/x/packages/core/src/code-mode/status.ts
deleted file mode 100644
index a78b23f4..00000000
--- a/apps/x/packages/core/src/code-mode/status.ts
+++ /dev/null
@@ -1,199 +0,0 @@
-import { exec } from 'child_process';
-import { promisify } from 'util';
-import os from 'os';
-import path from 'path';
-import fs from 'fs/promises';
-import { existsSync } from 'fs';
-import { CodeModeAgentStatus } from './types.js';
-
-const execAsync = promisify(exec);
-
-// Where claude.cmd / codex.cmd typically live when installed via npm/pnpm/yarn.
-// We scan these directly because Electron's spawned shell sometimes doesn't
-// inherit the user's full PATH (especially on macOS GUI launches, and even on
-// Windows when global npm prefix isn't propagated to system PATH).
-export function commonInstallPaths(binary: string): string[] {
-    const home = os.homedir();
-    if (process.platform === 'win32') {
-        const appData = process.env.APPDATA || path.join(home, 'AppData', 'Roaming');
-        const localAppData = process.env.LOCALAPPDATA || path.join(home, 'AppData', 'Local');
-        const programFiles = process.env.ProgramFiles || 'C:\\Program Files';
-        return [
-            path.join(appData, 'npm', `${binary}.cmd`),
-            path.join(appData, 'npm', `${binary}.exe`),
-            path.join(localAppData, 'npm', `${binary}.cmd`),
-            path.join(localAppData, 'pnpm', `${binary}.cmd`),
-            path.join(home, 'AppData', 'Roaming', 'pnpm', `${binary}.cmd`),
-            path.join(programFiles, 'nodejs', `${binary}.cmd`),
-            path.join(home, '.volta', 'bin', `${binary}.cmd`),
-        ];
-    }
-    return [
-        '/usr/local/bin',
-        '/opt/homebrew/bin',          // Apple Silicon Homebrew
-        '/usr/bin',
-        path.join(home, '.npm-global', 'bin'),
-        path.join(home, '.local', 'bin'),
-        path.join(home, '.volta', 'bin'),
-        path.join(home, '.nvm', 'versions', 'node'),  // partial; nvm has versioned subdirs
-        path.join(home, 'bin'),
-    ].map(dir => path.join(dir, binary));
-}
-
-async function probeShell(binary: string): Promise<boolean> {
-    try {
-        if (process.platform === 'win32') {
-            const { stdout } = await execAsync(`where ${binary}`, { timeout: 5000 });
-            return stdout.trim().length > 0;
-        }
-        // Login shell so ~/.zprofile / ~/.bashrc PATH additions are visible —
-        // essential for Homebrew, nvm, asdf, volta installs on macOS GUI launches.
-        const { stdout } = await execAsync(`/bin/sh -lc 'command -v ${binary}'`, { timeout: 5000 });
-        return stdout.trim().length > 0;
-    } catch {
-        return false;
-    }
-}
-
-async function isInstalled(binary: string): Promise<boolean> {
-    if (await probeShell(binary)) return true;
-    // Fallback: scan well-known install locations directly.
-    for (const candidate of commonInstallPaths(binary)) {
-        if (existsSync(candidate)) return true;
-    }
-    return false;
-}
-
-function decodeJwtPayload(token: string): Record<string, unknown> | null {
-    try {
-        const parts = token.split('.');
-        if (parts.length < 2) return null;
-        const padded = parts[1].replace(/-/g, '+').replace(/_/g, '/');
-        const pad = padded.length % 4 === 0 ? '' : '='.repeat(4 - (padded.length % 4));
-        const json = Buffer.from(padded + pad, 'base64').toString('utf-8');
-        const parsed = JSON.parse(json);
-        return typeof parsed === 'object' && parsed !== null ? parsed as Record<string, unknown> : null;
-    } catch {
-        return null;
-    }
-}
-
-// Given the raw credentials JSON (from a file or the macOS Keychain), decide
-// whether it represents a usable signed-in state: a valid API key, an unexpired
-// access token, or a refresh token (which can mint a new access token).
-function isClaudeCredentialSignedIn(raw: string): boolean {
-    try {
-        const parsed = JSON.parse(raw) as Record<string, unknown>;
-
-        const oauth = parsed.claudeAiOauth as Record<string, unknown> | undefined;
-        if (oauth) {
-            const access = typeof oauth.accessToken === 'string' ? oauth.accessToken : '';
-            const refresh = typeof oauth.refreshToken === 'string' ? oauth.refreshToken : '';
-            if (refresh.length > 0) return true;
-            if (access.length > 0) {
-                if (typeof oauth.expiresAt === 'number' && oauth.expiresAt > 0 && oauth.expiresAt < Date.now()) {
-                    return false;
-                }
-                return true;
-            }
-        }
-
-        if (typeof parsed.apiKey === 'string' && parsed.apiKey.length > 10) return true;
-        if (typeof parsed.accessToken === 'string' && parsed.accessToken.length > 10) return true;
-    } catch {
-        // malformed JSON
-    }
-    return false;
-}
-
-// Reads Claude Code's credentials from the macOS login Keychain, where the
-// CLI stores them on macOS (service "Claude Code-credentials"). On Linux/Windows
-// it uses the ~/.claude/.credentials.json file instead, so this is a no-op there.
-//
-// Caveats:
-//  - The first read by this app (a different binary than the `claude` CLI that
-//    created the item) triggers a one-time macOS authorization dialog; the user
-//    must "Always Allow". Headless/SSH sessions can't show it and will fail.
-//  - If CLAUDE_CONFIG_DIR is set, Claude appends a SHA-256 suffix to the service
-//    name, which this lookup won't match — such setups usually keep the file too.
-async function readClaudeKeychainCredential(): Promise<string | null> {
-    if (process.platform !== 'darwin') return null;
-    try {
-        const { stdout } = await execAsync(
-            `security find-generic-password -s "Claude Code-credentials" -w`,
-            { timeout: 5000 },
-        );
-        const out = stdout.trim();
-        return out.length > 0 ? out : null;
-    } catch {
-        // not present in keychain
-        return null;
-    }
-}
-
-// Validates Claude Code auth. On macOS the credentials live in the login
-// Keychain; on Linux/Windows in ~/.claude/.credentials.json (or ~/.config
-// fallback). We check both so detection works across platforms.
-async function checkClaudeSignedIn(): Promise<boolean> {
-    const home = os.homedir();
-    const candidates = [
-        path.join(home, '.claude', '.credentials.json'),
-        path.join(home, '.config', 'claude', '.credentials.json'),
-    ];
-    for (const full of candidates) {
-        try {
-            const raw = await fs.readFile(full, 'utf-8');
-            if (isClaudeCredentialSignedIn(raw)) return true;
-        } catch {
-            // try next candidate
-        }
-    }
-
-    // macOS: credentials are stored in the Keychain rather than on disk.
-    const keychainRaw = await readClaudeKeychainCredential();
-    if (keychainRaw && isClaudeCredentialSignedIn(keychainRaw)) return true;
-
-    return false;
-}
-
-// Validates Codex auth at ~/.codex/auth.json on all platforms.
-// Considered signed in if API key set, or a refresh_token / access_token
-// exists. id_token expiry is intentionally NOT used as a rejection signal —
-// id_tokens are short-lived (~1h) but refresh_tokens persist for weeks.
-async function checkCodexSignedIn(): Promise<boolean> {
-    const home = os.homedir();
-    const full = path.join(home, '.codex', 'auth.json');
-    try {
-        const raw = await fs.readFile(full, 'utf-8');
-        const parsed = JSON.parse(raw) as Record<string, unknown>;
-
-        if (typeof parsed.OPENAI_API_KEY === 'string' && parsed.OPENAI_API_KEY.length > 10) return true;
-
-        const tokens = parsed.tokens as Record<string, unknown> | undefined;
-        if (tokens) {
-            const refresh = typeof tokens.refresh_token === 'string' ? tokens.refresh_token : '';
-            const access = typeof tokens.access_token === 'string' ? tokens.access_token : '';
-            const id = typeof tokens.id_token === 'string' ? tokens.id_token : '';
-            if (refresh.length > 0 || access.length > 0 || id.length > 0) return true;
-        }
-    } catch {
-        // file missing or unreadable
-    }
-    return false;
-}
-
-// Exported for diagnostics — silenced unused-var warning by re-export only.
-export { decodeJwtPayload };
-
-export async function checkCodeModeAgentStatus(): Promise<CodeModeAgentStatus> {
-    const [claudeInstalled, codexInstalled, claudeSignedIn, codexSignedIn] = await Promise.all([
-        isInstalled('claude'),
-        isInstalled('codex'),
-        checkClaudeSignedIn(),
-        checkCodexSignedIn(),
-    ]);
-    return {
-        claude: { installed: claudeInstalled, signedIn: claudeSignedIn },
-        codex: { installed: codexInstalled, signedIn: codexSignedIn },
-    };
-}
diff --git a/apps/x/packages/core/src/code-mode/types.ts b/apps/x/packages/core/src/code-mode/types.ts
deleted file mode 100644
index f52ae813..00000000
--- a/apps/x/packages/core/src/code-mode/types.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import z from "zod";
-import { ApprovalPolicy } from "@x/shared/dist/code-mode.js";
-
-export const CodeModeConfig = z.object({
-    enabled: z.boolean(),
-    // How the ACP engine answers the coding agent's permission requests.
-    // Optional for back-compat; the tool defaults to "ask" when unset.
-    approvalPolicy: ApprovalPolicy.optional(),
-});
-export type CodeModeConfig = z.infer<typeof CodeModeConfig>;
-
-export const AgentStatus = z.object({
-    installed: z.boolean(),
-    signedIn: z.boolean(),
-});
-export type AgentStatus = z.infer<typeof AgentStatus>;
-
-export const CodeModeAgentStatus = z.object({
-    claude: AgentStatus,
-    codex: AgentStatus,
-});
-export type CodeModeAgentStatus = z.infer<typeof CodeModeAgentStatus>;
diff --git a/apps/x/packages/core/src/config/config.ts b/apps/x/packages/core/src/config/config.ts
index 7f230514..3d320172 100644
--- a/apps/x/packages/core/src/config/config.ts
+++ b/apps/x/packages/core/src/config/config.ts
@@ -49,10 +49,9 @@ function ensureDefaultConfigs() {
 ensureDirs();
 ensureDefaultConfigs();
 
-// One-time deprecation for the old Today.md live dashboard. New installs no
-// longer get a generated Today.md; existing files are paused in place.
-import('../knowledge/deprecate_today_note.js').then(m => m.deprecateTodayNote()).catch(err => {
-    console.error('[TodayNoteDeprecation] Failed to deprecate Today.md:', err);
+// Ensure default knowledge files exist
+import('../knowledge/ensure_daily_note.js').then(m => m.ensureDailyNote()).catch(err => {
+    console.error('[DailyNote] Failed to ensure daily note:', err);
 });
 
 // Initialize version history repo (async, fire-and-forget on startup)
diff --git a/apps/x/packages/core/src/config/security.ts b/apps/x/packages/core/src/config/security.ts
index 680b8ad8..199a6fc6 100644
--- a/apps/x/packages/core/src/config/security.ts
+++ b/apps/x/packages/core/src/config/security.ts
@@ -42,61 +42,26 @@ const DEFAULT_ALLOW_LIST = [
     "yq"
 ]
 
-export type FileAccessOperation = "read" | "list" | "search" | "write" | "delete";
-
-export type FileAccessGrant = {
-    operation: FileAccessOperation;
-    pathPrefix: string;
-};
-
 let cachedAllowList: string[] | null = null;
-let cachedFileAccessAllowList: FileAccessGrant[] | null = null;
 let cachedMtimeMs: number | null = null;
 
 export async function addToSecurityConfig(commands: string[]): Promise<void> {
     ensureSecurityConfigSync();
-    const current = readSecurityConfig();
-    const merged = new Set(current.allowedCommands);
+    const current = readAllowList();
+    const merged = new Set(current);
     for (const cmd of commands) {
         const normalized = cmd.trim().toLowerCase();
         if (normalized) merged.add(normalized);
     }
     await fsPromises.writeFile(
         SECURITY_CONFIG_PATH,
-        JSON.stringify({
-            allowedCommands: Array.from(merged).sort(),
-            allowedFileAccess: current.allowedFileAccess,
-        }, null, 2) + "\n",
+        JSON.stringify(Array.from(merged).sort(), null, 2) + "\n",
         "utf8",
     );
     // Reset cache so next read picks up the new file
     resetSecurityAllowListCache();
 }
 
-export async function addFileAccessGrant(grant: FileAccessGrant): Promise<void> {
-    ensureSecurityConfigSync();
-    const current = readSecurityConfig();
-    const normalizedGrant = normalizeFileAccessGrant(grant);
-    const exists = current.allowedFileAccess.some(existing =>
-        existing.operation === normalizedGrant.operation
-        && existing.pathPrefix === normalizedGrant.pathPrefix
-    );
-    const allowedFileAccess = exists
-        ? current.allowedFileAccess
-        : [...current.allowedFileAccess, normalizedGrant].sort((a, b) =>
-            `${a.operation}:${a.pathPrefix}`.localeCompare(`${b.operation}:${b.pathPrefix}`)
-        );
-    await fsPromises.writeFile(
-        SECURITY_CONFIG_PATH,
-        JSON.stringify({
-            allowedCommands: current.allowedCommands,
-            allowedFileAccess,
-        }, null, 2) + "\n",
-        "utf8",
-    );
-    resetSecurityAllowListCache();
-}
-
 /**
  * Async function to ensure security config file exists.
  * Called explicitly at app startup via initConfigs().
@@ -138,74 +103,28 @@ function normalizeList(commands: unknown[]): string[] {
     return Array.from(seen);
 }
 
-function normalizeFileAccessGrant(grant: FileAccessGrant): FileAccessGrant {
-    return {
-        operation: grant.operation,
-        pathPrefix: path.resolve(grant.pathPrefix),
-    };
-}
-
-function normalizeFileAccessList(grants: unknown[]): FileAccessGrant[] {
-    const seen = new Set<string>();
-    const normalized: FileAccessGrant[] = [];
-    for (const entry of grants) {
-        if (!entry || typeof entry !== "object") continue;
-        const maybeGrant = entry as Record<string, unknown>;
-        const operation = maybeGrant.operation;
-        const pathPrefix = maybeGrant.pathPrefix;
-        if (
-            operation !== "read"
-            && operation !== "list"
-            && operation !== "search"
-            && operation !== "write"
-            && operation !== "delete"
-        ) {
-            continue;
-        }
-        if (typeof pathPrefix !== "string" || !pathPrefix.trim()) continue;
-        const grant = normalizeFileAccessGrant({ operation, pathPrefix });
-        const key = `${grant.operation}:${grant.pathPrefix}`;
-        if (seen.has(key)) continue;
-        seen.add(key);
-        normalized.push(grant);
-    }
-    return normalized;
-}
-
-function parseSecurityPayload(payload: unknown): { allowedCommands: string[]; allowedFileAccess: FileAccessGrant[] } {
+function parseSecurityPayload(payload: unknown): string[] {
     if (Array.isArray(payload)) {
-        return { allowedCommands: normalizeList(payload), allowedFileAccess: [] };
+        return normalizeList(payload);
     }
 
     if (payload && typeof payload === "object") {
         const maybeObject = payload as Record<string, unknown>;
-        const allowedFileAccess = Array.isArray(maybeObject.allowedFileAccess)
-            ? normalizeFileAccessList(maybeObject.allowedFileAccess)
-            : [];
-
-        if (Array.isArray(maybeObject.allowedCommands) || Array.isArray(maybeObject.allowedFileAccess)) {
-            return {
-                allowedCommands: Array.isArray(maybeObject.allowedCommands)
-                    ? normalizeList(maybeObject.allowedCommands)
-                    : [],
-                allowedFileAccess,
-            };
+        if (Array.isArray(maybeObject.allowedCommands)) {
+            return normalizeList(maybeObject.allowedCommands);
         }
 
         const dynamicList = Object.entries(maybeObject)
             .filter(([, value]) => Boolean(value))
             .map(([key]) => key);
 
-        return {
-            allowedCommands: normalizeList(dynamicList),
-            allowedFileAccess,
-        };
+        return normalizeList(dynamicList);
     }
 
-    return { allowedCommands: [], allowedFileAccess: [] };
+    return [];
 }
 
-function readSecurityConfig(): { allowedCommands: string[]; allowedFileAccess: FileAccessGrant[] } {
+function readAllowList(): string[] {
     ensureSecurityConfigSync();
 
     try {
@@ -214,14 +133,10 @@ function readSecurityConfig(): { allowedCommands: string[]; allowedFileAccess: F
         return parseSecurityPayload(parsed);
     } catch (error) {
         console.warn(`Failed to read security config at ${SECURITY_CONFIG_PATH}: ${error instanceof Error ? error.message : error}`);
-        return { allowedCommands: DEFAULT_ALLOW_LIST, allowedFileAccess: [] };
+        return DEFAULT_ALLOW_LIST;
     }
 }
 
-function readAllowList(): string[] {
-    return readSecurityConfig().allowedCommands;
-}
-
 export function getSecurityAllowList(): string[] {
     ensureSecurityConfigSync();
     try {
@@ -234,32 +149,12 @@ export function getSecurityAllowList(): string[] {
         return cachedAllowList;
     } catch {
         cachedAllowList = null;
-        cachedFileAccessAllowList = null;
         cachedMtimeMs = null;
         return readAllowList();
     }
 }
 
-export function getFileAccessAllowList(): FileAccessGrant[] {
-    ensureSecurityConfigSync();
-    try {
-        const stats = fs.statSync(SECURITY_CONFIG_PATH);
-        if (cachedFileAccessAllowList && cachedMtimeMs === stats.mtimeMs) {
-            return cachedFileAccessAllowList;
-        }
-        cachedFileAccessAllowList = readSecurityConfig().allowedFileAccess;
-        cachedMtimeMs = stats.mtimeMs;
-        return cachedFileAccessAllowList;
-    } catch {
-        cachedAllowList = null;
-        cachedFileAccessAllowList = null;
-        cachedMtimeMs = null;
-        return readSecurityConfig().allowedFileAccess;
-    }
-}
-
 export function resetSecurityAllowListCache() {
     cachedAllowList = null;
-    cachedFileAccessAllowList = null;
     cachedMtimeMs = null;
 }
diff --git a/apps/x/packages/core/src/di/container.ts b/apps/x/packages/core/src/di/container.ts
index d7b17ce7..9382de8b 100644
--- a/apps/x/packages/core/src/di/container.ts
+++ b/apps/x/packages/core/src/di/container.ts
@@ -11,13 +11,10 @@ import { IAgentRuntime, AgentRuntime } from "../agents/runtime.js";
 import { FSOAuthRepo, IOAuthRepo } from "../auth/repo.js";
 import { FSClientRegistrationRepo, IClientRegistrationRepo } from "../auth/client-repo.js";
 import { FSGranolaConfigRepo, IGranolaConfigRepo } from "../knowledge/granola/repo.js";
-import { FSCodeModeConfigRepo, ICodeModeConfigRepo } from "../code-mode/repo.js";
 import { IAbortRegistry, InMemoryAbortRegistry } from "../runs/abort-registry.js";
 import { FSAgentScheduleRepo, IAgentScheduleRepo } from "../agent-schedule/repo.js";
 import { FSAgentScheduleStateRepo, IAgentScheduleStateRepo } from "../agent-schedule/state-repo.js";
 import { FSSlackConfigRepo, ISlackConfigRepo } from "../slack/repo.js";
-import { CodeModeManager } from "../code-mode/acp/manager.js";
-import { CodePermissionRegistry } from "../code-mode/acp/permission-registry.js";
 import type { IBrowserControlService } from "../application/browser-control/service.js";
 import type { INotificationService } from "../application/notification/service.js";
 
@@ -41,16 +38,9 @@ container.register({
     oauthRepo: asClass<IOAuthRepo>(FSOAuthRepo).singleton(),
     clientRegistrationRepo: asClass<IClientRegistrationRepo>(FSClientRegistrationRepo).singleton(),
     granolaConfigRepo: asClass<IGranolaConfigRepo>(FSGranolaConfigRepo).singleton(),
-    codeModeConfigRepo: asClass<ICodeModeConfigRepo>(FSCodeModeConfigRepo).singleton(),
     agentScheduleRepo: asClass<IAgentScheduleRepo>(FSAgentScheduleRepo).singleton(),
     agentScheduleStateRepo: asClass<IAgentScheduleStateRepo>(FSAgentScheduleStateRepo).singleton(),
     slackConfigRepo: asClass<ISlackConfigRepo>(FSSlackConfigRepo).singleton(),
-
-    // ACP code-mode engine: the manager holds a live agent connection per chat only
-    // around an active turn (torn down after a short idle grace; resumed via
-    // session/load); the registry brokers mid-run approvals.
-    codeModeManager: asClass(CodeModeManager).singleton(),
-    codePermissionRegistry: asClass(CodePermissionRegistry).singleton(),
 });
 
 export default container;
diff --git a/apps/x/packages/core/src/events/consumer.ts b/apps/x/packages/core/src/events/consumer.ts
deleted file mode 100644
index 92f4b161..00000000
--- a/apps/x/packages/core/src/events/consumer.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import type { RowboatEvent } from '@x/shared/dist/events.js';
-
-/**
- * A target (live note, bg-task, …) that a consumer might fire on an event.
- * The `id` is consumer-defined — a workspace-relative path for live-note, a
- * slug for bg-task. The processor never interprets it.
- */
-export interface EventConsumerTarget {
-    id: string;
-    instructions: string;
-    eventMatchCriteria: string;
-}
-
-export interface EventConsumerFireResult {
-    runId: string | null;
-    error?: string;
-}
-
-/**
- * An event consumer registers itself with the event processor in `init.ts`.
- * On each pending event, the processor runs all consumers' `findCandidates`
- * concurrently (Pass-1 routing), then fires each consumer's candidates
- * sequentially (preserves per-target FIFO) while consumers run in parallel.
- */
-export interface EventConsumer {
-    /** Stable identifier for logging and the enriched event `consumers` map. */
-    name: string;
-
-    /** All eligible candidates this consumer would consider routing into. */
-    listEligibleTargets(): Promise<EventConsumerTarget[]>;
-
-    /**
-     * Pass-1 routing. The implementation usually short-circuits when
-     * `event.target?.consumer === this.name`, otherwise delegates to
-     * `routeBatch` from `./routing.js`.
-     */
-    findCandidates(event: RowboatEvent, targets: EventConsumerTarget[]): Promise<string[]>;
-
-    /** Fire the consumer's agent on a single candidate id. */
-    fireCandidate(event: RowboatEvent, id: string): Promise<EventConsumerFireResult>;
-}
diff --git a/apps/x/packages/core/src/events/init.ts b/apps/x/packages/core/src/events/init.ts
deleted file mode 100644
index 9dd5392a..00000000
--- a/apps/x/packages/core/src/events/init.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { PrefixLogger } from '@x/shared';
-import { processPendingEvents } from './processor.js';
-import { ensureEventDirs } from './producer.js';
-
-export { registerConsumer } from './processor.js';
-export type { EventConsumer, EventConsumerTarget, EventConsumerFireResult } from './consumer.js';
-export { routeBatch } from './routing.js';
-export type { RouteBatchOptions } from './routing.js';
-export { createEvent } from './producer.js';
-
-const log = new PrefixLogger('Events:Processor');
-const POLL_INTERVAL_MS = 5_000; // 5 seconds — events should feel responsive
-
-/**
- * Start the event processor's tick loop. Consumers must be registered via
- * `registerConsumer` before this is called.
- */
-export async function init(): Promise<void> {
-    log.log(`starting, polling every ${POLL_INTERVAL_MS / 1000}s`);
-    ensureEventDirs();
-
-    await processPendingEvents();
-
-    while (true) {
-        await new Promise(resolve => setTimeout(resolve, POLL_INTERVAL_MS));
-        try {
-            await processPendingEvents();
-        } catch (err) {
-            log.log(`tick error: ${err instanceof Error ? err.message : String(err)}`);
-        }
-    }
-}
diff --git a/apps/x/packages/core/src/events/processor.ts b/apps/x/packages/core/src/events/processor.ts
deleted file mode 100644
index 42119741..00000000
--- a/apps/x/packages/core/src/events/processor.ts
+++ /dev/null
@@ -1,170 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-import { events, PrefixLogger } from '@x/shared';
-import type { RowboatEvent, ConsumerResult } from '@x/shared/dist/events.js';
-import type { EventConsumer } from './consumer.js';
-import { PENDING_DIR, DONE_DIR, ensureEventDirs } from './producer.js';
-
-const log = new PrefixLogger('Events:Processor');
-
-let registeredConsumers: EventConsumer[] = [];
-
-export function registerConsumer(consumer: EventConsumer): void {
-    registeredConsumers.push(consumer);
-    log.log(`registered consumer: ${consumer.name}`);
-}
-
-/** @internal — for tests. */
-export function _resetConsumersForTests(): void {
-    registeredConsumers = [];
-}
-
-function moveEventToDone(filename: string, enriched: RowboatEvent): void {
-    const donePath = path.join(DONE_DIR, filename);
-    const pendingPath = path.join(PENDING_DIR, filename);
-    fs.writeFileSync(donePath, JSON.stringify(enriched, null, 2), 'utf-8');
-    try {
-        fs.unlinkSync(pendingPath);
-    } catch (err) {
-        log.log(`failed to remove pending event ${filename}: ${err instanceof Error ? err.message : String(err)}`);
-    }
-}
-
-/**
- * Materialize the legacy `targetFilePath` field — events written by the
- * pre-rename code carry the flat field; the new processor reads it as a
- * live-note targeted re-run.
- */
-function migrateLegacyTarget(event: RowboatEvent): RowboatEvent {
-    if (event.target || !event.targetFilePath) return event;
-    return { ...event, target: { consumer: 'live-note', id: event.targetFilePath } };
-}
-
-async function processOneEvent(filename: string): Promise<void> {
-    const pendingPath = path.join(PENDING_DIR, filename);
-
-    let event: RowboatEvent;
-    try {
-        const raw = fs.readFileSync(pendingPath, 'utf-8');
-        const parsed = JSON.parse(raw);
-        event = events.RowboatEventSchema.parse(parsed);
-        event = migrateLegacyTarget(event);
-    } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        log.log(`event:${filename} — malformed, moving to done with error: ${msg}`);
-        const stub: RowboatEvent = {
-            id: filename.replace(/\.json$/, ''),
-            source: 'unknown',
-            type: 'unknown',
-            createdAt: new Date().toISOString(),
-            payload: '',
-            processedAt: new Date().toISOString(),
-            error: `Failed to parse: ${msg}`,
-        };
-        moveEventToDone(filename, stub);
-        return;
-    }
-
-    log.log(`event:${event.id} — received source=${event.source} type=${event.type}`);
-
-    if (registeredConsumers.length === 0) {
-        // No consumers — drop with a note in `done/` so the dir doesn't fill.
-        const enriched: RowboatEvent = {
-            ...event,
-            processedAt: new Date().toISOString(),
-            consumers: {},
-        };
-        moveEventToDone(filename, enriched);
-        return;
-    }
-
-    // Pass-1: run all consumers' routing concurrently. Each consumer is
-    // responsible for short-circuiting when `event.target?.consumer === this.name`.
-    const passOne = await Promise.all(registeredConsumers.map(async (consumer) => {
-        try {
-            const targets = await consumer.listEligibleTargets();
-            const candidateIds = await consumer.findCandidates(event, targets);
-            return { consumer, candidateIds, error: undefined as string | undefined };
-        } catch (err) {
-            const msg = err instanceof Error ? err.message : String(err);
-            log.log(`event:${event.id} — consumer ${consumer.name} Pass-1 threw: ${msg}`);
-            return { consumer, candidateIds: [], error: msg };
-        }
-    }));
-
-    // Firing: each consumer fires its candidates sequentially (preserves
-    // per-target FIFO). Consumers run in parallel via Promise.all.
-    const fired = await Promise.all(passOne.map(async ({ consumer, candidateIds, error }) => {
-        const result: ConsumerResult = { candidateIds, runIds: [], errors: error ? [error] : [] };
-
-        for (const id of candidateIds) {
-            try {
-                const r = await consumer.fireCandidate(event, id);
-                if (r.runId) result.runIds.push(r.runId);
-                if (r.error) {
-                    result.errors!.push(`${id}: ${r.error}`);
-                }
-            } catch (err) {
-                const msg = err instanceof Error ? err.message : String(err);
-                log.log(`event:${event.id} — consumer ${consumer.name} candidate ${id} threw: ${msg}`);
-                result.errors!.push(`${id}: ${msg}`);
-            }
-        }
-
-        if (result.errors!.length === 0) {
-            delete result.errors;
-        }
-
-        const total = candidateIds.length;
-        if (total > 0) {
-            const errCount = result.errors?.length ?? 0;
-            const okCount = result.runIds.length;
-            log.log(`event:${event.id} — ${consumer.name} processed ok=${okCount} errors=${errCount}`);
-        }
-
-        return { name: consumer.name, result };
-    }));
-
-    const consumersMap: Record<string, ConsumerResult> = {};
-    for (const { name, result } of fired) {
-        consumersMap[name] = result;
-    }
-
-    const enriched: RowboatEvent = {
-        ...event,
-        processedAt: new Date().toISOString(),
-        consumers: consumersMap,
-    };
-
-    moveEventToDone(filename, enriched);
-}
-
-export async function processPendingEvents(): Promise<void> {
-    ensureEventDirs();
-
-    let filenames: string[];
-    try {
-        filenames = fs.readdirSync(PENDING_DIR).filter(f => f.endsWith('.json'));
-    } catch (err) {
-        log.log(`failed to read pending dir: ${err instanceof Error ? err.message : String(err)}`);
-        return;
-    }
-
-    if (filenames.length === 0) return;
-
-    // FIFO: monotonic IDs are lexicographically sortable
-    filenames.sort();
-
-    if (filenames.length > 1) {
-        log.log(`tick — ${filenames.length} pending events`);
-    }
-
-    for (const filename of filenames) {
-        try {
-            await processOneEvent(filename);
-        } catch (err) {
-            log.log(`event:${filename} — unhandled error: ${err instanceof Error ? err.message : String(err)}`);
-            // Keep the loop alive — don't move file, will retry on next tick
-        }
-    }
-}
diff --git a/apps/x/packages/core/src/events/producer.ts b/apps/x/packages/core/src/events/producer.ts
deleted file mode 100644
index 29faa894..00000000
--- a/apps/x/packages/core/src/events/producer.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-import type { RowboatEvent } from '@x/shared/dist/events.js';
-import { WorkDir } from '../config/config.js';
-import type { IMonotonicallyIncreasingIdGenerator } from '../application/lib/id-gen.js';
-import container from '../di/container.js';
-
-export const EVENTS_DIR = path.join(WorkDir, 'events');
-export const PENDING_DIR = path.join(EVENTS_DIR, 'pending');
-export const DONE_DIR = path.join(EVENTS_DIR, 'done');
-
-/**
- * Write a RowboatEvent to the events/pending/ directory. The filename is the
- * monotonically increasing ID so events sort by creation order. Producers
- * (gmail/calendar sync) call this in chronological order within a batch.
- */
-export async function createEvent(event: Omit<RowboatEvent, 'id'>): Promise<void> {
-    fs.mkdirSync(PENDING_DIR, { recursive: true });
-
-    const idGen = container.resolve<IMonotonicallyIncreasingIdGenerator>('idGenerator');
-    const id = await idGen.next();
-
-    const fullEvent: RowboatEvent = { id, ...event };
-    const filePath = path.join(PENDING_DIR, `${id}.json`);
-    fs.writeFileSync(filePath, JSON.stringify(fullEvent, null, 2), 'utf-8');
-}
-
-export function ensureEventDirs(): void {
-    fs.mkdirSync(PENDING_DIR, { recursive: true });
-    fs.mkdirSync(DONE_DIR, { recursive: true });
-}
diff --git a/apps/x/packages/core/src/events/routing.ts b/apps/x/packages/core/src/events/routing.ts
deleted file mode 100644
index 5f9e4222..00000000
--- a/apps/x/packages/core/src/events/routing.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import { generateObject } from 'ai';
-import type { LanguageModel } from 'ai';
-import { events, PrefixLogger } from '@x/shared';
-import type { RowboatEvent } from '@x/shared/dist/events.js';
-import { captureLlmUsage } from '../analytics/usage.js';
-import { withUseCase, type UseCase } from '../analytics/use_case.js';
-import type { EventConsumerTarget } from './consumer.js';
-
-const log = new PrefixLogger('Events:Routing');
-
-const BATCH_SIZE = 20;
-
-/**
- * Pass-1 LLM classifier — given an event and a list of candidate targets,
- * return the subset whose intent/matchCriteria suggest the event might be
- * relevant. Liberal by design: the consumer's agent does Pass-2 on the event
- * payload before acting.
- */
-export interface RouteBatchOptions {
-    /** Singular noun for prompt wording, e.g. 'live note', 'background task'. */
-    entitySingular: string;
-    /** Plural noun for prompt wording, e.g. 'live notes', 'background tasks'. */
-    entityPlural: string;
-    /** Analytics use case (e.g. 'live_note_agent', 'background_task_agent'). */
-    useCase: UseCase;
-    /** Resolver returning the LLM to use for routing. Each consumer provides its own
-     *  so model selection stays aligned with the consumer's agent model. */
-    resolveModel: () => Promise<{ model: LanguageModel; modelId: string; providerName: string }>;
-}
-
-function buildSystemPrompt(opts: Pick<RouteBatchOptions, 'entitySingular' | 'entityPlural'>): string {
-    const { entitySingular, entityPlural } = opts;
-    return `You are a routing classifier for a personal productivity workspace.
-
-You will receive an event (something that happened — an email, meeting, message, etc.) and a list of ${entityPlural}. Each one has:
-- id: an identifier you return in the output
-- intent: the persistent intent of the ${entitySingular} (what it should keep being / containing / doing)
-- matchCriteria: an explicit description of which kinds of incoming signals should wake this ${entitySingular}
-
-Your job is to identify which ${entityPlural} MIGHT be relevant to this event.
-
-Rules:
-- Be LIBERAL in your selections. Include any ${entitySingular} that is even moderately relevant.
-- Prefer false positives over false negatives — it is much better to include one that turns out to be irrelevant than to miss one that was relevant.
-- Only exclude entries that are CLEARLY and OBVIOUSLY irrelevant to the event.
-- Do not attempt to judge whether the event contains enough information to act on. That is handled by the agent in a later stage.
-- Return an empty list only if no entries are relevant at all.
-- Return each candidate's id exactly as given.`;
-}
-
-function buildPrompt(event: RowboatEvent, batch: EventConsumerTarget[], entityPlural: string): string {
-    const list = batch
-        .map((t, i) => `${i + 1}. id: ${t.id}\n   intent: ${t.instructions}\n   matchCriteria: ${t.eventMatchCriteria}`)
-        .join('\n\n');
-
-    return `## Event
-
-Source: ${event.source}
-Type: ${event.type}
-Time: ${event.createdAt}
-
-${event.payload}
-
-## ${entityPlural[0].toUpperCase()}${entityPlural.slice(1)}
-
-${list}`;
-}
-
-/**
- * Run Pass-1 routing for one consumer. Returns the subset of `targets` whose
- * ids the classifier flagged as relevant. Batched in groups of 20.
- */
-export async function routeBatch(
-    event: RowboatEvent,
-    targets: EventConsumerTarget[],
-    opts: RouteBatchOptions,
-): Promise<string[]> {
-    if (targets.length === 0) {
-        log.log(`event:${event.id} — no eligible ${opts.entityPlural}`);
-        return [];
-    }
-
-    log.log(`event:${event.id} — routing against ${targets.length} ${targets.length === 1 ? opts.entitySingular : opts.entityPlural}`);
-
-    const { model, modelId, providerName } = await opts.resolveModel();
-    const systemPrompt = buildSystemPrompt(opts);
-    const matched = new Set<string>();
-
-    for (let i = 0; i < targets.length; i += BATCH_SIZE) {
-        const batch = targets.slice(i, i + BATCH_SIZE);
-        try {
-            const result = await withUseCase({ useCase: opts.useCase, subUseCase: 'routing' }, () => generateObject({
-                model,
-                system: systemPrompt,
-                prompt: buildPrompt(event, batch, opts.entityPlural),
-                schema: events.Pass1OutputSchema,
-            }));
-            captureLlmUsage({
-                useCase: opts.useCase,
-                subUseCase: 'routing',
-                model: modelId,
-                provider: providerName,
-                usage: result.usage,
-            });
-            for (const id of result.object.ids) {
-                matched.add(id);
-            }
-        } catch (err) {
-            log.log(`event:${event.id} — Pass1 batch ${Math.floor(i / BATCH_SIZE)} failed: ${err instanceof Error ? err.message : String(err)}`);
-        }
-    }
-
-    const candidateIds = targets.filter(t => matched.has(t.id)).map(t => t.id);
-    log.log(`event:${event.id} — Pass1 → ${candidateIds.length} candidate${candidateIds.length === 1 ? '' : 's'}${candidateIds.length > 0 ? `: ${candidateIds.join(', ')}` : ''}`);
-    return candidateIds;
-}
diff --git a/apps/x/packages/core/src/filesystem/files.test.ts b/apps/x/packages/core/src/filesystem/files.test.ts
deleted file mode 100644
index 6e9af8df..00000000
--- a/apps/x/packages/core/src/filesystem/files.test.ts
+++ /dev/null
@@ -1,204 +0,0 @@
-import fs from "node:fs/promises";
-import os from "node:os";
-import path from "node:path";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-
-let tmpDir: string;
-let workspaceDir: string;
-
-beforeEach(async () => {
-  tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "rowboat-files-test-"));
-  workspaceDir = path.join(tmpDir, "workspace");
-  process.env.ROWBOAT_WORKDIR = workspaceDir;
-  vi.resetModules();
-  vi.doMock("../knowledge/version_history.js", () => ({
-    commitAll: vi.fn(async () => undefined),
-    initRepo: vi.fn(async () => undefined),
-  }));
-  vi.doMock("../knowledge/deprecate_today_note.js", () => ({
-    deprecateTodayNote: vi.fn(async () => undefined),
-  }));
-});
-
-afterEach(async () => {
-  delete process.env.ROWBOAT_WORKDIR;
-  vi.doUnmock("../knowledge/version_history.js");
-  vi.doUnmock("../knowledge/deprecate_today_note.js");
-  vi.resetModules();
-  await fs.rm(tmpDir, { recursive: true, force: true });
-});
-
-async function loadFiles() {
-  return import("./files.js");
-}
-
-describe("filesystem files", () => {
-  it("resolves relative paths inside ROWBOAT_WORKDIR", async () => {
-    const files = await loadFiles();
-
-    const resolved = files.resolveFilePath("notes/example.md");
-
-    expect(resolved.originalPath).toBe("notes/example.md");
-    expect(resolved.resolvedPath).toBe(path.join(workspaceDir, "notes", "example.md"));
-    expect(resolved.isInsideWorkspace).toBe(true);
-    expect(resolved.workspaceRelPath).toBe("notes/example.md");
-  });
-
-  it("keeps absolute paths outside the workspace absolute", async () => {
-    const files = await loadFiles();
-    const absolutePath = path.join(tmpDir, "outside.txt");
-
-    const resolved = files.resolveFilePath(absolutePath);
-
-    expect(resolved.resolvedPath).toBe(absolutePath);
-    expect(resolved.isInsideWorkspace).toBe(false);
-    expect(resolved.workspaceRelPath).toBeNull();
-  });
-
-  it("expands home-relative paths", async () => {
-    const files = await loadFiles();
-
-    const resolved = files.resolveFilePath("~/rowboat-test.txt");
-
-    expect(resolved.resolvedPath).toBe(path.join(os.homedir(), "rowboat-test.txt"));
-    expect(resolved.isInsideWorkspace).toBe(false);
-  });
-
-  it("canonicalizes symlinked paths for permission checks", async () => {
-    const files = await loadFiles();
-    const externalDir = path.join(tmpDir, "external");
-    const linkPath = path.join(workspaceDir, "linked");
-    await fs.mkdir(externalDir, { recursive: true });
-    await fs.mkdir(workspaceDir, { recursive: true });
-    try {
-      await fs.symlink(externalDir, linkPath, "dir");
-    } catch (error) {
-      if (error && typeof error === "object" && "code" in error && error.code === "EPERM") {
-        return;
-      }
-      throw error;
-    }
-
-    const canonicalExternalDir = await fs.realpath(externalDir);
-    const resolved = await files.resolveFilePathForPermission("linked/new-file.txt");
-
-    expect(resolved.resolvedPath).toBe(path.join(workspaceDir, "linked", "new-file.txt"));
-    expect(resolved.canonicalPath).toBe(path.join(canonicalExternalDir, "new-file.txt"));
-    expect(resolved.isInsideWorkspace).toBe(false);
-    expect(resolved.workspaceRelPath).toBeNull();
-  });
-
-  it("reads text with line numbers and pagination metadata", async () => {
-    const files = await loadFiles();
-    await fs.mkdir(workspaceDir, { recursive: true });
-    await fs.writeFile(path.join(workspaceDir, "readme.txt"), "alpha\nbeta\ngamma\n", "utf8");
-
-    const result = await files.readText("readme.txt", 2, 1);
-
-    expect(result.path).toBe("readme.txt");
-    expect(result.encoding).toBe("utf8");
-    expect(result.offset).toBe(2);
-    expect(result.limit).toBe(1);
-    expect(result.totalLines).toBe(3);
-    expect(result.hasMore).toBe(true);
-    expect(result.content).toContain("2: beta");
-  });
-
-  it("rejects files containing NUL bytes as binary", async () => {
-    const files = await loadFiles();
-    await fs.mkdir(workspaceDir, { recursive: true });
-    await fs.writeFile(path.join(workspaceDir, "binary.dat"), Buffer.from([0x61, 0x00, 0x62]));
-
-    await expect(files.readText("binary.dat")).rejects.toThrow("binary file");
-  });
-
-  it("rejects files with a high non-printable byte ratio", async () => {
-    const files = await loadFiles();
-    await fs.mkdir(workspaceDir, { recursive: true });
-    await fs.writeFile(path.join(workspaceDir, "control.dat"), Buffer.from([0x01, 0x02, 0x03, 0x41]));
-
-    await expect(files.readText("control.dat")).rejects.toThrow("binary file");
-  });
-
-  it("rejects files that decode with many UTF-8 replacement characters", async () => {
-    const files = await loadFiles();
-    await fs.mkdir(workspaceDir, { recursive: true });
-    await fs.writeFile(path.join(workspaceDir, "invalid-utf8.txt"), Buffer.alloc(512, 0xff));
-
-    await expect(files.readText("invalid-utf8.txt")).rejects.toThrow("binary file");
-  });
-
-  it("accepts normal text control characters", async () => {
-    const files = await loadFiles();
-    await fs.mkdir(workspaceDir, { recursive: true });
-    await fs.writeFile(path.join(workspaceDir, "tabs.txt"), "one\ttwo\nthree\rfour\r\n", "utf8");
-
-    const result = await files.readText("tabs.txt");
-
-    expect(result.content).toContain("1: one\ttwo");
-    expect(result.content).toContain("2: three");
-  });
-
-  it("writes text and creates parent directories", async () => {
-    const files = await loadFiles();
-
-    await files.writeText("nested/dir/file.txt", "hello");
-
-    await expect(fs.readFile(path.join(workspaceDir, "nested", "dir", "file.txt"), "utf8")).resolves.toBe("hello");
-  });
-
-  it("rejects stale expectedEtag writes", async () => {
-    const files = await loadFiles();
-    await fs.mkdir(workspaceDir, { recursive: true });
-    await fs.writeFile(path.join(workspaceDir, "etag.txt"), "first", "utf8");
-    const initial = await files.stat("etag.txt");
-    await files.writeText("etag.txt", "second");
-
-    await expect(files.writeText("etag.txt", "third", { expectedEtag: initial.etag })).rejects.toThrow("ETag mismatch");
-  });
-
-  it("requires unique editText matches unless replaceAll is true", async () => {
-    const files = await loadFiles();
-    await fs.mkdir(workspaceDir, { recursive: true });
-    await fs.writeFile(path.join(workspaceDir, "edit.txt"), "one two one", "utf8");
-
-    const ambiguous = await files.editText("edit.txt", "one", "ONE");
-    expect(ambiguous).toEqual({ error: "oldString found 2 times. Use replaceAll: true or provide more context to make it unique." });
-
-    const replaced = await files.editText("edit.txt", "one", "ONE", true);
-    expect(replaced).toMatchObject({ success: true, replacements: 2 });
-    await expect(fs.readFile(path.join(workspaceDir, "edit.txt"), "utf8")).resolves.toBe("ONE two ONE");
-  });
-
-  it("runs glob relative to the requested cwd", async () => {
-    const files = await loadFiles();
-    await fs.mkdir(path.join(workspaceDir, "src"), { recursive: true });
-    await fs.writeFile(path.join(workspaceDir, "src", "a.ts"), "export {};", "utf8");
-    await fs.writeFile(path.join(workspaceDir, "src", "b.md"), "# b", "utf8");
-    await fs.writeFile(path.join(workspaceDir, "c.ts"), "export {};", "utf8");
-
-    const result = await files.glob("*.ts", "src");
-
-    expect(result.files).toEqual(["a.ts"]);
-    expect(result.resolvedFiles).toEqual([path.join(workspaceDir, "src", "a.ts")]);
-    expect(result.resolvedCwd).toBe(path.join(workspaceDir, "src"));
-  });
-
-  it("greps text files and skips binary files", async () => {
-    const files = await loadFiles();
-    await fs.mkdir(workspaceDir, { recursive: true });
-    await fs.writeFile(path.join(workspaceDir, "match.txt"), "needle\n", "utf8");
-    await fs.writeFile(path.join(workspaceDir, "binary.dat"), Buffer.from([0x6e, 0x65, 0x65, 0x64, 0x6c, 0x65, 0x00]));
-
-    const result = await files.grep({ pattern: "needle", searchPath: "." });
-
-    expect(result.count).toBe(1);
-    expect(result.matches).toEqual([
-      expect.objectContaining({
-        file: "match.txt",
-        line: 1,
-        content: "needle",
-      }),
-    ]);
-  });
-});
diff --git a/apps/x/packages/core/src/filesystem/files.ts b/apps/x/packages/core/src/filesystem/files.ts
deleted file mode 100644
index facb697b..00000000
--- a/apps/x/packages/core/src/filesystem/files.ts
+++ /dev/null
@@ -1,641 +0,0 @@
-import fs from 'node:fs/promises';
-import { createReadStream, type Stats } from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-import { createInterface } from 'node:readline';
-import { glob as globFiles } from 'glob';
-import { WorkDir } from '../config/config.js';
-import { withFileLock } from '../knowledge/file-lock.js';
-import { commitAll } from '../knowledge/version_history.js';
-import { rewriteWikiLinksForRenamedKnowledgeFile } from '../workspace/wiki-link-rewrite.js';
-
-export type FileOperation = 'read' | 'list' | 'search' | 'write' | 'delete';
-
-export type ResolvedFilePath = {
-  originalPath: string;
-  resolvedPath: string;
-  isInsideWorkspace: boolean;
-  workspaceRelPath: string | null;
-};
-
-export type CanonicalFilePath = ResolvedFilePath & {
-  canonicalPath: string;
-};
-
-export type FileStat = {
-  kind: 'file' | 'dir';
-  size: number;
-  mtimeMs: number;
-  ctimeMs: number;
-  isSymlink?: boolean;
-};
-
-export type DirEntry = {
-  name: string;
-  path: string;
-  resolvedPath: string;
-  kind: 'file' | 'dir';
-  stat?: {
-    size: number;
-    mtimeMs: number;
-  };
-};
-
-export type ReaddirOptions = {
-  recursive?: boolean;
-  includeStats?: boolean;
-  includeHidden?: boolean;
-  allowedExtensions?: string[];
-};
-
-export type WriteTextOptions = {
-  atomic?: boolean;
-  mkdirp?: boolean;
-  expectedEtag?: string;
-};
-
-export type RemoveOptions = {
-  recursive?: boolean;
-  trash?: boolean;
-};
-
-const DEFAULT_READ_LIMIT = 2000;
-const MAX_LINE_LENGTH = 2000;
-const MAX_BYTES = 50 * 1024;
-const MAX_LINE_SUFFIX = `... (line truncated to ${MAX_LINE_LENGTH} chars)`;
-const MAX_BYTES_LABEL = `${MAX_BYTES / 1024} KB`;
-
-let knowledgeCommitTimer: ReturnType<typeof setTimeout> | null = null;
-let canonicalWorkspaceRoot: string | null = null;
-
-function isPathInside(parent: string, child: string): boolean {
-  const relative = path.relative(parent, child);
-  return relative === '' || (!!relative && !relative.startsWith('..') && !path.isAbsolute(relative));
-}
-
-function expandHomePath(inputPath: string): string {
-  const trimmed = inputPath.trim();
-  if (!trimmed) {
-    throw new Error('Path is required');
-  }
-  if (trimmed === '~') {
-    return os.homedir();
-  }
-  if (trimmed.startsWith(`~${path.sep}`) || trimmed.startsWith('~/')) {
-    return path.join(os.homedir(), trimmed.slice(2));
-  }
-  return trimmed;
-}
-
-export function resolveFilePath(inputPath: string): ResolvedFilePath {
-  const originalPath = inputPath;
-  const expandedPath = expandHomePath(inputPath);
-  const resolvedPath = path.resolve(path.isAbsolute(expandedPath) ? expandedPath : path.join(WorkDir, expandedPath));
-  const workspaceRoot = path.resolve(WorkDir);
-  const isInsideWorkspace = isPathInside(workspaceRoot, resolvedPath);
-  const workspaceRelPath = isInsideWorkspace
-    ? path.relative(workspaceRoot, resolvedPath).split(path.sep).join('/')
-    : null;
-  return { originalPath, resolvedPath, isInsideWorkspace, workspaceRelPath };
-}
-
-async function getCanonicalWorkspaceRoot(): Promise<string> {
-  if (canonicalWorkspaceRoot) return canonicalWorkspaceRoot;
-  try {
-    canonicalWorkspaceRoot = await fs.realpath(WorkDir);
-  } catch {
-    canonicalWorkspaceRoot = path.resolve(WorkDir);
-  }
-  return canonicalWorkspaceRoot;
-}
-
-async function canonicalizePathForPermission(resolvedPath: string): Promise<string> {
-  try {
-    return await fs.realpath(resolvedPath);
-  } catch {
-    const parsed = path.parse(resolvedPath);
-    const missingParts: string[] = [];
-    let current = resolvedPath;
-
-    while (current !== parsed.root) {
-      try {
-        const canonicalParent = await fs.realpath(current);
-        return path.join(canonicalParent, ...missingParts.reverse());
-      } catch {
-        missingParts.push(path.basename(current));
-        current = path.dirname(current);
-      }
-    }
-
-    return path.resolve(resolvedPath);
-  }
-}
-
-export async function resolveFilePathForPermission(inputPath: string): Promise<CanonicalFilePath> {
-  const resolved = resolveFilePath(inputPath);
-  const [canonicalPath, workspaceRoot] = await Promise.all([
-    canonicalizePathForPermission(resolved.resolvedPath),
-    getCanonicalWorkspaceRoot(),
-  ]);
-  const isInsideWorkspace = isPathInside(workspaceRoot, canonicalPath);
-  const workspaceRelPath = isInsideWorkspace
-    ? path.relative(workspaceRoot, canonicalPath).split(path.sep).join('/')
-    : null;
-  return {
-    ...resolved,
-    canonicalPath,
-    isInsideWorkspace,
-    workspaceRelPath,
-  };
-}
-
-export function computeEtag(size: number, mtimeMs: number): string {
-  return `${size}:${mtimeMs}`;
-}
-
-function statToSchema(stats: Stats): FileStat {
-  return {
-    kind: stats.isDirectory() ? 'dir' : 'file',
-    size: stats.size,
-    mtimeMs: stats.mtimeMs,
-    ctimeMs: stats.ctimeMs,
-    isSymlink: stats.isSymbolicLink() ? true : undefined,
-  };
-}
-
-function scheduleKnowledgeCommit(filename: string): void {
-  if (knowledgeCommitTimer) {
-    clearTimeout(knowledgeCommitTimer);
-  }
-  knowledgeCommitTimer = setTimeout(() => {
-    knowledgeCommitTimer = null;
-    commitAll(`Edit ${filename}`, 'You').catch(err => {
-      console.error('[VersionHistory] Failed to commit after edit:', err);
-    });
-  }, 3 * 60 * 1000);
-}
-
-function isKnowledgeMarkdownPath(resolved: ResolvedFilePath): boolean {
-  return !!resolved.workspaceRelPath
-    && resolved.workspaceRelPath.startsWith('knowledge/')
-    && resolved.workspaceRelPath.endsWith('.md');
-}
-
-function scheduleKnowledgeCommitIfNeeded(resolved: ResolvedFilePath): void {
-  if (isKnowledgeMarkdownPath(resolved)) {
-    scheduleKnowledgeCommit(path.basename(resolved.resolvedPath));
-  }
-}
-
-async function assertTextFile(resolvedPath: string): Promise<void> {
-  const stats = await fs.lstat(resolvedPath);
-  if (!stats.isFile()) {
-    throw new Error('Path is not a file');
-  }
-
-  if (stats.size === 0) return;
-  const handle = await fs.open(resolvedPath, 'r');
-  try {
-    const buffer = Buffer.alloc(Math.min(stats.size, 8192));
-    const { bytesRead } = await handle.read(buffer, 0, buffer.length, 0);
-    const sample = buffer.subarray(0, bytesRead);
-    let nonPrintableCount = 0;
-    for (let index = 0; index < sample.length; index++) {
-      const byte = sample[index];
-      if (byte === 0) {
-        throw new Error('Refusing to read binary file as text');
-      }
-      if (byte < 9 || (byte > 13 && byte < 32)) {
-        nonPrintableCount++;
-      }
-    }
-    if (sample.length > 0 && nonPrintableCount / sample.length > 0.3) {
-      throw new Error('Refusing to read binary file as text');
-    }
-    const decoded = sample.toString('utf8');
-    const replacementChars = (decoded.match(/\uFFFD/g) || []).length;
-    if (replacementChars > Math.max(3, decoded.length * 0.01)) {
-      throw new Error('Refusing to read binary file as text');
-    }
-  } finally {
-    await handle.close();
-  }
-}
-
-export async function exists(inputPath: string): Promise<{ exists: boolean; path: string; resolvedPath: string; isInsideWorkspace: boolean }> {
-  const resolved = resolveFilePath(inputPath);
-  try {
-    await fs.access(resolved.resolvedPath);
-    return { exists: true, path: resolved.originalPath, resolvedPath: resolved.resolvedPath, isInsideWorkspace: resolved.isInsideWorkspace };
-  } catch {
-    return { exists: false, path: resolved.originalPath, resolvedPath: resolved.resolvedPath, isInsideWorkspace: resolved.isInsideWorkspace };
-  }
-}
-
-export async function stat(inputPath: string): Promise<FileStat & { path: string; resolvedPath: string; isInsideWorkspace: boolean; etag: string }> {
-  const resolved = resolveFilePath(inputPath);
-  const stats = await fs.lstat(resolved.resolvedPath);
-  return {
-    ...statToSchema(stats),
-    path: resolved.originalPath,
-    resolvedPath: resolved.resolvedPath,
-    isInsideWorkspace: resolved.isInsideWorkspace,
-    etag: computeEtag(stats.size, stats.mtimeMs),
-  };
-}
-
-export async function list(inputPath: string, opts?: ReaddirOptions): Promise<Array<DirEntry>> {
-  const root = resolveFilePath(inputPath || '.');
-  const entries: Array<DirEntry> = [];
-
-  async function readDir(currentPath: string, currentDisplayPath: string): Promise<void> {
-    const items = await fs.readdir(currentPath, { withFileTypes: true });
-    for (const item of items) {
-      if (!opts?.includeHidden && item.name.startsWith('.')) {
-        continue;
-      }
-
-      const itemPath = path.join(currentPath, item.name);
-      const displayPath = path.posix.join(currentDisplayPath.split(path.sep).join('/'), item.name);
-      const itemKind = item.isDirectory() ? 'dir' : item.isFile() ? 'file' : null;
-      if (!itemKind) continue;
-
-      if (itemKind === 'file' && opts?.allowedExtensions?.length) {
-        const ext = path.extname(item.name);
-        if (!opts.allowedExtensions.includes(ext)) continue;
-      }
-
-      let itemStat: { size: number; mtimeMs: number } | undefined;
-      if (opts?.includeStats) {
-        const stats = await fs.lstat(itemPath);
-        itemStat = { size: stats.size, mtimeMs: stats.mtimeMs };
-      }
-
-      entries.push({
-        name: item.name,
-        path: displayPath,
-        resolvedPath: itemPath,
-        kind: itemKind,
-        stat: itemStat,
-      });
-
-      if (itemKind === 'dir' && opts?.recursive) {
-        await readDir(itemPath, displayPath);
-      }
-    }
-  }
-
-  await readDir(root.resolvedPath, root.originalPath || '.');
-  entries.sort((a, b) => {
-    if (a.kind !== b.kind) return a.kind === 'dir' ? -1 : 1;
-    return a.name.localeCompare(b.name);
-  });
-  return entries;
-}
-
-export async function readText(inputPath: string, offset?: number, limit?: number) {
-  const resolved = resolveFilePath(inputPath);
-  await assertTextFile(resolved.resolvedPath);
-  const stats = await fs.lstat(resolved.resolvedPath);
-  const stat = statToSchema(stats);
-  const etag = computeEtag(stats.size, stats.mtimeMs);
-  const effectiveOffset = offset ?? 1;
-  const effectiveLimit = limit ?? DEFAULT_READ_LIMIT;
-  const start = effectiveOffset - 1;
-
-  const stream = createReadStream(resolved.resolvedPath, { encoding: 'utf8' });
-  const rl = createInterface({ input: stream, crlfDelay: Infinity });
-  const collected: string[] = [];
-  let totalLines = 0;
-  let bytes = 0;
-  let truncatedByBytes = false;
-  let hasMoreLines = false;
-
-  try {
-    for await (const text of rl) {
-      totalLines += 1;
-      if (totalLines <= start) continue;
-
-      if (collected.length >= effectiveLimit) {
-        hasMoreLines = true;
-        continue;
-      }
-
-      const line = text.length > MAX_LINE_LENGTH
-        ? text.substring(0, MAX_LINE_LENGTH) + MAX_LINE_SUFFIX
-        : text;
-      const size = Buffer.byteLength(line, 'utf-8') + (collected.length > 0 ? 1 : 0);
-      if (bytes + size > MAX_BYTES) {
-        truncatedByBytes = true;
-        hasMoreLines = true;
-        break;
-      }
-
-      collected.push(line);
-      bytes += size;
-    }
-  } finally {
-    rl.close();
-    stream.destroy();
-  }
-
-  if (totalLines < effectiveOffset && !(totalLines === 0 && effectiveOffset === 1)) {
-    return { error: `Offset ${effectiveOffset} is out of range for this file (${totalLines} lines)` };
-  }
-
-  const prefixed = collected.map((line, index) => `${index + effectiveOffset}: ${line}`);
-  const lastReadLine = effectiveOffset + collected.length - 1;
-  const nextOffset = lastReadLine + 1;
-  let footer: string;
-  if (truncatedByBytes) {
-    footer = `(Output capped at ${MAX_BYTES_LABEL}. Showing lines ${effectiveOffset}-${lastReadLine}. Use offset=${nextOffset} to continue.)`;
-  } else if (hasMoreLines) {
-    footer = `(Showing lines ${effectiveOffset}-${lastReadLine} of ${totalLines}. Use offset=${nextOffset} to continue.)`;
-  } else {
-    footer = `(End of file - total ${totalLines} lines)`;
-  }
-
-  const content = [
-    `<path>${resolved.originalPath}</path>`,
-    `<resolvedPath>${resolved.resolvedPath}</resolvedPath>`,
-    `<type>file</type>`,
-    `<content>`,
-    prefixed.join('\n'),
-    '',
-    footer,
-    `</content>`,
-  ].join('\n');
-
-  return {
-    path: resolved.originalPath,
-    resolvedPath: resolved.resolvedPath,
-    isInsideWorkspace: resolved.isInsideWorkspace,
-    encoding: 'utf8' as const,
-    content,
-    stat,
-    etag,
-    offset: effectiveOffset,
-    limit: effectiveLimit,
-    totalLines,
-    hasMore: hasMoreLines || truncatedByBytes,
-  };
-}
-
-export async function readBuffer(inputPath: string): Promise<{ buffer: Buffer; path: string; resolvedPath: string; isInsideWorkspace: boolean }> {
-  const resolved = resolveFilePath(inputPath);
-  const buffer = await fs.readFile(resolved.resolvedPath);
-  return {
-    buffer,
-    path: resolved.originalPath,
-    resolvedPath: resolved.resolvedPath,
-    isInsideWorkspace: resolved.isInsideWorkspace,
-  };
-}
-
-export async function writeText(inputPath: string, data: string, opts?: WriteTextOptions) {
-  const resolved = resolveFilePath(inputPath);
-  const atomic = opts?.atomic !== false;
-  const mkdirp = opts?.mkdirp !== false;
-
-  if (mkdirp) {
-    await fs.mkdir(path.dirname(resolved.resolvedPath), { recursive: true });
-  }
-
-  const result = await withFileLock(resolved.resolvedPath, async () => {
-    if (opts?.expectedEtag) {
-      const existingStats = await fs.lstat(resolved.resolvedPath);
-      const existingEtag = computeEtag(existingStats.size, existingStats.mtimeMs);
-      if (existingEtag !== opts.expectedEtag) {
-        throw new Error('File was modified (ETag mismatch)');
-      }
-    }
-
-    const buffer = Buffer.from(data, 'utf8');
-    if (atomic) {
-      const tempPath = `${resolved.resolvedPath}.tmp.${Date.now()}${Math.random().toString(36).slice(2)}`;
-      await fs.writeFile(tempPath, buffer);
-      await fs.rename(tempPath, resolved.resolvedPath);
-    } else {
-      await fs.writeFile(resolved.resolvedPath, buffer);
-    }
-
-    const stats = await fs.lstat(resolved.resolvedPath);
-    return { stat: statToSchema(stats), etag: computeEtag(stats.size, stats.mtimeMs) };
-  });
-
-  scheduleKnowledgeCommitIfNeeded(resolved);
-  return {
-    path: resolved.originalPath,
-    resolvedPath: resolved.resolvedPath,
-    isInsideWorkspace: resolved.isInsideWorkspace,
-    stat: result.stat,
-    etag: result.etag,
-  };
-}
-
-export async function editText(inputPath: string, oldString: string, newString: string, replaceAll = false) {
-  const resolved = resolveFilePath(inputPath);
-  await assertTextFile(resolved.resolvedPath);
-  const content = await fs.readFile(resolved.resolvedPath, 'utf8');
-  const occurrences = content.split(oldString).length - 1;
-
-  if (occurrences === 0) {
-    return { error: 'oldString not found in file' };
-  }
-  if (occurrences > 1 && !replaceAll) {
-    return { error: `oldString found ${occurrences} times. Use replaceAll: true or provide more context to make it unique.` };
-  }
-
-  const newContent = replaceAll
-    ? content.replaceAll(oldString, newString)
-    : content.replace(oldString, newString);
-  await writeText(inputPath, newContent, { atomic: true, mkdirp: true });
-  return {
-    success: true,
-    path: resolved.originalPath,
-    resolvedPath: resolved.resolvedPath,
-    isInsideWorkspace: resolved.isInsideWorkspace,
-    replacements: replaceAll ? occurrences : 1,
-  };
-}
-
-export async function mkdir(inputPath: string, recursive = true): Promise<{ ok: true; path: string; resolvedPath: string; isInsideWorkspace: boolean }> {
-  const resolved = resolveFilePath(inputPath);
-  await fs.mkdir(resolved.resolvedPath, { recursive });
-  return { ok: true, path: resolved.originalPath, resolvedPath: resolved.resolvedPath, isInsideWorkspace: resolved.isInsideWorkspace };
-}
-
-export async function rename(from: string, to: string, overwrite = false): Promise<{ ok: true; from: string; to: string; resolvedFrom: string; resolvedTo: string }> {
-  const source = resolveFilePath(from);
-  const dest = resolveFilePath(to);
-  await fs.access(source.resolvedPath);
-  const fromStats = await fs.lstat(source.resolvedPath);
-
-  if (!overwrite) {
-    try {
-      await fs.access(dest.resolvedPath);
-      throw new Error('Destination already exists');
-    } catch (err: unknown) {
-      if (err && typeof err === 'object' && 'code' in err && err.code === 'ENOENT') {
-        // destination does not exist
-      } else {
-        throw err;
-      }
-    }
-  }
-
-  await fs.mkdir(path.dirname(dest.resolvedPath), { recursive: true });
-  await fs.rename(source.resolvedPath, dest.resolvedPath);
-
-  if (fromStats.isFile() && isKnowledgeMarkdownPath(source) && isKnowledgeMarkdownPath(dest) && source.workspaceRelPath && dest.workspaceRelPath) {
-    try {
-      await rewriteWikiLinksForRenamedKnowledgeFile(WorkDir, source.workspaceRelPath, dest.workspaceRelPath);
-    } catch (error) {
-      console.error('Failed to rewrite wiki backlinks after file rename:', error);
-    }
-  }
-
-  return { ok: true, from, to, resolvedFrom: source.resolvedPath, resolvedTo: dest.resolvedPath };
-}
-
-export async function copy(from: string, to: string, overwrite = false): Promise<{ ok: true; from: string; to: string; resolvedFrom: string; resolvedTo: string }> {
-  const source = resolveFilePath(from);
-  const dest = resolveFilePath(to);
-  const fromStats = await fs.lstat(source.resolvedPath);
-  if (fromStats.isDirectory()) {
-    throw new Error('Copying directories is not supported');
-  }
-
-  if (!overwrite) {
-    try {
-      await fs.access(dest.resolvedPath);
-      throw new Error('Destination already exists');
-    } catch (err: unknown) {
-      if (err && typeof err === 'object' && 'code' in err && err.code === 'ENOENT') {
-        // destination does not exist
-      } else {
-        throw err;
-      }
-    }
-  }
-
-  await fs.mkdir(path.dirname(dest.resolvedPath), { recursive: true });
-  await fs.copyFile(source.resolvedPath, dest.resolvedPath);
-  return { ok: true, from, to, resolvedFrom: source.resolvedPath, resolvedTo: dest.resolvedPath };
-}
-
-export async function remove(inputPath: string, opts?: RemoveOptions): Promise<{ ok: true; path: string; resolvedPath: string; trashed?: string }> {
-  const resolved = resolveFilePath(inputPath);
-  const stats = await fs.lstat(resolved.resolvedPath);
-  const trash = opts?.trash !== false;
-
-  if (trash) {
-    const trashDir = path.join(WorkDir, '.trash');
-    await fs.mkdir(trashDir, { recursive: true });
-    const timestamp = Date.now();
-    const basename = path.basename(resolved.resolvedPath);
-    let finalTrashPath = path.join(trashDir, `${timestamp}-${basename}`);
-    let counter = 1;
-    while (true) {
-      try {
-        await fs.access(finalTrashPath);
-        finalTrashPath = path.join(trashDir, `${timestamp}-${counter}-${basename}`);
-        counter++;
-      } catch {
-        break;
-      }
-    }
-    await fs.rename(resolved.resolvedPath, finalTrashPath);
-    return { ok: true, path: resolved.originalPath, resolvedPath: resolved.resolvedPath, trashed: finalTrashPath };
-  }
-
-  if (stats.isDirectory()) {
-    if (!opts?.recursive) {
-      throw new Error('Cannot remove directory without recursive=true');
-    }
-    await fs.rm(resolved.resolvedPath, { recursive: true });
-  } else {
-    await fs.unlink(resolved.resolvedPath);
-  }
-  return { ok: true, path: resolved.originalPath, resolvedPath: resolved.resolvedPath };
-}
-
-export async function glob(pattern: string, cwd?: string): Promise<{ files: string[]; resolvedFiles: string[]; count: number; pattern: string; cwd: string; resolvedCwd: string }> {
-  const root = resolveFilePath(cwd || '.');
-  const files = await globFiles(pattern, {
-    cwd: root.resolvedPath,
-    nodir: true,
-    ignore: ['node_modules/**', '.git/**'],
-  });
-  const resolvedFiles = files.map(file => path.resolve(root.resolvedPath, file));
-  return {
-    files,
-    resolvedFiles,
-    count: files.length,
-    pattern,
-    cwd: cwd || '.',
-    resolvedCwd: root.resolvedPath,
-  };
-}
-
-export async function grep({
-  pattern,
-  searchPath,
-  fileGlob,
-  contextLines = 0,
-  maxResults = 100,
-}: {
-  pattern: string;
-  searchPath?: string;
-  fileGlob?: string;
-  contextLines?: number;
-  maxResults?: number;
-}) {
-  const root = resolveFilePath(searchPath || '.');
-  const stats = await fs.lstat(root.resolvedPath);
-  const candidates = stats.isDirectory()
-    ? await globFiles(fileGlob || '**/*', {
-      cwd: root.resolvedPath,
-      nodir: true,
-      ignore: ['node_modules/**', '.git/**'],
-      dot: false,
-    })
-    : [path.basename(root.resolvedPath)];
-  const baseDir = stats.isDirectory() ? root.resolvedPath : path.dirname(root.resolvedPath);
-  const regex = new RegExp(pattern, 'i');
-  const matches: Array<{ file: string; resolvedPath: string; line: number; content: string; before?: string[]; after?: string[] }> = [];
-
-  for (const candidate of candidates) {
-    if (matches.length >= maxResults) break;
-    const resolvedPath = stats.isDirectory() ? path.resolve(baseDir, candidate) : root.resolvedPath;
-    try {
-      await assertTextFile(resolvedPath);
-      const text = await fs.readFile(resolvedPath, 'utf8');
-      const lines = text.split(/\r?\n/);
-      for (let index = 0; index < lines.length; index++) {
-        if (!regex.test(lines[index])) continue;
-        const before = contextLines > 0 ? lines.slice(Math.max(0, index - contextLines), index) : undefined;
-        const after = contextLines > 0 ? lines.slice(index + 1, Math.min(lines.length, index + 1 + contextLines)) : undefined;
-        matches.push({
-          file: stats.isDirectory() ? candidate : root.originalPath,
-          resolvedPath,
-          line: index + 1,
-          content: lines[index].trim(),
-          before,
-          after,
-        });
-        if (matches.length >= maxResults) break;
-      }
-    } catch {
-      // Skip unreadable and binary files.
-    }
-  }
-
-  return {
-    matches,
-    count: matches.length,
-    tool: 'internal-grep',
-    searchPath: searchPath || '.',
-    resolvedSearchPath: root.resolvedPath,
-  };
-}
diff --git a/apps/x/packages/core/src/knowledge/agent_notes_agent.ts b/apps/x/packages/core/src/knowledge/agent_notes_agent.ts
index 32fbb08c..58aa22a7 100644
--- a/apps/x/packages/core/src/knowledge/agent_notes_agent.ts
+++ b/apps/x/packages/core/src/knowledge/agent_notes_agent.ts
@@ -1,21 +1,21 @@
 export function getRaw(): string {
   return `---
 tools:
-  file-writeText:
+  workspace-writeFile:
     type: builtin
-    name: file-writeText
-  file-readText:
+    name: workspace-writeFile
+  workspace-readFile:
     type: builtin
-    name: file-readText
-  file-editText:
+    name: workspace-readFile
+  workspace-edit:
     type: builtin
-    name: file-editText
-  file-list:
+    name: workspace-edit
+  workspace-readdir:
     type: builtin
-    name: file-list
-  file-mkdir:
+    name: workspace-readdir
+  workspace-mkdir:
     type: builtin
-    name: file-mkdir
+    name: workspace-mkdir
 ---
 # Agent Notes
 
diff --git a/apps/x/packages/core/src/knowledge/build_graph.ts b/apps/x/packages/core/src/knowledge/build_graph.ts
index 3e05e611..10be1d14 100644
--- a/apps/x/packages/core/src/knowledge/build_graph.ts
+++ b/apps/x/packages/core/src/knowledge/build_graph.ts
@@ -1,7 +1,6 @@
 import fs from 'fs';
 import path from 'path';
 import { WorkDir } from '../config/config.js';
-import { getKgModel } from '../models/defaults.js';
 import { createRun, createMessage } from '../runs/runs.js';
 import { bus } from '../runs/bus.js';
 import { getErrorDetails, waitForRunCompletion } from '../agents/utils.js';
@@ -253,7 +252,6 @@ async function createNotesFromBatch(
     // Create a run for the note creation agent
     const run = await createRun({
         agentId: NOTE_CREATION_AGENT,
-        model: await getKgModel(),
         useCase: 'knowledge_sync',
         subUseCase: 'build_graph',
     });
@@ -264,11 +262,10 @@ async function createNotesFromBatch(
     message += `**Instructions:**\n`;
     message += `- Use the KNOWLEDGE BASE INDEX below to resolve entities - DO NOT grep/search for existing notes\n`;
     message += `- Extract entities (people, organizations, projects, topics) from ALL files below\n`;
-    message += `- The source files below are INDEPENDENT — they are batched only for efficiency. Two entities are related ONLY if they co-occur within the same single source file (or in an existing note). NEVER link entities just because they appear in this batch (see "Source Scoping" in your instructions)\n`;
     message += `- Create or update notes in "knowledge" directory (workspace-relative paths like "knowledge/People/Name.md")\n`;
     message += `- You may also create or update "${SUGGESTED_TOPICS_REL_PATH}" to maintain curated suggested-topic cards\n`;
-    message += `- If the SAME entity appears in multiple files, merge the information into a single note (this is identity, not a relationship — do not link different entities across files)\n`;
-    message += `- Use file tools to read existing notes or "${SUGGESTED_TOPICS_REL_PATH}" (when you need full content) and write updates\n`;
+    message += `- If the same entity appears in multiple files, merge the information into a single note\n`;
+    message += `- Use workspace tools to read existing notes or "${SUGGESTED_TOPICS_REL_PATH}" (when you need full content) and write updates\n`;
     message += `- Follow the note templates and guidelines in your instructions\n\n`;
 
     // Add the knowledge base index
@@ -298,16 +295,16 @@ async function createNotesFromBatch(
         if (event.type !== "tool-invocation") {
             return;
         }
-        if (event.toolName !== "file-writeText" && event.toolName !== "file-editText") {
+        if (event.toolName !== "workspace-writeFile" && event.toolName !== "workspace-edit") {
             return;
         }
         const toolPath = extractPathFromToolInput(event.input);
         if (!toolPath) {
             return;
         }
-        if (event.toolName === "file-writeText") {
+        if (event.toolName === "workspace-writeFile") {
             notesCreated.add(toolPath);
-        } else if (event.toolName === "file-editText") {
+        } else if (event.toolName === "workspace-edit") {
             notesModified.add(toolPath);
         }
     });
@@ -358,7 +355,7 @@ async function buildGraphWithFiles(
         return { processedFiles: [], notesCreated: new Set(), notesModified: new Set(), hadError: false };
     }
 
-    const BATCH_SIZE = 1; // One source file per agent run — prevents cross-file entity contamination in the graph
+    const BATCH_SIZE = 10; // Reduced from 25 to 10 files per agent run for faster processing
     const totalBatches = Math.ceil(contentFiles.length / BATCH_SIZE);
 
     console.log(`Processing ${contentFiles.length} files in ${totalBatches} batches (${BATCH_SIZE} files per batch)...`);
@@ -544,7 +541,7 @@ async function processVoiceMemosForKnowledge(): Promise<boolean> {
     }
 
     // Process in batches like other sources
-    const BATCH_SIZE = 1; // One source file per agent run — prevents cross-file entity contamination in the graph
+    const BATCH_SIZE = 10;
     const totalBatches = Math.ceil(contentFiles.length / BATCH_SIZE);
 
     const notesCreated = new Set<string>();
diff --git a/apps/x/packages/core/src/knowledge/classify_thread.ts b/apps/x/packages/core/src/knowledge/classify_thread.ts
deleted file mode 100644
index faf72322..00000000
--- a/apps/x/packages/core/src/knowledge/classify_thread.ts
+++ /dev/null
@@ -1,264 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-import { z } from 'zod';
-import { generateObject } from 'ai';
-import { google } from 'googleapis';
-import type { OAuth2Client } from 'google-auth-library';
-import { WorkDir } from '../config/config.js';
-import { createProvider } from '../models/models.js';
-import {
-    getDefaultModelAndProvider,
-    getKgModel,
-    resolveProviderConfig,
-} from '../models/defaults.js';
-import { captureLlmUsage } from '../analytics/usage.js';
-import { withUseCase } from '../analytics/use_case.js';
-import type { GmailThreadSnapshot } from './sync_gmail.js';
-
-const STYLE_GUIDE_PATH = path.join(WorkDir, 'knowledge', 'Agent Notes', 'style', 'email.md');
-const CALENDAR_DIR = path.join(WorkDir, 'calendar_sync');
-const CALENDAR_LOOKAHEAD_DAYS = 7;
-const MAX_CALENDAR_EVENTS = 25;
-
-function readEmailStyleGuide(): string | null {
-    try {
-        const raw = fs.readFileSync(STYLE_GUIDE_PATH, 'utf-8').trim();
-        return raw || null;
-    } catch {
-        return null;
-    }
-}
-
-interface CalendarSlice {
-    summary: string;
-    startIso: string;
-    endIso?: string;
-}
-
-function readUpcomingCalendar(): CalendarSlice[] {
-    if (!fs.existsSync(CALENDAR_DIR)) return [];
-    const now = Date.now();
-    const cutoff = now + CALENDAR_LOOKAHEAD_DAYS * 24 * 60 * 60 * 1000;
-    const out: CalendarSlice[] = [];
-    let names: string[];
-    try {
-        names = fs.readdirSync(CALENDAR_DIR);
-    } catch {
-        return [];
-    }
-    for (const name of names) {
-        if (!name.endsWith('.json')) continue;
-        try {
-            const raw = fs.readFileSync(path.join(CALENDAR_DIR, name), 'utf-8');
-            const ev = JSON.parse(raw) as {
-                summary?: string;
-                start?: { dateTime?: string; date?: string };
-                end?: { dateTime?: string; date?: string };
-                status?: string;
-            };
-            if (ev.status === 'cancelled') continue;
-            const startStr = ev.start?.dateTime ?? ev.start?.date;
-            if (!startStr) continue;
-            const startMs = Date.parse(startStr);
-            if (Number.isNaN(startMs)) continue;
-            if (startMs < now || startMs > cutoff) continue;
-            out.push({
-                summary: ev.summary || '(no title)',
-                startIso: startStr,
-                endIso: ev.end?.dateTime ?? ev.end?.date,
-            });
-        } catch {
-            // skip malformed
-        }
-    }
-    out.sort((a, b) => Date.parse(a.startIso) - Date.parse(b.startIso));
-    return out.slice(0, MAX_CALENDAR_EVENTS);
-}
-
-function formatCalendar(events: CalendarSlice[]): string {
-    if (events.length === 0) return '(no upcoming events)';
-    return events.map((e) => {
-        const end = e.endIso ? ` – ${e.endIso}` : '';
-        return `- ${e.startIso}${end}: ${e.summary}`;
-    }).join('\n');
-}
-
-let cachedUserEmail: string | null = null;
-
-export async function getUserEmail(auth: OAuth2Client): Promise<string | null> {
-    if (cachedUserEmail) return cachedUserEmail;
-    try {
-        const gmailClient = google.gmail({ version: 'v1', auth });
-        const res = await gmailClient.users.getProfile({ userId: 'me' });
-        if (res.data.emailAddress) {
-            cachedUserEmail = res.data.emailAddress.toLowerCase();
-            return cachedUserEmail;
-        }
-    } catch (err) {
-        console.warn('[Email classifier] getProfile failed:', err);
-    }
-    return null;
-}
-
-export interface Classification {
-    importance: 'important' | 'other';
-    summary?: string;
-    draftResponse?: string;
-}
-
-const ClassificationSchema = z.object({
-    importance: z.enum(['important', 'other']).describe('important = real correspondence, action-required, or content worth referencing later. other = newsletters, marketing, automated notifications, transactional receipts, cold outreach.'),
-    summary: z.string().optional().describe('One or two sentences capturing what the thread is about and any implied action. Required when importance is important. Omit when other.'),
-    draftResponse: z.string().optional().describe('A complete draft reply the user can send as-is or edit. Plain text with real line breaks (\\n): greeting on its own line, a blank line between paragraphs, and the sign-off on its own line(s) — e.g. "Hi Tyrone,\\n\\nThanks for the follow-up.\\n\\nBest,\\nJohn". Required when importance is important AND the thread implies a response is wanted. Omit when other, or when no response is appropriate (e.g. an FYI from a colleague that does not need a reply).'),
-});
-
-const SYSTEM_PROMPT = `You classify a Gmail thread for a personal inbox view and, when appropriate, draft a reply on behalf of the user.
-
-# Importance
-
-Decide if the thread is "important" or "other":
-- important: real human correspondence the user is part of (customer, investor, team, vendor, candidate); a time-sensitive notification; a message that needs a response from the user; anything worth referencing later (contracts, pricing, deadlines, decisions).
-- other: newsletters, industry digests, marketing or promotional, product tips from vendors, automated notifications (verifications, recording uploads, platform policy updates), transactional confirmations (payment receipts, GST/tax filings, salary disbursements), unsolicited cold outreach.
-
-# Summary (important only)
-
-When the thread is important, write a 1-2 sentence summary that captures the gist and any action implied. Omit when "other".
-
-# Draft response (important only)
-
-When the thread is important AND a reply is reasonably expected from the user, write a complete draft reply they could send as-is.
-
-Format it like a real email, not one run-on block. Use actual line breaks: put the greeting on its own line, separate distinct paragraphs with a blank line, and put the sign-off and the name on their own lines. The example below illustrates only the line-break structure — not the wording, tone, greeting, or sign-off to use:
-
-Hi Tyrone,
-
-Thanks for the follow-up — sorry I missed your earlier note.
-
-Could you resend it with a bit more context so I can get back to you properly?
-
-Best,
-John
-
-When an email-style guide is provided below, it takes precedence: follow it for greeting, tone, sign-off, length, and phrasing patterns (while keeping the line-break structure shown above). If no style guide is provided, default to a brief, warm, professional voice.
-
-For scheduling-related threads (where the sender proposes meeting times, asks for the user's availability, or follows up on a meeting request), look at the user's upcoming calendar (provided below) and either:
-- Propose 2-3 specific time windows from genuinely free slots, or
-- Confirm/decline a specific time the sender proposed, based on calendar conflicts.
-
-Use the same timezone the user appears to operate in (inferable from their previous messages or calendar events).
-
-Omit the draft when:
-- importance is "other"
-- the thread is purely informational and doesn't ask for a reply
-- the latest message is from the user (they already replied; no draft needed)
-- you can't write a meaningful reply without information you don't have (don't fabricate)
-
-Be decisive — pick exactly one importance label. Do not hedge.`;
-
-function userSentLatest(snapshot: GmailThreadSnapshot, userEmail: string | null): boolean {
-    if (!userEmail) return false;
-    const latest = snapshot.messages[snapshot.messages.length - 1];
-    if (!latest) return false;
-    const needle = userEmail.toLowerCase();
-    return (latest.from || '').toLowerCase().includes(needle);
-}
-
-function buildPrompt(
-    snapshot: GmailThreadSnapshot,
-    userEmail: string | null,
-    styleGuide: string | null,
-    calendar: CalendarSlice[],
-): string {
-    const lines: string[] = [];
-
-    if (userEmail) {
-        lines.push(`# Your identity`);
-        lines.push(`The user's own email is ${userEmail}. You write as this person when drafting replies.`);
-        lines.push('');
-    }
-
-    if (styleGuide) {
-        lines.push(`# Email style guide`);
-        lines.push(styleGuide);
-        lines.push('');
-    }
-
-    lines.push(`# User's upcoming calendar (next ${CALENDAR_LOOKAHEAD_DAYS} days)`);
-    lines.push(formatCalendar(calendar));
-    lines.push('');
-
-    lines.push(`# Thread to classify`);
-    lines.push(`Subject: ${snapshot.subject || '(no subject)'}`);
-    lines.push(`Message count: ${snapshot.messages.length}`);
-    lines.push('');
-
-    for (let i = 0; i < snapshot.messages.length; i += 1) {
-        const msg = snapshot.messages[i];
-        const isLast = i === snapshot.messages.length - 1;
-        lines.push(`## Message ${i + 1}${isLast ? ' (latest)' : ''}`);
-        lines.push(`From: ${msg.from || 'unknown'}`);
-        if (msg.to) lines.push(`To: ${msg.to}`);
-        if (msg.date) lines.push(`Date: ${msg.date}`);
-        const body = (msg.body || '').replace(/\s+/g, ' ').slice(0, isLast ? 2000 : 600).trim();
-        if (body) {
-            lines.push('');
-            lines.push(body);
-        }
-        lines.push('');
-    }
-
-    return lines.join('\n');
-}
-
-export interface ClassifyOptions {
-    skipDraft?: boolean;
-}
-
-export async function classifyThread(
-    snapshot: GmailThreadSnapshot,
-    userEmail: string | null,
-    options: ClassifyOptions = {},
-): Promise<Classification> {
-    if (userSentLatest(snapshot, userEmail)) {
-        return { importance: 'important' };
-    }
-
-    try {
-        const styleGuide = readEmailStyleGuide();
-        const calendar = readUpcomingCalendar();
-
-        const modelId = await getKgModel();
-        const { provider } = await getDefaultModelAndProvider();
-        const config = await resolveProviderConfig(provider);
-        const model = createProvider(config).languageModel(modelId);
-
-        const systemPrompt = options.skipDraft
-            ? `${SYSTEM_PROMPT}\n\n# Skip the draft\n\nThe user already has their own draft in progress for this thread — DO NOT generate a draftResponse. Always omit the draftResponse field.`
-            : SYSTEM_PROMPT;
-
-        const result = await withUseCase({ useCase: 'knowledge_sync', subUseCase: 'email_classifier' }, () => generateObject({
-            model,
-            system: systemPrompt,
-            prompt: buildPrompt(snapshot, userEmail, styleGuide, calendar),
-            schema: ClassificationSchema,
-        }));
-
-        captureLlmUsage({
-            useCase: 'knowledge_sync',
-            subUseCase: 'email_classifier',
-            model: modelId,
-            provider,
-            usage: result.usage,
-        });
-
-        const out: Classification = { importance: result.object.importance };
-        if (result.object.importance === 'important') {
-            if (result.object.summary) out.summary = result.object.summary;
-            if (!options.skipDraft && result.object.draftResponse) out.draftResponse = result.object.draftResponse;
-        }
-        return out;
-    } catch (err) {
-        console.warn(`[Email classifier] LLM call failed for thread ${snapshot.threadId}:`, err);
-        return { importance: 'important' };
-    }
-}
diff --git a/apps/x/packages/core/src/knowledge/deprecate_today_note.ts b/apps/x/packages/core/src/knowledge/deprecate_today_note.ts
deleted file mode 100644
index 00a19120..00000000
--- a/apps/x/packages/core/src/knowledge/deprecate_today_note.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import fs from 'fs/promises';
-import path from 'path';
-import { z } from 'zod';
-import { LiveNoteSchema } from '@x/shared/dist/live-note.js';
-import { WorkDir } from '../config/config.js';
-import { splitFrontmatter, joinFrontmatter } from '../application/lib/parse-frontmatter.js';
-
-const KNOWLEDGE_DIR = path.join(WorkDir, 'knowledge');
-const TODAY_NOTE_PATH = path.join(KNOWLEDGE_DIR, 'Today.md');
-const STATE_FILE = path.join(WorkDir, 'config', 'today-note-deprecation.json');
-const NOTICE_MARKER = '<!-- rowboat-today-md-deprecated -->';
-const DEPRECATION_NOTICE = `${NOTICE_MARKER}
-> Rowboat's Today.md live dashboard is paused for now while we work on a better experience. You can keep using this note as a regular markdown file. If you want Rowboat to keep updating it automatically, re-enable the live note settings; automatic updates may use credits.
-
-`;
-
-const StateSchema = z.object({
-    processed_at: z.string().min(1).optional(),
-});
-type State = z.infer<typeof StateSchema>;
-
-const TodayNoteFrontmatterSchema = z.object({
-    live: LiveNoteSchema.optional(),
-}).passthrough();
-
-async function pathExists(filePath: string): Promise<boolean> {
-    try {
-        await fs.access(filePath);
-        return true;
-    } catch {
-        return false;
-    }
-}
-
-async function loadState(): Promise<State> {
-    try {
-        if (!await pathExists(STATE_FILE)) return {};
-        const raw = await fs.readFile(STATE_FILE, 'utf-8');
-        return StateSchema.parse(JSON.parse(raw));
-    } catch (error) {
-        console.warn('[TodayNoteDeprecation] Failed to load state:', error);
-        return {};
-    }
-}
-
-async function saveState(state: State): Promise<void> {
-    const dir = path.dirname(STATE_FILE);
-    await fs.mkdir(dir, { recursive: true });
-    await fs.writeFile(STATE_FILE, JSON.stringify(state, null, 2), 'utf-8');
-}
-
-async function markProcessed(): Promise<void> {
-    await saveState({ processed_at: new Date().toISOString() });
-}
-
-function disableLiveBlock(frontmatter: Record<string, unknown>): Record<string, unknown> {
-    const parsed = TodayNoteFrontmatterSchema.safeParse(frontmatter);
-    if (!parsed.success || !parsed.data.live) {
-        return frontmatter;
-    }
-
-    return {
-        ...frontmatter,
-        live: {
-            ...parsed.data.live,
-            active: false,
-        },
-    };
-}
-
-function prependNotice(body: string): string {
-    if (body.includes(NOTICE_MARKER)) return body;
-    return `${DEPRECATION_NOTICE}${body}`;
-}
-
-export async function deprecateTodayNote(): Promise<void> {
-    const state = await loadState();
-    if (state.processed_at) return;
-
-    if (!await pathExists(TODAY_NOTE_PATH)) {
-        await markProcessed();
-        return;
-    }
-
-    const content = await fs.readFile(TODAY_NOTE_PATH, 'utf-8');
-    const { frontmatter, body } = splitFrontmatter(content);
-    const nextFrontmatter = disableLiveBlock(frontmatter);
-    const nextBody = prependNotice(body);
-
-    if (nextFrontmatter !== frontmatter || nextBody !== body) {
-        await fs.writeFile(TODAY_NOTE_PATH, joinFrontmatter(nextFrontmatter, nextBody), 'utf-8');
-        console.log('[TodayNoteDeprecation] Deprecated Today.md live dashboard');
-    }
-
-    await markProcessed();
-}
diff --git a/apps/x/packages/core/src/knowledge/ensure_daily_note.ts b/apps/x/packages/core/src/knowledge/ensure_daily_note.ts
new file mode 100644
index 00000000..341ddfd9
--- /dev/null
+++ b/apps/x/packages/core/src/knowledge/ensure_daily_note.ts
@@ -0,0 +1,93 @@
+import path from 'path';
+import fs from 'fs';
+import { stringify as stringifyYaml } from 'yaml';
+import { LiveNoteSchema } from '@x/shared/dist/live-note.js';
+import { WorkDir } from '../config/config.js';
+import { splitFrontmatter } from '../application/lib/parse-frontmatter.js';
+import z from 'zod';
+
+const KNOWLEDGE_DIR = path.join(WorkDir, 'knowledge');
+const DAILY_NOTE_PATH = path.join(KNOWLEDGE_DIR, 'Today.md');
+
+// Bump this whenever the canonical Today.md template changes (objective,
+// triggers, default body, etc.). On app start, ensureDailyNote() compares the
+// on-disk `templateVersion` against this constant — if older or missing, the
+// existing file is renamed to Today.md.bkp.<ISO-stamp> and replaced with the
+// new template. v2 is the live-note rewrite (single objective, no `track:`).
+const CANONICAL_DAILY_NOTE_VERSION = 2;
+
+const TODAY_LIVE_NOTE: z.infer<typeof LiveNoteSchema> = {
+    objective:
+`Keep Today.md current as a living dashboard for the day. Maintain these H2 sections in this order:
+
+1. **Overview** — 2-3 prose sentences greeting the user and reading the day (warm, confident tone — use today's calendar density from \`calendar_sync/\` and the existing Priorities section if populated). Below the prose, render exactly one \`image\` block fitting the mood (use weather + calendar density as cues). Source the image via web-search from a permissive host (Unsplash/Pexels/Pixabay/Wikimedia, direct .jpg/.png/.webp URLs only); fall back to NASA APOD (https://apod.nasa.gov/apod/astropix.html) if nothing suitable. Keep the image **wide / low-height**. Skip refreshing this section if its content is still suitable and less than 24h old.
+
+2. **Calendar** — today's meetings as a single \`calendar\` block titled "Today's Meetings". Read \`calendar_sync/\` via \`workspace-readdir\` → \`workspace-readFile\` each \`.json\`. Filter to today; after 10am drop meetings that have already ended. Always emit the block (use \`events: []\` when empty). Set \`showJoinButton: true\` if any event has a \`conferenceLink\`.
+
+3. **Emails** — a digest of email threads worth attention today, as a **single** fenced \`emails\` block (plural — never individual \`email\` blocks per thread). Body shape: \`{"title":"Today's Emails","emails":[...]}\`. Each entry: \`threadId\`, \`subject\`, \`from\`, \`date\`, \`summary\`, \`latest_email\`. For threads needing a reply, add \`draft_response\` written in the user's voice — direct, informal, no fluff. For FYI threads, omit \`draft_response\`. Skip marketing, auto-notifications, and closed threads. Without an event payload, scan \`gmail_sync/\` (skip \`sync_state.json\` and \`attachments/\`), prioritising threads where frontmatter \`action = "reply"\` or \`"respond"\`. With an event payload, integrate qualifying new threads into the existing digest (add a new entry for a new threadId; update the existing entry if shown). Don't re-list threads the user has already seen unless their state changed. If nothing qualifies: "No new emails."
+
+4. **What you missed** — a short markdown summary of yesterday's meetings + emails that matter this morning. Pull decisions / action items from \`knowledge/Meetings/<source>/<yesterday>/\` (\`workspace-readdir\` recursive on \`knowledge/Meetings\`, filter folders matching yesterday's date, read each file). Skim \`gmail_sync/\` for unresolved threads. Skip recurring/routine events. If nothing notable: "Quiet day yesterday — nothing to flag."
+
+5. **Priorities** — a ranked markdown list of actionable items the user should focus on today. Sources: yesterday's meeting action items (\`knowledge/Meetings/<source>/<yesterday>/\`), open follow-ups across \`knowledge/\` (\`workspace-grep\` for "- [ ]"), the **What you missed** section above. Don't list calendar events as tasks (Calendar section has them) and don't list trivial admin. Rank by importance; note time-sensitivity inline. With an event payload (gmail or calendar), only re-emit the full list if the event genuinely shifts priorities (urgent reply, deadline arrival, blocking reschedule). If nothing pressing: "No pressing tasks today — good day to make progress on bigger items."
+
+Treat the note as a coherent artifact. Make small, incremental edits — one section at a time — rather than rewriting the whole body each run.`,
+    active: true,
+    triggers: {
+        // Three windows give the user a fresh dashboard morning, midday, and
+        // post-lunch even with no calendar/email events landing in between.
+        windows: [
+            { startTime: '08:00', endTime: '12:00' },
+            { startTime: '12:00', endTime: '15:00' },
+            { startTime: '15:00', endTime: '18:00' },
+        ],
+        // Event-driven updates handle in-day shifts (new email threads worth
+        // attention, calendar reshuffles, urgent escalations).
+        eventMatchCriteria:
+`Email or calendar events that may shift today's dashboard: new or updated email threads needing the user's attention, urgent reply requests, deadline-bearing items, escalations from people the user cares about, calendar additions/cancellations/reschedules affecting today, or anything that changes the user's near-term priorities. Skip marketing, newsletters, auto-notifications, and chatter on closed threads.`,
+    },
+};
+
+function buildDailyNoteContent(body: string = '# Today\n'): string {
+    const fm = stringifyYaml(
+        { templateVersion: CANONICAL_DAILY_NOTE_VERSION, live: TODAY_LIVE_NOTE },
+        { lineWidth: 0, blockQuote: 'literal' },
+    ).trimEnd();
+    return `---\n${fm}\n---\n${body}`;
+}
+
+function readCurrentTemplateVersion(): number {
+    if (!fs.existsSync(DAILY_NOTE_PATH)) return -1;
+    const raw = fs.readFileSync(DAILY_NOTE_PATH, 'utf-8');
+    const { frontmatter } = splitFrontmatter(raw);
+    const v = frontmatter.templateVersion;
+    return typeof v === 'number' ? v : 0;
+}
+
+export function ensureDailyNote(): void {
+    // Fresh install — no existing file.
+    if (!fs.existsSync(DAILY_NOTE_PATH)) {
+        fs.writeFileSync(DAILY_NOTE_PATH, buildDailyNoteContent(), 'utf-8');
+        console.log(`[DailyNote] Created Today.md (v${CANONICAL_DAILY_NOTE_VERSION})`);
+        return;
+    }
+
+    // Up-to-date — nothing to do.
+    const currentVersion = readCurrentTemplateVersion();
+    if (currentVersion >= CANONICAL_DAILY_NOTE_VERSION) return;
+
+    // Migrate aggressively: rename existing → backup, write a fresh canonical
+    // template (no body carried over). Today.md is a flagship demo whose
+    // content is meant to be regenerated by the live-note agent anyway —
+    // preserving the old body just leaves orphan sections behind on
+    // restructure. The .bkp file is the recovery path; its name doesn't end
+    // in `.md`, so the scheduler and event router naturally skip it. Pre-v2
+    // notes (with the old `track:` array) are caught by this same path.
+    const stamp = new Date().toISOString().replace(/[:.]/g, '-');
+    const backupPath = `${DAILY_NOTE_PATH}.bkp.${stamp}`;
+    fs.renameSync(DAILY_NOTE_PATH, backupPath);
+    fs.writeFileSync(DAILY_NOTE_PATH, buildDailyNoteContent(), 'utf-8');
+    console.log(
+        `[DailyNote] Migrated v${currentVersion} → v${CANONICAL_DAILY_NOTE_VERSION}; ` +
+        `previous version saved to ${backupPath}`,
+    );
+}
diff --git a/apps/x/packages/core/src/knowledge/google-client-factory.test.ts b/apps/x/packages/core/src/knowledge/google-client-factory.test.ts
deleted file mode 100644
index 7e49845b..00000000
--- a/apps/x/packages/core/src/knowledge/google-client-factory.test.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import type { OAuthTokens } from '../auth/types.js';
-
-/**
- * Regression for the cold-start race that left a stuck `error` field in
- * oauth.json: Gmail + Calendar both call getClient() in the same tick, the
- * dedup singleton's check-and-assign were separated by an `await`, two
- * parallel refreshes go out, backend 429s the second one, the upsert(error)
- * write from the 429 path could land last and stick "Needs reconnect" in
- * the UI even though tokens were valid.
- */
-
-interface MockOAuthRepo {
-  read: ReturnType<typeof vi.fn>;
-  upsert: ReturnType<typeof vi.fn>;
-  delete: ReturnType<typeof vi.fn>;
-  getClientFacingConfig: ReturnType<typeof vi.fn>;
-}
-
-let refreshSpy: ReturnType<typeof vi.fn>;
-let mockOAuthRepo: MockOAuthRepo;
-let storedTokens: OAuthTokens;
-
-beforeEach(() => {
-  vi.resetModules();
-
-  // Expired 1 minute ago — forces the refresh path through getClient.
-  storedTokens = {
-    access_token: 'old-access',
-    refresh_token: 'rt',
-    expires_at: Math.floor(Date.now() / 1000) - 60,
-    token_type: 'Bearer',
-    scopes: ['https://www.googleapis.com/auth/gmail.modify'],
-  };
-
-  mockOAuthRepo = {
-    read: vi.fn(async () => ({ tokens: storedTokens, mode: 'rowboat' as const })),
-    upsert: vi.fn(async () => undefined),
-    delete: vi.fn(async () => undefined),
-    getClientFacingConfig: vi.fn(async () => ({})),
-  };
-
-  vi.doMock('../di/container.js', () => ({
-    default: {
-      resolve: (key: string) => {
-        if (key === 'oauthRepo') return mockOAuthRepo;
-        throw new Error(`unexpected DI resolve in test: ${key}`);
-      },
-    },
-  }));
-
-  // Real-ish delay so two concurrent callers actually have something to
-  // overlap on — without it the spy might resolve synchronously and mask
-  // the very race we're testing for.
-  refreshSpy = vi.fn(async (_rt: string, scopes?: string[]) => {
-    await new Promise((r) => setTimeout(r, 25));
-    return {
-      access_token: 'new-access',
-      refresh_token: 'rt',
-      expires_at: Math.floor(Date.now() / 1000) + 3600,
-      token_type: 'Bearer' as const,
-      scopes,
-    };
-  });
-
-  vi.doMock('../auth/google-backend-oauth.js', async () => {
-    const actual = await vi.importActual<typeof import('../auth/google-backend-oauth.js')>(
-      '../auth/google-backend-oauth.js',
-    );
-    return {
-      ...actual,
-      refreshTokensViaBackend: refreshSpy,
-    };
-  });
-});
-
-afterEach(() => {
-  vi.doUnmock('../di/container.js');
-  vi.doUnmock('../auth/google-backend-oauth.js');
-  vi.resetModules();
-});
-
-describe('GoogleClientFactory.getClient', () => {
-  it('coalesces concurrent callers into a single refresh', async () => {
-    const { GoogleClientFactory } = await import('./google-client-factory.js');
-    GoogleClientFactory.clearCache();
-
-    // Same tick — this is the exact pattern that sync_gmail.init() and
-    // sync_calendar.init() produce on cold start.
-    const [a, b] = await Promise.all([
-      GoogleClientFactory.getClient(),
-      GoogleClientFactory.getClient(),
-    ]);
-
-    expect(refreshSpy).toHaveBeenCalledTimes(1);
-    expect(a).not.toBeNull();
-    expect(a).toBe(b);
-
-    // And the failure-path upsert (error: '429…') is never invoked, so
-    // oauth.json doesn't get a stuck error.
-    const errorUpserts = mockOAuthRepo.upsert.mock.calls.filter(
-      ([, conn]) => (conn as { error?: string | null }).error,
-    );
-    expect(errorUpserts).toHaveLength(0);
-  });
-
-  it('returns cached client when tokens are not expired', async () => {
-    // Tokens valid for another hour — no refresh should fire.
-    storedTokens = {
-      access_token: 'fresh-access',
-      refresh_token: 'rt',
-      expires_at: Math.floor(Date.now() / 1000) + 3600,
-      token_type: 'Bearer',
-      scopes: ['https://www.googleapis.com/auth/gmail.modify'],
-    };
-    mockOAuthRepo.read = vi.fn(async () => ({ tokens: storedTokens, mode: 'rowboat' as const }));
-
-    const { GoogleClientFactory } = await import('./google-client-factory.js');
-    GoogleClientFactory.clearCache();
-
-    const a = await GoogleClientFactory.getClient();
-    const b = await GoogleClientFactory.getClient();
-
-    expect(refreshSpy).not.toHaveBeenCalled();
-    expect(a).toBe(b);
-  });
-
-  it('does not stick an error on transient (429) refresh failure', async () => {
-    const { TransientRefreshError } = await import('../auth/google-backend-oauth.js');
-    refreshSpy.mockRejectedValueOnce(new TransientRefreshError('refresh failed: 429 Refresh in progress', 429));
-
-    const { GoogleClientFactory } = await import('./google-client-factory.js');
-    GoogleClientFactory.clearCache();
-
-    const result = await GoogleClientFactory.getClient();
-
-    expect(result).toBeNull();
-    const errorUpserts = mockOAuthRepo.upsert.mock.calls.filter(
-      ([, conn]) => (conn as { error?: string | null }).error,
-    );
-    expect(errorUpserts).toHaveLength(0);
-  });
-});
diff --git a/apps/x/packages/core/src/knowledge/google-client-factory.ts b/apps/x/packages/core/src/knowledge/google-client-factory.ts
index 2e85366b..aa47dbc2 100644
--- a/apps/x/packages/core/src/knowledge/google-client-factory.ts
+++ b/apps/x/packages/core/src/knowledge/google-client-factory.ts
@@ -8,7 +8,6 @@ import type { Configuration } from '../auth/oauth-client.js';
 import { OAuthTokens } from '../auth/types.js';
 import {
     ReconnectRequiredError,
-    TransientRefreshError,
     refreshTokensViaBackend,
 } from '../auth/google-backend-oauth.js';
 
@@ -53,14 +52,11 @@ export class GoogleClientFactory {
     };
 
     /**
-     * Promise singleton so concurrent getClient() callers share a single
-     * pass through the read/refresh/build pipeline rather than fanning
-     * out parallel refreshes. The check-and-assign must be atomic (no
-     * `await` between them) so two callers in the same tick can't both
-     * pass the null check before either assigns — that's why getClient()
-     * is a thin synchronous wrapper around getClientInner().
+     * Promise singleton so a burst of getClient() calls during the brief
+     * expiry window all wait on a single refresh round-trip rather than
+     * fanning out parallel refreshes.
      */
-    private static inFlightClient: Promise<OAuth2Client | null> | null = null;
+    private static refreshInFlight: Promise<OAuth2Client | null> | null = null;
 
     private static async resolveByokCredentials(): Promise<{ clientId: string; clientSecret?: string }> {
         const oauthRepo = container.resolve<IOAuthRepo>('oauthRepo');
@@ -73,24 +69,13 @@ export class GoogleClientFactory {
     }
 
     /**
-     * Get or create OAuth2Client, reusing the cached instance when possible.
-     *
-     * The check-and-assign of `inFlightClient` is synchronous so concurrent
-     * callers in the same tick coalesce onto a single pipeline run. The actual
-     * work lives in getClientInner(); this wrapper exists purely to guarantee
-     * the dedup invariant.
+     * Get or create OAuth2Client, reusing cached instance when possible
      */
     static async getClient(): Promise<OAuth2Client | null> {
-        if (this.inFlightClient) {
-            return this.inFlightClient;
+        if (this.refreshInFlight) {
+            return this.refreshInFlight;
         }
-        this.inFlightClient = this.getClientInner().finally(() => {
-            this.inFlightClient = null;
-        });
-        return this.inFlightClient;
-    }
 
-    private static async getClientInner(): Promise<OAuth2Client | null> {
         const oauthRepo = container.resolve<IOAuthRepo>('oauthRepo');
         const connection = await oauthRepo.read(this.PROVIDER_NAME);
         const tokens = connection.tokens ?? null;
@@ -125,12 +110,16 @@ export class GoogleClientFactory {
         // expiry — keeps long-running calls from racing the boundary.
         if (oauthClient.isTokenExpired(tokens)) {
             if (!tokens.refresh_token) {
-                console.log('[OAuth] Google token expired and no refresh token available.');
+                console.log('[OAuth] Token expired and no refresh token available for Google.');
                 await oauthRepo.upsert(this.PROVIDER_NAME, { error: 'Missing refresh token. Please reconnect.' });
                 this.clearCache();
                 return null;
             }
-            return this.refreshAndBuild(tokens, mode);
+
+            this.refreshInFlight = this.refreshAndBuild(tokens, mode).finally(() => {
+                this.refreshInFlight = null;
+            });
+            return this.refreshInFlight;
         }
 
         // Reuse client if tokens haven't changed
@@ -146,8 +135,7 @@ export class GoogleClientFactory {
         const oauthRepo = container.resolve<IOAuthRepo>('oauthRepo');
 
         try {
-            const secsSinceExpiry = Math.floor(Date.now() / 1000) - tokens.expires_at;
-            console.log(`[OAuth] Google token expired ${secsSinceExpiry}s ago, refreshing via ${mode}...`);
+            console.log(`[OAuth] Token expired, refreshing via ${mode}...`);
             const existingScopes = tokens.scopes;
 
             let refreshedTokens: OAuthTokens;
@@ -162,8 +150,7 @@ export class GoogleClientFactory {
             }
 
             await oauthRepo.upsert(this.PROVIDER_NAME, { tokens: refreshedTokens, error: null });
-            const ttl = refreshedTokens.expires_at - Math.floor(Date.now() / 1000);
-            console.log(`[OAuth] Google token refreshed successfully (mode=${mode}, new expires_at=${refreshedTokens.expires_at}, ttl=${ttl}s)`);
+            console.log('[OAuth] Token refreshed successfully');
             return this.buildAndCacheClient(refreshedTokens, mode);
         } catch (error) {
             if (error instanceof ReconnectRequiredError) {
@@ -172,24 +159,9 @@ export class GoogleClientFactory {
                 this.clearCache();
                 return null;
             }
-            if (error instanceof TransientRefreshError) {
-                // Transient (rate limit, in-flight dedup, upstream 5xx): leave
-                // stored tokens + cache alone, log, and let the next sync tick
-                // retry. Writing an `error` here would stick "Needs reconnect"
-                // in the UI for a problem the user can't fix by reconnecting.
-                console.warn(`[OAuth] Transient Google refresh failure (status=${error.status}): ${error.message} — will retry on next tick`);
-                return null;
-            }
             const message = error instanceof Error ? error.message : 'Failed to refresh token for Google';
             await oauthRepo.upsert(this.PROVIDER_NAME, { error: message });
             console.error('[OAuth] Failed to refresh token for Google:', error);
-            // Walk cause chain so we can see e.g. `Not signed into Rowboat`
-            // showing up under a generic `fetch failed` outer error.
-            let cause: unknown = error;
-            while (cause != null && typeof cause === 'object' && 'cause' in cause) {
-                cause = (cause as { cause?: unknown }).cause;
-                if (cause != null) console.error('[OAuth] Caused by:', cause);
-            }
             this.clearCache();
             return null;
         }
@@ -216,41 +188,18 @@ export class GoogleClientFactory {
      * Check if credentials are available and have required scopes
      */
     static async hasValidCredentials(requiredScopes: string | string[]): Promise<boolean> {
-        const status = await this.getCredentialStatus(requiredScopes);
-        return status.hasRequiredScopes;
-    }
-
-    static async getCredentialStatus(requiredScopes: string | string[]): Promise<{
-        connected: boolean;
-        hasRequiredScopes: boolean;
-        missingScopes: string[];
-    }> {
         const oauthRepo = container.resolve<IOAuthRepo>('oauthRepo');
         const { tokens } = await oauthRepo.read(this.PROVIDER_NAME);
         if (!tokens) {
-            const scopesArray = Array.isArray(requiredScopes) ? requiredScopes : [requiredScopes];
-            return {
-                connected: false,
-                hasRequiredScopes: false,
-                missingScopes: scopesArray,
-            };
+            return false;
         }
 
+        // Check if required scope(s) are present
         const scopesArray = Array.isArray(requiredScopes) ? requiredScopes : [requiredScopes];
-        const granted = new Set(tokens.scopes ?? []);
-        const missingScopes = scopesArray.filter(scope => !granted.has(scope));
         if (!tokens.scopes || tokens.scopes.length === 0) {
-            return {
-                connected: true,
-                hasRequiredScopes: false,
-                missingScopes,
-            };
+            return false;
         }
-        return {
-            connected: true,
-            hasRequiredScopes: missingScopes.length === 0,
-            missingScopes,
-        };
+        return scopesArray.every(scope => tokens.scopes!.includes(scope));
     }
 
     /**
diff --git a/apps/x/packages/core/src/knowledge/inline_task_agent.ts b/apps/x/packages/core/src/knowledge/inline_task_agent.ts
index db81198d..cd17a940 100644
--- a/apps/x/packages/core/src/knowledge/inline_task_agent.ts
+++ b/apps/x/packages/core/src/knowledge/inline_task_agent.ts
@@ -1,10 +1,7 @@
 import { BuiltinTools } from '../application/lib/builtin-tools.js';
 
 export function getRaw(): string {
-  // code_agent_run needs an interactive UI to answer its permission asks; exclude it
-  // from this headless agent so it can't hang waiting on an approval no one can give.
   const toolEntries = Object.keys(BuiltinTools)
-    .filter(name => name !== 'code_agent_run')
     .map(name => `  ${name}:\n    type: builtin\n    name: ${name}`)
     .join('\n');
 
@@ -101,7 +98,7 @@ This brief refreshes every 15 minutes, so it should always reflect the **current
 
 ## Technical Instructions
 
-**IMPORTANT:** File tools accept relative paths that resolve against the Rowboat workspace root. For workspace data, use paths like \`calendar_sync/\`, \`gmail_sync/\`, \`knowledge/\` — NOT absolute paths.
+**IMPORTANT:** All workspace tools (workspace-readdir, workspace-readFile, workspace-grep, etc.) take paths **relative to the workspace root**. Use paths like \`calendar_sync/\`, \`gmail_sync/\`, \`knowledge/\` — NOT absolute paths.
 
 **IMPORTANT:** Check the current date. If the date has changed since the content was last generated, clear everything and start fresh for the new day.
 
@@ -139,8 +136,8 @@ This is the most time-sensitive section — it orients the user on what's coming
 6. **IMPORTANT:** Do NOT say "nothing in the next X hours" if there IS an event within that window. Always compute the actual time difference between now and the next event's start time before writing this section.
 
 ### Calendar
-1. Use \`file-list\` with path \`calendar_sync\` to list files
-2. Use \`file-readText\` to read each \`.json\` event file (e.g. \`calendar_sync/eventid123.json\`)
+1. Use \`workspace-readdir\` with path \`calendar_sync\` to list files
+2. Use \`workspace-readFile\` to read each \`.json\` event file (e.g. \`calendar_sync/eventid123.json\`)
 3. Filter for events happening **today** (compare the event's start dateTime or date to the current date)
 4. **After morning:** Only include events that **haven't ended yet**. Don't show meetings that already happened — the user was there. If it's afternoon and all meetings are done, show an empty calendar block.
 5. **Always** output a \\\`\\\`\\\`calendar block — even if there are no events today. If no events, output an empty events array:
@@ -163,8 +160,8 @@ If there are events, include them:
 7. If there are no remaining events, don't add filler text — the empty calendar block speaks for itself.
 
 ### Emails
-1. Use \`file-list\` with path \`gmail_sync\` to list files (skip \`sync_state.json\` and \`attachments/\`)
-2. Use \`file-readText\` to read the email markdown files (e.g. \`gmail_sync/threadid123.md\`)
+1. Use \`workspace-readdir\` with path \`gmail_sync\` to list files (skip \`sync_state.json\` and \`attachments/\`)
+2. Use \`workspace-readFile\` to read the email markdown files (e.g. \`gmail_sync/threadid123.md\`)
 3. Check the frontmatter \`action\` field — emails with \`action: reply\` or \`action: respond\` need a response
 4. Output ALL emails (both action items and FYI) in a single \\\`\\\`\\\`emails block as a JSON array. Emails needing a response get a \`draft_response\`. Write drafts in the user's voice — direct, informal, no fluff. Example:
 
@@ -183,7 +180,7 @@ If there are events, include them:
 This section is about things the user might not be aware of from yesterday. Think of it as: "Here's what happened while you were away."
 
 - **Skip recurring/routine events entirely.** The user knows they have standup every day. Don't mention it unless something unusual happened during it.
-- **Read yesterday's meeting notes** from \`knowledge/Meetings/\`. The directory structure is nested: \`knowledge/Meetings/<source>/<YYYY-MM-DD>/meeting-<timestamp>.md\` (e.g. \`knowledge/Meetings/rowboat/2026-03-30/meeting-2026-03-30T13-49-27.md\`). Use \`file-list\` with \`recursive: true\` on \`knowledge/Meetings\` to find all files, then filter for files in a folder matching yesterday's date. Read the matching files with \`file-readText\`. Summarize key outcomes: decisions made, action items assigned, blockers raised, anything that changes priorities.
+- **Read yesterday's meeting notes** from \`knowledge/Meetings/\`. The directory structure is nested: \`knowledge/Meetings/<source>/<YYYY-MM-DD>/meeting-<timestamp>.md\` (e.g. \`knowledge/Meetings/rowboat/2026-03-30/meeting-2026-03-30T13-49-27.md\`). Use \`workspace-readdir\` with \`recursive: true\` on \`knowledge/Meetings\` to find all files, then filter for files in a folder matching yesterday's date. Read the matching files with \`workspace-readFile\`. Summarize key outcomes: decisions made, action items assigned, blockers raised, anything that changes priorities.
 - Check yesterday's emails in \`gmail_sync/\` for anything that went unresolved.
 - Surface things that matter: commitments made, deadlines mentioned, important updates.
 - **If nothing notable happened, say "Quiet day yesterday — nothing to flag." and move on.** Don't manufacture content.
@@ -195,7 +192,7 @@ This is NOT a generic task list. These are the things the user should actually f
 - **Do NOT list calendar events as tasks.** They're already in the Calendar section.
 - **Do NOT list trivial admin** (filing small invoices, archiving spam, etc.) — the user can handle that in 30 seconds without being told to.
 - **Pull action items from yesterday's meeting notes** in \`knowledge/Meetings/<source>/<YYYY-MM-DD>/\` — these are often the most important source of real tasks.
-- Search through \`knowledge/\` using \`file-grep\` and \`file-list\` for checkbox items (\`- [ ]\`), explicit action items, deadlines, or follow-ups.
+- Search through \`knowledge/\` using \`workspace-grep\` and \`workspace-readdir\` for checkbox items (\`- [ ]\`), explicit action items, deadlines, or follow-ups.
 - **Rank by importance.** Lead with the most critical item. If something is time-sensitive, say when it needs to happen by.
 - Add brief context for why each item matters if it's not obvious.
 - **If there are no real tasks, say "No pressing tasks today — good day to make progress on bigger items." Don't invent busywork.**
@@ -224,4 +221,4 @@ When you see a target region associated with your task (during a scheduled run),
 - Use the existing content as context (e.g., to update rather than regenerate from scratch if appropriate)
 - Do NOT include the target tags themselves in your response
 `;
-}
+}
\ No newline at end of file
diff --git a/apps/x/packages/core/src/knowledge/inline_tasks.ts b/apps/x/packages/core/src/knowledge/inline_tasks.ts
index cd2f23c0..5a19e4bd 100644
--- a/apps/x/packages/core/src/knowledge/inline_tasks.ts
+++ b/apps/x/packages/core/src/knowledge/inline_tasks.ts
@@ -11,7 +11,6 @@ import { createProvider } from '../models/models.js';
 import { inlineTask } from '@x/shared';
 import { extractAgentResponse, waitForRunCompletion } from '../agents/utils.js';
 import { captureLlmUsage } from '../analytics/usage.js';
-import { withUseCase } from '../analytics/use_case.js';
 
 const SYNC_INTERVAL_MS = 15 * 1000; // 15 seconds
 const INLINE_TASK_AGENT = 'inline_task_agent';
@@ -665,11 +664,11 @@ Default end time (local): ${localEnd}
 Respond with ONLY valid JSON: either a schedule object or null. No other text.`;
 
     try {
-        const result = await withUseCase({ useCase: 'knowledge_sync', subUseCase: 'inline_task_classify' }, () => generateText({
+        const result = await generateText({
             model,
             system: systemPrompt,
             prompt: instruction,
-        }));
+        });
 
         captureLlmUsage({
             useCase: 'knowledge_sync',
diff --git a/apps/x/packages/core/src/knowledge/label_emails.ts b/apps/x/packages/core/src/knowledge/label_emails.ts
index ebb940c6..76ae579c 100644
--- a/apps/x/packages/core/src/knowledge/label_emails.ts
+++ b/apps/x/packages/core/src/knowledge/label_emails.ts
@@ -78,13 +78,13 @@ async function labelEmailBatch(
     });
 
     let message = `Label the following ${files.length} email files by prepending YAML frontmatter.\n\n`;
-    message += `**Important:** Use workspace-relative paths with file-editText (e.g. "gmail_sync/email.md", NOT absolute paths).\n\n`;
+    message += `**Important:** Use workspace-relative paths with workspace-edit (e.g. "gmail_sync/email.md", NOT absolute paths).\n\n`;
 
     for (let i = 0; i < files.length; i++) {
         const file = files[i];
         const relativePath = path.relative(WorkDir, file.path);
         const truncated = file.content.length > MAX_CONTENT_LENGTH
-            ? file.content.slice(0, MAX_CONTENT_LENGTH) + '\n\n[... content truncated, use file-readText for full content ...]'
+            ? file.content.slice(0, MAX_CONTENT_LENGTH) + '\n\n[... content truncated, use workspace-readFile for full content ...]'
             : file.content;
 
         message += `## File ${i + 1}: ${relativePath}\n\n`;
@@ -98,7 +98,7 @@ async function labelEmailBatch(
         if (event.type !== 'tool-invocation') {
             return;
         }
-        if (event.toolName !== 'file-editText') {
+        if (event.toolName !== 'workspace-edit') {
             return;
         }
         try {
diff --git a/apps/x/packages/core/src/knowledge/labeling_agent.ts b/apps/x/packages/core/src/knowledge/labeling_agent.ts
index b0f819ac..8842891a 100644
--- a/apps/x/packages/core/src/knowledge/labeling_agent.ts
+++ b/apps/x/packages/core/src/knowledge/labeling_agent.ts
@@ -3,15 +3,15 @@ import { renderTagSystemForEmails } from './tag_system.js';
 export function getRaw(): string {
   return `---
 tools:
-  file-readText:
+  workspace-readFile:
     type: builtin
-    name: file-readText
-  file-editText:
+    name: workspace-readFile
+  workspace-edit:
     type: builtin
-    name: file-editText
-  file-list:
+    name: workspace-edit
+  workspace-readdir:
     type: builtin
-    name: file-list
+    name: workspace-readdir
 ---
 # Task
 
@@ -70,7 +70,7 @@ ${renderTagSystemForEmails()}
    - **Action**: Does this need a response (\`action-required\`), is it time-sensitive (\`urgent\`), or are you waiting on them (\`waiting\`)? Use \`""\` if none apply. **Do NOT use \`fyi\` as an action value** — it is not a valid action tag.
 3. **Apply noise tags aggressively.** Noise tags can and should coexist with relationship and topic tags. A salary confirmation from your finance team should have BOTH \`relationship: ['team']\` AND \`filter: ['receipt']\`. The noise tag determines whether a note is created — it overrides relationship and topic signals.
 4. Be accurate — only apply labels that clearly fit. But when an email IS noise, always add the noise tag even when other tags are present.
-5. Use \`file-editText\` to prepend YAML frontmatter to the file. The oldString should be the first line of the file (the \`# Subject\` heading), and the newString should be the frontmatter followed by that same first line.
+5. Use \`workspace-edit\` to prepend YAML frontmatter to the file. The oldString should be the first line of the file (the \`# Subject\` heading), and the newString should be the frontmatter followed by that same first line.
 6. Always include \`processed: true\` and \`labeled_at\` with the current ISO timestamp.
 7. If the email already has frontmatter (starts with \`---\`), skip it.
 
diff --git a/apps/x/packages/core/src/knowledge/live-note/agent.ts b/apps/x/packages/core/src/knowledge/live-note/agent.ts
index 7638384e..66cacbc3 100644
--- a/apps/x/packages/core/src/knowledge/live-note/agent.ts
+++ b/apps/x/packages/core/src/knowledge/live-note/agent.ts
@@ -26,7 +26,7 @@ Every run message has this shape:
     **Objective:**
     <the user-authored objective — usually 1-3 sentences describing what the note should keep being>
 
-    Start by calling \`file-readText\` on \`<filePath>\` ... patch-style edits ...
+    Start by calling \`workspace-readFile\` on \`<filePath>\` ... patch-style edits ...
 
 For **manual** runs, an optional trailing block may appear:
 
@@ -51,10 +51,10 @@ You own the **entire body below the H1** — you may freely add, edit, reorganiz
 **Make incremental, patch-style edits — not one-shot rewrites.**
 
 The right pattern on every run:
-1. \`file-readText\` to fetch the current note.
+1. \`workspace-readFile\` to fetch the current note.
 2. Decide on the *first* change you need to make (add a section, replace a stale figure, dedupe entries, fix an out-of-date paragraph).
-3. \`file-editText\` to make that one change.
-4. \`file-readText\` again to confirm the result.
+3. \`workspace-edit\` to make that one change.
+4. \`workspace-readFile\` again to confirm the result.
 5. Decide the *next* change. Repeat.
 
 Why patch-style:
@@ -63,8 +63,8 @@ Why patch-style:
 - It lets you abort partway if a tool call fails, leaving the note in a consistent partial state instead of a clobbered one.
 
 Avoid:
-- Calling \`file-writeText\` to replace the entire body. That's the no-go path.
-- Building up the entire new body in your head and emitting it in a single \`file-editText\` call with a giant \`oldString\` / \`newString\`. Smaller anchors, more steps.
+- Calling \`workspace-writeFile\` to replace the entire body. That's the no-go path.
+- Building up the entire new body in your head and emitting it in a single \`workspace-edit\` call with a giant \`oldString\` / \`newString\`. Smaller anchors, more steps.
 
 # Body Structure (defaults)
 
@@ -82,6 +82,165 @@ ${KNOWLEDGE_NOTE_STYLE_GUIDE}
 
 The style guide above is the canonical writing style for everything you emit into the body. The objective may specify a particular shape ("3-column markdown table: Location | Local Time | Offset") — when it does, follow it exactly. When it doesn't, walk the ladder above and pick the tightest shape that fits the data.
 
+# Output Block Types
+
+The note renderer turns specially-tagged fenced code blocks into styled UI: tables, charts, calendars, embeds, and more. Reach for these when the data has structure that benefits from a visual treatment; stay with plain markdown when prose, a markdown table, or bullets carry the meaning just as well. Pick **at most one block per output region** unless the objective asks for a multi-section layout — and follow the exact fence language and shape, since anything unparseable renders as a small "Invalid X block" error card.
+
+Do **not** emit \`task\` blocks — those are user-authored input mechanisms, not agent outputs.
+
+## \`table\` — tabular data (JSON)
+
+Use for: scoreboards, leaderboards, comparisons, multi-row status digests.
+
+\`\`\`table
+{
+  "title": "Top stories on Hacker News",
+  "columns": ["Rank", "Title", "Points", "Comments"],
+  "data": [
+    {"Rank": 1, "Title": "Show HN: ...", "Points": 842, "Comments": 312},
+    {"Rank": 2, "Title": "...", "Points": 530, "Comments": 144}
+  ]
+}
+\`\`\`
+
+Required: \`columns\` (string[]), \`data\` (array of objects keyed by column name). Optional: \`title\`.
+
+## \`chart\` — line / bar / pie chart (JSON)
+
+Use for: time series, categorical breakdowns, share-of-total. Skip if a single sentence carries the meaning.
+
+\`\`\`chart
+{
+  "chart": "line",
+  "title": "USD/INR — last 7 days",
+  "x": "date",
+  "y": "rate",
+  "data": [
+    {"date": "2026-04-13", "rate": 83.41},
+    {"date": "2026-04-14", "rate": 83.38}
+  ]
+}
+\`\`\`
+
+Required: \`chart\` ("line" | "bar" | "pie"), \`x\` (field name on each row), \`y\` (field name on each row), and **either** \`data\` (inline array of objects) **or** \`source\` (workspace path to a JSON-array file). Optional: \`title\`.
+
+## \`mermaid\` — diagrams (raw Mermaid source)
+
+Use for: relationship maps, flowcharts, sequence diagrams, gantt charts, mind maps.
+
+\`\`\`mermaid
+graph LR
+  A[Project Alpha] --> B[Sarah Chen]
+  A --> C[Acme Corp]
+  B --> D[Q3 Launch]
+\`\`\`
+
+Body is plain Mermaid source — no JSON wrapper.
+
+## \`calendar\` — list of events (JSON)
+
+Use for: upcoming meetings, agenda digests, day/week views.
+
+\`\`\`calendar
+{
+  "title": "Today",
+  "events": [
+    {
+      "summary": "1:1 with Sarah",
+      "start": {"dateTime": "2026-04-20T10:00:00-07:00"},
+      "end": {"dateTime": "2026-04-20T10:30:00-07:00"},
+      "location": "Zoom",
+      "conferenceLink": "https://zoom.us/j/..."
+    }
+  ]
+}
+\`\`\`
+
+Required: \`events\` (array). Each event optionally has \`summary\`, \`start\`/\`end\` (object with \`dateTime\` ISO string OR \`date\` "YYYY-MM-DD" for all-day), \`location\`, \`htmlLink\`, \`conferenceLink\`, \`source\`. Optional top-level: \`title\`, \`showJoinButton\` (bool).
+
+## \`email\` — single email or thread digest (JSON)
+
+Use for: surfacing one important thread — latest message body, summary of prior context, optional draft reply.
+
+\`\`\`email
+{
+  "subject": "Q3 launch readiness",
+  "from": "sarah@acme.com",
+  "date": "2026-04-19T16:42:00Z",
+  "summary": "Sarah confirms timeline; flagged blocker on infra capacity.",
+  "latest_email": "Hey — quick update on Q3...\\n\\nThanks,\\nSarah"
+}
+\`\`\`
+
+Required: \`latest_email\` (string). Optional: \`threadId\`, \`summary\`, \`subject\`, \`from\`, \`to\`, \`date\`, \`past_summary\`, \`draft_response\`, \`response_mode\` ("inline" | "assistant" | "both").
+
+For digests of **many** threads, prefer a \`table\` (Subject | From | Snippet) — \`email\` is for one thread at a time.
+
+## \`image\` — single image (JSON)
+
+Use for: charts, screenshots, photos you have a URL or workspace path for.
+
+\`\`\`image
+{
+  "src": "https://example.com/forecast.png",
+  "alt": "Weather forecast",
+  "caption": "Bay Area · April 20"
+}
+\`\`\`
+
+Required: \`src\` (URL or workspace path). Optional: \`alt\`, \`caption\`.
+
+## \`embed\` — YouTube / Figma / Tweet embed (JSON)
+
+Use for: linking to a video, design, or tweet that should render inline.
+
+\`\`\`embed
+{
+  "provider": "youtube",
+  "url": "https://www.youtube.com/watch?v=dQw4w9WgXcQ",
+  "caption": "Latest demo"
+}
+\`\`\`
+
+Required: \`provider\` ("youtube" | "figma" | "tweet" | "generic"), \`url\`. Optional: \`caption\`.
+
+## \`iframe\` — arbitrary embedded webpage (JSON)
+
+Use for: live dashboards, status pages, trackers — anything that has its own webpage and benefits from being live, not snapshotted.
+
+\`\`\`iframe
+{
+  "url": "https://status.example.com",
+  "title": "Service status",
+  "height": 600
+}
+\`\`\`
+
+Required: \`url\` (must be \`https://\` or \`http://localhost\`). Optional: \`title\`, \`caption\`, \`height\` (240–1600), \`allow\` (Permissions-Policy string).
+
+## \`transcript\` — long transcript (JSON)
+
+Use for: meeting transcripts, voice-note dumps — bodies that benefit from a collapsible UI.
+
+\`\`\`transcript
+{"transcript": "[00:00] Speaker A: Welcome everyone..."}
+\`\`\`
+
+Required: \`transcript\` (string).
+
+## \`prompt\` — starter Copilot prompt (YAML)
+
+Use for: end-of-output "next step" cards. The user clicks **Run** and the chat sidebar opens with the underlying instruction submitted to Copilot, with this note attached as a file mention.
+
+\`\`\`prompt
+label: Draft replies to today's emails
+instruction: |
+  For each unanswered email in the digest above, draft a 2-line reply
+  in my voice and present them as a checklist for me to approve.
+\`\`\`
+
+Required: \`label\` (short title shown on the card), \`instruction\` (the longer prompt). Note: this block uses **YAML**, not JSON.
+
 # Interpreting the Objective
 
 The objective was authored in a prior conversation you cannot see. Treat it as a **self-contained spec**. If ambiguous, pick what a reasonable user of a knowledge tracker would expect:
@@ -105,9 +264,9 @@ When skipping, still end with a summary line (see "Final Summary" below) so the
 
 You have the full workspace toolkit. Quick reference for common cases:
 
-- **\`file-readText\`, \`file-editText\`, \`file-writeText\`** — read and modify the note's body. Frontmatter is hands-off. Prefer many small \`file-editText\` calls over one giant \`file-writeText\`.
+- **\`workspace-readFile\`, \`workspace-edit\`, \`workspace-writeFile\`** — read and modify the note's body. Frontmatter is hands-off. Prefer many small \`workspace-edit\` calls over one giant \`workspace-writeFile\`.
 - **\`web-search\`** — the public web (news, prices, status pages, documentation). Use when the objective needs information beyond the workspace.
-- **\`file-grep\`, \`file-glob\`, \`file-list\`** — search the user's knowledge graph and synced data.
+- **\`workspace-grep\`, \`workspace-glob\`, \`workspace-readdir\`** — search the user's knowledge graph and synced data.
 - **\`parseFile\`, \`LLMParse\`** — parse PDFs, spreadsheets, Word docs if the objective references attached files.
 - **\`composio-*\`, \`listMcpTools\`, \`executeMcpTool\`** — user-connected integrations (Gmail, Calendar, etc.). Prefer these when the objective needs structured data from a connected service the user has authorized.
 - **\`browser-control\`** — only when a required source has no API / search alternative and requires JS rendering.
@@ -124,9 +283,9 @@ The user's knowledge graph is plain markdown in \`${WorkDir}/knowledge/\`, organ
 Synced external data often sits alongside under \`gmail_sync/\`, \`calendar_sync/\`, \`granola_sync/\`, \`fireflies_sync/\` — consult these when the objective references emails, meetings, or calendar events.
 
 **CRITICAL:** Always include the folder prefix in paths. Never pass an empty path or the workspace root.
-- \`file-grep({ pattern: "Acme", searchPath: "knowledge/" })\`
-- \`file-readText("knowledge/People/Sarah Chen.md")\`
-- \`file-list("gmail_sync/")\`
+- \`workspace-grep({ pattern: "Acme", path: "knowledge/" })\`
+- \`workspace-readFile("knowledge/People/Sarah Chen.md")\`
+- \`workspace-readdir("gmail_sync/")\`
 
 # Failure & Fallback
 
@@ -152,9 +311,7 @@ Avoid: "I updated the note.", "Done!", "Here is the update:". The summary is a d
 export function buildLiveNoteAgent(): z.infer<typeof Agent> {
     const tools: Record<string, z.infer<typeof ToolAttachment>> = {};
     for (const name of Object.keys(BuiltinTools)) {
-        // code_agent_run requires an interactive UI for permission approvals — skip it
-        // here (headless) so it can't hang on an approval no one can answer.
-        if (name === 'executeCommand' || name === 'code_agent_run') continue;
+        if (name === 'executeCommand') continue;
         tools[name] = { type: 'builtin', name };
     }
 
diff --git a/apps/x/packages/core/src/knowledge/live-note/event-consumer.ts b/apps/x/packages/core/src/knowledge/live-note/event-consumer.ts
deleted file mode 100644
index 8000aac5..00000000
--- a/apps/x/packages/core/src/knowledge/live-note/event-consumer.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import * as workspace from '../../workspace/workspace.js';
-import { fetchLiveNote } from './fileops.js';
-import { runLiveNoteAgent } from './runner.js';
-import type { EventConsumer, EventConsumerTarget } from '../../events/consumer.js';
-import { routeBatch } from '../../events/routing.js';
-import { createProvider } from '../../models/models.js';
-import { getDefaultModelAndProvider, getLiveNoteAgentModel, resolveProviderConfig } from '../../models/defaults.js';
-
-async function resolveRoutingModel() {
-    const modelId = await getLiveNoteAgentModel();
-    const { provider } = await getDefaultModelAndProvider();
-    const config = await resolveProviderConfig(provider);
-    return {
-        model: createProvider(config).languageModel(modelId),
-        modelId,
-        providerName: provider,
-    };
-}
-
-async function listKnowledgeMarkdownFiles(): Promise<string[]> {
-    try {
-        const entries = await workspace.readdir('knowledge', { recursive: true });
-        return entries
-            .filter(e => e.kind === 'file' && e.name.endsWith('.md'))
-            .map(e => e.path.replace(/^knowledge\//, ''));
-    } catch {
-        return [];
-    }
-}
-
-async function listEligibleTargets(): Promise<EventConsumerTarget[]> {
-    const out: EventConsumerTarget[] = [];
-    const filePaths = await listKnowledgeMarkdownFiles();
-
-    for (const filePath of filePaths) {
-        let live;
-        try {
-            live = await fetchLiveNote(filePath);
-        } catch {
-            continue;
-        }
-        if (!live) continue;
-        if (live.active === false) continue;
-
-        const eventMatchCriteria = live.triggers?.eventMatchCriteria;
-        if (!eventMatchCriteria) continue;
-
-        out.push({
-            id: filePath,
-            instructions: live.objective,
-            eventMatchCriteria,
-        });
-    }
-    return out;
-}
-
-export const liveNoteEventConsumer: EventConsumer = {
-    name: 'live-note',
-
-    listEligibleTargets,
-
-    findCandidates: async (event, targets) => {
-        // Targeted re-run from the UI — skip Pass-1.
-        if (event.target?.consumer === 'live-note') {
-            return targets.some(t => t.id === event.target!.id) ? [event.target.id] : [];
-        }
-        return routeBatch(event, targets, {
-            entitySingular: 'live note',
-            entityPlural: 'live notes',
-            useCase: 'live_note_agent',
-            resolveModel: resolveRoutingModel,
-        });
-    },
-
-    fireCandidate: async (event, filePath) => {
-        const result = await runLiveNoteAgent(filePath, 'event', event.payload);
-        return { runId: result.runId, error: result.error };
-    },
-};
diff --git a/apps/x/packages/core/src/knowledge/live-note/events.ts b/apps/x/packages/core/src/knowledge/live-note/events.ts
new file mode 100644
index 00000000..06008874
--- /dev/null
+++ b/apps/x/packages/core/src/knowledge/live-note/events.ts
@@ -0,0 +1,204 @@
+import fs from 'fs';
+import path from 'path';
+import { PrefixLogger, liveNote } from '@x/shared';
+import type { KnowledgeEvent } from '@x/shared/dist/live-note.js';
+import { WorkDir } from '../../config/config.js';
+import * as workspace from '../../workspace/workspace.js';
+import { fetchLiveNote } from './fileops.js';
+import { runLiveNoteAgent } from './runner.js';
+import { findCandidates, type ParsedLiveNote } from './routing.js';
+import type { IMonotonicallyIncreasingIdGenerator } from '../../application/lib/id-gen.js';
+import container from '../../di/container.js';
+
+const POLL_INTERVAL_MS = 5_000; // 5 seconds — events should feel responsive
+const EVENTS_DIR = path.join(WorkDir, 'events');
+const PENDING_DIR = path.join(EVENTS_DIR, 'pending');
+const DONE_DIR = path.join(EVENTS_DIR, 'done');
+
+const log = new PrefixLogger('LiveNote:Events');
+
+/**
+ * Write a KnowledgeEvent to the events/pending/ directory.
+ * Filename is a monotonically increasing ID so events sort by creation order.
+ * Call this function in chronological order (oldest event first) within a sync batch
+ * to ensure correct ordering.
+ */
+export async function createEvent(event: Omit<KnowledgeEvent, 'id'>): Promise<void> {
+    fs.mkdirSync(PENDING_DIR, { recursive: true });
+
+    const idGen = container.resolve<IMonotonicallyIncreasingIdGenerator>('idGenerator');
+    const id = await idGen.next();
+
+    const fullEvent: KnowledgeEvent = { id, ...event };
+    const filePath = path.join(PENDING_DIR, `${id}.json`);
+    fs.writeFileSync(filePath, JSON.stringify(fullEvent, null, 2), 'utf-8');
+}
+
+function ensureDirs(): void {
+    fs.mkdirSync(PENDING_DIR, { recursive: true });
+    fs.mkdirSync(DONE_DIR, { recursive: true });
+}
+
+async function listEventEligibleLiveNotes(): Promise<ParsedLiveNote[]> {
+    const out: ParsedLiveNote[] = [];
+    let entries;
+    try {
+        entries = await workspace.readdir('knowledge', { recursive: true });
+    } catch {
+        return out;
+    }
+    const mdFiles = entries
+        .filter(e => e.kind === 'file' && e.name.endsWith('.md'))
+        .map(e => e.path.replace(/^knowledge\//, ''));
+
+    for (const filePath of mdFiles) {
+        let live;
+        try {
+            live = await fetchLiveNote(filePath);
+        } catch {
+            continue;
+        }
+        if (!live) continue;
+        if (live.active === false) continue;
+
+        const eventMatchCriteria = live.triggers?.eventMatchCriteria;
+        if (!eventMatchCriteria) continue; // not event-eligible
+
+        out.push({
+            filePath,
+            objective: live.objective,
+            eventMatchCriteria,
+        });
+    }
+    return out;
+}
+
+function moveEventToDone(filename: string, enriched: KnowledgeEvent): void {
+    const donePath = path.join(DONE_DIR, filename);
+    const pendingPath = path.join(PENDING_DIR, filename);
+    fs.writeFileSync(donePath, JSON.stringify(enriched, null, 2), 'utf-8');
+    try {
+        fs.unlinkSync(pendingPath);
+    } catch (err) {
+        log.log(`failed to remove pending event ${filename}: ${err instanceof Error ? err.message : String(err)}`);
+    }
+}
+
+async function processOneEvent(filename: string): Promise<void> {
+    const pendingPath = path.join(PENDING_DIR, filename);
+
+    let event: KnowledgeEvent;
+    try {
+        const raw = fs.readFileSync(pendingPath, 'utf-8');
+        const parsed = JSON.parse(raw);
+        event = liveNote.KnowledgeEventSchema.parse(parsed);
+    } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        log.log(`event:${filename} — malformed, moving to done with error: ${msg}`);
+        const stub: KnowledgeEvent = {
+            id: filename.replace(/\.json$/, ''),
+            source: 'unknown',
+            type: 'unknown',
+            createdAt: new Date().toISOString(),
+            payload: '',
+            processedAt: new Date().toISOString(),
+            error: `Failed to parse: ${msg}`,
+        };
+        moveEventToDone(filename, stub);
+        return;
+    }
+
+    log.log(`event:${event.id} — received source=${event.source} type=${event.type}`);
+
+    const eligible = await listEventEligibleLiveNotes();
+    const candidates = await findCandidates(event, eligible);
+
+    if (candidates.length === 0) {
+        log.log(`event:${event.id} — no candidates (${eligible.length} eligible note${eligible.length === 1 ? '' : 's'})`);
+    } else {
+        log.log(`event:${event.id} — dispatching to ${candidates.length} candidate${candidates.length === 1 ? '' : 's'}: ${candidates.map(c => c.filePath).join(', ')}`);
+    }
+
+    const runIds: string[] = [];
+    let processingError: string | undefined;
+    let okCount = 0;
+    let errCount = 0;
+
+    // Sequential — preserves total ordering
+    for (const candidate of candidates) {
+        try {
+            const result = await runLiveNoteAgent(candidate.filePath, 'event', event.payload);
+            if (result.runId) runIds.push(result.runId);
+            if (result.error) {
+                errCount++;
+            } else {
+                okCount++;
+            }
+        } catch (err) {
+            errCount++;
+            const msg = err instanceof Error ? err.message : String(err);
+            log.log(`event:${event.id} — candidate ${candidate.filePath} threw: ${msg}`);
+            processingError = (processingError ? processingError + '; ' : '') + `${candidate.filePath}: ${msg}`;
+        }
+    }
+
+    if (candidates.length > 0) {
+        log.log(`event:${event.id} — processed ok=${okCount} errors=${errCount}`);
+    }
+
+    const enriched: KnowledgeEvent = {
+        ...event,
+        processedAt: new Date().toISOString(),
+        candidateFilePaths: candidates.map(c => c.filePath),
+        runIds,
+        ...(processingError ? { error: processingError } : {}),
+    };
+
+    moveEventToDone(filename, enriched);
+}
+
+async function processPendingEvents(): Promise<void> {
+    ensureDirs();
+
+    let filenames: string[];
+    try {
+        filenames = fs.readdirSync(PENDING_DIR).filter(f => f.endsWith('.json'));
+    } catch (err) {
+        log.log(`failed to read pending dir: ${err instanceof Error ? err.message : String(err)}`);
+        return;
+    }
+
+    if (filenames.length === 0) return;
+
+    // FIFO: monotonic IDs are lexicographically sortable
+    filenames.sort();
+
+    if (filenames.length > 1) {
+        log.log(`tick — ${filenames.length} pending events`);
+    }
+
+    for (const filename of filenames) {
+        try {
+            await processOneEvent(filename);
+        } catch (err) {
+            log.log(`event:${filename} — unhandled error: ${err instanceof Error ? err.message : String(err)}`);
+            // Keep the loop alive — don't move file, will retry on next tick
+        }
+    }
+}
+
+export async function init(): Promise<void> {
+    log.log(`starting, polling every ${POLL_INTERVAL_MS / 1000}s`);
+    ensureDirs();
+
+    await processPendingEvents();
+
+    while (true) {
+        await new Promise(resolve => setTimeout(resolve, POLL_INTERVAL_MS));
+        try {
+            await processPendingEvents();
+        } catch (err) {
+            log.log(`tick error: ${err instanceof Error ? err.message : String(err)}`);
+        }
+    }
+}
diff --git a/apps/x/packages/core/src/knowledge/live-note/routing.ts b/apps/x/packages/core/src/knowledge/live-note/routing.ts
new file mode 100644
index 00000000..fbf1e2c1
--- /dev/null
+++ b/apps/x/packages/core/src/knowledge/live-note/routing.ts
@@ -0,0 +1,111 @@
+import { generateObject } from 'ai';
+import { liveNote, PrefixLogger } from '@x/shared';
+import type { KnowledgeEvent } from '@x/shared/dist/live-note.js';
+import { createProvider } from '../../models/models.js';
+import { getDefaultModelAndProvider, getLiveNoteAgentModel, resolveProviderConfig } from '../../models/defaults.js';
+import { captureLlmUsage } from '../../analytics/usage.js';
+
+const log = new PrefixLogger('LiveNote:Routing');
+
+const BATCH_SIZE = 20;
+
+export interface ParsedLiveNote {
+    filePath: string;
+    objective: string;
+    eventMatchCriteria: string;
+}
+
+const ROUTING_SYSTEM_PROMPT = `You are a routing classifier for a personal knowledge base.
+
+You will receive an event (something that happened — an email, meeting, message, etc.) and a list of *live notes*. Each live note has:
+- filePath: the path of the note file
+- objective: the persistent intent of the note (what it should keep being / containing)
+- matchCriteria: an explicit description of which kinds of incoming signals should wake this note
+
+Your job is to identify which live notes MIGHT be relevant to this event.
+
+Rules:
+- Be LIBERAL in your selections. Include any note that is even moderately relevant.
+- Prefer false positives over false negatives — it is much better to include a note that turns out to be irrelevant than to miss one that was relevant.
+- Only exclude notes that are CLEARLY and OBVIOUSLY irrelevant to the event.
+- Do not attempt to judge whether the event contains enough information to act on. That is handled by the live-note agent in a later stage.
+- Return an empty list only if no notes are relevant at all.
+- Return each candidate's filePath exactly as given.`;
+
+async function resolveModel() {
+    const modelId = await getLiveNoteAgentModel();
+    const { provider } = await getDefaultModelAndProvider();
+    const config = await resolveProviderConfig(provider);
+    return {
+        model: createProvider(config).languageModel(modelId),
+        modelId,
+        providerName: provider,
+    };
+}
+
+function buildRoutingPrompt(event: KnowledgeEvent, batch: ParsedLiveNote[]): string {
+    const noteList = batch
+        .map((n, i) => `${i + 1}. filePath: ${n.filePath}\n   objective: ${n.objective}\n   matchCriteria: ${n.eventMatchCriteria}`)
+        .join('\n\n');
+
+    return `## Event
+
+Source: ${event.source}
+Type: ${event.type}
+Time: ${event.createdAt}
+
+${event.payload}
+
+## Live notes
+
+${noteList}`;
+}
+
+export async function findCandidates(
+    event: KnowledgeEvent,
+    allLiveNotes: ParsedLiveNote[],
+): Promise<ParsedLiveNote[]> {
+    // Short-circuit for targeted re-runs — skip LLM routing entirely
+    if (event.targetFilePath) {
+        const target = allLiveNotes.find(n => n.filePath === event.targetFilePath);
+        return target ? [target] : [];
+    }
+
+    if (allLiveNotes.length === 0) {
+        log.log(`event:${event.id} — no event-eligible live notes`);
+        return [];
+    }
+
+    log.log(`event:${event.id} — routing against ${allLiveNotes.length} live note${allLiveNotes.length === 1 ? '' : 's'}`);
+
+    const { model, modelId, providerName } = await resolveModel();
+    const candidatePaths = new Set<string>();
+
+    for (let i = 0; i < allLiveNotes.length; i += BATCH_SIZE) {
+        const batch = allLiveNotes.slice(i, i + BATCH_SIZE);
+        try {
+            const result = await generateObject({
+                model,
+                system: ROUTING_SYSTEM_PROMPT,
+                prompt: buildRoutingPrompt(event, batch),
+                schema: liveNote.Pass1OutputSchema,
+            });
+            captureLlmUsage({
+                useCase: 'live_note_agent',
+                subUseCase: 'routing',
+                model: modelId,
+                provider: providerName,
+                usage: result.usage,
+            });
+            for (const fp of result.object.filePaths) {
+                candidatePaths.add(fp);
+            }
+        } catch (err) {
+            log.log(`event:${event.id} — Pass1 batch ${Math.floor(i / BATCH_SIZE)} failed: ${err instanceof Error ? err.message : String(err)}`);
+        }
+    }
+
+    const candidates = allLiveNotes.filter(n => candidatePaths.has(n.filePath));
+    log.log(`event:${event.id} — Pass1 → ${candidates.length} candidate${candidates.length === 1 ? '' : 's'}${candidates.length > 0 ? `: ${candidates.map(c => c.filePath).join(', ')}` : ''}`);
+    return candidates;
+}
diff --git a/apps/x/packages/core/src/knowledge/live-note/runner.ts b/apps/x/packages/core/src/knowledge/live-note/runner.ts
index b263c3e5..54256320 100644
--- a/apps/x/packages/core/src/knowledge/live-note/runner.ts
+++ b/apps/x/packages/core/src/knowledge/live-note/runner.ts
@@ -3,7 +3,6 @@ import { fetchLiveNote, patchLiveNote, readNoteBody } from './fileops.js';
 import { createRun, createMessage } from '../../runs/runs.js';
 import { getLiveNoteAgentModel } from '../../models/defaults.js';
 import { extractAgentResponse, waitForRunCompletion } from '../../agents/utils.js';
-import { buildTriggerBlock } from '../../agents/build-trigger-block.js';
 import { liveNoteBus } from './bus.js';
 import { PrefixLogger } from '@x/shared/dist/prefix-logger.js';
 
@@ -30,9 +29,50 @@ function truncate(s: string | null | undefined, n = SUMMARY_LOG_LIMIT): string {
 // Agent run message
 // ---------------------------------------------------------------------------
 
-const LIVE_NOTE_EVENT_DECISION_DIRECTIVE = '**Decision:** Determine whether this event genuinely warrants updating the note. If the event is not meaningfully relevant on closer inspection, skip the update — do not call `file-editText`. Only edit the file if the event provides new or changed information that the objective implies should be reflected.';
+function describeWindow(triggers: LiveNote['triggers']): string {
+    const ws = triggers?.windows;
+    if (!ws || ws.length === 0) return 'a configured window';
+    return ws.map(w => `${w.startTime}–${w.endTime}`).join(', ');
+}
 
-const LIVE_NOTE_MANUAL_PAREN = 'user-triggered — either the Run button in the Live Note panel or the `run-live-note-agent` tool';
+function buildTriggerBlock(
+    live: LiveNote,
+    trigger: LiveNoteTriggerType,
+    context: string | undefined,
+): string {
+    if (trigger === 'event') {
+        const criteria = live.triggers?.eventMatchCriteria ?? '(none — should not happen for event-triggered runs)';
+        return `
+
+**Trigger:** Event match — Pass 1 routing flagged this note as potentially relevant to the event below.
+
+**Event match criteria for this note:**
+${criteria}
+
+**Event payload:**
+${context ?? '(no payload)'}
+
+**Decision:** Determine whether this event genuinely warrants updating the note. If the event is not meaningfully relevant on closer inspection, skip the update — do not call \`workspace-edit\`. Only edit the file if the event provides new or changed information that the objective implies should be reflected.`;
+    }
+
+    if (trigger === 'cron') {
+        const expr = live.triggers?.cronExpr ?? '(unknown)';
+        return `
+
+**Trigger:** Scheduled refresh — the cron expression \`${expr}\` matched. This is a baseline refresh; if your objective specifies different behavior for cron vs window vs event runs, follow the cron branch.${context ? `\n\n**Context:**\n${context}` : ''}`;
+    }
+
+    if (trigger === 'window') {
+        return `
+
+**Trigger:** Scheduled refresh — fired inside the configured window (${describeWindow(live.triggers)}). This is a forgiving baseline refresh that runs once per day per window; reactive updates are handled by event triggers (when configured). If your objective specifies different behavior for cron vs window vs event runs, follow the window branch.${context ? `\n\n**Context:**\n${context}` : ''}`;
+    }
+
+    // manual
+    return `
+
+**Trigger:** Manual run (user-triggered — either the Run button in the Live Note panel or the \`run-live-note-agent\` tool).${context ? `\n\n**Context:**\n${context}` : ''}`;
+}
 
 function buildMessage(
     filePath: string,
@@ -44,8 +84,8 @@ function buildMessage(
     const localNow = now.toLocaleString('en-US', { dateStyle: 'full', timeStyle: 'long' });
     const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
 
-    // Workspace-relative path the agent's tools (file-readText,
-    // file-editText) expect. Internal storage is knowledge/-relative.
+    // Workspace-relative path the agent's tools (workspace-readFile,
+    // workspace-edit) expect. Internal storage is knowledge/-relative.
     const wsPath = `knowledge/${filePath}`;
 
     const baseMessage = `Update the live note at \`${wsPath}\`.
@@ -55,21 +95,9 @@ function buildMessage(
 **Objective:**
 ${live.objective}
 
-Start by calling \`file-readText\` on \`${wsPath}\` to read the current note (frontmatter + body) — the body may be long and you should fetch it yourself rather than rely on a snapshot. Then make small, incremental edits with \`file-editText\` to bring the body in line with the objective: edit one region, re-read to verify, then edit the next region. Avoid one-shot rewrites of the whole body. Do not modify the YAML frontmatter at the top of the file — that block is owned by the user and the runtime.`;
+Start by calling \`workspace-readFile\` on \`${wsPath}\` to read the current note (frontmatter + body) — the body may be long and you should fetch it yourself rather than rely on a snapshot. Then make small, incremental edits with \`workspace-edit\` to bring the body in line with the objective: edit one region, re-read to verify, then edit the next region. Avoid one-shot rewrites of the whole body. Do not modify the YAML frontmatter at the top of the file — that block is owned by the user and the runtime.`;
 
-    return baseMessage + buildTriggerBlock({
-        trigger,
-        triggers: live.triggers,
-        // The live-note "event" branch passes the payload as `context`; for
-        // every other trigger that same arg is the manual/scheduled context
-        // appended to the block. Preserve both contracts with a single split.
-        context: trigger === 'event' ? undefined : context,
-        eventPayload: trigger === 'event' ? context : undefined,
-        targetNoun: 'note',
-        instructionsNoun: 'objective',
-        manualParen: LIVE_NOTE_MANUAL_PAREN,
-        eventDecisionDirective: LIVE_NOTE_EVENT_DECISION_DIRECTIVE,
-    });
+    return baseMessage + buildTriggerBlock(live, trigger, context);
 }
 
 // ---------------------------------------------------------------------------
diff --git a/apps/x/packages/core/src/knowledge/live-note/schedule-utils.ts b/apps/x/packages/core/src/knowledge/live-note/schedule-utils.ts
index fa01516a..fbe23364 100644
--- a/apps/x/packages/core/src/knowledge/live-note/schedule-utils.ts
+++ b/apps/x/packages/core/src/knowledge/live-note/schedule-utils.ts
@@ -1,4 +1,92 @@
-// Helpers moved to `packages/core/src/schedule/utils.ts` and shared with the
-// bg-task scheduler. This shim keeps existing imports working; remove after
-// the next release once nothing imports from this path.
-export { dueTimedTrigger, backoffRemainingMs, RETRY_BACKOFF_MS } from '../../schedule/utils.js';
+import { CronExpressionParser } from 'cron-parser';
+import type { Triggers } from '@x/shared/dist/live-note.js';
+
+const GRACE_MS = 2 * 60 * 1000; // 2 minutes
+export const RETRY_BACKOFF_MS = 5 * 60 * 1000; // 5 minutes
+
+/**
+ * Decide whether a live note's `triggers` block has any timed sub-trigger
+ * (cron or window) whose cycle is currently ready to fire. Pure cycle check —
+ * does NOT consider backoff.
+ *
+ * - Cycle accounting (cron prev-occurrence, window once-per-day) is anchored
+ *   on `lastRunAt` — which is bumped only on *successful* completions. So a
+ *   failed run leaves the cycle unfired and this returns the matched trigger
+ *   again on the next tick (caller is expected to gate on backoff separately).
+ * - `cronExpr` enforces a 2-minute grace window — if the scheduled time was
+ *   more than 2 minutes ago, it's a miss and skipped (avoids replay storms
+ *   after the app was offline).
+ * - `windows` are forgiving: each window fires at most once per day per
+ *   successful run, anywhere inside its time-of-day band. Cycles anchored at
+ *   `startTime`. Adjacent windows sharing an endpoint (e.g. 08–12 and 12–15)
+ *   each still fire on the same day.
+ *
+ * Returns the source ('cron' | 'window') or null if no cycle is ready.
+ */
+export function dueTimedTrigger(
+    triggers: Triggers | undefined,
+    lastRunAt: string | null,
+): 'cron' | 'window' | null {
+    if (!triggers) return null;
+
+    if (triggers.cronExpr && isCronDue(triggers.cronExpr, lastRunAt)) return 'cron';
+
+    if (triggers.windows) {
+        for (const w of triggers.windows) {
+            if (isWindowDue(w.startTime, w.endTime, lastRunAt)) return 'window';
+        }
+    }
+
+    return null;
+}
+
+/**
+ * Backoff check — has there been an attempt within `RETRY_BACKOFF_MS`?
+ * Returns the milliseconds remaining until the backoff lifts (positive) or 0
+ * if not in backoff. Caller logs the remaining time in human form.
+ */
+export function backoffRemainingMs(lastAttemptAt: string | null): number {
+    if (!lastAttemptAt) return 0;
+    const sinceAttempt = Date.now() - new Date(lastAttemptAt).getTime();
+    if (sinceAttempt < 0 || sinceAttempt >= RETRY_BACKOFF_MS) return 0;
+    return RETRY_BACKOFF_MS - sinceAttempt;
+}
+
+function isCronDue(expression: string, lastRunAt: string | null): boolean {
+    const now = new Date();
+    if (!lastRunAt) return true; // never ran — immediately due
+
+    try {
+        // Find the most recent occurrence at-or-before `now`, not the
+        // occurrence right after lastRunAt — if lastRunAt is old, that
+        // occurrence would be ancient too and always fall outside the
+        // grace window, blocking every future fire.
+        const interval = CronExpressionParser.parse(expression, { currentDate: now });
+        const prevRun = interval.prev().toDate();
+
+        // Already ran at-or-after this occurrence → skip.
+        if (new Date(lastRunAt).getTime() >= prevRun.getTime()) return false;
+
+        // Within grace → fire. Outside grace → missed, skip.
+        return now.getTime() <= prevRun.getTime() + GRACE_MS;
+    } catch {
+        return false;
+    }
+}
+
+function isWindowDue(startTime: string, endTime: string, lastRunAt: string | null): boolean {
+    const now = new Date();
+    const [startHour, startMin] = startTime.split(':').map(Number);
+    const [endHour, endMin] = endTime.split(':').map(Number);
+    const startMinutes = startHour * 60 + startMin;
+    const endMinutes = endHour * 60 + endMin;
+    const nowMinutes = now.getHours() * 60 + now.getMinutes();
+    if (nowMinutes < startMinutes || nowMinutes > endMinutes) return false;
+
+    if (!lastRunAt) return true;
+
+    const cycleStart = new Date(now);
+    cycleStart.setHours(startHour, startMin, 0, 0);
+    if (new Date(lastRunAt).getTime() > cycleStart.getTime()) return false;
+    return true;
+}
diff --git a/apps/x/packages/core/src/knowledge/live-note/scheduler.ts b/apps/x/packages/core/src/knowledge/live-note/scheduler.ts
index 0ce3abcc..f77042f9 100644
--- a/apps/x/packages/core/src/knowledge/live-note/scheduler.ts
+++ b/apps/x/packages/core/src/knowledge/live-note/scheduler.ts
@@ -2,7 +2,7 @@ import { PrefixLogger } from '@x/shared';
 import * as workspace from '../../workspace/workspace.js';
 import { fetchLiveNote } from './fileops.js';
 import { runLiveNoteAgent } from './runner.js';
-import { backoffRemainingMs, dueTimedTrigger } from '../../schedule/utils.js';
+import { backoffRemainingMs, dueTimedTrigger } from './schedule-utils.js';
 
 const log = new PrefixLogger('LiveNote:Scheduler');
 const POLL_INTERVAL_MS = 15_000; // 15 seconds
diff --git a/apps/x/packages/core/src/knowledge/note_creation.ts b/apps/x/packages/core/src/knowledge/note_creation.ts
index baee1d2b..2f58bf64 100644
--- a/apps/x/packages/core/src/knowledge/note_creation.ts
+++ b/apps/x/packages/core/src/knowledge/note_creation.ts
@@ -4,27 +4,27 @@ import { renderNoteEffectRules } from './tag_system.js';
 export function getRaw(): string {
   return `---
 tools:
-  file-writeText:
+  workspace-writeFile:
     type: builtin
-    name: file-writeText
-  file-readText:
+    name: workspace-writeFile
+  workspace-readFile:
     type: builtin
-    name: file-readText
-  file-editText:
+    name: workspace-readFile
+  workspace-edit:
     type: builtin
-    name: file-editText
-  file-list:
+    name: workspace-edit
+  workspace-readdir:
     type: builtin
-    name: file-list
-  file-mkdir:
+    name: workspace-readdir
+  workspace-mkdir:
     type: builtin
-    name: file-mkdir
-  file-grep:
+    name: workspace-mkdir
+  workspace-grep:
     type: builtin
-    name: file-grep
-  file-glob:
+    name: workspace-grep
+  workspace-glob:
     type: builtin
-    name: file-glob
+    name: workspace-glob
 ---
 # Context
 
@@ -37,7 +37,7 @@ Sources (emails, meetings, voice memos) are processed in roughly chronological o
 
 # Task
 
-You are a memory agent. You are given one or more source files (emails, meeting transcripts, or voice memos) to process. **The files in a request are independent of each other** — they are batched together only for efficiency, not because they are related. Process each source file on its own terms (see "Source Scoping" below). For each source file you will:
+You are a memory agent. Given a single source file (email, meeting transcript, or voice memo), you will:
 
 1. **Determine source type (meeting or email)**
 2. **Evaluate if the source is worth processing**
@@ -49,21 +49,7 @@ You are a memory agent. You are given one or more source files (emails, meeting
 8. Create new notes or update existing notes
 9. **Apply state changes to existing notes**
 
-The core rule: **Both meetings and emails can create notes, but emails require personalized content — and a new People/Organization note from an email also requires the user to have replied at least once in the thread (the Email Reply Gate). Emails can always update existing notes regardless.**
-
-# Source Scoping (Batch Isolation) — READ FIRST
-
-You may receive several source files in one request. **They are unrelated by default.** Two source files appearing in the same request tells you *nothing* about whether their entities are related.
-
-**The only relationship signal is co-occurrence WITHIN a single source file (or a relationship already recorded in existing notes).** Concretely:
-
-- **Create a link / relationship between two entities ONLY if the connection is evidenced within the same single source file, or is already documented in an existing note.** Example: if email A is between Sarah (Acme) and you, and email B is between David (Globex) and you, you must **not** link Sarah↔David or Acme↔Globex — they never appeared together.
-- **Never infer a relationship from batch co-occurrence.** "Both showed up in this run" is not evidence. When the only thing two entities share is the batch, add no link.
-- **The one allowed cross-file operation is identity merging:** if the *same* canonical entity appears in multiple source files in the batch, merge its information into a single note. That is recognizing one entity, not relating two.
-- **Activity entries are per-source.** Each activity line describes one source file's interaction and links only the entities actually present in *that* source.
-- **When in doubt, omit the link.** A missing edge is a minor gap; a fabricated edge is a wrong fact in the graph (the knowledge graph draws an edge for every \`[[link]]\` you write).
-
-This applies to every step below — entity resolution, content extraction, and especially the bidirectional links in Step 10.
+The core rule: **Both meetings and emails can create notes, but emails require personalized content.**
 
 You have full read access to the existing knowledge directory. Use this extensively to:
 - Find existing notes for people, organizations, projects mentioned
@@ -106,17 +92,17 @@ You have access to these tools:
 
 **For reading files:**
 \`\`\`
-file-readText({ path: "knowledge/People/Sarah Chen.md" })
+workspace-readFile({ path: "knowledge/People/Sarah Chen.md" })
 \`\`\`
 
 **For creating NEW files:**
 \`\`\`
-file-writeText({ path: "knowledge/People/Sarah Chen.md", data: "# Sarah Chen\\n\\n..." })
+workspace-writeFile({ path: "knowledge/People/Sarah Chen.md", data: "# Sarah Chen\\n\\n..." })
 \`\`\`
 
 **For editing EXISTING files (preferred for updates):**
 \`\`\`
-file-editText({
+workspace-edit({
   path: "knowledge/People/Sarah Chen.md",
   oldString: "## Activity\\n",
   newString: "## Activity\\n- **2026-02-03** (meeting): New activity entry\\n"
@@ -125,27 +111,27 @@ file-editText({
 
 **For listing directories:**
 \`\`\`
-file-list({ path: "knowledge/People" })
+workspace-readdir({ path: "knowledge/People" })
 \`\`\`
 
 **For creating directories:**
 \`\`\`
-file-mkdir({ path: "knowledge/Projects", recursive: true })
+workspace-mkdir({ path: "knowledge/Projects", recursive: true })
 \`\`\`
 
 **For searching files:**
 \`\`\`
-file-grep({ pattern: "Acme Corp", searchPath: "knowledge", fileGlob: "*.md" })
+workspace-grep({ pattern: "Acme Corp", searchPath: "knowledge", fileGlob: "*.md" })
 \`\`\`
 
 **For finding files by pattern:**
 \`\`\`
-file-glob({ pattern: "**/*.md", cwd: "knowledge/People" })
+workspace-glob({ pattern: "**/*.md", cwd: "knowledge/People" })
 \`\`\`
 
 **IMPORTANT:**
-- Use \`file-editText\` for updating existing notes (adding activity, updating fields)
-- Use \`file-writeText\` only for creating new notes
+- Use \`workspace-edit\` for updating existing notes (adding activity, updating fields)
+- Use \`workspace-writeFile\` only for creating new notes
 - Prefer the knowledge_index for entity resolution (it's faster than grep)
 
 # Output
@@ -172,7 +158,7 @@ ${renderNoteEffectRules()}
 
 Read the source file and determine if it's a meeting or email.
 \`\`\`
-file-readText({ path: "{source_file}" })
+workspace-readFile({ path: "{source_file}" })
 \`\`\`
 
 **Meeting indicators:**
@@ -208,7 +194,6 @@ Emails containing calendar invites (\`.ics\` attachments or inline calendar data
 - Contains calendar metadata (VCALENDAR, VEVENT)
 
 **Rules for calendar invite emails:**
-0. **Exempt from the Email Reply Gate** - a meeting actually scheduled with the user is direct engagement, so you may create the primary-contact note even if the user hasn't sent a text reply in the thread.
 1. **CREATE a note for the primary contact** - the person you're actually meeting with
 2. **Extract from the invite:** their name, email, organization (from email domain), meeting topic
 3. **Skip automated notifications from Google/Outlook** - emails from calendar-no-reply@google.com with no human sender
@@ -277,7 +262,7 @@ If processing, continue to Step 2.
 
 # Step 2: Read and Parse Source File
 \`\`\`
-file-readText({ path: "{source_file}" })
+workspace-readFile({ path: "{source_file}" })
 \`\`\`
 
 Extract metadata:
@@ -374,7 +359,7 @@ From index, find matches for:
 
 Only read the full note content when you need details not in the index (e.g., activity logs, open items):
 \`\`\`bash
-file-readText({ path: "{knowledge_folder}/People/Sarah Chen.md" })
+workspace-readFile({ path: "{knowledge_folder}/People/Sarah Chen.md" })
 \`\`\`
 
 **Why read these notes:**
@@ -451,7 +436,7 @@ Resolution Map:
 **If source_type == "email":**
 - The email already passed label-based filtering in Step 1
 - Resolved entities → Update existing notes
-- New entities → Create notes **only if the email-reply gate passes** (see Step 5 → "Email Reply Gate"). If the thread is purely inbound (the user never replied), update existing notes only — do not create new canonical People/Organization notes.
+- New entities → Create notes (the labels already confirmed this email is worth processing)
 
 ## 4c: Disambiguation Rules
 
@@ -460,10 +445,10 @@ When multiple candidates match a variant, disambiguate:
 **By organization (strongest signal):**
 \`\`\`
 # "David" could be David Kim or David Chen
-file-grep({ pattern: "Acme", searchPath: "{knowledge_folder}/People/David Kim.md" })
+workspace-grep({ pattern: "Acme", searchPath: "{knowledge_folder}/People/David Kim.md" })
 # Output: **Organization:** [[Acme Corp]]
 
-file-grep({ pattern: "Acme", searchPath: "{knowledge_folder}/People/David Chen.md" })
+workspace-grep({ pattern: "Acme", searchPath: "{knowledge_folder}/People/David Chen.md" })
 # Output: **Organization:** [[Other Corp]]
 
 # Source is from Acme context → "David" = "David Kim"
@@ -471,14 +456,14 @@ file-grep({ pattern: "Acme", searchPath: "{knowledge_folder}/People/David Chen.m
 
 **By email (definitive):**
 \`\`\`
-file-grep({ pattern: "david@acme.com", searchPath: "{knowledge_folder}/People/David Kim.md" })
+workspace-grep({ pattern: "david@acme.com", searchPath: "{knowledge_folder}/People/David Kim.md" })
 # Exact email match is definitive
 \`\`\`
 
 **By role:**
 \`\`\`
 # Source mentions "their CTO"
-file-grep({ pattern: "Role.*CTO", searchPath: "{knowledge_folder}/People" })
+workspace-grep({ pattern: "Role.*CTO", searchPath: "{knowledge_folder}/People" })
 # Filter results by organization context
 \`\`\`
 
@@ -523,7 +508,7 @@ For entities not resolved to existing notes, determine if they warrant new notes
 **CREATE a note for people who are:**
 - External (not @user.domain)
 - People you directly interacted with in meetings
-- Email correspondents directly participating in a thread the user has replied to (emails that reach this step already passed label-based filtering; new People/Org notes also require the Email Reply Gate)
+- Email correspondents directly participating in the thread (emails that reach this step already passed label-based filtering)
 - Decision makers or contacts at customers, prospects, or partners
 - Investors or potential investors
 - Candidates you are interviewing
@@ -594,21 +579,6 @@ For people who don't warrant their own note, add to Organization note's Contacts
 - Sarah Lee — Support, handled wire transfer issue
 \`\`\`
 
-### Email Reply Gate (new People/Organization notes only)
-
-**Emails can always update existing notes. But an email may only CREATE a new canonical People or Organization note if the user has replied at least once in the thread.** This stops purely inbound email (cold outreach, newsletters, one-way notifications) from spawning new notes for people the user has never engaged.
-
-**How to check:** The email source lists each message as a \`### From: <sender>\` block. The user has replied if **at least one message in the thread was sent by the user** — a \`### From:\` line whose address matches \`user.email\`. A reply from someone at \`@user.domain\` (the user's own team) also counts as the user's side having engaged.
-
-**Rules:**
-- **User replied at least once** → the thread is a two-way exchange; you may create new canonical People/Organization notes (still subject to the Direct Interaction and Weekly Importance tests below).
-- **Purely inbound** (every message is from external senders; no \`### From:\` matches \`user.email\` or \`@user.domain\`) → do **NOT** create new canonical People/Organization notes. You may still: update notes that already exist, and create/update a suggestion card in \`suggested-topics.md\` if the entity looks strategically relevant.
-
-**Scope:**
-- Applies **only to creating new** People/Organization notes from **emails**. It does not block updates to existing notes.
-- Does **not** apply to meetings or voice memos (those always create).
-- **Exception:** calendar-invite emails for a meeting actually scheduled with the user (see "Calendar Invite Emails") are exempt — a scheduled meeting is itself direct engagement, so create the primary-contact note even without a text reply.
-
 ### Direct Interaction Test (People and Organizations)
 
 For **new canonical People and Organizations notes**, require **direct interaction**, not just mention.
@@ -627,13 +597,9 @@ For **new canonical People and Organizations notes**, require **direct interacti
 - The source only establishes a second-degree relationship, not a direct one
 
 **Canonical note rule:**
-- For **new People/Organizations**, create the canonical note only if all are true:
-  1. For **email** sources, the **Email Reply Gate** passes (the user replied in the thread, or it's an exempt calendar invite)
-  2. There is **direct interaction**
-  3. The interaction is **not transactional** per the Transactional Interaction Check (see below) — reporting an issue, sending/paying an invoice, support questions, scheduling, etc. update existing notes only, never create new ones
-  4. The entity clears the **weekly importance test**
-  5. The interaction is **not purely temporary** per the ongoing-relationship soft check (see below)
-- **Updates to existing notes are never gated by these checks** — a transactional or temporary interaction with a person/org that already has a note still gets logged as activity.
+- For **new People/Organizations**, create the canonical note only if both are true:
+  1. There is **direct interaction**
+  2. The entity clears the **weekly importance test**
 
 If an entity seems strategically relevant but fails the direct interaction test, do **not** auto-create a canonical note. At most, create a suggestion card in \`suggested-topics.md\`.
 
@@ -672,42 +638,6 @@ This test is mainly for **People** and **Organizations**. **Do NOT use it as the
 - Update the existing note even if the current source is weaker; the importance test is mainly for deciding whether to create a **new** People/Organization note
 - If a previously tentative person/org is now clearly important enough for a canonical note, create/update the note and remove any tentative suggestion card for that exact entity from \`suggested-topics.md\`
 
-### Transactional Interaction Check (People and Organizations)
-
-**If the source is a transactional interaction — a discrete task or exchange that completes and closes — do NOT create a new canonical note. You may still UPDATE an existing note** (add an activity entry, mark an open item complete, update a field). The transaction is real activity worth logging when the person/org already matters, but on its own it is not evidence of a durable relationship worth minting a new note.
-
-**Transactional interactions include:**
-- Reporting, acknowledging, or resolving an **issue / bug / outage / support ticket**
-- Sending, requesting, or paying an **invoice, receipt, or payment confirmation**
-- A **how-to or product question** that resolves within the thread
-- **Scheduling / logistics / calendar** back-and-forth
-- A one-time **purchase, refund, password reset, form submission, or signature request**
-- Automated, templated, or notification-style messages
-
-The signal is the **nature of the exchange, not the sender's importance**: even someone at an important company, if they are only handling a transactional task here, does not earn a *new* note from that interaction alone. If the same person/org later shows non-transactional substance (an active deal, evaluation, partnership, ongoing thread), create the note then.
-
-### Ongoing-Relationship Test (soft check, People and Organizations)
-
-A softer companion to the transactional and weekly-importance checks, aimed at filtering out **temporary, one-off interactions** even when the single touchpoint looks substantive.
-
-**Ask:** _"Will the user still be in touch with this person/organization a month from now, or is this a temporary interaction that wraps up once this thread/issue is resolved?"_
-
-If the honest answer is "this is temporary and won't carry forward," **don't create a canonical note** — even if there was a real two-way exchange. The interaction can still be logged on an existing org note (e.g. in Contacts) without minting a new People note.
-
-**Temporary / one-off (lean NO — don't create):**
-- **Customer-support questions** — a support rep, or a customer asking a one-time support/how-to question, with no ongoing strategic relationship. Don't create a note for that person.
-- A scheduling/logistics back-and-forth that ends when the meeting is booked
-- A one-time transactional exchange (a single vendor purchase, a password reset, a refund, a form submission)
-- A recruiter or service rep handling a single request
-- Anyone where the interaction is clearly self-contained and resolves within this thread
-
-**Durable (lean YES — note is OK if the other gates pass):**
-- An active customer, prospect, investor, partner, or candidate relationship likely to continue
-- A contact in an ongoing deal, project, or evaluation
-- Someone with whom a recurring cadence (calls, syncs, threads) is likely
-
-This is a **soft** check: weigh it alongside the weekly-importance and direct-interaction tests rather than as a hard veto. When the relationship is genuinely durable, a single temporary-looking exchange shouldn't block the note. When in doubt and the interaction looks temporary, prefer a suggestion card (or just logging the activity on an existing note) over creating a new canonical note.
-
 ## Organizations
 
 **CREATE a note if:**
@@ -721,8 +651,6 @@ This is a **soft** check: weigh it alongside the weekly-importance and direct-in
 - One-time transactional vendors
 - Consumer service companies
 - Organizations only referenced through third-party mention or offered introductions
-- Transactional interactions (see Transactional Interaction Check) — invoices, support tickets, issue reports, scheduling. Update an existing org note if one exists; don't create a new one
-- Temporary, self-contained interactions that won't carry forward a month from now (see Ongoing-Relationship Test) — e.g. a one-off support exchange
 
 ## Projects
 
@@ -1031,7 +959,7 @@ Before writing, compare extracted content against existing notes.
 
 ## Check Activity Log
 \`\`\`
-file-grep({ pattern: "2025-01-15", searchPath: "{knowledge_folder}/People/Sarah Chen.md" })
+workspace-grep({ pattern: "2025-01-15", searchPath: "{knowledge_folder}/People/Sarah Chen.md" })
 \`\`\`
 
 If an entry for this date/source already exists, this may have been processed. Skip or verify different interaction.
@@ -1065,20 +993,20 @@ If new info contradicts existing:
 - Wait for the tool to return before generating the next note.
 - Do NOT batch multiple write commands in a single response.
 
-**For NEW entities (use file-writeText):**
+**For NEW entities (use workspace-writeFile):**
 \`\`\`
-file-writeText({
+workspace-writeFile({
   path: "{knowledge_folder}/People/Jennifer.md",
   data: "# Jennifer\\n\\n## Summary\\n..."
 })
 \`\`\`
 
-**For EXISTING entities (use file-editText):**
-- Read current content first with file-readText
-- Use file-editText to add activity entry at TOP (reverse chronological)
+**For EXISTING entities (use workspace-edit):**
+- Read current content first with workspace-readFile
+- Use workspace-edit to add activity entry at TOP (reverse chronological)
 - Update fields using targeted edits
 \`\`\`
-file-editText({
+workspace-edit({
   path: "{knowledge_folder}/People/Sarah Chen.md",
   oldString: "## Activity\\n",
   newString: "## Activity\\n- **2026-02-03** (meeting): Met to discuss project timeline\\n"
@@ -1088,8 +1016,8 @@ file-editText({
 **For \`suggested-topics.md\`:**
 - Use workspace-relative path \`suggested-topics.md\`
 - Read the current file if you need the latest content
-- Use \`file-writeText\` to create or rewrite the file when that is simpler and cleaner
-- Use \`file-editText\` for small targeted edits only if that keeps the file deduped and readable
+- Use \`workspace-writeFile\` to create or rewrite the file when that is simpler and cleaner
+- Use \`workspace-edit\` for small targeted edits only if that keeps the file deduped and readable
 
 ## 9b: Apply State Changes
 
@@ -1128,8 +1056,6 @@ After writing, verify links go both ways.
 
 ## Bidirectional Link Rules
 
-**Precondition (see "Source Scoping"):** only add a link when the relationship is evidenced **within a single source file** or already recorded in an existing note. Do **not** add links between entities that merely share this batch. Bidirectionality applies *after* a link is justified — it never justifies creating one.
-
 | If you add... | Then also add... |
 |---------------|------------------|
 | Person → Organization | Organization → Person (in People section) |
@@ -1138,8 +1064,6 @@ After writing, verify links go both ways.
 | Project → Topic | Topic → Project (in Related section) |
 | Person → Person | Person → Person (reverse link) |
 
-**Before writing any \`[[link]]\`, ask:** "Did these two entities actually appear together in *this* source file (or an existing note)?" If the only thing they share is the batch, do not link them.
-
 ---
 
 ${renderNoteTypesBlock()}
@@ -1152,12 +1076,9 @@ ${renderNoteTypesBlock()}
 |-------------|---------------|----------------|------------------------|
 | Meeting | Yes | Yes | Yes |
 | Voice memo | Yes | Yes | Yes |
-| Email (create label + user replied in thread) | Yes | Yes | Yes |
-| Email (create label, purely inbound — no user reply) | Update-only (no new People/Org notes) | Yes | Yes |
+| Email (has create label) | Yes | Yes | Yes |
 | Email (only skip labels) | No (SKIP) | No | No |
 
-**Email Reply Gate:** New canonical People/Organization notes from an email require the user to have replied at least once in the thread (a \`### From:\` matching \`user.email\` or \`@user.domain\`). Purely inbound threads update existing notes only. Calendar invites for a scheduled meeting are exempt.
-
 **Meeting activity format:** Always include a link to the source meeting note:
 \`\`\`
 **2025-01-15** (meeting): Discussed project timeline with [[People/Sarah Chen]]. See [[Meetings/granola/abc123_Weekly Sync]]
@@ -1204,11 +1125,8 @@ Before completing, verify:
 **Filtering:**
 - [ ] Excluded self (user.name, user.email, @user.domain)
 - [ ] Applied relevance test to each person
-- [ ] Applied the email reply gate to new People/Organizations from email sources (purely inbound threads create no new notes)
 - [ ] Applied the direct interaction test to new People/Organizations
-- [ ] Applied the transactional interaction check (issue reports, invoices, support, scheduling update existing notes only — never create new ones)
 - [ ] Applied the weekly importance test to new People/Organizations
-- [ ] Applied the ongoing-relationship soft check (temporary/one-off interactions create no new notes)
 - [ ] Transactional contacts in Org Contacts, not People notes
 - [ ] Source correctly classified (process vs skip)
 - [ ] Third-party mentions did not become new canonical People/Organizations notes
@@ -1229,7 +1147,6 @@ Before completing, verify:
 - [ ] Logged all state changes in activity
 
 **Structure:**
-- [ ] Every \`[[link]]\` reflects a real relationship from a single source file or existing note — none created from batch co-occurrence (Source Scoping)
 - [ ] All entity mentions use \`[[Folder/Name]]\` absolute links
 - [ ] Activity entries are reverse chronological
 - [ ] No duplicate activity entries
diff --git a/apps/x/packages/core/src/knowledge/note_tagging_agent.ts b/apps/x/packages/core/src/knowledge/note_tagging_agent.ts
index b1402d3a..8e9e3320 100644
--- a/apps/x/packages/core/src/knowledge/note_tagging_agent.ts
+++ b/apps/x/packages/core/src/knowledge/note_tagging_agent.ts
@@ -3,15 +3,15 @@ import { renderTagSystemForNotes } from './tag_system.js';
 export function getRaw(): string {
   return `---
 tools:
-  file-readText:
+  workspace-readFile:
     type: builtin
-    name: file-readText
-  file-editText:
+    name: workspace-readFile
+  workspace-edit:
     type: builtin
-    name: file-editText
-  file-list:
+    name: workspace-edit
+  workspace-readdir:
     type: builtin
-    name: file-list
+    name: workspace-readdir
 ---
 # Task
 
@@ -23,7 +23,7 @@ You are a note tagging agent. Given a batch of knowledge notes (People, Organiza
 2. Determine the note type from its folder path (People/, Organizations/, Projects/, Topics/, Meetings/).
 3. Classify the note using the Rowboat Tag System (Note Tags section) appended below.
 4. Extract attributes from the note's \`## Info\` section (or \`## About\` for Topics). For Meetings, extract metadata from the note content and file path (see Meeting extraction rules below).
-5. Use \`file-editText\` to prepend YAML frontmatter to the file. The oldString should be the first line of the file (the \`# Title\` heading), and the newString should be the frontmatter followed by that same first line.
+5. Use \`workspace-edit\` to prepend YAML frontmatter to the file. The oldString should be the first line of the file (the \`# Title\` heading), and the newString should be the frontmatter followed by that same first line.
 6. If the note already has frontmatter (starts with \`---\`), skip it.
 
 # Frontmatter Format
diff --git a/apps/x/packages/core/src/knowledge/summarize_meeting.ts b/apps/x/packages/core/src/knowledge/summarize_meeting.ts
index dde7acb5..cd84cdb5 100644
--- a/apps/x/packages/core/src/knowledge/summarize_meeting.ts
+++ b/apps/x/packages/core/src/knowledge/summarize_meeting.ts
@@ -5,7 +5,6 @@ import { createProvider } from '../models/models.js';
 import { getDefaultModelAndProvider, getMeetingNotesModel, resolveProviderConfig } from '../models/defaults.js';
 import { WorkDir } from '../config/config.js';
 import { captureLlmUsage } from '../analytics/usage.js';
-import { withUseCase } from '../analytics/use_case.js';
 
 const CALENDAR_SYNC_DIR = path.join(WorkDir, 'calendar_sync');
 
@@ -153,11 +152,11 @@ export async function summarizeMeeting(transcript: string, meetingStartTime?: st
 
     const prompt = `Meeting recording started at: ${meetingStartTime || 'unknown'}\n\n${transcript}${calendarContext}`;
 
-    const result = await withUseCase({ useCase: 'meeting_note' }, () => generateText({
+    const result = await generateText({
         model,
         system: SYSTEM_PROMPT,
         prompt,
-    }));
+    });
 
     captureLlmUsage({
         useCase: 'meeting_note',
diff --git a/apps/x/packages/core/src/knowledge/sync_calendar.ts b/apps/x/packages/core/src/knowledge/sync_calendar.ts
index a010295a..d82b4c9f 100644
--- a/apps/x/packages/core/src/knowledge/sync_calendar.ts
+++ b/apps/x/packages/core/src/knowledge/sync_calendar.ts
@@ -7,7 +7,7 @@ import { WorkDir } from '../config/config.js';
 import { GoogleClientFactory } from './google-client-factory.js';
 import { serviceLogger } from '../services/service_logger.js';
 import { limitEventItems } from './limit_event_items.js';
-import { createEvent } from '../events/producer.js';
+import { createEvent } from './live-note/events.js';
 
 const MAX_EVENTS_IN_DIGEST = 50;
 const MAX_DESCRIPTION_CHARS = 500;
@@ -30,10 +30,6 @@ function formatEventTime(event: AnyEvent): string {
     return `${startStr} → ${endStr}`;
 }
 
-function shouldSyncCalendarEvent(event: cal.Schema$Event): boolean {
-    return event.eventType !== 'workingLocation';
-}
-
 function formatEventBlock(event: AnyEvent, label: 'NEW' | 'UPDATED'): string {
     const id = getStr(event, 'id') ?? '(unknown id)';
     const title = getStr(event, 'summary') ?? '(no title)';
@@ -138,10 +134,11 @@ async function publishCalendarSyncEvent(
 
 // Configuration
 const SYNC_DIR = path.join(WorkDir, 'calendar_sync');
-const SYNC_INTERVAL_MS = 30 * 1000; // Check every 30 seconds
+const SYNC_INTERVAL_MS = 5 * 60 * 1000; // Check every 5 minutes
 const LOOKBACK_DAYS = 7;
 const REQUIRED_SCOPES = [
     'https://www.googleapis.com/auth/calendar.events.readonly',
+    'https://www.googleapis.com/auth/drive.readonly'
 ];
 const nhm = new NodeHtmlMarkdown();
 
@@ -351,9 +348,6 @@ async function syncCalendarWindow(auth: OAuth2Client, syncDir: string, lookbackD
             console.log(`Found ${events.length} events.`);
             for (const event of events) {
                 if (event.id) {
-                    if (!shouldSyncCalendarEvent(event)) {
-                        continue;
-                    }
                     const result = await saveEvent(event, syncDir);
                     const attachmentsSaved = await processAttachments(drive, event, syncDir);
                     currentEventIds.add(event.id);
diff --git a/apps/x/packages/core/src/knowledge/sync_gmail.test.ts b/apps/x/packages/core/src/knowledge/sync_gmail.test.ts
deleted file mode 100644
index 5da55bbc..00000000
--- a/apps/x/packages/core/src/knowledge/sync_gmail.test.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import {
-  sanitizeReplyBodyForGmailReply,
-  stripGmailQuotedReplyHtml,
-  stripGmailQuotedReplyText,
-} from './sync_gmail.js';
-
-describe('Gmail reply body sanitization', () => {
-  it('strips Gmail quote attribution and older quoted text from plain text replies', () => {
-    const body = [
-      'Sounds good, thanks. I will send it over today.',
-      '',
-      'On Thu, 28 May 2026 at 23:45, PRAKHAR <prakhar9999pandey@gmail.com> wrote:',
-      '> Can you share the final file?',
-      '> Thanks',
-    ].join('\n');
-
-    expect(stripGmailQuotedReplyText(body)).toBe('Sounds good, thanks. I will send it over today.');
-  });
-
-  it('strips Gmail quote blocks from html replies', () => {
-    const html = [
-      '<p>Sounds good, thanks.</p>',
-      '<div class="gmail_quote">',
-      '<div dir="ltr" class="gmail_attr">On Thu, 28 May 2026 at 23:45, PRAKHAR wrote:<br></div>',
-      '<blockquote>Older thread text</blockquote>',
-      '</div>',
-    ].join('');
-
-    expect(stripGmailQuotedReplyHtml(html)).toBe('<p>Sounds good, thanks.</p>');
-  });
-
-  it('regenerates html from clean text if only the text boundary is detected', () => {
-    const result = sanitizeReplyBodyForGmailReply(
-      '<p>Sounds good, thanks.</p><p>Older thread text</p>',
-      'Sounds good, thanks.\n\nOn Thu, 28 May 2026 at 23:45, PRAKHAR <prakhar9999pandey@gmail.com> wrote:\nOlder thread text',
-    );
-
-    expect(result.bodyText).toBe('Sounds good, thanks.');
-    expect(result.bodyHtml).toBe('<p>Sounds good, thanks.</p>');
-  });
-});
diff --git a/apps/x/packages/core/src/knowledge/sync_gmail.ts b/apps/x/packages/core/src/knowledge/sync_gmail.ts
index 77055f37..5e18e37d 100644
--- a/apps/x/packages/core/src/knowledge/sync_gmail.ts
+++ b/apps/x/packages/core/src/knowledge/sync_gmail.ts
@@ -7,195 +7,20 @@ import { WorkDir } from '../config/config.js';
 import { GoogleClientFactory } from './google-client-factory.js';
 import { serviceLogger, type ServiceRunContext } from '../services/service_logger.js';
 import { limitEventItems } from './limit_event_items.js';
-import { createEvent } from '../events/producer.js';
-import { classifyThread, getUserEmail } from './classify_thread.js';
+import { createEvent } from './live-note/events.js';
 
 // Configuration
 const SYNC_DIR = path.join(WorkDir, 'gmail_sync');
-const LEGACY_CACHE_DIR = path.join(SYNC_DIR, 'cache');
-const CACHE_DIR = path.join(WorkDir, 'inbox_lists');
-
-(function migrateLegacyCacheDir() {
-    try {
-        if (fs.existsSync(LEGACY_CACHE_DIR) && !fs.existsSync(CACHE_DIR)) {
-            fs.renameSync(LEGACY_CACHE_DIR, CACHE_DIR);
-            console.log(`[Gmail] Migrated cache from ${LEGACY_CACHE_DIR} → ${CACHE_DIR}`);
-        }
-    } catch (err) {
-        console.warn('[Gmail] Cache directory migration failed:', err);
-    }
-})();
-const SYNC_INTERVAL_MS = 30 * 1000; // Check every 30 seconds
-const REQUIRED_SCOPE = 'https://www.googleapis.com/auth/gmail.modify';
+const SYNC_INTERVAL_MS = 5 * 60 * 1000; // Check every 5 minutes
+const REQUIRED_SCOPE = 'https://www.googleapis.com/auth/gmail.readonly';
 const MAX_THREADS_IN_DIGEST = 10;
-const RECENT_BACKFILL_INTERVAL_MS = 15 * 60 * 1000;
 const nhm = new NodeHtmlMarkdown();
 
-// Bump whenever snapshot-building logic changes in a way that should invalidate
-// previously cached snapshots (e.g. attachment / recipient parsing fixes). The
-// short-circuit in buildAndCacheSnapshot only reuses a cache whose version matches,
-// so stale entries are transparently rebuilt on the next sync.
-const SNAPSHOT_PARSER_VERSION = 3;
-
-interface SnapshotCacheEntry {
-    historyId: string;
-    fetchedAt: string;
-    parserVersion?: number;
-    snapshot: GmailThreadSnapshot;
-}
-
-function cachePath(threadId: string): string {
-    return path.join(CACHE_DIR, `${encodeURIComponent(threadId)}.json`);
-}
-
-function readCachedSnapshot(threadId: string): SnapshotCacheEntry | null {
-    try {
-        const raw = fs.readFileSync(cachePath(threadId), 'utf-8');
-        return JSON.parse(raw) as SnapshotCacheEntry;
-    } catch {
-        return null;
-    }
-}
-
-function writeCachedSnapshot(threadId: string, historyId: string, snapshot: GmailThreadSnapshot): void {
-    try {
-        if (!fs.existsSync(CACHE_DIR)) fs.mkdirSync(CACHE_DIR, { recursive: true });
-        const entry: SnapshotCacheEntry = {
-            historyId,
-            fetchedAt: new Date().toISOString(),
-            parserVersion: SNAPSHOT_PARSER_VERSION,
-            snapshot,
-        };
-        fs.writeFileSync(cachePath(threadId), JSON.stringify(entry), 'utf-8');
-    } catch (err) {
-        console.warn(`[Gmail cache] write failed for ${threadId}:`, err);
-    }
-}
-
-export function saveMessageBodyHeight(threadId: string, messageId: string, height: number): void {
-    const cached = readCachedSnapshot(threadId);
-    if (!cached) return;
-    const message = cached.snapshot.messages.find((m) => m.id === messageId);
-    if (!message) return;
-    if (message.bodyHeight === height) return;
-    message.bodyHeight = height;
-    try {
-        fs.writeFileSync(cachePath(threadId), JSON.stringify(cached), 'utf-8');
-    } catch (err) {
-        console.warn(`[Gmail cache] height write failed for ${threadId}/${messageId}:`, err);
-    }
-}
-
-function deleteCachedSnapshot(threadId: string): void {
-    try {
-        fs.rmSync(cachePath(threadId), { force: true });
-    } catch (err) {
-        console.warn(`[Gmail cache] delete failed for ${threadId}:`, err);
-    }
-}
-
-async function getGmailClientOrThrow() {
-    const auth = await GoogleClientFactory.getClient();
-    if (!auth) throw new Error('Gmail is not connected.');
-    return google.gmail({ version: 'v1', auth });
-}
-
-export interface ThreadActionResult {
-    ok: boolean;
-    error?: string;
-}
-
-export async function archiveThread(threadId: string): Promise<ThreadActionResult> {
-    try {
-        const gmailClient = await getGmailClientOrThrow();
-        await gmailClient.users.threads.modify({
-            userId: 'me',
-            id: threadId,
-            requestBody: { removeLabelIds: ['INBOX'] },
-        });
-        deleteCachedSnapshot(threadId);
-        return { ok: true };
-    } catch (err) {
-        return { ok: false, error: err instanceof Error ? err.message : String(err) };
-    }
-}
-
-export async function trashThread(threadId: string): Promise<ThreadActionResult> {
-    try {
-        const gmailClient = await getGmailClientOrThrow();
-        await gmailClient.users.threads.trash({ userId: 'me', id: threadId });
-        deleteCachedSnapshot(threadId);
-        return { ok: true };
-    } catch (err) {
-        return { ok: false, error: err instanceof Error ? err.message : String(err) };
-    }
-}
-
-export async function markThreadRead(threadId: string): Promise<ThreadActionResult> {
-    try {
-        const gmailClient = await getGmailClientOrThrow();
-        await gmailClient.users.threads.modify({
-            userId: 'me',
-            id: threadId,
-            requestBody: { removeLabelIds: ['UNREAD'] },
-        });
-        // Update local cache: clear unread on all messages in the thread.
-        const cached = readCachedSnapshot(threadId);
-        if (cached) {
-            for (const m of cached.snapshot.messages) m.unread = false;
-            cached.snapshot.unread = false;
-            try {
-                fs.writeFileSync(cachePath(threadId), JSON.stringify(cached), 'utf-8');
-            } catch (err) {
-                console.warn(`[Gmail cache] markRead write failed for ${threadId}:`, err);
-            }
-        }
-        return { ok: true };
-    } catch (err) {
-        return { ok: false, error: err instanceof Error ? err.message : String(err) };
-    }
-}
-
 interface SyncedThread {
     threadId: string;
     markdown: string;
 }
 
-export interface GmailThreadSnapshot {
-    threadId: string;
-    threadUrl: string;
-    summary?: string;
-    subject?: string;
-    from?: string;
-    to?: string;
-    date?: string;
-    latest_email?: string;
-    past_summary?: string;
-    unread?: boolean;
-    importance?: 'important' | 'other';
-    draft_response?: string;
-    gmail_draft?: string;
-    messages: Array<{
-        id?: string;
-        from?: string;
-        to?: string;
-        cc?: string;
-        date?: string;
-        subject?: string;
-        body?: string;
-        bodyHtml?: string;
-        unread?: boolean;
-        bodyHeight?: number;
-        attachments?: Array<{
-            filename: string;
-            mimeType?: string;
-            sizeBytes?: number;
-            savedPath: string;
-        }>;
-        messageIdHeader?: string;
-    }>;
-}
-
 function summarizeGmailSync(threads: SyncedThread[]): string {
     const lines: string[] = [
         `# Gmail sync update`,
@@ -268,535 +93,35 @@ function decodeBase64(data: string): string {
     return Buffer.from(data, 'base64').toString('utf-8');
 }
 
-function extractBodyParts(payload: gmail.Schema$MessagePart): { text: string; html: string } {
-    const out = { text: '', html: '' };
-    const walk = (part: gmail.Schema$MessagePart): void => {
-        const mime = part.mimeType || '';
-        if (mime === 'text/html' && part.body?.data) {
-            if (!out.html) out.html = decodeBase64(part.body.data);
-            return;
-        }
-        if (mime === 'text/plain' && part.body?.data) {
-            if (!out.text) out.text = decodeBase64(part.body.data);
-            return;
-        }
-        if (part.parts) {
-            for (const sub of part.parts) walk(sub);
-        }
-    };
-    walk(payload);
-    return out;
-}
-
 function getBody(payload: gmail.Schema$MessagePart): string {
-    const { text, html } = extractBodyParts(payload);
-    if (html) {
-        const md = nhm.translate(html);
-        return md.split('\n').filter((line: string) => !line.trim().startsWith('>')).join('\n');
-    }
-    if (text) {
-        return text.split('\n').filter((line: string) => !line.trim().startsWith('>')).join('\n');
-    }
-    return '';
-}
-
-interface ExtractedAttachment {
-    filename: string;
-    mimeType?: string;
-    sizeBytes?: number;
-    savedPath: string;
-}
-
-/**
- * Walk a message MIME tree and collect "real" attachments — parts with a
- * filename + attachmentId, excluding cid-referenced inline images (those
- * already get baked into bodyHtml as data URLs).
- *
- * Returns workspace-relative paths matching the convention used by
- * saveAttachment / processThread, so the renderer can hand them to
- * shell.openPath via the existing IPC.
- */
-function extractAttachments(msgId: string, payload: gmail.Schema$MessagePart, html?: string): ExtractedAttachment[] {
-    const out: ExtractedAttachment[] = [];
-    const walk = (part: gmail.Schema$MessagePart): void => {
-        const filename = part.filename;
-        const attId = part.body?.attachmentId;
-        if (filename && attId) {
-            // Exclude only images that are genuinely inline — i.e. their Content-ID
-            // is actually referenced via `cid:` in the HTML body, so inlineCidImages
-            // already baked them in as data URLs. Gmail stamps a Content-ID on most
-            // parts (including real, separately-attached images like screenshots or
-            // scanned docs), so a Content-ID alone must NOT exclude an attachment;
-            // otherwise attached images silently disappear from the thread view.
-            const cidRaw = part.headers?.find(h => h.name?.toLowerCase() === 'content-id')?.value;
-            const cid = cidRaw?.replace(/^<|>$/g, '').trim();
-            const mime = part.mimeType || '';
-            const referencedInHtml = !!cid && !!html
-                && new RegExp(`cid:${cid.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}`, 'i').test(html);
-            const isInlineImage = mime.startsWith('image/') && referencedInHtml;
-            if (!isInlineImage) {
-                const safeName = `${msgId}_${cleanFilename(filename)}`;
-                out.push({
-                    filename,
-                    mimeType: part.mimeType ?? undefined,
-                    sizeBytes: typeof part.body?.size === 'number' ? part.body.size : undefined,
-                    savedPath: `gmail_sync/attachments/${safeName}`,
-                });
+    let body = "";
+    if (payload.parts) {
+        for (const part of payload.parts) {
+            if (part.mimeType === 'text/plain' && part.body && part.body.data) {
+                const text = decodeBase64(part.body.data);
+                // Strip quoted lines
+                const cleanLines = text.split('\n').filter((line: string) => !line.trim().startsWith('>'));
+                body += cleanLines.join('\n');
+            } else if (part.mimeType === 'text/html' && part.body && part.body.data) {
+                const html = decodeBase64(part.body.data);
+                const md = nhm.translate(html);
+                // Simple quote stripping for MD
+                const cleanLines = md.split('\n').filter((line: string) => !line.trim().startsWith('>'));
+                body += cleanLines.join('\n');
+            } else if (part.parts) {
+                body += getBody(part);
             }
         }
-        if (part.parts) for (const sub of part.parts) walk(sub);
-    };
-    walk(payload);
-    return out;
-}
-
-async function inlineCidImages(
-    gmailClient: gmail.Gmail,
-    messageId: string,
-    payload: gmail.Schema$MessagePart,
-    html: string,
-): Promise<string> {
-    if (!/src\s*=\s*["']?cid:/i.test(html)) return html;
-
-    const inlineParts: Array<{ contentId: string; mimeType: string; attachmentId: string }> = [];
-    const collect = (part: gmail.Schema$MessagePart): void => {
-        const cidHeader = part.headers?.find(h => h.name?.toLowerCase() === 'content-id')?.value;
-        const attachmentId = part.body?.attachmentId;
-        const mime = part.mimeType || '';
-        if (cidHeader && attachmentId && mime.startsWith('image/')) {
-            inlineParts.push({
-                contentId: cidHeader.replace(/^<|>$/g, '').trim(),
-                mimeType: mime,
-                attachmentId,
-            });
-        }
-        if (part.parts) for (const sub of part.parts) collect(sub);
-    };
-    collect(payload);
-    if (inlineParts.length === 0) return html;
-
-    const dataUrls = new Map<string, string>();
-    await Promise.all(inlineParts.map(async (part) => {
-        try {
-            const res = await gmailClient.users.messages.attachments.get({
-                userId: 'me',
-                messageId,
-                id: part.attachmentId,
-            });
-            const b64 = res.data.data;
-            if (!b64) return;
-            // Gmail returns base64url; data URLs need standard base64
-            const normalized = b64.replace(/-/g, '+').replace(/_/g, '/');
-            dataUrls.set(part.contentId, `data:${part.mimeType};base64,${normalized}`);
-        } catch (err) {
-            console.warn(`[Gmail] inline image fetch failed for ${part.contentId}:`, err);
-        }
-    }));
-
-    let rewritten = html;
-    for (const [cid, url] of dataUrls) {
-        const escaped = cid.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-        rewritten = rewritten.replace(new RegExp(`cid:${escaped}`, 'gi'), url);
-    }
-    return rewritten;
-}
-
-function normalizeBody(body: string): string {
-    return body.replace(/\r\n/g, '\n').replace(/\n{3,}/g, '\n\n').trim();
-}
-
-function isGmailQuoteAttribution(line: string): boolean {
-    const trimmed = line.trim();
-    return /^On\b.+\bwrote:\s*$/i.test(trimmed);
-}
-
-function isOriginalMessageBoundary(line: string): boolean {
-    return /^-{2,}\s*Original Message\s*-{2,}$/i.test(line.trim());
-}
-
-function isForwardedMessageBoundary(line: string): boolean {
-    return /^-{2,}\s*Forwarded message\s*-{2,}$/i.test(line.trim());
-}
-
-function isOutlookHeaderBoundary(lines: string[], index: number): boolean {
-    if (!/^From:\s+\S/i.test(lines[index]?.trim() || '')) return false;
-    const next = lines.slice(index + 1, index + 6).map((line) => line.trim());
-    return next.some((line) => /^(Sent|Date):\s+\S/i.test(line))
-        && next.some((line) => /^To:\s+\S/i.test(line))
-        && next.some((line) => /^Subject:\s+\S/i.test(line));
-}
-
-function findQuotedReplyBoundary(lines: string[]): number {
-    for (let i = 0; i < lines.length; i += 1) {
-        const line = lines[i] || '';
-        if (
-            isGmailQuoteAttribution(line)
-            || isOriginalMessageBoundary(line)
-            || isForwardedMessageBoundary(line)
-            || isOutlookHeaderBoundary(lines, i)
-        ) {
-            return i;
-        }
-
-        // Gmail plain text drafts often carry older messages as a quoted block.
-        // Treat a trailing blockquote as history, but avoid stripping an inline
-        // quote the user is actively writing at the top of the reply.
-        if (i > 0 && line.trim().startsWith('>') && (lines[i - 1]?.trim() === '' || lines[i - 1]?.trim().startsWith('>'))) {
-            return i;
+    } else if (payload.body && payload.body.data) {
+        const data = decodeBase64(payload.body.data);
+        if (payload.mimeType === 'text/html') {
+            const md = nhm.translate(data);
+            body += md.split('\n').filter((line: string) => !line.trim().startsWith('>')).join('\n');
+        } else {
+            body += data.split('\n').filter((line: string) => !line.trim().startsWith('>')).join('\n');
         }
     }
-    return -1;
-}
-
-export function stripGmailQuotedReplyText(text: string): string {
-    const normalized = text.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
-    const lines = normalized.split('\n');
-    const boundary = findQuotedReplyBoundary(lines);
-    const visible = boundary >= 0 ? lines.slice(0, boundary) : lines;
-    return visible
-        .join('\n')
-        .replace(/[ \t]+\n/g, '\n')
-        .replace(/\n{3,}/g, '\n\n')
-        .trim();
-}
-
-function htmlQuoteBoundaryIndex(html: string): number {
-    const candidates: number[] = [];
-    const patterns = [
-        /<[^>]+\bclass\s*=\s*["'][^"']*\bgmail_(?:quote|attr)\b[^"']*["'][^>]*>/i,
-        /<blockquote\b[^>]*(?:type\s*=\s*["']cite["']|class\s*=\s*["'][^"']*\bgmail_quote\b[^"']*["'])[^>]*>/i,
-        /<(p|div|li)\b[^>]*>\s*(?:<(?:span|b|strong|i|em)\b[^>]*>\s*)*On\b[\s\S]{0,800}?\bwrote:\s*(?:<br\s*\/?>\s*)?(?:<\/(?:span|b|strong|i|em)>\s*)*<\/\1>/i,
-        /<(p|div|li)\b[^>]*>\s*-{2,}\s*(?:Original Message|Forwarded message)\s*-{2,}\s*<\/\1>/i,
-    ];
-
-    for (const pattern of patterns) {
-        const match = pattern.exec(html);
-        if (match?.index !== undefined) candidates.push(match.index);
-    }
-
-    return candidates.length > 0 ? Math.min(...candidates) : -1;
-}
-
-export function stripGmailQuotedReplyHtml(html: string): string {
-    const boundary = htmlQuoteBoundaryIndex(html);
-    const visible = boundary >= 0 ? html.slice(0, boundary) : html;
-    return visible.trim();
-}
-
-function textToHtml(text: string): string {
-    return text
-        .split(/\n{2,}/)
-        .map((para) => `<p>${escapeHtml(para).replace(/\n/g, '<br />')}</p>`)
-        .join('');
-}
-
-function escapeHtml(value: string): string {
-    return value
-        .replace(/&/g, '&amp;')
-        .replace(/</g, '&lt;')
-        .replace(/>/g, '&gt;')
-        .replace(/"/g, '&quot;')
-        .replace(/'/g, '&#39;');
-}
-
-export function sanitizeReplyBodyForGmailReply(bodyHtml: string, bodyText: string): { bodyHtml: string; bodyText: string } {
-    const cleanText = stripGmailQuotedReplyText(bodyText);
-    const cleanHtml = stripGmailQuotedReplyHtml(bodyHtml);
-    const textWasStripped = cleanText !== bodyText.replace(/\r\n/g, '\n').replace(/\r/g, '\n').trim();
-    const htmlWasStripped = cleanHtml !== bodyHtml.trim();
-
-    return {
-        bodyText: cleanText,
-        bodyHtml: textWasStripped && !htmlWasStripped ? textToHtml(cleanText) : cleanHtml,
-    };
-}
-
-function headerValue(headers: gmail.Schema$MessagePartHeader[] | undefined, name: string): string | undefined {
-    return headers?.find(h => h.name?.toLowerCase() === name.toLowerCase())?.value || undefined;
-}
-
-export interface RecentThreadInfo {
-    threadId: string;
-    historyId: string;
-    snippet?: string;
-}
-
-export type InboxSection = 'important' | 'other';
-
-export interface InboxPageOptions {
-    section: InboxSection;
-    cursor?: string;
-    limit?: number;
-}
-
-export interface InboxPageResult {
-    threads: GmailThreadSnapshot[];
-    nextCursor: string | null;
-}
-
-interface IndexedEntry {
-    threadId: string;
-    dateMs: number;
-    snapshot: GmailThreadSnapshot;
-}
-
-function snapshotImportance(s: GmailThreadSnapshot): InboxSection {
-    return s.importance === 'other' ? 'other' : 'important';
-}
-
-function snapshotDateMs(s: GmailThreadSnapshot): number {
-    const latest = s.messages[s.messages.length - 1];
-    const raw = latest?.date || s.date;
-    if (!raw) return 0;
-    const ms = Date.parse(raw);
-    return Number.isFinite(ms) ? ms : 0;
-}
-
-function parseCursor(cursor: string | undefined): { dateMs: number; threadId: string } | null {
-    if (!cursor) return null;
-    const idx = cursor.indexOf('|');
-    if (idx < 0) return null;
-    const dateMs = Number(cursor.slice(0, idx));
-    const threadId = cursor.slice(idx + 1);
-    if (!Number.isFinite(dateMs) || !threadId) return null;
-    return { dateMs, threadId };
-}
-
-function encodeCursor(entry: { dateMs: number; threadId: string }): string {
-    return `${entry.dateMs}|${entry.threadId}`;
-}
-
-export function listImportantThreads(opts: { cursor?: string; limit?: number } = {}): InboxPageResult {
-    return listInboxPage({ section: 'important', ...opts });
-}
-
-export function listEverythingElseThreads(opts: { cursor?: string; limit?: number } = {}): InboxPageResult {
-    return listInboxPage({ section: 'other', ...opts });
-}
-
-export function listInboxPage(opts: InboxPageOptions): InboxPageResult {
-    const limit = Math.max(1, Math.min(100, opts.limit ?? 25));
-    const cursor = parseCursor(opts.cursor);
-
-    if (!fs.existsSync(CACHE_DIR)) return { threads: [], nextCursor: null };
-
-    let names: string[];
-    try {
-        names = fs.readdirSync(CACHE_DIR);
-    } catch {
-        return { threads: [], nextCursor: null };
-    }
-
-    const entries: IndexedEntry[] = [];
-    for (const name of names) {
-        if (!name.endsWith('.json')) continue;
-        const filePath = path.join(CACHE_DIR, name);
-        try {
-            const raw = fs.readFileSync(filePath, 'utf-8');
-            const wrapper = JSON.parse(raw) as SnapshotCacheEntry;
-            const snapshot = wrapper.snapshot;
-            if (!snapshot) continue;
-            if (snapshotImportance(snapshot) !== opts.section) continue;
-            entries.push({
-                threadId: snapshot.threadId,
-                dateMs: snapshotDateMs(snapshot),
-                snapshot,
-            });
-        } catch (err) {
-            console.warn(`[Inbox lists] read failed for ${name}:`, err);
-        }
-    }
-
-    // Newest first, threadId asc as tiebreak.
-    entries.sort((a, b) => {
-        if (b.dateMs !== a.dateMs) return b.dateMs - a.dateMs;
-        return a.threadId < b.threadId ? -1 : 1;
-    });
-
-    let startIdx = 0;
-    if (cursor) {
-        startIdx = entries.findIndex((e) => {
-            if (e.dateMs < cursor.dateMs) return true;
-            if (e.dateMs === cursor.dateMs && e.threadId > cursor.threadId) return true;
-            return false;
-        });
-        if (startIdx < 0) startIdx = entries.length;
-    }
-
-    const slice = entries.slice(startIdx, startIdx + limit);
-    const hasMore = startIdx + slice.length < entries.length;
-    const last = slice[slice.length - 1];
-
-    return {
-        threads: slice.map((e) => e.snapshot),
-        nextCursor: hasMore && last ? encodeCursor({ dateMs: last.dateMs, threadId: last.threadId }) : null,
-    };
-}
-
-export async function listRecentThreadIds(daysAgo: number = 2): Promise<RecentThreadInfo[]> {
-    const auth = await GoogleClientFactory.getClient();
-    if (!auth) {
-        throw new Error('Gmail is not connected.');
-    }
-
-    const gmailClient = google.gmail({ version: 'v1', auth });
-    const since = new Date();
-    since.setDate(since.getDate() - daysAgo);
-    const dateQuery = since.toISOString().split('T')[0].replace(/-/g, '/');
-
-    const results: RecentThreadInfo[] = [];
-    let pageToken: string | undefined;
-    do {
-        const res = await gmailClient.users.threads.list({
-            userId: 'me',
-            q: `after:${dateQuery}`,
-            pageToken,
-        });
-        const threads = res.data.threads || [];
-        for (const thread of threads) {
-            if (thread.id && thread.historyId) {
-                results.push({
-                    threadId: thread.id,
-                    historyId: thread.historyId,
-                    snippet: thread.snippet || undefined,
-                });
-            }
-        }
-        pageToken = res.data.nextPageToken ?? undefined;
-    } while (pageToken);
-
-    return results;
-}
-
-/**
- * Build a GmailThreadSnapshot from an already-fetched threads.get response,
- * classify it, and write to inbox_lists/. Called by the background sync
- * (processThread) — the only path that materializes snapshots.
- *
- * Returns null when the thread has no visible (non-draft) messages —
- * those shouldn't show up in the inbox.
- */
-async function buildAndCacheSnapshot(
-    threadId: string,
-    threadData: gmail.Schema$Thread,
-    gmailClient: gmail.Gmail,
-    auth: OAuth2Client,
-): Promise<GmailThreadSnapshot | null> {
-    const messages = threadData.messages;
-    if (!messages || messages.length === 0) return null;
-
-    const cached = readCachedSnapshot(threadId);
-    // Short-circuit: if the thread hasn't changed since we last classified it,
-    // skip the rebuild + classifier. Saves the cid-image fetches and one LLM
-    // call per unchanged thread (matters most during fullSync after a
-    // historyId expiry, where the whole window is re-walked).
-    // We require `importance` to be present too — pre-classifier cache files
-    // would otherwise stick around forever uncategorised.
-    if (
-        threadData.historyId &&
-        cached &&
-        cached.historyId === threadData.historyId &&
-        cached.parserVersion === SNAPSHOT_PARSER_VERSION &&
-        cached.snapshot.importance
-    ) {
-        return cached.snapshot;
-    }
-    const heightCarryover = new Map<string, number>();
-    if (cached) {
-        for (const m of cached.snapshot.messages) {
-            if (m.id && typeof m.bodyHeight === 'number') heightCarryover.set(m.id, m.bodyHeight);
-        }
-    }
-
-    const parsed = await Promise.all(messages.map(async (msg) => {
-        const headers = msg.payload?.headers || [];
-        const parts = msg.payload ? extractBodyParts(msg.payload) : { text: '', html: '' };
-        const body = msg.payload ? normalizeBody(getBody(msg.payload)) : '';
-        let bodyHtml: string | undefined;
-        if (parts.html && msg.payload && msg.id) {
-            try {
-                bodyHtml = await inlineCidImages(gmailClient, msg.id, msg.payload, parts.html);
-            } catch (err) {
-                console.warn(`[Gmail] inline image embed failed for message ${msg.id}:`, err);
-                bodyHtml = parts.html;
-            }
-        }
-        const isDraft = msg.labelIds?.includes('DRAFT') ?? false;
-        const attachments = msg.payload && msg.id ? extractAttachments(msg.id, msg.payload, parts.html) : [];
-        return {
-            id: msg.id || undefined,
-            from: headerValue(headers, 'From') || 'Unknown',
-            to: headerValue(headers, 'To'),
-            cc: headerValue(headers, 'Cc'),
-            date: headerValue(headers, 'Date'),
-            subject: headerValue(headers, 'Subject') || '(No Subject)',
-            body,
-            bodyHtml,
-            unread: msg.labelIds?.includes('UNREAD') ?? false,
-            bodyHeight: msg.id ? heightCarryover.get(msg.id) : undefined,
-            messageIdHeader: headerValue(headers, 'Message-ID') || headerValue(headers, 'Message-Id') || undefined,
-            attachments: attachments.length > 0 ? attachments : undefined,
-            isDraft,
-        };
-    }));
-
-    const sentMessages = parsed.filter((m) => !m.isDraft);
-    const draftMessages = parsed.filter((m) => m.isDraft);
-    const visibleMessages = sentMessages.map((msg) => {
-        const rest: Partial<typeof msg> = { ...msg };
-        delete rest.isDraft;
-        return rest as Omit<typeof msg, 'isDraft'>;
-    });
-    const latestDraftBody = draftMessages.length > 0
-        ? stripGmailQuotedReplyText(draftMessages[draftMessages.length - 1]!.body)
-        : '';
-
-    if (visibleMessages.length === 0) return null;
-
-    const latest = visibleMessages[visibleMessages.length - 1]!;
-    const earlier = visibleMessages.slice(0, -1);
-    const earlierSummary = earlier
-        .map((msg) => {
-            const date = msg.date ? ` (${msg.date})` : '';
-            const body = msg.body.replace(/\s+/g, ' ').slice(0, 500).trim();
-            return `${msg.from}${date}: ${body}`;
-        })
-        .filter(Boolean)
-        .join('\n\n');
-
-    const snapshot: GmailThreadSnapshot = {
-        threadId,
-        threadUrl: `https://mail.google.com/mail/u/0/#all/${threadId}`,
-        subject: latest.subject || visibleMessages[0]?.subject,
-        from: latest.from,
-        to: latest.to,
-        date: latest.date,
-        latest_email: latest.body,
-        past_summary: earlierSummary || undefined,
-        unread: visibleMessages.some((m) => m.unread),
-        messages: visibleMessages,
-        gmail_draft: latestDraftBody || undefined,
-    };
-
-    try {
-        const userEmail = await getUserEmail(auth);
-        const skipDraft = latestDraftBody.length > 0;
-        const classification = await classifyThread(snapshot, userEmail, { skipDraft });
-        snapshot.importance = classification.importance;
-        if (classification.summary) snapshot.summary = classification.summary;
-        if (classification.draftResponse) {
-            const draftResponse = stripGmailQuotedReplyText(classification.draftResponse);
-            if (draftResponse) snapshot.draft_response = draftResponse;
-        }
-    } catch (err) {
-        console.warn(`[Gmail] classify failed for ${threadId}:`, err);
-    }
-
-    if (threadData.historyId) {
-        writeCachedSnapshot(threadId, threadData.historyId, snapshot);
-    }
-
-    return snapshot;
+    return body;
 }
 
 async function saveAttachment(gmail: gmail.Gmail, userId: string, msgId: string, part: gmail.Schema$MessagePart, attachmentsDir: string): Promise<string | null> {
@@ -839,16 +164,6 @@ async function processThread(auth: OAuth2Client, threadId: string, syncDir: stri
 
         if (!messages || messages.length === 0) return null;
 
-        // Skip threads in SPAM or TRASH (Gmail labels them at the message level).
-        const isExcluded = messages.some(m => {
-            const labels = m.labelIds ?? [];
-            return labels.includes('SPAM') || labels.includes('TRASH');
-        });
-        if (isExcluded) {
-            console.log(`Skipping thread ${threadId} (SPAM/TRASH)`);
-            return null;
-        }
-
         // Subject from first message
         const firstHeader = messages[0].payload?.headers;
         const subject = firstHeader?.find(h => h.name === 'Subject')?.value || '(No Subject)';
@@ -900,180 +215,44 @@ async function processThread(auth: OAuth2Client, threadId: string, syncDir: stri
         fs.writeFileSync(path.join(syncDir, `${threadId}.md`), mdContent);
         console.log(`Synced Thread: ${subject} (${threadId})`);
 
-        // Also build + cache the rich snapshot for the inbox view.
-        // Reuses the threads.get response — no extra API call.
-        try {
-            await buildAndCacheSnapshot(threadId, thread, gmail, auth);
-        } catch (err) {
-            console.warn(`[Gmail] Inbox snapshot build failed for ${threadId}:`, err);
-        }
-
         return { threadId, markdown: mdContent };
 
     } catch (error) {
         console.error(`Error processing thread ${threadId}:`, error);
-        const status = getErrorStatus(error);
-        if (status === 404) return null;
-        throw error;
+        return null;
     }
 }
 
-/**
- * After a sync cycle, prune inbox_lists/ entries for threadIds that are
- * no longer in INBOX (archived/trashed elsewhere). Single threads.list call,
- * keeps the cache in lock-step with Gmail's INBOX label.
- */
-async function pruneInboxCache(auth: OAuth2Client): Promise<void> {
-    if (!fs.existsSync(CACHE_DIR)) return;
-    try {
-        const gmailClient = google.gmail({ version: 'v1', auth });
-        const inInbox = new Set<string>();
-        let pageToken: string | undefined;
-        do {
-            const res = await gmailClient.users.threads.list({
-                userId: 'me',
-                labelIds: ['INBOX'],
-                maxResults: 500,
-                pageToken,
-            });
-            for (const t of res.data.threads || []) {
-                if (t.id) inInbox.add(t.id);
-            }
-            pageToken = res.data.nextPageToken ?? undefined;
-        } while (pageToken);
-
-        for (const name of fs.readdirSync(CACHE_DIR)) {
-            if (!name.endsWith('.json')) continue;
-            const threadId = decodeURIComponent(name.replace(/\.json$/, ''));
-            if (!inInbox.has(threadId)) {
-                try {
-                    fs.rmSync(path.join(CACHE_DIR, name), { force: true });
-                } catch (err) {
-                    console.warn(`[Gmail] prune failed for ${threadId}:`, err);
-                }
-            }
-        }
-    } catch (err) {
-        console.warn('[Gmail] pruneInboxCache failed:', err);
-    }
-}
-
-function loadState(stateFile: string): { historyId?: string; last_sync?: string; last_recent_backfill?: string } {
+function loadState(stateFile: string): { historyId?: string; last_sync?: string } {
     if (fs.existsSync(stateFile)) {
         return JSON.parse(fs.readFileSync(stateFile, 'utf-8'));
     }
     return {};
 }
 
-function saveState(historyId: string, stateFile: string, extra: { last_recent_backfill?: string } = {}) {
-    const previous = loadState(stateFile);
+function saveState(historyId: string, stateFile: string) {
     fs.writeFileSync(stateFile, JSON.stringify({
         historyId,
-        last_sync: new Date().toISOString(),
-        last_recent_backfill: extra.last_recent_backfill ?? previous.last_recent_backfill,
-        ...extra,
+        last_sync: new Date().toISOString()
     }, null, 2));
 }
 
-function getErrorStatus(error: unknown): number | undefined {
-    const status = (error as { response?: { status?: number } }).response?.status;
-    if (status) return status;
-    const code = Number((error as { code?: number | string }).code);
-    return Number.isFinite(code) ? code : undefined;
-}
-
-function recentDateQuery(lookbackDays: number): string {
-    const pastDate = new Date();
-    pastDate.setDate(pastDate.getDate() - lookbackDays);
-    return pastDate.toISOString().split('T')[0].replace(/-/g, '/');
-}
-
-async function listRecentNonDeletedThreadIds(gmailClient: gmail.Gmail, lookbackDays: number): Promise<RecentThreadInfo[]> {
-    const dateQuery = recentDateQuery(lookbackDays);
-    const results: RecentThreadInfo[] = [];
-    const seen = new Set<string>();
-    let pageToken: string | undefined;
-
-    do {
-        const res = await gmailClient.users.threads.list({
-            userId: 'me',
-            q: `after:${dateQuery} -in:spam -in:trash`,
-            maxResults: 500,
-            pageToken,
-        });
-        for (const thread of res.data.threads || []) {
-            if (!thread.id || seen.has(thread.id)) continue;
-            seen.add(thread.id);
-            results.push({
-                threadId: thread.id,
-                historyId: thread.historyId || '',
-                snippet: thread.snippet || undefined,
-            });
-        }
-        pageToken = res.data.nextPageToken ?? undefined;
-    } while (pageToken);
-
-    return results;
-}
-
-function shouldRunRecentBackfill(stateFile: string): boolean {
-    const state = loadState(stateFile);
-    if (!state.last_recent_backfill) return true;
-    const lastRunMs = new Date(state.last_recent_backfill).getTime();
-    if (!Number.isFinite(lastRunMs)) return true;
-    return Date.now() - lastRunMs >= RECENT_BACKFILL_INTERVAL_MS;
-}
-
-async function backfillMissingRecentThreads(
-    auth: OAuth2Client,
-    syncDir: string,
-    attachmentsDir: string,
-    stateFile: string,
-    lookbackDays: number,
-): Promise<SyncedThread[]> {
-    if (!shouldRunRecentBackfill(stateFile)) return [];
-
-    const gmailClient = google.gmail({ version: 'v1', auth });
-    const recentThreads = await listRecentNonDeletedThreadIds(gmailClient, lookbackDays);
-    const missingThreadIds = recentThreads
-        .map((thread) => thread.threadId)
-        .filter((threadId) => !fs.existsSync(path.join(syncDir, `${threadId}.md`)));
-
-    const synced: SyncedThread[] = [];
-    for (const threadId of missingThreadIds) {
-        const result = await processThread(auth, threadId, syncDir, attachmentsDir);
-        if (result) synced.push(result);
-    }
-
-    const profile = await gmailClient.users.getProfile({ userId: 'me' });
-    saveState(profile.data.historyId!, stateFile, { last_recent_backfill: new Date().toISOString() });
-
-    if (missingThreadIds.length > 0) {
-        console.log(`Recent Gmail backfill synced ${synced.length}/${missingThreadIds.length} missing thread(s).`);
-    }
-    return synced;
-}
-
 async function fullSync(auth: OAuth2Client, syncDir: string, attachmentsDir: string, stateFile: string, lookbackDays: number) {
     const gmail = google.gmail({ version: 'v1', auth });
 
     // If the state file holds a last_sync timestamp (e.g. left over from a
     // prior Composio sync, or from a previous successful native sync that
     // we're falling back to after a history.list 404), use that as the
-    // floor — but never reach back further than lookbackDays. This caps the
-    // window at "1 week at most": if last_sync is within the lookback window
-    // we resume from it (a smaller window), otherwise we clamp to lookbackDays
-    // ago. Mail older than the cap that arrived during a long offline gap is
-    // intentionally skipped rather than backfilled.
+    // floor instead of the default lookback. Carries forward Composio's
+    // last_sync on first migration so we don't refetch the last 7 days.
     const state = loadState(stateFile);
-    const lookbackFloor = new Date();
-    lookbackFloor.setDate(lookbackFloor.getDate() - lookbackDays);
     let pastDate: Date;
-    if (state.last_sync && new Date(state.last_sync) > lookbackFloor) {
+    if (state.last_sync) {
         pastDate = new Date(state.last_sync);
         console.log(`Performing full sync from last_sync=${state.last_sync}...`);
     } else {
-        pastDate = lookbackFloor;
+        pastDate = new Date();
+        pastDate.setDate(pastDate.getDate() - lookbackDays);
         console.log(`Performing full sync of last ${lookbackDays} days...`);
     }
 
@@ -1100,8 +279,7 @@ async function fullSync(auth: OAuth2Client, syncDir: string, attachmentsDir: str
         do {
             const res = await gmail.users.threads.list({
                 userId: 'me',
-                q: `after:${dateQuery} -in:spam -in:trash`,
-                maxResults: 500,
+                q: `after:${dateQuery}`,
                 pageToken
             });
 
@@ -1195,24 +373,15 @@ async function partialSync(auth: OAuth2Client, startHistoryId: string, syncDir:
     };
 
     try {
-        const changes: gmail.Schema$History[] = [];
-        let pageToken: string | undefined;
-        do {
-            const res = await gmail.users.history.list({
-                userId: 'me',
-                startHistoryId,
-                historyTypes: ['messageAdded'],
-                maxResults: 500,
-                pageToken,
-            });
-            if (res.data.history) changes.push(...res.data.history);
-            pageToken = res.data.nextPageToken ?? undefined;
-        } while (pageToken);
+        const res = await gmail.users.history.list({
+            userId: 'me',
+            startHistoryId,
+            historyTypes: ['messageAdded']
+        });
 
+        const changes = res.data.history;
         if (!changes || changes.length === 0) {
             console.log("No new changes.");
-            const backfilled = await backfillMissingRecentThreads(auth, syncDir, attachmentsDir, stateFile, lookbackDays);
-            await publishGmailSyncEvent(backfilled);
             const profile = await gmail.users.getProfile({ userId: 'me' });
             saveState(profile.data.historyId!, stateFile);
             return;
@@ -1224,8 +393,6 @@ async function partialSync(auth: OAuth2Client, startHistoryId: string, syncDir:
         for (const record of changes) {
             if (record.messagesAdded) {
                 for (const item of record.messagesAdded) {
-                    const labels = item.message?.labelIds ?? [];
-                    if (labels.includes('SPAM') || labels.includes('TRASH')) continue;
                     if (item.message?.threadId) {
                         threadIds.add(item.message.threadId);
                     }
@@ -1234,8 +401,6 @@ async function partialSync(auth: OAuth2Client, startHistoryId: string, syncDir:
         }
 
         if (threadIds.size === 0) {
-            const backfilled = await backfillMissingRecentThreads(auth, syncDir, attachmentsDir, stateFile, lookbackDays);
-            await publishGmailSyncEvent(backfilled);
             const profile = await gmail.users.getProfile({ userId: 'me' });
             saveState(profile.data.historyId!, stateFile);
             return;
@@ -1260,8 +425,6 @@ async function partialSync(auth: OAuth2Client, startHistoryId: string, syncDir:
             const result = await processThread(auth, tid, syncDir, attachmentsDir);
             if (result) synced.push(result);
         }
-        const backfilled = await backfillMissingRecentThreads(auth, syncDir, attachmentsDir, stateFile, lookbackDays);
-        synced.push(...backfilled);
 
         await publishGmailSyncEvent(synced);
 
@@ -1332,204 +495,20 @@ async function performSync() {
         console.log("Authorization successful. Starting sync...");
 
         const state = loadState(STATE_FILE);
-        // Backfill case: users who upgraded from a pre-inbox-view build have a
-        // stored historyId but no inbox_lists/ cache, so partialSync would only
-        // touch *new* threads and the inbox UI would stay empty. Force a one-
-        // shot fullSync to populate snapshots for the lookback window. After
-        // this runs once, the cache directory is populated and we fall back to
-        // partial-sync on subsequent calls.
-        const cacheMissing = !fs.existsSync(CACHE_DIR) || fs.readdirSync(CACHE_DIR).length === 0;
-        // partialSync replays *every* messageAdded since the stored historyId,
-        // regardless of date — so after a long offline gap a still-valid
-        // historyId would pull the entire gap (e.g. 3 weeks). To honor the
-        // "1 week at most" cap, bypass it when last_sync is older than the
-        // lookback window and run a (date-clamped) fullSync instead.
-        const gapMs = state.last_sync ? Date.now() - new Date(state.last_sync).getTime() : 0;
-        const gapTooLarge = gapMs > LOOKBACK_DAYS * 24 * 60 * 60 * 1000;
         if (!state.historyId) {
             console.log("No history ID found, starting full sync...");
             await fullSync(auth, SYNC_DIR, ATTACHMENTS_DIR, STATE_FILE, LOOKBACK_DAYS);
-        } else if (cacheMissing) {
-            console.log("History ID present but inbox cache empty — running full sync to backfill snapshots...");
-            await fullSync(auth, SYNC_DIR, ATTACHMENTS_DIR, STATE_FILE, LOOKBACK_DAYS);
-        } else if (gapTooLarge) {
-            console.log(`Last sync older than ${LOOKBACK_DAYS} days — running full sync clamped to the lookback window instead of partial sync...`);
-            await fullSync(auth, SYNC_DIR, ATTACHMENTS_DIR, STATE_FILE, LOOKBACK_DAYS);
         } else {
             console.log("History ID found, starting partial sync...");
             await partialSync(auth, state.historyId, SYNC_DIR, ATTACHMENTS_DIR, STATE_FILE, LOOKBACK_DAYS);
         }
 
-        // Keep inbox_lists/ in lock-step with Gmail's INBOX label —
-        // remove cache files for threads that were archived/trashed elsewhere.
-        await pruneInboxCache(auth);
-
         console.log("Sync completed.");
     } catch (error) {
         console.error("Error during sync:", error);
     }
 }
 
-// --- Send Reply ---
-
-export interface SendReplyOptions {
-    threadId?: string;
-    to: string;
-    cc?: string;
-    bcc?: string;
-    subject: string;
-    bodyHtml: string;
-    bodyText: string;
-    inReplyTo?: string;
-    references?: string;
-}
-
-export interface SendReplyResult {
-    messageId?: string;
-    error?: string;
-}
-
-export interface GmailConnectionStatus {
-    connected: boolean;
-    hasRequiredScope: boolean;
-    missingScopes: string[];
-    email: string | null;
-}
-
-/** The connected Gmail address (cached). Used by the composer to exclude "me" from reply-all. */
-export async function getAccountEmail(): Promise<string | null> {
-    const auth = await GoogleClientFactory.getClient();
-    if (!auth) return null;
-    return getUserEmail(auth);
-}
-
-export async function getConnectionStatus(): Promise<GmailConnectionStatus> {
-    const status = await GoogleClientFactory.getCredentialStatus(REQUIRED_SCOPE);
-    let email: string | null = null;
-    if (status.connected) {
-        try {
-            email = await getAccountEmail();
-        } catch {
-            email = null;
-        }
-    }
-    return {
-        connected: status.connected,
-        hasRequiredScope: status.hasRequiredScopes,
-        missingScopes: status.missingScopes,
-        email,
-    };
-}
-
-function requireSafeHeaderValue(name: string, value: string): string {
-    if (/[\r\n]/.test(value)) {
-        throw new Error(`${name} cannot contain line breaks.`);
-    }
-    return value.trim();
-}
-
-function encodeRfc2047(text: string): string {
-    requireSafeHeaderValue('Subject', text);
-    // Only encode if non-ASCII chars present.
-    // eslint-disable-next-line no-control-regex
-    if (/^[\x00-\x7F]*$/.test(text)) return text;
-    return `=?UTF-8?B?${Buffer.from(text).toString('base64')}?=`;
-}
-
-function encodeMimeBase64(text: string): string {
-    return Buffer.from(text, 'utf8')
-        .toString('base64')
-        .match(/.{1,76}/g)
-        ?.join('\r\n') ?? '';
-}
-
-export async function sendThreadReply(opts: SendReplyOptions): Promise<SendReplyResult> {
-    try {
-        const auth = await GoogleClientFactory.getClient();
-        if (!auth) return { error: 'Gmail is not connected.' };
-
-        const gmailClient = google.gmail({ version: 'v1', auth });
-        const userEmail = await getUserEmail(auth);
-        if (!userEmail) return { error: 'Could not determine your Gmail address.' };
-
-        const safeTo = requireSafeHeaderValue('To', opts.to);
-        const safeCc = opts.cc?.trim() ? requireSafeHeaderValue('Cc', opts.cc) : undefined;
-        const safeBcc = opts.bcc?.trim() ? requireSafeHeaderValue('Bcc', opts.bcc) : undefined;
-        const safeInReplyTo = opts.inReplyTo ? requireSafeHeaderValue('In-Reply-To', opts.inReplyTo) : undefined;
-        const safeReferences = opts.references ? requireSafeHeaderValue('References', opts.references) : undefined;
-        const replyBody = opts.threadId
-            ? sanitizeReplyBodyForGmailReply(opts.bodyHtml, opts.bodyText)
-            : { bodyHtml: opts.bodyHtml.trim(), bodyText: opts.bodyText.trim() };
-        if (!replyBody.bodyText.trim()) return { error: 'Draft is empty.' };
-
-        const boundary = `b_${Date.now()}_${Math.random().toString(36).slice(2, 10)}`;
-        const headers: string[] = [];
-        headers.push(`From: ${requireSafeHeaderValue('From', userEmail)}`);
-        headers.push(`To: ${safeTo}`);
-        if (safeCc) headers.push(`Cc: ${safeCc}`);
-        if (safeBcc) headers.push(`Bcc: ${safeBcc}`);
-        headers.push(`Subject: ${encodeRfc2047(opts.subject)}`);
-        if (safeInReplyTo) headers.push(`In-Reply-To: ${safeInReplyTo}`);
-        if (safeReferences) headers.push(`References: ${safeReferences}`);
-        headers.push('MIME-Version: 1.0');
-        headers.push(`Content-Type: multipart/alternative; boundary="${boundary}"`);
-
-        const parts: string[] = [];
-        parts.push(`--${boundary}`);
-        parts.push('Content-Type: text/plain; charset="UTF-8"');
-        parts.push('Content-Transfer-Encoding: base64');
-        parts.push('');
-        parts.push(encodeMimeBase64(replyBody.bodyText));
-        parts.push('');
-        parts.push(`--${boundary}`);
-        parts.push('Content-Type: text/html; charset="UTF-8"');
-        parts.push('Content-Transfer-Encoding: base64');
-        parts.push('');
-        parts.push(encodeMimeBase64(replyBody.bodyHtml));
-        parts.push('');
-        parts.push(`--${boundary}--`);
-
-        const message = `${headers.join('\r\n')}\r\n\r\n${parts.join('\r\n')}`;
-        const raw = Buffer.from(message, 'utf8')
-            .toString('base64')
-            .replace(/\+/g, '-')
-            .replace(/\//g, '_')
-            .replace(/=+$/, '');
-
-        const requestBody: gmail.Schema$Message = { raw };
-        if (opts.threadId) requestBody.threadId = opts.threadId;
-
-        const res = await gmailClient.users.messages.send({
-            userId: 'me',
-            requestBody,
-        });
-
-        if (opts.threadId) {
-            // Clean up any Gmail-side drafts in this thread.
-            try {
-                const drafts = await gmailClient.users.drafts.list({ userId: 'me' });
-                const matching = (drafts.data.drafts || []).filter(
-                    (d) => d.message?.threadId === opts.threadId && d.id
-                );
-                await Promise.all(
-                    matching.map((d) =>
-                        gmailClient.users.drafts.delete({ userId: 'me', id: d.id! })
-                    )
-                );
-            } catch (cleanupErr) {
-                console.warn('[Gmail] Draft cleanup after send failed:', cleanupErr);
-            }
-        }
-
-        // Wake the sync loop so the cache picks up the new message.
-        triggerSync();
-
-        return { messageId: res.data.id || undefined };
-    } catch (err) {
-        return { error: err instanceof Error ? err.message : String(err) };
-    }
-}
-
 export async function init() {
     console.log("Starting Gmail Sync (TS)...");
     console.log(`Will sync every ${SYNC_INTERVAL_MS / 1000} seconds.`);
diff --git a/apps/x/packages/core/src/knowledge/tag_notes.ts b/apps/x/packages/core/src/knowledge/tag_notes.ts
index 7cc7b426..c1c45ae6 100644
--- a/apps/x/packages/core/src/knowledge/tag_notes.ts
+++ b/apps/x/packages/core/src/knowledge/tag_notes.ts
@@ -91,13 +91,13 @@ async function tagNoteBatch(
     });
 
     let message = `Tag the following ${files.length} knowledge notes by prepending YAML frontmatter with appropriate tags.\n\n`;
-    message += `**Important:** Use workspace-relative paths with file-editText (e.g. "knowledge/People/Sarah Chen.md", NOT absolute paths).\n\n`;
+    message += `**Important:** Use workspace-relative paths with workspace-edit (e.g. "knowledge/People/Sarah Chen.md", NOT absolute paths).\n\n`;
 
     for (let i = 0; i < files.length; i++) {
         const file = files[i];
         const relativePath = path.relative(WorkDir, file.path);
         const truncated = file.content.length > MAX_CONTENT_LENGTH
-            ? file.content.slice(0, MAX_CONTENT_LENGTH) + '\n\n[... content truncated, use file-readText for full content ...]'
+            ? file.content.slice(0, MAX_CONTENT_LENGTH) + '\n\n[... content truncated, use workspace-readFile for full content ...]'
             : file.content;
 
         message += `## File ${i + 1}: ${relativePath}\n\n`;
@@ -111,7 +111,7 @@ async function tagNoteBatch(
         if (event.type !== 'tool-invocation') {
             return;
         }
-        if (event.toolName !== 'file-editText') {
+        if (event.toolName !== 'workspace-edit') {
             return;
         }
         try {
diff --git a/apps/x/packages/core/src/models/defaults.ts b/apps/x/packages/core/src/models/defaults.ts
index 6d05e393..b2297c56 100644
--- a/apps/x/packages/core/src/models/defaults.ts
+++ b/apps/x/packages/core/src/models/defaults.ts
@@ -6,9 +6,8 @@ import container from "../di/container.js";
 
 const SIGNED_IN_DEFAULT_MODEL = "gpt-5.4";
 const SIGNED_IN_DEFAULT_PROVIDER = "rowboat";
-const SIGNED_IN_KG_MODEL = "google/gemini-3.1-flash-lite";
-const SIGNED_IN_LIVE_NOTE_AGENT_MODEL = "google/gemini-3.1-flash-lite";
-const SIGNED_IN_AUTO_PERMISSION_DECISION_MODEL = "google/gemini-3.1-flash-lite";
+const SIGNED_IN_KG_MODEL = "google/gemini-3.1-flash-lite-preview";
+const SIGNED_IN_LIVE_NOTE_AGENT_MODEL = "anthropic/claude-haiku-4.5";
 
 /**
  * The single source of truth for "what model+provider should we use when
@@ -77,17 +76,6 @@ export async function getLiveNoteAgentModel(): Promise<string> {
     return cfg.liveNoteAgentModel ?? cfg.model;
 }
 
-/**
- * Model used by the auto-permission classifier.
- * Signed-in: curated default. BYOK: user override
- * (`autoPermissionDecisionModel`) or assistant model.
- */
-export async function getAutoPermissionDecisionModel(): Promise<string> {
-    if (await isSignedIn()) return SIGNED_IN_AUTO_PERMISSION_DECISION_MODEL;
-    const cfg = await container.resolve<IModelConfigRepo>("modelConfigRepo").getConfig();
-    return cfg.autoPermissionDecisionModel ?? cfg.model;
-}
-
 /**
  * Model used by the meeting-notes summarizer. No special signed-in default —
  * historically meetings used the assistant model. BYOK: user override
@@ -98,13 +86,3 @@ export async function getMeetingNotesModel(): Promise<string> {
     const cfg = await container.resolve<IModelConfigRepo>("modelConfigRepo").getConfig();
     return cfg.meetingNotesModel ?? cfg.model;
 }
-
-/**
- * Model used by the background-task agent + routing classifier. Currently
- * mirrors `getLiveNoteAgentModel()` — both surfaces want a fast, reliable
- * agent model. Split into its own getter so a future per-feature override
- * doesn't require touching all call sites.
- */
-export async function getBackgroundTaskAgentModel(): Promise<string> {
-    return getLiveNoteAgentModel();
-}
diff --git a/apps/x/packages/core/src/models/gateway.ts b/apps/x/packages/core/src/models/gateway.ts
index ee14a7fa..6f613704 100644
--- a/apps/x/packages/core/src/models/gateway.ts
+++ b/apps/x/packages/core/src/models/gateway.ts
@@ -1,17 +1,12 @@
 import { ProviderV2 } from '@ai-sdk/provider';
 import { createOpenRouter } from '@openrouter/ai-sdk-provider';
 import { getAccessToken } from '../auth/tokens.js';
-import { getCurrentUseCase } from '../analytics/use_case.js';
 import { API_URL } from '../config/env.js';
 
 const authedFetch: typeof fetch = async (input, init) => {
     const token = await getAccessToken();
     const headers = new Headers(init?.headers);
     headers.set('Authorization', `Bearer ${token}`);
-    const ctx = getCurrentUseCase();
-    if (ctx?.useCase) headers.set('x-rowboat-use-case', ctx.useCase);
-    if (ctx?.subUseCase) headers.set('x-rowboat-sub-use-case', ctx.subUseCase);
-    if (ctx?.agentName) headers.set('x-rowboat-agent-name', ctx.agentName);
     return fetch(input, { ...init, headers });
 };
 
diff --git a/apps/x/packages/core/src/models/repo.ts b/apps/x/packages/core/src/models/repo.ts
index 29febf4b..3f21e675 100644
--- a/apps/x/packages/core/src/models/repo.ts
+++ b/apps/x/packages/core/src/models/repo.ts
@@ -53,7 +53,6 @@ export class FSModelConfigRepo implements IModelConfigRepo {
             knowledgeGraphModel: config.knowledgeGraphModel,
             meetingNotesModel: config.meetingNotesModel,
             liveNoteAgentModel: config.liveNoteAgentModel,
-            autoPermissionDecisionModel: config.autoPermissionDecisionModel,
         };
 
         const toWrite = { ...config, providers: existingProviders };
diff --git a/apps/x/packages/core/src/pre_built/email-draft.md b/apps/x/packages/core/src/pre_built/email-draft.md
index e8ba96fc..7ddd6ffb 100644
--- a/apps/x/packages/core/src/pre_built/email-draft.md
+++ b/apps/x/packages/core/src/pre_built/email-draft.md
@@ -1,20 +1,20 @@
 ---
 tools:
-  file-readText:
+  workspace-readFile:
     type: builtin
-    name: file-readText
-  file-writeText:
+    name: workspace-readFile
+  workspace-writeFile:
     type: builtin
-    name: file-writeText
-  file-list:
+    name: workspace-writeFile
+  workspace-readdir:
     type: builtin
-    name: file-list
-  file-mkdir:
+    name: workspace-readdir
+  workspace-mkdir:
     type: builtin
-    name: file-mkdir
-  file-exists:
+    name: workspace-mkdir
+  workspace-exists:
     type: builtin
-    name: file-exists
+    name: workspace-exists
   executeCommand:
     type: builtin
     name: executeCommand
@@ -41,8 +41,8 @@ All state is stored in `pre-built/email-draft/`:
 
 On first run, check if state exists. If not, create it:
 
-1. Use `file-exists` to check if `pre-built/email-draft/state.json` exists
-2. If not, use `file-mkdir` to create `pre-built/email-draft/` and `pre-built/email-draft/drafts/`
+1. Use `workspace-exists` to check if `pre-built/email-draft/state.json` exists
+2. If not, use `workspace-mkdir` to create `pre-built/email-draft/` and `pre-built/email-draft/drafts/`
 3. Initialize `state.json` with empty arrays and a timestamp of "1970-01-01T00:00:00Z"
 
 ## Processing Flow
@@ -56,7 +56,7 @@ Read `pre-built/email-draft/state.json` to get:
 
 ### Step 2: Scan for New Emails
 
-List emails in `gmail_sync/` folder using `file-list`.
+List emails in `gmail_sync/` folder using `workspace-readdir`.
 
 For each email file:
 1. Extract the email ID from filename (e.g., `19048cf9c0317981.md` → `19048cf9c0317981`)
diff --git a/apps/x/packages/core/src/pre_built/meeting-prep.md b/apps/x/packages/core/src/pre_built/meeting-prep.md
index 38c24dd1..3391fc47 100644
--- a/apps/x/packages/core/src/pre_built/meeting-prep.md
+++ b/apps/x/packages/core/src/pre_built/meeting-prep.md
@@ -1,20 +1,20 @@
 ---
 tools:
-  file-readText:
+  workspace-readFile:
     type: builtin
-    name: file-readText
-  file-writeText:
+    name: workspace-readFile
+  workspace-writeFile:
     type: builtin
-    name: file-writeText
-  file-list:
+    name: workspace-writeFile
+  workspace-readdir:
     type: builtin
-    name: file-list
-  file-mkdir:
+    name: workspace-readdir
+  workspace-mkdir:
     type: builtin
-    name: file-mkdir
-  file-exists:
+    name: workspace-mkdir
+  workspace-exists:
     type: builtin
-    name: file-exists
+    name: workspace-exists
   executeCommand:
     type: builtin
     name: executeCommand
@@ -40,8 +40,8 @@ All state is stored in `pre-built/meeting-prep/`:
 
 On first run, check if state exists. If not, create it:
 
-1. Use `file-exists` to check if `pre-built/meeting-prep/state.json` exists
-2. If not, use `file-mkdir` to create `pre-built/meeting-prep/` and `pre-built/meeting-prep/briefs/`
+1. Use `workspace-exists` to check if `pre-built/meeting-prep/state.json` exists
+2. If not, use `workspace-mkdir` to create `pre-built/meeting-prep/` and `pre-built/meeting-prep/briefs/`
 3. Initialize `state.json` with empty `prepared` array and current timestamp
 
 ## Processing Flow
@@ -54,7 +54,7 @@ Read `pre-built/meeting-prep/state.json` to get:
 
 ### Step 2: Scan for Upcoming Meetings
 
-List calendar events in `calendar_sync/` folder using `file-list`.
+List calendar events in `calendar_sync/` folder using `workspace-readdir`.
 
 For each event file:
 1. Read the JSON content
diff --git a/apps/x/packages/core/src/runs/repo.ts b/apps/x/packages/core/src/runs/repo.ts
index 8a1d3e85..1ef1d6cc 100644
--- a/apps/x/packages/core/src/runs/repo.ts
+++ b/apps/x/packages/core/src/runs/repo.ts
@@ -35,15 +35,10 @@ export type CreateRunRepoOptions = {
     agentId: string;
     model: string;
     provider: string;
-    permissionMode: "manual" | "auto";
     useCase: z.infer<typeof UseCase>;
     subUseCase?: string;
 };
 
-function runLogPath(runId: string): string {
-    return path.join(WorkDir, 'runs', `${runId}.jsonl`);
-}
-
 export interface IRunsRepo {
     create(options: CreateRunRepoOptions): Promise<z.infer<typeof Run>>;
     fetch(id: string): Promise<z.infer<typeof Run>>;
@@ -73,7 +68,7 @@ export class FSRunsRepo implements IRunsRepo {
         idGenerator: IMonotonicallyIncreasingIdGenerator;
     }) {
         this.idGenerator = idGenerator;
-        // ensure default runs directory exists
+        // ensure runs directory exists
         fsp.mkdir(path.join(WorkDir, 'runs'), { recursive: true });
     }
 
@@ -191,7 +186,7 @@ export class FSRunsRepo implements IRunsRepo {
 
     async appendEvents(runId: string, events: z.infer<typeof RunEvent>[]): Promise<void> {
         await fsp.appendFile(
-            runLogPath(runId),
+            path.join(WorkDir, 'runs', `${runId}.jsonl`),
             events.map(event => JSON.stringify(event)).join("\n") + "\n"
         );
     }
@@ -205,7 +200,6 @@ export class FSRunsRepo implements IRunsRepo {
             agentName: options.agentId,
             model: options.model,
             provider: options.provider,
-            permissionMode: options.permissionMode,
             useCase: options.useCase,
             ...(options.subUseCase ? { subUseCase: options.subUseCase } : {}),
             subflow: [],
@@ -218,7 +212,6 @@ export class FSRunsRepo implements IRunsRepo {
             agentId: options.agentId,
             model: options.model,
             provider: options.provider,
-            permissionMode: options.permissionMode,
             useCase: options.useCase,
             ...(options.subUseCase ? { subUseCase: options.subUseCase } : {}),
             log: [start],
@@ -226,7 +219,7 @@ export class FSRunsRepo implements IRunsRepo {
     }
 
     async fetch(id: string): Promise<z.infer<typeof Run>> {
-        const contents = await fsp.readFile(runLogPath(id), 'utf8');
+        const contents = await fsp.readFile(path.join(WorkDir, 'runs', `${id}.jsonl`), 'utf8');
         // Parse with the lenient schema so legacy start events (no model/provider) load.
         const rawEvents = contents.split('\n')
             .filter(line => line.trim() !== '')
@@ -254,7 +247,6 @@ export class FSRunsRepo implements IRunsRepo {
             agentId: start.agentName,
             model: start.model,
             provider: start.provider,
-            permissionMode: start.permissionMode ?? "manual",
             ...(start.useCase ? { useCase: start.useCase } : {}),
             ...(start.subUseCase ? { subUseCase: start.subUseCase } : {}),
             log: events,
@@ -322,6 +314,7 @@ export class FSRunsRepo implements IRunsRepo {
     }
 
     async delete(id: string): Promise<void> {
-        await fsp.unlink(runLogPath(id));
+        const filePath = path.join(WorkDir, 'runs', `${id}.jsonl`);
+        await fsp.unlink(filePath);
     }
-}
+}
\ No newline at end of file
diff --git a/apps/x/packages/core/src/runs/runs.ts b/apps/x/packages/core/src/runs/runs.ts
index f832c00d..8785e05f 100644
--- a/apps/x/packages/core/src/runs/runs.ts
+++ b/apps/x/packages/core/src/runs/runs.ts
@@ -9,7 +9,7 @@ import { IAbortRegistry } from "./abort-registry.js";
 import { IRunsLock } from "./lock.js";
 import { forceCloseAllMcpClients } from "../mcp/mcp.js";
 import { extractCommandNames } from "../application/lib/command-executor.js";
-import { addFileAccessGrant, addToSecurityConfig } from "../config/security.js";
+import { addToSecurityConfig } from "../config/security.js";
 import { loadAgent } from "../agents/runtime.js";
 import { getDefaultModelAndProvider } from "../models/defaults.js";
 
@@ -19,20 +19,16 @@ export async function createRun(opts: z.infer<typeof CreateRunOptions>): Promise
 
     // Resolve model+provider once at creation: opts > agent declaration > defaults.
     // Both fields are plain strings (provider is a name, looked up at runtime).
-    // Use `||` (not `??`) so an empty-string override — what an LLM tool call
-    // sometimes synthesizes for "I'm not setting this" — falls through to the
-    // next link in the chain instead of being treated as a real value.
     const agent = await loadAgent(opts.agentId);
     const defaults = await getDefaultModelAndProvider();
-    const model = opts.model || agent.model || defaults.model;
-    const provider = opts.provider || agent.provider || defaults.provider;
+    const model = opts.model ?? agent.model ?? defaults.model;
+    const provider = opts.provider ?? agent.provider ?? defaults.provider;
     const useCase = opts.useCase ?? "copilot_chat";
 
     const run = await repo.create({
         agentId: opts.agentId,
         model,
         provider,
-        permissionMode: opts.permissionMode ?? "manual",
         useCase,
         ...(opts.subUseCase ? { subUseCase: opts.subUseCase } : {}),
     });
@@ -40,9 +36,9 @@ export async function createRun(opts: z.infer<typeof CreateRunOptions>): Promise
     return run;
 }
 
-export async function createMessage(runId: string, message: UserMessageContentType, voiceInput?: boolean, voiceOutput?: VoiceOutputMode, searchEnabled?: boolean, middlePaneContext?: MiddlePaneContext, codeMode?: 'claude' | 'codex'): Promise<string> {
+export async function createMessage(runId: string, message: UserMessageContentType, voiceInput?: boolean, voiceOutput?: VoiceOutputMode, searchEnabled?: boolean, middlePaneContext?: MiddlePaneContext): Promise<string> {
     const queue = container.resolve<IMessageQueue>('messageQueue');
-    const id = await queue.enqueue(runId, message, voiceInput, voiceOutput, searchEnabled, middlePaneContext, codeMode);
+    const id = await queue.enqueue(runId, message, voiceInput, voiceOutput, searchEnabled, middlePaneContext);
     const runtime = container.resolve<IAgentRuntime>('agentRuntime');
     runtime.trigger(runId);
     return id;
@@ -61,12 +57,7 @@ export async function authorizePermission(runId: string, ev: z.infer<typeof Tool
                 && e.toolCall.toolCallId === rest.toolCallId
                 && JSON.stringify(e.subflow) === JSON.stringify(rest.subflow)
         );
-        if (permReqEvent?.permission?.kind === "file") {
-            await addFileAccessGrant({
-                operation: permReqEvent.permission.operation,
-                pathPrefix: permReqEvent.permission.pathPrefix,
-            });
-        } else if (permReqEvent && typeof permReqEvent.toolCall.arguments === 'object' && permReqEvent.toolCall.arguments !== null && 'command' in permReqEvent.toolCall.arguments) {
+        if (permReqEvent && typeof permReqEvent.toolCall.arguments === 'object' && permReqEvent.toolCall.arguments !== null && 'command' in permReqEvent.toolCall.arguments) {
             const commandNames = extractCommandNames(String(permReqEvent.toolCall.arguments.command));
             if (commandNames.length > 0) {
                 await addToSecurityConfig(commandNames);
diff --git a/apps/x/packages/core/src/schedule/utils.ts b/apps/x/packages/core/src/schedule/utils.ts
deleted file mode 100644
index 997e369a..00000000
--- a/apps/x/packages/core/src/schedule/utils.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import { CronExpressionParser } from 'cron-parser';
-import type { Triggers } from '@x/shared/dist/live-note.js';
-
-const GRACE_MS = 2 * 60 * 1000; // 2 minutes
-export const RETRY_BACKOFF_MS = 5 * 60 * 1000; // 5 minutes
-
-/**
- * Decide whether a `triggers` block has any timed sub-trigger (cron or window)
- * whose cycle is currently ready to fire. Pure cycle check — does NOT consider
- * backoff. Used by both the live-note scheduler and the bg-task scheduler.
- *
- * - Cycle accounting (cron prev-occurrence, window once-per-day) is anchored
- *   on `lastRunAt` — which is bumped only on *successful* completions. So a
- *   failed run leaves the cycle unfired and this returns the matched trigger
- *   again on the next tick (caller is expected to gate on backoff separately).
- * - `cronExpr` enforces a 2-minute grace window — if the scheduled time was
- *   more than 2 minutes ago, it's a miss and skipped (avoids replay storms
- *   after the app was offline).
- * - `windows` are forgiving: each window fires at most once per day per
- *   successful run, anywhere inside its time-of-day band. Cycles anchored at
- *   `startTime`. Adjacent windows sharing an endpoint (e.g. 08–12 and 12–15)
- *   each still fire on the same day.
- *
- * Returns the source ('cron' | 'window') or null if no cycle is ready.
- */
-export function dueTimedTrigger(
-    triggers: Triggers | undefined,
-    lastRunAt: string | null,
-): 'cron' | 'window' | null {
-    if (!triggers) return null;
-
-    if (triggers.cronExpr && isCronDue(triggers.cronExpr, lastRunAt)) return 'cron';
-
-    if (triggers.windows) {
-        for (const w of triggers.windows) {
-            if (isWindowDue(w.startTime, w.endTime, lastRunAt)) return 'window';
-        }
-    }
-
-    return null;
-}
-
-/**
- * Backoff check — has there been an attempt within `RETRY_BACKOFF_MS`?
- * Returns the milliseconds remaining until the backoff lifts (positive) or 0
- * if not in backoff. Caller logs the remaining time in human form.
- */
-export function backoffRemainingMs(lastAttemptAt: string | null): number {
-    if (!lastAttemptAt) return 0;
-    const sinceAttempt = Date.now() - new Date(lastAttemptAt).getTime();
-    if (sinceAttempt < 0 || sinceAttempt >= RETRY_BACKOFF_MS) return 0;
-    return RETRY_BACKOFF_MS - sinceAttempt;
-}
-
-function isCronDue(expression: string, lastRunAt: string | null): boolean {
-    const now = new Date();
-    if (!lastRunAt) return true; // never ran — immediately due
-
-    try {
-        // Find the most recent occurrence at-or-before `now`, not the
-        // occurrence right after lastRunAt — if lastRunAt is old, that
-        // occurrence would be ancient too and always fall outside the
-        // grace window, blocking every future fire.
-        const interval = CronExpressionParser.parse(expression, { currentDate: now });
-        const prevRun = interval.prev().toDate();
-
-        // Already ran at-or-after this occurrence → skip.
-        if (new Date(lastRunAt).getTime() >= prevRun.getTime()) return false;
-
-        // Within grace → fire. Outside grace → missed, skip.
-        return now.getTime() <= prevRun.getTime() + GRACE_MS;
-    } catch {
-        return false;
-    }
-}
-
-function isWindowDue(startTime: string, endTime: string, lastRunAt: string | null): boolean {
-    const now = new Date();
-    const [startHour, startMin] = startTime.split(':').map(Number);
-    const [endHour, endMin] = endTime.split(':').map(Number);
-    const startMinutes = startHour * 60 + startMin;
-    const endMinutes = endHour * 60 + endMin;
-    const nowMinutes = now.getHours() * 60 + now.getMinutes();
-    if (nowMinutes < startMinutes || nowMinutes > endMinutes) return false;
-
-    if (!lastRunAt) return true;
-
-    const cycleStart = new Date(now);
-    cycleStart.setHours(startHour, startMin, 0, 0);
-    if (new Date(lastRunAt).getTime() > cycleStart.getTime()) return false;
-    return true;
-}
diff --git a/apps/x/packages/core/src/security/auto-permission-classifier.ts b/apps/x/packages/core/src/security/auto-permission-classifier.ts
deleted file mode 100644
index 352512be..00000000
--- a/apps/x/packages/core/src/security/auto-permission-classifier.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import { generateObject, type ModelMessage } from "ai";
-import z from "zod";
-import { ToolPermissionMetadata } from "@x/shared/dist/runs.js";
-import { ToolCallPart } from "@x/shared/dist/message.js";
-import { captureLlmUsage } from "../analytics/usage.js";
-import { withUseCase, type UseCase } from "../analytics/use_case.js";
-import { getAutoPermissionDecisionModel, getDefaultModelAndProvider, resolveProviderConfig } from "../models/defaults.js";
-import { createProvider } from "../models/models.js";
-
-const DecisionSchema = z.object({
-    decisions: z.array(z.object({
-        toolCallId: z.string(),
-        decision: z.enum(["allow", "deny"]),
-        reason: z.string().min(1),
-    })),
-});
-
-export type AutoPermissionCandidate = {
-    toolCall: z.infer<typeof ToolCallPart>;
-    permission: z.infer<typeof ToolPermissionMetadata>;
-};
-
-export type AutoPermissionDecision = {
-    toolCallId: string;
-    decision: "allow" | "deny";
-    reason: string;
-};
-
-const SYSTEM_PROMPT = `You decide whether a personal productivity app may run tool calls without interrupting the user.
-
-You only receive tool calls that already require permission under deterministic rules.
-
-Allow a tool call only when it is clearly consistent with the user's request and low risk.
-Deny tool calls that are destructive, credential-sensitive, privacy-sensitive, broad in scope, likely irreversible, or not clearly requested.
-
-Command examples to deny unless explicitly requested: deleting data, force pushing, deploying, running migrations, changing permissions, reading secrets, exfiltrating tokens, or modifying files outside the user's workspace.
-File examples to deny unless explicitly requested: deleting paths, writing outside the workspace, reading secrets or credentials, or broad access to private directories.
-
-Return one decision for every toolCallId. Use the exact toolCallId values provided.`;
-
-function compact(value: unknown, max = 8_000): string {
-    const text = typeof value === "string" ? value : JSON.stringify(value, null, 2);
-    if (text.length <= max) return text;
-    return `${text.slice(0, max)}\n...<truncated>`;
-}
-
-function recentContext(messages: ModelMessage[]): unknown[] {
-    return messages.slice(-8).map((message) => {
-        if (typeof message.content === "string") {
-            return { role: message.role, content: compact(message.content, 2_000) };
-        }
-        return { role: message.role, content: compact(message.content, 3_000) };
-    });
-}
-
-function buildPrompt(input: {
-    agentName: string | null;
-    messages: ModelMessage[];
-    candidates: AutoPermissionCandidate[];
-}) {
-    return compact({
-        agentName: input.agentName,
-        recentConversation: recentContext(input.messages),
-        toolCalls: input.candidates.map(({ toolCall, permission }) => ({
-            toolCallId: toolCall.toolCallId,
-            toolName: toolCall.toolName,
-            arguments: toolCall.arguments,
-            permission,
-        })),
-    }, 24_000);
-}
-
-export async function classifyToolPermissions(input: {
-    runId: string;
-    agentName: string | null;
-    messages: ModelMessage[];
-    candidates: AutoPermissionCandidate[];
-    useCase: UseCase;
-    subUseCase?: string | null;
-}): Promise<AutoPermissionDecision[]> {
-    if (input.candidates.length === 0) return [];
-
-    const modelId = await getAutoPermissionDecisionModel();
-    const { provider: providerName } = await getDefaultModelAndProvider();
-    const providerConfig = await resolveProviderConfig(providerName);
-    const model = createProvider(providerConfig).languageModel(modelId);
-
-    const result = await withUseCase(
-        {
-            useCase: input.useCase,
-            subUseCase: "auto_permission_classifier",
-            ...(input.agentName ? { agentName: input.agentName } : {}),
-        },
-        () => generateObject({
-            model,
-            system: SYSTEM_PROMPT,
-            prompt: buildPrompt(input),
-            schema: DecisionSchema,
-        }),
-    );
-
-    captureLlmUsage({
-        useCase: input.useCase,
-        subUseCase: "auto_permission_classifier",
-        model: modelId,
-        provider: providerName,
-        usage: result.usage,
-    });
-
-    const allowedIds = new Set(input.candidates.map((candidate) => candidate.toolCall.toolCallId));
-    return result.object.decisions.filter((decision) => allowedIds.has(decision.toolCallId));
-}
diff --git a/apps/x/packages/core/tsconfig.build.json b/apps/x/packages/core/tsconfig.build.json
deleted file mode 100644
index 4838eeca..00000000
--- a/apps/x/packages/core/tsconfig.build.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "extends": "./tsconfig.json",
-    "exclude": [
-        "src/**/*.test.ts",
-        "src/**/*.spec.ts"
-    ]
-}
diff --git a/apps/x/packages/core/vitest.config.ts b/apps/x/packages/core/vitest.config.ts
deleted file mode 100644
index 3e3013eb..00000000
--- a/apps/x/packages/core/vitest.config.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { defineConfig } from "vitest/config";
-
-export default defineConfig({
-  test: {
-    environment: "node",
-    include: ["src/**/*.test.ts", "src/**/*.spec.ts"],
-    globals: false,
-    clearMocks: true,
-    restoreMocks: true,
-  },
-});
diff --git a/apps/x/packages/shared/src/background-task.ts b/apps/x/packages/shared/src/background-task.ts
deleted file mode 100644
index a47b567e..00000000
--- a/apps/x/packages/shared/src/background-task.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import z from 'zod';
-import { TriggersSchema, type Triggers, type TriggerWindow } from './live-note.js';
-
-// ---------------------------------------------------------------------------
-// Background tasks
-// ---------------------------------------------------------------------------
-//
-// A bg-task is a persistent agent set up to fire on a schedule and/or in
-// response to incoming events. Each task owns a folder under
-// `$WorkDir/bg-tasks/<slug>/`:
-//
-//   bg-tasks/<slug>/
-//   ├── task.yaml      # plain YAML: BackgroundTask shape
-//   ├── index.md       # agent-owned body — the user-visible artifact
-//   └── runs/          # one <runId>.jsonl per run (written by agent runtime)
-//
-// The agent picks between OUTPUT mode (rewrite index.md with the latest state)
-// and ACTION mode (perform a side-effect, append a journal entry) based on
-// the verbs in `instructions` each run. No mode field on the task.
-// ---------------------------------------------------------------------------
-
-// Re-export triggers so callers don't need a second import.
-export { TriggersSchema, type Triggers, type TriggerWindow };
-
-export type BackgroundTask = {
-    name: string;
-    instructions: string;
-    active: boolean;
-    triggers?: Triggers;
-    model?: string;
-    provider?: string;
-    createdAt: string;
-    // Runtime-managed — never hand-write. Mirrors live-note's flat-field
-    // pattern: `lastAttemptAt` is bumped at every run start (backoff anchor),
-    // `lastRunAt` / `lastRunSummary` only on successful completion, `lastRunError`
-    // only on failure (cleared on next success). This keeps the "last good run"
-    // visible even while a new run is in-flight or failing.
-    lastAttemptAt?: string;
-    lastRunId?: string;
-    lastRunAt?: string;
-    lastRunSummary?: string;
-    lastRunError?: string;
-};
-
-export type BackgroundTaskSummary = {
-    slug: string;
-    name: string;
-    instructions: string;
-    active: boolean;
-    triggers?: Triggers;
-    createdAt: string;
-    lastAttemptAt?: string;
-    lastRunId?: string;
-    lastRunAt?: string;
-    lastRunSummary?: string;
-    lastRunError?: string;
-};
-
-export const BackgroundTaskSchema = z.object({
-    name: z.string().min(1).describe('User-facing display name.'),
-    instructions: z.string().min(1).describe('A persistent instruction in the user\'s words — what should this task keep doing? E.g. "Summarize my unread emails every morning into a brief digest." The agent re-reads instructions on every run and decides whether to rewrite index.md (OUTPUT mode) or perform a side-effect and journal it (ACTION mode) based on the verbs.'),
-    active: z.boolean().default(true).describe('Set false to pause without deleting.'),
-    triggers: TriggersSchema.optional().describe('When the agent fires. Omit for manual-only.'),
-    model: z.string().optional().describe('ADVANCED — leave unset. Per-task model override.'),
-    provider: z.string().optional().describe('ADVANCED — leave unset. Per-task provider name override.'),
-    createdAt: z.string().describe('ISO timestamp set once at create-time.'),
-    lastAttemptAt: z.string().optional().describe('Runtime-managed — never write this yourself. Bumped at the start of every agent run; used by the scheduler for backoff so failures do not retry-storm.'),
-    lastRunId: z.string().optional().describe('Runtime-managed — never write this yourself. The id of the most recent run (success or failure); used by the bg-task:stop handler.'),
-    lastRunAt: z.string().optional().describe('Runtime-managed — never write this yourself. Bumped only when an agent run *succeeds*; used as the cycle anchor for cron / window triggers and as the freshness timestamp shown in the UI.'),
-    lastRunSummary: z.string().optional().describe('Runtime-managed — never write this yourself. Set on success; not overwritten on failure so the user keeps seeing the last good summary.'),
-    lastRunError: z.string().optional().describe('Runtime-managed — never write this yourself. Set on a failed run; cleared on the next successful run.'),
-});
-
-export const BackgroundTaskSummarySchema = z.object({
-    slug: z.string(),
-    name: z.string(),
-    instructions: z.string(),
-    active: z.boolean(),
-    triggers: TriggersSchema.optional(),
-    createdAt: z.string(),
-    lastAttemptAt: z.string().optional(),
-    lastRunId: z.string().optional(),
-    lastRunAt: z.string().optional(),
-    lastRunSummary: z.string().optional(),
-    lastRunError: z.string().optional(),
-});
-
-// ---------------------------------------------------------------------------
-// Bus events
-// ---------------------------------------------------------------------------
-
-export const BackgroundTaskTrigger = z.enum(['manual', 'cron', 'window', 'event']);
-export type BackgroundTaskTriggerType = z.infer<typeof BackgroundTaskTrigger>;
-
-export const BackgroundTaskAgentStartEvent = z.object({
-    type: z.literal('background_task_agent_start'),
-    slug: z.string(),
-    trigger: BackgroundTaskTrigger,
-    runId: z.string(),
-});
-
-export const BackgroundTaskAgentCompleteEvent = z.object({
-    type: z.literal('background_task_agent_complete'),
-    slug: z.string(),
-    runId: z.string(),
-    error: z.string().optional(),
-    summary: z.string().optional(),
-});
-
-export const BackgroundTaskAgentEvent = z.union([BackgroundTaskAgentStartEvent, BackgroundTaskAgentCompleteEvent]);
-export type BackgroundTaskAgentEventType = z.infer<typeof BackgroundTaskAgentEvent>;
diff --git a/apps/x/packages/shared/src/billing.ts b/apps/x/packages/shared/src/billing.ts
deleted file mode 100644
index 59fe68d3..00000000
--- a/apps/x/packages/shared/src/billing.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { z } from 'zod';
-
-export const BillingPlanSchema = z.enum(['free', 'starter', 'pro']);
-export type BillingPlan = z.infer<typeof BillingPlanSchema>;
-
-export const BillingUsageBucketSchema = z.object({
-  sanctionedCredits: z.number(),
-  usedCredits: z.number(),
-  availableCredits: z.number(),
-});
-export type BillingUsageBucket = z.infer<typeof BillingUsageBucketSchema>;
-
-export const BillingInfoSchema = z.object({
-  userEmail: z.string().nullable(),
-  userId: z.string().nullable(),
-  subscriptionPlan: BillingPlanSchema.nullable(),
-  subscriptionStatus: z.string().nullable(),
-  trialExpiresAt: z.string().nullable(),
-  monthly: BillingUsageBucketSchema,
-  daily: BillingUsageBucketSchema.extend({
-    usageDay: z.string(),
-  }),
-});
-export type BillingInfo = z.infer<typeof BillingInfoSchema>;
diff --git a/apps/x/packages/shared/src/blocks.ts b/apps/x/packages/shared/src/blocks.ts
index 69b331c4..69f58f97 100644
--- a/apps/x/packages/shared/src/blocks.ts
+++ b/apps/x/packages/shared/src/blocks.ts
@@ -88,13 +88,12 @@ export type CalendarBlock = z.infer<typeof CalendarBlockSchema>;
 
 export const EmailBlockSchema = z.object({
   threadId: z.string().optional(),
-  threadUrl: z.string().url().optional(),
   summary: z.string().optional(),
   subject: z.string().optional(),
   from: z.string().optional(),
   to: z.string().optional(),
   date: z.string().optional(),
-  latest_email: z.string().optional(),
+  latest_email: z.string(),
   past_summary: z.string().optional(),
   draft_response: z.string().optional(),
   response_mode: z.enum(['inline', 'assistant', 'both']).optional(),
@@ -102,43 +101,6 @@ export const EmailBlockSchema = z.object({
 
 export type EmailBlock = z.infer<typeof EmailBlockSchema>;
 
-export const GmailAttachmentSchema = z.object({
-  filename: z.string(),
-  mimeType: z.string().optional(),
-  sizeBytes: z.number().int().nonnegative().optional(),
-  savedPath: z.string(),
-});
-
-export type GmailAttachment = z.infer<typeof GmailAttachmentSchema>;
-
-export const GmailThreadMessageSchema = z.object({
-  id: z.string().optional(),
-  from: z.string().optional(),
-  to: z.string().optional(),
-  cc: z.string().optional(),
-  date: z.string().optional(),
-  subject: z.string().optional(),
-  body: z.string().optional(),
-  bodyHtml: z.string().optional(),
-  unread: z.boolean().optional(),
-  bodyHeight: z.number().int().positive().optional(),
-  attachments: z.array(GmailAttachmentSchema).optional(),
-  messageIdHeader: z.string().optional(),
-});
-
-export type GmailThreadMessage = z.infer<typeof GmailThreadMessageSchema>;
-
-export const GmailThreadSchema = EmailBlockSchema.extend({
-  threadId: z.string(),
-  threadUrl: z.string().url(),
-  unread: z.boolean().optional(),
-  importance: z.enum(['important', 'other']).optional(),
-  gmail_draft: z.string().optional(),
-  messages: z.array(GmailThreadMessageSchema),
-});
-
-export type GmailThread = z.infer<typeof GmailThreadSchema>;
-
 export const EmailsBlockSchema = z.object({
   title: z.string().optional(),
   emails: z.array(EmailBlockSchema),
diff --git a/apps/x/packages/shared/src/code-mode.ts b/apps/x/packages/shared/src/code-mode.ts
deleted file mode 100644
index a3bd46a7..00000000
--- a/apps/x/packages/shared/src/code-mode.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import z from "zod";
-
-// Shared zod schemas for the ACP code-mode engine. Single source of truth: the
-// core engine re-exports the inferred TS types, and runs.ts builds the RunEvent
-// variants that carry these to the renderer.
-
-export const CodingAgent = z.enum(["claude", "codex"]);
-export type CodingAgent = z.infer<typeof CodingAgent>;
-
-// How the permission broker answers the agent's requests before any per-tool
-// "always allow" memory is applied. `yolo` is the safe, scoped equivalent of
-// `claude --dangerously-skip-permissions` (our toggle, not a CLI flag).
-export const ApprovalPolicy = z.enum(["ask", "auto-approve-reads", "yolo"]);
-export type ApprovalPolicy = z.infer<typeof ApprovalPolicy>;
-
-export const PermissionDecision = z.enum(["allow_once", "allow_always", "reject"]);
-export type PermissionDecision = z.infer<typeof PermissionDecision>;
-
-// What the UI needs to render a permission card.
-export const PermissionAsk = z.object({
-    toolCallId: z.string().optional(),
-    title: z.string(),
-    kind: z.string().optional(), // tool kind, e.g. "edit" | "execute" | "read"
-    isRead: z.boolean(),
-});
-export type PermissionAsk = z.infer<typeof PermissionAsk>;
-
-// Normalized per-run stream items. The engine maps raw ACP session/update
-// notifications onto this union; the renderer renders them.
-export const CodeRunEvent = z.discriminatedUnion("type", [
-    // role distinguishes the agent's own output from replayed user turns
-    // (loadSession streams the whole prior conversation back on resume).
-    z.object({ type: z.literal("message"), role: z.enum(["agent", "user"]), text: z.string() }),
-    z.object({ type: z.literal("thought") }),
-    z.object({
-        type: z.literal("tool_call"),
-        id: z.string().optional(),
-        title: z.string().optional(),
-        kind: z.string().optional(),
-        status: z.string().optional(),
-    }),
-    z.object({
-        type: z.literal("tool_call_update"),
-        id: z.string().optional(),
-        status: z.string().optional(),
-        diffs: z.array(z.string()),
-    }),
-    z.object({
-        type: z.literal("plan"),
-        entries: z.array(z.object({
-            content: z.string(),
-            status: z.string().optional(),
-            priority: z.string().optional(),
-        })),
-    }),
-    z.object({
-        type: z.literal("permission"),
-        ask: PermissionAsk,
-        decision: z.union([PermissionDecision, z.literal("cancelled")]),
-        auto: z.boolean(),
-    }),
-    z.object({ type: z.literal("other"), sessionUpdate: z.string() }),
-]);
-export type CodeRunEvent = z.infer<typeof CodeRunEvent>;
-
-export const RunPromptResult = z.object({
-    stopReason: z.string(),
-    sessionId: z.string(),
-});
-export type RunPromptResult = z.infer<typeof RunPromptResult>;
diff --git a/apps/x/packages/shared/src/events.ts b/apps/x/packages/shared/src/events.ts
deleted file mode 100644
index 217a854d..00000000
--- a/apps/x/packages/shared/src/events.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { z } from 'zod';
-
-// ---------------------------------------------------------------------------
-// Rowboat events — the shared queue feeding the live-note + bg-task consumers.
-//
-// Producers (gmail/calendar sync) write JSON files to `$WorkDir/events/pending/`
-// using IDs from the monotonically increasing ID generator. The processor in
-// `packages/core/src/events/processor.ts` polls the directory, fans out Pass-1
-// routing across registered consumers in parallel, fires each consumer's
-// candidates sequentially, then enriches the event and moves it to `done/`.
-//
-// Schema is additive-on-optional so old events written by previous versions
-// parse cleanly. The legacy `KnowledgeEventSchema` is re-exported as an alias
-// from `./live-note.ts` for one release.
-// ---------------------------------------------------------------------------
-
-export const ConsumerResultSchema = z.object({
-    candidateIds: z.array(z.string()),
-    runIds: z.array(z.string()),
-    errors: z.array(z.string()).optional(),
-});
-
-export type ConsumerResult = z.infer<typeof ConsumerResultSchema>;
-
-export const RowboatEventSchema = z.object({
-    id: z.string().describe('Monotonically increasing ID; also the filename in events/pending/'),
-    source: z.string().describe('Producer of the event (e.g. "gmail", "calendar")'),
-    type: z.string().describe('Event type (e.g. "email.synced")'),
-    createdAt: z.string().describe('ISO timestamp when the event was produced'),
-    payload: z.string().describe('Human-readable event body, usually markdown'),
-
-    /**
-     * If set, the consumer-named here short-circuits Pass-1 and targets the
-     * named id directly (used for re-runs from the UI). The producer is
-     * unchanged from the legacy `targetFilePath` behavior but generalized.
-     */
-    target: z.object({
-        consumer: z.string(),
-        id: z.string(),
-    }).optional(),
-
-    /** Legacy field — preserved on read for backwards compat with events
-     *  written by the pre-rename code. Equivalent to
-     *  `target: { consumer: 'live-note', id: <value> }`. */
-    targetFilePath: z.string().optional(),
-
-    // ----------------- Enriched on move from pending/ to done/ -----------
-
-    processedAt: z.string().optional(),
-
-    /** Per-consumer outcome map. */
-    consumers: z.record(z.string(), ConsumerResultSchema).optional(),
-
-    /** Legacy field — preserved on read for backwards compat with events
-     *  enriched by the pre-rename code. */
-    candidateFilePaths: z.array(z.string()).optional(),
-
-    /** Legacy field — preserved on read for backwards compat with events
-     *  enriched by the pre-rename code. */
-    runIds: z.array(z.string()).optional(),
-
-    error: z.string().optional(),
-});
-
-export type RowboatEvent = z.infer<typeof RowboatEventSchema>;
-
-/**
- * Pass-1 routing output. The `ids` strings are consumer-defined:
- * - live-note → workspace-relative paths
- * - bg-task → task slugs
- */
-export const Pass1OutputSchema = z.object({
-    ids: z.array(z.string()).describe('Identifiers of candidates whose intent and event-match criteria suggest the event might be relevant. The consumer\'s agent does Pass 2 on the event payload before acting.'),
-});
-
-export type Pass1Output = z.infer<typeof Pass1OutputSchema>;
diff --git a/apps/x/packages/shared/src/index.ts b/apps/x/packages/shared/src/index.ts
index 02f980a2..0465db21 100644
--- a/apps/x/packages/shared/src/index.ts
+++ b/apps/x/packages/shared/src/index.ts
@@ -10,11 +10,8 @@ export * as serviceEvents from './service-events.js'
 export * as inlineTask from './inline-task.js';
 export * as blocks from './blocks.js';
 export * as liveNote from './live-note.js';
-export * as events from './events.js';
-export * as backgroundTask from './background-task.js';
 export * as promptBlock from './prompt-block.js';
 export * as frontmatter from './frontmatter.js';
 export * as bases from './bases.js';
 export * as browserControl from './browser-control.js';
-export * as billing from './billing.js';
 export { PrefixLogger };
diff --git a/apps/x/packages/shared/src/ipc.ts b/apps/x/packages/shared/src/ipc.ts
index f3acffa1..1089b699 100644
--- a/apps/x/packages/shared/src/ipc.ts
+++ b/apps/x/packages/shared/src/ipc.ts
@@ -7,19 +7,10 @@ import { AgentScheduleConfig, AgentScheduleEntry } from './agent-schedule.js';
 import { AgentScheduleState } from './agent-schedule-state.js';
 import { ServiceEvent } from './service-events.js';
 import { LiveNoteAgentEvent, LiveNoteSchema } from './live-note.js';
-import {
-    BackgroundTaskAgentEvent,
-    BackgroundTaskSchema,
-    BackgroundTaskSummarySchema,
-    TriggersSchema,
-} from './background-task.js';
 import { UserMessageContent } from './message.js';
 import { RowboatApiConfig } from './rowboat-account.js';
 import { ZListToolkitsResponse } from './composio.js';
 import { BrowserStateSchema } from './browser-control.js';
-import { BillingInfoSchema } from './billing.js';
-import { EmailBlockSchema, GmailThreadSchema } from './blocks.js';
-import { PermissionDecision, ApprovalPolicy } from './code-mode.js';
 
 // ============================================================================
 // Runtime Validation Schemas (Single Source of Truth)
@@ -39,7 +30,6 @@ const ipcSchemas = {
     res: z.object({
       installationId: z.string(),
       apiUrl: z.string(),
-      appVersion: z.string(),
     }),
   },
   'workspace:getRoot': {
@@ -126,82 +116,6 @@ const ipcSchemas = {
     req: WorkspaceChangeEvent,
     res: z.null(),
   },
-  'gmail:getImportant': {
-    req: z.object({
-      cursor: z.string().optional(),
-      limit: z.number().int().min(1).max(100).optional(),
-    }),
-    res: z.object({
-      threads: z.array(GmailThreadSchema),
-      nextCursor: z.string().nullable(),
-    }),
-  },
-  'gmail:getEverythingElse': {
-    req: z.object({
-      cursor: z.string().optional(),
-      limit: z.number().int().min(1).max(100).optional(),
-    }),
-    res: z.object({
-      threads: z.array(GmailThreadSchema),
-      nextCursor: z.string().nullable(),
-    }),
-  },
-  'gmail:triggerSync': {
-    req: z.object({}),
-    res: z.object({}),
-  },
-  'gmail:sendReply': {
-    req: z.object({
-      threadId: z.string().min(1).optional(),
-      to: z.string().min(1),
-      cc: z.string().optional(),
-      bcc: z.string().optional(),
-      subject: z.string(),
-      bodyHtml: z.string(),
-      bodyText: z.string(),
-      inReplyTo: z.string().optional(),
-      references: z.string().optional(),
-    }),
-    res: z.object({
-      messageId: z.string().optional(),
-      error: z.string().optional(),
-    }),
-  },
-  'gmail:getConnectionStatus': {
-    req: z.object({}),
-    res: z.object({
-      connected: z.boolean(),
-      hasRequiredScope: z.boolean(),
-      missingScopes: z.array(z.string()),
-      email: z.string().nullable(),
-    }),
-  },
-  'gmail:getAccountEmail': {
-    req: z.object({}),
-    res: z.object({
-      email: z.string().nullable(),
-    }),
-  },
-  'gmail:archiveThread': {
-    req: z.object({ threadId: z.string().min(1) }),
-    res: z.object({ ok: z.boolean(), error: z.string().optional() }),
-  },
-  'gmail:trashThread': {
-    req: z.object({ threadId: z.string().min(1) }),
-    res: z.object({ ok: z.boolean(), error: z.string().optional() }),
-  },
-  'gmail:markThreadRead': {
-    req: z.object({ threadId: z.string().min(1) }),
-    res: z.object({ ok: z.boolean(), error: z.string().optional() }),
-  },
-  'gmail:saveMessageHeight': {
-    req: z.object({
-      threadId: z.string().min(1),
-      messageId: z.string().min(1),
-      height: z.number().int().positive(),
-    }),
-    res: z.object({}),
-  },
   'mcp:listTools': {
     req: z.object({
       serverName: z.string(),
@@ -230,7 +144,6 @@ const ipcSchemas = {
       voiceInput: z.boolean().optional(),
       voiceOutput: z.enum(['summary', 'full']).optional(),
       searchEnabled: z.boolean().optional(),
-      codeMode: z.enum(['claude', 'codex']).optional(),
       middlePaneContext: z.discriminatedUnion('kind', [
         z.object({
           kind: z.literal('note'),
@@ -293,15 +206,6 @@ const ipcSchemas = {
     }),
     res: z.object({ success: z.boolean() }),
   },
-  'runs:downloadLog': {
-    req: z.object({
-      runId: z.string().min(1),
-    }),
-    res: z.object({
-      success: z.boolean(),
-      error: z.string().optional(),
-    }),
-  },
   'runs:events': {
     req: z.null(),
     res: z.null(),
@@ -314,10 +218,6 @@ const ipcSchemas = {
     req: LiveNoteAgentEvent,
     res: z.null(),
   },
-  'bg-task-agent:events': {
-    req: BackgroundTaskAgentEvent,
-    res: z.null(),
-  },
   'models:list': {
     req: z.null(),
     res: z.object({
@@ -427,39 +327,6 @@ const ipcSchemas = {
       enabled: z.boolean(),
     }),
   },
-  'codeMode:getConfig': {
-    req: z.null(),
-    res: z.object({
-      enabled: z.boolean(),
-      approvalPolicy: ApprovalPolicy.optional(),
-    }),
-  },
-  'codeMode:setConfig': {
-    req: z.object({
-      enabled: z.boolean(),
-      approvalPolicy: ApprovalPolicy.optional(),
-    }),
-    res: z.object({
-      success: z.literal(true),
-    }),
-  },
-  // Answer a mid-run permission request from a code_agent_run coding turn.
-  'codeRun:resolvePermission': {
-    req: z.object({
-      requestId: z.string(),
-      decision: PermissionDecision,
-    }),
-    res: z.object({
-      success: z.literal(true),
-    }),
-  },
-  'codeMode:checkAgentStatus': {
-    req: z.null(),
-    res: z.object({
-      claude: z.object({ installed: z.boolean(), signedIn: z.boolean() }),
-      codex: z.object({ installed: z.boolean(), signedIn: z.boolean() }),
-    }),
-  },
   'granola:setConfig': {
     req: z.object({
       enabled: z.boolean(),
@@ -612,10 +479,6 @@ const ipcSchemas = {
     req: z.object({ path: z.string() }),
     res: z.object({ error: z.string().optional() }),
   },
-  'shell:showItemInFolder': {
-    req: z.object({ path: z.string() }),
-    res: z.object({ success: z.literal(true) }),
-  },
   'shell:readFileBase64': {
     req: z.object({ path: z.string() }),
     res: z.object({ data: z.string(), mimeType: z.string(), size: z.number() }),
@@ -828,95 +691,6 @@ const ipcSchemas = {
       })),
     }),
   },
-  // Background-task channels
-  'bg-task:run': {
-    req: z.object({
-      slug: z.string(),
-      context: z.string().optional(),
-    }),
-    res: z.object({
-      success: z.boolean(),
-      runId: z.string().nullable().optional(),
-      summary: z.string().nullable().optional(),
-      error: z.string().optional(),
-    }),
-  },
-  'bg-task:get': {
-    req: z.object({
-      slug: z.string(),
-    }),
-    res: z.object({
-      success: z.boolean(),
-      task: BackgroundTaskSchema.nullable().optional(),
-      error: z.string().optional(),
-    }),
-  },
-  'bg-task:patch': {
-    req: z.object({
-      slug: z.string(),
-      partial: BackgroundTaskSchema.partial(),
-    }),
-    res: z.object({
-      success: z.boolean(),
-      task: BackgroundTaskSchema.nullable().optional(),
-      error: z.string().optional(),
-    }),
-  },
-  'bg-task:create': {
-    req: z.object({
-      name: z.string(),
-      instructions: z.string(),
-      triggers: TriggersSchema.optional(),
-      model: z.string().optional(),
-      provider: z.string().optional(),
-    }),
-    res: z.object({
-      success: z.boolean(),
-      slug: z.string().optional(),
-      error: z.string().optional(),
-    }),
-  },
-  'bg-task:delete': {
-    req: z.object({
-      slug: z.string(),
-    }),
-    res: z.object({
-      success: z.boolean(),
-      error: z.string().optional(),
-    }),
-  },
-  'bg-task:stop': {
-    req: z.object({
-      slug: z.string(),
-    }),
-    res: z.object({
-      success: z.boolean(),
-      error: z.string().optional(),
-    }),
-  },
-  'bg-task:list': {
-    req: z.object({
-      offset: z.number().int().nonnegative().optional(),
-      limit: z.number().int().positive().optional(),
-      sort: z.enum(['createdAt:desc', 'createdAt:asc', 'name:asc']).optional(),
-    }),
-    res: z.object({
-      items: z.array(BackgroundTaskSummarySchema),
-      total: z.number().int().nonnegative(),
-    }),
-  },
-  // Returns the runIds recorded in `bg-tasks/<slug>/runs.log` (newest first).
-  // The renderer turns each id into a full Run via the existing `runs:fetch`
-  // channel — bg-task transcripts now live at the global $WorkDir/runs/.
-  'bg-task:listRunIds': {
-    req: z.object({
-      slug: z.string(),
-      limit: z.number().int().positive().optional(),
-    }),
-    res: z.object({
-      runIds: z.array(z.string()),
-    }),
-  },
   // Embedded browser (WebContentsView) channels
   'browser:setBounds': {
     req: z.object({
@@ -1001,7 +775,15 @@ const ipcSchemas = {
   // Billing channels
   'billing:getInfo': {
     req: z.null(),
-    res: BillingInfoSchema,
+    res: z.object({
+      userEmail: z.string().nullable(),
+      userId: z.string().nullable(),
+      subscriptionPlan: z.string().nullable(),
+      subscriptionStatus: z.string().nullable(),
+      trialExpiresAt: z.string().nullable(),
+      sanctionedCredits: z.number(),
+      availableCredits: z.number(),
+    }),
   },
 } as const;
 
diff --git a/apps/x/packages/shared/src/live-note.ts b/apps/x/packages/shared/src/live-note.ts
index 221e5fc3..6d0c291c 100644
--- a/apps/x/packages/shared/src/live-note.ts
+++ b/apps/x/packages/shared/src/live-note.ts
@@ -85,12 +85,27 @@ export const LiveNoteSchema = z.object({
 // Knowledge events (live-note event-driven pipeline)
 // ---------------------------------------------------------------------------
 
-// Legacy aliases — `KnowledgeEventSchema` / `Pass1OutputSchema` now live in
-// `./events.ts` as `RowboatEventSchema` / `Pass1OutputSchema`. These re-exports
-// keep older import paths working for one release; remove after nothing imports
-// them from here.
-export { RowboatEventSchema as KnowledgeEventSchema, Pass1OutputSchema } from './events.js';
-export type { RowboatEvent as KnowledgeEvent, Pass1Output } from './events.js';
+export const KnowledgeEventSchema = z.object({
+    id: z.string().describe('Monotonically increasing ID; also the filename in events/pending/'),
+    source: z.string().describe('Producer of the event (e.g. "gmail", "calendar")'),
+    type: z.string().describe('Event type (e.g. "email.synced")'),
+    createdAt: z.string().describe('ISO timestamp when the event was produced'),
+    payload: z.string().describe('Human-readable event body, usually markdown'),
+    targetFilePath: z.string().optional().describe('If set, skip routing and target this note directly (used for re-runs)'),
+    // Enriched on move from pending/ to done/
+    processedAt: z.string().optional(),
+    candidateFilePaths: z.array(z.string()).optional(),
+    runIds: z.array(z.string()).optional(),
+    error: z.string().optional(),
+});
+
+export type KnowledgeEvent = z.infer<typeof KnowledgeEventSchema>;
+
+export const Pass1OutputSchema = z.object({
+    filePaths: z.array(z.string()).describe('Note file paths whose objective and event-match criteria suggest the event might be relevant. The agent does Pass 2 on the event payload before editing.'),
+});
+
+export type Pass1Output = z.infer<typeof Pass1OutputSchema>;
 
 // ---------------------------------------------------------------------------
 // Bus events
diff --git a/apps/x/packages/shared/src/message.ts b/apps/x/packages/shared/src/message.ts
index cdf5d983..2aefe3f3 100644
--- a/apps/x/packages/shared/src/message.ts
+++ b/apps/x/packages/shared/src/message.ts
@@ -50,29 +50,9 @@ export const UserContentPart = z.union([UserTextPart, UserAttachmentPart]);
 // Named type for user message content — used everywhere instead of repeating the union
 export const UserMessageContent = z.union([z.string(), z.array(UserContentPart)]);
 
-export const UserMessageContext = z.object({
-    currentDateTime: z.string().optional(),
-    middlePane: z.discriminatedUnion("kind", [
-        z.object({
-            kind: z.literal("empty"),
-        }),
-        z.object({
-            kind: z.literal("note"),
-            path: z.string(),
-            content: z.string(),
-        }),
-        z.object({
-            kind: z.literal("browser"),
-            url: z.string(),
-            title: z.string(),
-        }),
-    ]).optional(),
-});
-
 export const UserMessage = z.object({
     role: z.literal("user"),
     content: UserMessageContent,
-    userMessageContext: UserMessageContext.optional(),
     providerOptions: ProviderOptions.optional(),
 });
 
@@ -106,4 +86,4 @@ export const Message = z.discriminatedUnion("role", [
     UserMessage,
 ]);
 
-export const MessageList = z.array(Message);
+export const MessageList = z.array(Message);
\ No newline at end of file
diff --git a/apps/x/packages/shared/src/models.ts b/apps/x/packages/shared/src/models.ts
index 4571de2c..3a24c217 100644
--- a/apps/x/packages/shared/src/models.ts
+++ b/apps/x/packages/shared/src/models.ts
@@ -17,15 +17,10 @@ export const LlmModelConfig = z.object({
     headers: z.record(z.string(), z.string()).optional(),
     model: z.string().optional(),
     models: z.array(z.string()).optional(),
-    knowledgeGraphModel: z.string().optional(),
-    meetingNotesModel: z.string().optional(),
-    liveNoteAgentModel: z.string().optional(),
-    autoPermissionDecisionModel: z.string().optional(),
   })).optional(),
   // Per-category model overrides (BYOK only — signed-in users always get
   // the curated gateway defaults). Read by helpers in core/models/defaults.ts.
   knowledgeGraphModel: z.string().optional(),
   meetingNotesModel: z.string().optional(),
   liveNoteAgentModel: z.string().optional(),
-  autoPermissionDecisionModel: z.string().optional(),
 });
diff --git a/apps/x/packages/shared/src/runs.ts b/apps/x/packages/shared/src/runs.ts
index a5043cde..f204b451 100644
--- a/apps/x/packages/shared/src/runs.ts
+++ b/apps/x/packages/shared/src/runs.ts
@@ -1,6 +1,5 @@
 import { LlmStepStreamEvent } from "./llm-step-events.js";
 import { Message, ToolCallPart } from "./message.js";
-import { CodeRunEvent as CodeRunEventSchema, PermissionAsk } from "./code-mode.js";
 import z from "zod";
 
 const BaseRunEvent = z.object({
@@ -22,13 +21,11 @@ export const StartEvent = BaseRunEvent.extend({
     agentName: z.string(),
     model: z.string(),
     provider: z.string(),
-    permissionMode: z.enum(["manual", "auto"]).optional(),
     // useCase/subUseCase tag the run for analytics. Optional on read so legacy
     // run files written before these fields existed still parse cleanly.
     useCase: z.enum([
         "copilot_chat",
         "live_note_agent",
-        "background_task_agent",
         "meeting_note",
         "knowledge_sync",
     ]).optional(),
@@ -77,7 +74,6 @@ export const AskHumanRequestEvent = BaseRunEvent.extend({
     type: z.literal("ask-human-request"),
     toolCallId: z.string(),
     query: z.string(),
-    options: z.array(z.string()).optional(),
 });
 
 export const AskHumanResponseEvent = BaseRunEvent.extend({
@@ -86,23 +82,9 @@ export const AskHumanResponseEvent = BaseRunEvent.extend({
     response: z.string(),
 });
 
-export const ToolPermissionMetadata = z.discriminatedUnion("kind", [
-    z.object({
-        kind: z.literal("command"),
-        commandNames: z.array(z.string()),
-    }),
-    z.object({
-        kind: z.literal("file"),
-        operation: z.enum(["read", "list", "search", "write", "delete"]),
-        paths: z.array(z.string()),
-        pathPrefix: z.string(),
-    }),
-]);
-
 export const ToolPermissionRequestEvent = BaseRunEvent.extend({
     type: z.literal("tool-permission-request"),
     toolCall: ToolCallPart,
-    permission: ToolPermissionMetadata.optional(),
 });
 
 export const ToolPermissionResponseEvent = BaseRunEvent.extend({
@@ -112,32 +94,6 @@ export const ToolPermissionResponseEvent = BaseRunEvent.extend({
     scope: z.enum(["once", "session", "always"]).optional(),
 });
 
-// A structured item from a code_agent_run coding turn (tool call, diff, plan,
-// message chunk, resolved permission). Fire-and-forget — rendered live.
-export const CodeRunStreamEvent = BaseRunEvent.extend({
-    type: z.literal("code-run-event"),
-    toolCallId: z.string(),
-    event: CodeRunEventSchema,
-});
-
-// The coding agent is asking for permission mid-turn and the run is BLOCKED until
-// the user answers via `codeRun:resolvePermission` (keyed by requestId).
-export const CodeRunPermissionRequestEvent = BaseRunEvent.extend({
-    type: z.literal("code-run-permission-request"),
-    toolCallId: z.string(),
-    requestId: z.string(),
-    ask: PermissionAsk,
-});
-
-export const ToolPermissionAutoDecisionEvent = BaseRunEvent.extend({
-    type: z.literal("tool-permission-auto-decision"),
-    toolCallId: z.string(),
-    toolCall: ToolCallPart,
-    permission: ToolPermissionMetadata.optional(),
-    decision: z.enum(["allow", "deny"]),
-    reason: z.string(),
-});
-
 export const RunErrorEvent = BaseRunEvent.extend({
     type: z.literal("error"),
     error: z.string(),
@@ -162,9 +118,6 @@ export const RunEvent = z.union([
     AskHumanResponseEvent,
     ToolPermissionRequestEvent,
     ToolPermissionResponseEvent,
-    CodeRunStreamEvent,
-    CodeRunPermissionRequestEvent,
-    ToolPermissionAutoDecisionEvent,
     RunErrorEvent,
     RunStoppedEvent,
 ]);
@@ -185,7 +138,6 @@ export const AskHumanResponsePayload = AskHumanResponseEvent.pick({
 export const UseCase = z.enum([
     "copilot_chat",
     "live_note_agent",
-    "background_task_agent",
     "meeting_note",
     "knowledge_sync",
 ]);
@@ -197,7 +149,6 @@ export const Run = z.object({
     agentId: z.string(),
     model: z.string(),
     provider: z.string(),
-    permissionMode: z.enum(["manual", "auto"]).optional(),
     useCase: UseCase.optional(),
     subUseCase: z.string().optional(),
     log: z.array(RunEvent),
@@ -217,7 +168,6 @@ export const CreateRunOptions = z.object({
     agentId: z.string(),
     model: z.string().optional(),
     provider: z.string().optional(),
-    permissionMode: z.enum(["manual", "auto"]).optional(),
     useCase: UseCase.optional(),
     subUseCase: z.string().optional(),
 });
diff --git a/apps/x/patches/@openai__codex@0.128.0.patch b/apps/x/patches/@openai__codex@0.128.0.patch
deleted file mode 100644
index 73b2e0c3..00000000
--- a/apps/x/patches/@openai__codex@0.128.0.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/bin/codex.js b/bin/codex.js
-index 67ab3e2d95dfac1c91882578b5403916c3121484..f8030b6e1459e05161af99e152b2e7f65ea6c41d 100644
---- a/bin/codex.js
-+++ b/bin/codex.js
-@@ -175,6 +175,10 @@ env[packageManagerEnvVar] = "1";
- const child = spawn(binaryPath, process.argv.slice(2), {
-   stdio: "inherit",
-   env,
-+  // Native console-subsystem binary: without this Windows pops a visible console
-+  // window when launched from a console-less (Electron GUI) parent. Closing that
-+  // window wedges the agent. CREATE_NO_WINDOW keeps the console hidden.
-+  windowsHide: true,
- });
- 
- child.on("error", (err) => {
diff --git a/apps/x/pnpm-lock.yaml b/apps/x/pnpm-lock.yaml
index c4e5a8d5..c33e0f0e 100644
--- a/apps/x/pnpm-lock.yaml
+++ b/apps/x/pnpm-lock.yaml
@@ -4,17 +4,6 @@ settings:
   autoInstallPeers: true
   excludeLinksFromLockfile: false
 
-catalogs:
-  default:
-    vitest:
-      specifier: 4.1.7
-      version: 4.1.7
-
-patchedDependencies:
-  '@openai/codex@0.128.0':
-    hash: 9edd926108a95aaa788aa93870fd6b16d70eeccdf5740b503af5d34cc9f25e86
-    path: patches/@openai__codex@0.128.0.patch
-
 importers:
 
   .:
@@ -52,12 +41,6 @@ importers:
 
   apps/main:
     dependencies:
-      '@agentclientprotocol/claude-agent-acp':
-        specifier: ^0.39.0
-        version: 0.39.0(@anthropic-ai/sdk@0.100.1(zod@4.2.1))(@modelcontextprotocol/sdk@1.25.1(hono@4.11.3)(zod@4.2.1))
-      '@agentclientprotocol/codex-acp':
-        specifier: ^0.0.44
-        version: 0.0.44(zod@4.2.1)
       '@x/core':
         specifier: workspace:*
         version: link:../../packages/core
@@ -144,9 +127,6 @@ importers:
 
   apps/renderer:
     dependencies:
-      '@eigenpal/docx-editor-react':
-        specifier: ^1.0.3
-        version: 1.0.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(ai@5.0.117(zod@4.2.1))(prosemirror-commands@1.7.1)(prosemirror-dropcursor@1.8.2)(prosemirror-history@1.5.0)(prosemirror-keymap@1.2.3)(prosemirror-model@1.25.7)(prosemirror-state@1.4.4)(prosemirror-tables@1.8.5)(prosemirror-transform@1.12.0)(prosemirror-view@1.41.8)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
       '@radix-ui/react-avatar':
         specifier: ^1.1.11
         version: 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
@@ -206,16 +186,16 @@ importers:
         version: 3.22.4(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4)
       '@tiptap/extension-placeholder':
         specifier: 3.22.4
-        version: 3.22.4(@tiptap/extensions@3.22.4(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4))
+        version: 3.22.4(@tiptap/extensions@3.22.5(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4))
       '@tiptap/extension-table':
         specifier: 3.22.4
         version: 3.22.4(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4)
       '@tiptap/extension-task-item':
         specifier: 3.22.4
-        version: 3.22.4(@tiptap/extension-list@3.22.4(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4))
+        version: 3.22.4(@tiptap/extension-list@3.22.5(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4))
       '@tiptap/extension-task-list':
         specifier: 3.22.4
-        version: 3.22.4(@tiptap/extension-list@3.22.4(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4))
+        version: 3.22.4(@tiptap/extension-list@3.22.5(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4))
       '@tiptap/pm':
         specifier: 3.22.4
         version: 3.22.4
@@ -258,33 +238,6 @@ importers:
       posthog-js:
         specifier: ^1.332.0
         version: 1.332.0
-      prosemirror-commands:
-        specifier: ^1.7.1
-        version: 1.7.1
-      prosemirror-dropcursor:
-        specifier: ^1.8.2
-        version: 1.8.2
-      prosemirror-history:
-        specifier: ^1.5.0
-        version: 1.5.0
-      prosemirror-keymap:
-        specifier: ^1.2.3
-        version: 1.2.3
-      prosemirror-model:
-        specifier: ^1.25.7
-        version: 1.25.7
-      prosemirror-state:
-        specifier: ^1.4.4
-        version: 1.4.4
-      prosemirror-tables:
-        specifier: ^1.8.5
-        version: 1.8.5
-      prosemirror-transform:
-        specifier: ^1.12.0
-        version: 1.12.0
-      prosemirror-view:
-        specifier: ^1.41.8
-        version: 1.41.8
       radix-ui:
         specifier: ^1.4.3
         version: 1.4.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
@@ -373,15 +326,6 @@ importers:
 
   packages/core:
     dependencies:
-      '@agentclientprotocol/claude-agent-acp':
-        specifier: ^0.39.0
-        version: 0.39.0(@anthropic-ai/sdk@0.100.1(zod@4.2.1))(@modelcontextprotocol/sdk@1.25.1(hono@4.11.3)(zod@4.2.1))
-      '@agentclientprotocol/codex-acp':
-        specifier: ^0.0.44
-        version: 0.0.44(zod@4.2.1)
-      '@agentclientprotocol/sdk':
-        specifier: ^0.22.1
-        version: 0.22.1(zod@4.2.1)
       '@ai-sdk/anthropic':
         specifier: ^2.0.63
         version: 2.0.70(zod@4.2.1)
@@ -497,9 +441,6 @@ importers:
       '@types/pdf-parse':
         specifier: ^1.1.5
         version: 1.1.5
-      vitest:
-        specifier: 'catalog:'
-        version: 4.1.7(@opentelemetry/api@1.9.0)(@types/node@25.0.3)(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.46.0)(yaml@2.8.2))
 
   packages/shared:
     dependencies:
@@ -509,24 +450,6 @@ importers:
 
 packages:
 
-  '@agentclientprotocol/claude-agent-acp@0.39.0':
-    resolution: {integrity: sha512-+tCm5v32L0R3zE4qjZQowfO1L/zqvQ5FapmsMSIf4gawXfTf26CG5hgz99wARdo0zn20/1eP80gzx7PbZlSX9A==}
-    hasBin: true
-
-  '@agentclientprotocol/codex-acp@0.0.44':
-    resolution: {integrity: sha512-iHzFWKzJ0Z8I6yJCkuLZ+nb9mF2WYmfTcHFFvc7sU/awBsQmVBmpSOXOpZ+IK2Dy9cR3iRoML/B2/Wq2/zKBCA==}
-    hasBin: true
-
-  '@agentclientprotocol/sdk@0.21.1':
-    resolution: {integrity: sha512-ZTLH+o9QxcZDLX/9ww+W7C2iExnXFM+vD/uGFVSlR61Kzj9FaxUqBC6Rv/kwgA7qVWYUEI9c5ZNqCuO9PM4rKg==}
-    peerDependencies:
-      zod: ^3.25.0 || ^4.0.0
-
-  '@agentclientprotocol/sdk@0.22.1':
-    resolution: {integrity: sha512-DfqXtl/8gO9NImq094MTaCXEU2vkhh6v7q/kT+9UjZxUqj8hYaya2OjLVIqn16MzNHcXEpShTR2RIauLSYeDQQ==}
-    peerDependencies:
-      zod: ^3.25.0 || ^4.0.0
-
   '@ai-sdk/anthropic@2.0.70':
     resolution: {integrity: sha512-W3WjQlb0Ho+CVAQUvb8Rtk3hGS3Jlgy79ihY2H0yj2k4yU8XuxpQw0Oz+7JQsB47j+jlHhk7nUXtxhAeRg3S3Q==}
     engines: {node: '>=18'}
@@ -582,67 +505,6 @@ packages:
   '@antfu/install-pkg@1.1.0':
     resolution: {integrity: sha512-MGQsmw10ZyI+EJo45CdSER4zEb+p31LpDAFp2Z3gkSd1yqVZGi0Ebx++YTEMonJy4oChEMLsxZ64j8FH6sSqtQ==}
 
-  '@anthropic-ai/claude-agent-sdk-darwin-arm64@0.3.156':
-    resolution: {integrity: sha512-IkjcS9dqAUlD4Nb62L9AZtmAXCa+FV4ul8lIlyXXUprh3nlecbKsWOXVd/GORrzAhMmynJaX4+iV1JiutFKXUA==}
-    cpu: [arm64]
-    os: [darwin]
-
-  '@anthropic-ai/claude-agent-sdk-darwin-x64@0.3.156':
-    resolution: {integrity: sha512-6PKi5fPmGRuzXu+Em/iwLmPG3mqg0hl92wcTU8fmChqyNtxhxsjCw7LTbdFqp/05o5NeZVVV4k3p7YUv5IFD6g==}
-    cpu: [x64]
-    os: [darwin]
-
-  '@anthropic-ai/claude-agent-sdk-linux-arm64-musl@0.3.156':
-    resolution: {integrity: sha512-R7KEVjxkR4rYgIQoHGBzwPdUJYxRTO8I4vHjRbMLH1eW4FS7BJvVs7ogfKR/NnHFBvMVqtC+l6jHLQv8bobUiw==}
-    cpu: [arm64]
-    os: [linux]
-    libc: [musl]
-
-  '@anthropic-ai/claude-agent-sdk-linux-arm64@0.3.156':
-    resolution: {integrity: sha512-H0Nfd41iw5isto9uQI1FlVSZ0eaDttr8rBpJMR25oK/mj3egMO5EmZ6aAxeeUYSLn2mSU50HA5VNxlGUE118TQ==}
-    cpu: [arm64]
-    os: [linux]
-    libc: [glibc]
-
-  '@anthropic-ai/claude-agent-sdk-linux-x64-musl@0.3.156':
-    resolution: {integrity: sha512-/Q6WUizI6a+hqZZ6ElwRU0PEuFhOoN4v6CuU35HHbiZ/7uaocGht4A8ZIgK1Fw6wOGtZzGLbc00CA1OU1Zg8EA==}
-    cpu: [x64]
-    os: [linux]
-    libc: [musl]
-
-  '@anthropic-ai/claude-agent-sdk-linux-x64@0.3.156':
-    resolution: {integrity: sha512-ymhrdlbWoYvTACUdaGdhrEv+ZMfwXLsf0BRLkr/IvY5aqybP7URzWmmZGOtDQpqkT/8xu/UCGqUYH3woJwUxfg==}
-    cpu: [x64]
-    os: [linux]
-    libc: [glibc]
-
-  '@anthropic-ai/claude-agent-sdk-win32-arm64@0.3.156':
-    resolution: {integrity: sha512-5sAeNObQQrMy4NF9HwxewrMnU7mVxZDHh+/MfJVQSz0GSTvXQ6gOuRH8helMlfspoU6VOdekPxVLRooX/3foEw==}
-    cpu: [arm64]
-    os: [win32]
-
-  '@anthropic-ai/claude-agent-sdk-win32-x64@0.3.156':
-    resolution: {integrity: sha512-/PofeTWoiKgnWNSNk0wG4SsRn22GGLmnLhg2R94WcNhCRFOyOTmiZcYH2DBlWZBIRVTZDsSfa/Pl1DyPvYCGKw==}
-    cpu: [x64]
-    os: [win32]
-
-  '@anthropic-ai/claude-agent-sdk@0.3.156':
-    resolution: {integrity: sha512-6nM/Dj+VMds52UXJ2YaV4IKhYamlUqN0HtdDrFzYz5lvPMpDS935qD8YZDAUpy+ltdoD6PJMd1V/CKFY3/oWCQ==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@anthropic-ai/sdk': '>=0.93.0'
-      '@modelcontextprotocol/sdk': ^1.29.0
-      zod: ^4.0.0
-
-  '@anthropic-ai/sdk@0.100.1':
-    resolution: {integrity: sha512-RANcEe7LpiLczkKGOwoXOTuFdPhuubS0i4xaAKOMpcqc55YO0mukgxppV7eygx3DXNjxWT6RYOLPyOy0aIAmwg==}
-    hasBin: true
-    peerDependencies:
-      zod: ^3.25.0 || ^4.0.0
-    peerDependenciesMeta:
-      zod:
-        optional: true
-
   '@aws-crypto/crc32@5.2.0':
     resolution: {integrity: sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==}
     engines: {node: '>=16.0.0'}
@@ -930,60 +792,6 @@ packages:
     peerDependencies:
       zod: '>=3.25.76 <5'
 
-  '@eigenpal/docx-editor-agents@1.0.3':
-    resolution: {integrity: sha512-Bk/J9/PBnMCOxb6w4cHQiCTuN/1C4FtZM9evC9EXXcLP13yFMdqoEqsYs+Lh3HyaRRAaCZTrkfgOZyTqqyjtwQ==}
-    peerDependencies:
-      '@ai-sdk/vue': ^2.0.0
-      ai: ^5.0.0 || ^6.0.0
-      react: ^17.0.0 || ^18.0.0 || ^19.0.0
-      vue: ^3.0.0
-    peerDependenciesMeta:
-      '@ai-sdk/vue':
-        optional: true
-      ai:
-        optional: true
-      react:
-        optional: true
-      vue:
-        optional: true
-
-  '@eigenpal/docx-editor-core@1.0.3':
-    resolution: {integrity: sha512-etpupuln9ZlHLW4DgS7877WBdMEChsAG0D1bEZLjF70isYbyxrd2ARWax745P7XMm4GqqkAfByzxE2GGWQmJaA==}
-    hasBin: true
-    peerDependencies:
-      prosemirror-commands: ^1.5.2
-      prosemirror-dropcursor: ^1.8.2
-      prosemirror-history: ^1.4.0
-      prosemirror-keymap: ^1.2.2
-      prosemirror-model: ^1.19.4
-      prosemirror-state: ^1.4.3
-      prosemirror-tables: ^1.8.5
-      prosemirror-transform: ^1.12.0
-      prosemirror-view: ^1.32.7
-
-  '@eigenpal/docx-editor-i18n@1.0.3':
-    resolution: {integrity: sha512-zwz/S+duPOnzg/kh4bs28T3UqI8mKMzHdmFgbWgMxwtTfUkAxaUAnAVbuZgrysl1aD2scv4Hfy4EgOZcFy9NnA==}
-
-  '@eigenpal/docx-editor-react@1.0.3':
-    resolution: {integrity: sha512-KupDVHo6KC4KUs48bM1pMYFFbDJqkW8XyIhgsnLx+BWk2yOPU4bx2HfWB6H+JEVROA1h1AmhTAyE39gk75wg5w==}
-    peerDependencies:
-      prosemirror-commands: ^1.5.2
-      prosemirror-dropcursor: ^1.8.2
-      prosemirror-history: ^1.4.0
-      prosemirror-keymap: ^1.2.2
-      prosemirror-model: ^1.19.4
-      prosemirror-state: ^1.4.3
-      prosemirror-tables: ^1.8.5
-      prosemirror-transform: ^1.12.0
-      prosemirror-view: ^1.41.6
-      react: ^18.0.0 || ^19.0.0
-      react-dom: ^18.0.0 || ^19.0.0
-    peerDependenciesMeta:
-      react:
-        optional: true
-      react-dom:
-        optional: true
-
   '@electron-forge/cli@7.11.1':
     resolution: {integrity: sha512-pk8AoLsr7t7LBAt0cFD06XFA6uxtPdvtLx06xeal7O9o7GHGCbj29WGwFoJ8Br/ENM0Ho868S3PrAn1PtBXt5g==}
     engines: {node: '>= 16.4.0'}
@@ -1677,35 +1485,30 @@ packages:
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
-    libc: [glibc]
 
   '@napi-rs/canvas-linux-arm64-musl@0.1.80':
     resolution: {integrity: sha512-1XbCOz/ymhj24lFaIXtWnwv/6eFHXDrjP0jYkc6iHQ9q8oXKzUX1Lc6bu+wuGiLhGh2GS/2JlfORC5ZcXimRcg==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
-    libc: [musl]
 
   '@napi-rs/canvas-linux-riscv64-gnu@0.1.80':
     resolution: {integrity: sha512-XTzR125w5ZMs0lJcxRlS1K3P5RaZ9RmUsPtd1uGt+EfDyYMu4c6SEROYsxyatbbu/2+lPe7MPHOO/0a0x7L/gw==}
     engines: {node: '>= 10'}
     cpu: [riscv64]
     os: [linux]
-    libc: [glibc]
 
   '@napi-rs/canvas-linux-x64-gnu@0.1.80':
     resolution: {integrity: sha512-BeXAmhKg1kX3UCrJsYbdQd3hIMDH/K6HnP/pG2LuITaXhXBiNdh//TVVVVCBbJzVQaV5gK/4ZOCMrQW9mvuTqA==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
-    libc: [glibc]
 
   '@napi-rs/canvas-linux-x64-musl@0.1.80':
     resolution: {integrity: sha512-x0XvZWdHbkgdgucJsRxprX/4o4sEed7qo9rCQA9ugiS9qE2QvP0RIiEugtZhfLH3cyI+jIRFJHV4Fuz+1BHHMg==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
-    libc: [musl]
 
   '@napi-rs/canvas-win32-x64-msvc@0.1.80':
     resolution: {integrity: sha512-Z8jPsM6df5V8B1HrCHB05+bDiCxjE9QA//3YrkKIdVDEwn5RKaqOxCJDRJkl48cJbylcrJbW4HxZbTte8juuPg==}
@@ -1842,47 +1645,6 @@ packages:
     resolution: {integrity: sha512-6gH/bLQJSJEg7OEpkH4wGQdA8KXHRbzL1YkGyUO12YNAgV3jxKy4K9kvfXj4+9T0OLug5k58cnPCKSSIKzp7pg==}
     engines: {node: '>=8.0'}
 
-  '@openai/codex@0.128.0':
-    resolution: {integrity: sha512-+xp6ODmFfBNnexIWRHApEaPXot2j6gyM8A5we/5IS/uY4eYHj4arETct4hQ5M4eO+MK7JY3ZU4xhuobhlysr0A==}
-    engines: {node: '>=16'}
-    hasBin: true
-
-  '@openai/codex@0.128.0-darwin-arm64':
-    resolution: {integrity: sha512-w+6zohfHx/kHBdles/CyFKaY57u9I3nK8QI9+NrdwMliKA0b7xn13yblRNkMpe09j6vL1oAWoxYsMOQ/vjBGug==}
-    engines: {node: '>=16'}
-    cpu: [arm64]
-    os: [darwin]
-
-  '@openai/codex@0.128.0-darwin-x64':
-    resolution: {integrity: sha512-SDbn6fO22Puy8xmMIbZi4f2znMrUEPwABApke4mo+4ihaauwuVjeqzXvW5SPJz5ty/bG11/mSupQgReT7T8BBw==}
-    engines: {node: '>=16'}
-    cpu: [x64]
-    os: [darwin]
-
-  '@openai/codex@0.128.0-linux-arm64':
-    resolution: {integrity: sha512-+SvH73H60qvCXFuQGP/EsmR//s1hHMBR22PvJkXvM/hdnTIGucx+JqRUjAWdmmQ1IU6j3kgwVvdLW/6ICB+M6w==}
-    engines: {node: '>=16'}
-    cpu: [arm64]
-    os: [linux]
-
-  '@openai/codex@0.128.0-linux-x64':
-    resolution: {integrity: sha512-2lnSPA05CRRuKAzFW8BCmmNCSieDcToLwfC2ALLbBYilGLgzhRibjlDglK9F1BkEzfohSSWJu4PBbRu/aG60lQ==}
-    engines: {node: '>=16'}
-    cpu: [x64]
-    os: [linux]
-
-  '@openai/codex@0.128.0-win32-arm64':
-    resolution: {integrity: sha512-ECJvsqmYFdA9pn42xxK3Odp/G16AjmBW0BglX8L0PwPjqbstbmlew9bfHf7xvL+SNfNl4NmyotW0+RNo1phgaA==}
-    engines: {node: '>=16'}
-    cpu: [arm64]
-    os: [win32]
-
-  '@openai/codex@0.128.0-win32-x64':
-    resolution: {integrity: sha512-k3jmUAFrzkUtvjGTXvSKjQqJLLlzjxp/VoHJDYedgmXUn6j70HxK38IwapzmnYfiBiTuzETvGwjXHzZgzKjhoQ==}
-    engines: {node: '>=16'}
-    cpu: [x64]
-    os: [win32]
-
   '@openrouter/ai-sdk-provider@1.5.4':
     resolution: {integrity: sha512-xrSQPUIH8n9zuyYZR0XK7Ba0h2KsjJcMkxnwaYfmv13pKs3sDkjPzVPPhlhzqBGddHb5cFEwJ9VFuFeDcxCDSw==}
     engines: {node: '>=18'}
@@ -2869,67 +2631,56 @@ packages:
     resolution: {integrity: sha512-EHMUcDwhtdRGlXZsGSIuXSYwD5kOT9NVnx9sqzYiwAc91wfYOE1g1djOEDseZJKKqtHAHGwnGPQu3kytmfaXLQ==}
     cpu: [arm]
     os: [linux]
-    libc: [glibc]
 
   '@rollup/rollup-linux-arm-musleabihf@4.54.0':
     resolution: {integrity: sha512-+pBrqEjaakN2ySv5RVrj/qLytYhPKEUwk+e3SFU5jTLHIcAtqh2rLrd/OkbNuHJpsBgxsD8ccJt5ga/SeG0JmA==}
     cpu: [arm]
     os: [linux]
-    libc: [musl]
 
   '@rollup/rollup-linux-arm64-gnu@4.54.0':
     resolution: {integrity: sha512-NSqc7rE9wuUaRBsBp5ckQ5CVz5aIRKCwsoa6WMF7G01sX3/qHUw/z4pv+D+ahL1EIKy6Enpcnz1RY8pf7bjwng==}
     cpu: [arm64]
     os: [linux]
-    libc: [glibc]
 
   '@rollup/rollup-linux-arm64-musl@4.54.0':
     resolution: {integrity: sha512-gr5vDbg3Bakga5kbdpqx81m2n9IX8M6gIMlQQIXiLTNeQW6CucvuInJ91EuCJ/JYvc+rcLLsDFcfAD1K7fMofg==}
     cpu: [arm64]
     os: [linux]
-    libc: [musl]
 
   '@rollup/rollup-linux-loong64-gnu@4.54.0':
     resolution: {integrity: sha512-gsrtB1NA3ZYj2vq0Rzkylo9ylCtW/PhpLEivlgWe0bpgtX5+9j9EZa0wtZiCjgu6zmSeZWyI/e2YRX1URozpIw==}
     cpu: [loong64]
     os: [linux]
-    libc: [glibc]
 
   '@rollup/rollup-linux-ppc64-gnu@4.54.0':
     resolution: {integrity: sha512-y3qNOfTBStmFNq+t4s7Tmc9hW2ENtPg8FeUD/VShI7rKxNW7O4fFeaYbMsd3tpFlIg1Q8IapFgy7Q9i2BqeBvA==}
     cpu: [ppc64]
     os: [linux]
-    libc: [glibc]
 
   '@rollup/rollup-linux-riscv64-gnu@4.54.0':
     resolution: {integrity: sha512-89sepv7h2lIVPsFma8iwmccN7Yjjtgz0Rj/Ou6fEqg3HDhpCa+Et+YSufy27i6b0Wav69Qv4WBNl3Rs6pwhebQ==}
     cpu: [riscv64]
     os: [linux]
-    libc: [glibc]
 
   '@rollup/rollup-linux-riscv64-musl@4.54.0':
     resolution: {integrity: sha512-ZcU77ieh0M2Q8Ur7D5X7KvK+UxbXeDHwiOt/CPSBTI1fBmeDMivW0dPkdqkT4rOgDjrDDBUed9x4EgraIKoR2A==}
     cpu: [riscv64]
     os: [linux]
-    libc: [musl]
 
   '@rollup/rollup-linux-s390x-gnu@4.54.0':
     resolution: {integrity: sha512-2AdWy5RdDF5+4YfG/YesGDDtbyJlC9LHmL6rZw6FurBJ5n4vFGupsOBGfwMRjBYH7qRQowT8D/U4LoSvVwOhSQ==}
     cpu: [s390x]
     os: [linux]
-    libc: [glibc]
 
   '@rollup/rollup-linux-x64-gnu@4.54.0':
     resolution: {integrity: sha512-WGt5J8Ij/rvyqpFexxk3ffKqqbLf9AqrTBbWDk7ApGUzaIs6V+s2s84kAxklFwmMF/vBNGrVdYgbblCOFFezMQ==}
     cpu: [x64]
     os: [linux]
-    libc: [glibc]
 
   '@rollup/rollup-linux-x64-musl@4.54.0':
     resolution: {integrity: sha512-JzQmb38ATzHjxlPHuTH6tE7ojnMKM2kYNzt44LO/jJi8BpceEC8QuXYA908n8r3CNuG/B3BV8VR3Hi1rYtmPiw==}
     cpu: [x64]
     os: [linux]
-    libc: [musl]
 
   '@rollup/rollup-openharmony-arm64@4.54.0':
     resolution: {integrity: sha512-huT3fd0iC7jigGh7n3q/+lfPcXxBi+om/Rs3yiFxjvSxbSB6aohDFXbWvlspaqjeOh+hx7DDHS+5Es5qRkWkZg==}
@@ -3197,9 +2948,6 @@ packages:
     resolution: {integrity: sha512-4aUIteuyxtBUhVdiQqcDhKFitwfd9hqoSDYY2KRXiWtgoWJ9Bmise+KfEPDiVHWeJepvF8xJO9/9+WDIciMFFw==}
     engines: {node: '>=18.0.0'}
 
-  '@stablelib/base64@1.0.1':
-    resolution: {integrity: sha512-1bnPQqSxSuc3Ii6MhBysoWCg58j97aUjuCSZrGSmDxNqtytIi0k8utUenAwTZN4V5mXXYGsVUI9zeBqy+jBOSQ==}
-
   '@standard-schema/spec@1.1.0':
     resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
 
@@ -3251,28 +2999,24 @@ packages:
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
-    libc: [glibc]
 
   '@tailwindcss/oxide-linux-arm64-musl@4.1.18':
     resolution: {integrity: sha512-1px92582HkPQlaaCkdRcio71p8bc8i/ap5807tPRDK/uw953cauQBT8c5tVGkOwrHMfc2Yh6UuxaH4vtTjGvHg==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
-    libc: [musl]
 
   '@tailwindcss/oxide-linux-x64-gnu@4.1.18':
     resolution: {integrity: sha512-v3gyT0ivkfBLoZGF9LyHmts0Isc8jHZyVcbzio6Wpzifg/+5ZJpDiRiUhDLkcr7f/r38SWNe7ucxmGW3j3Kb/g==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
-    libc: [glibc]
 
   '@tailwindcss/oxide-linux-x64-musl@4.1.18':
     resolution: {integrity: sha512-bhJ2y2OQNlcRwwgOAGMY0xTFStt4/wyU6pvI6LSuZpRgKQwxTec0/3Scu91O8ir7qCR3AuepQKLU/kX99FouqQ==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
-    libc: [musl]
 
   '@tailwindcss/oxide-wasm32-wasi@4.1.18':
     resolution: {integrity: sha512-LffYTvPjODiP6PT16oNeUQJzNVyJl1cjIebq/rWWBF+3eDst5JGEFSc5cWxyRCJ0Mxl+KyIkqRxk1XPEs9x8TA==}
@@ -3408,12 +3152,6 @@ packages:
     peerDependencies:
       '@tiptap/extension-list': 3.22.5
 
-  '@tiptap/extension-list@3.22.4':
-    resolution: {integrity: sha512-Xe8UFvvHmyp/c/TJsFwlwU9CWACYbBirNsluJ3U1+H8BTu1wqdrT/AXR5uIXeyCl5kiWKgX5q71eHWbYFOrqrg==}
-    peerDependencies:
-      '@tiptap/core': 3.22.4
-      '@tiptap/pm': 3.22.4
-
   '@tiptap/extension-list@3.22.5':
     resolution: {integrity: sha512-cVO3ZHCgxAWZ4zrFSs81FO2nyCk1wb2EHkpLpW98FzbJLkN9rDkazhW99P3HRWy/CvUldOT+8ecI1YrQtBojMg==}
     peerDependencies:
@@ -3466,12 +3204,6 @@ packages:
     peerDependencies:
       '@tiptap/core': 3.22.5
 
-  '@tiptap/extensions@3.22.4':
-    resolution: {integrity: sha512-fOe8VptJvLPs32bNdUYo8SRyljwqKNQVXWW056VoXIc5en/59OdJlJQVeHI0jRRciH3MtrqODi/gfJR0VHNZ8A==}
-    peerDependencies:
-      '@tiptap/core': 3.22.4
-      '@tiptap/pm': 3.22.4
-
   '@tiptap/extensions@3.22.5':
     resolution: {integrity: sha512-Ifg4MzKCj3uRqe3ieTwYnomu2y4p7EXr2avVSKZYfh12i2dyWe2Gkn1KuZDREANVE+gHqFlQjJRYzhJFwzSCrg==}
     peerDependencies:
@@ -3531,9 +3263,6 @@ packages:
   '@types/cacheable-request@6.0.3':
     resolution: {integrity: sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==}
 
-  '@types/chai@5.2.3':
-    resolution: {integrity: sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==}
-
   '@types/connect@3.4.38':
     resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==}
 
@@ -3636,9 +3365,6 @@ packages:
   '@types/debug@4.1.12':
     resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==}
 
-  '@types/deep-eql@4.0.2':
-    resolution: {integrity: sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==}
-
   '@types/electron-squirrel-startup@1.0.2':
     resolution: {integrity: sha512-AzxnvBzNh8K/0SmxMmZtpJf1/IWoGXLP+pQDuUaVkPyotI8ryvAtBSqgxR/qOSvxWHYWrxkeNsJ+Ca5xOuUxJQ==}
 
@@ -3846,35 +3572,6 @@ packages:
     peerDependencies:
       vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
 
-  '@vitest/expect@4.1.7':
-    resolution: {integrity: sha512-1R+tw0ortHEbZDGMymm+pN7/AFQ/RkFFdtd7EN+VBpynKmLbP8A3rpEXdshBJ7+8hQ9zBJh/i1s0yKNtxAnU7w==}
-
-  '@vitest/mocker@4.1.7':
-    resolution: {integrity: sha512-vY7nuamKgfvpA1Koa3oYIw/k7D6kZnpGyNMZW8loow2bsBYla1TFdqTaXncWdRn4pgwNs+90RhnXhJScDwQeJA==}
-    peerDependencies:
-      msw: ^2.4.9
-      vite: ^6.0.0 || ^7.0.0 || ^8.0.0
-    peerDependenciesMeta:
-      msw:
-        optional: true
-      vite:
-        optional: true
-
-  '@vitest/pretty-format@4.1.7':
-    resolution: {integrity: sha512-umgCarTOYQWIaDMvGDRZij+6b9oVeLIyJzfN+AS88e0ZOU3QTgNNSTtjQOpcvWr3np1N0j4WgZj+sb3oYBDscw==}
-
-  '@vitest/runner@4.1.7':
-    resolution: {integrity: sha512-BapjmAQ2aI78WdMEfeUWivnfVzB+VPGwWRQcJE0OUq7qEeEcBsCSf+0T5iREBNE5nBb4wA5Ya0W6IA+sghdEFw==}
-
-  '@vitest/snapshot@4.1.7':
-    resolution: {integrity: sha512-ZacLzja+TmJeZ1h14xW2FB/WpeimUD3haBXQPyJqxvo8jQTmfeA8zv58mtjN2C7EHXZDYVcVYdYmAxjkWVvKCw==}
-
-  '@vitest/spy@4.1.7':
-    resolution: {integrity: sha512-kbkI5LMWakyuTIvs6fUJ5qdIVb1XVKsYJAT4OJ938cHMROYMSfmoQdZy0aaAnjbbc8F61vkoTqz/Az+/HiIu5Q==}
-
-  '@vitest/utils@4.1.7':
-    resolution: {integrity: sha512-T532WBu791cBxJlCl6SO+J14l81DQx6uQHm1bQbmCDY7nqlEIgkza/UFnSBNaUtSf41unldDFjdOBYEQC4b5Hw==}
-
   '@vscode/sudo-prompt@9.3.2':
     resolution: {integrity: sha512-gcXoCN00METUNFeQOFJ+C9xUI0DKB+0EGMVg7wbVYRHBw2Eq3fKisDZOkRdOz3kqXRKOENMfShPOmypw1/8nOw==}
 
@@ -3928,10 +3625,6 @@ packages:
     engines: {node: '>=10.0.0'}
     deprecated: this version has critical issues, please update to the latest version
 
-  '@xmldom/xmldom@0.9.10':
-    resolution: {integrity: sha512-A9gOqLdi6cV4ibazAjcQufGj0B1y/vDqYrcuP6d/6x8P27gRS8643Dj9o1dEKtB6O7fwxb2FgBmJS2mX7gpvdw==}
-    engines: {node: '>=14.6'}
-
   '@xtuc/ieee754@1.2.0':
     resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}
 
@@ -4071,10 +3764,6 @@ packages:
     resolution: {integrity: sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==}
     engines: {node: '>=8'}
 
-  assertion-error@2.0.1:
-    resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==}
-    engines: {node: '>=12'}
-
   async-lock@1.4.1:
     resolution: {integrity: sha512-Az2ZTpuytrtqENulXwO3GGv1Bztugx6TT37NIo7imr/Qo0gsYiGtSdBa2B6fsXhTpVZDNfu1Qn3pk531e3q+nQ==}
 
@@ -4203,10 +3892,6 @@ packages:
   buffer@6.0.3:
     resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==}
 
-  bundle-name@4.1.0:
-    resolution: {integrity: sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==}
-    engines: {node: '>=18'}
-
   bytes@3.1.2:
     resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
     engines: {node: '>= 0.8'}
@@ -4255,10 +3940,6 @@ packages:
     resolution: {integrity: sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==}
     engines: {node: '>=0.8'}
 
-  chai@6.2.2:
-    resolution: {integrity: sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==}
-    engines: {node: '>=18'}
-
   chalk@4.1.2:
     resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
     engines: {node: '>=10'}
@@ -4687,14 +4368,6 @@ packages:
   deep-is@0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
 
-  default-browser-id@5.0.1:
-    resolution: {integrity: sha512-x1VCxdX4t+8wVfd1so/9w+vQ4vx7lKd2Qp5tDRutErwmR85OgmfX7RlLRMWafRMY7hbEiXIbudNrjOAPa/hL8Q==}
-    engines: {node: '>=18'}
-
-  default-browser@5.5.0:
-    resolution: {integrity: sha512-H9LMLr5zwIbSxrmvikGuI/5KGhZ8E2zH3stkMgM5LpOWDutGM2JZaj460Udnf1a+946zc7YBgrqEWwbk7zHvGw==}
-    engines: {node: '>=18'}
-
   defaults@1.0.4:
     resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==}
 
@@ -4706,10 +4379,6 @@ packages:
     resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}
     engines: {node: '>= 0.4'}
 
-  define-lazy-prop@3.0.0:
-    resolution: {integrity: sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==}
-    engines: {node: '>=12'}
-
   define-properties@1.2.1:
     resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
     engines: {node: '>= 0.4'}
@@ -4751,20 +4420,12 @@ packages:
   diff3@0.0.3:
     resolution: {integrity: sha512-iSq8ngPOt0K53A6eVr4d5Kn6GNrM2nQZtC740pzIriHtn4pOQ2lyzEXQMBeVcWERN0ye7fhBsk9PbLLQOnUx/g==}
 
-  diff@8.0.4:
-    resolution: {integrity: sha512-DPi0FmjiSU5EvQV0++GFDOJ9ASQUVFh5kD+OzOnYdi7n3Wpm9hWWGfB/O2blfHcMVTL5WkQXSnRiK9makhrcnw==}
-    engines: {node: '>=0.3.1'}
-
   dingbat-to-unicode@1.0.1:
     resolution: {integrity: sha512-98l0sW87ZT58pU4i61wa2OHwxbiYSbuxsCBozaVnYX2iCnr3bLM3fIes1/ej7h1YdOKuKt/MLs706TVnALA65w==}
 
   dir-compare@4.2.0:
     resolution: {integrity: sha512-2xMCmOoMrdQIPHdsTawECdNPwlVFB9zGcz3kuhmBO6U3oU+UQjsue0i8ayLKpgBcm+hcXPMVSGUN9d+pvJ6+VQ==}
 
-  docxtemplater@3.68.7:
-    resolution: {integrity: sha512-FwgeAKqY2vc9eVm2V2XGg8bq25B0OQjtSDITGi9zNnvu5GbtR4WvGjM5QNld/ALB6ZbsSuHskBPK9SvPpKhsbA==}
-    engines: {node: '>=0.10'}
-
   dom-serializer@0.2.2:
     resolution: {integrity: sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==}
 
@@ -5022,9 +4683,6 @@ packages:
   estree-util-is-identifier-name@3.0.0:
     resolution: {integrity: sha512-hFtqIDZTIUZ9BXLb8y4pYGyk6+wekIivNVTcmvk8NoOh+VeRn5y6cEHzbURrWbfp1fIqdVipilzj+lfaadNZmg==}
 
-  estree-walker@3.0.3:
-    resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}
-
   esutils@2.0.3:
     resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
     engines: {node: '>=0.10.0'}
@@ -5059,10 +4717,6 @@ packages:
     resolution: {integrity: sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==}
     engines: {node: '>=6'}
 
-  expect-type@1.3.0:
-    resolution: {integrity: sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==}
-    engines: {node: '>=12.0.0'}
-
   exponential-backoff@3.1.3:
     resolution: {integrity: sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA==}
 
@@ -5105,9 +4759,6 @@ packages:
   fast-levenshtein@2.0.6:
     resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
 
-  fast-sha256@1.3.0:
-    resolution: {integrity: sha512-n11RGP/lrWEFI/bWdygLxhI+pVeo1ZYIVwvvPkW7azl/rOy+F3HYRZ2K5zeE9mmkhQppyv9sQFx0JM9UabnpPQ==}
-
   fast-uri@3.1.0:
     resolution: {integrity: sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==}
 
@@ -5707,11 +5358,6 @@ packages:
     engines: {node: '>=8'}
     hasBin: true
 
-  is-docker@3.0.0:
-    resolution: {integrity: sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    hasBin: true
-
   is-extglob@2.1.1:
     resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
     engines: {node: '>=0.10.0'}
@@ -5731,15 +5377,6 @@ packages:
   is-hexadecimal@2.0.1:
     resolution: {integrity: sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==}
 
-  is-in-ssh@1.0.0:
-    resolution: {integrity: sha512-jYa6Q9rH90kR1vKB6NM7qqd1mge3Fx4Dhw5TVlK1MUBqhEOuCagrEHMevNuCcbECmXZ0ThXkRm+Ymr51HwEPAw==}
-    engines: {node: '>=20'}
-
-  is-inside-container@1.0.0:
-    resolution: {integrity: sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==}
-    engines: {node: '>=14.16'}
-    hasBin: true
-
   is-interactive@1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -5797,10 +5434,6 @@ packages:
     resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==}
     engines: {node: '>=8'}
 
-  is-wsl@3.1.1:
-    resolution: {integrity: sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw==}
-    engines: {node: '>=16'}
-
   isarray@1.0.0:
     resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
 
@@ -5861,10 +5494,6 @@ packages:
   json-parse-even-better-errors@2.3.1:
     resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
 
-  json-schema-to-ts@3.1.1:
-    resolution: {integrity: sha512-+DWg8jCJG2TEnpy7kOm/7/AxaYoaRbjVB4LFZLySZlWn8exGs3A4OLJR966cVvU26N7X9TWxl+Jsw7dzAqKT6g==}
-    engines: {node: '>=16'}
-
   json-schema-traverse@0.4.1:
     resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
 
@@ -5973,28 +5602,24 @@ packages:
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
-    libc: [glibc]
 
   lightningcss-linux-arm64-musl@1.30.2:
     resolution: {integrity: sha512-5Vh9dGeblpTxWHpOx8iauV02popZDsCYMPIgiuw97OJ5uaDsL86cnqSFs5LZkG3ghHoX5isLgWzMs+eD1YzrnA==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
-    libc: [musl]
 
   lightningcss-linux-x64-gnu@1.30.2:
     resolution: {integrity: sha512-Cfd46gdmj1vQ+lR6VRTTadNHu6ALuw2pKR9lYq4FnhvgBc4zWY1EtZcAc6EffShbb1MFrIPfLDXD6Xprbnni4w==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
-    libc: [glibc]
 
   lightningcss-linux-x64-musl@1.30.2:
     resolution: {integrity: sha512-XJaLUUFXb6/QG2lGIW6aIk6jKdtjtcffUT0NKvIqhSBY3hh9Ch+1LCeH80dR9q9LBjG3ewbDjnumefsLsP6aiA==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
-    libc: [musl]
 
   lightningcss-win32-arm64-msvc@1.30.2:
     resolution: {integrity: sha512-FZn+vaj7zLv//D/192WFFVA0RgHawIcHqLX9xuWiQt7P0PtdFEVaxgF9rjM/IRYHQXNnk61/H/gb2Ei+kUQ4xQ==}
@@ -6593,9 +6218,6 @@ packages:
     resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
     engines: {node: '>= 0.4'}
 
-  obug@2.1.1:
-    resolution: {integrity: sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==}
-
   ollama-ai-provider-v2@1.5.5:
     resolution: {integrity: sha512-1YwTFdPjhPNHny/DrOHO+s8oVGGIE5Jib61/KnnjPRNWQhVVimrJJdaAX3e6nNRRDXrY5zbb9cfm2+yVvgsrqw==}
     engines: {node: '>=18'}
@@ -6619,10 +6241,6 @@ packages:
   oniguruma-to-es@4.3.4:
     resolution: {integrity: sha512-3VhUGN3w2eYxnTzHn+ikMI+fp/96KoRSVK9/kMTcFqj1NRDh2IhQCKvYxDnWePKRXY/AqH+Fuiyb7VHSzBjHfA==}
 
-  open@11.0.0:
-    resolution: {integrity: sha512-smsWv2LzFjP03xmvFoJ331ss6h+jixfA4UUV/Bsiyuu4YJPfN+FIQGOIiv4w9/+MoHkfkJ22UIaQWRVFRfH6Vw==}
-    engines: {node: '>=20'}
-
   open@7.4.2:
     resolution: {integrity: sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==}
     engines: {node: '>=8'}
@@ -6712,9 +6330,6 @@ packages:
   pako@1.0.11:
     resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
 
-  pako@2.1.0:
-    resolution: {integrity: sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==}
-
   papaparse@5.5.3:
     resolution: {integrity: sha512-5QvjGxYVjxO59MGU2lHVYpRWBBtKHnlIAcSe1uNFCkkptUh63NFRj0FJQm7nR67puEruUci/ZkjmEFrjCAyP4A==}
 
@@ -6828,9 +6443,6 @@ packages:
     resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
     engines: {node: '>=6'}
 
-  pizzip@3.2.0:
-    resolution: {integrity: sha512-X4NPNICxCfIK8VYhF6wbksn81vTiziyLbvKuORVAmolvnUzl1A1xmz9DAWKxPRq9lZg84pJOOAMq3OE61bD8IQ==}
-
   pkce-challenge@5.0.1:
     resolution: {integrity: sha512-wQ0b/W4Fr01qtpHlqSqspcj3EhBvimsdh0KlHhH8HRZnMsEa0ea2fTULOXOS9ccQr3om+GcGRk4e+isrZWV8qQ==}
     engines: {node: '>=16.20.0'}
@@ -6871,10 +6483,6 @@ packages:
     engines: {node: '>=14.0.0'}
     hasBin: true
 
-  powershell-utils@0.1.0:
-    resolution: {integrity: sha512-dM0jVuXJPsDN6DvRpea484tCUaMiXWjuCn++HGTqUWzGDjv5tZkEZldAJ/UMlqRYGFrD/etByo4/xOuC/snX2A==}
-    engines: {node: '>=20'}
-
   preact@10.28.2:
     resolution: {integrity: sha512-lbteaWGzGHdlIuiJ0l2Jq454m6kcpI1zNje6d8MlGAFlYvP2GO4ibnat7P74Esfz4sPTdM6UxtTwh/d3pwM9JA==}
 
@@ -6941,8 +6549,8 @@ packages:
   prosemirror-markdown@1.13.2:
     resolution: {integrity: sha512-FPD9rHPdA9fqzNmIIDhhnYQ6WgNoSWX9StUZ8LEKapaXU9i6XgykaHKhp6XMyXlOWetmaFgGDS/nu/w9/vUc5g==}
 
-  prosemirror-model@1.25.7:
-    resolution: {integrity: sha512-A79aN8QEFUwI6cax8Yq4Rpcx1TJZ3Kagn+ii7qLo4/V8H3mMiHrhFyhTyHHvpSnOgMPpWiDGSwM3etwrxE50ug==}
+  prosemirror-model@1.25.4:
+    resolution: {integrity: sha512-PIM7E43PBxKce8OQeezAs9j4TP+5yDpZVbuurd1h5phUxEKIu+G2a+EUZzIC5nS1mJktDJWzbqS23n1tsAf5QA==}
 
   prosemirror-schema-list@1.5.1:
     resolution: {integrity: sha512-927lFx/uwyQaGwJxLWCZRkjXG0p48KpMj6ueoYiu4JX05GGuGcgzAy62dfiV8eFZftgyBUvLx76RsMe20fJl+Q==}
@@ -6953,11 +6561,11 @@ packages:
   prosemirror-tables@1.8.5:
     resolution: {integrity: sha512-V/0cDCsHKHe/tfWkeCmthNUcEp1IVO3p6vwN8XtwE9PZQLAZJigbw3QoraAdfJPir4NKJtNvOB8oYGKRl+t0Dw==}
 
-  prosemirror-transform@1.12.0:
-    resolution: {integrity: sha512-GxboyN4AMIsoHNtz5uf2r2Ru551i5hWeCMD6E2Ib4Eogqoub0NflniaBPVQ4MrGE5yZ8JV9tUHg9qcZTTrcN4w==}
+  prosemirror-transform@1.10.5:
+    resolution: {integrity: sha512-RPDQCxIDhIBb1o36xxwsaeAvivO8VLJcgBtzmOwQ64bMtsVFh5SSuJ6dWSxO1UsHTiTXPCgQm3PDJt7p6IOLbw==}
 
-  prosemirror-view@1.41.8:
-    resolution: {integrity: sha512-TnKDdohEatgyZNGCDWIdccOHXhYloJwbwU+phw/a23KBvJIR9lWQWW7WHHK3vBdOLDNuF7TaX98GObUZOWkOnA==}
+  prosemirror-view@1.41.4:
+    resolution: {integrity: sha512-WkKgnyjNncri03Gjaz3IFWvCAE94XoiEgvtr0/r2Xw7R8/IjK3sKLSiDoCHWcsXSAinVaKlGRZDvMCsF1kbzjA==}
 
   protobufjs@7.5.4:
     resolution: {integrity: sha512-CvexbZtbov6jW2eXAvLukXjXUW1TzFaivC46BpWc/3BpcCysb5Vffu+B3XHMm8lVEuy2Mm4XGex8hBSg1yapPg==}
@@ -7293,10 +6901,6 @@ packages:
     resolution: {integrity: sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==}
     engines: {node: '>= 18'}
 
-  run-applescript@7.1.0:
-    resolution: {integrity: sha512-DPe5pVFaAsinSaV6QjQ6gdiedWDcRCbUuiQfQa2wmWV7+xC9bGulGI8+TdRmoFkAPaBXk8CrAbnlY2ISniJ47Q==}
-    engines: {node: '>=18'}
-
   run-parallel@1.2.0:
     resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
 
@@ -7319,10 +6923,6 @@ packages:
   safer-buffer@2.1.2:
     resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
 
-  sax@1.6.0:
-    resolution: {integrity: sha512-6R3J5M4AcbtLUdZmRv2SygeVaM7IhrLXu9BmnOGmmACak8fiUtOsYNWUS4uK7upbmHIBbLBeFeI//477BKLBzA==}
-    engines: {node: '>=11.0.0'}
-
   scheduler@0.25.0-rc-603e6108-20241029:
     resolution: {integrity: sha512-pFwF6H1XrSdYYNLfOcGlM28/j8CGLu8IvdrxqhjWULe2bPcKiKW4CV+OWqR/9fT52mywx65l7ysNkjLKBda7eA==}
 
@@ -7421,9 +7021,6 @@ packages:
     resolution: {integrity: sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==}
     engines: {node: '>= 0.4'}
 
-  siginfo@2.0.0:
-    resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==}
-
   signal-exit@3.0.7:
     resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
 
@@ -7502,19 +7099,10 @@ packages:
     resolution: {integrity: sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
 
-  stackback@0.0.2:
-    resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==}
-
-  standardwebhooks@1.0.0:
-    resolution: {integrity: sha512-BbHGOQK9olHPMvQNHWul6MYlrRTAOKn03rOe4A8O3CLWhNf4YHBqq2HJKKC+sfqpxiBY52pNeesD6jIiLDz8jg==}
-
   statuses@2.0.2:
     resolution: {integrity: sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==}
     engines: {node: '>= 0.8'}
 
-  std-env@4.1.0:
-    resolution: {integrity: sha512-Rq7ybcX2RuC55r9oaPVEW7/xu3tj8u4GeBYHBWCychFtzMIr86A7e3PPEBPT37sHStKX3+TiX/Fr/ACmJLVlLQ==}
-
   stream-browserify@3.0.0:
     resolution: {integrity: sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==}
 
@@ -7656,9 +7244,6 @@ packages:
   tiny-invariant@1.3.3:
     resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==}
 
-  tinybench@2.9.0:
-    resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==}
-
   tinyexec@1.0.2:
     resolution: {integrity: sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==}
     engines: {node: '>=18'}
@@ -7667,10 +7252,6 @@ packages:
     resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==}
     engines: {node: '>=12.0.0'}
 
-  tinyrainbow@3.1.0:
-    resolution: {integrity: sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==}
-    engines: {node: '>=14.0.0'}
-
   tiptap-markdown@0.9.0:
     resolution: {integrity: sha512-dKLQ9iiuGNgrlGVjrNauF/UBzWu4LYOx5pkD0jNkmQt/GOwfCJsBuzZTsf1jZ204ANHOm572mZ9PYvGh1S7tpQ==}
     peerDependencies:
@@ -7726,9 +7307,6 @@ packages:
   trough@2.2.0:
     resolution: {integrity: sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==}
 
-  ts-algebra@2.0.0:
-    resolution: {integrity: sha512-FPAhNPFMrkwz76P7cdjdmiShwMynZYN6SgOujD1urY4oNm80Ou9oMdmbR45LotcKOXoy7wSmHkRFE6Mxbrhefw==}
-
   ts-api-utils@2.1.0:
     resolution: {integrity: sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==}
     engines: {node: '>=18.12'}
@@ -7919,7 +7497,6 @@ packages:
 
   uuid@9.0.1:
     resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}
-    deprecated: uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).
     hasBin: true
 
   validate-npm-package-license@3.0.4:
@@ -7988,55 +7565,10 @@ packages:
       yaml:
         optional: true
 
-  vitest@4.1.7:
-    resolution: {integrity: sha512-flYyaFd2CgoCoU+0UKt3pxksgC+S02iTDN0n3LtqaMeXsI9SBcdNujc2k0DeFLzUn/0k538yNjOSdwgCqcrwJA==}
-    engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0}
-    hasBin: true
-    peerDependencies:
-      '@edge-runtime/vm': '*'
-      '@opentelemetry/api': ^1.9.0
-      '@types/node': ^20.0.0 || ^22.0.0 || >=24.0.0
-      '@vitest/browser-playwright': 4.1.7
-      '@vitest/browser-preview': 4.1.7
-      '@vitest/browser-webdriverio': 4.1.7
-      '@vitest/coverage-istanbul': 4.1.7
-      '@vitest/coverage-v8': 4.1.7
-      '@vitest/ui': 4.1.7
-      happy-dom: '*'
-      jsdom: '*'
-      vite: ^6.0.0 || ^7.0.0 || ^8.0.0
-    peerDependenciesMeta:
-      '@edge-runtime/vm':
-        optional: true
-      '@opentelemetry/api':
-        optional: true
-      '@types/node':
-        optional: true
-      '@vitest/browser-playwright':
-        optional: true
-      '@vitest/browser-preview':
-        optional: true
-      '@vitest/browser-webdriverio':
-        optional: true
-      '@vitest/coverage-istanbul':
-        optional: true
-      '@vitest/coverage-v8':
-        optional: true
-      '@vitest/ui':
-        optional: true
-      happy-dom:
-        optional: true
-      jsdom:
-        optional: true
-
   vscode-jsonrpc@8.2.0:
     resolution: {integrity: sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==}
     engines: {node: '>=14.0.0'}
 
-  vscode-jsonrpc@8.2.1:
-    resolution: {integrity: sha512-kdjOSJ2lLIn7r1rtrMbbNCHjyMPfRnowdKjBQ+mGq6NAW5QY2bEZC/khaC5OR8svbbjvLEaIXkOq45e2X9BIbQ==}
-    engines: {node: '>=14.0.0'}
-
   vscode-languageserver-protocol@3.17.5:
     resolution: {integrity: sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==}
 
@@ -8111,11 +7643,6 @@ packages:
     engines: {node: '>= 8'}
     hasBin: true
 
-  why-is-node-running@2.3.0:
-    resolution: {integrity: sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==}
-    engines: {node: '>=8'}
-    hasBin: true
-
   wmf@1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -8143,10 +7670,6 @@ packages:
   wrappy@1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
 
-  wsl-utils@0.3.1:
-    resolution: {integrity: sha512-g/eziiSUNBSsdDJtCLB8bdYEUMj4jR7AGeUo96p/3dTafgjHhpF4RiCFPiRILwjQoDXx5MqkBr4fwWtR3Ky4Wg==}
-    engines: {node: '>=20'}
-
   x-is-array@0.1.0:
     resolution: {integrity: sha512-goHPif61oNrr0jJgsXRfc8oqtYzvfiMJpTqwE7Z4y9uH+T3UozkGqQ4d2nX9mB9khvA8U2o/UbPOFjgC7hLWIA==}
 
@@ -8158,10 +7681,6 @@ packages:
     engines: {node: '>=0.8'}
     hasBin: true
 
-  xml-js@1.6.11:
-    resolution: {integrity: sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==}
-    hasBin: true
-
   xmlbuilder2@2.1.2:
     resolution: {integrity: sha512-PI710tmtVlQ5VmwzbRTuhmVhKnj9pM8Si+iOZCV2g2SNo3gCrpzR2Ka9wNzZtqfD+mnP+xkrqoNy0sjKZqP4Dg==}
     engines: {node: '>=8.0'}
@@ -8242,33 +7761,6 @@ packages:
 
 snapshots:
 
-  '@agentclientprotocol/claude-agent-acp@0.39.0(@anthropic-ai/sdk@0.100.1(zod@4.2.1))(@modelcontextprotocol/sdk@1.25.1(hono@4.11.3)(zod@4.2.1))':
-    dependencies:
-      '@agentclientprotocol/sdk': 0.22.1(zod@4.2.1)
-      '@anthropic-ai/claude-agent-sdk': 0.3.156(@anthropic-ai/sdk@0.100.1(zod@4.2.1))(@modelcontextprotocol/sdk@1.25.1(hono@4.11.3)(zod@4.2.1))(zod@4.2.1)
-      zod: 4.2.1
-    transitivePeerDependencies:
-      - '@anthropic-ai/sdk'
-      - '@modelcontextprotocol/sdk'
-
-  '@agentclientprotocol/codex-acp@0.0.44(zod@4.2.1)':
-    dependencies:
-      '@agentclientprotocol/sdk': 0.21.1(zod@4.2.1)
-      '@openai/codex': 0.128.0(patch_hash=9edd926108a95aaa788aa93870fd6b16d70eeccdf5740b503af5d34cc9f25e86)
-      diff: 8.0.4
-      open: 11.0.0
-      vscode-jsonrpc: 8.2.1
-    transitivePeerDependencies:
-      - zod
-
-  '@agentclientprotocol/sdk@0.21.1(zod@4.2.1)':
-    dependencies:
-      zod: 4.2.1
-
-  '@agentclientprotocol/sdk@0.22.1(zod@4.2.1)':
-    dependencies:
-      zod: 4.2.1
-
   '@ai-sdk/anthropic@2.0.70(zod@4.2.1)':
     dependencies:
       '@ai-sdk/provider': 2.0.1
@@ -8330,52 +7822,6 @@ snapshots:
       package-manager-detector: 1.6.0
       tinyexec: 1.0.2
 
-  '@anthropic-ai/claude-agent-sdk-darwin-arm64@0.3.156':
-    optional: true
-
-  '@anthropic-ai/claude-agent-sdk-darwin-x64@0.3.156':
-    optional: true
-
-  '@anthropic-ai/claude-agent-sdk-linux-arm64-musl@0.3.156':
-    optional: true
-
-  '@anthropic-ai/claude-agent-sdk-linux-arm64@0.3.156':
-    optional: true
-
-  '@anthropic-ai/claude-agent-sdk-linux-x64-musl@0.3.156':
-    optional: true
-
-  '@anthropic-ai/claude-agent-sdk-linux-x64@0.3.156':
-    optional: true
-
-  '@anthropic-ai/claude-agent-sdk-win32-arm64@0.3.156':
-    optional: true
-
-  '@anthropic-ai/claude-agent-sdk-win32-x64@0.3.156':
-    optional: true
-
-  '@anthropic-ai/claude-agent-sdk@0.3.156(@anthropic-ai/sdk@0.100.1(zod@4.2.1))(@modelcontextprotocol/sdk@1.25.1(hono@4.11.3)(zod@4.2.1))(zod@4.2.1)':
-    dependencies:
-      '@anthropic-ai/sdk': 0.100.1(zod@4.2.1)
-      '@modelcontextprotocol/sdk': 1.25.1(hono@4.11.3)(zod@4.2.1)
-      zod: 4.2.1
-    optionalDependencies:
-      '@anthropic-ai/claude-agent-sdk-darwin-arm64': 0.3.156
-      '@anthropic-ai/claude-agent-sdk-darwin-x64': 0.3.156
-      '@anthropic-ai/claude-agent-sdk-linux-arm64': 0.3.156
-      '@anthropic-ai/claude-agent-sdk-linux-arm64-musl': 0.3.156
-      '@anthropic-ai/claude-agent-sdk-linux-x64': 0.3.156
-      '@anthropic-ai/claude-agent-sdk-linux-x64-musl': 0.3.156
-      '@anthropic-ai/claude-agent-sdk-win32-arm64': 0.3.156
-      '@anthropic-ai/claude-agent-sdk-win32-x64': 0.3.156
-
-  '@anthropic-ai/sdk@0.100.1(zod@4.2.1)':
-    dependencies:
-      json-schema-to-ts: 3.1.1
-      standardwebhooks: 1.0.0
-    optionalDependencies:
-      zod: 4.2.1
-
   '@aws-crypto/crc32@5.2.0':
     dependencies:
       '@aws-crypto/util': 5.2.0
@@ -9023,61 +8469,6 @@ snapshots:
     dependencies:
       zod: 4.2.1
 
-  '@eigenpal/docx-editor-agents@1.0.3(ai@5.0.117(zod@4.2.1))(react@19.2.3)':
-    dependencies:
-      docxtemplater: 3.68.7
-      jszip: 3.10.1
-      pizzip: 3.2.0
-      xml-js: 1.6.11
-    optionalDependencies:
-      ai: 5.0.117(zod@4.2.1)
-      react: 19.2.3
-
-  '@eigenpal/docx-editor-core@1.0.3(prosemirror-commands@1.7.1)(prosemirror-dropcursor@1.8.2)(prosemirror-history@1.5.0)(prosemirror-keymap@1.2.3)(prosemirror-model@1.25.7)(prosemirror-state@1.4.4)(prosemirror-tables@1.8.5)(prosemirror-transform@1.12.0)(prosemirror-view@1.41.8)':
-    dependencies:
-      docxtemplater: 3.68.7
-      jszip: 3.10.1
-      pizzip: 3.2.0
-      prosemirror-commands: 1.7.1
-      prosemirror-dropcursor: 1.8.2
-      prosemirror-history: 1.5.0
-      prosemirror-keymap: 1.2.3
-      prosemirror-model: 1.25.7
-      prosemirror-state: 1.4.4
-      prosemirror-tables: 1.8.5
-      prosemirror-transform: 1.12.0
-      prosemirror-view: 1.41.8
-      xml-js: 1.6.11
-
-  '@eigenpal/docx-editor-i18n@1.0.3': {}
-
-  '@eigenpal/docx-editor-react@1.0.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(ai@5.0.117(zod@4.2.1))(prosemirror-commands@1.7.1)(prosemirror-dropcursor@1.8.2)(prosemirror-history@1.5.0)(prosemirror-keymap@1.2.3)(prosemirror-model@1.25.7)(prosemirror-state@1.4.4)(prosemirror-tables@1.8.5)(prosemirror-transform@1.12.0)(prosemirror-view@1.41.8)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@eigenpal/docx-editor-agents': 1.0.3(ai@5.0.117(zod@4.2.1))(react@19.2.3)
-      '@eigenpal/docx-editor-core': 1.0.3(prosemirror-commands@1.7.1)(prosemirror-dropcursor@1.8.2)(prosemirror-history@1.5.0)(prosemirror-keymap@1.2.3)(prosemirror-model@1.25.7)(prosemirror-state@1.4.4)(prosemirror-tables@1.8.5)(prosemirror-transform@1.12.0)(prosemirror-view@1.41.8)
-      '@eigenpal/docx-editor-i18n': 1.0.3
-      '@radix-ui/react-select': 2.2.6(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      clsx: 2.1.1
-      prosemirror-commands: 1.7.1
-      prosemirror-dropcursor: 1.8.2
-      prosemirror-history: 1.5.0
-      prosemirror-keymap: 1.2.3
-      prosemirror-model: 1.25.7
-      prosemirror-state: 1.4.4
-      prosemirror-tables: 1.8.5
-      prosemirror-transform: 1.12.0
-      prosemirror-view: 1.41.8
-      sonner: 2.0.7(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-    optionalDependencies:
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    transitivePeerDependencies:
-      - '@ai-sdk/vue'
-      - '@types/react'
-      - '@types/react-dom'
-      - ai
-      - vue
-
   '@electron-forge/cli@7.11.1(encoding@0.1.13)(esbuild@0.24.2)':
     dependencies:
       '@electron-forge/core': 7.11.1(encoding@0.1.13)(esbuild@0.24.2)
@@ -10106,33 +9497,6 @@ snapshots:
 
   '@oozcitak/util@8.3.4': {}
 
-  '@openai/codex@0.128.0(patch_hash=9edd926108a95aaa788aa93870fd6b16d70eeccdf5740b503af5d34cc9f25e86)':
-    optionalDependencies:
-      '@openai/codex-darwin-arm64': '@openai/codex@0.128.0-darwin-arm64'
-      '@openai/codex-darwin-x64': '@openai/codex@0.128.0-darwin-x64'
-      '@openai/codex-linux-arm64': '@openai/codex@0.128.0-linux-arm64'
-      '@openai/codex-linux-x64': '@openai/codex@0.128.0-linux-x64'
-      '@openai/codex-win32-arm64': '@openai/codex@0.128.0-win32-arm64'
-      '@openai/codex-win32-x64': '@openai/codex@0.128.0-win32-x64'
-
-  '@openai/codex@0.128.0-darwin-arm64':
-    optional: true
-
-  '@openai/codex@0.128.0-darwin-x64':
-    optional: true
-
-  '@openai/codex@0.128.0-linux-arm64':
-    optional: true
-
-  '@openai/codex@0.128.0-linux-x64':
-    optional: true
-
-  '@openai/codex@0.128.0-win32-arm64':
-    optional: true
-
-  '@openai/codex@0.128.0-win32-x64':
-    optional: true
-
   '@openrouter/ai-sdk-provider@1.5.4(ai@5.0.151(zod@4.2.1))(zod@4.2.1)':
     dependencies:
       '@openrouter/sdk': 0.1.27
@@ -11615,8 +10979,6 @@ snapshots:
     dependencies:
       tslib: 2.8.1
 
-  '@stablelib/base64@1.0.1': {}
-
   '@standard-schema/spec@1.1.0': {}
 
   '@standard-schema/utils@0.3.0': {}
@@ -11783,11 +11145,6 @@ snapshots:
     dependencies:
       '@tiptap/extension-list': 3.22.5(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4)
 
-  '@tiptap/extension-list@3.22.4(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4)':
-    dependencies:
-      '@tiptap/core': 3.22.4(@tiptap/pm@3.22.4)
-      '@tiptap/pm': 3.22.4
-
   '@tiptap/extension-list@3.22.5(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4)':
     dependencies:
       '@tiptap/core': 3.22.4(@tiptap/pm@3.22.4)
@@ -11801,9 +11158,9 @@ snapshots:
     dependencies:
       '@tiptap/core': 3.22.4(@tiptap/pm@3.22.4)
 
-  '@tiptap/extension-placeholder@3.22.4(@tiptap/extensions@3.22.4(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4))':
+  '@tiptap/extension-placeholder@3.22.4(@tiptap/extensions@3.22.5(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4))':
     dependencies:
-      '@tiptap/extensions': 3.22.4(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4)
+      '@tiptap/extensions': 3.22.5(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4)
 
   '@tiptap/extension-strike@3.22.5(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))':
     dependencies:
@@ -11814,13 +11171,13 @@ snapshots:
       '@tiptap/core': 3.22.4(@tiptap/pm@3.22.4)
       '@tiptap/pm': 3.22.4
 
-  '@tiptap/extension-task-item@3.22.4(@tiptap/extension-list@3.22.4(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4))':
+  '@tiptap/extension-task-item@3.22.4(@tiptap/extension-list@3.22.5(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4))':
     dependencies:
-      '@tiptap/extension-list': 3.22.4(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4)
+      '@tiptap/extension-list': 3.22.5(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4)
 
-  '@tiptap/extension-task-list@3.22.4(@tiptap/extension-list@3.22.4(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4))':
+  '@tiptap/extension-task-list@3.22.4(@tiptap/extension-list@3.22.5(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4))':
     dependencies:
-      '@tiptap/extension-list': 3.22.4(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4)
+      '@tiptap/extension-list': 3.22.5(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4)
 
   '@tiptap/extension-text@3.22.5(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))':
     dependencies:
@@ -11830,11 +11187,6 @@ snapshots:
     dependencies:
       '@tiptap/core': 3.22.4(@tiptap/pm@3.22.4)
 
-  '@tiptap/extensions@3.22.4(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4)':
-    dependencies:
-      '@tiptap/core': 3.22.4(@tiptap/pm@3.22.4)
-      '@tiptap/pm': 3.22.4
-
   '@tiptap/extensions@3.22.5(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4)':
     dependencies:
       '@tiptap/core': 3.22.4(@tiptap/pm@3.22.4)
@@ -11848,12 +11200,12 @@ snapshots:
       prosemirror-gapcursor: 1.4.0
       prosemirror-history: 1.5.0
       prosemirror-keymap: 1.2.3
-      prosemirror-model: 1.25.7
+      prosemirror-model: 1.25.4
       prosemirror-schema-list: 1.5.1
       prosemirror-state: 1.4.4
       prosemirror-tables: 1.8.5
-      prosemirror-transform: 1.12.0
-      prosemirror-view: 1.41.8
+      prosemirror-transform: 1.10.5
+      prosemirror-view: 1.41.4
 
   '@tiptap/react@3.22.4(@floating-ui/dom@1.7.4)(@tiptap/core@3.22.4(@tiptap/pm@3.22.4))(@tiptap/pm@3.22.4)(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
     dependencies:
@@ -11954,11 +11306,6 @@ snapshots:
       '@types/node': 25.0.3
       '@types/responselike': 1.0.3
 
-  '@types/chai@5.2.3':
-    dependencies:
-      '@types/deep-eql': 4.0.2
-      assertion-error: 2.0.1
-
   '@types/connect@3.4.38':
     dependencies:
       '@types/node': 25.0.3
@@ -12088,8 +11435,6 @@ snapshots:
     dependencies:
       '@types/ms': 2.1.0
 
-  '@types/deep-eql@4.0.2': {}
-
   '@types/electron-squirrel-startup@1.0.2': {}
 
   '@types/eslint-scope@3.7.7':
@@ -12347,47 +11692,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@vitest/expect@4.1.7':
-    dependencies:
-      '@standard-schema/spec': 1.1.0
-      '@types/chai': 5.2.3
-      '@vitest/spy': 4.1.7
-      '@vitest/utils': 4.1.7
-      chai: 6.2.2
-      tinyrainbow: 3.1.0
-
-  '@vitest/mocker@4.1.7(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.46.0)(yaml@2.8.2))':
-    dependencies:
-      '@vitest/spy': 4.1.7
-      estree-walker: 3.0.3
-      magic-string: 0.30.21
-    optionalDependencies:
-      vite: 7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.46.0)(yaml@2.8.2)
-
-  '@vitest/pretty-format@4.1.7':
-    dependencies:
-      tinyrainbow: 3.1.0
-
-  '@vitest/runner@4.1.7':
-    dependencies:
-      '@vitest/utils': 4.1.7
-      pathe: 2.0.3
-
-  '@vitest/snapshot@4.1.7':
-    dependencies:
-      '@vitest/pretty-format': 4.1.7
-      '@vitest/utils': 4.1.7
-      magic-string: 0.30.21
-      pathe: 2.0.3
-
-  '@vitest/spy@4.1.7': {}
-
-  '@vitest/utils@4.1.7':
-    dependencies:
-      '@vitest/pretty-format': 4.1.7
-      convert-source-map: 2.0.0
-      tinyrainbow: 3.1.0
-
   '@vscode/sudo-prompt@9.3.2': {}
 
   '@webassemblyjs/ast@1.14.1':
@@ -12468,8 +11772,6 @@ snapshots:
 
   '@xmldom/xmldom@0.8.11': {}
 
-  '@xmldom/xmldom@0.9.10': {}
-
   '@xtuc/ieee754@1.2.0': {}
 
   '@xtuc/long@4.2.2': {}
@@ -12604,8 +11906,6 @@ snapshots:
 
   arrify@2.0.1: {}
 
-  assertion-error@2.0.1: {}
-
   async-lock@1.4.1: {}
 
   async@1.5.2:
@@ -12747,10 +12047,6 @@ snapshots:
       base64-js: 1.5.1
       ieee754: 1.2.1
 
-  bundle-name@4.1.0:
-    dependencies:
-      run-applescript: 7.1.0
-
   bytes@3.1.2: {}
 
   cacache@16.1.3:
@@ -12823,8 +12119,6 @@ snapshots:
       adler-32: 1.3.1
       crc-32: 1.2.2
 
-  chai@6.2.2: {}
-
   chalk@4.1.2:
     dependencies:
       ansi-styles: 4.3.0
@@ -13245,13 +12539,6 @@ snapshots:
 
   deep-is@0.1.4: {}
 
-  default-browser-id@5.0.1: {}
-
-  default-browser@5.5.0:
-    dependencies:
-      bundle-name: 4.1.0
-      default-browser-id: 5.0.1
-
   defaults@1.0.4:
     dependencies:
       clone: 1.0.4
@@ -13264,8 +12551,6 @@ snapshots:
       es-errors: 1.3.0
       gopd: 1.2.0
 
-  define-lazy-prop@3.0.0: {}
-
   define-properties@1.2.1:
     dependencies:
       define-data-property: 1.1.4
@@ -13300,8 +12585,6 @@ snapshots:
 
   diff3@0.0.3: {}
 
-  diff@8.0.4: {}
-
   dingbat-to-unicode@1.0.1: {}
 
   dir-compare@4.2.0:
@@ -13309,10 +12592,6 @@ snapshots:
       minimatch: 3.1.2
       p-limit: 3.1.0
 
-  docxtemplater@3.68.7:
-    dependencies:
-      '@xmldom/xmldom': 0.9.10
-
   dom-serializer@0.2.2:
     dependencies:
       domelementtype: 2.3.0
@@ -13695,10 +12974,6 @@ snapshots:
 
   estree-util-is-identifier-name@3.0.0: {}
 
-  estree-walker@3.0.3:
-    dependencies:
-      '@types/estree': 1.0.8
-
   esutils@2.0.3: {}
 
   etag@1.8.1: {}
@@ -13729,8 +13004,6 @@ snapshots:
       signal-exit: 3.0.7
       strip-eof: 1.0.0
 
-  expect-type@1.3.0: {}
-
   exponential-backoff@3.1.3: {}
 
   express-rate-limit@7.5.1(express@5.2.1):
@@ -13804,8 +13077,6 @@ snapshots:
 
   fast-levenshtein@2.0.6: {}
 
-  fast-sha256@1.3.0: {}
-
   fast-uri@3.1.0: {}
 
   fast-xml-parser@5.2.5:
@@ -14581,8 +13852,6 @@ snapshots:
 
   is-docker@2.2.1: {}
 
-  is-docker@3.0.0: {}
-
   is-extglob@2.1.1: {}
 
   is-fullwidth-code-point@3.0.0: {}
@@ -14595,12 +13864,6 @@ snapshots:
 
   is-hexadecimal@2.0.1: {}
 
-  is-in-ssh@1.0.0: {}
-
-  is-inside-container@1.0.0:
-    dependencies:
-      is-docker: 3.0.0
-
   is-interactive@1.0.0: {}
 
   is-lambda@1.0.1: {}
@@ -14651,10 +13914,6 @@ snapshots:
     dependencies:
       is-docker: 2.2.1
 
-  is-wsl@3.1.1:
-    dependencies:
-      is-inside-container: 1.0.0
-
   isarray@1.0.0: {}
 
   isarray@2.0.5: {}
@@ -14723,11 +13982,6 @@ snapshots:
 
   json-parse-even-better-errors@2.3.1: {}
 
-  json-schema-to-ts@3.1.1:
-    dependencies:
-      '@babel/runtime': 7.28.6
-      ts-algebra: 2.0.0
-
   json-schema-traverse@0.4.1: {}
 
   json-schema-traverse@1.0.0: {}
@@ -15689,8 +14943,6 @@ snapshots:
   object-keys@1.1.1:
     optional: true
 
-  obug@2.1.1: {}
-
   ollama-ai-provider-v2@1.5.5(zod@4.2.1):
     dependencies:
       '@ai-sdk/provider': 2.0.1
@@ -15717,15 +14969,6 @@ snapshots:
       regex: 6.1.0
       regex-recursion: 6.0.2
 
-  open@11.0.0:
-    dependencies:
-      default-browser: 5.5.0
-      define-lazy-prop: 3.0.0
-      is-in-ssh: 1.0.0
-      is-inside-container: 1.0.0
-      powershell-utils: 0.1.0
-      wsl-utils: 0.3.1
-
   open@7.4.2:
     dependencies:
       is-docker: 2.2.1
@@ -15805,8 +15048,6 @@ snapshots:
 
   pako@1.0.11: {}
 
-  pako@2.1.0: {}
-
   papaparse@5.5.3: {}
 
   parent-module@1.0.1:
@@ -15904,10 +15145,6 @@ snapshots:
 
   pify@4.0.1: {}
 
-  pizzip@3.2.0:
-    dependencies:
-      pako: 2.1.0
-
   pkce-challenge@5.0.1: {}
 
   pkg-types@1.3.1:
@@ -15965,8 +15202,6 @@ snapshots:
     dependencies:
       commander: 9.5.0
 
-  powershell-utils@0.1.0: {}
-
   preact@10.28.2: {}
 
   prelude-ls@1.2.1: {}
@@ -15998,32 +15233,32 @@ snapshots:
 
   prosemirror-changeset@2.3.1:
     dependencies:
-      prosemirror-transform: 1.12.0
+      prosemirror-transform: 1.10.5
 
   prosemirror-commands@1.7.1:
     dependencies:
-      prosemirror-model: 1.25.7
+      prosemirror-model: 1.25.4
       prosemirror-state: 1.4.4
-      prosemirror-transform: 1.12.0
+      prosemirror-transform: 1.10.5
 
   prosemirror-dropcursor@1.8.2:
     dependencies:
       prosemirror-state: 1.4.4
-      prosemirror-transform: 1.12.0
-      prosemirror-view: 1.41.8
+      prosemirror-transform: 1.10.5
+      prosemirror-view: 1.41.4
 
   prosemirror-gapcursor@1.4.0:
     dependencies:
       prosemirror-keymap: 1.2.3
-      prosemirror-model: 1.25.7
+      prosemirror-model: 1.25.4
       prosemirror-state: 1.4.4
-      prosemirror-view: 1.41.8
+      prosemirror-view: 1.41.4
 
   prosemirror-history@1.5.0:
     dependencies:
       prosemirror-state: 1.4.4
-      prosemirror-transform: 1.12.0
-      prosemirror-view: 1.41.8
+      prosemirror-transform: 1.10.5
+      prosemirror-view: 1.41.4
       rope-sequence: 1.3.4
 
   prosemirror-keymap@1.2.3:
@@ -16035,41 +15270,41 @@ snapshots:
     dependencies:
       '@types/markdown-it': 14.1.2
       markdown-it: 14.1.0
-      prosemirror-model: 1.25.7
+      prosemirror-model: 1.25.4
 
-  prosemirror-model@1.25.7:
+  prosemirror-model@1.25.4:
     dependencies:
       orderedmap: 2.1.1
 
   prosemirror-schema-list@1.5.1:
     dependencies:
-      prosemirror-model: 1.25.7
+      prosemirror-model: 1.25.4
       prosemirror-state: 1.4.4
-      prosemirror-transform: 1.12.0
+      prosemirror-transform: 1.10.5
 
   prosemirror-state@1.4.4:
     dependencies:
-      prosemirror-model: 1.25.7
-      prosemirror-transform: 1.12.0
-      prosemirror-view: 1.41.8
+      prosemirror-model: 1.25.4
+      prosemirror-transform: 1.10.5
+      prosemirror-view: 1.41.4
 
   prosemirror-tables@1.8.5:
     dependencies:
       prosemirror-keymap: 1.2.3
-      prosemirror-model: 1.25.7
+      prosemirror-model: 1.25.4
       prosemirror-state: 1.4.4
-      prosemirror-transform: 1.12.0
-      prosemirror-view: 1.41.8
+      prosemirror-transform: 1.10.5
+      prosemirror-view: 1.41.4
 
-  prosemirror-transform@1.12.0:
+  prosemirror-transform@1.10.5:
     dependencies:
-      prosemirror-model: 1.25.7
+      prosemirror-model: 1.25.4
 
-  prosemirror-view@1.41.8:
+  prosemirror-view@1.41.4:
     dependencies:
-      prosemirror-model: 1.25.7
+      prosemirror-model: 1.25.4
       prosemirror-state: 1.4.4
-      prosemirror-transform: 1.12.0
+      prosemirror-transform: 1.10.5
 
   protobufjs@7.5.4:
     dependencies:
@@ -16550,8 +15785,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  run-applescript@7.1.0: {}
-
   run-parallel@1.2.0:
     dependencies:
       queue-microtask: 1.2.3
@@ -16574,8 +15807,6 @@ snapshots:
 
   safer-buffer@2.1.2: {}
 
-  sax@1.6.0: {}
-
   scheduler@0.25.0-rc-603e6108-20241029: {}
 
   scheduler@0.27.0: {}
@@ -16704,8 +15935,6 @@ snapshots:
       side-channel-map: 1.0.1
       side-channel-weakmap: 1.0.2
 
-  siginfo@2.0.0: {}
-
   signal-exit@3.0.7: {}
 
   signal-exit@4.1.0: {}
@@ -16785,17 +16014,8 @@ snapshots:
     dependencies:
       minipass: 3.3.6
 
-  stackback@0.0.2: {}
-
-  standardwebhooks@1.0.0:
-    dependencies:
-      '@stablelib/base64': 1.0.1
-      fast-sha256: 1.3.0
-
   statuses@2.0.2: {}
 
-  std-env@4.1.0: {}
-
   stream-browserify@3.0.0:
     dependencies:
       inherits: 2.0.4
@@ -16962,8 +16182,6 @@ snapshots:
 
   tiny-invariant@1.3.3: {}
 
-  tinybench@2.9.0: {}
-
   tinyexec@1.0.2: {}
 
   tinyglobby@0.2.15:
@@ -16971,8 +16189,6 @@ snapshots:
       fdir: 6.5.0(picomatch@4.0.3)
       picomatch: 4.0.3
 
-  tinyrainbow@3.1.0: {}
-
   tiptap-markdown@0.9.0(@tiptap/core@3.22.4(@tiptap/pm@3.22.4)):
     dependencies:
       '@tiptap/core': 3.22.4(@tiptap/pm@3.22.4)
@@ -17032,8 +16248,6 @@ snapshots:
 
   trough@2.2.0: {}
 
-  ts-algebra@2.0.0: {}
-
   ts-api-utils@2.1.0(typescript@5.9.3):
     dependencies:
       typescript: 5.9.3
@@ -17289,54 +16503,8 @@ snapshots:
       terser: 5.46.0
       yaml: 2.8.2
 
-  vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.46.0)(yaml@2.8.2):
-    dependencies:
-      esbuild: 0.27.2
-      fdir: 6.5.0(picomatch@4.0.3)
-      picomatch: 4.0.3
-      postcss: 8.5.6
-      rollup: 4.54.0
-      tinyglobby: 0.2.15
-    optionalDependencies:
-      '@types/node': 25.0.3
-      fsevents: 2.3.3
-      jiti: 2.6.1
-      lightningcss: 1.30.2
-      terser: 5.46.0
-      yaml: 2.8.2
-
-  vitest@4.1.7(@opentelemetry/api@1.9.0)(@types/node@25.0.3)(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.46.0)(yaml@2.8.2)):
-    dependencies:
-      '@vitest/expect': 4.1.7
-      '@vitest/mocker': 4.1.7(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.46.0)(yaml@2.8.2))
-      '@vitest/pretty-format': 4.1.7
-      '@vitest/runner': 4.1.7
-      '@vitest/snapshot': 4.1.7
-      '@vitest/spy': 4.1.7
-      '@vitest/utils': 4.1.7
-      es-module-lexer: 2.0.0
-      expect-type: 1.3.0
-      magic-string: 0.30.21
-      obug: 2.1.1
-      pathe: 2.0.3
-      picomatch: 4.0.3
-      std-env: 4.1.0
-      tinybench: 2.9.0
-      tinyexec: 1.0.2
-      tinyglobby: 0.2.15
-      tinyrainbow: 3.1.0
-      vite: 7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.46.0)(yaml@2.8.2)
-      why-is-node-running: 2.3.0
-    optionalDependencies:
-      '@opentelemetry/api': 1.9.0
-      '@types/node': 25.0.3
-    transitivePeerDependencies:
-      - msw
-
   vscode-jsonrpc@8.2.0: {}
 
-  vscode-jsonrpc@8.2.1: {}
-
   vscode-languageserver-protocol@3.17.5:
     dependencies:
       vscode-jsonrpc: 8.2.0
@@ -17438,11 +16606,6 @@ snapshots:
     dependencies:
       isexe: 2.0.0
 
-  why-is-node-running@2.3.0:
-    dependencies:
-      siginfo: 2.0.0
-      stackback: 0.0.2
-
   wmf@1.0.2: {}
 
   word-wrap@1.2.5: {}
@@ -17469,11 +16632,6 @@ snapshots:
 
   wrappy@1.0.2: {}
 
-  wsl-utils@0.3.1:
-    dependencies:
-      is-wsl: 3.1.1
-      powershell-utils: 0.1.0
-
   x-is-array@0.1.0: {}
 
   x-is-string@0.1.0: {}
@@ -17488,10 +16646,6 @@ snapshots:
       wmf: 1.0.2
       word: 0.3.0
 
-  xml-js@1.6.11:
-    dependencies:
-      sax: 1.6.0
-
   xmlbuilder2@2.1.2:
     dependencies:
       '@oozcitak/dom': 1.15.5
diff --git a/apps/x/pnpm-workspace.yaml b/apps/x/pnpm-workspace.yaml
index f5cdd141..57f726cf 100644
--- a/apps/x/pnpm-workspace.yaml
+++ b/apps/x/pnpm-workspace.yaml
@@ -2,9 +2,6 @@ packages:
   - apps/*
   - packages/*
 
-catalog:
-  vitest: 4.1.7
-
 onlyBuiltDependencies:
   - core-js
   - electron
@@ -13,5 +10,3 @@ onlyBuiltDependencies:
   - fs-xattr
   - macos-alias
   - protobufjs
-patchedDependencies:
-  '@openai/codex@0.128.0': patches/@openai__codex@0.128.0.patch