v1.1.9 - Android version prep

README.md

@@ -5,7 +5,7 @@ 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.
 
-## Download
+## Download (v1.1.8)
 
 ### Linux
 
@@ -21,21 +21,21 @@ yay -S helixnotes-appimage-bin
 curl -fsSL https://repo.arkhost.com/gpg.key | sudo gpg --dearmor -o /usr/share/keyrings/arkhost.gpg && echo "deb [signed-by=/usr/share/keyrings/arkhost.gpg arch=amd64] https://repo.arkhost.com stable main" | sudo tee /etc/apt/sources.list.d/helixnotes.list && sudo apt update && sudo apt install helix-notes
 ```
 
-#### AppImage (Arch, Fedora, openSUSE)
+#### AppImage (Arch, Fedora 43+, openSUSE Tumbleweed)
 
-[Download AppImage](https://download.helixnotes.com/releases/v1.1.4/HelixNotes_1.1.4_amd64.AppImage)
+[Download AppImage](https://download.helixnotes.com/releases/v1.1.8/HelixNotes_1.1.8_amd64.AppImage)
 
 #### .deb (manual)
 
-[Download .deb](https://codeberg.org/ArkHost/HelixNotes/releases/download/v1.1.4/HelixNotes_1.1.4_amd64.deb) — Ubuntu 22.04+
+[Download .deb](https://codeberg.org/ArkHost/HelixNotes/releases/download/v1.1.8/HelixNotes_1.1.8_amd64.deb) — Ubuntu 22.04+
 
 ### Windows
 
-[Download Installer](https://codeberg.org/ArkHost/HelixNotes/releases/download/v1.1.4/HelixNotes_1.1.4_x64-setup.exe) — Windows 10/11
+[Download Installer](https://codeberg.org/ArkHost/HelixNotes/releases/download/v1.1.8/HelixNotes_1.1.8_x64-setup.exe) — Windows 10/11
 
 ### macOS
 
-[Download .dmg](https://codeberg.org/ArkHost/HelixNotes/releases/download/v1.1.4/HelixNotes_1.1.4_x64.dmg) — macOS 12+ (Intel, runs on Apple Silicon via Rosetta)
+[Download .dmg](https://codeberg.org/ArkHost/HelixNotes/releases/download/v1.1.8/HelixNotes_1.1.8_x64.dmg) — macOS (Intel, runs on Apple Silicon via Rosetta)
 
 ---
 
@@ -50,14 +50,16 @@ All releases: [codeberg.org/ArkHost/HelixNotes/releases](https://codeberg.org/Ar
 - **Full-text search** powered by Tantivy
 - **Math support** — KaTeX rendering for inline and block equations
 - **Daily notes** — one-click button to create or open today's note
-- **AI writing tools** — improve, summarize, translate, and more (Anthropic / OpenAI)
+- **AI writing tools** — improve, summarize, translate, and more (Ollama / Anthropic / OpenAI)
 - **Version history** — per-note snapshots with diff view
 - **Backups** — automatic zip-based vault backups
 - **PDF preview** — inline rendering of embedded PDFs
 - **Tag management** — organize notes with tags, bulk edit from context menu
 - **Drag-and-drop** — move notes between notebooks, reorganize notebooks by dragging
 - **Obsidian import** — convert Obsidian wiki-links to standard markdown
-- **Themes** — light/dark mode with customizable accent colors and fonts
+- **Multi-window** — open notes in separate windows (right-click → "Open in New Window")
+- **File associations** — open .md files from your file manager directly in HelixNotes
+- **Themes** — light/dark mode with customizable accent colors, fonts, and line height
 - **Focus mode** — distraction-free writing
 - **View mode** — read-only toggle for distraction-free reading
 - **Local** — everything stays on your machine
@@ -92,6 +94,13 @@ pnpm tauri dev
 pnpm tauri build
 ```
 
