v1.1.0 - View mode, daily notes, tag management, math support, and more

README.md

@@ -1,6 +1,6 @@
 # HelixNotes
 
-A local-first markdown note-taking app built with Tauri, SvelteKit, and Rust.
+A local markdown note-taking app built with Tauri, SvelteKit, and Rust.
 
 Your notes are stored as standard Markdown files on your local filesystem. No cloud, no lock-in.
 
@@ -29,7 +29,7 @@ See all releases: [codeberg.org/ArkHost/HelixNotes/releases](https://codeberg.or
 - **Obsidian import** — convert Obsidian wiki-links to standard markdown
 - **Themes** — light/dark mode with customizable accent colors and fonts
 - **Focus mode** — distraction-free writing
-- **Local-first** — everything stays on your machine
+- **Local** — everything stays on your machine
 
 ## Tech Stack
 

package.json

@@ -2,7 +2,7 @@
   "name": "helixnotes",
   "private": true,
   "license": "AGPL-3.0-or-later",
-  "version": "1.0.9",
+  "version": "1.1.0",
   "type": "module",
   "scripts": {
     "dev": "vite dev",
@@ -57,7 +57,9 @@
     "@tiptap/extension-underline": "^3.19.0",
     "@tiptap/pm": "^3.19.0",
     "@tiptap/starter-kit": "^3.19.0",
+    "@types/katex": "^0.16.8",
     "@types/markdown-it": "^14.1.2",
+    "katex": "^0.16.28",
     "lowlight": "^3.3.0",
     "markdown-it": "^14.1.0",
     "markdown-it-mark": "^4.0.0",

pnpm-lock.yaml

@@ -89,9 +89,15 @@ importers:
       '@tiptap/starter-kit':
         specifier: ^3.19.0
         version: 3.19.0
+      '@types/katex':
+        specifier: ^0.16.8
+        version: 0.16.8
       '@types/markdown-it':
         specifier: ^14.1.2
         version: 14.1.2
+      katex:
+        specifier: ^0.16.28
+        version: 0.16.28
       lowlight:
         specifier: ^3.3.0
         version: 3.3.0
@@ -936,6 +942,9 @@ packages:
   '@types/hast@3.0.4':
     resolution: {integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==}
 
+  '@types/katex@0.16.8':
+    resolution: {integrity: sha512-trgaNyfU+Xh2Tc+ABIb44a5AYUpicB3uwirOioeOkNPPbmgRNtcWyDeeFRzjPZENO9Vq8gvVqfhaaXWLlevVwg==}
+
   '@types/linkify-it@5.0.0':
     resolution: {integrity: sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==}
 
@@ -972,6 +981,10 @@ packages:
     resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
     engines: {node: '>=6'}
 
+  commander@8.3.0:
+    resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==}
+    engines: {node: '>= 12'}
+
   cookie@0.6.0:
     resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==}
     engines: {node: '>= 0.6'}
@@ -1048,6 +1061,10 @@ packages:
     resolution: {integrity: sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==}
     hasBin: true
 
+  katex@0.16.28:
+    resolution: {integrity: sha512-YHzO7721WbmAL6Ov1uzN/l5mY5WWWhJBSW+jq4tkfZfsxmo1hu6frS0EOswvjBUnWE6NtjEs48SFn5CQESRLZg==}
+    hasBin: true
+
   kleur@4.1.5:
     resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==}
     engines: {node: '>=6'}
@@ -1972,6 +1989,8 @@ snapshots:
     dependencies:
       '@types/unist': 3.0.3
 
+  '@types/katex@0.16.8': {}
+
   '@types/linkify-it@5.0.0': {}
 
   '@types/markdown-it@14.1.2':
@@ -1997,6 +2016,8 @@ snapshots:
 
   clsx@2.1.1: {}
 
+  commander@8.3.0: {}
+
   cookie@0.6.0: {}
 
   crelt@1.0.6: {}
@@ -2074,6 +2095,10 @@ snapshots:
 
   jiti@2.6.1: {}
 
+  katex@0.16.28:
+    dependencies:
+      commander: 8.3.0
+
   kleur@4.1.5: {}
 
   lightningcss-android-arm64@1.30.2:

src-tauri/Cargo.lock

