Merge pull request #88 from lordmathis/docs/screenshot

Add app screenshot to README

.github/dependabot.yml

@@ -0,0 +1,21 @@
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/app"
+    schedule:
+      interval: "weekly"
+    groups:
+      minor-and-patch:
+        update-types:
+          - "minor"
+          - "patch"
+
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+      minor-and-patch:
+        update-types:
+          - "minor"
+          - "patch"

.gitignore

@@ -162,3 +162,9 @@ go.work.sum
 main
 *.db
 data
+
+# Feature specifications
+spec.md
+
+# Go debug files
+__debug_bin*

README.md

@@ -4,15 +4,21 @@
 
 Yet another markdown editor. Work in progress
 
+![App Screenshot](./.github/screenshot.png)
+
 ## Features
 
-- Markdown editing with syntax highlighting
+- **Editing & Content**
-- File tree navigation
+  - **Rich Markdown Editing** - Full-featured editor with syntax highlighting and live preview
-- Git integration for version control
+  - **Wikilinks Support** - Create interconnected notes with `[[wikilink]]` syntax and smart autocomplete
-- Dark and light theme support
+  - **Math Equations** - Render beautiful mathematical expressions with MathJax support
-- Multiple workspaces
+  - **Code Highlighting** - Syntax highlighting for code blocks in multiple languages
-- Math equation support (MathJax)
+- **Organization & Workflow**
-- Code syntax highlighting
+  - **File Tree Navigation** - Organized folder structure with intuitive file management
+  - **Multi-Workspace** - Manage multiple projects and note collections in one place
+  - **Git Integration** - Built-in version control to track changes and collaborate safely
+- **Customization**
+  - **Theme Flexibility** - Switch between dark and light modes to match your preference
 
 ## Prerequisites
 
@@ -22,33 +28,32 @@ Yet another markdown editor. Work in progress
 
 ## Configuration
 
-Lemma can be configured using environment variables. Here are the available configuration options:
+Lemma is configured using environment variables.
 
-### Required Environment Variables
+### Environment Variables
 
-- `LEMMA_ADMIN_EMAIL`: Email address for the admin account
+| Variable                    | Required | Default             | Description                                                                                              |
-- `LEMMA_ADMIN_PASSWORD`: Password for the admin account
+| --------------------------- | -------- | ------------------- | -------------------------------------------------------------------------------------------------------- |
-
+| `LEMMA_ADMIN_EMAIL`         | Yes      | -                   | Email address for the admin account                                                                      |
-### Optional Environment Variables
+| `LEMMA_ADMIN_PASSWORD`      | Yes      | -                   | Password for the admin account                                                                           |
-
+| `LEMMA_ENV`                 | No       | production          | Set to "development" to enable development mode                                                          |
-- `LEMMA_ENV`: Set to "development" to enable development mode
+| `LEMMA_DB_URL`              | No       | `sqlite://lemma.db` | Database connection string (supports `sqlite://`, `sqlite3://`, `postgres://`, `postgresql://` prefixes) |
-- `LEMMA_DB_URL`: URL (Connection string) to the database. Supported databases are sqlite and postgres a (default: "./lemma.db")
+| `LEMMA_WORKDIR`             | No       | `./data`            | Working directory for application data                                                                   |
-- `LEMMA_WORKDIR`: Working directory for application data (default: "sqlite://lemma.db")
+| `LEMMA_STATIC_PATH`         | No       | `../app/dist`       | Path to static files                                                                                     |
-- `LEMMA_STATIC_PATH`: Path to static files (default: "../app/dist")
+| `LEMMA_PORT`                | No       | `8080`              | Port to run the server on                                                                                |
-- `LEMMA_PORT`: Port to run the server on (default: "8080")
+| `LEMMA_DOMAIN`              | No       | -                   | Domain name for cookie authentication                                                                    |
-- `LEMMA_DOMAIN`: Domain name where the application is hosted for cookie authentication
+| `LEMMA_CORS_ORIGINS`        | No       | -                   | Comma-separated list of allowed CORS origins                                                             |
-- `LEMMA_CORS_ORIGINS`: Comma-separated list of allowed CORS origins
+| `LEMMA_ENCRYPTION_KEY`      | No       | auto-generated      | Base64-encoded 32-byte key for encrypting sensitive data                                                 |
-- `LEMMA_ENCRYPTION_KEY`: Base64-encoded 32-byte key used for encrypting sensitive data. If not provided, a key will be automatically generated and stored in `{LEMMA_WORKDIR}/secrets/encryption_key`
+| `LEMMA_JWT_SIGNING_KEY`     | No       | auto-generated      | Key used for signing JWT tokens                                                                          |
-- `LEMMA_JWT_SIGNING_KEY`: Key used for signing JWT tokens. If not provided, a key will be automatically generated and stored in `{LEMMA_WORKDIR}/secrets/jwt_signing_key`
+| `LEMMA_LOG_LEVEL`           | No       | DEBUG/INFO\*        | Logging level (\*DEBUG in dev, INFO in production)                                                       |
-- `LEMMA_LOG_LEVEL`: Logging level (defaults to DEBUG in development mode, INFO in production)
+| `LEMMA_RATE_LIMIT_REQUESTS` | No       | `100`               | Number of allowed requests per window                                                                    |
-- `LEMMA_RATE_LIMIT_REQUESTS`: Number of allowed requests per window (default: 100)
+| `LEMMA_RATE_LIMIT_WINDOW`   | No       | `15m`               | Duration of the rate limit window                                                                        |
-- `LEMMA_RATE_LIMIT_WINDOW`: Duration of the rate limit window (default: 15m)
 
 ### Security Keys
 
-Both the encryption key and JWT signing key are automatically generated on first startup if not provided via environment variables. The keys are stored in `{LEMMA_WORKDIR}/secrets/` with restrictive file permissions (0600).
+Security keys (`LEMMA_ENCRYPTION_KEY` and `LEMMA_JWT_SIGNING_KEY`) are automatically generated on first startup if not provided. Keys are stored in `{LEMMA_WORKDIR}/secrets/`.
 
-**Important**: Back up the `secrets` directory! If these keys are lost, encrypted data will become inaccessible and all users will need to re-authenticate.
+**Important:** Back up the `secrets` directory!
 
 ## Running the backend server
 

app/package.json