+## Screenshots
+
+![Editor](https://cdn.helixnotes.com/assets/screenshots/screenshot-1.png)
+![Settings](https://cdn.helixnotes.com/assets/screenshots/screenshot-2.png)
+![Graph View](https://cdn.helixnotes.com/assets/screenshots/screenshot-3.png)
+![AI Actions](https://cdn.helixnotes.com/assets/screenshots/screenshot-4.png)
+
 ## License
 
 [AGPL-3.0](https://codeberg.org/ArkHost/HelixNotes/src/branch/main/LICENSE)

package.json

@@ -2,7 +2,7 @@
   "name": "helixnotes",
   "private": true,
   "license": "AGPL-3.0-or-later",
-  "version": "1.1.5",
+  "version": "1.1.9",
   "type": "module",
   "scripts": {
     "dev": "vite dev",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "helixnotes"
-version = "1.1.5"
+version = "1.1.9"
 description = "Local markdown note-taking app"
 authors = ["HelixNotes"]
 license = "AGPL-3.0-or-later"
@@ -38,7 +38,8 @@ reqwest = { version = "0.12", default-features = false, features = ["json", "str
 futures = "0.3"
 rayon = "1"
 rustls = { version = "0.23", default-features = false, features = ["ring", "logging", "std", "tls12"] }
-
 [target.'cfg(not(target_os = "android"))'.dependencies]
 tauri-plugin-updater = "2"
 tauri-plugin-single-instance = "2"
+arboard = { version = "3", features = ["image-data", "wayland-data-control"] }
+png = "0.17"

src-tauri/capabilities/default.json

@@ -2,7 +2,7 @@
   "$schema": "../gen/schemas/desktop-schema.json",
   "identifier": "default",
   "description": "HelixNotes default capabilities",
-  "windows": ["main"],
+  "windows": ["main", "note-*"],
   "permissions": [
     "core:default",
     "core:window:default",
@@ -12,6 +12,8 @@
     "core:window:allow-close",
     "core:window:allow-is-maximized",
     "core:window:allow-set-decorations",
+    "core:window:allow-set-title",
+    "core:webview:allow-create-webview-window",
     "dialog:default",
     "dialog:allow-open",
     "dialog:allow-save",

src-tauri/src/ai.rs

@@ -6,6 +6,7 @@ use crate::types::AiStreamEvent;
 
 const ANTHROPIC_API_URL: &str = "https://api.anthropic.com/v1/messages";
 const OPENAI_API_URL: &str = "https://api.openai.com/v1/chat/completions";
+const OLLAMA_DEFAULT_URL: &str = "http://localhost:11434";
 
 pub fn ai_request(
     app: AppHandle,
@@ -15,6 +16,7 @@ pub fn ai_request(
     system_prompt: String,
     user_message: String,
     request_id: String,
+    base_url: Option<String>,
 ) {
     std::thread::spawn(move || {
         let rt = tokio::runtime::Runtime::new().unwrap();
@@ -23,7 +25,22 @@ pub fn ai_request(
                 "openai" => {
                     stream_openai(
                         &app,
-                        &api_key,
+                        OPENAI_API_URL,
+                        Some(&api_key),
+                        &model,
+                        &system_prompt,
+                        &user_message,
+                        &request_id,
+                    )
+                    .await
+                }
+                "ollama" => {
+                    let url = base_url.as_deref().unwrap_or(OLLAMA_DEFAULT_URL);
+                    let url = format!("{}/v1/chat/completions", url.trim_end_matches('/'));
+                    stream_openai(
+                        &app,
+                        &url,
+                        None,
                         &model,
                         &system_prompt,
                         &user_message,
@@ -188,7 +205,8 @@ async fn stream_anthropic(
 
 async fn stream_openai(
     app: &AppHandle,
-    api_key: &str,
+    url: &str,
+    api_key: Option<&str>,
     model: &str,
     system_prompt: &str,
     user_message: &str,
@@ -224,10 +242,15 @@ async fn stream_openai(
         body["temperature"] = json!(0.7);
     }
 
-    let response = client
+    let mut req = client
-        .post(OPENAI_API_URL)
+        .post(url)
-        .header("Authorization", format!("Bearer {}", api_key))
+        .header("content-type", "application/json");
-        .header("content-type", "application/json")
+
+    if let Some(key) = api_key {
+        req = req.header("Authorization", format!("Bearer {}", key));
+    }
+
+    let response = req
         .json(&body)
         .send()
         .await
@@ -325,9 +348,19 @@ async fn stream_openai(
     Ok(())
 }
 
-pub async fn test_connection(provider: &str, api_key: &str, model: &str) -> Result<String, String> {
+pub async fn test_connection(
+    provider: &str,
+    api_key: &str,
+    model: &str,
+    base_url: Option<&str>,
+) -> Result<String, String> {
     match provider {
-        "openai" => test_openai(api_key, model).await,
+        "openai" => test_openai(OPENAI_API_URL, Some(api_key), model).await,
+        "ollama" => {
+            let url = base_url.unwrap_or(OLLAMA_DEFAULT_URL);
+            let url = format!("{}/v1/chat/completions", url.trim_end_matches('/'));
+            test_openai(&url, None, model).await
+        }
         _ => test_anthropic(api_key, model).await,
     }
 }
@@ -365,19 +398,12 @@ async fn test_anthropic(api_key: &str, model: &str) -> Result<String, String> {
     }
 }
 
-async fn test_openai(api_key: &str, model: &str) -> Result<String, String> {
+async fn test_openai(url: &str, api_key: Option<&str>, model: &str) -> Result<String, String> {
     let client = Client::new();
 
-    let is_gpt5 = model.starts_with("gpt-5");
-    let token_key = if is_gpt5 {
-        "max_completion_tokens"
-    } else {
-        "max_tokens"
-    };
-
     let body = json!({
         "model": model,
-        token_key: 10,
+        "max_tokens": 10,
         "messages": [
             {
                 "role": "user",
@@ -386,10 +412,15 @@ async fn test_openai(api_key: &str, model: &str) -> Result<String, String> {
         ]
     });
 
-    let response = client
+    let mut req = client
-        .post(OPENAI_API_URL)
+        .post(url)
-        .header("Authorization", format!("Bearer {}", api_key))
+        .header("content-type", "application/json");
-        .header("content-type", "application/json")
+
+    if let Some(key) = api_key {
+        req = req.header("Authorization", format!("Bearer {}", key));
+    }
+
+    let response = req
         .json(&body)
         .send()
         .await

src-tauri/src/commands.rs

@@ -11,9 +11,21 @@ use tauri::{AppHandle, Manager, State};
 pub fn open_vault(app: AppHandle, state: State<'_, AppState>, path: String) -> Result<(), String> {
     operations::ensure_vault_structure(&path)?;
 
-    // Initialize search index
+    // Initialize search index — rebuild in background on Android (FUSE is slow)
-    let search = SearchIndex::new(&path)?;
+    let search = std::sync::Arc::new(SearchIndex::new(&path)?);
-    search.rebuild(&path)?;
+    #[cfg(target_os = "android")]
+    {
+        let search_bg = search.clone();
+        let vault = path.clone();
+        std::thread::spawn(move || {
+            let _ = search_bg.rebuild(&vault);
+            log::info!("Android: search index rebuild complete");
+        });
+    }
+    #[cfg(not(target_os = "android"))]
+    {
+        search.rebuild(&path)?;
+    }
     *state.search_index.lock().map_err(|e| e.to_string())? = Some(search);
 
     // Start file watcher
@@ -45,6 +57,12 @@ pub fn get_app_config(state: State<'_, AppState>) -> Result<AppConfig, String> {
     Ok(config.clone())
 }
 
+#[tauri::command]
+pub fn get_pending_open_file(state: State<'_, AppState>) -> Result<Option<String>, String> {
+    let mut pending = state.pending_open_file.lock().map_err(|e| e.to_string())?;
+    Ok(pending.take())
+}
+
 #[tauri::command]
 pub fn set_theme(state: State<'_, AppState>, theme: String) -> Result<(), String> {
     let mut config = state.config.lock().map_err(|e| e.to_string())?;
@@ -77,6 +95,14 @@ pub fn set_font_family(state: State<'_, AppState>, family: String) -> Result<(),
     Ok(())
 }
 
+#[tauri::command]
+pub fn set_line_height(state: State<'_, AppState>, height: f64) -> Result<(), String> {
+    let mut config = state.config.lock().map_err(|e| e.to_string())?;
+    config.line_height = Some(height);
+    save_app_config(&config)?;
+    Ok(())
+}
+
 // ── Notebooks ──
 
 #[tauri::command]
@@ -448,6 +474,41 @@ pub fn save_vault_state(state: State<'_, AppState>, vault_state: VaultState) ->
     operations::save_vault_state(vault_path, &vault_state)
 }
 
+// ── Clipboard ──
+
+/// Read image from system clipboard (bypasses WebKitGTK clipboard bug).
+/// Returns PNG bytes as Vec<u8>, or error if no image on clipboard.
+#[cfg(not(target_os = "android"))]
+#[tauri::command]
+pub fn read_clipboard_image() -> Result<Vec<u8>, String> {
+    let mut clipboard =
+        arboard::Clipboard::new().map_err(|e| format!("Clipboard init failed: {}", e))?;
+    let img = clipboard
+        .get_image()
+        .map_err(|_| "No image on clipboard".to_string())?;
+    // Encode RGBA data to PNG
+    let mut buf: Vec<u8> = Vec::new();
+    {
+        let mut encoder =
+            png::Encoder::new(std::io::Cursor::new(&mut buf), img.width as u32, img.height as u32);
+        encoder.set_color(png::ColorType::Rgba);
+        encoder.set_depth(png::BitDepth::Eight);
+        let mut writer = encoder
+            .write_header()
+            .map_err(|e| format!("PNG header failed: {}", e))?;
+        writer
+            .write_image_data(&img.bytes)
+            .map_err(|e| format!("PNG encode failed: {}", e))?;
+    }
+    Ok(buf)
+}
+
+#[cfg(target_os = "android")]
+#[tauri::command]
+pub fn read_clipboard_image() -> Result<Vec<u8>, String> {
+    Err("Clipboard image reading not supported on Android".to_string())
+}
+
 // ── Attachments ──
 
 #[tauri::command]
@@ -1320,11 +1381,13 @@ pub fn set_ai_settings(
     api_key: Option<String>,
     model: String,
     writing_style: Option<String>,
+    base_url: Option<String>,
 ) -> Result<(), String> {
     let mut config = state.config.lock().map_err(|e| e.to_string())?;
     let key = api_key.filter(|k| !k.is_empty());
     match provider.as_deref() {
         Some("openai") => config.openai_api_key = key,
+        Some("ollama") => config.ollama_base_url = base_url.filter(|u| !u.trim().is_empty()),
         _ => config.ai_api_key = key,
     }
     config.ai_provider = provider;
@@ -1336,27 +1399,36 @@ pub fn set_ai_settings(
 
 #[tauri::command]
 pub fn test_ai_connection(app: AppHandle) -> Result<(), String> {
-    let (provider, api_key, model) = {
+    let (provider, api_key, model, base_url) = {
         let state = app.state::<AppState>();
         let config = state.config.lock().map_err(|e| e.to_string())?;
         let provider = config
             .ai_provider
             .clone()
             .unwrap_or_else(|| "anthropic".to_string());
-        let key = if provider == "openai" {
+        let key = if provider == "ollama" {
+            // Ollama doesn't require an API key
+            Some(String::new())
+        } else if provider == "openai" {
             config.openai_api_key.clone()
         } else {
             config.ai_api_key.clone()
         }
         .ok_or("No API key configured")?;
         let model = config.ai_model.clone();
-        (provider, key, model)
+        let base_url = config.ollama_base_url.clone();
+        (provider, key, model, base_url)
     };
 
     std::thread::spawn(move || {
         use tauri::Emitter;
         let rt = tokio::runtime::Runtime::new().unwrap();
-        let result = rt.block_on(crate::ai::test_connection(&provider, &api_key, &model));
+        let result = rt.block_on(crate::ai::test_connection(
+            &provider,
+            &api_key,
+            &model,
+            base_url.as_deref(),
+        ));
         match result {
             Ok(msg) => {
                 let _ = app.emit(
@@ -1383,14 +1455,16 @@ pub fn ai_ask(
     custom_prompt: Option<String>,
     request_id: String,
 ) -> Result<(), String> {
-    let (provider, api_key, model, writing_style) = {
+    let (provider, api_key, model, writing_style, base_url) = {
         let state = app.state::<AppState>();
         let config = state.config.lock().map_err(|e| e.to_string())?;
         let provider = config
             .ai_provider
             .clone()
             .unwrap_or_else(|| "anthropic".to_string());
-        let key = if provider == "openai" {
+        let key = if provider == "ollama" {
+            Some(String::new())
+        } else if provider == "openai" {
             config.openai_api_key.clone()
         } else {
             config.ai_api_key.clone()
@@ -1398,7 +1472,8 @@ pub fn ai_ask(
         .ok_or("No API key configured. Go to Settings > AI to set up your API key.")?;
         let model = config.ai_model.clone();
         let style = config.ai_writing_style.clone();
-        (provider, key, model, style)
+        let base_url = config.ollama_base_url.clone();
+        (provider, key, model, style, base_url)
     };
 
     let mut system_prompt = "You are a helpful writing assistant inside a note-taking app called HelixNotes. \
@@ -1444,6 +1519,7 @@ pub fn ai_ask(
         system_prompt,
         user_message,
         request_id,
+        base_url,
     );
     Ok(())
 }
@@ -1494,11 +1570,13 @@ pub fn get_install_type() -> String {
     } else if std::path::Path::new("/var/lib/dpkg/info/helix-notes.list").exists() {
         "deb".to_string()
     } else if std::path::Path::new("/var/lib/pacman/local").exists()
-        && std::process::Command::new("pacman")
+        && ["helixnotes", "helixnotes-bin", "helixnotes-appimage-bin"].iter().any(|pkg| {
-            .args(["-Q", "helixnotes"])
+            std::process::Command::new("pacman")
-            .output()
+                .args(["-Q", pkg])
-            .map(|o| o.status.success())
+                .output()
-            .unwrap_or(false)
+                .map(|o| o.status.success())
+                .unwrap_or(false)
+        })
     {
         "aur".to_string()
     } else if std::env::var("APPIMAGE").is_ok() {

src-tauri/src/lib.rs

@@ -9,7 +9,7 @@ mod vault;
 
 use state::AppState;
 #[allow(unused_imports)]
-use tauri::Manager;
+use tauri::{Emitter, Manager};
 
 #[cfg(not(target_os = "android"))]
 use tauri::{
@@ -44,7 +44,7 @@ pub fn run() {
                 )?;
             }
 
-            // On Android, set config dir from Tauri's path resolver
+            // On Android, set config dir from Tauri's path resolver, then reload config
             #[cfg(target_os = "android")]
             {
                 if let Ok(config_dir) = app.path().config_dir() {
@@ -52,6 +52,11 @@ pub fn run() {
                 } else if let Ok(data_dir) = app.path().data_dir() {
                     commands::set_android_config_dir(data_dir);
                 }
+                // Reload config now that the Android config dir is available
+                let reloaded = commands::load_app_config();
+                let _ = app.state::<AppState>().config.lock().map(|mut cfg| {
+                    *cfg = reloaded;
+                });
             }
 
             #[cfg(not(target_os = "android"))]
@@ -59,6 +64,28 @@ pub fn run() {
                 setup_tray(app)?;
             }
 
+            // Check CLI args for a .md file path on initial launch
+            #[cfg(not(target_os = "android"))]
+            {
+                let file_arg = std::env::args().skip(1).find(|a| {
+                    let a = a.trim();
+                    !a.starts_with('-') && a.ends_with(".md")
+                });
+                if let Some(path) = file_arg {
+                    let resolved = if std::path::Path::new(&path).is_absolute() {
+                        std::path::PathBuf::from(&path)
+                    } else {
+                        std::env::current_dir().unwrap_or_default().join(&path)
+                    };
+                    if let Some(resolved_str) = resolved.to_str() {
+                        let app_state = app.state::<AppState>();
+                        let _ = app_state.pending_open_file.lock().map(|mut p| {
+                            *p = Some(resolved_str.to_string());
+                        });
+                    }
+                }
+            }
+
             Ok(())
         })
         .manage(app_state)
@@ -69,6 +96,7 @@ pub fn run() {
             commands::set_accent_color,
             commands::set_font_size,
             commands::set_font_family,
+            commands::set_line_height,
             commands::get_notebooks,
             commands::create_notebook,
             commands::rename_notebook,
@@ -92,6 +120,7 @@ pub fn run() {
             commands::empty_trash,
             commands::load_vault_state,
             commands::save_vault_state,
+            commands::read_clipboard_image,
             commands::save_image,
             commands::save_attachment,
             commands::get_notebook_icons,
@@ -117,28 +146,62 @@ pub fn run() {
             commands::test_ai_connection,
             commands::ai_ask,
             commands::get_install_type,
+            commands::get_pending_open_file,
         ]);
 
     #[cfg(not(target_os = "android"))]
     {
-        builder = builder.plugin(tauri_plugin_single_instance::init(|app, _args, _cwd| {
+        builder = builder.plugin(tauri_plugin_single_instance::init(|app, args, cwd| {
+            // Always show/focus the main window
             if let Some(window) = app.get_webview_window("main") {
                 let _ = window.show();
                 let _ = window.unminimize();
                 let _ = window.set_focus();
             }
+
+            // Extract .md file path from args (args[0] is the binary)
+            let file_path = args.iter().skip(1).find(|arg| {
+                let a = arg.trim();
+                !a.starts_with('-') && a.ends_with(".md")
+            });
+
+            if let Some(path) = file_path {
+                let resolved = if std::path::Path::new(path.as_str()).is_absolute() {
+                    std::path::PathBuf::from(path)
+                } else {
+                    std::path::Path::new(&cwd).join(path)
+                };
+                if let Some(resolved_str) = resolved.to_str() {
+                    let _ = app.emit("open-file", resolved_str.to_string());
+                }
+            }
         }));
 
         builder = builder.plugin(tauri_plugin_updater::Builder::new().build());
 
-        if close_to_tray {
+        builder = builder.on_window_event(move |window, event| {
-            builder = builder.on_window_event(|window, event| {
+            match event {
-                if let tauri::WindowEvent::CloseRequested { api, .. } = event {
+                tauri::WindowEvent::CloseRequested { api, .. } => {
-                    api.prevent_close();
+                    // Only hide to tray for the main window
-                    let _ = window.hide();
+                    if close_to_tray && window.label() == "main" {
+                        api.prevent_close();
+                        let _ = window.hide();
+                    }
                 }
-            });
+                tauri::WindowEvent::Destroyed => {
-        }
+                    // When main window is destroyed, close all note windows
+                    if window.label() == "main" {
+                        let app = window.app_handle();
+                        for (label, win) in app.webview_windows() {
+                            if label.starts_with("note-") {
+                                let _ = win.close();
+                            }
+                        }
+                    }
+                }
+                _ => {}
+            }
+        });
     }
 
     builder

src-tauri/src/search/mod.rs

@@ -77,18 +77,20 @@ impl SearchIndex {
 
         for entry in WalkDir::new(vault_path)
             .into_iter()
-            .filter_map(|e| e.ok())
+            .filter_entry(|e| {
-            .filter(|e| {
                 let p = e.path();
-                p.is_file()
+                !p.starts_with(&hn_dir)
-                    && p.extension().and_then(|x| x.to_str()) == Some("md")
-                    && !p.starts_with(&hn_dir)
                     && !p
                         .file_name()
                         .and_then(|n| n.to_str())
                         .map(|n| n.starts_with('.'))
                         .unwrap_or(false)
             })
+            .filter_map(|e| e.ok())
+            .filter(|e| {
+                e.file_type().is_file()
+                    && e.path().extension().and_then(|x| x.to_str()) == Some("md")
+            })
         {
             if let Ok(raw) = fs::read_to_string(entry.path()) {
                 let filename = entry.file_name().to_string_lossy().to_string();

src-tauri/src/state.rs

@@ -3,12 +3,14 @@ use crate::types::AppConfig;
 use notify::RecommendedWatcher;
 use std::sync::atomic::AtomicBool;
 use std::sync::Mutex;
+use std::sync::Arc;
 
 pub struct AppState {
     pub config: Mutex<AppConfig>,
-    pub search_index: Mutex<Option<SearchIndex>>,
+    pub search_index: Mutex<Option<Arc<SearchIndex>>>,
     pub watcher: Mutex<Option<RecommendedWatcher>>,
     pub importing: AtomicBool,
+    pub pending_open_file: Mutex<Option<String>>,
 }
 
 impl AppState {
@@ -18,6 +20,7 @@ impl AppState {
             search_index: Mutex::new(None),
             watcher: Mutex::new(None),
             importing: AtomicBool::new(false),
+            pending_open_file: Mutex::new(None),
         }
     }
 }

src-tauri/src/types.rs

@@ -54,6 +54,8 @@ pub struct AppConfig {
     #[serde(default)]
     pub font_family: Option<String>,
     #[serde(default)]
+    pub line_height: Option<f64>,
+    #[serde(default)]
     pub compact_notes: bool,
     #[serde(default)]
     pub time_format: String,
@@ -91,6 +93,8 @@ pub struct AppConfig {
     pub ai_api_key: Option<String>,
     #[serde(default)]
     pub openai_api_key: Option<String>,
+    #[serde(default)]
+    pub ollama_base_url: Option<String>,
     #[serde(default = "default_ai_model")]
     pub ai_model: String,
     #[serde(default)]
@@ -130,7 +134,7 @@ fn default_max_versions() -> u32 {
 }
 
 fn default_ai_model() -> String {
-    "claude-sonnet-4-5-20250929".to_string()
+    "claude-sonnet-4-6".to_string()
 }
 
 impl Default for AppConfig {
@@ -142,6 +146,7 @@ impl Default for AppConfig {
             accent_color: None,
             font_size: None,
             font_family: None,
+            line_height: None,
             compact_notes: false,
             time_format: "relative".to_string(),
             gpu_acceleration: true,
@@ -161,7 +166,8 @@ impl Default for AppConfig {
             ai_provider: None,
             ai_api_key: None,
             openai_api_key: None,
-            ai_model: "claude-sonnet-4-5-20250929".to_string(),
+            ollama_base_url: None,
+            ai_model: "claude-sonnet-4-6".to_string(),
             ai_writing_style: None,
             default_view_mode: false,
             show_tray_icon: false,

src-tauri/src/vault/frontmatter.rs

@@ -77,6 +77,29 @@ pub fn parse_note(raw: &str, filename: &str) -> (NoteMeta, String) {
     (meta, content)
 }
 
+/// Ensure the body starts with `# Title` heading for external app compatibility.
+/// If the body already starts with `# Title`, leave it as-is.
+fn ensure_title_heading(body: &str, title: &str) -> String {
+    let trimmed = body.trim_start();
+
+    // Check if body already starts with `# Title`
+    if let Some(rest) = trimmed.strip_prefix("# ") {
+        let first_line_end = rest.find('\n').unwrap_or(rest.len());
+        let heading_text = rest[..first_line_end].trim();
+        if heading_text.eq_ignore_ascii_case(title.trim()) {
+            return body.to_string();
+        }
+    }
+
+    // Don't add heading to empty notes (new/blank notes)
+    if trimmed.is_empty() {
+        return body.to_string();
+    }
+
+    // Prepend `# Title` heading
+    format!("# {}\n\n{}", title, body)
+}
+
 pub fn serialize_frontmatter(meta: &NoteMeta) -> String {
     let tags_str = if meta.tags.is_empty() {
         "[]".to_string()
@@ -104,7 +127,8 @@ pub fn serialize_frontmatter(meta: &NoteMeta) -> String {
 
 pub fn update_note_raw(meta: &NoteMeta, body: &str) -> String {
     let fm = serialize_frontmatter(meta);
-    format!("{}{}", fm, body)
+    let body_with_heading = ensure_title_heading(body, &meta.title);
+    format!("{}{}", fm, body_with_heading)
 }
 
 /// Merge NoteMeta fields into existing frontmatter, preserving unknown YAML keys.
@@ -163,7 +187,8 @@ pub fn merge_frontmatter(original_raw: &str, meta: &NoteMeta, body: &str) -> Str
         Err(_) => return update_note_raw(meta, body),
     };
 
-    format!("---\n{}---\n{}", yaml_str, body)
+    let body_with_heading = ensure_title_heading(body, &meta.title);
+    format!("---\n{}---\n{}", yaml_str, body_with_heading)
 }
 
 fn filename_to_title(filename: &str) -> String {

src-tauri/src/vault/operations.rs

@@ -59,11 +59,11 @@ fn scan_dir_recursive(dir: &Path, vault_root: &str) -> Vec<NotebookEntry> {
         return entries;
     };
 
+    // Collect subdirs (root level only lists directories, note counts come from scan_dir_with_count)
     let mut dirs: Vec<_> = read_dir
         .filter_map(|e| e.ok())
         .filter(|e| {
-            let path = e.path();
+            e.file_type().map(|ft| ft.is_dir()).unwrap_or(false) && !is_hidden(&e.path())
-            path.is_dir() && !is_hidden(&path)
         })
         .collect();
 
@@ -74,6 +74,8 @@ fn scan_dir_recursive(dir: &Path, vault_root: &str) -> Vec<NotebookEntry> {
             .cmp(&b.file_name().to_string_lossy().to_lowercase())
     });
 
+    // Store note_count for the parent directory (used when this is the top-level call)
+    // Each directory pushes its own entry with its own note_count
     for dir_entry in dirs {
         let path = dir_entry.path();
         let name = dir_entry.file_name().to_string_lossy().to_string();
@@ -83,32 +85,71 @@ fn scan_dir_recursive(dir: &Path, vault_root: &str) -> Vec<NotebookEntry> {
             .to_string_lossy()
             .to_string();
 
-        let children = scan_dir_recursive(&path, vault_root);
+        let (children, child_note_count) = scan_dir_with_count(&path, vault_root);
-        let note_count = count_notes_in_dir(&path);
 
         entries.push(NotebookEntry {
             name,
             path: path.to_string_lossy().to_string(),
             relative_path: relative,
             children,
-            note_count,
+            note_count: child_note_count,
         });
     }
 
     entries
 }
 
-fn count_notes_in_dir(dir: &Path) -> usize {
+/// Combined scan: returns (children, note_count) in a single read_dir pass.
-    fs::read_dir(dir)
+fn scan_dir_with_count(dir: &Path, vault_root: &str) -> (Vec<NotebookEntry>, usize) {
-        .map(|rd| {
+    let root = Path::new(vault_root);
-            rd.filter_map(|e| e.ok())
+
-                .filter(|e| {
+    let Ok(read_dir) = fs::read_dir(dir) else {
-                    let path = e.path();
+        return (Vec::new(), 0);
-                    path.is_file() && path.extension().and_then(|x| x.to_str()) == Some("md")
+    };
-                })
+
-                .count()
+    let mut subdirs = Vec::new();
-        })
+    let mut note_count = 0usize;
-        .unwrap_or(0)
+    for entry in read_dir.filter_map(|e| e.ok()) {
+        let ft = match entry.file_type() {
+            Ok(ft) => ft,
+            Err(_) => continue,
+        };
+        if ft.is_dir() && !is_hidden(&entry.path()) {
+            subdirs.push(entry);
+        } else if ft.is_file() && entry.path().extension().and_then(|x| x.to_str()) == Some("md") {
+            note_count += 1;
+        }
+    }
+
+    subdirs.sort_by(|a, b| {
+        a.file_name()
+            .to_string_lossy()
+            .to_lowercase()
+            .cmp(&b.file_name().to_string_lossy().to_lowercase())
+    });
+
+    let mut entries = Vec::new();
+    for dir_entry in subdirs {
+        let path = dir_entry.path();
+        let name = dir_entry.file_name().to_string_lossy().to_string();
+        let relative = path
+            .strip_prefix(root)
+            .unwrap_or(&path)
+            .to_string_lossy()
+            .to_string();
+
+        let (children, child_note_count) = scan_dir_with_count(&path, vault_root);
+
+        entries.push(NotebookEntry {
+            name,
+            path: path.to_string_lossy().to_string(),
+            relative_path: relative,
+            children,
+            note_count: child_note_count,
+        });
+    }
+
+    (entries, note_count)
 }
 
 fn is_hidden(path: &Path) -> bool {
@@ -129,37 +170,88 @@ pub fn scan_notes(vault_path: &str, notebook_path: Option<&str>) -> Result<Vec<N
     let root = Path::new(scan_path);
     let vault_root = Path::new(vault_path);
 
+    log::info!("scan_notes: vault={}, scan={}, exists={}", vault_path, scan_path, root.exists());
+
     if !root.exists() {
         return Err("Path does not exist".to_string());
     }
 
-    let md_files: Vec<PathBuf> = if notebook_path.is_some() {
+    // On Android, use metadata-only scan (no file reads) for fast listing on FUSE
-        // Only direct children for a specific notebook
+    #[cfg(target_os = "android")]
-        fs::read_dir(root)
+    {
-            .map_err(|e| e.to_string())?
+        let mut notes = Vec::new();
-            .filter_map(|e| e.ok())
+        // Log what read_dir sees
-            .map(|e| e.path())
+        if let Ok(rd) = fs::read_dir(root) {
-            .filter(|p| p.is_file() && p.extension().and_then(|x| x.to_str()) == Some("md"))
+            let items: Vec<_> = rd.filter_map(|e| e.ok()).collect();
-            .collect()
+            log::info!("scan_notes: read_dir found {} entries in {:?}", items.len(), root);
-    } else {
+            for (i, entry) in items.iter().enumerate().take(5) {
-        // Recursive for "All Notes"
+                let ft = entry.file_type().map(|ft| if ft.is_file() { "file" } else if ft.is_dir() { "dir" } else { "other" }).unwrap_or("err");
-        WalkDir::new(root)
+                log::info!("  [{}] {:?} type={}", i, entry.file_name(), ft);
-            .into_iter()
+            }
-            .filter_map(|e| e.ok())
+        } else {
-            .filter(|e| !is_hidden(e.path()) && !e.path().starts_with(&helixnotes_dir(vault_path)))
+            log::info!("scan_notes: read_dir FAILED for {:?}", root);
-            .map(|e| e.path().to_path_buf())
+        }
-            .filter(|p| p.is_file() && p.extension().and_then(|x| x.to_str()) == Some("md"))
-            .collect()
-    };
 
-    // Process files in parallel with partial reads
+        if notebook_path.is_some() {
-    let mut notes: Vec<NoteEntry> = md_files
+            if let Ok(rd) = fs::read_dir(root) {
-        .par_iter()
+                for entry in rd.filter_map(|e| e.ok()) {
-        .filter_map(|path| read_note_entry_fast(path, vault_root).ok())
+                    let is_file = entry.file_type().map(|ft| ft.is_file()).unwrap_or(false);
-        .collect();
+                    if is_file && entry.path().extension().and_then(|x| x.to_str()) == Some("md") {
+                        if let Ok(note) = read_note_entry_metadata_only(&entry.path(), vault_root) {
+                            notes.push(note);
+                        }
+                    }
+                }
+            }
+        } else {
+            let hn_dir = helixnotes_dir(vault_path);
+            for entry in WalkDir::new(root)
+                .into_iter()
+                // filter_entry skips descending into hidden dirs (unlike filter)
+                .filter_entry(|e| !is_hidden(e.path()) && !e.path().starts_with(&hn_dir))
+                .filter_map(|e| e.ok())
+                .filter(|e| {
+                    e.file_type().is_file()
+                        && e.path().extension().and_then(|x| x.to_str()) == Some("md")
+                })
+            {
+                if let Ok(note) = read_note_entry_metadata_only(entry.path(), vault_root) {
+                    notes.push(note);
+                }
+            }
+        }
+        log::info!("scan_notes: Android scan found {} notes", notes.len());
+        notes.sort_by(|a, b| b.meta.modified.cmp(&a.meta.modified));
+        return Ok(notes);
+    }
 
-    notes.sort_by(|a, b| b.meta.modified.cmp(&a.meta.modified));
+    #[cfg(not(target_os = "android"))]
-    Ok(notes)
+    {
+        let md_files: Vec<PathBuf> = if notebook_path.is_some() {
+            fs::read_dir(root)
+                .map_err(|e| e.to_string())?
+                .filter_map(|e| e.ok())
+                .map(|e| e.path())
+                .filter(|p| p.is_file() && p.extension().and_then(|x| x.to_str()) == Some("md"))
+                .collect()
+        } else {
+            WalkDir::new(root)
+                .into_iter()
+                .filter_entry(|e| !is_hidden(e.path()) && !e.path().starts_with(&helixnotes_dir(vault_path)))
+                .filter_map(|e| e.ok())
+                .map(|e| e.path().to_path_buf())
+                .filter(|p| p.is_file() && p.extension().and_then(|x| x.to_str()) == Some("md"))
+                .collect()
+        };
+
+        let mut notes: Vec<NoteEntry> = md_files
+            .par_iter()
+            .filter_map(|path| read_note_entry_fast(path, vault_root).ok())
+            .collect();
+
+        notes.sort_by(|a, b| b.meta.modified.cmp(&a.meta.modified));
+        Ok(notes)
+    }
 }
 
 fn read_note_entry(path: &Path, vault_root: &Path) -> Result<NoteEntry, String> {
@@ -167,6 +259,49 @@ fn read_note_entry(path: &Path, vault_root: &Path) -> Result<NoteEntry, String>
     read_note_entry_from_str(&raw, path, vault_root)
 }
 
+/// Android-only: reads just the frontmatter (first 2KB) for tags/title/pinned,
+/// uses filesystem timestamps for dates. No preview text.
+#[cfg(target_os = "android")]
+fn read_note_entry_metadata_only(path: &Path, vault_root: &Path) -> Result<NoteEntry, String> {
+    // Read first 2KB — enough for frontmatter with tags, title, pinned
+    let mut file = fs::File::open(path).map_err(|e| e.to_string())?;
+    let mut buf = vec![0u8; 2048];
+    let bytes_read = file.read(&mut buf).map_err(|e| e.to_string())?;
+    buf.truncate(bytes_read);
+    let raw = String::from_utf8_lossy(&buf);
+
+    let filename = path
+        .file_name()
+        .unwrap_or_default()
+        .to_string_lossy()
+        .to_string();
+
+    let (mut meta, _content) = frontmatter::parse_note(&raw, &filename);
+
+    // Always use filesystem timestamps on Android (faster than parsing date strings)
+    if let Ok(fs_meta) = fs::metadata(path) {
+        if let Ok(m) = fs_meta.modified() {
+            meta.modified = m.into();
+        }
+        if let Ok(c) = fs_meta.created() {
+            meta.created = c.into();
+        }
+    }
+
+    let relative = path
+        .strip_prefix(vault_root)
+        .unwrap_or(path)
+        .to_string_lossy()
+        .to_string();
+
+    Ok(NoteEntry {
+        path: path.to_string_lossy().to_string(),
+        relative_path: relative,
+        meta,
+        preview: String::new(),
+    })
+}
+
 /// Fast version: reads only the first ~2KB of the file (enough for frontmatter + preview).
 fn read_note_entry_fast(path: &Path, vault_root: &Path) -> Result<NoteEntry, String> {
     let mut file = fs::File::open(path).map_err(|e| e.to_string())?;

src-tauri/tauri.conf.json

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

src/lib/api.ts

@@ -38,6 +38,10 @@ export async function setFontFamily(family: string): Promise<void> {
   return invoke("set_font_family", { family });
 }
 
+export async function setLineHeight(height: number): Promise<void> {
+  return invoke("set_line_height", { height });
+}
+
 export async function getNotebooks(): Promise<NotebookEntry[]> {
   return invoke("get_notebooks");
 }
@@ -160,6 +164,10 @@ export async function saveVaultState(vaultState: VaultState): Promise<void> {
   return invoke("save_vault_state", { vaultState });
 }
 
+export async function readClipboardImage(): Promise<number[]> {
+  return invoke("read_clipboard_image");
+}
+
 export async function saveImage(name: string, data: number[]): Promise<string> {
   return invoke("save_image", { name, data });
 }
@@ -310,8 +318,9 @@ export async function setAiSettings(
   apiKey: string | null,
   model: string,
   writingStyle: string | null,
+  baseUrl: string | null = null,
 ): Promise<void> {
-  return invoke("set_ai_settings", { provider, apiKey, model, writingStyle });
+  return invoke("set_ai_settings", { provider, apiKey, model, writingStyle, baseUrl });
 }
 
 export async function testAiConnection(): Promise<void> {
@@ -330,3 +339,7 @@ export async function aiAsk(
 export async function getInstallType(): Promise<string> {
   return invoke("get_install_type");
 }
+
+export async function getPendingOpenFile(): Promise<string | null> {
+  return invoke("get_pending_open_file");
+}

src/lib/components/AppLayout.svelte

@@ -28,14 +28,21 @@
 		showInfo,
 		showSettings,
 		sourceMode,
-		mobileView
+		mobileView,
+		appConfig,
+		quickAccessPaths,
+		tags,
+		notes,
+		updateAvailable as globalUpdateAvailable,
+		settingsTab
 	} from '$lib/stores/app';
 
 	const appWindow = getCurrentWindow();
 	const isMac = navigator.platform.startsWith('Mac');
 	const isMobile = /android|ios/i.test(navigator.userAgent);
-	import { loadVaultState, saveVaultState, readNote, createDailyNote, createBackup } from '$lib/api';
+	import { loadVaultState, saveVaultState, readNote, createDailyNote, createBackup, getPendingOpenFile, addQuickAccess, removeQuickAccess, getQuickAccess } from '$lib/api';
 	import { debounce } from '$lib/utils/debounce';
+	import { openNoteWindow } from '$lib/utils/window';
 	import { get } from 'svelte/store';
 	import type { VaultState, FileEvent } from '$lib/types';
 
@@ -43,7 +50,13 @@
 	let noteList: NoteList;
 	let editor: Editor;
 	let unlistenFileChange: (() => void) | null = null;
+	let unlistenOpenFile: (() => void) | null = null;
+
+	// Mobile editor header helpers
+	let noteRelativePath = $derived($activeNotePath && $appConfig?.active_vault ? $activeNotePath.replace($appConfig.active_vault + '/', '') : '');
+	let isQuickAccess = $derived(noteRelativePath ? $quickAccessPaths.includes(noteRelativePath) : false);
 	let backupInterval: ReturnType<typeof setInterval> | null = null;
+
 	let navigatingFromHistory = false;
 	let noteHistory: string[] = [];
 	let noteHistoryIndex = -1;
@@ -95,6 +108,7 @@
 		noteHistoryIndex = newIndex;
 		navigatingFromHistory = true;
 		readNote(path).then((content) => {
+			editor?.flushSave();
 			$activeNote = content;
 			$activeNotePath = path;
 			$editorDirty = false;
@@ -104,9 +118,26 @@
 		});
 	}
 
+	async function handleOpenFile(filePath: string) {
+		if (!filePath || !filePath.endsWith('.md')) return;
+		const config = get(appConfig);
+		const vaultRoot = config?.active_vault;
+		if (!vaultRoot || !filePath.startsWith(vaultRoot)) return;
+		try {
+			const content = await readNote(filePath);
+			editor?.flushSave();
+			$activeNote = content;
+			$activeNotePath = filePath;
+			$editorDirty = false;
+			editor?.loadNote(filePath, content.content);
+		} catch (e) {
+			console.error('Failed to open file:', e);
+		}
+	}
+
 	const persistState = debounce(async () => {
 		const state: VaultState = {
-			last_open_note: null,
+			last_open_note: $activeNotePath,
 			sidebar_width: $sidebarWidth,
 			notelist_width: $notelistWidth,
 			sidebar_collapsed: $sidebarCollapsed,
@@ -133,12 +164,11 @@
 	}
 
 	function handleViewChanged() {
-		noteList?.refresh(true);
+		noteList?.refresh();
 		if (isMobile) $mobileView = 'notelist';
 	}
 
 	async function createAndFocusNote() {
-		if (isMobile && $mobileView !== 'notelist') $mobileView = 'notelist';
 		await noteList?.handleCreateNote();
 		editor?.focusTitle();
 		if (isMobile) $mobileView = 'editor';
@@ -148,6 +178,7 @@
 		try {
 			const entry = await createDailyNote();
 			const content = await readNote(entry.path);
+			editor?.flushSave();
 			$activeNote = content;
 			$activeNotePath = entry.path;
 			$editorDirty = false;
@@ -160,6 +191,38 @@
 		}
 	}
 
+	// Android back gesture / hardware back button support
+	let mobileNavFromPopstate = false;
+
+	if (isMobile) {
+		// Seed initial history state
+		history.replaceState({ mobileView: 'sidebar' }, '');
+
+		// When mobileView changes forward, push browser history so Android back gesture works
+		$effect(() => {
+			const view = $mobileView;
+			if (mobileNavFromPopstate) {
+				mobileNavFromPopstate = false;
+				return;
+			}
+			// Replace state to track current view
+			history.pushState({ mobileView: view }, '');
+		});
+
+		window.addEventListener('popstate', (e) => {
+			const currentView = $mobileView;
+			if (currentView === 'sidebar') {
+				// Already at root — let Android handle it (exit app)
+				return;
+			}
+			mobileNavFromPopstate = true;
+			if (currentView === 'editor') $mobileView = 'notelist';
+			else if (currentView === 'notelist') $mobileView = 'sidebar';
+			// Push state again so next back gesture also works
+			history.pushState({ mobileView: $mobileView }, '');
+		});
+	}
+
 	function mobileBack() {
 		if ($mobileView === 'editor') $mobileView = 'notelist';
 		else if ($mobileView === 'notelist') $mobileView = 'sidebar';
@@ -219,6 +282,12 @@
 			e.preventDefault();
 			$sourceMode = !$sourceMode;
 		}
+		if (mod && e.shiftKey && e.key === 'W') {
+			e.preventDefault();
+			if ($activeNotePath && $activeNote) {
+				openNoteWindow($activeNotePath, $activeNote.meta.title);
+			}
+		}
 		if (e.key === 'Escape') {
 			if ($showSettings) $showSettings = false;
 			else if ($showInfo) $showInfo = false;
@@ -245,29 +314,96 @@
 		persistState();
 	});
 
+	$effect(() => {
+		$activeNotePath;
+		persistState();
+	});
+
 	onMount(async () => {
+		let lastNotePath: string | null = null;
 		try {
 			const state = await loadVaultState();
 			$sidebarWidth = state.sidebar_width;
 			$notelistWidth = state.notelist_width;
 			$sidebarCollapsed = state.sidebar_collapsed;
 			$collapsedNotebooks = state.collapsed_notebooks ?? [];
+			lastNotePath = state.last_open_note ?? null;
 		} catch (_) {}
 
+		// On mobile, prefetch last-opened note so first tap is instant
+		let prefetchPromise: Promise<any> | null = null;
+		if (isMobile && lastNotePath) {
+			prefetchPromise = readNote(lastNotePath).catch(() => null);
+		}
+
 		applyTheme($theme);
 
 		window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => {
 			if ($theme === 'system') applyTheme('system');
 		});
 
-		await sidebar?.refresh();
+		// Run sidebar and note list refresh in parallel
-		await noteList?.refresh();
+		await Promise.all([sidebar?.refresh(), noteList?.refresh()]);
 
-		unlistenFileChange = await listen<FileEvent>('file-changed', async () => {
+		// On mobile, derive tags from the scanned notes (avoids a separate full-scan Rust call)
-			await sidebar?.refresh();
+		if (isMobile) {
-			await noteList?.refresh(true);
+			const tagMap = new Map<string, number>();
+			for (const note of $notes) {
+				for (const tag of note.meta.tags) {
+					tagMap.set(tag, (tagMap.get(tag) ?? 0) + 1);
+				}
+			}
+			$tags = Array.from(tagMap.entries()).sort((a, b) => a[0].localeCompare(b[0]));
+		}
+
+		// On mobile, auto-load the last-opened note so it's ready when the user taps it
+		if (isMobile && prefetchPromise) {
+			prefetchPromise.then((noteContent) => {
+				if (noteContent && lastNotePath && !$activeNotePath) {
+					$activeNote = noteContent;
+					$activeNotePath = lastNotePath;
+					$editorDirty = false;
+					editor?.loadNote(lastNotePath, noteContent.content);
+				}
+			});
+		}
+
+		if (isMobile) {
+			// Mobile: debounce file-changed heavily and skip when actively editing
+			// (our own saves trigger the watcher, causing expensive refreshes on FUSE)
+			const debouncedRefresh = debounce(async () => {
+				if (get(editorDirty)) return; // user is still typing, skip
+				await Promise.all([sidebar?.refresh(), noteList?.refresh(true)]);
+				// Re-derive tags from refreshed notes
+				const tagMap = new Map<string, number>();
+				for (const note of get(notes)) {
+					for (const tag of note.meta.tags) {
+						tagMap.set(tag, (tagMap.get(tag) ?? 0) + 1);
+					}
+				}
+				tags.set(Array.from(tagMap.entries()).sort((a, b) => a[0].localeCompare(b[0])));
+			}, 3000);
+			unlistenFileChange = await listen<FileEvent>('file-changed', () => {
+				debouncedRefresh();
+			});
+		} else {
+			unlistenFileChange = await listen<FileEvent>('file-changed', async () => {
+				await sidebar?.refresh();
+				await noteList?.refresh(true);
+			});
+		}
+
+		// Listen for file open events (from single-instance or OS file associations)
+		unlistenOpenFile = await listen<string>('open-file', async (event) => {
+			await handleOpenFile(event.payload);
 		});
 
+		// Check for pending file from first-launch CLI args
+		try {
+			const pending = await getPendingOpenFile();
+			if (pending) await handleOpenFile(pending);
+		} catch (_) {}
+
 		// Scheduled backup: check on startup and every 5 minutes
 		checkScheduledBackup();
 		backupInterval = setInterval(checkScheduledBackup, 5 * 60 * 1000);
@@ -275,6 +411,7 @@
 
 	onDestroy(() => {
 		unlistenFileChange?.();
+		unlistenOpenFile?.();
 		if (backupInterval) clearInterval(backupInterval);
 	});
 </script>
@@ -303,18 +440,23 @@
 					</svg>
 				</div>
 			{/if}
-			<span class="mobile-header-title">
+			{#if $mobileView !== 'editor'}
-				{#if $mobileView === 'sidebar'}
+				<span class="mobile-header-title">
-					HelixNotes
+					{#if $mobileView === 'sidebar'}
-				{:else if $mobileView === 'notelist'}
+						HelixNotes
-					{$activeNotebook?.name || 'All Notes'}
+					{:else}
-				{:else}
+						{$activeNotebook?.name || 'All Notes'}
-					{$activeNote?.meta.title || 'Untitled'}
+					{/if}
+				</span>
+				{#if $globalUpdateAvailable && $mobileView === 'sidebar'}
+					<button class="mobile-update-badge" onclick={() => { $settingsTab = 'updates'; $showSettings = true; }}>
+						v{$globalUpdateAvailable.version}
+					</button>
 				{/if}
-			</span>
+			{/if}
 			<div class="mobile-header-actions">
 				{#if $mobileView === 'editor'}
-					<button class="mobile-header-btn" class:active={$readOnly} onclick={() => ($readOnly = !$readOnly)}>
+					<button class="mobile-header-btn" class:active={$readOnly} onclick={() => ($readOnly = !$readOnly)} title={$readOnly ? 'Edit' : 'View'}>
 						<svg width="18" height="18" 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" />
@@ -325,26 +467,76 @@
 							{/if}
 						</svg>
 					</button>
+					<button class="mobile-header-btn" class:active={$sourceMode} onclick={() => ($sourceMode = !$sourceMode)} title={$sourceMode ? 'Rich Editor' : 'Source Mode'}>
+						<svg width="18" height="18" 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>
+					</button>
+					<button class="mobile-header-btn" onclick={() => editor?.openNoteSearch()} title="Find in note">
+						<svg width="18" height="18" 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="mobile-header-btn" class:active={$activeNote?.meta.pinned} onclick={() => { if ($activeNote) { $activeNote.meta.pinned = !$activeNote.meta.pinned; $editorDirty = true; } }} title="Pin">
+						<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+							<path d="M12 17v5"/><path d="M9 2h6l-1 7h4l-2 4H8l-2-4h4L9 2z"/>
+						</svg>
+					</button>
+					<button class="mobile-header-btn" class:active={isQuickAccess} onclick={async () => {
+						if (!noteRelativePath) return;
+						try {
+							if (isQuickAccess) { await removeQuickAccess(noteRelativePath); } else { await addQuickAccess(noteRelativePath); }
+							$quickAccessPaths = (await getQuickAccess()).map(n => n.relative_path);
+						} catch (e) { console.error('Quick access toggle failed:', e); }
+					}} title="Quick Access">
+						<svg width="18" height="18" viewBox="0 0 24 24" fill={isQuickAccess ? 'currentColor' : 'none'} stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+							<polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2" />
+						</svg>
+					</button>
+					<button class="mobile-header-btn" onclick={() => editor?.toggleOutlinePanel()} title="Outline">
+						<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+							<line x1="4" y1="6" x2="20" y2="6"/><line x1="8" y1="12" x2="20" y2="12"/><line x1="8" y1="18" x2="20" y2="18"/><circle cx="4" cy="12" r="1" fill="currentColor"/><circle cx="4" cy="18" r="1" fill="currentColor"/>
+						</svg>
+					</button>
+					<button class="mobile-header-btn" onclick={() => editor?.toggleHistoryPanel()} title="History">
+						<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+							<circle cx="12" cy="12" r="10"/><polyline points="12 6 12 12 16 14"/>
+						</svg>
+					</button>
+					{#if $appConfig?.ai_provider && ($appConfig?.ai_provider === 'ollama' || $appConfig?.ai_api_key || $appConfig?.openai_api_key)}
+					<button class="mobile-header-btn" onclick={() => editor?.triggerAiMenu()} title="AI Actions">
+						<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+							<path d="M12 8V4l-2-2"/><rect x="4" y="8" width="16" height="12" rx="2"/><path d="M2 14h2"/><path d="M20 14h2"/><path d="M9 13v2"/><path d="M15 13v2"/>
+						</svg>
+					</button>
+					{/if}
 				{:else}
-					<button class="mobile-header-btn" onclick={createAndFocusNote}>
+					<button class="mobile-header-btn" onclick={() => ($showSearch = true)} title="Search">
-						<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round">
+						<svg width="18" height="18" 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="mobile-header-btn" onclick={createAndFocusNote} title="New Note">
+						<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round">
 							<path d="M12 5v14M5 12h14" />
 						</svg>
 					</button>
+					<button class="mobile-header-btn" onclick={handleDailyNote} title="Daily Note">
+						<svg width="18" height="18" 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="mobile-header-btn" onclick={() => ($showSettings = true)} title="Settings">
+						<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+							<circle cx="12" cy="12" r="3" />
+							<path d="M19.4 15a1.65 1.65 0 00.33 1.82l.06.06a2 2 0 01-2.83 2.83l-.06-.06a1.65 1.65 0 00-1.82-.33 1.65 1.65 0 00-1 1.51V21a2 2 0 01-4 0v-.09A1.65 1.65 0 009 19.4a1.65 1.65 0 00-1.82.33l-.06.06a2 2 0 01-2.83-2.83l.06-.06A1.65 1.65 0 004.68 15a1.65 1.65 0 00-1.51-1H3a2 2 0 010-4h.09A1.65 1.65 0 004.6 9a1.65 1.65 0 00-.33-1.82l-.06-.06a2 2 0 012.83-2.83l.06.06A1.65 1.65 0 009 4.68a1.65 1.65 0 001-1.51V3a2 2 0 014 0v.09a1.65 1.65 0 001 1.51 1.65 1.65 0 001.82-.33l.06-.06a2 2 0 012.83 2.83l-.06.06A1.65 1.65 0 0019.4 9a1.65 1.65 0 001.51 1H21a2 2 0 010 4h-.09a1.65 1.65 0 00-1.51 1z" />
+						</svg>
+					</button>
 				{/if}
-				<button class="mobile-header-btn" onclick={() => ($showInfo = true)} title="Info">
-					<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-						<circle cx="12" cy="12" r="10" />
-						<line x1="12" y1="16" x2="12" y2="12" />
-						<line x1="12" y1="8" x2="12.01" y2="8" />
-					</svg>
-				</button>
-				<button class="mobile-header-btn" onclick={() => ($showSettings = true)} title="Settings">
-					<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-						<circle cx="12" cy="12" r="3" />
-						<path d="M19.4 15a1.65 1.65 0 00.33 1.82l.06.06a2 2 0 01-2.83 2.83l-.06-.06a1.65 1.65 0 00-1.82-.33 1.65 1.65 0 00-1 1.51V21a2 2 0 01-4 0v-.09A1.65 1.65 0 009 19.4a1.65 1.65 0 00-1.82.33l-.06.06a2 2 0 01-2.83-2.83l.06-.06A1.65 1.65 0 004.68 15a1.65 1.65 0 00-1.51-1H3a2 2 0 010-4h.09A1.65 1.65 0 004.6 9a1.65 1.65 0 00-.33-1.82l-.06-.06a2 2 0 012.83-2.83l.06.06A1.65 1.65 0 009 4.68a1.65 1.65 0 001-1.51V3a2 2 0 014 0v.09a1.65 1.65 0 001 1.51 1.65 1.65 0 001.82-.33l.06-.06a2 2 0 012.83 2.83l-.06.06A1.65 1.65 0 0019.4 9a1.65 1.65 0 001.51 1H21a2 2 0 010 4h-.09a1.65 1.65 0 00-1.51 1z" />
-					</svg>
-				</button>
 			</div>
 		</div>
 
@@ -354,47 +546,13 @@
 				<Sidebar bind:this={sidebar} onViewChanged={handleViewChanged} />
 			</div>
 			<div class="mobile-panel" class:active={$mobileView === 'notelist'}>
-				<NoteList bind:this={noteList} onNoteSelected={handleNoteSelected} onNoteMoved={() => sidebar?.refresh()} />
+				<NoteList bind:this={noteList} onNoteSelected={handleNoteSelected} onBeforeNoteSwitch={() => editor?.flushSave()} onNoteMoved={() => sidebar?.refresh()} />
 			</div>
 			<div class="mobile-panel" class:active={$mobileView === 'editor'}>
 				<Editor bind:this={editor} />
 			</div>
 		</div>
 
-		<!-- Mobile Bottom Nav -->
-		{#if $mobileView !== 'editor'}
-		<div class="mobile-bottom-nav">
-			<button class="mobile-nav-item" class:active={$mobileView === 'sidebar'} onclick={() => ($mobileView = 'sidebar')}>
-				<svg width="22" height="22" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" 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" />
-				</svg>
-				<span>Notebooks</span>
-			</button>
-			<button class="mobile-nav-item" onclick={() => $showSearch = true}>
-				<svg width="22" height="22" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" 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>
-				<span>Search</span>
-			</button>
-			<button class="mobile-nav-item" onclick={handleDailyNote}>
-				<svg width="22" height="22" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" 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>
-				<span>Daily</span>
-			</button>
-			<button class="mobile-nav-item" onclick={() => ($showSettings = true)}>
-				<svg width="22" height="22" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round">
-					<circle cx="12" cy="12" r="3" />
-					<path d="M19.4 15a1.65 1.65 0 00.33 1.82l.06.06a2 2 0 01-2.83 2.83l-.06-.06a1.65 1.65 0 00-1.82-.33 1.65 1.65 0 00-1 1.51V21a2 2 0 01-4 0v-.09A1.65 1.65 0 009 19.4a1.65 1.65 0 00-1.82.33l-.06.06a2 2 0 01-2.83-2.83l.06-.06A1.65 1.65 0 004.68 15a1.65 1.65 0 00-1.51-1H3a2 2 0 010-4h.09A1.65 1.65 0 004.6 9a1.65 1.65 0 00-.33-1.82l-.06-.06a2 2 0 012.83-2.83l.06.06A1.65 1.65 0 009 4.68a1.65 1.65 0 001-1.51V3a2 2 0 014 0v.09a1.65 1.65 0 001 1.51 1.65 1.65 0 001.82-.33l.06-.06a2 2 0 012.83 2.83l-.06.06A1.65 1.65 0 0019.4 9a1.65 1.65 0 001.51 1H21a2 2 0 010 4h-.09a1.65 1.65 0 00-1.51 1z" />
-				</svg>
-				<span>Settings</span>
-			</button>
-		</div>
-		{/if}
 	</div>
 {:else}
 	<!-- ═══ DESKTOP LAYOUT ═══ -->
@@ -448,7 +606,7 @@
 				{/if}
 
 				<div class="notelist-panel" style="width: {$notelistWidth}px">
-					<NoteList bind:this={noteList} onNoteSelected={handleNoteSelected} onNoteMoved={() => sidebar?.refresh()} />
+					<NoteList bind:this={noteList} onNoteSelected={handleNoteSelected} onBeforeNoteSwitch={() => editor?.flushSave()} onNoteMoved={() => sidebar?.refresh()} />
 				</div>
 
 				<ResizeHandle onResize={handleNotelistResize} />
@@ -597,10 +755,25 @@
 		padding: 0 4px;
 	}
 
+	.mobile-update-badge {
+		background: var(--accent);
+		color: white;
+		border: none;
+		border-radius: 10px;
+		padding: 2px 8px;
+		font-size: 11px;
+		font-weight: 600;
+		font-family: inherit;
+		cursor: pointer;
+		white-space: nowrap;
+		flex-shrink: 0;
+	}
+
 	.mobile-header-actions {
 		display: flex;
 		align-items: center;
 		gap: 2px;
+		margin-left: auto;
 	}
 
 	.mobile-header-btn {
@@ -645,38 +818,4 @@
 		pointer-events: auto;
 	}
 
-	.mobile-bottom-nav {
-		display: flex;
-		align-items: center;
-		justify-content: space-around;
-		height: 56px;
-		background: var(--bg-secondary);
-		border-top: 1px solid var(--border-color);
-		flex-shrink: 0;
-		padding-bottom: env(safe-area-inset-bottom);
-	}
-
-	.mobile-nav-item {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		gap: 2px;
-		padding: 6px 16px;
-		border: none;
-		background: none;
-		color: var(--text-tertiary);
-		font-size: 10px;
-		font-weight: 500;
-		cursor: pointer;
-		border-radius: 8px;
-		transition: color 0.15s;
-	}
-
-	.mobile-nav-item:active {
-		background: var(--bg-hover);
-	}
-
-	.mobile-nav-item.active {
-		color: var(--accent);
-	}
 </style>

src/lib/components/InfoPanel.svelte

@@ -6,9 +6,10 @@
 	import type { VaultStats } from '$lib/types';
 
 	const modKey = navigator.platform.startsWith('Mac') ? '⌘' : 'Ctrl';
+	const isMobile = /android|ios/i.test(navigator.userAgent);
 
 	let stats = $state<VaultStats | null>(null);
-	let activeTab = $state<'about' | 'shortcuts'>('shortcuts');
+	let activeTab = $state<'about' | 'shortcuts'>(isMobile ? 'about' : 'shortcuts');
 	let appVersion = $state('...');
 
 	getVersion().then(v => appVersion = v).catch(() => appVersion = '0.0.0');
@@ -54,10 +55,12 @@
 			</div>
 
 			<div class="info-body">
+				{#if !isMobile}
 				<div class="info-tabs">
 					<button class="info-tab" class:active={activeTab === 'shortcuts'} onclick={() => activeTab = 'shortcuts'}>Shortcuts</button>
 					<button class="info-tab" class:active={activeTab === 'about'} onclick={() => activeTab = 'about'}>About</button>
 				</div>
+				{/if}
 
 				{#if activeTab === 'about'}
 					<div class="info-logo">
@@ -127,6 +130,7 @@
 						<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">Toggle source mode</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>Shift</kbd>+<kbd>M</kbd></span></div>
+						<div class="shortcut-row"><span class="shortcut-desc">Open note in new window</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>Shift</kbd>+<kbd>W</kbd></span></div>
 						<div class="shortcut-row"><span class="shortcut-desc">Exit focus mode</span><span class="shortcut-keys"><kbd>Esc</kbd></span></div>
 
 						<h4 class="shortcuts-group-title">Editor Commands</h4>
@@ -397,4 +401,19 @@
 		color: var(--text-tertiary);
 		line-height: 1.4;
 	}
+
+	/* Mobile */
+	@media (max-width: 600px) {
+		.info-panel {
+			width: 100%;
+			height: 100%;
+			max-height: 100%;
+			border-radius: 0;
+			border: none;
+		}
+
+		.info-header {
+			padding-top: calc(env(safe-area-inset-top, 12px) + 12px);
+		}
+	}
 </style>

src/lib/components/NoteList.svelte

@@ -12,7 +12,8 @@
 		quickAccessPaths,
 		appConfig,
 		notebooks,
-		tags
+		tags,
+		mobileView
 	} from '$lib/stores/app';
 	import {
 		getNotes,
@@ -32,16 +33,37 @@
 		getAllTags
 	} from '$lib/api';
 	import { formatRelativeTime } from '$lib/utils/time';
+	import { openNoteWindow } from '$lib/utils/window';
 	import type { NoteEntry, SortMode } from '$lib/types';
 
-	let { onNoteSelected = (_path: string, _content: string) => {}, onNoteMoved = () => {} }: {
+	let { onNoteSelected = (_path: string, _content: string) => {}, onNoteMoved = () => {}, onBeforeNoteSwitch = () => {} }: {
 		onNoteSelected?: (path: string, content: string) => void;
 		onNoteMoved?: () => void;
+		onBeforeNoteSwitch?: () => void;
 	} = $props();
 
 	const modKey = navigator.platform.startsWith('Mac') ? '⌘' : 'Ctrl';
 	const isMobile = /android|ios/i.test(navigator.userAgent);
 
+	/** Derive tags from current $notes store (avoids re-scanning files on mobile) */
+	function deriveTagsFromNotes() {
+		const tagMap = new Map<string, number>();
+		for (const note of $notes) {
+			for (const tag of note.meta.tags) {
+				tagMap.set(tag, (tagMap.get(tag) ?? 0) + 1);
+			}
+		}
+		$tags = Array.from(tagMap.entries()).sort((a, b) => a[0].localeCompare(b[0]));
+	}
+
+	async function refreshTags() {
+		if (isMobile) {
+			deriveTagsFromNotes();
+		} else {
+			await refreshTags();
+		}
+	}
+
 	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);
@@ -167,7 +189,12 @@
 			} else if ($viewMode === 'quickaccess') {
 				$notes = await getQuickAccess();
 			} else if ($viewMode === 'tag' && $activeTag) {
-				const all = await getNotes(null);
+				// Reuse cached "all" notes if available, otherwise fetch and cache them
+				let all = noteCache.get('all');
+				if (!all) {
+					all = await getNotes(null);
+					noteCache.set('all', all);
+				}
 				$notes = all.filter((n) => n.meta.tags.includes($activeTag!));
 			} else {
 				const nbPath = $viewMode === 'notebook' ? $activeNotebook?.path ?? null : null;
@@ -180,9 +207,13 @@
 	}
 
 	async function selectNote(note: NoteEntry) {
-		if ($activeNotePath === note.path) return;
+		if ($activeNotePath === note.path) {
+			if (isMobile) $mobileView = 'editor';
+			return;
+		}
 		try {
 			const content = await readNote(note.path);
+			onBeforeNoteSwitch();
 			$activeNote = content;
 			$activeNotePath = note.path;
 			$editorDirty = false;
@@ -321,7 +352,7 @@
 			if ($activeNotePath === note.path && $activeNote) {
 				$activeNote = { ...$activeNote, meta: { ...$activeNote.meta, tags: newTags } };
 			}
-			$tags = await getAllTags();
+			await refreshTags();
 		} catch (e) {
 			console.error('Failed to save tags:', e);
 		}
@@ -357,7 +388,7 @@
 					}
 				}
 			}
-			$tags = await getAllTags();
+			await refreshTags();
 		} catch (e) {
 			console.error('Failed to add tag to batch:', e);
 		}
@@ -379,7 +410,7 @@
 					}
 				}
 			}
-			$tags = await getAllTags();
+			await refreshTags();
 		} catch (e) {
 			console.error('Failed to remove tag from batch:', e);
 		}
@@ -446,9 +477,18 @@
 		}
 	}
 
+	function clampMenu(x: number, y: number, menuWidth = 220, menuHeight = 400): { x: number; y: number } {
+		if (x + menuWidth > window.innerWidth) x = window.innerWidth - menuWidth - 8;
+		if (y + menuHeight > window.innerHeight) y = window.innerHeight - menuHeight - 8;
+		if (x < 4) x = 4;
+		if (y < 4) y = 4;
+		return { x, y };
+	}
+
 	function onContextMenu(e: MouseEvent, note: NoteEntry) {
 		e.preventDefault();
-		contextMenu = { x: e.clientX, y: e.clientY, note };
+		const { x, y } = clampMenu(e.clientX, e.clientY);
+		contextMenu = { x, y, note };
 	}
 
 	function startRename(note: NoteEntry) {
@@ -688,16 +728,17 @@
 					onclick={(e) => handleNoteClick(e, note)}
 					oncontextmenu={(e) => {
 						e.preventDefault();
+						const pos = clampMenu(e.clientX, e.clientY);
 						// If multi-selected and right-clicking a selected note, show batch menu
 						if (selectedPaths.size > 1 && selectedPaths.has(note.path)) {
-							contextMenu = { x: e.clientX, y: e.clientY, note };
+							contextMenu = { x: pos.x, y: pos.y, note };
 							return;
 						}
 						// Otherwise clear selection and show single menu
 						if (selectedPaths.size > 0 && !selectedPaths.has(note.path)) {
 							clearSelection();
 						}
-						contextMenu = { x: e.clientX, y: e.clientY, note };
+						contextMenu = { x: pos.x, y: pos.y, note };
 					}}
 					draggable="true"
 					ondragstart={(e) => {
@@ -936,6 +977,12 @@
 					Add to Quick Access
 				</button>
 			{/if}
+			<button onclick={() => { const n = contextMenu!.note; contextMenu = null; openNoteWindow(n.path, n.meta.title); }}>
+				<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="M18 13v6a2 2 0 01-2 2H5a2 2 0 01-2-2V8a2 2 0 012-2h6"/><polyline points="15 3 21 3 21 9"/><line x1="10" y1="14" x2="21" y2="3"/>
+				</svg>
+				Open in New Window
+			</button>
 			<button onclick={() => startRename(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="M17 3a2.85 2.85 0 114 4L7.5 20.5 2 22l1.5-5.5Z"/><path d="m15 5 4 4"/>
@@ -1530,7 +1577,7 @@
 	}
 
 	.note-list.mobile .list-content {
-		padding: 4px 8px;
+		padding: 4px 8px 180px;
 	}
 
 	.note-list.mobile .note-item {

src/lib/components/NoteWindow.svelte

@@ -0,0 +1,326 @@
+<script lang="ts">
+	import { onMount, onDestroy } from 'svelte';
+	import { listen } from '@tauri-apps/api/event';
+	import { getCurrentWindow } from '@tauri-apps/api/window';
+	import Editor from './Editor.svelte';
+	import {
+		activeNote,
+		activeNotePath,
+		editorDirty,
+		readOnly,
+		sourceMode,
+		theme
+	} from '$lib/stores/app';
+	import { readNote } from '$lib/api';
+	import type { FileEvent } from '$lib/types';
+
+	let { notePath }: { notePath: string } = $props();
+
+	const appWindow = getCurrentWindow();
+	const isMac = navigator.platform.startsWith('Mac');
+	let editor = $state<Editor>(null!);
+	let unlistenFileChange: (() => void) | null = null;
+	let maximized = $state(false);
+	let loadError = $state<string | null>(null);
+
+	async function checkMaximized() {
+		maximized = await appWindow.isMaximized();
+	}
+
+	$effect(() => {
+		checkMaximized();
+		const unlisten = appWindow.onResized(() => checkMaximized());
+		return () => { unlisten.then(fn => fn()); };
+	});
+
+	$effect(() => {
+		const themeValue = $theme || 'system';
+		const root = document.documentElement;
+		root.classList.remove('dark');
+		if (themeValue === 'dark' || (themeValue === 'system' && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
+			root.classList.add('dark');
+		}
+	});
+
+	let lastMouseDown = 0;
+	const RESIZE_EDGE = 6;
+
+	function handleMouseDown(e: MouseEvent) {
+		if (e.button !== 0) return;
+		const target = e.target as HTMLElement;
+		if (target.closest('.titlebar-controls') || target.closest('.titlebar-actions')) return;
+
+		if (!maximized) {
+			const rect = (e.currentTarget as HTMLElement).getBoundingClientRect();
+			if (e.clientY - rect.top < RESIZE_EDGE || e.clientX - rect.left < RESIZE_EDGE) return;
+		}
+
+		const now = Date.now();
+		if (now - lastMouseDown < 300) {
+			appWindow.toggleMaximize();
+			lastMouseDown = 0;
+			return;
+		}
+		lastMouseDown = now;
+		appWindow.startDragging();
+	}
+
+	function handleKeydown(e: KeyboardEvent) {
+		const mod = e.ctrlKey || e.metaKey;
+		if (mod && e.key === 's') {
+			e.preventDefault();
+			editor?.forceSave();
+		}
+		if (mod && e.shiftKey && e.key === 'M') {
+			e.preventDefault();
+			$sourceMode = !$sourceMode;
+		}
+	}
+
+	onMount(async () => {
+		try {
+			const content = await readNote(notePath);
+			$activeNote = content;
+			$activeNotePath = notePath;
+			$editorDirty = false;
+			setTimeout(() => {
+				editor?.loadNote(notePath, content.content);
+				appWindow.setTitle(`${content.meta.title} - HelixNotes`);
+			}, 50);
+		} catch (e) {
+			loadError = String(e);
+		}
+
+		unlistenFileChange = await listen<FileEvent>('file-changed', async (event) => {
+			if (event.payload.path === notePath && event.payload.event_type === 'modify') {
+				if (!$editorDirty) {
+					try {
+						const content = await readNote(notePath);
+						$activeNote = content;
+						editor?.loadNote(notePath, content.content);
+					} catch (_) {}
+				}
+			}
+		});
+	});
+
+	onDestroy(() => {
+		unlistenFileChange?.();
+	});
+</script>
+
+<svelte:window onkeydown={handleKeydown} />
+
+<div class="note-window">
+	<!-- svelte-ignore a11y_no_static_element_interactions -->
+	<div class="nw-titlebar" class:macos={isMac} onmousedown={handleMouseDown}>
+		<div class="nw-titlebar-brand">
+			<svg width="14" height="14" viewBox="0 0 48 48" fill="none">
+				<rect width="48" height="48" rx="12" fill="var(--accent)" />
+				<circle cx="16" cy="16" r="3.5" fill="white" opacity="0.9" />
+				<circle cx="32" cy="16" r="3.5" fill="white" opacity="0.9" />
+				<circle cx="16" cy="32" r="3.5" fill="white" opacity="0.9" />
+				<circle cx="32" cy="32" r="3.5" fill="white" opacity="0.9" />
+				<line x1="19" y1="18" x2="29" y2="30" stroke="white" stroke-width="2" stroke-linecap="round" opacity="0.7" />
+				<line x1="29" y1="18" x2="19" y2="30" stroke="white" stroke-width="2" stroke-linecap="round" opacity="0.7" />
+			</svg>
+			<span class="nw-title">{$activeNote?.meta.title || 'Loading...'}</span>
+			{#if $editorDirty}
+				<span class="nw-dirty-dot" title="Unsaved changes"></span>
+			{/if}
+		</div>
+		<div class="titlebar-actions">
+			<button class="nw-btn" class:active={$sourceMode} onclick={() => ($sourceMode = !$sourceMode)} title="Toggle Source Mode">
+				<svg width="14" height="14" 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>
+			</button>
+			<button class="nw-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>
+		</div>
+		{#if !isMac}
+		<div class="titlebar-controls">
+			<button class="titlebar-btn" 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>
+			</button>
+			<button class="titlebar-btn" onclick={() => appWindow.toggleMaximize()} title={maximized ? 'Restore' : 'Maximize'}>
+				{#if maximized}
+					<svg width="10" height="10" viewBox="0 0 10 10">
+						<rect x="2.5" y="0.5" width="7" height="7" rx="1" fill="none" stroke="currentColor" stroke-width="1.2" />
+						<rect x="0.5" y="2.5" width="7" height="7" rx="1" fill="var(--bg-secondary)" stroke="currentColor" stroke-width="1.2" />
+					</svg>
+				{:else}
+					<svg width="10" height="10" viewBox="0 0 10 10">
+						<rect x="1" y="1" width="8" height="8" rx="1" fill="none" stroke="currentColor" stroke-width="1.2" />
+					</svg>
+				{/if}
+			</button>
+			<button class="titlebar-btn titlebar-close" onclick={() => appWindow.close()} title="Close">
+				<svg width="10" height="10" viewBox="0 0 10 10">
+					<line x1="1.5" y1="1.5" x2="8.5" y2="8.5" stroke="currentColor" stroke-width="1.2" stroke-linecap="round" />
+					<line x1="8.5" y1="1.5" x2="1.5" y2="8.5" stroke="currentColor" stroke-width="1.2" stroke-linecap="round" />
+				</svg>
+			</button>
+		</div>
+		{/if}
+	</div>
+
+	{#if loadError}
+		<div class="nw-error">
+			<p>Failed to load note</p>
+			<p class="nw-error-detail">{loadError}</p>
+		</div>
+	{:else}
+		<div class="nw-editor">
+			<Editor bind:this={editor} />
+		</div>
+	{/if}
+</div>
+
+<style>
+	.note-window {
+		display: flex;
+		flex-direction: column;
+		height: 100vh;
+		background: var(--bg-primary);
+	}
+
+	.nw-titlebar {
+		display: flex;
+		align-items: center;
+		height: 34px;
+		background: var(--bg-secondary);
+		border-bottom: 1px solid var(--border-color);
+		user-select: none;
+		flex-shrink: 0;
+		-webkit-app-region: drag;
+	}
+
+	.nw-titlebar.macos {
+		padding-left: 78px;
+	}
+
+	.nw-titlebar-brand {
+		display: flex;
+		align-items: center;
+		gap: 8px;
+		padding-left: 14px;
+		pointer-events: none;
+		flex: 1;
+		min-width: 0;
+	}
+
+	.nw-title {
+		font-size: 12px;
+		font-weight: 500;
+		color: var(--text-tertiary);
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.nw-dirty-dot {
+		width: 6px;
+		height: 6px;
+		border-radius: 50%;
+		background: var(--accent);
+		flex-shrink: 0;
+	}
+
+	.titlebar-actions {
+		display: flex;
+		align-items: center;
+		gap: 4px;
+		margin-right: 8px;
+		-webkit-app-region: no-drag;
+	}
+
+	.nw-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 28px;
+		height: 28px;
+		border: none;
+		border-radius: 7px;
+		background: var(--bg-hover);
+		color: var(--text-secondary);
+		cursor: pointer;
+		transition: background 0.15s, color 0.15s;
+	}
+
+	.nw-btn:hover {
+		background: var(--bg-tertiary, var(--bg-hover));
+		color: var(--text-primary);
+	}
+
+	.nw-btn.active {
+		background: color-mix(in srgb, var(--accent) 18%, transparent);
+		color: var(--accent);
+	}
+
+	.titlebar-controls {
+		display: flex;
+		height: 100%;
+		-webkit-app-region: no-drag;
+	}
+
+	.titlebar-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 38px;
+		height: 100%;
+		border: none;
+		background: none;
+		color: var(--text-tertiary);
+		cursor: pointer;
+		transition: background 0.1s, color 0.1s;
+	}
+
+	.titlebar-btn:hover {
+		background: var(--bg-hover);
+		color: var(--text-primary);
+	}
+
+	.titlebar-close:hover {
+		background: #e81123;
+		color: white;
+	}
+
+	.nw-editor {
+		flex: 1;
+		overflow: hidden;
+	}
+
+	.nw-error {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		gap: 8px;
+		color: var(--text-secondary);
+		font-size: 14px;
+	}
+
+	.nw-error-detail {
+		font-size: 12px;
+		color: var(--text-tertiary);
+		max-width: 400px;
+		text-align: center;
+		word-break: break-word;
+	}
+</style>

src/lib/components/SearchPanel.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { showSearch, activeNote, activeNotePath, editorDirty, appConfig } from '$lib/stores/app';
+	import { showSearch, activeNote, activeNotePath, editorDirty, appConfig, mobileView } from '$lib/stores/app';
 	import { searchNotes, readNote } from '$lib/api';
 	import { debounce } from '$lib/utils/debounce';
 	import type { SearchResult } from '$lib/types';
@@ -83,6 +83,8 @@
 		return str.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 	}
 
+	const isMobile = /android|ios/i.test(navigator.userAgent);
+
 	async function openResult(result: SearchResult) {
 		try {
 			const content = await readNote(result.path);
@@ -90,6 +92,7 @@
 			$activeNotePath = result.path;
 			$editorDirty = false;
 			$showSearch = false;
+			if (isMobile) $mobileView = 'editor';
 		} catch (e) {
 			console.error('Failed to open search result:', e);
 		}
@@ -118,7 +121,7 @@
 					oninput={handleInput}
 					onkeydown={handleKeydown}
 				/>
-				<kbd class="search-esc">Esc</kbd>
+				{#if !isMobile}<kbd class="search-esc">Esc</kbd>{/if}
 			</div>
 
 			{#if results.length > 0}

src/lib/components/SettingsPanel.svelte

@@ -1,12 +1,14 @@
 <script lang="ts">
-	import { showSettings, theme, appConfig, updateAvailable as globalUpdateAvailable, updateObj as globalUpdateObj, installType, settingsTab } from '$lib/stores/app';
+	import { showSettings, theme, appConfig, updateAvailable as globalUpdateAvailable, updateObj as globalUpdateObj, installType, settingsTab, vaultReady, androidApkUrl, checkForUpdateMobile } from '$lib/stores/app';
-	import { setTheme, setAccentColor, setFontSize, setFontFamily, setGeneralSettings, importObsidian, createBackup, listBackups, restoreBackup, deleteBackup, setBackupSettings, setAiSettings, testAiConnection } from '$lib/api';
+	import { setTheme, setAccentColor, setFontSize, setFontFamily, setLineHeight, setGeneralSettings, importObsidian, createBackup, listBackups, restoreBackup, deleteBackup, setBackupSettings, setAiSettings, testAiConnection } from '$lib/api';
 	import { open as openDialog } from '@tauri-apps/plugin-dialog';
 	import { listen } from '@tauri-apps/api/event';
-	import { check as checkUpdate } from '@tauri-apps/plugin-updater';
 	import { getVersion } from '@tauri-apps/api/app';
+	import { openUrl } from '@tauri-apps/plugin-opener';
 	import type { ImportResult, BackupEntry } from '$lib/types';
 
+	const isMobile = /android|ios/i.test(navigator.userAgent);
+
 	type Tab = 'general' | 'editor' | 'styling' | 'import' | 'backup' | 'ai' | 'updates';
 	let activeTab = $state<Tab>('styling');
 
@@ -54,15 +56,27 @@
 		updateMessage = null;
 		updateAvailable = null;
 		try {
-			const update = await checkUpdate();
+			if (isMobile) {
-			if (update) {
+				await checkForUpdateMobile();
-				updateObj = update;
+				const global = $globalUpdateAvailable;
-				$globalUpdateObj = update;
+				if (global) {
-				updateAvailable = { version: update.version, body: update.body, date: update.date };
+					updateAvailable = { version: global.version, body: global.body };
-				globalUpdateAvailable.set({ version: update.version, body: update.body });
+					updateMessage = { type: 'info', text: `Version ${global.version} is available!` };
-				updateMessage = { type: 'info', text: `Version ${update.version} is available!` };
+				} else {
+					updateMessage = { type: 'success', text: 'You are on the latest version.' };
+				}
 			} else {
-				updateMessage = { type: 'success', text: 'You are on the latest version.' };
+				const { check: checkUpdate } = await import('@tauri-apps/plugin-updater');
+				const update = await checkUpdate();
+				if (update) {
+					updateObj = update;
+					$globalUpdateObj = update;
+					updateAvailable = { version: update.version, body: update.body, date: update.date };
+					globalUpdateAvailable.set({ version: update.version, body: update.body });
+					updateMessage = { type: 'info', text: `Version ${update.version} is available!` };
+				} else {
+					updateMessage = { type: 'success', text: 'You are on the latest version.' };
+				}
 			}
 		} catch (e) {
 			updateMessage = { type: 'error', text: `Failed to check: ${e}` };
@@ -204,18 +218,20 @@
 	let aiProvider = $state<string | null>($appConfig?.ai_provider ?? null);
 	let aiApiKey = $derived.by(() => {
 		if (aiProvider === 'openai') return _openaiKey;
+		if (aiProvider === 'ollama') return '';
 		return _anthropicKey;
 	});
 	let _anthropicKey = $state($appConfig?.ai_api_key ?? '');
 	let _openaiKey = $state($appConfig?.openai_api_key ?? '');
-	let aiModel = $state($appConfig?.ai_model ?? 'claude-sonnet-4-5-20250929');
+	let _ollamaBaseUrl = $state($appConfig?.ollama_base_url ?? 'http://localhost:11434');
+	let aiModel = $state($appConfig?.ai_model ?? 'claude-sonnet-4-6');
 	let aiWritingStyle = $state($appConfig?.ai_writing_style ?? '');
 	let aiShowKey = $state(false);
 	let aiTestLoading = $state(false);
 	let aiTestMessage = $state<{ type: 'success' | 'error'; text: string } | null>(null);
 
 	const anthropicModels = [
-		{ value: 'claude-sonnet-4-5-20250929', label: 'Claude Sonnet 4.5', desc: 'Balanced' },
+		{ value: 'claude-sonnet-4-6', label: 'Claude Sonnet 4.6', desc: 'Balanced' },
 		{ value: 'claude-opus-4-6', label: 'Claude Opus 4.6', desc: 'Most capable' },
 		{ value: 'claude-haiku-4-5-20251001', label: 'Claude Haiku 4.5', desc: 'Fast' },
 	];
@@ -228,13 +244,15 @@
 	let aiModels = $derived(aiProvider === 'openai' ? openaiModels : anthropicModels);
 
 	async function saveAiSettings() {
-		await setAiSettings(aiProvider, aiApiKey || null, aiModel, aiWritingStyle || null);
+		const baseUrl = aiProvider === 'ollama' ? (_ollamaBaseUrl || null) : null;
+		await setAiSettings(aiProvider, aiApiKey || null, aiModel, aiWritingStyle || null, baseUrl);
 		if ($appConfig) {
 			$appConfig = {
 				...$appConfig,
 				ai_provider: aiProvider,
 				ai_api_key: _anthropicKey || null,
 				openai_api_key: _openaiKey || null,
+				ollama_base_url: _ollamaBaseUrl || null,
 				ai_model: aiModel,
 				ai_writing_style: aiWritingStyle || null,
 			};
@@ -293,9 +311,17 @@
 		{ name: 'Mono', value: 'mono', stack: '"JetBrains Mono", "Fira Code", "Cascadia Code", monospace' },
 	];
 
+	const lineHeightPresets = [
+		{ label: 'Tight', value: 1.4 },
+		{ label: 'Default', value: 1.6 },
+		{ label: 'Relaxed', value: 1.8 },
+		{ label: 'Loose', value: 2.0 },
+	];
+
 	let activeAccent = $state($appConfig?.accent_color ?? 'Indigo');
 	let activeFontSize = $state($appConfig?.font_size ?? 14);
 	let activeFontFamily = $state($appConfig?.font_family ?? 'system');
+	let activeLineHeight = $state($appConfig?.line_height ?? 1.6);
 
 	// General settings
 	let compactNotes = $state($appConfig?.compact_notes ?? false);
@@ -422,6 +448,17 @@
 		document.documentElement.style.setProperty('--editor-font-family', stack);
 	}
 
+	function selectLineHeight(value: number) {
+		activeLineHeight = value;
+		applyLineHeight(value);
+		if ($appConfig) $appConfig.line_height = value;
+		setLineHeight(value).catch((e) => console.error('Failed to save line height:', e));
+	}
+
+	function applyLineHeight(value: number) {
+		document.documentElement.style.setProperty('--editor-line-height', String(value));
+	}
+
 	function close() {
 		// Ensure AI settings are saved when closing (in case input wasn't blurred)
 		// Only save if the key differs from what's already stored
@@ -454,6 +491,11 @@
 				applyFontFamily(preset.stack);
 			}
 		}
+		const savedLineHeight = $appConfig?.line_height;
+		if (savedLineHeight) {
+			activeLineHeight = savedLineHeight;
+			applyLineHeight(savedLineHeight);
+		}
 		// Sync general settings
 		if ($appConfig) {
 			compactNotes = $appConfig.compact_notes ?? false;
@@ -478,9 +520,9 @@
 
 {#if $showSettings}
 	<!-- svelte-ignore a11y_no_static_element_interactions -->
-	<div class="settings-overlay" onclick={close} onkeydown={(e) => { if (e.key === 'Escape') close(); }}>
+	<div class="settings-overlay" class:mobile={isMobile} onclick={close} onkeydown={(e) => { if (e.key === 'Escape') close(); }}>
 		<!-- svelte-ignore a11y_no_static_element_interactions -->
-		<div class="settings-panel" onclick={(e) => e.stopPropagation()}>
+		<div class="settings-panel" class:mobile={isMobile} onclick={(e) => e.stopPropagation()}>
 			<div class="settings-header">
 				<h2>Settings</h2>
 				<button class="close-btn" onclick={close}>
@@ -511,18 +553,22 @@
 						</svg>
 						Styling
 					</button>
+					{#if !isMobile}
 					<button class="tab-btn" class:active={activeTab === 'import'} onclick={() => activeTab = 'import'}>
 						<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="M12 3v12"/><path d="m8 11 4 4 4-4"/><path d="M8 5H4a2 2 0 00-2 2v10a2 2 0 002 2h16a2 2 0 002-2V7a2 2 0 00-2-2h-4"/>
 						</svg>
 						Import
 					</button>
+				{/if}
+					{#if !isMobile}
 					<button class="tab-btn" class:active={activeTab === 'backup'} onclick={() => { activeTab = 'backup'; loadBackups(); }}>
 						<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="M21 12a9 9 0 00-9-9 9.75 9.75 0 00-6.74 2.74L3 8"/><path d="M3 3v5h5"/><path d="M3 12a9 9 0 009 9 9.75 9.75 0 006.74-2.74L21 16"/><path d="M16 16h5v5"/>
 						</svg>
 						Backup
 					</button>
+					{/if}
 					<button class="tab-btn" class:active={activeTab === 'ai'} onclick={() => activeTab = 'ai'}>
 						<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="M12 8V4l-2-2"/><rect x="4" y="8" width="16" height="12" rx="2"/><path d="M2 14h2"/><path d="M20 14h2"/><path d="M9 13v2"/><path d="M15 13v2"/>
@@ -562,6 +608,20 @@
 								</div>
 							</div>
 
+							{#if isMobile}
+							<div class="settings-section">
+								<h3>Vault</h3>
+								<p class="setting-desc" style="margin-bottom: 12px; color: var(--text-tertiary); font-size: 13px;">Current: <strong style="color: var(--text-primary);">{$appConfig?.active_vault?.split('/').pop() ?? 'Unknown'}</strong></p>
+								<button class="import-btn" onclick={() => { $showSettings = false; $vaultReady = false; }}>
+									<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="M22 19a2 2 0 01-2 2H4a2 2 0 01-2-2V5a2 2 0 012-2h5l2 3h9a2 2 0 012 2z"/>
+									</svg>
+									Switch Vault
+								</button>
+							</div>
+							{/if}
+
+							{#if !isMobile}
 							<div class="settings-section">
 								<h3>Performance</h3>
 								<label class="setting-toggle">
@@ -607,6 +667,7 @@
 								</label>
 								{/if}
 							</div>
+						{/if}
 						</div>
 					{:else if activeTab === 'editor'}
 						<div class="tab-content">
@@ -621,6 +682,7 @@
 										<span class="toggle-knob"></span>
 									</button>
 								</label>
+								{#if !isMobile}
 								<label class="setting-toggle" style="margin-top: 12px;">
 									<span class="setting-label">
 										<span class="setting-name">Show line numbers</span>
@@ -630,6 +692,7 @@
 										<span class="toggle-knob"></span>
 									</button>
 								</label>
+								{/if}
 								<label class="setting-toggle" style="margin-top: 12px;">
 									<span class="setting-label">
 										<span class="setting-name">Open notes in View Mode</span>
@@ -654,6 +717,7 @@
 								</label>
 							</div>
 
+							{#if !isMobile}
 							<div class="settings-section">
 								<h3>PDF Preview</h3>
 								<label class="setting-toggle">
@@ -685,6 +749,7 @@
 									<span class="setting-hint">Default height for PDF previews in notes</span>
 								</div>
 							{/if}
+						{/if}
 						</div>
 					{:else if activeTab === 'styling'}
 						<div class="tab-content">
@@ -748,6 +813,22 @@
 								</div>
 							</div>
 
+							<div class="settings-section">
+								<h3>Line Height</h3>
+								<div class="font-size-options">
+									{#each lineHeightPresets as preset}
+										<button
+											class="font-size-btn"
+											class:active={activeLineHeight === preset.value}
+											onclick={() => selectLineHeight(preset.value)}
+										>
+											<span class="font-size-label">{preset.label}</span>
+											<span class="font-size-value">{preset.value}</span>
+										</button>
+									{/each}
+								</div>
+							</div>
+
 							<div class="settings-section">
 								<h3>Font</h3>
 								<div class="font-family-options">
@@ -805,6 +886,7 @@
 								</label>
 
 								<div class="backup-actions">
+									{#if !isMobile}
 									<button class="backup-link-btn" onclick={handleSelectBackupFolder}>
 										<svg width="14" height="14" 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"/>
@@ -814,6 +896,7 @@
 									{#if $appConfig?.backup_location}
 										<p class="backup-path">{$appConfig.backup_location}</p>
 									{/if}
+									{/if}
 									<button class="backup-link-btn" onclick={handleBackupNow} disabled={backupLoading}>
 										{#if backupLoading}
 											<svg class="spinner-icon" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="12" r="10" opacity="0.25" /><path d="M12 2a10 10 0 019.95 9" /></svg>
@@ -941,52 +1024,86 @@
 								<h3>Provider</h3>
 								<div class="setting-options">
 									<button class="option-btn" class:active={!aiProvider} onclick={() => { if (!aiProvider) return; aiProvider = null; aiTestMessage = null; saveAiSettings(); }}>Disabled</button>
-									<button class="option-btn" class:active={aiProvider === 'anthropic'} onclick={() => { if (aiProvider === 'anthropic') return; aiProvider = 'anthropic'; aiModel = 'claude-sonnet-4-5-20250929'; aiTestMessage = null; saveAiSettings(); }}>Anthropic</button>
+									<button class="option-btn" class:active={aiProvider === 'ollama'} onclick={() => { if (aiProvider === 'ollama') return; aiProvider = 'ollama'; aiModel = 'gemma3:4b'; aiTestMessage = null; saveAiSettings(); }}>Ollama</button>
+									<button class="option-btn" class:active={aiProvider === 'anthropic'} onclick={() => { if (aiProvider === 'anthropic') return; aiProvider = 'anthropic'; aiModel = 'claude-sonnet-4-6'; aiTestMessage = null; saveAiSettings(); }}>Anthropic</button>
 									<button class="option-btn" class:active={aiProvider === 'openai'} onclick={() => { if (aiProvider === 'openai') return; aiProvider = 'openai'; aiModel = 'gpt-5.2'; aiTestMessage = null; saveAiSettings(); }}>OpenAI</button>
 								</div>
 							</div>
 
 							{#if aiProvider}
-								<div class="settings-section">
+								{#if aiProvider === 'ollama'}
-									<h3>API Key</h3>
+									<p class="setting-hint" style="color: var(--text-success, #4ade80); margin-top: -4px; margin-bottom: 12px;">Your data stays on your device. No text is sent to any external server.</p>
-									<div class="ai-key-row">
+								{:else}
+									<p class="setting-hint" style="color: var(--text-warning, #f59e0b); margin-top: -4px; margin-bottom: 12px;">Your selected text and note content will be sent to {aiProvider === 'openai' ? 'OpenAI' : 'Anthropic'} servers for processing.</p>
+								{/if}
+
+								{#if aiProvider === 'ollama'}
+									<div class="settings-section">
+										<h3>Server URL</h3>
 										<input
-											type={aiShowKey ? 'text' : 'password'}
+											type="text"
 											class="ai-key-input"
-											placeholder={aiProvider === 'openai' ? 'sk-...' : 'sk-ant-...'}
+											placeholder="http://localhost:11434"
-											value={aiApiKey}
+											value={_ollamaBaseUrl}
-											oninput={(e) => { const v = (e.target as HTMLInputElement).value; if (aiProvider === 'openai') _openaiKey = v; else _anthropicKey = v; }}
+											oninput={(e) => { _ollamaBaseUrl = (e.target as HTMLInputElement).value; }}
 											onblur={saveAiSettings}
 										/>
-										<button class="ai-key-toggle" onclick={() => aiShowKey = !aiShowKey} title={aiShowKey ? 'Hide' : 'Show'}>
+										<p class="setting-hint">Ollama server address. Install from <a href="https://ollama.com" target="_blank" class="ai-link">ollama.com</a></p>
-											{#if aiShowKey}
-												<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.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 11-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg>
-											{:else}
-												<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="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/><circle cx="12" cy="12" r="3"/></svg>
-											{/if}
-										</button>
 									</div>
-									{#if aiProvider === 'openai'}
+								{:else}
-										<p class="setting-hint">Get your API key from <a href="https://platform.openai.com/api-keys" target="_blank" class="ai-link">platform.openai.com</a></p>
+									<div class="settings-section">
-									{:else}
+										<h3>API Key</h3>
-										<p class="setting-hint">Get your API key from <a href="https://console.anthropic.com/settings/keys" target="_blank" class="ai-link">console.anthropic.com</a></p>
+										<div class="ai-key-row">
-									{/if}
+											<input
-								</div>
+												type={aiShowKey ? 'text' : 'password'}
+												class="ai-key-input"
+												placeholder={aiProvider === 'openai' ? 'sk-...' : 'sk-ant-...'}
+												value={aiApiKey}
+												oninput={(e) => { const v = (e.target as HTMLInputElement).value; if (aiProvider === 'openai') _openaiKey = v; else _anthropicKey = v; }}
+												onblur={saveAiSettings}
+											/>
+											<button class="ai-key-toggle" onclick={() => aiShowKey = !aiShowKey} title={aiShowKey ? 'Hide' : 'Show'}>
+												{#if aiShowKey}
+													<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.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 11-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg>
+												{:else}
+													<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="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/><circle cx="12" cy="12" r="3"/></svg>
+												{/if}
+											</button>
+										</div>
+										{#if aiProvider === 'openai'}
+											<p class="setting-hint">Get your API key from <a href="https://platform.openai.com/api-keys" target="_blank" class="ai-link">platform.openai.com</a></p>
+										{:else}
+											<p class="setting-hint">Get your API key from <a href="https://console.anthropic.com/settings/keys" target="_blank" class="ai-link">console.anthropic.com</a></p>
+										{/if}
+									</div>
+								{/if}
 
 								<div class="settings-section">
 									<h3>Model</h3>
-									<div class="ai-model-options">
+									{#if aiProvider === 'ollama'}
-										{#each aiModels as m}
+										<input
-											<button
+											type="text"
-												class="ai-model-btn"
+											class="ai-key-input"
-												class:active={aiModel === m.value}
+											placeholder="gemma3:4b"
-												onclick={() => { aiModel = m.value; saveAiSettings(); }}
+											value={aiModel}
-											>
+											oninput={(e) => { aiModel = (e.target as HTMLInputElement).value; }}
-												<span class="ai-model-name">{m.label}</span>
+											onblur={saveAiSettings}
-												<span class="ai-model-desc">{m.desc}</span>
+										/>
-											</button>
+										<p class="setting-hint">Enter the model name as shown by <code>ollama list</code></p>
-										{/each}
+									{:else}
-									</div>
+										<div class="ai-model-options">
+											{#each aiModels as m}
+												<button
+													class="ai-model-btn"
+													class:active={aiModel === m.value}
+													onclick={() => { aiModel = m.value; saveAiSettings(); }}
+												>
+													<span class="ai-model-name">{m.label}</span>
+													<span class="ai-model-desc">{m.desc}</span>
+												</button>
+											{/each}
+										</div>
+									{/if}
 								</div>
 
 								<div class="settings-section">
@@ -1004,7 +1121,7 @@
 
 								<div class="settings-section">
 									<h3>Connection</h3>
-									<button class="import-btn" onclick={handleTestAi} disabled={aiTestLoading || !aiApiKey}>
+									<button class="import-btn" onclick={handleTestAi} disabled={aiTestLoading || (aiProvider !== 'ollama' && !aiApiKey)}>
 										{#if aiTestLoading}
 											<svg class="spinner-icon" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="12" r="10" opacity="0.25" /><path d="M12 2a10 10 0 019.95 9" /></svg>
 											Testing...
@@ -1027,7 +1144,11 @@
 
 								<div class="settings-section">
 									<h3>Usage</h3>
+									{#if isMobile}
+									<p class="import-desc">Use the AI button in the toolbar or header to access AI writing tools: improve, fix grammar, rewrite, summarize, translate, and more.</p>
+								{:else}
 									<p class="import-desc">Select text in the editor and right-click to access AI writing tools: improve, fix grammar, rewrite, summarize, translate, and more.</p>
+								{/if}
 								</div>
 							{/if}
 						</div>
@@ -1093,6 +1214,13 @@
 										<p>Update via your AUR helper:</p>
 										<code>yay -Syu helixnotes</code>
 									</div>
+								{:else if $installType === 'android'}
+									<button class="update-install-btn" onclick={() => { openUrl('https://helixnotes.com/#download').catch(() => {}); }}>
+										<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="M21 15v4a2 2 0 01-2 2H5a2 2 0 01-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" y1="15" x2="12" y2="3"/>
+										</svg>
+										Download from Website
+									</button>
 								{:else}
 									<a class="update-install-btn" href="https://codeberg.org/ArkHost/HelixNotes/releases" target="_blank" rel="noopener">
 										<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
@@ -2007,4 +2135,111 @@
 		color: var(--accent);
 	}
 
+	/* ═══ Mobile ═══ */
+
+	.settings-overlay.mobile {
+		align-items: stretch;
+		justify-content: stretch;
+	}
+
+	.settings-panel.mobile {
+		width: 100%;
+		height: 100%;
+		max-height: 100%;
+		border-radius: 0;
+		border: none;
+	}
+
+	.settings-panel.mobile .settings-content {
+		flex-direction: column;
+	}
+
+	.settings-panel.mobile .settings-tabs {
+		flex-direction: row;
+		min-width: 0;
+		border-right: none;
+		border-bottom: 1px solid var(--border-light);
+		padding: 8px 8px 0;
+		overflow-x: auto;
+		overflow-y: hidden;
+		-webkit-overflow-scrolling: touch;
+		scrollbar-width: none;
+		gap: 0;
+	}
+
+	.settings-panel.mobile .settings-tabs::-webkit-scrollbar {
+		display: none;
+	}
+
+	.settings-panel.mobile .tab-btn {
+		flex-shrink: 0;
+		flex-direction: column;
+		gap: 4px;
+		padding: 8px 14px 10px;
+		font-size: 11px;
+		border-radius: 8px 8px 0 0;
+	}
+
+	.settings-panel.mobile .tab-btn.active {
+		border-bottom: 2px solid var(--accent);
+		border-radius: 8px 8px 0 0;
+	}
+
+	.settings-panel.mobile .settings-header {
+		padding-top: calc(env(safe-area-inset-top, 12px) + 12px);
+	}
+
+	.settings-panel.mobile .settings-body {
+		padding: 16px;
+	}
+
+	.settings-panel.mobile .setting-name {
+		font-size: 14px;
+	}
+
+	.settings-panel.mobile .setting-desc {
+		font-size: 12px;
+	}
+
+	.settings-panel.mobile .toggle-switch {
+		width: 44px;
+		height: 26px;
+	}
+
+	.settings-panel.mobile .toggle-knob {
+		width: 22px;
+		height: 22px;
+	}
+
+	.settings-panel.mobile .toggle-switch.on .toggle-knob {
+		transform: translateX(18px);
+	}
+
+	.settings-panel.mobile .option-btn {
+		padding: 12px 10px;
+		font-size: 14px;
+	}
+
+	.settings-panel.mobile .theme-btn {
+		padding: 12px 10px;
+		font-size: 14px;
+	}
+
+	.settings-panel.mobile .accent-grid {
+		grid-template-columns: repeat(4, 1fr);
+		gap: 10px;
+	}
+
+	.settings-panel.mobile .accent-swatch {
+		padding: 14px 8px;
+	}
+
+	.settings-panel.mobile .font-size-options {
+		gap: 8px;
+	}
+
+	.settings-panel.mobile .font-size-btn {
+		padding: 12px 6px;
+	}
+
 </style>

src/lib/components/Sidebar.svelte

@@ -51,11 +51,23 @@
 
 	export async function refresh() {
 		try {
-			$notebooks = await getNotebooks();
+			if (isMobile) {
-			$tags = await getAllTags();
+				// On mobile, parallelize and skip getAllTags (derive from $notes instead)
-			$notebookIcons = await getNotebookIcons();
+				const [nbs, icons, qaNotes] = await Promise.all([
-			const qaNotes = await getQuickAccess();
+					getNotebooks(),
-			$quickAccessPaths = qaNotes.map(n => n.relative_path);
+					getNotebookIcons(),
+					getQuickAccess(),
+				]);
+				$notebooks = nbs;
+				$notebookIcons = icons;
+				$quickAccessPaths = qaNotes.map(n => n.relative_path);
+			} else {
+				$notebooks = await getNotebooks();
+				$tags = await getAllTags();
+				$notebookIcons = await getNotebookIcons();
+				const qaNotes = await getQuickAccess();
+				$quickAccessPaths = qaNotes.map(n => n.relative_path);
+			}
 		} catch (e) {
 			console.error('Failed to refresh sidebar:', e);
 		}
@@ -271,9 +283,18 @@
 		return convertFileSrc(`${vaultRoot}/${iconPath}`);
 	}
 
+	function clampMenu(x: number, y: number, menuWidth = 220, menuHeight = 300): { x: number; y: number } {
+		if (x + menuWidth > window.innerWidth) x = window.innerWidth - menuWidth - 8;
+		if (y + menuHeight > window.innerHeight) y = window.innerHeight - menuHeight - 8;
+		if (x < 4) x = 4;
+		if (y < 4) y = 4;
+		return { x, y };
+	}
+
 	function onContextMenu(e: MouseEvent, nb: NotebookEntry) {
 		e.preventDefault();
-		contextMenu = { x: e.clientX, y: e.clientY, notebook: nb };
+		const { x, y } = clampMenu(e.clientX, e.clientY);
+		contextMenu = { x, y, notebook: nb };
 	}
 
 	function closeContextMenu() {
@@ -283,7 +304,8 @@
 	function onTrashContextMenu(e: MouseEvent) {
 		e.preventDefault();
 		e.stopPropagation();
-		trashContextMenu = { x: e.clientX, y: e.clientY };
+		const { x, y } = clampMenu(e.clientX, e.clientY, 180, 60);
+		trashContextMenu = { x, y };
 	}
 
 	async function handleEmptyTrash() {
@@ -310,6 +332,7 @@
 <svelte:window onclick={handleWindowClick} />
 
 <aside class="sidebar" class:collapsed={$sidebarCollapsed} class:mobile={isMobile}>
+	{#if !isMobile}
 	<div class="sidebar-header">
 		<button class="collapse-btn" onclick={() => ($sidebarCollapsed = !$sidebarCollapsed)} title="Toggle sidebar">
 			<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
@@ -329,6 +352,7 @@
 			</button>
 		{/if}
 	</div>
+	{/if}
 
 	{#if !$sidebarCollapsed}
 		<nav class="sidebar-nav">
@@ -425,9 +449,32 @@
 					{@render notebookItem(nb, 0)}
 				{/each}
 			</div>
+		{#if isMobile && $tags.length > 0}
+				<div class="tags-section-inline">
+					<button class="section-header" onclick={() => tagsCollapsed = !tagsCollapsed}>
+						<span class="section-title">Tags</span>
+						<span class="tag-count" style="margin-left: auto">{$tags.length}</span>
+					</button>
+					{#if !tagsCollapsed}
+						<div class="tag-list">
+							{#each $tags as [tag, count]}
+								<button
+									class="tag-item"
+									class:active={$viewMode === 'tag' && $activeTag === tag}
+									onclick={() => selectTag(tag)}
+								>
+									<span class="tag-hash">#</span>
+									<span class="tag-name">{tag}</span>
+									<span class="tag-count">{count}</span>
+								</button>
+							{/each}
+						</div>
+					{/if}
+				</div>
+			{/if}
 		</div>
 
-		{#if $tags.length > 0}
+		{#if !isMobile && $tags.length > 0}
 			<div class="tags-section">
 				<button class="section-header" onclick={() => tagsCollapsed = !tagsCollapsed}>
 					<span class="section-title">Tags</span>
@@ -1052,6 +1099,16 @@
 		height: 20px;
 	}
 
+	.sidebar.mobile .section {
+		padding-bottom: 180px;
+	}
+
+	.sidebar.mobile .tags-section-inline {
+		border-top: 1px solid var(--border-light);
+		padding: 4px 0;
+		margin-top: 8px;
+	}
+
 	.sidebar.mobile .section-header {
 		padding: 12px 16px 6px;
 		min-height: 44px;

src/lib/components/VaultPicker.svelte

@@ -11,12 +11,56 @@
 	let recentVaults: VaultConfig[] = $derived($appConfig?.vaults ?? []);
 	let loading = $state(false);
 	let error = $state('');
+	let vaultName = $state('HelixNotes');
+	let hasPermission = $state(!isMobile);
+	let selectedLocation = $state('Documents');
+	let customPath = $state('');
+
+	const storageLocations = [
+		{ label: 'Documents', path: '/storage/emulated/0/Documents' },
+		{ label: 'Downloads', path: '/storage/emulated/0/Download' },
+		{ label: 'Internal Storage', path: '/storage/emulated/0' },
+	];
+
+	if (isMobile) {
+		checkPermission();
+		setTimeout(checkPermission, 500);
+		(window as any).__storagePermissionGranted = () => { hasPermission = true; };
+		document.addEventListener('visibilitychange', () => {
+			if (document.visibilityState === 'visible') setTimeout(checkPermission, 300);
+		});
+	}
+
+	function checkPermission() {
+		try {
+			const bridge = (window as any).Android;
+			if (bridge?.hasStoragePermission) {
+				hasPermission = bridge.hasStoragePermission() === true;
+			}
+		} catch { /* bridge not ready */ }
+	}
+
+	function requestPermission() {
+		try {
+			const bridge = (window as any).Android;
+			bridge?.requestStoragePermission?.();
+		} catch {
+			error = 'Go to Settings > Apps > HelixNotes > Permissions and enable "All files access".';
+		}
+	}
+
+	function getMobileBasePath(): string {
+		if (selectedLocation === 'Custom') {
+			return customPath.trim() || '/storage/emulated/0/Documents';
+		}
+		return storageLocations.find(l => l.label === selectedLocation)?.path || '/storage/emulated/0/Documents';
+	}
+
+	let fullPath = $derived(isMobile ? `${getMobileBasePath()}/${vaultName.trim() || 'HelixNotes'}` : '');
 
 	async function pickFolder() {
 		if (isMobile) {
-			// Use shared Documents folder for Syncthing/Nextcloud compatibility
+			await openSelectedVault(fullPath);
-			const vaultPath = '/storage/emulated/0/Documents/HelixNotes';
-			await openSelectedVault(vaultPath);
 		} else {
 			const selected = await open({ directory: true, multiple: false, title: 'Choose Notes Folder' });
 			if (selected) {
@@ -29,6 +73,12 @@
 		loading = true;
 		error = '';
 		try {
+			if (isMobile) {
+				try {
+					const bridge = (window as any).Android;
+					bridge?.prepareVaultDir?.(path);
+				} catch { /* Rust will retry mkdir itself */ }
+			}
 			await openVault(path);
 			const config = await getAppConfig();
 			$appConfig = config;
@@ -68,7 +118,41 @@
 		<h1>HelixNotes</h1>
 		<p class="subtitle">Local markdown notes</p>
 		{#if isMobile}
-			<p class="description">Notes are stored in Documents/HelixNotes as Markdown files. Sync with Nextcloud, Syncthing, or any file sync app.</p>
+			<p class="description">Choose where to store your notes. Sync with Syncthing, Nextcloud, or any file sync app.</p>
+
+			{#if !hasPermission}
+				<button class="btn-permission" onclick={requestPermission}>
+					Grant File Access
+				</button>
+				<p class="permission-hint">Required to access Documents, Downloads, and other shared folders.</p>
+			{/if}
+
+			<div class="location-selector">
+				<label class="location-label">Location</label>
+				<div class="location-options">
+					{#each storageLocations as loc}
+						<button
+							class="location-option"
+							class:active={selectedLocation === loc.label}
+							onclick={() => selectedLocation = loc.label}
+						>{loc.label}</button>
+					{/each}
+					<button
+						class="location-option"
+						class:active={selectedLocation === 'Custom'}
+						onclick={() => selectedLocation = 'Custom'}
+					>Custom</button>
+				</div>
+				{#if selectedLocation === 'Custom'}
+					<input class="custom-path-input" type="text" bind:value={customPath} placeholder="/storage/emulated/0/..." />
+				{/if}
+			</div>
+
+			<div class="vault-name-input">
+				<label for="vault-name">Vault name</label>
+				<div class="vault-name-preview"><input id="vault-name" type="text" bind:value={vaultName} placeholder="HelixNotes" /></div>
+				<span class="vault-path-hint">{fullPath}</span>
+			</div>
 		{:else}
 			<p class="description">Your notes are stored as standard Markdown (.md) files. Pick any folder — existing .md files will be recognized automatically.</p>
 		{/if}
@@ -87,13 +171,13 @@
 			{/if}
 		</button>
 
-		{#if !isMobile && $appConfig?.active_vault}
+		{#if $appConfig?.active_vault}
 			<button class="btn-back" onclick={() => ($vaultReady = true)}>
 				Back
 			</button>
 		{/if}
 
-		{#if !isMobile && recentVaults.length > 0}
+		{#if recentVaults.length > 0}
 			<div class="recent">
 				<span class="recent-label">Recent</span>
 				{#each recentVaults as vault}
@@ -110,11 +194,13 @@
 <style>
 	.vault-picker {
 		display: flex;
-		align-items: center;
 		justify-content: center;
 		height: 100vh;
+		height: 100dvh;
 		background: var(--bg-primary);
 		position: relative;
+		overflow-y: auto;
+		-webkit-overflow-scrolling: touch;
 	}
 
 	.window-controls {
@@ -148,6 +234,9 @@
 		max-width: 400px;
 		width: 100%;
 		padding: 48px 32px;
+		padding-bottom: calc(120px + env(safe-area-inset-bottom, 0px));
+		margin: auto;
+		flex-shrink: 0;
 	}
 
 	.logo {
@@ -276,6 +365,130 @@
 		white-space: nowrap;
 	}
 
+	.vault-name-input {
+		margin-bottom: 20px;
+		text-align: left;
+	}
+
+	.vault-name-input label {
+		display: block;
+		font-size: 12px;
+		font-weight: 500;
+		color: var(--text-tertiary);
+		margin-bottom: 6px;
+	}
+
+	.vault-name-preview {
+		display: flex;
+		align-items: center;
+		background: var(--bg-secondary);
+		border: 1px solid var(--border-color);
+		border-radius: 8px;
+		padding: 10px 12px;
+		font-size: 14px;
+		color: var(--text-tertiary);
+	}
+
+	.vault-name-preview input {
+		background: none;
+		border: none;
+		outline: none;
+		color: var(--text-primary);
+		font-size: 14px;
+		font-family: inherit;
+		width: 100%;
+		padding: 0;
+	}
+
+	.location-selector {
+		margin-bottom: 16px;
+		text-align: left;
+	}
+
+	.location-label {
+		display: block;
+		font-size: 12px;
+		font-weight: 500;
+		color: var(--text-tertiary);
+		margin-bottom: 6px;
+	}
+
+	.location-options {
+		display: flex;
+		gap: 6px;
+		flex-wrap: wrap;
+	}
+
+	.location-option {
+		padding: 8px 14px;
+		border: 1px solid var(--border-color);
+		border-radius: 8px;
+		background: var(--bg-secondary);
+		color: var(--text-secondary);
+		font-size: 13px;
+		font-family: inherit;
+		cursor: pointer;
+		transition: all 0.15s;
+	}
+
+	.location-option.active {
+		background: var(--accent);
+		color: white;
+		border-color: var(--accent);
+	}
+
+	.custom-path-input {
+		width: 100%;
+		margin-top: 8px;
+		padding: 10px 12px;
+		background: var(--bg-secondary);
+		border: 1px solid var(--border-color);
+		border-radius: 8px;
+		color: var(--text-primary);
+		font-size: 13px;
+		font-family: inherit;
+		outline: none;
+		box-sizing: border-box;
+	}
+
+	.custom-path-input:focus {
+		border-color: var(--accent);
+	}
+
+	.vault-path-hint {
+		display: block;
+		font-size: 11px;
+		color: var(--text-tertiary);
+		margin-top: 6px;
+		opacity: 0.7;
+		word-break: break-all;
+	}
+
+	.btn-permission {
+		width: 100%;
+		padding: 12px 20px;
+		background: var(--accent);
+		color: white;
+		border: none;
+		border-radius: 10px;
+		font-size: 15px;
+		font-weight: 600;
+		cursor: pointer;
+		margin-bottom: 6px;
+		transition: background 0.15s;
+	}
+
+	.btn-permission:hover {
+		background: var(--accent-hover);
+	}
+
+	.permission-hint {
+		font-size: 12px;
+		color: var(--text-tertiary);
+		margin-bottom: 20px;
+		opacity: 0.7;
+	}
+
 	/* Mobile */
 	.mobile .btn-primary {
 		padding: 14px 20px;
@@ -295,4 +508,22 @@
 		width: 88px;
 		height: 88px;
 	}
+
+	.mobile .btn-back {
+		padding: 14px 20px;
+		font-size: 16px;
+		border-radius: 12px;
+	}
+
+	.mobile .vault-item {
+		padding: 14px 16px;
+	}
+
+	.mobile .vault-name {
+		font-size: 15px;
+	}
+
+	.mobile .vault-path {
+		font-size: 13px;
+	}
 </style>

src/lib/stores/app.ts

@@ -59,6 +59,7 @@ export const updateAvailable = writable<{
 } | null>(null);
 export const updateObj = writable<any>(null);
 export const installType = writable<string>("native");
+export const androidApkUrl = writable<string | null>(null);
 
 export async function checkForUpdate() {
   try {
@@ -73,6 +74,37 @@ export async function checkForUpdate() {
   }
 }
 
+function isNewerVersion(remote: string, local: string): boolean {
+  const r = remote.split(".").map(Number);
+  const l = local.split(".").map(Number);
+  for (let i = 0; i < Math.max(r.length, l.length); i++) {
+    const rv = r[i] || 0;
+    const lv = l[i] || 0;
+    if (rv > lv) return true;
+    if (rv < lv) return false;
+  }
+  return false;
+}
+
+export async function checkForUpdateMobile() {
+  try {
+    const { getVersion } = await import("@tauri-apps/api/app");
+    const currentVersion = await getVersion();
+    const res = await fetch("https://helixnotes.com/latest.json");
+    if (!res.ok) return;
+    const data = await res.json();
+    if (data.version && isNewerVersion(data.version, currentVersion)) {
+      updateAvailable.set({ version: data.version, body: data.notes });
+      const android = data.platforms?.["android-universal"];
+      if (android?.url) {
+        androidApkUrl.set(android.url);
+      }
+    }
+  } catch {
+    // Silent fail
+  }
+}
+
 // Derived
 export const sortedNotes = derived(
   [notes, sortMode, viewMode],

src/lib/types.ts

@@ -41,6 +41,7 @@ export interface AppConfig {
   accent_color: string | null;
   font_size: number | null;
   font_family: string | null;
+  line_height: number | null;
   compact_notes: boolean;
   time_format: string;
   gpu_acceleration: boolean;
@@ -59,6 +60,7 @@ export interface AppConfig {
   ai_provider: string | null;
   ai_api_key: string | null;
   openai_api_key: string | null;
+  ollama_base_url: string | null;
   ai_model: string;
   ai_writing_style: string | null;
   default_view_mode: boolean;

src/lib/utils/window.ts

@@ -0,0 +1,42 @@
+import { WebviewWindow } from '@tauri-apps/api/webviewWindow';
+
+const openNoteWindows = new Map<string, string>();
+
+export async function openNoteWindow(notePath: string, noteTitle: string) {
+	const existingLabel = openNoteWindows.get(notePath);
+	if (existingLabel) {
+		const existing = await WebviewWindow.getByLabel(existingLabel);
+		if (existing) {
+			await existing.show();
+			await existing.unminimize();
+			await existing.setFocus();
+			return;
+		}
+		openNoteWindows.delete(notePath);
+	}
+
+	const label = `note-${Date.now()}`;
+	const url = `/?note=${encodeURIComponent(notePath)}`;
+
+	const noteWindow = new WebviewWindow(label, {
+		url,
+		title: `${noteTitle} - HelixNotes`,
+		width: 900,
+		height: 700,
+		minWidth: 500,
+		minHeight: 400,
+		decorations: false,
+		center: true
+	});
+
+	openNoteWindows.set(notePath, label);
+
+	noteWindow.once('tauri://destroyed', () => {
+		openNoteWindows.delete(notePath);
+	});
+
+	noteWindow.once('tauri://error', (e) => {
+		console.error('Failed to create note window:', e);
+		openNoteWindows.delete(notePath);
+	});
+}

src/routes/+layout.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { onMount } from 'svelte';
 	import '../app.css';
-	import { theme, appConfig, activeNotePath, installType, checkForUpdate } from '$lib/stores/app';
+	import { theme, appConfig, activeNotePath, installType, checkForUpdate, checkForUpdateMobile } from '$lib/stores/app';
 	import { openUrl } from '@tauri-apps/plugin-opener';
 	import { openFile, getInstallType } from '$lib/api';
 	import { get } from 'svelte/store';
@@ -33,9 +33,12 @@
 		return resolved.join('/');
 	}
 
-	// Detect install type and check for updates on startup (skip on mobile — updates via app store)
+	// Detect install type and check for updates on startup
 	onMount(() => {
-		if (!isMobile) {
+		if (isMobile) {
+			installType.set('android');
+			checkForUpdateMobile();
+		} else {
 			getInstallType().then(t => installType.set(t)).catch(() => {});
 			checkForUpdate();
 		}

src/routes/+page.svelte

@@ -4,10 +4,19 @@
 	import { getAppConfig, openVault } from '$lib/api';
 	import VaultPicker from '$lib/components/VaultPicker.svelte';
 	import AppLayout from '$lib/components/AppLayout.svelte';
+	import NoteWindow from '$lib/components/NoteWindow.svelte';
 
 	let loading = $state(true);
+	let noteWindowPath = $state<string | null>(null);
 
 	onMount(async () => {
+		// Check for note window mode
+		const params = new URLSearchParams(window.location.search);
+		const notePath = params.get('note');
+		if (notePath) {
+			noteWindowPath = notePath;
+		}
+
 		try {
 			const config = await getAppConfig();
 			$appConfig = config;
@@ -25,6 +34,9 @@
 			if (config.font_size) {
 				document.documentElement.style.setProperty('--editor-font-size', `${config.font_size}px`);
 			}
+			if (config.line_height) {
+				document.documentElement.style.setProperty('--editor-line-height', String(config.line_height));
+			}
 			if (config.font_family) {
 				const fontStacks: Record<string, string> = {
 					system: '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif',
@@ -69,7 +81,10 @@
 			// Auto-open last vault if available
 			if (config.active_vault) {
 				try {
-					await openVault(config.active_vault);
+					// Note windows don't re-open the vault (already open in main process)
+					if (!noteWindowPath) {
+						await openVault(config.active_vault);
+					}
 					$vaultReady = true;
 				} catch {
 					// Vault path might not exist anymore
@@ -86,6 +101,8 @@
 	<div class="loading">
 		<div class="spinner"></div>
 	</div>
+{:else if noteWindowPath}
+	<NoteWindow notePath={noteWindowPath} />
 {:else if $vaultReady}
 	<AppLayout />
 {:else}