fix: use git ls-files --unmerged for reliable conflict detection

git diff --name-only --diff-filter=U only works during an active merge (while MERGE_HEAD exists). When the vault has stale conflict state — e.g. after a reboot — git diff returns empty, causing conflictFiles=[] and making the StatusBar click handler, command palette entry, and conflict resolver modal all non-functional. Switch to git ls-files --unmerged which reads unmerged index entries directly and works regardless of MERGE_HEAD state. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
fix: open newly created theme in editor after New Theme command
2026-03-03 19:36:50 +01:00 · 2026-03-03 19:29:32 +01:00 · 2026-03-03 16:46:47 +01:00 · 2026-03-03 14:57:20 +01:00 · 2026-03-03 14:34:18 +01:00 · 2026-03-03 14:30:12 +01:00
46 changed files with 668 additions and 189 deletions
--- a/mcp-server/index.js
+++ b/mcp-server/index.js
@@ -32,10 +32,16 @@ import { startUiBridge } from './ws-bridge.js'
 const VAULT_PATH = process.env.VAULT_PATH || process.env.HOME + '/Laputa'
 const WS_UI_PORT = parseInt(process.env.WS_UI_PORT || '9711', 10)

-// Start the UI bridge so stdio-based MCP tools can broadcast UI actions
-const uiBridge = startUiBridge(WS_UI_PORT)
+// Start the UI bridge so stdio-based MCP tools can broadcast UI actions.
+// If the port is already in use (e.g. by the running Laputa app), continue
+// without the bridge — vault tools still work via stdio MCP.
+let uiBridge = null
+startUiBridge(WS_UI_PORT).then((bridge) => {
+  uiBridge = bridge
+})

 function broadcastUiAction(action, payload) {
+  if (!uiBridge) return
  const msg = JSON.stringify({ type: 'ui_action', action, ...payload })
  for (const client of uiBridge.clients) {
    if (client.readyState === 1) client.send(msg)
--- a/mcp-server/ws-bridge.js
+++ b/mcp-server/ws-bridge.js
@@ -19,6 +19,7 @@
 * Protocol (UI bridge):
 *   Server broadcasts: { "type": "ui_action", "action": "open_note", "path": "..." }
 */
+import { createServer } from 'node:http'
 import { WebSocketServer } from 'ws'
 import {
  readNote, createNote, searchNotes, appendToNote,
@@ -80,15 +81,34 @@ async function handleMessage(data) {
  }
 }

+/**
+ * Attempt to start the UI bridge WebSocket server.
+ * Returns a Promise that resolves to the WebSocketServer or null if the port
+ * is unavailable (e.g. another Laputa instance owns it).
+ */
 export function startUiBridge(port = WS_UI_PORT) {
-  uiBridge = new WebSocketServer({ port })
+  return new Promise((resolve) => {
+    const httpServer = createServer()

-  uiBridge.on('connection', () => {
-    console.error(`[ws-bridge] UI client connected on port ${port}`)
+    httpServer.on('error', (err) => {
+      if (err.code === 'EADDRINUSE') {
+        console.error(`[ws-bridge] UI bridge port ${port} already in use, disabling bridge`)
+      } else {
+        console.error(`[ws-bridge] UI bridge error: ${err.message}`)
+      }
+      resolve(null)
+    })
+
+    httpServer.listen(port, () => {
+      const wss = new WebSocketServer({ server: httpServer })
+      wss.on('connection', () => {
+        console.error(`[ws-bridge] UI client connected on port ${port}`)
+      })
+      uiBridge = wss
+      console.error(`[ws-bridge] UI bridge listening on ws://localhost:${port}`)
+      resolve(wss)
+    })
  })
-
-  console.error(`[ws-bridge] UI bridge listening on ws://localhost:${port}`)
-  return uiBridge
 }

 export function startBridge(port = WS_PORT) {
@@ -116,6 +136,5 @@ export function startBridge(port = WS_PORT) {
 // Run directly if invoked as main module
 const isMain = process.argv[1]?.endsWith('ws-bridge.js')
 if (isMain) {
-  startUiBridge()
-  startBridge()
+  startUiBridge().then(() => startBridge())
 }
--- a/src-tauri/src/git.rs
+++ b/src-tauri/src/git.rs
@@ -427,20 +427,28 @@ pub fn git_pull(vault_path: &str) -> Result<GitPullResult, String> {
 }

 /// List files with merge conflicts (unmerged paths).
+///
+/// Uses `git ls-files --unmerged` instead of `git diff --diff-filter=U` because
+/// ls-files reliably detects unmerged index entries even when the merge state is
+/// stale (e.g. after a reboot or when MERGE_HEAD is missing).
 pub fn get_conflict_files(vault_path: &str) -> Result<Vec<String>, String> {
    let vault = Path::new(vault_path);
    let output = Command::new("git")
-        .args(["diff", "--name-only", "--diff-filter=U"])
+        .args(["ls-files", "--unmerged"])
        .current_dir(vault)
        .output()
        .map_err(|e| format!("Failed to check conflicts: {}", e))?;

    let stdout = String::from_utf8_lossy(&output.stdout);
-    Ok(stdout
+    // Each unmerged file appears multiple times (once per stage: base/ours/theirs).
+    // Format: "<mode> <hash> <stage>\t<path>"
+    let mut files: Vec<String> = stdout
        .lines()
-        .filter(|l| !l.is_empty())
-        .map(|l| l.to_string())
-        .collect())
+        .filter_map(|line| line.split('\t').nth(1).map(|s| s.to_string()))
+        .collect();
+    files.sort();
+    files.dedup();
+    Ok(files)
 }

 /// Parse `git pull` output to extract updated file paths.
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -448,9 +448,9 @@ fn save_vault_settings(vault_path: String, settings: VaultSettings) -> Result<()
 }

 #[tauri::command]
-fn set_active_theme(vault_path: String, theme_id: String) -> Result<(), String> {
+fn set_active_theme(vault_path: String, theme_id: Option<String>) -> Result<(), String> {
    let vault_path = expand_tilde(&vault_path);
-    theme::set_active_theme(&vault_path, &theme_id)
+    theme::set_active_theme(&vault_path, theme_id.as_deref())
 }

 #[tauri::command]
--- a/src-tauri/src/menu.rs
+++ b/src-tauri/src/menu.rs
@@ -23,6 +23,7 @@ const NOTE_TRASH: &str = "note-trash";
 const EDIT_FIND_IN_VAULT: &str = "edit-find-in-vault";
 const VIEW_GO_BACK: &str = "view-go-back";
 const VIEW_GO_FORWARD: &str = "view-go-forward";
+const APP_CHECK_FOR_UPDATES: &str = "app-check-for-updates";

 const CUSTOM_IDS: &[&str] = &[
    APP_SETTINGS,
@@ -44,6 +45,7 @@ const CUSTOM_IDS: &[&str] = &[
    VIEW_ZOOM_RESET,
    VIEW_GO_BACK,
    VIEW_GO_FORWARD,
+    APP_CHECK_FOR_UPDATES,
 ];

 /// IDs of menu items that should be disabled when no note tab is active.
@@ -56,10 +58,15 @@ fn build_app_menu(app: &App) -> MenuResult {
        .id(APP_SETTINGS)
        .accelerator("CmdOrCtrl+,")
        .build(app)?;
+    let check_updates_item = MenuItemBuilder::new("Check for Updates...")
+        .id(APP_CHECK_FOR_UPDATES)
+        .build(app)?;

    Ok(SubmenuBuilder::new(app, "Laputa")
        .about(None)
        .separator()
+        .item(&check_updates_item)
+        .separator()
        .item(&settings_item)
        .separator()
        .services()
@@ -269,6 +276,7 @@ mod tests {
            "view-zoom-reset",
            "view-go-back",
            "view-go-forward",
+            "app-check-for-updates",
        ];
        for id in &expected {
            assert!(CUSTOM_IDS.contains(id), "missing custom ID: {id}");
--- a/src-tauri/src/theme.rs
+++ b/src-tauri/src/theme.rs
@@ -98,10 +98,10 @@ pub fn save_vault_settings(vault_path: &str, settings: VaultSettings) -> Result<
        .map_err(|e| format!("Failed to write vault settings: {e}"))
 }

-/// Set the active theme in vault settings.
-pub fn set_active_theme(vault_path: &str, theme_id: &str) -> Result<(), String> {
+/// Set the active theme in vault settings. Pass `None` to clear.
+pub fn set_active_theme(vault_path: &str, theme_id: Option<&str>) -> Result<(), String> {
    let mut settings = get_vault_settings(vault_path)?;
-    settings.theme = Some(theme_id.to_string());
+    settings.theme = theme_id.map(|s| s.to_string());
    save_vault_settings(vault_path, settings)
 }

@@ -684,9 +684,14 @@ mod tests {
        assert!(settings.theme.is_none());

        // Set and read back
-        set_active_theme(vp, "dark").unwrap();
+        set_active_theme(vp, Some("dark")).unwrap();
        let settings = get_vault_settings(vp).unwrap();
        assert_eq!(settings.theme.as_deref(), Some("dark"));
+
+        // Clear theme
+        set_active_theme(vp, None).unwrap();
+        let settings = get_vault_settings(vp).unwrap();
+        assert_eq!(settings.theme, None);
    }

    #[test]
--- a/src-tauri/src/vault/mod.rs
+++ b/src-tauri/src/vault/mod.rs
@@ -68,6 +68,9 @@ pub struct VaultEntry {
    /// Markdown template for notes of this Type. When a new note is created
    /// with this type, the template body is pre-filled after the frontmatter.
    pub template: Option<String>,
+    /// Default sort preference for the note list when viewing instances of this Type.
+    /// Stored as "option:direction" (e.g. "modified:desc", "title:asc", "property:Priority:asc").
+    pub sort: Option<String>,
    /// Word count of the note body (excludes frontmatter and H1 title).
    #[serde(rename = "wordCount")]
    pub word_count: u32,
@@ -118,6 +121,8 @@ struct Frontmatter {
    sidebar_label: Option<String>,
    #[serde(default)]
    template: Option<String>,
+    #[serde(default)]
+    sort: Option<String>,
 }

 /// Handles YAML fields that can be either a single string or a list of strings.
@@ -163,6 +168,7 @@ const SKIP_KEYS: &[&str] = &[
    "order",
    "sidebar label",
    "template",
+    "sort",
 ];

 /// Extract all wikilink-containing fields from raw YAML frontmatter.
@@ -387,6 +393,7 @@ pub fn parse_md_file(path: &Path) -> Result<VaultEntry, String> {
        order: frontmatter.order,
        sidebar_label: frontmatter.sidebar_label,
        template: frontmatter.template,
+        sort: frontmatter.sort,
        word_count,
        outgoing_links,
        properties,
@@ -1183,6 +1190,40 @@ References:
        assert!(entry.relationships.get("template").is_none());
    }

+    // --- sort field tests ---
+
+    #[test]
+    fn test_parse_sort_from_type_entry() {
+        let dir = TempDir::new().unwrap();
+        let content = "---\ntype: Type\nsort: \"modified:desc\"\n---\n# Project\n";
+        let entry = parse_test_entry(&dir, "type/project.md", content);
+        assert_eq!(entry.sort, Some("modified:desc".to_string()));
+    }
+
+    #[test]
+    fn test_parse_sort_missing_defaults_to_none() {
+        let dir = TempDir::new().unwrap();
+        let content = "---\ntype: Type\n---\n# Project\n";
+        let entry = parse_test_entry(&dir, "type/project.md", content);
+        assert_eq!(entry.sort, None);
+    }
+
+    #[test]
+    fn test_sort_not_in_relationships() {
+        let dir = TempDir::new().unwrap();
+        let content = "---\ntype: Type\nsort: \"title:asc\"\n---\n# Project\n";
+        let entry = parse_test_entry(&dir, "type/project.md", content);
+        assert!(entry.relationships.get("sort").is_none());
+    }
+
+    #[test]
+    fn test_sort_not_in_properties() {
+        let dir = TempDir::new().unwrap();
+        let content = "---\ntype: Type\nsort: \"title:asc\"\n---\n# Project\n";
+        let entry = parse_test_entry(&dir, "type/project.md", content);
+        assert!(entry.properties.get("sort").is_none());
+    }
+
    // --- custom properties tests ---

    #[test]
--- a/src/App.test.tsx
+++ b/src/App.test.tsx
@@ -34,7 +34,7 @@ const mockEntries = [
    modifiedAt: 1700000000,
    createdAt: null,
    fileSize: 1024,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
  },
  {
@@ -51,7 +51,7 @@ const mockEntries = [
    modifiedAt: 1700000000,
    createdAt: null,
    fileSize: 256,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
  },
 ]
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -24,7 +24,7 @@ import { useAppCommands } from './hooks/useAppCommands'
 import { useDialogs } from './hooks/useDialogs'
 import { useVaultSwitcher } from './hooks/useVaultSwitcher'
 import { useGitHistory } from './hooks/useGitHistory'
-import { useUpdater } from './hooks/useUpdater'
+import { useUpdater, restartApp } from './hooks/useUpdater'
 import { useNavigationHistory } from './hooks/useNavigationHistory'
 import { useAutoSync } from './hooks/useAutoSync'
 import { useConflictResolver } from './hooks/useConflictResolver'
@@ -280,6 +280,14 @@ function App() {
  const { status: updateStatus, actions: updateActions } = useUpdater()

  const handleCheckForUpdates = useCallback(async () => {
+    if (updateStatus.state === 'downloading') {
+      setToastMessage('Update is downloading…')
+      return
+    }
+    if (updateStatus.state === 'ready') {
+      await restartApp()
+      return
+    }
    const result = await updateActions.checkForUpdates()
    if (result === 'up-to-date') {
      setToastMessage("You're on the latest version")
@@ -287,7 +295,7 @@ function App() {
      setToastMessage('Could not check for updates')
    }
    // 'available' → UpdateBanner handles it automatically
-  }, [updateActions, setToastMessage])
+  }, [updateActions, updateStatus.state, setToastMessage])

  const commands = useAppCommands({
    activeTabPath: notes.activeTabPath, activeTabPathRef: notes.activeTabPathRef,
@@ -322,9 +330,13 @@ function App() {
    themes: themeManager.themes, activeThemeId: themeManager.activeThemeId,
    onSwitchTheme: themeManager.switchTheme,
    onCreateTheme: async () => {
-      await themeManager.createTheme()
-      await vault.reloadVault()
+      const path = await themeManager.createTheme()
+      const freshEntries = await vault.reloadVault()
      setSelection({ kind: 'sectionGroup', type: 'Theme' })
+      if (path) {
+        const entry = freshEntries.find(e => e.path === path)
+        if (entry) notes.handleSelectNote(entry)
+      }
    },
    onOpenTheme: (themeId: string) => {
      const entry = vault.entries.find(e => e.path === themeId)
@@ -334,7 +346,6 @@ function App() {
    onCreateType: dialogs.openCreateType,
    onToggleAIChat: dialogs.toggleAIChat,
    onCheckForUpdates: handleCheckForUpdates,
-    isUpdating: updateStatus.state === 'downloading' || updateStatus.state === 'ready',
    onRemoveActiveVault: () => vaultSwitcher.removeVault(vaultSwitcher.vaultPath),
    onRestoreGettingStarted: vaultSwitcher.restoreGettingStarted,
    isGettingStartedHidden: vaultSwitcher.isGettingStartedHidden,
@@ -386,7 +397,7 @@ function App() {
        {noteListVisible && (
          <>
            <div className="app__note-list" style={{ width: layout.noteListWidth }}>
-              <NoteList entries={vault.entries} selection={selection} selectedNote={activeTab?.entry ?? null} allContent={vault.allContent} modifiedFiles={vault.modifiedFiles} modifiedFilesError={vault.modifiedFilesError} getNoteStatus={vault.getNoteStatus} sidebarCollapsed={!sidebarVisible} onSelectNote={notes.handleSelectNote} onReplaceActiveTab={notes.handleReplaceActiveTab} onCreateNote={notes.handleCreateNoteImmediate} onBulkArchive={bulkActions.handleBulkArchive} onBulkTrash={bulkActions.handleBulkTrash} />
+              <NoteList entries={vault.entries} selection={selection} selectedNote={activeTab?.entry ?? null} allContent={vault.allContent} modifiedFiles={vault.modifiedFiles} modifiedFilesError={vault.modifiedFilesError} getNoteStatus={vault.getNoteStatus} sidebarCollapsed={!sidebarVisible} onSelectNote={notes.handleSelectNote} onReplaceActiveTab={notes.handleReplaceActiveTab} onCreateNote={notes.handleCreateNoteImmediate} onBulkArchive={bulkActions.handleBulkArchive} onBulkTrash={bulkActions.handleBulkTrash} onUpdateTypeSort={notes.handleUpdateFrontmatter} updateEntry={vault.updateEntry} />
            </div>
            <ResizeHandle onResize={layout.handleNoteListResize} />
          </>
--- a/src/components/AiPanel.test.tsx
+++ b/src/components/AiPanel.test.tsx
@@ -1,5 +1,5 @@
 import { describe, it, expect, vi } from 'vitest'
-import { render, screen, fireEvent } from '@testing-library/react'
+import { render, screen, fireEvent, act } from '@testing-library/react'
 import { AiPanel } from './AiPanel'
 import type { VaultEntry } from '../types'

@@ -133,4 +133,33 @@ describe('AiPanel', () => {
    const input = screen.getByTestId('agent-input') as HTMLInputElement
    expect(input.placeholder).toBe('Ask the AI agent...')
  })
+
+  it('auto-focuses input on mount', async () => {
+    vi.useFakeTimers()
+    render(<AiPanel onClose={vi.fn()} vaultPath="/tmp/vault" />)
+    await act(() => { vi.advanceTimersByTime(1) })
+    const input = screen.getByTestId('agent-input')
+    expect(document.activeElement).toBe(input)
+    vi.useRealTimers()
+  })
+
+  it('calls onClose when Escape is pressed while panel has focus', async () => {
+    vi.useFakeTimers()
+    const onClose = vi.fn()
+    render(<AiPanel onClose={onClose} vaultPath="/tmp/vault" />)
+    await act(() => { vi.advanceTimersByTime(1) })
+    // Input is focused inside the panel, so Escape should trigger onClose
+    fireEvent.keyDown(document.activeElement!, { key: 'Escape' })
+    expect(onClose).toHaveBeenCalledOnce()
+    vi.useRealTimers()
+  })
+
+  it('calls onClose when Escape is pressed on panel element', () => {
+    const onClose = vi.fn()
+    render(<AiPanel onClose={onClose} vaultPath="/tmp/vault" />)
+    const panel = screen.getByTestId('ai-panel')
+    panel.focus()
+    fireEvent.keyDown(panel, { key: 'Escape' })
+    expect(onClose).toHaveBeenCalledOnce()
+  })
 })
--- a/src/components/AiPanel.tsx
+++ b/src/components/AiPanel.tsx
@@ -1,4 +1,4 @@
-import { useState, useRef, useEffect, useMemo } from 'react'
+import { useState, useRef, useEffect, useCallback, useMemo } from 'react'
 import { Robot, X, PaperPlaneRight, Plus, Link } from '@phosphor-icons/react'
 import { AiMessage } from './AiMessage'
 import { useAiAgent, type AiAgentMessage } from '../hooks/useAiAgent'
@@ -103,10 +103,10 @@ function MessageHistory({ messages, isActive, onOpenNote, hasContext }: {
  )
 }

-function InputBar({ input, onInputChange, onSend, onKeyDown, isActive, hasContext }: {
+function InputBar({ input, onInputChange, onSend, onKeyDown, isActive, hasContext, inputRef }: {
  input: string; onInputChange: (v: string) => void
  onSend: () => void; onKeyDown: (e: React.KeyboardEvent) => void
-  isActive: boolean; hasContext: boolean
+  isActive: boolean; hasContext: boolean; inputRef: React.RefObject<HTMLInputElement | null>
 }) {
  const sendDisabled = isActive || !input.trim()
  return (
@@ -116,6 +116,7 @@ function InputBar({ input, onInputChange, onSend, onKeyDown, isActive, hasContex
    >
      <div className="flex items-end gap-2">
        <input
+          ref={inputRef}
          value={input}
          onChange={e => onInputChange(e.target.value)}
          onKeyDown={onKeyDown}
@@ -150,6 +151,8 @@ function InputBar({ input, onInputChange, onSend, onKeyDown, isActive, hasContex

 export function AiPanel({ onClose, onOpenNote, vaultPath, activeEntry, entries, allContent }: AiPanelProps) {
  const [input, setInput] = useState('')
+  const inputRef = useRef<HTMLInputElement>(null)
+  const panelRef = useRef<HTMLElement>(null)

  const linkedEntries = useMemo(() => {
    if (!activeEntry || !entries) return []
@@ -163,9 +166,33 @@ export function AiPanel({ onClose, onOpenNote, vaultPath, activeEntry, entries,

  const agent = useAiAgent(vaultPath, contextPrompt)
  const hasContext = !!activeEntry
-
  const isActive = agent.status === 'thinking' || agent.status === 'tool-executing'

+  useEffect(() => {
+    const timer = setTimeout(() => inputRef.current?.focus(), 0)
+    return () => clearTimeout(timer)
+  }, [])
+
+  useEffect(() => {
+    if (isActive) {
+      panelRef.current?.focus()
+    } else {
+      inputRef.current?.focus()
+    }
+  }, [isActive])
+
+  const handleEscape = useCallback((e: KeyboardEvent) => {
+    if (e.key === 'Escape' && panelRef.current?.contains(document.activeElement)) {
+      e.preventDefault()
+      onClose()
+    }
+  }, [onClose])
+
+  useEffect(() => {
+    window.addEventListener('keydown', handleEscape)
+    return () => window.removeEventListener('keydown', handleEscape)
+  }, [handleEscape])
+
  const handleSend = () => {
    if (!input.trim() || isActive) return
    agent.sendMessage(input)
@@ -181,7 +208,10 @@ export function AiPanel({ onClose, onOpenNote, vaultPath, activeEntry, entries,

  return (
    <aside
+      ref={panelRef}
+      tabIndex={-1}
      className="flex flex-1 flex-col overflow-hidden border-l border-border bg-background text-foreground"
+      style={{ outline: 'none' }}
      data-testid="ai-panel"
    >
      <PanelHeader onClose={onClose} onClear={agent.clearConversation} />
@@ -201,6 +231,7 @@ export function AiPanel({ onClose, onOpenNote, vaultPath, activeEntry, entries,
        onKeyDown={handleKeyDown}
        isActive={isActive}
        hasContext={hasContext}
+        inputRef={inputRef}
      />
    </aside>
  )
--- a/src/components/DynamicPropertiesPanel.test.tsx
+++ b/src/components/DynamicPropertiesPanel.test.tsx
@@ -51,7 +51,7 @@ const makeEntry = (overrides: Partial<VaultEntry> = {}): VaultEntry => ({
  icon: null,
  color: null,
  order: null,
-  template: null,
+  template: null, sort: null,
  outgoingLinks: [],
  ...overrides,
 })
--- a/src/components/Editor.test.tsx
+++ b/src/components/Editor.test.tsx
@@ -75,7 +75,7 @@ const mockEntry: VaultEntry = {
  icon: null,
  color: null,
    order: null,
-  template: null,
+  template: null, sort: null,
  outgoingLinks: [],
 }

--- a/src/components/Inspector.test.tsx
+++ b/src/components/Inspector.test.tsx
@@ -26,7 +26,7 @@ const mockEntry: VaultEntry = {
  icon: null,
  color: null,
    order: null,
-  template: null,
+  template: null, sort: null,
  outgoingLinks: [],
 }

@@ -71,7 +71,7 @@ const referrerEntry: VaultEntry = {
  icon: null,
  color: null,
  order: null,
-  template: null,
+  template: null, sort: null,
  outgoingLinks: ['Test Project'],
 }

@@ -376,7 +376,7 @@ This is a test note with some words to count.
      icon: null,
      color: null,
      order: null,
-      template: null,
+      template: null, sort: null,
      outgoingLinks: [],
    }

@@ -403,7 +403,7 @@ This is a test note with some words to count.
      icon: null,
      color: null,
      order: null,
-      template: null,
+      template: null, sort: null,
      outgoingLinks: [],
    }

@@ -430,7 +430,7 @@ This is a test note with some words to count.
      icon: null,
      color: null,
      order: null,
-      template: null,
+      template: null, sort: null,
      outgoingLinks: [],
    }

@@ -457,7 +457,7 @@ This is a test note with some words to count.
      icon: null,
      color: null,
      order: null,
-      template: null,
+      template: null, sort: null,
      outgoingLinks: [],
    }

@@ -600,7 +600,7 @@ Status: Active
        icon: null,
        color: null,
        order: null,
-        template: null,
+        template: null, sort: null,
        // Body text also links to grow-newsletter
        outgoingLinks: ['responsibility/grow-newsletter'],
      }
--- a/src/components/InspectorPanels.test.tsx
+++ b/src/components/InspectorPanels.test.tsx
@@ -30,7 +30,7 @@ const makeEntry = (overrides: Partial<VaultEntry> = {}): VaultEntry => ({
  icon: null,
  color: null,
  order: null,
-  template: null,
+  template: null, sort: null,
  outgoingLinks: [],
  ...overrides,
 })
--- a/src/components/NoteList.test.tsx
+++ b/src/components/NoteList.test.tsx
@@ -34,7 +34,7 @@ const mockEntries: VaultEntry[] = [
    icon: null,
    color: null,
    order: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -64,7 +64,7 @@ const mockEntries: VaultEntry[] = [
    icon: null,
    color: null,
    order: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -91,7 +91,7 @@ const mockEntries: VaultEntry[] = [
    icon: null,
    color: null,
    order: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -118,7 +118,7 @@ const mockEntries: VaultEntry[] = [
    icon: null,
    color: null,
    order: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -145,7 +145,7 @@ const mockEntries: VaultEntry[] = [
    icon: null,
    color: null,
    order: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -367,7 +367,7 @@ describe('getSortComparator', () => {
    icon: null,
    color: null,
    order: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
    ...overrides,
@@ -481,7 +481,7 @@ describe('NoteList sort controls', () => {
    icon: null,
    color: null,
    order: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
    ...overrides,
@@ -739,7 +739,7 @@ const trashedEntry: VaultEntry = {
  icon: null,
  color: null,
  order: null,
-  template: null,
+  template: null, sort: null,
  outgoingLinks: [],
  properties: {},
 }
@@ -767,7 +767,7 @@ const expiredTrashedEntry: VaultEntry = {
  icon: null,
  color: null,
  order: null,
-  template: null,
+  template: null, sort: null,
  outgoingLinks: [],
  properties: {},
 }
@@ -924,7 +924,7 @@ describe('NoteList — virtual list with large datasets', () => {
    icon: null,
    color: null,
    order: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
    ...overrides,
@@ -1254,7 +1254,7 @@ const typeEntry: VaultEntry = {
  icon: null,
  color: null,
  order: null,
-  template: null,
+  template: null, sort: null,
  outgoingLinks: [],
  properties: {},
 }
--- a/src/components/NoteList.tsx
+++ b/src/components/NoteList.tsx
@@ -1,4 +1,4 @@
-import { useState, useMemo, useCallback, useEffect, memo } from 'react'
+import { useState, useMemo, useCallback, useEffect, useRef, memo } from 'react'
 import { useDragRegion } from '../hooks/useDragRegion'
 import { Virtuoso, type VirtuosoHandle } from 'react-virtuoso'
 import type { VaultEntry, SidebarSelection, ModifiedFile, NoteStatus } from '../types'
@@ -18,6 +18,7 @@ import {
  buildRelationshipGroups, filterEntries,
  relativeDate, getDisplayDate,
  loadSortPreferences, saveSortPreferences,
+  parseSortConfig, serializeSortConfig, clearListSortFromLocalStorage,
 } from '../utils/noteListHelpers'

 interface NoteListProps {
@@ -34,6 +35,8 @@ interface NoteListProps {
  onCreateNote: () => void
  onBulkArchive?: (paths: string[]) => void
  onBulkTrash?: (paths: string[]) => void
+  onUpdateTypeSort?: (path: string, key: string, value: string | number | boolean | string[] | null) => void
+  updateEntry?: (path: string, patch: Partial<VaultEntry>) => void
 }

 function PinnedCard({ entry, typeEntryMap, onClickNote, showDate }: {
@@ -256,11 +259,6 @@ function useNoteListData({ entries, selection, allContent, query, listSort, list
  const isEntityView = selection.kind === 'entity'
  const isTrashView = selection.kind === 'filter' && selection.filter === 'trash'

-  const typeDocument = useMemo(() => {
-    if (selection.kind !== 'sectionGroup') return null
-    return entries.find((e) => e.isA === 'Type' && e.title === selection.type) ?? null
-  }, [selection, entries])
-
  const filteredEntries = useFilteredEntries(entries, selection, modifiedPathSet, modifiedSuffixes)

  const searched = useMemo(() => {
@@ -279,14 +277,26 @@ function useNoteListData({ entries, selection, allContent, query, listSort, list
    [isTrashView, searched],
  )

-  return { isEntityView, isTrashView, typeDocument, searched, searchedGroups, expiredTrashCount }
+  return { isEntityView, isTrashView, searched, searchedGroups, expiredTrashCount }
+}
+
+// --- Pure helpers ---
+
+const DEFAULT_LIST_CONFIG: SortConfig = { option: 'modified', direction: 'desc' }
+
+function resolveListSortConfig(typeDocument: VaultEntry | null, sortPrefs: Record<string, SortConfig>): SortConfig {
+  if (typeDocument?.sort) {
+    const parsed = parseSortConfig(typeDocument.sort)
+    if (parsed) return parsed
+  }
+  return sortPrefs['__list__'] ?? DEFAULT_LIST_CONFIG
 }

 // --- Main component ---

 const defaultGetNoteStatus = (): NoteStatus => 'clean'

-function NoteListInner({ entries, selection, selectedNote, allContent, modifiedFiles, modifiedFilesError, getNoteStatus, sidebarCollapsed, onSelectNote, onReplaceActiveTab, onCreateNote, onBulkArchive, onBulkTrash }: NoteListProps) {
+function NoteListInner({ entries, selection, selectedNote, allContent, modifiedFiles, modifiedFilesError, getNoteStatus, sidebarCollapsed, onSelectNote, onReplaceActiveTab, onCreateNote, onBulkArchive, onBulkTrash, onUpdateTypeSort, updateEntry }: NoteListProps) {
  const [search, setSearch] = useState('')
  const [searchVisible, setSearchVisible] = useState(false)
  const [collapsedGroups, setCollapsedGroups] = useState<Set<string>>(new Set())
@@ -311,9 +321,43 @@ function NoteListInner({ entries, selection, selectedNote, allContent, modifiedF
    [getNoteStatus, modifiedFiles, modifiedPathSet],
  )

+  // Resolve the type document for sectionGroup selections (needs to be above sort logic)
+  const typeDocument = useMemo(() => {
+    if (selection.kind !== 'sectionGroup') return null
+    return entries.find((e) => e.isA === 'Type' && e.title === selection.type) ?? null
+  }, [selection, entries])
+
+  // Resolve list sort config: read from type frontmatter for sectionGroup, else localStorage
+  const listConfig = resolveListSortConfig(typeDocument, sortPrefs)
+
+  // Silent migration: if type has no sort in frontmatter but localStorage has __list__, migrate it
+  const migrationDoneRef = useRef<Set<string>>(new Set())
+  useEffect(() => {
+    if (!typeDocument || typeDocument.sort || !onUpdateTypeSort || !updateEntry) return
+    if (migrationDoneRef.current.has(typeDocument.path)) return
+    const lsConfig = sortPrefs['__list__']
+    if (!lsConfig) return
+    migrationDoneRef.current.add(typeDocument.path)
+    const serialized = serializeSortConfig(lsConfig)
+    onUpdateTypeSort(typeDocument.path, 'sort', serialized)
+    updateEntry(typeDocument.path, { sort: serialized })
+    clearListSortFromLocalStorage()
+  }, [typeDocument, sortPrefs, onUpdateTypeSort, updateEntry])
+
  const handleSortChange = useCallback((groupLabel: string, option: SortOption, direction: SortDirection) => {
-    setSortPrefs((prev) => { const next = { ...prev, [groupLabel]: { option, direction } }; saveSortPreferences(next); return next })
-  }, [])
+    if (groupLabel === '__list__' && typeDocument && onUpdateTypeSort && updateEntry) {
+      // Persist sort to type file frontmatter
+      const config: SortConfig = { option, direction }
+      const serialized = serializeSortConfig(config)
+      onUpdateTypeSort(typeDocument.path, 'sort', serialized)
+      updateEntry(typeDocument.path, { sort: serialized })
+      // Clear old localStorage __list__ entry if present (migration cleanup)
+      clearListSortFromLocalStorage()
+    } else {
+      // Relationship group sorts still use localStorage
+      setSortPrefs((prev) => { const next = { ...prev, [groupLabel]: { option, direction } }; saveSortPreferences(next); return next })
+    }
+  }, [typeDocument, onUpdateTypeSort, updateEntry])

  const toggleGroup = useCallback((label: string) => {
    setCollapsedGroups((prev) => toggleSetMember(prev, label))
@@ -321,7 +365,6 @@ function NoteListInner({ entries, selection, selectedNote, allContent, modifiedF

  const typeEntryMap = useTypeEntryMap(entries)
  const query = search.trim().toLowerCase()
-  const listConfig = sortPrefs['__list__'] ?? { option: 'modified' as SortOption, direction: 'desc' as SortDirection }

  // Compute custom properties and derive effective sort before sorting entries
  const filteredEntries = useFilteredEntries(entries, selection, modifiedPathSet, modifiedSuffixes)
@@ -332,7 +375,7 @@ function NoteListInner({ entries, selection, selectedNote, allContent, modifiedF
    return customProperties.includes(opt.slice('property:'.length)) ? opt : 'modified'
  }, [listConfig.option, customProperties])
  const listDirection = listSort === listConfig.option ? listConfig.direction : 'desc'
-  const { isEntityView, isTrashView, typeDocument, searched, searchedGroups, expiredTrashCount } = useNoteListData({ entries, selection, allContent, query, listSort, listDirection, modifiedPathSet, modifiedSuffixes })
+  const { isEntityView, isTrashView, searched, searchedGroups, expiredTrashCount } = useNoteListData({ entries, selection, allContent, query, listSort, listDirection, modifiedPathSet, modifiedSuffixes })
  const isChangesView = selection.kind === 'filter' && selection.filter === 'changes'

  const noteListKeyboard = useNoteListKeyboard({
--- a/src/components/QuickOpenPalette.test.tsx
+++ b/src/components/QuickOpenPalette.test.tsx
@@ -26,7 +26,7 @@ const makeEntry = (overrides: Partial<VaultEntry> = {}): VaultEntry => ({
  icon: null,
  color: null,
  order: null,
-  template: null,
+  template: null, sort: null,
  outgoingLinks: [],
  ...overrides,
 })
--- a/src/components/RawEditorView.test.tsx
+++ b/src/components/RawEditorView.test.tsx
@@ -11,7 +11,7 @@ function entry(title: string, path = `/vault/note/${title}.md`) {
    cadence: null, archived: false, trashed: false, trashedAt: null,
    modifiedAt: null, createdAt: null, fileSize: 0, snippet: '', wordCount: 0,
    relationships: {}, icon: null, color: null, order: null,
-    sidebarLabel: null, template: null, outgoingLinks: [],
+    sidebarLabel: null, template: null, sort: null, outgoingLinks: [],
    properties: {},
  }
 }
--- a/src/components/SearchPanel.test.tsx
+++ b/src/components/SearchPanel.test.tsx
@@ -38,7 +38,7 @@ const MOCK_ENTRIES: VaultEntry[] = [
    icon: null,
    color: null,
    order: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: ['topic/ai', 'topic/api-design', 'person/luca'],
    properties: {},
  },
@@ -65,7 +65,7 @@ const MOCK_ENTRIES: VaultEntry[] = [
    icon: null,
    color: null,
    order: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: ['person/bob'],
    properties: {},
  },
--- a/src/components/SettingsPanel.tsx
+++ b/src/components/SettingsPanel.tsx
@@ -349,7 +349,7 @@ function AppearanceSection({ themeManager }: { themeManager: ThemeManager }) {
      <button
        className="border border-border bg-transparent text-muted-foreground rounded cursor-pointer hover:text-foreground hover:border-foreground"
        style={{ fontSize: 12, padding: '6px 12px', display: 'flex', alignItems: 'center', gap: 4, alignSelf: 'flex-start' }}
-        onClick={() => createTheme(activeThemeId ?? undefined)}
+        onClick={() => createTheme()}
        type="button"
        data-testid="create-theme"
      >
--- a/src/components/Sidebar.test.tsx
+++ b/src/components/Sidebar.test.tsx
@@ -40,7 +40,7 @@ const mockEntries: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -68,7 +68,7 @@ const mockEntries: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -96,7 +96,7 @@ const mockEntries: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -124,7 +124,7 @@ const mockEntries: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -152,7 +152,7 @@ const mockEntries: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -180,7 +180,7 @@ const mockEntries: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -208,7 +208,7 @@ const mockEntries: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -236,7 +236,7 @@ const mockEntries: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -457,7 +457,7 @@ describe('Sidebar', () => {
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
      },
@@ -485,7 +485,7 @@ describe('Sidebar', () => {
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
      },
@@ -512,7 +512,7 @@ describe('Sidebar', () => {
        icon: null,
        color: null,
        order: null,
-        template: null,
+        template: null, sort: null,
        outgoingLinks: [],
        properties: {},
      },
@@ -539,7 +539,7 @@ describe('Sidebar', () => {
        icon: null,
        color: null,
        order: null,
-        template: null,
+        template: null, sort: null,
        outgoingLinks: [],
        properties: {},
      },
@@ -627,7 +627,7 @@ describe('Sidebar', () => {
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
      }
--- a/src/components/StatusBar.tsx
+++ b/src/components/StatusBar.tsx
@@ -1,5 +1,5 @@
 import { useState, useRef, useEffect } from 'react'
-import { Package, RefreshCw, Sparkles, FileText, Bell, Settings, FolderOpen, Check, Github, CircleDot, AlertTriangle, Loader2, GitCommitHorizontal, Search, X } from 'lucide-react'
+import { Package, RefreshCw, FileText, Bell, Settings, FolderOpen, Check, Github, CircleDot, AlertTriangle, Loader2, GitCommitHorizontal, Search, X } from 'lucide-react'
 import type { LastCommitInfo, SyncStatus } from '../types'
 import type { IndexingProgress } from '../hooks/useIndexing'
 import { openExternalUrl } from '../utils/url'
@@ -302,7 +302,6 @@ export function StatusBar({ noteCount, modifiedCount = 0, vaultPath, vaults, onS
        {indexingProgress && <IndexingBadge progress={indexingProgress} />}
      </div>
      <div style={{ display: 'flex', alignItems: 'center', gap: 12 }}>
-        <span style={ICON_STYLE}><Sparkles size={13} style={{ color: 'var(--accent-purple)' }} />Claude Sonnet 4</span>
        <span style={ICON_STYLE}><FileText size={13} />{noteCount.toLocaleString()} notes</span>
        {zoomLevel !== 100 && (
          <span
--- a/src/components/TabBar.test.tsx
+++ b/src/components/TabBar.test.tsx
@@ -11,7 +11,7 @@ function makeEntry(path: string, title: string): VaultEntry {
    status: null, owner: null, cadence: null, archived: false,
    trashed: false, trashedAt: null,
    modifiedAt: null, createdAt: null, fileSize: 0,
-    snippet: '', wordCount: 0, relationships: {}, icon: null, color: null, order: null, template: null, outgoingLinks: [],
+    snippet: '', wordCount: 0, relationships: {}, icon: null, color: null, order: null, template: null, sort: null, outgoingLinks: [],
  }
 }

--- a/src/hooks/useAppCommands.ts
+++ b/src/hooks/useAppCommands.ts
@@ -60,7 +60,6 @@ interface AppCommandsConfig {
  onCreateType?: () => void
  onToggleAIChat?: () => void
  onCheckForUpdates?: () => void
-  isUpdating?: boolean
  onRemoveActiveVault?: () => void
  onRestoreGettingStarted?: () => void
  isGettingStartedHidden?: boolean
@@ -122,6 +121,7 @@ export function useAppCommands(config: AppCommandsConfig): CommandAction[] {
    onSearch: config.onSearch,
    onGoBack: config.onGoBack,
    onGoForward: config.onGoForward,
+    onCheckForUpdates: config.onCheckForUpdates,
    activeTabPathRef: config.activeTabPathRef,
    handleCloseTabRef: config.handleCloseTabRef,
    activeTabPath: config.activeTabPath,
@@ -168,7 +168,6 @@ export function useAppCommands(config: AppCommandsConfig): CommandAction[] {
    onCreateType: config.onCreateType,
    onToggleAIChat: config.onToggleAIChat,
    onCheckForUpdates: config.onCheckForUpdates,
-    isUpdating: config.isUpdating,
    onRemoveActiveVault: config.onRemoveActiveVault,
    onRestoreGettingStarted: config.onRestoreGettingStarted,
    isGettingStartedHidden: config.isGettingStartedHidden,
--- a/src/hooks/useCommandRegistry.test.ts
+++ b/src/hooks/useCommandRegistry.test.ts
@@ -26,7 +26,7 @@ const makeEntry = (overrides: Partial<VaultEntry> = {}): VaultEntry => ({
  icon: null,
  color: null,
  order: null,
-  template: null,
+  template: null, sort: null,
  outgoingLinks: [],
  ...overrides,
 })
@@ -369,20 +369,11 @@ describe('useCommandRegistry', () => {
      expect(cmd!.keywords).toContain('version')
    })

-    it('is enabled when not updating', () => {
-      const { result } = renderHook(() =>
-        useCommandRegistry(makeConfig({ isUpdating: false })),
-      )
+    it('is always enabled', () => {
+      const { result } = renderHook(() => useCommandRegistry(makeConfig()))
      expect(result.current.find(c => c.id === 'check-updates')!.enabled).toBe(true)
    })

-    it('is disabled when updating', () => {
-      const { result } = renderHook(() =>
-        useCommandRegistry(makeConfig({ isUpdating: true })),
-      )
-      expect(result.current.find(c => c.id === 'check-updates')!.enabled).toBe(false)
-    })
-
    it('calls onCheckForUpdates when executed', () => {
      const onCheckForUpdates = vi.fn()
      const { result } = renderHook(() =>
--- a/src/hooks/useCommandRegistry.ts
+++ b/src/hooks/useCommandRegistry.ts
@@ -40,7 +40,6 @@ interface CommandRegistryConfig {
  onToggleAIChat?: () => void
  activeNoteModified: boolean
  onCheckForUpdates?: () => void
-  isUpdating?: boolean
  onZoomIn: () => void
  onZoomOut: () => void
  onZoomReset: () => void
@@ -191,7 +190,7 @@ export function useCommandRegistry(config: CommandRegistryConfig): CommandAction
    onSelect, onOpenDailyNote, onCloseTab,
    onGoBack, onGoForward, canGoBack, canGoForward,
    themes, activeThemeId, onSwitchTheme, onCreateTheme, onOpenTheme,
-    onCheckForUpdates, isUpdating,
+    onCheckForUpdates,
    onCreateType,
    onRemoveActiveVault, onRestoreGettingStarted, isGettingStartedHidden, vaultCount,
  } = config
@@ -252,7 +251,7 @@ export function useCommandRegistry(config: CommandRegistryConfig): CommandAction
      { id: 'open-vault', label: 'Open Vault…', group: 'Settings', keywords: ['vault', 'folder', 'switch', 'open', 'workspace'], enabled: true, execute: () => onOpenVault?.() },
      { id: 'remove-vault', label: 'Remove Vault from List', group: 'Settings', keywords: ['vault', 'remove', 'disconnect', 'hide'], enabled: (vaultCount ?? 0) > 1 && !!onRemoveActiveVault, execute: () => onRemoveActiveVault?.() },
      { id: 'restore-getting-started', label: 'Restore Getting Started Vault', group: 'Settings', keywords: ['vault', 'restore', 'demo', 'getting started', 'reset'], enabled: !!isGettingStartedHidden && !!onRestoreGettingStarted, execute: () => onRestoreGettingStarted?.() },
-      { id: 'check-updates', label: 'Check for Updates', group: 'Settings', keywords: ['update', 'version', 'upgrade', 'release'], enabled: !isUpdating, execute: () => onCheckForUpdates?.() },
+      { id: 'check-updates', label: 'Check for Updates', group: 'Settings', keywords: ['update', 'version', 'upgrade', 'release'], enabled: true, execute: () => onCheckForUpdates?.() },

      // Type-aware: "New [Type]" and "List [Type]"
      ...buildTypeCommands(vaultTypes, onCreateNoteOfType, onSelect),
@@ -264,7 +263,7 @@ export function useCommandRegistry(config: CommandRegistryConfig): CommandAction
    onQuickOpen, onCreateNote, onCreateNoteOfType, onCreateType, onSave, onOpenSettings,
    onTrashNote, onRestoreNote, onArchiveNote, onUnarchiveNote,
    onCommitPush, onResolveConflicts, onSetViewMode, onToggleInspector, onToggleDiff, onToggleRawEditor, onToggleAIChat, onOpenVault,
-    onCheckForUpdates, isUpdating,
+    onCheckForUpdates,
    onZoomIn, onZoomOut, onZoomReset, zoomLevel,
    onSelect, onOpenDailyNote, onCloseTab,
    onGoBack, onGoForward, canGoBack, canGoForward,
--- a/src/hooks/useEntryActions.test.ts
+++ b/src/hooks/useEntryActions.test.ts
@@ -26,7 +26,7 @@ const makeEntry = (overrides: Partial<VaultEntry> = {}): VaultEntry => ({
  icon: null,
  color: null,
  order: null,
-  template: null,
+  template: null, sort: null,
  outgoingLinks: [],
  properties: {},
  ...overrides,
--- a/src/hooks/useKeyboardNavigation.test.ts
+++ b/src/hooks/useKeyboardNavigation.test.ts
@@ -30,7 +30,7 @@ const makeEntry = (overrides: Partial<VaultEntry> = {}): VaultEntry => ({
  icon: null,
  color: null,
  order: null,
-  template: null,
+  template: null, sort: null,
  outgoingLinks: [],
  properties: {},
  ...overrides,
--- a/src/hooks/useMenuEvents.test.ts
+++ b/src/hooks/useMenuEvents.test.ts
@@ -19,6 +19,7 @@ function makeHandlers(): MenuEventHandlers {
    onSearch: vi.fn(),
    onGoBack: vi.fn(),
    onGoForward: vi.fn(),
+    onCheckForUpdates: vi.fn(),
    activeTabPathRef: { current: '/vault/test.md' } as React.MutableRefObject<string | null>,
    handleCloseTabRef: { current: vi.fn() } as React.MutableRefObject<(path: string) => void>,
    activeTabPath: '/vault/test.md',
@@ -161,6 +162,12 @@ describe('dispatchMenuEvent', () => {
    expect(h.onGoForward).toHaveBeenCalled()
  })

+  it('app-check-for-updates triggers check for updates', () => {
+    const h = makeHandlers()
+    dispatchMenuEvent('app-check-for-updates', h)
+    expect(h.onCheckForUpdates).toHaveBeenCalled()
+  })
+
  it('unknown event ID does nothing', () => {
    const h = makeHandlers()
    dispatchMenuEvent('unknown-event', h)
--- a/src/hooks/useMenuEvents.ts
+++ b/src/hooks/useMenuEvents.ts
@@ -19,6 +19,7 @@ export interface MenuEventHandlers {
  onSearch: () => void
  onGoBack?: () => void
  onGoForward?: () => void
+  onCheckForUpdates?: () => void
  activeTabPathRef: React.MutableRefObject<string | null>
  handleCloseTabRef: React.MutableRefObject<(path: string) => void>
  activeTabPath: string | null
@@ -58,6 +59,7 @@ function dispatchActiveTabEvent(id: string, h: MenuEventHandlers): boolean {
 function dispatchOptionalEvent(id: string, h: MenuEventHandlers): boolean {
  if (id === 'view-go-back') { h.onGoBack?.(); return true }
  if (id === 'view-go-forward') { h.onGoForward?.(); return true }
+  if (id === 'app-check-for-updates') { h.onCheckForUpdates?.(); return true }
  return false
 }

--- a/src/hooks/useNoteActions.test.ts
+++ b/src/hooks/useNoteActions.test.ts
@@ -59,7 +59,7 @@ const makeEntry = (overrides: Partial<VaultEntry> = {}): VaultEntry => ({
  color: null,
  order: null,
  outgoingLinks: [],
-  template: null,
+  template: null, sort: null,
  ...overrides,
 })

--- a/src/hooks/useNoteActions.ts
+++ b/src/hooks/useNoteActions.ts
@@ -72,7 +72,7 @@ export function buildNewEntry({ path, slug, title, type, status }: NewEntryParam
    aliases: [], belongsTo: [], relatedTo: [],
    status, owner: null, cadence: null, archived: false, trashed: false, trashedAt: null,
    modifiedAt: now, createdAt: now, fileSize: 0,
-    snippet: '', wordCount: 0, relationships: {}, icon: null, color: null, order: null, outgoingLinks: [], sidebarLabel: null, template: null, properties: {},
+    snippet: '', wordCount: 0, relationships: {}, icon: null, color: null, order: null, outgoingLinks: [], sidebarLabel: null, template: null, sort: null, properties: {},
  }
 }

@@ -148,7 +148,7 @@ const ENTRY_DELETE_MAP: Record<string, Partial<VaultEntry>> = {
  icon: { icon: null }, owner: { owner: null }, cadence: { cadence: null },
  aliases: { aliases: [] }, belongs_to: { belongsTo: [] }, related_to: { relatedTo: [] },
  archived: { archived: false }, trashed: { trashed: false }, order: { order: null },
-  template: { template: null },
+  template: { template: null }, sort: { sort: null },
 }

 /** Map a frontmatter key+value to the corresponding VaultEntry field(s). */
@@ -166,6 +166,7 @@ export function frontmatterToEntryPatch(
    archived: { archived: Boolean(value) }, trashed: { trashed: Boolean(value) },
    order: { order: typeof value === 'number' ? value : null },
    template: { template: str },
+    sort: { sort: str },
  }
  return updates[k] ?? {}
 }
--- a/src/hooks/useNoteListKeyboard.test.ts
+++ b/src/hooks/useNoteListKeyboard.test.ts
@@ -22,7 +22,7 @@ function makeEntry(path: string, title: string): VaultEntry {
    fileSize: 100,
    color: null,
    icon: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    relationships: {},
  }
--- a/src/hooks/useTabManagement.test.ts
+++ b/src/hooks/useTabManagement.test.ts
@@ -32,7 +32,7 @@ const makeEntry = (overrides: Partial<VaultEntry> = {}): VaultEntry => ({
  icon: null,
  color: null,
  order: null,
-  template: null,
+  template: null, sort: null,
  outgoingLinks: [],
  ...overrides,
 })
--- a/src/hooks/useThemeManager.test.ts
+++ b/src/hooks/useThemeManager.test.ts
@@ -56,7 +56,7 @@ function makeThemeEntry(path: string, title: string): VaultEntry {
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  }
@@ -84,7 +84,7 @@ vi.mock('../mock-tauri', () => ({
  mockInvoke: (cmd: string, args?: Record<string, unknown>) => mockInvokeFn(cmd, args),
 }))

-const { useThemeManager, extractCssVars } = await import('./useThemeManager')
+const { useThemeManager, extractCssVars, isColorDark } = await import('./useThemeManager')

 describe('extractCssVars', () => {
  it('extracts color variables from frontmatter', () => {
@@ -101,6 +101,26 @@ describe('extractCssVars', () => {
  })
 })

+describe('isColorDark', () => {
+  it('identifies dark colors', () => {
+    expect(isColorDark('#000000')).toBe(true)
+    expect(isColorDark('#0f0f1a')).toBe(true)
+    expect(isColorDark('#1a1a2e')).toBe(true)
+  })
+
+  it('identifies light colors', () => {
+    expect(isColorDark('#FFFFFF')).toBe(false)
+    expect(isColorDark('#F7F6F3')).toBe(false)
+    expect(isColorDark('#E0E0E0')).toBe(false)
+  })
+
+  it('returns false for invalid hex', () => {
+    expect(isColorDark('')).toBe(false)
+    expect(isColorDark('#abc')).toBe(false)
+    expect(isColorDark('red')).toBe(false)
+  })
+})
+
 describe('useThemeManager', () => {
  const entries = [defaultEntry, darkEntry]
  const allContent: Record<string, string> = {}
@@ -346,4 +366,116 @@ describe('useThemeManager', () => {
    const afterCalls = mockInvokeFn.mock.calls.filter(c => c[0] === 'get_vault_settings').length
    expect(afterCalls).toBe(initialCalls + 1)
  })
+
+  it('clears stale theme ID that does not match any known theme', async () => {
+    mockInvokeFn.mockImplementation(async (cmd: string) => {
+      if (cmd === 'get_vault_settings') return { theme: 'untitled-2' }
+      if (cmd === 'set_active_theme') return null
+      return null
+    })
+
+    const { result } = renderHook(() =>
+      useThemeManager('/vault', entries, allContent)
+    )
+    await waitFor(() => {
+      expect(result.current.themes).toHaveLength(2)
+    })
+
+    // Stale ID "untitled-2" doesn't match any theme path — should be cleared
+    await waitFor(() => {
+      expect(result.current.activeThemeId).toBeNull()
+    })
+    expect(mockInvokeFn).toHaveBeenCalledWith('set_active_theme', {
+      vaultPath: '/vault', themeId: null,
+    })
+  })
+
+  it('sets color-scheme to light for light theme', async () => {
+    const { result } = renderHook(() =>
+      useThemeManager('/vault', entries, allContent)
+    )
+    await waitFor(() => {
+      expect(result.current.activeTheme).not.toBeNull()
+    })
+
+    const root = document.documentElement
+    expect(root.style.getPropertyValue('color-scheme')).toBe('light')
+    expect(root.dataset.themeMode).toBe('light')
+  })
+
+  it('sets color-scheme to dark for dark theme', async () => {
+    const { result } = renderHook(() =>
+      useThemeManager('/vault', entries, allContent)
+    )
+    await waitFor(() => {
+      expect(result.current.themes).toHaveLength(2)
+    })
+
+    await act(async () => {
+      await result.current.switchTheme(THEME_PATH_DARK)
+    })
+
+    await waitFor(() => {
+      expect(document.documentElement.style.getPropertyValue('color-scheme')).toBe('dark')
+    })
+    expect(document.documentElement.dataset.themeMode).toBe('dark')
+  })
+
+  it('populates theme colors from allContent when available', async () => {
+    const contentWithColors = {
+      [THEME_PATH_DEFAULT]: DEFAULT_THEME_CONTENT,
+      [THEME_PATH_DARK]: DARK_THEME_CONTENT,
+    }
+    const { result } = renderHook(() =>
+      useThemeManager('/vault', entries, contentWithColors)
+    )
+    await waitFor(() => {
+      expect(result.current.themes).toHaveLength(2)
+    })
+
+    const defaultTheme = result.current.themes.find(t => t.id === THEME_PATH_DEFAULT)
+    expect(defaultTheme?.colors.background).toBe('#FFFFFF')
+    expect(defaultTheme?.colors.primary).toBe('#155DFF')
+
+    const darkTheme = result.current.themes.find(t => t.id === THEME_PATH_DARK)
+    expect(darkTheme?.colors.background).toBe('#0f0f1a')
+  })
+
+  it('isDark detects dark theme from cached content', async () => {
+    const contentWithColors = {
+      [THEME_PATH_DEFAULT]: DEFAULT_THEME_CONTENT,
+      [THEME_PATH_DARK]: DARK_THEME_CONTENT,
+    }
+    mockInvokeFn.mockImplementation(async (cmd: string) => {
+      if (cmd === 'get_vault_settings') return { theme: THEME_PATH_DARK }
+      if (cmd === 'set_active_theme') return null
+      if (cmd === 'get_note_content') return DARK_THEME_CONTENT
+      return null
+    })
+
+    const { result } = renderHook(() =>
+      useThemeManager('/vault', entries, contentWithColors)
+    )
+    await waitFor(() => {
+      expect(result.current.activeThemeId).toBe(THEME_PATH_DARK)
+    })
+    await waitFor(() => {
+      expect(result.current.isDark).toBe(true)
+    })
+  })
+
+  it('isDark is false for light theme', async () => {
+    const contentWithColors = {
+      [THEME_PATH_DEFAULT]: DEFAULT_THEME_CONTENT,
+    }
+
+    const { result } = renderHook(() =>
+      useThemeManager('/vault', entries, contentWithColors)
+    )
+    await waitFor(() => {
+      expect(result.current.activeThemeId).toBe(THEME_PATH_DEFAULT)
+    })
+    // Light theme isDark should be false (default state is false, so this is stable)
+    expect(result.current.isDark).toBe(false)
+  })
 })
--- a/src/hooks/useThemeManager.ts
+++ b/src/hooks/useThemeManager.ts
@@ -41,11 +41,50 @@ export function extractCssVars(content: string): Record<string, string> {
  return vars
 }

+/** Extract bare colors (without -- prefix) for ThemeFile.colors from content. */
+function extractColorsFromContent(content: string): Record<string, string> {
+  const fm = parseFrontmatter(content)
+  const colors: Record<string, string> = {}
+  for (const [key, value] of Object.entries(fm)) {
+    if (NON_THEME_KEYS.has(key)) continue
+    if (typeof value === 'string' && value.startsWith('#')) {
+      colors[key] = value
+    }
+  }
+  return colors
+}
+
+/** Check if a hex color is perceptually dark (luminance < 0.5). */
+export function isColorDark(hex: string): boolean {
+  if (!hex.startsWith('#') || hex.length < 7) return false
+  const r = parseInt(hex.slice(1, 3), 16)
+  const g = parseInt(hex.slice(3, 5), 16)
+  const b = parseInt(hex.slice(5, 7), 16)
+  return (0.299 * r + 0.587 * g + 0.114 * b) / 255 < 0.5
+}
+
+/** Update color-scheme and data-theme-mode on document root based on --background. */
+function updateColorScheme(vars: Record<string, string>): void {
+  const bg = vars['--background']
+  if (!bg) return
+  const dark = isColorDark(bg)
+  const root = document.documentElement
+  root.style.setProperty('color-scheme', dark ? 'dark' : 'light')
+  root.dataset.themeMode = dark ? 'dark' : 'light'
+}
+
+function clearColorScheme(): void {
+  const root = document.documentElement
+  root.style.removeProperty('color-scheme')
+  delete root.dataset.themeMode
+}
+
 function applyVarsToDom(vars: Record<string, string>): void {
  const root = document.documentElement
  for (const [key, value] of Object.entries(vars)) {
    root.style.setProperty(key, value)
  }
+  updateColorScheme(vars)
 }

 function clearVarsFromDom(vars: Record<string, string>): void {
@@ -53,16 +92,17 @@ function clearVarsFromDom(vars: Record<string, string>): void {
  for (const key of Object.keys(vars)) {
    root.style.removeProperty(key)
  }
+  clearColorScheme()
 }

-/** Build a ThemeFile descriptor from a vault entry (metadata only). */
-function entryToThemeFile(entry: VaultEntry): ThemeFile {
+/** Build a ThemeFile descriptor from a vault entry, enriched with content colors. */
+function entryToThemeFile(entry: VaultEntry, content: string | undefined): ThemeFile {
  return {
    id: entry.path,
    name: entry.title,
    description: '',
    path: entry.path,
-    colors: {},
+    colors: content ? extractColorsFromContent(content) : {},
    typography: {},
    spacing: {},
  }
@@ -112,15 +152,17 @@ function useThemeApplier(
  cachedContent: string | undefined,
 ) {
  const appliedVarsRef = useRef<Record<string, string>>({})
+  const [isDark, setIsDark] = useState(false)

-  const apply = useCallback((content: string) => {
+  const applyDom = useCallback((content: string) => {
    const newVars = extractCssVars(content)
    clearVarsFromDom(appliedVarsRef.current)
    applyVarsToDom(newVars)
    appliedVarsRef.current = newVars
+    return newVars
  }, [])

-  const clear = useCallback(() => {
+  const clearDom = useCallback(() => {
    clearVarsFromDom(appliedVarsRef.current)
    appliedVarsRef.current = {}
  }, [])
@@ -128,14 +170,25 @@ function useThemeApplier(
  // Apply theme when activeThemeId or cached content changes.
  // Also serves as live-preview: re-applies when the user saves the theme note.
  useEffect(() => {
-    if (!activeThemeId) { clear(); return }
-    if (cachedContent) { apply(cachedContent); return }
+    if (!activeThemeId) {
+      clearDom()
+      setIsDark(false) // eslint-disable-line react-hooks/set-state-in-effect -- sync dark mode with cleared theme
+      return
+    }
+    if (cachedContent) {
+      const vars = applyDom(cachedContent)
+      setIsDark(isColorDark(vars['--background'] ?? ''))
+      return
+    }
    tauriCall<string>('get_note_content', { path: activeThemeId })
-      .then(apply)
-      .catch(clear)
-  }, [activeThemeId, cachedContent, apply, clear])
+      .then(content => {
+        const vars = applyDom(content)
+        setIsDark(isColorDark(vars['--background'] ?? ''))
+      })
+      .catch(() => { clearDom(); setIsDark(false) })
+  }, [activeThemeId, cachedContent, applyDom, clearDom])

-  return { clear }
+  return { clearDom, isDark }
 }

 export function useThemeManager(
@@ -145,11 +198,17 @@ export function useThemeManager(
 ): ThemeManager {
  const { activeThemeId, setActiveThemeId, reload } = useThemeSetting(vaultPath)
  const cachedThemeContent = activeThemeId ? allContent[activeThemeId] : undefined
-  const { clear: clearTheme } = useThemeApplier(activeThemeId, cachedThemeContent)
+  const { clearDom: clearTheme, isDark } = useThemeApplier(activeThemeId, cachedThemeContent)
+
+  // Track IDs set by user actions (switchTheme/createTheme) so the stale-ID
+  // cleanup doesn't clear a newly-created theme that isn't in entries yet.
+  const userSetIdRef = useRef<string | null>(null)

  const themes = useMemo(
-    () => entries.filter(e => e.isA === 'Theme' && !e.trashed && !e.archived).map(entryToThemeFile),
-    [entries],
+    () => entries
+      .filter(e => e.isA === 'Theme' && !e.trashed && !e.archived)
+      .map(e => entryToThemeFile(e, allContent[e.path])),
+    [entries, allContent],
  )

  const activeTheme = useMemo(
@@ -157,6 +216,21 @@ export function useThemeManager(
    [themes, activeThemeId],
  )

+  // If active theme ID doesn't match any known theme (e.g. stale ID from old
+  // JSON-based theme system), clear it so the app doesn't try to load a
+  // non-existent path. Skip IDs just set by switchTheme/createTheme — the
+  // entry may not have appeared in `entries` yet.
+  useEffect(() => {
+    if (!activeThemeId || themes.length === 0) return
+    if (activeThemeId === userSetIdRef.current) return
+    const isKnown = themes.some(t => t.id === activeThemeId)
+    if (!isKnown) {
+      clearTheme()
+      setActiveThemeId(null)
+      if (vaultPath) tauriCall('set_active_theme', { vaultPath, themeId: null }).catch(() => {})
+    }
+  }, [activeThemeId, themes, clearTheme, vaultPath, setActiveThemeId])
+
  // If active theme is trashed or archived: clear CSS vars and fall back to no theme
  useEffect(() => {
    if (!activeThemeId) return
@@ -171,6 +245,7 @@ export function useThemeManager(
    if (!vaultPath) return
    try {
      await tauriCall<null>('set_active_theme', { vaultPath, themeId })
+      userSetIdRef.current = themeId
      setActiveThemeId(themeId)
    } catch (err) { console.error('Failed to switch theme:', err) }
  }, [vaultPath, setActiveThemeId])
@@ -180,6 +255,7 @@ export function useThemeManager(
    try {
      const path = await tauriCall<string>('create_vault_theme', { vaultPath, name: name ?? null })
      await tauriCall<null>('set_active_theme', { vaultPath, themeId: path })
+      userSetIdRef.current = path
      setActiveThemeId(path)
      return path
    } catch (err) { console.error('Failed to create theme:', err); return '' }
@@ -187,17 +263,5 @@ export function useThemeManager(

  const reloadThemes = useCallback(async () => { await reload() }, [reload])

-  // Determine if the active theme is dark by checking --background CSS variable
-  const isDark = useMemo(() => {
-    if (!activeThemeId || !cachedThemeContent) return false
-    const vars = extractCssVars(cachedThemeContent)
-    const bg = vars['--background'] ?? ''
-    if (!bg.startsWith('#') || bg.length < 7) return false
-    const r = parseInt(bg.slice(1, 3), 16)
-    const g = parseInt(bg.slice(3, 5), 16)
-    const b = parseInt(bg.slice(5, 7), 16)
-    return (0.299 * r + 0.587 * g + 0.114 * b) / 255 < 0.5
-  }, [activeThemeId, cachedThemeContent])
-
  return { themes, activeThemeId, activeTheme, isDark, switchTheme, createTheme, reloadThemes }
 }
--- a/src/hooks/useVaultLoader.test.ts
+++ b/src/hooks/useVaultLoader.test.ts
@@ -10,7 +10,7 @@ const mockEntries: VaultEntry[] = [
    status: 'Active', owner: null, cadence: null,
    archived: false, trashed: false, trashedAt: null,
    modifiedAt: 1700000000, createdAt: 1700000000, fileSize: 100,
-    snippet: '', wordCount: 0, relationships: {}, icon: null, color: null, order: null, template: null, outgoingLinks: [],
+    snippet: '', wordCount: 0, relationships: {}, icon: null, color: null, order: null, template: null, sort: null, outgoingLinks: [],
  },
 ]

--- a/src/hooks/useVaultLoader.ts
+++ b/src/hooks/useVaultLoader.ts
@@ -172,8 +172,8 @@ export function useVaultLoader(vaultPath: string) {

  const reloadVault = useCallback(
    () => loadVaultData(vaultPath)
-      .then((data) => { setEntries(data.entries); setAllContent((prev) => ({ ...prev, ...data.allContent })); loadModifiedFiles() })
-      .catch((err) => console.warn('Vault reload failed:', err)),
+      .then((data) => { setEntries(data.entries); setAllContent((prev) => ({ ...prev, ...data.allContent })); loadModifiedFiles(); return data.entries })
+      .catch((err) => { console.warn('Vault reload failed:', err); return [] as VaultEntry[] }),
    [vaultPath, loadModifiedFiles],
  )

--- a/src/mock-tauri/mock-entries.ts
+++ b/src/mock-tauri/mock-entries.ts
@@ -36,7 +36,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: ['quarter/q1-2026', 'topic/software-development', 'person/matteo-cellini', 'person/maria-bianchi', 'person/marco-verdi'],
    properties: { Priority: 'High', 'Due date': '2026-06-15' },
  },
@@ -73,7 +73,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: ['essay/on-writing-well', 'essay/engineering-leadership-101', 'essay/ai-agents-primer', 'topic/growth', 'topic/writing'],
    properties: { Priority: 'High', Rating: 5, Cadence: 'Weekly' },
  },
@@ -104,7 +104,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: ['person/matteo-cellini'],
    properties: {},
  },
@@ -135,7 +135,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: ['responsibility/grow-newsletter'],
    properties: {},
  },
@@ -166,7 +166,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: ['responsibility/manage-sponsorships'],
    properties: {},
  },
@@ -198,7 +198,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: ['topic/trading', 'topic/algorithmic-trading', 'data/ema200-backtest-results'],
    properties: { Priority: 'Low', 'Due date': '2026-03-01' },
  },
@@ -230,7 +230,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: ['project/26q1-laputa-app', 'topic/growth', 'topic/ads'],
    properties: { Priority: 'Medium', Rating: 4 },
  },
@@ -261,7 +261,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: ['project/26q1-laputa-app'],
    properties: {},
  },
@@ -291,7 +291,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: { Company: 'Acme Corp', Role: 'Engineering Lead' },
  },
@@ -321,7 +321,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: { Company: 'TechStart', Role: 'Product Manager' },
  },
@@ -351,7 +351,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -381,7 +381,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -412,7 +412,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: ['project/26q1-laputa-app', 'person/matteo-cellini'],
    properties: {},
  },
@@ -443,7 +443,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -474,7 +474,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -505,7 +505,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: ['responsibility/grow-newsletter'],
    properties: {},
  },
@@ -537,7 +537,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: ['responsibility/grow-newsletter', 'topic/software-development'],
    properties: {},
  },
@@ -568,7 +568,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: ['responsibility/grow-newsletter'],
    properties: {},
  },
@@ -597,7 +597,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: 0,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -625,7 +625,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: 1,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -653,7 +653,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: 2,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -681,7 +681,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: 3,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -709,7 +709,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: 4,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -737,7 +737,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: 5,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -765,7 +765,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: 6,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -793,7 +793,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: 7,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -821,7 +821,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: 8,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -850,7 +850,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: 'orange',
    order: 9,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -878,7 +878,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: 'green',
    order: 10,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -909,7 +909,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: { Difficulty: 'Easy', 'Prep time': '30 min', Servings: 4 },
  },
@@ -939,7 +939,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: { Author: 'Martin Kleppmann', Rating: 5, 'Year published': 2017 },
  },
@@ -971,7 +971,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -1001,7 +1001,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -1032,7 +1032,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -1055,7 +1055,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
    modifiedAt: now - 86400 * 120,
@@ -1086,7 +1086,7 @@ export const MOCK_ENTRIES: VaultEntry[] = [
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
    modifiedAt: now - 86400 * 90,
@@ -1151,7 +1151,7 @@ function generateBulkEntries(count: number): VaultEntry[] {
      order: null,
      outgoingLinks: Array.from({ length: i % 8 }, (_j, j) => `note/link-target-${(i + j) % 50}`),
      sidebarLabel: null,
-      template: null,
+      template: null, sort: null,
      properties: {},
    })
  }
@@ -1184,7 +1184,7 @@ MOCK_ENTRIES.push(
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -1212,7 +1212,7 @@ MOCK_ENTRIES.push(
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
@@ -1240,7 +1240,7 @@ MOCK_ENTRIES.push(
    color: null,
    order: null,
    sidebarLabel: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    properties: {},
  },
--- a/src/types.ts
+++ b/src/types.ts
@@ -29,6 +29,8 @@ export interface VaultEntry {
  sidebarLabel: string | null
  /** Markdown template for Type entries. Pre-fills new notes created with this type. */
  template: string | null
+  /** Default sort preference for the note list of this Type. Format: "option:direction". */
+  sort: string | null
  /** All wikilink targets found in the note content. Extracted from [[target]] patterns. */
  outgoingLinks: string[]
  /** Custom scalar frontmatter properties (non-relationship, non-structural). */
--- a/src/utils/noteListHelpers.test.ts
+++ b/src/utils/noteListHelpers.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, afterEach } from 'vitest'
-import { formatSubtitle, formatSearchSubtitle, relativeDate, buildRelationshipGroups, getSortComparator, extractSortableProperties, getSortOptionLabel, getDefaultDirection } from './noteListHelpers'
+import { formatSubtitle, formatSearchSubtitle, relativeDate, buildRelationshipGroups, getSortComparator, extractSortableProperties, getSortOptionLabel, getDefaultDirection, parseSortConfig, serializeSortConfig } from './noteListHelpers'
 import type { VaultEntry } from '../types'

 function makeEntry(overrides: Partial<VaultEntry> = {}): VaultEntry {
@@ -10,7 +10,7 @@ function makeEntry(overrides: Partial<VaultEntry> = {}): VaultEntry {
    trashed: false, trashedAt: null,
    modifiedAt: null, createdAt: null, fileSize: 0,
    snippet: '', wordCount: 0, relationships: {},
-    icon: null, color: null, order: null, template: null, outgoingLinks: [],
+    icon: null, color: null, order: null, template: null, sort: null, outgoingLinks: [],
    ...overrides,
  }
 }
@@ -435,3 +435,53 @@ describe('getDefaultDirection', () => {
    expect(getDefaultDirection('property:Priority')).toBe('asc')
  })
 })
+
+describe('serializeSortConfig', () => {
+  it('serializes a built-in sort config', () => {
+    expect(serializeSortConfig({ option: 'modified', direction: 'desc' })).toBe('modified:desc')
+    expect(serializeSortConfig({ option: 'title', direction: 'asc' })).toBe('title:asc')
+  })
+
+  it('serializes a custom property sort config', () => {
+    expect(serializeSortConfig({ option: 'property:Priority', direction: 'asc' })).toBe('property:Priority:asc')
+  })
+})
+
+describe('parseSortConfig', () => {
+  it('parses a built-in sort config', () => {
+    expect(parseSortConfig('modified:desc')).toEqual({ option: 'modified', direction: 'desc' })
+    expect(parseSortConfig('title:asc')).toEqual({ option: 'title', direction: 'asc' })
+  })
+
+  it('parses a custom property sort config with colon in option', () => {
+    expect(parseSortConfig('property:Priority:asc')).toEqual({ option: 'property:Priority', direction: 'asc' })
+  })
+
+  it('returns null for null/undefined input', () => {
+    expect(parseSortConfig(null)).toBeNull()
+    expect(parseSortConfig(undefined)).toBeNull()
+  })
+
+  it('returns null for empty string', () => {
+    expect(parseSortConfig('')).toBeNull()
+  })
+
+  it('returns null for invalid direction', () => {
+    expect(parseSortConfig('modified:up')).toBeNull()
+  })
+
+  it('returns null for string without colon', () => {
+    expect(parseSortConfig('modified')).toBeNull()
+  })
+
+  it('roundtrips correctly', () => {
+    const configs = [
+      { option: 'modified' as const, direction: 'desc' as const },
+      { option: 'title' as const, direction: 'asc' as const },
+      { option: 'property:Due date' as const, direction: 'desc' as const },
+    ]
+    for (const config of configs) {
+      expect(parseSortConfig(serializeSortConfig(config))).toEqual(config)
+    }
+  })
+})
--- a/src/utils/noteListHelpers.ts
+++ b/src/utils/noteListHelpers.ts
@@ -183,6 +183,23 @@ export function getSortComparator(option: SortOption, direction?: SortDirection)

 const SORT_STORAGE_KEY = 'laputa-sort-preferences'

+/** Serialize a SortConfig to the string format stored in type frontmatter: "option:direction". */
+export function serializeSortConfig(config: SortConfig): string {
+  return `${config.option}:${config.direction}`
+}
+
+/** Parse a frontmatter sort string ("option:direction") back to SortConfig. */
+export function parseSortConfig(raw: string | null | undefined): SortConfig | null {
+  if (!raw) return null
+  // Format: "option:direction" where option itself can contain ":" (e.g. "property:Priority:asc")
+  const lastColon = raw.lastIndexOf(':')
+  if (lastColon <= 0) return null
+  const dir = raw.slice(lastColon + 1)
+  if (dir !== 'asc' && dir !== 'desc') return null
+  const option = raw.slice(0, lastColon) as SortOption
+  return { option, direction: dir }
+}
+
 export function loadSortPreferences(): Record<string, SortConfig> {
  try {
    const raw = localStorage.getItem(SORT_STORAGE_KEY)
@@ -210,6 +227,21 @@ export function saveSortPreferences(prefs: Record<string, SortConfig>) {
  } catch { /* ignore */ }
 }

+/** Remove the `__list__` key from localStorage sort preferences (used during migration). */
+export function clearListSortFromLocalStorage(): void {
+  try {
+    const raw = localStorage.getItem(SORT_STORAGE_KEY)
+    if (!raw) return
+    const parsed = JSON.parse(raw)
+    delete parsed['__list__']
+    if (Object.keys(parsed).length === 0) {
+      localStorage.removeItem(SORT_STORAGE_KEY)
+    } else {
+      localStorage.setItem(SORT_STORAGE_KEY, JSON.stringify(parsed))
+    }
+  } catch { /* ignore */ }
+}
+
 function findBacklinks(entity: VaultEntry, allEntries: VaultEntry[], allContent: Record<string, string>): VaultEntry[] {
  const stem = entity.filename.replace(/\.md$/, '')
  const pathStem = entity.path.replace(/^.*\/Laputa\//, '').replace(/\.md$/, '')
--- a/src/utils/suggestionEnrichment.test.ts
+++ b/src/utils/suggestionEnrichment.test.ts
@@ -13,7 +13,7 @@ function makeEntry(overrides: Partial<VaultEntry> = {}): VaultEntry {
    aliases: [], belongsTo: [], relatedTo: [], status: null, owner: null, cadence: null,
    archived: false, trashed: false, trashedAt: null, modifiedAt: null, createdAt: null,
    fileSize: 0, snippet: '', wordCount: 0, relationships: {}, icon: null, color: null,
-    order: null, template: null, outgoingLinks: [],
+    order: null, template: null, sort: null, outgoingLinks: [],
    ...overrides,
  }
 }
--- a/src/utils/typeColors.test.ts
+++ b/src/utils/typeColors.test.ts
@@ -54,7 +54,7 @@ const baseEntry: VaultEntry = {
  status: null, owner: null, cadence: null, archived: false, trashed: false, trashedAt: null,
  modifiedAt: null, createdAt: null, fileSize: 0, snippet: '', relationships: {},
  wordCount: 0,
-  icon: null, color: null, order: null, template: null, outgoingLinks: [],
+  icon: null, color: null, order: null, template: null, sort: null, outgoingLinks: [],
 }

 describe('buildTypeEntryMap', () => {
--- a/src/utils/wikilinkColors.test.ts
+++ b/src/utils/wikilinkColors.test.ts
@@ -26,7 +26,7 @@ function makeEntry(overrides: Partial<VaultEntry>): VaultEntry {
    icon: null,
    color: null,
    order: null,
-    template: null,
+    template: null, sort: null,
    outgoingLinks: [],
    ...overrides,
  }
Author	SHA1	Message	Date
Test	3fcb06396a	fix: use git ls-files --unmerged for reliable conflict detection git diff --name-only --diff-filter=U only works during an active merge (while MERGE_HEAD exists). When the vault has stale conflict state — e.g. after a reboot — git diff returns empty, causing conflictFiles=[] and making the StatusBar click handler, command palette entry, and conflict resolver modal all non-functional. Switch to git ls-files --unmerged which reads unmerged index entries directly and works regardless of MERGE_HEAD state. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-03-03 19:36:50 +01:00
Test	17eeac75cd	fix: open newly created theme in editor after New Theme command After createTheme(), the theme file was created and the sidebar navigated to the Theme section, but the note was never opened in the editor. Now captures the returned path and opens it via handleSelectNote. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-03-03 19:29:32 +01:00
Test	2dad764ea7	fix: check-for-updates command always visible in Cmd+K, handles all update states	2026-03-03 16:46:47 +01:00
Test	c3fa296b99	refactor: remove AI model indicator from status bar Remove the hardcoded "Claude Sonnet 4" stub label and unused Sparkles import — no model picker is planned at this stage. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-03-03 14:57:20 +01:00
Test	6370b66e05	fix: handle Escape at panel level and manage focus across active states Move Escape handler from input onKeyDown to a window-level listener scoped to the panel, so it works even when input is disabled during AI response. When agent is active, focus transfers to the panel container; when idle, focus returns to the input. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-03-03 14:34:18 +01:00
Test	1ec27dd264	fix: auto-focus AI Chat input on panel open and close on Escape When AI Chat panel mounts (via Cmd+I), the input field now receives focus automatically so users can type immediately without clicking. Pressing Escape in the input closes the panel. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-03-03 14:30:12 +01:00
Test	10e6d7b366	fix: handle EADDRINUSE in MCP server ws-bridge — allow Claude Code to start when port is taken When Claude CLI starts the Laputa MCP server, it crashed immediately because startUiBridge() tried to bind port 9711 which is already held by the running Laputa app. The unhandled EADDRINUSE error killed the process, making all Laputa MCP tools unavailable to Claude Code in AI Chat. Fix: - Make startUiBridge() async, return Promise<WebSocketServer\|null> - Handle 'error' event on HTTP server: EADDRINUSE resolves to null instead of crashing - Guard broadcastUiAction() with 'if (!uiBridge) return' for graceful no-op - In ws-bridge.js main: chain startUiBridge().then(() => startBridge()) All vault tools (read/write/search) now work via stdio MCP when port is busy.	2026-03-03 13:22:28 +01:00
Test	0c87e51037	feat: add Check for Updates command to native menu and Cmd+K palette - Add APP_CHECK_FOR_UPDATES constant and menu item in menu.rs (between About and Settings) - Wire onCheckForUpdates handler through useMenuEvents and useAppCommands - Add test for app-check-for-updates dispatch	2026-03-03 13:19:09 +01:00
Test	7df1961172	feat: persist note list sort preference in type file frontmatter Sort preferences for each type's note list are now stored in the type file's frontmatter (e.g. `sort: modified:desc` in `type/person.md`) instead of localStorage. This makes preferences portable with the vault and versionable in git. - Add `sort` field to Rust Frontmatter/VaultEntry and TS VaultEntry - NoteList reads sort from type entry's frontmatter when viewing a type - Sort changes write to type file via update_frontmatter - Silent migration from localStorage on first access per type - Relationship group sorts still use localStorage (no type file) - Fallback to `modified:desc` when no sort preference exists Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-03-03 12:18:40 +01:00
Test	ec74f86d53	fix: restore theming system after dark-editor merge regression The merge of the dark-theme-editor feature (`cadb350`) into the themes-editable rewrite (`19bc3c6`) broke the entire theming UI: themes weren't listed, switching didn't work, and new theme creation was broken. Root causes and fixes: - Stale theme ID from old JSON system ("untitled-2") never cleared: added detection that clears IDs not matching any known vault theme, with a ref to skip IDs just set by switchTheme/createTheme - set_active_theme Rust command only accepted String, not Option: now accepts Option<String> so null can clear the setting - Theme colors empty in UI: entryToThemeFile now extracts colors from frontmatter content via extractColorsFromContent - color-scheme/data-theme-mode not set: added updateColorScheme and clearColorScheme to sync DOM attributes on theme apply/clear - isDark broken in Tauri (allContent is {}): moved isDark tracking into useThemeApplier as state, updated when vars are applied - SettingsPanel passed activeThemeId as name to createTheme: fixed to call createTheme() with no arguments Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-03-03 11:53:00 +01:00