chore: ratchet codescene thresholds to 9.68/9.33

Previously, clicking a suggested property slot (Status, Date, URL) would add
an empty property to frontmatter but fail to open the editor. This was due
to a race condition where:

1. handleSuggestedAdd() called onAddProperty() which is async
2. The useEffect tried to detect when the property appeared in frontmatter
3. But frontmatter updates asynchronously after onAddProperty resolves
4. By the time frontmatter is updated, the useEffect had already run

The fix is to directly set the editing key immediately when clicking a
suggested slot, rather than relying on the useEffect to detect the property
being added. This is more reliable because we know we're adding the property
- we don't need to wait for it to appear in frontmatter.

.codescene-thresholds

@@ -1,2 +1,2 @@
-HOTSPOT_THRESHOLD=9.7
-AVERAGE_THRESHOLD=9.36
+HOTSPOT_THRESHOLD=9.68
+AVERAGE_THRESHOLD=9.33

docs/ABSTRACTIONS.md

@@ -503,7 +503,7 @@ No indexing step required — search runs directly against the filesystem.
 
 Per-vault settings stored locally and scoped by vault path:
 - Managed by `useVaultConfig` hook and `vaultConfigStore`
-- Settings: zoom, view mode, tag colors, status colors, property display modes, Inbox note-list column overrides, explicit organization workflow toggle
+- Settings: zoom, view mode, tag colors, status colors, property display modes, Inbox note-list column overrides
 - One-time migration from localStorage (`configMigration.ts`)
 
 ### Getting Started / Onboarding

docs/ARCHITECTURE.md

