feat: rebuild FilterBuilder with shadcn/ui components

Replace native HTML elements with design system components:
- Operator <select> → shadcn Select dropdown
- Field <input>+<datalist> → shadcn Select with all available fields
- Value input → shadcn Select (when suggestions available) or Input
- Date input (type="date") for before/after operators
- Remove button → shadcn Button variant="ghost"
- AND/OR toggle → shadcn Button variant="outline" with rounded-full

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

.codescene-thresholds

@@ -1,2 +1,2 @@
-HOTSPOT_THRESHOLD=9.72
-AVERAGE_THRESHOLD=9.34
+HOTSPOT_THRESHOLD=9.56
+AVERAGE_THRESHOLD=9.33

src-tauri/src/vault/views.rs

@@ -142,9 +142,58 @@ pub struct ViewFile {
     pub definition: ViewDefinition,
 }
 
-/// Scan all `.yml` files from `vault_path/.laputa/views/` and return parsed views.
+/// Migrate views from `.laputa/views/` to `views/` in the vault root (one-time).
+pub fn migrate_views(vault_path: &Path) {
+    let old_dir = vault_path.join(".laputa").join("views");
+    if !old_dir.is_dir() {
+        return;
+    }
+
+    let entries = match fs::read_dir(&old_dir) {
+        Ok(e) => e,
+        Err(_) => return,
+    };
+
+    let yml_files: Vec<_> = entries
+        .flatten()
+        .filter(|e| e.path().extension().and_then(|ext| ext.to_str()) == Some("yml"))
+        .collect();
+
+    if yml_files.is_empty() {
+        return;
+    }
+
+    let new_dir = vault_path.join("views");
+    if fs::create_dir_all(&new_dir).is_err() {
+        log::warn!("Failed to create views/ directory for migration");
+        return;
+    }
+
+    for entry in yml_files {
+        let src = entry.path();
+        let dst = new_dir.join(entry.file_name());
+        if !dst.exists() {
+            if let Err(e) = fs::rename(&src, &dst) {
+                log::warn!("Failed to migrate view {:?}: {}", src, e);
+            } else {
+                log::info!("Migrated view {:?} → {:?}", src, dst);
+            }
+        }
+    }
+
+    // Clean up old directory if empty
+    if fs::read_dir(&old_dir)
+        .map(|mut d| d.next().is_none())
+        .unwrap_or(false)
+    {
+        let _ = fs::remove_dir(&old_dir);
+    }
+}
+
+/// Scan all `.yml` files from `vault_path/views/` and return parsed views.
 pub fn scan_views(vault_path: &Path) -> Vec<ViewFile> {
-    let views_dir = vault_path.join(".laputa").join("views");
+    migrate_views(vault_path);
+    let views_dir = vault_path.join("views");
     if !views_dir.is_dir() {
         return Vec::new();
     }
@@ -180,7 +229,7 @@ pub fn scan_views(vault_path: &Path) -> Vec<ViewFile> {
     views
 }
 
-/// Save a view definition as YAML to `vault_path/.laputa/views/{filename}`.
+/// Save a view definition as YAML to `vault_path/views/{filename}`.
 pub fn save_view(
     vault_path: &Path,
     filename: &str,
@@ -189,7 +238,7 @@ pub fn save_view(
     if !filename.ends_with(".yml") {
         return Err("Filename must end with .yml".to_string());
     }
-    let views_dir = vault_path.join(".laputa").join("views");
+    let views_dir = vault_path.join("views");
     fs::create_dir_all(&views_dir)
         .map_err(|e| format!("Failed to create views directory: {}", e))?;
     let yaml = serde_yaml::to_string(definition)
@@ -198,9 +247,9 @@ pub fn save_view(
         .map_err(|e| format!("Failed to write view file: {}", e))
 }
 
-/// Delete a view file at `vault_path/.laputa/views/{filename}`.
+/// Delete a view file at `vault_path/views/{filename}`.
 pub fn delete_view(vault_path: &Path, filename: &str) -> Result<(), String> {
-    let path = vault_path.join(".laputa").join("views").join(filename);
+    let path = vault_path.join("views").join(filename);
     fs::remove_file(&path).map_err(|e| format!("Failed to delete view: {}", e))
 }
 
@@ -599,7 +648,7 @@ filters:
     #[test]
     fn test_scan_views_reads_yml_files() {
         let dir = tempfile::TempDir::new().unwrap();
-        let views_dir = dir.path().join(".laputa").join("views");
+        let views_dir = dir.path().join("views");
         fs::create_dir_all(&views_dir).unwrap();
 
         let yaml_a = "name: Alpha\nfilters:\n  all:\n    - field: type\n      op: equals\n      value: Note\n";
@@ -617,6 +666,26 @@ filters:
         assert_eq!(views[1].definition.name, "Beta");
     }
 
+    #[test]
+    fn test_migrate_views_from_old_location() {
+        let dir = tempfile::TempDir::new().unwrap();
+        let old_dir = dir.path().join(".laputa").join("views");
+        fs::create_dir_all(&old_dir).unwrap();
+
+        let yaml = "name: Migrated\nfilters:\n  all:\n    - field: type\n      op: equals\n      value: Note\n";
+        fs::write(old_dir.join("test.yml"), yaml).unwrap();
+
+        // scan_views should trigger migration and find the view
+        let views = scan_views(dir.path());
+        assert_eq!(views.len(), 1);
+        assert_eq!(views[0].definition.name, "Migrated");
+
+        // File should now be in new location
+        assert!(dir.path().join("views").join("test.yml").exists());
+        // Old file should be gone
+        assert!(!old_dir.join("test.yml").exists());
+    }
+
     #[test]
     fn test_save_and_read_view() {
         let dir = tempfile::TempDir::new().unwrap();

src/App.tsx

@@ -336,15 +336,23 @@ function App() {
     setToastMessage(`Type "${name}" created`)
   }, [notes])
 
-  const handleCreateView = useCallback(async (definition: import('./types').ViewDefinition) => {
-    const filename = definition.name.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/(^-|-$)/g, '') + '.yml'
+  const handleCreateOrUpdateView = useCallback(async (definition: import('./types').ViewDefinition) => {
+    const editing = dialogs.editingView
+    const filename = editing
+      ? editing.filename
+      : definition.name.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/(^-|-$)/g, '') + '.yml'
     const target = isTauri() ? invoke : mockInvoke
     await target('save_view_cmd', { vaultPath: resolvedPath, filename, definition })
-    trackEvent('view_created')
+    trackEvent(editing ? 'view_updated' : 'view_created')
     await vault.reloadViews()
-    setToastMessage(`View "${definition.name}" created`)
+    setToastMessage(editing ? `View "${definition.name}" updated` : `View "${definition.name}" created`)
     handleSetSelection({ kind: 'view', filename })
-  }, [resolvedPath, vault, handleSetSelection])
+  }, [resolvedPath, vault, handleSetSelection, dialogs.editingView])
+
+  const handleEditView = useCallback((filename: string) => {
+    const view = vault.views.find((v) => v.filename === filename)
+    if (view) dialogs.openEditView(filename, view.definition)
+  }, [vault.views, dialogs])
 
   const handleDeleteView = useCallback(async (filename: string) => {
     const target = isTauri() ? invoke : mockInvoke
@@ -545,7 +553,7 @@ function App() {
         {sidebarVisible && (
           <>
             <div className="app__sidebar" style={{ width: layout.sidebarWidth }}>
-              <Sidebar entries={vault.entries} folders={vault.folders} views={vault.views} selection={selection} onSelect={handleSetSelection} onSelectNote={notes.handleSelectNote} onSelectFavorite={notes.handleSelectNote} onReorderFavorites={entryActions.handleReorderFavorites} onCreateType={notes.handleCreateNoteImmediate} onCreateNewType={dialogs.openCreateType} onCustomizeType={entryActions.handleCustomizeType} onUpdateTypeTemplate={entryActions.handleUpdateTypeTemplate} onReorderSections={entryActions.handleReorderSections} onRenameSection={entryActions.handleRenameSection} onToggleTypeVisibility={entryActions.handleToggleTypeVisibility} onCreateFolder={handleCreateFolder} onCreateView={dialogs.openCreateView} onDeleteView={handleDeleteView} inboxCount={inboxCount} />
+              <Sidebar entries={vault.entries} folders={vault.folders} views={vault.views} selection={selection} onSelect={handleSetSelection} onSelectNote={notes.handleSelectNote} onSelectFavorite={notes.handleSelectNote} onReorderFavorites={entryActions.handleReorderFavorites} onCreateType={notes.handleCreateNoteImmediate} onCreateNewType={dialogs.openCreateType} onCustomizeType={entryActions.handleCustomizeType} onUpdateTypeTemplate={entryActions.handleUpdateTypeTemplate} onReorderSections={entryActions.handleReorderSections} onRenameSection={entryActions.handleRenameSection} onToggleTypeVisibility={entryActions.handleToggleTypeVisibility} onCreateFolder={handleCreateFolder} onCreateView={dialogs.openCreateView} onEditView={handleEditView} onDeleteView={handleDeleteView} inboxCount={inboxCount} />
             </div>
             <ResizeHandle onResize={layout.handleSidebarResize} />
           </>
@@ -624,7 +632,7 @@ function App() {
       <CommandPalette open={dialogs.showCommandPalette} commands={commands} onClose={dialogs.closeCommandPalette} />
       <SearchPanel open={dialogs.showSearch} vaultPath={resolvedPath} entries={vault.entries} onSelectNote={notes.handleSelectNote} onClose={dialogs.closeSearch} />
       <CreateTypeDialog open={dialogs.showCreateTypeDialog} onClose={dialogs.closeCreateType} onCreate={handleCreateType} />
-      <CreateViewDialog open={dialogs.showCreateViewDialog} onClose={dialogs.closeCreateView} onCreate={handleCreateView} availableFields={availableFields} valueSuggestions={valueSuggestionsForField} />
+      <CreateViewDialog open={dialogs.showCreateViewDialog} onClose={dialogs.closeCreateView} onCreate={handleCreateOrUpdateView} availableFields={availableFields} valueSuggestions={valueSuggestionsForField} editingView={dialogs.editingView?.definition ?? null} />
       <CommitDialog open={commitFlow.showCommitDialog} modifiedCount={vault.modifiedFiles.length} suggestedMessage={suggestedCommitMessage} onCommit={commitFlow.handleCommitPush} onClose={commitFlow.closeCommitDialog} />
       <ConflictResolverModal
         open={dialogs.showConflictResolver}

src/components/CreateViewDialog.test.tsx

@@ -0,0 +1,45 @@
+import { render, screen } from '@testing-library/react'
+import { describe, it, expect, vi } from 'vitest'
+import { CreateViewDialog } from './CreateViewDialog'
+import type { ViewDefinition } from '../types'
+
+describe('CreateViewDialog', () => {
+  const defaultProps = {
+    open: true,
+    onClose: vi.fn(),
+    onCreate: vi.fn(),
+    availableFields: ['type', 'status', 'title'],
+  }
+
+  it('shows "Create View" title in create mode', () => {
+    render(<CreateViewDialog {...defaultProps} />)
+    expect(screen.getByText('Create View')).toBeInTheDocument()
+    expect(screen.getByText('Create')).toBeInTheDocument()
+  })
+
+  it('shows "Edit View" title when editingView is provided', () => {
+    const editingView: ViewDefinition = {
+      name: 'Active Projects',
+      icon: '🚀',
+      color: null,
+      sort: null,
+      filters: { all: [{ field: 'type', op: 'equals', value: 'Project' }] },
+    }
+    render(<CreateViewDialog {...defaultProps} editingView={editingView} />)
+    expect(screen.getByText('Edit View')).toBeInTheDocument()
+    expect(screen.getByText('Save')).toBeInTheDocument()
+  })
+
+  it('pre-populates name field in edit mode', () => {
+    const editingView: ViewDefinition = {
+      name: 'Active Projects',
+      icon: '🚀',
+      color: null,
+      sort: null,
+      filters: { all: [{ field: 'type', op: 'equals', value: 'Project' }] },
+    }
+    render(<CreateViewDialog {...defaultProps} editingView={editingView} />)
+    const input = screen.getByPlaceholderText(/Active Projects|Reading List/i)
+    expect(input).toHaveValue('Active Projects')
+  })
+})

src/components/CreateViewDialog.tsx

@@ -13,9 +13,11 @@ interface CreateViewDialogProps {
   availableFields: string[]
   /** Returns known values for a given field (for autocomplete). */
   valueSuggestions?: (field: string) => string[]
+  /** When provided, the dialog operates in edit mode with pre-populated fields. */
+  editingView?: ViewDefinition | null
 }
 
-export function CreateViewDialog({ open, onClose, onCreate, availableFields, valueSuggestions }: CreateViewDialogProps) {
+export function CreateViewDialog({ open, onClose, onCreate, availableFields, valueSuggestions, editingView }: CreateViewDialogProps) {
   const [name, setName] = useState('')
   const [icon, setIcon] = useState('')
   const [showEmojiPicker, setShowEmojiPicker] = useState(false)
@@ -23,16 +25,23 @@ export function CreateViewDialog({ open, onClose, onCreate, availableFields, val
     all: [{ field: 'type', op: 'equals', value: '' }],
   })
   const inputRef = useRef<HTMLInputElement>(null)
+  const isEditing = !!editingView
 
   useEffect(() => {
     if (open) {
-      setName('') // eslint-disable-line react-hooks/set-state-in-effect -- reset on dialog open
-      setIcon('') // eslint-disable-line react-hooks/set-state-in-effect -- reset on dialog open
+      if (editingView) {
+        setName(editingView.name) // eslint-disable-line react-hooks/set-state-in-effect -- populate on dialog open
+        setIcon(editingView.icon ?? '') // eslint-disable-line react-hooks/set-state-in-effect -- populate on dialog open
+        setFilters(editingView.filters) // eslint-disable-line react-hooks/set-state-in-effect -- populate on dialog open
+      } else {
+        setName('') // eslint-disable-line react-hooks/set-state-in-effect -- reset on dialog open
+        setIcon('') // eslint-disable-line react-hooks/set-state-in-effect -- reset on dialog open
+        setFilters({ all: [{ field: availableFields[0] ?? 'type', op: 'equals', value: '' }] }) // eslint-disable-line react-hooks/set-state-in-effect -- reset on dialog open
+      }
       setShowEmojiPicker(false) // eslint-disable-line react-hooks/set-state-in-effect -- reset on dialog open
-      setFilters({ all: [{ field: availableFields[0] ?? 'type', op: 'equals', value: '' }] }) // eslint-disable-line react-hooks/set-state-in-effect -- reset on dialog open
       setTimeout(() => inputRef.current?.focus(), 50)
     }
-  }, [open, availableFields])
+  }, [open, availableFields, editingView])
 
   const handleSubmit = (e: React.FormEvent) => {
     e.preventDefault()
@@ -60,11 +69,11 @@ export function CreateViewDialog({ open, onClose, onCreate, availableFields, val
 
   return (
     <Dialog open={open} onOpenChange={(isOpen) => { if (!isOpen) onClose() }}>
-      <DialogContent showCloseButton={false} className="sm:max-w-[520px]">
+      <DialogContent showCloseButton={false} className="flex max-h-[80vh] flex-col sm:max-w-[600px]">
         <DialogHeader>
-          <DialogTitle>Create View</DialogTitle>
+          <DialogTitle>{isEditing ? 'Edit View' : 'Create View'}</DialogTitle>
         </DialogHeader>
-        <form onSubmit={handleSubmit} className="space-y-4">
+        <form onSubmit={handleSubmit} className="flex min-h-0 flex-1 flex-col gap-4">
           <div className="flex gap-2">
             <div className="w-16 space-y-1.5 relative">
               <label className="text-xs font-medium text-muted-foreground">Icon</label>
@@ -90,7 +99,7 @@ export function CreateViewDialog({ open, onClose, onCreate, availableFields, val
               />
             </div>
           </div>
-          <div className="space-y-1.5">
+          <div className="min-h-0 flex-1 space-y-1.5 overflow-y-auto">
             <label className="text-xs font-medium text-muted-foreground">Filters</label>
             <FilterBuilder
               group={filters}
@@ -101,7 +110,7 @@ export function CreateViewDialog({ open, onClose, onCreate, availableFields, val
           </div>
           <DialogFooter>
             <Button type="button" variant="outline" onClick={onClose}>Cancel</Button>
-            <Button type="submit" disabled={!name.trim()}>Create</Button>
+            <Button type="submit" disabled={!name.trim()}>{isEditing ? 'Save' : 'Create'}</Button>
           </DialogFooter>
         </form>
       </DialogContent>

src/components/FilterBuilder.tsx

@@ -1,6 +1,7 @@
-import { useId } from 'react'
 import { Plus, X } from '@phosphor-icons/react'
 import { Button } from '@/components/ui/button'
+import { Input } from '@/components/ui/input'
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
 import type { FilterCondition, FilterOp, FilterGroup, FilterNode } from '../types'
 
 const OPERATORS: { value: FilterOp; label: string }[] = [
@@ -15,6 +16,7 @@ const OPERATORS: { value: FilterOp; label: string }[] = [
 ]
 
 const NO_VALUE_OPS = new Set<FilterOp>(['is_empty', 'is_not_empty'])
+const DATE_OPS = new Set<FilterOp>(['before', 'after'])
 
 function isFilterGroup(node: FilterNode): node is FilterGroup {
   return 'all' in node || 'any' in node
@@ -32,49 +34,97 @@ function setGroupChildren(mode: 'all' | 'any', children: FilterNode[]): FilterGr
   return mode === 'all' ? { all: children } : { any: children }
 }
 
-/** Combobox-style field input with datalist autocomplete. */
-function FieldInput({ value, fields, onChange }: {
+function FieldSelect({ value, fields, onChange }: {
   value: string
   fields: string[]
   onChange: (v: string) => void
 }) {
-  const id = useId()
+  const isCustom = value !== '' && !fields.includes(value)
   return (
-    <>
-      <input
-        list={id}
-        className="h-8 rounded-md border border-input bg-background px-2 text-sm flex-1 min-w-0"
-        value={value}
-        onChange={(e) => onChange(e.target.value)}
-        placeholder="field"
-      />
-      <datalist id={id}>
-        {fields.map((f) => <option key={f} value={f} />)}
-      </datalist>
-    </>
+    <Select value={value} onValueChange={onChange}>
+      <SelectTrigger
+        size="sm"
+        className="h-8 min-w-[100px] flex-1 gap-1 border-input bg-background px-2 text-sm shadow-none"
+      >
+        <SelectValue placeholder="field" />
+      </SelectTrigger>
+      <SelectContent position="popper">
+        {isCustom && <SelectItem value={value}>{value}</SelectItem>}
+        {fields.map((f) => (
+          <SelectItem key={f} value={f}>{f}</SelectItem>
+        ))}
+      </SelectContent>
+    </Select>
   )
 }
 
-/** Combobox-style value input with autocomplete for known values. */
-function ValueInput({ value, suggestions, onChange }: {
+function OperatorSelect({ value, onChange }: {
+  value: FilterOp
+  onChange: (v: FilterOp) => void
+}) {
+  return (
+    <Select value={value} onValueChange={(v) => onChange(v as FilterOp)}>
+      <SelectTrigger
+        size="sm"
+        className="h-8 shrink-0 gap-1 border-input bg-background px-2 text-sm shadow-none"
+        style={{ minWidth: 120 }}
+      >
+        <SelectValue />
+      </SelectTrigger>
+      <SelectContent position="popper">
+        {OPERATORS.map((o) => (
+          <SelectItem key={o.value} value={o.value}>{o.label}</SelectItem>
+        ))}
+      </SelectContent>
+    </Select>
+  )
+}
+
+function ValueInput({ value, suggestions, isDateOp, onChange }: {
   value: string
   suggestions: string[]
+  isDateOp: boolean
   onChange: (v: string) => void
 }) {
-  const id = useId()
-  return (
-    <>
-      <input
-        list={id}
-        className="h-8 rounded-md border border-input bg-background px-2 text-sm flex-1 min-w-0"
-        placeholder="value"
+  if (isDateOp) {
+    return (
+      <Input
+        type="date"
+        className="h-8 flex-1 min-w-0 text-sm"
         value={value}
         onChange={(e) => onChange(e.target.value)}
       />
-      <datalist id={id}>
-        {suggestions.map((s) => <option key={s} value={s} />)}
-      </datalist>
-    </>
+    )
+  }
+
+  if (suggestions.length > 0) {
+    return (
+      <Select value={value} onValueChange={onChange}>
+        <SelectTrigger
+          size="sm"
+          className="h-8 flex-1 min-w-0 gap-1 border-input bg-background px-2 text-sm shadow-none"
+        >
+          <SelectValue placeholder="value" />
+        </SelectTrigger>
+        <SelectContent position="popper">
+          {value !== '' && !suggestions.includes(value) && (
+            <SelectItem value={value}>{value}</SelectItem>
+          )}
+          {suggestions.map((s) => (
+            <SelectItem key={s} value={s}>{s}</SelectItem>
+          ))}
+        </SelectContent>
+      </Select>
+    )
+  }
+
+  return (
+    <Input
+      className="h-8 flex-1 min-w-0 text-sm"
+      placeholder="value"
+      value={value}
+      onChange={(e) => onChange(e.target.value)}
+    />
   )
 }
 
@@ -86,37 +136,36 @@ function FilterRow({ condition, fields, valueSuggestions, onUpdate, onRemove }:
   onRemove: () => void
 }) {
   const suggestions = valueSuggestions(condition.field)
+  const isDateOp = DATE_OPS.has(condition.op)
   return (
     <div className="flex items-center gap-1.5">
-      <FieldInput
+      <FieldSelect
         value={condition.field}
         fields={fields}
         onChange={(v) => onUpdate({ ...condition, field: v })}
       />
-      <select
-        className="h-8 rounded-md border border-input bg-background px-2 text-sm shrink-0"
+      <OperatorSelect
         value={condition.op}
-        onChange={(e) => onUpdate({ ...condition, op: e.target.value as FilterOp })}
-      >
-        {OPERATORS.map((o) => (
-          <option key={o.value} value={o.value}>{o.label}</option>
-        ))}
-      </select>
+        onChange={(op) => onUpdate({ ...condition, op })}
+      />
       {!NO_VALUE_OPS.has(condition.op) && (
         <ValueInput
           value={String(condition.value ?? '')}
           suggestions={suggestions}
+          isDateOp={isDateOp}
           onChange={(v) => onUpdate({ ...condition, value: v })}
         />
       )}
-      <button
+      <Button
         type="button"
-        className="flex-shrink-0 rounded p-1 text-muted-foreground hover:text-foreground"
+        variant="ghost"
+        size="sm"
+        className="h-8 w-8 shrink-0 p-0 text-muted-foreground hover:text-foreground"
         onClick={onRemove}
         title="Remove filter"
       >
         <X size={14} />
-      </button>
+      </Button>
     </div>
   )
 }
@@ -159,26 +208,30 @@ function FilterGroupView({ group, fields, valueSuggestions, depth, onChange, onR
   return (
     <div className={depth > 0 ? 'ml-3 border-l-2 border-border pl-3 py-1' : ''}>
       <div className="flex items-center gap-2 mb-2">
-        <button
+        <Button
           type="button"
-          className="rounded-full border border-input bg-muted px-2.5 py-0.5 text-[11px] font-medium text-foreground cursor-pointer hover:bg-accent transition-colors"
+          variant="outline"
+          size="sm"
+          className="h-6 rounded-full px-2.5 text-[11px] font-medium"
           onClick={toggleMode}
           title={`Switch to ${mode === 'all' ? 'OR' : 'AND'}`}
         >
           {mode === 'all' ? 'AND' : 'OR'}
-        </button>
+        </Button>
         <span className="text-[11px] text-muted-foreground">
           {mode === 'all' ? 'Match all conditions' : 'Match any condition'}
         </span>
         {onRemove && (
-          <button
+          <Button
             type="button"
-            className="ml-auto rounded p-0.5 text-muted-foreground hover:text-foreground"
+            variant="ghost"
+            size="sm"
+            className="ml-auto h-6 w-6 p-0 text-muted-foreground hover:text-foreground"
             onClick={onRemove}
             title="Remove group"
           >
             <X size={12} />
-          </button>
+          </Button>
         )}
       </div>
       <div className="space-y-2">

src/components/FolderTree.tsx

@@ -102,7 +102,7 @@ export const FolderTree = memo(function FolderTree({ folders, selection, onSelec
   if (folders.length === 0 && !isCreating) return null
 
   return (
-    <div style={{ padding: '8px 0' }}>
+    <div style={{ padding: '4px 6px' }}>
       {/* Header */}
       <button
         className="flex w-full cursor-pointer select-none items-center justify-between border-none bg-transparent text-muted-foreground"

src/components/Sidebar.test.tsx

@@ -958,4 +958,55 @@ describe('Sidebar', () => {
       expect(onSelect).toHaveBeenCalledWith({ kind: 'filter', filter: 'favorites' })
     })
   })
+
+  describe('group separators', () => {
+    it('SECTIONS header and its entries share the same border-b container (no separator inside group)', () => {
+      render(<Sidebar entries={mockEntries} selection={defaultSelection} onSelect={() => {}} />)
+      const sectionsHeader = screen.getByText('SECTIONS')
+      const projectsSection = screen.getByText('Projects')
+      // Walk up from SECTIONS header to find the border-b container
+      const borderContainer = sectionsHeader.closest('.border-b')
+      expect(borderContainer).not.toBeNull()
+      // The section entry should be inside the same border-b container
+      expect(borderContainer!.contains(projectsSection)).toBe(true)
+    })
+  })
+
+  describe('view edit button', () => {
+    const mockViews = [
+      {
+        filename: 'active-projects.yml',
+        definition: {
+          name: 'Active Projects',
+          icon: '🚀',
+          color: null,
+          sort: null,
+          filters: { all: [{ field: 'type', op: 'equals' as const, value: 'Project' }] },
+        },
+      },
+    ]
+
+    it('renders edit button for each view item when onEditView is provided', () => {
+      render(
+        <Sidebar entries={mockEntries} selection={defaultSelection} onSelect={() => {}} views={mockViews} onEditView={() => {}} onDeleteView={() => {}} />
+      )
+      expect(screen.getByTitle('Edit view')).toBeInTheDocument()
+    })
+
+    it('does not render edit button when onEditView is not provided', () => {
+      render(
+        <Sidebar entries={mockEntries} selection={defaultSelection} onSelect={() => {}} views={mockViews} onDeleteView={() => {}} />
+      )
+      expect(screen.queryByTitle('Edit view')).not.toBeInTheDocument()
+    })
+
+    it('calls onEditView with correct filename when clicked', () => {
+      const onEditView = vi.fn()
+      render(
+        <Sidebar entries={mockEntries} selection={defaultSelection} onSelect={() => {}} views={mockViews} onEditView={onEditView} onDeleteView={() => {}} />
+      )
+      fireEvent.click(screen.getByTitle('Edit view'))
+      expect(onEditView).toHaveBeenCalledWith('active-projects.yml')
+    })
+  })
 })

src/components/Sidebar.tsx

@@ -12,7 +12,7 @@ import {
 } from '@dnd-kit/sortable'
 import { CSS } from '@dnd-kit/utilities'
 import {
-  FileText, Trash, Archive, CaretLeft, Tray, CaretRight, CaretDown, Plus, Funnel,
+  FileText, Trash, Archive, CaretLeft, Tray, CaretRight, CaretDown, Plus, Funnel, PencilSimple,
 } from '@phosphor-icons/react'
 import { isEmoji } from '../utils/emoji'
 import { arrayMove } from '@dnd-kit/sortable'
@@ -40,6 +40,7 @@ interface SidebarProps {
   onReorderFavorites?: (orderedPaths: string[]) => void
   views?: ViewFile[]
   onCreateView?: () => void
+  onEditView?: (filename: string) => void
   onDeleteView?: (filename: string) => void
   folders?: FolderNode[]
   onCreateFolder?: (name: string) => void
@@ -223,7 +224,7 @@ function FavoritesSection({ entries, selection, onSelect, onSelectNote, onReorde
   if (favorites.length === 0) return null
 
   return (
-    <div style={{ padding: '4px 6px 0' }}>
+    <div style={{ padding: '4px 6px' }}>
       <button
         className="flex w-full cursor-pointer select-none items-center justify-between border-none bg-transparent text-muted-foreground"
         style={{ padding: '6px 14px 6px 16px' }}
@@ -331,7 +332,7 @@ export const Sidebar = memo(function Sidebar({
   entries, selection, onSelect,
   onCustomizeType, onUpdateTypeTemplate, onReorderSections, onRenameSection,
   onToggleTypeVisibility, onSelectFavorite, onReorderFavorites,
-  views = [], onCreateView, onDeleteView,
+  views = [], onCreateView, onEditView, onDeleteView,
   folders = [], onCreateFolder, inboxCount = 0, onCollapse,
 }: SidebarProps) {
   const [customizeTarget, setCustomizeTarget] = useState<string | null>(null)
@@ -430,7 +431,7 @@ export const Sidebar = memo(function Sidebar({
 
         {/* Views */}
         {hasViews && (
-          <div className="border-b border-border" style={{ padding: '4px 6px 0' }}>
+          <div className="border-b border-border" style={{ padding: '4px 6px' }}>
             <button
               className="flex w-full cursor-pointer select-none items-center justify-between border-none bg-transparent text-muted-foreground"
               style={{ padding: '6px 14px 6px 16px' }}
@@ -454,20 +455,31 @@ export const Sidebar = memo(function Sidebar({
                   <div key={v.filename} className="group relative">
                     <NavItem
                       icon={Funnel}
+                      emoji={v.definition.icon}
                       label={v.definition.name}
                       isActive={isSelectionActive(selection, { kind: 'view', filename: v.filename })}
                       onClick={() => onSelect({ kind: 'view', filename: v.filename })}
-                      compact
                     />
-                    {onDeleteView && (
-                      <button
-                        className="absolute right-2 top-1/2 -translate-y-1/2 rounded p-0.5 text-muted-foreground opacity-0 transition-opacity hover:text-destructive group-hover:opacity-100"
-                        onClick={(e) => { e.stopPropagation(); onDeleteView(v.filename) }}
-                        title="Delete view"
-                      >
-                        <Trash size={12} />
-                      </button>
-                    )}
+                    <div className="absolute right-2 top-1/2 flex -translate-y-1/2 items-center gap-0.5 opacity-0 transition-opacity group-hover:opacity-100">
+                      {onEditView && (
+                        <button
+                          className="rounded p-0.5 text-muted-foreground hover:text-foreground"
+                          onClick={(e) => { e.stopPropagation(); onEditView(v.filename) }}
+                          title="Edit view"
+                        >
+                          <PencilSimple size={12} />
+                        </button>
+                      )}
+                      {onDeleteView && (
+                        <button
+                          className="rounded p-0.5 text-muted-foreground hover:text-destructive"
+                          onClick={(e) => { e.stopPropagation(); onDeleteView(v.filename) }}
+                          title="Delete view"
+                        >
+                          <Trash size={12} />
+                        </button>
+                      )}
+                    </div>
                   </div>
                 ))}
               </div>
@@ -475,39 +487,41 @@ export const Sidebar = memo(function Sidebar({
           </div>
         )}
 
-        {/* Sections header + visibility popover */}
-        <div ref={customizeRef} className="border-b border-border" style={{ position: 'relative', padding: '4px 6px 0' }}>
-          <button
-            className="flex w-full cursor-pointer select-none items-center justify-between border-none bg-transparent text-muted-foreground"
-            style={{ padding: '6px 14px 6px 16px' }}
-            onClick={() => toggleGroup('sections')}
-          >
-            <div className="flex items-center gap-1">
-              {groupCollapsed.sections ? <CaretRight size={12} /> : <CaretDown size={12} />}
-              <span className="text-[10px] font-semibold" style={{ letterSpacing: 0.5 }}>SECTIONS</span>
-            </div>
-            <span
-              role="button"
-              title="Customize sections"
-              aria-label="Customize sections"
-              onClick={(e) => { e.stopPropagation(); setShowCustomize((v) => !v) }}
+        {/* Sections header + entries */}
+        <div className="border-b border-border">
+          <div ref={customizeRef} style={{ position: 'relative', padding: '4px 6px' }}>
+            <button
+              className="flex w-full cursor-pointer select-none items-center justify-between border-none bg-transparent text-muted-foreground"
+              style={{ padding: '6px 14px 6px 16px' }}
+              onClick={() => toggleGroup('sections')}
             >
-              <SlidersHorizontal size={12} className="text-muted-foreground hover:text-foreground" />
-            </span>
-          </button>
-          {showCustomize && <VisibilityPopover sections={allSectionGroups} isSectionVisible={isSectionVisible} onToggle={toggleVisibility} />}
-        </div>
+              <div className="flex items-center gap-1">
+                {groupCollapsed.sections ? <CaretRight size={12} /> : <CaretDown size={12} />}
+                <span className="text-[10px] font-semibold" style={{ letterSpacing: 0.5 }}>SECTIONS</span>
+              </div>
+              <span
+                role="button"
+                title="Customize sections"
+                aria-label="Customize sections"
+                onClick={(e) => { e.stopPropagation(); setShowCustomize((v) => !v) }}
+              >
+                <SlidersHorizontal size={12} className="text-muted-foreground hover:text-foreground" />
+              </span>
+            </button>
+            {showCustomize && <VisibilityPopover sections={allSectionGroups} isSectionVisible={isSectionVisible} onToggle={toggleVisibility} />}
+          </div>
 
-        {/* Sortable section groups */}
-        {!groupCollapsed.sections && (
-          <DndContext sensors={sensors} collisionDetection={closestCenter} onDragEnd={handleDragEnd}>
-            <SortableContext items={sectionIds} strategy={verticalListSortingStrategy}>
-              {visibleSections.map((g) => (
-                <SortableSection key={g.type} group={g} sectionProps={sectionProps} />
-              ))}
-            </SortableContext>
-          </DndContext>
-        )}
+          {/* Sortable section groups */}
+          {!groupCollapsed.sections && (
+            <DndContext sensors={sensors} collisionDetection={closestCenter} onDragEnd={handleDragEnd}>
+              <SortableContext items={sectionIds} strategy={verticalListSortingStrategy}>
+                {visibleSections.map((g) => (
+                  <SortableSection key={g.type} group={g} sectionProps={sectionProps} />
+                ))}
+              </SortableContext>
+            </DndContext>
+          )}
+        </div>
 
         {/* Folder tree */}
         <FolderTree folders={folders} selection={selection} onSelect={onSelect} onCreateFolder={onCreateFolder} collapsed={groupCollapsed.folders} onToggle={() => toggleGroup('folders')} />

src/components/SidebarParts.tsx

@@ -26,8 +26,9 @@ export function isSelectionActive(current: SidebarSelection, check: SidebarSelec
 
 // --- NavItem ---
 
-export function NavItem({ icon: Icon, label, count, isActive, activeClassName = 'bg-primary/10 text-primary', badgeClassName, badgeStyle, activeBadgeClassName, activeBadgeStyle, onClick, disabled, disabledTooltip, compact }: {
+export function NavItem({ icon: Icon, emoji, label, count, isActive, activeClassName = 'bg-primary/10 text-primary', badgeClassName, badgeStyle, activeBadgeClassName, activeBadgeStyle, onClick, disabled, disabledTooltip, compact }: {
   icon: ComponentType<IconProps>
+  emoji?: string | null
   label: string
   count?: number
   isActive?: boolean
@@ -46,11 +47,14 @@ export function NavItem({ icon: Icon, label, count, isActive, activeClassName =
   const padding = compact ? '4px 16px' : '6px 16px'
   const resolvedBadgeClass = isActive && activeBadgeClassName ? activeBadgeClassName : badgeClassName
   const resolvedBadgeStyle = isActive && activeBadgeClassName ? activeBadgeStyle : badgeStyle
+  const iconEl = emoji
+    ? <span style={{ fontSize: iconSize, lineHeight: 1, width: iconSize, textAlign: 'center' }}>{emoji}</span>
+    : <Icon size={iconSize} weight={isActive ? 'fill' : 'regular'} />
 
   if (disabled) {
     return (
       <div className="flex select-none items-center gap-2 rounded text-foreground" style={{ padding, borderRadius: 4, opacity: 0.4, cursor: 'not-allowed' }} title={disabledTooltip ?? "Coming soon"}>
-        <Icon size={iconSize} />
+        {iconEl}
         <span className={cn("flex-1 font-medium", textClass)}>{label}</span>
       </div>
     )
@@ -61,7 +65,7 @@ export function NavItem({ icon: Icon, label, count, isActive, activeClassName =
       style={{ padding, borderRadius: 4 }}
       onClick={onClick}
     >
-      <Icon size={iconSize} weight={isActive ? 'fill' : 'regular'} />
+      {iconEl}
       <span className={cn("flex-1 font-medium", textClass)}>{label}</span>
       {count !== undefined && count > 0 && (
         <span className={cn("flex items-center justify-center", resolvedBadgeClass)} style={{ height: compact ? 18 : 20, borderRadius: 9999, padding: '0 6px', fontSize: 10, ...resolvedBadgeStyle }}>

src/hooks/useDialogs.ts

@@ -1,4 +1,5 @@
 import { useState, useCallback } from 'react'
+import type { ViewDefinition } from '../types'
 
 export function useDialogs() {
   const [showCreateTypeDialog, setShowCreateTypeDialog] = useState(false)
@@ -10,6 +11,7 @@ export function useDialogs() {
   const [showSearch, setShowSearch] = useState(false)
   const [showConflictResolver, setShowConflictResolver] = useState(false)
   const [showCreateViewDialog, setShowCreateViewDialog] = useState(false)
+  const [editingView, setEditingView] = useState<{ filename: string; definition: ViewDefinition } | null>(null)
 
   const openCreateType = useCallback(() => setShowCreateTypeDialog(true), [])
   const closeCreateType = useCallback(() => setShowCreateTypeDialog(false), [])
@@ -26,8 +28,12 @@ export function useDialogs() {
   const closeSearch = useCallback(() => setShowSearch(false), [])
   const openConflictResolver = useCallback(() => setShowConflictResolver(true), [])
   const closeConflictResolver = useCallback(() => setShowConflictResolver(false), [])
-  const openCreateView = useCallback(() => setShowCreateViewDialog(true), [])
-  const closeCreateView = useCallback(() => setShowCreateViewDialog(false), [])
+  const openCreateView = useCallback(() => { setEditingView(null); setShowCreateViewDialog(true) }, [])
+  const closeCreateView = useCallback(() => { setShowCreateViewDialog(false); setEditingView(null) }, [])
+  const openEditView = useCallback((filename: string, definition: ViewDefinition) => {
+    setEditingView({ filename, definition })
+    setShowCreateViewDialog(true)
+  }, [])
 
   return {
     showCreateTypeDialog, openCreateType, closeCreateType,
@@ -38,6 +44,6 @@ export function useDialogs() {
     showGitHubVault, openGitHubVault, closeGitHubVault,
     showSearch, openSearch, closeSearch,
     showConflictResolver, openConflictResolver, closeConflictResolver,
-    showCreateViewDialog, openCreateView, closeCreateView,
+    showCreateViewDialog, openCreateView, closeCreateView, editingView, openEditView,
   }
 }

src/utils/viewFilters.test.ts

@@ -136,4 +136,58 @@ describe('evaluateView', () => {
     const result = evaluateView(view, entries)
     expect(result.map((e) => e.title)).toEqual(['A', 'B'])
   })
+
+  it('contains on relationship uses substring match for plain text', () => {
+    const view: ViewDefinition = {
+      name: 'Monday', icon: null, color: null, sort: null,
+      filters: { all: [{ field: 'belongs to', op: 'contains', value: 'Monday' }] },
+    }
+    const entries = [
+      makeEntry({ title: 'A', relationships: { 'belongs to': ['[[Monday Ideas]]'] } }),
+      makeEntry({ title: 'B', relationships: { 'belongs to': ['[[Monday Recap]]'] } }),
+      makeEntry({ title: 'C', relationships: { 'belongs to': ['[[Tuesday Ideas]]'] } }),
+    ]
+    const result = evaluateView(view, entries)
+    expect(result.map((e) => e.title)).toEqual(['A', 'B'])
+  })
+
+  it('not_contains on relationship uses substring match for plain text', () => {
+    const view: ViewDefinition = {
+      name: 'Not Monday', icon: null, color: null, sort: null,
+      filters: { all: [{ field: 'belongs to', op: 'not_contains', value: 'Monday' }] },
+    }
+    const entries = [
+      makeEntry({ title: 'A', relationships: { 'belongs to': ['[[Monday Ideas]]'] } }),
+      makeEntry({ title: 'B', relationships: { 'belongs to': ['[[Tuesday Ideas]]'] } }),
+      makeEntry({ title: 'C', relationships: { 'belongs to': [] } }),
+    ]
+    const result = evaluateView(view, entries)
+    expect(result.map((e) => e.title)).toEqual(['B', 'C'])
+  })
+
+  it('contains on relationship uses exact match for wikilink syntax', () => {
+    const view: ViewDefinition = {
+      name: 'Exact', icon: null, color: null, sort: null,
+      filters: { all: [{ field: 'belongs to', op: 'contains', value: '[[Monday Ideas]]' }] },
+    }
+    const entries = [
+      makeEntry({ title: 'A', relationships: { 'belongs to': ['[[Monday Ideas]]'] } }),
+      makeEntry({ title: 'B', relationships: { 'belongs to': ['[[Monday Recap]]'] } }),
+    ]
+    const result = evaluateView(view, entries)
+    expect(result.map((e) => e.title)).toEqual(['A'])
+  })
+
+  it('any_of / none_of on relationship always use exact stem match', () => {
+    const view: ViewDefinition = {
+      name: 'Exact list', icon: null, color: null, sort: null,
+      filters: { all: [{ field: 'belongs to', op: 'any_of', value: ['[[Monday]]'] }] },
+    }
+    const entries = [
+      makeEntry({ title: 'Exact', relationships: { 'belongs to': ['[[Monday]]'] } }),
+      makeEntry({ title: 'Partial', relationships: { 'belongs to': ['[[Monday Ideas]]'] } }),
+    ]
+    const result = evaluateView(view, entries)
+    expect(result.map((e) => e.title)).toEqual(['Exact'])
+  })
 })

src/utils/viewFilters.ts

@@ -75,7 +75,10 @@ function evaluateCondition(cond: FilterCondition, entry: VaultEntry): boolean {
 
   if (resolved.array) {
     const stem = wikilinkStem(condVal)
-    const arrayMatch = (arr: string[]) => arr.some((item) => wikilinkStem(item) === stem)
+    const isWikilink = condVal.trim().startsWith('[[')
+    const arrayMatch = (arr: string[]) => arr.some((item) =>
+      isWikilink ? wikilinkStem(item) === stem : wikilinkStem(item).includes(stem)
+    )
     if (op === 'contains') return arrayMatch(resolved.array)
     if (op === 'not_contains') return !arrayMatch(resolved.array)
     if (op === 'any_of' && Array.isArray(value)) {