@@ -1778,7 +1778,7 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "helixnotes"
-version = "1.0.9"
+version = "1.1.0"
 dependencies = [
  "chrono",
  "dirs",

src-tauri/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "helixnotes"
-version = "1.0.9"
+version = "1.1.0"
-description = "Local-first markdown note-taking app"
+description = "Local markdown note-taking app"
 authors = ["HelixNotes"]
 license = "AGPL-3.0-or-later"
 edition = "2021"

src-tauri/src/commands.rs

@@ -245,6 +245,21 @@ pub fn create_note(
     Ok(entry)
 }
 
+#[tauri::command]
+pub fn create_daily_note(state: State<'_, AppState>) -> Result<NoteEntry, String> {
+    let config = state.config.lock().map_err(|e| e.to_string())?;
+    let vault_path = config.active_vault.as_ref().ok_or("No active vault")?;
+    let entry = operations::create_daily_note(vault_path)?;
+
+    if let Ok(search_guard) = state.search_index.lock() {
+        if let Some(ref search) = *search_guard {
+            let _ = search.index_note(&entry.path);
+        }
+    }
+
+    Ok(entry)
+}
+
 #[tauri::command]
 pub fn rename_note(path: String, new_title: String) -> Result<String, String> {
     operations::rename_note(&path, &new_title)
@@ -1082,6 +1097,9 @@ fn resolve_wiki_ref(
     reference: &str,
 ) -> String {
     let reference = reference.trim();
+    // Strip Obsidian heading anchors (#) and block references (^) before lookup
+    let reference = reference.split('#').next().unwrap_or(reference).trim();
+    let reference = reference.split('^').next().unwrap_or(reference).trim();
     // Direct match by filename
     if let Some(rel) = file_index.get(reference) {
         return rel.clone();

src-tauri/src/lib.rs

@@ -66,6 +66,7 @@ pub fn run() {
             commands::read_note,
             commands::save_note,
             commands::create_note,
+            commands::create_daily_note,
             commands::rename_note,
             commands::delete_note,
             commands::move_note,

src-tauri/src/vault/frontmatter.rs

@@ -1,9 +1,8 @@
 use crate::types::NoteMeta;
-use chrono::Utc;
+use chrono::{NaiveDate, NaiveDateTime, Utc};
 use gray_matter::engine::YAML;
 use gray_matter::Matter;
 use serde::{Deserialize, Serialize};
-use uuid::Uuid;
 
 #[derive(Debug, Serialize, Deserialize, Default)]
 struct RawFrontmatter {
@@ -15,6 +14,32 @@ struct RawFrontmatter {
     modified: Option<String>,
 }
 
+/// Try to parse a date string in multiple common formats.
+fn parse_date_flexible(s: &str) -> Option<chrono::DateTime<Utc>> {
+    let s = s.trim();
+    // RFC 3339 / ISO 8601 with timezone (e.g. 2024-01-15T10:30:00+00:00)
+    if let Ok(dt) = s.parse::<chrono::DateTime<Utc>>() {
+        return Some(dt);
+    }
+    // Try parsing as DateTime with fixed offset then convert
+    if let Ok(dt) = chrono::DateTime::parse_from_rfc3339(s) {
+        return Some(dt.with_timezone(&Utc));
+    }
+    // YYYY-MM-DD HH:MM:SS (no timezone)
+    if let Ok(ndt) = NaiveDateTime::parse_from_str(s, "%Y-%m-%d %H:%M:%S") {
+        return Some(ndt.and_utc());
+    }
+    // YYYY-MM-DDTHH:MM:SS (no timezone, with T separator)
+    if let Ok(ndt) = NaiveDateTime::parse_from_str(s, "%Y-%m-%dT%H:%M:%S") {
+        return Some(ndt.and_utc());
+    }
+    // YYYY-MM-DD (date only)
+    if let Ok(nd) = NaiveDate::parse_from_str(s, "%Y-%m-%d") {
+        return nd.and_hms_opt(0, 0, 0).map(|ndt| ndt.and_utc());
+    }
+    None
+}
+
 pub fn parse_note(raw: &str, filename: &str) -> (NoteMeta, String) {
     let matter = Matter::<YAML>::new();
     let result = matter.parse(raw);
@@ -28,15 +53,16 @@ pub fn parse_note(raw: &str, filename: &str) -> (NoteMeta, String) {
 
     let created = fm
         .created
-        .and_then(|s| s.parse().ok())
+        .and_then(|s| parse_date_flexible(&s))
         .unwrap_or_else(Utc::now);
 
     let modified = fm
         .modified
-        .and_then(|s| s.parse().ok())
+        .and_then(|s| parse_date_flexible(&s))
         .unwrap_or_else(Utc::now);
 
-    let id = fm.id.unwrap_or_else(|| Uuid::new_v4().to_string());
+    // Don't generate UUID on read — empty string signals "no ID yet"
+    let id = fm.id.unwrap_or_default();
 
     let meta = NoteMeta {
         id,
@@ -81,6 +107,65 @@ pub fn update_note_raw(meta: &NoteMeta, body: &str) -> String {
     format!("{}{}", fm, body)
 }
 
+/// Merge NoteMeta fields into existing frontmatter, preserving unknown YAML keys.
+/// Falls back to serialize_frontmatter() if the original has no frontmatter.
+pub fn merge_frontmatter(original_raw: &str, meta: &NoteMeta, body: &str) -> String {
+    let matter = Matter::<YAML>::new();
+    let parsed = matter.parse(original_raw);
+
+    // If original had no frontmatter, use the simple serializer
+    if parsed.matter.trim().is_empty() {
+        return update_note_raw(meta, body);
+    }
+
+    // Parse existing YAML into a Mapping to preserve all keys
+    let mut mapping: serde_yaml::Mapping = match serde_yaml::from_str(&parsed.matter) {
+        Ok(m) => m,
+        Err(_) => return update_note_raw(meta, body), // unparseable YAML, fall back
+    };
+
+    // Update only our known fields
+    if !meta.id.is_empty() {
+        mapping.insert(
+            serde_yaml::Value::String("id".into()),
+            serde_yaml::Value::String(meta.id.clone()),
+        );
+    }
+    mapping.insert(
+        serde_yaml::Value::String("title".into()),
+        serde_yaml::Value::String(meta.title.clone()),
+    );
+    mapping.insert(
+        serde_yaml::Value::String("tags".into()),
+        serde_yaml::Value::Sequence(
+            meta.tags
+                .iter()
+                .map(|t| serde_yaml::Value::String(t.clone()))
+                .collect(),
+        ),
+    );
+    mapping.insert(
+        serde_yaml::Value::String("pinned".into()),
+        serde_yaml::Value::Bool(meta.pinned),
+    );
+    mapping.insert(
+        serde_yaml::Value::String("created".into()),
+        serde_yaml::Value::String(meta.created.to_rfc3339()),
+    );
+    mapping.insert(
+        serde_yaml::Value::String("modified".into()),
+        serde_yaml::Value::String(meta.modified.to_rfc3339()),
+    );
+
+    // Serialize the mapping back to YAML
+    let yaml_str = match serde_yaml::to_string(&serde_yaml::Value::Mapping(mapping)) {
+        Ok(s) => s,
+        Err(_) => return update_note_raw(meta, body),
+    };
+
+    format!("---\n{}---\n{}", yaml_str, body)
+}
+
 fn filename_to_title(filename: &str) -> String {
     let stem = filename.trim_end_matches(".md");
     // Only replace dashes/underscores acting as word separators (between non-space chars).

src-tauri/src/vault/operations.rs

@@ -1,6 +1,6 @@
 use crate::types::{NoteContent, NoteEntry, NoteMeta, NotebookEntry, VaultState};
 use crate::vault::frontmatter;
-use chrono::Utc;
+use chrono::{Local, Utc};
 use rayon::prelude::*;
 use std::fs;
 use std::io::Read;
@@ -184,15 +184,21 @@ fn read_note_entry_from_str(
 
     let (mut meta, content) = frontmatter::parse_note(raw, &filename);
 
-    // Use filesystem times if frontmatter didn't have them
+    // Use filesystem times only if frontmatter didn't have created/modified fields
+    let has_created = raw.contains("\ncreated:") || raw.starts_with("created:");
+    let has_modified = raw.contains("\nmodified:") || raw.starts_with("modified:");
     if let Ok(fs_meta) = fs::metadata(path) {
+        if !has_modified {
             if let Ok(modified) = fs_meta.modified() {
                 meta.modified = modified.into();
             }
+        }
+        if !has_created {
             if let Ok(created) = fs_meta.created() {
                 meta.created = created.into();
             }
         }
+    }
 
     let relative = path
         .strip_prefix(vault_root)
@@ -233,7 +239,19 @@ pub fn save_note(path: &str, meta: &NoteMeta, body: &str) -> Result<(), String>
     let mut updated_meta = meta.clone();
     updated_meta.modified = Utc::now();
 
-    let raw = frontmatter::update_note_raw(&updated_meta, body);
+    // Generate UUID on first save if note didn't have one
+    if updated_meta.id.is_empty() {
+        updated_meta.id = Uuid::new_v4().to_string();
+    }
+
+    // Read existing file to preserve unknown frontmatter fields
+    let existing = fs::read_to_string(path).unwrap_or_default();
+    let raw = if existing.is_empty() {
+        frontmatter::update_note_raw(&updated_meta, body)
+    } else {
+        frontmatter::merge_frontmatter(&existing, &updated_meta, body)
+    };
+
     fs::write(path, raw).map_err(|e| e.to_string())?;
     Ok(())
 }
@@ -290,6 +308,49 @@ pub fn create_note(
     })
 }
 
+pub fn create_daily_note(vault_path: &str) -> Result<NoteEntry, String> {
+    let today = Local::now();
+    let date_str = today.format("%Y-%m-%d").to_string();
+    let title = today.format("%B %d, %Y").to_string();
+
+    let dir = Path::new(vault_path).join("Daily");
+    fs::create_dir_all(&dir).map_err(|e| e.to_string())?;
+
+    let file_path = dir.join(format!("{}.md", date_str));
+    let vault_root = Path::new(vault_path);
+
+    // If today's note already exists, return it
+    if file_path.exists() {
+        return read_note_entry(&file_path, vault_root);
+    }
+
+    let now = Utc::now();
+    let meta = NoteMeta {
+        id: Uuid::new_v4().to_string(),
+        title,
+        tags: vec!["daily".to_string()],
+        pinned: false,
+        created: now,
+        modified: now,
+    };
+
+    let raw = frontmatter::update_note_raw(&meta, "\n");
+    fs::write(&file_path, raw).map_err(|e| e.to_string())?;
+
+    let relative = file_path
+        .strip_prefix(vault_root)
+        .unwrap_or(&file_path)
+        .to_string_lossy()
+        .to_string();
+
+    Ok(NoteEntry {
+        path: file_path.to_string_lossy().to_string(),
+        relative_path: relative,
+        meta,
+        preview: String::new(),
+    })
+}
+
 pub fn create_notebook(
     vault_path: &str,
     parent_relative: Option<&str>,
@@ -385,7 +446,10 @@ pub fn rename_note(path: &str, new_title: &str) -> Result<String, String> {
     let (mut meta, content) = frontmatter::parse_note(&raw, &filename);
     meta.title = new_title.to_string();
     meta.modified = Utc::now();
-    let updated = frontmatter::update_note_raw(&meta, &content);
+    if meta.id.is_empty() {
+        meta.id = Uuid::new_v4().to_string();
+    }
+    let updated = frontmatter::merge_frontmatter(&raw, &meta, &content);
 
     // Rename file
     let new_filename = sanitize_filename(new_title);

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
   "productName": "HelixNotes",
-  "version": "1.0.9",
+  "version": "1.1.0",
   "identifier": "com.helixnotes.app",
   "build": {
     "frontendDist": "../build",

src/lib/api.ts

@@ -92,6 +92,10 @@ export async function createNote(
   return invoke("create_note", { notebookRelative, title });
 }
 
+export async function createDailyNote(): Promise<NoteEntry> {
+  return invoke("create_daily_note");
+}
+
 export async function renameNote(
   path: string,
   newTitle: string,

src/lib/components/AppLayout.svelte

@@ -20,6 +20,7 @@
 		showCommandPalette,
 		theme,
 		focusMode,
+		readOnly,
 		activeNote,
 		activeNotePath,
 		editorDirty,
@@ -29,7 +30,7 @@
 
 	const appWindow = getCurrentWindow();
 	const isMac = navigator.platform.startsWith('Mac');
-	import { loadVaultState, saveVaultState, readNote } from '$lib/api';
+	import { loadVaultState, saveVaultState, readNote, createDailyNote } from '$lib/api';
 	import { debounce } from '$lib/utils/debounce';
 	import type { VaultState, FileEvent } from '$lib/types';
 
@@ -107,12 +108,28 @@
 		editor?.focusTitle();
 	}
 
+	async function handleDailyNote() {
+		try {
+			const entry = await createDailyNote();
+			const content = await readNote(entry.path);
+			$activeNote = content;
+			$activeNotePath = entry.path;
+			$editorDirty = false;
+			editor?.loadNote(entry.path, content.content);
+			noteList?.refresh();
+			sidebar?.refresh();
+		} catch (e) {
+			console.error('Failed to create/open daily note:', e);
+		}
+	}
+
 	function handleMouseDown(e: MouseEvent) {
 		if (e.button === 3) { e.preventDefault(); navigateHistory(-1); }
 		if (e.button === 4) { e.preventDefault(); navigateHistory(1); }
 	}
 
 	function handleKeydown(e: KeyboardEvent) {
+		const mod = e.ctrlKey || e.metaKey;
 		if (e.altKey && e.key === 'ArrowLeft') {
 			e.preventDefault();
 			navigateHistory(-1);
@@ -123,19 +140,19 @@
 			navigateHistory(1);
 			return;
 		}
-		if (e.ctrlKey && !e.shiftKey && e.key === 'n') {
+		if (mod && !e.shiftKey && e.key === 'n') {
 			e.preventDefault();
 			createAndFocusNote();
 		}
-		if (e.ctrlKey && e.shiftKey && e.key === 'N') {
+		if (mod && e.shiftKey && e.key === 'N') {
 			e.preventDefault();
 		}
-		if (e.ctrlKey && e.shiftKey && e.key === 'F') {
+		if (mod && e.shiftKey && e.key === 'F') {
 			e.preventDefault();
 			$showSearch = true;
 			return;
 		}
-		if (e.ctrlKey && !e.shiftKey && e.key === 'f') {
+		if (mod && !e.shiftKey && e.key === 'f') {
 			e.preventDefault();
 			if ($activeNotePath) {
 				editor?.openNoteSearch();
@@ -144,11 +161,11 @@
 			}
 			return;
 		}
-		if (e.ctrlKey && e.key === 'p') {
+		if (mod && e.key === 'p') {
 			e.preventDefault();
 			$showCommandPalette = true;
 		}
-		if (e.ctrlKey && e.key === 's') {
+		if (mod && e.key === 's') {
 			e.preventDefault();
 			editor?.forceSave();
 		}
@@ -220,6 +237,18 @@
 						<path d="M8 3v3a2 2 0 01-2 2H3m18 0h-3a2 2 0 01-2-2V3m0 18v-3a2 2 0 012-2h3M3 16h3a2 2 0 012 2v3"/>
 					</svg>
 				</button>
+				<button class="focus-btn" class:focus-active={$readOnly} onclick={() => ($readOnly = !$readOnly)} title={$readOnly ? 'Switch to Edit Mode' : 'Switch to View Mode'}>
+					<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+						{#if $readOnly}
+							<path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z" />
+							<circle cx="12" cy="12" r="3" />
+						{:else}
+							<path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94" />
+							<path d="M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19" />
+							<line x1="1" y1="1" x2="23" y2="23" />
+						{/if}
+					</svg>
+				</button>
 				{#if !isMac}
 				<button class="focus-btn" onmousedown={(e) => e.stopPropagation()} onclick={() => appWindow.minimize()} title="Minimize">
 					<svg width="10" height="10" viewBox="0 0 10 10"><line x1="1" y1="5" x2="9" y2="5" stroke="currentColor" stroke-width="1.2" stroke-linecap="round"/></svg>
@@ -234,7 +263,7 @@
 			</div>
 		</div>
 	{:else}
-		<TitleBar onNewNote={createAndFocusNote} />
+		<TitleBar onNewNote={createAndFocusNote} onDailyNote={handleDailyNote} />
 	{/if}
 	<div class="app-layout">
 		{#if !$focusMode}

src/lib/components/CommandPalette.svelte

@@ -9,6 +9,8 @@
 		action: () => void;
 	}
 
+	const modKey = navigator.platform.startsWith('Mac') ? '⌘' : 'Ctrl';
+
 	let query = $state('');
 	let selectedIndex = $state(0);
 	let inputEl = $state<HTMLInputElement>(null!);
@@ -17,7 +19,7 @@
 		{
 			id: 'search',
 			label: 'Search Notes',
-			shortcut: 'Ctrl+F',
+			shortcut: `${modKey}+F`,
 			action: () => {
 				$showCommandPalette = false;
 				$showSearch = true;

src/lib/components/Editor.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { onDestroy, tick } from 'svelte';
+	import { onDestroy, tick, untrack } from 'svelte';
 	import { Editor } from '@tiptap/core';
 	import StarterKit from '@tiptap/starter-kit';
 	import Placeholder from '@tiptap/extension-placeholder';
@@ -26,6 +26,8 @@
 	import markdownItMark from 'markdown-it-mark';
 	import markdownItSup from 'markdown-it-sup';
 	import markdownItSub from 'markdown-it-sub';
+	import katex from 'katex';
+	import 'katex/dist/katex.min.css';
 	import { Extension, Node as TiptapNode, Mark as TiptapMark, mergeAttributes } from '@tiptap/core';
 	import { Plugin, PluginKey, EditorState } from '@tiptap/pm/state';
 	import { Decoration, DecorationSet } from '@tiptap/pm/view';
@@ -36,13 +38,15 @@
 	import { openUrl } from '@tauri-apps/plugin-opener';
 	import { openFile, copyFileTo } from '$lib/api';
 	import { save as saveDialog } from '@tauri-apps/plugin-dialog';
-	import { activeNote, activeNotePath, appConfig, editorDirty, sourceMode, focusMode, quickAccessPaths, notes } from '$lib/stores/app';
+	import { activeNote, activeNotePath, appConfig, editorDirty, sourceMode, focusMode, readOnly, quickAccessPaths, notes } from '$lib/stores/app';
 	import { saveNote, saveImage, saveAttachment, addQuickAccess, removeQuickAccess, getQuickAccess, getNoteVersions, getNoteVersionContent, createVersion, aiAsk, getAllNoteTitles, readNote } from '$lib/api';
 	import type { VersionEntry, AiStreamEvent, NoteTitleEntry } from '$lib/types';
 	import { listen } from '@tauri-apps/api/event';
 	import { debounce } from '$lib/utils/debounce';
 	import GraphView from './GraphView.svelte';
 
+	const modKey = navigator.platform.startsWith('Mac') ? '⌘' : 'Ctrl';
+
 	let editorElement = $state<HTMLDivElement>(null!);
 	let sourceElement = $state<HTMLTextAreaElement>(null!);
 	let editor: Editor | null = null;
@@ -93,9 +97,7 @@
 	let aiOriginalMarkdown = $state('');
 	let aiMediaPlaceholders = $state<Map<string, string>>(new Map());
 
-	// View mode (read-only)
+	// View mode (read-only) — state managed by $readOnly store
-	let readOnly = $state(false);
-	let readOnlyFlash = $state(false);
 
 	// Version history
 	let showHistory = $state(false);
@@ -266,6 +268,67 @@
 		},
 	});
 
+	const MathBlock = TiptapNode.create({
+		name: 'mathBlock',
+		group: 'block',
+		atom: true,
+		addAttributes() {
+			return { tex: { default: '' } };
+		},
+		parseHTML() {
+			return [{
+				tag: 'div[data-math-block]',
+				getAttrs: (el: HTMLElement) => ({ tex: decodeURIComponent(el.getAttribute('data-math-block') || '') }),
+			}];
+		},
+		renderHTML({ HTMLAttributes }) {
+			const tex = HTMLAttributes.tex || '';
+			const rendered = katex.renderToString(tex, { displayMode: true, throwOnError: false });
+			return ['div', { 'data-math-block': encodeURIComponent(tex), class: 'math-block', contenteditable: 'false' }, ['div', { innerHTML: rendered }]];
+		},
+		addNodeView() {
+			return ({ node }) => {
+				const dom = document.createElement('div');
+				dom.classList.add('math-block');
+				dom.contentEditable = 'false';
+				dom.setAttribute('data-math-block', encodeURIComponent(node.attrs.tex));
+				dom.innerHTML = katex.renderToString(node.attrs.tex, { displayMode: true, throwOnError: false });
+				return { dom };
+			};
+		},
+	});
+
+	const MathInline = TiptapNode.create({
+		name: 'mathInline',
+		group: 'inline',
+		inline: true,
+		atom: true,
+		addAttributes() {
+			return { tex: { default: '' } };
+		},
+		parseHTML() {
+			return [{
+				tag: 'span[data-math-inline]',
+				getAttrs: (el: HTMLElement) => ({ tex: decodeURIComponent(el.getAttribute('data-math-inline') || '') }),
+			}];
+		},
+		renderHTML({ HTMLAttributes }) {
+			const tex = HTMLAttributes.tex || '';
+			const rendered = katex.renderToString(tex, { displayMode: false, throwOnError: false });
+			return ['span', { 'data-math-inline': encodeURIComponent(tex), class: 'math-inline', contenteditable: 'false' }, ['span', { innerHTML: rendered }]];
+		},
+		addNodeView() {
+			return ({ node }) => {
+				const dom = document.createElement('span');
+				dom.classList.add('math-inline');
+				dom.contentEditable = 'false';
+				dom.setAttribute('data-math-inline', encodeURIComponent(node.attrs.tex));
+				dom.innerHTML = katex.renderToString(node.attrs.tex, { displayMode: false, throwOnError: false });
+				return { dom };
+			};
+		},
+	});
+
 	let codeLangDropdown = $state<{ pos: number; x: number; y: number; current: string } | null>(null);
 
 	function openCodeLangDropdown(pos: number, current: string, triggerEl: HTMLElement) {
@@ -559,7 +622,12 @@
 
 	let wikiLinkFiltered = $derived.by(() => {
 		if (!wikiLinkMenu) return wikiLinkTitlesCache;
-		const q = wikiLinkMenu.query.toLowerCase();
+		let q = wikiLinkMenu.query.toLowerCase();
+		if (!q) return wikiLinkTitlesCache;
+		// Strip |alias, #heading, ^block — only use the note name part for filtering
+		const pipeIdx = q.indexOf('|');
+		if (pipeIdx >= 0) q = q.slice(0, pipeIdx);
+		q = q.replace(/#.*$/, '').replace(/\^.*$/, '').trim();
 		if (!q) return wikiLinkTitlesCache;
 		return wikiLinkTitlesCache.filter(entry =>
 			entry.title.toLowerCase().includes(q)
@@ -579,20 +647,23 @@
 		wikiLinkSelectedIndex = 0;
 	}
 
-	function insertWikiLink(entry: NoteTitleEntry) {
+	function insertWikiLink(entry: NoteTitleEntry, originalRef?: string) {
 		if (!editor || !wikiLinkMenu) return;
 		const { from } = wikiLinkMenu;
 		// Delete the [[ trigger and query text
 		const to = editor.state.selection.from;
 		editor.chain().focus().deleteRange({ from, to }).run();
 		// Insert the wiki-link mark
+		// entry.title is the display text, originalRef (if provided) is the full reference (e.g. "note#heading")
+		const displayText = entry.title;
+		const titleAttr = originalRef || entry.title;
 		tick().then(() => {
 			if (!editor) return;
 			editor.chain().focus()
 				.insertContent({
 					type: 'text',
-					text: entry.title,
+					text: displayText,
-					marks: [{ type: 'wikiLink', attrs: { title: entry.title, path: entry.path } }],
+					marks: [{ type: 'wikiLink', attrs: { title: titleAttr, path: entry.path } }],
 				})
 				.run();
 		});
@@ -698,11 +769,17 @@
 								const textBefore = state.doc.textBetween(wikiLinkMenu.from, state.selection.from);
 								if (textBefore.endsWith(']')) {
 									// User typed ]] — resolve the query as a link title
-									const query = textBefore.slice(2, -1); // strip the [[ and trailing ]
+									// Supports Obsidian syntax: [[note|alias]], [[note#heading]], [[note^block]]
-									if (query.trim()) {
+									const rawQuery = textBefore.slice(2, -1); // strip the [[ and trailing ]
-										const match = wikiLinkTitlesCache.find(e => e.title.toLowerCase() === query.toLowerCase());
+									if (rawQuery.trim()) {
+										const pipeIdx = rawQuery.indexOf('|');
+										const noteRef = (pipeIdx >= 0 ? rawQuery.slice(0, pipeIdx) : rawQuery).trim();
+										const display = (pipeIdx >= 0 ? rawQuery.slice(pipeIdx + 1) : noteRef).trim();
+										// Strip #heading and ^block for title matching
+										const titleForLookup = noteRef.replace(/#.*$/, '').replace(/\^.*$/, '').trim();
+										const match = wikiLinkTitlesCache.find(e => e.title.toLowerCase() === titleForLookup.toLowerCase());
 										if (match) {
-											insertWikiLink(match);
+											insertWikiLink({ ...match, title: display }, noteRef);
 										} else {
 											// Insert as unresolved wiki-link (no path)
 											const menuFrom = wikiLinkMenu.from;
@@ -713,8 +790,8 @@
 											tick().then(() => {
 												editor?.chain().focus().insertContent({
 													type: 'text',
-													text: query,
+													text: display,
-													marks: [{ type: 'wikiLink', attrs: { title: query, path: '' } }],
+													marks: [{ type: 'wikiLink', attrs: { title: noteRef, path: '' } }],
 												}).run();
 											});
 										}
@@ -764,19 +841,21 @@
 	}
 
 	async function navigateToWikiLink(path: string, title: string) {
+		// title may contain #heading or ^block anchors — strip for note lookup
+		const noteTitle = title.replace(/#.*$/, '').replace(/\^.*$/, '').trim();
 		if (!path) {
 			// Unresolved link — try to find by title
-			const match = wikiLinkTitlesCache.find(e => e.title.toLowerCase() === title.toLowerCase());
+			const match = wikiLinkTitlesCache.find(e => e.title.toLowerCase() === noteTitle.toLowerCase());
 			if (match) {
 				path = match.path;
 			} else {
-				// Offer to create the note
+				// Offer to create the note (use clean title, not the anchor ref)
 				const notebookRel = $activeNotePath
 					? $activeNotePath.substring(($appConfig?.active_vault?.length ?? 0) + 1).split('/').slice(0, -1).join('/')
 					: null;
 				try {
 					const { createNote } = await import('$lib/api');
-					const newNote = await createNote(notebookRel || null, title);
+					const newNote = await createNote(notebookRel || null, noteTitle);
 					// Navigate to the new note
 					const content = await readNote(newNote.path);
 					$activeNote = { ...content, content: content.content };
@@ -912,14 +991,16 @@
 		}
 	}
 
-	function toggleReadOnly() {
+	// Sync editor editable state when readOnly store changes (from titlebar or editor)
-		readOnly = !readOnly;
+	$effect(() => {
+		const ro = $readOnly;
+		untrack(() => {
 			if (editor) {
-			// Save before entering read-only so nothing is lost
+				if (ro && $editorDirty) forceSave();
-			if (readOnly && $editorDirty) forceSave();
+				editor.setEditable(!ro);
-			editor.setEditable(!readOnly);
-		}
 			}
+		});
+	});
 
 	async function toggleHistory() {
 		showHistory = !showHistory;
@@ -1027,7 +1108,7 @@
 		// Apply default view mode when switching notes — but new notes always open in edit mode
 		const isNewNote = $activeNote?.meta.title === 'Untitled' && !content.replace(/^---[\s\S]*?---\s*/, '').trim();
 		const shouldBeReadOnly = isNewNote ? false : ($appConfig?.default_view_mode ?? false);
-		readOnly = shouldBeReadOnly;
+		$readOnly = shouldBeReadOnly;
 		if (editor) editor.setEditable(!shouldBeReadOnly);
 		if ($sourceMode) {
 			sourceContent = stripTitleH1(content);
@@ -1185,6 +1266,10 @@
 				const name = node.attrs.name || '';
 				return `<div data-pdf-src="${src}" data-pdf-name="${name}" class="pdf-embed"></div>\n`;
 			}
+			case 'mathBlock': {
+				const tex = node.attrs.tex || '';
+				return `$$\n${tex}\n$$\n`;
+			}
 			case 'details': {
 				// Preserve details as raw HTML
 				const detDiv = document.createElement('div');
@@ -1259,7 +1344,12 @@
 							break;
 						}
 						case 'link': text = `[${text}](${mark.attrs.href})`; break;
-						case 'wikiLink': text = `[[${mark.attrs.title || text}]]`; break;
+						case 'wikiLink': {
+							const wlTitle = mark.attrs.title || text;
+							// If display text differs from the reference, emit [[ref|display]] (Obsidian alias syntax)
+							text = wlTitle !== text ? `[[${wlTitle}|${text}]]` : `[[${wlTitle}]]`;
+							break;
+						}
 					}
 				}
 				parts.push(text);
@@ -1269,6 +1359,8 @@
 				const size = child.attrs['data-size'] || child.attrs.size || 'full';
 				const sizeSuffix = size && size !== 'full' ? `|size=${size}` : '';
 				parts.push(`![${alt}${sizeSuffix}](${src})`);
+			} else if (child.type.name === 'mathInline') {
+				parts.push(`$${child.attrs.tex || ''}$`);
 			} else if (child.type.name === 'hardBreak') {
 				parts.push('\n');
 			}
@@ -1285,15 +1377,25 @@
 
 	function updateNoteSearch(query: string) {
 		if (noteSearchTimer) clearTimeout(noteSearchTimer);
-		if (!editor) return;
 		if (!query) {
 			noteSearchResults = [];
 			noteSearchIndex = 0;
+			if (!$sourceMode && editor) {
 				const tr = editor.state.tr.setMeta(noteSearchPluginKey, DecorationSet.empty);
 				editor.view.dispatch(tr);
+			}
 			return;
 		}
 		noteSearchTimer = setTimeout(() => {
+			if ($sourceMode) {
+				updateNoteSearchSource(query);
+			} else {
+				updateNoteSearchWysiwyg(query);
+			}
+		}, 100);
+	}
+
+	function updateNoteSearchWysiwyg(query: string) {
 		if (!editor) return;
 		const results: {from: number, to: number}[] = [];
 		const lowerQuery = query.toLowerCase();
@@ -1309,7 +1411,33 @@
 		noteSearchResults = results;
 		if (noteSearchIndex >= results.length) noteSearchIndex = 0;
 		applySearchDecorations();
-		}, 100);
+	}
+
+	function updateNoteSearchSource(query: string) {
+		const results: {from: number, to: number}[] = [];
+		const lowerQuery = query.toLowerCase();
+		const text = sourceContent.toLowerCase();
+		let idx = text.indexOf(lowerQuery);
+		while (idx !== -1) {
+			results.push({ from: idx, to: idx + query.length });
+			idx = text.indexOf(lowerQuery, idx + 1);
+		}
+		noteSearchResults = results;
+		if (noteSearchIndex >= results.length) noteSearchIndex = 0;
+		scrollToSourceMatch();
+	}
+
+	function scrollToSourceMatch(focusTextarea = false) {
+		if (!sourceElement || noteSearchResults.length === 0) return;
+		const match = noteSearchResults[noteSearchIndex];
+		// Only steal focus when navigating (Enter/Shift+Enter), not while typing
+		if (focusTextarea) sourceElement.focus();
+		sourceElement.setSelectionRange(match.from, match.to);
+		// Scroll the match into view
+		const linesBefore = sourceContent.substring(0, match.from).split('\n').length;
+		const lineHeight = parseFloat(getComputedStyle(sourceElement).lineHeight) || 20;
+		const targetScroll = (linesBefore - 1) * lineHeight - sourceElement.clientHeight / 2;
+		sourceElement.scrollTop = Math.max(0, targetScroll);
 	}
 
 	function applySearchDecorations() {
@@ -1336,14 +1464,22 @@
 	function noteSearchNext() {
 		if (noteSearchResults.length === 0) return;
 		noteSearchIndex = (noteSearchIndex + 1) % noteSearchResults.length;
+		if ($sourceMode) {
+			scrollToSourceMatch(true);
+		} else {
 			applySearchDecorations();
 		}
+	}
 
 	function noteSearchPrev() {
 		if (noteSearchResults.length === 0) return;
 		noteSearchIndex = (noteSearchIndex - 1 + noteSearchResults.length) % noteSearchResults.length;
+		if ($sourceMode) {
+			scrollToSourceMatch(true);
+		} else {
 			applySearchDecorations();
 		}
+	}
 
 	export function openNoteSearch() {
 		noteSearchOpen = true;
@@ -1354,7 +1490,7 @@
 		noteSearchQuery = '';
 		noteSearchResults = [];
 		noteSearchIndex = 0;
-		if (editor) {
+		if (!$sourceMode && editor) {
 			const tr = editor.state.tr.setMeta(noteSearchPluginKey, DecorationSet.empty);
 			editor.view.dispatch(tr);
 			editor.commands.focus();
@@ -1500,13 +1636,19 @@
 		let src = stripTitleH1(md);
 
 		// Pre-process: convert [[Note Title]] wiki-links to HTML anchors
+		// Supports Obsidian syntax: [[note|alias]], [[note#heading]], [[note^block]]
 		if ($appConfig?.enable_wiki_links) {
-			src = src.replace(/\[\[([^\]]+)\]\]/g, (_, title) => {
+			src = src.replace(/\[\[([^\]]+)\]\]/g, (_, raw) => {
-				const trimmed = title.trim();
+				// Split on pipe: [[note|display text]] → noteRef="note", display="display text"
+				const pipeIdx = raw.indexOf('|');
+				const noteRef = (pipeIdx >= 0 ? raw.slice(0, pipeIdx) : raw).trim();
+				const display = (pipeIdx >= 0 ? raw.slice(pipeIdx + 1) : noteRef).trim();
+				// Strip #heading and ^block anchors for title matching
+				const titleForLookup = noteRef.replace(/#.*$/, '').replace(/\^.*$/, '').trim();
 				// Try to resolve the title to a path from cache
-				const match = wikiLinkTitlesCache.find(e => e.title.toLowerCase() === trimmed.toLowerCase());
+				const match = wikiLinkTitlesCache.find(e => e.title.toLowerCase() === titleForLookup.toLowerCase());
 				const path = match ? match.path : '';
-				return `<span data-wiki-link data-path="${escapeHtml(path)}" data-title="${escapeHtml(trimmed)}" class="wiki-link">${escapeHtml(trimmed)}</span>`;
+				return `<span data-wiki-link data-path="${escapeHtml(path)}" data-title="${escapeHtml(noteRef)}" class="wiki-link">${escapeHtml(display)}</span>`;
 			});
 		}
 
@@ -1527,6 +1669,46 @@
 			return `<div data-pdf-src="${pdfSrc}" data-pdf-name="${name}" class="pdf-embed"><iframe src="${displaySrc}" width="100%" height="${pdfHeight}px"></iframe><p class="pdf-label">${name}</p></div>`;
 		});
 
+		// Pre-process: render KaTeX math — only outside fenced code blocks
+		{
+			const lines = src.split('\n');
+			const outLines: string[] = [];
+			let inFence = false;
+			let mathBlock: string[] | null = null;
+			for (let i = 0; i < lines.length; i++) {
+				const line = lines[i];
+				if (/^```/.test(line)) { inFence = !inFence; outLines.push(line); continue; }
+				if (inFence) { outLines.push(line); continue; }
+				// Accumulate block math: $$ on its own line starts/ends a block
+				if (line.trim() === '$$') {
+					if (!mathBlock) { mathBlock = []; continue; }
+					const tex = mathBlock.join('\n').trim();
+					mathBlock = null;
+					try {
+						outLines.push(`<div data-math-block="${encodeURIComponent(tex)}" class="math-block">${katex.renderToString(tex, { displayMode: true, throwOnError: false })}</div>`);
+					} catch { outLines.push('$$', tex, '$$'); }
+					continue;
+				}
+				if (mathBlock) { mathBlock.push(line); continue; }
+				// Inline math: $...$ (skip content inside backticks)
+				const processed = line.replace(/`[^`]*`/g, m => '\x00'.repeat(m.length));
+				let result = line;
+				let offset = 0;
+				for (const m of processed.matchAll(/(?<!\$)\$(?!\$)([^\n$]+?)(?<!\$)\$(?!\$)/g)) {
+					const tex = m[1].trim();
+					try {
+						const html = `<span data-math-inline="${encodeURIComponent(tex)}" class="math-inline">${katex.renderToString(tex, { displayMode: false, throwOnError: false })}</span>`;
+						result = result.slice(0, m.index! + offset) + html + result.slice(m.index! + m[0].length + offset);
+						offset += html.length - m[0].length;
+					} catch { /* leave as-is */ }
+				}
+				outLines.push(result);
+			}
+			// If unclosed math block, just output the lines as-is
+			if (mathBlock) { outLines.push('$$', ...mathBlock); }
+			src = outLines.join('\n');
+		}
+
 		// Pre-process: convert task list syntax before markdown-it (it doesn't know TipTap's format)
 		// Support indented (nested) and blockquoted task lists too
 		src = src.replace(/^([\s>]*)-\s\[x\][^\S\n]+(.+)$/gm, '$1- <tiptask checked="true">$2</tiptask>');
@@ -1664,6 +1846,8 @@
 				CodeBlockLowlight.configure({ lowlight, enableTabIndentation: true, defaultLanguage: 'text' }),
 				CodeBlockLanguageSelect,
 				PdfEmbed,
+				MathBlock,
+				MathInline,
 				Details.configure({ persist: true, HTMLAttributes: { class: 'editor-details' } }),
 				DetailsSummary,
 				DetailsContent,
@@ -2523,8 +2707,8 @@
 			</div>
 			<p>Select a note or create a new one</p>
 			<div class="shortcuts-hint">
-				<span><kbd>Ctrl</kbd>+<kbd>N</kbd> New note</span>
+				<span><kbd>{modKey}</kbd>+<kbd>N</kbd> New note</span>
-				<span><kbd>Ctrl</kbd>+<kbd>P</kbd> Quick open</span>
+				<span><kbd>{modKey}</kbd>+<kbd>P</kbd> Quick open</span>
 			</div>
 		</div>
 	{:else}
@@ -2533,7 +2717,7 @@
 				<input
 					bind:this={titleInput}
 					type="text"
-					readonly={readOnly}
+					readonly={$readOnly}
 					value={$activeNote.meta.title}
 					onkeydown={(e) => {
 						if (e.key === 'Tab') {
@@ -2563,37 +2747,20 @@
 				{#if $editorDirty}
 					<span class="save-indicator">Unsaved</span>
 				{/if}
-				{#if readOnly}
+				{#if $readOnly}
 					<span class="readonly-indicator">View Mode</span>
 				{/if}
 				<button
 					class="icon-btn"
 					class:active={noteSearchOpen}
 					onclick={() => noteSearchOpen ? closeNoteSearch() : openNoteSearch()}
-					title="Find in note (Ctrl+F)"
+					title={`Find in note (${modKey}+F)`}
 				>
 					<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
 						<circle cx="11" cy="11" r="8"/><line x1="21" y1="21" x2="16.65" y2="16.65"/>
 					</svg>
 				</button>
-				<button
+
-					class="icon-btn"
-					class:active={readOnly}
-					class:flash={readOnlyFlash}
-					onclick={toggleReadOnly}
-					title={readOnly ? 'Switch to Edit Mode' : 'Switch to View Mode'}
-				>
-					<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-						{#if readOnly}
-							<path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z" />
-							<circle cx="12" cy="12" r="3" />
-						{:else}
-							<path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94" />
-							<path d="M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19" />
-							<line x1="1" y1="1" x2="23" y2="23" />
-						{/if}
-					</svg>
-				</button>
 				<button
 					class="icon-btn"
 					class:active={$activeNote?.meta.pinned}
@@ -2724,6 +2891,7 @@
 						class="source-editor"
 						bind:this={sourceElement}
 						bind:value={sourceContent}
+						readonly={$readOnly}
 						oninput={() => {
 							$editorDirty = true;
 							autoSave();
@@ -2732,12 +2900,7 @@
 					></textarea>
 				{:else}
 					<!-- svelte-ignore a11y_no_static_element_interactions -->
-					<div class="tiptap-wrapper" bind:this={editorElement} onclick={(e) => { closeLinkContextMenu(); handleEditorClick(e); }} oncontextmenu={handleEditorContextMenu} onkeydown={(e) => {
+					<div class="tiptap-wrapper" bind:this={editorElement} onclick={(e) => { closeLinkContextMenu(); handleEditorClick(e); }} oncontextmenu={handleEditorContextMenu}></div>
-					if (readOnly && !e.ctrlKey && !e.metaKey && !e.altKey && e.key.length === 1) {
-						readOnlyFlash = true;
-						setTimeout(() => { readOnlyFlash = false; }, 600);
-					}
-				}}></div>
 				{/if}
 			</div>
 
@@ -2855,16 +3018,16 @@
 				<div class="fmt-sep"></div>
 
 				<!-- Text formatting -->
-				<button class="fmt-btn" class:active={(editorState, editor.isActive('bold'))} onclick={() => editor?.chain().focus().toggleBold().run()} title="Bold (Ctrl+B)">
+				<button class="fmt-btn" class:active={(editorState, editor.isActive('bold'))} onclick={() => editor?.chain().focus().toggleBold().run()} title={`Bold (${modKey}+B)`}>
 					<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M6 12h9a4 4 0 010 8H7a1 1 0 01-1-1V5a1 1 0 011-1h7a4 4 0 010 8"/></svg>
 				</button>
-				<button class="fmt-btn" class:active={(editorState, editor.isActive('italic'))} onclick={() => editor?.chain().focus().toggleItalic().run()} title="Italic (Ctrl+I)">
+				<button class="fmt-btn" class:active={(editorState, editor.isActive('italic'))} onclick={() => editor?.chain().focus().toggleItalic().run()} title={`Italic (${modKey}+I)`}>
 					<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="19" x2="10" y1="4" y2="4"/><line x1="14" x2="5" y1="20" y2="20"/><line x1="15" x2="9" y1="4" y2="20"/></svg>
 				</button>
-				<button class="fmt-btn" class:active={(editorState, editor.isActive('underline'))} onclick={() => editor?.chain().focus().toggleUnderline().run()} title="Underline (Ctrl+U)">
+				<button class="fmt-btn" class:active={(editorState, editor.isActive('underline'))} onclick={() => editor?.chain().focus().toggleUnderline().run()} title={`Underline (${modKey}+U)`}>
 					<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M6 4v6a6 6 0 0012 0V4"/><line x1="4" x2="20" y1="20" y2="20"/></svg>
 				</button>
-				<button class="fmt-btn" class:active={(editorState, editor.isActive('strike'))} onclick={() => editor?.chain().focus().toggleStrike().run()} title="Strikethrough (Ctrl+Shift+X)">
+				<button class="fmt-btn" class:active={(editorState, editor.isActive('strike'))} onclick={() => editor?.chain().focus().toggleStrike().run()} title={`Strikethrough (${modKey}+Shift+X)`}>
 					<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M16 4H9a3 3 0 00-2.83 4"/><path d="M14 12a4 4 0 010 8H6"/><line x1="4" x2="20" y1="12" y2="12"/></svg>
 				</button>
 
@@ -2891,45 +3054,45 @@
 				<div class="fmt-sep"></div>
 
 				<!-- Link -->
-				<button class="fmt-btn" class:active={(editorState, editor.isActive('link'))} onclick={addLinkFromToolbar} title="Link (Ctrl+K)">
+				<button class="fmt-btn" class:active={(editorState, editor.isActive('link'))} onclick={addLinkFromToolbar} title={`Link (${modKey}+K)`}>
 					<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M10 13a5 5 0 007.54.54l3-3a5 5 0 00-7.07-7.07l-1.72 1.71"/><path d="M14 11a5 5 0 00-7.54-.54l-3 3a5 5 0 007.07 7.07l1.71-1.71"/></svg>
 				</button>
 
 				<div class="fmt-sep"></div>
 
 				<!-- Lists -->
-				<button class="fmt-btn" class:active={(editorState, editor.isActive('bulletList'))} onclick={() => editor?.chain().focus().toggleBulletList().run()} title="Bullet List (Ctrl+Shift+8)">
+				<button class="fmt-btn" class:active={(editorState, editor.isActive('bulletList'))} onclick={() => editor?.chain().focus().toggleBulletList().run()} title={`Bullet List (${modKey}+Shift+8)`}>
 					<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M3 5h.01"/><path d="M3 12h.01"/><path d="M3 19h.01"/><path d="M8 5h13"/><path d="M8 12h13"/><path d="M8 19h13"/></svg>
 				</button>
-				<button class="fmt-btn" class:active={(editorState, editor.isActive('orderedList'))} onclick={() => editor?.chain().focus().toggleOrderedList().run()} title="Ordered List (Ctrl+Shift+7)">
+				<button class="fmt-btn" class:active={(editorState, editor.isActive('orderedList'))} onclick={() => editor?.chain().focus().toggleOrderedList().run()} title={`Ordered List (${modKey}+Shift+7)`}>
 					<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M11 5h10"/><path d="M11 12h10"/><path d="M11 19h10"/><path d="M4 4h1v5"/><path d="M4 9h2"/><path d="M6.5 20H3.4c0-1 2.6-1.925 2.6-3.5a1.5 1.5 0 00-2.6-1.02"/></svg>
 				</button>
-				<button class="fmt-btn" class:active={(editorState, editor.isActive('taskList'))} onclick={() => editor?.chain().focus().toggleTaskList().run()} title="Task List (Ctrl+Shift+9)">
+				<button class="fmt-btn" class:active={(editorState, editor.isActive('taskList'))} onclick={() => editor?.chain().focus().toggleTaskList().run()} title={`Task List (${modKey}+Shift+9)`}>
 					<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M13 5h8"/><path d="M13 12h8"/><path d="M13 19h8"/><path d="m3 17 2 2 4-4"/><path d="m3 7 2 2 4-4"/></svg>
 				</button>
 
 				<div class="fmt-sep"></div>
 
 				<!-- Undo / Redo -->
-				<button class="fmt-btn" onclick={() => editor?.chain().focus().undo().run()} title="Undo (Ctrl+Z)">
+				<button class="fmt-btn" onclick={() => editor?.chain().focus().undo().run()} title={`Undo (${modKey}+Z)`}>
 					<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M9 14 4 9l5-5"/><path d="M4 9h10.5a5.5 5.5 0 015.5 5.5 5.5 5.5 0 01-5.5 5.5H11"/></svg>
 				</button>
-				<button class="fmt-btn" onclick={() => editor?.chain().focus().redo().run()} title="Redo (Ctrl+Shift+Z)">
+				<button class="fmt-btn" onclick={() => editor?.chain().focus().redo().run()} title={`Redo (${modKey}+Shift+Z)`}>
 					<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="m15 14 5-5-5-5"/><path d="M20 9H9.5A5.5 5.5 0 004 14.5 5.5 5.5 0 009.5 20H13"/></svg>
 				</button>
 
 				<div class="fmt-sep"></div>
 
 				<!-- Code & Code Block -->
-				<button class="fmt-btn" class:active={(editorState, editor.isActive('code'))} onclick={() => editor?.chain().focus().toggleCode().run()} title="Inline Code (Ctrl+E)">
+				<button class="fmt-btn" class:active={(editorState, editor.isActive('code'))} onclick={() => editor?.chain().focus().toggleCode().run()} title={`Inline Code (${modKey}+E)`}>
 					<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="m16 18 6-6-6-6"/><path d="m8 6-6 6 6 6"/></svg>
 				</button>
-				<button class="fmt-btn" class:active={(editorState, editor.isActive('codeBlock'))} onclick={() => editor?.chain().focus().toggleCodeBlock().run()} title="Code Block (Ctrl+Alt+C)">
+				<button class="fmt-btn" class:active={(editorState, editor.isActive('codeBlock'))} onclick={() => editor?.chain().focus().toggleCodeBlock().run()} title={`Code Block (${modKey}+Alt+C)`}>
 					<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="m10 9-3 3 3 3"/><path d="m14 15 3-3-3-3"/><rect x="3" y="3" width="18" height="18" rx="2"/></svg>
 				</button>
 
 				<!-- Blockquote -->
-				<button class="fmt-btn" class:active={(editorState, editor.isActive('blockquote'))} onclick={() => editor?.chain().focus().toggleBlockquote().run()} title="Quote (Ctrl+Shift+B)">
+				<button class="fmt-btn" class:active={(editorState, editor.isActive('blockquote'))} onclick={() => editor?.chain().focus().toggleBlockquote().run()} title={`Quote (${modKey}+Shift+B)`}>
 					<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M17 5H3"/><path d="M21 12H8"/><path d="M21 19H8"/><path d="M3 12v7"/></svg>
 				</button>
 
@@ -2975,7 +3138,7 @@
 
 				<!-- Highlight -->
 				<div class="fmt-dropdown-wrap">
-					<button class="fmt-btn" class:active={(editorState, editor.isActive('highlight'))} onclick={(e) => { e.stopPropagation(); highlightDropdown = !highlightDropdown; headingDropdown = false; colorDropdown = false; tablePickerOpen = false; alignDropdown = false; insertDropdown = false; }} title="Highlight (Ctrl+Shift+H)">
+					<button class="fmt-btn" class:active={(editorState, editor.isActive('highlight'))} onclick={(e) => { e.stopPropagation(); highlightDropdown = !highlightDropdown; headingDropdown = false; colorDropdown = false; tablePickerOpen = false; alignDropdown = false; insertDropdown = false; }} title={`Highlight (${modKey}+Shift+H)`}>
 						<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="m9 11-6 6v3h9l3-3"/><path d="m22 12-4.6 4.6a2 2 0 01-2.8 0l-5.2-5.2a2 2 0 010-2.8L14 4"/></svg>
 						<span class="color-indicator" style="background: {editor.getAttributes('highlight').color || 'var(--accent)'}"></span>
 					</button>
@@ -3170,23 +3333,23 @@
 			<button onclick={ctxCut}>
 				<svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="6" cy="6" r="3"/><circle cx="6" cy="18" r="3"/><line x1="20" y1="4" x2="8.12" y2="15.88"/><line x1="14.47" y1="14.48" x2="20" y2="20"/><line x1="8.12" y1="8.12" x2="12" y2="12"/></svg>
 				Cut
-				<span class="text-ctx-shortcut">Ctrl+X</span>
+				<span class="text-ctx-shortcut">{modKey}+X</span>
 			</button>
 			<button onclick={ctxCopy}>
 				<svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="9" y="9" width="13" height="13" rx="2" ry="2"/><path d="M5 15H4a2 2 0 01-2-2V4a2 2 0 012-2h9a2 2 0 012 2v1"/></svg>
 				Copy
-				<span class="text-ctx-shortcut">Ctrl+C</span>
+				<span class="text-ctx-shortcut">{modKey}+C</span>
 			</button>
 			<button onclick={ctxPaste}>
 				<svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M16 4h2a2 2 0 012 2v14a2 2 0 01-2 2H6a2 2 0 01-2-2V6a2 2 0 012-2h2"/><rect x="8" y="2" width="8" height="4" rx="1" ry="1"/></svg>
 				Paste
-				<span class="text-ctx-shortcut">Ctrl+V</span>
+				<span class="text-ctx-shortcut">{modKey}+V</span>
 			</button>
 			<div class="text-ctx-sep"></div>
 			<button onclick={ctxSelectAll}>
 				<svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M8 7h8M8 12h8M8 17h8"/></svg>
 				Select All
-				<span class="text-ctx-shortcut">Ctrl+A</span>
+				<span class="text-ctx-shortcut">{modKey}+A</span>
 			</button>
 			<div class="text-ctx-sep"></div>
 			<!-- Heading submenu -->
@@ -3211,17 +3374,17 @@
 			<button onclick={ctxBold}>
 				<svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1"><path d="M6 4h8a4 4 0 014 4 4 4 0 01-4 4H6zm0 8h9a4 4 0 014 4 4 4 0 01-4 4H6z"/></svg>
 				Bold
-				<span class="text-ctx-shortcut">Ctrl+B</span>
+				<span class="text-ctx-shortcut">{modKey}+B</span>
 			</button>
 			<button onclick={ctxItalic}>
 				<svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="19" y1="4" x2="10" y2="4"/><line x1="14" y1="20" x2="5" y2="20"/><line x1="15" y1="4" x2="9" y2="20"/></svg>
 				Italic
-				<span class="text-ctx-shortcut">Ctrl+I</span>
+				<span class="text-ctx-shortcut">{modKey}+I</span>
 			</button>
 			<button onclick={ctxUnderline}>
 				<svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M6 3v7a6 6 0 006 6 6 6 0 006-6V3"/><line x1="4" y1="21" x2="20" y2="21"/></svg>
 				Underline
-				<span class="text-ctx-shortcut">Ctrl+U</span>
+				<span class="text-ctx-shortcut">{modKey}+U</span>
 			</button>
 			<button onclick={ctxStrike}>
 				<svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M16 4H9a3 3 0 00-3 3 3 3 0 003 3h6"/><line x1="4" y1="12" x2="20" y2="12"/><path d="M8 20h7a3 3 0 003-3 3 3 0 00-3-3H8"/></svg>
@@ -3235,7 +3398,7 @@
 			<button onclick={ctxLink}>
 				<svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M10 13a5 5 0 007.54.54l3-3a5 5 0 00-7.07-7.07l-1.72 1.71"/><path d="M14 11a5 5 0 00-7.54-.54l-3 3a5 5 0 007.07 7.07l1.71-1.71"/></svg>
 				Add Link
-				<span class="text-ctx-shortcut">Ctrl+K</span>
+				<span class="text-ctx-shortcut">{modKey}+K</span>
 			</button>
 			<button onclick={ctxCode}>
 				<svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="16 18 22 12 16 6"/><polyline points="8 6 2 12 8 18"/></svg>
@@ -3728,15 +3891,6 @@
 		font-weight: 500;
 	}
 
-	.icon-btn.flash {
-		animation: flash-icon 0.6s ease;
-	}
-
-	@keyframes flash-icon {
-		0%, 100% { color: var(--text-tertiary); }
-		25%, 75% { color: var(--accent); transform: scale(1.2); }
-	}
-
 	.icon-btn {
 		background: none;
 		border: none;
@@ -5037,6 +5191,16 @@
 	}
 
 	/* PDF embeds */
+	:global(.tiptap .math-block) {
+		margin: 16px 0;
+		padding: 12px;
+		text-align: center;
+		overflow-x: auto;
+		cursor: default;
+	}
+	:global(.tiptap .math-inline) {
+		cursor: default;
+	}
 	:global(.tiptap .pdf-embed) {
 		margin: 12px 0;
 		border: 1px solid var(--border);

src/lib/components/GraphView.svelte

@@ -91,7 +91,12 @@
 					let match;
 					wikiLinkRegex.lastIndex = 0;
 					while ((match = wikiLinkRegex.exec(body)) !== null) {
-						const linkTitle = match[1].trim().toLowerCase();
+						// Handle Obsidian syntax: strip |alias, #heading, ^block
+						let rawLink = match[1].trim();
+						const pipeIdx = rawLink.indexOf('|');
+						if (pipeIdx >= 0) rawLink = rawLink.slice(0, pipeIdx).trim();
+						rawLink = rawLink.replace(/#.*$/, '').replace(/\^.*$/, '').trim();
+						const linkTitle = rawLink.toLowerCase();
 						const targetIdx = nodeIndexMap.get(linkTitle);
 						if (linkTitle !== node.id && targetIdx !== undefined) {
 							const edgeKey = nodeIdx < targetIdx ? `${nodeIdx}|${targetIdx}` : `${targetIdx}|${nodeIdx}`;

src/lib/components/InfoPanel.svelte

@@ -5,6 +5,8 @@
 	import { getVersion } from '@tauri-apps/api/app';
 	import type { VaultStats } from '$lib/types';
 
+	const modKey = navigator.platform.startsWith('Mac') ? '⌘' : 'Ctrl';
+
 	let stats = $state<VaultStats | null>(null);
 	let activeTab = $state<'about' | 'shortcuts'>('shortcuts');
 	let appVersion = $state('...');
@@ -71,7 +73,7 @@
 					</div>
 					<h3 class="app-name">HelixNotes</h3>
 					<p class="app-version">v{appVersion}</p>
-					<p class="app-description">A local-first markdown note-taking app.</p>
+					<p class="app-description">A local markdown note-taking app.</p>
 
 					{#if stats}
 						<div class="info-stats">
@@ -112,16 +114,16 @@
 				{:else}
 					<div class="shortcuts-section">
 						<h4 class="shortcuts-group-title">Keyboard Shortcuts</h4>
-						<div class="shortcut-row"><span class="shortcut-desc">New note</span><span class="shortcut-keys"><kbd>Ctrl</kbd>+<kbd>N</kbd></span></div>
+						<div class="shortcut-row"><span class="shortcut-desc">New note</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>N</kbd></span></div>
-						<div class="shortcut-row"><span class="shortcut-desc">Quick open</span><span class="shortcut-keys"><kbd>Ctrl</kbd>+<kbd>P</kbd></span></div>
+						<div class="shortcut-row"><span class="shortcut-desc">Quick open</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>P</kbd></span></div>
-						<div class="shortcut-row"><span class="shortcut-desc">Find in note</span><span class="shortcut-keys"><kbd>Ctrl</kbd>+<kbd>F</kbd></span></div>
+						<div class="shortcut-row"><span class="shortcut-desc">Find in note</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>F</kbd></span></div>
-						<div class="shortcut-row"><span class="shortcut-desc">Search vault</span><span class="shortcut-keys"><kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>F</kbd></span></div>
+						<div class="shortcut-row"><span class="shortcut-desc">Search vault</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>Shift</kbd>+<kbd>F</kbd></span></div>
-						<div class="shortcut-row"><span class="shortcut-desc">Save</span><span class="shortcut-keys"><kbd>Ctrl</kbd>+<kbd>S</kbd></span></div>
+						<div class="shortcut-row"><span class="shortcut-desc">Save</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>S</kbd></span></div>
-						<div class="shortcut-row"><span class="shortcut-desc">Bold</span><span class="shortcut-keys"><kbd>Ctrl</kbd>+<kbd>B</kbd></span></div>
+						<div class="shortcut-row"><span class="shortcut-desc">Bold</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>B</kbd></span></div>
-						<div class="shortcut-row"><span class="shortcut-desc">Italic</span><span class="shortcut-keys"><kbd>Ctrl</kbd>+<kbd>I</kbd></span></div>
+						<div class="shortcut-row"><span class="shortcut-desc">Italic</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>I</kbd></span></div>
-						<div class="shortcut-row"><span class="shortcut-desc">Underline</span><span class="shortcut-keys"><kbd>Ctrl</kbd>+<kbd>U</kbd></span></div>
+						<div class="shortcut-row"><span class="shortcut-desc">Underline</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>U</kbd></span></div>
-						<div class="shortcut-row"><span class="shortcut-desc">Undo</span><span class="shortcut-keys"><kbd>Ctrl</kbd>+<kbd>Z</kbd></span></div>
+						<div class="shortcut-row"><span class="shortcut-desc">Undo</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>Z</kbd></span></div>
-						<div class="shortcut-row"><span class="shortcut-desc">Redo</span><span class="shortcut-keys"><kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>Z</kbd></span></div>
+						<div class="shortcut-row"><span class="shortcut-desc">Redo</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>Shift</kbd>+<kbd>Z</kbd></span></div>
 						<div class="shortcut-row"><span class="shortcut-desc">Go back</span><span class="shortcut-keys"><kbd>Alt</kbd>+<kbd>←</kbd></span></div>
 						<div class="shortcut-row"><span class="shortcut-desc">Go forward</span><span class="shortcut-keys"><kbd>Alt</kbd>+<kbd>→</kbd></span></div>
 						<div class="shortcut-row"><span class="shortcut-desc">Exit focus mode</span><span class="shortcut-keys"><kbd>Esc</kbd></span></div>

src/lib/components/NoteList.svelte

@@ -11,7 +11,8 @@
 		editorDirty,
 		quickAccessPaths,
 		appConfig,
-		notebooks
+		notebooks,
+		tags
 	} from '$lib/stores/app';
 	import {
 		getNotes,
@@ -27,7 +28,8 @@
 		addQuickAccess,
 		removeQuickAccess,
 		reorderQuickAccess,
-		moveNote
+		moveNote,
+		getAllTags
 	} from '$lib/api';
 	import { formatRelativeTime } from '$lib/utils/time';
 	import type { NoteEntry, SortMode } from '$lib/types';
@@ -37,17 +39,23 @@
 		onNoteMoved?: () => void;
 	} = $props();
 
+	const modKey = navigator.platform.startsWith('Mac') ? '⌘' : 'Ctrl';
+
 	let compact = $derived($appConfig?.compact_notes ?? false);
 	let contextMenu = $state<{ x: number; y: number; note: NoteEntry } | null>(null);
 	let sortMenu = $state<{ x: number; y: number } | null>(null);
 	let editingNote = $state<string | null>(null);
 	let editValue = $state('');
 	let movePickerNote = $state<NoteEntry | null>(null);
+	let tagEditNote = $state<NoteEntry | null>(null);
+	let tagEditValue = $state('');
+	let tagEditTags = $state<string[]>([]);
 
 	// Multi-select
 	let selectedPaths = $state<Set<string>>(new Set());
 	let lastClickedPath = $state<string | null>(null);
 	let batchMovePicker = $state(false);
+	let batchTagEdit = $state(false);
 
 	// Quick Access drag-to-reorder
 	let qaDragFrom = $state<number | null>(null);
@@ -280,6 +288,102 @@
 		}
 	}
 
+	function openTagEdit(note: NoteEntry) {
+		tagEditNote = note;
+		tagEditTags = [...note.meta.tags];
+		tagEditValue = '';
+	}
+
+	async function addTagToNote(tag: string) {
+		if (!tagEditNote || !tag.trim()) return;
+		const cleaned = tag.trim().toLowerCase();
+		if (tagEditTags.includes(cleaned)) return;
+		tagEditTags = [...tagEditTags, cleaned];
+		tagEditValue = '';
+		await saveTagsForNote(tagEditNote, tagEditTags);
+	}
+
+	async function removeTagFromNote(tag: string) {
+		if (!tagEditNote) return;
+		tagEditTags = tagEditTags.filter(t => t !== tag);
+		await saveTagsForNote(tagEditNote, tagEditTags);
+	}
+
+	async function saveTagsForNote(note: NoteEntry, newTags: string[]) {
+		try {
+			const content = await readNote(note.path);
+			content.meta.tags = newTags;
+			await saveNote(note.path, content.meta, content.content);
+			$notes = $notes.map(n =>
+				n.path === note.path ? { ...n, meta: { ...n.meta, tags: newTags } } : n
+			);
+			if ($activeNotePath === note.path && $activeNote) {
+				$activeNote = { ...$activeNote, meta: { ...$activeNote.meta, tags: newTags } };
+			}
+			$tags = await getAllTags();
+		} catch (e) {
+			console.error('Failed to save tags:', e);
+		}
+	}
+
+	function openBatchTagEdit() {
+		batchTagEdit = true;
+		tagEditValue = '';
+		// Show tags common to ALL selected notes
+		const selectedNotes = $notes.filter(n => selectedPaths.has(n.path));
+		if (selectedNotes.length === 0) { tagEditTags = []; return; }
+		tagEditTags = selectedNotes[0].meta.tags.filter(t =>
+			selectedNotes.every(n => n.meta.tags.includes(t))
+		);
+	}
+
+	async function addTagToBatch(tag: string) {
+		if (!tag.trim()) return;
+		const cleaned = tag.trim().toLowerCase();
+		tagEditValue = '';
+		if (!tagEditTags.includes(cleaned)) tagEditTags = [...tagEditTags, cleaned];
+		try {
+			for (const path of selectedPaths) {
+				const content = await readNote(path);
+				if (!content.meta.tags.includes(cleaned)) {
+					content.meta.tags = [...content.meta.tags, cleaned];
+					await saveNote(path, content.meta, content.content);
+					$notes = $notes.map(n =>
+						n.path === path ? { ...n, meta: { ...n.meta, tags: content.meta.tags } } : n
+					);
+					if ($activeNotePath === path) {
+						$activeNote = content;
+					}
+				}
+			}
+			$tags = await getAllTags();
+		} catch (e) {
+			console.error('Failed to add tag to batch:', e);
+		}
+	}
+
+	async function removeTagFromBatch(tag: string) {
+		tagEditTags = tagEditTags.filter(t => t !== tag);
+		try {
+			for (const path of selectedPaths) {
+				const content = await readNote(path);
+				if (content.meta.tags.includes(tag)) {
+					content.meta.tags = content.meta.tags.filter((t: string) => t !== tag);
+					await saveNote(path, content.meta, content.content);
+					$notes = $notes.map(n =>
+						n.path === path ? { ...n, meta: { ...n.meta, tags: content.meta.tags } } : n
+					);
+					if ($activeNotePath === path) {
+						$activeNote = content;
+					}
+				}
+			}
+			$tags = await getAllTags();
+		} catch (e) {
+			console.error('Failed to remove tag from batch:', e);
+		}
+	}
+
 	async function handleAddQuickAccess(note: NoteEntry) {
 		contextMenu = null;
 		try {
@@ -441,7 +545,7 @@
 	}
 
 	function handleWindowClick() {
-		if (contextMenu) { contextMenu = null; movePickerNote = null; }
+		if (contextMenu) { contextMenu = null; movePickerNote = null; tagEditNote = null; batchTagEdit = false; }
 		if (sortMenu) sortMenu = null;
 	}
 
@@ -481,7 +585,7 @@
 				</svg>
 			</button>
 			{#if $viewMode !== 'trash'}
-				<button class="icon-btn" onclick={handleCreateNote} title="New note (Ctrl+N)">
+				<button class="icon-btn" onclick={handleCreateNote} title={`New note (${modKey}+N)`}>
 					<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
 						<line x1="12" y1="5" x2="12" y2="19" /><line x1="5" y1="12" x2="19" y2="12" />
 					</svg>
@@ -674,7 +778,50 @@
 				<button class="danger" onclick={() => { contextMenu = null; handleBatchPermanentDelete(); }}>
 					Delete {selectedPaths.size} permanently
 				</button>
+			{:else if batchTagEdit}
+				<button class="move-back" onclick={() => batchTagEdit = false}>
+					<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+						<polyline points="15 18 9 12 15 6"/>
+					</svg>
+					Tags for {selectedPaths.size} notes
+				</button>
+				<div class="context-sep"></div>
+				<div class="tag-edit-section">
+					<div class="tag-edit-input-row">
+						<input
+							type="text"
+							class="tag-edit-input"
+							placeholder="Add tag to all..."
+							bind:value={tagEditValue}
+							onkeydown={(e) => {
+								if (e.key === 'Enter') { e.preventDefault(); addTagToBatch(tagEditValue); }
+								if (e.key === 'Escape') { e.preventDefault(); batchTagEdit = false; }
+							}}
+							autofocus
+						/>
+					</div>
+					{#if tagEditTags.length > 0}
+						<div class="tag-edit-list">
+							{#each tagEditTags as tag}
+								<div class="tag-edit-item">
+									<span class="tag-edit-name">#{tag}</span>
+									<button class="tag-edit-remove" onclick={() => removeTagFromBatch(tag)} title="Remove from all">
+										<svg width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/></svg>
+									</button>
+								</div>
+							{/each}
+						</div>
 					{:else}
+						<div class="context-empty">No common tags</div>
+					{/if}
+				</div>
+			{:else}
+				<button onclick={() => openBatchTagEdit()}>
+					<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+						<path d="M20.59 13.41l-7.17 7.17a2 2 0 01-2.83 0L2 12V2h10l8.59 8.59a2 2 0 010 2.82z"/><line x1="7" y1="7" x2="7.01" y2="7"/>
+					</svg>
+					Tags...
+				</button>
 				<button onclick={() => { contextMenu = null; batchMovePicker = true; }}>
 					<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
 						<path d="M22 19a2 2 0 01-2 2H4a2 2 0 01-2-2V5a2 2 0 012-2h5l2 3h9a2 2 0 012 2z"/>
@@ -688,6 +835,43 @@
 		{:else if $viewMode === 'trash'}
 			<button onclick={() => handleRestore(contextMenu!.note)}>Restore</button>
 			<button class="danger" onclick={() => handlePermanentDelete(contextMenu!.note)}>Delete Permanently</button>
+		{:else if tagEditNote}
+			<button class="move-back" onclick={() => tagEditNote = null}>
+				<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+					<polyline points="15 18 9 12 15 6"/>
+				</svg>
+				Tags
+			</button>
+			<div class="context-sep"></div>
+			<div class="tag-edit-section">
+				<div class="tag-edit-input-row">
+					<input
+						type="text"
+						class="tag-edit-input"
+						placeholder="Add tag..."
+						bind:value={tagEditValue}
+						onkeydown={(e) => {
+							if (e.key === 'Enter') { e.preventDefault(); addTagToNote(tagEditValue); }
+							if (e.key === 'Escape') { e.preventDefault(); tagEditNote = null; }
+						}}
+						autofocus
+					/>
+				</div>
+				{#if tagEditTags.length > 0}
+					<div class="tag-edit-list">
+						{#each tagEditTags as tag}
+							<div class="tag-edit-item">
+								<span class="tag-edit-name">#{tag}</span>
+								<button class="tag-edit-remove" onclick={() => removeTagFromNote(tag)} title="Remove tag">
+									<svg width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/></svg>
+								</button>
+							</div>
+						{/each}
+					</div>
+				{:else}
+					<div class="context-empty">No tags</div>
+				{/if}
+			</div>
 		{:else if movePickerNote}
 			<button class="move-back" onclick={() => movePickerNote = null}>
 				<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
@@ -717,6 +901,12 @@
 				</svg>
 				{contextMenu.note.meta.pinned ? 'Unpin Note' : 'Pin Note'}
 			</button>
+			<button onclick={() => openTagEdit(contextMenu!.note)}>
+				<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+					<path d="M20.59 13.41l-7.17 7.17a2 2 0 01-2.83 0L2 12V2h10l8.59 8.59a2 2 0 010 2.82z"/><line x1="7" y1="7" x2="7.01" y2="7"/>
+				</svg>
+				Tags...
+			</button>
 			{#if $quickAccessPaths.includes(contextMenu.note.relative_path)}
 				<button onclick={() => handleRemoveQuickAccess(contextMenu!.note)}>
 					<svg width="14" height="14" viewBox="0 0 24 24" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
@@ -1173,6 +1363,62 @@
 		border-radius: 2px;
 	}
 
+	.tag-edit-section {
+		padding: 4px 0;
+	}
+
+	.tag-edit-input-row {
+		padding: 2px 8px 4px;
+	}
+
+	.tag-edit-input {
+		width: 100%;
+		padding: 4px 8px;
+		border: 1px solid var(--border-color);
+		border-radius: 4px;
+		background: var(--bg-secondary);
+		color: var(--text-primary);
+		font-size: 12px;
+		outline: none;
+	}
+
+	.tag-edit-input:focus {
+		border-color: var(--accent);
+	}
+
+	.tag-edit-list {
+		max-height: 160px;
+		overflow-y: auto;
+	}
+
+	.tag-edit-item {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 3px 12px;
+		font-size: 12px;
+	}
+
+	.tag-edit-name {
+		color: var(--text-secondary);
+	}
+
+	.tag-edit-remove {
+		background: none;
+		border: none;
+		color: var(--text-tertiary);
+		cursor: pointer;
+		padding: 2px;
+		border-radius: 3px;
+		display: flex;
+		align-items: center;
+	}
+
+	.tag-edit-remove:hover {
+		color: var(--danger, #e53e3e);
+		background: color-mix(in srgb, var(--danger, #e53e3e) 10%, transparent);
+	}
+
 	.sort-menu {
 		position: fixed;
 		background: var(--bg-primary);

src/lib/components/Sidebar.svelte

@@ -27,6 +27,8 @@
 		onViewChanged?: () => void;
 	} = $props();
 
+	const modKey = navigator.platform.startsWith('Mac') ? '⌘' : 'Ctrl';
+
 	let editingNotebook = $state<string | null>(null);
 	let editValue = $state('');
 	let newNotebookName = $state('');
@@ -35,6 +37,8 @@
 	let draggedNotebookPath = $state<string | null>(null);
 	let contextMenu = $state<{ x: number; y: number; notebook: NotebookEntry } | null>(null);
 	let trashContextMenu = $state<{ x: number; y: number } | null>(null);
+	let tagsCollapsed = $state(true);
+	let deleteConfirm = $state<NotebookEntry | null>(null);
 	function toggleCollapse(path: string, e: MouseEvent) {
 		e.stopPropagation();
 		if ($collapsedNotebooks.includes(path)) {
@@ -117,8 +121,22 @@
 		}
 	}
 
-	async function handleDelete(nb: NotebookEntry) {
+	function countNotesRecursive(nb: NotebookEntry): number {
+		return nb.note_count + nb.children.reduce((sum, c) => sum + countNotesRecursive(c), 0);
+	}
+
+	function handleDelete(nb: NotebookEntry) {
 		contextMenu = null;
+		const total = countNotesRecursive(nb);
+		if (total > 0) {
+			deleteConfirm = nb;
+		} else {
+			confirmDelete(nb);
+		}
+	}
+
+	async function confirmDelete(nb: NotebookEntry) {
+		deleteConfirm = null;
 		try {
 			await deleteNotebook(nb.path);
 			if ($activeNotebook?.path === nb.path) {
@@ -282,7 +300,7 @@
 			</svg>
 		</button>
 		{#if !$sidebarCollapsed}
-			<button class="icon-btn" onclick={() => ($showSearch = true)} title="Search (Ctrl+F)">
+			<button class="icon-btn" onclick={() => ($showSearch = true)} title={`Search (${modKey}+F)`}>
 				<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
 					<circle cx="11" cy="11" r="8" />
 					<line x1="21" y1="21" x2="16.65" y2="16.65" />
@@ -380,9 +398,11 @@
 
 		{#if $tags.length > 0}
 			<div class="section">
-				<div class="section-header">
+				<button class="section-header" onclick={() => tagsCollapsed = !tagsCollapsed}>
 					<span class="section-title">Tags</span>
-				</div>
+					<span class="tag-count" style="margin-left: auto">{$tags.length}</span>
+				</button>
+				{#if !tagsCollapsed}
 					<div class="tag-list">
 						{#each $tags as [tag, count]}
 							<button
@@ -396,6 +416,7 @@
 							</button>
 						{/each}
 					</div>
+				{/if}
 			</div>
 		{/if}
 
@@ -456,6 +477,21 @@
 	</div>
 {/if}
 
+{#if deleteConfirm}
+	<!-- svelte-ignore a11y_no_static_element_interactions -->
+	<div class="delete-confirm-overlay" onclick={() => deleteConfirm = null}>
+		<!-- svelte-ignore a11y_no_static_element_interactions -->
+		<div class="delete-confirm" onclick={(e) => e.stopPropagation()}>
+			<h4>Delete "{deleteConfirm.name}"?</h4>
+			<p>This notebook contains {countNotesRecursive(deleteConfirm)} note{countNotesRecursive(deleteConfirm) === 1 ? '' : 's'} that will be permanently deleted.</p>
+			<div class="delete-confirm-actions">
+				<button class="delete-confirm-cancel" onclick={() => deleteConfirm = null}>Cancel</button>
+				<button class="delete-confirm-btn" onclick={() => confirmDelete(deleteConfirm!)}>Delete</button>
+			</div>
+		</div>
+	</div>
+{/if}
+
 {#snippet notebookItem(nb: NotebookEntry, depth: number)}
 	{@const hasChildren = nb.children.length > 0}
 	{@const isCollapsed = $collapsedNotebooks.includes(nb.path)}
@@ -603,6 +639,13 @@
 		align-items: center;
 		justify-content: space-between;
 		padding: 8px 12px 4px;
+		width: 100%;
+		background: none;
+		border: none;
+		cursor: pointer;
+		color: inherit;
+		font: inherit;
+		text-align: left;
 	}
 
 	.section-title {
@@ -839,4 +882,71 @@
 	.context-menu button.danger:hover {
 		background: color-mix(in srgb, var(--danger) 10%, transparent);
 	}
+
+	.delete-confirm-overlay {
+		position: fixed;
+		inset: 0;
+		background: rgba(0, 0, 0, 0.4);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		z-index: 1000;
+	}
+
+	.delete-confirm {
+		background: var(--bg-primary);
+		border: 1px solid var(--border-color);
+		border-radius: 10px;
+		padding: 20px 24px;
+		max-width: 340px;
+		box-shadow: 0 8px 32px rgba(0, 0, 0, 0.25);
+	}
+
+	.delete-confirm h4 {
+		margin: 0 0 8px;
+		font-size: 14px;
+		color: var(--text-primary);
+	}
+
+	.delete-confirm p {
+		margin: 0 0 16px;
+		font-size: 12.5px;
+		color: var(--text-secondary);
+		line-height: 1.4;
+	}
+
+	.delete-confirm-actions {
+		display: flex;
+		gap: 8px;
+		justify-content: flex-end;
+	}
+
+	.delete-confirm-cancel {
+		padding: 6px 14px;
+		border: 1px solid var(--border-color);
+		border-radius: 6px;
+		background: var(--bg-secondary);
+		color: var(--text-primary);
+		font-size: 12px;
+		cursor: pointer;
+	}
+
+	.delete-confirm-cancel:hover {
+		background: var(--bg-hover);
+	}
+
+	.delete-confirm-btn {
+		padding: 6px 14px;
+		border: none;
+		border-radius: 6px;
+		background: var(--danger, #e53e3e);
+		color: white;
+		font-size: 12px;
+		font-weight: 600;
+		cursor: pointer;
+	}
+
+	.delete-confirm-btn:hover {
+		opacity: 0.9;
+	}
 </style>

src/lib/components/TitleBar.svelte

@@ -1,13 +1,15 @@
 <script lang="ts">
 	import { getCurrentWindow } from '@tauri-apps/api/window';
-	import { vaultReady, focusMode, updateAvailable, showSettings, settingsTab } from '$lib/stores/app';
+	import { vaultReady, focusMode, readOnly, updateAvailable, showSettings, settingsTab } from '$lib/stores/app';
 
-	let { onNewNote = () => {} }: {
+	let { onNewNote = () => {}, onDailyNote = () => {} }: {
 		onNewNote?: () => void;
+		onDailyNote?: () => void;
 	} = $props();
 
 	const appWindow = getCurrentWindow();
 	const isMac = navigator.platform.startsWith('Mac');
+	const modKey = isMac ? '⌘' : 'Ctrl';
 	let maximized = $state(false);
 
 	async function checkMaximized() {
@@ -90,7 +92,27 @@
 				<path d="M8 3H5a2 2 0 00-2 2v3m18 0V5a2 2 0 00-2-2h-3m0 18h3a2 2 0 002-2v-3M3 16v3a2 2 0 002 2h3"/>
 			</svg>
 		</button>
-		<button class="new-note-btn" onclick={onNewNote} title="New Note (Ctrl+N)">
+		<button class="switch-vault-btn" class:active={$readOnly} onclick={() => ($readOnly = !$readOnly)} title={$readOnly ? 'Switch to Edit Mode' : 'Switch to View Mode'}>
+			<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+				{#if $readOnly}
+					<path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z" />
+					<circle cx="12" cy="12" r="3" />
+				{:else}
+					<path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94" />
+					<path d="M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19" />
+					<line x1="1" y1="1" x2="23" y2="23" />
+				{/if}
+			</svg>
+		</button>
+		<button class="switch-vault-btn" onclick={onDailyNote} title="Daily Note">
+			<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+				<rect x="3" y="4" width="18" height="18" rx="2" ry="2" />
+				<line x1="16" y1="2" x2="16" y2="6" />
+				<line x1="8" y1="2" x2="8" y2="6" />
+				<line x1="3" y1="10" x2="21" y2="10" />
+			</svg>
+		</button>
+		<button class="new-note-btn" onclick={onNewNote} title={`New Note (${modKey}+N)`}>
 			<svg width="14" height="14" viewBox="0 0 14 14" fill="none">
 				<path d="M7 1v12M1 7h12" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" />
 			</svg>
@@ -199,6 +221,11 @@
 		color: var(--text-primary);
 	}
 
+	.switch-vault-btn.active {
+		background: color-mix(in srgb, var(--accent) 18%, transparent);
+		color: var(--accent);
+	}
+
 	.new-note-btn {
 		display: flex;
 		align-items: center;

src/lib/components/VaultPicker.svelte

@@ -57,7 +57,7 @@
 			</svg>
 		</div>
 		<h1>HelixNotes</h1>
-		<p class="subtitle">Local-first markdown notes</p>
+		<p class="subtitle">Local markdown notes</p>
 		<p class="description">Your notes are stored as standard Markdown (.md) files. Pick any folder — existing .md files will be recognized automatically.</p>
 
 		{#if error}

src/lib/stores/app.ts

@@ -42,6 +42,7 @@ export const activeTag = writable<string | null>(null);
 export const editorDirty = writable(false);
 export const sourceMode = writable(false);
 export const focusMode = writable(false);
+export const readOnly = writable(false);
 
 // Theme
 export const theme = writable<string>("system");