@@ -420,7 +420,6 @@ Per-vault UI settings stored locally per vault path (currently in browser/Tauri
 - `tag_colors`, `status_colors`: Custom color overrides
 - `property_display_modes`: Property display preferences
 - `inbox.noteListProperties`: Optional Inbox-only property chip override for the note list
-- `inbox.explicitOrganization`: When `false`, hide Inbox and the organized toggle so the vault behaves like a plain note collection
 
 ### Getting Started Vault
 
@@ -671,7 +670,6 @@ The vault backend (`src-tauri/src/vault/`) is split into focused submodules:
 | `save_image` | Save base64 image to vault |
 | `copy_image_to_vault` | Copy image file to vault |
 | `update_menu_state` | Update native menu checkmarks and enabled/disabled state for selection-dependent actions |
-| `trigger_menu_command` | Emit a native menu command ID for deterministic shortcut QA |
 
 ## Mock Layer
 
@@ -707,7 +705,6 @@ No Redux or global context. State lives in the root `App.tsx` and custom hooks:
 | `useUnifiedSearch` | Query, results, loading state | Keyword search |
 | `useSettings` | App settings (API keys, GitHub token) | Persistent settings |
 | `useVaultConfig` | Per-vault UI preferences | Vault-specific config |
-| `appCommandDispatcher` | Canonical shortcut/menu command IDs | Shared execution path for renderer and native menu commands |
 
 Data flows unidirectionally: `App` passes data and callbacks as props to child components. No child-to-child communication — everything goes through `App`.
 
@@ -727,12 +724,6 @@ Data flows unidirectionally: `App` passes data and callbacks as props to child c
 
 Selection-dependent note actions are wired through both the command palette and the native Note menu. For example, a deleted file opened from Changes view becomes a read-only diff preview, and that state enables the "Restore Deleted Note" menu/command while normal note mutation actions stay disabled.
 
-Shortcut ownership is explicit:
-
-- Renderer-owned shortcuts flow through `useAppKeyboard` into `appCommandDispatcher.ts`
-- Native-owned shortcuts flow through `menu.rs` into `useMenuEvents`, then into `appCommandDispatcher.ts`
-- Deterministic QA uses `trigger_menu_command` in Tauri and `window.__laputaTest.triggerMenuCommand()` in browser runs to exercise the native-menu command path without flaky macOS key synthesis
-
 ## Auto-Release & In-App Updates
 
 ### Release Pipeline

docs/GETTING-STARTED.md

@@ -97,7 +97,6 @@ laputa-app/
 │   │   ├── useCommandRegistry.ts # Command palette registry
 │   │   ├── useAppCommands.ts     # App-level commands
 │   │   ├── useAppKeyboard.ts     # Keyboard shortcuts
-│   │   ├── appCommandDispatcher.ts # Shared shortcut/menu command IDs + dispatch
 │   │   ├── useSettings.ts        # App settings
 │   │   ├── useOnboarding.ts      # First-launch flow
 │   │   ├── useCodeMirror.ts      # CodeMirror raw editor
@@ -246,8 +245,8 @@ laputa-app/
 | File | Why it matters |
 |------|---------------|
 | `src/hooks/useSettings.ts` | App settings (API keys, GitHub token, sync interval). |
-| `src/hooks/useVaultConfig.ts` | Per-vault local UI preferences (zoom, view mode, colors, Inbox columns, explicit organization workflow). |
-| `src/components/SettingsPanel.tsx` | Settings UI including GitHub OAuth connection and the vault-level explicit organization toggle. |
+| `src/hooks/useVaultConfig.ts` | Per-vault local UI preferences (zoom, view mode, colors, Inbox columns). |
+| `src/components/SettingsPanel.tsx` | Settings UI including GitHub OAuth connection. |
 
 ## Architecture Patterns
 
@@ -281,12 +280,10 @@ type SidebarSelection =
 
 ### Command Registry
 
-`useCommandRegistry` + `useAppCommands` build a centralized command registry. Commands are registered with labels, shortcuts, and handlers. The `CommandPalette` (Cmd+K) fuzzy-searches this registry. Renderer shortcuts (`useAppKeyboard`) and native menu events (`useMenuEvents`) both route through `appCommandDispatcher.ts`, so shortcut behavior is owned by shared command IDs instead of duplicate handler paths.
+`useCommandRegistry` + `useAppCommands` build a centralized command registry. Commands are registered with labels, shortcuts, and handlers. The `CommandPalette` (Cmd+K) fuzzy-searches this registry. The native macOS menu bar also triggers commands via `useMenuEvents`.
 
 Commands whose availability depends on the current note or Git state must also flow through `update_menu_state` so the native menu stays in sync with the command palette. The deleted-note restore action in Changes view is the reference example: the row opens a deleted diff preview, the command palette exposes "Restore Deleted Note", and the Note menu enables the same action only while that preview is active.
 
-For automated QA, prefer the `window.__laputaTest.triggerMenuCommand()` bridge for native-owned shortcuts and `window.__laputaTest.dispatchAppCommand()` only for renderer-only command paths. Do not treat flaky synthesized macOS keystrokes as proof that a native accelerator works.
-
 ## Running Tests
 
 ```bash
@@ -340,7 +337,7 @@ BASE_URL="http://localhost:5173" npx playwright test tests/smoke/<slug>.spec.ts
 
 1. Register the command in `useAppCommands.ts` via the command registry
 2. Add a corresponding menu bar item in `menu.rs` for discoverability
-3. If it has a keyboard shortcut, map it to the canonical command ID in `appCommandDispatcher.ts` and register ownership in `useAppKeyboard.ts`
+3. If it has a keyboard shortcut, register it in `useAppKeyboard.ts`
 4. If its enabled state depends on runtime selection (active note, deleted preview, Git status, etc.), thread that flag through `useMenuEvents.ts` and `update_menu_state` so the native menu enables/disables correctly
 
 ### Modify styling

docs/adr/0050-deterministic-shortcut-command-routing.md

@@ -1,29 +0,0 @@
----
-type: ADR
-id: "0050"
-title: "Deterministic shortcut command routing"
-status: active
-date: 2026-04-11
----
-
-## Context
-
-Laputa is keyboard-first, but shortcut execution had split ownership: `useAppKeyboard` handled some shortcuts in the renderer while `menu.rs` owned others as native Tauri menu accelerators. That split made QA unreliable. Browser tests could prove the renderer path, but not the native menu path, and flaky macOS key synthesis made `Cmd+Shift+L`, `Cmd+Shift+I`, and `Cmd+N` regressions easy to miss.
-
-## Decision
-
-**Keyboard shortcuts and native menu accelerators now dispatch through the same canonical app command IDs. Renderer-owned shortcuts call the shared dispatcher directly; native menu items emit the same IDs into the frontend, and tests get a deterministic menu-command trigger that exercises that route without relying on synthesized native keystrokes.**
-
-## Options considered
-
-- **Option A** (chosen): Shared command IDs plus deterministic menu-command trigger — keeps native desktop UX while making menu-owned commands testable in unit tests, Playwright, and native QA. Downside: one more command layer to maintain.
-- **Option B**: Move every shortcut to the renderer — simpler automated testing, but worse macOS menu-bar parity and weaker native UX.
-- **Option C**: Keep renderer and native shortcuts separate — lowest code churn, but continues to produce false confidence and shortcut regressions.
-
-## Consequences
-
-- `appCommandDispatcher.ts` owns the canonical shortcut command IDs and the shared execution path used by `useAppKeyboard` and `useMenuEvents`.
-- Native menu routing remains explicit in `menu.rs`; adding or changing a native shortcut now requires wiring the accelerator and the matching command ID in one place.
-- Automated QA can trigger menu-owned commands deterministically through the shared `window.__laputaTest.triggerMenuCommand()` bridge in browser runs and through the native `trigger_menu_command` Tauri command in desktop runs.
-- Keyboard QA should prefer real menu selection or the deterministic menu-command trigger for native-owned shortcuts, and reserve synthesized keystrokes for renderer-owned shortcuts or true end-to-end spot checks.
-- This decision supersedes the blanket assumption in ADR 0020 that all shortcut verification can be treated as plain keyboard-event testing.

docs/adr/README.md

@@ -105,4 +105,3 @@ proposed → active → superseded
 | [0047](0047-regex-mode-for-view-filter-conditions.md) | Regex mode for view filter conditions | active |
 | [0048](0048-relative-date-expressions-in-view-filters.md) | Relative date expressions in view filter conditions | active |
 | [0049](0049-per-note-icon-property.md) | Per-note icon property (_icon on individual notes) | active |
-| [0050](0050-deterministic-shortcut-command-routing.md) | Deterministic shortcut command routing | active |

package.json

@@ -13,7 +13,7 @@
     "test": "vitest run",
     "test:watch": "vitest",
     "test:e2e": "playwright test",
-    "playwright:smoke": "playwright test --config playwright.smoke.config.ts tests/smoke/example.spec.ts tests/smoke/fix-ai-chat-empty-body-v3.spec.ts tests/smoke/fix-crash-create-note.spec.ts tests/smoke/getting-started-template.spec.ts tests/smoke/h1-title-decoupled.spec.ts tests/smoke/keyboard-command-routing.spec.ts tests/smoke/wikilink-path-fix.spec.ts",
+    "playwright:smoke": "playwright test --config playwright.smoke.config.ts tests/smoke/example.spec.ts tests/smoke/fix-ai-chat-empty-body-v3.spec.ts tests/smoke/getting-started-template.spec.ts tests/smoke/h1-title-decoupled.spec.ts tests/smoke/wikilink-path-fix.spec.ts",
     "playwright:regression": "playwright test tests/smoke/",
     "playwright:integration": "playwright test --config playwright.integration.config.ts",
     "test:coverage": "vitest run --coverage",

src-tauri/src/commands/system.rs

@@ -3,7 +3,6 @@ use crate::menu;
 use crate::settings::Settings;
 use crate::vault_list;
 use crate::vault_list::VaultList;
-use serde::Deserialize;
 
 use super::parse_build_label;
 
@@ -42,29 +41,23 @@ pub async fn check_mcp_status() -> Result<crate::mcp::McpStatus, String> {
 
 // ── Menu commands ───────────────────────────────────────────────────────────
 
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct MenuStateUpdate {
-    has_active_note: bool,
-    has_modified_files: Option<bool>,
-    has_conflicts: Option<bool>,
-    has_restorable_deleted_note: Option<bool>,
-}
-
 #[cfg(desktop)]
 #[tauri::command]
 pub fn update_menu_state(
     app_handle: tauri::AppHandle,
-    state: MenuStateUpdate,
+    has_active_note: bool,
+    has_modified_files: Option<bool>,
+    has_conflicts: Option<bool>,
+    has_restorable_deleted_note: Option<bool>,
 ) -> Result<(), String> {
-    menu::set_note_items_enabled(&app_handle, state.has_active_note);
-    if let Some(v) = state.has_modified_files {
+    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) = state.has_conflicts {
+    if let Some(v) = has_conflicts {
         menu::set_git_conflict_items_enabled(&app_handle, v);
     }
-    if let Some(v) = state.has_restorable_deleted_note {
+    if let Some(v) = has_restorable_deleted_note {
         menu::set_restore_deleted_item_enabled(&app_handle, v);
     }
     Ok(())
@@ -74,23 +67,14 @@ pub fn update_menu_state(
 #[tauri::command]
 pub fn update_menu_state(
     _app_handle: tauri::AppHandle,
-    _state: MenuStateUpdate,
+    _has_active_note: bool,
+    _has_modified_files: Option<bool>,
+    _has_conflicts: Option<bool>,
+    _has_restorable_deleted_note: Option<bool>,
 ) -> Result<(), String> {
     Ok(())
 }
 
-#[cfg(desktop)]
-#[tauri::command]
-pub fn trigger_menu_command(app_handle: tauri::AppHandle, id: String) -> Result<(), String> {
-    menu::emit_custom_menu_event(&app_handle, &id)
-}
-
-#[cfg(mobile)]
-#[tauri::command]
-pub fn trigger_menu_command(_app_handle: tauri::AppHandle, _id: String) -> Result<(), String> {
-    Err("Native menu commands are not available on mobile".into())
-}
-
 // ── Settings & config commands ──────────────────────────────────────────────
 
 #[tauri::command]

src-tauri/src/commands/vault.rs

@@ -45,17 +45,6 @@ pub fn rename_note(
     vault::rename_note(&vault_path, &old_path, &new_title, old_title.as_deref())
 }
 
-#[tauri::command]
-pub fn rename_note_filename(
-    vault_path: String,
-    old_path: String,
-    new_filename_stem: String,
-) -> Result<RenameResult, String> {
-    let vault_path = expand_tilde(&vault_path);
-    let old_path = expand_tilde(&old_path);
-    vault::rename_note_filename(&vault_path, &old_path, &new_filename_stem)
-}
-
 #[tauri::command]
 pub fn auto_rename_untitled(
     vault_path: String,

src-tauri/src/lib.rs

@@ -113,77 +113,6 @@ fn setup_app(app: &mut tauri::App) -> Result<(), Box<dyn std::error::Error>> {
     Ok(())
 }
 
-fn with_invoke_handler(builder: tauri::Builder<tauri::Wry>) -> tauri::Builder<tauri::Wry> {
-    builder.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::rename_note_filename,
-        commands::auto_rename_untitled,
-        commands::detect_renames,
-        commands::update_wikilinks_for_renames,
-        commands::get_file_history,
-        commands::get_modified_files,
-        commands::get_file_diff,
-        commands::get_file_diff_at_commit,
-        commands::get_vault_pulse,
-        commands::git_commit,
-        commands::get_build_number,
-        commands::get_last_commit_info,
-        commands::git_pull,
-        commands::git_push,
-        commands::git_remote_status,
-        commands::get_conflict_files,
-        commands::get_conflict_mode,
-        commands::git_resolve_conflict,
-        commands::git_commit_conflict_resolution,
-        commands::git_discard_file,
-        commands::is_git_repo,
-        commands::init_git_repo,
-        commands::check_claude_cli,
-        commands::stream_claude_chat,
-        commands::stream_claude_agent,
-        commands::reload_vault,
-        commands::reload_vault_entry,
-        commands::sync_note_title,
-        commands::save_image,
-        commands::copy_image_to_vault,
-        commands::delete_note,
-        commands::batch_delete_notes,
-        commands::migrate_is_a_to_type,
-        commands::create_vault_folder,
-        commands::batch_archive_notes,
-        commands::get_settings,
-        commands::update_menu_state,
-        commands::trigger_menu_command,
-        commands::save_settings,
-        commands::load_vault_list,
-        commands::save_vault_list,
-        commands::github_list_repos,
-        commands::github_create_repo,
-        commands::clone_repo,
-        commands::github_device_flow_start,
-        commands::github_device_flow_poll,
-        commands::github_get_user,
-        commands::search_vault,
-        commands::create_empty_vault,
-        commands::create_getting_started_vault,
-        commands::check_vault_exists,
-        commands::get_default_vault_path,
-        commands::register_mcp_tools,
-        commands::check_mcp_status,
-        commands::repair_vault,
-        commands::reinit_telemetry,
-        commands::list_views,
-        commands::save_view_cmd,
-        commands::delete_view_cmd
-    ])
-}
-
 #[cfg(desktop)]
 fn handle_run_event(app_handle: &tauri::AppHandle, event: &tauri::RunEvent) {
     use tauri::Manager;
@@ -205,8 +134,74 @@ pub fn run() {
     #[cfg(desktop)]
     let builder = builder.manage(WsBridgeChild(Mutex::new(None)));
 
-    with_invoke_handler(builder)
+    builder
         .setup(setup_app)
+        .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::auto_rename_untitled,
+            commands::detect_renames,
+            commands::update_wikilinks_for_renames,
+            commands::get_file_history,
+            commands::get_modified_files,
+            commands::get_file_diff,
+            commands::get_file_diff_at_commit,
+            commands::get_vault_pulse,
+            commands::git_commit,
+            commands::get_build_number,
+            commands::get_last_commit_info,
+            commands::git_pull,
+            commands::git_push,
+            commands::git_remote_status,
+            commands::get_conflict_files,
+            commands::get_conflict_mode,
+            commands::git_resolve_conflict,
+            commands::git_commit_conflict_resolution,
+            commands::git_discard_file,
+            commands::is_git_repo,
+            commands::init_git_repo,
+            commands::check_claude_cli,
+            commands::stream_claude_chat,
+            commands::stream_claude_agent,
+            commands::reload_vault,
+            commands::reload_vault_entry,
+            commands::sync_note_title,
+            commands::save_image,
+            commands::copy_image_to_vault,
+            commands::delete_note,
+            commands::batch_delete_notes,
+            commands::migrate_is_a_to_type,
+            commands::create_vault_folder,
+            commands::batch_archive_notes,
+            commands::get_settings,
+            commands::update_menu_state,
+            commands::save_settings,
+            commands::load_vault_list,
+            commands::save_vault_list,
+            commands::github_list_repos,
+            commands::github_create_repo,
+            commands::clone_repo,
+            commands::github_device_flow_start,
+            commands::github_device_flow_poll,
+            commands::github_get_user,
+            commands::search_vault,
+            commands::create_empty_vault,
+            commands::create_getting_started_vault,
+            commands::check_vault_exists,
+            commands::get_default_vault_path,
+            commands::register_mcp_tools,
+            commands::check_mcp_status,
+            commands::repair_vault,
+            commands::reinit_telemetry,
+            commands::list_views,
+            commands::save_view_cmd,
+            commands::delete_view_cmd
+        ])
         .build(tauri::generate_context!())
         .expect("error while building tauri application")
         .run(|app_handle, event| {

src-tauri/src/menu.rs

@@ -35,7 +35,6 @@ const GO_ARCHIVED: &str = "go-archived";
 const GO_CHANGES: &str = "go-changes";
 const GO_INBOX: &str = "go-inbox";
 
-const NOTE_TOGGLE_ORGANIZED: &str = "note-toggle-organized";
 const NOTE_ARCHIVE: &str = "note-archive";
 const NOTE_DELETE: &str = "note-delete";
 const NOTE_OPEN_IN_NEW_WINDOW: &str = "note-open-in-new-window";
@@ -78,8 +77,6 @@ const CUSTOM_IDS: &[&str] = &[
     GO_ALL_NOTES,
     GO_ARCHIVED,
     GO_CHANGES,
-    GO_INBOX,
-    NOTE_TOGGLE_ORGANIZED,
     NOTE_ARCHIVE,
     NOTE_DELETE,
     NOTE_OPEN_IN_NEW_WINDOW,
@@ -99,7 +96,6 @@ const CUSTOM_IDS: &[&str] = &[
 /// IDs of menu items that should be disabled when no note tab is active.
 const NOTE_DEPENDENT_IDS: &[&str] = &[
     FILE_SAVE,
-    NOTE_TOGGLE_ORGANIZED,
     NOTE_ARCHIVE,
     NOTE_DELETE,
     EDIT_TOGGLE_RAW_EDITOR,
@@ -214,7 +210,6 @@ fn build_view_menu(app: &App) -> MenuResult {
         .build(app)?;
     let toggle_properties = MenuItemBuilder::new("Toggle Properties Panel")
         .id(VIEW_TOGGLE_PROPERTIES)
-        .accelerator("CmdOrCtrl+Shift+I")
         .build(app)?;
     let command_palette = MenuItemBuilder::new("Command Palette")
         .id(VIEW_COMMAND_PALETTE)
@@ -278,12 +273,9 @@ fn build_go_menu(app: &App) -> MenuResult {
 }
 
 fn build_note_menu(app: &App) -> MenuResult {
-    let toggle_organized = MenuItemBuilder::new("Toggle Organized")
-        .id(NOTE_TOGGLE_ORGANIZED)
-        .accelerator("CmdOrCtrl+E")
-        .build(app)?;
     let archive_note = MenuItemBuilder::new("Archive Note")
         .id(NOTE_ARCHIVE)
+        .accelerator("CmdOrCtrl+E")
         .build(app)?;
     let delete_note = MenuItemBuilder::new("Delete Note")
         .id(NOTE_DELETE)
@@ -310,7 +302,6 @@ fn build_note_menu(app: &App) -> MenuResult {
         .build(app)?;
 
     Ok(SubmenuBuilder::new(app, "Note")
-        .item(&toggle_organized)
         .item(&archive_note)
         .item(&delete_note)
         .item(&restore_deleted_note)
@@ -406,21 +397,14 @@ pub fn setup_menu(app: &App) -> Result<(), Box<dyn std::error::Error>> {
 
     app.on_menu_event(|app_handle, event| {
         let id = event.id().0.as_str();
-        let _ = emit_custom_menu_event(app_handle, id);
+        if CUSTOM_IDS.contains(&id) {
+            let _ = app_handle.emit("menu-event", id);
+        }
     });
 
     Ok(())
 }
 
-pub fn emit_custom_menu_event(app_handle: &AppHandle, id: &str) -> Result<(), String> {
-    if !CUSTOM_IDS.contains(&id) {
-        return Err(format!("Unknown custom menu event: {id}"));
-    }
-    app_handle
-        .emit("menu-event", id)
-        .map_err(|err| format!("Failed to emit menu-event {id}: {err}"))
-}
-
 fn set_items_enabled(app_handle: &AppHandle, ids: &[&str], enabled: bool) {
     let Some(menu) = app_handle.menu() else {
         return;

src-tauri/src/vault/mod.rs

@@ -20,8 +20,8 @@ pub use getting_started::{create_getting_started_vault, default_vault_path, vaul
 pub use image::{copy_image_to_vault, save_image};
 pub use migration::migrate_is_a_to_type;
 pub use rename::{
-    auto_rename_untitled, detect_renames, rename_note, rename_note_filename,
-    update_wikilinks_for_renames, DetectedRename, RenameResult,
+    auto_rename_untitled, 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};

src-tauri/src/vault/rename.rs

@@ -1,6 +1,5 @@
 use regex::Regex;
 use serde::{Deserialize, Serialize};
-use std::collections::HashSet;
 use std::fs;
 use std::path::Path;
 use walkdir::WalkDir;
@@ -29,17 +28,13 @@ pub(super) fn title_to_slug(title: &str) -> String {
         .join("-")
 }
 
-/// Build a regex that matches wiki links referencing any of the provided targets.
-fn build_wikilink_pattern(targets: &[&str]) -> Option<Regex> {
-    let escaped_targets: Vec<String> = targets
-        .iter()
-        .filter(|target| !target.is_empty())
-        .map(|target| regex::escape(target))
-        .collect();
-    if escaped_targets.is_empty() {
-        return None;
-    }
-    let pattern_str = format!(r"\[\[(?:{})(\|[^\]]*?)?\]\]", escaped_targets.join("|"));
+/// Build a regex that matches wiki links referencing old title or path stem.
+fn build_wikilink_pattern(old_title: &str, old_path_stem: &str) -> Option<Regex> {
+    let pattern_str = format!(
+        r"\[\[(?:{}|{})(\|[^\]]*?)?\]\]",
+        regex::escape(old_title),
+        regex::escape(old_path_stem),
+    );
     Regex::new(&pattern_str).ok()
 }
 
@@ -49,13 +44,13 @@ fn is_replaceable_md_file(path: &Path, exclude: &Path) -> bool {
 }
 
 /// Replace wikilink references in a single file's content. Returns updated content if changed.
-fn replace_wikilinks_in_content(content: &str, re: &Regex, new_target: &str) -> Option<String> {
+fn replace_wikilinks_in_content(content: &str, re: &Regex, new_title: &str) -> Option<String> {
     if !re.is_match(content) {
         return None;
     }
     let replaced = re.replace_all(content, |caps: &regex::Captures| match caps.get(1) {
-        Some(pipe) => format!("[[{}{}]]", new_target, pipe.as_str()),
-        None => format!("[[{}]]", new_target),
+        Some(pipe) => format!("[[{}{}]]", new_title, pipe.as_str()),
+        None => format!("[[{}]]", new_title),
     });
     if replaced != content {
         Some(replaced.into_owned())
@@ -64,6 +59,15 @@ fn replace_wikilinks_in_content(content: &str, re: &Regex, new_target: &str) ->
     }
 }
 
+/// Parameters for a vault-wide wikilink replacement.
+struct WikilinkReplacement<'a> {
+    vault_path: &'a Path,
+    old_title: &'a str,
+    new_title: &'a str,
+    old_path_stem: &'a str,
+    exclude_path: &'a Path,
+}
+
 /// Collect all .md file paths in vault eligible for wikilink replacement.
 fn collect_md_files(vault_path: &Path, exclude: &Path) -> Vec<std::path::PathBuf> {
     WalkDir::new(vault_path)
@@ -75,76 +79,47 @@ fn collect_md_files(vault_path: &Path, exclude: &Path) -> Vec<std::path::PathBuf
         .collect()
 }
 
-fn unique_wikilink_targets(targets: Vec<&str>) -> Vec<&str> {
-    let mut seen = HashSet::new();
-    targets
-        .into_iter()
-        .filter(|target| !target.is_empty())
-        .filter(|target| seen.insert(*target))
-        .collect()
-}
-
-fn collect_legacy_wikilink_targets<'a>(old_title: &'a str, old_path_stem: &'a str) -> Vec<&'a str> {
-    let old_filename_stem = old_path_stem.rsplit('/').next().unwrap_or(old_path_stem);
-    unique_wikilink_targets(vec![old_title, old_path_stem, old_filename_stem])
-}
-
 /// Replace wiki link references across all vault markdown files.
-fn update_wikilinks_in_vault(
-    vault_path: &Path,
-    old_targets: &[&str],
-    new_target: &str,
-    exclude_path: &Path,
-) -> usize {
-    let re = match build_wikilink_pattern(old_targets) {
+fn update_wikilinks_in_vault(params: &WikilinkReplacement) -> usize {
+    let re = match build_wikilink_pattern(params.old_title, params.old_path_stem) {
         Some(r) => r,
         None => return 0,
     };
-    replace_wikilinks_in_files(collect_md_files(vault_path, exclude_path), &re, new_target)
-}
 
-fn replace_wikilinks_in_files(
-    files: Vec<std::path::PathBuf>,
-    re: &Regex,
-    replacement: &str,
-) -> usize {
+    let files = collect_md_files(params.vault_path, params.exclude_path);
     files
         .iter()
-        .filter(|path| rewrite_wikilinks_in_file(path, re, replacement))
+        .filter(|path| {
+            let content = match fs::read_to_string(path) {
+                Ok(c) => c,
+                Err(_) => return false,
+            };
+            match replace_wikilinks_in_content(&content, &re, params.new_title) {
+                Some(new_content) => fs::write(path, &new_content).is_ok(),
+                None => false,
+            }
+        })
         .count()
 }
 
-fn rewrite_wikilinks_in_file(path: &Path, re: &Regex, replacement: &str) -> bool {
-    let Ok(content) = fs::read_to_string(path) else {
-        return false;
-    };
-
-    let Some(new_content) = replace_wikilinks_in_content(&content, re, replacement) else {
-        return false;
-    };
-
-    fs::write(path, &new_content).is_ok()
-}
-
 /// Extract the value of the `title:` frontmatter field from raw content.
 fn extract_fm_title_value(content: &str) -> Option<String> {
     if !content.starts_with("---\n") {
         return None;
     }
     let fm = content[4..].split("\n---").next()?;
-    fm.lines()
-        .map(str::trim_start)
-        .find_map(extract_title_value_from_frontmatter_line)
-}
-
-fn extract_title_value_from_frontmatter_line(line: &str) -> Option<String> {
-    ["title:", "\"title\":"]
-        .iter()
-        .find_map(|prefix| line.strip_prefix(prefix))
-        .map(str::trim)
-        .map(|value| value.trim_matches('"').trim_matches('\''))
-        .filter(|value| !value.is_empty())
-        .map(|value| value.to_string())
+    for line in fm.lines() {
+        let t = line.trim_start();
+        for prefix in &["title:", "\"title\":"] {
+            if let Some(rest) = t.strip_prefix(prefix) {
+                let val = rest.trim().trim_matches('"').trim_matches('\'');
+                if !val.is_empty() {
+                    return Some(val.to_string());
+                }
+            }
+        }
+    }
+    None
 }
 
 /// Update the `title:` frontmatter field in content.
@@ -193,22 +168,6 @@ fn unique_dest_path(dest_dir: &Path, filename: &str, exclude: &Path) -> std::pat
     }
 }
 
-fn normalize_filename_stem(new_filename_stem: &str) -> Result<String, String> {
-    let trimmed = new_filename_stem.trim();
-    let stem = trimmed.strip_suffix(".md").unwrap_or(trimmed).trim();
-    if stem.is_empty() {
-        return Err("New filename cannot be empty".to_string());
-    }
-    if is_invalid_filename_stem(stem) {
-        return Err("Invalid filename".to_string());
-    }
-    Ok(stem.to_string())
-}
-
-fn is_invalid_filename_stem(stem: &str) -> bool {
-    stem == "." || stem == ".." || stem.contains('/') || stem.contains('\\')
-}
-
 /// Rename a note: update its frontmatter title, rename the file, and update wiki links across the vault.
 ///
 /// When `old_title_hint` is provided it is used instead of extracting the title from
@@ -278,9 +237,13 @@ pub fn rename_note(
     // Update wikilinks across the vault
     let vault_prefix = format!("{}/", vault.to_string_lossy());
     let old_path_stem = to_path_stem(old_path, &vault_prefix);
-    let new_path_stem = to_path_stem(&new_path_str, &vault_prefix).to_string();
-    let old_targets = collect_legacy_wikilink_targets(old_title, old_path_stem);
-    let updated_files = update_wikilinks_in_vault(vault, &old_targets, &new_path_stem, &new_file);
+    let updated_files = update_wikilinks_in_vault(&WikilinkReplacement {
+        vault_path: vault,
+        old_title,
+        new_title,
+        old_path_stem,
+        exclude_path: &new_file,
+    });
 
     Ok(RenameResult {
         new_path: new_path_str,
@@ -288,67 +251,6 @@ pub fn rename_note(
     })
 }
 
-/// Rename only the file path stem while preserving title/frontmatter content.
-pub fn rename_note_filename(
-    vault_path: &str,
-    old_path: &str,
-    new_filename_stem: &str,
-) -> Result<RenameResult, String> {
-    let vault = Path::new(vault_path);
-    let old_file = Path::new(old_path);
-
-    if !old_file.exists() {
-        return Err(format!("File does not exist: {}", old_path));
-    }
-
-    let normalized_stem = normalize_filename_stem(new_filename_stem)?;
-    let old_filename = old_file
-        .file_name()
-        .map(|f| f.to_string_lossy().to_string())
-        .unwrap_or_default();
-    let content =
-        fs::read_to_string(old_file).map_err(|e| format!("Failed to read {}: {}", old_path, e))?;
-    let fm_title = extract_fm_title_value(&content);
-    let old_title = super::extract_title(fm_title.as_deref(), &content, &old_filename);
-    let new_filename = format!("{}.md", normalized_stem);
-
-    if old_filename == new_filename {
-        return Ok(RenameResult {
-            new_path: old_path.to_string(),
-            updated_files: 0,
-        });
-    }
-
-    let parent_dir = old_file
-        .parent()
-        .ok_or("Cannot determine parent directory")?;
-    let new_file = parent_dir.join(&new_filename);
-    if new_file.exists() && new_file != old_file {
-        return Err("A note with that name already exists".to_string());
-    }
-
-    fs::rename(old_file, &new_file).map_err(|e| {
-        format!(
-            "Failed to rename {} to {}: {}",
-            old_path,
-            new_file.to_string_lossy(),
-            e
-        )
-    })?;
-
-    let vault_prefix = format!("{}/", vault.to_string_lossy());
-    let old_path_stem = to_path_stem(old_path, &vault_prefix);
-    let new_path = new_file.to_string_lossy().to_string();
-    let new_path_stem = to_path_stem(&new_path, &vault_prefix).to_string();
-    let old_targets = collect_legacy_wikilink_targets(&old_title, old_path_stem);
-    let updated_files = update_wikilinks_in_vault(vault, &old_targets, &new_path_stem, &new_file);
-
-    Ok(RenameResult {
-        new_path,
-        updated_files,
-    })
-}
-
 /// Check if a filename matches the untitled pattern (e.g. "untitled-note-1234567890.md").
 fn is_untitled_filename(filename: &str) -> bool {
     let stem = filename.strip_suffix(".md").unwrap_or(filename);
@@ -450,12 +352,22 @@ pub fn update_wikilinks_for_renames(
             .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 old_targets = collect_legacy_wikilink_targets(&old_title, old_stem);
-        let updated = update_wikilinks_in_vault(vault, &old_targets, new_stem, &new_file);
+
+        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;
     }
 
@@ -545,11 +457,11 @@ mod tests {
         assert_eq!(result.updated_files, 2);
 
         let other_content = fs::read_to_string(vault.join("note/other.md")).unwrap();
-        assert!(other_content.contains("[[note/sprint-retrospective]]"));
+        assert!(other_content.contains("[[Sprint Retrospective]]"));
         assert!(!other_content.contains("[[Weekly Review]]"));
 
         let project_content = fs::read_to_string(vault.join("project/my-project.md")).unwrap();
-        assert!(project_content.contains("[[note/sprint-retrospective]]"));
+        assert!(project_content.contains("[[Sprint Retrospective]]"));
     }
 
     #[test]
@@ -609,33 +521,7 @@ mod tests {
 
         assert_eq!(result.updated_files, 1);
         let ref_content = fs::read_to_string(vault.join("note/ref.md")).unwrap();
-        assert!(ref_content.contains("[[note/sprint-retro|my review]]"));
-    }
-
-    #[test]
-    fn test_rename_note_updates_filename_only_wikilinks_to_canonical_path() {
-        let dir = TempDir::new().unwrap();
-        let vault = dir.path();
-        create_test_file(vault, "note/weekly-review.md", "# Weekly Review\n");
-        create_test_file(
-            vault,
-            "note/ref.md",
-            "# Ref\n\nSee [[weekly-review]] for info.\n",
-        );
-
-        let old_path = vault.join("note/weekly-review.md");
-        let result = rename_note(
-            vault.to_str().unwrap(),
-            old_path.to_str().unwrap(),
-            "Sprint Retro",
-            None,
-        )
-        .unwrap();
-
-        assert_eq!(result.updated_files, 1);
-        let ref_content = fs::read_to_string(vault.join("note/ref.md")).unwrap();
-        assert!(ref_content.contains("[[note/sprint-retro]]"));
-        assert!(!ref_content.contains("[[weekly-review]]"));
+        assert!(ref_content.contains("[[Sprint Retro|my review]]"));
     }
 
     #[test]
@@ -812,58 +698,6 @@ mod tests {
         assert!(vault.join("note/my-note.md").exists());
     }
 
-    #[test]
-    fn test_rename_note_filename_preserves_title_and_updates_path_wikilinks() {
-        let dir = TempDir::new().unwrap();
-        let vault = dir.path();
-        create_test_file(
-            vault,
-            "note/project-kickoff.md",
-            "---\ntitle: Project Kickoff\ntype: Note\n---\n\n# Project Kickoff\n\nBody.\n",
-        );
-        create_test_file(
-            vault,
-            "note/ref.md",
-            "# Ref\n\nSee [[note/project-kickoff]] and [[Project Kickoff]].\n",
-        );
-
-        let old_path = vault.join("note/project-kickoff.md");
-        let result = rename_note_filename(
-            vault.to_str().unwrap(),
-            old_path.to_str().unwrap(),
-            "manual-name",
-        )
-        .unwrap();
-
-        assert!(result.new_path.ends_with("manual-name.md"));
-        assert!(!old_path.exists());
-
-        let renamed = fs::read_to_string(&result.new_path).unwrap();
-        assert!(renamed.contains("title: Project Kickoff"));
-        assert!(renamed.contains("# Project Kickoff"));
-
-        let ref_content = fs::read_to_string(vault.join("note/ref.md")).unwrap();
-        assert!(ref_content.contains("[[note/manual-name]]"));
-        assert!(!ref_content.contains("[[Project Kickoff]]"));
-        assert!(!ref_content.contains("[[note/project-kickoff]]"));
-    }
-
-    #[test]
-    fn test_rename_note_filename_rejects_existing_destination() {
-        let dir = TempDir::new().unwrap();
-        let vault = dir.path();
-        create_test_file(vault, "note/current.md", "# Current\n");
-        create_test_file(vault, "note/manual-name.md", "# Existing\n");
-
-        let result = rename_note_filename(
-            vault.to_str().unwrap(),
-            vault.join("note/current.md").to_str().unwrap(),
-            "manual-name",
-        );
-
-        assert_eq!(result.unwrap_err(), "A note with that name already exists");
-    }
-
     #[test]
     fn test_rename_note_with_old_title_hint_updates_wikilinks() {
         // Simulates H1 sync: content already saved with new H1, but wikilinks still use old title.
@@ -902,11 +736,11 @@ mod tests {
         assert!(!vault.join("note/weekly-review.md").exists());
 
         let other_content = fs::read_to_string(vault.join("note/other.md")).unwrap();
-        assert!(other_content.contains("[[note/sprint-retrospective]]"));
+        assert!(other_content.contains("[[Sprint Retrospective]]"));
         assert!(!other_content.contains("[[Weekly Review]]"));
 
         let project_content = fs::read_to_string(vault.join("project/my-project.md")).unwrap();
-        assert!(project_content.contains("[[note/sprint-retrospective]]"));
+        assert!(project_content.contains("[[Sprint Retrospective]]"));
     }
 
     #[test]
@@ -936,7 +770,7 @@ mod tests {
 
         assert_eq!(result.updated_files, 1);
         let other_content = fs::read_to_string(vault.join("note/other.md")).unwrap();
-        assert!(other_content.contains("[[note/sprint-retrospective]]"));
+        assert!(other_content.contains("[[Sprint Retrospective]]"));
     }
 
     #[test]

src/App.test.tsx

@@ -185,27 +185,6 @@ describe('App', () => {
     })
   })
 
-  it('defaults to All Notes when explicit organization is disabled in vault config', async () => {
-    const disabledWorkflowConfig = JSON.stringify({
-      zoom: null,
-      view_mode: null,
-      editor_mode: null,
-      tag_colors: null,
-      status_colors: null,
-      property_display_modes: null,
-      inbox: { noteListProperties: null, explicitOrganization: false },
-    })
-    localStorage.setItem('laputa:vault-config:/Users/mock/Documents/Getting Started', disabledWorkflowConfig)
-    localStorage.setItem('laputa:vault-config:/Volumes/Jupiter/Workspace/laputa-app/demo-vault-v2', disabledWorkflowConfig)
-
-    render(<App />)
-
-    await waitFor(() => {
-      expect(screen.queryByText('Inbox')).not.toBeInTheDocument()
-      expect(screen.getByText('All Notes')).toBeInTheDocument()
-    })
-  })
-
   it('renders status bar', async () => {
     render(<App />)
     // StatusBar should be present

src/App.tsx

@@ -17,7 +17,6 @@ import { SettingsPanel } from './components/SettingsPanel'
 import { GitHubVaultModal } from './components/GitHubVaultModal'
 import { WelcomeScreen } from './components/WelcomeScreen'
 import { TelemetryConsentDialog } from './components/TelemetryConsentDialog'
-import { FeedbackDialog } from './components/FeedbackDialog'
 import { useTelemetry } from './hooks/useTelemetry'
 import { useMcpStatus } from './hooks/useMcpStatus'
 import { useClaudeCodeStatus } from './hooks/useClaudeCodeStatus'
@@ -64,11 +63,6 @@ import { focusNoteIconPropertyEditor } from './components/noteIconPropertyEvents
 import { trackEvent } from './lib/telemetry'
 import { extractDeletedContentFromDiff } from './components/note-list/noteListUtils'
 import { hasNoteIconValue } from './utils/noteIcon'
-import {
-  INBOX_SELECTION,
-  isExplicitOrganizationEnabled,
-  sanitizeSelectionForOrganization,
-} from './utils/organizationWorkflow'
 import './App.css'
 
 // Type declarations for mock content storage and test overrides
@@ -80,7 +74,7 @@ declare global {
   }
 }
 
-const DEFAULT_SELECTION: SidebarSelection = INBOX_SELECTION
+const DEFAULT_SELECTION: SidebarSelection = { kind: 'filter', filter: 'inbox' }
 
 /** Wraps useEditorSave to also keep outgoingLinks in sync on save and on content change. */
 function App() {
@@ -97,9 +91,6 @@ function App() {
   const visibleNotesRef = useRef<VaultEntry[]>([])
   const [toastMessage, setToastMessage] = useState<string | null>(null)
   const dialogs = useDialogs()
-  const [showFeedback, setShowFeedback] = useState(false)
-  const openFeedback = useCallback(() => setShowFeedback(true), [])
-  const closeFeedback = useCallback(() => setShowFeedback(false), [])
 
   // onSwitch closure captures `notes` declared below — safe because it's only
   // called on user interaction, never during render (refs inside the hook
@@ -133,22 +124,6 @@ function App() {
 
   const vault = useVaultLoader(resolvedPath)
   const { config: vaultConfig, updateConfig } = useVaultConfig(resolvedPath)
-  const explicitOrganizationEnabled = isExplicitOrganizationEnabled(vaultConfig.inbox?.explicitOrganization)
-  const effectiveSelection = sanitizeSelectionForOrganization(selection, vaultConfig.inbox?.explicitOrganization)
-
-  useEffect(() => {
-    if (effectiveSelection !== selection) {
-      setSelection(effectiveSelection)
-      setNoteListFilter('open')
-    }
-  }, [effectiveSelection, selection])
-
-  const handleSaveExplicitOrganization = useCallback((enabled: boolean) => {
-    updateConfig('inbox', {
-      noteListProperties: vaultConfig.inbox?.noteListProperties ?? null,
-      explicitOrganization: enabled,
-    })
-  }, [updateConfig, vaultConfig.inbox?.noteListProperties])
   const { settings, loaded: settingsLoaded, saveSettings } = useSettings()
   useTelemetry(settings, settingsLoaded)
 
@@ -288,13 +263,6 @@ function App() {
     replaceEntry: vault.replaceEntry, resolvedPath,
   })
 
-  const handleFilenameRename = useCallback((path: string, newFilenameStem: string) => {
-    appSave.savePendingForPath(path)
-      .then(() => notes.handleRenameFilename(path, newFilenameStem, resolvedPath, vault.replaceEntry))
-      .then(vault.loadModifiedFiles)
-      .catch((err) => console.error('Filename rename failed:', err))
-  }, [appSave, notes, resolvedPath, vault])
-
   const aiActivity = useAiActivity({
     onOpenNote: vaultBridge.openNoteByPath,
     onOpenTab: vaultBridge.openNoteByPath,
@@ -533,7 +501,7 @@ function App() {
     visibleNotesRef,
     modifiedCount: vault.modifiedFiles.length,
     activeNoteModified: vault.modifiedFiles.some(f => f.path === notes.activeTabPath),
-    selection: effectiveSelection,
+    selection,
     onQuickOpen: dialogs.openQuickOpen, onCommandPalette: dialogs.openCommandPalette,
     onSearch: dialogs.openSearch,
     onCreateNote: notes.handleCreateNoteImmediate,
@@ -541,7 +509,6 @@ function App() {
     onCreateNoteOfType: notes.handleCreateNoteImmediate,
     onSave: appSave.handleSave,
     onOpenSettings: dialogs.openSettings,
-    onOpenFeedback: openFeedback,
     onDeleteNote: deleteActions.handleDeleteNote,
     onArchiveNote: entryActions.handleArchiveNote, onUnarchiveNote: entryActions.handleUnarchiveNote,
     onCommitPush: commitFlow.openCommitDialog,
@@ -554,7 +521,6 @@ function App() {
     onZoomIn: zoom.zoomIn, onZoomOut: zoom.zoomOut, onZoomReset: zoom.zoomReset,
     zoomLevel: zoom.zoomLevel,
     onSelect: handleSetSelection,
-    showInbox: explicitOrganizationEnabled,
     onReplaceActiveTab: notes.handleReplaceActiveTab,
     onSelectNote: notes.handleSelectNote,
     onGoBack: handleGoBack, onGoForward: handleGoForward,
@@ -583,9 +549,9 @@ function App() {
     onSetNoteListFilter: setNoteListFilter,
     onOpenInNewWindow: handleOpenInNewWindow,
     onToggleFavorite: entryActions.handleToggleFavorite,
-    onToggleOrganized: explicitOrganizationEnabled ? entryActions.handleToggleOrganized : undefined,
+    onToggleOrganized: entryActions.handleToggleOrganized,
     onCustomizeInboxColumns: handleCustomizeInboxColumns,
-    canCustomizeInboxColumns: explicitOrganizationEnabled && effectiveSelection.kind === 'filter' && effectiveSelection.filter === 'inbox',
+    canCustomizeInboxColumns: selection.kind === 'filter' && selection.filter === 'inbox',
     onRestoreDeletedNote: activeDeletedFile ? () => { void handleDiscardFile(activeDeletedFile.relativePath) } : undefined,
     canRestoreDeletedNote: !!activeDeletedFile,
   })
@@ -595,18 +561,18 @@ function App() {
   const inboxCount = useMemo(() => filterInboxEntries(vault.entries, inboxPeriod).length, [vault.entries, inboxPeriod])
 
   const aiNoteList = useMemo<NoteListItem[]>(() => {
-    const isInbox = effectiveSelection.kind === 'filter' && effectiveSelection.filter === 'inbox'
-    const filtered = isInbox ? filterInboxEntries(vault.entries, inboxPeriod) : filterEntries(vault.entries, effectiveSelection, undefined, vault.views)
+    const isInbox = selection.kind === 'filter' && selection.filter === 'inbox'
+    const filtered = isInbox ? filterInboxEntries(vault.entries, inboxPeriod) : filterEntries(vault.entries, selection, undefined, vault.views)
     return filtered.map(e => ({
       path: e.path, title: e.title, type: e.isA ?? 'Note',
     }))
-  }, [vault.entries, vault.views, effectiveSelection, inboxPeriod])
+  }, [vault.entries, vault.views, selection, inboxPeriod])
 
   const aiNoteListFilter = useMemo(() => {
-    if (effectiveSelection.kind === 'sectionGroup') return { type: effectiveSelection.type, query: '' }
-    if (effectiveSelection.kind === 'entity') return { type: null, query: effectiveSelection.entry.title }
+    if (selection.kind === 'sectionGroup') return { type: selection.type, query: '' }
+    if (selection.kind === 'entity') return { type: null, query: selection.entry.title }
     return { type: null, query: '' }
-  }, [effectiveSelection])
+  }, [selection])
 
   // 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')) {
@@ -656,7 +622,7 @@ function App() {
         {sidebarVisible && (
           <>
             <div className="app__sidebar" style={{ width: layout.sidebarWidth }}>
-              <Sidebar entries={vault.entries} folders={vault.folders} views={vault.views} selection={effectiveSelection} onSelect={handleSetSelection} onSelectNote={notes.handleSelectNote} onSelectFavorite={notes.handleSelectNote} onReorderFavorites={entryActions.handleReorderFavorites} onCreateType={notes.handleCreateNoteImmediate} onCreateNewType={dialogs.openCreateType} onCustomizeType={entryActions.handleCustomizeType} onUpdateTypeTemplate={entryActions.handleUpdateTypeTemplate} onReorderSections={entryActions.handleReorderSections} onRenameSection={entryActions.handleRenameSection} onToggleTypeVisibility={entryActions.handleToggleTypeVisibility} onCreateFolder={handleCreateFolder} onCreateView={dialogs.openCreateView} onEditView={handleEditView} onDeleteView={handleDeleteView} showInbox={explicitOrganizationEnabled} inboxCount={inboxCount} />
+              <Sidebar entries={vault.entries} folders={vault.folders} views={vault.views} selection={selection} onSelect={handleSetSelection} onSelectNote={notes.handleSelectNote} onSelectFavorite={notes.handleSelectNote} onReorderFavorites={entryActions.handleReorderFavorites} onCreateType={notes.handleCreateNoteImmediate} onCreateNewType={dialogs.openCreateType} onCustomizeType={entryActions.handleCustomizeType} onUpdateTypeTemplate={entryActions.handleUpdateTypeTemplate} onReorderSections={entryActions.handleReorderSections} onRenameSection={entryActions.handleRenameSection} onToggleTypeVisibility={entryActions.handleToggleTypeVisibility} onCreateFolder={handleCreateFolder} onCreateView={dialogs.openCreateView} onEditView={handleEditView} onDeleteView={handleDeleteView} inboxCount={inboxCount} />
             </div>
             <ResizeHandle onResize={layout.handleSidebarResize} />
           </>
@@ -664,10 +630,10 @@ function App() {
         {noteListVisible && (
           <>
             <div className={`app__note-list${aiActivity.highlightElement === 'notelist' ? ' ai-highlight' : ''}`} style={{ width: layout.noteListWidth }}>
-              {effectiveSelection.kind === 'filter' && effectiveSelection.filter === 'pulse' ? (
+              {selection.kind === 'filter' && selection.filter === 'pulse' ? (
                 <PulseView vaultPath={resolvedPath} onOpenNote={vaultBridge.handlePulseOpenNote} sidebarCollapsed={!sidebarVisible} onExpandSidebar={() => setViewMode('all')} />
               ) : (
-                <NoteList entries={vault.entries} selection={effectiveSelection} selectedNote={activeTab?.entry ?? null} noteListFilter={noteListFilter} onNoteListFilterChange={setNoteListFilter} inboxPeriod={inboxPeriod} modifiedFiles={vault.modifiedFiles} modifiedFilesError={vault.modifiedFilesError} getNoteStatus={vault.getNoteStatus} sidebarCollapsed={!sidebarVisible} onSelectNote={notes.handleSelectNote} onReplaceActiveTab={notes.handleReplaceActiveTab} onCreateNote={notes.handleCreateNoteImmediate} onBulkArchive={bulkActions.handleBulkArchive} onBulkDeletePermanently={deleteActions.handleBulkDeletePermanently} onUpdateTypeSort={notes.handleUpdateFrontmatter} updateEntry={vault.updateEntry} onOpenInNewWindow={handleOpenEntryInNewWindow} onDiscardFile={handleDiscardFile} onAutoTriggerDiff={() => diffToggleRef.current()} onOpenDeletedNote={handleOpenDeletedNote} inboxNoteListProperties={vaultConfig.inbox?.noteListProperties ?? null} onUpdateInboxNoteListProperties={handleUpdateInboxNoteListProperties} views={vault.views} visibleNotesRef={visibleNotesRef} />
+                <NoteList entries={vault.entries} selection={selection} selectedNote={activeTab?.entry ?? null} noteListFilter={noteListFilter} onNoteListFilterChange={setNoteListFilter} inboxPeriod={inboxPeriod} modifiedFiles={vault.modifiedFiles} modifiedFilesError={vault.modifiedFilesError} getNoteStatus={vault.getNoteStatus} sidebarCollapsed={!sidebarVisible} onSelectNote={notes.handleSelectNote} onReplaceActiveTab={notes.handleReplaceActiveTab} onCreateNote={notes.handleCreateNoteImmediate} onBulkArchive={bulkActions.handleBulkArchive} onBulkDeletePermanently={deleteActions.handleBulkDeletePermanently} onUpdateTypeSort={notes.handleUpdateFrontmatter} updateEntry={vault.updateEntry} onOpenInNewWindow={handleOpenEntryInNewWindow} onDiscardFile={handleDiscardFile} onAutoTriggerDiff={() => diffToggleRef.current()} onOpenDeletedNote={handleOpenDeletedNote} inboxNoteListProperties={vaultConfig.inbox?.noteListProperties ?? null} onUpdateInboxNoteListProperties={handleUpdateInboxNoteListProperties} views={vault.views} visibleNotesRef={visibleNotesRef} />
               )}
             </div>
             <ResizeHandle onResize={layout.handleNoteListResize} />
@@ -701,14 +667,13 @@ function App() {
             noteList={aiNoteList}
             noteListFilter={aiNoteListFilter}
             onToggleFavorite={activeDeletedFile ? undefined : entryActions.handleToggleFavorite}
-            onToggleOrganized={activeDeletedFile || !explicitOrganizationEnabled ? undefined : entryActions.handleToggleOrganized}
+            onToggleOrganized={activeDeletedFile ? undefined : entryActions.handleToggleOrganized}
             onDeleteNote={activeDeletedFile ? undefined : deleteActions.handleDeleteNote}
             onArchiveNote={activeDeletedFile ? undefined : entryActions.handleArchiveNote}
             onUnarchiveNote={activeDeletedFile ? undefined : entryActions.handleUnarchiveNote}
             onContentChange={appSave.handleContentChange}
             onSave={appSave.handleSave}
             onTitleSync={activeDeletedFile ? undefined : appSave.handleTitleSync}
-            onRenameFilename={activeDeletedFile ? undefined : handleFilenameRename}
             rawToggleRef={rawToggleRef}
             diffToggleRef={diffToggleRef}
             canGoBack={canGoBack}
@@ -727,7 +692,7 @@ function App() {
       </div>
       <UpdateBanner status={updateStatus} actions={updateActions} />
       <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} onOpenFeedback={openFeedback} 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} claudeCodeStatus={claudeCodeStatus} claudeCodeVersion={claudeCodeVersion} />
+      <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} claudeCodeStatus={claudeCodeStatus} claudeCodeVersion={claudeCodeVersion} />
       <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} />
@@ -746,8 +711,7 @@ function App() {
         onCommit={conflictResolver.commitResolution}
         onClose={conflictFlow.handleCloseConflictResolver}
       />
-      <SettingsPanel open={dialogs.showSettings} settings={settings} onSave={saveSettings} explicitOrganizationEnabled={explicitOrganizationEnabled} onSaveExplicitOrganization={handleSaveExplicitOrganization} onClose={dialogs.closeSettings} />
-      <FeedbackDialog open={showFeedback} onClose={closeFeedback} />
+      <SettingsPanel open={dialogs.showSettings} settings={settings} onSave={saveSettings} onClose={dialogs.closeSettings} />
       <GitHubVaultModal
         open={dialogs.showGitHubVault}
         githubToken={settings.github_token}

src/components/ArchivedNoteBanner.test.tsx

@@ -9,12 +9,12 @@ describe('ArchivedNoteBanner', () => {
     expect(screen.getByText('Archived')).toBeTruthy()
   })
 
-  it('renders unarchive button without the stale archive shortcut hint', () => {
+  it('renders unarchive button with keyboard hint', () => {
     render(<ArchivedNoteBanner onUnarchive={vi.fn()} />)
     const btn = screen.getByTestId('unarchive-btn')
     expect(btn).toBeTruthy()
     expect(btn.textContent).toContain('Unarchive')
-    expect(btn.title).toBe('Unarchive')
+    expect(btn.title).toBe('Unarchive (Cmd+E)')
   })
 
   it('calls onUnarchive when button is clicked', () => {

src/components/ArchivedNoteBanner.tsx

@@ -38,7 +38,7 @@ export function ArchivedNoteBanner({ onUnarchive }: ArchivedNoteBannerProps) {
           color: 'var(--muted-foreground)',
           cursor: 'pointer',
         }}
-        title="Unarchive"
+        title="Unarchive (Cmd+E)"
       >
         <ArrowUUpLeft size={12} />
         Unarchive

src/components/BreadcrumbBar.test.tsx

@@ -74,43 +74,31 @@ describe('BreadcrumbBar — delete', () => {
 describe('BreadcrumbBar — archive/unarchive', () => {
   it('shows archive button for non-archived note', () => {
     render(<BreadcrumbBar entry={baseEntry} {...defaultProps} onArchive={vi.fn()} onUnarchive={vi.fn()} />)
-    expect(screen.getByTitle('Archive')).toBeInTheDocument()
-    expect(screen.queryByTitle('Unarchive')).not.toBeInTheDocument()
+    expect(screen.getByTitle('Archive (Cmd+E)')).toBeInTheDocument()
+    expect(screen.queryByTitle('Unarchive (Cmd+E)')).not.toBeInTheDocument()
   })
 
   it('shows unarchive button for archived note', () => {
     render(<BreadcrumbBar entry={archivedEntry} {...defaultProps} onArchive={vi.fn()} onUnarchive={vi.fn()} />)
-    expect(screen.getByTitle('Unarchive')).toBeInTheDocument()
-    expect(screen.queryByTitle('Archive')).not.toBeInTheDocument()
+    expect(screen.getByTitle('Unarchive (Cmd+E)')).toBeInTheDocument()
+    expect(screen.queryByTitle('Archive (Cmd+E)')).not.toBeInTheDocument()
   })
 
   it('calls onArchive when archive button is clicked', () => {
     const onArchive = vi.fn()
     render(<BreadcrumbBar entry={baseEntry} {...defaultProps} onArchive={onArchive} />)
-    fireEvent.click(screen.getByTitle('Archive'))
+    fireEvent.click(screen.getByTitle('Archive (Cmd+E)'))
     expect(onArchive).toHaveBeenCalledOnce()
   })
 
   it('calls onUnarchive when unarchive button is clicked', () => {
     const onUnarchive = vi.fn()
     render(<BreadcrumbBar entry={archivedEntry} {...defaultProps} onUnarchive={onUnarchive} />)
-    fireEvent.click(screen.getByTitle('Unarchive'))
+    fireEvent.click(screen.getByTitle('Unarchive (Cmd+E)'))
     expect(onUnarchive).toHaveBeenCalledOnce()
   })
 })
 
-describe('BreadcrumbBar — organized shortcut hint', () => {
-  it('shows Cmd+E on the organized toggle tooltip', () => {
-    render(<BreadcrumbBar entry={baseEntry} {...defaultProps} onToggleOrganized={vi.fn()} />)
-    expect(screen.getByTitle('Mark as organized (remove from Inbox) (Cmd+E)')).toBeInTheDocument()
-  })
-
-  it('hides the organized toggle when the workflow is disabled', () => {
-    render(<BreadcrumbBar entry={baseEntry} {...defaultProps} />)
-    expect(screen.queryByTitle('Mark as organized (remove from Inbox) (Cmd+E)')).not.toBeInTheDocument()
-  })
-})
-
 describe('BreadcrumbBar — title in breadcrumb (always rendered, CSS-toggled)', () => {
   it('always renders title elements in the DOM', () => {
     render(<BreadcrumbBar entry={baseEntry} {...defaultProps} />)
@@ -137,95 +125,13 @@ describe('BreadcrumbBar — title in breadcrumb (always rendered, CSS-toggled)',
     expect(screen.getByText('Note')).toBeInTheDocument()
   })
 
-  it('separator visibility is controlled by data-title-hidden while using the shared border chrome', () => {
+  it('shadow is controlled by data-title-hidden attribute via CSS', () => {
     const { container } = render(<BreadcrumbBar entry={baseEntry} {...defaultProps} />)
     const bar = container.querySelector('.breadcrumb-bar')!
-    expect(bar).toHaveClass('border-b', 'border-transparent')
     expect(bar).not.toHaveAttribute('data-title-hidden')
     bar.setAttribute('data-title-hidden', '')
     expect(bar).toHaveAttribute('data-title-hidden')
   })
-
-  it('uses the active separator state when raw mode forces the title into the breadcrumb', () => {
-    const { container } = render(
-      <BreadcrumbBar entry={baseEntry} {...defaultProps} rawMode onToggleRaw={vi.fn()} />,
-    )
-
-    expect(container.querySelector('.breadcrumb-bar')).toHaveAttribute('data-title-hidden')
-  })
-
-  it('keeps the breadcrumb title visible when the separate title section is absent', () => {
-    const { container } = render(
-      <BreadcrumbBar entry={baseEntry} {...defaultProps} showTitleSection={false} />,
-    )
-
-    expect(container.querySelector('.breadcrumb-bar')).toHaveAttribute('data-title-hidden')
-  })
-})
-
-describe('BreadcrumbBar — filename controls', () => {
-  it('shows the sync button when the filename diverges from the title slug', () => {
-    const entry = { ...baseEntry, title: 'Fresh Title', filename: 'untitled-note-123.md' }
-    render(<BreadcrumbBar entry={entry} {...defaultProps} onRenameFilename={vi.fn()} />)
-    expect(screen.getByTestId('breadcrumb-sync-button')).toBeInTheDocument()
-  })
-
-  it('hides the sync button when the filename already matches the title slug', () => {
-    const entry = { ...baseEntry, title: 'Test Note', filename: 'test-note.md' }
-    render(<BreadcrumbBar entry={entry} {...defaultProps} onRenameFilename={vi.fn()} />)
-    expect(screen.queryByTestId('breadcrumb-sync-button')).not.toBeInTheDocument()
-  })
-
-  it('clicking the sync button renames the file to the title slug', () => {
-    const onRenameFilename = vi.fn()
-    const entry = { ...baseEntry, title: 'Fresh Title', filename: 'untitled-note-123.md' }
-    render(<BreadcrumbBar entry={entry} {...defaultProps} onRenameFilename={onRenameFilename} />)
-    fireEvent.click(screen.getByTestId('breadcrumb-sync-button'))
-    expect(onRenameFilename).toHaveBeenCalledWith(entry.path, 'fresh-title')
-  })
-
-  it('lets keyboard users press Enter on the filename to start editing', () => {
-    render(<BreadcrumbBar entry={baseEntry} {...defaultProps} onRenameFilename={vi.fn()} />)
-    fireEvent.keyDown(screen.getByTestId('breadcrumb-filename-trigger'), { key: 'Enter' })
-    expect(screen.getByTestId('breadcrumb-filename-input')).toHaveValue('test')
-  })
-
-  it('double-clicking the filename enters edit mode and Enter confirms the rename', () => {
-    const onRenameFilename = vi.fn()
-    render(<BreadcrumbBar entry={baseEntry} {...defaultProps} onRenameFilename={onRenameFilename} />)
-
-    fireEvent.doubleClick(screen.getByTestId('breadcrumb-filename-trigger'))
-    const input = screen.getByTestId('breadcrumb-filename-input')
-    fireEvent.change(input, { target: { value: 'renamed-file' } })
-    fireEvent.keyDown(input, { key: 'Enter' })
-
-    expect(onRenameFilename).toHaveBeenCalledWith(baseEntry.path, 'renamed-file')
-  })
-
-  it('pressing Escape while editing cancels the inline rename', () => {
-    const onRenameFilename = vi.fn()
-    render(<BreadcrumbBar entry={baseEntry} {...defaultProps} onRenameFilename={onRenameFilename} />)
-
-    fireEvent.doubleClick(screen.getByTestId('breadcrumb-filename-trigger'))
-    const input = screen.getByTestId('breadcrumb-filename-input')
-    fireEvent.change(input, { target: { value: 'renamed-file' } })
-    fireEvent.keyDown(input, { key: 'Escape' })
-
-    expect(onRenameFilename).not.toHaveBeenCalled()
-    expect(screen.queryByTestId('breadcrumb-filename-input')).not.toBeInTheDocument()
-  })
-
-  it('blur confirms the inline rename when the value changed', () => {
-    const onRenameFilename = vi.fn()
-    render(<BreadcrumbBar entry={baseEntry} {...defaultProps} onRenameFilename={onRenameFilename} />)
-
-    fireEvent.doubleClick(screen.getByTestId('breadcrumb-filename-trigger'))
-    const input = screen.getByTestId('breadcrumb-filename-input')
-    fireEvent.change(input, { target: { value: 'renamed-on-blur' } })
-    fireEvent.blur(input)
-
-    expect(onRenameFilename).toHaveBeenCalledWith(baseEntry.path, 'renamed-on-blur')
-  })
 })
 
 describe('BreadcrumbBar — action buttons always right-aligned', () => {

src/components/BreadcrumbBar.tsx

@@ -1,9 +1,6 @@
-import { memo, useCallback, useEffect, useMemo, useRef, useState, type CSSProperties, type KeyboardEvent, type ReactNode } from 'react'
+import { memo } from 'react'
 import type { VaultEntry } from '../types'
 import { cn } from '@/lib/utils'
-import { Button } from '@/components/ui/button'
-import { Input } from '@/components/ui/input'
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
 import {
   MagnifyingGlass,
   GitBranch,
@@ -17,10 +14,8 @@ import {
   ArrowUUpLeft,
   Star,
   CheckCircle,
-  ArrowsClockwise,
 } from '@phosphor-icons/react'
 import { NoteTitleIcon } from './NoteTitleIcon'
-import { slugify } from '../hooks/useNoteCreation'
 
 interface BreadcrumbBarProps {
   entry: VaultEntry
@@ -42,466 +37,182 @@ interface BreadcrumbBarProps {
   onDelete?: () => void
   onArchive?: () => void
   onUnarchive?: () => void
-  onRenameFilename?: (path: string, newFilenameStem: string) => void
-  showTitleSection?: boolean
   /** Ref for direct DOM manipulation — avoids re-render on scroll. */
   barRef?: React.Ref<HTMLDivElement>
 }
 
 const DISABLED_ICON_STYLE = { opacity: 0.4, cursor: 'not-allowed' } as const
 
-function IconActionButton({
-  title,
-  onClick,
-  className,
-  style,
-  disabled,
-  tabIndex,
-  children,
-  testId,
-}: {
-  title: string
-  onClick?: () => void
-  className?: string
-  style?: CSSProperties
-  disabled?: boolean
-  tabIndex?: number
-  children: ReactNode
-  testId?: string
-}) {
-  return (
-    <Button
-      type="button"
-      variant="ghost"
-      size="icon-xs"
-      className={cn('text-muted-foreground', className)}
-      style={style}
-      onClick={onClick}
-      disabled={disabled}
-      tabIndex={tabIndex}
-      title={title}
-      data-testid={testId}
-    >
-      {children}
-    </Button>
-  )
-}
-
 function RawToggleButton({ rawMode, onToggleRaw }: { rawMode?: boolean; onToggleRaw?: () => void }) {
   return (
-    <IconActionButton
-      title={rawMode ? 'Back to editor' : 'Raw editor'}
+    <button
+      className={cn(
+        'flex items-center justify-center border-none bg-transparent p-0 cursor-pointer transition-colors',
+        rawMode ? 'text-foreground' : 'text-muted-foreground hover:text-foreground',
+      )}
       onClick={onToggleRaw}
-      className={cn(rawMode ? 'text-foreground' : 'hover:text-foreground')}
+      title={rawMode ? 'Back to editor' : 'Raw editor'}
     >
       <Code size={16} />
-    </IconActionButton>
+    </button>
   )
 }
 
-function FavoriteAction({ favorite, onToggleFavorite }: { favorite: boolean; onToggleFavorite?: () => void }) {
-  return (
-    <IconActionButton
-      title={favorite ? 'Remove from favorites' : 'Add to favorites'}
-      onClick={onToggleFavorite}
-      className={cn(favorite ? 'text-yellow-500' : 'hover:text-foreground')}
-    >
-      <Star size={16} weight={favorite ? 'fill' : 'regular'} />
-    </IconActionButton>
-  )
-}
-
-function OrganizedAction({
-  organized,
-  onToggleOrganized,
-}: {
-  organized: boolean
-  onToggleOrganized?: () => void
-}) {
-  if (!onToggleOrganized) return null
-  return (
-    <IconActionButton
-      title={organized ? 'Mark as unorganized (back to Inbox) (Cmd+E)' : 'Mark as organized (remove from Inbox) (Cmd+E)'}
-      onClick={onToggleOrganized}
-      className={cn(organized ? 'text-green-600' : 'hover:text-foreground')}
-    >
-      <CheckCircle size={16} weight={organized ? 'fill' : 'regular'} />
-    </IconActionButton>
-  )
-}
-
-function SearchAction() {
-  return (
-    <IconActionButton title="Search in file" className="hover:text-foreground">
-      <MagnifyingGlass size={16} />
-    </IconActionButton>
-  )
-}
-
-function DiffAction({
-  showDiffToggle,
-  diffMode,
-  diffLoading,
-  onToggleDiff,
-}: Pick<BreadcrumbBarProps, 'showDiffToggle' | 'diffMode' | 'diffLoading' | 'onToggleDiff'>) {
-  if (!showDiffToggle) {
-    return (
-      <IconActionButton title="No changes" style={DISABLED_ICON_STYLE} tabIndex={-1}>
-        <GitBranch size={16} />
-      </IconActionButton>
-    )
-  }
-
-  return (
-    <IconActionButton
-      title={diffLoading ? 'Loading diff...' : diffMode ? 'Back to editor' : 'Show diff'}
-      onClick={onToggleDiff}
-      disabled={diffLoading}
-      className={cn(diffMode ? 'text-foreground' : 'hover:text-foreground')}
-    >
-      <GitBranch size={16} />
-    </IconActionButton>
-  )
-}
-
-function PlaceholderAction({ title, children }: { title: string; children: ReactNode }) {
-  return (
-    <IconActionButton title={title} style={DISABLED_ICON_STYLE} tabIndex={-1}>
-      {children}
-    </IconActionButton>
-  )
-}
-
-function AIChatAction({ showAIChat, onToggleAIChat }: Pick<BreadcrumbBarProps, 'showAIChat' | 'onToggleAIChat'>) {
-  return (
-    <IconActionButton
-      title={showAIChat ? 'Close AI Chat' : 'Open AI Chat'}
-      onClick={onToggleAIChat}
-      className={cn(showAIChat ? 'text-primary' : 'hover:text-foreground')}
-    >
-      <Sparkle size={16} weight={showAIChat ? 'fill' : 'regular'} />
-    </IconActionButton>
-  )
-}
-
-function ArchiveAction({
-  archived,
-  onArchive,
-  onUnarchive,
-}: Pick<VaultEntry, 'archived'> & Pick<BreadcrumbBarProps, 'onArchive' | 'onUnarchive'>) {
-  if (archived) {
-    return (
-      <IconActionButton title="Unarchive" onClick={onUnarchive} className="hover:text-foreground">
-        <ArrowUUpLeft size={16} />
-      </IconActionButton>
-    )
-  }
-
-  return (
-    <IconActionButton title="Archive" onClick={onArchive} className="hover:text-foreground">
-      <Archive size={16} />
-    </IconActionButton>
-  )
-}
-
-function DeleteAction({ onDelete }: Pick<BreadcrumbBarProps, 'onDelete'>) {
-  return (
-    <IconActionButton title="Delete (Cmd+Delete)" onClick={onDelete} className="hover:text-destructive">
-      <Trash size={16} />
-    </IconActionButton>
-  )
-}
-
-function InspectorAction({
-  inspectorCollapsed,
-  onToggleInspector,
-}: Pick<BreadcrumbBarProps, 'inspectorCollapsed' | 'onToggleInspector'>) {
-  if (!inspectorCollapsed) return null
-  return (
-    <IconActionButton title="Properties (⌘⇧I)" onClick={onToggleInspector} className="hover:text-foreground">
-      <SlidersHorizontal size={16} />
-    </IconActionButton>
-  )
-}
-
-function normalizeFilenameStemInput(value: string): string {
-  const trimmed = value.trim()
-  return trimmed.replace(/\.md$/i, '').trim()
-}
-
-function deriveSyncStem(entry: VaultEntry): string | null {
-  const expectedStem = slugify(entry.title.trim())
-  const filenameStem = entry.filename.replace(/\.md$/, '')
-  if (!expectedStem || expectedStem === filenameStem) return null
-  return expectedStem
-}
-
-function FilenameInput({
-  inputRef,
-  draftStem,
-  onDraftStemChange,
-  onBlur,
-  onKeyDown,
-}: {
-  inputRef: React.RefObject<HTMLInputElement | null>
-  draftStem: string
-  onDraftStemChange: (nextValue: string) => void
-  onBlur: () => void
-  onKeyDown: (event: KeyboardEvent<HTMLInputElement>) => void
-}) {
-  return (
-    <Input
-      ref={inputRef}
-      value={draftStem}
-      onChange={(event) => onDraftStemChange(event.target.value)}
-      onBlur={onBlur}
-      onKeyDown={onKeyDown}
-      className="h-7 w-[180px] text-sm"
-      data-testid="breadcrumb-filename-input"
-      aria-label="Rename filename"
-    />
-  )
-}
-
-function FilenameTrigger({
-  entry,
-  filenameStem,
-  onStartEditing,
-}: {
-  entry: VaultEntry
-  filenameStem: string
-  onStartEditing: () => void
-}) {
-  const handleKeyDown = useCallback((event: KeyboardEvent<HTMLButtonElement>) => {
-    if (event.key !== 'Enter') return
-    event.preventDefault()
-    onStartEditing()
-  }, [onStartEditing])
-
-  return (
-    <Button
-      type="button"
-      variant="ghost"
-      size="xs"
-      className="h-auto min-w-0 gap-1 px-0 py-0 text-sm font-medium text-foreground hover:bg-transparent hover:text-foreground"
-      onDoubleClick={onStartEditing}
-      onKeyDown={handleKeyDown}
-      data-testid="breadcrumb-filename-trigger"
-      aria-label={`Filename ${filenameStem}. Press Enter to rename`}
-    >
-      <NoteTitleIcon icon={entry.icon} size={15} testId="breadcrumb-note-icon" />
-      <span className="truncate">{filenameStem}</span>
-    </Button>
-  )
-}
-
-function SyncFilenameButton({
-  entryPath,
-  syncStem,
-  onRenameFilename,
-}: {
-  entryPath: string
-  syncStem: string | null
-  onRenameFilename?: (path: string, newFilenameStem: string) => void
-}) {
-  if (!syncStem || !onRenameFilename) return null
-  return (
-    <TooltipProvider delayDuration={100}>
-      <Tooltip>
-        <TooltipTrigger asChild>
-          <Button
-            type="button"
-            variant="ghost"
-            size="icon-xs"
-            className="text-muted-foreground hover:text-foreground"
-            onClick={() => onRenameFilename(entryPath, syncStem)}
-            data-testid="breadcrumb-sync-button"
-            aria-label="Rename file to match title"
-          >
-            <ArrowsClockwise size={14} />
-          </Button>
-        </TooltipTrigger>
-        <TooltipContent>
-          Rename file to match title
-        </TooltipContent>
-      </Tooltip>
-    </TooltipProvider>
-  )
-}
-
-function FilenameDisplay({
-  entry,
-  filenameStem,
-  syncStem,
-  onRenameFilename,
-  onStartEditing,
-}: {
-  entry: VaultEntry
-  filenameStem: string
-  syncStem: string | null
-  onRenameFilename?: (path: string, newFilenameStem: string) => void
-  onStartEditing: () => void
-}) {
-  return (
-    <div className="flex min-w-0 items-center gap-1">
-      <FilenameTrigger entry={entry} filenameStem={filenameStem} onStartEditing={onStartEditing} />
-      <SyncFilenameButton entryPath={entry.path} syncStem={syncStem} onRenameFilename={onRenameFilename} />
-    </div>
-  )
-}
-
-function FilenameCrumb({ entry, onRenameFilename }: Pick<BreadcrumbBarProps, 'entry' | 'onRenameFilename'>) {
-  const filenameStem = useMemo(() => entry.filename.replace(/\.md$/, ''), [entry.filename])
-  const syncStem = useMemo(() => deriveSyncStem(entry), [entry])
-  const [isEditing, setIsEditing] = useState(false)
-  const [draftStem, setDraftStem] = useState(filenameStem)
-  const inputRef = useRef<HTMLInputElement>(null)
-
-  useEffect(() => {
-    if (!isEditing) return
-    inputRef.current?.focus()
-    inputRef.current?.select()
-  }, [isEditing])
-
-  const startEditing = useCallback(() => {
-    if (!onRenameFilename) return
-    setDraftStem(filenameStem)
-    setIsEditing(true)
-  }, [onRenameFilename, filenameStem])
-
-  const cancelEditing = useCallback(() => {
-    setDraftStem(filenameStem)
-    setIsEditing(false)
-  }, [filenameStem])
-
-  const submitRename = useCallback(() => {
-    const nextStem = normalizeFilenameStemInput(draftStem)
-    setIsEditing(false)
-    if (!nextStem || nextStem === filenameStem) return
-    onRenameFilename?.(entry.path, nextStem)
-  }, [draftStem, filenameStem, onRenameFilename, entry.path])
-
-  const handleInputKeyDown = useCallback((event: KeyboardEvent<HTMLInputElement>) => {
-    if (event.key === 'Enter') {
-      event.preventDefault()
-      submitRename()
-      return
-    }
-    if (event.key === 'Escape') {
-      event.preventDefault()
-      cancelEditing()
-    }
-  }, [submitRename, cancelEditing])
-
-  if (isEditing) {
-    return (
-      <FilenameInput
-        inputRef={inputRef}
-        draftStem={draftStem}
-        onDraftStemChange={setDraftStem}
-        onBlur={submitRename}
-        onKeyDown={handleInputKeyDown}
-      />
-    )
-  }
-
-  return (
-    <FilenameDisplay
-      entry={entry}
-      filenameStem={filenameStem}
-      syncStem={syncStem}
-      onRenameFilename={onRenameFilename}
-      onStartEditing={startEditing}
-    />
-  )
-}
-
-function BreadcrumbActions({
-  entry,
-  showDiffToggle,
-  diffMode,
-  diffLoading,
-  onToggleDiff,
-  rawMode,
-  onToggleRaw,
-  forceRawMode,
-  showAIChat,
-  onToggleAIChat,
-  inspectorCollapsed,
-  onToggleInspector,
-  onToggleFavorite,
-  onToggleOrganized,
-  onDelete,
-  onArchive,
-  onUnarchive,
-}: Omit<BreadcrumbBarProps, 'wordCount' | 'barRef' | 'onRenameFilename'>) {
+function BreadcrumbActions({ entry, showDiffToggle, diffMode, diffLoading, onToggleDiff,
+  rawMode, onToggleRaw, forceRawMode,
+  showAIChat, onToggleAIChat, inspectorCollapsed, onToggleInspector,
+  onToggleFavorite, onToggleOrganized, onDelete, onArchive, onUnarchive,
+}: Omit<BreadcrumbBarProps, 'wordCount'>) {
   return (
     <div className="breadcrumb-bar__actions ml-auto flex items-center" style={{ gap: 12 }}>
-      <FavoriteAction favorite={entry.favorite} onToggleFavorite={onToggleFavorite} />
-      <OrganizedAction organized={entry.organized} onToggleOrganized={onToggleOrganized} />
-      <SearchAction />
-      <DiffAction
-        showDiffToggle={showDiffToggle}
-        diffMode={diffMode}
-        diffLoading={diffLoading}
-        onToggleDiff={onToggleDiff}
-      />
+      <button
+        className={cn(
+          "flex items-center justify-center border-none bg-transparent p-0 cursor-pointer transition-colors",
+          entry.favorite ? "text-yellow-500" : "text-muted-foreground hover:text-foreground"
+        )}
+        onClick={onToggleFavorite}
+        title={entry.favorite ? 'Remove from favorites' : 'Add to favorites'}
+      >
+        <Star size={16} weight={entry.favorite ? 'fill' : 'regular'} />
+      </button>
+      <button
+        className={cn(
+          "flex items-center justify-center border-none bg-transparent p-0 cursor-pointer transition-colors",
+          entry.organized ? "text-green-600" : "text-muted-foreground hover:text-foreground"
+        )}
+        onClick={onToggleOrganized}
+        title={entry.organized ? 'Mark as unorganized (back to Inbox)' : 'Mark as organized (remove from Inbox)'}
+      >
+        <CheckCircle size={16} weight={entry.organized ? 'fill' : 'regular'} />
+      </button>
+      <button
+        className="flex items-center justify-center border-none bg-transparent p-0 text-muted-foreground cursor-pointer hover:text-foreground transition-colors"
+        title="Search in file"
+      >
+        <MagnifyingGlass size={16} />
+      </button>
+      {showDiffToggle ? (
+        <button
+          className={cn(
+            "flex items-center justify-center border-none bg-transparent p-0 cursor-pointer transition-colors",
+            diffMode ? "text-foreground" : "text-muted-foreground hover:text-foreground"
+          )}
+          onClick={onToggleDiff}
+          disabled={diffLoading}
+          title={diffLoading ? 'Loading diff...' : diffMode ? 'Back to editor' : 'Show diff'}
+        >
+          <GitBranch size={16} />
+        </button>
+      ) : (
+        <button
+          className="flex items-center justify-center border-none bg-transparent p-0 text-muted-foreground"
+          style={DISABLED_ICON_STYLE}
+          title="No changes"
+          tabIndex={-1}
+        >
+          <GitBranch size={16} />
+        </button>
+      )}
       {!forceRawMode && <RawToggleButton rawMode={rawMode} onToggleRaw={onToggleRaw} />}
-      <PlaceholderAction title="Coming soon">
+      <button
+        className="flex items-center justify-center border-none bg-transparent p-0 text-muted-foreground"
+        style={DISABLED_ICON_STYLE}
+        title="Coming soon"
+        tabIndex={-1}
+      >
         <CursorText size={16} />
-      </PlaceholderAction>
-      <AIChatAction showAIChat={showAIChat} onToggleAIChat={onToggleAIChat} />
-      <ArchiveAction archived={entry.archived} onArchive={onArchive} onUnarchive={onUnarchive} />
-      <DeleteAction onDelete={onDelete} />
-      <InspectorAction inspectorCollapsed={inspectorCollapsed} onToggleInspector={onToggleInspector} />
-      <PlaceholderAction title="Coming soon">
+      </button>
+      <button
+        className={cn(
+          "flex items-center justify-center border-none bg-transparent p-0 cursor-pointer transition-colors",
+          showAIChat ? "" : "text-muted-foreground hover:text-foreground"
+        )}
+        style={showAIChat ? { color: 'var(--primary)' } : undefined}
+        onClick={onToggleAIChat}
+        title={showAIChat ? 'Close AI Chat' : 'Open AI Chat'}
+      >
+        <Sparkle size={16} weight={showAIChat ? 'fill' : 'regular'} />
+      </button>
+      {entry.archived ? (
+        <button
+          className="flex items-center justify-center border-none bg-transparent p-0 cursor-pointer transition-colors text-muted-foreground hover:text-foreground"
+          onClick={onUnarchive}
+          title="Unarchive (Cmd+E)"
+        >
+          <ArrowUUpLeft size={16} />
+        </button>
+      ) : (
+        <button
+          className="flex items-center justify-center border-none bg-transparent p-0 cursor-pointer transition-colors text-muted-foreground hover:text-foreground"
+          onClick={onArchive}
+          title="Archive (Cmd+E)"
+        >
+          <Archive size={16} />
+        </button>
+      )}
+      <button
+        className="flex items-center justify-center border-none bg-transparent p-0 cursor-pointer transition-colors text-muted-foreground hover:text-destructive"
+        onClick={onDelete}
+        title="Delete (Cmd+Delete)"
+      >
+        <Trash size={16} />
+      </button>
+      {inspectorCollapsed && (
+        <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="Properties (⌘⇧I)"
+        >
+          <SlidersHorizontal size={16} />
+        </button>
+      )}
+      <button
+        className="flex items-center justify-center border-none bg-transparent p-0 text-muted-foreground"
+        style={DISABLED_ICON_STYLE}
+        title="Coming soon"
+        tabIndex={-1}
+      >
         <DotsThree size={16} />
-      </PlaceholderAction>
+      </button>
     </div>
   )
 }
 
-function BreadcrumbTitle({
-  entry,
-  onRenameFilename,
-}: Pick<BreadcrumbBarProps, 'entry' | 'onRenameFilename'>) {
+function BreadcrumbTitle({ entry }: { entry: VaultEntry }) {
   const typeLabel = entry.isA ?? 'Note'
+  const filenameStem = entry.filename.replace(/\.md$/, '')
   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>
-      <div className="flex min-w-0 items-center gap-1 truncate">
-        <FilenameCrumb entry={entry} onRenameFilename={onRenameFilename} />
-      </div>
+      <span className="flex min-w-0 items-center gap-1 truncate font-medium text-foreground">
+        <NoteTitleIcon icon={entry.icon} size={15} testId="breadcrumb-note-icon" />
+        <span className="truncate">{filenameStem}</span>
+      </span>
     </div>
   )
 }
 
 export const BreadcrumbBar = memo(function BreadcrumbBar({
-  entry,
-  barRef,
-  onRenameFilename,
-  showTitleSection = true,
-  ...actionProps
+  entry, barRef, ...actionProps
 }: BreadcrumbBarProps) {
   // In raw/diff mode the title section is not rendered — always show title in breadcrumb.
   // Using a prop-driven attribute avoids the timing issues of DOM mutation in useEffect.
-  const titleAlwaysVisible = !showTitleSection || actionProps.rawMode || actionProps.diffMode
+  const titleAlwaysVisible = actionProps.rawMode || actionProps.diffMode
   return (
     <div
       ref={barRef}
       data-tauri-drag-region
       {...(titleAlwaysVisible ? { 'data-title-hidden': '' } : {})}
-      className="breadcrumb-bar flex shrink-0 items-center border-b border-transparent"
+      className="breadcrumb-bar flex shrink-0 items-center"
       style={{
         height: 52,
         background: 'var(--background)',
         padding: '6px 16px',
-        boxSizing: 'border-box',
       }}
     >
       <div className="breadcrumb-bar__title flex-1 min-w-0">
-        <BreadcrumbTitle entry={entry} onRenameFilename={onRenameFilename} />
+        <BreadcrumbTitle entry={entry} />
       </div>
       <BreadcrumbActions entry={entry} {...actionProps} />
     </div>

src/components/BreadcrumbBar.visibility.test.tsx

@@ -1,70 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { render, screen } from '@testing-library/react'
-import { describe, expect, it, vi } from 'vitest'
-import { BreadcrumbBar } from './BreadcrumbBar'
-import './Editor.css'
-import type { VaultEntry } from '../types'
-
-const baseEntry: VaultEntry = {
-  path: '/vault/note/test.md',
-  filename: 'test.md',
-  title: 'Test Note',
-  isA: 'Note',
-  aliases: [],
-  belongsTo: [],
-  relatedTo: [],
-  status: null,
-  archived: false,
-  modifiedAt: 1700000000,
-  createdAt: null,
-  fileSize: 100,
-  snippet: '',
-  wordCount: 0,
-  relationships: {},
-  icon: null,
-  color: null,
-  order: null,
-  outgoingLinks: [],
-  template: null,
-  sort: null,
-  sidebarLabel: null,
-  view: null,
-  visible: null,
-  properties: {},
-  organized: false,
-  favorite: false,
-  favoriteIndex: null,
-  listPropertiesDisplay: [],
-  hasH1: false,
-}
-
-const defaultProps = {
-  wordCount: 100,
-  showDiffToggle: false,
-  diffMode: false,
-  diffLoading: false,
-  onToggleDiff: vi.fn(),
-}
-
-describe('BreadcrumbBar filename visibility', () => {
-  it('keeps the filename visible in the breadcrumb by default', () => {
-    render(<BreadcrumbBar entry={baseEntry} {...defaultProps} />)
-    expect(screen.getByText('test')).toBeVisible()
-  })
-
-  it('keeps the filename visible even when the bar is marked as title-hidden', () => {
-    const { container } = render(<BreadcrumbBar entry={baseEntry} {...defaultProps} />)
-    container.querySelector('.breadcrumb-bar')?.setAttribute('data-title-hidden', '')
-    expect(screen.getByText('test')).toBeVisible()
-  })
-
-  it('keeps breadcrumb action buttons on the zero-padding footprint', () => {
-    const editorCss = readFileSync(`${process.cwd()}/src/components/Editor.css`, 'utf8')
-
-    expect(editorCss).toContain(".breadcrumb-bar__actions [data-slot='button']")
-    expect(editorCss).toContain('width: auto;')
-    expect(editorCss).toContain('height: auto;')
-    expect(editorCss).toContain('padding: 0;')
-    expect(editorCss).toContain('border-radius: 0;')
-  })
-})

src/components/DynamicPropertiesPanel.test.tsx

@@ -700,22 +700,6 @@ describe('DynamicPropertiesPanel', () => {
       expect(screen.getByTestId('url-link')).toHaveTextContent('https://example.com')
     })
 
-    it('gives long URL values a truncating value-cell layout inside the properties panel', () => {
-      render(
-        <DynamicPropertiesPanel
-          entry={makeEntry()}
-          content=""
-          frontmatter={{ url: 'https://example.com/very/long/path/that/should/truncate' }}
-          onUpdateProperty={onUpdateProperty}
-        />
-      )
-
-      const link = screen.getByTestId('url-link')
-      const value = screen.getByText('https://example.com/very/long/path/that/should/truncate')
-      expect(link).toHaveClass('flex-1', 'overflow-hidden')
-      expect(value).toHaveClass('truncate')
-    })
-
     it('renders bare domain values as URL links', () => {
       render(
         <DynamicPropertiesPanel

src/components/EditableValue.test.tsx

@@ -35,13 +35,6 @@ describe('EditableValue', () => {
     expect(onStartEdit).toHaveBeenCalled()
   })
 
-  it('uses a full-width truncating layout in view mode', () => {
-    render(<EditableValue value="A very long property value" onSave={onSave} onCancel={onCancel} isEditing={false} onStartEdit={onStartEdit} />)
-    const value = screen.getByText('A very long property value')
-    expect(value.parentElement).toHaveClass('w-full', 'overflow-hidden')
-    expect(value).toHaveClass('truncate')
-  })
-
   it('shows input in editing mode', () => {
     render(<EditableValue value="Active" onSave={onSave} onCancel={onCancel} isEditing={true} onStartEdit={onStartEdit} />)
     const input = screen.getByDisplayValue('Active')
@@ -175,11 +168,6 @@ describe('TagPillList', () => {
     fireEvent.blur(input)
     expect(onSave).not.toHaveBeenCalled()
   })
-
-  it('truncates long pill labels independently', () => {
-    render(<TagPillList items={['A very long property list value']} onSave={onSave} label="Tags" />)
-    expect(screen.getByText('A very long property list value')).toHaveClass('truncate')
-  })
 })
 
 describe('isUrlValue', () => {
@@ -250,14 +238,6 @@ describe('UrlValue', () => {
     expect(openExternalUrl).toHaveBeenCalledWith('https://example.com')
   })
 
-  it('uses a flexible truncating layout for long URL values', () => {
-    render(<UrlValue value="https://example.com/very/long/path/that/needs/truncation" onSave={onSave} onCancel={onCancel} isEditing={false} onStartEdit={onStartEdit} />)
-    const link = screen.getByTestId('url-link')
-    const value = screen.getByText('https://example.com/very/long/path/that/needs/truncation')
-    expect(link).toHaveClass('flex-1', 'overflow-hidden')
-    expect(value).toHaveClass('truncate')
-  })
-
   it('does not open malformed URL', () => {
     render(<UrlValue value="://broken" onSave={onSave} onCancel={onCancel} isEditing={false} onStartEdit={onStartEdit} />)
     fireEvent.click(screen.getByTestId('url-link'))

src/components/EditableValue.tsx

@@ -64,14 +64,14 @@ export function UrlValue({
   }
 
   return (
-    <span className="group/url flex w-full min-w-0 items-center gap-1">
+    <span className="group/url flex min-w-0 max-w-full items-center gap-1">
       <span
-        className="inline-flex h-6 min-w-0 flex-1 cursor-pointer items-center justify-end overflow-hidden 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)]"
+        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"
       >
-        <span className="min-w-0 truncate">{value || '\u2014'}</span>
+        {value || '\u2014'}
       </span>
       <button
         className="shrink-0 border-none bg-transparent p-0 text-[12px] leading-none text-muted-foreground opacity-0 transition-all hover:text-foreground group-hover/url:opacity-100"
@@ -125,11 +125,11 @@ export function EditableValue({
 
   return (
     <span
-      className="inline-flex h-6 w-full min-w-0 cursor-pointer items-center justify-end overflow-hidden rounded-md px-2 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'}
     >
-      <span className="min-w-0 truncate">{value || '\u2014'}</span>
+      {value || '\u2014'}
     </span>
   )
 }
@@ -212,7 +212,7 @@ export function TagPillList({
         ) : (
           <span
             key={idx}
-            className="group/pill relative inline-flex h-6 max-w-full min-w-0 cursor-pointer items-center overflow-hidden rounded-md transition-colors"
+            className="group/pill relative inline-flex h-6 cursor-pointer items-center rounded-md transition-colors"
             style={{
               ...getTagStyle(item),
               backgroundColor: getTagStyle(item).bg,
@@ -223,7 +223,7 @@ export function TagPillList({
             onClick={() => handleStartEdit(idx)}
             title="Click to edit"
           >
-            <span className="min-w-0 truncate pr-4">{item}</span>
+            {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 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 }}

src/components/Editor.css

@@ -22,32 +22,24 @@
   opacity: 0.55;
 }
 
-/* Breadcrumb bar: border can still react to the data attribute, but the
-   breadcrumb filename/title stays visible at all times. */
+/* Breadcrumb bar: title + shadow toggled via data attribute (no React re-render) */
 .breadcrumb-bar {
-  transition: border-color 0.2s ease;
+  transition: box-shadow 0.2s ease;
+  box-shadow: none;
 }
 
 .breadcrumb-bar[data-title-hidden] {
-  border-bottom-color: var(--border);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.08);
 }
 
 .breadcrumb-bar__title {
+  display: none;
+}
+
+.breadcrumb-bar[data-title-hidden] .breadcrumb-bar__title {
   display: flex;
 }
 
-.breadcrumb-bar__actions [data-slot='button'] {
-  width: auto;
-  height: auto;
-  min-width: 0;
-  padding: 0;
-  border-radius: 0;
-}
-
-.breadcrumb-bar__actions [data-slot='button']:hover {
-  background: transparent;
-}
-
 /* Scroll area wrapping title + editor — single scroll context for alignment */
 .editor-scroll-area {
   flex: 1;

src/components/Editor.test.tsx

@@ -413,7 +413,7 @@ describe('wikilink autocomplete', () => {
     expect(items.length).toBeGreaterThan(0)
     items[0].onItemClick()
     expect(mockEditor.insertInlineContent).toHaveBeenCalledWith([
-      { type: 'wikilink', props: { target: 'vault/project/test' } },
+      { type: 'wikilink', props: { target: 'vault/project/test|Alpha Project' } },
       ' ',
     ])
   })
@@ -566,7 +566,7 @@ describe('person @mention autocomplete', () => {
     expect(items.length).toBeGreaterThan(0)
     items[0].onItemClick()
     expect(mockEditor.insertInlineContent).toHaveBeenCalledWith([
-      { type: 'wikilink', props: { target: 'vault/person/matteo-cellini' } },
+      { type: 'wikilink', props: { target: 'vault/person/matteo-cellini|Matteo Cellini' } },
       ' ',
     ])
   })

src/components/Editor.tsx

@@ -56,8 +56,6 @@ interface EditorProps {
   onSave?: () => void
   /** Called when the user edits the title in TitleField. */
   onTitleSync?: (path: string, newTitle: string) => void
-  /** Called when the user explicitly renames the filename from the breadcrumb. */
-  onRenameFilename?: (path: string, newFilenameStem: string) => void
   canGoBack?: boolean
   canGoForward?: boolean
   onGoBack?: () => void
@@ -205,7 +203,7 @@ export const Editor = memo(function Editor(props: EditorProps) {
     showAIChat, onToggleAIChat,
     vaultPath, noteList, noteListFilter,
     onToggleFavorite, onToggleOrganized, onDeleteNote, onArchiveNote, onUnarchiveNote,
-    onContentChange, onSave, onTitleSync, onRenameFilename,
+    onContentChange, onSave, onTitleSync,
     onFileCreated, onFileModified, onVaultChanged,
     isConflicted, onKeepMine, onKeepTheirs,
   } = props
@@ -257,7 +255,6 @@ export const Editor = memo(function Editor(props: EditorProps) {
               vaultPath={vaultPath}
               rawLatestContentRef={rawLatestContentRef}
               onTitleChange={onTitleSync}
-              onRenameFilename={onRenameFilename}
               isConflicted={isConflicted}
               onKeepMine={onKeepMine}
               onKeepTheirs={onKeepTheirs}

src/components/EditorRightPanel.tsx

@@ -75,7 +75,6 @@ export function EditorRightPanel({
         content={inspectorContent}
         entries={entries}
         gitHistory={gitHistory}
-        vaultPath={vaultPath}
         onNavigate={onNavigateWikilink}
         onViewCommitDiff={onViewCommitDiff}
         onUpdateFrontmatter={onUpdateFrontmatter}

src/components/FeedbackDialog.test.tsx

@@ -1,53 +0,0 @@
-import { fireEvent, render, screen, waitFor } from '@testing-library/react'
-import { describe, expect, it, vi } from 'vitest'
-import { FeedbackDialog } from './FeedbackDialog'
-import { LAPUTA_GITHUB_ISSUES_URL } from '../constants/feedback'
-
-vi.mock('../utils/url', () => ({
-  openExternalUrl: vi.fn().mockResolvedValue(undefined),
-}))
-
-const { openExternalUrl } = await import('../utils/url') as typeof import('../utils/url') & {
-  openExternalUrl: ReturnType<typeof vi.fn>
-}
-
-describe('FeedbackDialog', () => {
-  it('renders the instructional copy when open', () => {
-    render(<FeedbackDialog open={true} onClose={vi.fn()} />)
-    expect(screen.getByTestId('feedback-dialog')).toBeInTheDocument()
-    expect(screen.getByText('Share feedback')).toBeInTheDocument()
-    expect(screen.getByText(/best way to share product feedback/i)).toBeInTheDocument()
-    expect(screen.getByText(/check whether a similar one already exists/i)).toBeInTheDocument()
-  })
-
-  it('focuses the primary CTA when opened', async () => {
-    render(<FeedbackDialog open={true} onClose={vi.fn()} />)
-    const cta = screen.getByRole('button', { name: 'Go to Issues' })
-    await waitFor(() => expect(cta).toHaveFocus())
-  })
-
-  it('opens GitHub Issues without closing the modal', async () => {
-    const onClose = vi.fn()
-    render(<FeedbackDialog open={true} onClose={onClose} />)
-
-    fireEvent.click(screen.getByRole('button', { name: 'Go to Issues' }))
-
-    await waitFor(() => expect(openExternalUrl).toHaveBeenCalledWith(LAPUTA_GITHUB_ISSUES_URL))
-    expect(onClose).not.toHaveBeenCalled()
-    expect(screen.getByTestId('feedback-dialog')).toBeInTheDocument()
-  })
-
-  it('closes when pressing Escape', () => {
-    const onClose = vi.fn()
-    render(<FeedbackDialog open={true} onClose={onClose} />)
-    fireEvent.keyDown(document, { key: 'Escape' })
-    expect(onClose).toHaveBeenCalledOnce()
-  })
-
-  it('closes when clicking Close', () => {
-    const onClose = vi.fn()
-    render(<FeedbackDialog open={true} onClose={onClose} />)
-    fireEvent.click(screen.getByRole('button', { name: 'Close' }))
-    expect(onClose).toHaveBeenCalledOnce()
-  })
-})

src/components/FeedbackDialog.tsx

@@ -1,59 +0,0 @@
-import { Megaphone } from '@phosphor-icons/react'
-import { Button } from '@/components/ui/button'
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from '@/components/ui/dialog'
-import { LAPUTA_GITHUB_ISSUES_URL } from '../constants/feedback'
-import { openExternalUrl } from '../utils/url'
-
-interface FeedbackDialogProps {
-  open: boolean
-  onClose: () => void
-}
-
-export function FeedbackDialog({ open, onClose }: FeedbackDialogProps) {
-  const handleOpenIssues = () => {
-    void openExternalUrl(LAPUTA_GITHUB_ISSUES_URL)
-  }
-
-  return (
-    <Dialog open={open} onOpenChange={(next) => { if (!next) onClose() }}>
-      <DialogContent showCloseButton={false} className="sm:max-w-[460px]" data-testid="feedback-dialog">
-        <DialogHeader>
-          <DialogTitle className="flex items-center gap-2">
-            <Megaphone size={18} weight="duotone" />
-            Share feedback
-          </DialogTitle>
-          <DialogDescription>
-            The best way to share product feedback is through a GitHub Issue.
-          </DialogDescription>
-        </DialogHeader>
-
-        <div className="space-y-3 text-sm leading-6 text-muted-foreground">
-          <p>
-            Before opening a new issue, please check whether a similar one already exists.
-            If it does, add an upvote or comment there instead of opening a duplicate.
-          </p>
-          <p>
-            When you do open a new issue, include the steps to reproduce, what you expected,
-            and what actually happened so it is easier to triage.
-          </p>
-        </div>
-
-        <DialogFooter className="sm:justify-between">
-          <Button type="button" variant="outline" onClick={onClose}>
-            Close
-          </Button>
-          <Button type="button" autoFocus onClick={handleOpenIssues}>
-            Go to Issues
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  )
-}

src/components/FilterFieldCombobox.tsx

@@ -54,62 +54,6 @@ function stepHighlightedIndex(current: number, optionCount: number, direction: '
   return (current - 1 + optionCount) % optionCount
 }
 
-function moveHighlightedOption({
-  event,
-  open,
-  options,
-  direction,
-  openCombobox,
-  setHighlightedIndex,
-}: {
-  event: KeyboardEvent<HTMLInputElement>
-  open: boolean
-  options: string[]
-  direction: 'next' | 'previous'
-  openCombobox: () => void
-  setHighlightedIndex: (updater: number | ((current: number) => number)) => void
-}) {
-  event.preventDefault()
-  if (!open) {
-    openCombobox()
-    return
-  }
-  if (options.length === 0) return
-  setHighlightedIndex((current) => stepHighlightedIndex(current, options.length, direction))
-}
-
-function selectHighlightedOption({
-  event,
-  open,
-  options,
-  highlightedIndex,
-  selectOption,
-}: {
-  event: KeyboardEvent<HTMLInputElement>
-  open: boolean
-  options: string[]
-  highlightedIndex: number
-  selectOption: (value: string) => void
-}) {
-  if (!open || highlightedIndex < 0 || options[highlightedIndex] === undefined) return
-  event.preventDefault()
-  selectOption(options[highlightedIndex])
-}
-
-function closeOpenCombobox({
-  event,
-  open,
-  closeCombobox,
-}: {
-  event: KeyboardEvent<HTMLInputElement>
-  open: boolean
-  closeCombobox: () => void
-}) {
-  if (!open) return
-  event.preventDefault()
-  closeCombobox()
-}
-
 function handleFilterFieldKeyDown({
   event,
   open,
@@ -131,16 +75,32 @@ function handleFilterFieldKeyDown({
 }) {
   switch (event.key) {
     case 'ArrowDown':
-      moveHighlightedOption({ event, open, options, direction: 'next', openCombobox, setHighlightedIndex })
+      event.preventDefault()
+      if (!open) {
+        openCombobox()
+        return
+      }
+      if (options.length === 0) return
+      setHighlightedIndex((current) => stepHighlightedIndex(current, options.length, 'next'))
       return
     case 'ArrowUp':
-      moveHighlightedOption({ event, open, options, direction: 'previous', openCombobox, setHighlightedIndex })
+      event.preventDefault()
+      if (!open) {
+        openCombobox()
+        return
+      }
+      if (options.length === 0) return
+      setHighlightedIndex((current) => stepHighlightedIndex(current, options.length, 'previous'))
       return
     case 'Enter':
-      selectHighlightedOption({ event, open, options, highlightedIndex, selectOption })
+      if (!open || highlightedIndex < 0 || options[highlightedIndex] === undefined) return
+      event.preventDefault()
+      selectOption(options[highlightedIndex])
       return
     case 'Escape':
-      closeOpenCombobox({ event, open, closeCombobox })
+      if (!open) return
+      event.preventDefault()
+      closeCombobox()
       return
     default:
       return
@@ -218,27 +178,21 @@ function FilterFieldPopoverPanel({
     <PopoverContent
       align="start"
       sideOffset={4}
-      className="overflow-hidden p-1"
+      className="max-h-60 overflow-y-auto p-1"
       style={{ width: contentWidth }}
       onOpenAutoFocus={(event) => event.preventDefault()}
       onCloseAutoFocus={(event) => event.preventDefault()}
       data-testid="filter-field-combobox-popover"
     >
-      <div
-        className="max-h-60 overflow-y-auto overscroll-contain"
-        data-testid="filter-field-combobox-scroll-area"
-        onWheelCapture={(event) => event.stopPropagation()}
-      >
-        <div id={listboxId} role="listbox" data-testid="filter-field-combobox-options">
-          <FilterFieldOptionsList
-            listboxId={listboxId}
-            fieldGroups={fieldGroups}
-            options={options}
-            highlightedIndex={highlightedIndex}
-            onHighlight={onHighlight}
-            onSelect={onSelect}
-          />
-        </div>
+      <div id={listboxId} role="listbox" data-testid="filter-field-combobox-options">
+        <FilterFieldOptionsList
+          listboxId={listboxId}
+          fieldGroups={fieldGroups}
+          options={options}
+          highlightedIndex={highlightedIndex}
+          onHighlight={onHighlight}
+          onSelect={onSelect}
+        />
       </div>
     </PopoverContent>
   )

src/components/Inspector.tsx

@@ -24,7 +24,6 @@ interface InspectorProps {
   content: string | null
   entries: VaultEntry[]
   gitHistory: GitCommit[]
-  vaultPath?: string
   onNavigate: (target: string) => void
   onViewCommitDiff?: (commitHash: string) => void
   onUpdateFrontmatter?: (path: string, key: string, value: FrontmatterValue) => Promise<void>
@@ -42,7 +41,6 @@ export function Inspector({
   content,
   entries,
   gitHistory,
-  vaultPath,
   onNavigate,
   onViewCommitDiff,
   onUpdateFrontmatter,
@@ -98,7 +96,6 @@ export function Inspector({
                     frontmatter={frontmatter}
                     entries={entries}
                     typeEntryMap={typeEntryMap}
-                    vaultPath={vaultPath}
                     onNavigate={onNavigate}
                     onAddProperty={onAddProperty ? handleAddProperty : undefined}
                     onUpdateProperty={onUpdateFrontmatter ? handleUpdateProperty : undefined}

src/components/InspectorPanels.test.tsx

@@ -179,7 +179,7 @@ describe('DynamicRelationshipsPanel', () => {
     fireEvent.change(screen.getByPlaceholderText('Relationship name'), { target: { value: 'Related to' } })
     fireEvent.change(screen.getByPlaceholderText('Note title'), { target: { value: 'AI' } })
     fireEvent.click(screen.getByTestId('submit-add-relationship'))
-    expect(onAddProperty).toHaveBeenCalledWith('Related to', '[[topic/ai]]')
+    expect(onAddProperty).toHaveBeenCalledWith('Related to', '[[AI]]')
   })
 
   it('cancels add relationship form', () => {
@@ -427,14 +427,14 @@ describe('DynamicRelationshipsPanel', () => {
       const input = screen.getByTestId('add-relation-ref-input')
       fireEvent.change(input, { target: { value: 'AI' } })
       fireEvent.keyDown(input, { key: 'Enter' })
-      expect(onUpdateProperty).toHaveBeenCalledWith('Belongs to', ['[[project/my-project]]', '[[topic/ai]]'])
+      expect(onUpdateProperty).toHaveBeenCalledWith('Belongs to', ['[[project/my-project]]', '[[AI]]'])
     })
 
     it('does not add duplicate refs', () => {
       render(
         <DynamicRelationshipsPanel
           typeEntryMap={{}}
-          frontmatter={{ 'Belongs to': ['[[topic/ai]]'] }}
+          frontmatter={{ 'Belongs to': ['[[AI]]'] }}
           entries={entries}
           onNavigate={onNavigate}
           onUpdateProperty={onUpdateProperty}
@@ -533,7 +533,7 @@ describe('DynamicRelationshipsPanel', () => {
       fireEvent.click(screen.getByTestId('create-and-open-option'))
       expect(onCreateAndOpenNote).toHaveBeenCalledWith('Brand New Note')
       await vi.waitFor(() => {
-        expect(onUpdateProperty).toHaveBeenCalledWith('Belongs to', ['[[project/my-project]]', '[[brand-new-note]]'])
+        expect(onUpdateProperty).toHaveBeenCalledWith('Belongs to', ['[[project/my-project]]', '[[Brand New Note]]'])
       })
     })
 
@@ -647,7 +647,7 @@ describe('DynamicRelationshipsPanel', () => {
       fireEvent.click(screen.getByTestId('create-and-open-option'))
       expect(onCreateAndOpenNote).toHaveBeenCalledWith('New Person')
       await vi.waitFor(() => {
-        expect(onAddProperty).toHaveBeenCalledWith('Mentions', '[[new-person]]')
+        expect(onAddProperty).toHaveBeenCalledWith('Mentions', '[[New Person]]')
       })
     })
   })

src/components/NoteItem.test.tsx

@@ -12,8 +12,6 @@ const { openExternalUrl } = await import('../utils/url') as typeof import('../ut
   openExternalUrl: ReturnType<typeof vi.fn>
 }
 
-const NOW_SECONDS = 1_744_286_400
-
 describe('NoteItem', () => {
   beforeEach(() => {
     openExternalUrl.mockClear()
@@ -89,60 +87,6 @@ describe('NoteItem', () => {
     expect(screen.queryByTestId('change-status-icon')).not.toBeInTheDocument()
   })
 
-  it('adds more breathing room between note sections', () => {
-    const entry = makeEntry({
-      title: 'Spaced note',
-      snippet: 'Body preview',
-      createdAt: NOW_SECONDS - 86400 * 3,
-      modifiedAt: NOW_SECONDS - 86400,
-      properties: { Status: 'Active' },
-    })
-
-    render(
-      <NoteItem
-        entry={entry}
-        isSelected={false}
-        typeEntryMap={{}}
-        displayPropsOverride={['Status']}
-        onClickNote={vi.fn()}
-      />,
-    )
-
-    expect(screen.getByTestId('note-content-stack').className).toContain('space-y-2')
-  })
-
-  it('shows created date on the right side of the date row when available', () => {
-    vi.useFakeTimers()
-    vi.setSystemTime(new Date(NOW_SECONDS * 1000))
-    const entry = makeEntry({
-      title: 'Dated note',
-      createdAt: NOW_SECONDS - 86400 * 5,
-      modifiedAt: NOW_SECONDS - 86400 * 2,
-    })
-
-    render(<NoteItem entry={entry} isSelected={false} typeEntryMap={{}} onClickNote={vi.fn()} />)
-
-    const dateRow = screen.getByTestId('note-date-row')
-    expect(dateRow.className).toContain('justify-between')
-    expect(dateRow).toHaveTextContent('2d ago')
-    expect(dateRow).toHaveTextContent('Created 5d ago')
-  })
-
-  it('leaves the right side empty when no creation date exists', () => {
-    vi.useFakeTimers()
-    vi.setSystemTime(new Date(NOW_SECONDS * 1000))
-    const entry = makeEntry({
-      title: 'Modified note',
-      createdAt: null,
-      modifiedAt: NOW_SECONDS - 3600,
-    })
-
-    render(<NoteItem entry={entry} isSelected={false} typeEntryMap={{}} onClickNote={vi.fn()} />)
-
-    expect(screen.getByTestId('note-date-row')).toHaveTextContent('1h ago')
-    expect(screen.queryByText(/Created /)).not.toBeInTheDocument()
-  })
-
   it('colors relationship chips by target type and opens the related note on Cmd+click only', () => {
     const linkedProject = makeEntry({
       path: '/vault/project/build-app.md',

src/components/NoteItem.tsx

@@ -163,72 +163,35 @@ function StandardNoteContent({
     <>
       {/* eslint-disable-next-line react-hooks/static-components -- icon lookup from static map, no internal state */}
       <TypeIcon width={14} height={14} className="absolute right-3 top-2.5" style={{ color: typeColor }} data-testid="type-icon" />
-      <div className="space-y-2 pr-5" data-testid="note-content-stack">
-        <NoteTitleRow
-          entry={entry}
-          isBinary={isBinary}
-          isSelected={isSelected}
-          noteStatus={noteStatus}
-        />
-        {!isBinary && entry.snippet && (
-          <div
-            className="text-[12px] leading-[1.5] text-muted-foreground"
-            data-testid="note-snippet"
-            style={{ display: '-webkit-box', WebkitLineClamp: 2, WebkitBoxOrient: 'vertical', overflow: 'hidden' }}
-          >
-            {entry.snippet}
-          </div>
-        )}
-        {!isBinary && displayProps.length > 0 && (
-          <PropertyChips
-            entry={entry}
-            displayProps={displayProps}
-            allEntries={allEntries}
-            typeEntryMap={typeEntryMap}
-            onOpenNote={onClickNote}
-          />
-        )}
-        {!isBinary && <NoteDateRow entry={entry} />}
+      <div className="pr-5">
+        <div className={cn('truncate text-[13px]', isBinary ? 'text-muted-foreground' : 'text-foreground', isSelected && !isBinary ? 'font-semibold' : 'font-medium')}>
+          {noteStatus !== 'clean' && !isBinary && <StatusDot noteStatus={noteStatus} />}
+          <NoteTitleIcon icon={entry.icon} size={15} className="mr-1" testId="note-title-icon" />
+          {entry.title}
+          {!isBinary && <StateBadge archived={entry.archived} />}
+        </div>
       </div>
+      {entry.snippet && !isBinary && (
+        <div className="mt-0.5 text-[12px] leading-[1.5] text-muted-foreground" data-testid="note-snippet" style={{ display: '-webkit-box', WebkitLineClamp: 2, WebkitBoxOrient: 'vertical', overflow: 'hidden' }}>
+          {entry.snippet}
+        </div>
+      )}
+      {!isBinary && displayProps.length > 0 && (
+        <PropertyChips
+          entry={entry}
+          displayProps={displayProps}
+          allEntries={allEntries}
+          typeEntryMap={typeEntryMap}
+          onOpenNote={onClickNote}
+        />
+      )}
+      {!isBinary && (
+        <div className="mt-0.5 text-[10px] text-muted-foreground">{relativeDate(getDisplayDate(entry))}</div>
+      )}
     </>
   )
 }
 
-function NoteTitleRow({
-  entry,
-  isBinary,
-  isSelected,
-  noteStatus,
-}: {
-  entry: VaultEntry
-  isBinary: boolean
-  isSelected: boolean
-  noteStatus: NoteStatus
-}) {
-  return (
-    <div className={cn('truncate text-[13px]', isBinary ? 'text-muted-foreground' : 'text-foreground', isSelected && !isBinary ? 'font-semibold' : 'font-medium')}>
-      {noteStatus !== 'clean' && !isBinary && <StatusDot noteStatus={noteStatus} />}
-      <NoteTitleIcon icon={entry.icon} size={15} className="mr-1" testId="note-title-icon" />
-      {entry.title}
-      {!isBinary && <StateBadge archived={entry.archived} />}
-    </div>
-  )
-}
-
-function NoteDateRow({ entry }: { entry: VaultEntry }) {
-  const modifiedLabel = relativeDate(getDisplayDate(entry))
-  const createdLabel = entry.createdAt ? `Created ${relativeDate(entry.createdAt)}` : null
-
-  if (!modifiedLabel && !createdLabel) return null
-
-  return (
-    <div className="flex items-center justify-between gap-3 text-[10px] text-muted-foreground" data-testid="note-date-row">
-      <span>{modifiedLabel}</span>
-      {createdLabel && <span className="ml-auto">{createdLabel}</span>}
-    </div>
-  )
-}
-
 function noteItemStyle(isSelected: boolean, isMultiSelected: boolean, typeColor: string, typeLightColor: string): React.CSSProperties {
   const base: React.CSSProperties = { padding: isSelected && !isMultiSelected ? '14px 16px 14px 13px' : '14px 16px' }
   if (isMultiSelected) base.backgroundColor = 'color-mix(in srgb, var(--accent-blue) 10%, transparent)'

src/components/NoteList.rendering.test.tsx

@@ -9,23 +9,6 @@ import {
   renderNoteList,
 } from '../test-utils/noteListTestUtils'
 
-function makeBookTypeEntries(
-  displayProps: string[] = [],
-  entryOverrides: Parameters<typeof makeEntry>[0] = {},
-) {
-  return [
-    makeTypeDefinition('Book', displayProps),
-    makeEntry({
-      path: '/vault/book.md',
-      filename: 'book.md',
-      title: 'Book Note',
-      isA: 'Book',
-      createdAt: 1700000000,
-      ...entryOverrides,
-    }),
-  ]
-}
-
 describe('NoteList rendering', () => {
   it('shows an empty state when there are no entries', () => {
     renderNoteList({ entries: [] })
@@ -154,8 +137,20 @@ describe('NoteList rendering', () => {
   })
 
   it('shows the inbox customize-columns action and falls back to type-defined chips', () => {
+    const entries = [
+      makeTypeDefinition('Book', ['Priority']),
+      makeEntry({
+        path: '/vault/book.md',
+        filename: 'book.md',
+        title: 'Book Note',
+        isA: 'Book',
+        properties: { Priority: 'High', Owner: 'Luca' },
+        createdAt: 1700000000,
+      }),
+    ]
+
     renderNoteList({
-      entries: makeBookTypeEntries(['Priority'], { properties: { Priority: 'High', Owner: 'Luca' } }),
+      entries,
       selection: { kind: 'filter', filter: 'inbox' },
       inboxNoteListProperties: null,
       onUpdateInboxNoteListProperties: () => undefined,
@@ -168,9 +163,20 @@ describe('NoteList rendering', () => {
 
   it('opens the inbox column picker from the global event and saves new columns', () => {
     const onUpdateInboxNoteListProperties = vi.fn()
+    const entries = [
+      makeTypeDefinition('Book', ['Priority']),
+      makeEntry({
+        path: '/vault/book.md',
+        filename: 'book.md',
+        title: 'Book Note',
+        isA: 'Book',
+        properties: { Priority: 'High', Owner: 'Luca' },
+        createdAt: 1700000000,
+      }),
+    ]
 
     renderNoteList({
-      entries: makeBookTypeEntries(['Priority'], { properties: { Priority: 'High', Owner: 'Luca' } }),
+      entries,
       selection: { kind: 'filter', filter: 'inbox' },
       inboxNoteListProperties: null,
       onUpdateInboxNoteListProperties,
@@ -188,8 +194,20 @@ describe('NoteList rendering', () => {
   })
 
   it('shows status in the type column picker when at least one note has it set', () => {
+    const entries = [
+      makeTypeDefinition('Book'),
+      makeEntry({
+        path: '/vault/book.md',
+        filename: 'book.md',
+        title: 'Book Note',
+        isA: 'Book',
+        status: 'Active',
+        createdAt: 1700000000,
+      }),
+    ]
+
     renderNoteList({
-      entries: makeBookTypeEntries([], { status: 'Active' }),
+      entries,
       selection: { kind: 'sectionGroup', type: 'Book' },
       onUpdateTypeSort: () => undefined,
     })
@@ -203,8 +221,21 @@ describe('NoteList rendering', () => {
   })
 
   it('keeps blank statuses out of the type column picker', () => {
+    const entries = [
+      makeTypeDefinition('Book'),
+      makeEntry({
+        path: '/vault/book.md',
+        filename: 'book.md',
+        title: 'Book Note',
+        isA: 'Book',
+        status: '',
+        properties: { Owner: 'Luca' },
+        createdAt: 1700000000,
+      }),
+    ]
+
     renderNoteList({
-      entries: makeBookTypeEntries([], { status: '', properties: { Owner: 'Luca' } }),
+      entries,
       selection: { kind: 'sectionGroup', type: 'Book' },
       onUpdateTypeSort: () => undefined,
     })
@@ -219,41 +250,41 @@ describe('NoteList rendering', () => {
   })
 
   it('renders status as a note-list chip when a type displays it', () => {
+    const entries = [
+      makeTypeDefinition('Book', ['status']),
+      makeEntry({
+        path: '/vault/book.md',
+        filename: 'book.md',
+        title: 'Book Note',
+        isA: 'Book',
+        status: 'Active',
+        createdAt: 1700000000,
+      }),
+    ]
+
     renderNoteList({
-      entries: makeBookTypeEntries(['status'], { status: 'Active' }),
+      entries,
       selection: { kind: 'sectionGroup', type: 'Book' },
     })
 
-    const chip = screen.getByTestId('property-chip-status-0')
-    expect(chip).toHaveTextContent('• Active')
-    expect(chip).toHaveStyle({ backgroundColor: 'var(--accent-green-light)', color: 'var(--accent-green)' })
-  })
-
-  it('auto-detects status-like property values in note-list chips', () => {
-    renderNoteList({
-      entries: makeBookTypeEntries(['Phase'], { properties: { Phase: 'Draft' } }),
-      selection: { kind: 'sectionGroup', type: 'Book' },
-    })
-
-    const chip = screen.getByTestId('property-chip-phase-0')
-    expect(chip).toHaveTextContent('• Draft')
-    expect(chip).toHaveStyle({ backgroundColor: 'var(--accent-yellow-light)', color: 'var(--accent-yellow)' })
-  })
-
-  it('keeps unknown status values on neutral note-list chip styling', () => {
-    renderNoteList({
-      entries: makeBookTypeEntries(['status'], { status: 'Needs Review' }),
-      selection: { kind: 'sectionGroup', type: 'Book' },
-    })
-
-    const chip = screen.getByTestId('property-chip-status-0')
-    expect(chip).toHaveTextContent('• Needs Review')
-    expect(chip.getAttribute('style')).toBeNull()
+    expect(screen.getByTestId('property-chips')).toHaveTextContent('Active')
   })
 
   it('uses inbox overrides when configured', () => {
+    const entries = [
+      makeTypeDefinition('Book', ['Priority']),
+      makeEntry({
+        path: '/vault/book.md',
+        filename: 'book.md',
+        title: 'Book Note',
+        isA: 'Book',
+        properties: { Priority: 'High', Owner: 'Luca' },
+        createdAt: 1700000000,
+      }),
+    ]
+
     renderNoteList({
-      entries: makeBookTypeEntries(['Priority'], { properties: { Priority: 'High', Owner: 'Luca' } }),
+      entries,
       selection: { kind: 'filter', filter: 'inbox' },
       inboxNoteListProperties: ['Owner'],
       onUpdateInboxNoteListProperties: () => undefined,

src/components/QuickOpenPalette.tsx

@@ -48,7 +48,6 @@ export function QuickOpenPalette({ open, entries, onSelect, onClose }: QuickOpen
 
   return (
     <div
-      data-testid="quick-open-palette"
       className="fixed inset-0 z-[1000] flex justify-center bg-[var(--shadow-dialog)] pt-[15vh]"
       onClick={onClose}
     >

src/components/RawEditorView.test.tsx

@@ -1,6 +1,7 @@
 import { describe, it, expect, vi } from 'vitest'
 import { render, screen, act } from '@testing-library/react'
 import { RawEditorView } from './RawEditorView'
+import { extractWikilinkQuery, detectYamlError } from '../utils/rawEditorUtils'
 
 function entry(title: string, path = `/vault/note/${title}.md`) {
   return {
@@ -22,6 +23,61 @@ const defaultProps = {
   onSave: vi.fn(),
 }
 
+describe('extractWikilinkQuery', () => {
+  it('returns null when no [[ trigger', () => {
+    expect(extractWikilinkQuery('hello world', 5)).toBeNull()
+  })
+
+  it('returns empty string immediately after [[', () => {
+    const text = 'see [['
+    expect(extractWikilinkQuery(text, text.length)).toBe('')
+  })
+
+  it('returns query after [[', () => {
+    const text = 'see [[Proj'
+    expect(extractWikilinkQuery(text, text.length)).toBe('Proj')
+  })
+
+  it('returns null when ]] closes the link', () => {
+    const text = '[[Proj]]'
+    expect(extractWikilinkQuery(text, text.length)).toBeNull()
+  })
+
+  it('returns null when newline is in query', () => {
+    const text = '[[Proj\ncontinued'
+    expect(extractWikilinkQuery(text, text.length)).toBeNull()
+  })
+
+  it('handles cursor before end of text', () => {
+    const text = '[[Proj after'
+    expect(extractWikilinkQuery(text, 6)).toBe('Proj')
+  })
+})
+
+describe('detectYamlError', () => {
+  it('returns null for content without frontmatter', () => {
+    expect(detectYamlError('# Title\n\nSome content.')).toBeNull()
+  })
+
+  it('returns null for valid frontmatter', () => {
+    expect(detectYamlError('---\ntitle: My Note\n---\n\n# Title')).toBeNull()
+  })
+
+  it('returns error for unclosed frontmatter', () => {
+    const error = detectYamlError('---\ntitle: My Note\n\n# Title')
+    expect(error).toContain('Unclosed frontmatter')
+  })
+
+  it('returns error for tab indentation in frontmatter', () => {
+    const error = detectYamlError('---\n\ttitle: My Note\n---\n')
+    expect(error).toContain('tab indentation')
+  })
+
+  it('returns null for content not starting with ---', () => {
+    expect(detectYamlError('Not frontmatter')).toBeNull()
+  })
+})
+
 describe('RawEditorView', () => {
   it('renders CodeMirror container', () => {
     render(<RawEditorView {...defaultProps} />)

src/components/RawEditorView.tsx

@@ -1,21 +1,22 @@
 import { useRef, useState, useCallback, useEffect, useMemo } from 'react'
 import { trackEvent } from '../lib/telemetry'
 import type { EditorView } from '@codemirror/view'
-import { MIN_QUERY_LENGTH } from '../utils/wikilinkSuggestions'
+import { preFilterWikilinks, deduplicateByPath, MIN_QUERY_LENGTH } from '../utils/wikilinkSuggestions'
+import { attachClickHandlers, enrichSuggestionItems } from '../utils/suggestionEnrichment'
 import { buildTypeEntryMap } from '../utils/typeColors'
 import { NoteSearchList } from './NoteSearchList'
-import {
-  buildRawEditorAutocompleteState,
-  buildRawEditorBaseItems,
-  detectYamlError,
-  extractWikilinkQuery,
-  getRawEditorDropdownPosition,
-  replaceActiveWikilinkQuery,
-  type RawEditorAutocompleteState,
-} from '../utils/rawEditorUtils'
+import { extractWikilinkQuery, detectYamlError } from '../utils/rawEditorUtils'
 import { useCodeMirror } from '../hooks/useCodeMirror'
+import type { WikilinkSuggestionItem } from './WikilinkSuggestionMenu'
 import type { VaultEntry } from '../types'
 
+interface AutocompleteState {
+  caretTop: number
+  caretLeft: number
+  selectedIndex: number
+  items: WikilinkSuggestionItem[]
+}
+
 export interface RawEditorViewProps {
   content: string
   path: string
@@ -31,6 +32,13 @@ export interface RawEditorViewProps {
 const DEBOUNCE_MS = 500
 const DROPDOWN_MAX_HEIGHT = 200
 
+function getCursorCoords(view: EditorView): { top: number; left: number } | null {
+  const pos = view.state.selection.main.head
+  const coords = view.coordsAtPos(pos)
+  if (!coords) return null
+  return { top: coords.bottom, left: coords.left }
+}
+
 export function RawEditorView({ content, path, entries, onContentChange, onSave, latestContentRef, vaultPath }: RawEditorViewProps) {
   const containerRef = useRef<HTMLDivElement>(null)
   const debounceRef = useRef<ReturnType<typeof setTimeout> | null>(null)
@@ -44,14 +52,23 @@ export function RawEditorView({ content, path, entries, onContentChange, onSave,
   useEffect(() => { onContentChangeRef.current = onContentChange }, [onContentChange])
   useEffect(() => { onSaveRef.current = onSave }, [onSave])
 
-  const [autocomplete, setAutocomplete] = useState<RawEditorAutocompleteState | null>(null)
+  const [autocomplete, setAutocomplete] = useState<AutocompleteState | null>(null)
   const [yamlError, setYamlError] = useState<string | null>(() => detectYamlError(content))
 
   const typeEntryMap = useMemo(() => buildTypeEntryMap(entries), [entries])
 
-  const baseItems = useMemo(() => buildRawEditorBaseItems(entries), [entries])
+  const baseItems = useMemo(
+    () => deduplicateByPath(entries.map(entry => ({
+      title: entry.title,
+      aliases: [...new Set([entry.filename.replace(/\.md$/, ''), ...entry.aliases])],
+      group: entry.isA || 'Note',
+      entryTitle: entry.title,
+      path: entry.path,
+    }))),
+    [entries],
+  )
 
-  const insertWikilinkRef = useRef<(target: string) => void>(() => {})
+  const insertWikilinkRef = useRef<(entryTitle: string) => void>(() => {})
 
   const latestContentRefStable = useRef(latestContentRef)
   useEffect(() => { latestContentRefStable.current = latestContentRef }, [latestContentRef])
@@ -74,15 +91,12 @@ export function RawEditorView({ content, path, entries, onContentChange, onSave,
       setAutocomplete(null)
       return
     }
-    const nextAutocomplete = buildRawEditorAutocompleteState({
-      view,
-      baseItems,
-      query,
-      typeEntryMap,
-      onInsertTarget: (target: string) => insertWikilinkRef.current(target),
-      vaultPath: vaultPath ?? '',
-    })
-    setAutocomplete(nextAutocomplete)
+    const coords = getCursorCoords(view)
+    if (!coords) { setAutocomplete(null); return }
+    const candidates = preFilterWikilinks(baseItems, query)
+    const withHandlers = attachClickHandlers(candidates, (title: string) => insertWikilinkRef.current(title), vaultPath ?? '')
+    const items = enrichSuggestionItems(withHandlers, query, typeEntryMap)
+    setAutocomplete({ caretTop: coords.top, caretLeft: coords.left, selectedIndex: 0, items })
   }, [baseItems, typeEntryMap, vaultPath])
 
   const handleSave = useCallback(() => {
@@ -106,25 +120,30 @@ export function RawEditorView({ content, path, entries, onContentChange, onSave,
     onEscape: handleEscape,
   })
 
-  const insertWikilink = useCallback((target: string) => {
+  const insertWikilink = useCallback((entryTitle: string) => {
     const view = viewRef.current
     if (!view) return
     const cursor = view.state.selection.main.head
     const doc = view.state.doc.toString()
-    const replacement = replaceActiveWikilinkQuery(doc, cursor, target)
-    if (!replacement) return
+    const before = doc.slice(0, cursor)
+    const triggerIdx = before.lastIndexOf('[[')
+    if (triggerIdx === -1) return
+
+    const after = doc.slice(cursor)
+    const newText = `${doc.slice(0, triggerIdx)}[[${entryTitle}]]${after}`
+    const newCursor = triggerIdx + entryTitle.length + 4
 
     view.dispatch({
-      changes: { from: 0, to: doc.length, insert: replacement.text },
-      selection: { anchor: replacement.cursor },
+      changes: { from: 0, to: doc.length, insert: newText },
+      selection: { anchor: newCursor },
     })
     trackEvent('wikilink_inserted')
     setAutocomplete(null)
 
     if (debounceRef.current) clearTimeout(debounceRef.current)
     debounceRef.current = null
-    latestDocRef.current = replacement.text
-    onContentChangeRef.current(pathRef.current, replacement.text)
+    latestDocRef.current = newText
+    onContentChangeRef.current(pathRef.current, newText)
 
     view.focus()
   }, [viewRef])
@@ -146,9 +165,9 @@ export function RawEditorView({ content, path, entries, onContentChange, onSave,
     } else if (e.key === 'Enter') {
       e.preventDefault()
       const item = autocomplete.items[autocomplete.selectedIndex]
-      if (item) item.onItemClick()
+      if (item) insertWikilink(item.entryTitle ?? item.title)
     }
-  }, [autocomplete])
+  }, [autocomplete, insertWikilink])
 
   // Flush pending debounce on unmount
   useEffect(() => {
@@ -160,7 +179,15 @@ export function RawEditorView({ content, path, entries, onContentChange, onSave,
     }
   }, [])
 
-  const dropdownPosition = getRawEditorDropdownPosition(autocomplete, DROPDOWN_MAX_HEIGHT, window)
+  const dropdownBelow = autocomplete
+    ? autocomplete.caretTop + 20 + DROPDOWN_MAX_HEIGHT <= window.innerHeight
+    : true
+  const dropdownTop = autocomplete
+    ? (dropdownBelow ? autocomplete.caretTop + 4 : autocomplete.caretTop - DROPDOWN_MAX_HEIGHT - 24)
+    : 0
+  const dropdownLeft = autocomplete
+    ? Math.min(autocomplete.caretLeft, window.innerWidth - 260)
+    : 0
 
   return (
     <div className="flex flex-1 flex-col min-h-0 relative" style={{ background: 'var(--background)' }} onKeyDown={handleAutocompleteKey} role="presentation">
@@ -185,8 +212,8 @@ export function RawEditorView({ content, path, entries, onContentChange, onSave,
         <div
           className="fixed z-50 min-w-64 max-w-xs rounded-md border shadow-lg overflow-auto"
           style={{
-            top: dropdownPosition.top,
-            left: dropdownPosition.left,
+            top: dropdownTop,
+            left: dropdownLeft,
             maxHeight: DROPDOWN_MAX_HEIGHT,
             background: 'var(--popover)',
             borderColor: 'var(--border)',
@@ -197,7 +224,7 @@ export function RawEditorView({ content, path, entries, onContentChange, onSave,
             items={autocomplete.items}
             selectedIndex={autocomplete.selectedIndex}
             getItemKey={(item, i) => `${item.title}-${item.path ?? i}`}
-            onItemClick={(item) => item.onItemClick()}
+            onItemClick={(item) => insertWikilink(item.entryTitle ?? item.title)}
             onItemHover={(i) => setAutocomplete(prev => prev ? { ...prev, selectedIndex: i } : null)}
           />
         </div>

src/components/SettingsPanel.test.tsx

@@ -75,32 +75,6 @@ describe('SettingsPanel', () => {
     expect(onClose).toHaveBeenCalled()
   })
 
-  it('defaults the organization workflow switch to on', () => {
-    render(
-      <SettingsPanel open={true} settings={emptySettings} onSave={onSave} onClose={onClose} />
-    )
-    expect(screen.getByRole('switch', { name: 'Organize notes explicitly' })).toHaveAttribute('aria-checked', 'true')
-  })
-
-  it('saves the organization workflow preference when toggled off', () => {
-    const onSaveExplicitOrganization = vi.fn()
-    render(
-      <SettingsPanel
-        open={true}
-        settings={emptySettings}
-        onSave={onSave}
-        explicitOrganizationEnabled={true}
-        onSaveExplicitOrganization={onSaveExplicitOrganization}
-        onClose={onClose}
-      />
-    )
-
-    fireEvent.click(screen.getByRole('switch', { name: 'Organize notes explicitly' }))
-    fireEvent.click(screen.getByTestId('settings-save'))
-
-    expect(onSaveExplicitOrganization).toHaveBeenCalledWith(false)
-  })
-
   it('calls onClose when Cancel is clicked', () => {
     render(
       <SettingsPanel open={true} settings={emptySettings} onSave={onSave} onClose={onClose} />

src/components/SettingsPanel.tsx

@@ -3,14 +3,11 @@ import { X, GithubLogo, SignOut } from '@phosphor-icons/react'
 import { GitHubDeviceFlow } from './GitHubDeviceFlow'
 import type { Settings } from '../types'
 import { trackEvent } from '../lib/telemetry'
-import { Switch } from './ui/switch'
 
 interface SettingsPanelProps {
   open: boolean
   settings: Settings
   onSave: (settings: Settings) => void
-  explicitOrganizationEnabled?: boolean
-  onSaveExplicitOrganization?: (enabled: boolean) => void
   onClose: () => void
 }
 
@@ -62,48 +59,18 @@ function GitHubConnectedRow({ username, onDisconnect }: { username: string; onDi
 
 // --- Settings Panel ---
 
-function isSaveShortcut(event: React.KeyboardEvent): boolean {
-  return event.key === 'Enter' && (event.metaKey || event.ctrlKey)
-}
-
-export function SettingsPanel({
-  open,
-  settings,
-  onSave,
-  explicitOrganizationEnabled = true,
-  onSaveExplicitOrganization,
-  onClose,
-}: SettingsPanelProps) {
+export function SettingsPanel({ open, settings, onSave, onClose }: SettingsPanelProps) {
   if (!open) return null
-  return (
-    <SettingsPanelInner
-      settings={settings}
-      onSave={onSave}
-      explicitOrganizationEnabled={explicitOrganizationEnabled}
-      onSaveExplicitOrganization={onSaveExplicitOrganization}
-      onClose={onClose}
-    />
-  )
+  return <SettingsPanelInner settings={settings} onSave={onSave} onClose={onClose} />
 }
 
-type SettingsPanelInnerProps = Omit<SettingsPanelProps, 'open' | 'explicitOrganizationEnabled'> & {
-  explicitOrganizationEnabled: boolean
-}
-
-function SettingsPanelInner({
-  settings,
-  onSave,
-  explicitOrganizationEnabled,
-  onSaveExplicitOrganization,
-  onClose,
-}: SettingsPanelInnerProps) {
+function SettingsPanelInner({ settings, onSave, onClose }: Omit<SettingsPanelProps, 'open'>) {
   const [githubToken, setGithubToken] = useState(settings.github_token)
   const [githubUsername, setGithubUsername] = useState(settings.github_username)
   const [pullInterval, setPullInterval] = useState(settings.auto_pull_interval_minutes ?? 5)
   const [releaseChannel, setReleaseChannel] = useState(settings.release_channel ?? 'stable')
   const [crashReporting, setCrashReporting] = useState(settings.crash_reporting_enabled ?? false)
   const [analytics, setAnalytics] = useState(settings.analytics_enabled ?? false)
-  const [explicitOrganization, setExplicitOrganization] = useState(explicitOrganizationEnabled)
   const panelRef = useRef<HTMLDivElement>(null)
 
   // Auto-focus first input when settings panel opens
@@ -132,7 +99,6 @@ function SettingsPanelInner({
     if (!prevAnalytics && newAnalytics) trackEvent('telemetry_opted_in')
     if (prevAnalytics && !newAnalytics) trackEvent('telemetry_opted_out')
     onSave(buildSettings())
-    onSaveExplicitOrganization?.(explicitOrganization)
     onClose()
   }
 
@@ -153,7 +119,7 @@ function SettingsPanelInner({
       e.stopPropagation()
       onClose()
     }
-    if (isSaveShortcut(e)) {
+    if (e.key === 'Enter' && (e.metaKey || e.ctrlKey)) {
       e.preventDefault()
       handleSave()
     }
@@ -178,8 +144,6 @@ function SettingsPanelInner({
           onGitHubConnected={handleGitHubConnected} onGitHubDisconnect={handleGitHubDisconnect}
           pullInterval={pullInterval} setPullInterval={setPullInterval}
           releaseChannel={releaseChannel} setReleaseChannel={setReleaseChannel}
-          explicitOrganization={explicitOrganization}
-          setExplicitOrganization={setExplicitOrganization}
           crashReporting={crashReporting} setCrashReporting={setCrashReporting}
           analytics={analytics} setAnalytics={setAnalytics}
         />
@@ -213,7 +177,6 @@ interface SettingsBodyProps {
   onGitHubDisconnect: () => void
   pullInterval: number; setPullInterval: (v: number) => void
   releaseChannel: string; setReleaseChannel: (v: string) => void
-  explicitOrganization: boolean; setExplicitOrganization: (v: boolean) => void
   crashReporting: boolean; setCrashReporting: (v: boolean) => void
   analytics: boolean; setAnalytics: (v: boolean) => void
 }
@@ -288,13 +251,6 @@ function SettingsBody(props: SettingsBodyProps) {
 
       <div style={{ height: 1, background: 'var(--border)' }} />
 
-      <OrganizationWorkflowSection
-        checked={props.explicitOrganization}
-        onChange={props.setExplicitOrganization}
-      />
-
-      <div style={{ height: 1, background: 'var(--border)' }} />
-
       <div>
         <div style={{ fontSize: 13, fontWeight: 600, color: 'var(--foreground)', marginBottom: 4 }}>Privacy &amp; Telemetry</div>
         <div style={{ fontSize: 12, color: 'var(--muted-foreground)', lineHeight: 1.5 }}>
@@ -308,39 +264,6 @@ function SettingsBody(props: SettingsBodyProps) {
   )
 }
 
-function OrganizationWorkflowSection({
-  checked,
-  onChange,
-}: {
-  checked: boolean
-  onChange: (value: boolean) => void
-}) {
-  return (
-    <>
-      <div>
-        <div style={{ fontSize: 13, fontWeight: 600, color: 'var(--foreground)', marginBottom: 4 }}>Workflow</div>
-        <div style={{ fontSize: 12, color: 'var(--muted-foreground)', lineHeight: 1.5 }}>
-          Choose whether Laputa shows the Inbox workflow and the organized toggle.
-        </div>
-      </div>
-
-      <label
-        className="flex items-start justify-between gap-3"
-        style={{ cursor: 'pointer' }}
-        data-testid="settings-explicit-organization"
-      >
-        <div className="space-y-1">
-          <div style={{ fontSize: 13, fontWeight: 500, color: 'var(--foreground)' }}>Organize notes explicitly</div>
-          <div style={{ fontSize: 11, color: 'var(--muted-foreground)' }}>
-            When enabled, an Inbox section shows unorganized notes, and a toggle lets you mark notes as organized.
-          </div>
-        </div>
-        <Switch checked={checked} onCheckedChange={onChange} aria-label="Organize notes explicitly" />
-      </label>
-    </>
-  )
-}
-
 function TelemetryToggle({ label, description, checked, onChange, testId }: { label: string; description: string; checked: boolean; onChange: (v: boolean) => void; testId: string }) {
   return (
     <label style={{ display: 'flex', alignItems: 'center', gap: 10, cursor: 'pointer' }} data-testid={testId}>

src/components/Sidebar.test.tsx

@@ -1,4 +1,4 @@
-import { render, screen, fireEvent, within } from '@testing-library/react'
+import { render, screen, fireEvent } from '@testing-library/react'
 import { describe, it, expect, vi } from 'vitest'
 import { Sidebar } from './Sidebar'
 import type { VaultEntry, SidebarSelection } from '../types'
@@ -867,13 +867,6 @@ describe('Sidebar', () => {
     expect(onSelect).toHaveBeenCalledWith({ kind: 'filter', filter: 'inbox' })
   })
 
-  it('hides Inbox when explicit organization is disabled', () => {
-    render(<Sidebar entries={[]} selection={defaultSelection} onSelect={() => {}} showInbox={false} inboxCount={3} />)
-    expect(screen.queryByText('Inbox')).not.toBeInTheDocument()
-    const topNav = screen.getByTestId('sidebar-top-nav')
-    expect(topNav.children[0].textContent).toContain('All Notes')
-  })
-
   it('does not show inline entries — no child items in type sections', () => {
     const entriesWithEmoji: VaultEntry[] = [
       {
@@ -900,46 +893,6 @@ describe('Sidebar', () => {
       favorite: true, favoriteIndex: 0,
     }
 
-    function getFavoriteAndTypeRows(favoriteTitle = 'My Favorite Note') {
-      const favoriteLabel = screen.getByText(favoriteTitle)
-      const favoriteRow = favoriteLabel.closest('.cursor-pointer')
-      const typeLabel = screen.getByText('Projects')
-      const typeRow = typeLabel.closest('.cursor-pointer')
-      expect(favoriteRow).not.toBeNull()
-      expect(typeRow).not.toBeNull()
-
-      return {
-        favoriteLabel,
-        favoriteRow: favoriteRow as HTMLElement,
-        typeLabel,
-        typeRow: typeRow as HTMLElement,
-      }
-    }
-
-    function expectFavoriteIconToMatchTypeSizing(favoriteRow: HTMLElement) {
-      const favoriteIcon = favoriteRow.querySelector('svg')
-      expect(favoriteIcon).not.toBeNull()
-      expect(favoriteIcon!.getAttribute('width')).toBe('16')
-      expect(favoriteIcon!.getAttribute('height')).toBe('16')
-      expect(favoriteIcon!.getAttribute('style')).toContain('var(--accent-red)')
-      return favoriteIcon as SVGElement
-    }
-
-    function expectFavoriteRowToMatchTypeRow(favoriteTitle = 'My Favorite Note') {
-      const { favoriteLabel, favoriteRow, typeLabel, typeRow } = getFavoriteAndTypeRows(favoriteTitle)
-
-      expect(favoriteRow.className).toBe(typeRow.className)
-      expect(favoriteRow.style.padding).toBe(typeRow.style.padding)
-      expect(favoriteRow.style.gap).toBe(typeRow.style.gap)
-      expect(favoriteLabel.className).toContain(typeLabel.className)
-      expect(favoriteLabel.className).toContain('truncate')
-      return {
-        favoriteRow,
-        typeRow,
-        favoriteIcon: expectFavoriteIconToMatchTypeSizing(favoriteRow),
-      }
-    }
-
     it('shows FAVORITES section when there are favorites', () => {
       render(<Sidebar entries={[...mockEntries, favEntry]} selection={defaultSelection} onSelect={() => {}} />)
       expect(screen.getByText('FAVORITES')).toBeInTheDocument()
@@ -957,60 +910,6 @@ describe('Sidebar', () => {
       fireEvent.click(screen.getByText('My Favorite Note'))
       expect(onSelect).toHaveBeenCalledWith({ kind: 'filter', filter: 'favorites' })
     })
-
-    it('matches the Types row styling and type color for favorites', () => {
-      render(<Sidebar entries={[...mockEntries, favEntry]} selection={defaultSelection} onSelect={() => {}} />)
-      expectFavoriteRowToMatchTypeRow()
-    })
-
-    it('prefers a favorite note emoji icon over the type icon fallback', () => {
-      const emojiFavorite = { ...favEntry, title: 'Emoji Favorite', icon: '🚀' }
-
-      render(<Sidebar entries={[...mockEntries, emojiFavorite]} selection={defaultSelection} onSelect={() => {}} />)
-
-      const emojiRow = screen.getByText('Emoji Favorite').closest('.cursor-pointer')
-      expect(within(emojiRow as HTMLElement).getByText('🚀')).toBeInTheDocument()
-      expect(emojiRow?.querySelector('svg')).toBeNull()
-    })
-
-    it('uses a favorite note phosphor icon and keeps the type color', () => {
-      const iconFavorite = { ...favEntry, title: 'Icon Favorite', icon: 'rocket' }
-
-      render(<Sidebar entries={[...mockEntries, iconFavorite]} selection={defaultSelection} onSelect={() => {}} />)
-
-      const { favoriteIcon, typeRow } = expectFavoriteRowToMatchTypeRow('Icon Favorite')
-      const typeIcon = typeRow.querySelector('svg')
-      expect(typeIcon).not.toBeNull()
-      expect(favoriteIcon.innerHTML).not.toBe(typeIcon!.innerHTML)
-    })
-
-    it('falls back to a neutral icon color when the favorite type has no defined color', () => {
-      const customType: VaultEntry = {
-        path: '/vault/types/recipe.md', filename: 'recipe.md', title: 'Recipe',
-        isA: 'Type', aliases: [], belongsTo: [], relatedTo: [], status: null, owner: null,
-        cadence: null, archived: false, modifiedAt: 1700000000,
-        createdAt: null, fileSize: 120, snippet: '', wordCount: 0, relationships: {},
-        icon: 'flask', color: null, order: null, sidebarLabel: null, template: null,
-        sort: null, view: null, visible: null, outgoingLinks: [], properties: {},
-      }
-      const recipeFavorite: VaultEntry = {
-        path: '/vault/recipe/sourdough.md', filename: 'sourdough.md', title: 'Sourdough',
-        isA: 'Recipe', aliases: [], belongsTo: [], relatedTo: [], status: null, owner: null,
-        cadence: null, archived: false, modifiedAt: 1700000000,
-        createdAt: null, fileSize: 120, snippet: '', wordCount: 0, relationships: {},
-        icon: null, color: null, order: null, sidebarLabel: null, template: null,
-        sort: null, view: null, visible: null, outgoingLinks: [], properties: {},
-        favorite: true, favoriteIndex: 0,
-      }
-
-      render(<Sidebar entries={[...mockEntries, customType, recipeFavorite]} selection={defaultSelection} onSelect={() => {}} />)
-
-      const recipeRow = screen.getByText('Sourdough').closest('.cursor-pointer')
-      const recipeIcon = recipeRow?.querySelector('svg')
-
-      expect(recipeIcon?.getAttribute('style')).toContain('var(--muted-foreground)')
-      expect(within(recipeRow as HTMLElement).getByText('Sourdough')).toBeInTheDocument()
-    })
   })
 
   describe('group separators', () => {
@@ -1150,32 +1049,5 @@ describe('Sidebar', () => {
       const viewContainer = screen.getByText('Empty View').closest('div')
       expect(viewContainer?.querySelector('span:last-child')?.textContent).not.toBe('0')
     })
-
-    it('adds hover and focus classes that hide the view count chip while showing the action buttons', () => {
-      render(
-        <Sidebar
-          entries={mockEntries}
-          selection={defaultSelection}
-          onSelect={() => {}}
-          views={mockViews}
-          onEditView={() => {}}
-          onDeleteView={() => {}}
-        />
-      )
-
-      const label = screen.getByText('Active Projects')
-      const viewItem = label.closest('.group.relative') as HTMLElement
-      const navItem = label.closest('[class*="cursor-pointer"]') as HTMLElement
-      const countChip = navItem.querySelector('span:last-child') as HTMLElement
-      expect(countChip).toBeTruthy()
-      expect(viewItem.className).toContain('[&>div>span:last-child]:transition-opacity')
-      expect(viewItem.className).toContain('group-hover:[&>div>span:last-child]:opacity-0')
-      expect(viewItem.className).toContain('group-focus-within:[&>div>span:last-child]:opacity-0')
-
-      const actionButton = within(viewItem).getByTitle('Edit view')
-      const actionContainer = actionButton.parentElement as HTMLElement
-      expect(actionContainer.className).toContain('group-hover:opacity-100')
-      expect(actionContainer.className).toContain('group-focus-within:opacity-100')
-    })
   })
 })

src/components/Sidebar.tsx

@@ -44,7 +44,6 @@ interface SidebarProps {
   onDeleteView?: (filename: string) => void
   folders?: FolderNode[]
   onCreateFolder?: (name: string) => void
-  showInbox?: boolean
   inboxCount?: number
   onCollapse?: () => void
 }
@@ -66,7 +65,6 @@ export const Sidebar = memo(function Sidebar({
   onDeleteView,
   folders = [],
   onCreateFolder,
-  showInbox = true,
   inboxCount = 0,
   onCollapse,
   onCreateNewType,
@@ -162,7 +160,6 @@ export const Sidebar = memo(function Sidebar({
         <SidebarTopNav
           selection={selection}
           onSelect={onSelect}
-          showInbox={showInbox}
           inboxCount={inboxCount}
           activeCount={activeCount}
           archivedCount={archivedCount}

src/components/StatusBar.test.tsx

@@ -51,19 +51,6 @@ describe('StatusBar', () => {
     expect(screen.queryByText('main')).not.toBeInTheDocument()
   })
 
-  it('shows Feedback button when callback is provided', () => {
-    render(<StatusBar noteCount={100} vaultPath="/Users/luca/Laputa" vaults={vaults} onSwitchVault={vi.fn()} onOpenFeedback={vi.fn()} />)
-    expect(screen.getByTestId('status-feedback')).toBeInTheDocument()
-    expect(screen.getByText('Feedback')).toBeInTheDocument()
-  })
-
-  it('calls onOpenFeedback when Feedback is clicked', () => {
-    const onOpenFeedback = vi.fn()
-    render(<StatusBar noteCount={100} vaultPath="/Users/luca/Laputa" vaults={vaults} onSwitchVault={vi.fn()} onOpenFeedback={onOpenFeedback} />)
-    fireEvent.click(screen.getByTestId('status-feedback'))
-    expect(onOpenFeedback).toHaveBeenCalledOnce()
-  })
-
   it('shows clickable commit hash that opens URL via openExternalUrl', () => {
     render(
       <StatusBar

src/components/StatusBar.tsx

@@ -34,7 +34,6 @@ interface StatusBarProps {
   onOpenConflictResolver?: () => void
   zoomLevel?: number
   onZoomReset?: () => void
-  onOpenFeedback?: () => void
   buildNumber?: string
   onCheckForUpdates?: () => void
   onRemoveVault?: (path: string) => void
@@ -68,7 +67,6 @@ export function StatusBar({
   onOpenConflictResolver,
   zoomLevel = 100,
   onZoomReset,
-  onOpenFeedback,
   buildNumber,
   onCheckForUpdates,
   onRemoveVault,
@@ -133,7 +131,6 @@ export function StatusBar({
         noteCount={noteCount}
         zoomLevel={zoomLevel}
         onZoomReset={onZoomReset}
-        onOpenFeedback={onOpenFeedback}
         onOpenSettings={onOpenSettings}
       />
     </footer>

src/components/editor-content/EditorContentLayout.tsx

@@ -29,7 +29,6 @@ type BreadcrumbActions = Pick<
   | 'onDeleteNote'
   | 'onArchiveNote'
   | 'onUnarchiveNote'
-  | 'onRenameFilename'
 >
 
 function EditorLoadingSkeleton() {
@@ -99,14 +98,12 @@ function ActiveTabBreadcrumb({
   barRef,
   wordCount,
   path,
-  showTitleSection,
   actions,
 }: {
   activeTab: NonNullable<EditorContentModel['activeTab']>
   barRef: React.RefObject<HTMLDivElement | null>
   wordCount: number
   path: string
-  showTitleSection: boolean
   actions: BreadcrumbActions
 }) {
   return (
@@ -114,7 +111,6 @@ function ActiveTabBreadcrumb({
       entry={activeTab.entry}
       wordCount={wordCount}
       barRef={barRef}
-      showTitleSection={showTitleSection}
       showDiffToggle={actions.showDiffToggle}
       diffMode={actions.diffMode}
       diffLoading={actions.diffLoading}
@@ -131,7 +127,6 @@ function ActiveTabBreadcrumb({
       onDelete={bindPath(actions.onDeleteNote, path)}
       onArchive={bindPath(actions.onArchiveNote, path)}
       onUnarchive={bindPath(actions.onUnarchiveNote, path)}
-      onRenameFilename={actions.onRenameFilename}
     />
   )
 }
@@ -321,7 +316,6 @@ export function EditorContentLayout(model: EditorContentModel) {
         barRef={breadcrumbBarRef}
         wordCount={wordCount}
         path={path}
-        showTitleSection={showTitleSection}
         actions={{
           diffMode: model.diffMode,
           diffLoading: model.diffLoading,
@@ -339,7 +333,6 @@ export function EditorContentLayout(model: EditorContentModel) {
           onDeleteNote: model.onDeleteNote,
           onArchiveNote: model.onArchiveNote,
           onUnarchiveNote: model.onUnarchiveNote,
-          onRenameFilename: model.onRenameFilename,
         }}
       />
       <EditorChrome

src/components/editor-content/useEditorContentModel.ts

@@ -40,54 +40,11 @@ export interface EditorContentProps {
   vaultPath?: string
   rawLatestContentRef?: React.MutableRefObject<string | null>
   onTitleChange?: (path: string, newTitle: string) => void
-  onRenameFilename?: (path: string, newFilenameStem: string) => void
   isConflicted?: boolean
   onKeepMine?: (path: string) => void
   onKeepTheirs?: (path: string) => void
 }
 
-function useBreadcrumbTitleVisibility({
-  showEditor,
-  showTitleSection,
-  path,
-  breadcrumbBarRef,
-  titleSectionRef,
-}: {
-  showEditor: boolean
-  showTitleSection: boolean
-  path: string
-  breadcrumbBarRef: React.RefObject<HTMLDivElement | null>
-  titleSectionRef: React.RefObject<HTMLDivElement | null>
-}) {
-  useEffect(() => {
-    if (!showEditor) return
-
-    const bar = breadcrumbBarRef.current
-    const titleSection = titleSectionRef.current
-    if (!bar || !titleSection) return
-
-    if (!showTitleSection) {
-      bar.setAttribute('data-title-hidden', '')
-      return () => {
-        bar.removeAttribute('data-title-hidden')
-      }
-    }
-
-    const observer = new IntersectionObserver(
-      ([entry]) => {
-        if (entry.isIntersecting) bar.removeAttribute('data-title-hidden')
-        else bar.setAttribute('data-title-hidden', '')
-      },
-      { threshold: 0 },
-    )
-    observer.observe(titleSection)
-    return () => {
-      observer.disconnect()
-      bar.removeAttribute('data-title-hidden')
-    }
-  }, [path, showEditor, showTitleSection, breadcrumbBarRef, titleSectionRef])
-}
-
 export function useEditorContentModel(props: EditorContentProps) {
   const {
     activeTab,
@@ -120,13 +77,26 @@ export function useEditorContentModel(props: EditorContentProps) {
   const titleSectionRef = useRef<HTMLDivElement | null>(null)
   const breadcrumbBarRef = useRef<HTMLDivElement | null>(null)
 
-  useBreadcrumbTitleVisibility({
-    showEditor,
-    showTitleSection,
-    path,
-    breadcrumbBarRef,
-    titleSectionRef,
-  })
+  useEffect(() => {
+    if (!showEditor) return
+
+    const bar = breadcrumbBarRef.current
+    const titleSection = titleSectionRef.current
+    if (!bar || !titleSection) return
+
+    const observer = new IntersectionObserver(
+      ([entry]) => {
+        if (entry.isIntersecting) bar.removeAttribute('data-title-hidden')
+        else bar.setAttribute('data-title-hidden', '')
+      },
+      { threshold: 0 },
+    )
+    observer.observe(titleSection)
+    return () => {
+      observer.disconnect()
+      bar.removeAttribute('data-title-hidden')
+    }
+  }, [path, showEditor])
 
   return {
     ...props,

src/components/filter-builder/FilterFieldCombobox.test.tsx

@@ -19,41 +19,4 @@ describe('FilterFieldCombobox', () => {
     expect(listbox).toBeInTheDocument()
     expect(root.contains(listbox)).toBe(false)
   })
-
-  it('renders the option list inside a dedicated scroll container', () => {
-    render(
-      <FilterFieldCombobox
-        value="status"
-        fields={Array.from({ length: 20 }, (_, index) => `Field ${index + 1}`)}
-        onChange={vi.fn()}
-      />,
-    )
-
-    fireEvent.focus(screen.getByTestId('filter-field-combobox-input'))
-
-    expect(screen.getByTestId('filter-field-combobox-scroll-area')).toHaveClass(
-      'max-h-60',
-      'overflow-y-auto',
-      'overscroll-contain',
-    )
-  })
-
-  it('stops wheel events from bubbling out of the scroll container', () => {
-    const onWheel = vi.fn()
-
-    render(
-      <div onWheel={onWheel}>
-        <FilterFieldCombobox
-          value="status"
-          fields={Array.from({ length: 20 }, (_, index) => `Field ${index + 1}`)}
-          onChange={vi.fn()}
-        />
-      </div>,
-    )
-
-    fireEvent.focus(screen.getByTestId('filter-field-combobox-input'))
-    fireEvent.wheel(screen.getByTestId('filter-field-combobox-scroll-area'))
-
-    expect(onWheel).not.toHaveBeenCalled()
-  })
 })

src/components/inspector/RelationshipsPanel.tsx

@@ -6,12 +6,7 @@ import { containsWikilinks } from '../DynamicPropertiesPanel'
 import type { FrontmatterValue } from '../Inspector'
 import { NoteSearchList } from '../NoteSearchList'
 import { useNoteSearch } from '../../hooks/useNoteSearch'
-import {
-  resolveEntry,
-  canonicalWikilinkTargetForEntry,
-  canonicalWikilinkTargetForTitle,
-  formatWikilinkRef,
-} from '../../utils/wikilink'
+import { resolveEntry } from '../../utils/wikilink'
 import { isWikilink, resolveRefProps } from './shared'
 import { LinkButton } from './LinkButton'
 
@@ -20,61 +15,6 @@ function hasExactTitleMatch(entries: VaultEntry[], title: string): boolean {
   return resolveEntry(entries, title) !== undefined
 }
 
-function inferVaultPath(entries: VaultEntry[]): string {
-  if (entries.length === 0) return ''
-  const segments = entries.map((entry) => entry.path.split('/').slice(0, -1))
-  const prefix: string[] = []
-  const maxDepth = Math.min(...segments.map((parts) => parts.length))
-  for (let i = 0; i < maxDepth; i += 1) {
-    const segment = segments[0][i]
-    if (segments.every((parts) => parts[i] === segment)) prefix.push(segment)
-    else break
-  }
-  return prefix.join('/')
-}
-
-function canonicalRefForEntry(entry: VaultEntry, vaultPath: string): string {
-  return formatWikilinkRef(canonicalWikilinkTargetForEntry(entry, vaultPath))
-}
-
-function canonicalRefForTitle(title: string, entries: VaultEntry[], vaultPath: string): string {
-  return formatWikilinkRef(canonicalWikilinkTargetForTitle(title, entries, vaultPath))
-}
-
-function shouldShowSearchDropdown(focused: boolean, trimmed: string, resultCount: number, showCreate: boolean): boolean {
-  return focused && trimmed.length > 0 && (resultCount > 0 || showCreate)
-}
-
-function confirmRelationshipSelection({
-  showCreate,
-  selectedIndex,
-  createIndex,
-  trimmed,
-  selectedEntry,
-  onCreate,
-  onSelectEntry,
-  onFallback,
-}: {
-  showCreate: boolean
-  selectedIndex: number
-  createIndex: number
-  trimmed: string
-  selectedEntry?: VaultEntry
-  onCreate?: (title: string) => void
-  onSelectEntry?: (entry: VaultEntry) => void
-  onFallback?: () => void
-}): void {
-  if (showCreate && selectedIndex === createIndex && trimmed) {
-    onCreate?.(trimmed)
-    return
-  }
-  if (selectedEntry) {
-    onSelectEntry?.(selectedEntry)
-    return
-  }
-  onFallback?.()
-}
-
 /** Shared keyboard navigation for search dropdowns with an optional "create" item. */
 function useSearchKeyboard(
   search: ReturnType<typeof useNoteSearch>,
@@ -150,7 +90,7 @@ function CreateAndOpenOption({ title, selected, onClick, onHover }: {
 
 function SearchDropdownWithCreate({ search, onSelect, query, entries, onCreateAndOpen }: {
   search: ReturnType<typeof useNoteSearch>
-  onSelect: (entry: VaultEntry) => void
+  onSelect: (title: string) => void
   query: string
   entries: VaultEntry[]
   onCreateAndOpen?: (title: string) => void
@@ -168,7 +108,7 @@ function SearchDropdownWithCreate({ search, onSelect, query, entries, onCreateAn
           items={search.results}
           selectedIndex={search.selectedIndex}
           getItemKey={(item) => item.entry.path}
-          onItemClick={(item) => onSelect(item.entry)}
+          onItemClick={(item) => onSelect(item.entry.title)}
           onItemHover={(i) => search.setSelectedIndex(i)}
           className="max-h-[160px] overflow-y-auto"
         />
@@ -185,12 +125,11 @@ function SearchDropdownWithCreate({ search, onSelect, query, entries, onCreateAn
   )
 }
 
-function useInlineAddNoteState(
-  entries: VaultEntry[],
-  vaultPath: string,
-  onAdd: (ref: string) => void,
-  onCreateAndOpenNote?: (title: string) => Promise<boolean>,
-) {
+function InlineAddNote({ entries, onAdd, onCreateAndOpenNote }: {
+  entries: VaultEntry[]
+  onAdd: (noteTitle: string) => void
+  onCreateAndOpenNote?: (title: string) => Promise<boolean>
+}) {
   const [active, setActive] = useState(false)
   const [query, setQuery] = useState('')
   const inputRef = useRef<HTMLInputElement>(null)
@@ -199,82 +138,25 @@ function useInlineAddNoteState(
   const trimmed = query.trim()
   const { showCreate, createIndex, totalItems } = useCreateOption(entries, trimmed, search.results.length, !!onCreateAndOpenNote)
 
-  const dismiss = useCallback(() => {
-    setQuery('')
-    setActive(false)
-  }, [])
+  const dismiss = useCallback(() => { setQuery(''); setActive(false) }, [])
 
-  const selectAndClose = useCallback((ref: string) => {
-    onAdd(ref)
+  const selectAndClose = useCallback((title: string) => {
+    onAdd(title)
     dismiss()
   }, [onAdd, dismiss])
 
-  const selectEntryAndClose = useCallback((entry: VaultEntry) => {
-    selectAndClose(canonicalRefForEntry(entry, vaultPath))
-  }, [selectAndClose, vaultPath])
-
-  const handleCreateAndOpen = useCreateAndOpen(
-    onCreateAndOpenNote,
-    (title) => onAdd(canonicalRefForTitle(title, entries, vaultPath)),
-    dismiss,
-  )
-
-  const handleFallback = useCallback(() => {
-    if (!trimmed) return
-    selectAndClose(canonicalRefForTitle(trimmed, entries, vaultPath))
-  }, [trimmed, selectAndClose, entries, vaultPath])
+  const handleCreateAndOpen = useCreateAndOpen(onCreateAndOpenNote, onAdd, dismiss)
 
   const handleConfirm = useCallback(() => {
-    confirmRelationshipSelection({
-      showCreate,
-      selectedIndex: search.selectedIndex,
-      createIndex,
-      trimmed,
-      selectedEntry: search.selectedEntry,
-      onCreate: handleCreateAndOpen,
-      onSelectEntry: selectEntryAndClose,
-      onFallback: handleFallback,
-    })
-  }, [showCreate, search.selectedIndex, search.selectedEntry, createIndex, trimmed, handleCreateAndOpen, selectEntryAndClose, handleFallback])
+    if (showCreate && search.selectedIndex === createIndex) {
+      handleCreateAndOpen(trimmed)
+      return
+    }
+    const title = search.selectedEntry?.title ?? trimmed
+    if (title) selectAndClose(title)
+  }, [search.selectedEntry, search.selectedIndex, trimmed, selectAndClose, showCreate, createIndex, handleCreateAndOpen])
 
   const handleKeyDown = useSearchKeyboard(search, totalItems, handleConfirm, dismiss)
-  const showDropdown = shouldShowSearchDropdown(active, trimmed, search.results.length, showCreate)
-
-  return {
-    active,
-    setActive,
-    query,
-    setQuery,
-    inputRef,
-    search,
-    dismiss,
-    handleKeyDown,
-    showDropdown,
-    selectEntryAndClose,
-    showCreate,
-    handleCreateAndOpen,
-  }
-}
-
-function InlineAddNote({ entries, vaultPath, onAdd, onCreateAndOpenNote }: {
-  entries: VaultEntry[]
-  vaultPath: string
-  onAdd: (ref: string) => void
-  onCreateAndOpenNote?: (title: string) => Promise<boolean>
-}) {
-  const {
-    active,
-    setActive,
-    query,
-    setQuery,
-    inputRef,
-    search,
-    dismiss,
-    handleKeyDown,
-    showDropdown,
-    selectEntryAndClose,
-    handleCreateAndOpen,
-  } = useInlineAddNoteState(entries, vaultPath, onAdd, onCreateAndOpenNote)
 
   if (!active) {
     return (
@@ -289,6 +171,8 @@ function InlineAddNote({ entries, vaultPath, onAdd, onCreateAndOpenNote }: {
     )
   }
 
+  const showDropdown = trimmed.length > 0 && (search.results.length > 0 || showCreate)
+
   return (
     <div className="relative mt-1">
       <div className="group/add relative flex items-center">
@@ -313,7 +197,7 @@ function InlineAddNote({ entries, vaultPath, onAdd, onCreateAndOpenNote }: {
       {showDropdown && (
         <SearchDropdownWithCreate
           search={search}
-          onSelect={selectEntryAndClose}
+          onSelect={selectAndClose}
           query={query}
           entries={entries}
           onCreateAndOpen={onCreateAndOpenNote ? (title) => { handleCreateAndOpen(title) } : undefined}
@@ -323,11 +207,11 @@ function InlineAddNote({ entries, vaultPath, onAdd, onCreateAndOpenNote }: {
   )
 }
 
-function RelationshipGroup({ label, refs, entries, typeEntryMap, vaultPath, onNavigate, onRemoveRef, onAddRef, onCreateAndOpenNote }: {
-  label: string; refs: string[]; entries: VaultEntry[]; typeEntryMap: Record<string, VaultEntry>; vaultPath: string
+function RelationshipGroup({ label, refs, entries, typeEntryMap, onNavigate, onRemoveRef, onAddRef, onCreateAndOpenNote }: {
+  label: string; refs: string[]; entries: VaultEntry[]; typeEntryMap: Record<string, VaultEntry>
   onNavigate: (target: string) => void
   onRemoveRef?: (ref: string) => void
-  onAddRef?: (ref: string) => void
+  onAddRef?: (noteTitle: string) => void
   onCreateAndOpenNote?: (title: string) => Promise<boolean>
 }) {
   if (refs.length === 0) return null
@@ -350,7 +234,6 @@ function RelationshipGroup({ label, refs, entries, typeEntryMap, vaultPath, onNa
       {onAddRef && (
         <InlineAddNote
           entries={entries}
-          vaultPath={vaultPath}
           onAdd={onAddRef}
           onCreateAndOpenNote={onCreateAndOpenNote}
         />
@@ -386,30 +269,22 @@ function NoteTargetInput({ entries, value, onChange, onSubmit, onCancel, onCreat
   const trimmed = value.trim()
   const { showCreate, createIndex, totalItems } = useCreateOption(entries, trimmed, search.results.length, !!onCreateAndOpenNote)
 
-  const selectEntry = useCallback((entry: VaultEntry) => {
-    onChange(entry.title)
-    setFocused(false)
-  }, [onChange])
-
   const handleConfirm = useCallback(() => {
-    confirmRelationshipSelection({
-      showCreate,
-      selectedIndex: search.selectedIndex,
-      createIndex,
-      trimmed,
-      selectedEntry: search.selectedEntry,
-      onCreate: onSubmitWithCreate,
-      onSelectEntry: selectEntry,
-      onFallback: onSubmit,
-    })
-  }, [showCreate, search.selectedIndex, search.selectedEntry, createIndex, trimmed, onSubmitWithCreate, selectEntry, onSubmit])
+    if (showCreate && search.selectedIndex === createIndex) {
+      onSubmitWithCreate?.(trimmed)
+    } else if (search.selectedEntry) {
+      onChange(search.selectedEntry.title)
+      setFocused(false)
+    } else {
+      onSubmit?.()
+    }
+  }, [showCreate, search.selectedIndex, search.selectedEntry, createIndex, trimmed, onChange, onSubmit, onSubmitWithCreate])
 
-  const handleEscape = useCallback(() => {
-    onCancel?.()
-  }, [onCancel])
+  const handleEscape = useCallback(() => { onCancel?.() }, [onCancel])
 
   const handleKeyDown = useSearchKeyboard(search, totalItems, handleConfirm, handleEscape)
-  const showDropdown = shouldShowSearchDropdown(focused, trimmed, search.results.length, showCreate)
+
+  const showDropdown = focused && trimmed.length > 0 && (search.results.length > 0 || showCreate)
 
   return (
     <div className="relative">
@@ -426,7 +301,7 @@ function NoteTargetInput({ entries, value, onChange, onSubmit, onCancel, onCreat
       {showDropdown && (
         <SearchDropdownWithCreate
           search={search}
-          onSelect={selectEntry}
+          onSelect={(title) => { onChange(title); setFocused(false) }}
           query={value}
           entries={entries}
           onCreateAndOpen={onCreateAndOpenNote ? (title) => onSubmitWithCreate?.(title) : undefined}
@@ -436,56 +311,8 @@ function NoteTargetInput({ entries, value, onChange, onSubmit, onCancel, onCreat
   )
 }
 
-function useRelationshipPanelState(
-  frontmatter: ParsedFrontmatter,
-  entries: VaultEntry[],
-  vaultPath: string | undefined,
-  onAddProperty?: (key: string, value: FrontmatterValue) => void,
-  onUpdateProperty?: (key: string, value: FrontmatterValue) => void,
-  onDeleteProperty?: (key: string) => void,
-) {
-  const relationshipEntries = useMemo(() => extractRelationshipRefs(frontmatter), [frontmatter])
-  const resolvedVaultPath = useMemo(() => vaultPath ?? inferVaultPath(entries), [vaultPath, entries])
-
-  const handleRemoveRef = useCallback((key: string, refToRemove: string) => {
-    if (!onUpdateProperty || !onDeleteProperty) return
-    const group = relationshipEntries.find(g => g.key === key)
-    if (!group) return
-    const result = updateRefsForRemoval(group.refs, refToRemove)
-    if (result === null) onDeleteProperty(key)
-    else onUpdateProperty(key, result)
-  }, [relationshipEntries, onUpdateProperty, onDeleteProperty])
-
-  const handleAddRef = useCallback((key: string, ref: string) => {
-    if (!onUpdateProperty) return
-    const existing = relationshipEntries.find(g => g.key === key)?.refs ?? []
-    const result = updateRefsForAddition(existing, ref)
-    if (result !== false) onUpdateProperty(key, result)
-  }, [relationshipEntries, onUpdateProperty])
-
-  const canEdit = !!onUpdateProperty && !!onDeleteProperty
-  const existingRelKeys = useMemo(
-    () => new Set(relationshipEntries.map(g => g.key.toLowerCase())),
-    [relationshipEntries],
-  )
-  const missingSuggestedRels = useMemo(
-    () => (onAddProperty ? SUGGESTED_RELATIONSHIPS.filter(r => !existingRelKeys.has(r.toLowerCase())) : []),
-    [onAddProperty, existingRelKeys],
-  )
-
-  return {
-    relationshipEntries,
-    resolvedVaultPath,
-    handleRemoveRef,
-    handleAddRef,
-    canEdit,
-    missingSuggestedRels,
-  }
-}
-
-function AddRelationshipForm({ entries, vaultPath, onAddProperty, onCreateAndOpenNote }: {
+function AddRelationshipForm({ entries, onAddProperty, onCreateAndOpenNote }: {
   entries: VaultEntry[]
-  vaultPath: string
   onAddProperty: (key: string, value: FrontmatterValue) => void
   onCreateAndOpenNote?: (title: string) => Promise<boolean>
 }) {
@@ -500,16 +327,16 @@ function AddRelationshipForm({ entries, vaultPath, onAddProperty, onCreateAndOpe
 
   const submitForm = useCallback((targetOverride?: string) => {
     const key = relKey.trim()
-    const rawTarget = (targetOverride ?? relTarget).trim()
-    if (!key || !rawTarget) return
-    onAddProperty(key, canonicalRefForTitle(rawTarget, entries, vaultPath))
+    const target = (targetOverride ?? relTarget).trim()
+    if (!key || !target) return
+    onAddProperty(key, `[[${target}]]`)
     resetForm()
-  }, [relKey, relTarget, entries, vaultPath, onAddProperty, resetForm])
+  }, [relKey, relTarget, onAddProperty, resetForm])
 
   const addPropertyForKey = useCallback((title: string) => {
     const key = relKey.trim()
-    if (key) onAddProperty(key, canonicalRefForTitle(title, entries, vaultPath))
-  }, [relKey, entries, vaultPath, onAddProperty])
+    if (key) onAddProperty(key, `[[${title}]]`)
+  }, [relKey, onAddProperty])
 
   const handleCreateAndSubmit = useCreateAndOpen(onCreateAndOpenNote, addPropertyForKey, resetForm)
 
@@ -554,9 +381,10 @@ function updateRefsForRemoval(refs: string[], refToRemove: string): FrontmatterV
   return remaining.length === 1 ? remaining[0] : remaining
 }
 
-function updateRefsForAddition(refs: string[], refToAdd: string): FrontmatterValue | false {
-  if (refs.includes(refToAdd)) return false
-  const updated = [...refs, refToAdd]
+function updateRefsForAddition(refs: string[], noteTitle: string): FrontmatterValue | false {
+  const newRef = `[[${noteTitle}]]`
+  if (refs.includes(newRef)) return false
+  const updated = [...refs, newRef]
   return updated.length === 1 ? updated[0] : updated
 }
 
@@ -568,11 +396,10 @@ function DisabledLinkButton() {
 
 const SUGGESTED_RELATIONSHIPS = ['Belongs to', 'Related to', 'Has'] as const
 
-function SuggestedRelationshipSlot({ label, entries, vaultPath, onAdd, onCreateAndOpenNote }: {
+function SuggestedRelationshipSlot({ label, entries, onAdd, onCreateAndOpenNote }: {
   label: string
   entries: VaultEntry[]
-  vaultPath: string
-  onAdd: (ref: string) => void
+  onAdd: (noteTitle: string) => void
   onCreateAndOpenNote?: (title: string) => Promise<boolean>
 }) {
   return (
@@ -580,7 +407,6 @@ function SuggestedRelationshipSlot({ label, entries, vaultPath, onAdd, onCreateA
       <span className="mb-1 block text-[12px] text-muted-foreground/50">{label}</span>
       <InlineAddNote
         entries={entries}
-        vaultPath={vaultPath}
         onAdd={onAdd}
         onCreateAndOpenNote={onCreateAndOpenNote}
       />
@@ -588,30 +414,50 @@ function SuggestedRelationshipSlot({ label, entries, vaultPath, onAdd, onCreateA
   )
 }
 
-export function DynamicRelationshipsPanel({ frontmatter, entries, typeEntryMap, vaultPath, onNavigate, onAddProperty, onUpdateProperty, onDeleteProperty, onCreateAndOpenNote }: {
-  frontmatter: ParsedFrontmatter; entries: VaultEntry[]; typeEntryMap: Record<string, VaultEntry>; vaultPath?: string
+export function DynamicRelationshipsPanel({ frontmatter, entries, typeEntryMap, onNavigate, onAddProperty, onUpdateProperty, onDeleteProperty, onCreateAndOpenNote }: {
+  frontmatter: ParsedFrontmatter; entries: VaultEntry[]; typeEntryMap: Record<string, VaultEntry>
   onNavigate: (target: string) => void
   onAddProperty?: (key: string, value: FrontmatterValue) => void
   onUpdateProperty?: (key: string, value: FrontmatterValue) => void
   onDeleteProperty?: (key: string) => void
   onCreateAndOpenNote?: (title: string) => Promise<boolean>
 }) {
-  const {
-    relationshipEntries,
-    resolvedVaultPath,
-    handleRemoveRef,
-    handleAddRef,
-    canEdit,
-    missingSuggestedRels,
-  } = useRelationshipPanelState(frontmatter, entries, vaultPath, onAddProperty, onUpdateProperty, onDeleteProperty)
+  const relationshipEntries = useMemo(() => extractRelationshipRefs(frontmatter), [frontmatter])
+
+  const handleRemoveRef = useCallback((key: string, refToRemove: string) => {
+    if (!onUpdateProperty || !onDeleteProperty) return
+    const group = relationshipEntries.find(g => g.key === key)
+    if (!group) return
+    const result = updateRefsForRemoval(group.refs, refToRemove)
+    if (result === null) onDeleteProperty(key)
+    else onUpdateProperty(key, result)
+  }, [relationshipEntries, onUpdateProperty, onDeleteProperty])
+
+  const handleAddRef = useCallback((key: string, noteTitle: string) => {
+    if (!onUpdateProperty) return
+    const existing = relationshipEntries.find(g => g.key === key)?.refs ?? []
+    const result = updateRefsForAddition(existing, noteTitle)
+    if (result !== false) onUpdateProperty(key, result)
+  }, [relationshipEntries, onUpdateProperty])
+
+  const canEdit = !!onUpdateProperty && !!onDeleteProperty
+
+  const existingRelKeys = useMemo(
+    () => new Set(relationshipEntries.map(g => g.key.toLowerCase())),
+    [relationshipEntries],
+  )
+
+  const missingSuggestedRels = onAddProperty
+    ? SUGGESTED_RELATIONSHIPS.filter(r => !existingRelKeys.has(r.toLowerCase()))
+    : []
 
   return (
     <div>
       {relationshipEntries.map(({ key, refs }) => (
         <RelationshipGroup
-          key={key} label={key} refs={refs} entries={entries} typeEntryMap={typeEntryMap} vaultPath={resolvedVaultPath} onNavigate={onNavigate}
+          key={key} label={key} refs={refs} entries={entries} typeEntryMap={typeEntryMap} onNavigate={onNavigate}
           onRemoveRef={canEdit ? (ref) => handleRemoveRef(key, ref) : undefined}
-          onAddRef={canEdit ? (ref) => handleAddRef(key, ref) : undefined}
+          onAddRef={canEdit ? (noteTitle) => handleAddRef(key, noteTitle) : undefined}
           onCreateAndOpenNote={canEdit ? onCreateAndOpenNote : undefined}
         />
       ))}
@@ -620,13 +466,12 @@ export function DynamicRelationshipsPanel({ frontmatter, entries, typeEntryMap,
           key={label}
           label={label}
           entries={entries}
-          vaultPath={resolvedVaultPath}
-          onAdd={(ref) => onAddProperty!(label, ref)}
+          onAdd={(noteTitle) => onAddProperty!(label, `[[${noteTitle}]]`)}
           onCreateAndOpenNote={onCreateAndOpenNote}
         />
       ))}
       {onAddProperty
-        ? <AddRelationshipForm entries={entries} vaultPath={resolvedVaultPath} onAddProperty={onAddProperty} onCreateAndOpenNote={onCreateAndOpenNote} />
+        ? <AddRelationshipForm entries={entries} onAddProperty={onAddProperty} onCreateAndOpenNote={onCreateAndOpenNote} />
         : <DisabledLinkButton />
       }
     </div>

src/components/inspector/useInspectorData.ts

@@ -11,10 +11,10 @@ function targetMatchesEntry(target: string, entryPath: string, matchTargets: Set
   return false
 }
 
-function refsMatchTargets(refs: string[], entryPath: string, targets: Set<string>): boolean {
+function refsMatchTargets(refs: string[], targets: Set<string>): boolean {
   return refs.some((ref) => {
     const target = wikilinkTarget(ref)
-    return targetMatchesEntry(target, entryPath, targets)
+    return targets.has(target) || targets.has(target.split('/').pop() ?? '')
   })
 }
 
@@ -29,7 +29,7 @@ export function useReferencedBy(entry: VaultEntry | null, entries: VaultEntry[])
     for (const other of entries) {
       if (other.path === entry.path) continue
       for (const [key, refs] of Object.entries(other.relationships)) {
-        if (key !== 'Type' && refsMatchTargets(refs, entry.path, matchTargets)) {
+        if (key !== 'Type' && refsMatchTargets(refs, matchTargets)) {
           results.push({ entry: other, viaKey: key })
         }
       }

src/components/note-item/PropertyChips.tsx

@@ -3,8 +3,6 @@ import { Link } from '@phosphor-icons/react'
 import { cn } from '@/lib/utils'
 import type { VaultEntry } from '../../types'
 import { resolveNoteIcon } from '../../utils/noteIcon'
-import { detectPropertyType } from '../../utils/propertyTypes'
-import { getMappedStatusStyle } from '../../utils/statusStyles'
 import { getTypeColor, getTypeLightColor } from '../../utils/typeColors'
 import { isUrlValue, normalizeUrl, openExternalUrl } from '../../utils/url'
 import { resolveEntry, wikilinkDisplay, wikilinkTarget } from '../../utils/wikilink'
@@ -16,7 +14,7 @@ interface PropertyChipValue {
   typeIcon: ComponentType<SVGAttributes<SVGSVGElement>> | null
   style?: CSSProperties
   action?: { kind: 'note'; entry: VaultEntry } | { kind: 'url'; url: string }
-  tone: 'neutral' | 'relationship' | 'status' | 'url'
+  tone: 'neutral' | 'relationship' | 'url'
 }
 
 const URL_CHIP_STYLE: CSSProperties = {
@@ -24,8 +22,6 @@ const URL_CHIP_STYLE: CSSProperties = {
   color: 'var(--accent-blue)',
 }
 
-type ChipScalarValue = string | number | boolean | null
-
 function toChipTestId(propName: string, index: number): string {
   const slug = propName.trim().toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '')
   return `property-chip-${slug || 'value'}-${index}`
@@ -119,29 +115,6 @@ function resolveScalarChip(value: unknown): PropertyChipValue | null {
   }
 }
 
-function resolveStatusChip(value: ChipScalarValue): PropertyChipValue | null {
-  const label = formatChipLabel(value)
-  if (!label) return null
-
-  const status = String(value)
-  const style = getMappedStatusStyle(status)
-  return {
-    label: `• ${label}`,
-    noteIcon: null,
-    typeIcon: null,
-    style: style ? { backgroundColor: style.bg, color: style.color } : undefined,
-    tone: 'status',
-  }
-}
-
-function resolvePropertyValueChip(propName: string, value: ChipScalarValue | undefined): PropertyChipValue | null {
-  if (value === undefined) return null
-  if (detectPropertyType(propName, value) !== 'status') {
-    return resolveScalarChip(value)
-  }
-  return resolveStatusChip(value)
-}
-
 function resolveRelationshipChipValues(
   entry: VaultEntry,
   propName: string,
@@ -162,7 +135,7 @@ function resolveScalarChipValues(entry: VaultEntry, propName: string): PropertyC
   const rawValue = entry.properties[propertyKey]
   const values = Array.isArray(rawValue) ? rawValue : [rawValue]
   return values
-    .map((value) => resolvePropertyValueChip(propertyKey, value))
+    .map((value) => resolveScalarChip(value))
     .filter((chip): chip is PropertyChipValue => chip !== null)
 }
 
@@ -173,7 +146,7 @@ function resolvePropertyChipValues(
   typeEntryMap: Record<string, VaultEntry>,
 ): PropertyChipValue[] {
   if (propName.toLowerCase() === 'status') {
-    const statusChip = resolvePropertyValueChip(propName, entry.status)
+    const statusChip = resolveScalarChip(entry.status)
     return statusChip ? [statusChip] : []
   }
 

src/components/sidebar/SidebarSections.tsx

@@ -20,7 +20,6 @@ import {
 } from '../SidebarParts'
 import { TypeCustomizePopover } from '../TypeCustomizePopover'
 import { useDragRegion } from '../../hooks/useDragRegion'
-import { buildTypeEntryMap, getTypeColor, getTypeLightColor } from '../../utils/typeColors'
 import { NoteTitleIcon } from '../NoteTitleIcon'
 
 export interface SidebarSectionProps {
@@ -87,7 +86,7 @@ function ViewItem({
   const count = useMemo(() => evaluateView(view.definition, entries).length, [view.definition, entries])
 
   return (
-    <div className="group relative [&>div>span:last-child]:transition-opacity group-hover:[&>div>span:last-child]:opacity-0 group-focus-within:[&>div>span:last-child]:opacity-0">
+    <div className="group relative">
       <NavItem
         icon={Funnel}
         emoji={view.definition.icon}
@@ -96,7 +95,7 @@ function ViewItem({
         isActive={isActive}
         onClick={onSelect}
       />
-      <div className="absolute right-2 top-1/2 flex -translate-y-1/2 items-center gap-0.5 opacity-0 transition-opacity group-hover:opacity-100 group-focus-within:opacity-100">
+      <div className="absolute right-2 top-1/2 flex -translate-y-1/2 items-center gap-0.5 opacity-0 transition-opacity group-hover:opacity-100">
         {onEditView && (
           <button
             className="rounded p-0.5 text-muted-foreground hover:text-foreground"
@@ -123,32 +122,28 @@ function ViewItem({
 export function SidebarTopNav({
   selection,
   onSelect,
-  showInbox,
   inboxCount,
   activeCount,
   archivedCount,
 }: {
   selection: SidebarSelection
   onSelect: (selection: SidebarSelection) => void
-  showInbox: boolean
   inboxCount: number
   activeCount: number
   archivedCount: number
 }) {
   return (
     <div className="border-b border-border" data-testid="sidebar-top-nav" style={{ padding: '4px 6px' }}>
-      {showInbox && (
-        <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={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"
@@ -339,46 +334,16 @@ export function TypesSection({
   )
 }
 
-const FAVORITE_TYPE_ICON_MAP: Record<string, string> = {
-  Project: 'wrench',
-  project: 'wrench',
-  Experiment: 'flask',
-  experiment: 'flask',
-  Responsibility: 'target',
-  responsibility: 'target',
-  Procedure: 'arrows-clockwise',
-  procedure: 'arrows-clockwise',
-  Person: 'users',
-  person: 'users',
-  Event: 'calendar-blank',
-  event: 'calendar-blank',
-  Topic: 'tag',
-  topic: 'tag',
-  Type: 'stack-simple',
-  type: 'stack-simple',
-}
-
-function getFavoriteIcon(entry: VaultEntry, typeEntryMap: Record<string, VaultEntry>) {
-  const typeEntry = entry.isA ? typeEntryMap[entry.isA] : undefined
-  return entry.icon ?? typeEntry?.icon ?? FAVORITE_TYPE_ICON_MAP[entry.isA ?? ''] ?? 'file-text'
-}
-
 function SortableFavoriteItem({
   entry,
   isActive,
   onSelect,
-  typeEntryMap,
 }: {
   entry: VaultEntry
   isActive: boolean
   onSelect: () => void
-  typeEntryMap: Record<string, VaultEntry>
 }) {
   const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({ id: entry.path })
-  const typeEntry = entry.isA ? typeEntryMap[entry.isA] : undefined
-  const icon = getFavoriteIcon(entry, typeEntryMap)
-  const typeColor = getTypeColor(entry.isA ?? null, typeEntry?.color)
-  const typeLightColor = getTypeLightColor(entry.isA ?? null, typeEntry?.color)
 
   return (
     <div
@@ -388,36 +353,17 @@ function SortableFavoriteItem({
       {...listeners}
     >
       <div
-        className={`group/section flex cursor-pointer select-none items-center justify-between rounded transition-colors ${isActive ? '' : 'hover:bg-accent'}`}
-        style={{ padding: '6px 8px 6px 16px', borderRadius: 4, gap: 4, ...(isActive ? { background: typeLightColor } : {}) }}
+        className={`flex cursor-pointer select-none items-center gap-1.5 rounded text-[13px] font-normal transition-colors ${isActive ? 'bg-secondary text-foreground' : 'text-muted-foreground hover:bg-accent'}`}
+        style={{ padding: '4px 16px 4px 28px' }}
         onClick={onSelect}
       >
-        <div className="flex min-w-0 flex-1 items-center" style={{ gap: 4 }}>
-          <NoteTitleIcon icon={icon} size={16} color={typeColor} />
-          <span className="truncate text-[13px] font-medium" style={{ marginLeft: 4, color: isActive ? typeColor : undefined }}>
-            {entry.title}
-          </span>
-        </div>
+        <NoteTitleIcon icon={entry.icon} size={14} />
+        <span className="truncate">{entry.title}</span>
       </div>
     </div>
   )
 }
 
-function sortFavorites(entries: VaultEntry[]) {
-  return entries
-    .filter((entry) => entry.favorite && !entry.archived)
-    .sort((a, b) => (a.favoriteIndex ?? Infinity) - (b.favoriteIndex ?? Infinity))
-}
-
-function reorderFavoriteIds(favoriteIds: string[], event: DragEndEvent) {
-  const { active, over } = event
-  if (!over || active.id === over.id) return null
-  const oldIndex = favoriteIds.indexOf(active.id as string)
-  const newIndex = favoriteIds.indexOf(over.id as string)
-  if (oldIndex === -1 || newIndex === -1) return null
-  return arrayMove(favoriteIds, oldIndex, newIndex)
-}
-
 export function FavoritesSection({
   entries,
   selection,
@@ -435,14 +381,22 @@ export function FavoritesSection({
   collapsed: boolean
   onToggle: () => void
 }) {
-  const favorites = useMemo(() => sortFavorites(entries), [entries])
+  const favorites = useMemo(
+    () => entries
+      .filter((entry) => entry.favorite && !entry.archived)
+      .sort((a, b) => (a.favoriteIndex ?? Infinity) - (b.favoriteIndex ?? Infinity)),
+    [entries],
+  )
   const favoriteIds = useMemo(() => favorites.map((entry) => entry.path), [favorites])
-  const typeEntryMap = useMemo(() => buildTypeEntryMap(entries), [entries])
   const sensors = useSensors(useSensor(PointerSensor, { activationConstraint: { distance: 5 } }))
 
   const handleDragEnd = useCallback((event: DragEndEvent) => {
-    const reordered = reorderFavoriteIds(favoriteIds, event)
-    if (reordered) onReorder?.(reordered)
+    const { active, over } = event
+    if (!over || active.id === over.id) return
+    const oldIndex = favoriteIds.indexOf(active.id as string)
+    const newIndex = favoriteIds.indexOf(over.id as string)
+    if (oldIndex === -1 || newIndex === -1) return
+    onReorder?.(arrayMove(favoriteIds, oldIndex, newIndex))
   }, [favoriteIds, onReorder])
 
   if (favorites.length === 0) return null
@@ -459,7 +413,6 @@ export function FavoritesSection({
                   key={entry.path}
                   entry={entry}
                   isActive={isSelectionActive(selection, { kind: 'entity', entry })}
-                  typeEntryMap={typeEntryMap}
                   onSelect={() => {
                     onSelect({ kind: 'filter', filter: 'favorites' })
                     onSelectNote?.(entry)

src/components/status-bar/StatusBarSections.tsx

@@ -1,9 +1,7 @@
 import { Bell, FileText, Package, Settings } from 'lucide-react'
-import { Megaphone } from '@phosphor-icons/react'
 import type { ClaudeCodeStatus } from '../../hooks/useClaudeCodeStatus'
 import type { McpStatus } from '../../hooks/useMcpStatus'
 import type { GitRemoteStatus, LastCommitInfo, SyncStatus } from '../../types'
-import { Button } from '@/components/ui/button'
 import {
   ClaudeCodeBadge,
   CommitBadge,
@@ -51,7 +49,6 @@ interface StatusBarSecondarySectionProps {
   noteCount: number
   zoomLevel: number
   onZoomReset?: () => void
-  onOpenFeedback?: () => void
   onOpenSettings?: () => void
 }
 
@@ -130,7 +127,6 @@ export function StatusBarSecondarySection({
   noteCount,
   zoomLevel,
   onZoomReset,
-  onOpenFeedback,
   onOpenSettings,
 }: StatusBarSecondarySectionProps) {
   return (
@@ -152,20 +148,6 @@ export function StatusBarSecondarySection({
           {zoomLevel}%
         </span>
       )}
-      {onOpenFeedback && (
-        <Button
-          type="button"
-          variant="ghost"
-          size="xs"
-          className="h-6 px-2 text-[11px] font-medium text-muted-foreground hover:text-foreground"
-          onClick={onOpenFeedback}
-          title="Share feedback"
-          data-testid="status-feedback"
-        >
-          <Megaphone size={14} />
-          Feedback
-        </Button>
-      )}
       <span style={DISABLED_STYLE} title="Coming soon">
         <Bell size={14} />
       </span>

src/components/ui/switch.tsx

@@ -1,46 +0,0 @@
-import * as React from "react"
-
-import { cn } from "@/lib/utils"
-
-interface SwitchProps extends Omit<React.ComponentProps<"button">, "onChange"> {
-  checked?: boolean
-  onCheckedChange?: (checked: boolean) => void
-}
-
-function Switch({
-  checked = false,
-  className,
-  onCheckedChange,
-  onClick,
-  type = "button",
-  ...props
-}: SwitchProps) {
-  return (
-    <button
-      data-slot="switch"
-      role="switch"
-      aria-checked={checked}
-      type={type}
-      className={cn(
-        "peer inline-flex h-5 w-9 shrink-0 items-center rounded-full border border-transparent shadow-xs transition-colors outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",
-        checked ? "bg-primary" : "bg-input",
-        className,
-      )}
-      onClick={(event) => {
-        onClick?.(event)
-        if (!event.defaultPrevented) onCheckedChange?.(!checked)
-      }}
-      {...props}
-    >
-      <span
-        data-slot="switch-thumb"
-        className={cn(
-          "pointer-events-none block size-4 rounded-full bg-background transition-transform",
-          checked ? "translate-x-4" : "translate-x-0",
-        )}
-      />
-    </button>
-  )
-}
-
-export { Switch }

src/constants/feedback.ts

@@ -1 +0,0 @@
-export const LAPUTA_GITHUB_ISSUES_URL = 'https://github.com/refactoringhq/laputa-app/issues'

src/hooks/appCommandDispatcher.test.ts

@@ -1,107 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import {
-  APP_COMMAND_IDS,
-  dispatchAppCommand,
-  isAppCommandId,
-  isNativeMenuCommandId,
-  type AppCommandHandlers,
-} from './appCommandDispatcher'
-
-function makeHandlers(): AppCommandHandlers {
-  return {
-    onSetViewMode: vi.fn(),
-    onCreateNote: vi.fn(),
-    onCreateType: vi.fn(),
-    onOpenDailyNote: vi.fn(),
-    onQuickOpen: vi.fn(),
-    onSave: vi.fn(),
-    onOpenSettings: vi.fn(),
-    onToggleInspector: vi.fn(),
-    onCommandPalette: vi.fn(),
-    onZoomIn: vi.fn(),
-    onZoomOut: vi.fn(),
-    onZoomReset: vi.fn(),
-    onToggleOrganized: vi.fn(),
-    onToggleFavorite: vi.fn(),
-    onArchiveNote: vi.fn(),
-    onDeleteNote: vi.fn(),
-    onSearch: vi.fn(),
-    onToggleRawEditor: vi.fn(),
-    onToggleDiff: vi.fn(),
-    onToggleAIChat: vi.fn(),
-    onGoBack: vi.fn(),
-    onGoForward: vi.fn(),
-    onCheckForUpdates: vi.fn(),
-    onSelectFilter: vi.fn(),
-    onOpenVault: vi.fn(),
-    onRemoveActiveVault: vi.fn(),
-    onRestoreGettingStarted: vi.fn(),
-    onCommitPush: vi.fn(),
-    onPull: vi.fn(),
-    onResolveConflicts: vi.fn(),
-    onViewChanges: vi.fn(),
-    onInstallMcp: vi.fn(),
-    onOpenInNewWindow: vi.fn(),
-    onReloadVault: vi.fn(),
-    onRepairVault: vi.fn(),
-    onRestoreDeletedNote: vi.fn(),
-    activeTabPathRef: { current: '/vault/test.md' },
-  }
-}
-
-describe('appCommandDispatcher', () => {
-  it('recognizes valid command ids', () => {
-    expect(isAppCommandId(APP_COMMAND_IDS.fileNewNote)).toBe(true)
-    expect(isAppCommandId('not-a-command')).toBe(false)
-  })
-
-  it('distinguishes native menu ids from keyboard-only ids', () => {
-    expect(isNativeMenuCommandId(APP_COMMAND_IDS.fileNewNote)).toBe(true)
-    expect(isNativeMenuCommandId(APP_COMMAND_IDS.noteToggleFavorite)).toBe(false)
-  })
-
-  it('dispatches create note through the shared command path', () => {
-    const handlers = makeHandlers()
-    expect(dispatchAppCommand(APP_COMMAND_IDS.fileNewNote, handlers)).toBe(true)
-    expect(handlers.onCreateNote).toHaveBeenCalled()
-  })
-
-  it('dispatches inspector toggle through the shared command path', () => {
-    const handlers = makeHandlers()
-    expect(dispatchAppCommand(APP_COMMAND_IDS.viewToggleProperties, handlers)).toBe(true)
-    expect(handlers.onToggleInspector).toHaveBeenCalled()
-  })
-
-  it('dispatches AI panel toggle through the shared command path', () => {
-    const handlers = makeHandlers()
-    expect(dispatchAppCommand(APP_COMMAND_IDS.viewToggleAiChat, handlers)).toBe(true)
-    expect(handlers.onToggleAIChat).toHaveBeenCalled()
-  })
-
-  it('uses the active note for note-scoped commands', () => {
-    const handlers = makeHandlers()
-    expect(dispatchAppCommand(APP_COMMAND_IDS.noteToggleFavorite, handlers)).toBe(true)
-    expect(dispatchAppCommand(APP_COMMAND_IDS.noteToggleOrganized, handlers)).toBe(true)
-    expect(dispatchAppCommand(APP_COMMAND_IDS.noteDelete, handlers)).toBe(true)
-    expect(handlers.onToggleFavorite).toHaveBeenCalledWith('/vault/test.md')
-    expect(handlers.onToggleOrganized).toHaveBeenCalledWith('/vault/test.md')
-    expect(handlers.onDeleteNote).toHaveBeenCalledWith('/vault/test.md')
-  })
-
-  it('no-ops note-scoped commands when there is no active note', () => {
-    const handlers = makeHandlers()
-    handlers.activeTabPathRef.current = null
-    expect(dispatchAppCommand(APP_COMMAND_IDS.noteToggleFavorite, handlers)).toBe(false)
-    expect(dispatchAppCommand(APP_COMMAND_IDS.noteToggleOrganized, handlers)).toBe(false)
-    expect(dispatchAppCommand(APP_COMMAND_IDS.noteDelete, handlers)).toBe(false)
-    expect(handlers.onToggleFavorite).not.toHaveBeenCalled()
-    expect(handlers.onToggleOrganized).not.toHaveBeenCalled()
-    expect(handlers.onDeleteNote).not.toHaveBeenCalled()
-  })
-
-  it('dispatches navigation filters through the same shared command path', () => {
-    const handlers = makeHandlers()
-    expect(dispatchAppCommand(APP_COMMAND_IDS.goChanges, handlers)).toBe(true)
-    expect(handlers.onSelectFilter).toHaveBeenCalledWith('changes')
-  })
-})

src/hooks/appCommandDispatcher.ts

@@ -1,292 +0,0 @@
-import type { MutableRefObject } from 'react'
-import type { SidebarFilter } from '../types'
-import type { ViewMode } from './useViewMode'
-
-export const APP_COMMAND_EVENT_NAME = 'laputa:dispatch-command'
-export const APP_MENU_EVENT_NAME = 'laputa:dispatch-menu-command'
-
-export const APP_COMMAND_IDS = {
-  appSettings: 'app-settings',
-  appCheckForUpdates: 'app-check-for-updates',
-  fileNewNote: 'file-new-note',
-  fileNewType: 'file-new-type',
-  fileDailyNote: 'file-daily-note',
-  fileQuickOpen: 'file-quick-open',
-  fileSave: 'file-save',
-  editFindInVault: 'edit-find-in-vault',
-  editToggleRawEditor: 'edit-toggle-raw-editor',
-  editToggleDiff: 'edit-toggle-diff',
-  viewEditorOnly: 'view-editor-only',
-  viewEditorList: 'view-editor-list',
-  viewAll: 'view-all',
-  viewToggleProperties: 'view-toggle-properties',
-  viewToggleAiChat: 'view-toggle-ai-chat',
-  viewToggleBacklinks: 'view-toggle-backlinks',
-  viewCommandPalette: 'view-command-palette',
-  viewZoomIn: 'view-zoom-in',
-  viewZoomOut: 'view-zoom-out',
-  viewZoomReset: 'view-zoom-reset',
-  viewGoBack: 'view-go-back',
-  viewGoForward: 'view-go-forward',
-  goAllNotes: 'go-all-notes',
-  goArchived: 'go-archived',
-  goChanges: 'go-changes',
-  goInbox: 'go-inbox',
-  noteToggleOrganized: 'note-toggle-organized',
-  noteToggleFavorite: 'note-toggle-favorite',
-  noteArchive: 'note-archive',
-  noteDelete: 'note-delete',
-  noteOpenInNewWindow: 'note-open-in-new-window',
-  noteRestoreDeleted: 'note-restore-deleted',
-  vaultOpen: 'vault-open',
-  vaultRemove: 'vault-remove',
-  vaultRestoreGettingStarted: 'vault-restore-getting-started',
-  vaultCommitPush: 'vault-commit-push',
-  vaultPull: 'vault-pull',
-  vaultResolveConflicts: 'vault-resolve-conflicts',
-  vaultViewChanges: 'vault-view-changes',
-  vaultInstallMcp: 'vault-install-mcp',
-  vaultReload: 'vault-reload',
-  vaultRepair: 'vault-repair',
-} as const
-
-export type AppCommandId = (typeof APP_COMMAND_IDS)[keyof typeof APP_COMMAND_IDS]
-
-const VIEW_MODE_COMMANDS: Partial<Record<AppCommandId, ViewMode>> = {
-  [APP_COMMAND_IDS.viewEditorOnly]: 'editor-only',
-  [APP_COMMAND_IDS.viewEditorList]: 'editor-list',
-  [APP_COMMAND_IDS.viewAll]: 'all',
-}
-
-const FILTER_COMMANDS: Partial<Record<AppCommandId, SidebarFilter>> = {
-  [APP_COMMAND_IDS.goAllNotes]: 'all',
-  [APP_COMMAND_IDS.goArchived]: 'archived',
-  [APP_COMMAND_IDS.goChanges]: 'changes',
-  [APP_COMMAND_IDS.goInbox]: 'inbox',
-}
-
-const APP_COMMAND_SET = new Set<string>(Object.values(APP_COMMAND_IDS))
-
-const NATIVE_MENU_COMMAND_IDS = [
-  APP_COMMAND_IDS.appSettings,
-  APP_COMMAND_IDS.appCheckForUpdates,
-  APP_COMMAND_IDS.fileNewNote,
-  APP_COMMAND_IDS.fileNewType,
-  APP_COMMAND_IDS.fileDailyNote,
-  APP_COMMAND_IDS.fileQuickOpen,
-  APP_COMMAND_IDS.fileSave,
-  APP_COMMAND_IDS.editFindInVault,
-  APP_COMMAND_IDS.editToggleRawEditor,
-  APP_COMMAND_IDS.editToggleDiff,
-  APP_COMMAND_IDS.viewEditorOnly,
-  APP_COMMAND_IDS.viewEditorList,
-  APP_COMMAND_IDS.viewAll,
-  APP_COMMAND_IDS.viewToggleProperties,
-  APP_COMMAND_IDS.viewToggleAiChat,
-  APP_COMMAND_IDS.viewToggleBacklinks,
-  APP_COMMAND_IDS.viewCommandPalette,
-  APP_COMMAND_IDS.viewZoomIn,
-  APP_COMMAND_IDS.viewZoomOut,
-  APP_COMMAND_IDS.viewZoomReset,
-  APP_COMMAND_IDS.viewGoBack,
-  APP_COMMAND_IDS.viewGoForward,
-  APP_COMMAND_IDS.goAllNotes,
-  APP_COMMAND_IDS.goArchived,
-  APP_COMMAND_IDS.goChanges,
-  APP_COMMAND_IDS.goInbox,
-  APP_COMMAND_IDS.noteToggleOrganized,
-  APP_COMMAND_IDS.noteArchive,
-  APP_COMMAND_IDS.noteDelete,
-  APP_COMMAND_IDS.noteOpenInNewWindow,
-  APP_COMMAND_IDS.noteRestoreDeleted,
-  APP_COMMAND_IDS.vaultOpen,
-  APP_COMMAND_IDS.vaultRemove,
-  APP_COMMAND_IDS.vaultRestoreGettingStarted,
-  APP_COMMAND_IDS.vaultCommitPush,
-  APP_COMMAND_IDS.vaultPull,
-  APP_COMMAND_IDS.vaultResolveConflicts,
-  APP_COMMAND_IDS.vaultViewChanges,
-  APP_COMMAND_IDS.vaultInstallMcp,
-  APP_COMMAND_IDS.vaultReload,
-  APP_COMMAND_IDS.vaultRepair,
-] as const
-
-const NATIVE_MENU_COMMAND_SET = new Set<string>(NATIVE_MENU_COMMAND_IDS)
-
-export type NativeMenuCommandId = (typeof NATIVE_MENU_COMMAND_IDS)[number]
-
-export interface AppCommandHandlers {
-  onSetViewMode: (mode: ViewMode) => void
-  onCreateNote: () => void
-  onCreateType?: () => void
-  onOpenDailyNote: () => void
-  onQuickOpen: () => void
-  onSave: () => void
-  onOpenSettings: () => void
-  onToggleInspector: () => void
-  onCommandPalette: () => void
-  onZoomIn: () => void
-  onZoomOut: () => void
-  onZoomReset: () => void
-  onToggleOrganized?: (path: string) => void
-  onToggleFavorite?: (path: string) => void
-  onArchiveNote: (path: string) => void
-  onDeleteNote: (path: string) => void
-  onSearch: () => void
-  onToggleRawEditor?: () => void
-  onToggleDiff?: () => void
-  onToggleAIChat?: () => void
-  onGoBack?: () => void
-  onGoForward?: () => void
-  onCheckForUpdates?: () => void
-  onSelectFilter?: (filter: SidebarFilter) => void
-  onOpenVault?: () => void
-  onRemoveActiveVault?: () => void
-  onRestoreGettingStarted?: () => void
-  onCommitPush?: () => void
-  onPull?: () => void
-  onResolveConflicts?: () => void
-  onViewChanges?: () => void
-  onInstallMcp?: () => void
-  onOpenInNewWindow?: () => void
-  onReloadVault?: () => void
-  onRepairVault?: () => void
-  onRestoreDeletedNote?: () => void
-  activeTabPathRef: MutableRefObject<string | null>
-}
-
-function dispatchActiveTabCommand(
-  pathRef: MutableRefObject<string | null>,
-  onPath: (path: string) => void,
-): boolean {
-  const path = pathRef.current
-  if (!path) return false
-  onPath(path)
-  return true
-}
-
-export function isAppCommandId(value: string): value is AppCommandId {
-  return APP_COMMAND_SET.has(value)
-}
-
-export function isNativeMenuCommandId(value: string): value is NativeMenuCommandId {
-  return NATIVE_MENU_COMMAND_SET.has(value)
-}
-
-export function dispatchAppCommand(id: AppCommandId, handlers: AppCommandHandlers): boolean {
-  const viewMode = VIEW_MODE_COMMANDS[id]
-  if (viewMode) {
-    handlers.onSetViewMode(viewMode)
-    return true
-  }
-
-  const filter = FILTER_COMMANDS[id]
-  if (filter) {
-    handlers.onSelectFilter?.(filter)
-    return true
-  }
-
-  switch (id) {
-    case APP_COMMAND_IDS.appSettings:
-      handlers.onOpenSettings()
-      return true
-    case APP_COMMAND_IDS.appCheckForUpdates:
-      handlers.onCheckForUpdates?.()
-      return true
-    case APP_COMMAND_IDS.fileNewNote:
-      handlers.onCreateNote()
-      return true
-    case APP_COMMAND_IDS.fileNewType:
-      handlers.onCreateType?.()
-      return true
-    case APP_COMMAND_IDS.fileDailyNote:
-      handlers.onOpenDailyNote()
-      return true
-    case APP_COMMAND_IDS.fileQuickOpen:
-      handlers.onQuickOpen()
-      return true
-    case APP_COMMAND_IDS.fileSave:
-      handlers.onSave()
-      return true
-    case APP_COMMAND_IDS.editFindInVault:
-      handlers.onSearch()
-      return true
-    case APP_COMMAND_IDS.editToggleRawEditor:
-      handlers.onToggleRawEditor?.()
-      return true
-    case APP_COMMAND_IDS.editToggleDiff:
-      handlers.onToggleDiff?.()
-      return true
-    case APP_COMMAND_IDS.viewToggleProperties:
-    case APP_COMMAND_IDS.viewToggleBacklinks:
-      handlers.onToggleInspector()
-      return true
-    case APP_COMMAND_IDS.viewToggleAiChat:
-      handlers.onToggleAIChat?.()
-      return true
-    case APP_COMMAND_IDS.viewCommandPalette:
-      handlers.onCommandPalette()
-      return true
-    case APP_COMMAND_IDS.viewZoomIn:
-      handlers.onZoomIn()
-      return true
-    case APP_COMMAND_IDS.viewZoomOut:
-      handlers.onZoomOut()
-      return true
-    case APP_COMMAND_IDS.viewZoomReset:
-      handlers.onZoomReset()
-      return true
-    case APP_COMMAND_IDS.viewGoBack:
-      handlers.onGoBack?.()
-      return true
-    case APP_COMMAND_IDS.viewGoForward:
-      handlers.onGoForward?.()
-      return true
-    case APP_COMMAND_IDS.noteToggleOrganized:
-      return dispatchActiveTabCommand(handlers.activeTabPathRef, (path) => handlers.onToggleOrganized?.(path))
-    case APP_COMMAND_IDS.noteToggleFavorite:
-      return dispatchActiveTabCommand(handlers.activeTabPathRef, (path) => handlers.onToggleFavorite?.(path))
-    case APP_COMMAND_IDS.noteArchive:
-      return dispatchActiveTabCommand(handlers.activeTabPathRef, handlers.onArchiveNote)
-    case APP_COMMAND_IDS.noteDelete:
-      return dispatchActiveTabCommand(handlers.activeTabPathRef, handlers.onDeleteNote)
-    case APP_COMMAND_IDS.noteOpenInNewWindow:
-      handlers.onOpenInNewWindow?.()
-      return true
-    case APP_COMMAND_IDS.noteRestoreDeleted:
-      handlers.onRestoreDeletedNote?.()
-      return true
-    case APP_COMMAND_IDS.vaultOpen:
-      handlers.onOpenVault?.()
-      return true
-    case APP_COMMAND_IDS.vaultRemove:
-      handlers.onRemoveActiveVault?.()
-      return true
-    case APP_COMMAND_IDS.vaultRestoreGettingStarted:
-      handlers.onRestoreGettingStarted?.()
-      return true
-    case APP_COMMAND_IDS.vaultCommitPush:
-      handlers.onCommitPush?.()
-      return true
-    case APP_COMMAND_IDS.vaultPull:
-      handlers.onPull?.()
-      return true
-    case APP_COMMAND_IDS.vaultResolveConflicts:
-      handlers.onResolveConflicts?.()
-      return true
-    case APP_COMMAND_IDS.vaultViewChanges:
-      handlers.onViewChanges?.()
-      return true
-    case APP_COMMAND_IDS.vaultInstallMcp:
-      handlers.onInstallMcp?.()
-      return true
-    case APP_COMMAND_IDS.vaultReload:
-      handlers.onReloadVault?.()
-      return true
-    case APP_COMMAND_IDS.vaultRepair:
-      handlers.onRepairVault?.()
-      return true
-  }
-
-  return false
-}

src/hooks/appKeyboardShortcuts.ts

@@ -1,47 +1,35 @@
+import type { MutableRefObject } from 'react'
 import type { ViewMode } from './useViewMode'
 import { trackEvent } from '../lib/telemetry'
-import { isTauri } from '../mock-tauri'
-import {
-  APP_COMMAND_IDS,
-  dispatchAppCommand,
-  type AppCommandId,
-  type AppCommandHandlers,
-} from './appCommandDispatcher'
 
-export type KeyboardActions = Pick<
-  AppCommandHandlers,
-  | 'onQuickOpen'
-  | 'onCommandPalette'
-  | 'onSearch'
-  | 'onCreateNote'
-  | 'onOpenDailyNote'
-  | 'onSave'
-  | 'onOpenSettings'
-  | 'onDeleteNote'
-  | 'onArchiveNote'
-  | 'onSetViewMode'
-  | 'onZoomIn'
-  | 'onZoomOut'
-  | 'onZoomReset'
-  | 'onGoBack'
-  | 'onGoForward'
-  | 'onToggleAIChat'
-  | 'onToggleRawEditor'
-  | 'onToggleInspector'
-  | 'onToggleFavorite'
-  | 'onToggleOrganized'
-  | 'onOpenInNewWindow'
-  | 'activeTabPathRef'
->
+export interface KeyboardActions {
+  onQuickOpen: () => void
+  onCommandPalette: () => void
+  onSearch: () => void
+  onCreateNote: () => void
+  onOpenDailyNote: () => void
+  onSave: () => void
+  onOpenSettings: () => void
+  onDeleteNote: (path: string) => void
+  onArchiveNote: (path: string) => void
+  onSetViewMode: (mode: ViewMode) => void
+  onZoomIn: () => void
+  onZoomOut: () => void
+  onZoomReset: () => void
+  onGoBack?: () => void
+  onGoForward?: () => void
+  onToggleAIChat?: () => void
+  onToggleRawEditor?: () => void
+  onToggleInspector?: () => void
+  onToggleFavorite?: (path: string) => void
+  onOpenInNewWindow?: () => void
+  activeTabPathRef: MutableRefObject<string | null>
+}
 
-type ShortcutMap = Record<string, AppCommandId>
-type NativeMenuCombo = 'command' | 'command-shift'
+type ShortcutHandler = () => void
+type ShortcutMap = Record<string, ShortcutHandler>
 
 const TEXT_EDITING_KEYS = new Set(['Backspace', 'Delete'])
-const TAURI_NATIVE_MENU_KEYS: Record<NativeMenuCombo, Set<string>> = {
-  command: new Set([',', '1', '2', '3', 'n', 'j', 'p', 's', 'k', '=', '+', '-', '0', '[', ']', '\\', 'e', 'Backspace', 'Delete']),
-  'command-shift': new Set(['f', 'i', 'o', 'l']),
-}
 
 const VIEW_MODE_KEYS: Record<string, ViewMode> = {
   '1': 'editor-only',
@@ -68,47 +56,48 @@ function isCommandShiftOnly(e: KeyboardEvent): boolean {
   return e.metaKey && e.ctrlKey === false && e.altKey === false && e.shiftKey
 }
 
-function nativeMenuComboForEvent(e: KeyboardEvent): NativeMenuCombo | null {
-  if (isCommandShiftOnly(e)) return 'command-shift'
-  if (isCommandOrCtrlOnly(e) && e.shiftKey === false) return 'command'
-  return null
-}
-
-function shouldDeferToNativeMenu(e: KeyboardEvent): boolean {
-  if (!isTauri()) return false
-  const combo = nativeMenuComboForEvent(e)
-  if (combo === null) return false
-  const normalizedKey = combo === 'command-shift' ? e.key.toLowerCase() : e.key
-  return TAURI_NATIVE_MENU_KEYS[combo].has(normalizedKey)
-}
-
-export function createCommandKeyMap(): ShortcutMap {
-  return {
-    k: APP_COMMAND_IDS.viewCommandPalette,
-    p: APP_COMMAND_IDS.fileQuickOpen,
-    n: APP_COMMAND_IDS.fileNewNote,
-    j: APP_COMMAND_IDS.fileDailyNote,
-    s: APP_COMMAND_IDS.fileSave,
-    ',': APP_COMMAND_IDS.appSettings,
-    d: APP_COMMAND_IDS.noteToggleFavorite,
-    e: APP_COMMAND_IDS.noteToggleOrganized,
-    Backspace: APP_COMMAND_IDS.noteDelete,
-    Delete: APP_COMMAND_IDS.noteDelete,
-    '[': APP_COMMAND_IDS.viewGoBack,
-    ']': APP_COMMAND_IDS.viewGoForward,
-    '=': APP_COMMAND_IDS.viewZoomIn,
-    '+': APP_COMMAND_IDS.viewZoomIn,
-    '-': APP_COMMAND_IDS.viewZoomOut,
-    '0': APP_COMMAND_IDS.viewZoomReset,
-    '\\': APP_COMMAND_IDS.editToggleRawEditor,
+function withActiveTab(
+  activeTabPathRef: MutableRefObject<string | null>,
+  handler: (path: string) => void,
+): ShortcutHandler {
+  return () => {
+    const path = activeTabPathRef.current
+    if (path) handler(path)
   }
 }
 
-export function createShiftCommandKeyMap(): ShortcutMap {
+export function createCommandKeyMap(actions: KeyboardActions): ShortcutMap {
+  const { activeTabPathRef } = actions
+
   return {
-    f: APP_COMMAND_IDS.editFindInVault,
-    i: APP_COMMAND_IDS.viewToggleProperties,
-    o: APP_COMMAND_IDS.noteOpenInNewWindow,
+    k: actions.onCommandPalette,
+    p: actions.onQuickOpen,
+    n: actions.onCreateNote,
+    j: actions.onOpenDailyNote,
+    s: actions.onSave,
+    ',': actions.onOpenSettings,
+    d: withActiveTab(activeTabPathRef, (path) => actions.onToggleFavorite?.(path)),
+    e: withActiveTab(activeTabPathRef, actions.onArchiveNote),
+    Backspace: withActiveTab(activeTabPathRef, actions.onDeleteNote),
+    Delete: withActiveTab(activeTabPathRef, actions.onDeleteNote),
+    '[': () => actions.onGoBack?.(),
+    ']': () => actions.onGoForward?.(),
+    '=': actions.onZoomIn,
+    '+': actions.onZoomIn,
+    '-': actions.onZoomOut,
+    '0': actions.onZoomReset,
+    '\\': () => actions.onToggleRawEditor?.(),
+  }
+}
+
+export function createShiftCommandKeyMap(actions: KeyboardActions): ShortcutMap {
+  return {
+    f: () => {
+      trackEvent('search_used')
+      actions.onSearch()
+    },
+    i: () => actions.onToggleInspector?.(),
+    o: () => actions.onOpenInNewWindow?.(),
   }
 }
 
@@ -121,42 +110,38 @@ export function handleViewModeKey(e: KeyboardEvent, onSetViewMode: (mode: ViewMo
   return true
 }
 
-export function handleCommandKey(e: KeyboardEvent, keyMap: ShortcutMap, actions: KeyboardActions): boolean {
+export function handleCommandKey(e: KeyboardEvent, keyMap: ShortcutMap): boolean {
   if (isCommandOrCtrlOnly(e) === false || e.shiftKey) return false
-  const commandId = keyMap[e.key]
-  if (commandId === undefined) return false
+  const handler = keyMap[e.key]
+  if (handler === undefined) return false
   if (TEXT_EDITING_KEYS.has(e.key) && isTextInputFocused()) return false
   e.preventDefault()
-  dispatchAppCommand(commandId, actions)
+  handler()
   return true
 }
 
-export function handleAiPanelKey(e: KeyboardEvent, actions: KeyboardActions): boolean {
+export function handleAiPanelKey(e: KeyboardEvent, onToggleAIChat?: () => void): boolean {
   const matchesAiPanelShortcut = e.code === 'KeyL' || e.key.toLowerCase() === 'l'
-  if (isCommandShiftOnly(e) === false || matchesAiPanelShortcut === false || actions.onToggleAIChat === undefined) return false
+  if (isCommandShiftOnly(e) === false || matchesAiPanelShortcut === false || onToggleAIChat === undefined) return false
   e.preventDefault()
-  dispatchAppCommand(APP_COMMAND_IDS.viewToggleAiChat, actions)
+  onToggleAIChat()
   return true
 }
 
-export function handleShiftCommandKey(e: KeyboardEvent, keyMap: ShortcutMap, actions: KeyboardActions): boolean {
+export function handleShiftCommandKey(e: KeyboardEvent, keyMap: ShortcutMap): boolean {
   if (isCommandOrCtrlShiftOnly(e) === false) return false
-  const commandId = keyMap[e.key.toLowerCase()]
-  if (commandId === undefined) return false
+  const handler = keyMap[e.key.toLowerCase()]
+  if (handler === undefined) return false
   e.preventDefault()
-  if (commandId === APP_COMMAND_IDS.editFindInVault) {
-    trackEvent('search_used')
-  }
-  dispatchAppCommand(commandId, actions)
+  handler()
   return true
 }
 
 export function handleAppKeyboardEvent(actions: KeyboardActions, event: KeyboardEvent) {
-  if (shouldDeferToNativeMenu(event)) return
-  if (handleAiPanelKey(event, actions)) return
-  const shiftKeyMap = createShiftCommandKeyMap()
-  if (handleShiftCommandKey(event, shiftKeyMap, actions)) return
+  if (handleAiPanelKey(event, actions.onToggleAIChat)) return
+  const shiftKeyMap = createShiftCommandKeyMap(actions)
+  if (handleShiftCommandKey(event, shiftKeyMap)) return
   if (handleViewModeKey(event, actions.onSetViewMode)) return
-  const cmdKeyMap = createCommandKeyMap()
-  handleCommandKey(event, cmdKeyMap, actions)
+  const cmdKeyMap = createCommandKeyMap(actions)
+  handleCommandKey(event, cmdKeyMap)
 }

src/hooks/commands/navigationCommands.ts

@@ -4,7 +4,6 @@ import type { SidebarSelection } from '../../types'
 interface NavigationCommandsConfig {
   onQuickOpen: () => void
   onSelect: (sel: SidebarSelection) => void
-  showInbox?: boolean
   onOpenDailyNote: () => void
   onGoBack?: () => void
   onGoForward?: () => void
@@ -13,25 +12,15 @@ interface NavigationCommandsConfig {
 }
 
 export function buildNavigationCommands(config: NavigationCommandsConfig): CommandAction[] {
-  const { onQuickOpen, onSelect, showInbox = true, onGoBack, onGoForward, canGoBack, canGoForward } = config
-  const commands: CommandAction[] = [
+  const { onQuickOpen, onSelect, onGoBack, onGoForward, canGoBack, canGoForward } = config
+  return [
     { id: 'search-notes', label: 'Search Notes', group: 'Navigation', shortcut: '⌘P', keywords: ['find', 'open', 'quick'], enabled: true, execute: onQuickOpen },
     { id: 'go-all', label: 'Go to All Notes', group: 'Navigation', keywords: ['filter'], enabled: true, execute: () => onSelect({ kind: 'filter', filter: 'all' }) },
     { id: 'go-archived', label: 'Go to Archived', group: 'Navigation', keywords: [], enabled: true, execute: () => onSelect({ kind: 'filter', filter: 'archived' }) },
     { id: 'go-changes', label: 'Go to Changes', group: 'Navigation', keywords: ['git', 'modified', 'pending'], enabled: true, execute: () => onSelect({ kind: 'filter', filter: 'changes' }) },
     { id: 'go-pulse', label: 'Go to Pulse', group: 'Navigation', keywords: ['activity', 'history', 'commits', 'git', 'feed'], enabled: true, execute: () => onSelect({ kind: 'filter', filter: 'pulse' }) },
+    { id: 'go-inbox', label: 'Go to Inbox', group: 'Navigation', keywords: ['inbox', 'unlinked', 'orphan', 'unorganized', 'triage'], enabled: true, execute: () => onSelect({ kind: 'filter', filter: 'inbox' }) },
     { id: 'go-back', label: 'Go Back', group: 'Navigation', shortcut: '⌘[', keywords: ['previous', 'history', 'back'], enabled: !!canGoBack, execute: () => onGoBack?.() },
     { id: 'go-forward', label: 'Go Forward', group: 'Navigation', shortcut: '⌘]', keywords: ['next', 'history', 'forward'], enabled: !!canGoForward, execute: () => onGoForward?.() },
   ]
-  if (showInbox) {
-    commands.splice(5, 0, {
-      id: 'go-inbox',
-      label: 'Go to Inbox',
-      group: 'Navigation',
-      keywords: ['inbox', 'unlinked', 'orphan', 'unorganized', 'triage'],
-      enabled: true,
-      execute: () => onSelect({ kind: 'filter', filter: 'inbox' }),
-    })
-  }
-  return commands
 }

src/hooks/commands/noteCommands.ts

@@ -45,7 +45,7 @@ export function buildNoteCommands(config: NoteCommandsConfig): CommandAction[] {
       execute: () => { if (activeTabPath) onDeleteNote(activeTabPath) },
     },
     {
-      id: 'archive-note', label: isArchived ? 'Unarchive Note' : 'Archive Note', group: 'Note',
+      id: 'archive-note', label: isArchived ? 'Unarchive Note' : 'Archive Note', group: 'Note', shortcut: '⌘E',
       keywords: ['archive'], enabled: hasActiveNote,
       execute: () => { if (activeTabPath) (isArchived ? onUnarchiveNote : onArchiveNote)(activeTabPath) },
     },
@@ -62,7 +62,7 @@ export function buildNoteCommands(config: NoteCommandsConfig): CommandAction[] {
       execute: () => { if (activeTabPath) onToggleFavorite?.(activeTabPath) },
     },
     {
-      id: 'toggle-organized', label: isOrganized ? 'Mark as Unorganized' : 'Mark as Organized', group: 'Note', shortcut: '⌘E',
+      id: 'toggle-organized', label: isOrganized ? 'Mark as Unorganized' : 'Mark as Organized', group: 'Note',
       keywords: ['organized', 'inbox', 'triage', 'done'],
       enabled: hasActiveNote && !!onToggleOrganized,
       execute: () => { if (activeTabPath) onToggleOrganized?.(activeTabPath) },

src/hooks/commands/settingsCommands.ts

@@ -5,7 +5,6 @@ interface SettingsCommandsConfig {
   vaultCount?: number
   isGettingStartedHidden?: boolean
   onOpenSettings: () => void
-  onOpenFeedback?: () => void
   onOpenVault?: () => void
   onRemoveActiveVault?: () => void
   onRestoreGettingStarted?: () => void
@@ -18,13 +17,12 @@ interface SettingsCommandsConfig {
 export function buildSettingsCommands(config: SettingsCommandsConfig): CommandAction[] {
   const {
     mcpStatus, vaultCount, isGettingStartedHidden,
-    onOpenSettings, onOpenFeedback, onOpenVault, onRemoveActiveVault, onRestoreGettingStarted,
+    onOpenSettings, onOpenVault, onRemoveActiveVault, onRestoreGettingStarted,
     onCheckForUpdates, onInstallMcp, onReloadVault, onRepairVault,
   } = config
 
   return [
     { id: 'open-settings', label: 'Open Settings', group: 'Settings', shortcut: '⌘,', keywords: ['preferences', 'config'], enabled: true, execute: onOpenSettings },
-    { id: 'give-feedback', label: 'Give Feedback', group: 'Settings', keywords: ['feedback', 'issue', 'bug', 'github', 'report'], enabled: !!onOpenFeedback, execute: () => onOpenFeedback?.() },
     { id: 'open-vault', label: 'Open Vault…', group: 'Settings', keywords: ['vault', 'folder', 'switch', 'open', 'workspace'], enabled: true, execute: () => onOpenVault?.() },
     { id: 'remove-vault', label: 'Remove Vault from List', group: 'Settings', keywords: ['vault', 'remove', 'disconnect', 'hide'], enabled: (vaultCount ?? 0) > 1 && !!onRemoveActiveVault, execute: () => onRemoveActiveVault?.() },
     { id: 'restore-getting-started', label: 'Restore Getting Started Vault', group: 'Settings', keywords: ['vault', 'restore', 'demo', 'getting started', 'reset'], enabled: !!isGettingStartedHidden && !!onRestoreGettingStarted, execute: () => onRestoreGettingStarted?.() },

src/hooks/useAppCommands.ts

@@ -23,7 +23,6 @@ interface AppCommandsConfig {
   onCreateNoteOfType: (type: string) => void
   onSave: () => void
   onOpenSettings: () => void
-  onOpenFeedback?: () => void
   onDeleteNote: (path: string) => void
   onArchiveNote: (path: string) => void
   onUnarchiveNote: (path: string) => void
@@ -40,7 +39,6 @@ interface AppCommandsConfig {
   onZoomReset: () => void
   zoomLevel: number
   onSelect: (sel: SidebarSelection) => void
-  showInbox?: boolean
   onReplaceActiveTab: (entry: VaultEntry) => void
   onSelectNote: (entry: VaultEntry) => void
   onGoBack?: () => void
@@ -90,9 +88,8 @@ export function useAppCommands(config: AppCommandsConfig): CommandAction[] {
   const { onSelect } = config
 
   const selectFilter = useCallback((filter: SidebarFilter) => {
-    const safeFilter = !config.showInbox && filter === 'inbox' ? 'all' : filter
-    onSelect({ kind: 'filter', filter: safeFilter })
-  }, [config.showInbox, onSelect])
+    onSelect({ kind: 'filter', filter })
+  }, [onSelect])
 
   const viewChanges = useCallback(() => {
     onSelect({ kind: 'filter', filter: 'changes' })
@@ -118,7 +115,6 @@ export function useAppCommands(config: AppCommandsConfig): CommandAction[] {
     onToggleRawEditor: config.onToggleRawEditor,
     onToggleInspector: config.onToggleInspector,
     onToggleFavorite: config.onToggleFavorite,
-    onToggleOrganized: config.onToggleOrganized,
     onOpenInNewWindow: config.onOpenInNewWindow,
     activeTabPathRef: config.activeTabPathRef,
   })
@@ -142,7 +138,6 @@ export function useAppCommands(config: AppCommandsConfig): CommandAction[] {
     onToggleRawEditor: config.onToggleRawEditor,
     onToggleDiff: config.onToggleDiff,
     onToggleAIChat: config.onToggleAIChat,
-    onToggleOrganized: config.onToggleOrganized,
     onGoBack: config.onGoBack,
     onGoForward: config.onGoForward,
     onCheckForUpdates: config.onCheckForUpdates,
@@ -174,7 +169,6 @@ export function useAppCommands(config: AppCommandsConfig): CommandAction[] {
     onCreateNoteOfType: config.onCreateNoteOfType,
     onSave: config.onSave,
     onOpenSettings: config.onOpenSettings,
-    onOpenFeedback: config.onOpenFeedback,
     onDeleteNote: config.onDeleteNote,
     onArchiveNote: config.onArchiveNote,
     onUnarchiveNote: config.onUnarchiveNote,
@@ -193,7 +187,6 @@ export function useAppCommands(config: AppCommandsConfig): CommandAction[] {
     onZoomReset: config.onZoomReset,
     zoomLevel: config.zoomLevel,
     onSelect: config.onSelect,
-    showInbox: config.showInbox,
     onOpenDailyNote: config.onOpenDailyNote,
     onGoBack: config.onGoBack,
     onGoForward: config.onGoForward,

src/hooks/useAppKeyboard.test.ts

@@ -38,7 +38,6 @@ function makeActions() {
     onOpenSettings: vi.fn(),
     onDeleteNote: vi.fn(),
     onArchiveNote: vi.fn(),
-    onToggleOrganized: vi.fn(),
     onSetViewMode: vi.fn(),
     onZoomIn: vi.fn(),
     onZoomOut: vi.fn(),
@@ -48,10 +47,7 @@ function makeActions() {
 }
 
 describe('useAppKeyboard', () => {
-  afterEach(() => {
-    delete (window as typeof window & { __TAURI__?: unknown }).__TAURI__
-    vi.restoreAllMocks()
-  })
+  afterEach(() => vi.restoreAllMocks())
 
   it('Cmd+1 sets view mode to editor-only', () => {
     const actions = makeActions()
@@ -95,14 +91,6 @@ describe('useAppKeyboard', () => {
     expect(actions.onCreateNote).toHaveBeenCalled()
   })
 
-  it('Cmd+N defers to native menu in Tauri', () => {
-    const actions = makeActions()
-    ;(window as typeof window & { __TAURI__?: object }).__TAURI__ = {}
-    renderHook(() => useAppKeyboard(actions))
-    fireKey('n', { metaKey: true })
-    expect(actions.onCreateNote).not.toHaveBeenCalled()
-  })
-
   it('Cmd+D triggers toggle favorite on active note', () => {
     const actions = makeActions()
     actions.onToggleFavorite = vi.fn()
@@ -111,23 +99,6 @@ describe('useAppKeyboard', () => {
     expect(actions.onToggleFavorite).toHaveBeenCalledWith('/vault/test.md')
   })
 
-  it('Cmd+D still uses JS shortcut in Tauri when no native menu owns it', () => {
-    const actions = makeActions()
-    actions.onToggleFavorite = vi.fn()
-    ;(window as typeof window & { __TAURI__?: object }).__TAURI__ = {}
-    renderHook(() => useAppKeyboard(actions))
-    fireKey('d', { metaKey: true })
-    expect(actions.onToggleFavorite).toHaveBeenCalledWith('/vault/test.md')
-  })
-
-  it('Cmd+E triggers toggle organized on active note, not archive', () => {
-    const actions = makeActions()
-    renderHook(() => useAppKeyboard(actions))
-    fireKey('e', { metaKey: true })
-    expect(actions.onToggleOrganized).toHaveBeenCalledWith('/vault/test.md')
-    expect(actions.onArchiveNote).not.toHaveBeenCalled()
-  })
-
   it('Cmd+J triggers open daily note', () => {
     const actions = makeActions()
     renderHook(() => useAppKeyboard(actions))

src/hooks/useAppSave.test.ts

@@ -1,17 +1,14 @@
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
+import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { renderHook, act } from '@testing-library/react'
 import { useAppSave } from './useAppSave'
 import type { VaultEntry } from '../types'
-import { isTauri } from '../mock-tauri'
-import { invoke } from '@tauri-apps/api/core'
 
 vi.mock('@tauri-apps/api/core', () => ({
   invoke: vi.fn().mockResolvedValue(undefined),
 }))
 vi.mock('../mock-tauri', () => ({
-  isTauri: vi.fn(() => false),
+  isTauri: () => false,
   mockInvoke: vi.fn().mockResolvedValue(undefined),
-  updateMockContent: vi.fn(),
 }))
 
 function makeEntry(path: string, title = 'Test', filename = 'test.md'): VaultEntry {
@@ -35,18 +32,12 @@ describe('useAppSave', () => {
 
   beforeEach(() => {
     vi.clearAllMocks()
-    vi.useRealTimers()
-    vi.mocked(isTauri).mockReturnValue(false)
     deps.unsavedPaths = new Set()
     deps.tabs = []
     deps.activeTabPath = null
     deps.handleRenameNote.mockResolvedValue(undefined)
   })
 
-  afterEach(() => {
-    vi.useRealTimers()
-  })
-
   function renderSave(overrides = {}) {
     return renderHook(() => useAppSave({ ...deps, ...overrides }))
   }
@@ -100,85 +91,4 @@ describe('useAppSave', () => {
     const { result } = renderSave()
     expect(typeof result.current.handleContentChange).toBe('function')
   })
-
-  it('debounces untitled H1 auto-rename until the user pauses typing', async () => {
-    vi.useFakeTimers()
-    vi.mocked(isTauri).mockReturnValue(true)
-    vi.mocked(invoke).mockImplementation(async (command: string, args?: Record<string, unknown>) => {
-      if (command === 'save_note_content') return undefined
-      if (command === 'auto_rename_untitled') return { new_path: '/vault/fresh-title.md', updated_files: 0 }
-      if (command === 'reload_vault_entry') return makeEntry('/vault/fresh-title.md', 'Fresh Title', 'fresh-title.md')
-      if (command === 'get_note_content' && args?.path === '/vault/fresh-title.md') return '# Fresh Title\n\nBody'
-      return undefined
-    })
-
-    const entry = makeEntry('/vault/untitled-note-123.md', 'Untitled Note 123', 'untitled-note-123.md')
-    const tabs = [{ entry, content: '# Fresh Title\n\nBody' }]
-    const { result } = renderSave({
-      tabs,
-      activeTabPath: entry.path,
-      unsavedPaths: new Set([entry.path]),
-    })
-
-    await act(async () => {
-      result.current.handleContentChange(entry.path, '# Fresh Title\n\nBody')
-      await vi.advanceTimersByTimeAsync(500)
-    })
-
-    expect(vi.mocked(invoke)).not.toHaveBeenCalledWith('auto_rename_untitled', expect.anything())
-
-    await act(async () => {
-      await vi.advanceTimersByTimeAsync(2_499)
-    })
-    expect(vi.mocked(invoke)).not.toHaveBeenCalledWith('auto_rename_untitled', expect.anything())
-
-    await act(async () => {
-      await vi.advanceTimersByTimeAsync(1)
-    })
-
-    expect(vi.mocked(invoke)).toHaveBeenCalledWith('auto_rename_untitled', {
-      vaultPath: '/vault',
-      notePath: entry.path,
-    })
-    expect(deps.replaceEntry).toHaveBeenCalledWith(
-      entry.path,
-      expect.objectContaining({ path: '/vault/fresh-title.md', filename: 'fresh-title.md' }),
-      '# Fresh Title\n\nBody',
-    )
-  })
-
-  it('cancels a pending untitled auto-rename when the user navigates away', async () => {
-    vi.useFakeTimers()
-    vi.mocked(isTauri).mockReturnValue(true)
-    vi.mocked(invoke).mockImplementation(async (command: string) => {
-      if (command === 'save_note_content') return undefined
-      if (command === 'auto_rename_untitled') return { new_path: '/vault/fresh-title.md', updated_files: 0 }
-      return undefined
-    })
-
-    const entry = makeEntry('/vault/untitled-note-123.md', 'Untitled Note 123', 'untitled-note-123.md')
-    const tabs = [{ entry, content: '# Fresh Title\n\nBody' }]
-    const { result, rerender } = renderHook(
-      ({ currentActiveTabPath }: { currentActiveTabPath: string | null }) => useAppSave({
-        ...deps,
-        tabs,
-        activeTabPath: currentActiveTabPath,
-        unsavedPaths: new Set([entry.path]),
-      }),
-      { initialProps: { currentActiveTabPath: entry.path } },
-    )
-
-    await act(async () => {
-      result.current.handleContentChange(entry.path, '# Fresh Title\n\nBody')
-      await vi.advanceTimersByTimeAsync(500)
-    })
-
-    rerender({ currentActiveTabPath: '/vault/other.md' })
-
-    await act(async () => {
-      await vi.advanceTimersByTimeAsync(2_500)
-    })
-
-    expect(vi.mocked(invoke)).not.toHaveBeenCalledWith('auto_rename_untitled', expect.anything())
-  })
 })

src/hooks/useAppSave.ts

@@ -1,9 +1,8 @@
-import { useCallback, useEffect, useRef, type MutableRefObject } from 'react'
+import { useCallback, useEffect, useRef } from 'react'
 import { invoke } from '@tauri-apps/api/core'
 import { useEditorSaveWithLinks } from './useEditorSaveWithLinks'
 import { needsRenameOnSave } from './useNoteRename'
 import { flushEditorContent } from '../utils/autoSave'
-import { extractH1TitleFromContent } from '../utils/noteTitle'
 import { isTauri } from '../mock-tauri'
 import type { VaultEntry } from '../types'
 
@@ -12,13 +11,6 @@ interface TabState {
   content: string
 }
 
-const UNTITLED_RENAME_DEBOUNCE_MS = 2500
-
-interface PendingUntitledRename {
-  path: string
-  timer: ReturnType<typeof setTimeout>
-}
-
 function findUnsavedFallback(
   tabs: TabState[], activeTabPath: string | null, unsavedPaths: Set<string>,
 ): { path: string; content: string } | undefined {
@@ -35,74 +27,6 @@ function activeTabNeedsRename(tabs: TabState[], activeTabPath: string | null): {
     : null
 }
 
-function isUntitledRenameCandidate(path: string): boolean {
-  const filename = path.split('/').pop() ?? ''
-  const stem = filename.replace(/\.md$/, '')
-  return stem.startsWith('untitled-') && /\d+$/.test(stem)
-}
-
-function shouldScheduleUntitledRename(path: string, content: string): boolean {
-  return isTauri()
-    && isUntitledRenameCandidate(path)
-    && extractH1TitleFromContent(content) !== null
-}
-
-function matchingPendingRename(
-  pending: PendingUntitledRename | null,
-  path?: string,
-): PendingUntitledRename | null {
-  if (!pending) return null
-  if (path && pending.path !== path) return null
-  return pending
-}
-
-function takePendingRename(
-  pendingRenameRef: MutableRefObject<PendingUntitledRename | null>,
-  path?: string,
-): PendingUntitledRename | null {
-  const pending = matchingPendingRename(pendingRenameRef.current, path)
-  if (!pending) return null
-  clearTimeout(pending.timer)
-  pendingRenameRef.current = null
-  return pending
-}
-
-function schedulePendingRename(
-  pendingRenameRef: MutableRefObject<PendingUntitledRename | null>,
-  path: string,
-  onFire: (path: string) => void,
-): void {
-  takePendingRename(pendingRenameRef)
-  const timer = setTimeout(() => {
-    const pending = takePendingRename(pendingRenameRef, path)
-    if (pending) onFire(pending.path)
-  }, UNTITLED_RENAME_DEBOUNCE_MS)
-  pendingRenameRef.current = { path, timer }
-}
-
-function pendingRenameOutsideActiveTab(
-  pendingRenameRef: MutableRefObject<PendingUntitledRename | null>,
-  activeTabPath: string | null,
-): string | null {
-  const pending = pendingRenameRef.current
-  if (!pending || pending.path === activeTabPath) return null
-  return pending.path
-}
-
-async function reloadAutoRenamedNote(
-  oldPath: string,
-  newPath: string,
-  replaceEntry: AppSaveDeps['replaceEntry'],
-  loadModifiedFiles: AppSaveDeps['loadModifiedFiles'],
-): Promise<void> {
-  const [newEntry, newContent] = await Promise.all([
-    invoke<VaultEntry>('reload_vault_entry', { path: newPath }),
-    invoke<string>('get_note_content', { path: newPath }),
-  ])
-  replaceEntry(oldPath, { ...newEntry, path: newPath }, newContent)
-  loadModifiedFiles()
-}
-
 interface AppSaveDeps {
   updateEntry: (path: string, patch: Partial<VaultEntry>) => void
   setTabs: Parameters<typeof useEditorSaveWithLinks>[0]['setTabs']
@@ -125,63 +49,41 @@ export function useAppSave({
   handleRenameNote, replaceEntry, resolvedPath,
 }: AppSaveDeps) {
   const contentChangeRef = useRef<(path: string, content: string) => void>(() => {})
-  const pendingUntitledRenameRef = useRef<PendingUntitledRename | null>(null)
 
   const onAfterSave = useCallback(() => {
     loadModifiedFiles()
   }, [loadModifiedFiles])
 
-  const cancelPendingUntitledRename = useCallback((path?: string) => (
-    takePendingRename(pendingUntitledRenameRef, path) !== null
-  ), [])
-
-  const executeUntitledRename = useCallback(async (path: string) => {
-    try {
-      const result = await invoke<{ new_path: string; updated_files: number } | null>('auto_rename_untitled', {
-        vaultPath: resolvedPath,
-        notePath: path,
-      })
-      if (!result) return false
-      await reloadAutoRenamedNote(path, result.new_path, replaceEntry, loadModifiedFiles)
-      return true
-    } catch {
-      return false
-    }
-  }, [resolvedPath, replaceEntry, loadModifiedFiles])
-
-  const flushPendingUntitledRename = useCallback(async (path?: string) => {
-    const pending = takePendingRename(pendingUntitledRenameRef, path)
-    if (!pending) return false
-    return executeUntitledRename(pending.path)
-  }, [executeUntitledRename])
-
-  const scheduleUntitledRename = useCallback((path: string, content: string) => {
-    if (!shouldScheduleUntitledRename(path, content)) {
-      cancelPendingUntitledRename(path)
-      return
-    }
-
-    schedulePendingRename(pendingUntitledRenameRef, path, (pendingPath) => {
-      void executeUntitledRename(pendingPath)
-    })
-  }, [cancelPendingUntitledRename, executeUntitledRename])
-
-  const onNotePersisted = useCallback((path: string, content: string) => {
+  const onNotePersisted = useCallback((path: string) => {
     clearUnsaved(path)
     if (path.endsWith('.yml')) reloadViews?.()
-    scheduleUntitledRename(path, content)
-  }, [clearUnsaved, reloadViews, scheduleUntitledRename])
+    // Auto-rename untitled notes when they have an H1 heading
+    const filename = path.split('/').pop() ?? ''
+    const stem = filename.replace(/\.md$/, '')
+    if (isTauri() && stem.startsWith('untitled-') && /\d+$/.test(stem)) {
+      invoke<{ new_path: string; updated_files: number } | null>('auto_rename_untitled', {
+        vaultPath: resolvedPath,
+        notePath: path,
+      }).then((result) => {
+        if (result) {
+          // Re-read the renamed file content and entry, then replace
+          Promise.all([
+            invoke<VaultEntry>('reload_vault_entry', { path: result.new_path }),
+            invoke<string>('get_note_content', { path: result.new_path }),
+          ]).then(([newEntry, newContent]) => {
+            replaceEntry(path, { ...newEntry, path: result.new_path }, newContent)
+            loadModifiedFiles()
+          }).catch(() => { /* ignore reload failure */ })
+        }
+      }).catch(() => { /* auto-rename is best-effort */ })
+    }
+  }, [clearUnsaved, reloadViews, resolvedPath, replaceEntry, loadModifiedFiles])
 
   const { handleSave: handleSaveRaw, handleContentChange, savePendingForPath, savePending } = useEditorSaveWithLinks({
     updateEntry, setTabs, setToastMessage, onAfterSave, onNotePersisted,
   })
 
   useEffect(() => { contentChangeRef.current = handleContentChange }, [handleContentChange])
-  useEffect(() => () => { cancelPendingUntitledRename() }, [cancelPendingUntitledRename])
-  useEffect(() => {
-    const pendingPath = pendingRenameOutsideActiveTab(pendingUntitledRenameRef, activeTabPath)
-    if (pendingPath) cancelPendingUntitledRename(pendingPath)
-  }, [activeTabPath, cancelPendingUntitledRename])
 
   // Refs for stable closure in flushBeforeAction
   const tabsRef = useRef(tabs)
@@ -197,33 +99,29 @@ export function useAppSave({
         isUnsaved: (p) => unsavedPathsRef.current.has(p),
         onSaved: (p) => { clearUnsaved(p) },
       })
-      await flushPendingUntitledRename(path)
     } catch (err) {
       setToastMessage(`Auto-save failed: ${err}`)
       throw err
     }
-  }, [savePendingForPath, clearUnsaved, setToastMessage, flushPendingUntitledRename])
+  }, [savePendingForPath, clearUnsaved, setToastMessage])
 
   const handleRenameTab = useCallback(async (path: string, newTitle: string) => {
     await savePendingForPath(path)
-    cancelPendingUntitledRename(path)
     await handleRenameNote(path, newTitle, resolvedPath, replaceEntry).then(loadModifiedFiles)
-  }, [handleRenameNote, resolvedPath, replaceEntry, savePendingForPath, loadModifiedFiles, cancelPendingUntitledRename])
+  }, [handleRenameNote, resolvedPath, replaceEntry, savePendingForPath, loadModifiedFiles])
 
   const handleSave = useCallback(async () => {
     await handleSaveRaw(findUnsavedFallback(tabs, activeTabPath, unsavedPaths))
-    const flushedUntitledRename = await flushPendingUntitledRename(activeTabPath ?? undefined)
     const rename = activeTabNeedsRename(tabs, activeTabPath)
-    if (!flushedUntitledRename && rename) await handleRenameTab(rename.path, rename.title)
-  }, [handleSaveRaw, handleRenameTab, tabs, activeTabPath, unsavedPaths, flushPendingUntitledRename])
+    if (rename) await handleRenameTab(rename.path, rename.title)
+  }, [handleSaveRaw, handleRenameTab, tabs, activeTabPath, unsavedPaths])
 
   const handleTitleSync = useCallback((path: string, newTitle: string) => {
-    cancelPendingUntitledRename(path)
     savePendingForPath(path)
       .then(() => handleRenameNote(path, newTitle, resolvedPath, replaceEntry))
       .then(loadModifiedFiles)
       .catch((err) => console.error('Title rename failed:', err))
-  }, [handleRenameNote, resolvedPath, replaceEntry, savePendingForPath, loadModifiedFiles, cancelPendingUntitledRename])
+  }, [handleRenameNote, resolvedPath, replaceEntry, savePendingForPath, loadModifiedFiles])
 
   return {
     contentChangeRef,

src/hooks/useCommandRegistry.test.ts

@@ -16,7 +16,6 @@ function makeConfig(overrides: Record<string, unknown> = {}) {
     onDeleteNote: vi.fn(),
     onArchiveNote: vi.fn(),
     onUnarchiveNote: vi.fn(),
-    onToggleOrganized: vi.fn(),
     onCommitPush: vi.fn(),
     onResolveConflicts: vi.fn(),
     onSetViewMode: vi.fn(),
@@ -193,32 +192,6 @@ describe('useCommandRegistry', () => {
     const cmd = findCommand(result.current, 'customize-inbox-columns')
     expect(cmd!.enabled).toBe(false)
   })
-
-  it('shows Cmd+E on toggle organized and removes it from archive note', () => {
-    const config = makeConfig()
-    const { result } = renderHook(() => useCommandRegistry(config))
-    expect(findCommand(result.current, 'toggle-organized')?.shortcut).toBe('⌘E')
-    expect(findCommand(result.current, 'archive-note')?.shortcut).toBeUndefined()
-  })
-
-  it('omits Inbox navigation when the explicit workflow is disabled', () => {
-    const config = makeConfig({ showInbox: false })
-    const { result } = renderHook(() => useCommandRegistry(config))
-    expect(findCommand(result.current, 'go-inbox')).toBeUndefined()
-  })
-
-  it('includes Give Feedback in the Settings group when available', () => {
-    const onOpenFeedback = vi.fn()
-    const config = makeConfig({ onOpenFeedback })
-    const { result } = renderHook(() => useCommandRegistry(config))
-    const cmd = findCommand(result.current, 'give-feedback')
-    expect(cmd).toBeDefined()
-    expect(cmd!.group).toBe('Settings')
-    expect(cmd!.enabled).toBe(true)
-
-    cmd!.execute()
-    expect(onOpenFeedback).toHaveBeenCalledOnce()
-  })
 })
 
 describe('pluralizeType', () => {

src/hooks/useCommandRegistry.ts

@@ -39,7 +39,6 @@ interface CommandRegistryConfig {
   onCreateNoteOfType: (type: string) => void
   onSave: () => void
   onOpenSettings: () => void
-  onOpenFeedback?: () => void
   onOpenVault?: () => void
   onCreateType?: () => void
   onDeleteNote: (path: string) => void
@@ -61,7 +60,6 @@ interface CommandRegistryConfig {
   zoomLevel: number
   onSelect: (sel: SidebarSelection) => void
   onOpenDailyNote: () => void
-  showInbox?: boolean
   onGoBack?: () => void
   onGoForward?: () => void
   canGoBack?: boolean
@@ -78,13 +76,12 @@ interface CommandRegistryConfig {
 export function useCommandRegistry(config: CommandRegistryConfig): import('./commands/types').CommandAction[] {
   const {
     activeTabPath, entries, modifiedCount,
-    onQuickOpen, onCreateNote, onCreateNoteOfType, onSave, onOpenSettings, onOpenFeedback,
+    onQuickOpen, onCreateNote, onCreateNoteOfType, onSave, onOpenSettings,
     onDeleteNote, onArchiveNote, onUnarchiveNote,
     onCommitPush, onPull, onResolveConflicts, onSetViewMode, onToggleInspector, onToggleDiff, onToggleRawEditor, onToggleAIChat, onOpenVault,
     activeNoteModified,
     onZoomIn, onZoomOut, onZoomReset, zoomLevel,
     onSelect, onOpenDailyNote,
-    showInbox,
     onGoBack, onGoForward, canGoBack, canGoForward,
     onCheckForUpdates, onCreateType,
     onRemoveActiveVault, onRestoreGettingStarted, isGettingStartedHidden, vaultCount,
@@ -110,7 +107,7 @@ export function useCommandRegistry(config: CommandRegistryConfig): import('./com
   const vaultTypes = useMemo(() => extractVaultTypes(entries), [entries])
 
   return useMemo(() => [
-    ...buildNavigationCommands({ onQuickOpen, onSelect, onOpenDailyNote, showInbox, onGoBack, onGoForward, canGoBack, canGoForward }),
+    ...buildNavigationCommands({ onQuickOpen, onSelect, onOpenDailyNote, onGoBack, onGoForward, canGoBack, canGoForward }),
     ...buildNoteCommands({
       hasActiveNote, activeTabPath, isArchived,
       onCreateNote, onCreateType, onOpenDailyNote, onSave,
@@ -127,20 +124,19 @@ export function useCommandRegistry(config: CommandRegistryConfig): import('./com
     }),
     ...buildSettingsCommands({
       mcpStatus, vaultCount, isGettingStartedHidden,
-      onOpenSettings, onOpenFeedback, onOpenVault, onRemoveActiveVault, onRestoreGettingStarted,
+      onOpenSettings, onOpenVault, onRemoveActiveVault, onRestoreGettingStarted,
       onCheckForUpdates, onInstallMcp, onReloadVault, onRepairVault,
     }),
     ...buildTypeCommands(vaultTypes, onCreateNoteOfType, onSelect),
     ...buildFilterCommands({ isSectionGroup, noteListFilter, onSetNoteListFilter }),
   ], [
     hasActiveNote, activeTabPath, isArchived, modifiedCount, activeNoteModified,
-    onQuickOpen, onCreateNote, onCreateNoteOfType, onCreateType, onSave, onOpenSettings, onOpenFeedback,
+    onQuickOpen, onCreateNote, onCreateNoteOfType, onCreateType, onSave, onOpenSettings,
     onDeleteNote, onArchiveNote, onUnarchiveNote,
     onCommitPush, onPull, onResolveConflicts, onSetViewMode, onToggleInspector, onToggleDiff, onToggleRawEditor, onToggleAIChat, onOpenVault,
     onCheckForUpdates,
     onZoomIn, onZoomOut, onZoomReset, zoomLevel,
     onSelect, onOpenDailyNote,
-    showInbox,
     onGoBack, onGoForward, canGoBack, canGoForward,
     vaultTypes,
     onRemoveActiveVault, onRestoreGettingStarted, isGettingStartedHidden, vaultCount,

src/hooks/useMenuEvents.test.ts

@@ -15,7 +15,6 @@ function makeHandlers(): MenuEventHandlers {
     onZoomIn: vi.fn(),
     onZoomOut: vi.fn(),
     onZoomReset: vi.fn(),
-    onToggleOrganized: vi.fn(),
     onArchiveNote: vi.fn(),
     onDeleteNote: vi.fn(),
     onSearch: vi.fn(),
@@ -144,19 +143,6 @@ describe('dispatchMenuEvent', () => {
     expect(h.onArchiveNote).not.toHaveBeenCalled()
   })
 
-  it('note-toggle-organized triggers organized toggle on active tab', () => {
-    const h = makeHandlers()
-    dispatchMenuEvent('note-toggle-organized', h)
-    expect(h.onToggleOrganized).toHaveBeenCalledWith('/vault/test.md')
-  })
-
-  it('note-toggle-organized does nothing when no active tab', () => {
-    const h = makeHandlers()
-    h.activeTabPathRef = { current: null }
-    dispatchMenuEvent('note-toggle-organized', h)
-    expect(h.onToggleOrganized).not.toHaveBeenCalled()
-  })
-
   it('note-delete triggers delete on active tab', () => {
     const h = makeHandlers()
     dispatchMenuEvent('note-delete', h)

src/hooks/useMenuEvents.ts

@@ -1,76 +1,146 @@
 import { useEffect, useRef } from 'react'
 import { isTauri } from '../mock-tauri'
-import {
-  APP_COMMAND_EVENT_NAME,
-  dispatchAppCommand,
-  isAppCommandId,
-  type AppCommandHandlers,
-} from './appCommandDispatcher'
+import type { SidebarFilter } from '../types'
+import type { ViewMode } from './useViewMode'
 
-declare global {
-  interface Window {
-    __laputaTest?: {
-      dispatchAppCommand?: (id: string) => void
-      dispatchBrowserMenuCommand?: (id: string) => void
-      triggerMenuCommand?: (id: string) => Promise<unknown>
-    }
-  }
-}
-
-export interface MenuEventHandlers extends AppCommandHandlers {
+export interface MenuEventHandlers {
+  onSetViewMode: (mode: ViewMode) => void
+  onCreateNote: () => void
+  onCreateType?: () => void
+  onOpenDailyNote: () => void
+  onQuickOpen: () => void
+  onSave: () => void
+  onOpenSettings: () => void
+  onToggleInspector: () => void
+  onCommandPalette: () => void
+  onZoomIn: () => void
+  onZoomOut: () => void
+  onZoomReset: () => void
+  onArchiveNote: (path: string) => void
+  onDeleteNote: (path: string) => void
+  onSearch: () => void
+  onToggleRawEditor?: () => void
+  onToggleDiff?: () => void
+  onToggleAIChat?: () => void
+  onGoBack?: () => void
+  onGoForward?: () => void
+  onCheckForUpdates?: () => void
+  onSelectFilter?: (filter: SidebarFilter) => void
+  onOpenVault?: () => void
+  onRemoveActiveVault?: () => void
+  onRestoreGettingStarted?: () => void
+  onCommitPush?: () => void
+  onPull?: () => void
+  onResolveConflicts?: () => void
+  onViewChanges?: () => void
+  onInstallMcp?: () => void
+  onOpenInNewWindow?: () => void
+  onReloadVault?: () => void
+  onRepairVault?: () => void
+  onRestoreDeletedNote?: () => void
+  activeTabPathRef: React.MutableRefObject<string | null>
   activeTabPath: string | null
   modifiedCount?: number
   conflictCount?: number
   hasRestorableDeletedNote?: boolean
 }
 
-interface MenuStatePayload {
-  hasActiveNote: boolean
-  hasModifiedFiles?: boolean
-  hasConflicts?: boolean
-  hasRestorableDeletedNote?: boolean
+const VIEW_MODE_MAP: Record<string, ViewMode> = {
+  'view-editor-only': 'editor-only',
+  'view-editor-list': 'editor-list',
+  'view-all': 'all',
 }
 
-function readCustomEventDetail(event: Event): string | null {
-  if (!(event instanceof CustomEvent) || typeof event.detail !== 'string') {
-    return null
-  }
-  return event.detail
+type SimpleHandler = 'onCreateNote' | 'onOpenDailyNote' | 'onQuickOpen' | 'onSave' | 'onOpenSettings' | 'onToggleInspector' | 'onCommandPalette' | 'onZoomIn' | 'onZoomOut' | 'onZoomReset' | 'onSearch'
+
+const SIMPLE_EVENT_MAP: Record<string, SimpleHandler> = {
+  'file-new-note': 'onCreateNote',
+  'file-daily-note': 'onOpenDailyNote',
+  'file-quick-open': 'onQuickOpen',
+  'file-save': 'onSave',
+  'app-settings': 'onOpenSettings',
+  'view-toggle-properties': 'onToggleInspector',
+  'view-toggle-backlinks': 'onToggleInspector',
+  'view-command-palette': 'onCommandPalette',
+  'view-zoom-in': 'onZoomIn',
+  'view-zoom-out': 'onZoomOut',
+  'view-zoom-reset': 'onZoomReset',
+  'edit-find-in-vault': 'onSearch',
 }
 
-function createWindowCommandListener(
-  dispatch: (id: string) => void,
-): (event: Event) => void {
-  return (event: Event) => {
-    const detail = readCustomEventDetail(event)
-    if (detail) {
-      dispatch(detail)
-    }
-  }
+const FILTER_MAP: Record<string, SidebarFilter> = {
+  'go-all-notes': 'all',
+  'go-archived': 'archived',
+  'go-changes': 'changes',
+  'go-inbox': 'inbox',
 }
 
-function syncNativeMenuState(state: MenuStatePayload): void {
-  if (!isTauri()) return
+type OptionalHandler =
+  | 'onGoBack' | 'onGoForward' | 'onCheckForUpdates'
+  | 'onCreateType' | 'onToggleRawEditor' | 'onToggleDiff' | 'onToggleAIChat'
+  | 'onOpenVault' | 'onRemoveActiveVault' | 'onRestoreGettingStarted'
+  | 'onCommitPush' | 'onPull' | 'onResolveConflicts' | 'onViewChanges' | 'onInstallMcp' | 'onReloadVault' | 'onRepairVault'
+  | 'onOpenInNewWindow' | 'onRestoreDeletedNote'
 
-  import('@tauri-apps/api/core')
-    .then(({ invoke }) => invoke('update_menu_state', { state }))
-    .catch(() => {})
+const OPTIONAL_EVENT_MAP: Record<string, OptionalHandler> = {
+  'view-go-back': 'onGoBack',
+  'view-go-forward': 'onGoForward',
+  'app-check-for-updates': 'onCheckForUpdates',
+  'file-new-type': 'onCreateType',
+  'edit-toggle-raw-editor': 'onToggleRawEditor',
+  'edit-toggle-diff': 'onToggleDiff',
+  'view-toggle-ai-chat': 'onToggleAIChat',
+  'vault-open': 'onOpenVault',
+  'vault-remove': 'onRemoveActiveVault',
+  'vault-restore-getting-started': 'onRestoreGettingStarted',
+  'vault-commit-push': 'onCommitPush',
+  'vault-pull': 'onPull',
+  'vault-resolve-conflicts': 'onResolveConflicts',
+  'vault-view-changes': 'onViewChanges',
+  'vault-install-mcp': 'onInstallMcp',
+  'vault-reload': 'onReloadVault',
+  'vault-repair': 'onRepairVault',
+  'note-open-in-new-window': 'onOpenInNewWindow',
+  'note-restore-deleted': 'onRestoreDeletedNote',
+}
+
+function dispatchActiveTabEvent(id: string, h: MenuEventHandlers): boolean {
+  const path = h.activeTabPathRef.current
+  if (!path) return id === 'note-archive' || id === 'note-delete'
+  if (id === 'note-archive') { h.onArchiveNote(path); return true }
+  if (id === 'note-delete') { h.onDeleteNote(path); return true }
+  return false
+}
+
+function dispatchOptionalEvent(id: string, h: MenuEventHandlers): boolean {
+  const handler = OPTIONAL_EVENT_MAP[id]
+  if (handler) { h[handler]?.(); return true }
+  return false
+}
+
+function dispatchFilterEvent(id: string, h: MenuEventHandlers): boolean {
+  const filter = FILTER_MAP[id]
+  if (filter) { h.onSelectFilter?.(filter); return true }
+  return false
 }
 
 /** Dispatch a Tauri menu event ID to the matching handler. Exported for testing. */
 export function dispatchMenuEvent(id: string, h: MenuEventHandlers): void {
-  if (!isAppCommandId(id)) return
-  dispatchAppCommand(id, h)
+  const viewMode = VIEW_MODE_MAP[id]
+  if (viewMode) { h.onSetViewMode(viewMode); return }
+
+  const simple = SIMPLE_EVENT_MAP[id]
+  if (simple) { h[simple](); return }
+
+  if (dispatchActiveTabEvent(id, h)) return
+  if (dispatchFilterEvent(id, h)) return
+  dispatchOptionalEvent(id, h)
 }
 
 /** Listen for native macOS menu events and dispatch them to the appropriate handlers. */
 export function useMenuEvents(handlers: MenuEventHandlers) {
   const ref = useRef(handlers)
   ref.current = handlers
-  const hasActiveNote = handlers.activeTabPath !== null
-  const hasModifiedFiles = handlers.modifiedCount != null ? handlers.modifiedCount > 0 : undefined
-  const hasConflicts = handlers.conflictCount != null ? handlers.conflictCount > 0 : undefined
-  const hasRestorableDeletedNote = handlers.hasRestorableDeletedNote
 
   // Subscribe once to Tauri menu events
   useEffect(() => {
@@ -87,41 +157,16 @@ export function useMenuEvents(handlers: MenuEventHandlers) {
     return () => cleanup?.()
   }, [])
 
-  useEffect(() => {
-    const handleCommandEvent = createWindowCommandListener((detail) => {
-      if (isAppCommandId(detail)) {
-        dispatchAppCommand(detail, ref.current)
-      }
-    })
-
-    window.addEventListener(APP_COMMAND_EVENT_NAME, handleCommandEvent)
-    return () => window.removeEventListener(APP_COMMAND_EVENT_NAME, handleCommandEvent)
-  }, [])
-
-  useEffect(() => {
-    const bridge = (id: string) => {
-      dispatchMenuEvent(id, ref.current)
-    }
-
-    window.__laputaTest = {
-      ...window.__laputaTest,
-      dispatchBrowserMenuCommand: bridge,
-    }
-
-    return () => {
-      if (window.__laputaTest?.dispatchBrowserMenuCommand === bridge) {
-        delete window.__laputaTest.dispatchBrowserMenuCommand
-      }
-    }
-  }, [])
-
   // Sync menu item enabled state when active note or git state changes
   useEffect(() => {
-    syncNativeMenuState({
-      hasActiveNote,
-      hasModifiedFiles,
-      hasConflicts,
-      hasRestorableDeletedNote,
-    })
-  }, [hasActiveNote, hasModifiedFiles, hasConflicts, hasRestorableDeletedNote])
+    if (!isTauri()) return
+    import('@tauri-apps/api/core').then(({ invoke }) => {
+      invoke('update_menu_state', {
+        hasActiveNote: handlers.activeTabPath !== null,
+        hasModifiedFiles: handlers.modifiedCount != null ? handlers.modifiedCount > 0 : undefined,
+        hasConflicts: handlers.conflictCount != null ? handlers.conflictCount > 0 : undefined,
+        hasRestorableDeletedNote: handlers.hasRestorableDeletedNote,
+      })
+    }).catch(() => {})
+  }, [handlers.activeTabPath, handlers.modifiedCount, handlers.conflictCount, handlers.hasRestorableDeletedNote])
 }