fix: use floor instead of round in CodeScene ratchet

round(9.8457, 2) → 9.85 which exceeds the actual score, causing
the threshold to be unreachable. Use math.floor to truncate instead:
9.8457 → 9.84, 9.3884 → 9.38.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

.claude/commands/laputa-done.md

@@ -0,0 +1,50 @@
+# /laputa-done <task_id>
+
+Mark a Laputa task as done: add completion comment, move to In Review, notify Brian, then self-dispatch the next task.
+
+Run this after Phase 1 (Playwright) and Phase 2 (native app QA) both pass **and `git push origin main` has succeeded**.
+
+⚠️ A task is NOT done until the push succeeds. If the push is blocked by the pre-push hook (clippy, tests, CodeScene, build):
+- Read the error
+- Fix it (never use `--no-verify`)
+- Commit the fix and push again
+- Repeat until push exits with code 0
+
+## Steps
+
+**1. Add completion comment to the task**
+
+Summarize what was done — this is the context Luca and Brian will read in Todoist:
+
+```bash
+curl -s -X POST "https://api.todoist.com/api/v1/comments" \
+  -H "Authorization: Bearer $TODOIST_API_KEY" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "task_id": "$ARGUMENTS",
+    "content": "✅ Implementation complete.\n\n**What changed:** [brief summary of the implementation]\n**ADR:** [if an ADR was created, reference it here; otherwise omit]\n**Playwright:** all tests pass\n**Native QA:** tested with pnpm tauri dev — [describe what was tested and what was observed]"
+  }'
+```
+
+**2. Move task to In Review**
+
+```bash
+curl -s -X POST "https://api.todoist.com/api/v1/tasks/$ARGUMENTS/move" \
+  -H "Authorization: Bearer $TODOIST_API_KEY" \
+  -H "Content-Type: application/json" \
+  -d '{"section_id": "6g3XjX33FF4Vj86M"}'
+```
+
+**3. Notify Luca (informational only — no action needed from him)**
+
+```bash
+openclaw system event --text "laputa-task-done:$ARGUMENTS" --mode now
+```
+
+This is a passive notification. Luca reviews tasks in his own time. Do NOT wait for approval — proceed immediately to step 4.
+
+**4. Pick the next task**
+
+Run `/laputa-next-task` to get the next task and start working on it immediately.
+
+If `/laputa-next-task` returns `NO_TASKS` → exit cleanly. The hourly watchdog will restart you when new tasks arrive.

.claude/commands/laputa-next-task.md

@@ -0,0 +1,43 @@
+# /laputa-next-task
+
+Pick the next Laputa task from Todoist and move it to In Progress.
+
+Priority order: **To Rework** first, then **Open** (sorted by Todoist priority p1→p4).
+
+## Steps
+
+1. Fetch tasks from To Rework (`6g6QqvR9rRpvJWvv`), then Open (`6g3XjWR832hVHhCM`)
+2. Sort each section by priority (p1 highest)
+3. Take the first available task
+4. Move it to In Progress (`6g3XjWjfmJFcGgHM`) via Todoist API:
+
+```bash
+curl -s -X POST "https://api.todoist.com/api/v1/tasks/<task_id>/move" \
+  -H "Authorization: Bearer $TODOIST_API_KEY" \
+  -H "Content-Type: application/json" \
+  -d '{"section_id": "6g3XjWjfmJFcGgHM"}'
+```
+
+5. Add a "started" comment to the task:
+
+```bash
+curl -s -X POST "https://api.todoist.com/api/v1/comments" \
+  -H "Authorization: Bearer $TODOIST_API_KEY" \
+  -H "Content-Type: application/json" \
+  -d '{"task_id": "<task_id>", "content": "🚀 Starting work. [Brief description of approach or what needs to be fixed]"}'
+```
+
+6. Fetch the full task details (description, comments) from Todoist:
+
+```bash
+curl -s "https://api.todoist.com/api/v1/tasks/<task_id>" \
+  -H "Authorization: Bearer $TODOIST_API_KEY"
+
+curl -s "https://api.todoist.com/api/v1/comments?task_id=<task_id>" \
+  -H "Authorization: Bearer $TODOIST_API_KEY"
+```
+
+6. For To Rework tasks: read the ❌ QA failed comment — it tells you exactly what to fix
+7. Output: task ID, title, and full description so you can start working immediately
+
+If no tasks are available in either section → output `NO_TASKS` and exit cleanly.

.codescene-thresholds

@@ -0,0 +1,2 @@
+HOTSPOT_THRESHOLD=9.84
+AVERAGE_THRESHOLD=9.38

.husky/pre-push

@@ -110,12 +110,19 @@ else
   echo "⏭️  [4/5] Playwright smoke tests — skipped (no tests/smoke/*.spec.ts)"
 fi
 
-# ── 5. CodeScene code health gate ────────────────────────────────────────
-# Blocks push if Hotspot < 9.5 OR Average < 9.33.
-# Remote scores reflect state after last push — this catches regressions
-# introduced in a previous push that weren't caught yet.
+# ── 5. CodeScene code health gate (ratchet) ──────────────────────────────
+# Thresholds live in .codescene-thresholds and only ever go UP (ratchet).
+# After every successful push the file is updated if scores improved.
+THRESHOLDS_FILE="$(git rev-parse --show-toplevel)/.codescene-thresholds"
+HOTSPOT_MIN=9.5
+AVERAGE_MIN=9.31
+if [ -f "$THRESHOLDS_FILE" ]; then
+  HOTSPOT_MIN=$(grep HOTSPOT_THRESHOLD "$THRESHOLDS_FILE" | cut -d= -f2)
+  AVERAGE_MIN=$(grep AVERAGE_THRESHOLD "$THRESHOLDS_FILE" | cut -d= -f2)
+fi
+
 echo ""
-echo "🏥 [5/5] CodeScene code health (Hotspot ≥9.5 + Average ≥9.33)..."
+echo "🏥 [5/5] CodeScene code health (Hotspot ≥${HOTSPOT_MIN} + Average ≥${AVERAGE_MIN})..."
 if [ -z "$CODESCENE_PAT" ] || [ -z "$CODESCENE_PROJECT_ID" ]; then
   echo "  ⚠️  CODESCENE_PAT or CODESCENE_PROJECT_ID not set — skipping"
 else
@@ -128,25 +135,44 @@ else
   if [ -z "$HOTSPOT_SCORE" ] || [ -z "$AVERAGE_SCORE" ]; then
     echo "  ⚠️  Could not fetch remote scores — skipping (CI will enforce)"
   else
-    echo "  Remote Hotspot Code Health: $HOTSPOT_SCORE (threshold: 9.5)"
-    echo "  Remote Average Code Health: $AVERAGE_SCORE (threshold: 9.33)"
+    echo "  Remote Hotspot Code Health: $HOTSPOT_SCORE (threshold: $HOTSPOT_MIN)"
+    echo "  Remote Average Code Health: $AVERAGE_SCORE (threshold: $AVERAGE_MIN)"
     python3 -c "
-import sys
+import sys, os
+
 hotspot = float('$HOTSPOT_SCORE')
 average = float('$AVERAGE_SCORE')
+hotspot_min = float('$HOTSPOT_MIN')
+average_min = float('$AVERAGE_MIN')
 failed = False
-if hotspot < 9.5:
-    print(f'FAIL: Hotspot Code Health {hotspot:.2f} < 9.5')
+
+if hotspot < hotspot_min:
+    print(f'FAIL: Hotspot Code Health {hotspot:.2f} < {hotspot_min}')
     failed = True
 else:
-    print(f'OK: Hotspot {hotspot:.2f} >= 9.5')
-if average < 9.33:
-    print(f'FAIL: Average Code Health {average:.2f} < 9.33 — regressions detected, fix before pushing')
+    print(f'OK: Hotspot {hotspot:.2f} >= {hotspot_min}')
+
+if average < average_min:
+    print(f'FAIL: Average Code Health {average:.2f} < {average_min} — regressions detected, fix before pushing')
     failed = True
 else:
-    print(f'OK: Average {average:.2f} >= 9.33')
+    print(f'OK: Average {average:.2f} >= {average_min}')
+
 if failed:
     sys.exit(1)
+
+# Ratchet: update thresholds file if scores improved
+# Truncate (floor) to 2 decimals so the threshold never exceeds the actual score
+import math
+thresholds_file = '$THRESHOLDS_FILE'
+new_hotspot = max(hotspot_min, math.floor(hotspot * 100) / 100)
+new_average = max(average_min, math.floor(average * 100) / 100)
+if new_hotspot > hotspot_min or new_average > average_min:
+    with open(thresholds_file, 'w') as f:
+        f.write(f'HOTSPOT_THRESHOLD={new_hotspot}\nAVERAGE_THRESHOLD={new_average}\n')
+    print(f'  📈 Ratchet updated: Hotspot {hotspot_min} → {new_hotspot}, Average {average_min} → {new_average}')
+    # Stage and amend the thresholds update into the last commit would change history — instead just auto-commit it
+    os.system(f'git add {thresholds_file} && git commit -m \"chore: ratchet CodeScene thresholds to {new_hotspot}/{new_average}\" --no-verify 2>/dev/null || true')
 " || exit 1
   fi
 fi

CLAUDE.md

@@ -1,38 +1,32 @@
 # CLAUDE.md — Laputa App
 
-## ⛔ BEFORE EVERY COMMIT
+> Quick links: [Project Spec](docs/PROJECT-SPEC.md) · [Architecture](docs/ARCHITECTURE.md) · [Abstractions](docs/ABSTRACTIONS.md) · [Wireframes](ui-design.pen)
 
-```bash
-pnpm lint && npx tsc --noEmit
-pnpm test
-pnpm test:coverage                  # frontend ≥70%
-cargo test
-cargo llvm-cov --manifest-path src-tauri/Cargo.toml --no-clean --fail-under-lines 85
-```
+---
 
-**CodeScene Code Health** — the pre-commit and pre-push hooks enforce:
-- Hotspot Code Health ≥ 9.5 (most-edited files)
-- Average Code Health ≥ 9.31 (project-wide, ALL files)
+## 1. Task Workflow
 
-**Both gates block commit/push.** If either fails: extract hooks, split large components, reduce function complexity. Never add `// eslint-disable`, `#[allow(...)]`, or `as any` to pass the gate. Check both scores via MCP CodeScene after every significant change:
-- `hotspot_code_health.now` ≥ 9.5
-- `code_health.now` ≥ 9.31 (average — do NOT ignore this one)
+### 1a. Pick up a task
 
-If Average Code Health is below 9.0, you must fix regressions before pushing — even in files you didn't directly modify, if your changes indirectly affected complexity.
+Run `/laputa-next-task` — fetches next task (To Rework first, then Open), moves to In Progress, returns full description.
 
-**Boy Scout Rule (Robert C. Martin):** Leave every file you touch better than you found it. When working on any task:
-1. Before modifying a file, check its CodeScene health: `mcp__codescene__code_health_review`
-2. If the file has issues (complexity, duplication, large functions), fix them as part of your work
-3. After your changes, verify the file's score is higher than before: `mcp__codescene__code_health_score`
-4. The goal: every commit either maintains or raises the overall average. No commit should lower it.
+- Read task description and all comments fully
+- For To Rework: the ❌ QA failed comment tells you exactly what to fix
+- Check `docs/adr/` for relevant architecture decisions before structural choices
+- Add a comment: `🚀 Starting work on this task. [Brief description of approach]`
 
-This is not optional — it's how we incrementally raise the codebase quality with every task.
+### 1b. Implement
 
-## ⛔ BEFORE FIRING laputa-task-done — Two-phase QA
+- Work on `main` branch — **no branches, no PRs, ever**
+- Commit every 20–30 min: `feat:`, `fix:`, `refactor:`, `test:`, `docs:`
+- **⛔ NEVER use --no-verify**
+- For UI tasks: open `ui-design.pen` first, study visual language, design in light mode
 
-### Phase 1: Playwright (you do this)
+### 1c. When done
 
-Write a test in `tests/smoke/<slug>.spec.ts` that covers every acceptance criterion. The test must fail before your fix and pass after. Run it:
+**Phase 1 — Playwright (only for core user flows):**
+
+Write smoke test in `tests/smoke/<slug>.spec.ts` only if feature touches: vault open, note create/save/delete, search, wikilink navigation, git commit/push, conflict resolution. Do NOT write Playwright tests for cosmetic changes — use Vitest instead. Suite must stay under **10 minutes**.
 
 ```bash
 pnpm dev --port 5201 &
@@ -40,82 +34,91 @@ sleep 3
 BASE_URL="http://localhost:5201" npx playwright test tests/smoke/<slug>.spec.ts
 ```
 
-**If your task touches filesystem, git, AI, MCP, or any native Tauri command**: also test with `pnpm tauri dev` against `~/Laputa` (not demo vault). Use `osascript` keyboard events — no mouse, no `cliclick`.
-
-### Phase 2: Native QA (Brian does this after push)
-
-Brian installs the release build and runs keyboard-only QA. Phase 1 must pass first or the task goes to To Rework.
-
-Fire done signal only after Phase 1 passes — **two steps, both required**:
+**Phase 2 — Native app QA:**
 
 ```bash
-# 1. Move task to In Review on Todoist
-curl -s -X POST "https://api.todoist.com/api/v1/tasks/<task_id>/move" \
-  -H "Authorization: Bearer $TODOIST_API_KEY" \
-  -H "Content-Type: application/json" \
-  -d '{"section_id": "6g3XjX33FF4Vj86M"}'
-
-# 2. Notify Brian
-openclaw system event --text "laputa-task-done:<task_id>" --mode now
+pnpm tauri dev &
+sleep 10
+bash ~/.openclaw/skills/laputa-qa/scripts/focus-app.sh laputa
+bash ~/.openclaw/skills/laputa-qa/scripts/screenshot.sh /tmp/qa-native.png
 ```
 
-## Project
+Use `osascript` for keyboard interactions. Write result as Todoist comment (✅ or ❌). **⚠️ WKWebView:** `osascript keystroke` blocked inside editor — rely on Playwright for text input features.
 
-Tauri v2 + React + TypeScript desktop app. Reads a vault of markdown files with YAML frontmatter.
+After both phases pass, run `/laputa-done <task_id>` → moves to In Review, notifies Brian, self-dispatches next task.
 
-- **Spec**: `docs/PROJECT-SPEC.md` | **Architecture**: `docs/ARCHITECTURE.md` | **Abstractions**: `docs/ABSTRACTIONS.md`
-- **Wireframes**: `ui-design.pen` | **Luca's vault**: `~/Laputa/` (~9200 markdown files)
-- Stack: Rust backend, React + BlockNote editor, Vitest + Playwright + cargo test, pnpm
+---
 
-## How to Work
+## 2. Development Process
 
-- **Push directly to main** — no PRs ever. The pre-push hook runs all checks.
-- **⛔ NEVER open a PR** — branches diverge and cause rebase churn.
+### Commits & pushes
+
+- Push directly to `main` — no PRs, no branches
+- Pre-push hook runs full check suite (build + tests + Playwright + CodeScene)
+- **A task is NOT done until `git push origin main` succeeds.** If the hook blocks: read the error, fix it (clippy, tests, CodeScene, build), commit the fix, push again. Never use `--no-verify`.
 - **⛔ NEVER use --no-verify**
-- Commit every 20–30 min: `feat:`, `fix:`, `refactor:`, `test:`, `docs:`
 
-## TDD (mandatory)
+### TDD (mandatory)
 
-Red → Green → Refactor → Commit. One cycle per commit. For bugs: write a failing regression test first, then fix. Exception: pure CSS/layout with no logic.
+Red → Green → Refactor → Commit. One cycle per commit. For bugs: write failing regression test first, then fix. Exception: pure CSS/layout changes.
 
-**Test quality (Kent Beck's Desiderata):** every test must be Isolated (no shared state), Deterministic (no flakiness), Fast, Behavioral (tests behavior not implementation), Structure-insensitive (refactoring doesn't break it), Specific (failure points to exact cause), Predictive (all pass = production-ready). Fix flaky/non-deterministic tests before adding new ones. E2E tests over unit tests for user flows.
+**Test quality (Kent Beck's Desiderata):** Isolated · Deterministic · Fast · Behavioral · Structure-insensitive · Specific · Predictive. Fix flaky tests before adding new ones. Prefer E2E over unit tests for user flows.
 
-## ⛔ Docs — Keep docs/ in sync
+### Code health (mandatory)
 
-After adding a Tauri command, new component/hook, data model change, or new integration: update `docs/ARCHITECTURE.md`, `docs/ABSTRACTIONS.md`, and/or `docs/GETTING-STARTED.md` in the same commit. Use Mermaid for diagrams (not ASCII). Exception: spatial wireframe layouts.
+Pre-commit and pre-push hooks enforce **Hotspot Code Health** and **Average Code Health** ≥ thresholds in `.codescene-thresholds`. Both gates block commit/push. Thresholds are a **ratchet** — only go up, auto-updated after each successful push. Never add `// eslint-disable`, `#[allow(...)]`, or `as any`.
 
-## Architecture Decision Records (ADRs)
+**Before every commit:**
+- `mcp__codescene__code_health_review` — check file before touching
+- `mcp__codescene__code_health_score` — verify score is higher after changes
 
-ADRs live in `docs/adr/`. Before making an architectural choice, check existing ADRs there first.
+**Boy Scout Rule:** every file you touch must leave with a higher score. If Average drops below 9.0, fix regressions before pushing.
 
-**When to create one**: storage strategy, new dependency, platform support, core abstraction change, cross-cutting concern. Use `/create-adr` for the full template and instructions.
+### Check suite (runs on every push)
+```bash
+pnpm lint && npx tsc --noEmit
+pnpm test
+pnpm test:coverage        # frontend ≥70%
+cargo test
+cargo llvm-cov --manifest-path src-tauri/Cargo.toml --no-clean --fail-under-lines 85
+```
 
-**When your work supersedes an existing ADR**: do not edit the existing file — use `/create-adr` which covers the superseding flow.
+### Architecture Decision Records (ADRs)
 
-**Do not create ADRs for**: bug fixes, UI styling, refactors, or test additions.
+ADRs live in `docs/adr/`. Check before structural choices. Create the ADR **in the same commit as the code**. Never edit existing ADRs — create a new one that supersedes. Use `/create-adr` for template.
 
-## Design File (UI tasks)
+**When to create one:** new dependency, storage strategy, platform target, core abstraction change, cross-cutting pattern. **Not for:** bug fixes, UI styling, refactors, test additions.
 
-1. Open `ui-design.pen` first — study existing frames for visual language.
-2. Design in light mode. Create `design/<slug>.pen` for the task.
-3. On merge to main: merge frames into `ui-design.pen`, delete `design/<slug>.pen`.
+### Keep docs/ in sync
 
-## Vault Retrocompatibility
+After Tauri command, new component/hook, data model change, or new integration: update `docs/ARCHITECTURE.md`, `docs/ABSTRACTIONS.md`, and/or `docs/GETTING-STARTED.md` in the same commit.
 
-Every feature that depends on vault files must auto-bootstrap: check if file/folder exists on vault open, create with defaults if missing (silent, idempotent). Register with the central `Cmd+K → "Repair Vault"` command.
+---
 
-## Keyboard-First + Menu Bar (mandatory)
+## 3. Product Rules
 
-Every feature must be reachable via keyboard. Every new command palette entry must also appear in the macOS menu bar (File / Edit / View / Note / Vault / Window). This is a QA requirement.
+### User vault (`~/Laputa/`)
 
-## macOS / Tauri Gotchas
+Default to `demo-vault-v2/`. If you must use `~/Laputa/` for testing: **never commit changes** — always run `cd ~/Laputa && git checkout -- . && git clean -fd` when done.
 
-- `Option+N` → special chars on macOS. Use `e.code` or `Cmd+N`.
-- Tauri menu accelerators: `MenuItemBuilder::new(label).accelerator("CmdOrCtrl+1")`.
-- `app.set_menu()` replaces the ENTIRE menu bar — include all submenus.
-- `mock-tauri.ts` silently swallows Tauri calls — not a substitute for native app testing.
+### UI design
 
-## QA Scripts
+1. Open `ui-design.pen` first — study existing frames for visual language
+2. Design in light mode. Create `design/<slug>.pen` for the task
+3. On completion: merge frames into `ui-design.pen`, delete `design/<slug>.pen`
+
+---
+
+## 4. Reference
+
+### macOS / Tauri gotchas
+
+- `Option+N` → special chars on macOS. Use `e.code` or `Cmd+N`
+- Tauri menu accelerators: `MenuItemBuilder::new(label).accelerator("CmdOrCtrl+1")`
+- `app.set_menu()` replaces the ENTIRE menu bar — include all submenus
+- `mock-tauri.ts` silently swallows Tauri calls — not a substitute for native testing
+
+### QA scripts
 
 ```bash
 bash ~/.openclaw/skills/laputa-qa/scripts/focus-app.sh laputa
@@ -123,6 +126,6 @@ bash ~/.openclaw/skills/laputa-qa/scripts/screenshot.sh /tmp/out.png
 bash ~/.openclaw/skills/laputa-qa/scripts/shortcut.sh "command" "s"
 ```
 
-## Documentation Diagrams
+### Diagrams
 
-Prefer Mermaid for all diagrams (`flowchart`, `sequenceDiagram`, `classDiagram`, `stateDiagram-v2`). ASCII only for spatial wireframe layouts. GitHub renders Mermaid natively.
+Prefer Mermaid (`flowchart`, `sequenceDiagram`, `classDiagram`, `stateDiagram-v2`). ASCII only for spatial wireframe layouts.

docs/ABSTRACTIONS.md

@@ -523,7 +523,6 @@ App-level settings persisted at `~/.config/com.laputa.app/settings.json`:
 
 ```typescript
 interface Settings {
-  anthropic_key: string | null
   openai_key: string | null
   google_key: string | null
   github_token: string | null

docs/ARCHITECTURE.md

@@ -21,7 +21,7 @@ When deciding where to persist a piece of data, ask: **"Would the user want this
 | Follows the vault | Stays with the installation |
 |-------------------|-----------------------------|
 | Type icon, type color | Editor zoom level |
-| Pinned properties per type | API keys (Anthropic, OpenAI) |
+| Pinned properties per type | API keys (OpenAI, Google) |
 | Sidebar label overrides | GitHub token |
 | Property display order | Window size / position |
 | Any user-visible customization of how content is organized or displayed | Any machine-specific or credential-type setting |
@@ -31,7 +31,6 @@ When deciding where to persist a piece of data, ask: **"Would the user want this
 Examples:
 - ✅ Vault: `_pinned_properties` in a Type note (every device should show the same pinned properties)
 - ✅ Vault: `_icon: shapes` in a Type note (icon is part of the type's identity)
-- ✅ App settings: `anthropic_key` (credential, not vault data)
 - ✅ App settings: `zoom: 1.3` (machine-specific preference)
 
 ### No hardcoded exceptions
@@ -97,7 +96,6 @@ flowchart LR
 | Build | Vite | 7.3.1 |
 | Backend language | Rust (edition 2021) | 1.77.2 |
 | Frontmatter parsing | gray_matter | 0.2 |
-| AI (in-app chat) | Anthropic Claude API (Haiku 3.5 default) | - |
 | AI (agent panel) | Claude CLI subprocess (streaming NDJSON) | - |
 | Search | Keyword (walkdir-based file scan) | - |
 | MCP | @modelcontextprotocol/sdk | 1.0 |
@@ -116,14 +114,13 @@ flowchart TD
             NL["NoteList / PulseView\n(filtered list / activity)"]
             ED["Editor\n(BlockNote + diff + raw)"]
             IN["Inspector\n(metadata + relationships)"]
-            AIC["AIChatPanel\n(API-based chat)"]
             AIP["AiPanel\n(Claude CLI agent + tools)"]
             SP["SearchPanel\n(keyword search)"]
             ST["StatusBar\n(vault picker + sync + version)"]
             CP["CommandPalette\n(Cmd+K launcher)"]
 
             App --> WS & SB & NL & ED & SP & ST & CP
-            ED --> IN & AIC & AIP
+            ED --> IN & AIP
         end
 
         subgraph RB["Rust Backend"]
@@ -138,7 +135,6 @@ flowchart TD
         end
 
         subgraph EXT["External Services"]
-            ANTH["Anthropic API\n(Claude chat)"]
             CCLI["Claude CLI\n(agent subprocess)"]
             MCP["MCP Server\n(ws://9710, 9711)"]
             GHAPI["GitHub API\n(OAuth, repos, clone)"]
@@ -179,7 +175,7 @@ flowchart TD
 - **Sidebar** (150-400px, resizable): Top-level filters (All Notes, Changes, Pulse) and collapsible type-based section groups. Each type can have a custom icon, color, sort, and visibility set via its type document in `type/`.
 - **Note List / Pulse View** (200-500px, resizable): When a section group or filter is selected, shows filtered notes with snippets, modified dates, and status indicators. When Pulse filter is active, shows `PulseView` — a chronological git activity feed grouped by day.
 - **Editor** (flex, fills remaining space): Single note open at a time (no tabs — see ADR-0003). Breadcrumb bar with word count, BlockNote rich text editor with wikilink support. Can toggle to diff view (modified files) or raw CodeMirror view. Decomposed into `Editor` (orchestrator), `EditorContent`, `EditorRightPanel`, `SingleEditorView`, with hooks `useDiffMode`, `useEditorFocus`, `useEditorSave`, `useRawMode`. Navigation history (Cmd+[/]) replaces tabs.
-- **Inspector / AI Chat / AI Agent** (200-500px or 40px collapsed): Toggles between Inspector (frontmatter, relationships, instances, backlinks, git history), AI Chat panel (API-based), and AI Agent panel (Claude CLI subprocess with tool execution). The Sparkle icon in the breadcrumb bar toggles between them. When viewing a Type note, the Inspector shows an **Instances** section listing all notes of that type (sorted by modified_at desc, capped at 50).
+- **Inspector / AI Agent** (200-500px or 40px collapsed): Toggles between Inspector (frontmatter, relationships, instances, backlinks, git history) and AI Agent panel (Claude CLI subprocess with tool execution). The Sparkle icon in the breadcrumb bar toggles between them. When viewing a Type note, the Inspector shows an **Instances** section listing all notes of that type (sorted by modified_at desc, capped at 50).
 
 Panels are separated by `ResizeHandle` components that support drag-to-resize.
 
@@ -203,16 +199,6 @@ Notes can be opened in separate Tauri windows for focused editing. Secondary win
 
 ## AI System
 
-Laputa has two AI interfaces with distinct architectures:
-
-### AI Chat (AIChatPanel)
-
-Simple chat mode — no tool execution, streaming text responses.
-
-1. **Frontend** (`AIChatPanel` + `useAIChat` hook) — UI and state management
-2. **API Proxy** (Vite middleware in dev, Rust `ai_chat` command in Tauri) — routes to Anthropic
-3. **Context picker** — selected notes sent as system context with token estimation
-
 ### AI Agent (AiPanel)
 
 Full agent mode — spawns Claude CLI as a subprocess with tool access and MCP vault integration.
@@ -263,7 +249,7 @@ When the agent writes or edits vault files, `useAiAgent` detects this from tool
 
 ### Context Building
 
-Both AI modes use context from the active note and linked entries. The agent panel (`ai-context.ts`) builds a structured JSON snapshot:
+The agent panel (`ai-context.ts`) builds a structured JSON snapshot from the active note and linked entries:
 
 ```json
 {
@@ -277,19 +263,9 @@ Both AI modes use context from the active note and linked entries. The agent pan
 
 Token budget: 60% of 180k context limit (~108k tokens max). Active note gets priority, then linked notes, then truncation.
 
-### Models (Chat mode)
+### Authentication
 
-| Model | ID | Use case |
-|-------|----|----------|
-| Haiku 3.5 | `claude-3-5-haiku-20241022` | Fast, cheap — default |
-| Sonnet 4 | `claude-sonnet-4-20250514` | Balanced |
-| Opus 4 | `claude-opus-4-20250514` | Most capable |
-
-### API Key Management
-
-- Stored in app settings (`~/.config/com.laputa.app/settings.json`) under `anthropic_key`
-- Configurable via Settings panel (also supports `openai_key`, `google_key`)
-- Claude CLI (agent mode) uses its own authentication — no API key needed
+Claude CLI (agent mode) uses its own authentication — no API key configuration needed in Laputa.
 
 ## MCP Server
 
@@ -589,7 +565,6 @@ The vault backend (`src-tauri/src/vault/`) is split into focused submodules:
 | `github/` | GitHub OAuth + API (`auth.rs`, `api.rs`, `clone.rs`) |
 | `search.rs` | Keyword search — walkdir-based vault file scan |
 | `claude_cli.rs` | Claude CLI subprocess spawning + NDJSON stream parsing |
-| `ai_chat.rs` | Direct Anthropic API client (non-streaming, for Tauri builds) |
 | `mcp.rs` | MCP server spawning + config registration |
 | `commands/` | Tauri command handlers (split into submodules) |
 | `settings.rs` | App settings persistence |
@@ -674,7 +649,6 @@ The vault backend (`src-tauri/src/vault/`) is split into focused submodules:
 
 | Command | Description |
 |---------|-------------|
-| `ai_chat` | Direct Anthropic API call (non-streaming) |
 | `stream_claude_chat` | Claude CLI chat mode (streaming) |
 | `stream_claude_agent` | Claude CLI agent mode (streaming + tools) |
 | `check_claude_cli` | Check if Claude CLI is available |
@@ -726,7 +700,6 @@ No Redux or global context. State lives in the root `App.tsx` and custom hooks:
 | `useTabManagement` | Navigation history, note switching | Note navigation lifecycle |
 | `useVaultSwitcher` | `vaultPath`, `extraVaults` | Vault switching |
 | `useTheme` | Editor theme CSS vars | Editor typography theme |
-| `useAIChat` | `messages`, `isStreaming` | AI chat conversation |
 | `useAiAgent` | `messages`, `status`, tool actions | AI agent conversation |
 | `useAutoSync` | Sync interval, pull/push state | Git auto-sync |
 | `useUnifiedSearch` | Query, results, loading state | Keyword search |

docs/GETTING-STARTED.md

@@ -53,7 +53,6 @@ laputa-app/
 │   │   ├── RawEditorView.tsx     # CodeMirror raw editor
 │   │   ├── Inspector.tsx         # Fourth panel: metadata + relationships
 │   │   ├── DynamicPropertiesPanel.tsx  # Editable frontmatter properties
-│   │   ├── AIChatPanel.tsx       # AI chat (API-based)
 │   │   ├── AiPanel.tsx           # AI agent (Claude CLI subprocess)
 │   │   ├── AiMessage.tsx         # Agent message display
 │   │   ├── AiActionCard.tsx      # Agent tool action cards
@@ -86,7 +85,6 @@ laputa-app/
 │   │   ├── useNoteActions.ts     # Composes creation + rename + frontmatter
 │   │   ├── useNoteCreation.ts   # Note/type/daily-note creation
 │   │   ├── useNoteRename.ts     # Note renaming + wikilink updates
-│   │   ├── useAIChat.ts          # AI chat state
 │   │   ├── useAiAgent.ts         # AI agent state + tool tracking
 │   │   ├── useAiActivity.ts      # MCP UI bridge listener
 │   │   ├── useAutoSync.ts        # Auto git pull/push
@@ -110,7 +108,7 @@ laputa-app/
 │   │   ├── wikilinks.ts          # Wikilink preprocessing pipeline
 │   │   ├── frontmatter.ts        # TypeScript YAML parser
 │   │   ├── ai-agent.ts           # Agent stream utilities
-│   │   ├── ai-chat.ts            # Chat API client + token estimation
+│   │   ├── ai-chat.ts            # Token estimation utilities
 │   │   ├── ai-context.ts         # Context snapshot builder
 │   │   ├── noteListHelpers.ts    # Sorting, filtering, date formatting
 │   │   ├── wikilink.ts           # Wikilink resolution
@@ -155,7 +153,6 @@ laputa-app/
 │   │   ├── telemetry.rs          # Sentry init + path scrubber
 │   │   ├── search.rs             # Keyword search (walkdir-based)
 │   │   ├── claude_cli.rs         # Claude CLI subprocess management
-│   │   ├── ai_chat.rs            # Direct Anthropic API client
 │   │   ├── mcp.rs                # MCP server lifecycle + registration
 │   │   ├── settings.rs           # App settings persistence
 │   │   ├── vault_config.rs       # Per-vault UI config
@@ -231,7 +228,6 @@ laputa-app/
 | File | Why it matters |
 |------|---------------|
 | `src/components/AiPanel.tsx` | AI agent panel — Claude CLI with tool execution, reasoning, actions. |
-| `src/components/AIChatPanel.tsx` | AI chat panel — API-based chat without tools. |
 | `src/hooks/useAiAgent.ts` | Agent state: messages, streaming, tool tracking, file detection. |
 | `src/utils/ai-context.ts` | Context snapshot builder for AI conversations. |
 

docs/IPAD-PROTOTYPE.md

@@ -30,7 +30,7 @@ Laputa can be ported to iPad using Tauri v2 iOS (beta) with **minimal code chang
 |---------|---------|---------------------|
 | Git operations | No `git` binary on iOS | **Option B (Working Copy)** for prototype; **Option A (isomorphic-git)** for production |
 | GitHub clone/push/pull | Depends on git CLI | Same as above |
-| Claude CLI streaming | No `claude` binary on iOS | Use Anthropic API directly (already available via `ai_chat`) |
+| Claude CLI streaming | No `claude` binary on iOS | Use Anthropic API directly (requires new implementation) |
 | MCP server / WS bridge | Spawns Node.js child process | Skip for mobile; explore in-process MCP later |
 | macOS menu bar | Desktop-only API | Touch-native navigation (already handled by React) |
 | Updater plugin | Desktop-only | Use TestFlight for updates |

docs/adr/0027-dual-ai-architecture.md

@@ -2,7 +2,8 @@
 type: ADR
 id: "0027"
 title: "Dual AI architecture (API chat + CLI agent)"
-status: active
+status: superseded
+superseded_by: "0028"
 date: 2026-03-01
 ---
 

docs/adr/0028-cli-agent-only-no-api-key.md

@@ -0,0 +1,40 @@
+---
+type: ADR
+id: "0028"
+title: "CLI agent only — no direct Anthropic API key"
+status: active
+date: 2026-03-29
+supersedes: "0027"
+---
+
+## Context
+
+ADR-0027 introduced a dual AI architecture: a lightweight API-based chat (AIChatPanel) using the Anthropic API directly, and a full CLI agent (AiPanel) spawning Claude CLI as a subprocess with MCP tool access. In practice, the API chat was never shipped to users — the CLI agent covered all use cases and provided a superior experience through tool access and MCP integration. Maintaining two codepaths added complexity, and requiring users to manage an Anthropic API key created friction.
+
+## Decision
+
+**Remove the direct Anthropic API integration entirely. AI is available exclusively via CLI agent subprocesses (Claude Code, and in the future Codex or other CLI agents).** No API key field in settings. The CLI agent authenticates via its own mechanism (e.g. `claude` CLI login).
+
+Removed:
+- `AIChatPanel` component, `useAIChat` hook
+- Rust `ai_chat` command and `ai_chat.rs` module
+- `anthropic_key` field from Settings (Rust and TypeScript)
+- Vite dev-server Anthropic API proxy (`aiChatProxyPlugin`, `aiAgentProxyPlugin`)
+
+Kept:
+- `AiPanel` + `useAiAgent` — Claude CLI subprocess with MCP vault integration
+- Shared utilities in `ai-chat.ts` (`trimHistory`, `formatMessageWithHistory`, `streamClaudeChat`, etc.)
+- `Cmd+I` keyboard shortcut and menu item for toggling the AI panel
+
+## Options considered
+
+- **Option A** (chosen): Remove API chat, keep CLI agent only. Simplifies codebase, removes API key management, single codepath.
+- **Option B**: Keep both but hide API chat behind feature flag. Adds dead code weight without benefit.
+- **Option C**: Replace CLI agent with API chat + manual tool calling. Loses MCP integration and Claude CLI features.
+
+## Consequences
+
+- Users no longer need to obtain or manage an Anthropic API key
+- Existing saved API keys are silently ignored (the field no longer exists in the Settings struct; serde skips unknown fields on deserialization)
+- Future CLI agents (Codex, etc.) can plug into the same `AiPanel` architecture
+- If a lightweight chat mode is needed later, it should be built as a CLI agent mode, not a separate API integration

docs/adr/0029-domain-command-builder-pattern.md

@@ -0,0 +1,29 @@
+---
+type: ADR
+id: "0029"
+title: "Domain command builder pattern for useCommandRegistry"
+status: active
+date: 2026-03-30
+---
+
+## Context
+
+`useCommandRegistry` was a 224-line "brain method" (CodeScene hotspot) that defined all command palette commands inline: navigation, note actions, git operations, view toggles, settings, type management, and filter controls. This monolithic structure scored 39 on CodeScene's complexity scale (target: ≤9.5 for hotspots), making it increasingly hard to add new commands without touching the central file.
+
+## Decision
+
+**Split command definitions into focused domain modules under `src/hooks/commands/`, each exporting a `build*Commands(config)` factory function. `useCommandRegistry` becomes a thin assembler that calls each builder and merges the results.** Domain modules: `navigationCommands`, `noteCommands`, `gitCommands`, `viewCommands`, `settingsCommands`, `typeCommands`, `filterCommands`. Shared types live in `commands/types.ts`; public API re-exported from `commands/index.ts`.
+
+## Options considered
+
+- **Option A** (chosen): Domain builder modules — each module owns its command shape and receives typed config. `useCommandRegistry` is pure assembly. All new files score 9.58–10.0. Downside: more files to navigate.
+- **Option B**: Split by file but keep one large hook calling sub-hooks — sub-hooks still need shared state passed down, similar coupling. No real complexity win.
+- **Option C**: Register commands imperatively via a global registry — decouples callers entirely. Downside: harder to trace, no TypeScript inference at the registration site, over-engineering for current scale.
+
+## Consequences
+
+- Adding a new command means editing the relevant domain module (e.g. `noteCommands.ts`) only, not touching the assembler.
+- Each domain module receives only the config it needs — explicit, typed interface, no hook dependency.
+- `useCommandRegistry` reduced from 224 lines to a thin assembler.
+- Pattern is consistent with the Rust commands/ module split (ADR-0030).
+- Re-evaluation trigger: if command count grows to the point where the assembler itself becomes a complexity hotspot.

docs/adr/0030-rust-commands-module-split.md

@@ -0,0 +1,29 @@
+---
+type: ADR
+id: "0030"
+title: "Rust commands/ module split by domain"
+status: active
+date: 2026-03-30
+---
+
+## Context
+
+`src-tauri/src/commands.rs` grew to 937 lines as Tauri command handlers accumulated for vault CRUD, git/GitHub sync, AI, system, and window operations. All commands shared a single file with no domain separation, making it hard to navigate, review, and extend. The file was a CodeScene hotspot dragging down overall code health.
+
+## Decision
+
+**Replace `commands.rs` with a `commands/` module split by domain: `vault.rs`, `git.rs`, `github.rs`, `ai.rs`, `system.rs`, and `mod.rs` (shared utilities + re-exports).** Each file owns the Tauri command handlers for its domain and the `#[cfg(desktop)]` / `#[cfg(mobile)]` stubs for platform-conditional availability. `mod.rs` is kept thin (≤100 lines) with no command logic — only re-exports and shared helpers (`expand_tilde`, `parse_build_label`).
+
+## Options considered
+
+- **Option A** (chosen): Domain-based module split — mirrors the TypeScript `hooks/commands/` pattern (ADR-0029). Each file is independently reviewable and scores well on code health. Downside: more files to navigate.
+- **Option B**: Split by platform (`desktop.rs`, `mobile.rs`) — aligns with `#[cfg(...)]` guards but mixes domain concerns. Harder to find a specific command.
+- **Option C**: Keep monolith but add section comments — zero file-count cost, but doesn't solve complexity or reviewability.
+
+## Consequences
+
+- `github.rs` separates GitHub OAuth/API commands from git sync commands (`git.rs`), matching the underlying Rust module split (`github/` vs `git/`).
+- Platform stubs (`#[cfg(mobile)]` error returns) live alongside the desktop implementation in the same domain file.
+- `mod.rs` re-exports all command functions so `lib.rs` `invoke_handler!` registration is unchanged.
+- New Tauri commands go into the appropriate domain file; if no domain fits, create a new one rather than putting it in `mod.rs`.
+- Re-evaluation trigger: if a single domain file (e.g. `vault.rs`) itself grows beyond ~300 lines and becomes a hotspot.

docs/adr/0031-full-app-for-note-windows.md

@@ -0,0 +1,30 @@
+---
+type: ADR
+id: "0031"
+title: "Full App instance for secondary note windows"
+status: active
+date: 2026-03-31
+---
+
+## Context
+
+Laputa supports opening a note in a secondary window ("Open in New Window"). The original implementation used a dedicated `NoteWindow` component — a thin shell that rendered only the editor, duplicating some App-level logic (vault loading, settings, keyboard shortcuts) in a simplified but diverging form. As the main App gained features (properties editing, zoom, command palette, keyboard shortcuts), the `NoteWindow` shell fell behind, requiring ongoing maintenance to keep parity.
+
+## Decision
+
+**Remove `NoteWindow` and render the full `App` component in secondary note windows.** The window type is detected at startup via URL query parameters (`?window=note&path=...&vault=...`). When in note-window mode, the App initialises with panels hidden (sidebar collapsed, inspector collapsed) and auto-opens the target note once vault entries load. The window title is kept in sync with the active note title via the Tauri window API.
+
+## Options considered
+
+- **Keep `NoteWindow` shell** (status quo): lower initial bundle weight per window, but divergence grows with every main-App feature. Rejected — maintenance cost dominates.
+- **Full `App` instance with URL-param mode** (chosen): complete feature parity for free; single code path for all window types. Trade-off: slightly heavier startup for secondary windows (full vault load), acceptable given local filesystem speed.
+- **IPC-driven secondary window (no vault reload)**: secondary window subscribes to primary window's vault state via Tauri events. Maximum efficiency, avoids double vault reads. Deferred — requires significant IPC plumbing; can be layered on top later without changing the rendering model.
+
+## Consequences
+
+- Removes ~163 lines (`NoteWindow.tsx` deleted entirely)
+- Secondary note windows get full feature parity: all keyboard shortcuts, properties panel, zoom, command palette, diff mode, raw editor
+- `useLayoutPanels` gains an `initialInspectorCollapsed` option to support the hidden-panel initial state
+- A new `src/utils/windowMode.ts` utility encapsulates URL-param detection — single source of truth for window-type logic
+- Vault is loaded independently in each note window (no shared state with the main window); writes go to the same filesystem so eventual consistency is maintained via file-watching
+- Triggers re-evaluation if: multiple simultaneous note windows cause measurable vault-read contention, or if IPC-driven shared-state windows become a product requirement

docs/adr/0032-status-bar-for-git-actions.md

@@ -0,0 +1,29 @@
+---
+type: ADR
+id: "0032"
+title: "Git actions (Changes, Pulse, Commit) in status bar, not sidebar"
+status: active
+date: 2026-03-31
+---
+
+## Context
+
+The Laputa sidebar originally surfaced git-related affordances — a "Changes" nav item (visible when modified files > 0), a "Pulse" nav item, and a "Commit & Push" button — alongside the note-type navigation filters and sections. This mixed two concerns in the sidebar: **navigation** (where to go) and **git status / actions** (what changed, what to do). As the sidebar grew, the git items created visual noise and made the nav hierarchy harder to scan.
+
+## Decision
+
+**Move Changes, Pulse, and Commit & Push out of the sidebar and into the bottom status bar.** The status bar shows a GitDiff icon with an orange count badge for modified files; a Pulse icon sits next to it. Commit & Push is accessible via an icon button beside the Changes indicator. The sidebar now contains only navigation items (filters and type sections).
+
+## Options considered
+
+- **Keep git items in sidebar** (status quo): familiar placement, visible at all times. Rejected — mixes navigation and action concerns; sidebar becomes harder to scan.
+- **Status bar** (chosen): consistent with app conventions (build number, sync status, vault switcher already live there); persistent but unobtrusive; follows macOS app patterns where status/action items live at window bottom.
+- **Toolbar / breadcrumb bar**: would require a new chrome layer or polluting the per-note breadcrumb with global git state. Rejected.
+
+## Consequences
+
+- Sidebar props `modifiedCount`, `onCommitPush`, `isGitVault` removed; sidebar renders navigation-only
+- `StatusBar` gains `onClickPending`, `onClickPulse`, `onCommitPush`, `isGitVault` props
+- Sidebar tests for Changes/Pulse/Commit button removed; StatusBar tests extended
+- Users find Commit & Push in the status bar (same location as sync indicators) rather than bottom of sidebar — small discoverability change, offset by status bar being always visible regardless of sidebar collapsed state
+- Triggers re-evaluation if: user research shows git actions are hard to discover in the status bar

docs/adr/0033-subfolder-scanning-and-folder-tree.md

@@ -0,0 +1,33 @@
+---
+type: ADR
+id: "0033"
+title: "Subfolder scanning and folder tree navigation"
+status: active
+date: 2026-03-31
+---
+
+## Context
+
+Supersedes the scanning constraint in [ADR-0006](0006-flat-vault-structure.md) which limited vault indexing to root-level `.md` files plus protected folders (`attachments/`, `assets/`).
+
+Users with folder-based workflows (PARA, Zettelkasten with folders, project directories) could not see or filter notes by directory. The vault scanner silently ignored all subdirectory `.md` files, making Laputa unsuitable for vaults with any folder structure.
+
+## Decision
+
+**Extend the Rust vault scanner to index `.md` files in all visible subdirectories, and expose the vault's folder tree via a new `list_vault_folders` Tauri command so the sidebar can render a collapsible FOLDERS section.**
+
+Hidden directories (names starting with `.`, plus `.git` and `.laputa`) are excluded from both scanning and the folder tree.
+
+## Options considered
+
+- **Option A** (chosen): Scan all subdirectories with `walkdir`, expose separate `list_vault_folders` command — simple, no schema changes to VaultEntry, folder tree is lightweight and independent of the entry cache.
+- **Option B**: Add a `folder` field to VaultEntry and derive the tree on the frontend — couples folder metadata to the entry cache, complicates cache invalidation when folders are created/deleted without file changes.
+- **Option C**: Keep flat scanning, add a "virtual folders" feature that groups by path prefix from frontmatter — doesn't solve the core problem of missing notes in subdirectories.
+
+## Consequences
+
+- All `.md` files in the vault are now indexed regardless of depth — vaults with many non-note `.md` files (e.g. node_modules) will see spurious entries. Mitigation: hidden directories are already excluded; users can add a `.laputaignore` in the future if needed.
+- The git-based cache in `cache.rs` already uses `walkdir` for change detection, so this change aligns scanning with caching.
+- `SidebarSelection` gains a new `{ kind: 'folder'; path: string }` variant — all exhaustive switches on selection kind must handle it.
+- ADR-0006's "flat vault" principle is relaxed: notes can now live in subdirectories. Type definitions still live in `type/` at the root.
+- Re-evaluate if users request recursive folder filtering (currently only direct children are shown when a folder is selected).

docs/adr/README.md

@@ -82,4 +82,10 @@ proposed → active → superseded
 | [0024](0024-cache-outside-vault.md) | Vault cache stored outside vault directory | active |
 | [0025](0025-type-field-canonical.md) | type: as canonical field (replacing Is A:) | active |
 | [0026](0026-props-down-no-global-state.md) | Props-down callbacks-up (no global state) | active |
-| [0027](0027-dual-ai-architecture.md) | Dual AI architecture (API chat + CLI agent) | active |
+| [0027](0027-dual-ai-architecture.md) | Dual AI architecture (API chat + CLI agent) | superseded |
+| [0028](0028-cli-agent-only-no-api-key.md) | CLI agent only — no direct Anthropic API key | active |
+| [0029](0029-domain-command-builder-pattern.md) | Domain command builder pattern for useCommandRegistry | active |
+| [0030](0030-rust-commands-module-split.md) | Rust commands/ module split by domain | active |
+| [0031](0031-full-app-for-note-windows.md) | Full App instance for secondary note windows | active |
+| [0032](0032-status-bar-for-git-actions.md) | Git actions (Changes, Pulse, Commit) in status bar, not sidebar | active |
+| [0033](0033-subfolder-scanning-and-folder-tree.md) | Subfolder scanning and folder tree navigation | active |

index.html

@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-    <link href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@400;500;600&family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet" />
+    <link href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@400;500;600&family=Inter:wght@400;500;600;700&family=JetBrains+Mono&display=swap" rel="stylesheet" />
     <title>laputa-scaffold</title>
   </head>
   <body>

package.json

@@ -32,6 +32,7 @@
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",
+    "@lezer/highlight": "^1.2.3",
     "@mantine/core": "^8.3.14",
     "@phosphor-icons/react": "^2.1.10",
     "@radix-ui/react-dialog": "^1.1.15",

pnpm-lock.yaml

@@ -47,6 +47,9 @@ importers:
       '@dnd-kit/utilities':
         specifier: ^3.2.2
         version: 3.2.2(react@19.2.4)
+      '@lezer/highlight':
+        specifier: ^1.2.3
+        version: 1.2.3
       '@mantine/core':
         specifier: ^8.3.14
         version: 8.3.14(@mantine/hooks@8.3.14(react@19.2.4))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)

src-tauri/src/ai_chat.rs

@@ -1,386 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Deserialize)]
-pub struct AiChatRequest {
-    pub model: Option<String>,
-    pub messages: Vec<AiMessage>,
-    pub system: Option<String>,
-    pub max_tokens: Option<u32>,
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-pub struct AiMessage {
-    pub role: String,
-    pub content: String,
-}
-
-#[derive(Debug, Serialize)]
-pub struct AiChatResponse {
-    pub content: String,
-    pub model: String,
-    pub stop_reason: Option<String>,
-}
-
-#[derive(Debug, Deserialize)]
-struct AnthropicResponse {
-    content: Vec<ContentBlock>,
-    model: String,
-    stop_reason: Option<String>,
-}
-
-#[derive(Debug, Deserialize)]
-struct ContentBlock {
-    text: Option<String>,
-}
-
-#[derive(Debug, Serialize)]
-struct AnthropicRequest {
-    model: String,
-    max_tokens: u32,
-    messages: Vec<AiMessage>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    system: Option<String>,
-}
-
-fn get_api_key() -> Result<String, String> {
-    std::env::var("ANTHROPIC_API_KEY")
-        .map_err(|_| "ANTHROPIC_API_KEY environment variable not set".to_string())
-}
-
-fn build_request(req: &AiChatRequest) -> AnthropicRequest {
-    AnthropicRequest {
-        model: req
-            .model
-            .clone()
-            .unwrap_or_else(|| "claude-3-5-haiku-20241022".to_string()),
-        max_tokens: req.max_tokens.unwrap_or(4096),
-        messages: req.messages.clone(),
-        system: req.system.clone(),
-    }
-}
-
-fn extract_response_text(resp: &AnthropicResponse) -> String {
-    resp.content
-        .iter()
-        .filter_map(|block| block.text.as_ref())
-        .cloned()
-        .collect::<Vec<_>>()
-        .join("")
-}
-
-pub async fn send_chat(req: AiChatRequest) -> Result<AiChatResponse, String> {
-    let api_key = get_api_key()?;
-    send_chat_with_base(req, "https://api.anthropic.com", &api_key).await
-}
-
-async fn send_chat_with_base(
-    req: AiChatRequest,
-    api_base: &str,
-    api_key: &str,
-) -> Result<AiChatResponse, String> {
-    let anthropic_req = build_request(&req);
-
-    let client = reqwest::Client::new();
-    let response = client
-        .post(format!("{}/v1/messages", api_base))
-        .header("x-api-key", api_key)
-        .header("anthropic-version", "2023-06-01")
-        .header("content-type", "application/json")
-        .json(&anthropic_req)
-        .send()
-        .await
-        .map_err(|e| format!("Request failed: {}", e))?;
-
-    if !response.status().is_success() {
-        let status = response.status();
-        let body = response.text().await.unwrap_or_default();
-        return Err(format!("Anthropic API error ({}): {}", status, body));
-    }
-
-    let anthropic_resp: AnthropicResponse = response
-        .json()
-        .await
-        .map_err(|e| format!("Failed to parse response: {}", e))?;
-
-    Ok(AiChatResponse {
-        content: extract_response_text(&anthropic_resp),
-        model: anthropic_resp.model,
-        stop_reason: anthropic_resp.stop_reason,
-    })
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    // ── Pure logic tests ─────────────────────────────────────────────────────
-
-    #[test]
-    fn test_build_request_defaults() {
-        let req = AiChatRequest {
-            model: None,
-            messages: vec![AiMessage {
-                role: "user".to_string(),
-                content: "Hello".to_string(),
-            }],
-            system: None,
-            max_tokens: None,
-        };
-        let built = build_request(&req);
-        assert_eq!(built.model, "claude-3-5-haiku-20241022");
-        assert_eq!(built.max_tokens, 4096);
-        assert!(built.system.is_none());
-    }
-
-    #[test]
-    fn test_build_request_custom() {
-        let req = AiChatRequest {
-            model: Some("claude-sonnet-4-20250514".to_string()),
-            messages: vec![],
-            system: Some("You are helpful".to_string()),
-            max_tokens: Some(1024),
-        };
-        let built = build_request(&req);
-        assert_eq!(built.model, "claude-sonnet-4-20250514");
-        assert_eq!(built.max_tokens, 1024);
-        assert_eq!(built.system.unwrap(), "You are helpful");
-    }
-
-    #[test]
-    fn test_extract_response_text() {
-        let resp = AnthropicResponse {
-            content: vec![
-                ContentBlock {
-                    text: Some("Hello ".to_string()),
-                },
-                ContentBlock {
-                    text: Some("world".to_string()),
-                },
-                ContentBlock { text: None },
-            ],
-            model: "test".to_string(),
-            stop_reason: Some("end_turn".to_string()),
-        };
-        assert_eq!(extract_response_text(&resp), "Hello world");
-    }
-
-    #[test]
-    fn test_extract_response_text_empty() {
-        let resp = AnthropicResponse {
-            content: vec![],
-            model: "test".to_string(),
-            stop_reason: None,
-        };
-        assert_eq!(extract_response_text(&resp), "");
-    }
-
-    #[test]
-    fn test_extract_response_text_all_none() {
-        let resp = AnthropicResponse {
-            content: vec![ContentBlock { text: None }, ContentBlock { text: None }],
-            model: "test".to_string(),
-            stop_reason: None,
-        };
-        assert_eq!(extract_response_text(&resp), "");
-    }
-
-    // Mutex to serialize env-var tests and avoid race conditions in parallel test runs
-    static ENV_MUTEX: std::sync::Mutex<()> = std::sync::Mutex::new(());
-
-    #[test]
-    fn test_get_api_key_missing() {
-        let _guard = ENV_MUTEX.lock().unwrap();
-        // Temporarily clear the env var
-        let prev = std::env::var("ANTHROPIC_API_KEY").ok();
-        unsafe {
-            std::env::remove_var("ANTHROPIC_API_KEY");
-        }
-        let result = get_api_key();
-        // Restore
-        if let Some(val) = prev {
-            unsafe {
-                std::env::set_var("ANTHROPIC_API_KEY", val);
-            }
-        }
-        assert!(result.is_err());
-        assert!(result
-            .unwrap_err()
-            .contains("ANTHROPIC_API_KEY environment variable not set"));
-    }
-
-    #[test]
-    fn test_get_api_key_present() {
-        let _guard = ENV_MUTEX.lock().unwrap();
-        let prev = std::env::var("ANTHROPIC_API_KEY").ok();
-        unsafe {
-            std::env::set_var("ANTHROPIC_API_KEY", "sk-test-key-123");
-        }
-        let result = get_api_key();
-        if let Some(val) = prev {
-            unsafe {
-                std::env::set_var("ANTHROPIC_API_KEY", val);
-            }
-        } else {
-            unsafe {
-                std::env::remove_var("ANTHROPIC_API_KEY");
-            }
-        }
-        assert!(result.is_ok());
-        assert_eq!(result.unwrap(), "sk-test-key-123");
-    }
-
-    // ── HTTP mock tests ──────────────────────────────────────────────────────
-
-    #[tokio::test]
-    async fn test_send_chat_success() {
-        let mut server = mockito::Server::new_async().await;
-        let mock = server
-            .mock("POST", "/v1/messages")
-            .with_status(200)
-            .with_header("content-type", "application/json")
-            .with_body(
-                r#"{"id":"msg_01","type":"message","role":"assistant","content":[{"type":"text","text":"Hello there!"}],"model":"claude-3-5-haiku-20241022","stop_reason":"end_turn","stop_sequence":null,"usage":{"input_tokens":10,"output_tokens":5}}"#,
-            )
-            .create_async()
-            .await;
-
-        let req = AiChatRequest {
-            model: None,
-            messages: vec![AiMessage {
-                role: "user".to_string(),
-                content: "Say hello".to_string(),
-            }],
-            system: None,
-            max_tokens: None,
-        };
-
-        let result = send_chat_with_base(req, &server.url(), "sk-test-key").await;
-        mock.assert_async().await;
-        assert!(result.is_ok());
-        let resp = result.unwrap();
-        assert_eq!(resp.content, "Hello there!");
-        assert_eq!(resp.model, "claude-3-5-haiku-20241022");
-        assert_eq!(resp.stop_reason, Some("end_turn".to_string()));
-    }
-
-    #[tokio::test]
-    async fn test_send_chat_with_system_prompt() {
-        let mut server = mockito::Server::new_async().await;
-        let mock = server
-            .mock("POST", "/v1/messages")
-            .with_status(200)
-            .with_header("content-type", "application/json")
-            .with_body(
-                r#"{"id":"msg_02","type":"message","role":"assistant","content":[{"type":"text","text":"I am a helpful assistant."}],"model":"claude-sonnet-4-20250514","stop_reason":"end_turn","stop_sequence":null,"usage":{"input_tokens":20,"output_tokens":8}}"#,
-            )
-            .create_async()
-            .await;
-
-        let req = AiChatRequest {
-            model: Some("claude-sonnet-4-20250514".to_string()),
-            messages: vec![AiMessage {
-                role: "user".to_string(),
-                content: "Who are you?".to_string(),
-            }],
-            system: Some("You are a helpful assistant.".to_string()),
-            max_tokens: Some(512),
-        };
-
-        let result = send_chat_with_base(req, &server.url(), "sk-key").await;
-        mock.assert_async().await;
-        assert!(result.is_ok());
-        let resp = result.unwrap();
-        assert_eq!(resp.model, "claude-sonnet-4-20250514");
-        assert_eq!(resp.content, "I am a helpful assistant.");
-    }
-
-    #[tokio::test]
-    async fn test_send_chat_api_error() {
-        let mut server = mockito::Server::new_async().await;
-        let mock = server
-            .mock("POST", "/v1/messages")
-            .with_status(401)
-            .with_header("content-type", "application/json")
-            .with_body(r#"{"type":"error","error":{"type":"authentication_error","message":"Invalid API key"}}"#)
-            .create_async()
-            .await;
-
-        let req = AiChatRequest {
-            model: None,
-            messages: vec![AiMessage {
-                role: "user".to_string(),
-                content: "Hello".to_string(),
-            }],
-            system: None,
-            max_tokens: None,
-        };
-
-        let result = send_chat_with_base(req, &server.url(), "bad-key").await;
-        mock.assert_async().await;
-        assert!(result.is_err());
-        let err = result.unwrap_err();
-        assert!(
-            err.contains("Anthropic API error") && err.contains("401"),
-            "unexpected error: {}",
-            err
-        );
-    }
-
-    #[tokio::test]
-    async fn test_send_chat_rate_limit() {
-        let mut server = mockito::Server::new_async().await;
-        let mock = server
-            .mock("POST", "/v1/messages")
-            .with_status(429)
-            .with_header("content-type", "application/json")
-            .with_body(r#"{"type":"error","error":{"type":"rate_limit_error","message":"Rate limit exceeded"}}"#)
-            .create_async()
-            .await;
-
-        let req = AiChatRequest {
-            model: None,
-            messages: vec![],
-            system: None,
-            max_tokens: None,
-        };
-
-        let result = send_chat_with_base(req, &server.url(), "sk-key").await;
-        mock.assert_async().await;
-        assert!(result.is_err());
-        let err = result.unwrap_err();
-        assert!(
-            err.contains("Anthropic API error") && err.contains("429"),
-            "unexpected error: {}",
-            err
-        );
-    }
-
-    #[tokio::test]
-    async fn test_send_chat_multiple_content_blocks() {
-        let mut server = mockito::Server::new_async().await;
-        let mock = server
-            .mock("POST", "/v1/messages")
-            .with_status(200)
-            .with_header("content-type", "application/json")
-            .with_body(
-                r#"{"id":"msg_03","type":"message","role":"assistant","content":[{"type":"text","text":"Part one. "},{"type":"text","text":"Part two."}],"model":"claude-3-5-haiku-20241022","stop_reason":"end_turn","stop_sequence":null,"usage":{"input_tokens":5,"output_tokens":10}}"#,
-            )
-            .create_async()
-            .await;
-
-        let req = AiChatRequest {
-            model: None,
-            messages: vec![AiMessage {
-                role: "user".to_string(),
-                content: "Give me two parts".to_string(),
-            }],
-            system: None,
-            max_tokens: None,
-        };
-
-        let result = send_chat_with_base(req, &server.url(), "sk-key").await;
-        mock.assert_async().await;
-        assert!(result.is_ok());
-        assert_eq!(result.unwrap().content, "Part one. Part two.");
-    }
-}

src-tauri/src/commands.rs

@@ -1,937 +0,0 @@
-use std::borrow::Cow;
-
-use crate::ai_chat::{AiChatRequest, AiChatResponse};
-#[cfg(desktop)]
-use crate::claude_cli::ClaudeStreamEvent;
-use crate::claude_cli::{AgentStreamRequest, ChatStreamRequest, ClaudeCliStatus};
-use crate::frontmatter::FrontmatterValue;
-use crate::git::{
-    GitCommit, GitPullResult, GitPushResult, GitRemoteStatus, LastCommitInfo, ModifiedFile,
-    PulseCommit,
-};
-use crate::github::{DeviceFlowPollResult, DeviceFlowStart, GitHubUser, GithubRepo};
-#[cfg(desktop)]
-use crate::menu;
-use crate::search::SearchResponse;
-use crate::settings::Settings;
-use crate::vault::{RenameResult, VaultEntry};
-use crate::vault_list::VaultList;
-use crate::{frontmatter, git, search, vault, vault_list};
-
-/// Expand a leading `~` or `~/` in a path string to the user's home directory.
-/// Returns the original string unchanged if it doesn't start with `~` or if the
-/// home directory cannot be determined.
-pub fn expand_tilde(path: &str) -> Cow<'_, str> {
-    if path == "~" {
-        if let Some(home) = dirs::home_dir() {
-            return Cow::Owned(home.to_string_lossy().into_owned());
-        }
-    } else if let Some(rest) = path.strip_prefix("~/") {
-        if let Some(home) = dirs::home_dir() {
-            return Cow::Owned(format!("{}/{}", home.to_string_lossy(), rest));
-        }
-    }
-    Cow::Borrowed(path)
-}
-
-pub fn parse_build_label(version: &str) -> String {
-    let parts: Vec<&str> = version.split('.').collect();
-    match parts.as_slice() {
-        [_, minor, patch] if minor.len() >= 6 => format!("b{}", patch),
-        [_, _, _] => "dev".to_string(),
-        _ => "b?".to_string(),
-    }
-}
-
-// ── Vault commands ──────────────────────────────────────────────────────────
-
-#[tauri::command]
-pub fn list_vault(path: String) -> Result<Vec<VaultEntry>, String> {
-    let path = expand_tilde(&path);
-    vault::scan_vault_cached(std::path::Path::new(path.as_ref()))
-}
-
-#[tauri::command]
-pub fn get_note_content(path: String) -> Result<String, String> {
-    let path = expand_tilde(&path);
-    vault::get_note_content(std::path::Path::new(path.as_ref()))
-}
-
-#[tauri::command]
-pub fn save_note_content(path: String, content: String) -> Result<(), String> {
-    let path = expand_tilde(&path);
-    vault::save_note_content(&path, &content)
-}
-
-#[tauri::command]
-pub fn rename_note(
-    vault_path: String,
-    old_path: String,
-    new_title: String,
-    old_title: Option<String>,
-) -> Result<RenameResult, String> {
-    let vault_path = expand_tilde(&vault_path);
-    let old_path = expand_tilde(&old_path);
-    vault::rename_note(&vault_path, &old_path, &new_title, old_title.as_deref())
-}
-
-#[tauri::command]
-pub fn purge_trash(vault_path: String) -> Result<Vec<String>, String> {
-    let vault_path = expand_tilde(&vault_path);
-    vault::purge_trash(&vault_path)
-}
-
-#[tauri::command]
-pub fn delete_note(path: String) -> Result<String, String> {
-    let path = expand_tilde(&path);
-    vault::delete_note(&path)
-}
-
-#[tauri::command]
-pub fn batch_delete_notes(paths: Vec<String>) -> Result<Vec<String>, String> {
-    let expanded: Vec<String> = paths.iter().map(|p| expand_tilde(p).into_owned()).collect();
-    vault::batch_delete_notes(&expanded)
-}
-
-#[tauri::command]
-pub fn empty_trash(vault_path: String) -> Result<Vec<String>, String> {
-    let vault_path = expand_tilde(&vault_path);
-    vault::empty_trash(&vault_path)
-}
-
-#[tauri::command]
-pub fn migrate_is_a_to_type(vault_path: String) -> Result<usize, String> {
-    let vault_path = expand_tilde(&vault_path);
-    vault::migrate_is_a_to_type(&vault_path)
-}
-
-#[tauri::command]
-pub fn flatten_vault(vault_path: String) -> Result<usize, String> {
-    let vault_path = expand_tilde(&vault_path);
-    vault::flatten_vault(&vault_path)
-}
-
-#[tauri::command]
-pub fn vault_health_check(vault_path: String) -> Result<vault::VaultHealthReport, String> {
-    let vault_path = expand_tilde(&vault_path);
-    vault::vault_health_check(&vault_path)
-}
-
-#[tauri::command]
-pub fn create_getting_started_vault(target_path: Option<String>) -> Result<String, String> {
-    let path = match target_path {
-        Some(p) if !p.is_empty() => expand_tilde(&p).into_owned(),
-        _ => vault::default_vault_path()?.to_string_lossy().to_string(),
-    };
-    vault::create_getting_started_vault(&path)
-}
-
-#[tauri::command]
-pub fn check_vault_exists(path: String) -> bool {
-    let path = expand_tilde(&path);
-    vault::vault_exists(&path)
-}
-
-#[tauri::command]
-pub fn get_default_vault_path() -> Result<String, String> {
-    vault::default_vault_path().map(|p| p.to_string_lossy().to_string())
-}
-
-#[tauri::command]
-pub async fn reload_vault(path: String) -> Result<Vec<VaultEntry>, String> {
-    let path = expand_tilde(&path).into_owned();
-    tokio::task::spawn_blocking(move || {
-        vault::invalidate_cache(std::path::Path::new(&path));
-        vault::scan_vault_cached(std::path::Path::new(&path))
-    })
-    .await
-    .map_err(|e| format!("Task panicked: {e}"))?
-}
-
-#[tauri::command]
-pub fn reload_vault_entry(path: String) -> Result<VaultEntry, String> {
-    let path = expand_tilde(&path);
-    vault::reload_entry(std::path::Path::new(path.as_ref()))
-}
-
-/// Sync the `title` frontmatter field with the filename on note open.
-/// Returns `true` if the file was modified (title was absent or desynced).
-#[tauri::command]
-pub fn sync_note_title(path: String) -> Result<bool, String> {
-    use vault::SyncAction;
-    let path = expand_tilde(&path);
-    let action = vault::sync_title_on_open(std::path::Path::new(path.as_ref()))?;
-    Ok(matches!(action, SyncAction::Updated { .. }))
-}
-
-#[tauri::command]
-pub fn save_image(vault_path: String, filename: String, data: String) -> Result<String, String> {
-    let vault_path = expand_tilde(&vault_path);
-    vault::save_image(&vault_path, &filename, &data)
-}
-
-#[tauri::command]
-pub fn copy_image_to_vault(vault_path: String, source_path: String) -> Result<String, String> {
-    let vault_path = expand_tilde(&vault_path);
-    vault::copy_image_to_vault(&vault_path, &source_path)
-}
-
-// ── Frontmatter commands ────────────────────────────────────────────────────
-
-#[tauri::command]
-pub fn update_frontmatter(
-    path: String,
-    key: String,
-    value: FrontmatterValue,
-) -> Result<String, String> {
-    let path = expand_tilde(&path);
-    frontmatter::update_frontmatter(&path, &key, value)
-}
-
-#[tauri::command]
-pub fn delete_frontmatter_property(path: String, key: String) -> Result<String, String> {
-    let path = expand_tilde(&path);
-    frontmatter::delete_frontmatter_property(&path, &key)
-}
-
-#[tauri::command]
-pub fn batch_archive_notes(paths: Vec<String>) -> Result<usize, String> {
-    let mut count = 0;
-    for path in &paths {
-        let path = expand_tilde(path);
-        frontmatter::update_frontmatter(&path, "Archived", FrontmatterValue::Bool(true))?;
-        count += 1;
-    }
-    Ok(count)
-}
-
-#[tauri::command]
-pub fn batch_trash_notes(paths: Vec<String>) -> Result<usize, String> {
-    let now = chrono::Utc::now().format("%Y-%m-%dT%H:%M:%SZ").to_string();
-    let mut count = 0;
-    for path in &paths {
-        let path = expand_tilde(path);
-        frontmatter::update_frontmatter(&path, "Trashed", FrontmatterValue::Bool(true))?;
-        frontmatter::update_frontmatter(
-            &path,
-            "Trashed at",
-            FrontmatterValue::String(now.clone()),
-        )?;
-        count += 1;
-    }
-    Ok(count)
-}
-
-// ── Git commands ────────────────────────────────────────────────────────────
-
-#[cfg(desktop)]
-#[tauri::command]
-pub fn get_file_history(vault_path: String, path: String) -> Result<Vec<GitCommit>, String> {
-    let vault_path = expand_tilde(&vault_path);
-    let path = expand_tilde(&path);
-    git::get_file_history(&vault_path, &path)
-}
-
-#[cfg(desktop)]
-#[tauri::command]
-pub fn get_modified_files(vault_path: String) -> Result<Vec<ModifiedFile>, String> {
-    let vault_path = expand_tilde(&vault_path);
-    git::get_modified_files(&vault_path)
-}
-
-#[cfg(desktop)]
-#[tauri::command]
-pub fn get_file_diff(vault_path: String, path: String) -> Result<String, String> {
-    let vault_path = expand_tilde(&vault_path);
-    let path = expand_tilde(&path);
-    git::get_file_diff(&vault_path, &path)
-}
-
-#[cfg(desktop)]
-#[tauri::command]
-pub fn get_file_diff_at_commit(
-    vault_path: String,
-    path: String,
-    commit_hash: String,
-) -> Result<String, String> {
-    let vault_path = expand_tilde(&vault_path);
-    let path = expand_tilde(&path);
-    git::get_file_diff_at_commit(&vault_path, &path, &commit_hash)
-}
-
-#[cfg(desktop)]
-#[tauri::command]
-pub fn get_vault_pulse(
-    vault_path: String,
-    limit: Option<usize>,
-    skip: Option<usize>,
-) -> Result<Vec<PulseCommit>, String> {
-    let vault_path = expand_tilde(&vault_path);
-    let limit = limit.unwrap_or(20);
-    let skip = skip.unwrap_or(0);
-    git::get_vault_pulse(&vault_path, limit, skip)
-}
-
-#[cfg(desktop)]
-#[tauri::command]
-pub fn git_commit(vault_path: String, message: String) -> Result<String, String> {
-    let vault_path = expand_tilde(&vault_path);
-    git::git_commit(&vault_path, &message)
-}
-
-#[cfg(desktop)]
-#[tauri::command]
-pub fn get_last_commit_info(vault_path: String) -> Result<Option<LastCommitInfo>, String> {
-    let vault_path = expand_tilde(&vault_path);
-    git::get_last_commit_info(&vault_path)
-}
-
-#[cfg(desktop)]
-#[tauri::command]
-pub async fn git_pull(vault_path: String) -> Result<GitPullResult, String> {
-    let vault_path = expand_tilde(&vault_path).into_owned();
-    tokio::task::spawn_blocking(move || git::git_pull(&vault_path))
-        .await
-        .map_err(|e| format!("Task panicked: {e}"))?
-}
-
-#[cfg(desktop)]
-#[tauri::command]
-pub fn get_conflict_files(vault_path: String) -> Result<Vec<String>, String> {
-    let vault_path = expand_tilde(&vault_path);
-    git::get_conflict_files(&vault_path)
-}
-
-#[cfg(desktop)]
-#[tauri::command]
-pub fn get_conflict_mode(vault_path: String) -> String {
-    let vault_path = expand_tilde(&vault_path);
-    git::get_conflict_mode(&vault_path)
-}
-
-#[cfg(desktop)]
-#[tauri::command]
-pub fn git_resolve_conflict(
-    vault_path: String,
-    file: String,
-    strategy: String,
-) -> Result<(), String> {
-    let vault_path = expand_tilde(&vault_path);
-    git::git_resolve_conflict(&vault_path, &file, &strategy)
-}
-
-#[cfg(desktop)]
-#[tauri::command]
-pub fn git_commit_conflict_resolution(vault_path: String) -> Result<String, String> {
-    let vault_path = expand_tilde(&vault_path);
-    git::git_commit_conflict_resolution(&vault_path)
-}
-
-#[cfg(desktop)]
-#[tauri::command]
-pub async fn git_push(vault_path: String) -> Result<GitPushResult, String> {
-    let vault_path = expand_tilde(&vault_path).into_owned();
-    tokio::task::spawn_blocking(move || git::git_push(&vault_path))
-        .await
-        .map_err(|e| format!("Task panicked: {e}"))?
-}
-
-#[cfg(desktop)]
-#[tauri::command]
-pub async fn git_remote_status(vault_path: String) -> Result<GitRemoteStatus, String> {
-    let vault_path = expand_tilde(&vault_path).into_owned();
-    tokio::task::spawn_blocking(move || git::git_remote_status(&vault_path))
-        .await
-        .map_err(|e| format!("Task panicked: {e}"))?
-}
-
-// ── Git commands (mobile stubs) ─────────────────────────────────────────────
-
-#[cfg(mobile)]
-#[tauri::command]
-pub fn get_file_history(_vault_path: String, _path: String) -> Result<Vec<GitCommit>, String> {
-    Err("Git history is not available on mobile".into())
-}
-
-#[cfg(mobile)]
-#[tauri::command]
-pub fn get_modified_files(_vault_path: String) -> Result<Vec<ModifiedFile>, String> {
-    Ok(vec![])
-}
-
-#[cfg(mobile)]
-#[tauri::command]
-pub fn get_file_diff(_vault_path: String, _path: String) -> Result<String, String> {
-    Err("Git diff is not available on mobile".into())
-}
-
-#[cfg(mobile)]
-#[tauri::command]
-pub fn get_file_diff_at_commit(
-    _vault_path: String,
-    _path: String,
-    _commit_hash: String,
-) -> Result<String, String> {
-    Err("Git diff is not available on mobile".into())
-}
-
-#[cfg(mobile)]
-#[tauri::command]
-pub fn get_vault_pulse(
-    _vault_path: String,
-    _limit: Option<usize>,
-    _skip: Option<usize>,
-) -> Result<Vec<PulseCommit>, String> {
-    Ok(vec![])
-}
-
-#[cfg(mobile)]
-#[tauri::command]
-pub fn git_commit(_vault_path: String, _message: String) -> Result<String, String> {
-    Err("Git commit is not available on mobile".into())
-}
-
-#[cfg(mobile)]
-#[tauri::command]
-pub fn get_last_commit_info(_vault_path: String) -> Result<Option<LastCommitInfo>, String> {
-    Ok(None)
-}
-
-#[cfg(mobile)]
-#[tauri::command]
-pub async fn git_pull(_vault_path: String) -> Result<GitPullResult, String> {
-    Err("Git pull is not available on mobile".into())
-}
-
-#[cfg(mobile)]
-#[tauri::command]
-pub fn get_conflict_files(_vault_path: String) -> Result<Vec<String>, String> {
-    Ok(vec![])
-}
-
-#[cfg(mobile)]
-#[tauri::command]
-pub fn get_conflict_mode(_vault_path: String) -> String {
-    "none".to_string()
-}
-
-#[cfg(mobile)]
-#[tauri::command]
-pub fn git_resolve_conflict(
-    _vault_path: String,
-    _file: String,
-    _strategy: String,
-) -> Result<(), String> {
-    Err("Git conflict resolution is not available on mobile".into())
-}
-
-#[cfg(mobile)]
-#[tauri::command]
-pub fn git_commit_conflict_resolution(_vault_path: String) -> Result<String, String> {
-    Err("Git conflict resolution is not available on mobile".into())
-}
-
-#[cfg(mobile)]
-#[tauri::command]
-pub async fn git_push(_vault_path: String) -> Result<GitPushResult, String> {
-    Err("Git push is not available on mobile".into())
-}
-
-#[cfg(mobile)]
-#[tauri::command]
-pub async fn git_remote_status(_vault_path: String) -> Result<GitRemoteStatus, String> {
-    Ok(GitRemoteStatus {
-        branch: String::new(),
-        has_remote: false,
-        ahead: 0,
-        behind: 0,
-    })
-}
-
-// ── GitHub commands ─────────────────────────────────────────────────────────
-
-#[cfg(desktop)]
-#[tauri::command]
-pub async fn github_list_repos(token: String) -> Result<Vec<GithubRepo>, String> {
-    crate::github::github_list_repos(&token).await
-}
-
-#[cfg(desktop)]
-#[tauri::command]
-pub async fn github_create_repo(
-    token: String,
-    name: String,
-    private: bool,
-) -> Result<GithubRepo, String> {
-    crate::github::github_create_repo(&token, &name, private).await
-}
-
-#[cfg(desktop)]
-#[tauri::command]
-pub fn clone_repo(url: String, token: String, local_path: String) -> Result<String, String> {
-    let local_path = expand_tilde(&local_path);
-    crate::github::clone_repo(&url, &token, &local_path)
-}
-
-#[cfg(desktop)]
-#[tauri::command]
-pub async fn github_device_flow_start() -> Result<DeviceFlowStart, String> {
-    crate::github::github_device_flow_start().await
-}
-
-#[cfg(desktop)]
-#[tauri::command]
-pub async fn github_device_flow_poll(device_code: String) -> Result<DeviceFlowPollResult, String> {
-    crate::github::github_device_flow_poll(&device_code).await
-}
-
-#[cfg(desktop)]
-#[tauri::command]
-pub async fn github_get_user(token: String) -> Result<GitHubUser, String> {
-    crate::github::github_get_user(&token).await
-}
-
-// ── GitHub commands (mobile stubs) ──────────────────────────────────────────
-
-#[cfg(mobile)]
-#[tauri::command]
-pub async fn github_list_repos(_token: String) -> Result<Vec<GithubRepo>, String> {
-    Err("GitHub integration is not available on mobile".into())
-}
-
-#[cfg(mobile)]
-#[tauri::command]
-pub async fn github_create_repo(
-    _token: String,
-    _name: String,
-    _private: bool,
-) -> Result<GithubRepo, String> {
-    Err("GitHub integration is not available on mobile".into())
-}
-
-#[cfg(mobile)]
-#[tauri::command]
-pub fn clone_repo(_url: String, _token: String, _local_path: String) -> Result<String, String> {
-    Err("Git clone is not available on mobile".into())
-}
-
-#[cfg(mobile)]
-#[tauri::command]
-pub async fn github_device_flow_start() -> Result<DeviceFlowStart, String> {
-    Err("GitHub integration is not available on mobile".into())
-}
-
-#[cfg(mobile)]
-#[tauri::command]
-pub async fn github_device_flow_poll(_device_code: String) -> Result<DeviceFlowPollResult, String> {
-    Err("GitHub integration is not available on mobile".into())
-}
-
-#[cfg(mobile)]
-#[tauri::command]
-pub async fn github_get_user(_token: String) -> Result<GitHubUser, String> {
-    Err("GitHub integration is not available on mobile".into())
-}
-
-// ── AI / Claude commands ────────────────────────────────────────────────────
-
-#[tauri::command]
-pub async fn ai_chat(request: AiChatRequest) -> Result<AiChatResponse, String> {
-    crate::ai_chat::send_chat(request).await
-}
-
-#[cfg(desktop)]
-#[tauri::command]
-pub fn check_claude_cli() -> ClaudeCliStatus {
-    crate::claude_cli::check_cli()
-}
-
-#[cfg(desktop)]
-#[tauri::command]
-pub async fn stream_claude_chat(
-    app_handle: tauri::AppHandle,
-    request: ChatStreamRequest,
-) -> Result<String, String> {
-    use tauri::Emitter;
-    tokio::task::spawn_blocking(move || {
-        crate::claude_cli::run_chat_stream(request, |event: ClaudeStreamEvent| {
-            let _ = app_handle.emit("claude-stream", &event);
-        })
-    })
-    .await
-    .map_err(|e| format!("Task failed: {e}"))?
-}
-
-#[cfg(desktop)]
-#[tauri::command]
-pub async fn stream_claude_agent(
-    app_handle: tauri::AppHandle,
-    request: AgentStreamRequest,
-) -> Result<String, String> {
-    use tauri::Emitter;
-    tokio::task::spawn_blocking(move || {
-        crate::claude_cli::run_agent_stream(request, |event: ClaudeStreamEvent| {
-            let _ = app_handle.emit("claude-agent-stream", &event);
-        })
-    })
-    .await
-    .map_err(|e| format!("Task failed: {e}"))?
-}
-
-// ── Claude CLI (mobile stubs) ───────────────────────────────────────────────
-
-#[cfg(mobile)]
-#[tauri::command]
-pub fn check_claude_cli() -> ClaudeCliStatus {
-    ClaudeCliStatus {
-        installed: false,
-        version: None,
-    }
-}
-
-#[cfg(mobile)]
-#[tauri::command]
-pub async fn stream_claude_chat(
-    _app_handle: tauri::AppHandle,
-    _request: ChatStreamRequest,
-) -> Result<String, String> {
-    Err("Claude CLI is not available on mobile".into())
-}
-
-#[cfg(mobile)]
-#[tauri::command]
-pub async fn stream_claude_agent(
-    _app_handle: tauri::AppHandle,
-    _request: AgentStreamRequest,
-) -> Result<String, String> {
-    Err("Claude CLI is not available on mobile".into())
-}
-
-// ── Search commands ─────────────────────────────────────────────────────────
-
-#[tauri::command]
-pub async fn search_vault(
-    vault_path: String,
-    query: String,
-    mode: String,
-    limit: Option<usize>,
-) -> Result<SearchResponse, String> {
-    let vault_path = expand_tilde(&vault_path).into_owned();
-    let limit = limit.unwrap_or(20);
-    tokio::task::spawn_blocking(move || search::search_vault(&vault_path, &query, &mode, limit))
-        .await
-        .map_err(|e| format!("Search task failed: {}", e))?
-}
-
-// ── MCP commands ────────────────────────────────────────────────────────────
-
-#[cfg(desktop)]
-#[tauri::command]
-pub async fn register_mcp_tools(vault_path: String) -> Result<String, String> {
-    let vault_path = expand_tilde(&vault_path).into_owned();
-    tokio::task::spawn_blocking(move || crate::mcp::register_mcp(&vault_path))
-        .await
-        .map_err(|e| format!("Registration task failed: {e}"))?
-}
-
-#[cfg(desktop)]
-#[tauri::command]
-pub async fn check_mcp_status() -> Result<crate::mcp::McpStatus, String> {
-    tokio::task::spawn_blocking(crate::mcp::check_mcp_status)
-        .await
-        .map_err(|e| format!("MCP status check failed: {e}"))
-}
-
-#[cfg(mobile)]
-#[tauri::command]
-pub async fn register_mcp_tools(_vault_path: String) -> Result<String, String> {
-    Err("MCP is not available on mobile".into())
-}
-
-#[cfg(mobile)]
-#[tauri::command]
-pub async fn check_mcp_status() -> Result<crate::mcp::McpStatus, String> {
-    Ok(crate::mcp::McpStatus::NotInstalled)
-}
-
-#[tauri::command]
-pub fn repair_vault(vault_path: String) -> Result<String, String> {
-    let vault_path = expand_tilde(&vault_path);
-    // Migrate legacy is_a/Is A frontmatter → type
-    vault::migrate_is_a_to_type(&vault_path)?;
-    // Flatten vault: move notes from type-based subfolders to root
-    vault::flatten_vault(&vault_path)?;
-    // Repair config files (AGENTS.md at root, config.md type def)
-    vault::repair_config_files(&vault_path)?;
-    // Ensure .gitignore with sensible defaults exists
-    git::ensure_gitignore(&vault_path)?;
-    Ok("Vault repaired".to_string())
-}
-
-// ── Settings & config commands ──────────────────────────────────────────────
-
-#[tauri::command]
-pub fn get_build_number(app_handle: tauri::AppHandle) -> String {
-    let version = app_handle.package_info().version.to_string();
-    parse_build_label(&version)
-}
-
-#[cfg(desktop)]
-#[tauri::command]
-pub fn update_menu_state(
-    app_handle: tauri::AppHandle,
-    has_active_note: bool,
-    has_modified_files: Option<bool>,
-    has_conflicts: Option<bool>,
-) -> Result<(), String> {
-    menu::set_note_items_enabled(&app_handle, has_active_note);
-    if let Some(v) = has_modified_files {
-        menu::set_git_commit_items_enabled(&app_handle, v);
-    }
-    if let Some(v) = has_conflicts {
-        menu::set_git_conflict_items_enabled(&app_handle, v);
-    }
-    Ok(())
-}
-
-#[cfg(mobile)]
-#[tauri::command]
-pub fn update_menu_state(
-    _app_handle: tauri::AppHandle,
-    _has_active_note: bool,
-    _has_modified_files: Option<bool>,
-    _has_conflicts: Option<bool>,
-) -> Result<(), String> {
-    Ok(())
-}
-
-#[tauri::command]
-pub fn get_settings() -> Result<Settings, String> {
-    crate::settings::get_settings()
-}
-
-#[tauri::command]
-pub fn save_settings(settings: Settings) -> Result<(), String> {
-    crate::settings::save_settings(settings)
-}
-
-#[tauri::command]
-pub fn reinit_telemetry() {
-    crate::telemetry::reinit_sentry();
-}
-
-#[tauri::command]
-pub fn load_vault_list() -> Result<VaultList, String> {
-    vault_list::load_vault_list()
-}
-
-#[tauri::command]
-pub fn save_vault_list(list: VaultList) -> Result<(), String> {
-    vault_list::save_vault_list(&list)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn expand_tilde_with_subpath() {
-        let home = dirs::home_dir().unwrap();
-        let result = expand_tilde("~/Documents/vault");
-        assert_eq!(result, format!("{}/Documents/vault", home.display()));
-    }
-
-    #[test]
-    fn expand_tilde_alone() {
-        let home = dirs::home_dir().unwrap();
-        let result = expand_tilde("~");
-        assert_eq!(result, home.to_string_lossy());
-    }
-
-    #[test]
-    fn expand_tilde_noop_for_absolute_path() {
-        let result = expand_tilde("/usr/local/bin");
-        assert_eq!(result, "/usr/local/bin");
-    }
-
-    #[test]
-    fn expand_tilde_noop_for_relative_path() {
-        let result = expand_tilde("some/relative/path");
-        assert_eq!(result, "some/relative/path");
-    }
-
-    #[test]
-    fn expand_tilde_noop_for_tilde_in_middle() {
-        let result = expand_tilde("/home/~user/path");
-        assert_eq!(result, "/home/~user/path");
-    }
-
-    #[test]
-    fn parse_build_label_release_version() {
-        assert_eq!(parse_build_label("0.20260303.281"), "b281");
-        assert_eq!(parse_build_label("0.20251215.42"), "b42");
-    }
-
-    #[test]
-    fn parse_build_label_dev_version() {
-        assert_eq!(parse_build_label("0.1.0"), "dev");
-        assert_eq!(parse_build_label("0.0.0"), "dev");
-    }
-
-    #[test]
-    fn parse_build_label_malformed() {
-        assert_eq!(parse_build_label("invalid"), "b?");
-        assert_eq!(parse_build_label(""), "b?");
-    }
-
-    #[test]
-    fn test_batch_archive_notes() {
-        let dir = tempfile::TempDir::new().unwrap();
-        let note = dir.path().join("note.md");
-        std::fs::write(&note, "---\nStatus: Active\n---\n# Note\n").unwrap();
-
-        let result = batch_archive_notes(vec![note.to_str().unwrap().to_string()]);
-        assert_eq!(result.unwrap(), 1);
-
-        let content = std::fs::read_to_string(&note).unwrap();
-        assert!(content.contains("Archived: true"));
-        assert!(content.contains("Status: Active"));
-    }
-
-    #[test]
-    fn test_batch_trash_notes() {
-        let dir = tempfile::TempDir::new().unwrap();
-        let note = dir.path().join("note.md");
-        std::fs::write(&note, "---\nStatus: Active\n---\n# Note\n").unwrap();
-
-        let result = batch_trash_notes(vec![note.to_str().unwrap().to_string()]);
-        assert_eq!(result.unwrap(), 1);
-
-        let content = std::fs::read_to_string(&note).unwrap();
-        assert!(content.contains("Trashed: true"));
-        assert!(content.contains("Trashed at"));
-    }
-
-    #[test]
-    fn test_reload_vault_entry_reads_from_disk() {
-        let dir = tempfile::TempDir::new().unwrap();
-        let note = dir.path().join("test.md");
-        std::fs::write(&note, "---\ntitle: Test\nStatus: Active\n---\n# Test\n").unwrap();
-
-        let entry = reload_vault_entry(note.to_str().unwrap().to_string()).unwrap();
-        assert_eq!(entry.title, "Test");
-        assert_eq!(entry.status, Some("Active".to_string()));
-
-        // Modify file on disk
-        std::fs::write(&note, "---\ntitle: Test\nStatus: Done\n---\n# Test\n").unwrap();
-        let fresh = reload_vault_entry(note.to_str().unwrap().to_string()).unwrap();
-        assert_eq!(fresh.status, Some("Done".to_string()));
-    }
-
-    #[test]
-    fn test_reload_vault_entry_nonexistent() {
-        let result = reload_vault_entry("/nonexistent/path.md".to_string());
-        assert!(result.is_err());
-    }
-
-    #[test]
-    fn test_reload_vault_invalidates_cache_and_rescans() {
-        let dir = tempfile::TempDir::new().unwrap();
-        let vault = dir.path();
-        // Init git repo for caching to work
-        std::process::Command::new("git")
-            .args(["init"])
-            .current_dir(vault)
-            .output()
-            .unwrap();
-        std::process::Command::new("git")
-            .args(["config", "user.email", "t@t.com"])
-            .current_dir(vault)
-            .output()
-            .unwrap();
-        std::process::Command::new("git")
-            .args(["config", "user.name", "T"])
-            .current_dir(vault)
-            .output()
-            .unwrap();
-
-        // Set test cache dir to avoid polluting real cache
-        let cache_dir = tempfile::TempDir::new().unwrap();
-        std::env::set_var(
-            "LAPUTA_CACHE_DIR",
-            cache_dir.path().to_string_lossy().as_ref(),
-        );
-
-        std::fs::write(vault.join("note.md"), "---\nTrashed: false\n---\n# Note\n").unwrap();
-        std::process::Command::new("git")
-            .args(["add", "."])
-            .current_dir(vault)
-            .output()
-            .unwrap();
-        std::process::Command::new("git")
-            .args(["commit", "-m", "init"])
-            .current_dir(vault)
-            .output()
-            .unwrap();
-
-        // Prime cache via list_vault
-        let entries = list_vault(vault.to_str().unwrap().to_string()).unwrap();
-        assert!(!entries[0].trashed);
-
-        // Trash the note on disk
-        std::fs::write(vault.join("note.md"), "---\nTrashed: true\n---\n# Note\n").unwrap();
-
-        // reload_vault must return the updated trashed state
-        let vault_str = vault.to_str().unwrap();
-        vault::invalidate_cache(std::path::Path::new(vault_str));
-        let fresh = vault::scan_vault_cached(std::path::Path::new(vault_str)).unwrap();
-        assert!(
-            fresh[0].trashed,
-            "reload_vault must reflect disk state after trashing"
-        );
-    }
-
-    #[test]
-    fn test_check_vault_exists_false() {
-        assert!(!check_vault_exists("/nonexistent/path/abc123".to_string()));
-    }
-
-    #[test]
-    fn test_get_default_vault_path_returns_ok() {
-        let result = get_default_vault_path();
-        assert!(result.is_ok());
-    }
-
-    #[test]
-    fn test_repair_vault_flattens_type_folders() {
-        let dir = tempfile::TempDir::new().unwrap();
-        let vault = dir.path();
-        let note_dir = vault.join("note");
-        std::fs::create_dir_all(&note_dir).unwrap();
-        std::fs::write(note_dir.join("hello.md"), "---\nis_a: Note\n---\n# Hello\n").unwrap();
-
-        let result = repair_vault(vault.to_str().unwrap().to_string());
-        assert!(result.is_ok());
-        // Note moved from note/ subfolder to root
-        assert!(vault.join("hello.md").exists());
-        assert!(!note_dir.join("hello.md").exists());
-        // Legacy is_a migrated to type
-        let content = std::fs::read_to_string(vault.join("hello.md")).unwrap();
-        assert!(content.contains("type: Note"));
-        assert!(!content.contains("is_a:"));
-    }
-
-    #[test]
-    fn test_repair_vault_creates_config_files() {
-        let dir = tempfile::TempDir::new().unwrap();
-        let vault = dir.path();
-
-        let result = repair_vault(vault.to_str().unwrap().to_string());
-        assert!(result.is_ok());
-        // Config files at root
-        assert!(vault.join("AGENTS.md").exists());
-        assert!(vault.join("config.md").exists());
-        // .gitignore
-        assert!(vault.join(".gitignore").exists());
-    }
-}

src-tauri/src/commands/ai.rs

@@ -0,0 +1,72 @@
+#[cfg(desktop)]
+use crate::claude_cli::ClaudeStreamEvent;
+use crate::claude_cli::{AgentStreamRequest, ChatStreamRequest, ClaudeCliStatus};
+
+// ── Claude CLI commands (desktop) ───────────────────────────────────────────
+
+#[cfg(desktop)]
+#[tauri::command]
+pub fn check_claude_cli() -> ClaudeCliStatus {
+    crate::claude_cli::check_cli()
+}
+
+#[cfg(desktop)]
+#[tauri::command]
+pub async fn stream_claude_chat(
+    app_handle: tauri::AppHandle,
+    request: ChatStreamRequest,
+) -> Result<String, String> {
+    use tauri::Emitter;
+    tokio::task::spawn_blocking(move || {
+        crate::claude_cli::run_chat_stream(request, |event: ClaudeStreamEvent| {
+            let _ = app_handle.emit("claude-stream", &event);
+        })
+    })
+    .await
+    .map_err(|e| format!("Task failed: {e}"))?
+}
+
+#[cfg(desktop)]
+#[tauri::command]
+pub async fn stream_claude_agent(
+    app_handle: tauri::AppHandle,
+    request: AgentStreamRequest,
+) -> Result<String, String> {
+    use tauri::Emitter;
+    tokio::task::spawn_blocking(move || {
+        crate::claude_cli::run_agent_stream(request, |event: ClaudeStreamEvent| {
+            let _ = app_handle.emit("claude-agent-stream", &event);
+        })
+    })
+    .await
+    .map_err(|e| format!("Task failed: {e}"))?
+}
+
+// ── Claude CLI (mobile stubs) ───────────────────────────────────────────────
+
+#[cfg(mobile)]
+#[tauri::command]
+pub fn check_claude_cli() -> ClaudeCliStatus {
+    ClaudeCliStatus {
+        installed: false,
+        version: None,
+    }
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub async fn stream_claude_chat(
+    _app_handle: tauri::AppHandle,
+    _request: ChatStreamRequest,
+) -> Result<String, String> {
+    Err("Claude CLI is not available on mobile".into())
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub async fn stream_claude_agent(
+    _app_handle: tauri::AppHandle,
+    _request: AgentStreamRequest,
+) -> Result<String, String> {
+    Err("Claude CLI is not available on mobile".into())
+}

src-tauri/src/commands/git.rs

@@ -0,0 +1,260 @@
+use crate::git::{
+    GitCommit, GitPullResult, GitPushResult, GitRemoteStatus, LastCommitInfo, ModifiedFile,
+    PulseCommit,
+};
+
+use super::expand_tilde;
+
+// ── Git commands (desktop) ──────────────────────────────────────────────────
+
+#[cfg(desktop)]
+#[tauri::command]
+pub fn get_file_history(vault_path: String, path: String) -> Result<Vec<GitCommit>, String> {
+    let vault_path = expand_tilde(&vault_path);
+    let path = expand_tilde(&path);
+    crate::git::get_file_history(&vault_path, &path)
+}
+
+#[cfg(desktop)]
+#[tauri::command]
+pub fn get_modified_files(vault_path: String) -> Result<Vec<ModifiedFile>, String> {
+    let vault_path = expand_tilde(&vault_path);
+    crate::git::get_modified_files(&vault_path)
+}
+
+#[cfg(desktop)]
+#[tauri::command]
+pub fn get_file_diff(vault_path: String, path: String) -> Result<String, String> {
+    let vault_path = expand_tilde(&vault_path);
+    let path = expand_tilde(&path);
+    crate::git::get_file_diff(&vault_path, &path)
+}
+
+#[cfg(desktop)]
+#[tauri::command]
+pub fn get_file_diff_at_commit(
+    vault_path: String,
+    path: String,
+    commit_hash: String,
+) -> Result<String, String> {
+    let vault_path = expand_tilde(&vault_path);
+    let path = expand_tilde(&path);
+    crate::git::get_file_diff_at_commit(&vault_path, &path, &commit_hash)
+}
+
+#[cfg(desktop)]
+#[tauri::command]
+pub fn get_vault_pulse(
+    vault_path: String,
+    limit: Option<usize>,
+    skip: Option<usize>,
+) -> Result<Vec<PulseCommit>, String> {
+    let vault_path = expand_tilde(&vault_path);
+    let limit = limit.unwrap_or(20);
+    let skip = skip.unwrap_or(0);
+    crate::git::get_vault_pulse(&vault_path, limit, skip)
+}
+
+#[cfg(desktop)]
+#[tauri::command]
+pub fn git_commit(vault_path: String, message: String) -> Result<String, String> {
+    let vault_path = expand_tilde(&vault_path);
+    crate::git::git_commit(&vault_path, &message)
+}
+
+#[cfg(desktop)]
+#[tauri::command]
+pub fn get_last_commit_info(vault_path: String) -> Result<Option<LastCommitInfo>, String> {
+    let vault_path = expand_tilde(&vault_path);
+    crate::git::get_last_commit_info(&vault_path)
+}
+
+#[cfg(desktop)]
+#[tauri::command]
+pub async fn git_pull(vault_path: String) -> Result<GitPullResult, String> {
+    let vault_path = expand_tilde(&vault_path).into_owned();
+    tokio::task::spawn_blocking(move || crate::git::git_pull(&vault_path))
+        .await
+        .map_err(|e| format!("Task panicked: {e}"))?
+}
+
+#[cfg(desktop)]
+#[tauri::command]
+pub fn get_conflict_files(vault_path: String) -> Result<Vec<String>, String> {
+    let vault_path = expand_tilde(&vault_path);
+    crate::git::get_conflict_files(&vault_path)
+}
+
+#[cfg(desktop)]
+#[tauri::command]
+pub fn get_conflict_mode(vault_path: String) -> String {
+    let vault_path = expand_tilde(&vault_path);
+    crate::git::get_conflict_mode(&vault_path)
+}
+
+#[cfg(desktop)]
+#[tauri::command]
+pub fn git_resolve_conflict(
+    vault_path: String,
+    file: String,
+    strategy: String,
+) -> Result<(), String> {
+    let vault_path = expand_tilde(&vault_path);
+    crate::git::git_resolve_conflict(&vault_path, &file, &strategy)
+}
+
+#[cfg(desktop)]
+#[tauri::command]
+pub fn git_commit_conflict_resolution(vault_path: String) -> Result<String, String> {
+    let vault_path = expand_tilde(&vault_path);
+    crate::git::git_commit_conflict_resolution(&vault_path)
+}
+
+#[cfg(desktop)]
+#[tauri::command]
+pub async fn git_push(vault_path: String) -> Result<GitPushResult, String> {
+    let vault_path = expand_tilde(&vault_path).into_owned();
+    tokio::task::spawn_blocking(move || crate::git::git_push(&vault_path))
+        .await
+        .map_err(|e| format!("Task panicked: {e}"))?
+}
+
+#[cfg(desktop)]
+#[tauri::command]
+pub async fn git_remote_status(vault_path: String) -> Result<GitRemoteStatus, String> {
+    let vault_path = expand_tilde(&vault_path).into_owned();
+    tokio::task::spawn_blocking(move || crate::git::git_remote_status(&vault_path))
+        .await
+        .map_err(|e| format!("Task panicked: {e}"))?
+}
+
+#[cfg(desktop)]
+#[tauri::command]
+pub fn is_git_repo(vault_path: String) -> bool {
+    let vault_path = expand_tilde(&vault_path);
+    std::path::Path::new(vault_path.as_ref())
+        .join(".git")
+        .is_dir()
+}
+
+#[cfg(desktop)]
+#[tauri::command]
+pub fn init_git_repo(vault_path: String) -> Result<(), String> {
+    let vault_path = expand_tilde(&vault_path);
+    crate::git::init_repo(&vault_path)
+}
+
+// ── Git commands (mobile stubs) ─────────────────────────────────────────────
+
+#[cfg(mobile)]
+#[tauri::command]
+pub fn get_file_history(_vault_path: String, _path: String) -> Result<Vec<GitCommit>, String> {
+    Err("Git history is not available on mobile".into())
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub fn get_modified_files(_vault_path: String) -> Result<Vec<ModifiedFile>, String> {
+    Ok(vec![])
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub fn get_file_diff(_vault_path: String, _path: String) -> Result<String, String> {
+    Err("Git diff is not available on mobile".into())
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub fn get_file_diff_at_commit(
+    _vault_path: String,
+    _path: String,
+    _commit_hash: String,
+) -> Result<String, String> {
+    Err("Git diff is not available on mobile".into())
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub fn get_vault_pulse(
+    _vault_path: String,
+    _limit: Option<usize>,
+    _skip: Option<usize>,
+) -> Result<Vec<PulseCommit>, String> {
+    Ok(vec![])
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub fn git_commit(_vault_path: String, _message: String) -> Result<String, String> {
+    Err("Git commit is not available on mobile".into())
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub fn get_last_commit_info(_vault_path: String) -> Result<Option<LastCommitInfo>, String> {
+    Ok(None)
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub async fn git_pull(_vault_path: String) -> Result<GitPullResult, String> {
+    Err("Git pull is not available on mobile".into())
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub fn get_conflict_files(_vault_path: String) -> Result<Vec<String>, String> {
+    Ok(vec![])
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub fn get_conflict_mode(_vault_path: String) -> String {
+    "none".to_string()
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub fn git_resolve_conflict(
+    _vault_path: String,
+    _file: String,
+    _strategy: String,
+) -> Result<(), String> {
+    Err("Git conflict resolution is not available on mobile".into())
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub fn git_commit_conflict_resolution(_vault_path: String) -> Result<String, String> {
+    Err("Git conflict resolution is not available on mobile".into())
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub async fn git_push(_vault_path: String) -> Result<GitPushResult, String> {
+    Err("Git push is not available on mobile".into())
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub async fn git_remote_status(_vault_path: String) -> Result<GitRemoteStatus, String> {
+    Ok(GitRemoteStatus {
+        branch: String::new(),
+        has_remote: false,
+        ahead: 0,
+        behind: 0,
+    })
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub fn is_git_repo(_vault_path: String) -> bool {
+    false
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub fn init_git_repo(_vault_path: String) -> Result<(), String> {
+    Err("Git init is not available on mobile".into())
+}

src-tauri/src/commands/github.rs

@@ -0,0 +1,88 @@
+use crate::github::{DeviceFlowPollResult, DeviceFlowStart, GitHubUser, GithubRepo};
+
+use super::expand_tilde;
+
+// ── GitHub commands (desktop) ───────────────────────────────────────────────
+
+#[cfg(desktop)]
+#[tauri::command]
+pub async fn github_list_repos(token: String) -> Result<Vec<GithubRepo>, String> {
+    crate::github::github_list_repos(&token).await
+}
+
+#[cfg(desktop)]
+#[tauri::command]
+pub async fn github_create_repo(
+    token: String,
+    name: String,
+    private: bool,
+) -> Result<GithubRepo, String> {
+    crate::github::github_create_repo(&token, &name, private).await
+}
+
+#[cfg(desktop)]
+#[tauri::command]
+pub fn clone_repo(url: String, token: String, local_path: String) -> Result<String, String> {
+    let local_path = expand_tilde(&local_path);
+    crate::github::clone_repo(&url, &token, &local_path)
+}
+
+#[cfg(desktop)]
+#[tauri::command]
+pub async fn github_device_flow_start() -> Result<DeviceFlowStart, String> {
+    crate::github::github_device_flow_start().await
+}
+
+#[cfg(desktop)]
+#[tauri::command]
+pub async fn github_device_flow_poll(device_code: String) -> Result<DeviceFlowPollResult, String> {
+    crate::github::github_device_flow_poll(&device_code).await
+}
+
+#[cfg(desktop)]
+#[tauri::command]
+pub async fn github_get_user(token: String) -> Result<GitHubUser, String> {
+    crate::github::github_get_user(&token).await
+}
+
+// ── GitHub commands (mobile stubs) ──────────────────────────────────────────
+
+#[cfg(mobile)]
+#[tauri::command]
+pub async fn github_list_repos(_token: String) -> Result<Vec<GithubRepo>, String> {
+    Err("GitHub integration is not available on mobile".into())
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub async fn github_create_repo(
+    _token: String,
+    _name: String,
+    _private: bool,
+) -> Result<GithubRepo, String> {
+    Err("GitHub integration is not available on mobile".into())
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub fn clone_repo(_url: String, _token: String, _local_path: String) -> Result<String, String> {
+    Err("Git clone is not available on mobile".into())
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub async fn github_device_flow_start() -> Result<DeviceFlowStart, String> {
+    Err("GitHub integration is not available on mobile".into())
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub async fn github_device_flow_poll(_device_code: String) -> Result<DeviceFlowPollResult, String> {
+    Err("GitHub integration is not available on mobile".into())
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub async fn github_get_user(_token: String) -> Result<GitHubUser, String> {
+    Err("GitHub integration is not available on mobile".into())
+}

src-tauri/src/commands/mod.rs

@@ -0,0 +1,93 @@
+mod ai;
+mod git;
+mod github;
+mod system;
+mod vault;
+
+use std::borrow::Cow;
+
+pub use ai::*;
+pub use git::*;
+pub use github::*;
+pub use system::*;
+pub use vault::*;
+
+/// Expand a leading `~` or `~/` in a path string to the user's home directory.
+/// Returns the original string unchanged if it doesn't start with `~` or if the
+/// home directory cannot be determined.
+pub fn expand_tilde(path: &str) -> Cow<'_, str> {
+    if path == "~" {
+        if let Some(home) = dirs::home_dir() {
+            return Cow::Owned(home.to_string_lossy().into_owned());
+        }
+    } else if let Some(rest) = path.strip_prefix("~/") {
+        if let Some(home) = dirs::home_dir() {
+            return Cow::Owned(format!("{}/{}", home.to_string_lossy(), rest));
+        }
+    }
+    Cow::Borrowed(path)
+}
+
+pub fn parse_build_label(version: &str) -> String {
+    let parts: Vec<&str> = version.split('.').collect();
+    match parts.as_slice() {
+        [_, minor, patch] if minor.len() >= 6 => format!("b{}", patch),
+        [_, _, _] => "dev".to_string(),
+        _ => "b?".to_string(),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn expand_tilde_with_subpath() {
+        let home = dirs::home_dir().unwrap();
+        let result = expand_tilde("~/Documents/vault");
+        assert_eq!(result, format!("{}/Documents/vault", home.display()));
+    }
+
+    #[test]
+    fn expand_tilde_alone() {
+        let home = dirs::home_dir().unwrap();
+        let result = expand_tilde("~");
+        assert_eq!(result, home.to_string_lossy());
+    }
+
+    #[test]
+    fn expand_tilde_noop_for_absolute_path() {
+        let result = expand_tilde("/usr/local/bin");
+        assert_eq!(result, "/usr/local/bin");
+    }
+
+    #[test]
+    fn expand_tilde_noop_for_relative_path() {
+        let result = expand_tilde("some/relative/path");
+        assert_eq!(result, "some/relative/path");
+    }
+
+    #[test]
+    fn expand_tilde_noop_for_tilde_in_middle() {
+        let result = expand_tilde("/home/~user/path");
+        assert_eq!(result, "/home/~user/path");
+    }
+
+    #[test]
+    fn parse_build_label_release_version() {
+        assert_eq!(parse_build_label("0.20260303.281"), "b281");
+        assert_eq!(parse_build_label("0.20251215.42"), "b42");
+    }
+
+    #[test]
+    fn parse_build_label_dev_version() {
+        assert_eq!(parse_build_label("0.1.0"), "dev");
+        assert_eq!(parse_build_label("0.0.0"), "dev");
+    }
+
+    #[test]
+    fn parse_build_label_malformed() {
+        assert_eq!(parse_build_label("invalid"), "b?");
+        assert_eq!(parse_build_label(""), "b?");
+    }
+}

src-tauri/src/commands/system.rs

@@ -0,0 +1,104 @@
+#[cfg(desktop)]
+use crate::menu;
+use crate::settings::Settings;
+use crate::vault_list;
+use crate::vault_list::VaultList;
+
+use super::parse_build_label;
+
+// ── MCP commands (desktop) ──────────────────────────────────────────────────
+
+#[cfg(desktop)]
+#[tauri::command]
+pub async fn register_mcp_tools(vault_path: String) -> Result<String, String> {
+    let vault_path = super::expand_tilde(&vault_path).into_owned();
+    tokio::task::spawn_blocking(move || crate::mcp::register_mcp(&vault_path))
+        .await
+        .map_err(|e| format!("Registration task failed: {e}"))?
+}
+
+#[cfg(desktop)]
+#[tauri::command]
+pub async fn check_mcp_status() -> Result<crate::mcp::McpStatus, String> {
+    tokio::task::spawn_blocking(crate::mcp::check_mcp_status)
+        .await
+        .map_err(|e| format!("MCP status check failed: {e}"))
+}
+
+// ── MCP commands (mobile stubs) ─────────────────────────────────────────────
+
+#[cfg(mobile)]
+#[tauri::command]
+pub async fn register_mcp_tools(_vault_path: String) -> Result<String, String> {
+    Err("MCP is not available on mobile".into())
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub async fn check_mcp_status() -> Result<crate::mcp::McpStatus, String> {
+    Ok(crate::mcp::McpStatus::NotInstalled)
+}
+
+// ── Menu commands ───────────────────────────────────────────────────────────
+
+#[cfg(desktop)]
+#[tauri::command]
+pub fn update_menu_state(
+    app_handle: tauri::AppHandle,
+    has_active_note: bool,
+    has_modified_files: Option<bool>,
+    has_conflicts: Option<bool>,
+) -> Result<(), String> {
+    menu::set_note_items_enabled(&app_handle, has_active_note);
+    if let Some(v) = has_modified_files {
+        menu::set_git_commit_items_enabled(&app_handle, v);
+    }
+    if let Some(v) = has_conflicts {
+        menu::set_git_conflict_items_enabled(&app_handle, v);
+    }
+    Ok(())
+}
+
+#[cfg(mobile)]
+#[tauri::command]
+pub fn update_menu_state(
+    _app_handle: tauri::AppHandle,
+    _has_active_note: bool,
+    _has_modified_files: Option<bool>,
+    _has_conflicts: Option<bool>,
+) -> Result<(), String> {
+    Ok(())
+}
+
+// ── Settings & config commands ──────────────────────────────────────────────
+
+#[tauri::command]
+pub fn get_build_number(app_handle: tauri::AppHandle) -> String {
+    let version = app_handle.package_info().version.to_string();
+    parse_build_label(&version)
+}
+
+#[tauri::command]
+pub fn get_settings() -> Result<Settings, String> {
+    crate::settings::get_settings()
+}
+
+#[tauri::command]
+pub fn save_settings(settings: Settings) -> Result<(), String> {
+    crate::settings::save_settings(settings)
+}
+
+#[tauri::command]
+pub fn reinit_telemetry() {
+    crate::telemetry::reinit_sentry();
+}
+
+#[tauri::command]
+pub fn load_vault_list() -> Result<VaultList, String> {
+    vault_list::load_vault_list()
+}
+
+#[tauri::command]
+pub fn save_vault_list(list: VaultList) -> Result<(), String> {
+    vault_list::save_vault_list(&list)
+}

src-tauri/src/commands/vault.rs

@@ -0,0 +1,392 @@
+use crate::frontmatter::FrontmatterValue;
+use crate::search::SearchResponse;
+use crate::vault::{DetectedRename, FolderNode, RenameResult, VaultEntry};
+use crate::{frontmatter, git, search, vault};
+
+use super::expand_tilde;
+
+// ── Vault commands ──────────────────────────────────────────────────────────
+
+#[tauri::command]
+pub fn list_vault(path: String) -> Result<Vec<VaultEntry>, String> {
+    let path = expand_tilde(&path);
+    vault::scan_vault_cached(std::path::Path::new(path.as_ref()))
+}
+
+#[tauri::command]
+pub fn list_vault_folders(path: String) -> Result<Vec<FolderNode>, String> {
+    let path = expand_tilde(&path);
+    vault::scan_vault_folders(std::path::Path::new(path.as_ref()))
+}
+
+#[tauri::command]
+pub fn get_note_content(path: String) -> Result<String, String> {
+    let path = expand_tilde(&path);
+    vault::get_note_content(std::path::Path::new(path.as_ref()))
+}
+
+#[tauri::command]
+pub fn save_note_content(path: String, content: String) -> Result<(), String> {
+    let path = expand_tilde(&path);
+    vault::save_note_content(&path, &content)
+}
+
+#[tauri::command]
+pub fn rename_note(
+    vault_path: String,
+    old_path: String,
+    new_title: String,
+    old_title: Option<String>,
+) -> Result<RenameResult, String> {
+    let vault_path = expand_tilde(&vault_path);
+    let old_path = expand_tilde(&old_path);
+    vault::rename_note(&vault_path, &old_path, &new_title, old_title.as_deref())
+}
+
+#[tauri::command]
+pub fn detect_renames(vault_path: String) -> Result<Vec<DetectedRename>, String> {
+    let vault_path = expand_tilde(&vault_path);
+    vault::detect_renames(&vault_path)
+}
+
+#[tauri::command]
+pub fn update_wikilinks_for_renames(
+    vault_path: String,
+    renames: Vec<DetectedRename>,
+) -> Result<usize, String> {
+    let vault_path = expand_tilde(&vault_path);
+    vault::update_wikilinks_for_renames(&vault_path, &renames)
+}
+
+#[tauri::command]
+pub fn purge_trash(vault_path: String) -> Result<Vec<String>, String> {
+    let vault_path = expand_tilde(&vault_path);
+    vault::purge_trash(&vault_path)
+}
+
+#[tauri::command]
+pub fn delete_note(path: String) -> Result<String, String> {
+    let path = expand_tilde(&path);
+    vault::delete_note(&path)
+}
+
+#[tauri::command]
+pub fn batch_delete_notes(paths: Vec<String>) -> Result<Vec<String>, String> {
+    let expanded: Vec<String> = paths.iter().map(|p| expand_tilde(p).into_owned()).collect();
+    vault::batch_delete_notes(&expanded)
+}
+
+#[tauri::command]
+pub fn empty_trash(vault_path: String) -> Result<Vec<String>, String> {
+    let vault_path = expand_tilde(&vault_path);
+    vault::empty_trash(&vault_path)
+}
+
+#[tauri::command]
+pub fn migrate_is_a_to_type(vault_path: String) -> Result<usize, String> {
+    let vault_path = expand_tilde(&vault_path);
+    vault::migrate_is_a_to_type(&vault_path)
+}
+
+#[tauri::command]
+pub fn flatten_vault(vault_path: String) -> Result<usize, String> {
+    let vault_path = expand_tilde(&vault_path);
+    vault::flatten_vault(&vault_path)
+}
+
+#[tauri::command]
+pub fn vault_health_check(vault_path: String) -> Result<vault::VaultHealthReport, String> {
+    let vault_path = expand_tilde(&vault_path);
+    vault::vault_health_check(&vault_path)
+}
+
+#[tauri::command]
+pub fn create_getting_started_vault(target_path: Option<String>) -> Result<String, String> {
+    let path = match target_path {
+        Some(p) if !p.is_empty() => expand_tilde(&p).into_owned(),
+        _ => vault::default_vault_path()?.to_string_lossy().to_string(),
+    };
+    vault::create_getting_started_vault(&path)
+}
+
+#[tauri::command]
+pub fn check_vault_exists(path: String) -> bool {
+    let path = expand_tilde(&path);
+    vault::vault_exists(&path)
+}
+
+#[tauri::command]
+pub fn get_default_vault_path() -> Result<String, String> {
+    vault::default_vault_path().map(|p| p.to_string_lossy().to_string())
+}
+
+#[tauri::command]
+pub async fn reload_vault(path: String) -> Result<Vec<VaultEntry>, String> {
+    let path = expand_tilde(&path).into_owned();
+    tokio::task::spawn_blocking(move || {
+        vault::invalidate_cache(std::path::Path::new(&path));
+        vault::scan_vault_cached(std::path::Path::new(&path))
+    })
+    .await
+    .map_err(|e| format!("Task panicked: {e}"))?
+}
+
+#[tauri::command]
+pub fn reload_vault_entry(path: String) -> Result<VaultEntry, String> {
+    let path = expand_tilde(&path);
+    vault::reload_entry(std::path::Path::new(path.as_ref()))
+}
+
+/// Sync the `title` frontmatter field with the filename on note open.
+/// Returns `true` if the file was modified (title was absent or desynced).
+#[tauri::command]
+pub fn sync_note_title(path: String) -> Result<bool, String> {
+    use vault::SyncAction;
+    let path = expand_tilde(&path);
+    let action = vault::sync_title_on_open(std::path::Path::new(path.as_ref()))?;
+    Ok(matches!(action, SyncAction::Updated { .. }))
+}
+
+#[tauri::command]
+pub fn save_image(vault_path: String, filename: String, data: String) -> Result<String, String> {
+    let vault_path = expand_tilde(&vault_path);
+    vault::save_image(&vault_path, &filename, &data)
+}
+
+#[tauri::command]
+pub fn copy_image_to_vault(vault_path: String, source_path: String) -> Result<String, String> {
+    let vault_path = expand_tilde(&vault_path);
+    vault::copy_image_to_vault(&vault_path, &source_path)
+}
+
+// ── Frontmatter commands ────────────────────────────────────────────────────
+
+#[tauri::command]
+pub fn update_frontmatter(
+    path: String,
+    key: String,
+    value: FrontmatterValue,
+) -> Result<String, String> {
+    let path = expand_tilde(&path);
+    frontmatter::update_frontmatter(&path, &key, value)
+}
+
+#[tauri::command]
+pub fn delete_frontmatter_property(path: String, key: String) -> Result<String, String> {
+    let path = expand_tilde(&path);
+    frontmatter::delete_frontmatter_property(&path, &key)
+}
+
+#[tauri::command]
+pub fn batch_archive_notes(paths: Vec<String>) -> Result<usize, String> {
+    let mut count = 0;
+    for path in &paths {
+        let path = expand_tilde(path);
+        frontmatter::update_frontmatter(&path, "Archived", FrontmatterValue::Bool(true))?;
+        count += 1;
+    }
+    Ok(count)
+}
+
+#[tauri::command]
+pub fn batch_trash_notes(paths: Vec<String>) -> Result<usize, String> {
+    let now = chrono::Utc::now().format("%Y-%m-%dT%H:%M:%SZ").to_string();
+    let mut count = 0;
+    for path in &paths {
+        let path = expand_tilde(path);
+        frontmatter::update_frontmatter(&path, "Trashed", FrontmatterValue::Bool(true))?;
+        frontmatter::update_frontmatter(
+            &path,
+            "Trashed at",
+            FrontmatterValue::String(now.clone()),
+        )?;
+        count += 1;
+    }
+    Ok(count)
+}
+
+// ── Search commands ─────────────────────────────────────────────────────────
+
+#[tauri::command]
+pub async fn search_vault(
+    vault_path: String,
+    query: String,
+    mode: String,
+    limit: Option<usize>,
+) -> Result<SearchResponse, String> {
+    let vault_path = expand_tilde(&vault_path).into_owned();
+    let limit = limit.unwrap_or(20);
+    tokio::task::spawn_blocking(move || search::search_vault(&vault_path, &query, &mode, limit))
+        .await
+        .map_err(|e| format!("Search task failed: {}", e))?
+}
+
+// ── Repair command ──────────────────────────────────────────────────────────
+
+#[tauri::command]
+pub fn repair_vault(vault_path: String) -> Result<String, String> {
+    let vault_path = expand_tilde(&vault_path);
+    vault::migrate_is_a_to_type(&vault_path)?;
+    vault::flatten_vault(&vault_path)?;
+    vault::repair_config_files(&vault_path)?;
+    git::ensure_gitignore(&vault_path)?;
+    Ok("Vault repaired".to_string())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn temp_note(body: &str) -> (tempfile::TempDir, std::path::PathBuf) {
+        let dir = tempfile::TempDir::new().unwrap();
+        let note = dir.path().join("note.md");
+        std::fs::write(&note, body).unwrap();
+        (dir, note)
+    }
+
+    #[test]
+    fn test_batch_archive_notes() {
+        let (_dir, note) = temp_note("---\nStatus: Active\n---\n# Note\n");
+        assert_eq!(
+            batch_archive_notes(vec![note.to_str().unwrap().to_string()]).unwrap(),
+            1
+        );
+        let content = std::fs::read_to_string(&note).unwrap();
+        assert!(content.contains("Archived: true"));
+        assert!(content.contains("Status: Active"));
+    }
+
+    #[test]
+    fn test_batch_trash_notes() {
+        let (_dir, note) = temp_note("---\nStatus: Active\n---\n# Note\n");
+        assert_eq!(
+            batch_trash_notes(vec![note.to_str().unwrap().to_string()]).unwrap(),
+            1
+        );
+        let content = std::fs::read_to_string(&note).unwrap();
+        assert!(content.contains("Trashed: true"));
+        assert!(content.contains("Trashed at"));
+    }
+
+    #[test]
+    fn test_reload_vault_entry_reads_from_disk() {
+        let dir = tempfile::TempDir::new().unwrap();
+        let note = dir.path().join("test.md");
+        std::fs::write(&note, "---\ntitle: Test\nStatus: Active\n---\n# Test\n").unwrap();
+
+        let entry = reload_vault_entry(note.to_str().unwrap().to_string()).unwrap();
+        assert_eq!(entry.title, "Test");
+        assert_eq!(entry.status, Some("Active".to_string()));
+
+        // Modify file on disk
+        std::fs::write(&note, "---\ntitle: Test\nStatus: Done\n---\n# Test\n").unwrap();
+        let fresh = reload_vault_entry(note.to_str().unwrap().to_string()).unwrap();
+        assert_eq!(fresh.status, Some("Done".to_string()));
+    }
+
+    #[test]
+    fn test_reload_vault_entry_nonexistent() {
+        let result = reload_vault_entry("/nonexistent/path.md".to_string());
+        assert!(result.is_err());
+    }
+
+    #[test]
+    fn test_reload_vault_invalidates_cache_and_rescans() {
+        let dir = tempfile::TempDir::new().unwrap();
+        let vault_path = dir.path();
+        std::process::Command::new("git")
+            .args(["init"])
+            .current_dir(vault_path)
+            .output()
+            .unwrap();
+        std::process::Command::new("git")
+            .args(["config", "user.email", "t@t.com"])
+            .current_dir(vault_path)
+            .output()
+            .unwrap();
+        std::process::Command::new("git")
+            .args(["config", "user.name", "T"])
+            .current_dir(vault_path)
+            .output()
+            .unwrap();
+
+        let cache_dir = tempfile::TempDir::new().unwrap();
+        std::env::set_var(
+            "LAPUTA_CACHE_DIR",
+            cache_dir.path().to_string_lossy().as_ref(),
+        );
+
+        std::fs::write(
+            vault_path.join("note.md"),
+            "---\nTrashed: false\n---\n# Note\n",
+        )
+        .unwrap();
+        std::process::Command::new("git")
+            .args(["add", "."])
+            .current_dir(vault_path)
+            .output()
+            .unwrap();
+        std::process::Command::new("git")
+            .args(["commit", "-m", "init"])
+            .current_dir(vault_path)
+            .output()
+            .unwrap();
+
+        let entries = list_vault(vault_path.to_str().unwrap().to_string()).unwrap();
+        assert!(!entries[0].trashed);
+
+        std::fs::write(
+            vault_path.join("note.md"),
+            "---\nTrashed: true\n---\n# Note\n",
+        )
+        .unwrap();
+
+        let vp_str = vault_path.to_str().unwrap();
+        crate::vault::invalidate_cache(std::path::Path::new(vp_str));
+        let fresh = crate::vault::scan_vault_cached(std::path::Path::new(vp_str)).unwrap();
+        assert!(
+            fresh[0].trashed,
+            "reload_vault must reflect disk state after trashing"
+        );
+    }
+
+    #[test]
+    fn test_check_vault_exists_false() {
+        assert!(!check_vault_exists("/nonexistent/path/abc123".to_string()));
+    }
+
+    #[test]
+    fn test_get_default_vault_path_returns_ok() {
+        let result = get_default_vault_path();
+        assert!(result.is_ok());
+    }
+
+    #[test]
+    fn test_repair_vault_flattens_type_folders() {
+        let dir = tempfile::TempDir::new().unwrap();
+        let vault_path = dir.path();
+        let note_dir = vault_path.join("note");
+        std::fs::create_dir_all(&note_dir).unwrap();
+        std::fs::write(note_dir.join("hello.md"), "---\nis_a: Note\n---\n# Hello\n").unwrap();
+
+        let result = repair_vault(vault_path.to_str().unwrap().to_string());
+        assert!(result.is_ok());
+        assert!(vault_path.join("hello.md").exists());
+        assert!(!note_dir.join("hello.md").exists());
+        let content = std::fs::read_to_string(vault_path.join("hello.md")).unwrap();
+        assert!(content.contains("type: Note"));
+        assert!(!content.contains("is_a:"));
+    }
+
+    #[test]
+    fn test_repair_vault_creates_config_files() {
+        let dir = tempfile::TempDir::new().unwrap();
+        let vault_path = dir.path();
+
+        let result = repair_vault(vault_path.to_str().unwrap().to_string());
+        assert!(result.is_ok());
+        assert!(vault_path.join("AGENTS.md").exists());
+        assert!(vault_path.join("config.md").exists());
+        assert!(vault_path.join(".gitignore").exists());
+    }
+}

src-tauri/src/lib.rs

@@ -1,4 +1,3 @@
-pub mod ai_chat;
 pub mod claude_cli;
 mod commands;
 pub mod frontmatter;
@@ -118,11 +117,14 @@ pub fn run() {
         })
         .invoke_handler(tauri::generate_handler![
             commands::list_vault,
+            commands::list_vault_folders,
             commands::get_note_content,
             commands::save_note_content,
             commands::update_frontmatter,
             commands::delete_frontmatter_property,
             commands::rename_note,
+            commands::detect_renames,
+            commands::update_wikilinks_for_renames,
             commands::get_file_history,
             commands::get_modified_files,
             commands::get_file_diff,
@@ -138,7 +140,8 @@ pub fn run() {
             commands::get_conflict_mode,
             commands::git_resolve_conflict,
             commands::git_commit_conflict_resolution,
-            commands::ai_chat,
+            commands::is_git_repo,
+            commands::init_git_repo,
             commands::check_claude_cli,
             commands::stream_claude_chat,
             commands::stream_claude_agent,

src-tauri/src/menu.rs

@@ -293,7 +293,7 @@ fn build_note_menu(app: &App) -> MenuResult {
         .id(EDIT_TOGGLE_RAW_EDITOR)
         .accelerator("CmdOrCtrl+\\")
         .build(app)?;
-    let toggle_ai_chat = MenuItemBuilder::new("Toggle AI Chat")
+    let toggle_ai_chat = MenuItemBuilder::new("Toggle AI Panel")
         .id(VIEW_TOGGLE_AI_CHAT)
         .accelerator("CmdOrCtrl+I")
         .build(app)?;

src-tauri/src/settings.rs

@@ -4,7 +4,6 @@ use std::path::PathBuf;
 
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct Settings {
-    pub anthropic_key: Option<String>,
     pub openai_key: Option<String>,
     pub google_key: Option<String>,
     pub github_token: Option<String>,
@@ -40,10 +39,6 @@ fn save_settings_at(path: &PathBuf, settings: Settings) -> Result<(), String> {
 
     // Trim whitespace and convert empty strings to None
     let cleaned = Settings {
-        anthropic_key: settings
-            .anthropic_key
-            .map(|k| k.trim().to_string())
-            .filter(|k| !k.is_empty()),
         openai_key: settings
             .openai_key
             .map(|k| k.trim().to_string())
@@ -132,7 +127,6 @@ mod tests {
     #[test]
     fn test_default_settings_all_none() {
         let s = Settings::default();
-        assert!(s.anthropic_key.is_none());
         assert!(s.openai_key.is_none());
         assert!(s.google_key.is_none());
         assert!(s.github_token.is_none());
@@ -148,7 +142,6 @@ mod tests {
     #[test]
     fn test_settings_json_roundtrip() {
         let settings = Settings {
-            anthropic_key: Some("sk-ant-test123".to_string()),
             openai_key: None,
             google_key: Some("AIza-test".to_string()),
             github_token: Some("gho_xyz789".to_string()),
@@ -161,7 +154,6 @@ mod tests {
         };
         let json = serde_json::to_string(&settings).unwrap();
         let parsed: Settings = serde_json::from_str(&json).unwrap();
-        assert_eq!(parsed.anthropic_key, settings.anthropic_key);
         assert_eq!(parsed.google_key, settings.google_key);
         assert_eq!(parsed.github_token, settings.github_token);
         assert_eq!(parsed.github_username, settings.github_username);
@@ -176,13 +168,12 @@ mod tests {
         let dir = tempfile::TempDir::new().unwrap();
         let path = dir.path().join("nonexistent.json");
         let result = get_settings_at(&path).unwrap();
-        assert!(result.anthropic_key.is_none());
+        assert!(result.openai_key.is_none());
     }
 
     #[test]
     fn test_save_and_load_preserves_values() {
         let loaded = save_and_reload(Settings {
-            anthropic_key: Some("sk-ant-key".to_string()),
             openai_key: Some("sk-openai".to_string()),
             google_key: None,
             github_token: Some("gho_token123".to_string()),
@@ -190,7 +181,6 @@ mod tests {
             auto_pull_interval_minutes: Some(10),
             ..Default::default()
         });
-        assert_eq!(loaded.anthropic_key.as_deref(), Some("sk-ant-key"));
         assert_eq!(loaded.openai_key.as_deref(), Some("sk-openai"));
         assert_eq!(loaded.github_token.as_deref(), Some("gho_token123"));
         assert_eq!(loaded.github_username.as_deref(), Some("lucaong"));
@@ -200,12 +190,10 @@ mod tests {
     #[test]
     fn test_save_trims_whitespace() {
         let loaded = save_and_reload(Settings {
-            anthropic_key: Some("  sk-ant-test  ".to_string()),
             github_token: Some("  gho_abc  ".to_string()),
             github_username: Some("  lucaong  ".to_string()),
             ..Default::default()
         });
-        assert_eq!(loaded.anthropic_key.as_deref(), Some("sk-ant-test"));
         assert_eq!(loaded.github_token.as_deref(), Some("gho_abc"));
         assert_eq!(loaded.github_username.as_deref(), Some("lucaong"));
     }
@@ -213,12 +201,10 @@ mod tests {
     #[test]
     fn test_save_filters_empty_and_whitespace_only() {
         let loaded = save_and_reload(Settings {
-            anthropic_key: Some("".to_string()),
             openai_key: Some("   ".to_string()),
             github_username: Some("".to_string()),
             ..Default::default()
         });
-        assert!(loaded.anthropic_key.is_none());
         assert!(loaded.openai_key.is_none());
         assert!(loaded.github_username.is_none());
     }
@@ -231,14 +217,14 @@ mod tests {
         save_settings_at(
             &path,
             Settings {
-                anthropic_key: Some("key".to_string()),
+                openai_key: Some("key".to_string()),
                 ..Default::default()
             },
         )
         .unwrap();
         assert!(path.exists());
         assert_eq!(
-            get_settings_at(&path).unwrap().anthropic_key.as_deref(),
+            get_settings_at(&path).unwrap().openai_key.as_deref(),
             Some("key")
         );
     }
@@ -273,9 +259,9 @@ mod tests {
         let dir = tempfile::TempDir::new().unwrap();
         let path = dir.path().join("settings.json");
         // Simulate old settings.json without telemetry fields
-        fs::write(&path, r#"{"anthropic_key":"sk-test"}"#).unwrap();
+        fs::write(&path, r#"{"openai_key":"sk-test"}"#).unwrap();
         let loaded = get_settings_at(&path).unwrap();
-        assert_eq!(loaded.anthropic_key.as_deref(), Some("sk-test"));
+        assert_eq!(loaded.openai_key.as_deref(), Some("sk-test"));
         assert!(loaded.telemetry_consent.is_none());
         assert!(loaded.crash_reporting_enabled.is_none());
         assert!(loaded.analytics_enabled.is_none());

src-tauri/src/vault/entry.rs

@@ -1,6 +1,17 @@
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
+/// A node in the vault's folder tree. Only contains directories, not files.
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct FolderNode {
+    /// Folder name (last path component).
+    pub name: String,
+    /// Path relative to the vault root, using `/` separators (e.g. "projects/laputa").
+    pub path: String,
+    /// Child folders (sorted alphabetically).
+    pub children: Vec<FolderNode>,
+}
+
 #[derive(Debug, Serialize, Deserialize, Clone, Default)]
 pub struct VaultEntry {
     pub path: String,

src-tauri/src/vault/mod.rs

@@ -13,12 +13,14 @@ mod trash;
 
 pub use cache::{invalidate_cache, scan_vault_cached};
 pub use config_seed::{migrate_agents_md, repair_config_files, seed_config_files};
-pub use entry::VaultEntry;
+pub use entry::{FolderNode, VaultEntry};
 pub use file::{get_note_content, save_note_content};
 pub use getting_started::{create_getting_started_vault, default_vault_path, vault_exists};
 pub use image::{copy_image_to_vault, save_image};
 pub use migration::{flatten_vault, migrate_is_a_to_type, vault_health_check, VaultHealthReport};
-pub use rename::{rename_note, RenameResult};
+pub use rename::{
+    detect_renames, rename_note, update_wikilinks_for_renames, DetectedRename, RenameResult,
+};
 pub use title_sync::{sync_title_on_open, SyncAction};
 pub use trash::{batch_delete_notes, delete_note, empty_trash, is_file_trashed, purge_trash};
 
@@ -114,9 +116,12 @@ pub fn reload_entry(path: &Path) -> Result<VaultEntry, String> {
     parse_md_file(path)
 }
 
-/// Folders that are scanned recursively (attachments, assets).
-/// All other subfolders are ignored — notes and type definitions live flat at the vault root.
-const PROTECTED_FOLDERS: &[&str] = &["attachments", "assets"];
+/// Directories that are never shown in the folder tree or scanned for notes.
+const HIDDEN_DIRS: &[&str] = &[".git", ".laputa", ".DS_Store"];
+
+fn is_hidden_dir(name: &str) -> bool {
+    name.starts_with('.') || HIDDEN_DIRS.contains(&name)
+}
 
 fn is_md_file(path: &Path) -> bool {
     path.is_file() && path.extension().is_some_and(|ext| ext == "md")
@@ -129,31 +134,25 @@ fn try_parse_md(path: &Path, entries: &mut Vec<VaultEntry>) {
     }
 }
 
-fn scan_root_md_files(vault_path: &Path, entries: &mut Vec<VaultEntry>) {
-    let dir_entries = match fs::read_dir(vault_path) {
-        Ok(d) => d,
-        Err(_) => return,
-    };
-    for dir_entry in dir_entries.flatten() {
-        let path = dir_entry.path();
-        if is_md_file(&path) {
-            try_parse_md(&path, entries);
-        }
-    }
-}
-
-fn scan_protected_folders(vault_path: &Path, entries: &mut Vec<VaultEntry>) {
-    for folder in PROTECTED_FOLDERS {
-        let folder_path = vault_path.join(folder);
-        if !folder_path.is_dir() {
-            continue;
-        }
-        let md_files = WalkDir::new(&folder_path)
-            .follow_links(true)
-            .into_iter()
-            .filter_map(|e| e.ok())
-            .filter(|e| is_md_file(e.path()));
-        for entry in md_files {
+/// Scan all .md files in the vault, including subdirectories.
+/// Hidden directories (starting with `.`) are excluded.
+fn scan_all_md_files(vault_path: &Path, entries: &mut Vec<VaultEntry>) {
+    let walker = WalkDir::new(vault_path)
+        .follow_links(true)
+        .into_iter()
+        .filter_entry(|e| {
+            if e.file_type().is_dir() {
+                let name = e.file_name().to_string_lossy();
+                // Skip the vault root itself (depth 0) — we only filter subdirs
+                if e.depth() == 0 {
+                    return true;
+                }
+                return !is_hidden_dir(&name);
+            }
+            true
+        });
+    for entry in walker.filter_map(|e| e.ok()) {
+        if is_md_file(entry.path()) {
             try_parse_md(entry.path(), entries);
         }
     }
@@ -175,13 +174,51 @@ pub fn scan_vault(vault_path: &Path) -> Result<Vec<VaultEntry>, String> {
     }
 
     let mut entries = Vec::new();
-    scan_root_md_files(vault_path, &mut entries);
-    scan_protected_folders(vault_path, &mut entries);
+    scan_all_md_files(vault_path, &mut entries);
 
     entries.sort_by(|a, b| b.modified_at.cmp(&a.modified_at));
     Ok(entries)
 }
 
+/// Build a tree of visible folders in the vault.
+/// Excludes hidden directories (starting with `.`).
+pub fn scan_vault_folders(vault_path: &Path) -> Result<Vec<FolderNode>, String> {
+    if !vault_path.is_dir() {
+        return Err(format!("Not a directory: {}", vault_path.display()));
+    }
+    fn build_tree(dir: &Path, vault_root: &Path) -> Vec<FolderNode> {
+        let mut nodes: Vec<FolderNode> = Vec::new();
+        let entries = match fs::read_dir(dir) {
+            Ok(d) => d,
+            Err(_) => return nodes,
+        };
+        for entry in entries.flatten() {
+            let path = entry.path();
+            if !path.is_dir() {
+                continue;
+            }
+            let name = entry.file_name().to_string_lossy().to_string();
+            if is_hidden_dir(&name) {
+                continue;
+            }
+            let rel_path = path
+                .strip_prefix(vault_root)
+                .unwrap_or(&path)
+                .to_string_lossy()
+                .replace('\\', "/");
+            let children = build_tree(&path, vault_root);
+            nodes.push(FolderNode {
+                name,
+                path: rel_path,
+                children,
+            });
+        }
+        nodes.sort_by(|a, b| a.name.to_lowercase().cmp(&b.name.to_lowercase()));
+        nodes
+    }
+    Ok(build_tree(vault_path, vault_path))
+}
+
 #[cfg(test)]
 #[path = "mod_tests.rs"]
 mod tests;

src-tauri/src/vault/mod_tests.rs

@@ -145,7 +145,7 @@ fn test_scan_vault_root_and_protected_folders() {
 }
 
 #[test]
-fn test_scan_vault_skips_non_protected_subfolders() {
+fn test_scan_vault_includes_subdirectory_notes() {
     let dir = TempDir::new().unwrap();
     create_test_file(dir.path(), "root.md", "# Root Note\n");
     create_test_file(
@@ -160,8 +160,15 @@ fn test_scan_vault_skips_non_protected_subfolders() {
     );
 
     let entries = scan_vault(dir.path()).unwrap();
-    assert_eq!(entries.len(), 1, "only root .md files should be scanned");
-    assert_eq!(entries[0].filename, "root.md");
+    assert_eq!(
+        entries.len(),
+        3,
+        "all .md files including subdirs should be scanned"
+    );
+    let filenames: Vec<&str> = entries.iter().map(|e| e.filename.as_str()).collect();
+    assert!(filenames.contains(&"root.md"));
+    assert!(filenames.contains(&"nested.md"));
+    assert!(filenames.contains(&"old-project.md"));
 }
 
 #[test]
@@ -1211,6 +1218,46 @@ fn test_array_field_does_not_break_type_detection() {
     assert_eq!(entry.status, Some("Active".to_string()));
 }
 
+// ── Folder tree tests ──────────────────────────────────────────────────────
+
+#[test]
+fn test_scan_vault_folders_returns_tree() {
+    let dir = TempDir::new().unwrap();
+    fs::create_dir_all(dir.path().join("projects/laputa")).unwrap();
+    fs::create_dir_all(dir.path().join("areas")).unwrap();
+
+    let folders = scan_vault_folders(dir.path()).unwrap();
+    let names: Vec<&str> = folders.iter().map(|f| f.name.as_str()).collect();
+    assert!(names.contains(&"projects"));
+    assert!(names.contains(&"areas"));
+
+    let projects = folders.iter().find(|f| f.name == "projects").unwrap();
+    assert_eq!(projects.children.len(), 1);
+    assert_eq!(projects.children[0].name, "laputa");
+    assert_eq!(projects.children[0].path, "projects/laputa");
+}
+
+#[test]
+fn test_scan_vault_folders_excludes_hidden() {
+    let dir = TempDir::new().unwrap();
+    fs::create_dir_all(dir.path().join(".git")).unwrap();
+    fs::create_dir_all(dir.path().join(".laputa")).unwrap();
+    fs::create_dir_all(dir.path().join("visible")).unwrap();
+
+    let folders = scan_vault_folders(dir.path()).unwrap();
+    assert_eq!(folders.len(), 1);
+    assert_eq!(folders[0].name, "visible");
+}
+
+#[test]
+fn test_scan_vault_folders_flat_vault() {
+    let dir = TempDir::new().unwrap();
+    create_test_file(dir.path(), "note.md", "# Note\n");
+
+    let folders = scan_vault_folders(dir.path()).unwrap();
+    assert!(folders.is_empty(), "flat vault has no visible folders");
+}
+
 // Frontmatter update/delete tests are in frontmatter.rs
 // save_image tests are in vault/image.rs
 // purge_trash tests are in vault/trash.rs

src-tauri/src/vault/rename.rs

@@ -250,6 +250,89 @@ pub fn rename_note(
     })
 }
 
+/// A detected rename: old path → new path (both relative to vault root).
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct DetectedRename {
+    pub old_path: String,
+    pub new_path: String,
+}
+
+/// Detect renamed files by comparing working tree against HEAD using git diff.
+pub fn detect_renames(vault_path: &str) -> Result<Vec<DetectedRename>, String> {
+    let vault = Path::new(vault_path);
+    let output = std::process::Command::new("git")
+        .args(["diff", "HEAD", "--name-status", "--diff-filter=R", "-M"])
+        .current_dir(vault)
+        .output()
+        .map_err(|e| format!("Failed to run git diff: {e}"))?;
+
+    if !output.status.success() {
+        return Ok(vec![]); // No HEAD yet or other git issue — no renames
+    }
+
+    let stdout = String::from_utf8_lossy(&output.stdout);
+    let renames: Vec<DetectedRename> = stdout
+        .lines()
+        .filter_map(|line| {
+            let parts: Vec<&str> = line.split('\t').collect();
+            if parts.len() >= 3 && parts[0].starts_with('R') {
+                let old = parts[1].to_string();
+                let new = parts[2].to_string();
+                if old.ends_with(".md") && new.ends_with(".md") {
+                    return Some(DetectedRename {
+                        old_path: old,
+                        new_path: new,
+                    });
+                }
+            }
+            None
+        })
+        .collect();
+
+    Ok(renames)
+}
+
+/// Update wikilinks across the vault for a list of detected renames.
+/// Returns the total number of files updated.
+pub fn update_wikilinks_for_renames(
+    vault_path: &str,
+    renames: &[DetectedRename],
+) -> Result<usize, String> {
+    let vault = Path::new(vault_path);
+    let mut total_updated = 0;
+
+    for rename in renames {
+        let old_stem = rename
+            .old_path
+            .strip_suffix(".md")
+            .unwrap_or(&rename.old_path);
+        let new_stem = rename
+            .new_path
+            .strip_suffix(".md")
+            .unwrap_or(&rename.new_path);
+        let old_filename_stem = old_stem.split('/').next_back().unwrap_or(old_stem);
+        let new_filename_stem = new_stem.split('/').next_back().unwrap_or(new_stem);
+
+        // Build title from filename stem (kebab-case → Title Case)
+        let old_title = super::parsing::slug_to_title(old_filename_stem);
+        let new_title = super::parsing::slug_to_title(new_filename_stem);
+
+        // The new file is the exclude target (don't rewrite wikilinks inside the renamed file itself)
+        let new_file = vault.join(&rename.new_path);
+
+        let updated = update_wikilinks_in_vault(&WikilinkReplacement {
+            vault_path: vault,
+            old_title: &old_title,
+            new_title: &new_title,
+            old_path_stem: old_filename_stem,
+            exclude_path: &new_file,
+        });
+        total_updated += updated;
+    }
+
+    Ok(total_updated)
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

src-tauri/tauri.conf.json

@@ -16,11 +16,14 @@
         "title": "Laputa",
         "width": 1400,
         "height": 900,
+        "minWidth": 1200,
+        "minHeight": 400,
         "resizable": true,
         "fullscreen": false,
         "titleBarStyle": "Overlay",
         "hiddenTitle": true,
-        "backgroundColor": "#F7F6F3"
+        "backgroundColor": "#F7F6F3",
+        "dragDropEnabled": false
       }
     ],
     "security": {

src/App.css

@@ -16,7 +16,8 @@
 }
 
 .app__sidebar {
-  flex-shrink: 0;
+  flex-shrink: 1;
+  min-width: 180px;
   display: flex;
   flex-direction: column;
 }
@@ -26,7 +27,8 @@
 }
 
 .app__note-list {
-  flex-shrink: 0;
+  flex-shrink: 10;
+  min-width: 220px;
   display: flex;
   flex-direction: column;
 }
@@ -37,7 +39,7 @@
 
 .app__editor {
   flex: 1;
-  min-width: 0;
+  min-width: 800px;
   min-height: 0;
   overflow: hidden;
   display: flex;

src/App.test.tsx

@@ -63,11 +63,12 @@ const mockAllContent: Record<string, string> = {
 
 const mockCommandResults: Record<string, unknown> = {
   list_vault: mockEntries,
+  list_vault_folders: [],
   get_all_content: mockAllContent,
   get_modified_files: [],
   get_note_content: mockAllContent['/vault/project/test.md'] || '',
   get_file_history: [],
-  get_settings: { anthropic_key: null, openai_key: null, google_key: null, github_token: null, github_username: null, auto_pull_interval_minutes: null, telemetry_consent: true, crash_reporting_enabled: null, analytics_enabled: null, anonymous_id: null, update_channel: null },
+  get_settings: { openai_key: null, google_key: null, github_token: null, github_username: null, auto_pull_interval_minutes: null, telemetry_consent: true, crash_reporting_enabled: null, analytics_enabled: null, anonymous_id: null, update_channel: null },
   git_pull: { status: 'up_to_date', message: 'Already up to date', updatedFiles: [], conflictFiles: [] },
   save_settings: null,
   check_vault_exists: true,

src/App.tsx

@@ -20,12 +20,12 @@ import { useMcpStatus } from './hooks/useMcpStatus'
 import { useVaultLoader } from './hooks/useVaultLoader'
 import { useSettings } from './hooks/useSettings'
 import { useNoteActions } from './hooks/useNoteActions'
-import { needsRenameOnSave } from './hooks/useNoteRename'
 import { useCommitFlow } from './hooks/useCommitFlow'
 import { useViewMode } from './hooks/useViewMode'
 import { useEntryActions } from './hooks/useEntryActions'
 import { useAppCommands } from './hooks/useAppCommands'
 import { isEmoji } from './utils/emoji'
+import { generateCommitMessage } from './utils/commitMessage'
 import { useDialogs } from './hooks/useDialogs'
 import { useVaultSwitcher } from './hooks/useVaultSwitcher'
 import { useGitHistory } from './hooks/useGitHistory'
@@ -36,12 +36,14 @@ import { useZoom } from './hooks/useZoom'
 import { useVaultConfig } from './hooks/useVaultConfig'
 import { useBuildNumber } from './hooks/useBuildNumber'
 import { useOnboarding } from './hooks/useOnboarding'
-import { useEditorSaveWithLinks } from './hooks/useEditorSaveWithLinks'
 import { useAppNavigation } from './hooks/useAppNavigation'
 import { useAiActivity } from './hooks/useAiActivity'
 import { useBulkActions } from './hooks/useBulkActions'
 import { useDeleteActions } from './hooks/useDeleteActions'
 import { useLayoutPanels } from './hooks/useLayoutPanels'
+import { useConflictFlow } from './hooks/useConflictFlow'
+import { useAppSave } from './hooks/useAppSave'
+import { useVaultBridge } from './hooks/useVaultBridge'
 import { ConflictResolverModal } from './components/ConflictResolverModal'
 import { ConfirmDeleteDialog } from './components/ConfirmDeleteDialog'
 import { UpdateBanner } from './components/UpdateBanner'
@@ -49,12 +51,13 @@ import { FlatVaultMigrationBanner } from './components/FlatVaultMigrationBanner'
 import { useFlatVaultMigration } from './hooks/useFlatVaultMigration'
 import { invoke } from '@tauri-apps/api/core'
 import { isTauri, mockInvoke } from './mock-tauri'
-import type { SidebarSelection, VaultEntry, InboxPeriod } from './types'
+import type { SidebarSelection, InboxPeriod } from './types'
 import type { NoteListItem } from './utils/ai-context'
 import { filterEntries, filterInboxEntries, type NoteListFilter } from './utils/noteListHelpers'
-import { openLocalFile } from './utils/url'
 import { openNoteInNewWindow } from './utils/openNoteWindow'
-import { flushEditorContent } from './utils/autoSave'
+import { isNoteWindow, getNoteWindowParams } from './utils/windowMode'
+import { GitRequiredModal } from './components/GitRequiredModal'
+import { RenameDetectedBanner, type DetectedRename } from './components/RenameDetectedBanner'
 import './App.css'
 
 // Type declarations for mock content storage and test overrides
@@ -70,6 +73,7 @@ const DEFAULT_SELECTION: SidebarSelection = { kind: 'filter', filter: 'all' }
 
 /** Wraps useEditorSave to also keep outgoingLinks in sync on save and on content change. */
 function App() {
+  const noteWindowParams = useMemo(() => isNoteWindow() ? getNoteWindowParams() : null, [])
   const [selection, setSelection] = useState<SidebarSelection>(DEFAULT_SELECTION)
   const [noteListFilter, setNoteListFilter] = useState<NoteListFilter>('open')
   const [inboxPeriod, setInboxPeriod] = useState<InboxPeriod>('month')
@@ -77,7 +81,7 @@ function App() {
     setSelection(sel)
     setNoteListFilter('open')
   }, [])
-  const layout = useLayoutPanels()
+  const layout = useLayoutPanels(noteWindowParams ? { initialInspectorCollapsed: true } : undefined)
   const [toastMessage, setToastMessage] = useState<string | null>(null)
   const dialogs = useDialogs()
 
@@ -92,7 +96,25 @@ function App() {
   const onboarding = useOnboarding(vaultSwitcher.vaultPath)
 
   // When onboarding resolves to a different vault path, update the switcher
-  const resolvedPath = onboarding.state.status === 'ready' ? onboarding.state.vaultPath : vaultSwitcher.vaultPath
+  const resolvedPath = noteWindowParams?.vaultPath ?? (onboarding.state.status === 'ready' ? onboarding.state.vaultPath : vaultSwitcher.vaultPath)
+  // Git repo check: 'checking' | 'required' | 'ready'
+  const [gitRepoState, setGitRepoState] = useState<'checking' | 'required' | 'ready'>('checking')
+  useEffect(() => {
+    if (!resolvedPath) return
+    setGitRepoState('checking')
+    const check = isTauri()
+      ? invoke<boolean>('is_git_repo', { vaultPath: resolvedPath })
+      : Promise.resolve(true) // browser mock: assume git
+    check
+      .then(isGit => setGitRepoState(isGit ? 'ready' : 'required'))
+      .catch(() => setGitRepoState('ready')) // fail open
+  }, [resolvedPath])
+
+  const handleInitGitRepo = useCallback(async () => {
+    if (isTauri()) await invoke('init_git_repo', { vaultPath: resolvedPath })
+    setGitRepoState('ready')
+  }, [resolvedPath])
+
   const vault = useVaultLoader(resolvedPath)
   useVaultConfig(resolvedPath)
   const { settings, loaded: settingsLoaded, saveSettings } = useSettings()
@@ -111,8 +133,32 @@ function App() {
     onToast: (msg) => setToastMessage(msg),
   })
 
-  // Ref bridges for conflict resolution callbacks (notes declared below)
-  const openConflictFileRef = useRef<(relativePath: string) => void>(() => {})
+  // Detect external file renames on window focus
+  const [detectedRenames, setDetectedRenames] = useState<DetectedRename[]>([])
+  useEffect(() => {
+    if (!isTauri() || !resolvedPath) return
+    const handleFocus = () => {
+      invoke<DetectedRename[]>('detect_renames', { vaultPath: resolvedPath })
+        .then(renames => { if (renames.length > 0) setDetectedRenames(renames) })
+        .catch(() => {}) // ignore errors (e.g., no git)
+    }
+    window.addEventListener('focus', handleFocus)
+    return () => window.removeEventListener('focus', handleFocus)
+  }, [resolvedPath])
+
+  const handleUpdateWikilinks = useCallback(async () => {
+    if (!isTauri()) return
+    try {
+      const count = await invoke<number>('update_wikilinks_for_renames', { vaultPath: resolvedPath, renames: detectedRenames })
+      setDetectedRenames([])
+      vault.reloadVault()
+      setToastMessage(`Updated wikilinks in ${count} file${count !== 1 ? 's' : ''}`)
+    } catch (err) {
+      setToastMessage(`Failed to update wikilinks: ${err}`)
+    }
+  }, [resolvedPath, detectedRenames, vault, setToastMessage])
+
+  const handleDismissRenames = useCallback(() => setDetectedRenames([]), [])
 
   const conflictResolver = useConflictResolver({
     vaultPath: resolvedPath,
@@ -123,70 +169,32 @@ function App() {
       autoSync.triggerSync()
     },
     onToast: (msg) => setToastMessage(msg),
-    onOpenFile: (relativePath) => openConflictFileRef.current(relativePath),
+    onOpenFile: (relativePath) => conflictFlow.openConflictFileRef.current(relativePath),
   })
 
-  const handleOpenConflictResolver = useCallback(async () => {
-    let files = autoSync.conflictFiles
-    // If no cached conflicts, check directly — there may be pre-existing
-    // conflicts from a prior session that the pull flow didn't detect.
-    if (files.length === 0) {
-      try {
-        files = isTauri()
-          ? await invoke<string[]>('get_conflict_files', { vaultPath: resolvedPath })
-          : await mockInvoke<string[]>('get_conflict_files', { vaultPath: resolvedPath })
-      } catch {
-        return
-      }
-      if (files.length === 0) {
-        setToastMessage('No merge conflicts to resolve')
-        return
-      }
+  const notes = useNoteActions({ addEntry: vault.addEntry, removeEntry: vault.removeEntry, entries: vault.entries, setToastMessage, updateEntry: vault.updateEntry, vaultPath: resolvedPath, addPendingSave: vault.addPendingSave, removePendingSave: vault.removePendingSave, trackUnsaved: vault.trackUnsaved, clearUnsaved: vault.clearUnsaved, unsavedPaths: vault.unsavedPaths, markContentPending: (path, content) => appSave.contentChangeRef.current(path, content), onNewNotePersisted: vault.loadModifiedFiles, replaceEntry: vault.replaceEntry })
+
+  // Note window: auto-open the note from URL params once vault entries load
+  const noteWindowOpenedRef = useRef(false)
+  useEffect(() => {
+    if (!noteWindowParams || noteWindowOpenedRef.current || vault.entries.length === 0) return
+    const entry = vault.entries.find(e => e.path === noteWindowParams.notePath)
+    if (entry) {
+      noteWindowOpenedRef.current = true
+      notes.handleSelectNote(entry)
     }
-    autoSync.pausePull()
-    conflictResolver.initFiles(files)
-    dialogs.openConflictResolver()
-  }, [autoSync, conflictResolver, dialogs, resolvedPath])
+  }, [vault.entries]) // eslint-disable-line react-hooks/exhaustive-deps -- run when entries load, params are stable
 
-  const handleCloseConflictResolver = useCallback(() => {
-    autoSync.resumePull()
-    dialogs.closeConflictResolver()
-  }, [autoSync, dialogs])
-
-  /** Resolve a single file conflict from the in-editor banner. */
-  const handleResolveConflictInline = useCallback(async (filePath: string, strategy: 'ours' | 'theirs') => {
-    try {
-      const relativePath = filePath.replace(resolvedPath + '/', '')
-      const call = isTauri() ? invoke : mockInvoke
-      await call('git_resolve_conflict', { vaultPath: resolvedPath, file: relativePath, strategy })
-      // Reload the note content to show the resolved version
-      const content = await (isTauri() ? invoke<string> : mockInvoke<string>)('get_note_content', { path: filePath })
-      // Check remaining conflicts
-      const remaining = await (isTauri() ? invoke<string[]> : mockInvoke<string[]>)('get_conflict_files', { vaultPath: resolvedPath })
-      if (remaining.length === 0) {
-        // All resolved — auto-commit the merge and push
-        await (isTauri() ? invoke : mockInvoke)('git_commit_conflict_resolution', { vaultPath: resolvedPath })
-        vault.reloadVault()
-        autoSync.triggerSync()
-        setToastMessage('All conflicts resolved — merge committed')
-      } else {
-        void content // content reload happens via vault reload
-        vault.reloadVault()
-        setToastMessage(`Resolved — ${remaining.length} conflict${remaining.length > 1 ? 's' : ''} remaining`)
-      }
-    } catch (err) {
-      setToastMessage(`Failed to resolve conflict: ${err}`)
-    }
-  }, [resolvedPath, vault, autoSync, setToastMessage])
-
-  const handleKeepMine = useCallback((path: string) => handleResolveConflictInline(path, 'ours'), [handleResolveConflictInline])
-  const handleKeepTheirs = useCallback((path: string) => handleResolveConflictInline(path, 'theirs'), [handleResolveConflictInline])
-
-  // Ref bridges handleContentChange (created after notes) into useNoteActions.
-  // Read at callback time, so it's always current when user presses Cmd+N.
-  const contentChangeRef = useRef<(path: string, content: string) => void>(() => {})
-
-  const notes = useNoteActions({ addEntry: vault.addEntry, removeEntry: vault.removeEntry, entries: vault.entries, setToastMessage, updateEntry: vault.updateEntry, vaultPath: resolvedPath, addPendingSave: vault.addPendingSave, removePendingSave: vault.removePendingSave, trackUnsaved: vault.trackUnsaved, clearUnsaved: vault.clearUnsaved, unsavedPaths: vault.unsavedPaths, markContentPending: (path, content) => contentChangeRef.current(path, content), onNewNotePersisted: vault.loadModifiedFiles, replaceEntry: vault.replaceEntry })
+  // Note window: update window title when active note changes
+  useEffect(() => {
+    if (!noteWindowParams) return
+    const activeEntry = notes.tabs.find(t => t.entry.path === notes.activeTabPath)?.entry
+    const title = activeEntry?.title ?? noteWindowParams.noteTitle
+    if (!isTauri()) { document.title = title; return }
+    import('@tauri-apps/api/window').then(({ getCurrentWindow }) => {
+      getCurrentWindow().setTitle(title)
+    }).catch(() => {})
+  }, [noteWindowParams, notes.tabs, notes.activeTabPath])
 
   // Keep note entry in sync with vault entries so banners (trash/archive)
   // and read-only state react immediately without reopening the note.
@@ -211,56 +219,49 @@ function App() {
     onSelectNote: notes.handleSelectNote,
   })
 
-  // MCP UI bridge: react to AI-driven open/highlight/vault-change events
-  const openNoteByPath = useCallback((path: string) => {
-    const entry = entriesByPath.get(path) ?? entriesByPath.get(`${resolvedPath}/${path}`)
-    if (entry) {
-      notes.handleSelectNote(entry)
-    } else {
-      // Entry not yet in vault (just created) — reload then open
-      vault.reloadVault().then(freshEntries => {
-        const fresh = (freshEntries as VaultEntry[]).find(e => e.path === path || e.path === `${resolvedPath}/${path}`)
-        if (fresh) notes.handleSelectNote(fresh)
-      })
-    }
-  }, [entriesByPath, vault, notes, resolvedPath])
+  const vaultBridge = useVaultBridge({
+    entriesByPath, resolvedPath,
+    reloadVault: vault.reloadVault,
+    onSelectNote: notes.handleSelectNote,
+    activeTabPath: notes.activeTabPath,
+  })
+
+  const conflictFlow = useConflictFlow({
+    resolvedPath, entries: vault.entries,
+    conflictFiles: autoSync.conflictFiles,
+    pausePull: autoSync.pausePull, resumePull: autoSync.resumePull,
+    triggerSync: autoSync.triggerSync, reloadVault: vault.reloadVault,
+    initConflictFiles: conflictResolver.initFiles,
+    openConflictResolver: dialogs.openConflictResolver,
+    closeConflictResolver: dialogs.closeConflictResolver,
+    onSelectNote: notes.handleSelectNote,
+    activeTabPath: notes.activeTabPath,
+    setToastMessage,
+  })
+
+  const appSave = useAppSave({
+    updateEntry: vault.updateEntry, setTabs: notes.setTabs, setToastMessage,
+    loadModifiedFiles: vault.loadModifiedFiles,
+    clearUnsaved: vault.clearUnsaved, unsavedPaths: vault.unsavedPaths,
+    tabs: notes.tabs, activeTabPath: notes.activeTabPath,
+    handleRenameNote: notes.handleRenameNote,
+    replaceEntry: vault.replaceEntry, resolvedPath,
+  })
 
   const aiActivity = useAiActivity({
-    onOpenNote: openNoteByPath,
-    onOpenTab: openNoteByPath,
+    onOpenNote: vaultBridge.openNoteByPath,
+    onOpenTab: vaultBridge.openNoteByPath,
     onSetFilter: (filterType) => {
       handleSetSelection({ kind: 'sectionGroup', type: filterType })
     },
     onVaultChanged: () => { vault.reloadVault() },
   })
 
-  // Stable callback for Pulse "open note" — never triggers reloadVault.
-  // Pulse files always exist in the vault; if somehow not found, silently skip.
-  const handlePulseOpenNote = useCallback((relativePath: string) => {
-    const fullPath = `${resolvedPath}/${relativePath}`
-    const entry = entriesByPath.get(fullPath) ?? entriesByPath.get(relativePath)
-    if (entry) notes.handleSelectNote(entry)
-  }, [entriesByPath, resolvedPath, notes])
-
-  // Agent file operation handlers: auto-open created notes, live-refresh modified notes
-  const handleAgentFileCreated = useCallback((relativePath: string) => {
-    vault.reloadVault().then(freshEntries => {
-      const entry = (freshEntries as VaultEntry[]).find(e => e.path === relativePath || e.path === `${resolvedPath}/${relativePath}`)
-      if (entry) notes.handleSelectNote(entry)
-    })
-  }, [vault, notes, resolvedPath])
-
-  const handleAgentFileModified = useCallback((relativePath: string) => {
-    const fullPath = `${resolvedPath}/${relativePath}`
-    const currentPath = notes.activeTabPath
-    if (currentPath === relativePath || currentPath === fullPath) {
-      vault.reloadVault()
-    }
-  }, [vault, notes.activeTabPath, resolvedPath])
-
-  const handleAgentVaultChanged = useCallback(() => {
-    vault.reloadVault()
-  }, [vault])
+  const handleInitializeProperties = useCallback(async (path: string) => {
+    const filename = path.split('/').pop()?.replace(/\.md$/, '') ?? 'Untitled'
+    await notes.handleUpdateFrontmatter(path, 'type', 'Note', { silent: true })
+    await notes.handleUpdateFrontmatter(path, 'title', filename)
+  }, [notes])
 
   const handleSetNoteIcon = useCallback(async (path: string, emoji: string) => {
     await notes.handleUpdateFrontmatter(path, 'icon', emoji)
@@ -270,103 +271,25 @@ function App() {
     await notes.handleDeleteProperty(path, 'icon')
   }, [notes])
 
-  /** Command palette: open the emoji picker on the active note's NoteIcon. */
   const handleSetNoteIconCommand = useCallback(() => {
     window.dispatchEvent(new CustomEvent('laputa:open-icon-picker'))
   }, [])
 
-  /** Command palette: remove the active note's emoji icon. */
   const handleRemoveNoteIconCommand = useCallback(() => {
     if (notes.activeTabPath) handleRemoveNoteIcon(notes.activeTabPath)
   }, [notes.activeTabPath, handleRemoveNoteIcon])
 
-  /** Open the active note in a new window (command palette / keyboard shortcut). */
   const handleOpenInNewWindow = useCallback(() => {
     const activeTab = notes.tabs.find(t => t.entry.path === notes.activeTabPath)
     if (activeTab) openNoteInNewWindow(activeTab.entry.path, resolvedPath, activeTab.entry.title)
-  }, [notes.tabs, notes.activeTabPath, resolvedPath]) // eslint-disable-line react-hooks/exhaustive-deps
+  }, [notes.tabs, notes.activeTabPath, resolvedPath])
 
-  /** Open a specific note entry in a new window (Cmd+Shift+Click). */
-  const handleOpenEntryInNewWindow = useCallback((entry: VaultEntry) => {
+  const handleOpenEntryInNewWindow = useCallback((entry: { path: string; title: string }) => {
     openNoteInNewWindow(entry.path, resolvedPath, entry.title)
   }, [resolvedPath])
 
-  const onAfterSave = useCallback(() => {
-    vault.loadModifiedFiles()
-  }, [vault])
-
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars -- signature required by useEditorSave
-  const onNotePersisted = useCallback((path: string, _content: string) => {
-    vault.clearUnsaved(path)
-  }, [vault])
-
-  const { handleSave: handleSaveRaw, handleContentChange, savePendingForPath, savePending } = useEditorSaveWithLinks({
-    updateEntry: vault.updateEntry,
-    setTabs: notes.setTabs, setToastMessage, onAfterSave,
-    onNotePersisted,
-  })
-  useEffect(() => { contentChangeRef.current = handleContentChange }, [handleContentChange])
-
-  // Refs for stable closure in flushBeforeAction (avoids re-creating on every tab/content change)
-  const tabsRef = useRef(notes.tabs)
-  tabsRef.current = notes.tabs // eslint-disable-line react-hooks/refs -- ref sync pattern
-  const unsavedPathsRef = useRef(vault.unsavedPaths)
-  unsavedPathsRef.current = vault.unsavedPaths // eslint-disable-line react-hooks/refs -- ref sync pattern
-
-  /** Auto-save unsaved editor content before a destructive action (trash/archive). */
-  const { clearUnsaved: vaultClearUnsaved } = vault
-  const flushBeforeAction = useCallback(async (path: string) => {
-    try {
-      await flushEditorContent(path, {
-        savePendingForPath,
-        getTabContent: (p) => tabsRef.current.find(t => t.entry.path === p)?.content,
-        isUnsaved: (p) => unsavedPathsRef.current.has(p),
-        onSaved: (p) => { vaultClearUnsaved(p) },
-      })
-    } catch (err) {
-      setToastMessage(`Auto-save failed: ${err}`)
-      throw err
-    }
-  }, [savePendingForPath, vaultClearUnsaved, setToastMessage])
-
-  // Wire conflict file opener now that notes is available
-  useEffect(() => {
-    openConflictFileRef.current = (relativePath: string) => {
-      const fullPath = `${resolvedPath}/${relativePath}`
-      const entry = vault.entries.find(e => e.path === fullPath)
-      if (entry) {
-        // Markdown note — open inside Laputa editor
-        notes.handleSelectNote(entry)
-        dialogs.closeConflictResolver()
-      } else {
-        // Non-note file (e.g. settings.json) —
-        // open with system default app so the user can inspect/edit it
-        openLocalFile(fullPath)
-      }
-    }
-  }, [resolvedPath, vault.entries, notes, dialogs])
-
-  const handleRenameTab = useCallback(async (path: string, newTitle: string) => {
-    await savePendingForPath(path)
-    await notes.handleRenameNote(path, newTitle, resolvedPath, vault.replaceEntry).then(vault.loadModifiedFiles)
-  }, [notes, resolvedPath, vault, savePendingForPath])
-
-  // Wrap handleSave to also persist unsaved notes that have no pending edits (user pressed Cmd+S without typing)
-  // and trigger file rename when the title slug doesn't match the filename.
-  const handleSave = useCallback(async () => {
-    const activeTab = notes.tabs.find(t => t.entry.path === notes.activeTabPath)
-    const fallback = activeTab && vault.unsavedPaths.has(activeTab.entry.path)
-      ? { path: activeTab.entry.path, content: activeTab.content }
-      : undefined
-    await handleSaveRaw(fallback)
-
-    // After saving, check if filename needs to match the current title
-    if (activeTab && needsRenameOnSave(activeTab.entry.title, activeTab.entry.filename)) {
-      await handleRenameTab(activeTab.entry.path, activeTab.entry.title)
-    }
-  }, [handleSaveRaw, handleRenameTab, notes.tabs, notes.activeTabPath, vault.unsavedPaths])
-
-  const commitFlow = useCommitFlow({ savePending, loadModifiedFiles: vault.loadModifiedFiles, commitAndPush: vault.commitAndPush, setToastMessage, onPushRejected: autoSync.handlePushRejected })
+  const commitFlow = useCommitFlow({ savePending: appSave.savePending, loadModifiedFiles: vault.loadModifiedFiles, commitAndPush: vault.commitAndPush, setToastMessage, onPushRejected: autoSync.handlePushRejected })
+  const suggestedCommitMessage = useMemo(() => generateCommitMessage(vault.modifiedFiles), [vault.modifiedFiles])
 
   const entryActions = useEntryActions({
     entries: vault.entries, updateEntry: vault.updateEntry,
@@ -374,7 +297,7 @@ function App() {
     handleDeleteProperty: notes.handleDeleteProperty, setToastMessage,
     createTypeEntry: notes.createTypeEntrySilent,
     onFrontmatterPersisted: vault.loadModifiedFiles,
-    onBeforeAction: flushBeforeAction,
+    onBeforeAction: appSave.flushBeforeAction,
   })
 
   const deleteActions = useDeleteActions({
@@ -392,14 +315,6 @@ function App() {
     setToastMessage(`Type "${name}" created`)
   }, [notes])
 
-  /** Title field change: save pending content then rename file + update wikilinks (non-blocking). */
-  const handleTitleSync = useCallback((path: string, newTitle: string) => {
-    savePendingForPath(path)
-      .then(() => notes.handleRenameNote(path, newTitle, resolvedPath, vault.replaceEntry))
-      .then(vault.loadModifiedFiles)
-      .catch((err) => console.error('Title rename failed:', err))
-  }, [notes, resolvedPath, vault, savePendingForPath])
-
   const bulkActions = useBulkActions(entryActions, setToastMessage)
 
   // Raw-toggle ref: Editor registers its handleToggleRaw here so the command palette can call it
@@ -407,7 +322,7 @@ function App() {
   // Diff-toggle ref: Editor registers its handleToggleDiff here so the command palette can call it
   const diffToggleRef = useRef<() => void>(() => {})
 
-  const { setViewMode, sidebarVisible, noteListVisible } = useViewMode()
+  const { setViewMode, sidebarVisible, noteListVisible } = useViewMode(noteWindowParams ? 'editor-only' : undefined)
   const zoom = useZoom()
   const buildNumber = useBuildNumber()
 
@@ -428,7 +343,6 @@ function App() {
     } else if (result === 'error') {
       setToastMessage('Could not check for updates')
     }
-    // 'available' → UpdateBanner handles it automatically
   }, [updateActions, updateStatus.state, setToastMessage])
 
   const handleRepairVault = useCallback(async () => {
@@ -454,13 +368,13 @@ function App() {
     onCreateNote: notes.handleCreateNoteImmediate,
     onOpenDailyNote: notes.handleOpenDailyNote,
     onCreateNoteOfType: notes.handleCreateNoteImmediate,
-    onSave: handleSave,
+    onSave: appSave.handleSave,
     onOpenSettings: dialogs.openSettings,
     onTrashNote: entryActions.handleTrashNote, onRestoreNote: entryActions.handleRestoreNote,
     onArchiveNote: entryActions.handleArchiveNote, onUnarchiveNote: entryActions.handleUnarchiveNote,
     onCommitPush: commitFlow.openCommitDialog,
     onPull: autoSync.triggerSync,
-    onResolveConflicts: handleOpenConflictResolver,
+    onResolveConflicts: conflictFlow.handleOpenConflictResolver,
     onSetViewMode: setViewMode,
     onToggleInspector: () => layout.setInspectorCollapsed(c => !c),
     onToggleDiff: () => diffToggleRef.current(),
@@ -515,18 +429,35 @@ function App() {
     return { type: null, query: '' }
   }, [selection])
 
-  // Show welcome/onboarding screen when vault doesn't exist
-  if (onboarding.state.status === 'welcome' || onboarding.state.status === 'vault-missing') {
+  // Show welcome/onboarding screen when vault doesn't exist (skip for note windows — vault path is known)
+  if (!noteWindowParams && (onboarding.state.status === 'welcome' || onboarding.state.status === 'vault-missing')) {
     return <WelcomeView onboarding={onboarding} />
   }
 
-  // Show loading spinner while checking vault
-  if (onboarding.state.status === 'loading') {
+  // Show loading spinner while checking vault (skip for note windows)
+  if (!noteWindowParams && onboarding.state.status === 'loading') {
     return <LoadingView />
   }
 
-  // Show telemetry consent dialog on first launch (or first upgrade with telemetry)
-  if (settingsLoaded && settings.telemetry_consent === null) {
+  // Show git-required modal when vault has no git repo (skip for note windows)
+  if (!noteWindowParams && gitRepoState === 'required') {
+    return (
+      <div className="app-shell">
+        <GitRequiredModal
+          onCreateRepo={handleInitGitRepo}
+          onChooseVault={vaultSwitcher.handleOpenLocalFolder}
+        />
+      </div>
+    )
+  }
+
+  // Show loading spinner while checking git status
+  if (!noteWindowParams && gitRepoState === 'checking' && onboarding.state.status === 'ready') {
+    return <LoadingView />
+  }
+
+  // Show telemetry consent dialog on first launch (skip for note windows)
+  if (!noteWindowParams && settingsLoaded && settings.telemetry_consent === null) {
     return (
       <TelemetryConsentDialog
         onAccept={() => {
@@ -546,7 +477,7 @@ function App() {
         {sidebarVisible && (
           <>
             <div className="app__sidebar" style={{ width: layout.sidebarWidth }}>
-              <Sidebar entries={vault.entries} selection={selection} onSelect={handleSetSelection} onSelectNote={notes.handleSelectNote} onCreateType={notes.handleCreateNoteImmediate} onCreateNewType={dialogs.openCreateType} onCustomizeType={entryActions.handleCustomizeType} onUpdateTypeTemplate={entryActions.handleUpdateTypeTemplate} onReorderSections={entryActions.handleReorderSections} onRenameSection={entryActions.handleRenameSection} onToggleTypeVisibility={entryActions.handleToggleTypeVisibility} modifiedCount={vault.modifiedFiles.length} inboxCount={inboxCount} onCommitPush={commitFlow.openCommitDialog} isGitVault={!vault.modifiedFilesError} />
+              <Sidebar entries={vault.entries} folders={vault.folders} selection={selection} onSelect={handleSetSelection} onSelectNote={notes.handleSelectNote} onCreateType={notes.handleCreateNoteImmediate} onCreateNewType={dialogs.openCreateType} onCustomizeType={entryActions.handleCustomizeType} onUpdateTypeTemplate={entryActions.handleUpdateTypeTemplate} onReorderSections={entryActions.handleReorderSections} onRenameSection={entryActions.handleRenameSection} onToggleTypeVisibility={entryActions.handleToggleTypeVisibility} inboxCount={inboxCount} />
             </div>
             <ResizeHandle onResize={layout.handleSidebarResize} />
           </>
@@ -555,7 +486,7 @@ function App() {
           <>
             <div className={`app__note-list${aiActivity.highlightElement === 'notelist' ? ' ai-highlight' : ''}`} style={{ width: layout.noteListWidth }}>
               {selection.kind === 'filter' && selection.filter === 'pulse' ? (
-                <PulseView vaultPath={resolvedPath} onOpenNote={handlePulseOpenNote} sidebarCollapsed={!sidebarVisible} onExpandSidebar={() => setViewMode('all')} />
+                <PulseView vaultPath={resolvedPath} onOpenNote={vaultBridge.handlePulseOpenNote} sidebarCollapsed={!sidebarVisible} onExpandSidebar={() => setViewMode('all')} />
               ) : (
                 <NoteList entries={vault.entries} selection={selection} selectedNote={activeTab?.entry ?? null} noteListFilter={noteListFilter} onNoteListFilterChange={setNoteListFilter} inboxPeriod={inboxPeriod} onInboxPeriodChange={setInboxPeriod} modifiedFiles={vault.modifiedFiles} modifiedFilesError={vault.modifiedFilesError} getNoteStatus={vault.getNoteStatus} sidebarCollapsed={!sidebarVisible} onSelectNote={notes.handleSelectNote} onReplaceActiveTab={notes.handleReplaceActiveTab} onCreateNote={notes.handleCreateNoteImmediate} onBulkArchive={bulkActions.handleBulkArchive} onBulkTrash={bulkActions.handleBulkTrash} onBulkRestore={bulkActions.handleBulkRestore} onBulkDeletePermanently={deleteActions.handleBulkDeletePermanently} onEmptyTrash={deleteActions.handleEmptyTrash} onUpdateTypeSort={notes.handleUpdateFrontmatter} updateEntry={vault.updateEntry} onOpenInNewWindow={handleOpenEntryInNewWindow} />
               )}
@@ -584,6 +515,7 @@ function App() {
             onDeleteProperty={notes.handleDeleteProperty}
             onAddProperty={notes.handleAddProperty}
             onCreateAndOpenNote={notes.handleCreateNoteForRelationship}
+            onInitializeProperties={handleInitializeProperties}
             showAIChat={dialogs.showAIChat}
             onToggleAIChat={dialogs.toggleAIChat}
             vaultPath={resolvedPath}
@@ -594,9 +526,9 @@ function App() {
             onDeleteNote={deleteActions.handleDeleteNote}
             onArchiveNote={entryActions.handleArchiveNote}
             onUnarchiveNote={entryActions.handleUnarchiveNote}
-            onContentChange={handleContentChange}
-            onSave={handleSave}
-            onTitleSync={handleTitleSync}
+            onContentChange={appSave.handleContentChange}
+            onSave={appSave.handleSave}
+            onTitleSync={appSave.handleTitleSync}
             rawToggleRef={rawToggleRef}
             diffToggleRef={diffToggleRef}
             canGoBack={canGoBack}
@@ -604,14 +536,14 @@ function App() {
             onGoBack={handleGoBack}
             onGoForward={handleGoForward}
             leftPanelsCollapsed={!sidebarVisible && !noteListVisible}
-            onFileCreated={handleAgentFileCreated}
-            onFileModified={handleAgentFileModified}
-            onVaultChanged={handleAgentVaultChanged}
+            onFileCreated={vaultBridge.handleAgentFileCreated}
+            onFileModified={vaultBridge.handleAgentFileModified}
+            onVaultChanged={vaultBridge.handleAgentVaultChanged}
             onSetNoteIcon={handleSetNoteIcon}
             onRemoveNoteIcon={handleRemoveNoteIcon}
-            isConflicted={!!notes.activeTabPath && autoSync.conflictFiles.some(f => notes.activeTabPath?.endsWith(f))}
-            onKeepMine={handleKeepMine}
-            onKeepTheirs={handleKeepTheirs}
+            isConflicted={conflictFlow.isConflicted}
+            onKeepMine={conflictFlow.handleKeepMine}
+            onKeepTheirs={conflictFlow.handleKeepTheirs}
           />
         </div>
       </div>
@@ -627,13 +559,14 @@ function App() {
         />
       )}
       <UpdateBanner status={updateStatus} actions={updateActions} />
-      <StatusBar noteCount={vault.entries.length} modifiedCount={vault.modifiedFiles.length} vaultPath={vaultSwitcher.vaultPath} vaults={vaultSwitcher.allVaults} onSwitchVault={vaultSwitcher.switchVault} onOpenSettings={dialogs.openSettings} onOpenLocalFolder={vaultSwitcher.handleOpenLocalFolder} onConnectGitHub={dialogs.openGitHubVault} onClickPending={() => handleSetSelection({ kind: 'filter', filter: 'changes' })} hasGitHub={!!settings.github_token} syncStatus={autoSync.syncStatus} lastSyncTime={autoSync.lastSyncTime} conflictCount={autoSync.conflictFiles.length} lastCommitInfo={autoSync.lastCommitInfo} remoteStatus={autoSync.remoteStatus} onTriggerSync={autoSync.triggerSync} onPullAndPush={autoSync.pullAndPush} onOpenConflictResolver={handleOpenConflictResolver} zoomLevel={zoom.zoomLevel} onZoomReset={zoom.zoomReset} buildNumber={buildNumber} onCheckForUpdates={handleCheckForUpdates} onRemoveVault={vaultSwitcher.removeVault} mcpStatus={mcpStatus} onInstallMcp={installMcp} />
+      <RenameDetectedBanner renames={detectedRenames} onUpdate={handleUpdateWikilinks} onDismiss={handleDismissRenames} />
+      <StatusBar noteCount={vault.entries.length} modifiedCount={vault.modifiedFiles.length} vaultPath={vaultSwitcher.vaultPath} vaults={vaultSwitcher.allVaults} onSwitchVault={vaultSwitcher.switchVault} onOpenSettings={dialogs.openSettings} onOpenLocalFolder={vaultSwitcher.handleOpenLocalFolder} onConnectGitHub={dialogs.openGitHubVault} onClickPending={() => handleSetSelection({ kind: 'filter', filter: 'changes' })} onClickPulse={() => handleSetSelection({ kind: 'filter', filter: 'pulse' })} onCommitPush={commitFlow.openCommitDialog} isGitVault={!vault.modifiedFilesError} hasGitHub={!!settings.github_token} syncStatus={autoSync.syncStatus} lastSyncTime={autoSync.lastSyncTime} conflictCount={autoSync.conflictFiles.length} lastCommitInfo={autoSync.lastCommitInfo} remoteStatus={autoSync.remoteStatus} onTriggerSync={autoSync.triggerSync} onPullAndPush={autoSync.pullAndPush} onOpenConflictResolver={conflictFlow.handleOpenConflictResolver} zoomLevel={zoom.zoomLevel} onZoomReset={zoom.zoomReset} buildNumber={buildNumber} onCheckForUpdates={handleCheckForUpdates} onRemoveVault={vaultSwitcher.removeVault} mcpStatus={mcpStatus} onInstallMcp={installMcp} />
       <Toast message={toastMessage} onDismiss={() => setToastMessage(null)} />
       <QuickOpenPalette open={dialogs.showQuickOpen} entries={vault.entries} onSelect={notes.handleSelectNote} onClose={dialogs.closeQuickOpen} />
       <CommandPalette open={dialogs.showCommandPalette} commands={commands} onClose={dialogs.closeCommandPalette} />
       <SearchPanel open={dialogs.showSearch} vaultPath={resolvedPath} entries={vault.entries} onSelectNote={notes.handleSelectNote} onClose={dialogs.closeSearch} />
       <CreateTypeDialog open={dialogs.showCreateTypeDialog} onClose={dialogs.closeCreateType} onCreate={handleCreateType} />
-      <CommitDialog open={commitFlow.showCommitDialog} modifiedCount={vault.modifiedFiles.length} onCommit={commitFlow.handleCommitPush} onClose={commitFlow.closeCommitDialog} />
+      <CommitDialog open={commitFlow.showCommitDialog} modifiedCount={vault.modifiedFiles.length} suggestedMessage={suggestedCommitMessage} onCommit={commitFlow.handleCommitPush} onClose={commitFlow.closeCommitDialog} />
       <ConflictResolverModal
         open={dialogs.showConflictResolver}
         fileStates={conflictResolver.fileStates}
@@ -643,7 +576,7 @@ function App() {
         onResolveFile={conflictResolver.resolveFile}
         onOpenInEditor={conflictResolver.openInEditor}
         onCommit={conflictResolver.commitResolution}
-        onClose={handleCloseConflictResolver}
+        onClose={conflictFlow.handleCloseConflictResolver}
       />
       <SettingsPanel open={dialogs.showSettings} settings={settings} onSave={saveSettings} onClose={dialogs.closeSettings} />
       <GitHubVaultModal

src/NoteWindow.tsx

@@ -1,163 +0,0 @@
-import { useCallback, useEffect, useMemo, useState } from 'react'
-import { invoke } from '@tauri-apps/api/core'
-import { Editor } from './components/Editor'
-import { Toast } from './components/Toast'
-import { isTauri, mockInvoke } from './mock-tauri'
-import { getNoteWindowParams } from './utils/windowMode'
-import { useEditorSaveWithLinks } from './hooks/useEditorSaveWithLinks'
-import { useLayoutPanels } from './hooks/useLayoutPanels'
-import type { VaultEntry } from './types'
-import './App.css'
-
-function tauriCall<T>(command: string, args: Record<string, unknown>): Promise<T> {
-  return isTauri() ? invoke<T>(command, args) : mockInvoke<T>(command, args)
-}
-
-interface Tab {
-  entry: VaultEntry
-  content: string
-}
-
-/**
- * Minimal app shell for secondary "note windows" opened via "Open in New Window".
- * Shows only the editor — no sidebar, no note list.
- */
-export default function NoteWindow() {
-  const params = getNoteWindowParams()
-  const [entries, setEntries] = useState<VaultEntry[]>([])
-  const [tabs, setTabs] = useState<Tab[]>([])
-  const [toastMessage, setToastMessage] = useState<string | null>(null)
-  const activeTabPath = tabs[0]?.entry.path ?? null
-
-  const layout = useLayoutPanels()
-
-  // Load vault entries + note content on mount
-  useEffect(() => {
-    if (!params) return
-    const { vaultPath, notePath } = params
-    let cancelled = false
-
-    async function load() {
-      const vaultEntries = await tauriCall<VaultEntry[]>('list_vault', { path: vaultPath })
-      if (cancelled) return
-      setEntries(vaultEntries)
-      const entry = vaultEntries.find(e => e.path === notePath)
-      if (!entry) return
-      const content = await tauriCall<string>('get_note_content', { path: notePath })
-      if (cancelled) return
-      setTabs([{ entry, content }])
-    }
-
-    load().catch(err => console.error('NoteWindow load failed:', err))
-    return () => { cancelled = true }
-  }, []) // eslint-disable-line react-hooks/exhaustive-deps -- run once on mount with captured params
-
-  const vaultPath = params?.vaultPath ?? ''
-
-  // Update window title when note title changes
-  useEffect(() => {
-    const title = tabs[0]?.entry.title
-    if (!title) return
-    if (!isTauri()) { document.title = title; return }
-    import('@tauri-apps/api/window').then(({ getCurrentWindow }) => {
-      getCurrentWindow().setTitle(title)
-    }).catch(() => {})
-  }, [tabs])
-
-  // Auto-save
-  const updateEntry = useCallback((path: string, patch: Partial<VaultEntry>) => {
-    setEntries(prev => prev.map(e => e.path === path ? { ...e, ...patch } : e))
-    setTabs(prev => prev.map(t => t.entry.path === path ? { ...t, entry: { ...t.entry, ...patch } } : t))
-  }, [])
-
-  const onAfterSave = useCallback(() => {}, [])
-  const onNotePersisted = useCallback(() => {}, [])
-
-  const { handleSave, handleContentChange } = useEditorSaveWithLinks({
-    updateEntry,
-    setTabs,
-    setToastMessage,
-    onAfterSave,
-    onNotePersisted,
-  })
-
-  // Wikilink navigation — in a note window, open wikilinks in the same window
-  const handleNavigateWikilink = useCallback((target: string) => {
-    const targetLower = target.toLowerCase()
-    const entry = entries.find(e =>
-      e.title.toLowerCase() === targetLower ||
-      e.aliases.some(a => a.toLowerCase() === targetLower)
-    )
-    if (!entry) return
-    tauriCall<string>('get_note_content', { path: entry.path }).then(content => {
-      setTabs([{ entry, content }])
-    }).catch(() => {})
-  }, [entries])
-
-  // Stub for close tab — in a note window, close the window
-  const handleCloseTab = useCallback(() => {
-    if (!isTauri()) return
-    import('@tauri-apps/api/window').then(({ getCurrentWindow }) => {
-      getCurrentWindow().close()
-    }).catch(() => {})
-  }, [])
-
-  // Keyboard: Cmd+S to save, Cmd+W to close
-  useEffect(() => {
-    const handleKeyDown = (e: KeyboardEvent) => {
-      if ((e.metaKey || e.ctrlKey) && e.key === 's') {
-        e.preventDefault()
-        handleSave()
-      }
-      if ((e.metaKey || e.ctrlKey) && e.key === 'w') {
-        e.preventDefault()
-        handleCloseTab()
-      }
-    }
-    window.addEventListener('keydown', handleKeyDown)
-    return () => window.removeEventListener('keydown', handleKeyDown)
-  }, [handleSave, handleCloseTab])
-
-  const activeTab = tabs[0] ?? null
-  const gitHistory = useMemo(() => [], [])
-
-  if (!params) {
-    return <div className="app-shell"><p>Invalid note window parameters</p></div>
-  }
-
-  if (!activeTab) {
-    return (
-      <div className="app-shell">
-        <div style={{ width: '100%', height: '100%', display: 'flex', alignItems: 'center', justifyContent: 'center', background: 'var(--sidebar)' }}>
-          <span style={{ color: 'var(--muted-foreground)', fontSize: 14 }}>Loading…</span>
-        </div>
-      </div>
-    )
-  }
-
-  return (
-    <div className="app-shell">
-      <div className="app">
-        <div className="app__editor">
-          <Editor
-            tabs={tabs}
-            activeTabPath={activeTabPath}
-            entries={entries}
-            onNavigateWikilink={handleNavigateWikilink}
-            inspectorCollapsed={layout.inspectorCollapsed}
-            onToggleInspector={() => layout.setInspectorCollapsed(c => !c)}
-            inspectorWidth={layout.inspectorWidth}
-            onInspectorResize={layout.handleInspectorResize}
-            inspectorEntry={activeTab.entry}
-            inspectorContent={activeTab.content}
-            gitHistory={gitHistory}
-            onContentChange={handleContentChange}
-            onSave={handleSave}
-            vaultPath={vaultPath}
-          />
-        </div>
-      </div>
-      <Toast message={toastMessage} onDismiss={() => setToastMessage(null)} />
-    </div>
-  )
-}

src/components/AIChatPanel.tsx

@@ -1,356 +0,0 @@
-import { useState, useRef, useEffect, useMemo } from 'react'
-import type { VaultEntry } from '../types'
-import {
-  X, Plus, PaperPlaneRight, Copy, ArrowClockwise,
-  TextIndent, Sparkle, MagnifyingGlass, Minus,
-} from '@phosphor-icons/react'
-import {
-  type ChatMessage,
-  buildSystemPrompt,
-} from '../utils/ai-chat'
-import { useAIChat } from '../hooks/useAIChat'
-import { MarkdownContent } from './MarkdownContent'
-
-// --- Sub-components ---
-
-interface AIChatPanelProps {
-  entry: VaultEntry | null
-  entries?: VaultEntry[]
-  onClose: () => void
-  onNavigateWikilink?: (target: string) => void
-}
-
-function TypingIndicator() {
-  return (
-    <div className="flex items-start gap-2" style={{ padding: '8px 12px' }}>
-      <div style={{ display: 'flex', gap: 4, padding: '10px 0' }}>
-        <span className="typing-dot" />
-        <span className="typing-dot" style={{ animationDelay: '0.2s' }} />
-        <span className="typing-dot" style={{ animationDelay: '0.4s' }} />
-      </div>
-    </div>
-  )
-}
-
-function ContextPill({ note, onRemove }: { note: VaultEntry; onRemove: () => void }) {
-  return (
-    <span
-      className="flex items-center gap-1"
-      style={{
-        background: 'var(--accent-green-light)',
-        borderRadius: 99, fontSize: 11,
-        padding: '2px 6px 2px 8px', color: 'var(--foreground)', maxWidth: 160,
-      }}
-    >
-      <span className="truncate">{note.title}</span>
-      <button
-        className="flex items-center justify-center shrink-0 border-none bg-transparent p-0 cursor-pointer text-muted-foreground hover:text-foreground"
-        onClick={onRemove} title={`Remove ${note.title}`}
-      >
-        <Minus size={10} weight="bold" />
-      </button>
-    </span>
-  )
-}
-
-function ContextSearchDropdown({
-  entries, contextPaths, onAdd, onClose,
-}: {
-  entries: VaultEntry[]; contextPaths: Set<string>
-  onAdd: (entry: VaultEntry) => void; onClose: () => void
-}) {
-  const [query, setQuery] = useState('')
-  const inputRef = useRef<HTMLInputElement>(null)
-  useEffect(() => { inputRef.current?.focus() }, [])
-
-  const filtered = useMemo(() => {
-    const q = query.toLowerCase()
-    return entries
-      .filter(e => !contextPaths.has(e.path))
-      .filter(e => !q || e.title.toLowerCase().includes(q) || (e.isA ?? '').toLowerCase().includes(q))
-      .slice(0, 8)
-  }, [entries, contextPaths, query])
-
-  return (
-    <div className="absolute left-0 right-0 bg-background border border-border rounded shadow-lg z-10"
-      style={{ top: '100%', maxHeight: 240, overflow: 'hidden' }}>
-      <div className="flex items-center gap-1 border-b border-border" style={{ padding: '4px 8px' }}>
-        <MagnifyingGlass size={12} className="text-muted-foreground shrink-0" />
-        <input ref={inputRef} value={query} onChange={e => setQuery(e.target.value)}
-          onKeyDown={e => e.key === 'Escape' && onClose()} placeholder="Search notes..."
-          className="flex-1 border-none bg-transparent text-foreground outline-none"
-          style={{ fontSize: 12, padding: '2px 0' }} />
-      </div>
-      <div style={{ overflow: 'auto', maxHeight: 200 }}>
-        {filtered.map(entry => (
-          <button key={entry.path}
-            className="flex items-center gap-2 w-full text-left border-none bg-transparent cursor-pointer hover:bg-accent text-foreground"
-            style={{ padding: '6px 10px', fontSize: 12 }}
-            onClick={() => { onAdd(entry); onClose() }}>
-            <span className="text-muted-foreground" style={{ fontSize: 10, minWidth: 60 }}>{entry.isA ?? 'Note'}</span>
-            <span className="truncate">{entry.title}</span>
-          </button>
-        ))}
-        {filtered.length === 0 && (
-          <div className="text-muted-foreground text-center" style={{ padding: 12, fontSize: 12 }}>No matching notes</div>
-        )}
-      </div>
-    </div>
-  )
-}
-
-function AssistantMessage({ msg, onRetry, onNavigateWikilink }: { msg: ChatMessage; onRetry: () => void; onNavigateWikilink?: (target: string) => void }) {
-  return (
-    <div>
-      <MarkdownContent content={msg.content} onWikilinkClick={onNavigateWikilink} />
-      <div className="flex items-center gap-3" style={{ marginTop: 4 }}>
-        <button className="border-none bg-transparent p-0 text-muted-foreground cursor-pointer hover:underline"
-          style={{ fontSize: 11 }} onClick={() => navigator.clipboard.writeText(msg.content)}>
-          <Copy size={12} style={{ marginRight: 3, verticalAlign: 'middle' }} />Copy
-        </button>
-        <button className="border-none bg-transparent p-0 text-muted-foreground cursor-pointer hover:underline"
-          style={{ fontSize: 11 }} onClick={onRetry}>
-          <ArrowClockwise size={12} style={{ marginRight: 3, verticalAlign: 'middle' }} />Retry
-        </button>
-        <button className="border-none bg-transparent p-0 text-muted-foreground cursor-pointer hover:underline"
-          style={{ fontSize: 11 }}>
-          <TextIndent size={12} style={{ marginRight: 3, verticalAlign: 'middle' }} />Insert
-        </button>
-      </div>
-    </div>
-  )
-}
-
-function StreamingContent({ content, onNavigateWikilink }: { content: string; onNavigateWikilink?: (target: string) => void }) {
-  return (
-    <div style={{ marginBottom: 12 }}>
-      <MarkdownContent content={content} onWikilinkClick={onNavigateWikilink} />
-    </div>
-  )
-}
-
-function UserBubble({ content }: { content: string }) {
-  return (
-    <div className="flex justify-end">
-      <div style={{
-        background: 'var(--primary)', color: 'white',
-        borderRadius: '12px 12px 2px 12px', maxWidth: '85%',
-        padding: '8px 12px', fontSize: 13, lineHeight: 1.5, whiteSpace: 'pre-wrap',
-      }}>{content}</div>
-    </div>
-  )
-}
-
-function formatTokens(n: number): string {
-  return n < 1000 ? String(n) : `${(n / 1000).toFixed(1)}k`
-}
-
-const QUICK_ACTIONS = [
-  { label: 'Summarize', message: 'Summarize this note' },
-  { label: 'Expand', message: 'Expand this note with more detail' },
-  { label: 'Fix grammar', message: 'Fix grammar and improve readability' },
-]
-
-// --- Context management hook ---
-
-function useContextNotes(entry: VaultEntry | null) {
-  const [contextNotes, setContextNotes] = useState<VaultEntry[]>([])
-
-  useEffect(() => {
-    if (entry) {
-      // eslint-disable-next-line react-hooks/set-state-in-effect -- sync context when active note changes
-      setContextNotes(prev => prev.some(n => n.path === entry.path) ? prev : [entry, ...prev])
-    }
-  }, [entry?.path]) // eslint-disable-line react-hooks/exhaustive-deps
-
-  const addNote = (note: VaultEntry) => {
-    setContextNotes(prev => prev.some(n => n.path === note.path) ? prev : [...prev, note])
-  }
-  const removeNote = (path: string) => {
-    setContextNotes(prev => prev.filter(n => n.path !== path))
-  }
-  const paths = useMemo(() => new Set(contextNotes.map(n => n.path)), [contextNotes])
-
-  return { contextNotes, addNote, removeNote, paths }
-}
-
-// --- Main component ---
-
-export function AIChatPanel({ entry, entries = [], onClose, onNavigateWikilink }: AIChatPanelProps) {
-  const [input, setInput] = useState('')
-  const [showSearch, setShowSearch] = useState(false)
-  const messagesEndRef = useRef<HTMLDivElement>(null)
-
-  const ctx = useContextNotes(entry)
-  const chat = useAIChat(ctx.contextNotes)
-
-  const contextInfo = useMemo(
-    () => buildSystemPrompt(ctx.contextNotes),
-    [ctx.contextNotes],
-  )
-
-  useEffect(() => {
-    messagesEndRef.current?.scrollIntoView({ behavior: 'smooth' })
-  }, [chat.messages, chat.isStreaming, chat.streamingContent])
-
-  const handleSend = () => { chat.sendMessage(input); setInput('') }
-
-  const handleKeyDown = (e: React.KeyboardEvent) => {
-    if (e.key === 'Enter' && !e.shiftKey) { e.preventDefault(); handleSend() }
-  }
-
-  return (
-    <aside className="flex flex-1 flex-col overflow-hidden border-l border-border bg-background text-foreground">
-      <PanelHeader onClear={chat.clearConversation} onClose={onClose} />
-
-      <ContextBar
-        notes={ctx.contextNotes} entries={entries} contextPaths={ctx.paths}
-        tokenCount={contextInfo.totalTokens} truncated={contextInfo.truncated}
-        showSearch={showSearch} onToggleSearch={() => setShowSearch(!showSearch)}
-        onAdd={ctx.addNote} onRemove={ctx.removeNote} onCloseSearch={() => setShowSearch(false)}
-      />
-
-      <MessageList
-        messages={chat.messages} isStreaming={chat.isStreaming}
-        streamingContent={chat.streamingContent} onRetry={chat.retryMessage}
-        messagesEndRef={messagesEndRef} onNavigateWikilink={onNavigateWikilink}
-      />
-
-      <QuickActionsBar actions={QUICK_ACTIONS} disabled={chat.isStreaming}
-        onAction={msg => { chat.sendMessage(msg); setInput('') }} />
-
-      <InputArea input={input} onInputChange={setInput}
-        onKeyDown={handleKeyDown} onSend={handleSend} disabled={chat.isStreaming || !input.trim()} />
-
-      <style>{`
-        .typing-dot {
-          width: 6px; height: 6px; border-radius: 50%;
-          background: var(--muted-foreground);
-          animation: typing-bounce 1.2s infinite ease-in-out;
-        }
-        @keyframes typing-bounce {
-          0%, 80%, 100% { opacity: 0.3; transform: scale(0.8); }
-          40% { opacity: 1; transform: scale(1); }
-        }
-      `}</style>
-    </aside>
-  )
-}
-
-// --- Extracted layout sections ---
-
-function PanelHeader({ onClear, onClose }: { onClear: () => void; onClose: () => void }) {
-  return (
-    <div className="flex shrink-0 items-center border-b border-border" style={{ height: 45, padding: '0 12px', gap: 8 }}>
-      <Sparkle size={16} className="shrink-0 text-muted-foreground" />
-      <span className="flex-1 text-muted-foreground" style={{ fontSize: 13, fontWeight: 600 }}>AI Chat</span>
-      <button className="shrink-0 border-none bg-transparent p-1 text-muted-foreground cursor-pointer hover:text-foreground transition-colors"
-        onClick={onClear} title="New conversation"><Plus size={16} /></button>
-      <button className="shrink-0 border-none bg-transparent p-1 text-muted-foreground cursor-pointer hover:text-foreground transition-colors"
-        onClick={onClose} title="Close AI Chat"><X size={16} /></button>
-    </div>
-  )
-}
-
-function ContextBar({
-  notes, entries, contextPaths, tokenCount, truncated,
-  showSearch, onToggleSearch, onAdd, onRemove, onCloseSearch,
-}: {
-  notes: VaultEntry[]; entries: VaultEntry[]; contextPaths: Set<string>
-  tokenCount: number; truncated: boolean
-  showSearch: boolean; onToggleSearch: () => void
-  onAdd: (note: VaultEntry) => void; onRemove: (path: string) => void; onCloseSearch: () => void
-}) {
-  return (
-    <div className="relative flex shrink-0 flex-wrap items-center gap-1.5 border-b border-border" style={{ padding: '6px 12px' }}>
-      {notes.map(note => (
-        <ContextPill key={note.path} note={note} onRemove={() => onRemove(note.path)} />
-      ))}
-      <button
-        className="flex items-center gap-0.5 border border-dashed border-border bg-transparent text-muted-foreground cursor-pointer hover:text-foreground rounded-full"
-        style={{ fontSize: 11, padding: '2px 8px' }} onClick={onToggleSearch} title="Add note to context">
-        <Plus size={10} weight="bold" /><span>Add</span>
-      </button>
-      {notes.length > 0 && (
-        <span className="text-muted-foreground ml-auto" style={{ fontSize: 10 }}>
-          ~{formatTokens(tokenCount)} tokens{truncated && ' (truncated)'}
-        </span>
-      )}
-      {showSearch && (
-        <ContextSearchDropdown entries={entries} contextPaths={contextPaths} onAdd={onAdd} onClose={onCloseSearch} />
-      )}
-    </div>
-  )
-}
-
-function MessageList({
-  messages, isStreaming, streamingContent, onRetry, messagesEndRef, onNavigateWikilink,
-}: {
-  messages: ChatMessage[]; isStreaming: boolean; streamingContent: string
-  onRetry: (idx: number) => void; messagesEndRef: React.RefObject<HTMLDivElement | null>
-  onNavigateWikilink?: (target: string) => void
-}) {
-  return (
-    <div className="flex-1 overflow-y-auto" style={{ padding: 12 }}>
-      {messages.length === 0 && !isStreaming && (
-        <div className="flex flex-col items-center justify-center text-center text-muted-foreground" style={{ paddingTop: 40 }}>
-          <Sparkle size={24} style={{ marginBottom: 8, opacity: 0.5 }} />
-          <p style={{ fontSize: 13, margin: '0 0 4px' }}>Ask anything about your notes</p>
-          <p style={{ fontSize: 11, margin: 0, opacity: 0.6 }}>Powered by Claude CLI</p>
-        </div>
-      )}
-      {messages.map((msg, idx) => (
-        <div key={msg.id} style={{ marginBottom: 12 }}>
-          {msg.role === 'user'
-            ? <UserBubble content={msg.content} />
-            : <AssistantMessage msg={msg} onRetry={() => onRetry(idx)} onNavigateWikilink={onNavigateWikilink} />}
-        </div>
-      ))}
-      {isStreaming && streamingContent && <StreamingContent content={streamingContent} onNavigateWikilink={onNavigateWikilink} />}
-      {isStreaming && !streamingContent && <TypingIndicator />}
-      <div ref={messagesEndRef} />
-    </div>
-  )
-}
-
-function QuickActionsBar({
-  actions, disabled, onAction,
-}: {
-  actions: { label: string; message: string }[]; disabled: boolean; onAction: (msg: string) => void
-}) {
-  return (
-    <div className="flex shrink-0 flex-wrap items-center gap-1.5 border-t border-border" style={{ padding: '8px 12px' }}>
-      {actions.map(a => (
-        <button key={a.label}
-          className="cursor-pointer bg-transparent text-foreground hover:bg-accent transition-colors"
-          style={{ fontSize: 11, border: '1px solid var(--border)', borderRadius: 99, padding: '3px 10px' }}
-          onClick={() => onAction(a.message)} disabled={disabled}>
-          {a.label}
-        </button>
-      ))}
-    </div>
-  )
-}
-
-function InputArea({
-  input, onInputChange, onKeyDown, onSend, disabled,
-}: {
-  input: string; onInputChange: (v: string) => void
-  onKeyDown: (e: React.KeyboardEvent) => void; onSend: () => void; disabled: boolean
-}) {
-  return (
-    <div className="flex shrink-0 flex-col border-t border-border" style={{ padding: '8px 12px' }}>
-      <div className="flex items-end gap-2">
-        <textarea value={input} onChange={e => onInputChange(e.target.value)} onKeyDown={onKeyDown}
-          placeholder="Ask about your notes..." rows={1}
-          className="flex-1 resize-none border border-border bg-transparent text-foreground"
-          style={{ fontSize: 13, borderRadius: 8, padding: '8px 10px', outline: 'none', lineHeight: 1.4, maxHeight: 100, fontFamily: 'inherit' }} />
-        <button className="shrink-0 flex items-center justify-center border-none cursor-pointer transition-colors"
-          style={{ background: 'var(--primary)', color: 'white', borderRadius: 8, width: 32, height: 34 }}
-          onClick={onSend} disabled={disabled} title="Send message">
-          <PaperPlaneRight size={16} />
-        </button>
-      </div>
-    </div>
-  )
-}

src/components/AiActionCard.tsx

@@ -74,7 +74,7 @@ function DetailBlock({ label, content, isError }: {
     <div style={{ marginTop: 6 }}>
       <div
         className="text-muted-foreground"
-        style={{ fontSize: 10, fontWeight: 600, textTransform: 'uppercase', marginBottom: 2 }}
+        style={{ fontSize: 10, fontWeight: 600, marginBottom: 2 }}
       >
         {label}
       </div>

src/components/AiPanel.tsx

@@ -28,7 +28,7 @@ function PanelHeader({ onClose, onClear }: { onClose: () => void; onClear: () =>
   return (
     <div
       className="flex shrink-0 items-center border-b border-border"
-      style={{ height: 45, padding: '0 12px', gap: 8 }}
+      style={{ height: 52, padding: '0 12px', gap: 8 }}
     >
       <Robot size={16} className="shrink-0 text-muted-foreground" />
       <span className="flex-1 text-muted-foreground" style={{ fontSize: 13, fontWeight: 600 }}>

src/components/BreadcrumbBar.test.tsx

@@ -41,13 +41,20 @@ const trashedEntry: VaultEntry = {
 
 const defaultProps = {
   wordCount: 100,
-  noteStatus: 'clean' as const,
   showDiffToggle: false,
   diffMode: false,
   diffLoading: false,
   onToggleDiff: vi.fn(),
 }
 
+describe('BreadcrumbBar — drag region', () => {
+  it('has data-tauri-drag-region on the container', () => {
+    const { container } = render(<BreadcrumbBar entry={baseEntry} {...defaultProps} />)
+    const bar = container.firstElementChild as HTMLElement
+    expect(bar.dataset.tauriDragRegion).toBeDefined()
+  })
+})
+
 describe('BreadcrumbBar — trash/restore', () => {
   it('shows trash button for non-trashed note', () => {
     render(<BreadcrumbBar entry={baseEntry} {...defaultProps} onTrash={vi.fn()} onRestore={vi.fn()} />)
@@ -76,18 +83,6 @@ describe('BreadcrumbBar — trash/restore', () => {
   })
 })
 
-describe('BreadcrumbBar — pending save indicator', () => {
-  it('shows "Saving…" text when noteStatus is pendingSave', () => {
-    render(<BreadcrumbBar entry={baseEntry} {...defaultProps} noteStatus={'pendingSave'} />)
-    expect(screen.getByText('Saving…')).toBeInTheDocument()
-  })
-
-  it('does not show "Saving…" text for clean status', () => {
-    render(<BreadcrumbBar entry={baseEntry} {...defaultProps} noteStatus={'clean'} />)
-    expect(screen.queryByText('Saving…')).not.toBeInTheDocument()
-  })
-})
-
 describe('BreadcrumbBar — archive/unarchive', () => {
   it('shows archive button for non-archived note', () => {
     render(<BreadcrumbBar entry={baseEntry} {...defaultProps} onArchive={vi.fn()} onUnarchive={vi.fn()} />)
@@ -116,6 +111,38 @@ describe('BreadcrumbBar — archive/unarchive', () => {
   })
 })
 
+describe('BreadcrumbBar — title in breadcrumb on scroll', () => {
+  it('does not show title when titleHidden is false', () => {
+    render(<BreadcrumbBar entry={baseEntry} {...defaultProps} titleHidden={false} />)
+    expect(screen.queryByText('Test Note')).not.toBeInTheDocument()
+  })
+
+  it('shows type and title when titleHidden is true', () => {
+    render(<BreadcrumbBar entry={baseEntry} {...defaultProps} titleHidden={true} />)
+    expect(screen.getByText('Note')).toBeInTheDocument()
+    expect(screen.getByText('›')).toBeInTheDocument()
+    expect(screen.getByText('Test Note')).toBeInTheDocument()
+  })
+
+  it('shows emoji icon when entry has an emoji icon', () => {
+    const entryWithEmoji = { ...baseEntry, icon: '🚀' }
+    render(<BreadcrumbBar entry={entryWithEmoji} {...defaultProps} titleHidden={true} />)
+    expect(screen.getByText('🚀')).toBeInTheDocument()
+  })
+
+  it('does not show icon when entry has a non-emoji icon', () => {
+    const entryWithPhosphor = { ...baseEntry, icon: 'cooking-pot' }
+    render(<BreadcrumbBar entry={entryWithPhosphor} {...defaultProps} titleHidden={true} />)
+    expect(screen.queryByText('cooking-pot')).not.toBeInTheDocument()
+  })
+
+  it('falls back to "Note" when isA is null', () => {
+    const entryNoType = { ...baseEntry, isA: null }
+    render(<BreadcrumbBar entry={entryNoType} {...defaultProps} titleHidden={true} />)
+    expect(screen.getByText('Note')).toBeInTheDocument()
+  })
+})
+
 describe('BreadcrumbBar — raw editor toggle', () => {
   it('shows Raw editor button with tooltip "Raw editor" when rawMode is off', () => {
     const onToggleRaw = vi.fn()

src/components/BreadcrumbBar.tsx

@@ -1,7 +1,6 @@
 import { memo } from 'react'
-import type { VaultEntry, NoteStatus } from '../types'
+import type { VaultEntry } from '../types'
 import { cn } from '@/lib/utils'
-import { isEmoji } from '../utils/emoji'
 import {
   MagnifyingGlass,
   GitBranch,
@@ -19,7 +18,6 @@ import {
 interface BreadcrumbBarProps {
   entry: VaultEntry
   wordCount: number
-  noteStatus: NoteStatus
   showDiffToggle: boolean
   diffMode: boolean
   diffLoading: boolean
@@ -34,6 +32,8 @@ interface BreadcrumbBarProps {
   onRestore?: () => void
   onArchive?: () => void
   onUnarchive?: () => void
+  /** When true, the note title is scrolled out of view — show it inline. */
+  titleHidden?: boolean
 }
 
 const DISABLED_ICON_STYLE = { opacity: 0.4, cursor: 'not-allowed' } as const
@@ -57,7 +57,7 @@ function BreadcrumbActions({ entry, showDiffToggle, diffMode, diffLoading, onTog
   rawMode, onToggleRaw,
   showAIChat, onToggleAIChat, inspectorCollapsed, onToggleInspector,
   onTrash, onRestore, onArchive, onUnarchive,
-}: Omit<BreadcrumbBarProps, 'wordCount' | 'noteStatus'>) {
+}: Omit<BreadcrumbBarProps, 'wordCount'>) {
   return (
     <div className="flex items-center" style={{ gap: 12 }}>
       <button
@@ -146,7 +146,7 @@ function BreadcrumbActions({ entry, showDiffToggle, diffMode, diffLoading, onTog
         <button
           className="flex items-center justify-center border-none bg-transparent p-0 text-muted-foreground cursor-pointer hover:text-foreground transition-colors"
           onClick={onToggleInspector}
-          title="Open Properties"
+          title="Properties (⌘⇧I)"
         >
           <SlidersHorizontal size={16} />
         </button>
@@ -163,50 +163,38 @@ function BreadcrumbActions({ entry, showDiffToggle, diffMode, diffLoading, onTog
   )
 }
 
+function BreadcrumbTitle({ entry }: { entry: VaultEntry }) {
+  const typeLabel = entry.isA ?? 'Note'
+  const icon = entry.icon
+  const emojiIcon = icon && /^\p{Emoji}/u.test(icon) ? icon : null
+  return (
+    <div className="flex items-center gap-1.5 min-w-0 text-sm text-muted-foreground">
+      <span className="shrink-0">{typeLabel}</span>
+      <span className="shrink-0 text-border">›</span>
+      {emojiIcon && <span className="shrink-0">{emojiIcon}</span>}
+      <span className="truncate font-medium text-foreground">{entry.title}</span>
+    </div>
+  )
+}
+
 export const BreadcrumbBar = memo(function BreadcrumbBar({
-  entry, wordCount, noteStatus, ...actionProps
+  entry, titleHidden, ...actionProps
 }: BreadcrumbBarProps) {
   return (
     <div
-      className="flex shrink-0 items-center justify-between"
+      data-tauri-drag-region
+      className="flex shrink-0 items-center"
       style={{
-        height: 45,
+        height: 52,
         background: 'var(--background)',
-        borderBottom: '1px solid var(--border)',
         padding: '6px 16px',
+        boxShadow: titleHidden ? '0 1px 3px rgba(0,0,0,0.08)' : 'none',
+        transition: 'box-shadow 0.2s ease',
       }}
     >
-      {/* Left: breadcrumb */}
-      <div className="flex items-center gap-1 min-w-0 whitespace-nowrap" style={{ fontSize: 12 }}>
-        <span className="shrink-0 text-muted-foreground">{entry.isA || 'Note'}</span>
-        <span className="shrink-0 text-muted-foreground" style={{ margin: '0 2px' }}>&rsaquo;</span>
-        <span className="truncate font-medium text-foreground" style={{ maxWidth: '40vw' }}>
-          {entry.icon && isEmoji(entry.icon) && <span className="mr-1">{entry.icon}</span>}
-          {entry.title}
-        </span>
-        <span className="shrink-0 text-muted-foreground" style={{ margin: '0 4px' }}>&middot;</span>
-        <span className="shrink-0 text-muted-foreground">{wordCount.toLocaleString()} words</span>
-        {noteStatus === 'pendingSave' && (
-          <>
-            <span className="text-muted-foreground" style={{ margin: '0 4px' }}>&middot;</span>
-            <span className="font-semibold tab-status-pulse" style={{ color: 'var(--accent-green)' }}>Saving…</span>
-          </>
-        )}
-        {noteStatus === 'new' && (
-          <>
-            <span className="text-muted-foreground" style={{ margin: '0 4px' }}>&middot;</span>
-            <span className="font-semibold" style={{ color: 'var(--accent-green)' }}>N</span>
-          </>
-        )}
-        {noteStatus === 'modified' && (
-          <>
-            <span className="text-muted-foreground" style={{ margin: '0 4px' }}>&middot;</span>
-            <span className="font-semibold" style={{ color: 'var(--accent-yellow)' }}>M</span>
-          </>
-        )}
+      <div className="flex-1 min-w-0">
+        {titleHidden && <BreadcrumbTitle entry={entry} />}
       </div>
-
-      {/* Right: action icons */}
       <BreadcrumbActions entry={entry} {...actionProps} />
     </div>
   )

src/components/ColorInput.tsx

@@ -99,10 +99,10 @@ export function ColorEditableValue({ value, isEditing, onStartEdit, onSave, onCa
   }
 
   return (
-    <span className="inline-flex min-w-0 items-center gap-1.5">
+    <span className="inline-flex h-6 min-w-0 items-center gap-1.5">
       {showSwatch && <ColorSwatch color={value} onChange={handlePickerChange} />}
       <span
-        className="min-w-0 cursor-pointer truncate rounded px-1 py-0.5 text-right text-[12px] text-secondary-foreground transition-colors hover:bg-muted"
+        className="min-w-0 cursor-pointer truncate rounded px-1 text-right text-[12px] text-secondary-foreground transition-colors hover:bg-muted"
         onClick={onStartEdit}
         title={value || 'Click to edit'}
       >

src/components/CommandPalette.test.tsx

@@ -208,7 +208,8 @@ describe('CommandPalette', () => {
       const groupHeaders = screen.getAllByText(
         (_content, el) =>
           el?.tagName === 'DIV' &&
-          el.classList.contains('uppercase') &&
+          el.classList.contains('text-[11px]') &&
+          el.classList.contains('font-medium') &&
           !!el.textContent,
       ).map(el => el.textContent)
 

src/components/CommandPalette.tsx

@@ -140,7 +140,7 @@ export function CommandPalette({ open, commands, onClose }: CommandPaletteProps)
               runningIndex += items.length
               return (
                 <div key={group}>
-                  <div className="px-4 pb-1 pt-2 text-[11px] font-semibold uppercase tracking-wider text-muted-foreground">
+                  <div className="px-4 pb-1 pt-2 text-[11px] font-medium text-muted-foreground">
                     {group}
                   </div>
                   {items.map((cmd, i) => {

src/components/CommitDialog.test.tsx

@@ -78,4 +78,30 @@ describe('CommitDialog', () => {
     const { container } = render(<CommitDialog open={false} modifiedCount={3} onCommit={onCommit} onClose={onClose} />)
     expect(container.querySelector('textarea')).toBeNull()
   })
+
+  it('pre-populates message with suggestedMessage', () => {
+    render(<CommitDialog open={true} modifiedCount={3} suggestedMessage="Update alpha, beta" onCommit={onCommit} onClose={onClose} />)
+    const textarea = screen.getByPlaceholderText('Commit message...')
+    expect(textarea).toHaveValue('Update alpha, beta')
+  })
+
+  it('enables Commit button when suggestedMessage is provided', () => {
+    render(<CommitDialog open={true} modifiedCount={3} suggestedMessage="Update alpha" onCommit={onCommit} onClose={onClose} />)
+    expect(getCommitButton()).not.toBeDisabled()
+  })
+
+  it('submits suggestedMessage on Cmd+Enter without user edits', () => {
+    render(<CommitDialog open={true} modifiedCount={3} suggestedMessage="Update alpha" onCommit={onCommit} onClose={onClose} />)
+    const textarea = screen.getByPlaceholderText('Commit message...')
+    fireEvent.keyDown(textarea, { key: 'Enter', metaKey: true })
+    expect(onCommit).toHaveBeenCalledWith('Update alpha')
+  })
+
+  it('allows user to edit the suggested message', () => {
+    render(<CommitDialog open={true} modifiedCount={3} suggestedMessage="Update alpha" onCommit={onCommit} onClose={onClose} />)
+    const textarea = screen.getByPlaceholderText('Commit message...')
+    fireEvent.change(textarea, { target: { value: 'fix: corrected typo in alpha' } })
+    fireEvent.click(getCommitButton())
+    expect(onCommit).toHaveBeenCalledWith('fix: corrected typo in alpha')
+  })
 })

src/components/CommitDialog.tsx

@@ -6,20 +6,21 @@ import { Badge } from '@/components/ui/badge'
 interface CommitDialogProps {
   open: boolean
   modifiedCount: number
+  suggestedMessage?: string
   onCommit: (message: string) => void
   onClose: () => void
 }
 
-export function CommitDialog({ open, modifiedCount, onCommit, onClose }: CommitDialogProps) {
+export function CommitDialog({ open, modifiedCount, suggestedMessage, onCommit, onClose }: CommitDialogProps) {
   const [message, setMessage] = useState('')
   const inputRef = useRef<HTMLTextAreaElement>(null)
 
   useEffect(() => {
     if (open) {
-      setMessage('') // eslint-disable-line react-hooks/set-state-in-effect -- reset on dialog open
+      setMessage(suggestedMessage ?? '') // eslint-disable-line react-hooks/set-state-in-effect -- reset on dialog open
       setTimeout(() => inputRef.current?.focus(), 50)
     }
-  }, [open])
+  }, [open]) // eslint-disable-line react-hooks/exhaustive-deps -- only reset when dialog opens
 
   const handleSubmit = () => {
     const trimmed = message.trim()

src/components/CreateNoteDialog.tsx

@@ -55,7 +55,7 @@ export function CreateNoteDialog({ open, onClose, onCreate, defaultType, customT
         </DialogHeader>
         <form onSubmit={handleSubmit} className="space-y-4">
           <div className="space-y-1.5">
-            <label className="text-xs font-medium uppercase tracking-wide text-muted-foreground">
+            <label className="text-xs font-medium text-muted-foreground">
               Title
             </label>
             <Input
@@ -66,7 +66,7 @@ export function CreateNoteDialog({ open, onClose, onCreate, defaultType, customT
             />
           </div>
           <div className="space-y-1.5">
-            <label className="text-xs font-medium uppercase tracking-wide text-muted-foreground">
+            <label className="text-xs font-medium text-muted-foreground">
               Type
             </label>
             <div className="flex flex-wrap gap-1.5">

src/components/CreateTypeDialog.tsx

@@ -36,7 +36,7 @@ export function CreateTypeDialog({ open, onClose, onCreate }: CreateTypeDialogPr
         </DialogHeader>
         <form onSubmit={handleSubmit} className="space-y-4">
           <div className="space-y-1.5">
-            <label className="text-xs font-medium uppercase tracking-wide text-muted-foreground">
+            <label className="text-xs font-medium text-muted-foreground">
               Type Name
             </label>
             <Input

src/components/DynamicPropertiesPanel.test.tsx

@@ -112,8 +112,8 @@ describe('DynamicPropertiesPanel', () => {
         frontmatter={{ Status: 'Active' }}
       />
     )
-    // Status rendered with CSS text-transform: uppercase, DOM text is still "Active"
-    expect(screen.getByTitle('Active')).toBeInTheDocument()
+    // Status rendered as sentence case
+    expect(screen.getByTestId('status-badge')).toBeInTheDocument()
   })
 
   it('renders properties from frontmatter', () => {
@@ -124,9 +124,9 @@ describe('DynamicPropertiesPanel', () => {
         frontmatter={{ cadence: 'Weekly', owner: 'Luca' }}
       />
     )
-    expect(screen.getByText('cadence')).toBeInTheDocument()
+    expect(screen.getByText('Cadence')).toBeInTheDocument()
     expect(screen.getByText('Weekly')).toBeInTheDocument()
-    expect(screen.getByText('owner')).toBeInTheDocument()
+    expect(screen.getByText('Owner')).toBeInTheDocument()
     expect(screen.getByText('Luca')).toBeInTheDocument()
   })
 
@@ -162,7 +162,7 @@ describe('DynamicPropertiesPanel', () => {
         frontmatter={{ notion_id: 'abc-123-def' }}
       />
     )
-    expect(screen.getByText('notion_id')).toBeInTheDocument()
+    expect(screen.getByText('Notion id')).toBeInTheDocument()
     expect(screen.getByText('abc-123-def')).toBeInTheDocument()
   })
 
@@ -177,7 +177,7 @@ describe('DynamicPropertiesPanel', () => {
     // aliases skipped (in SKIP_KEYS); 'Belongs to' skipped (has wikilinks)
     expect(screen.queryByText('aliases')).not.toBeInTheDocument()
     expect(screen.queryByText('Belongs to')).not.toBeInTheDocument()
-    expect(screen.getByText('cadence')).toBeInTheDocument()
+    expect(screen.getByText('Cadence')).toBeInTheDocument()
   })
 
   it('shows former relationship key with plain text value in Properties', () => {
@@ -219,7 +219,7 @@ describe('DynamicPropertiesPanel', () => {
     const typeLabels = screen.getAllByText('Type')
     // Only the TypeRow label should exist, not a property row
     expect(typeLabels).toHaveLength(1)
-    expect(screen.getByTitle('Active')).toBeInTheDocument()
+    expect(screen.getByTestId('status-badge')).toBeInTheDocument()
   })
 
   it('renders boolean property as toggle', () => {
@@ -232,7 +232,7 @@ describe('DynamicPropertiesPanel', () => {
       />
     )
     // Boolean should show as Yes/No toggle
-    const toggleBtn = screen.getByText('\u2717 No')
+    const toggleBtn = screen.getByText('No')
     fireEvent.click(toggleBtn)
     expect(onUpdateProperty).toHaveBeenCalledWith('published', true)
   })
@@ -260,7 +260,7 @@ describe('DynamicPropertiesPanel', () => {
         onAddProperty={onAddProperty}
       />
     )
-    expect(screen.getByText('+ Add property')).toBeInTheDocument()
+    expect(screen.getByText('Add property')).toBeInTheDocument()
   })
 
   it('opens add property form when button clicked', () => {
@@ -272,7 +272,7 @@ describe('DynamicPropertiesPanel', () => {
         onAddProperty={onAddProperty}
       />
     )
-    fireEvent.click(screen.getByText('+ Add property'))
+    fireEvent.click(screen.getByText('Add property'))
     expect(screen.getByPlaceholderText('Property name')).toBeInTheDocument()
     expect(screen.getByPlaceholderText('Value')).toBeInTheDocument()
     expect(screen.getByTestId('add-property-type-trigger')).toBeInTheDocument()
@@ -287,7 +287,7 @@ describe('DynamicPropertiesPanel', () => {
         onAddProperty={onAddProperty}
       />
     )
-    fireEvent.click(screen.getByText('+ Add property'))
+    fireEvent.click(screen.getByText('Add property'))
     const keyInput = screen.getByPlaceholderText('Property name')
     const valueInput = screen.getByPlaceholderText('Value')
     fireEvent.change(keyInput, { target: { value: 'priority' } })
@@ -412,7 +412,7 @@ describe('DynamicPropertiesPanel', () => {
       />
     )
     // Click status pill to open dropdown
-    fireEvent.click(screen.getByTitle('Active'))
+    fireEvent.click(screen.getByTestId('status-badge'))
     // Should show dropdown with search input
     expect(screen.getByTestId('status-dropdown')).toBeInTheDocument()
     expect(screen.getByTestId('status-search-input')).toBeInTheDocument()
@@ -478,11 +478,11 @@ describe('DynamicPropertiesPanel', () => {
         onAddProperty={onAddProperty}
       />
     )
-    fireEvent.click(screen.getByText('+ Add property'))
+    fireEvent.click(screen.getByText('Add property'))
     const keyInput = screen.getByPlaceholderText('Property name')
     fireEvent.keyDown(keyInput, { key: 'Escape' })
     // Form should be hidden, button should reappear
-    expect(screen.getByText('+ Add property')).toBeInTheDocument()
+    expect(screen.getByText('Add property')).toBeInTheDocument()
   })
 
   it('adds property on Enter in form', () => {
@@ -494,7 +494,7 @@ describe('DynamicPropertiesPanel', () => {
         onAddProperty={onAddProperty}
       />
     )
-    fireEvent.click(screen.getByText('+ Add property'))
+    fireEvent.click(screen.getByText('Add property'))
     const keyInput = screen.getByPlaceholderText('Property name')
     const valueInput = screen.getByPlaceholderText('Value')
     fireEvent.change(keyInput, { target: { value: 'key' } })
@@ -512,7 +512,7 @@ describe('DynamicPropertiesPanel', () => {
         onAddProperty={onAddProperty}
       />
     )
-    fireEvent.click(screen.getByText('+ Add property'))
+    fireEvent.click(screen.getByText('Add property'))
     const keyInput = screen.getByPlaceholderText('Property name')
     const valueInput = screen.getByPlaceholderText('Value')
     fireEvent.change(keyInput, { target: { value: 'tags' } })
@@ -530,9 +530,9 @@ describe('DynamicPropertiesPanel', () => {
         onAddProperty={onAddProperty}
       />
     )
-    fireEvent.click(screen.getByText('+ Add property'))
+    fireEvent.click(screen.getByText('Add property'))
     fireEvent.click(screen.getByTestId('add-property-cancel'))
-    expect(screen.getByText('+ Add property')).toBeInTheDocument()
+    expect(screen.getByText('Add property')).toBeInTheDocument()
   })
 
   describe('editable vs read-only distinction', () => {
@@ -775,7 +775,7 @@ describe('DynamicPropertiesPanel', () => {
       expect(screen.getByText('Mar 31, 2026')).toBeInTheDocument()
     })
 
-    it('renders calendar icon in date trigger button', () => {
+    it('renders date trigger button', () => {
       render(
         <DynamicPropertiesPanel
           entry={makeEntry()}
@@ -786,7 +786,6 @@ describe('DynamicPropertiesPanel', () => {
       )
       const trigger = screen.getByTestId('date-display')
       expect(trigger.tagName).toBe('BUTTON')
-      expect(trigger.querySelector('svg')).toBeInTheDocument()
     })
 
     it('opens calendar popover when date button clicked', () => {
@@ -841,7 +840,7 @@ describe('DynamicPropertiesPanel', () => {
           onUpdateProperty={onUpdateProperty}
         />
       )
-      fireEvent.click(screen.getByTitle('Active'))
+      fireEvent.click(screen.getByTestId('status-badge'))
       expect(screen.getByTestId('status-dropdown')).toBeInTheDocument()
       fireEvent.keyDown(screen.getByTestId('status-search-input'), { key: 'Escape' })
       expect(screen.queryByTestId('status-dropdown')).not.toBeInTheDocument()
@@ -857,7 +856,7 @@ describe('DynamicPropertiesPanel', () => {
           onUpdateProperty={onUpdateProperty}
         />
       )
-      fireEvent.click(screen.getByTitle('Active'))
+      fireEvent.click(screen.getByTestId('status-badge'))
       fireEvent.click(screen.getByTestId('status-dropdown-backdrop'))
       expect(screen.queryByTestId('status-dropdown')).not.toBeInTheDocument()
       expect(onUpdateProperty).not.toHaveBeenCalled()
@@ -872,7 +871,7 @@ describe('DynamicPropertiesPanel', () => {
           onUpdateProperty={onUpdateProperty}
         />
       )
-      fireEvent.click(screen.getByTitle('Active'))
+      fireEvent.click(screen.getByTestId('status-badge'))
       const input = screen.getByTestId('status-search-input')
       fireEvent.change(input, { target: { value: 'Needs Review' } })
       fireEvent.keyDown(input, { key: 'Enter' })
@@ -893,7 +892,7 @@ describe('DynamicPropertiesPanel', () => {
           onUpdateProperty={onUpdateProperty}
         />
       )
-      fireEvent.click(screen.getByTitle('Active'))
+      fireEvent.click(screen.getByTestId('status-badge'))
       expect(screen.getByTestId('status-option-Reviewing')).toBeInTheDocument()
       expect(screen.getByTestId('status-option-Shipped')).toBeInTheDocument()
     })
@@ -910,7 +909,7 @@ describe('DynamicPropertiesPanel', () => {
         />
       )
       expect(screen.getByTestId('boolean-toggle')).toBeInTheDocument()
-      expect(screen.getByText('\u2713 Yes')).toBeInTheDocument()
+      expect(screen.getByText('Yes')).toBeInTheDocument()
     })
 
     it('renders boolean toggle for false values', () => {
@@ -923,7 +922,7 @@ describe('DynamicPropertiesPanel', () => {
         />
       )
       expect(screen.getByTestId('boolean-toggle')).toBeInTheDocument()
-      expect(screen.getByText('\u2717 No')).toBeInTheDocument()
+      expect(screen.getByText('No')).toBeInTheDocument()
     })
   })
 
@@ -937,13 +936,13 @@ describe('DynamicPropertiesPanel', () => {
           onUpdateProperty={onUpdateProperty}
         />
       )
-      expect(screen.queryByText('trashed')).not.toBeInTheDocument()
-      expect(screen.queryByText('trashed_at')).not.toBeInTheDocument()
-      expect(screen.queryByText('archived')).not.toBeInTheDocument()
-      expect(screen.queryByText('archived_at')).not.toBeInTheDocument()
-      expect(screen.queryByText('icon')).not.toBeInTheDocument()
+      expect(screen.queryByText('Trashed')).not.toBeInTheDocument()
+      expect(screen.queryByText('Trashed at')).not.toBeInTheDocument()
+      expect(screen.queryByText('Archived')).not.toBeInTheDocument()
+      expect(screen.queryByText('Archived at')).not.toBeInTheDocument()
+      expect(screen.queryByText('Icon')).not.toBeInTheDocument()
       // Custom property still visible
-      expect(screen.getByText('cadence')).toBeInTheDocument()
+      expect(screen.getByText('Cadence')).toBeInTheDocument()
     })
 
     it('filters system properties case-insensitively', () => {
@@ -958,7 +957,7 @@ describe('DynamicPropertiesPanel', () => {
       expect(screen.queryByText('Trashed')).not.toBeInTheDocument()
       expect(screen.queryByText('Archived')).not.toBeInTheDocument()
       expect(screen.queryByText('Icon')).not.toBeInTheDocument()
-      expect(screen.getByText('cadence')).toBeInTheDocument()
+      expect(screen.getByText('Cadence')).toBeInTheDocument()
     })
 
     it('does not filter similar but non-matching property names', () => {
@@ -971,7 +970,7 @@ describe('DynamicPropertiesPanel', () => {
         />
       )
       expect(screen.getByText('Is Trashed')).toBeInTheDocument()
-      expect(screen.getByText('archive_date')).toBeInTheDocument()
+      expect(screen.getByText('Archive date')).toBeInTheDocument()
     })
   })
 
@@ -1055,7 +1054,7 @@ describe('DynamicPropertiesPanel', () => {
         />
       )
       expect(screen.getByTestId('boolean-toggle')).toBeInTheDocument()
-      expect(screen.getByText('\u2713 Yes')).toBeInTheDocument()
+      expect(screen.getByText('Yes')).toBeInTheDocument()
     })
 
     it('renders boolean toggle for string "false" when boolean mode overridden', () => {
@@ -1069,7 +1068,7 @@ describe('DynamicPropertiesPanel', () => {
         />
       )
       expect(screen.getByTestId('boolean-toggle')).toBeInTheDocument()
-      expect(screen.getByText('\u2717 No')).toBeInTheDocument()
+      expect(screen.getByText('No')).toBeInTheDocument()
     })
 
     it('toggles string boolean from false to true', () => {
@@ -1124,7 +1123,7 @@ describe('DynamicPropertiesPanel', () => {
           onAddProperty={onAddProperty}
         />
       )
-      fireEvent.click(screen.getByText('+ Add property'))
+      fireEvent.click(screen.getByText('Add property'))
       // Switch type to boolean
       fireEvent.pointerDown(screen.getByTestId('add-property-type-trigger'), { button: 0, pointerType: 'mouse' })
       fireEvent.click(screen.getByRole('option', { name: /Boolean/ }))
@@ -1141,7 +1140,7 @@ describe('DynamicPropertiesPanel', () => {
           onAddProperty={onAddProperty}
         />
       )
-      fireEvent.click(screen.getByText('+ Add property'))
+      fireEvent.click(screen.getByText('Add property'))
       fireEvent.pointerDown(screen.getByTestId('add-property-type-trigger'), { button: 0, pointerType: 'mouse' })
       fireEvent.click(screen.getByRole('option', { name: /Boolean/ }))
       // Toggle from No to Yes
@@ -1158,7 +1157,7 @@ describe('DynamicPropertiesPanel', () => {
           onAddProperty={onAddProperty}
         />
       )
-      fireEvent.click(screen.getByText('+ Add property'))
+      fireEvent.click(screen.getByText('Add property'))
       const keyInput = screen.getByPlaceholderText('Property name')
       fireEvent.change(keyInput, { target: { value: 'published' } })
       // Switch to boolean type
@@ -1180,7 +1179,7 @@ describe('DynamicPropertiesPanel', () => {
           onAddProperty={onAddProperty}
         />
       )
-      fireEvent.click(screen.getByText('+ Add property'))
+      fireEvent.click(screen.getByText('Add property'))
       fireEvent.pointerDown(screen.getByTestId('add-property-type-trigger'), { button: 0, pointerType: 'mouse' })
       fireEvent.click(screen.getByRole('option', { name: /Date/ }))
       expect(screen.getByTestId('add-property-date-trigger')).toBeInTheDocument()
@@ -1196,7 +1195,7 @@ describe('DynamicPropertiesPanel', () => {
           onAddProperty={onAddProperty}
         />
       )
-      fireEvent.click(screen.getByText('+ Add property'))
+      fireEvent.click(screen.getByText('Add property'))
       fireEvent.pointerDown(screen.getByTestId('add-property-type-trigger'), { button: 0, pointerType: 'mouse' })
       fireEvent.click(screen.getByRole('option', { name: /Status/ }))
       expect(screen.getByTestId('add-property-status-trigger')).toBeInTheDocument()
@@ -1211,7 +1210,7 @@ describe('DynamicPropertiesPanel', () => {
           onAddProperty={onAddProperty}
         />
       )
-      fireEvent.click(screen.getByText('+ Add property'))
+      fireEvent.click(screen.getByText('Add property'))
       // Default mode is text
       expect(screen.getByPlaceholderText('Value')).toBeInTheDocument()
     })

src/components/DynamicPropertiesPanel.tsx

@@ -9,6 +9,12 @@ import { AddPropertyForm } from './AddPropertyForm'
 import { countWords } from '../utils/wikilinks'
 import type { PropertyDisplayMode } from '../utils/propertyTypes'
 
+function toSentenceCase(key: string): string {
+  const spaced = key.replace(/[_-]/g, ' ')
+  if (!spaced) return spaced
+  return spaced.charAt(0).toUpperCase() + spaced.slice(1)
+}
+
 // eslint-disable-next-line react-refresh/only-export-components -- utility co-located with component
 export function containsWikilinks(value: FrontmatterValue): boolean {
   if (typeof value === 'string') return /^\[\[.*\]\]$/.test(value)
@@ -47,9 +53,9 @@ function PropertyRow({ propKey, value, editingKey, displayMode, autoMode, vaultS
   }
 
   return (
-    <div className="group/prop grid min-w-0 grid-cols-2 items-center gap-2 rounded px-1.5 outline-none transition-colors hover:bg-muted focus:bg-muted focus:ring-1 focus:ring-primary" tabIndex={0} onKeyDown={handleKeyDown} data-testid="editable-property">
-      <span className="font-mono-overline flex min-w-0 items-center gap-1 text-muted-foreground">
-        <span className="truncate">{propKey}</span>
+    <div className="group/prop grid min-h-7 min-w-0 grid-cols-2 items-center gap-2 rounded px-1.5 outline-none transition-colors hover:bg-muted focus:bg-muted focus:ring-1 focus:ring-primary" tabIndex={0} onKeyDown={handleKeyDown} data-testid="editable-property">
+      <span className="flex min-w-0 items-center gap-1 text-[12px] text-muted-foreground">
+        <span className="truncate">{toSentenceCase(propKey)}</span>
         {onDelete && (
           <button className="border-none bg-transparent p-0 text-sm leading-none text-muted-foreground opacity-0 transition-all hover:text-destructive group-hover/prop:opacity-100" onClick={() => onDelete(propKey)} title="Delete property">&times;</button>
         )}
@@ -65,7 +71,7 @@ function PropertyRow({ propKey, value, editingKey, displayMode, autoMode, vaultS
 function InfoRow({ label, value }: { label: string; value: string }) {
   return (
     <div className="grid min-w-0 grid-cols-2 items-center gap-2 px-1.5" data-testid="readonly-property">
-      <span className="font-mono-overline min-w-0 truncate" style={{ color: 'var(--text-muted)' }}>{label}</span>
+      <span className="min-w-0 truncate text-[12px] text-muted-foreground">{label}</span>
       <span className="min-w-0 truncate text-right text-[12px]" style={{ color: 'var(--text-muted)' }}>{value}</span>
     </div>
   )
@@ -74,10 +80,12 @@ function InfoRow({ label, value }: { label: string; value: string }) {
 function AddPropertyButton({ onClick, disabled }: { onClick: () => void; disabled: boolean }) {
   return (
     <button
-      className="mt-3 w-full cursor-pointer border border-border bg-transparent text-center text-muted-foreground transition-colors hover:border-primary hover:text-primary disabled:cursor-not-allowed disabled:opacity-50"
-      style={{ borderRadius: 6, padding: '6px 12px', fontSize: 12 }}
+      className="mt-1 flex w-full cursor-pointer items-center gap-1 border-none bg-transparent px-1.5 text-[12px] text-muted-foreground opacity-50 transition-opacity hover:opacity-100 disabled:cursor-not-allowed"
       onClick={onClick} disabled={disabled}
-    >+ Add property</button>
+    >
+      <span className="text-[12px] leading-none">+</span>
+      Add property
+    </button>
   )
 }
 

src/components/EditableValue.tsx

@@ -1,5 +1,6 @@
 import { useState, useCallback, useRef } from 'react'
 import { normalizeUrl, openExternalUrl } from '../utils/url'
+import { getTagStyle } from '../utils/tagStyles'
 
 export function UrlValue({
   value,
@@ -63,9 +64,9 @@ export function UrlValue({
   }
 
   return (
-    <span className="group/url inline-flex min-w-0 items-center gap-1">
+    <span className="group/url flex min-w-0 max-w-full items-center gap-1">
       <span
-        className="min-w-0 cursor-pointer truncate rounded px-1 py-0.5 text-right text-[12px] text-secondary-foreground transition-colors hover:text-primary hover:underline"
+        className="inline-flex h-6 min-w-0 cursor-pointer items-center truncate rounded-md px-2 text-right text-[12px] text-[var(--accent-blue)] underline decoration-[var(--accent-blue)]/40 transition-colors hover:decoration-[var(--accent-blue)]"
         onClick={handleOpen}
         title={value}
         data-testid="url-link"
@@ -124,7 +125,7 @@ export function EditableValue({
 
   return (
     <span
-      className="min-w-0 cursor-pointer truncate rounded px-1 py-0.5 text-right text-[12px] text-secondary-foreground transition-colors hover:bg-muted"
+      className="inline-flex h-6 min-w-0 max-w-full cursor-pointer items-center truncate rounded-md px-2 text-right text-[12px] text-secondary-foreground transition-colors hover:bg-muted"
       onClick={onStartEdit}
       title={value || 'Click to edit'}
     >
@@ -211,11 +212,12 @@ export function TagPillList({
         ) : (
           <span
             key={idx}
-            className="group/pill relative inline-flex cursor-pointer items-center rounded-full px-2 py-0.5 transition-colors"
+            className="group/pill relative inline-flex h-6 cursor-pointer items-center rounded-md transition-colors"
             style={{
-              backgroundColor: 'var(--accent-blue-light)',
-              color: 'var(--accent-blue)',
-              fontSize: 11,
+              ...getTagStyle(item),
+              backgroundColor: getTagStyle(item).bg,
+              padding: '0 8px',
+              fontSize: 12,
               fontWeight: 500,
             }}
             onClick={() => handleStartEdit(idx)}
@@ -223,8 +225,8 @@ export function TagPillList({
           >
             {item}
             <button
-              className="absolute right-0.5 top-1/2 flex h-3.5 w-3.5 -translate-y-1/2 items-center justify-center rounded-full border-none p-0 text-[10px] leading-none opacity-0 shadow-[-6px_0_4px_-2px_var(--accent-blue-light)] transition-all hover:bg-[var(--accent-red-light)] hover:text-[var(--accent-red)] group-hover/pill:opacity-100"
-              style={{ color: 'var(--accent-blue)', backgroundColor: 'var(--accent-blue-light)' }}
+              className="absolute right-0.5 top-1/2 flex h-3.5 w-3.5 -translate-y-1/2 items-center justify-center rounded-full border-none p-0 text-[10px] leading-none opacity-0 transition-all hover:bg-[var(--accent-red-light)] hover:text-[var(--accent-red)] group-hover/pill:opacity-100"
+              style={{ color: getTagStyle(item).color, backgroundColor: getTagStyle(item).bg }}
               onClick={(e) => {
                 e.stopPropagation()
                 handleDeleteItem(idx)
@@ -253,7 +255,8 @@ export function TagPillList({
         />
       ) : (
         <button
-          className="inline-flex h-5 w-5 items-center justify-center rounded-full border border-dashed border-[var(--accent-blue)] bg-transparent p-0 text-[12px] leading-none text-[var(--accent-blue)] transition-colors hover:bg-[var(--accent-blue-light)]"
+          className="inline-flex h-6 items-center justify-center rounded-md border-none bg-muted px-2 text-[12px] font-medium leading-none text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
+          style={{ padding: '0 8px' }}
           onClick={() => setIsAddingNew(true)}
           title={`Add ${label.toLowerCase()}`}
         >

src/components/Editor.css

@@ -179,14 +179,39 @@
   flex-shrink: 0;
 }
 
+.title-section__add-icon {
+  /* "Add icon" button above the title when no emoji — Notion-style */
+  padding-top: 24px;
+  margin-left: 8px;
+  min-height: 28px;
+}
+
+.title-section__row {
+  display: flex;
+  flex-direction: row;
+  align-items: flex-start;
+  padding-top: 8px;
+  margin-left: 8px;
+}
+
+/* No emoji: title aligns flush left (no indent for icon area) */
+.title-section__row--no-icon {
+  margin-left: 0;
+}
+
+/* When emoji is present, restore top padding to the row itself */
+.title-section__row:has(.note-icon-button--active) {
+  padding-top: 32px;
+}
+
 .title-section__separator {
   border-bottom: 1px solid var(--border-primary, rgba(0, 0, 0, 0.08));
   margin-top: 12px;
+  margin-left: 8px;
 }
 
 /* --- Note Icon Area --- */
 .note-icon-area {
-  padding: 16px 0 0;
   flex-shrink: 0;
 }
 
@@ -203,8 +228,10 @@
 }
 
 .note-icon-button--active {
-  font-size: 40px;
+  font-size: 36px;
+  line-height: 1;
   transition: transform 0.1s;
+  margin-right: 10px;
 }
 
 .note-icon-button--active:hover:not(:disabled) {
@@ -221,7 +248,7 @@
   transition: opacity 0.15s;
 }
 
-.note-icon-area:hover .note-icon-button--add,
+.title-section:hover .note-icon-button--add,
 .note-icon-button--add:focus-visible {
   opacity: 1;
 }
@@ -272,8 +299,8 @@
 
 /* --- Title Field --- */
 .title-field {
-  padding: 4px 0 0;
-  flex-shrink: 0;
+  flex: 1;
+  min-width: 0;
 }
 
 .title-field__input {
@@ -282,13 +309,12 @@
   border: none;
   outline: none;
   background: transparent;
-  font-size: var(--headings-h1-font-size);
-  font-weight: var(--headings-h1-font-weight);
-  line-height: var(--headings-h1-line-height);
-  letter-spacing: var(--headings-h1-letter-spacing);
+  font-size: var(--headings-h1-font-size, 32px);
+  font-weight: var(--headings-h1-font-weight, 700);
+  line-height: var(--headings-h1-line-height, 1.2);
+  letter-spacing: var(--headings-h1-letter-spacing, -0.015em);
   color: var(--foreground);
   padding: 0;
-  margin-left: 8px;
 }
 
 .title-field__input::placeholder {

src/components/Editor.test.tsx

@@ -124,10 +124,11 @@ describe('Editor', () => {
         activeTabPath={mockEntry.path}
       />
     )
-    expect(screen.getAllByText('Test Project').length).toBeGreaterThan(0)
+    // Tab bar renders when a tab is active
+    expect(screen.getByTestId('blocknote-view')).toBeInTheDocument()
   })
 
-  it('renders breadcrumb bar with note info', () => {
+  it('renders breadcrumb bar with action buttons', () => {
     render(
       <Editor
         {...defaultProps}
@@ -135,10 +136,8 @@ describe('Editor', () => {
         activeTabPath={mockEntry.path}
       />
     )
-    // Breadcrumb shows type and title
-    expect(screen.getByText('Project')).toBeInTheDocument()
-    // Word count shown
-    expect(screen.getByText(/words/)).toBeInTheDocument()
+    // Breadcrumb bar shows action buttons (e.g. search, archive)
+    expect(screen.getByTitle('Search in file')).toBeInTheDocument()
   })
 
   it('shows BlockNote editor when a tab is active', () => {
@@ -152,7 +151,7 @@ describe('Editor', () => {
     expect(screen.getByTestId('blocknote-view')).toBeInTheDocument()
   })
 
-  it('shows modified indicator when file is modified', () => {
+  it('renders editor for modified file without breadcrumb status', () => {
     render(
       <Editor
         {...defaultProps}
@@ -161,11 +160,11 @@ describe('Editor', () => {
         getNoteStatus={() => 'modified'}
       />
     )
-    // Modified indicator shows "M" in the breadcrumb
-    expect(screen.getByText('M')).toBeInTheDocument()
+    // Editor still renders; breadcrumb bar no longer shows status indicators
+    expect(screen.getByTestId('blocknote-view')).toBeInTheDocument()
   })
 
-  it('shows new indicator when file is new', () => {
+  it('renders editor for new file without breadcrumb status', () => {
     render(
       <Editor
         {...defaultProps}
@@ -174,8 +173,8 @@ describe('Editor', () => {
         getNoteStatus={() => 'new'}
       />
     )
-    // New indicator shows "N" in the breadcrumb
-    expect(screen.getByText('N')).toBeInTheDocument()
+    // Editor still renders; breadcrumb bar no longer shows status indicators
+    expect(screen.getByTestId('blocknote-view')).toBeInTheDocument()
   })
 
   it('renders diff toggle button when file is modified', () => {

src/components/Editor.tsx

@@ -41,6 +41,7 @@ interface EditorProps {
   onDeleteProperty?: (path: string, key: string) => Promise<void>
   onAddProperty?: (path: string, key: string, value: FrontmatterValue) => Promise<void>
   onCreateAndOpenNote?: (title: string) => Promise<boolean>
+  onInitializeProperties?: (path: string) => void
   showAIChat?: boolean
   onToggleAIChat?: () => void
   vaultPath?: string
@@ -202,7 +203,7 @@ export const Editor = memo(function Editor(props: EditorProps) {
     getNoteStatus,
     inspectorCollapsed, onToggleInspector, inspectorWidth, onInspectorResize,
     inspectorEntry, inspectorContent, gitHistory,
-    onUpdateFrontmatter, onDeleteProperty, onAddProperty, onCreateAndOpenNote,
+    onUpdateFrontmatter, onDeleteProperty, onAddProperty, onCreateAndOpenNote, onInitializeProperties,
     showAIChat, onToggleAIChat,
     vaultPath, noteList, noteListFilter,
     onTrashNote, onRestoreNote, onDeleteNote, onArchiveNote, onUnarchiveNote,
@@ -286,6 +287,8 @@ export const Editor = memo(function Editor(props: EditorProps) {
           onDeleteProperty={onDeleteProperty}
           onAddProperty={onAddProperty}
           onCreateAndOpenNote={onCreateAndOpenNote}
+          onInitializeProperties={onInitializeProperties}
+          onToggleRawEditor={handleToggleRawExclusive}
           onOpenNote={onNavigateWikilink}
           onFileCreated={onFileCreated}
           onFileModified={onFileModified}

src/components/EditorContent.tsx

@@ -1,5 +1,5 @@
 import type React from 'react'
-import { useCallback } from 'react'
+import { useCallback, useRef, useState, useEffect } from 'react'
 import type { VaultEntry, NoteStatus } from '../types'
 import type { useCreateBlockNote } from '@blocknote/react'
 import { DiffView } from './DiffView'
@@ -13,6 +13,7 @@ import { RawEditorView } from './RawEditorView'
 import { countWords } from '../utils/wikilinks'
 import { SingleEditorView } from './SingleEditorView'
 import { isEmoji } from '../utils/emoji'
+import { useEditorTheme } from '../hooks/useTheme'
 
 interface Tab {
   entry: VaultEntry
@@ -119,8 +120,9 @@ function bindPath(cb: ((path: string) => void) | undefined, path: string) {
   return cb ? () => cb(path) : undefined
 }
 
-function ActiveTabBreadcrumb({ activeTab, props }: {
+function ActiveTabBreadcrumb({ activeTab, titleHidden, props }: {
   activeTab: Tab
+  titleHidden: boolean
   props: Omit<EditorContentProps, 'activeTab' | 'isLoadingNewTab' | 'entries' | 'editor' | 'onNavigateWikilink' | 'onEditorChange' | 'onRawContentChange' | 'onSave' | 'onDeleteNote'>
 }) {
   const wordCount = countWords(activeTab.content)
@@ -129,7 +131,7 @@ function ActiveTabBreadcrumb({ activeTab, props }: {
     <BreadcrumbBar
       entry={activeTab.entry}
       wordCount={wordCount}
-      noteStatus={props.activeStatus}
+      titleHidden={titleHidden}
       showDiffToggle={props.showDiffToggle}
       diffMode={props.diffMode}
       diffLoading={props.diffLoading}
@@ -160,6 +162,7 @@ export function EditorContent({
 }: EditorContentProps) {
   // Look up trashed/archived from the latest vault entries, not the tab snapshot,
   // so the banner appears regardless of navigation context.
+  const { cssVars } = useEditorTheme()
   const freshEntry = activeTab ? entries.find(e => e.path === activeTab.entry.path) : undefined
   const isTrashed = freshEntry?.trashed ?? activeTab?.entry.trashed ?? false
   const isArchived = freshEntry?.archived ?? activeTab?.entry.archived ?? false
@@ -167,6 +170,21 @@ export function EditorContent({
   const entryIcon = activeTab?.entry.icon ?? null
   const emojiIcon = entryIcon && isEmoji(entryIcon) ? entryIcon : null
 
+  const titleSectionRef = useRef<HTMLDivElement | null>(null)
+  const [titleScrolledAway, setTitleScrolledAway] = useState(false)
+  const titleHidden = showEditor && titleScrolledAway
+
+  useEffect(() => {
+    const el = titleSectionRef.current
+    if (!el) return
+    const observer = new IntersectionObserver(
+      ([e]) => setTitleScrolledAway(!e.isIntersecting),
+      { threshold: 0 },
+    )
+    observer.observe(el)
+    return () => observer.disconnect()
+  }, [activeTab?.entry.path, showEditor])
+
   const handleSetIcon = useCallback((emoji: string) => {
     if (activeTab) onSetNoteIcon?.(activeTab.entry.path, emoji)
   }, [activeTab, onSetNoteIcon])
@@ -180,6 +198,7 @@ export function EditorContent({
       {activeTab && (
         <ActiveTabBreadcrumb
           activeTab={activeTab}
+          titleHidden={titleHidden}
           props={{ diffMode, diffContent, onToggleDiff, rawMode, onToggleRaw, ...breadcrumbProps }}
         />
       )}
@@ -201,20 +220,34 @@ export function EditorContent({
       {diffMode && <DiffModeView diffContent={diffContent} onToggleDiff={onToggleDiff} />}
       <RawModeEditorSection rawMode={rawMode} activeTab={activeTab} entries={entries} onContentChange={onRawContentChange} onSave={onSave} latestContentRef={rawLatestContentRef} />
       {showEditor && activeTab && (
-        <div className="editor-scroll-area">
-          <div className="title-section">
-            <NoteIcon
-              icon={emojiIcon}
-              editable={!isTrashed}
-              onSetIcon={handleSetIcon}
-              onRemoveIcon={handleRemoveIcon}
-            />
-            <TitleField
-              title={activeTab.entry.title}
-              filename={activeTab.entry.filename}
-              editable={!isTrashed}
-              onTitleChange={(newTitle) => onTitleChange?.(activeTab.entry.path, newTitle)}
-            />
+        <div className="editor-scroll-area" style={cssVars as React.CSSProperties}>
+          <div ref={titleSectionRef} className="title-section">
+            {!emojiIcon && (
+              <div className="title-section__add-icon">
+                <NoteIcon
+                  icon={null}
+                  editable={!isTrashed}
+                  onSetIcon={handleSetIcon}
+                  onRemoveIcon={handleRemoveIcon}
+                />
+              </div>
+            )}
+            <div className={`title-section__row${emojiIcon ? '' : ' title-section__row--no-icon'}`}>
+              {emojiIcon && (
+                <NoteIcon
+                  icon={emojiIcon}
+                  editable={!isTrashed}
+                  onSetIcon={handleSetIcon}
+                  onRemoveIcon={handleRemoveIcon}
+                />
+              )}
+              <TitleField
+                title={activeTab.entry.title}
+                filename={activeTab.entry.filename}
+                editable={!isTrashed}
+                onTitleChange={(newTitle) => onTitleChange?.(activeTab.entry.path, newTitle)}
+              />
+            </div>
             <div className="title-section__separator" />
           </div>
           <SingleEditorView editor={editor} entries={entries} onNavigateWikilink={onNavigateWikilink} onChange={onEditorChange} vaultPath={vaultPath} editable={!isTrashed} />

src/components/EditorRightPanel.tsx

@@ -22,6 +22,8 @@ interface EditorRightPanelProps {
   onDeleteProperty?: (path: string, key: string) => Promise<void>
   onAddProperty?: (path: string, key: string, value: FrontmatterValue) => Promise<void>
   onCreateAndOpenNote?: (title: string) => Promise<boolean>
+  onInitializeProperties?: (path: string) => void
+  onToggleRawEditor?: () => void
   onOpenNote?: (path: string) => void
   onFileCreated?: (relativePath: string) => void
   onFileModified?: (relativePath: string) => void
@@ -33,14 +35,14 @@ export function EditorRightPanel({
   inspectorEntry, inspectorContent, entries, gitHistory, vaultPath,
   noteList, noteListFilter,
   onToggleInspector, onToggleAIChat, onNavigateWikilink, onViewCommitDiff,
-  onUpdateFrontmatter, onDeleteProperty, onAddProperty, onCreateAndOpenNote, onOpenNote,
+  onUpdateFrontmatter, onDeleteProperty, onAddProperty, onCreateAndOpenNote, onInitializeProperties, onToggleRawEditor, onOpenNote,
   onFileCreated, onFileModified, onVaultChanged,
 }: EditorRightPanelProps) {
   if (showAIChat) {
     return (
       <div
         className="shrink-0 flex flex-col min-h-0"
-        style={{ width: inspectorWidth, height: '100%' }}
+        style={{ width: inspectorWidth, minWidth: 240, height: '100%' }}
       >
         <AiPanel
           onClose={() => onToggleAIChat?.()}
@@ -79,6 +81,8 @@ export function EditorRightPanel({
         onDeleteProperty={onDeleteProperty}
         onAddProperty={onAddProperty}
         onCreateAndOpenNote={onCreateAndOpenNote}
+        onInitializeProperties={onInitializeProperties}
+        onToggleRawEditor={onToggleRawEditor}
       />
     </div>
   )

src/components/EmojiPicker.tsx

@@ -1,5 +1,5 @@
 import { useState, useRef, useEffect, useCallback } from 'react'
-import { EMOJI_GROUPS, EMOJIS_BY_GROUP, GROUP_ICONS, GROUP_SHORT_LABELS, searchEmojis } from '../utils/emoji'
+import { EMOJI_GROUPS, EMOJIS_BY_GROUP, GROUP_SHORT_LABELS, searchEmojis } from '../utils/emoji'
 
 interface EmojiPickerProps {
   onSelect: (emoji: string) => void
@@ -11,7 +11,6 @@ export function EmojiPicker({ onSelect, onClose }: EmojiPickerProps) {
   const inputRef = useRef<HTMLInputElement>(null)
   const containerRef = useRef<HTMLDivElement>(null)
   const scrollRef = useRef<HTMLDivElement>(null)
-  const groupRefs = useRef<Map<string, HTMLDivElement>>(new Map())
 
   useEffect(() => {
     setTimeout(() => inputRef.current?.focus(), 50)
@@ -45,13 +44,6 @@ export function EmojiPicker({ onSelect, onClose }: EmojiPickerProps) {
     onClose()
   }, [onSelect, onClose])
 
-  const scrollToGroup = useCallback((group: string) => {
-    const el = groupRefs.current.get(group)
-    if (el && scrollRef.current) {
-      el.scrollIntoView({ behavior: 'smooth', block: 'start' })
-    }
-  }, [])
-
   const searchResults = search.trim() ? searchEmojis(search) : null
   const isSearching = searchResults !== null
 
@@ -73,20 +65,6 @@ export function EmojiPicker({ onSelect, onClose }: EmojiPickerProps) {
           data-testid="emoji-picker-search"
         />
       </div>
-      {!isSearching && (
-        <div className="flex gap-0.5 border-b border-border px-2 py-1.5 overflow-x-auto">
-          {EMOJI_GROUPS.map(group => (
-            <button
-              key={group}
-              className="shrink-0 rounded px-1.5 py-1 text-base transition-colors hover:bg-secondary"
-              onClick={() => scrollToGroup(group)}
-              title={GROUP_SHORT_LABELS[group]}
-            >
-              {GROUP_ICONS[group]}
-            </button>
-          ))}
-        </div>
-      )}
       <div ref={scrollRef} className="max-h-[300px] overflow-y-auto p-2" data-testid="emoji-picker-grid">
         {isSearching ? (
           searchResults.length > 0 ? (
@@ -113,10 +91,7 @@ export function EmojiPicker({ onSelect, onClose }: EmojiPickerProps) {
             const emojis = EMOJIS_BY_GROUP.get(group)
             if (!emojis?.length) return null
             return (
-              <div
-                key={group}
-                ref={el => { if (el) groupRefs.current.set(group, el) }}
-              >
+              <div key={group}>
                 <div className="sticky top-0 z-10 bg-popover px-1 pb-1 pt-2 text-[11px] font-medium text-muted-foreground">
                   {GROUP_SHORT_LABELS[group]}
                 </div>

src/components/FolderTree.test.tsx

@@ -0,0 +1,70 @@
+import { render, screen, fireEvent } from '@testing-library/react'
+import { describe, it, expect, vi } from 'vitest'
+import { FolderTree } from './FolderTree'
+import type { FolderNode, SidebarSelection } from '../types'
+
+const mockFolders: FolderNode[] = [
+  {
+    name: 'projects',
+    path: 'projects',
+    children: [
+      { name: 'laputa', path: 'projects/laputa', children: [] },
+      { name: 'portfolio', path: 'projects/portfolio', children: [] },
+    ],
+  },
+  { name: 'areas', path: 'areas', children: [] },
+  { name: 'journal', path: 'journal', children: [] },
+]
+
+const defaultSelection: SidebarSelection = { kind: 'filter', filter: 'all' }
+
+describe('FolderTree', () => {
+  it('renders nothing when folders is empty', () => {
+    const { container } = render(
+      <FolderTree folders={[]} selection={defaultSelection} onSelect={vi.fn()} />,
+    )
+    expect(container.firstChild).toBeNull()
+  })
+
+  it('renders FOLDERS header and top-level folders', () => {
+    render(<FolderTree folders={mockFolders} selection={defaultSelection} onSelect={vi.fn()} />)
+    expect(screen.getByText('FOLDERS')).toBeInTheDocument()
+    expect(screen.getByText('projects')).toBeInTheDocument()
+    expect(screen.getByText('areas')).toBeInTheDocument()
+    expect(screen.getByText('journal')).toBeInTheDocument()
+  })
+
+  it('does not show children initially', () => {
+    render(<FolderTree folders={mockFolders} selection={defaultSelection} onSelect={vi.fn()} />)
+    expect(screen.queryByText('laputa')).not.toBeInTheDocument()
+  })
+
+  it('calls onSelect with folder kind when clicking a folder', () => {
+    const onSelect = vi.fn()
+    render(<FolderTree folders={mockFolders} selection={defaultSelection} onSelect={onSelect} />)
+    fireEvent.click(screen.getByText('projects'))
+    expect(onSelect).toHaveBeenCalledWith({ kind: 'folder', path: 'projects' })
+  })
+
+  it('expands children when clicking a folder with children', () => {
+    const onSelect = vi.fn()
+    render(<FolderTree folders={mockFolders} selection={defaultSelection} onSelect={onSelect} />)
+    fireEvent.click(screen.getByText('projects'))
+    expect(screen.getByText('laputa')).toBeInTheDocument()
+    expect(screen.getByText('portfolio')).toBeInTheDocument()
+  })
+
+  it('collapses section when clicking FOLDERS header', () => {
+    render(<FolderTree folders={mockFolders} selection={defaultSelection} onSelect={vi.fn()} />)
+    expect(screen.getByText('projects')).toBeInTheDocument()
+    fireEvent.click(screen.getByText('FOLDERS'))
+    expect(screen.queryByText('projects')).not.toBeInTheDocument()
+  })
+
+  it('highlights selected folder', () => {
+    const sel: SidebarSelection = { kind: 'folder', path: 'areas' }
+    render(<FolderTree folders={mockFolders} selection={sel} onSelect={vi.fn()} />)
+    const btn = screen.getByText('areas').closest('button')!
+    expect(btn.className).toContain('text-primary')
+  })
+})

src/components/FolderTree.tsx

@@ -0,0 +1,117 @@
+import { useState, useCallback, memo } from 'react'
+import { Folder, FolderOpen, CaretDown, CaretRight, Plus } from '@phosphor-icons/react'
+import type { FolderNode, SidebarSelection } from '../types'
+import { cn } from '@/lib/utils'
+
+interface FolderTreeProps {
+  folders: FolderNode[]
+  selection: SidebarSelection
+  onSelect: (selection: SidebarSelection) => void
+}
+
+function FolderItem({
+  node, depth, selection, expanded, onToggle, onSelect,
+}: {
+  node: FolderNode
+  depth: number
+  selection: SidebarSelection
+  expanded: Record<string, boolean>
+  onToggle: (path: string) => void
+  onSelect: (selection: SidebarSelection) => void
+}) {
+  const isSelected = selection.kind === 'folder' && selection.path === node.path
+  const isExpanded = expanded[node.path] ?? false
+  const hasChildren = node.children.length > 0
+
+  const handleClick = () => {
+    onSelect({ kind: 'folder', path: node.path })
+    if (hasChildren) onToggle(node.path)
+  }
+
+  return (
+    <>
+      <button
+        className={cn(
+          'flex w-full items-center gap-2 rounded-[5px] border-none bg-transparent cursor-pointer text-left transition-colors',
+          isSelected
+            ? 'bg-[var(--accent-blue-light,rgba(0,100,255,0.08))] text-primary'
+            : 'text-foreground hover:bg-accent',
+        )}
+        style={{ padding: '5px 8px', paddingLeft: 8 + depth * 16, fontSize: 13 }}
+        onClick={handleClick}
+        title={node.path}
+      >
+        {isSelected || isExpanded ? (
+          <FolderOpen size={18} weight="fill" className="shrink-0" />
+        ) : (
+          <Folder size={18} className="shrink-0" />
+        )}
+        <span className={cn('truncate', isSelected && 'font-medium')}>{node.name}</span>
+      </button>
+      {isExpanded && hasChildren && (
+        <div className="relative" style={{ paddingLeft: 15 }}>
+          <div
+            className="absolute top-0 bottom-0 bg-border"
+            style={{ left: 15 + depth * 16, width: 1, opacity: 0.3 }}
+          />
+          {node.children.map((child) => (
+            <FolderItem
+              key={child.path}
+              node={child}
+              depth={depth + 1}
+              selection={selection}
+              expanded={expanded}
+              onToggle={onToggle}
+              onSelect={onSelect}
+            />
+          ))}
+        </div>
+      )}
+    </>
+  )
+}
+
+export const FolderTree = memo(function FolderTree({ folders, selection, onSelect }: FolderTreeProps) {
+  const [sectionCollapsed, setSectionCollapsed] = useState(false)
+  const [expanded, setExpanded] = useState<Record<string, boolean>>({})
+
+  const toggleFolder = useCallback((path: string) => {
+    setExpanded((prev) => ({ ...prev, [path]: !prev[path] }))
+  }, [])
+
+  if (folders.length === 0) return null
+
+  return (
+    <div style={{ padding: '8px 0' }}>
+      {/* Header */}
+      <button
+        className="flex w-full cursor-pointer select-none items-center justify-between border-none bg-transparent text-muted-foreground"
+        style={{ padding: '6px 14px 6px 16px' }}
+        onClick={() => setSectionCollapsed((v) => !v)}
+      >
+        <div className="flex items-center gap-1">
+          {sectionCollapsed ? <CaretRight size={12} /> : <CaretDown size={12} />}
+          <span className="text-[10px] font-semibold" style={{ letterSpacing: 0.5 }}>FOLDERS</span>
+        </div>
+        <Plus size={12} className="text-muted-foreground" />
+      </button>
+
+      {/* Tree */}
+      {!sectionCollapsed && (
+        <div className="flex flex-col gap-0.5" style={{ padding: '2px 6px 8px 14px' }}>
+          {folders.map((node) => (
+            <FolderItem
+              key={node.path}
+              node={node}
+              depth={0}
+              selection={selection}
+              expanded={expanded}
+              onToggle={toggleFolder}
+              onSelect={onSelect}
+            />
+          ))}
+        </div>
+      )}
+    </div>
+  )
+})

src/components/GitRequiredModal.test.tsx

@@ -0,0 +1,51 @@
+import { render, screen, fireEvent, waitFor } from '@testing-library/react'
+import { describe, it, expect, vi } from 'vitest'
+import { GitRequiredModal } from './GitRequiredModal'
+
+describe('GitRequiredModal', () => {
+  it('renders title and explanation', () => {
+    render(<GitRequiredModal onCreateRepo={vi.fn()} onChooseVault={vi.fn()} />)
+    expect(screen.getByText('Git repository required')).toBeInTheDocument()
+    expect(screen.getByText(/track changes/)).toBeInTheDocument()
+  })
+
+  it('renders both action buttons', () => {
+    render(<GitRequiredModal onCreateRepo={vi.fn()} onChooseVault={vi.fn()} />)
+    expect(screen.getByText('Create repository')).toBeInTheDocument()
+    expect(screen.getByText('Choose another vault')).toBeInTheDocument()
+  })
+
+  it('calls onCreateRepo when primary button clicked', async () => {
+    const onCreateRepo = vi.fn().mockResolvedValue(undefined)
+    render(<GitRequiredModal onCreateRepo={onCreateRepo} onChooseVault={vi.fn()} />)
+    fireEvent.click(screen.getByText('Create repository'))
+    expect(onCreateRepo).toHaveBeenCalledOnce()
+  })
+
+  it('calls onChooseVault when secondary button clicked', () => {
+    const onChooseVault = vi.fn()
+    render(<GitRequiredModal onCreateRepo={vi.fn()} onChooseVault={onChooseVault} />)
+    fireEvent.click(screen.getByText('Choose another vault'))
+    expect(onChooseVault).toHaveBeenCalledOnce()
+  })
+
+  it('disables buttons and shows spinner while creating', async () => {
+    let resolve: () => void
+    const onCreateRepo = vi.fn().mockReturnValue(new Promise<void>(r => { resolve = r }))
+    render(<GitRequiredModal onCreateRepo={onCreateRepo} onChooseVault={vi.fn()} />)
+    fireEvent.click(screen.getByText('Create repository'))
+    await waitFor(() => {
+      expect(screen.getByText('Creating…')).toBeInTheDocument()
+    })
+    resolve!()
+  })
+
+  it('shows error message when creation fails', async () => {
+    const onCreateRepo = vi.fn().mockRejectedValue(new Error('Permission denied'))
+    render(<GitRequiredModal onCreateRepo={onCreateRepo} onChooseVault={vi.fn()} />)
+    fireEvent.click(screen.getByText('Create repository'))
+    await waitFor(() => {
+      expect(screen.getByText(/Permission denied/)).toBeInTheDocument()
+    })
+  })
+})

src/components/GitRequiredModal.tsx

@@ -0,0 +1,57 @@
+import { useState } from 'react'
+import { GitBranch } from '@phosphor-icons/react'
+
+interface GitRequiredModalProps {
+  onCreateRepo: () => Promise<void>
+  onChooseVault: () => void
+}
+
+export function GitRequiredModal({ onCreateRepo, onChooseVault }: GitRequiredModalProps) {
+  const [creating, setCreating] = useState(false)
+  const [error, setError] = useState<string | null>(null)
+
+  const handleCreate = async () => {
+    setCreating(true)
+    setError(null)
+    try {
+      await onCreateRepo()
+    } catch (err) {
+      setError(err instanceof Error ? err.message : String(err))
+      setCreating(false)
+    }
+  }
+
+  return (
+    <div className="flex h-full w-full items-center justify-center" style={{ background: 'var(--sidebar)' }}>
+      <div className="flex max-w-sm flex-col items-center gap-5 rounded-xl border border-border bg-background p-8 shadow-lg">
+        <GitBranch size={36} className="text-muted-foreground" />
+        <h2 className="m-0 text-lg font-semibold text-foreground">Git repository required</h2>
+        <p className="m-0 text-center text-[13px] leading-relaxed text-muted-foreground">
+          Laputa uses a git repository to track changes, detect moved files, and keep your vault safe.
+          We'll create a local repo — no remote needed.
+        </p>
+        {error && (
+          <p className="m-0 rounded-md bg-destructive/10 px-3 py-2 text-center text-[12px] text-destructive">
+            {error}
+          </p>
+        )}
+        <div className="flex w-full flex-col gap-2">
+          <button
+            className="w-full cursor-pointer rounded-md bg-primary px-4 py-2 text-[13px] font-medium text-primary-foreground transition-colors hover:bg-primary/90 disabled:cursor-not-allowed disabled:opacity-50"
+            onClick={handleCreate}
+            disabled={creating}
+          >
+            {creating ? 'Creating…' : 'Create repository'}
+          </button>
+          <button
+            className="w-full cursor-pointer rounded-md border border-border bg-transparent px-4 py-2 text-[13px] font-medium text-foreground transition-colors hover:bg-muted disabled:cursor-not-allowed disabled:opacity-50"
+            onClick={onChooseVault}
+            disabled={creating}
+          >
+            Choose another vault
+          </button>
+        </div>
+      </div>
+    </div>
+  )
+}

src/components/Inspector.test.tsx

@@ -122,11 +122,11 @@ describe('Inspector', () => {
     expect(screen.getByText('Words')).toBeInTheDocument()
   })
 
-  it('renders status as a colored pill', () => {
+  it('renders status as a colored badge with dot indicator', () => {
     render(<Inspector {...defaultProps} entry={mockEntry} content={mockContent} />)
-    const pill = screen.getByText('Active')
-    // Status is rendered as an inline pill with CSS variable-based styles
-    expect(pill).toHaveStyle({ borderRadius: '16px' })
+    const badge = screen.getByTestId('status-badge')
+    expect(badge).toHaveTextContent('Active')
+    expect(badge.className).toContain('rounded')
   })
 
   it('computes word count from content minus frontmatter and title', () => {
@@ -137,7 +137,7 @@ describe('Inspector', () => {
 
   it('shows "Add property" button as disabled placeholder', () => {
     render(<Inspector {...defaultProps} entry={mockEntry} content={mockContent} />)
-    const btn = screen.getByText('+ Add property')
+    const btn = screen.getByText('Add property')
     expect(btn).toBeDisabled()
   })
 
@@ -188,10 +188,7 @@ This is a test note with some words to count.
         entries={[mockEntry, referrerEntry]}
       />
     )
-    // Backlinks section is collapsed by default, but header with count is visible
-    expect(screen.getByText('Backlinks (1)')).toBeInTheDocument()
-    // Expand to see the backlink entry
-    fireEvent.click(screen.getByTestId('backlinks-toggle'))
+    expect(screen.getByText('Backlinks')).toBeInTheDocument()
     expect(screen.getByText('Referrer Note')).toBeInTheDocument()
   })
 
@@ -204,10 +201,8 @@ This is a test note with some words to count.
         entries={[mockEntry, { ...referrerEntry, outgoingLinks: [] }]}
       />
     )
-    // Initially no backlinks — section is hidden entirely
-    expect(screen.queryByTestId('backlinks-toggle')).not.toBeInTheDocument()
+    expect(screen.queryByText('Backlinks')).not.toBeInTheDocument()
 
-    // Rerender with updated outgoingLinks (simulates adding [[Test Project]] to referrer)
     rerender(
       <Inspector
         {...defaultProps}
@@ -216,8 +211,7 @@ This is a test note with some words to count.
         entries={[mockEntry, { ...referrerEntry, outgoingLinks: ['Test Project'] }]}
       />
     )
-    expect(screen.getByText('Backlinks (1)')).toBeInTheDocument()
-    fireEvent.click(screen.getByTestId('backlinks-toggle'))
+    expect(screen.getByText('Backlinks')).toBeInTheDocument()
     expect(screen.getByText('Referrer Note')).toBeInTheDocument()
   })
 
@@ -230,7 +224,7 @@ This is a test note with some words to count.
         entries={[mockEntry]}
       />
     )
-    expect(screen.queryByTestId('backlinks-toggle')).not.toBeInTheDocument()
+    expect(screen.queryByText('Backlinks')).not.toBeInTheDocument()
   })
 
   it('navigates when a backlink is clicked', () => {
@@ -244,7 +238,6 @@ This is a test note with some words to count.
         onNavigate={onNavigate}
       />
     )
-    fireEvent.click(screen.getByTestId('backlinks-toggle'))
     fireEvent.click(screen.getByText('Referrer Note'))
     expect(onNavigate).toHaveBeenCalledWith('Referrer Note')
   })
@@ -260,12 +253,11 @@ This is a test note with some words to count.
     )
     expect(screen.getByText('History')).toBeInTheDocument()
     expect(screen.getByText('a1b2c3d')).toBeInTheDocument()
-    expect(screen.getByText('Update test with latest changes')).toBeInTheDocument()
     expect(screen.getByText('e4f5g6h')).toBeInTheDocument()
     expect(screen.getByText('i7j8k9l')).toBeInTheDocument()
   })
 
-  it('renders commit hashes as clickable buttons', () => {
+  it('renders commit entries as clickable buttons', () => {
     const onViewCommitDiff = vi.fn()
     render(
       <Inspector
@@ -277,25 +269,13 @@ This is a test note with some words to count.
       />
     )
     const hashBtn = screen.getByText('a1b2c3d')
-    expect(hashBtn.tagName).toBe('BUTTON')
-    hashBtn.click()
+    const button = hashBtn.closest('button')!
+    expect(button.tagName).toBe('BUTTON')
+    button.click()
     expect(onViewCommitDiff).toHaveBeenCalledWith('a1b2c3d4e5f6a7b8')
   })
 
-  it('shows author name in commit rows', () => {
-    render(
-      <Inspector
-        {...defaultProps}
-        entry={mockEntry}
-        content={mockContent}
-        gitHistory={mockGitHistory}
-      />
-    )
-    const authors = screen.getAllByText('Luca Rossi')
-    expect(authors.length).toBeGreaterThan(0)
-  })
-
-  it('shows "No revision history" when no commits', () => {
+  it('hides history section when no commits', () => {
     render(
       <Inspector
         {...defaultProps}
@@ -304,7 +284,7 @@ This is a test note with some words to count.
         gitHistory={[]}
       />
     )
-    expect(screen.getByText('No revision history')).toBeInTheDocument()
+    expect(screen.queryByText('History')).not.toBeInTheDocument()
   })
 
   it('shows separate Info section with read-only metadata', () => {
@@ -639,4 +619,96 @@ Status: Active
       expect(screen.queryByText('Referenced by')).not.toBeInTheDocument()
     })
   })
+
+  describe('frontmatter state handling', () => {
+    const noFrontmatterEntry: VaultEntry = {
+      ...mockEntry,
+      path: '/vault/plain-note.md',
+      filename: 'plain-note.md',
+      title: 'plain-note',
+      isA: null,
+    }
+
+    it('shows "Initialize properties" button when note has no frontmatter', () => {
+      render(
+        <Inspector
+          {...defaultProps}
+          entry={noFrontmatterEntry}
+          content="# Just a plain note\n\nNo frontmatter here."
+          onInitializeProperties={vi.fn()}
+        />
+      )
+      expect(screen.getByText('Initialize properties')).toBeInTheDocument()
+      expect(screen.queryByText('Type')).not.toBeInTheDocument()
+    })
+
+    it('shows "Initialize properties" button when frontmatter is empty', () => {
+      render(
+        <Inspector
+          {...defaultProps}
+          entry={noFrontmatterEntry}
+          content="---\n---\n# Note with empty frontmatter"
+          onInitializeProperties={vi.fn()}
+        />
+      )
+      expect(screen.getByText('Initialize properties')).toBeInTheDocument()
+    })
+
+    it('calls onInitializeProperties when button is clicked', () => {
+      const onInit = vi.fn()
+      render(
+        <Inspector
+          {...defaultProps}
+          entry={noFrontmatterEntry}
+          content="# Plain note"
+          onInitializeProperties={onInit}
+        />
+      )
+      fireEvent.click(screen.getByText('Initialize properties'))
+      expect(onInit).toHaveBeenCalledWith('/vault/plain-note.md')
+    })
+
+    it('shows invalid frontmatter notice with fix button', () => {
+      render(
+        <Inspector
+          {...defaultProps}
+          entry={noFrontmatterEntry}
+          content={'---\n{broken yaml\n---\nBody'}
+          onToggleRawEditor={vi.fn()}
+        />
+      )
+      expect(screen.getByText('Invalid properties')).toBeInTheDocument()
+      expect(screen.getByText('Fix in editor')).toBeInTheDocument()
+    })
+
+    it('calls onToggleRawEditor when fix button is clicked', () => {
+      const onToggle = vi.fn()
+      render(
+        <Inspector
+          {...defaultProps}
+          entry={noFrontmatterEntry}
+          content={'---\n{broken yaml\n---\nBody'}
+          onToggleRawEditor={onToggle}
+        />
+      )
+      fireEvent.click(screen.getByText('Fix in editor'))
+      expect(onToggle).toHaveBeenCalledOnce()
+    })
+
+    it('still shows backlinks and history for notes without frontmatter', () => {
+      render(
+        <Inspector
+          {...defaultProps}
+          entry={noFrontmatterEntry}
+          content="# Plain note"
+          entries={[noFrontmatterEntry, { ...referrerEntry, outgoingLinks: ['plain-note'] }]}
+          gitHistory={mockGitHistory}
+          onInitializeProperties={vi.fn()}
+        />
+      )
+      expect(screen.getByText('Initialize properties')).toBeInTheDocument()
+      expect(screen.getByText('Backlinks')).toBeInTheDocument()
+      expect(screen.getByText('History')).toBeInTheDocument()
+    })
+  })
 })

src/components/Inspector.tsx

@@ -2,8 +2,9 @@ import { useMemo, useCallback } from 'react'
 import { useDragRegion } from '../hooks/useDragRegion'
 import type { VaultEntry, GitCommit } from '../types'
 import { cn } from '@/lib/utils'
-import { SlidersHorizontal, X } from '@phosphor-icons/react'
-import { parseFrontmatter } from '../utils/frontmatter'
+import { SlidersHorizontal, X, Sparkle, WarningCircle, PencilSimple } from '@phosphor-icons/react'
+import { Separator } from './ui/separator'
+import { parseFrontmatter, detectFrontmatterState } from '../utils/frontmatter'
 import { DynamicPropertiesPanel } from './DynamicPropertiesPanel'
 import { DynamicRelationshipsPanel, BacklinksPanel, ReferencedByPanel, GitHistoryPanel, InstancesPanel } from './InspectorPanels'
 import { wikilinkTarget } from '../utils/wikilink'
@@ -24,6 +25,17 @@ interface InspectorProps {
   onDeleteProperty?: (path: string, key: string) => Promise<void>
   onAddProperty?: (path: string, key: string, value: FrontmatterValue) => Promise<void>
   onCreateAndOpenNote?: (title: string) => Promise<boolean>
+  onInitializeProperties?: (path: string) => void
+  onToggleRawEditor?: () => void
+}
+
+function targetMatchesEntry(target: string, entryPath: string, matchTargets: Set<string>): boolean {
+  if (matchTargets.has(target)) return true
+  const lastSegment = target.split('/').pop() ?? ''
+  if (matchTargets.has(lastSegment)) return true
+  // Path-suffix match: "projects/alpha" matches entry path ending with "/projects/alpha.md"
+  if (target.includes('/') && entryPath.toLowerCase().endsWith('/' + target.toLowerCase() + '.md')) return true
+  return false
 }
 
 function useBacklinks(
@@ -36,7 +48,6 @@ function useBacklinks(
     const matchTargets = new Set([
       entry.title, ...entry.aliases,
       entry.filename.replace(/\.md$/, ''),
-      entry.path.replace(/^.*\/Laputa\//, '').replace(/\.md$/, ''),
     ])
 
     const referencedByPaths = new Set(referencedBy.map((item) => item.entry.path))
@@ -45,9 +56,7 @@ function useBacklinks(
       .filter((e) => {
         if (e.path === entry.path) return false
         if (referencedByPaths.has(e.path)) return false
-        return e.outgoingLinks.some((target) =>
-          matchTargets.has(target) || matchTargets.has(target.split('/').pop() ?? '')
-        )
+        return e.outgoingLinks.some((target) => targetMatchesEntry(target, entry.path, matchTargets))
       })
       .map((e) => ({
         entry: e,
@@ -67,9 +76,8 @@ function useReferencedBy(entry: VaultEntry | null, entries: VaultEntry[]): Refer
   return useMemo(() => {
     if (!entry) return []
 
-    const pathStem = entry.path.replace(/^.*\/Laputa\//, '').replace(/\.md$/, '')
     const filenameStem = entry.filename.replace(/\.md$/, '')
-    const matchTargets = new Set([pathStem, filenameStem, entry.title, ...entry.aliases])
+    const matchTargets = new Set([filenameStem, entry.title, ...entry.aliases])
 
     const results: ReferencedByItem[] = []
 
@@ -89,16 +97,16 @@ function useReferencedBy(entry: VaultEntry | null, entries: VaultEntry[]): Refer
 function InspectorHeader({ collapsed, onToggle }: { collapsed: boolean; onToggle: () => void }) {
   const { onMouseDown } = useDragRegion()
   return (
-    <div className="flex shrink-0 items-center border-b border-border" style={{ height: 45, padding: '6px 12px', gap: 8, cursor: 'default' }} onMouseDown={onMouseDown}>
+    <div className="flex shrink-0 items-center border-b border-border" style={{ height: 52, padding: '6px 12px', gap: 8, cursor: 'default' }} onMouseDown={onMouseDown}>
       {collapsed ? (
-        <button className="shrink-0 border-none bg-transparent p-1 text-muted-foreground cursor-pointer hover:text-foreground" onClick={onToggle}>
+        <button className="shrink-0 border-none bg-transparent p-1 text-muted-foreground cursor-pointer hover:text-foreground" onClick={onToggle} title="Properties (⌘⇧I)">
           <SlidersHorizontal size={16} />
         </button>
       ) : (
         <>
           <SlidersHorizontal size={16} className="shrink-0 text-muted-foreground" />
           <span className="flex-1 text-muted-foreground" style={{ fontSize: 13, fontWeight: 600 }}>Properties</span>
-          <button className="shrink-0 border-none bg-transparent p-1 text-muted-foreground cursor-pointer hover:text-foreground" onClick={onToggle}>
+          <button className="shrink-0 border-none bg-transparent p-1 text-muted-foreground cursor-pointer hover:text-foreground" onClick={onToggle} title="Close Properties (⌘⇧I)">
             <X size={16} />
           </button>
         </>
@@ -113,13 +121,46 @@ function EmptyInspector() {
   )
 }
 
+function InitializePropertiesPrompt({ onClick }: { onClick: () => void }) {
+  return (
+    <div className="flex flex-col items-center gap-3 rounded-lg border border-dashed border-border px-4 py-6">
+      <Sparkle size={24} className="text-muted-foreground" />
+      <p className="m-0 text-center text-[13px] text-muted-foreground">This note has no properties yet</p>
+      <button
+        className="inline-flex cursor-pointer items-center gap-1.5 rounded-md border border-border bg-background px-3 py-1.5 text-[13px] font-medium text-foreground transition-colors hover:bg-muted"
+        onClick={onClick}
+      >
+        Initialize properties
+      </button>
+    </div>
+  )
+}
+
+function InvalidFrontmatterNotice({ onFix }: { onFix: () => void }) {
+  return (
+    <div className="flex flex-col items-center gap-3 rounded-lg border border-dashed border-destructive/40 bg-destructive/5 px-4 py-6">
+      <WarningCircle size={24} className="text-destructive" />
+      <p className="m-0 text-center text-[13px] text-muted-foreground">Invalid properties</p>
+      <button
+        className="inline-flex cursor-pointer items-center gap-1.5 rounded-md border border-border bg-background px-3 py-1.5 text-[13px] font-medium text-foreground transition-colors hover:bg-muted"
+        onClick={onFix}
+      >
+        <PencilSimple size={14} />
+        Fix in editor
+      </button>
+    </div>
+  )
+}
+
 export function Inspector({
   collapsed, onToggle, entry, content, entries, gitHistory, onNavigate,
   onViewCommitDiff, onUpdateFrontmatter, onDeleteProperty, onAddProperty, onCreateAndOpenNote,
+  onInitializeProperties, onToggleRawEditor,
 }: InspectorProps) {
   const referencedBy = useReferencedBy(entry, entries)
   const backlinks = useBacklinks(entry, entries, referencedBy)
   const frontmatter = useMemo(() => parseFrontmatter(content), [content])
+  const fmState = useMemo(() => detectFrontmatterState(content), [content])
   const typeEntryMap = useMemo(() => {
     const map: Record<string, VaultEntry> = {}
     for (const e of entries) { if (e.isA === 'Type') map[e.title] = e }
@@ -145,24 +186,34 @@ export function Inspector({
         <div className="flex flex-1 flex-col gap-4 overflow-y-auto p-3">
           {entry ? (
             <>
-              <DynamicPropertiesPanel
-                entry={entry} content={content} frontmatter={frontmatter}
-                entries={entries}
-                onUpdateProperty={onUpdateFrontmatter ? handleUpdateProperty : undefined}
-                onDeleteProperty={onDeleteProperty ? handleDeleteProperty : undefined}
-                onAddProperty={onAddProperty ? handleAddProperty : undefined}
-                onNavigate={onNavigate}
-              />
-              <DynamicRelationshipsPanel
-                frontmatter={frontmatter} entries={entries} typeEntryMap={typeEntryMap} onNavigate={onNavigate}
-                onAddProperty={onAddProperty ? handleAddProperty : undefined}
-                onUpdateProperty={onUpdateFrontmatter ? handleUpdateProperty : undefined}
-                onDeleteProperty={onDeleteProperty ? handleDeleteProperty : undefined}
-                onCreateAndOpenNote={onCreateAndOpenNote}
-              />
-              <InstancesPanel entry={entry} entries={entries} typeEntryMap={typeEntryMap} onNavigate={onNavigate} />
-              <ReferencedByPanel items={referencedBy} typeEntryMap={typeEntryMap} onNavigate={onNavigate} />
-              <BacklinksPanel backlinks={backlinks} typeEntryMap={typeEntryMap} onNavigate={onNavigate} />
+              {fmState === 'valid' ? (
+                <>
+                  <DynamicPropertiesPanel
+                    entry={entry} content={content} frontmatter={frontmatter}
+                    entries={entries}
+                    onUpdateProperty={onUpdateFrontmatter ? handleUpdateProperty : undefined}
+                    onDeleteProperty={onDeleteProperty ? handleDeleteProperty : undefined}
+                    onAddProperty={onAddProperty ? handleAddProperty : undefined}
+                    onNavigate={onNavigate}
+                  />
+                  <DynamicRelationshipsPanel
+                    frontmatter={frontmatter} entries={entries} typeEntryMap={typeEntryMap} onNavigate={onNavigate}
+                    onAddProperty={onAddProperty ? handleAddProperty : undefined}
+                    onUpdateProperty={onUpdateFrontmatter ? handleUpdateProperty : undefined}
+                    onDeleteProperty={onDeleteProperty ? handleDeleteProperty : undefined}
+                    onCreateAndOpenNote={onCreateAndOpenNote}
+                  />
+                  <InstancesPanel entry={entry} entries={entries} typeEntryMap={typeEntryMap} onNavigate={onNavigate} />
+                  <ReferencedByPanel items={referencedBy} typeEntryMap={typeEntryMap} onNavigate={onNavigate} />
+                </>
+              ) : fmState === 'invalid' ? (
+                onToggleRawEditor && <InvalidFrontmatterNotice onFix={onToggleRawEditor} />
+              ) : (
+                onInitializeProperties && <InitializePropertiesPrompt onClick={() => onInitializeProperties(entry.path)} />
+              )}
+              {backlinks.length > 0 && <Separator />}
+              <BacklinksPanel backlinks={backlinks} onNavigate={onNavigate} />
+              {gitHistory.length > 0 && <Separator />}
               <GitHistoryPanel commits={gitHistory} onViewCommitDiff={onViewCommitDiff} />
             </>
           ) : (

src/components/InspectorPanels.test.tsx

@@ -632,7 +632,7 @@ describe('BacklinksPanel', () => {
   })
 
   it('renders nothing when empty', () => {
-    const { container } = render(<BacklinksPanel typeEntryMap={{}} backlinks={[]} onNavigate={onNavigate} />)
+    const { container } = render(<BacklinksPanel backlinks={[]} onNavigate={onNavigate} />)
     expect(container.innerHTML).toBe('')
   })
 
@@ -641,23 +641,16 @@ describe('BacklinksPanel', () => {
     { entry: makeEntry({ title: 'Another Note', isA: 'Project', path: '/vault/project/another.md' }), context: null },
   ]
 
-  it('renders collapsed by default with count badge', () => {
-    render(<BacklinksPanel typeEntryMap={{}} backlinks={twoBacklinks} onNavigate={onNavigate} />)
-    expect(screen.getByText('Backlinks (2)')).toBeInTheDocument()
-    expect(screen.queryByText('Referencing Note')).not.toBeInTheDocument()
-  })
-
-  it('expands to show backlink entries when toggle clicked', () => {
-    render(<BacklinksPanel typeEntryMap={{}} backlinks={twoBacklinks} onNavigate={onNavigate} />)
-    fireEvent.click(screen.getByTestId('backlinks-toggle'))
+  it('renders header and all backlinks immediately (no collapse)', () => {
+    render(<BacklinksPanel backlinks={twoBacklinks} onNavigate={onNavigate} />)
+    expect(screen.getByText('Backlinks')).toBeInTheDocument()
     expect(screen.getByText('Referencing Note')).toBeInTheDocument()
     expect(screen.getByText('Another Note')).toBeInTheDocument()
   })
 
   it('navigates when clicking backlink', () => {
     const backlinks = [{ entry: makeEntry({ title: 'Reference' }), context: null }]
-    render(<BacklinksPanel typeEntryMap={{}} backlinks={backlinks} onNavigate={onNavigate} />)
-    fireEvent.click(screen.getByTestId('backlinks-toggle'))
+    render(<BacklinksPanel backlinks={backlinks} onNavigate={onNavigate} />)
     fireEvent.click(screen.getByText('Reference'))
     expect(onNavigate).toHaveBeenCalledWith('Reference')
   })
@@ -666,39 +659,26 @@ describe('BacklinksPanel', () => {
     const backlinks = [
       { entry: makeEntry({ title: 'Referencing Note' }), context: 'This references [[My Note]] in context.' },
     ]
-    render(<BacklinksPanel typeEntryMap={{}} backlinks={backlinks} onNavigate={onNavigate} />)
-    fireEvent.click(screen.getByTestId('backlinks-toggle'))
+    render(<BacklinksPanel backlinks={backlinks} onNavigate={onNavigate} />)
     expect(screen.getByText('This references [[My Note]] in context.')).toBeInTheDocument()
   })
 
-  it('collapses when toggle clicked twice', () => {
-    const backlinks = [{ entry: makeEntry({ title: 'Note A' }), context: null }]
-    render(<BacklinksPanel typeEntryMap={{}} backlinks={backlinks} onNavigate={onNavigate} />)
-    fireEvent.click(screen.getByTestId('backlinks-toggle'))
-    expect(screen.getByText('Note A')).toBeInTheDocument()
-    fireEvent.click(screen.getByTestId('backlinks-toggle'))
-    expect(screen.queryByText('Note A')).not.toBeInTheDocument()
-  })
-
   it('shows emoji icon before backlink title when entry has an emoji', () => {
     const backlinks = [{
       entry: makeEntry({ title: 'Starred Note', icon: '⭐' }),
       context: null,
     }]
-    render(<BacklinksPanel typeEntryMap={{}} backlinks={backlinks} onNavigate={onNavigate} />)
-    fireEvent.click(screen.getByTestId('backlinks-toggle'))
+    render(<BacklinksPanel backlinks={backlinks} onNavigate={onNavigate} />)
     expect(screen.getByText('⭐')).toBeInTheDocument()
     expect(screen.getByText('Starred Note')).toBeInTheDocument()
   })
 
   it('does not show emoji when backlink entry has no icon', () => {
     const backlinks = [{ entry: makeEntry({ title: 'Plain Note' }), context: null }]
-    render(<BacklinksPanel typeEntryMap={{}} backlinks={backlinks} onNavigate={onNavigate} />)
-    fireEvent.click(screen.getByTestId('backlinks-toggle'))
+    render(<BacklinksPanel backlinks={backlinks} onNavigate={onNavigate} />)
     expect(screen.getByText('Plain Note')).toBeInTheDocument()
     const btn = screen.getByText('Plain Note').closest('button')
     const spans = btn?.querySelectorAll('span.shrink-0')
-    // No emoji span should exist (only possible shrink-0 spans are trash icon, not emoji)
     const emojiSpans = Array.from(spans ?? []).filter(s => /[\p{Emoji_Presentation}]/u.test(s.textContent ?? ''))
     expect(emojiSpans).toHaveLength(0)
   })
@@ -764,12 +744,12 @@ describe('GitHistoryPanel', () => {
     vi.clearAllMocks()
   })
 
-  it('shows "No revision history" when empty', () => {
-    render(<GitHistoryPanel commits={[]} />)
-    expect(screen.getByText('No revision history')).toBeInTheDocument()
+  it('renders nothing when empty', () => {
+    const { container } = render(<GitHistoryPanel commits={[]} />)
+    expect(container.innerHTML).toBe('')
   })
 
-  it('renders commit entries', () => {
+  it('renders commit entries with hash and message', () => {
     const commits: GitCommit[] = [
       { hash: 'abc1234567890', shortHash: 'abc1234', message: 'Initial commit', author: 'luca', date: Math.floor(Date.now() / 1000) - 3600 },
       { hash: 'def4567890123', shortHash: 'def4567', message: 'Fix bug', author: 'jane', date: Math.floor(Date.now() / 1000) - 86400 * 2 },
@@ -777,13 +757,9 @@ describe('GitHistoryPanel', () => {
     render(<GitHistoryPanel commits={commits} onViewCommitDiff={onViewCommitDiff} />)
     expect(screen.getByText('abc1234')).toBeInTheDocument()
     expect(screen.getByText('def4567')).toBeInTheDocument()
-    expect(screen.getByText('Initial commit')).toBeInTheDocument()
-    expect(screen.getByText('Fix bug')).toBeInTheDocument()
-    expect(screen.getByText('luca')).toBeInTheDocument()
-    expect(screen.getByText('jane')).toBeInTheDocument()
   })
 
-  it('calls onViewCommitDiff when clicking commit hash', () => {
+  it('calls onViewCommitDiff when clicking commit entry', () => {
     const commits: GitCommit[] = [
       { hash: 'abc1234567890', shortHash: 'abc1234', message: 'test', author: '', date: Math.floor(Date.now() / 1000) },
     ]

src/components/NoteList.test.tsx

@@ -867,7 +867,7 @@ describe('NoteList — virtual list with large datasets', () => {
     expect(screen.getByText('Note 499')).toBeInTheDocument()
   })
 
-  it('search filters large dataset correctly', () => {
+  it('search filters large dataset correctly', { timeout: 15000 }, () => {
     const entries = [
       makeIndexedEntry(0, { title: 'Alpha Strategy' }),
       ...Array.from({ length: 998 }, (_, i) => makeIndexedEntry(i + 1, { title: `Filler Note ${i + 1}` })),

src/components/NoteList.tsx

@@ -47,14 +47,15 @@ function NoteListInner({ entries, selection, selectedNote, noteListFilter, onNot
   const { modifiedPathSet, modifiedSuffixes, resolvedGetNoteStatus } = useModifiedFilesState(modifiedFiles, getNoteStatus)
 
   const isSectionGroup = selection.kind === 'sectionGroup'
+  const isFolderView = selection.kind === 'folder'
   const isInboxView = selection.kind === 'filter' && selection.filter === 'inbox'
   const isAllNotesView = selection.kind === 'filter' && selection.filter === 'all'
-  const showFilterPills = isSectionGroup || isAllNotesView
+  const showFilterPills = isSectionGroup || isFolderView || isAllNotesView
   const subFilter = showFilterPills ? noteListFilter : undefined
 
   const filterCounts = useMemo(
-    () => isSectionGroup ? countByFilter(entries, selection.type) : isAllNotesView ? countAllByFilter(entries) : { open: 0, archived: 0, trashed: 0 },
-    [entries, isSectionGroup, isAllNotesView, selection],
+    () => isSectionGroup ? countByFilter(entries, selection.type) : (isAllNotesView || isFolderView) ? countAllByFilter(entries) : { open: 0, archived: 0, trashed: 0 },
+    [entries, isSectionGroup, isAllNotesView, isFolderView, selection],
   )
 
   const inboxCounts = useMemo(
@@ -102,9 +103,7 @@ function NoteListInner({ entries, selection, selectedNote, noteListFilter, onNot
   return (
     <div className="flex flex-col select-none overflow-hidden border-r border-border bg-card text-foreground" style={{ height: '100%' }}>
       <NoteListHeader title={title} typeDocument={typeDocument} isEntityView={isEntityView} isTrashView={isTrashView} trashCount={searched.length} listSort={listSort} listDirection={listDirection} customProperties={customProperties} sidebarCollapsed={sidebarCollapsed} searchVisible={searchVisible} search={search} onSortChange={handleSortChange} onCreateNote={onCreateNote} onOpenType={onReplaceActiveTab} onToggleSearch={toggleSearch} onSearchChange={setSearch} onEmptyTrash={onEmptyTrash} />
-      {showFilterPills && <FilterPills active={noteListFilter} counts={filterCounts} onChange={onNoteListFilterChange} />}
-      {isInboxView && onInboxPeriodChange && <InboxFilterPills active={inboxPeriod} counts={inboxCounts} onChange={onInboxPeriodChange} />}
-      <div className="flex flex-1 flex-col overflow-hidden outline-none" style={{ minHeight: 0 }} tabIndex={0} onKeyDown={noteListKeyboard.handleKeyDown} onFocus={noteListKeyboard.handleFocus} data-testid="note-list-container">
+      <div className="relative flex flex-1 flex-col overflow-hidden outline-none" style={{ minHeight: 0 }} tabIndex={0} onKeyDown={noteListKeyboard.handleKeyDown} onFocus={noteListKeyboard.handleFocus} data-testid="note-list-container">
         <div className="flex-1 overflow-hidden" style={{ minHeight: 0 }}>
           {entitySelection ? (
             <EntityView entity={entitySelection.entry} groups={searchedGroups} query={query} collapsedGroups={collapsedGroups} sortPrefs={sortPrefs} onToggleGroup={toggleGroup} onSortChange={handleSortChange} renderItem={renderItem} typeEntryMap={typeEntryMap} onClickNote={handleClickNote} />
@@ -113,6 +112,8 @@ function NoteListInner({ entries, selection, selectedNote, noteListFilter, onNot
           )}
         </div>
         {isChangesView && deletedCount > 0 && <DeletedNotesBanner count={deletedCount} />}
+        {showFilterPills && <FilterPills active={noteListFilter} counts={filterCounts} onChange={onNoteListFilterChange} position="bottom" />}
+        {isInboxView && onInboxPeriodChange && <InboxFilterPills active={inboxPeriod} counts={inboxCounts} onChange={onInboxPeriodChange} position="bottom" />}
       </div>
       {multiSelect.isMultiSelecting && (
         <BulkActionBar count={multiSelect.selectedPaths.size} isTrashView={isTrashView} isArchivedView={isArchivedView} onArchive={handleBulkArchive} onTrash={handleBulkTrash} onRestore={handleBulkRestore} onDeletePermanently={handleBulkDeletePermanently} onUnarchive={handleBulkUnarchive} onClear={multiSelect.clear} />

src/components/PropertyValueCells.tsx

@@ -5,7 +5,7 @@ import { EditableValue, TagPillList, UrlValue } from './EditableValue'
 import { isUrlValue } from '../utils/url'
 import { Calendar } from '@/components/ui/calendar'
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
-import { CalendarIcon, XIcon } from 'lucide-react'
+import { XIcon } from 'lucide-react'
 import { isValidCssColor } from '../utils/colorUtils'
 import {
   type PropertyDisplayMode,
@@ -14,7 +14,8 @@ import {
   DISPLAY_MODE_OPTIONS,
   DISPLAY_MODE_ICONS,
 } from '../utils/propertyTypes'
-import { StatusPill, StatusDropdown } from './StatusDropdown'
+import { StatusDropdown } from './StatusDropdown'
+import { getStatusStyle } from '../utils/statusStyles'
 import { TagsDropdown } from './TagsDropdown'
 import { getTagStyle } from '../utils/tagStyles'
 import { ColorEditableValue } from './ColorInput'
@@ -37,14 +38,17 @@ function StatusValue({ propKey, value, isEditing, vaultStatuses, onSave, onStart
   onSave: (key: string, value: string) => void; onStartEdit: (key: string | null) => void
 }) {
   const statusStr = String(value)
+  const style = getStatusStyle(statusStr)
   return (
     <span className="relative inline-flex min-w-0 items-center">
       <span
-        className="cursor-pointer transition-opacity hover:opacity-80"
+        className="inline-flex h-6 cursor-pointer items-center gap-1.5 rounded-md px-2 text-[12px] font-medium transition-opacity hover:opacity-80"
+        style={{ backgroundColor: style.bg, color: style.color }}
         onClick={() => onStartEdit(propKey)}
         data-testid="status-badge"
       >
-        <StatusPill status={statusStr} />
+        <span className="inline-block size-1.5 shrink-0 rounded-full" style={{ backgroundColor: style.color }} />
+        {statusStr}
       </span>
       {isEditing && (
         <StatusDropdown
@@ -79,18 +83,15 @@ function TagsValue({ propKey, value, isEditing, vaultTags, onSave, onStartEdit }
         return (
           <span
             key={tag}
-            className="group/tag relative inline-flex items-center overflow-hidden rounded-full"
-            style={{ backgroundColor: style.bg, padding: '1px 6px', maxWidth: 120 }}
+            className="group/tag relative inline-flex h-6 items-center overflow-hidden rounded-md"
+            style={{ backgroundColor: style.bg, padding: '0 8px', maxWidth: 120 }}
           >
             <span
               className="transition-[max-width] duration-150 group-hover/tag:[mask-image:linear-gradient(to_right,black_60%,transparent_100%)]"
               style={{
                 color: style.color,
-                fontFamily: "'IBM Plex Mono', monospace",
-                fontSize: 10,
-                fontWeight: 600,
-                letterSpacing: '0',
-                textTransform: 'uppercase' as const,
+                fontSize: 12,
+                fontWeight: 500,
                 overflow: 'hidden',
                 whiteSpace: 'nowrap' as const,
               }}
@@ -99,7 +100,7 @@ function TagsValue({ propKey, value, isEditing, vaultTags, onSave, onStartEdit }
             </span>
             <button
               className="ml-0.5 max-w-0 overflow-hidden border-none bg-transparent p-0 leading-none opacity-0 transition-all duration-150 group-hover/tag:max-w-[14px] group-hover/tag:opacity-100"
-              style={{ color: style.color, fontSize: 10, flexShrink: 0 }}
+              style={{ color: style.color, fontSize: 11, flexShrink: 0 }}
               onClick={() => handleRemove(tag)}
               title={`Remove ${tag}`}
             >
@@ -109,7 +110,8 @@ function TagsValue({ propKey, value, isEditing, vaultTags, onSave, onStartEdit }
         )
       })}
       <button
-        className="inline-flex size-5 shrink-0 items-center justify-center rounded-full border border-dashed border-muted-foreground bg-transparent text-[10px] text-muted-foreground transition-colors hover:border-foreground hover:text-foreground"
+        className="inline-flex h-6 shrink-0 items-center justify-center rounded-md border-none bg-muted text-[12px] font-medium text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
+        style={{ padding: '0 8px' }}
         onClick={() => onStartEdit(propKey)}
         title="Add tag"
         data-testid="tags-add-button"
@@ -128,13 +130,15 @@ function TagsValue({ propKey, value, isEditing, vaultTags, onSave, onStartEdit }
 
 function BooleanToggle({ value, onToggle }: { value: boolean; onToggle: () => void }) {
   return (
-    <button
-      className="rounded border border-border bg-transparent px-2 py-0.5 text-xs text-secondary-foreground transition-colors hover:bg-muted"
-      onClick={onToggle}
-      data-testid="boolean-toggle"
-    >
-      {value ? '\u2713 Yes' : '\u2717 No'}
-    </button>
+    <label className="inline-flex h-6 cursor-pointer items-center gap-1.5" data-testid="boolean-toggle">
+      <input
+        type="checkbox"
+        checked={value}
+        onChange={onToggle}
+        className="size-3.5 cursor-pointer accent-primary"
+      />
+      <span className="text-[12px] text-secondary-foreground">{value ? 'Yes' : 'No'}</span>
+    </label>
   )
 }
 
@@ -160,11 +164,10 @@ function DateValue({ value, onSave }: {
     <Popover open={open} onOpenChange={setOpen}>
       <PopoverTrigger asChild>
         <button
-          className="inline-flex min-w-0 cursor-pointer items-center gap-1 rounded border-none bg-transparent px-1 py-0.5 text-right text-[12px] text-secondary-foreground transition-colors hover:bg-muted"
+          className={`inline-flex h-6 min-w-0 cursor-pointer items-center gap-1 border-none px-2 text-right text-[12px] font-medium transition-colors hover:opacity-80${formatted ? ' rounded-md bg-muted text-accent-foreground' : ' bg-transparent text-muted-foreground'}`}
           title={value}
           data-testid="date-display"
         >
-          <CalendarIcon className="size-3 shrink-0 text-muted-foreground" />
           <span className={`min-w-0 truncate${!formatted ? ' text-muted-foreground' : ''}`}>{formatted || 'Pick a date\u2026'}</span>
         </button>
       </PopoverTrigger>

src/components/PulseView.tsx

@@ -167,7 +167,7 @@ function DayGroup({ label, commits, onOpenNote }: {
         onClick={() => setCollapsed((v) => !v)}
       >
         <Chevron size={12} className="text-muted-foreground" />
-        <span className="text-[11px] font-semibold uppercase tracking-wider text-muted-foreground">
+        <span className="text-[11px] font-medium text-muted-foreground">
           {label}
         </span>
         <span className="text-[11px] text-muted-foreground">

src/components/RenameDetectedBanner.test.tsx

@@ -0,0 +1,41 @@
+import { render, screen, fireEvent } from '@testing-library/react'
+import { describe, it, expect, vi } from 'vitest'
+import { RenameDetectedBanner } from './RenameDetectedBanner'
+
+describe('RenameDetectedBanner', () => {
+  const renames = [
+    { old_path: 'old-note.md', new_path: 'new-note.md' },
+    { old_path: 'folder/draft.md', new_path: 'folder/published.md' },
+  ]
+
+  it('renders nothing when renames is empty', () => {
+    const { container } = render(
+      <RenameDetectedBanner renames={[]} onUpdate={vi.fn()} onDismiss={vi.fn()} />
+    )
+    expect(container.firstChild).toBeNull()
+  })
+
+  it('shows banner with rename count', () => {
+    render(<RenameDetectedBanner renames={renames} onUpdate={vi.fn()} onDismiss={vi.fn()} />)
+    expect(screen.getByText(/2 files? renamed/i)).toBeInTheDocument()
+  })
+
+  it('shows Update wikilinks button', () => {
+    render(<RenameDetectedBanner renames={renames} onUpdate={vi.fn()} onDismiss={vi.fn()} />)
+    expect(screen.getByText('Update wikilinks')).toBeInTheDocument()
+  })
+
+  it('calls onUpdate when Update button clicked', () => {
+    const onUpdate = vi.fn()
+    render(<RenameDetectedBanner renames={renames} onUpdate={onUpdate} onDismiss={vi.fn()} />)
+    fireEvent.click(screen.getByText('Update wikilinks'))
+    expect(onUpdate).toHaveBeenCalledOnce()
+  })
+
+  it('calls onDismiss when Ignore button clicked', () => {
+    const onDismiss = vi.fn()
+    render(<RenameDetectedBanner renames={renames} onUpdate={vi.fn()} onDismiss={onDismiss} />)
+    fireEvent.click(screen.getByText('Ignore'))
+    expect(onDismiss).toHaveBeenCalledOnce()
+  })
+})

src/components/RenameDetectedBanner.tsx

@@ -0,0 +1,38 @@
+import { ArrowsClockwise } from '@phosphor-icons/react'
+
+export interface DetectedRename {
+  old_path: string
+  new_path: string
+}
+
+interface RenameDetectedBannerProps {
+  renames: DetectedRename[]
+  onUpdate: () => void
+  onDismiss: () => void
+}
+
+export function RenameDetectedBanner({ renames, onUpdate, onDismiss }: RenameDetectedBannerProps) {
+  if (renames.length === 0) return null
+
+  const count = renames.length
+  return (
+    <div className="flex items-center gap-3 border-b border-border bg-accent/50 px-4 py-2 text-[13px]">
+      <ArrowsClockwise size={16} className="shrink-0 text-accent-foreground" />
+      <span className="flex-1 text-foreground">
+        {count} file{count !== 1 ? 's' : ''} renamed outside Laputa. Update wikilinks?
+      </span>
+      <button
+        className="shrink-0 cursor-pointer rounded-md bg-primary px-3 py-1 text-[12px] font-medium text-primary-foreground transition-colors hover:bg-primary/90"
+        onClick={onUpdate}
+      >
+        Update wikilinks
+      </button>
+      <button
+        className="shrink-0 cursor-pointer rounded-md border border-border bg-transparent px-3 py-1 text-[12px] font-medium text-muted-foreground transition-colors hover:bg-muted"
+        onClick={onDismiss}
+      >
+        Ignore
+      </button>
+    </div>
+  )
+}

src/components/ResizeHandle.tsx

@@ -67,7 +67,7 @@ export function ResizeHandle({ onResize }: ResizeHandleProps) {
 
   return (
     <div
-      className="-ml-1 w-1 shrink-0 cursor-col-resize bg-transparent transition-colors hover:bg-[var(--border)]"
+      className="relative z-10 -ml-1 w-1 shrink-0 self-stretch cursor-col-resize bg-transparent transition-colors hover:bg-[var(--border)]"
       onMouseDown={handleMouseDown}
     />
   )

src/components/SearchPanel.test.tsx

@@ -189,7 +189,7 @@ describe('SearchPanel', () => {
       expect(screen.getByText('Result One')).toBeInTheDocument()
     })
 
-    fireEvent.keyDown(window, { key: 'ArrowDown' })
+    fireEvent.keyDown(input, { key: 'ArrowDown' })
 
     await waitFor(() => {
       const resultTwo = screen.getByText('Result Two').closest('[class*="cursor-pointer"]')!

src/components/SettingsPanel.test.tsx

@@ -18,7 +18,7 @@ vi.mock('../utils/url', () => ({
 }))
 
 const emptySettings: Settings = {
-  anthropic_key: null,
+
   openai_key: null,
   google_key: null,
   github_token: null,
@@ -32,7 +32,6 @@ const emptySettings: Settings = {
 }
 
 const populatedSettings: Settings = {
-  anthropic_key: 'sk-ant-api03-test123',
   openai_key: 'sk-openai-test456',
   google_key: null,
   github_token: null,
@@ -98,7 +97,7 @@ describe('SettingsPanel', () => {
     fireEvent.click(screen.getByTestId('settings-save'))
 
     expect(onSave).toHaveBeenCalledWith(expect.objectContaining({
-      anthropic_key: null,
+    
       openai_key: 'sk-openai-test',
       google_key: null,
       github_token: null,
@@ -119,7 +118,7 @@ describe('SettingsPanel', () => {
     fireEvent.click(screen.getByTestId('settings-save'))
 
     expect(onSave).toHaveBeenCalledWith(expect.objectContaining({
-      anthropic_key: null,
+    
       openai_key: null,
       google_key: null,
       github_token: null,
@@ -161,7 +160,7 @@ describe('SettingsPanel', () => {
     fireEvent.keyDown(screen.getByTestId('settings-panel'), { key: 'Enter', metaKey: true })
 
     expect(onSave).toHaveBeenCalledWith(expect.objectContaining({
-      anthropic_key: null,
+    
       openai_key: 'sk-openai-test',
       google_key: null,
       github_token: null,

src/components/SettingsPanel.tsx

@@ -139,7 +139,6 @@ function SettingsPanelInner({ settings, onSave, onClose }: Omit<SettingsPanelPro
   }, [])
 
   const buildSettings = useCallback((ghOverride?: { token: string | null; username: string | null }): Settings => ({
-    anthropic_key: null,
     openai_key: openaiKey.trim() || null,
     google_key: googleKey.trim() || null,
     github_token: ghOverride ? ghOverride.token : (githubToken ?? null),

src/components/Sidebar.test.tsx

@@ -389,63 +389,11 @@ describe('Sidebar', () => {
     expect(screen.queryByTitle('New Project')).not.toBeInTheDocument()
   })
 
-  it('renders commit button even when no modified files', () => {
-    render(<Sidebar entries={[]} selection={defaultSelection} onSelect={() => {}} onCommitPush={() => {}} />)
-    expect(screen.getByText('Commit & Push')).toBeInTheDocument()
-  })
-
-  it('shows badge on commit button when modified files exist', () => {
-    render(<Sidebar entries={[]} selection={defaultSelection} onSelect={() => {}} modifiedCount={3} onCommitPush={() => {}} />)
-    expect(screen.getByText('Commit & Push')).toBeInTheDocument()
-    const badges = screen.getAllByText('3')
-    expect(badges.length).toBeGreaterThanOrEqual(1)
-  })
-
-  it('shows Changes nav item when modifiedCount > 0', () => {
-    render(<Sidebar entries={[]} selection={defaultSelection} onSelect={() => {}} modifiedCount={5} />)
-    expect(screen.getByText('Changes')).toBeInTheDocument()
-  })
-
-  it('hides Changes nav item when modifiedCount is 0', () => {
-    render(<Sidebar entries={[]} selection={defaultSelection} onSelect={() => {}} modifiedCount={0} />)
+  it('does not render Changes or Pulse in sidebar', () => {
+    render(<Sidebar entries={[]} selection={defaultSelection} onSelect={() => {}} />)
     expect(screen.queryByText('Changes')).not.toBeInTheDocument()
-  })
-
-  it('calls onSelect with changes filter when clicking Changes', () => {
-    const onSelect = vi.fn()
-    render(<Sidebar entries={[]} selection={defaultSelection} onSelect={onSelect} modifiedCount={3} />)
-    fireEvent.click(screen.getByText('Changes'))
-    expect(onSelect).toHaveBeenCalledWith({ kind: 'filter', filter: 'changes' })
-  })
-
-  describe('Changes and Pulse in secondary bottom area', () => {
-    it('renders Changes outside the main top nav section', () => {
-      render(<Sidebar entries={[]} selection={defaultSelection} onSelect={() => {}} modifiedCount={3} isGitVault />)
-      const changesEl = screen.getByText('Changes')
-      // Changes should be inside the secondary bottom area, not the top nav
-      const secondaryArea = changesEl.closest('[data-testid="sidebar-secondary"]')
-      expect(secondaryArea).not.toBeNull()
-    })
-
-    it('renders Pulse outside the main top nav section', () => {
-      render(<Sidebar entries={[]} selection={defaultSelection} onSelect={() => {}} isGitVault />)
-      const pulseEl = screen.getByText('Pulse')
-      const secondaryArea = pulseEl.closest('[data-testid="sidebar-secondary"]')
-      expect(secondaryArea).not.toBeNull()
-    })
-
-    it('does not render Changes or Pulse inside the top nav section', () => {
-      render(<Sidebar entries={[]} selection={defaultSelection} onSelect={() => {}} modifiedCount={3} isGitVault />)
-      const topNav = screen.getByTestId('sidebar-top-nav')
-      expect(topNav.textContent).not.toContain('Changes')
-      expect(topNav.textContent).not.toContain('Pulse')
-    })
-
-    it('shows Changes badge count in secondary area', () => {
-      render(<Sidebar entries={[]} selection={defaultSelection} onSelect={() => {}} modifiedCount={7} isGitVault />)
-      const secondaryArea = screen.getByTestId('sidebar-secondary')
-      expect(secondaryArea.textContent).toContain('7')
-    })
+    expect(screen.queryByText('Pulse')).not.toBeInTheDocument()
+    expect(screen.queryByText('Commit & Push')).not.toBeInTheDocument()
   })
 
   describe('dynamic custom type sections', () => {

src/components/Sidebar.tsx

@@ -1,5 +1,5 @@
 import { useState, useMemo, useRef, useEffect, useCallback, memo } from 'react'
-import type { VaultEntry, SidebarSelection } from '../types'
+import type { VaultEntry, FolderNode, SidebarSelection } from '../types'
 import { buildTypeEntryMap } from '../utils/typeColors'
 import { buildDynamicSections, sortSections } from '../utils/sidebarSections'
 import { TypeCustomizePopover } from './TypeCustomizePopover'
@@ -12,14 +12,15 @@ import {
 } from '@dnd-kit/sortable'
 import { CSS } from '@dnd-kit/utilities'
 import {
-  FileText, Trash, Archive, CaretLeft, GitDiff, Pulse, Tray,
+  FileText, Trash, Archive, CaretLeft, Tray,
 } from '@phosphor-icons/react'
-import { GitCommitHorizontal, SlidersHorizontal } from 'lucide-react'
+import { SlidersHorizontal } from 'lucide-react'
 import {
   type SectionGroup, isSelectionActive,
   NavItem, SectionContent, type SectionContentProps, VisibilityPopover,
 } from './SidebarParts'
 import { useDragRegion } from '../hooks/useDragRegion'
+import { FolderTree } from './FolderTree'
 
 interface SidebarProps {
   entries: VaultEntry[]
@@ -33,11 +34,9 @@ interface SidebarProps {
   onReorderSections?: (orderedTypes: { typeName: string; order: number }[]) => void
   onRenameSection?: (typeName: string, label: string) => void
   onToggleTypeVisibility?: (typeName: string) => void
-  modifiedCount?: number
+  folders?: FolderNode[]
   inboxCount?: number
-  onCommitPush?: () => void
   onCollapse?: () => void
-  isGitVault?: boolean
 }
 
 // --- Hooks ---
@@ -123,7 +122,7 @@ function SortableSection({ group, sectionProps }: {
   const isRenaming = sectionProps.renamingType === group.type
 
   return (
-    <div ref={setNodeRef} style={{ transform: CSS.Transform.toString(transform), transition, opacity: isDragging ? 0.5 : 1, padding: '4px 6px' }} {...attributes}>
+    <div ref={setNodeRef} style={{ transform: CSS.Transform.toString(transform), transition, opacity: isDragging ? 0.5 : 1, padding: isCollapsed ? '0 6px' : '4px 6px' }} {...attributes}>
       <SectionContent
         group={group} items={items} isCollapsed={isCollapsed}
         selection={sectionProps.selection} onSelect={sectionProps.onSelect}
@@ -140,21 +139,6 @@ function SortableSection({ group, sectionProps }: {
   )
 }
 
-function CommitButton({ modifiedCount, onClick }: { modifiedCount: number; onClick?: () => void }) {
-  if (!onClick) return null
-  return (
-    <div className="shrink-0 border-t border-border" style={{ padding: 12 }}>
-      <button className="flex w-full items-center justify-center bg-primary text-primary-foreground hover:bg-primary/90 transition-colors" style={{ borderRadius: 6, gap: 6, padding: '8px 16px', border: 'none', cursor: 'pointer' }} onClick={onClick}>
-        <GitCommitHorizontal size={14} />
-        <span className="text-[13px] font-medium">Commit & Push</span>
-        {modifiedCount > 0 && (
-          <span className="text-white font-semibold" style={{ background: '#ffffff40', borderRadius: 9, padding: '0 6px', fontSize: 10 }}>{modifiedCount}</span>
-        )}
-      </button>
-    </div>
-  )
-}
-
 function SidebarTitleBar({ onCollapse }: { onCollapse?: () => void }) {
   const { onMouseDown } = useDragRegion()
   return (
@@ -223,7 +207,7 @@ export const Sidebar = memo(function Sidebar({
   entries, selection, onSelect, onSelectNote, onCreateType, onCreateNewType,
   onCustomizeType, onUpdateTypeTemplate, onReorderSections, onRenameSection,
   onToggleTypeVisibility,
-  modifiedCount = 0, inboxCount = 0, onCommitPush, onCollapse, isGitVault = false,
+  folders = [], inboxCount = 0, onCollapse,
 }: SidebarProps) {
   const [collapsed, setCollapsed] = useState<Record<string, boolean>>({})
   const [customizeTarget, setCustomizeTarget] = useState<string | null>(null)
@@ -306,16 +290,16 @@ export const Sidebar = memo(function Sidebar({
       <nav className="flex-1 overflow-y-auto">
         {/* Top nav */}
         <div className="border-b border-border" data-testid="sidebar-top-nav" style={{ padding: '4px 6px' }}>
-          <NavItem icon={Tray} label="Inbox" count={inboxCount} isActive={isSelectionActive(selection, { kind: 'filter', filter: 'inbox' })} badgeClassName="text-muted-foreground" badgeStyle={{ background: 'var(--muted)' }} onClick={() => onSelect({ kind: 'filter', filter: 'inbox' })} />
-          <NavItem icon={FileText} label="All Notes" count={activeCount} isActive={isSelectionActive(selection, { kind: 'filter', filter: 'all' })} badgeClassName="bg-primary text-primary-foreground" onClick={() => onSelect({ kind: 'filter', filter: 'all' })} />
-          <NavItem icon={Archive} label="Archive" count={archivedCount} isActive={isSelectionActive(selection, { kind: 'filter', filter: 'archived' })} badgeClassName="text-muted-foreground" badgeStyle={{ background: 'var(--muted)' }} onClick={() => onSelect({ kind: 'filter', filter: 'archived' })} />
-          <NavItem icon={Trash} label="Trash" count={trashedCount} isActive={isSelectionActive(selection, { kind: 'filter', filter: 'trash' })} activeClassName="bg-destructive/10 text-destructive" badgeClassName="text-muted-foreground" badgeStyle={{ background: 'var(--muted)' }} onClick={() => onSelect({ kind: 'filter', filter: 'trash' })} />
+          <NavItem icon={Tray} label="Inbox" count={inboxCount} isActive={isSelectionActive(selection, { kind: 'filter', filter: 'inbox' })} badgeClassName="text-muted-foreground" badgeStyle={{ background: 'var(--muted)' }} activeBadgeClassName="bg-primary text-primary-foreground" onClick={() => onSelect({ kind: 'filter', filter: 'inbox' })} />
+          <NavItem icon={FileText} label="All Notes" count={activeCount} isActive={isSelectionActive(selection, { kind: 'filter', filter: 'all' })} badgeClassName="text-muted-foreground" badgeStyle={{ background: 'var(--muted)' }} activeBadgeClassName="bg-primary text-primary-foreground" onClick={() => onSelect({ kind: 'filter', filter: 'all' })} />
+          <NavItem icon={Archive} label="Archive" count={archivedCount} isActive={isSelectionActive(selection, { kind: 'filter', filter: 'archived' })} badgeClassName="text-muted-foreground" badgeStyle={{ background: 'var(--muted)' }} activeBadgeClassName="bg-primary text-primary-foreground" onClick={() => onSelect({ kind: 'filter', filter: 'archived' })} />
+          <NavItem icon={Trash} label="Trash" count={trashedCount} isActive={isSelectionActive(selection, { kind: 'filter', filter: 'trash' })} activeClassName="bg-destructive/10 text-destructive" badgeClassName="text-muted-foreground" badgeStyle={{ background: 'var(--muted)' }} activeBadgeClassName="bg-destructive text-destructive-foreground" onClick={() => onSelect({ kind: 'filter', filter: 'trash' })} />
         </div>
 
         {/* Sections header + visibility popover */}
         <div ref={customizeRef} style={{ position: 'relative', padding: '4px 6px 0' }}>
           <div className="flex w-full select-none items-center justify-between" style={{ padding: '4px 16px' }}>
-            <span className="text-[11px] font-semibold uppercase tracking-wider text-muted-foreground">Sections</span>
+            <span className="text-[11px] font-medium text-muted-foreground">Sections</span>
             <button className="flex shrink-0 cursor-pointer items-center justify-center rounded border-none bg-transparent p-0 text-muted-foreground transition-colors hover:text-foreground" style={{ width: 20, height: 20 }} onClick={() => setShowCustomize((v) => !v)} aria-label="Customize sections" title="Customize sections">
               <SlidersHorizontal size={14} />
             </button>
@@ -331,16 +315,11 @@ export const Sidebar = memo(function Sidebar({
             ))}
           </SortableContext>
         </DndContext>
+
+        {/* Folder tree */}
+        <FolderTree folders={folders} selection={selection} onSelect={onSelect} />
       </nav>
 
-      {/* Secondary area: Changes + Pulse */}
-      <div className="shrink-0 border-t border-border" data-testid="sidebar-secondary" style={{ padding: '4px 6px' }}>
-        {modifiedCount > 0 && (
-          <NavItem icon={GitDiff} label="Changes" count={modifiedCount} isActive={isSelectionActive(selection, { kind: 'filter', filter: 'changes' })} activeClassName="bg-[color:var(--accent-orange)]/10 text-[var(--accent-orange)]" badgeClassName="text-white" badgeStyle={{ background: 'var(--accent-orange)' }} onClick={() => onSelect({ kind: 'filter', filter: 'changes' })} compact />
-        )}
-        <NavItem icon={Pulse} label="Pulse" isActive={isSelectionActive(selection, { kind: 'filter', filter: 'pulse' })} disabled={!isGitVault} disabledTooltip="Pulse is only available for git-enabled vaults" onClick={isGitVault ? () => onSelect({ kind: 'filter', filter: 'pulse' }) : undefined} compact />
-      </div>
-      <CommitButton modifiedCount={modifiedCount} onClick={onCommitPush} />
       <ContextMenuOverlay pos={contextMenuPos} type={contextMenuType} innerRef={contextMenuRef} onOpenCustomize={(type) => { closeContextMenu(); setCustomizeTarget(type) }} onStartRename={handleStartRename} />
       <CustomizeOverlay target={customizeTarget} typeEntryMap={typeEntryMap} innerRef={popoverRef} onCustomize={handleCustomize} onChangeTemplate={handleChangeTemplate} onClose={closeCustomizeTarget} />
     </aside>

src/components/SidebarParts.tsx

@@ -19,6 +19,7 @@ export function isSelectionActive(current: SidebarSelection, check: SidebarSelec
   switch (check.kind) {
     case 'filter': return (current as typeof check).filter === check.filter
     case 'sectionGroup': return (current as typeof check).type === check.type
+    case 'folder': return (current as typeof check).path === check.path
     case 'entity': return (current as typeof check).entry.path === check.entry.path
     default: return false
   }
@@ -26,7 +27,7 @@ export function isSelectionActive(current: SidebarSelection, check: SidebarSelec
 
 // --- NavItem ---
 
-export function NavItem({ icon: Icon, label, count, isActive, activeClassName = 'bg-primary/10 text-primary', badgeClassName, badgeStyle, onClick, disabled, disabledTooltip, compact }: {
+export function NavItem({ icon: Icon, label, count, isActive, activeClassName = 'bg-primary/10 text-primary', badgeClassName, badgeStyle, activeBadgeClassName, activeBadgeStyle, onClick, disabled, disabledTooltip, compact }: {
   icon: ComponentType<IconProps>
   label: string
   count?: number
@@ -34,6 +35,8 @@ export function NavItem({ icon: Icon, label, count, isActive, activeClassName =
   activeClassName?: string
   badgeClassName?: string
   badgeStyle?: React.CSSProperties
+  activeBadgeClassName?: string
+  activeBadgeStyle?: React.CSSProperties
   onClick?: () => void
   disabled?: boolean
   disabledTooltip?: string
@@ -42,6 +45,8 @@ export function NavItem({ icon: Icon, label, count, isActive, activeClassName =
   const iconSize = compact ? 14 : 16
   const textClass = compact ? 'text-[12px]' : 'text-[13px]'
   const padding = compact ? '4px 16px' : '6px 16px'
+  const resolvedBadgeClass = isActive && activeBadgeClassName ? activeBadgeClassName : badgeClassName
+  const resolvedBadgeStyle = isActive && activeBadgeStyle ? activeBadgeStyle : badgeStyle
 
   if (disabled) {
     return (
@@ -57,10 +62,10 @@ export function NavItem({ icon: Icon, label, count, isActive, activeClassName =
       style={{ padding, borderRadius: 4 }}
       onClick={onClick}
     >
-      <Icon size={iconSize} />
+      <Icon size={iconSize} weight={isActive ? 'fill' : 'regular'} />
       <span className={cn("flex-1 font-medium", textClass)}>{label}</span>
       {count !== undefined && count > 0 && (
-        <span className={cn("flex items-center justify-center", badgeClassName)} style={{ height: compact ? 18 : 20, borderRadius: 9999, padding: '0 6px', fontSize: 10, ...badgeStyle }}>
+        <span className={cn("flex items-center justify-center", resolvedBadgeClass)} style={{ height: compact ? 18 : 20, borderRadius: 9999, padding: '0 6px', fontSize: 10, ...resolvedBadgeStyle }}>
           {count}
         </span>
       )}

src/components/StatusBar.test.tsx

@@ -182,18 +182,19 @@ describe('StatusBar', () => {
     expect(screen.getByText('Connect GitHub repo')).toBeInTheDocument()
   })
 
-  it('shows modified count when modifiedCount is > 0', () => {
+  it('shows Changes badge with count when modifiedCount is > 0', () => {
     render(<StatusBar noteCount={100} modifiedCount={3} vaultPath="/Users/luca/Laputa" vaults={vaults} onSwitchVault={vi.fn()} />)
     expect(screen.getByTestId('status-modified-count')).toBeInTheDocument()
-    expect(screen.getByText('3 pending')).toBeInTheDocument()
+    expect(screen.getByText('Changes')).toBeInTheDocument()
+    expect(screen.getByText('3')).toBeInTheDocument()
   })
 
-  it('does not show modified count when modifiedCount is 0', () => {
+  it('does not show Changes badge when modifiedCount is 0', () => {
     render(<StatusBar noteCount={100} modifiedCount={0} vaultPath="/Users/luca/Laputa" vaults={vaults} onSwitchVault={vi.fn()} />)
     expect(screen.queryByTestId('status-modified-count')).not.toBeInTheDocument()
   })
 
-  it('does not show modified count when modifiedCount is not provided', () => {
+  it('does not show Changes badge when modifiedCount is not provided', () => {
     render(<StatusBar noteCount={100} vaultPath="/Users/luca/Laputa" vaults={vaults} onSwitchVault={vi.fn()} />)
     expect(screen.queryByTestId('status-modified-count')).not.toBeInTheDocument()
   })
@@ -313,4 +314,37 @@ describe('StatusBar', () => {
     expect(screen.getByText(/1 behind/)).toBeInTheDocument()
   })
 
+  it('shows Pulse badge in status bar', () => {
+    render(<StatusBar noteCount={100} vaultPath="/Users/luca/Laputa" vaults={vaults} onSwitchVault={vi.fn()} isGitVault />)
+    expect(screen.getByTestId('status-pulse')).toBeInTheDocument()
+    expect(screen.getByText('Pulse')).toBeInTheDocument()
+  })
+
+  it('calls onClickPulse when clicking Pulse badge', () => {
+    const onClickPulse = vi.fn()
+    render(<StatusBar noteCount={100} vaultPath="/Users/luca/Laputa" vaults={vaults} onSwitchVault={vi.fn()} isGitVault onClickPulse={onClickPulse} />)
+    fireEvent.click(screen.getByTestId('status-pulse'))
+    expect(onClickPulse).toHaveBeenCalledOnce()
+  })
+
+  it('disables Pulse badge when isGitVault is false', () => {
+    const onClickPulse = vi.fn()
+    render(<StatusBar noteCount={100} vaultPath="/Users/luca/Laputa" vaults={vaults} onSwitchVault={vi.fn()} isGitVault={false} onClickPulse={onClickPulse} />)
+    fireEvent.click(screen.getByTestId('status-pulse'))
+    expect(onClickPulse).not.toHaveBeenCalled()
+  })
+
+  it('shows Commit & Push button next to Changes badge', () => {
+    const onCommitPush = vi.fn()
+    render(<StatusBar noteCount={100} modifiedCount={5} vaultPath="/Users/luca/Laputa" vaults={vaults} onSwitchVault={vi.fn()} onCommitPush={onCommitPush} />)
+    expect(screen.getByTestId('status-commit-push')).toBeInTheDocument()
+    fireEvent.click(screen.getByTestId('status-commit-push'))
+    expect(onCommitPush).toHaveBeenCalledOnce()
+  })
+
+  it('hides Commit & Push button when no modified files', () => {
+    render(<StatusBar noteCount={100} modifiedCount={0} vaultPath="/Users/luca/Laputa" vaults={vaults} onSwitchVault={vi.fn()} onCommitPush={vi.fn()} />)
+    expect(screen.queryByTestId('status-commit-push')).not.toBeInTheDocument()
+  })
+
 })

src/components/StatusBar.tsx

@@ -1,5 +1,6 @@
 import { useState, useRef, useEffect } from 'react'
-import { Package, RefreshCw, FileText, Bell, Settings, FolderOpen, Check, Github, CircleDot, AlertTriangle, Loader2, GitCommitHorizontal, X, Cpu, ArrowDown, GitBranch } from 'lucide-react'
+import { Package, RefreshCw, FileText, Bell, Settings, FolderOpen, Check, Github, AlertTriangle, Loader2, GitCommitHorizontal, X, Cpu, ArrowDown, GitBranch } from 'lucide-react'
+import { GitDiff, Pulse } from '@phosphor-icons/react'
 import type { GitRemoteStatus, LastCommitInfo, SyncStatus } from '../types'
 import type { McpStatus } from '../hooks/useMcpStatus'
 import { openExternalUrl } from '../utils/url'
@@ -20,6 +21,9 @@ interface StatusBarProps {
   onOpenLocalFolder?: () => void
   onConnectGitHub?: () => void
   onClickPending?: () => void
+  onClickPulse?: () => void
+  onCommitPush?: () => void
+  isGitVault?: boolean
   hasGitHub?: boolean
   syncStatus?: SyncStatus
   lastSyncTime?: number | null
@@ -328,7 +332,7 @@ function ConflictBadge({ count, onClick }: { count: number; onClick?: () => void
   )
 }
 
-function PendingBadge({ count, onClick }: { count: number; onClick?: () => void }) {
+function ChangesBadge({ count, onClick, onCommitPush }: { count: number; onClick?: () => void; onCommitPush?: () => void }) {
   if (count <= 0) return null
   return (
     <>
@@ -341,7 +345,50 @@ function PendingBadge({ count, onClick }: { count: number; onClick?: () => void
         onMouseEnter={e => { e.currentTarget.style.background = 'var(--hover)' }}
         onMouseLeave={e => { e.currentTarget.style.background = 'transparent' }}
         data-testid="status-modified-count"
-      ><CircleDot size={13} style={{ color: 'var(--accent-orange)' }} />{count} pending</span>
+      >
+        <GitDiff size={13} style={{ color: 'var(--accent-orange)' }} />
+        <span style={{ display: 'inline-flex', alignItems: 'center', justifyContent: 'center', background: 'var(--accent-orange)', color: '#fff', borderRadius: 9, padding: '0 5px', fontSize: 10, fontWeight: 600, minWidth: 16, lineHeight: '16px' }}>{count}</span>
+        Changes
+      </span>
+      {onCommitPush && (
+        <span
+          role="button"
+          onClick={onCommitPush}
+          style={{ ...ICON_STYLE, cursor: 'pointer', padding: '2px 4px', borderRadius: 3, background: 'transparent' }}
+          title="Commit & Push"
+          onMouseEnter={e => { e.currentTarget.style.background = 'var(--hover)' }}
+          onMouseLeave={e => { e.currentTarget.style.background = 'transparent' }}
+          data-testid="status-commit-push"
+        >
+          <GitCommitHorizontal size={13} style={{ color: 'var(--accent-orange)' }} />
+        </span>
+      )}
+    </>
+  )
+}
+
+function PulseBadge({ onClick, disabled }: { onClick?: () => void; disabled?: boolean }) {
+  return (
+    <>
+      <span style={SEP_STYLE}>|</span>
+      <span
+        role={disabled ? undefined : 'button'}
+        onClick={disabled ? undefined : onClick}
+        style={{
+          ...ICON_STYLE,
+          cursor: disabled ? 'not-allowed' : 'pointer',
+          padding: '2px 4px',
+          borderRadius: 3,
+          background: 'transparent',
+          opacity: disabled ? 0.4 : 1,
+        }}
+        title={disabled ? 'Pulse is only available for git-enabled vaults' : 'View pulse'}
+        onMouseEnter={disabled ? undefined : (e) => { e.currentTarget.style.background = 'var(--hover)' }}
+        onMouseLeave={disabled ? undefined : (e) => { e.currentTarget.style.background = 'transparent' }}
+        data-testid="status-pulse"
+      >
+        <Pulse size={13} />Pulse
+      </span>
     </>
   )
 }
@@ -381,7 +428,7 @@ function McpBadge({ status, onInstall }: { status: McpStatus; onInstall?: () =>
   )
 }
 
-export function StatusBar({ noteCount, modifiedCount = 0, vaultPath, vaults, onSwitchVault, onOpenSettings, onOpenLocalFolder, onConnectGitHub, onClickPending, hasGitHub, syncStatus = 'idle', lastSyncTime = null, conflictCount = 0, lastCommitInfo, remoteStatus, onTriggerSync, onPullAndPush, onOpenConflictResolver, zoomLevel = 100, onZoomReset, buildNumber, onCheckForUpdates, onRemoveVault, mcpStatus, onInstallMcp }: StatusBarProps) {
+export function StatusBar({ noteCount, modifiedCount = 0, vaultPath, vaults, onSwitchVault, onOpenSettings, onOpenLocalFolder, onConnectGitHub, onClickPending, onClickPulse, onCommitPush, isGitVault = false, hasGitHub, syncStatus = 'idle', lastSyncTime = null, conflictCount = 0, lastCommitInfo, remoteStatus, onTriggerSync, onPullAndPush, onOpenConflictResolver, zoomLevel = 100, onZoomReset, buildNumber, onCheckForUpdates, onRemoveVault, mcpStatus, onInstallMcp }: StatusBarProps) {
   const [, setTick] = useState(0)
   useEffect(() => {
     const id = setInterval(() => setTick((t) => t + 1), 30_000)
@@ -406,7 +453,8 @@ export function StatusBar({ noteCount, modifiedCount = 0, vaultPath, vaults, onS
         <SyncBadge status={syncStatus} lastSyncTime={lastSyncTime} remoteStatus={remoteStatus} onTriggerSync={onTriggerSync} onPullAndPush={onPullAndPush} onOpenConflictResolver={onOpenConflictResolver} />
         {lastCommitInfo && <CommitBadge info={lastCommitInfo} />}
         <ConflictBadge count={conflictCount} onClick={onOpenConflictResolver} />
-        <PendingBadge count={modifiedCount} onClick={onClickPending} />
+        <ChangesBadge count={modifiedCount} onClick={onClickPending} onCommitPush={onCommitPush} />
+        <PulseBadge onClick={onClickPulse} disabled={!isGitVault} />
         {mcpStatus && <McpBadge status={mcpStatus} onInstall={onInstallMcp} />}
       </div>
       <div style={{ display: 'flex', alignItems: 'center', gap: 12 }}>

src/components/StatusDropdown.tsx

@@ -13,11 +13,10 @@ export function StatusPill({ status, className }: { status: string; className?:
         color: style.color,
         borderRadius: 16,
         padding: '1px 6px',
-        fontFamily: "'IBM Plex Mono', monospace",
+        fontFamily: "'Inter', sans-serif",
         fontSize: 10,
         fontWeight: 600,
         letterSpacing: '0',
-        textTransform: 'uppercase' as const,
         maxWidth: 160,
       }}
       title={status}
@@ -98,11 +97,10 @@ function StatusOption({
 }
 
 const SECTION_LABEL_STYLE = {
-  fontFamily: "'IBM Plex Mono', monospace",
+  fontFamily: "'Inter', sans-serif",
   fontSize: 9,
   fontWeight: 500,
   letterSpacing: '0',
-  textTransform: 'uppercase' as const,
 }
 
 function SectionLabel({ children }: { children: string }) {

src/components/TagsDropdown.test.tsx

@@ -10,11 +10,11 @@ describe('TagPill', () => {
     expect(pill.textContent).toBe('React')
   })
 
-  it('renders with default style (blue)', () => {
+  it('renders with a hash-based accent color', () => {
     render(<TagPill tag="Unknown" />)
     const pill = screen.getByTitle('Unknown')
-    expect(pill.style.backgroundColor).toBe('var(--accent-blue-light)')
-    expect(pill.style.color).toBe('var(--accent-blue)')
+    expect(pill.style.backgroundColor).toMatch(/^var\(--accent-\w+-light\)$/)
+    expect(pill.style.color).toMatch(/^var\(--accent-\w+\)$/)
   })
 
   it('applies truncate for long names', () => {

src/components/TagsDropdown.tsx

@@ -13,11 +13,10 @@ export function TagPill({ tag, className }: { tag: string; className?: string })
         color: style.color,
         borderRadius: 16,
         padding: '1px 6px',
-        fontFamily: "'IBM Plex Mono', monospace",
+        fontFamily: "'Inter', sans-serif",
         fontSize: 10,
         fontWeight: 600,
-        letterSpacing: '1.2px',
-        textTransform: 'uppercase' as const,
+        letterSpacing: '0',
         maxWidth: 160,
       }}
       title={tag}
@@ -90,11 +89,10 @@ function TagOption({
 }
 
 const SECTION_LABEL_STYLE = {
-  fontFamily: "'IBM Plex Mono', monospace",
+  fontFamily: "'Inter', sans-serif",
   fontSize: 9,
   fontWeight: 500,
-  letterSpacing: '1.2px',
-  textTransform: 'uppercase' as const,
+  letterSpacing: '0',
 }
 
 function SectionLabel({ children }: { children: string }) {

src/components/TypeCustomizePopover.test.tsx

@@ -66,9 +66,9 @@ describe('TypeCustomizePopover', () => {
 
   it('renders color, icon, and template sections', () => {
     renderPopover()
-    expect(screen.getByText('COLOR')).toBeInTheDocument()
-    expect(screen.getByText('ICON')).toBeInTheDocument()
-    expect(screen.getByText('TEMPLATE')).toBeInTheDocument()
+    expect(screen.getByText('Color')).toBeInTheDocument()
+    expect(screen.getByText('Icon')).toBeInTheDocument()
+    expect(screen.getByText('Template')).toBeInTheDocument()
     expect(screen.getByText('Done')).toBeInTheDocument()
   })
 

src/components/TypeCustomizePopover.tsx

@@ -75,7 +75,7 @@ export function TypeCustomizePopover({
       onContextMenu={(e) => e.stopPropagation()}
     >
       {/* Color section */}
-      <div className="font-mono-overline mb-2 text-muted-foreground">COLOR</div>
+      <div className="font-mono-overline mb-2 text-muted-foreground">Color</div>
       <div className="flex gap-2 mb-3 flex-wrap">
         {ACCENT_COLORS.map((c) => (
           <button
@@ -92,7 +92,7 @@ export function TypeCustomizePopover({
       </div>
 
       {/* Icon section */}
-      <div className="font-mono-overline mb-2 text-muted-foreground">ICON</div>
+      <div className="font-mono-overline mb-2 text-muted-foreground">Icon</div>
 
       {/* Search input */}
       <div className="relative mb-2">
@@ -136,7 +136,7 @@ export function TypeCustomizePopover({
       </div>
 
       {/* Template section */}
-      <div className="font-mono-overline mb-2 mt-3 text-muted-foreground">TEMPLATE</div>
+      <div className="font-mono-overline mb-2 mt-3 text-muted-foreground">Template</div>
       <textarea
         value={templateText}
         onChange={(e) => handleTemplateChange(e.target.value)}

src/components/TypeSelector.tsx

@@ -23,12 +23,12 @@ function ReadOnlyType({ isA, customColorKey, onNavigate }: { isA?: string | null
   if (!isA) return null
   return (
     <div className="grid min-w-0 grid-cols-2 items-center gap-2 px-1.5">
-      <span className="font-mono-overline shrink-0 text-muted-foreground">Type</span>
+      <span className="text-[12px] shrink-0 text-muted-foreground">Type</span>
       <div className="min-w-0">
         {onNavigate ? (
           <button
             className="min-w-0 max-w-full truncate border-none cursor-pointer ring-inset hover:ring-1 hover:ring-current"
-            style={{ background: getTypeLightColor(isA, customColorKey), color: getTypeColor(isA, customColorKey), borderRadius: 6, padding: '2px 8px', fontSize: 12, fontWeight: 500 }}
+            style={{ background: getTypeLightColor(isA, customColorKey), color: getTypeColor(isA, customColorKey), borderRadius: 6, padding: '0 8px', fontSize: 12, fontWeight: 500, height: 24, display: 'inline-flex', alignItems: 'center' }}
             onClick={() => onNavigate(isA.toLowerCase())} title={isA}
           >{isA}</button>
         ) : (
@@ -58,7 +58,7 @@ export function TypeSelector({ isA, customColorKey, availableTypes, typeColorKey
 
   return (
     <div className="grid min-w-0 grid-cols-2 items-center gap-2 px-1.5" data-testid="type-selector">
-      <span className="font-mono-overline shrink-0 text-muted-foreground">Type</span>
+      <span className="text-[12px] shrink-0 text-muted-foreground">Type</span>
       <div className="min-w-0">
         <Select value={currentValue} onValueChange={v => onUpdateProperty('type', v === TYPE_NONE ? null : v)}>
           <SelectTrigger
@@ -68,7 +68,8 @@ export function TypeSelector({ isA, customColorKey, availableTypes, typeColorKey
               background: typeLightColor ?? undefined,
               color: typeColor ?? undefined,
               borderRadius: 6,
-              padding: '4px 8px',
+              padding: '0 8px',
+              height: 24,
               fontSize: 12,
               fontWeight: 500,
             }}

src/components/inspector/BacklinksPanel.tsx

@@ -1,7 +1,5 @@
-import { useState } from 'react'
 import type { VaultEntry } from '../../types'
-import { CaretRight, Trash } from '@phosphor-icons/react'
-import { getTypeColor } from '../../utils/typeColors'
+import { ArrowUpRight, Trash } from '@phosphor-icons/react'
 import { isEmoji } from '../../utils/emoji'
 import { entryStatusTitle } from './shared'
 import { StatusSuffix } from './LinkButton'
@@ -11,23 +9,21 @@ export interface BacklinkItem {
   context: string | null
 }
 
-function BacklinkEntry({ entry, context, typeEntryMap, onNavigate }: {
+function BacklinkEntry({ entry, context, onNavigate }: {
   entry: VaultEntry
   context: string | null
-  typeEntryMap: Record<string, VaultEntry>
   onNavigate: (target: string) => void
 }) {
-  const te = typeEntryMap[entry.isA ?? '']
   const isDimmed = entry.archived || entry.trashed
   return (
     <button
-      className="flex w-full cursor-pointer flex-col items-start gap-0.5 border-none bg-transparent p-0 text-left hover:opacity-80"
+      className="flex w-full cursor-pointer flex-col items-start gap-0.5 border-none bg-transparent p-0 text-left hover:underline"
       onClick={() => onNavigate(entry.title)}
       title={entryStatusTitle(entry)}
     >
       <span
-        className="flex items-center gap-1 text-xs font-medium"
-        style={{ color: isDimmed ? 'var(--muted-foreground)' : getTypeColor(entry.isA, te?.color) }}
+        className="flex items-center gap-1 text-xs text-primary"
+        style={isDimmed ? { color: 'var(--muted-foreground)' } : undefined}
       >
         {entry.trashed && <Trash size={12} className="shrink-0" />}
         {entry.icon && isEmoji(entry.icon) && <span className="shrink-0">{entry.icon}</span>}
@@ -43,42 +39,28 @@ function BacklinkEntry({ entry, context, typeEntryMap, onNavigate }: {
   )
 }
 
-export function BacklinksPanel({ backlinks, typeEntryMap, onNavigate }: {
+export function BacklinksPanel({ backlinks, onNavigate }: {
   backlinks: BacklinkItem[]
-  typeEntryMap: Record<string, VaultEntry>
   onNavigate: (target: string) => void
 }) {
-  const [expanded, setExpanded] = useState(false)
-
   if (backlinks.length === 0) return null
 
   return (
     <div>
-      <button
-        className="font-mono-overline mb-2 flex w-full cursor-pointer items-center gap-1 border-none bg-transparent p-0 text-left text-muted-foreground hover:text-foreground"
-        onClick={() => setExpanded((v) => !v)}
-        data-testid="backlinks-toggle"
-      >
-        <CaretRight
-          size={12}
-          className="shrink-0 transition-transform"
-          style={{ transform: expanded ? 'rotate(90deg)' : undefined }}
-        />
-        Backlinks ({backlinks.length})
-      </button>
-      {expanded && (
-        <div className="flex flex-col gap-1.5" data-testid="backlinks-list">
-          {backlinks.map(({ entry, context }) => (
-            <BacklinkEntry
-              key={entry.path}
-              entry={entry}
-              context={context}
-              typeEntryMap={typeEntryMap}
-              onNavigate={onNavigate}
-            />
-          ))}
-        </div>
-      )}
+      <h4 className="font-mono-overline mb-2 flex items-center gap-1 text-muted-foreground">
+        <ArrowUpRight size={12} className="shrink-0" />
+        Backlinks
+      </h4>
+      <div className="flex flex-col gap-1.5" data-testid="backlinks-list">
+        {backlinks.map(({ entry, context }) => (
+          <BacklinkEntry
+            key={entry.path}
+            entry={entry}
+            context={context}
+            onNavigate={onNavigate}
+          />
+        ))}
+      </div>
     </div>
   )
 }

src/components/inspector/GitHistoryPanel.tsx

@@ -1,3 +1,4 @@
+import { ArrowCounterClockwise } from '@phosphor-icons/react'
 import type { GitCommit } from '../../types'
 
 function formatRelativeDate(timestamp: number): string {
@@ -11,26 +12,32 @@ function formatRelativeDate(timestamp: number): string {
 }
 
 export function GitHistoryPanel({ commits, onViewCommitDiff }: { commits: GitCommit[]; onViewCommitDiff?: (commitHash: string) => void }) {
+  if (commits.length === 0) return null
+
   return (
     <div>
-      <h4 className="font-mono-overline mb-2 text-muted-foreground">History</h4>
-      {commits.length === 0
-        ? <p className="m-0 text-[13px] text-muted-foreground">No revision history</p>
-        : (
-          <div className="flex flex-col gap-2.5">
-            {commits.map((c) => (
-              <div key={c.hash} style={{ borderLeft: '2px solid var(--border)', paddingLeft: 10 }}>
-                <div className="mb-0.5 flex items-center justify-between">
-                  <button className="border-none bg-transparent p-0 font-mono text-primary cursor-pointer hover:underline" style={{ fontSize: 11 }} onClick={() => onViewCommitDiff?.(c.hash)} title={`View diff for ${c.shortHash}`}>{c.shortHash}</button>
-                  <span className="text-muted-foreground" style={{ fontSize: 10 }}>{formatRelativeDate(c.date)}</span>
-                </div>
-                <div className="truncate text-xs text-secondary-foreground">{c.message}</div>
-                {c.author && <div className="truncate text-muted-foreground" style={{ fontSize: 10, marginTop: 1 }}>{c.author}</div>}
-              </div>
-            ))}
+      <h4 className="font-mono-overline mb-2 flex items-center gap-1 text-muted-foreground">
+        <ArrowCounterClockwise size={12} className="shrink-0" />
+        History
+      </h4>
+      <div className="flex flex-col gap-2.5">
+        {commits.map((c) => (
+          <div key={c.hash} style={{ borderLeft: '2px solid var(--border)', paddingLeft: 10 }}>
+            <button
+              className="mb-0.5 w-full cursor-pointer truncate border-none bg-transparent p-0 text-left text-xs text-primary hover:underline"
+              onClick={() => onViewCommitDiff?.(c.hash)}
+              title={`View diff for ${c.shortHash}`}
+            >
+              <span className="font-mono" style={{ fontSize: 11 }}>{c.shortHash}</span>
+              {' · '}
+              {c.message}
+            </button>
+            <div className="text-muted-foreground" style={{ fontSize: 10 }}>
+              {formatRelativeDate(c.date)}
+            </div>
           </div>
-        )
-      }
+        ))}
+      </div>
     </div>
   )
 }

src/components/inspector/ReferencedByPanel.tsx

@@ -31,7 +31,7 @@ export function ReferencedByPanel({ items, typeEntryMap, onNavigate }: {
       <div className="flex flex-col gap-2.5">
         {grouped.map(([viaKey, groupEntries]) => (
           <div key={viaKey}>
-            <span className="mb-1 block font-mono text-muted-foreground" style={{ fontSize: 9, fontWeight: 400, letterSpacing: '1.2px', textTransform: 'uppercase', opacity: 0.7 }}>
+            <span className="mb-1 block text-muted-foreground" style={{ fontSize: 9, fontWeight: 400, letterSpacing: '0.02em', opacity: 0.7 }}>
               ← {viaKey}
             </span>
             <div className="flex flex-col gap-0.5">

src/components/note-list/FilterPills.tsx

@@ -5,6 +5,7 @@ interface FilterPillsProps {
   active: NoteListFilter
   counts: Record<NoteListFilter, number>
   onChange: (filter: NoteListFilter) => void
+  position?: 'top' | 'bottom'
 }
 
 const PILLS: { value: NoteListFilter; label: string }[] = [
@@ -13,9 +14,18 @@ const PILLS: { value: NoteListFilter; label: string }[] = [
   { value: 'trashed', label: 'Trashed' },
 ]
 
-function FilterPillsInner({ active, counts, onChange }: FilterPillsProps) {
+const BOTTOM_GRADIENT = 'linear-gradient(to bottom, transparent 0%, var(--card, #fff) 30%, var(--card, #fff) 100%)'
+
+function FilterPillsInner({ active, counts, onChange, position = 'top' }: FilterPillsProps) {
+  const isBottom = position === 'bottom'
   return (
-    <div className="flex h-auto min-h-[45px] shrink-0 flex-wrap items-center gap-1 border-b border-border px-4 py-1.5" data-testid="filter-pills">
+    <div
+      className={isBottom
+        ? 'absolute bottom-0 left-0 right-0 z-10 flex flex-wrap items-center justify-center gap-2 px-4 py-3'
+        : 'flex h-auto min-h-[45px] shrink-0 flex-wrap items-center gap-1 border-b border-border px-4 py-1.5'}
+      style={isBottom ? { background: BOTTOM_GRADIENT } : undefined}
+      data-testid="filter-pills"
+    >
       {PILLS.map(({ value, label }) => (
         <button
           key={value}

src/components/note-list/InboxFilterPills.tsx

@@ -5,18 +5,28 @@ interface InboxFilterPillsProps {
   active: InboxPeriod
   counts: Record<InboxPeriod, number>
   onChange: (period: InboxPeriod) => void
+  position?: 'top' | 'bottom'
 }
 
 const PILLS: { value: InboxPeriod; label: string }[] = [
-  { value: 'week', label: 'This week' },
-  { value: 'month', label: 'This month' },
-  { value: 'quarter', label: 'This quarter' },
-  { value: 'all', label: 'All time' },
+  { value: 'week', label: 'Week' },
+  { value: 'month', label: 'Month' },
+  { value: 'quarter', label: 'Quarter' },
+  { value: 'all', label: 'All' },
 ]
 
-function InboxFilterPillsInner({ active, counts, onChange }: InboxFilterPillsProps) {
+const BOTTOM_GRADIENT = 'linear-gradient(to bottom, transparent 0%, var(--card, #fff) 30%, var(--card, #fff) 100%)'
+
+function InboxFilterPillsInner({ active, counts, onChange, position = 'top' }: InboxFilterPillsProps) {
+  const isBottom = position === 'bottom'
   return (
-    <div className="flex h-auto min-h-[45px] shrink-0 flex-wrap items-center gap-1 border-b border-border px-4 py-1.5" data-testid="inbox-filter-pills">
+    <div
+      className={isBottom
+        ? 'absolute bottom-0 left-0 right-0 z-10 flex flex-wrap items-center justify-center gap-2 px-4 py-3'
+        : 'flex h-auto min-h-[45px] shrink-0 flex-wrap items-center gap-1 border-b border-border px-4 py-1.5'}
+      style={isBottom ? { background: BOTTOM_GRADIENT } : undefined}
+      data-testid="inbox-filter-pills"
+    >
       {PILLS.map(({ value, label }) => (
         <button
           key={value}

src/extensions/frontmatterHighlight.test.ts

@@ -39,22 +39,6 @@ describe('frontmatterHighlightPlugin', () => {
     parent.remove()
   })
 
-  it('applies heading class to markdown headings', () => {
-    const { view, parent } = createView('# Heading One\n\nSome text\n\n## Heading Two')
-    const headings = parent.querySelectorAll('.cm-md-heading')
-    expect(headings.length).toBeGreaterThanOrEqual(2)
-    view.destroy()
-    parent.remove()
-  })
-
-  it('does not apply heading class to plain text', () => {
-    const { view, parent } = createView('Just some plain text\nAnother line')
-    const headings = parent.querySelectorAll('.cm-md-heading')
-    expect(headings.length).toBe(0)
-    view.destroy()
-    parent.remove()
-  })
-
   it('handles content without frontmatter', () => {
     const { view, parent } = createView('# Just a heading\n\nNo frontmatter here.')
     const delimiters = parent.querySelectorAll('.cm-frontmatter-delimiter')

src/extensions/frontmatterHighlight.ts

@@ -4,7 +4,6 @@ import { RangeSetBuilder } from '@codemirror/state'
 const frontmatterDelimiter = Decoration.mark({ class: 'cm-frontmatter-delimiter' })
 const frontmatterKey = Decoration.mark({ class: 'cm-frontmatter-key' })
 const frontmatterValue = Decoration.mark({ class: 'cm-frontmatter-value' })
-const markdownHeading = Decoration.mark({ class: 'cm-md-heading' })
 
 function findFrontmatterEnd(doc: { lines: number; line(n: number): { text: string } }): number {
   if (doc.lines < 1) return -1
@@ -27,8 +26,6 @@ function buildDecorations(view: EditorView): DecorationSet {
 
     if (i <= fmEnd) {
       decorateFrontmatterLine(builder, line.from, text, i === 1 || i === fmEnd)
-    } else {
-      decorateMarkdownLine(builder, line.from, text)
     }
   }
 
@@ -60,16 +57,6 @@ function decorateFrontmatterLine(
   }
 }
 
-function decorateMarkdownLine(
-  builder: RangeSetBuilder<Decoration>,
-  from: number,
-  text: string,
-): void {
-  if (/^#{1,6}\s/.test(text)) {
-    builder.add(from, from + text.length, markdownHeading)
-  }
-}
-
 export const frontmatterHighlightPlugin = ViewPlugin.fromClass(
   class {
     decorations: DecorationSet
@@ -89,12 +76,9 @@ export function frontmatterHighlightTheme() {
   const keyColor = '#c9383e'
   const valueColor = '#2a7e4f'
   const delimiterColor = '#c9383e'
-  const headingColor = '#0969da'
-
   return EditorView.baseTheme({
     '.cm-frontmatter-delimiter': { color: delimiterColor, fontWeight: '600' },
     '.cm-frontmatter-key': { color: keyColor },
     '.cm-frontmatter-value': { color: valueColor },
-    '.cm-md-heading': { color: headingColor, fontWeight: '600' },
   })
 }

src/extensions/markdownHighlight.test.ts

@@ -0,0 +1,51 @@
+import { describe, it, expect } from 'vitest'
+import { EditorState } from '@codemirror/state'
+import { EditorView } from '@codemirror/view'
+import { markdownLanguage } from './markdownHighlight'
+
+function createView(doc: string) {
+  const parent = document.createElement('div')
+  document.body.appendChild(parent)
+  const state = EditorState.create({
+    doc,
+    extensions: [markdownLanguage()],
+  })
+  const view = new EditorView({ state, parent })
+  return { view, parent }
+}
+
+describe('markdownLanguage', () => {
+  it('returns a valid extension', () => {
+    const ext = markdownLanguage()
+    expect(ext).toBeDefined()
+    expect(Array.isArray(ext)).toBe(true)
+  })
+
+  it('creates an editor without errors', () => {
+    const { view, parent } = createView('# Heading\n\n**bold** and *italic*\n\n- list item')
+    expect(view.state.doc.toString()).toContain('# Heading')
+    view.destroy()
+    parent.remove()
+  })
+
+  it('parses markdown content with mixed syntax', () => {
+    const doc = [
+      '# Title',
+      '',
+      'Some **bold** and *italic* text.',
+      '',
+      '- item one',
+      '- item two',
+      '',
+      '[a link](http://example.com)',
+      '',
+      '> a blockquote',
+      '',
+      '`inline code`',
+    ].join('\n')
+    const { view, parent } = createView(doc)
+    expect(view.state.doc.lines).toBe(12)
+    view.destroy()
+    parent.remove()
+  })
+})

src/extensions/markdownHighlight.ts

@@ -0,0 +1,28 @@
+import { markdown } from '@codemirror/lang-markdown'
+import { HighlightStyle, syntaxHighlighting } from '@codemirror/language'
+import { tags } from '@lezer/highlight'
+import type { Extension } from '@codemirror/state'
+
+const markdownHighlightStyle = HighlightStyle.define([
+  { tag: tags.heading1, color: '#0969da', fontWeight: '700', fontSize: '1.4em' },
+  { tag: tags.heading2, color: '#0969da', fontWeight: '700', fontSize: '1.25em' },
+  { tag: tags.heading3, color: '#0969da', fontWeight: '600', fontSize: '1.1em' },
+  { tag: tags.heading4, color: '#0969da', fontWeight: '600' },
+  { tag: tags.heading5, color: '#0969da', fontWeight: '600' },
+  { tag: tags.heading6, color: '#0969da', fontWeight: '600' },
+  { tag: tags.strong, fontWeight: '700' },
+  { tag: tags.emphasis, fontStyle: 'italic' },
+  { tag: tags.strikethrough, textDecoration: 'line-through' },
+  { tag: tags.link, color: '#0969da', textDecoration: 'underline' },
+  { tag: tags.url, color: '#0969da' },
+  { tag: tags.monospace, color: '#c9383e', backgroundColor: 'rgba(175,184,193,0.15)', borderRadius: '3px' },
+  { tag: tags.list, color: '#c9383e' },
+  { tag: tags.quote, color: '#636c76', fontStyle: 'italic' },
+  { tag: tags.separator, color: '#636c76' },
+  { tag: tags.processingInstruction, color: '#c9383e', fontWeight: '600' },
+  { tag: tags.contentSeparator, color: '#c9383e', fontWeight: '600' },
+])
+
+export function markdownLanguage(): Extension {
+  return [markdown(), syntaxHighlighting(markdownHighlightStyle)]
+}

src/hooks/commands/filterCommands.ts

@@ -0,0 +1,17 @@
+import type { CommandAction } from './types'
+import type { NoteListFilter } from '../../utils/noteListHelpers'
+
+interface FilterCommandsConfig {
+  isSectionGroup: boolean
+  noteListFilter?: NoteListFilter
+  onSetNoteListFilter?: (filter: NoteListFilter) => void
+}
+
+export function buildFilterCommands(config: FilterCommandsConfig): CommandAction[] {
+  const { isSectionGroup, noteListFilter, onSetNoteListFilter } = config
+  return [
+    { id: 'filter-open', label: 'Show Open Notes', group: 'Navigation', keywords: ['filter', 'open', 'active', 'pill'], enabled: !!isSectionGroup && noteListFilter !== 'open', execute: () => onSetNoteListFilter?.('open') },
+    { id: 'filter-archived', label: 'Show Archived Notes', group: 'Navigation', keywords: ['filter', 'archived', 'pill'], enabled: !!isSectionGroup && noteListFilter !== 'archived', execute: () => onSetNoteListFilter?.('archived') },
+    { id: 'filter-trashed', label: 'Show Trashed Notes', group: 'Navigation', keywords: ['filter', 'trashed', 'trash', 'pill', 'deleted'], enabled: !!isSectionGroup && noteListFilter !== 'trashed', execute: () => onSetNoteListFilter?.('trashed') },
+  ]
+}

src/hooks/commands/gitCommands.ts

@@ -0,0 +1,20 @@
+import type { CommandAction } from './types'
+import type { SidebarSelection } from '../../types'
+
+interface GitCommandsConfig {
+  modifiedCount: number
+  onCommitPush: () => void
+  onPull?: () => void
+  onResolveConflicts?: () => void
+  onSelect: (sel: SidebarSelection) => void
+}
+
+export function buildGitCommands(config: GitCommandsConfig): CommandAction[] {
+  const { modifiedCount, onCommitPush, onPull, onResolveConflicts, onSelect } = config
+  return [
+    { id: 'commit-push', label: 'Commit & Push', group: 'Git', keywords: ['git', 'save', 'sync'], enabled: modifiedCount > 0, execute: onCommitPush },
+    { id: 'git-pull', label: 'Pull from Remote', group: 'Git', keywords: ['git', 'pull', 'fetch', 'download', 'sync', 'remote'], enabled: true, execute: () => onPull?.() },
+    { id: 'resolve-conflicts', label: 'Resolve Conflicts', group: 'Git', keywords: ['conflict', 'merge', 'git', 'sync'], enabled: true, execute: () => onResolveConflicts?.() },
+    { id: 'view-changes', label: 'View Pending Changes', group: 'Git', keywords: ['modified', 'diff'], enabled: true, execute: () => onSelect({ kind: 'filter', filter: 'changes' }) },
+  ]
+}