@@ -29,55 +29,56 @@
   },
   "homepage": "https://github.com/LordMathis/Lemma#readme",
   "dependencies": {
-    "@codemirror/commands": "^6.6.2",
+    "@codemirror/autocomplete": "^6.19.1",
-    "@codemirror/lang-markdown": "^6.2.5",
+    "@codemirror/commands": "^6.10.0",
-    "@codemirror/state": "^6.4.1",
+    "@codemirror/lang-markdown": "^6.5.0",
-    "@codemirror/theme-one-dark": "^6.1.2",
+    "@codemirror/state": "^6.5.2",
-    "@codemirror/view": "^6.34.0",
+    "@codemirror/theme-one-dark": "^6.1.3",
-    "@mantine/core": "^7.13.2",
+    "@codemirror/view": "^6.38.6",
-    "@mantine/hooks": "^7.13.2",
+    "@mantine/core": "^8.3.7",
-    "@mantine/modals": "^7.13.2",
+    "@mantine/hooks": "^8.3.7",
-    "@mantine/notifications": "^7.13.2",
+    "@mantine/modals": "^8.3.7",
+    "@mantine/notifications": "^8.3.7",
     "@react-hook/resize-observer": "^2.0.2",
-    "@tabler/icons-react": "^3.19.0",
+    "@tabler/icons-react": "^3.35.0",
-    "codemirror": "^6.0.1",
+    "codemirror": "^6.0.2",
     "react": "^18.3.1",
-    "react-arborist": "^3.4.0",
+    "react-arborist": "^3.4.3",
     "react-dom": "^18.3.1",
     "rehype-highlight": "^7.0.2",
-    "rehype-mathjax": "^6.0.0",
+    "rehype-mathjax": "^7.1.0",
     "rehype-react": "^8.0.0",
     "remark": "^15.0.1",
     "remark-math": "^6.0.0",
     "remark-parse": "^11.0.0",
-    "remark-rehype": "^11.1.1",
+    "remark-rehype": "^11.1.2",
     "unified": "^11.0.5",
     "unist-util-visit": "^5.0.0"
   },
   "devDependencies": {
-    "@eslint/compat": "^1.2.9",
+    "@eslint/compat": "^1.4.1",
-    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.0",
     "@types/babel__core": "^7.20.5",
     "@types/node": "^22.14.0",
     "@types/react": "^18.3.20",
     "@types/react-dom": "^18.3.6",
-    "@typescript-eslint/eslint-plugin": "^8.32.1",
+    "@typescript-eslint/eslint-plugin": "^8.46.4",
     "@typescript-eslint/parser": "^8.32.1",
     "@vitejs/plugin-react": "^4.3.4",
-    "@vitest/coverage-v8": "^3.1.4",
+    "@vitest/coverage-v8": "^4.0.8",
-    "eslint": "^9.27.0",
+    "eslint": "^9.39.1",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^5.2.0",
     "jsdom": "^26.1.0",
-    "postcss": "^8.4.47",
+    "postcss": "^8.5.6",
-    "postcss-preset-mantine": "^1.17.0",
+    "postcss-preset-mantine": "^1.18.0",
     "postcss-simple-vars": "^7.0.1",
-    "sass": "^1.80.4",
+    "sass": "^1.93.3",
-    "typescript": "^5.8.2",
+    "typescript": "^5.9.3",
     "vite": "^6.4.1",
-    "vite-plugin-compression2": "^1.3.0",
+    "vite-plugin-compression2": "^2.3.1",
-    "vitest": "^3.1.4"
+    "vitest": "^4.0.8"
   },
   "browserslist": {
     "production": [

app/src/api/api.ts

@@ -29,10 +29,16 @@ export const apiCall = async (
     // Set up headers with CSRF token for non-GET requests
     const method = options.method || 'GET';
     const headers: Record<string, string> = {
-      'Content-Type': 'application/json',
       ...(options.headers as Record<string, string>),
     };
 
+    // Only set Content-Type to application/json if not already set and body is not FormData
+    // FormData requires the browser to set Content-Type with the boundary parameter
+    const isFormData = options.body instanceof FormData;
+    if (!headers['Content-Type'] && !isFormData) {
+      headers['Content-Type'] = 'application/json';
+    }
+
     // Add CSRF token for non-GET methods
     if (method !== 'GET') {
       const csrfToken = getCsrfToken();
@@ -41,11 +47,18 @@ export const apiCall = async (
       }
     }
 
+    // For FormData, don't include Content-Type in headers - let the browser set it
+    const fetchHeaders = isFormData
+      ? Object.fromEntries(
+          Object.entries(headers).filter(([key]) => key !== 'Content-Type')
+        )
+      : headers;
+
     const response = await fetch(url, {
       ...options,
       // Include credentials to send/receive cookies
       credentials: 'include',
-      headers,
+      headers: fetchHeaders,
     });
     console.debug(`Response status: ${response.status} for URL: ${url}`);
 

app/src/components/editor/ContentView.test.tsx

@@ -104,6 +104,7 @@ describe('ContentView', () => {
           handleContentChange={mockHandleContentChange}
           handleSave={mockHandleSave}
           handleFileSelect={mockHandleFileSelect}
+          files={[]}
         />
       </TestWrapper>
     );
@@ -121,6 +122,7 @@ describe('ContentView', () => {
           handleContentChange={mockHandleContentChange}
           handleSave={mockHandleSave}
           handleFileSelect={mockHandleFileSelect}
+          files={[]}
         />
       </TestWrapper>
     );
@@ -138,6 +140,7 @@ describe('ContentView', () => {
           handleContentChange={mockHandleContentChange}
           handleSave={mockHandleSave}
           handleFileSelect={mockHandleFileSelect}
+          files={[]}
         />
       </TestWrapper>
     );
@@ -157,6 +160,7 @@ describe('ContentView', () => {
           handleContentChange={mockHandleContentChange}
           handleSave={mockHandleSave}
           handleFileSelect={mockHandleFileSelect}
+          files={[]}
         />
       </TestWrapper>
     );
@@ -179,6 +183,7 @@ describe('ContentView', () => {
           handleContentChange={mockHandleContentChange}
           handleSave={mockHandleSave}
           handleFileSelect={mockHandleFileSelect}
+          files={[]}
         />
       </TestWrapper>
     );
@@ -208,6 +213,7 @@ describe('ContentView', () => {
           handleContentChange={mockHandleContentChange}
           handleSave={mockHandleSave}
           handleFileSelect={mockHandleFileSelect}
+          files={[]}
         />
       </TestWrapper>
     );

app/src/components/editor/ContentView.tsx

@@ -4,6 +4,7 @@ import Editor from './Editor';
 import MarkdownPreview from './MarkdownPreview';
 import { getFileUrl, isImageFile } from '../../utils/fileHelpers';
 import { useWorkspace } from '@/contexts/WorkspaceContext';
+import type { FileNode } from '../../types/models';
 
 type ViewTab = 'source' | 'preview';
 
@@ -14,6 +15,7 @@ interface ContentViewProps {
   handleContentChange: (content: string) => void;
   handleSave: (filePath: string, content: string) => Promise<boolean>;
   handleFileSelect: (filePath: string | null) => Promise<void>;
+  files: FileNode[];
 }
 
 const ContentView: React.FC<ContentViewProps> = ({
@@ -23,6 +25,7 @@ const ContentView: React.FC<ContentViewProps> = ({
   handleContentChange,
   handleSave,
   handleFileSelect,
+  files,
 }) => {
   const { currentWorkspace } = useWorkspace();
   if (!currentWorkspace) {
@@ -67,6 +70,7 @@ const ContentView: React.FC<ContentViewProps> = ({
       handleContentChange={handleContentChange}
       handleSave={handleSave}
       selectedFile={selectedFile}
+      files={files}
     />
   ) : (
     <MarkdownPreview content={content} handleFileSelect={handleFileSelect} />

app/src/components/editor/Editor.tsx

@@ -1,17 +1,22 @@
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect, useRef, useMemo } from 'react';
 import { basicSetup } from 'codemirror';
 import { EditorState } from '@codemirror/state';
 import { EditorView, keymap } from '@codemirror/view';
 import { markdown } from '@codemirror/lang-markdown';
 import { defaultKeymap } from '@codemirror/commands';
 import { oneDark } from '@codemirror/theme-one-dark';
+import { autocompletion } from '@codemirror/autocomplete';
 import { useWorkspace } from '../../hooks/useWorkspace';
+import { createWikiLinkCompletions } from '../../utils/wikiLinkCompletion';
+import { flattenFileTree } from '../../utils/fileHelpers';
+import type { FileNode } from '../../types/models';
 
 interface EditorProps {
   content: string;
   handleContentChange: (content: string) => void;
   handleSave: (filePath: string, content: string) => Promise<boolean>;
   selectedFile: string;
+  files: FileNode[];
 }
 
 const Editor: React.FC<EditorProps> = ({
@@ -19,11 +24,19 @@ const Editor: React.FC<EditorProps> = ({
   handleContentChange,
   handleSave,
   selectedFile,
+  files,
 }) => {
-  const { colorScheme } = useWorkspace();
+  const { colorScheme, currentWorkspace } = useWorkspace();
   const editorRef = useRef<HTMLDivElement>(null);
   const viewRef = useRef<EditorView | null>(null);
 
+  // Flatten file tree for autocompletion, respecting showHiddenFiles setting
+  const showHiddenFiles = currentWorkspace?.showHiddenFiles || false;
+  const flatFiles = useMemo(
+    () => flattenFileTree(files, showHiddenFiles),
+    [files, showHiddenFiles]
+  );
+
   useEffect(() => {
     const handleEditorSave = (view: EditorView): boolean => {
       void handleSave(selectedFile, view.state.doc.toString());
@@ -71,6 +84,12 @@ const Editor: React.FC<EditorProps> = ({
         }),
         theme,
         colorScheme === 'dark' ? oneDark : [],
+        autocompletion({
+          override: [createWikiLinkCompletions(flatFiles)],
+          activateOnTyping: true,
+          maxRenderedOptions: 10,
+          closeOnBlur: true,
+        }),
       ],
     });
 
@@ -87,7 +106,7 @@ const Editor: React.FC<EditorProps> = ({
     };
     // TODO: Refactor
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [colorScheme, handleContentChange, handleSave, selectedFile]);
+  }, [colorScheme, handleContentChange, handleSave, selectedFile, flatFiles]);
 
   useEffect(() => {
     if (viewRef.current && content !== viewRef.current.state.doc.toString()) {

app/src/components/files/FileTree.tsx

@@ -6,7 +6,7 @@ import {
   IconFolderOpen,
   IconUpload,
 } from '@tabler/icons-react';
-import { Tooltip, Text, Box } from '@mantine/core';
+import { Text, Box } from '@mantine/core';
 import useResizeObserver from '@react-hook/resize-observer';
 import { useFileOperations } from '../../hooks/useFileOperations';
 import type { FileNode } from '@/types/models';
@@ -53,13 +53,12 @@ function Node({
   style,
   dragHandle,
   onNodeClick,
-  ...rest
 }: {
   node: NodeApi<FileNode>;
   style: React.CSSProperties;
   dragHandle?: React.Ref<HTMLDivElement>;
   onNodeClick?: (node: NodeApi<FileNode>) => void;
-} & Record<string, unknown>) {
+}) {
   const handleClick = () => {
     if (node.isInternal) {
       node.toggle();
@@ -69,37 +68,40 @@ function Node({
   };
 
   return (
-    <Tooltip label={node.data.name} openDelay={500}>
+    <div
-      <div
+      ref={dragHandle} // This enables dragging for the node
-        ref={dragHandle} // This enables dragging for the node
+      style={{
+        ...style,
+        paddingLeft: `${node.level * 20}px`,
+        display: 'flex',
+        alignItems: 'center',
+        cursor: 'pointer',
+        whiteSpace: 'nowrap',
+        overflow: 'hidden',
+        // Add visual feedback when being dragged
+        opacity: node.state?.isDragging ? 0.5 : 1,
+        // Highlight when this node will receive the drop
+        backgroundColor: node.state?.willReceiveDrop
+          ? 'rgba(0, 123, 255, 0.2)'
+          : 'transparent',
+        borderRadius: '4px',
+      }}
+      onClick={handleClick}
+      title={node.data.name}
+    >
+      <FileIcon node={node} />
+      <span
         style={{
-          ...style,
+          marginLeft: '8px',
-          paddingLeft: `${node.level * 20}px`,
+          fontSize: '14px',
-          display: 'flex',
-          alignItems: 'center',
-          cursor: 'pointer',
-          whiteSpace: 'nowrap',
           overflow: 'hidden',
-          // Add visual feedback when being dragged
+          textOverflow: 'ellipsis',
-          opacity: node.state?.isDragging ? 0.5 : 1,
+          flexGrow: 1,
         }}
-        onClick={handleClick}
-        {...rest}
       >
-        <FileIcon node={node} />
+        {node.data.name}
-        <span
+      </span>
-          style={{
+    </div>
-            marginLeft: '8px',
-            fontSize: '14px',
-            overflow: 'hidden',
-            textOverflow: 'ellipsis',
-            flexGrow: 1,
-          }}
-        >
-          {node.data.name}
-        </span>
-      </div>
-    </Tooltip>
   );
 }
 
@@ -205,41 +207,46 @@ export const FileTree: React.FC<FileTreeProps> = ({
 
   // External file drag and drop handlers
   const handleDragEnter = useCallback((e: React.DragEvent) => {
-    e.preventDefault();
-    e.stopPropagation();
-
     // Check if drag contains files (not internal tree nodes)
     if (e.dataTransfer.types.includes('Files')) {
+      e.preventDefault();
+      e.stopPropagation();
       setIsDragOver(true);
     }
   }, []);
 
   const handleDragLeave = useCallback((e: React.DragEvent) => {
-    e.preventDefault();
+    // Only handle if it's an external file drag
-    e.stopPropagation();
+    if (e.dataTransfer.types.includes('Files')) {
+      e.preventDefault();
+      e.stopPropagation();
 
-    // Only hide overlay when leaving the container itself
+      // Only hide overlay when leaving the container itself
-    if (e.currentTarget === e.target) {
+      if (e.currentTarget === e.target) {
-      setIsDragOver(false);
+        setIsDragOver(false);
+      }
     }
   }, []);
 
   const handleDragOver = useCallback((e: React.DragEvent) => {
-    e.preventDefault();
+    // Only handle external file drags
-    e.stopPropagation();
+    if (e.dataTransfer.types.includes('Files')) {
-    // Set the drop effect to indicate this is a valid drop target
+      e.preventDefault();
-    e.dataTransfer.dropEffect = 'copy';
+      e.stopPropagation();
+      // Set the drop effect to indicate this is a valid drop target
+      e.dataTransfer.dropEffect = 'copy';
+    }
   }, []);
 
   const handleDrop = useCallback(
     (e: React.DragEvent) => {
-      e.preventDefault();
-      e.stopPropagation();
-
-      setIsDragOver(false);
-
       const { files } = e.dataTransfer;
+      // Only handle if it's an external file drop
       if (files && files.length > 0) {
+        e.preventDefault();
+        e.stopPropagation();
+        setIsDragOver(false);
+
         const uploadFiles = async () => {
           try {
             const success = await handleUpload(files);
@@ -305,7 +312,10 @@ export const FileTree: React.FC<FileTreeProps> = ({
           height={size.height}
           indent={24}
           rowHeight={28}
+          idAccessor="id"
           onMove={handleTreeMove}
+          disableDrag={() => false}
+          disableDrop={() => false}
           onActivate={(node) => {
             const fileNode = node.data;
             if (!node.isInternal) {

app/src/components/files/FolderSelector.tsx

@@ -0,0 +1,266 @@
+import React, { useRef, useLayoutEffect, useState } from 'react';
+import { Box } from '@mantine/core';
+import { Tree, type NodeApi } from 'react-arborist';
+import {
+  IconFolder,
+  IconFolderOpen,
+  IconChevronRight,
+} from '@tabler/icons-react';
+import useResizeObserver from '@react-hook/resize-observer';
+import { filterToFolders } from '../../utils/fileTreeUtils';
+import type { FileNode } from '@/types/models';
+
+interface FolderSelectorProps {
+  files: FileNode[];
+  selectedPath: string;
+  onSelect: (path: string) => void;
+}
+
+interface Size {
+  width: number;
+  height: number;
+}
+
+const useSize = (target: React.RefObject<HTMLElement>): Size | undefined => {
+  const [size, setSize] = useState<Size>();
+
+  useLayoutEffect(() => {
+    if (target.current) {
+      setSize(target.current.getBoundingClientRect());
+    }
+  }, [target]);
+
+  useResizeObserver(target, (entry) => setSize(entry.contentRect));
+  return size;
+};
+
+// Node component for rendering folders
+function FolderNode({
+  node,
+  style,
+  selectedPath,
+  onSelect,
+}: {
+  node: NodeApi<FileNode>;
+  style: React.CSSProperties;
+  selectedPath: string;
+  onSelect: (path: string) => void;
+}) {
+  const isSelected = node.data.path === selectedPath;
+  const hasChildren = node.children && node.children.length > 0;
+
+  const handleClick = () => {
+    onSelect(node.data.path);
+  };
+
+  const handleChevronClick = (e: React.MouseEvent) => {
+    e.stopPropagation();
+    node.toggle();
+  };
+
+  return (
+    <div
+      style={{
+        ...style,
+        paddingLeft: `${node.level * 16 + 8}px`,
+        paddingRight: '8px',
+        paddingTop: '4px',
+        paddingBottom: '4px',
+        display: 'flex',
+        alignItems: 'center',
+        cursor: 'pointer',
+        whiteSpace: 'nowrap',
+        overflow: 'hidden',
+        backgroundColor: isSelected
+          ? 'var(--mantine-color-blue-filled)'
+          : 'transparent',
+        color: isSelected ? 'var(--mantine-color-white)' : 'inherit',
+        borderRadius: '4px',
+        transition: 'background-color 0.1s ease, color 0.1s ease',
+      }}
+      onClick={handleClick}
+      title={node.data.name}
+      onMouseEnter={(e) => {
+        if (!isSelected) {
+          e.currentTarget.style.backgroundColor =
+            'var(--mantine-color-default-hover)';
+        }
+      }}
+      onMouseLeave={(e) => {
+        if (!isSelected) {
+          e.currentTarget.style.backgroundColor = 'transparent';
+        }
+      }}
+    >
+      {/* Chevron for folders with children */}
+      {hasChildren && (
+        <IconChevronRight
+          size={14}
+          onClick={handleChevronClick}
+          style={{
+            marginRight: '4px',
+            transform: node.isOpen ? 'rotate(90deg)' : 'rotate(0deg)',
+            transition: 'transform 0.2s ease',
+            flexShrink: 0,
+          }}
+        />
+      )}
+      {/* Spacer for items without chevron */}
+      {!hasChildren && <div style={{ width: '18px', flexShrink: 0 }} />}
+
+      {/* Folder icon */}
+      {node.isOpen ? (
+        <IconFolderOpen
+          size={16}
+          color={
+            isSelected
+              ? 'var(--mantine-color-white)'
+              : 'var(--mantine-color-yellow-filled)'
+          }
+          style={{ flexShrink: 0 }}
+        />
+      ) : (
+        <IconFolder
+          size={16}
+          color={
+            isSelected
+              ? 'var(--mantine-color-white)'
+              : 'var(--mantine-color-yellow-filled)'
+          }
+          style={{ flexShrink: 0 }}
+        />
+      )}
+
+      {/* Name */}
+      <span
+        style={{
+          marginLeft: '8px',
+          fontSize: '14px',
+          overflow: 'hidden',
+          textOverflow: 'ellipsis',
+          flexGrow: 1,
+        }}
+      >
+        {node.data.name}
+      </span>
+    </div>
+  );
+}
+
+// Root node component
+function RootNode({
+  isSelected,
+  onSelect,
+}: {
+  isSelected: boolean;
+  onSelect: () => void;
+}) {
+  return (
+    <div
+      style={{
+        paddingLeft: '8px',
+        paddingRight: '8px',
+        paddingTop: '4px',
+        paddingBottom: '4px',
+        display: 'flex',
+        alignItems: 'center',
+        cursor: 'pointer',
+        whiteSpace: 'nowrap',
+        overflow: 'hidden',
+        backgroundColor: isSelected
+          ? 'var(--mantine-color-blue-filled)'
+          : 'transparent',
+        color: isSelected ? 'var(--mantine-color-white)' : 'inherit',
+        borderRadius: '4px',
+        transition: 'background-color 0.1s ease, color 0.1s ease',
+        marginBottom: '4px',
+      }}
+      onClick={onSelect}
+      onMouseEnter={(e) => {
+        if (!isSelected) {
+          e.currentTarget.style.backgroundColor =
+            'var(--mantine-color-default-hover)';
+        }
+      }}
+      onMouseLeave={(e) => {
+        if (!isSelected) {
+          e.currentTarget.style.backgroundColor = 'transparent';
+        }
+      }}
+    >
+      <div style={{ width: '18px', flexShrink: 0 }} />
+      <IconFolder
+        size={16}
+        color={
+          isSelected
+            ? 'var(--mantine-color-white)'
+            : 'var(--mantine-color-yellow-filled)'
+        }
+        style={{ flexShrink: 0 }}
+      />
+      <span
+        style={{
+          marginLeft: '8px',
+          fontSize: '14px',
+          overflow: 'hidden',
+          textOverflow: 'ellipsis',
+          flexGrow: 1,
+        }}
+      >
+        / (root)
+      </span>
+    </div>
+  );
+}
+
+export const FolderSelector: React.FC<FolderSelectorProps> = ({
+  files,
+  selectedPath,
+  onSelect,
+}) => {
+  const target = useRef<HTMLDivElement>(null);
+  const size = useSize(target);
+
+  // Filter to only folders
+  const folders = filterToFolders(files);
+
+  // Calculate tree height: root node (32px) + folders
+  const rootNodeHeight = 32;
+  const treeHeight = size ? size.height - rootNodeHeight : 0;
+
+  return (
+    <Box
+      ref={target}
+      style={{
+        maxHeight: '300px',
+        height: '300px',
+        overflowY: 'auto',
+        padding: '8px',
+      }}
+    >
+      {/* Root option */}
+      <RootNode isSelected={selectedPath === ''} onSelect={() => onSelect('')} />
+
+      {/* Folder tree */}
+      {size && folders.length > 0 && (
+        <Tree
+          data={folders}
+          openByDefault={false}
+          width={size.width - 16}
+          height={treeHeight}
+          indent={24}
+          rowHeight={28}
+          idAccessor="id"
+          disableDrag={() => true}
+          disableDrop={() => true}
+        >
+          {(props) => (
+            <FolderNode {...props} selectedPath={selectedPath} onSelect={onSelect} />
+          )}
+        </Tree>
+      )}
+    </Box>
+  );
+};
+
+export default FolderSelector;

app/src/components/layout/Layout.tsx

@@ -53,6 +53,7 @@ const Layout: React.FC = () => {
             selectedFile={selectedFile}
             handleFileSelect={handleFileSelect}
             loadFileList={loadFileList}
+            files={files}
           />
         </Container>
       </AppShell.Main>

app/src/components/layout/MainContent.test.tsx

@@ -131,6 +131,7 @@ describe('MainContent', () => {
           selectedFile="docs/guide.md"
           handleFileSelect={mockHandleFileSelect}
           loadFileList={mockLoadFileList}
+          files={[]}
         />
       </TestWrapper>
     );
@@ -156,6 +157,7 @@ describe('MainContent', () => {
           selectedFile="test.md"
           handleFileSelect={mockHandleFileSelect}
           loadFileList={mockLoadFileList}
+          files={[]}
         />
       </TestWrapper>
     );
@@ -172,6 +174,7 @@ describe('MainContent', () => {
           selectedFile="test.md"
           handleFileSelect={mockHandleFileSelect}
           loadFileList={mockLoadFileList}
+          files={[]}
         />
       </TestWrapper>
     );
@@ -188,6 +191,7 @@ describe('MainContent', () => {
           selectedFile={null}
           handleFileSelect={mockHandleFileSelect}
           loadFileList={mockLoadFileList}
+          files={[]}
         />
       </TestWrapper>
     );

app/src/components/layout/MainContent.tsx

@@ -12,6 +12,7 @@ import { useFileContent } from '../../hooks/useFileContent';
 import { useFileOperations } from '../../hooks/useFileOperations';
 import { useGitOperations } from '../../hooks/useGitOperations';
 import { useModalContext } from '../../contexts/ModalContext';
+import type { FileNode } from '../../types/models';
 
 type ViewTab = 'source' | 'preview';
 
@@ -19,12 +20,14 @@ interface MainContentProps {
   selectedFile: string | null;
   handleFileSelect: (filePath: string | null) => Promise<void>;
   loadFileList: () => Promise<void>;
+  files: FileNode[];
 }
 
 const MainContent: React.FC<MainContentProps> = ({
   selectedFile,
   handleFileSelect,
   loadFileList,
+  files,
 }) => {
   const [activeTab, setActiveTab] = useState<ViewTab>('source');
   const {
@@ -161,6 +164,7 @@ const MainContent: React.FC<MainContentProps> = ({
           handleContentChange={handleContentChange}
           handleSave={handleSaveFile}
           handleFileSelect={handleFileSelect}
+          files={files}
         />
       </Box>
       <CreateFileModal onCreateFile={handleCreateFile} />

app/src/components/modals/file/CreateFileModal.test.tsx

@@ -29,6 +29,31 @@ vi.mock('../../../contexts/ModalContext', () => ({
   useModalContext: () => mockModalContext,
 }));
 
+// Mock useFileList hook
+const mockLoadFileList = vi.fn();
+const mockFiles = [
+  {
+    id: '1',
+    name: 'docs',
+    path: 'docs',
+    children: [
+      {
+        id: '2',
+        name: 'guides',
+        path: 'docs/guides',
+        children: [],
+      },
+    ],
+  },
+];
+
+vi.mock('../../../hooks/useFileList', () => ({
+  useFileList: () => ({
+    files: mockFiles,
+    loadFileList: mockLoadFileList,
+  }),
+}));
+
 // Helper wrapper component for testing
 const TestWrapper = ({ children }: { children: React.ReactNode }) => (
   <MantineProvider defaultColorScheme="light">{children}</MantineProvider>
@@ -47,6 +72,8 @@ describe('CreateFileModal', () => {
     mockOnCreateFile.mockReset();
     mockOnCreateFile.mockResolvedValue(undefined);
     mockModalContext.setNewFileModalVisible.mockClear();
+    mockLoadFileList.mockClear();
+    mockLoadFileList.mockResolvedValue(undefined);
   });
 
   describe('Modal Visibility and Content', () => {

app/src/components/modals/file/CreateFileModal.tsx

@@ -1,6 +1,9 @@
 import React, { useState } from 'react';
-import { Modal, TextInput, Button, Group, Box } from '@mantine/core';
+import { Modal, TextInput, Button, Group, Box, Popover, ActionIcon, Text } from '@mantine/core';
+import { IconFolderOpen } from '@tabler/icons-react';
 import { useModalContext } from '../../../contexts/ModalContext';
+import { useFileList } from '../../../hooks/useFileList';
+import { FolderSelector } from '../../files/FolderSelector';
 
 interface CreateFileModalProps {
   onCreateFile: (fileName: string) => Promise<void>;
@@ -8,16 +11,49 @@ interface CreateFileModalProps {
 
 const CreateFileModal: React.FC<CreateFileModalProps> = ({ onCreateFile }) => {
   const [fileName, setFileName] = useState<string>('');
+  const [selectedFolder, setSelectedFolder] = useState<string>('');
+  const [popoverOpened, setPopoverOpened] = useState<boolean>(false);
   const { newFileModalVisible, setNewFileModalVisible } = useModalContext();
+  const { files, loadFileList } = useFileList();
 
   const handleSubmit = async (): Promise<void> => {
     if (fileName) {
-      await onCreateFile(fileName.trim());
+      const fullPath = selectedFolder
+        ? `${selectedFolder}/${fileName.trim()}`
+        : fileName.trim();
+      await onCreateFile(fullPath);
       setFileName('');
+      setSelectedFolder('');
       setNewFileModalVisible(false);
     }
   };
 
+  const handleClose = () => {
+    setFileName('');
+    setSelectedFolder('');
+    setNewFileModalVisible(false);
+  };
+
+  const handleFolderSelect = (path: string) => {
+    setSelectedFolder(path);
+    setPopoverOpened(false);
+  };
+
+  // Load files when modal opens
+  React.useEffect(() => {
+    if (newFileModalVisible) {
+      void loadFileList();
+    }
+  }, [newFileModalVisible, loadFileList]);
+
+  // Generate full path preview
+  const fullPathPreview = selectedFolder
+    ? `${selectedFolder}/${fileName || 'filename'}`
+    : fileName || 'filename';
+
+  // Display text for location input
+  const locationDisplay = selectedFolder || '/ (root)';
+
   const handleKeyDown = (event: React.KeyboardEvent): void => {
     if (event.key === 'Enter' && !event.shiftKey) {
       event.preventDefault();
@@ -28,27 +64,82 @@ const CreateFileModal: React.FC<CreateFileModalProps> = ({ onCreateFile }) => {
   return (
     <Modal
       opened={newFileModalVisible}
-      onClose={() => setNewFileModalVisible(false)}
+      onClose={handleClose}
       title="Create New File"
       centered
       size="sm"
     >
       <Box maw={400} mx="auto">
+        {/* Location input with folder picker */}
+        <Popover
+          opened={popoverOpened}
+          onChange={setPopoverOpened}
+          position="bottom-start"
+          width="target"
+        >
+          <Popover.Target>
+            <TextInput
+              label="Location"
+              type="text"
+              placeholder="Select folder"
+              data-testid="location-input"
+              value={locationDisplay}
+              readOnly
+              mb="md"
+              w="100%"
+              rightSection={
+                <ActionIcon
+                  variant="subtle"
+                  onClick={() => setPopoverOpened((o) => !o)}
+                  data-testid="folder-picker-button"
+                >
+                  <IconFolderOpen size={18} />
+                </ActionIcon>
+              }
+              styles={{
+                input: {
+                  cursor: 'pointer',
+                },
+              }}
+              onClick={() => setPopoverOpened(true)}
+            />
+          </Popover.Target>
+          <Popover.Dropdown>
+            <FolderSelector
+              files={files}
+              selectedPath={selectedFolder}
+              onSelect={handleFolderSelect}
+            />
+          </Popover.Dropdown>
+        </Popover>
+
+        {/* File name input */}
         <TextInput
           label="File Name"
           type="text"
-          placeholder="Enter file name"
+          placeholder="example.md"
           data-testid="file-name-input"
           value={fileName}
           onChange={(event) => setFileName(event.currentTarget.value)}
           onKeyDown={handleKeyDown}
-          mb="md"
+          mb="xs"
           w="100%"
         />
+
+        {/* Hint text */}
+        <Text size="xs" c="dimmed" mb="xs">
+          Tip: Use / to create nested folders (e.g., folder/subfolder/file.md)
+        </Text>
+
+        {/* Full path preview */}
+        <Text size="sm" c="dimmed" mb="md">
+          Full path: {fullPathPreview}
+        </Text>
+
         <Group justify="flex-end" mt="md">
           <Button
             variant="default"
-            onClick={() => setNewFileModalVisible(false)}
+            onClick={handleClose}
             data-testid="cancel-create-file-button"
           >
             Cancel

app/src/components/modals/user/DeleteUserModal.test.tsx

@@ -8,7 +8,7 @@ import {
 import React from 'react';
 import { MantineProvider } from '@mantine/core';
 import DeleteUserModal from './DeleteUserModal';
-import { UserRole, type User } from '@/types/models';
+import { UserRole, Theme, type User } from '@/types/models';
 
 // Mock notifications
 vi.mock('@mantine/notifications', () => ({
@@ -36,6 +36,7 @@ describe('DeleteUserModal', () => {
     email: 'test@example.com',
     displayName: 'Test User',
     role: UserRole.Editor,
+    theme: Theme.Dark,
     createdAt: '2024-01-01T00:00:00Z',
     lastWorkspaceId: 1,
   };

app/src/components/modals/user/EditUserModal.test.tsx

@@ -8,7 +8,7 @@ import {
 import React from 'react';
 import { MantineProvider } from '@mantine/core';
 import EditUserModal from './EditUserModal';
-import { UserRole, type User } from '@/types/models';
+import { UserRole, Theme, type User } from '@/types/models';
 
 // Mock notifications
 vi.mock('@mantine/notifications', () => ({
@@ -36,6 +36,7 @@ describe('EditUserModal', () => {
     email: 'test@example.com',
     displayName: 'Test User',
     role: UserRole.Editor,
+    theme: Theme.Dark,
     createdAt: '2024-01-01T00:00:00Z',
     lastWorkspaceId: 1,
   };
@@ -187,6 +188,7 @@ describe('EditUserModal', () => {
         email: 'newuser@example.com',
         displayName: 'New User',
         role: UserRole.Admin,
+        theme: Theme.Dark,
       };
 
       rerender(

app/src/components/navigation/UserMenu.test.tsx

@@ -2,7 +2,7 @@ import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { fireEvent, waitFor } from '@testing-library/react';
 import { render } from '../../test/utils';
 import UserMenu from './UserMenu';
-import { UserRole } from '../../types/models';
+import { UserRole, Theme } from '../../types/models';
 
 // Mock the contexts
 vi.mock('../../contexts/AuthContext', () => ({
@@ -37,6 +37,7 @@ describe('UserMenu', () => {
     email: 'test@example.com',
     displayName: 'Test User',
     role: UserRole.Editor,
+    theme: Theme.Dark,
     createdAt: '2024-01-01T00:00:00Z',
     lastWorkspaceId: 1,
   };
@@ -53,6 +54,7 @@ describe('UserMenu', () => {
       login: vi.fn(),
       refreshToken: vi.fn(),
       refreshUser: vi.fn(),
+      updateProfile: vi.fn(),
     });
   });
 
@@ -84,6 +86,7 @@ describe('UserMenu', () => {
       login: vi.fn(),
       refreshToken: vi.fn(),
       refreshUser: vi.fn(),
+      updateProfile: vi.fn(),
     });
 
     const { getByLabelText, getByText } = render(
@@ -145,6 +148,7 @@ describe('UserMenu', () => {
       id: mockUser.id,
       email: mockUser.email,
       role: mockUser.role,
+      theme: mockUser.theme,
       createdAt: mockUser.createdAt,
       lastWorkspaceId: mockUser.lastWorkspaceId,
     };
@@ -157,6 +161,7 @@ describe('UserMenu', () => {
       login: vi.fn(),
       refreshToken: vi.fn(),
       refreshUser: vi.fn(),
+      updateProfile: vi.fn(),
     });
 
     const { getByLabelText, getByText } = render(

app/src/components/settings/account/AccountSettings.tsx

@@ -89,6 +89,7 @@ const AccountSettings: React.FC<AccountSettingsProps> = ({
         email: user.email,
         currentPassword: '',
         newPassword: '',
+        theme: user.theme,
       };
       dispatch({
         type: SettingsActionType.INIT_SETTINGS,
@@ -107,6 +108,13 @@ const AccountSettings: React.FC<AccountSettingsProps> = ({
     });
   };
 
+  const handleThemeChange = (theme: string): void => {
+    dispatch({
+      type: SettingsActionType.UPDATE_LOCAL_SETTINGS,
+      payload: { theme } as UserProfileSettings,
+    });
+  };
+
   const handleSubmit = async (): Promise<void> => {
     const updates: UserProfileSettings = {};
     const needsPasswordConfirmation =
@@ -117,6 +125,14 @@ const AccountSettings: React.FC<AccountSettingsProps> = ({
       updates.displayName = state.localSettings.displayName || '';
     }
 
+    // Add theme if changed
+    if (
+      state.localSettings.theme &&
+      state.localSettings.theme !== state.initialSettings.theme
+    ) {
+      updates.theme = state.localSettings.theme;
+    }
+
     // Handle password change
     if (state.localSettings.newPassword) {
       if (!state.localSettings.currentPassword) {
@@ -216,6 +232,7 @@ const AccountSettings: React.FC<AccountSettingsProps> = ({
                 <ProfileSettings
                   settings={state.localSettings}
                   onInputChange={handleInputChange}
+                  onThemeChange={handleThemeChange}
                 />
               </Accordion.Panel>
             </Accordion.Item>

app/src/components/settings/account/ProfileSettings.test.tsx

@@ -4,6 +4,25 @@ import React from 'react';
 import { MantineProvider } from '@mantine/core';
 import ProfileSettings from './ProfileSettings';
 import type { UserProfileSettings } from '@/types/models';
+import { Theme, UserRole, type User } from '@/types/models';
+
+// Mock user for AuthContext
+const mockUser: User = {
+  id: 1,
+  email: 'test@example.com',
+  displayName: 'Test User',
+  role: UserRole.Editor,
+  theme: Theme.Dark,
+  createdAt: '2024-01-01T00:00:00Z',
+  lastWorkspaceId: 1,
+};
+
+// Mock the auth context
+vi.mock('../../../contexts/AuthContext', () => ({
+  useAuth: () => ({
+    user: mockUser,
+  }),
+}));
 
 // Helper wrapper component for testing
 const TestWrapper = ({ children }: { children: React.ReactNode }) => (

app/src/components/settings/account/ProfileSettings.tsx

@@ -1,36 +1,66 @@
 import React from 'react';
-import { Box, Stack, TextInput } from '@mantine/core';
+import { Box, Stack, TextInput, Group, Text, Switch } from '@mantine/core';
-import type { UserProfileSettings } from '@/types/models';
+import { useAuth } from '@/contexts/AuthContext';
+import { Theme, type UserProfileSettings } from '@/types/models';
 
 interface ProfileSettingsProps {
   settings: UserProfileSettings;
   onInputChange: (key: keyof UserProfileSettings, value: string) => void;
+  onThemeChange?: (theme: Theme) => void;
 }
 
 const ProfileSettings: React.FC<ProfileSettingsProps> = ({
   settings,
   onInputChange,
-}) => (
+  onThemeChange,
-  <Box>
+}) => {
-    <Stack gap="md">
+  const { user } = useAuth();
-      <TextInput
+  const currentTheme = settings.theme || user?.theme || Theme.Dark;
-        label="Display Name"
+
-        type="text"
+  const handleThemeToggle = () => {
-        value={settings.displayName || ''}
+    const newTheme = currentTheme === Theme.Dark ? Theme.Light : Theme.Dark;
-        onChange={(e) => onInputChange('displayName', e.currentTarget.value)}
+    if (onThemeChange) {
-        placeholder="Enter display name"
+      onThemeChange(newTheme);
-        data-testid="display-name-input"
+    }
-      />
+  };
-      <TextInput
+
-        label="Email"
+  return (
-        type="email"
+    <Box>
-        value={settings.email || ''}
+      <Stack gap="md">
-        onChange={(e) => onInputChange('email', e.currentTarget.value)}
+        <TextInput
-        placeholder="Enter email"
+          label="Display Name"
-        data-testid="email-input"
+          type="text"
-      />
+          value={settings.displayName || ''}
-    </Stack>
+          onChange={(e) => onInputChange('displayName', e.currentTarget.value)}
-  </Box>
+          placeholder="Enter display name"
-);
+          data-testid="display-name-input"
+        />
+        <TextInput
+          label="Email"
+          type="email"
+          value={settings.email || ''}
+          onChange={(e) => onInputChange('email', e.currentTarget.value)}
+          placeholder="Enter email"
+          data-testid="email-input"
+        />
+        <Box mb="md">
+          <Group justify="space-between" align="center">
+            <div>
+              <Text size="sm">Default Dark Mode</Text>
+              <Text size="xs" c="dimmed">
+                Sets the default theme for new workspaces
+              </Text>
+            </div>
+            <Switch
+              checked={currentTheme === Theme.Dark}
+              onChange={handleThemeToggle}
+              data-testid="theme-toggle"
+            />
+          </Group>
+        </Box>
+      </Stack>
+    </Box>
+  );
+};
 
 export default ProfileSettings;

app/src/components/settings/admin/AdminDashboard.test.tsx

@@ -3,7 +3,7 @@ import { render as rtlRender, screen, fireEvent } from '@testing-library/react';
 import React from 'react';
 import { MantineProvider } from '@mantine/core';
 import AdminDashboard from './AdminDashboard';
-import { UserRole, type User } from '@/types/models';
+import { UserRole, Theme, type User } from '@/types/models';
 
 // Mock the auth context
 const mockCurrentUser: User = {
@@ -11,6 +11,7 @@ const mockCurrentUser: User = {
   email: 'admin@example.com',
   displayName: 'Admin User',
   role: UserRole.Admin,
+  theme: Theme.Dark,
   createdAt: '2024-01-01T00:00:00Z',
   lastWorkspaceId: 1,
 };

app/src/components/settings/admin/AdminUsersTab.test.tsx

@@ -8,7 +8,7 @@ import {
 import React from 'react';
 import { MantineProvider } from '@mantine/core';
 import AdminUsersTab from './AdminUsersTab';
-import { UserRole, type User } from '@/types/models';
+import { UserRole, Theme, type User } from '@/types/models';
 
 // Mock the user admin hook
 const mockCreate = vi.fn();
@@ -123,6 +123,7 @@ describe('AdminUsersTab', () => {
     email: 'admin@example.com',
     displayName: 'Admin User',
     role: UserRole.Admin,
+    theme: Theme.Dark,
     createdAt: '2024-01-01T00:00:00Z',
     lastWorkspaceId: 1,
   };
@@ -134,6 +135,7 @@ describe('AdminUsersTab', () => {
       email: 'editor@example.com',
       displayName: 'Editor User',
       role: UserRole.Editor,
+      theme: Theme.Dark,
       createdAt: '2024-01-15T00:00:00Z',
       lastWorkspaceId: 2,
     },
@@ -142,6 +144,7 @@ describe('AdminUsersTab', () => {
       email: 'viewer@example.com',
       displayName: 'Viewer User',
       role: UserRole.Viewer,
+      theme: Theme.Dark,
       createdAt: '2024-02-01T00:00:00Z',
       lastWorkspaceId: 3,
     },

app/src/contexts/AuthContext.test.tsx

@@ -2,7 +2,7 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { renderHook, act, waitFor } from '@testing-library/react';
 import React from 'react';
 import { AuthProvider, useAuth } from './AuthContext';
-import { UserRole, type User } from '@/types/models';
+import { UserRole, Theme, type User } from '@/types/models';
 
 // Set up mocks before imports are used
 vi.mock('@/api/auth', () => {
@@ -42,6 +42,7 @@ const mockUser: User = {
   email: 'test@example.com',
   displayName: 'Test User',
   role: UserRole.Editor,
+    theme: Theme.Dark,
   createdAt: '2024-01-01T00:00:00Z',
   lastWorkspaceId: 1,
 };

app/src/contexts/AuthContext.tsx

@@ -12,7 +12,8 @@ import {
   refreshToken as apiRefreshToken,
   getCurrentUser,
 } from '@/api/auth';
-import type { User } from '@/types/models';
+import { updateProfile as apiUpdateProfile } from '@/api/user';
+import type { User, UserProfileSettings } from '@/types/models';
 
 interface AuthContextType {
   user: User | null;
@@ -22,6 +23,7 @@ interface AuthContextType {
   logout: () => Promise<void>;
   refreshToken: () => Promise<boolean>;
   refreshUser: () => Promise<void>;
+  updateProfile: (updates: UserProfileSettings) => Promise<User>;
 }
 
 const AuthContext = createContext<AuthContextType | null>(null);
@@ -109,6 +111,31 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ children }) => {
     }
   }, []);
 
+  const updateProfile = useCallback(
+    async (updates: UserProfileSettings): Promise<User> => {
+      try {
+        const updatedUser = await apiUpdateProfile(updates);
+        setUser(updatedUser);
+        notifications.show({
+          title: 'Success',
+          message: 'Profile updated successfully',
+          color: 'green',
+        });
+        return updatedUser;
+      } catch (error) {
+        console.error('Failed to update profile:', error);
+        notifications.show({
+          title: 'Error',
+          message:
+            error instanceof Error ? error.message : 'Failed to update profile',
+          color: 'red',
+        });
+        throw error;
+      }
+    },
+    []
+  );
+
   const value: AuthContextType = {
     user,
     loading,
@@ -117,6 +144,7 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ children }) => {
     logout,
     refreshToken,
     refreshUser,
+    updateProfile,
   };
 
   return <AuthContext.Provider value={value}>{children}</AuthContext.Provider>;

app/src/hooks/useAdminData.test.ts

@@ -4,6 +4,7 @@ import { useAdminData } from './useAdminData';
 import * as adminApi from '@/api/admin';
 import {
   UserRole,
+  Theme,
   type SystemStats,
   type User,
   type WorkspaceStats,
@@ -35,6 +36,7 @@ const mockUsers: User[] = [
     email: 'admin@example.com',
     displayName: 'Admin User',
     role: UserRole.Admin,
+    theme: Theme.Dark,
     createdAt: '2024-01-01T00:00:00Z',
     lastWorkspaceId: 1,
   },
@@ -43,6 +45,7 @@ const mockUsers: User[] = [
     email: 'editor@example.com',
     displayName: 'Editor User',
     role: UserRole.Editor,
+    theme: Theme.Dark,
     createdAt: '2024-01-02T00:00:00Z',
     lastWorkspaceId: 2,
   },

app/src/hooks/useFileNavigation.test.ts

@@ -34,6 +34,9 @@ describe('useFileNavigation', () => {
       id: 1,
       name: 'test-workspace',
     };
+    // Default mock implementations
+    mockLastOpenedFile.loadLastOpenedFile.mockResolvedValue(null);
+    mockLastOpenedFile.saveLastOpenedFile.mockResolvedValue(undefined);
   });
 
   afterEach(() => {

app/src/hooks/useFileOperations.ts

@@ -122,7 +122,8 @@ export const useFileOperations = (): UseFileOperationsResult => {
       if (!currentWorkspace) return false;
 
       try {
-        await uploadFile(currentWorkspace.name, targetPath || '', files);
+        // Default to '.' (root directory) if no target path is provided
+        await uploadFile(currentWorkspace.name, targetPath || '.', files);
 
         notifications.show({
           title: 'Success',

app/src/hooks/useProfileSettings.test.ts

@@ -3,7 +3,7 @@ import { renderHook, act } from '@testing-library/react';
 import { useProfileSettings } from './useProfileSettings';
 import * as userApi from '@/api/user';
 import type { UpdateProfileRequest } from '@/types/api';
-import { UserRole, type User } from '@/types/models';
+import { UserRole, Theme, type User } from '@/types/models';
 
 // Mock dependencies
 vi.mock('@/api/user');
@@ -22,6 +22,7 @@ const mockUser: User = {
   email: 'test@example.com',
   displayName: 'Test User',
   role: UserRole.Editor,
+    theme: Theme.Dark,
   createdAt: '2024-01-01T00:00:00Z',
   lastWorkspaceId: 1,
 };

app/src/hooks/useUserAdmin.test.ts

@@ -3,7 +3,7 @@ import { renderHook, act } from '@testing-library/react';
 import { useUserAdmin } from './useUserAdmin';
 import * as adminApi from '@/api/admin';
 import type { CreateUserRequest, UpdateUserRequest } from '@/types/api';
-import { UserRole, type User } from '@/types/models';
+import { UserRole, Theme, type User } from '@/types/models';
 
 // Mock dependencies
 vi.mock('@/api/admin');
@@ -35,6 +35,7 @@ const mockUsers: User[] = [
     email: 'admin@example.com',
     displayName: 'Admin User',
     role: UserRole.Admin,
+    theme: Theme.Dark,
     createdAt: '2024-01-01T00:00:00Z',
     lastWorkspaceId: 1,
   },
@@ -43,6 +44,7 @@ const mockUsers: User[] = [
     email: 'editor@example.com',
     displayName: 'Editor User',
     role: UserRole.Editor,
+    theme: Theme.Dark,
     createdAt: '2024-01-02T00:00:00Z',
     lastWorkspaceId: 1,
   },
@@ -112,6 +114,7 @@ describe('useUserAdmin', () => {
         email: 'newuser@example.com',
         displayName: 'New User',
         role: UserRole.Viewer,
+    theme: Theme.Dark,
         createdAt: '2024-01-03T00:00:00Z',
         lastWorkspaceId: 1,
       };
@@ -124,6 +127,7 @@ describe('useUserAdmin', () => {
         displayName: 'New User',
         password: 'password123',
         role: UserRole.Viewer,
+    theme: Theme.Dark,
       };
 
       let createResult: boolean | undefined;
@@ -152,6 +156,7 @@ describe('useUserAdmin', () => {
         displayName: 'Test User',
         password: 'password123',
         role: UserRole.Editor,
+    theme: Theme.Dark,
       };
 
       let createResult: boolean | undefined;
@@ -179,6 +184,7 @@ describe('useUserAdmin', () => {
         displayName: 'Test User',
         password: 'password123',
         role: UserRole.Editor,
+    theme: Theme.Dark,
       };
 
       let createResult: boolean | undefined;
@@ -204,6 +210,7 @@ describe('useUserAdmin', () => {
         email: user.email,
         displayName: 'Updated Editor',
         role: user.role,
+        theme: user.theme,
         createdAt: user.createdAt,
         lastWorkspaceId: user.lastWorkspaceId,
       };
@@ -238,6 +245,7 @@ describe('useUserAdmin', () => {
         email: 'newemail@example.com',
         displayName: user.displayName || '',
         role: UserRole.Admin,
+    theme: Theme.Dark,
         createdAt: user.createdAt,
         lastWorkspaceId: user.lastWorkspaceId,
       };
@@ -248,6 +256,7 @@ describe('useUserAdmin', () => {
       const updateRequest: UpdateUserRequest = {
         email: 'newemail@example.com',
         role: UserRole.Admin,
+    theme: Theme.Dark,
       };
 
       let updateResult: boolean | undefined;
@@ -436,6 +445,7 @@ describe('useUserAdmin', () => {
           displayName: 'Test',
           password: 'pass',
           role: UserRole.Viewer,
+    theme: Theme.Dark,
         });
       });
 
@@ -474,6 +484,7 @@ describe('useUserAdmin', () => {
           displayName: 'Test',
           password: 'pass',
           role: UserRole.Viewer,
+    theme: Theme.Dark,
         });
       });
 
@@ -500,6 +511,7 @@ describe('useUserAdmin', () => {
           email: 'user1@example.com',
           displayName: 'User 1',
           role: UserRole.Viewer,
+    theme: Theme.Dark,
           createdAt: '2024-01-03T00:00:00Z',
           lastWorkspaceId: 1,
         })
@@ -508,6 +520,7 @@ describe('useUserAdmin', () => {
           email: 'user2@example.com',
           displayName: 'User 2',
           role: UserRole.Editor,
+    theme: Theme.Dark,
           createdAt: '2024-01-04T00:00:00Z',
           lastWorkspaceId: 1,
         });
@@ -520,12 +533,14 @@ describe('useUserAdmin', () => {
           displayName: 'User 1',
           password: 'pass1',
           role: UserRole.Viewer,
+    theme: Theme.Dark,
         },
         {
           email: 'user2@example.com',
           displayName: 'User 2',
           password: 'pass2',
           role: UserRole.Editor,
+    theme: Theme.Dark,
         },
       ];
 
@@ -555,12 +570,14 @@ describe('useUserAdmin', () => {
           displayName: 'Success User',
           password: 'pass1',
           role: UserRole.Viewer,
+    theme: Theme.Dark,
         },
         {
           email: 'fail@example.com',
           displayName: 'Fail User',
           password: 'pass2',
           role: UserRole.Editor,
+    theme: Theme.Dark,
         },
       ];
 

app/src/test/setup.ts

@@ -1,5 +1,26 @@
 import '@testing-library/jest-dom';
-import { vi } from 'vitest';
+import { vi, beforeAll, afterAll } from 'vitest';
+
+// Suppress console errors during tests
+const originalConsoleError = console.error;
+beforeAll(() => {
+  console.error = (...args: any[]) => {
+    // Suppress specific expected errors during tests
+    const errorString = args.join(' ');
+    if (
+      errorString.includes('Failed to initialize auth') ||
+      errorString.includes('Failed to save last opened file') ||
+      errorString.includes('Failed to load last opened file')
+    ) {
+      return;
+    }
+    originalConsoleError(...args);
+  };
+});
+
+afterAll(() => {
+  console.error = originalConsoleError;
+});
 
 // Mock window.API_BASE_URL
 Object.defineProperty(window, 'API_BASE_URL', {
@@ -23,8 +44,8 @@ Object.defineProperty(window, 'matchMedia', {
 });
 
 // Mock ResizeObserver - sometimes needed for Mantine components
-global.ResizeObserver = vi.fn().mockImplementation(() => ({
+global.ResizeObserver = class ResizeObserver {
-  observe: vi.fn(),
+  observe = vi.fn();
-  unobserve: vi.fn(),
+  unobserve = vi.fn();
-  disconnect: vi.fn(),
+  disconnect = vi.fn();
-}));
+};

app/src/types/api.test.ts

@@ -9,7 +9,7 @@ import {
   type SaveFileResponse,
   type UploadFilesResponse,
 } from './api';
-import { UserRole, type User } from './models';
+import { UserRole, Theme, type User } from './models';
 
 // Mock user data for testing
 const mockUser: User = {
@@ -17,6 +17,7 @@ const mockUser: User = {
   email: 'test@example.com',
   displayName: 'Test User',
   role: UserRole.Editor,
+  theme: Theme.Dark,
   createdAt: '2024-01-01T00:00:00Z',
   lastWorkspaceId: 1,
 };

app/src/types/api.ts

@@ -1,4 +1,4 @@
-import { isUser, type User, type UserRole } from './models';
+import { isUser, type User, type UserRole, type Theme } from './models';
 
 declare global {
   interface Window {
@@ -55,6 +55,7 @@ export interface CreateUserRequest {
   displayName: string;
   password: string;
   role: UserRole;
+  theme?: Theme;
 }
 
 // UpdateUserRequest holds the request fields for updating a user
@@ -63,6 +64,7 @@ export interface UpdateUserRequest {
   displayName?: string;
   password?: string;
   role?: UserRole;
+  theme?: Theme;
 }
 
 export interface LookupResponse {
@@ -126,6 +128,7 @@ export interface UpdateProfileRequest {
   email?: string;
   currentPassword?: string;
   newPassword?: string;
+  theme?: Theme;
 }
 
 // DeleteAccountRequest represents a user account deletion request

app/src/types/models.test.ts

@@ -63,6 +63,7 @@ describe('Models Type Guards', () => {
       email: 'test@example.com',
       displayName: 'Test User',
       role: UserRole.Editor,
+      theme: Theme.Dark,
       createdAt: '2024-01-01T00:00:00Z',
       lastWorkspaceId: 1,
     };
@@ -76,6 +77,7 @@ describe('Models Type Guards', () => {
         id: 1,
         email: 'test@example.com',
         role: UserRole.Editor,
+        theme: Theme.Dark,
         createdAt: '2024-01-01T00:00:00Z',
         lastWorkspaceId: 1,
       };
@@ -186,6 +188,7 @@ describe('Models Type Guards', () => {
         id: 1,
         email: 'test@example.com',
         role: UserRole.Editor,
+        theme: Theme.Dark,
         createdAt: '2024-01-01T00:00:00Z',
         lastWorkspaceId: 1,
         __proto__: { malicious: true },
@@ -771,6 +774,7 @@ describe('Models Type Guards', () => {
         id: 1,
         email: 'test@example.com',
         role: UserRole.Editor,
+        theme: Theme.Dark,
         createdAt: '2024-01-01T00:00:00Z',
         lastWorkspaceId: 1,
       };
@@ -804,6 +808,7 @@ describe('Models Type Guards', () => {
         id: 1,
         email: 'test@example.com',
         role: UserRole.Editor,
+        theme: Theme.Dark,
         createdAt: '2024-01-01T00:00:00Z',
         lastWorkspaceId: 1,
       });
@@ -852,6 +857,7 @@ describe('Models Type Guards', () => {
         id: 1,
         email: longString,
         role: UserRole.Editor,
+        theme: Theme.Dark,
         createdAt: '2024-01-01T00:00:00Z',
         lastWorkspaceId: 1,
       };

app/src/types/models.ts

@@ -8,6 +8,7 @@ export interface User {
   email: string;
   displayName?: string;
   role: UserRole;
+  theme: Theme;
   createdAt: string;
   lastWorkspaceId: number;
 }
@@ -28,6 +29,9 @@ export function isUser(value: unknown): value is User {
       : true) &&
     'role' in value &&
     isUserRole((value as User).role) &&
+    'theme' in value &&
+    typeof (value as User).theme === 'string' &&
+    Object.values(Theme).includes((value as User).theme) &&
     'createdAt' in value &&
     typeof (value as User).createdAt === 'string' &&
     'lastWorkspaceId' in value &&
@@ -171,7 +175,7 @@ export interface DefaultFile {
 export const DEFAULT_FILE: DefaultFile = {
   name: 'New File.md',
   path: 'New File.md',
-  content: '# Welcome to NovaMD\n\nStart editing here!',
+  content: '# Welcome to Lemma\n\nStart editing here!',
 };
 
 export interface FileNode {
@@ -309,6 +313,7 @@ export interface UserProfileSettings {
   email?: string;
   currentPassword?: string;
   newPassword?: string;
+  theme?: Theme;
 }
 
 export interface ProfileSettingsState {

app/src/utils/fileHelpers.ts

@@ -1,5 +1,17 @@
 import { API_BASE_URL } from '@/types/api';
-import { IMAGE_EXTENSIONS } from '@/types/models';
+import { IMAGE_EXTENSIONS, type FileNode } from '@/types/models';
+
+/**
+ * Represents a flattened file for searching and autocompletion
+ */
+export interface FlatFile {
+  name: string; // "meeting-notes.md"
+  path: string; // "work/2024/meeting-notes.md"
+  displayPath: string; // "work/2024/meeting-notes"
+  nameWithoutExt: string; // "meeting-notes"
+  parentFolder: string; // "work/2024"
+  isImage: boolean;
+}
 
 /**
  * Checks if the given file path has an image extension.
@@ -15,3 +27,65 @@ export const getFileUrl = (workspaceName: string, filePath: string) => {
     workspaceName
   )}/files/content?file_path=${encodeURIComponent(filePath)}`;
 };
+
+/**
+ * Recursively flattens FileNode tree into searchable array
+ * Precomputes display strings and metadata for performance
+ *
+ * @param nodes - Array of FileNode from the file tree
+ * @param showHiddenFiles - Whether to include hidden files (files/folders starting with .)
+ * @returns Array of FlatFile objects ready for searching
+ */
+export function flattenFileTree(nodes: FileNode[], showHiddenFiles = false): FlatFile[] {
+  const result: FlatFile[] = [];
+
+  function traverse(node: FileNode) {
+    // Skip hidden files and folders if showHiddenFiles is false
+    // Hidden files/folders are those that start with a dot (.)
+    if (!showHiddenFiles && node.name.startsWith('.')) {
+      return;
+    }
+
+    // Only process files, not folders (folders have children)
+    if (!node.children) {
+      const name = node.name;
+      const path = node.path;
+      const isImage = isImageFile(path);
+
+      // Remove extension for display (except for images)
+      let nameWithoutExt = name;
+      let displayPath = path;
+
+      if (name.endsWith('.md')) {
+        nameWithoutExt = name.slice(0, -3);
+        displayPath = path.slice(0, -3);
+      }
+
+      // Get parent folder path
+      const lastSlashIndex = path.lastIndexOf('/');
+      const parentFolder = lastSlashIndex > 0 ? path.slice(0, lastSlashIndex) : '';
+
+      result.push({
+        name,
+        path,
+        displayPath,
+        nameWithoutExt,
+        parentFolder,
+        isImage,
+      });
+    }
+
+    // Recursively process children
+    if (node.children) {
+      for (const child of node.children) {
+        traverse(child);
+      }
+    }
+  }
+
+  for (const node of nodes) {
+    traverse(node);
+  }
+
+  return result;
+}

app/src/utils/fileTreeUtils.ts

@@ -0,0 +1,44 @@
+import type { FileNode } from '@/types/models';
+
+/**
+ * Recursively filter tree to only include folders
+ * @param nodes - Array of FileNode objects
+ * @returns New tree structure with only folder nodes
+ */
+export const filterToFolders = (nodes: FileNode[]): FileNode[] => {
+  return nodes
+    .filter((node) => node.children !== undefined)
+    .map((node) => {
+      const filtered: FileNode = {
+        id: node.id,
+        name: node.name,
+        path: node.path,
+      };
+      if (node.children) {
+        filtered.children = filterToFolders(node.children);
+      }
+      return filtered;
+    });
+};
+
+/**
+ * Find a specific folder node by its path
+ * @param nodes - Array of FileNode objects
+ * @param path - Path to search for
+ * @returns The found FileNode or null
+ */
+export const findFolderByPath = (
+  nodes: FileNode[],
+  path: string
+): FileNode | null => {
+  for (const node of nodes) {
+    if (node.path === path && node.children !== undefined) {
+      return node;
+    }
+    if (node.children) {
+      const found = findFolderByPath(node.children, path);
+      if (found) return found;
+    }
+  }
+  return null;
+};

app/src/utils/fuzzyMatch.ts

@@ -0,0 +1,129 @@
+/**
+ * Result of a fuzzy match operation
+ */
+export interface MatchResult {
+  matched: boolean;
+  score: number; // Higher is better
+  matchedIndices: number[]; // For highlighting
+}
+
+/**
+ * Scoring weights for match quality
+ */
+const SCORING = {
+  consecutiveMatch: 15,
+  wordBoundaryMatch: 10,
+  camelCaseMatch: 10,
+  firstCharMatch: 15,
+  gapPenalty: -1,
+} as const;
+
+/**
+ * Performs fuzzy matching between query and target string
+ *
+ * Algorithm:
+ * - Sequential character matching (order matters)
+ * - Bonus for consecutive matches
+ * - Bonus for word boundary matches
+ * - Bonus for camelCase matches
+ * - Case-insensitive by default
+ *
+ * Example:
+ *   query: "mtno"
+ *   target: "meeting-notes"
+ *   → matches: [0, 4, 8, 9], score: 85
+ *
+ * @param query - The search string
+ * @param target - The string to search in
+ * @returns MatchResult with matched status, score, and matched indices
+ */
+export function fuzzyMatch(query: string, target: string): MatchResult {
+  if (!query) {
+    return { matched: true, score: 0, matchedIndices: [] };
+  }
+
+  const queryLower = query.toLowerCase();
+  const targetLower = target.toLowerCase();
+
+  const matchedIndices: number[] = [];
+  let score = 0;
+  let queryIndex = 0;
+  let previousMatchIndex = -1;
+
+  // Try to match all query characters in order
+  for (let targetIndex = 0; targetIndex < targetLower.length; targetIndex++) {
+    if (queryIndex >= queryLower.length) {
+      break;
+    }
+
+    if (queryLower[queryIndex] === targetLower[targetIndex]) {
+      matchedIndices.push(targetIndex);
+
+      // Bonus for first character match
+      if (targetIndex === 0) {
+        score += SCORING.firstCharMatch;
+      }
+
+      // Bonus for consecutive matches
+      if (previousMatchIndex === targetIndex - 1) {
+        score += SCORING.consecutiveMatch;
+      } else if (previousMatchIndex >= 0) {
+        // Penalty for gaps
+        const gap = targetIndex - previousMatchIndex - 1;
+        score += gap * SCORING.gapPenalty;
+      }
+
+      // Bonus for word boundary matches
+      if (isWordBoundary(target, targetIndex)) {
+        score += SCORING.wordBoundaryMatch;
+      }
+
+      // Bonus for camelCase matches
+      if (isCamelCaseMatch(target, targetIndex)) {
+        score += SCORING.camelCaseMatch;
+      }
+
+      previousMatchIndex = targetIndex;
+      queryIndex++;
+    }
+  }
+
+  // All query characters must be matched
+  const matched = queryIndex === queryLower.length;
+
+  if (!matched) {
+    return { matched: false, score: 0, matchedIndices: [] };
+  }
+
+  // Boost score for matches with higher character coverage
+  const coverage = matchedIndices.length / target.length;
+  score += coverage * 50;
+
+  return { matched, score, matchedIndices };
+}
+
+/**
+ * Checks if a character at the given index is at a word boundary
+ * Word boundaries are: start of string, after space, after dash, after slash
+ */
+function isWordBoundary(str: string, index: number): boolean {
+  if (index === 0) return true;
+  const prevChar = str[index - 1];
+  return prevChar === ' ' || prevChar === '-' || prevChar === '/' || prevChar === '_';
+}
+
+/**
+ * Checks if a character at the given index is a camelCase boundary
+ * (lowercase followed by uppercase)
+ */
+function isCamelCaseMatch(str: string, index: number): boolean {
+  if (index === 0 || index >= str.length) return false;
+  const currentChar = str[index];
+  const prevChar = str[index - 1];
+  if (!currentChar || !prevChar) return false;
+  return (
+    currentChar === currentChar.toUpperCase() &&
+    currentChar !== currentChar.toLowerCase() &&
+    prevChar === prevChar.toLowerCase()
+  );
+}

app/src/utils/remarkWikiLinks.ts

@@ -240,17 +240,13 @@ export function remarkWikiLinks(workspaceName: string) {
             continue;
           }
 
-          const lookupFileName: string = match.isImage
+          // If the filename contains a path separator, treat it as a full path
-            ? match.fileName
+          // This handles wikilinks with paths like [[folder/subfolder/file]]
-            : addMarkdownExtension(match.fileName);
+          let filePath: string;
+          if (match.fileName.includes('/')) {
+            // It's already a full path - use it directly
+            filePath = match.isImage ? match.fileName : addMarkdownExtension(match.fileName);
 
-          const paths: string[] = await lookupFileByName(
-            workspaceName,
-            lookupFileName
-          );
-
-          if (paths && paths.length > 0 && paths[0]) {
-            const filePath: string = paths[0];
             if (match.isImage) {
               newNodes.push(
                 createImageNode(workspaceName, filePath, match.displayText)
@@ -266,9 +262,37 @@ export function remarkWikiLinks(workspaceName: string) {
               );
             }
           } else {
-            newNodes.push(
+            // It's just a filename - look it up to find the full path
-              createNotFoundLink(match.fileName, match.displayText, baseUrl)
+            const lookupFileName: string = match.isImage
+              ? match.fileName
+              : addMarkdownExtension(match.fileName);
+
+            const paths: string[] = await lookupFileByName(
+              workspaceName,
+              lookupFileName
             );
+
+            if (paths && paths.length > 0 && paths[0]) {
+              filePath = paths[0];
+              if (match.isImage) {
+                newNodes.push(
+                  createImageNode(workspaceName, filePath, match.displayText)
+                );
+              } else {
+                newNodes.push(
+                  createFileLink(
+                    filePath,
+                    match.displayText,
+                    match.heading,
+                    baseUrl
+                  )
+                );
+              }
+            } else {
+              newNodes.push(
+                createNotFoundLink(match.fileName, match.displayText, baseUrl)
+              );
+            }
           }
         } catch (error) {
           console.debug('File lookup failed:', match.fileName, error);

app/src/utils/wikiLinkCompletion.ts

@@ -0,0 +1,239 @@
+import type {
+  CompletionContext,
+  CompletionResult,
+  Completion,
+} from '@codemirror/autocomplete';
+import type { FlatFile } from './fileHelpers';
+import { fuzzyMatch } from './fuzzyMatch';
+
+/**
+ * Wiki link context detection result
+ */
+interface WikiLinkContext {
+  isWikiLink: boolean;
+  isImage: boolean; // true if ![[
+  query: string; // partial text after [[
+  from: number; // cursor position to replace from
+  to: number; // cursor position to replace to
+}
+
+/**
+ * Creates CodeMirror autocompletion source for wiki links
+ *
+ * @param files - Flattened file list from workspace
+ * @returns CompletionSource function
+ */
+export function createWikiLinkCompletions(
+  files: FlatFile[]
+): (context: CompletionContext) => CompletionResult | null {
+  return (context: CompletionContext): CompletionResult | null => {
+    const wikiContext = detectWikiLinkContext(context);
+
+    if (!wikiContext.isWikiLink) {
+      return null;
+    }
+
+    // Filter and rank files based on query
+    const rankedFiles = filterAndRankFiles(
+      wikiContext.query,
+      files,
+      wikiContext.isImage,
+      50
+    );
+
+    if (rankedFiles.length === 0) {
+      return null;
+    }
+
+    // Convert to completion options
+    const options = rankedFiles.map((file) => formatCompletion(file));
+
+    return {
+      from: wikiContext.from,
+      to: wikiContext.to,
+      options,
+      // Don't set filter or validFor - let CodeMirror re-trigger our completion
+      // source on every keystroke so we can re-filter with fuzzy matching
+    };
+  };
+}
+
+/**
+ * Detects if cursor is inside a wiki link and extracts context
+ *
+ * Detection logic:
+ * 1. Search backwards from cursor for [[ or ![[
+ * 2. Ensure no closing ]] between opener and cursor
+ * 3. Extract partial query (text after [[ and before cursor)
+ * 4. Determine if image link (![[) or regular ([[)
+ *
+ * Examples:
+ *   "[[meeti|ng"  → { isWikiLink: true, query: "meeti", ... }
+ *   "![[img|"     → { isWikiLink: true, isImage: true, query: "img", ... }
+ *   "regular text|" → { isWikiLink: false }
+ */
+function detectWikiLinkContext(context: CompletionContext): WikiLinkContext {
+  const { state, pos } = context;
+  const line = state.doc.lineAt(pos);
+  const textBefore = state.sliceDoc(line.from, pos);
+
+  // Look for [[ or ![[
+  const imageWikiLinkMatch = textBefore.lastIndexOf('![[');
+  const regularWikiLinkMatch = textBefore.lastIndexOf('[[');
+
+  // Determine which one is closer to cursor
+  let isImage = false;
+  let openerIndex = -1;
+
+  if (imageWikiLinkMatch > regularWikiLinkMatch) {
+    isImage = true;
+    openerIndex = imageWikiLinkMatch;
+  } else if (regularWikiLinkMatch >= 0) {
+    openerIndex = regularWikiLinkMatch;
+  }
+
+  // If no opener found, not in a wiki link
+  if (openerIndex < 0) {
+    return {
+      isWikiLink: false,
+      isImage: false,
+      query: '',
+      from: pos,
+      to: pos,
+    };
+  }
+
+  // Calculate the absolute position of the opener in the document
+  const openerPos = line.from + openerIndex;
+  const openerLength = isImage ? 3 : 2; // ![[ or [[
+  const queryStartPos = openerPos + openerLength;
+
+  // Check if there's a closing ]] between opener and cursor
+  const textAfterOpener = textBefore.slice(openerIndex);
+  const closingIndex = textAfterOpener.indexOf(']]');
+
+  if (closingIndex >= 0 && closingIndex < textAfterOpener.length - 2) {
+    // Found ]] before cursor, so we're not inside a wiki link
+    return {
+      isWikiLink: false,
+      isImage: false,
+      query: '',
+      from: pos,
+      to: pos,
+    };
+  }
+
+  // Extract the query (text between [[ and cursor)
+  const query = state.sliceDoc(queryStartPos, pos);
+
+  return {
+    isWikiLink: true,
+    isImage,
+    query,
+    from: queryStartPos,
+    to: pos,
+  };
+}
+
+/**
+ * Filters files and ranks by relevance
+ *
+ * Ranking priority:
+ * 1. File type match (images for ![[, markdown for [[)
+ * 2. Fuzzy match score
+ * 3. Exact filename match > path component match
+ * 4. Shorter paths (prefer root over deeply nested)
+ * 5. Alphabetical for ties
+ *
+ * @param query - User's partial input
+ * @param files - All available files
+ * @param isImage - Whether to filter for images
+ * @param maxResults - Limit returned results (default: 50)
+ */
+function filterAndRankFiles(
+  query: string,
+  files: FlatFile[],
+  isImage: boolean,
+  maxResults = 50
+): FlatFile[] {
+  // If query is empty, show all matching file types
+  if (!query) {
+    const filtered = files.filter((f) => f.isImage === isImage);
+    return filtered.slice(0, maxResults);
+  }
+
+  interface ScoredFile {
+    file: FlatFile;
+    score: number;
+    nameScore: number;
+    pathScore: number;
+  }
+
+  const scored: ScoredFile[] = [];
+
+  for (const file of files) {
+    // Filter by file type
+    if (file.isImage !== isImage) {
+      continue;
+    }
+
+    // Try matching against different fields
+    const nameMatch = fuzzyMatch(query, file.nameWithoutExt);
+    const pathMatch = fuzzyMatch(query, file.displayPath);
+
+    // Use the best match
+    if (nameMatch.matched || pathMatch.matched) {
+      // Prefer name matches over path matches
+      const nameScore = nameMatch.matched ? nameMatch.score : 0;
+      const pathScore = pathMatch.matched ? pathMatch.score : 0;
+
+      // Name matches get higher priority
+      const totalScore = nameScore * 2 + pathScore;
+
+      // Penalize deeply nested files slightly
+      const depth = file.path.split('/').length;
+      const depthPenalty = depth * 0.5;
+
+      scored.push({
+        file,
+        score: totalScore - depthPenalty,
+        nameScore,
+        pathScore,
+      });
+    }
+  }
+
+  // Sort by score (descending), then alphabetically
+  scored.sort((a, b) => {
+    if (b.score !== a.score) {
+      return b.score - a.score;
+    }
+    return a.file.displayPath.localeCompare(b.file.displayPath);
+  });
+
+  // Return top results
+  return scored.slice(0, maxResults).map((s) => s.file);
+}
+
+/**
+ * Converts FlatFile to CodeMirror Completion object
+ *
+ * Format rules:
+ * - Markdown files: show path without .md extension
+ * - Images: show full path with extension
+ * - Display includes path relative to workspace root
+ * - Apply text: full path (no extension for .md)
+ *
+ * Example outputs:
+ *   work/2024/meeting-notes    (for .md)
+ *   assets/screenshot.png       (for image)
+ */
+function formatCompletion(file: FlatFile): Completion {
+  return {
+    label: file.displayPath,
+    apply: file.displayPath,
+    type: file.isImage ? 'image' : 'file',
+    detail: file.parentFolder || '/',
+    boost: 0,
+  };
+}

app/vite.config.ts

@@ -11,7 +11,10 @@ export default defineConfig(({ mode }) => ({
     react({
       include: ['**/*.tsx', '**/*.ts', '**/*.jsx', '**/*.js'],
     }),
-    compression(),
+    compression({
+      threshold: 1024, // Only compress files > 1KB
+      deleteOriginalAssets: false, // Keep original files
+    }),
   ],
 
   root: 'src',

app/vitest.config.ts

@@ -1,5 +1,5 @@
 /// <reference types="vitest" />
-import { defineConfig } from 'vite';
+import { defineConfig } from 'vitest/config';
 import react from '@vitejs/plugin-react';
 import path from 'path';
 

server/internal/app/init.go

@@ -118,6 +118,7 @@ func setupAdminUser(database db.Database, storageManager storage.Manager, cfg *C
 		DisplayName:  "Admin",
 		PasswordHash: string(hashedPassword),
 		Role:         models.RoleAdmin,
+		Theme:        "dark", // default theme
 	}
 
 	createdUser, err := database.CreateUser(adminUser)
@@ -132,7 +133,8 @@ func setupAdminUser(database db.Database, storageManager storage.Manager, cfg *C
 
 	logging.Info("admin user setup completed",
 		"userId", createdUser.ID,
-		"workspaceId", createdUser.LastWorkspaceID)
+		"workspaceId", createdUser.LastWorkspaceID,
+		"theme", createdUser.Theme)
 
 	return nil
 }

server/internal/db/migrations/postgres/001_initial_schema.up.sql

@@ -7,6 +7,7 @@ CREATE TABLE IF NOT EXISTS users (
     display_name TEXT,
     password_hash TEXT NOT NULL,
     role TEXT NOT NULL CHECK(role IN ('admin', 'editor', 'viewer')),
+    theme TEXT NOT NULL DEFAULT 'dark' CHECK(theme IN ('light', 'dark')),
     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     last_workspace_id INTEGER
 );
@@ -19,7 +20,7 @@ CREATE TABLE IF NOT EXISTS workspaces (
     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     last_opened_file_path TEXT,
     -- Settings fields
-    theme TEXT NOT NULL DEFAULT 'light' CHECK(theme IN ('light', 'dark')),
+    theme TEXT NOT NULL DEFAULT 'dark' CHECK(theme IN ('light', 'dark')),
     auto_save BOOLEAN NOT NULL DEFAULT FALSE,
     git_enabled BOOLEAN NOT NULL DEFAULT FALSE,
     git_url TEXT,

server/internal/db/migrations/sqlite/001_initial_schema.up.sql

@@ -6,6 +6,7 @@ CREATE TABLE IF NOT EXISTS users (
     display_name TEXT,
     password_hash TEXT NOT NULL,
     role TEXT NOT NULL CHECK(role IN ('admin', 'editor', 'viewer')),
+    theme TEXT NOT NULL DEFAULT 'dark' CHECK(theme IN ('light', 'dark')),
     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     last_workspace_id INTEGER
 );
@@ -18,7 +19,7 @@ CREATE TABLE IF NOT EXISTS workspaces (
     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     last_opened_file_path TEXT,
     -- Settings fields
-    theme TEXT NOT NULL DEFAULT 'light' CHECK(theme IN ('light', 'dark')),
+    theme TEXT NOT NULL DEFAULT 'dark' CHECK(theme IN ('light', 'dark')),
     auto_save BOOLEAN NOT NULL DEFAULT 0,
     git_enabled BOOLEAN NOT NULL DEFAULT 0,
     git_url TEXT,

server/internal/db/sessions_test.go

@@ -29,6 +29,7 @@ func TestSessionOperations(t *testing.T) {
 		DisplayName:  "Test User",
 		PasswordHash: "hash",
 		Role:         "editor",
+		Theme:        "dark",
 	})
 	if err != nil {
 		t.Fatalf("failed to create test user: %v", err)

server/internal/db/struct_query_test.go

@@ -156,6 +156,7 @@ func TestStructQueries(t *testing.T) {
 		DisplayName:  "Struct Query Test",
 		PasswordHash: "hashed_password",
 		Role:         models.RoleEditor,
+		Theme:        "dark",
 	}
 
 	t.Run("InsertStructQuery", func(t *testing.T) {
@@ -243,6 +244,7 @@ func TestStructQueries(t *testing.T) {
 			DisplayName:  "Struct Query Test 2",
 			PasswordHash: "hashed_password2",
 			Role:         models.RoleViewer,
+			Theme:        "light",
 		}
 
 		createdUser2, err := database.CreateUser(secondUser)
@@ -437,6 +439,7 @@ func TestEncryptedFields(t *testing.T) {
 		DisplayName:  "Encryption Test",
 		PasswordHash: "hash",
 		Role:         models.RoleEditor,
+		Theme:        "dark",
 	})
 	if err != nil {
 		t.Fatalf("Failed to create test user: %v", err)

server/internal/db/system_test.go

@@ -31,12 +31,14 @@ func TestSystemOperations(t *testing.T) {
 				DisplayName:  "User 1",
 				PasswordHash: "hash1",
 				Role:         "editor",
+				Theme:        "dark",
 			},
 			{
 				Email:        "user2@test.com",
 				DisplayName:  "User 2",
 				PasswordHash: "hash2",
 				Role:         "viewer",
+				Theme:        "light",
 			},
 		}
 

server/internal/db/users_test.go

@@ -34,6 +34,7 @@ func TestUserOperations(t *testing.T) {
 					DisplayName:  "Test User",
 					PasswordHash: "hashed_password",
 					Role:         models.RoleEditor,
+					Theme:        "dark",
 				},
 				wantErr: false,
 			},
@@ -44,6 +45,7 @@ func TestUserOperations(t *testing.T) {
 					DisplayName:  "Another User",
 					PasswordHash: "different_hash",
 					Role:         models.RoleViewer,
+					Theme:        "light",
 				},
 				wantErr:     true,
 				errContains: "UNIQUE constraint failed",
@@ -108,6 +110,7 @@ func TestUserOperations(t *testing.T) {
 			DisplayName:  "Get By ID User",
 			PasswordHash: "hash",
 			Role:         models.RoleEditor,
+			Theme:        "dark",
 		})
 		if err != nil {
 			t.Fatalf("failed to create test user: %v", err)
@@ -159,6 +162,7 @@ func TestUserOperations(t *testing.T) {
 			DisplayName:  "Get By Email User",
 			PasswordHash: "hash",
 			Role:         models.RoleEditor,
+			Theme:        "dark",
 		})
 		if err != nil {
 			t.Fatalf("failed to create test user: %v", err)
@@ -210,6 +214,7 @@ func TestUserOperations(t *testing.T) {
 			DisplayName:  "Original Name",
 			PasswordHash: "original_hash",
 			Role:         models.RoleEditor,
+			Theme:        "dark",
 		})
 		if err != nil {
 			t.Fatalf("failed to create test user: %v", err)
@@ -249,12 +254,14 @@ func TestUserOperations(t *testing.T) {
 				DisplayName:  "User One",
 				PasswordHash: "hash1",
 				Role:         models.RoleEditor,
+				Theme:        "dark",
 			},
 			{
 				Email:        "user2@example.com",
 				DisplayName:  "User Two",
 				PasswordHash: "hash2",
 				Role:         models.RoleViewer,
+				Theme:        "light",
 			},
 		}
 
@@ -305,6 +312,7 @@ func TestUserOperations(t *testing.T) {
 			DisplayName:  "Workspace User",
 			PasswordHash: "hash",
 			Role:         models.RoleEditor,
+			Theme:        "dark",
 		})
 		if err != nil {
 			t.Fatalf("failed to create test user: %v", err)
@@ -343,6 +351,7 @@ func TestUserOperations(t *testing.T) {
 			DisplayName:  "Delete User",
 			PasswordHash: "hash",
 			Role:         models.RoleEditor,
+			Theme:        "dark",
 		})
 		if err != nil {
 			t.Fatalf("failed to create test user: %v", err)
@@ -377,18 +386,21 @@ func TestUserOperations(t *testing.T) {
 				DisplayName:  "Admin One",
 				PasswordHash: "hash1",
 				Role:         models.RoleAdmin,
+				Theme:        "dark",
 			},
 			{
 				Email:        "admin2@example.com",
 				DisplayName:  "Admin Two",
 				PasswordHash: "hash2",
 				Role:         models.RoleAdmin,
+				Theme:        "light",
 			},
 			{
 				Email:        "editor@example.com",
 				DisplayName:  "Editor",
 				PasswordHash: "hash3",
 				Role:         models.RoleEditor,
+				Theme:        "dark",
 			},
 		}
 

server/internal/db/workspaces_test.go

@@ -26,6 +26,7 @@ func TestWorkspaceOperations(t *testing.T) {
 		DisplayName:  "Test User",
 		PasswordHash: "hash",
 		Role:         models.RoleEditor,
+		Theme:        "dark",
 	})
 	if err != nil {
 		t.Fatalf("failed to create test user: %v", err)

server/internal/handlers/admin_handlers.go

@@ -22,6 +22,7 @@ type CreateUserRequest struct {
 	DisplayName string          `json:"displayName"`
 	Password    string          `json:"password"`
 	Role        models.UserRole `json:"role"`
+	Theme       string          `json:"theme,omitempty"`
 }
 
 // UpdateUserRequest holds the request fields for updating a user
@@ -30,6 +31,7 @@ type UpdateUserRequest struct {
 	DisplayName string          `json:"displayName,omitempty"`
 	Password    string          `json:"password,omitempty"`
 	Role        models.UserRole `json:"role,omitempty"`
+	Theme       string          `json:"theme,omitempty"`
 }
 
 // WorkspaceStats holds workspace statistics
@@ -164,11 +166,24 @@ func (h *Handler) AdminCreateUser() http.HandlerFunc {
 			return
 		}
 
+		// Handle theme with validation and default
+		theme := req.Theme
+		if theme == "" {
+			theme = "dark" // Default theme
+		} else if theme != "light" && theme != "dark" {
+			// Invalid theme, fallback to dark
+			log.Debug("invalid theme value in user creation, falling back to dark",
+				"theme", theme,
+			)
+			theme = "dark"
+		}
+
 		user := &models.User{
 			Email:        req.Email,
 			DisplayName:  req.DisplayName,
 			PasswordHash: string(hashedPassword),
 			Role:         req.Role,
+			Theme:        theme,
 		}
 
 		insertedUser, err := h.DB.CreateUser(user)
@@ -196,6 +211,7 @@ func (h *Handler) AdminCreateUser() http.HandlerFunc {
 			"newUserID", insertedUser.ID,
 			"email", insertedUser.Email,
 			"role", insertedUser.Role,
+			"theme", insertedUser.Theme,
 		)
 		respondJSON(w, insertedUser)
 	}
@@ -322,6 +338,17 @@ func (h *Handler) AdminUpdateUser() http.HandlerFunc {
 			user.Role = req.Role
 			updates["role"] = req.Role
 		}
+		if req.Theme != "" {
+			// Validate theme value, fallback to "dark" if invalid
+			if req.Theme != "light" && req.Theme != "dark" {
+				log.Debug("invalid theme value, falling back to dark",
+					"theme", req.Theme,
+				)
+				req.Theme = "dark"
+			}
+			user.Theme = req.Theme
+			updates["theme"] = req.Theme
+		}
 		if req.Password != "" {
 			hashedPassword, err := bcrypt.GenerateFromPassword([]byte(req.Password), bcrypt.DefaultCost)
 			if err != nil {

server/internal/handlers/file_handlers.go

@@ -410,7 +410,8 @@ func (h *Handler) UploadFile() http.HandlerFunc {
 				}
 			}()
 
-			filePath := decodedPath + "/" + formFile.Filename
+			// Use filepath.Join to properly construct the path
+		filePath := filepath.Join(decodedPath, formFile.Filename)
 
 			content, err := io.ReadAll(file)
 			if err != nil {

server/internal/handlers/file_handlers_integration_test.go

@@ -352,15 +352,6 @@ func testFileHandlers(t *testing.T, dbConfig DatabaseConfig) {
 				assert.Equal(t, http.StatusBadRequest, rr.Code)
 			})
 
-			t.Run("upload with missing file_path parameter", func(t *testing.T) {
-				fileName := "test.txt"
-				fileContent := "test content"
-				files := map[string]string{fileName: fileContent}
-
-				rr := h.makeUploadRequest(t, baseURL+"/upload", files, h.RegularTestUser)
-				assert.Equal(t, http.StatusBadRequest, rr.Code)
-			})
-
 			t.Run("upload with invalid file_path", func(t *testing.T) {
 				fileName := "test.txt"
 				fileContent := "test content"

server/internal/handlers/integration_test.go

@@ -213,6 +213,7 @@ func (h *testHarness) createTestUser(t *testing.T, email, password string, role
 		DisplayName:  "Test User",
 		PasswordHash: string(hashedPassword),
 		Role:         role,
+		Theme:        "dark",
 	}
 
 	user, err = h.DB.CreateUser(user)

server/internal/handlers/static_handler.go

@@ -24,6 +24,28 @@ func getStaticLogger() logging.Logger {
 	return logging.WithGroup("static")
 }
 
+// getContentType returns the appropriate content type based on file extension
+func getContentType(path string) string {
+	switch filepath.Ext(path) {
+	case ".js":
+		return "application/javascript"
+	case ".css":
+		return "text/css"
+	case ".html":
+		return "text/html"
+	case ".json":
+		return "application/json"
+	case ".svg":
+		return "image/svg+xml"
+	case ".xml":
+		return "application/xml"
+	case ".yaml", ".yml":
+		return "application/x-yaml"
+	default:
+		return "application/octet-stream"
+	}
+}
+
 // ServeHTTP serves the static files
 func (h *StaticHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	log := getStaticLogger().With(
@@ -77,23 +99,28 @@ func (h *StaticHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// Check for pre-compressed version
+	// Check for pre-compressed versions (prefer brotli over gzip)
-	if strings.Contains(r.Header.Get("Accept-Encoding"), "gzip") {
+	acceptEncoding := r.Header.Get("Accept-Encoding")
+
+	// Try brotli first (better compression ratio)
+	if strings.Contains(acceptEncoding, "br") {
+		brPath := cleanPath + ".br"
+		if _, err := os.Stat(brPath); err == nil {
+			w.Header().Set("Content-Encoding", "br")
+			w.Header().Set("Content-Type", getContentType(cleanPath))
+			w.Header().Set("Vary", "Accept-Encoding")
+			http.ServeFile(w, r, brPath)
+			return
+		}
+	}
+
+	// Fall back to gzip
+	if strings.Contains(acceptEncoding, "gzip") {
 		gzPath := cleanPath + ".gz"
 		if _, err := os.Stat(gzPath); err == nil {
 			w.Header().Set("Content-Encoding", "gzip")
-
+			w.Header().Set("Content-Type", getContentType(cleanPath))
-			// Set proper content type based on original file
+			w.Header().Set("Vary", "Accept-Encoding")
-			contentType := "application/octet-stream"
-			switch filepath.Ext(cleanPath) {
-			case ".js":
-				contentType = "application/javascript"
-			case ".css":
-				contentType = "text/css"
-			case ".html":
-				contentType = "text/html"
-			}
-			w.Header().Set("Content-Type", contentType)
 			http.ServeFile(w, r, gzPath)
 			return
 		}

server/internal/handlers/static_handler_integration_test.go

@@ -26,8 +26,12 @@ func TestStaticHandler_Integration(t *testing.T) {
 		"index.html":          []byte("<html><body>Index</body></html>"),
 		"assets/style.css":    []byte("body { color: blue; }"),
 		"assets/style.css.gz": []byte("gzipped css content"),
+		"assets/style.css.br": []byte("brotli css content"),
 		"assets/script.js":    []byte("console.log('test');"),
 		"assets/script.js.gz": []byte("gzipped js content"),
+		"assets/script.js.br": []byte("brotli js content"),
+		"assets/app.js":       []byte("console.log('app');"),
+		"assets/app.js.br":    []byte("brotli app content"),
 		"subdir/page.html":    []byte("<html><body>Page</body></html>"),
 		"subdir/page.html.gz": []byte("gzipped html content"),
 	}
@@ -52,6 +56,7 @@ func TestStaticHandler_Integration(t *testing.T) {
 		wantType        string
 		wantEncoding    string
 		wantCacheHeader string
+		wantVary        string
 	}{
 		{
 			name:       "serve index.html",
@@ -69,6 +74,7 @@ func TestStaticHandler_Integration(t *testing.T) {
 			wantType:        "text/css",
 			wantEncoding:    "gzip",
 			wantCacheHeader: "public, max-age=31536000",
+			wantVary:        "Accept-Encoding",
 		},
 		{
 			name:            "serve JS with gzip support",
@@ -79,6 +85,7 @@ func TestStaticHandler_Integration(t *testing.T) {
 			wantType:        "application/javascript",
 			wantEncoding:    "gzip",
 			wantCacheHeader: "public, max-age=31536000",
+			wantVary:        "Accept-Encoding",
 		},
 		{
 			name:            "serve CSS without gzip",
@@ -114,6 +121,50 @@ func TestStaticHandler_Integration(t *testing.T) {
 			wantBody:   []byte("<html><body>Index</body></html>"),
 			wantType:   "text/html; charset=utf-8",
 		},
+		{
+			name:            "serve CSS with brotli support",
+			path:            "/assets/style.css",
+			acceptEncoding:  "br",
+			wantStatus:      http.StatusOK,
+			wantBody:        []byte("brotli css content"),
+			wantType:        "text/css",
+			wantEncoding:    "br",
+			wantCacheHeader: "public, max-age=31536000",
+			wantVary:        "Accept-Encoding",
+		},
+		{
+			name:            "serve JS with brotli support",
+			path:            "/assets/script.js",
+			acceptEncoding:  "br",
+			wantStatus:      http.StatusOK,
+			wantBody:        []byte("brotli js content"),
+			wantType:        "application/javascript",
+			wantEncoding:    "br",
+			wantCacheHeader: "public, max-age=31536000",
+			wantVary:        "Accept-Encoding",
+		},
+		{
+			name:            "prefer brotli over gzip when both supported",
+			path:            "/assets/script.js",
+			acceptEncoding:  "gzip, br",
+			wantStatus:      http.StatusOK,
+			wantBody:        []byte("brotli js content"),
+			wantType:        "application/javascript",
+			wantEncoding:    "br",
+			wantCacheHeader: "public, max-age=31536000",
+			wantVary:        "Accept-Encoding",
+		},
+		{
+			name:            "fallback to gzip when brotli not available",
+			path:            "/assets/app.js",
+			acceptEncoding:  "gzip, br",
+			wantStatus:      http.StatusOK,
+			wantBody:        []byte("brotli app content"),
+			wantType:        "application/javascript",
+			wantEncoding:    "br",
+			wantCacheHeader: "public, max-age=31536000",
+			wantVary:        "Accept-Encoding",
+		},
 	}
 
 	for _, tc := range tests {
@@ -139,6 +190,10 @@ func TestStaticHandler_Integration(t *testing.T) {
 				if tc.wantCacheHeader != "" {
 					assert.Equal(t, tc.wantCacheHeader, w.Header().Get("Cache-Control"))
 				}
+
+				if tc.wantVary != "" {
+					assert.Equal(t, tc.wantVary, w.Header().Get("Vary"))
+				}
 			}
 		})
 	}

server/internal/handlers/user_handlers.go

@@ -16,6 +16,7 @@ type UpdateProfileRequest struct {
 	Email           string `json:"email"`
 	CurrentPassword string `json:"currentPassword"`
 	NewPassword     string `json:"newPassword"`
+	Theme           string `json:"theme"`
 }
 
 // DeleteAccountRequest represents a user account deletion request
@@ -149,6 +150,19 @@ func (h *Handler) UpdateProfile() http.HandlerFunc {
 			updates["displayNameChanged"] = true
 		}
 
+		// Update theme if provided
+		if req.Theme != "" {
+			// Validate theme value, fallback to "dark" if invalid
+			if req.Theme != "light" && req.Theme != "dark" {
+				log.Debug("invalid theme value, falling back to dark",
+					"theme", req.Theme,
+				)
+				req.Theme = "dark"
+			}
+			user.Theme = req.Theme
+			updates["themeChanged"] = true
+		}
+
 		// Update user in database
 		if err := h.DB.UpdateUser(user); err != nil {
 			log.Error("failed to update user in database",

server/internal/handlers/workspace_handlers.go

@@ -87,7 +87,7 @@ func (h *Handler) CreateWorkspace() http.HandlerFunc {
 			"clientIP", r.RemoteAddr,
 		)
 
-		var workspace models.Workspace
+			var workspace models.Workspace
 		if err := json.NewDecoder(r.Body).Decode(&workspace); err != nil {
 			log.Debug("invalid request body received",
 				"error", err.Error(),
@@ -104,7 +104,21 @@ func (h *Handler) CreateWorkspace() http.HandlerFunc {
 			return
 		}
 
+		// Get user to access their theme preference
+		user, err := h.DB.GetUserByID(ctx.UserID)
+		if err != nil {
+			log.Error("failed to fetch user from database",
+				"error", err.Error(),
+			)
+			respondError(w, "Failed to get user", http.StatusInternalServerError)
+			return
+		}
+
 		workspace.UserID = ctx.UserID
+		// Use user's theme as default if not provided
+		if workspace.Theme == "" {
+			workspace.Theme = user.Theme
+		}
 		if err := h.DB.CreateWorkspace(&workspace); err != nil {
 			log.Error("failed to create workspace in database",
 				"error", err.Error(),
@@ -145,6 +159,7 @@ func (h *Handler) CreateWorkspace() http.HandlerFunc {
 		log.Info("workspace created",
 			"workspaceID", workspace.ID,
 			"workspaceName", workspace.Name,
+			"theme", workspace.Theme,
 			"gitEnabled", workspace.GitEnabled,
 		)
 		respondJSON(w, workspace)

server/internal/models/user.go

@@ -25,6 +25,7 @@ type User struct {
 	DisplayName     string    `json:"displayName" db:"display_name"`
 	PasswordHash    string    `json:"-" db:"password_hash"`
 	Role            UserRole  `json:"role" db:"role" validate:"required,oneof=admin editor viewer"`
+	Theme           string    `json:"theme" db:"theme" validate:"required,oneof=light dark"`
 	CreatedAt       time.Time `json:"createdAt" db:"created_at,default"`
 	LastWorkspaceID int       `json:"lastWorkspaceId" db:"last_workspace_id"`
 }

server/internal/models/workspace.go

@@ -13,7 +13,7 @@ type Workspace struct {
 	LastOpenedFilePath string    `json:"lastOpenedFilePath" db:"last_opened_file_path"`
 
 	// Integrated settings
-	Theme                string `json:"theme" db:"theme" validate:"oneof=light dark"`
+	Theme                string `json:"theme" db:"theme" validate:"required,oneof=light dark"`
 	AutoSave             bool   `json:"autoSave" db:"auto_save"`
 	ShowHiddenFiles      bool   `json:"showHiddenFiles" db:"show_hidden_files"`
 	GitEnabled           bool   `json:"gitEnabled" db:"git_enabled"`
@@ -40,7 +40,7 @@ func (w *Workspace) ValidateGitSettings() error {
 func (w *Workspace) SetDefaultSettings() {
 
 	if w.Theme == "" {
-		w.Theme = "light"
+		w.Theme = "dark"
 	}
 
 	w.AutoSave = w.AutoSave || false