diff --git a/frontend/src/api/client.ts b/frontend/src/api/client.ts
index 71a43b74..cf57d557 100644
--- a/frontend/src/api/client.ts
+++ b/frontend/src/api/client.ts
@@ -1,5 +1,6 @@
 import axios, { type AxiosError, type InternalAxiosRequestConfig } from 'axios'
 import { useAuthStore } from '@/store/authStore'
+import { toast } from '@/lib/toast'
 
 const API_BASE_URL = import.meta.env.VITE_API_URL || 'http://localhost:8000'
 
@@ -10,6 +11,44 @@ export const apiClient = axios.create({
   },
 })
 
+// Global error handler - shows toast for common API errors
+// Pages can still catch errors explicitly if they need custom handling
+function handleGlobalError(error: AxiosError) {
+  // Network error (no response from server)
+  if (!error.response) {
+    if (error.code === 'ECONNABORTED') {
+      toast.error('Request timeout - please try again')
+    } else {
+      toast.error('Network error - please check your connection')
+    }
+    return
+  }
+
+  const status = error.response.status
+  const data = error.response.data as { detail?: string }
+
+  // Don't show toast for 401 (handled by refresh interceptor)
+  if (status === 401) {
+    return
+  }
+
+  // Client errors (4xx)
+  if (status >= 400 && status < 500) {
+    const message = data?.detail || 'Invalid request'
+    // Only show generic messages - pages handle specific errors
+    if (!data?.detail) {
+      toast.error(message)
+    }
+    return
+  }
+
+  // Server errors (5xx)
+  if (status >= 500) {
+    toast.error('Server error - please try again later')
+    return
+  }
+}
+
 // Request interceptor - add auth token
 apiClient.interceptors.request.use(
   (config: InternalAxiosRequestConfig) => {
@@ -48,6 +87,9 @@ apiClient.interceptors.response.use(
 
     // Only handle 401s that haven't already been retried
     if (error.response?.status !== 401 || originalRequest._retry) {
+      // Show global error toast for non-401 errors
+      // Pages can still catch errors explicitly for custom handling
+      handleGlobalError(error)
       return Promise.reject(error)
     }
 
diff --git a/frontend/src/components/library/FolderEditModal.tsx b/frontend/src/components/library/FolderEditModal.tsx
index 27d9a566..7f1c6166 100644
--- a/frontend/src/components/library/FolderEditModal.tsx
+++ b/frontend/src/components/library/FolderEditModal.tsx
@@ -3,6 +3,7 @@ import { X } from 'lucide-react'
 import { foldersApi } from '@/api'
 import type { FolderListItem, FolderCreate, FolderUpdate } from '@/types'
 import { cn } from '@/lib/utils'
+import { toast } from '@/lib/toast'
 
 // Predefined color options
 const FOLDER_COLORS = [
@@ -66,7 +67,6 @@ export function FolderEditModal({
   const [color, setColor] = useState(FOLDER_COLORS[0])
   const [parentId, setParentId] = useState<string | null>(null)
   const [isSubmitting, setIsSubmitting] = useState(false)
-  const [error, setError] = useState<string | null>(null)
 
   const isEditMode = folder !== null
 
@@ -127,15 +127,13 @@ export function FolderEditModal({
       setColor(FOLDER_COLORS[0])
       setParentId(initialParentId || null)
     }
-    setError(null)
   }, [folder, initialParentId, isOpen])
 
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault()
-    setError(null)
 
     if (!name.trim()) {
-      setError('Folder name is required')
+      toast.error('Folder name is required')
       return
     }
 
@@ -148,12 +146,14 @@ export function FolderEditModal({
           updateData.parent_id = parentId
         }
         await foldersApi.update(folder.id, updateData)
+        toast.success('Folder updated successfully')
       } else {
         const createData: FolderCreate = { name, color }
         if (parentId) {
           createData.parent_id = parentId
         }
         await foldersApi.create(createData)
+        toast.success('Folder created successfully')
       }
       onSave()
       onClose()
@@ -163,7 +163,7 @@ export function FolderEditModal({
       const errorMessage = err instanceof Error && 'response' in err
         ? (err as { response?: { data?: { detail?: string } } }).response?.data?.detail
         : undefined
-      setError(errorMessage || 'Failed to save folder')
+      toast.error(errorMessage || 'Failed to save folder')
     } finally {
       setIsSubmitting(false)
     }
@@ -257,13 +257,6 @@ export function FolderEditModal({
             </div>
           </div>
 
-          {/* Error message */}
-          {error && (
-            <div className="mb-4 rounded-md bg-destructive/10 p-3 text-sm text-destructive">
-              {error}
-            </div>
-          )}
-
           {/* Actions */}
           <div className="flex justify-end gap-3">
             <button
diff --git a/frontend/src/lib/toast.ts b/frontend/src/lib/toast.ts
new file mode 100644
index 00000000..f36c0df2
--- /dev/null
+++ b/frontend/src/lib/toast.ts
@@ -0,0 +1,71 @@
+import { toast as sonnerToast, type ExternalToast } from 'sonner'
+
+/**
+ * Toast notification utility wrapper for ResolutionFlow
+ * Built on Sonner with theme integration and consistent styling
+ *
+ * @example
+ * // Success notification
+ * toast.success('Tree saved successfully!')
+ *
+ * @example
+ * // Error notification
+ * toast.error('Failed to save tree')
+ *
+ * @example
+ * // Promise with loading states
+ * toast.promise(
+ *   api.saveTree(data),
+ *   {
+ *     loading: 'Saving tree...',
+ *     success: 'Tree saved!',
+ *     error: 'Failed to save tree'
+ *   }
+ * )
+ */
+export const toast = {
+  /**
+   * Display a success toast notification
+   */
+  success: (message: string, options?: ExternalToast) =>
+    sonnerToast.success(message, options),
+
+  /**
+   * Display an error toast notification
+   */
+  error: (message: string, options?: ExternalToast) =>
+    sonnerToast.error(message, options),
+
+  /**
+   * Display an info toast notification
+   */
+  info: (message: string, options?: ExternalToast) =>
+    sonnerToast.info(message, options),
+
+  /**
+   * Display a warning toast notification
+   */
+  warning: (message: string, options?: ExternalToast) =>
+    sonnerToast.warning(message, options),
+
+  /**
+   * Display a promise toast with loading/success/error states
+   * @example
+   * toast.promise(
+   *   saveData(),
+   *   {
+   *     loading: 'Saving...',
+   *     success: 'Saved successfully',
+   *     error: 'Failed to save'
+   *   }
+   * )
+   */
+  promise: <T>(
+    promise: Promise<T>,
+    messages: {
+      loading: string
+      success: string | ((data: T) => string)
+      error: string | ((error: Error) => string)
+    }
+  ) => sonnerToast.promise(promise, messages),
+}
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index db032b74..b739ee18 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -1,10 +1,18 @@
 import { StrictMode } from 'react'
 import { createRoot } from 'react-dom/client'
+import { Toaster } from 'sonner'
 import './index.css'
 import App from './App'
 
 createRoot(document.getElementById('root')!).render(
   <StrictMode>
+    {/* Toast notification system - theme syncs automatically via CSS custom properties */}
+    <Toaster
+      position="top-right"
+      expand={false}
+      richColors
+      closeButton
+    />
     <App />
   </StrictMode>,
 )
diff --git a/frontend/src/pages/SessionDetailPage.tsx b/frontend/src/pages/SessionDetailPage.tsx
index cb81efb2..d687abaf 100644
--- a/frontend/src/pages/SessionDetailPage.tsx
+++ b/frontend/src/pages/SessionDetailPage.tsx
@@ -6,6 +6,7 @@ import { ExportPreviewModal } from '@/components/session/ExportPreviewModal'
 import { useUserPreferencesStore } from '@/store/userPreferencesStore'
 import type { Session, SessionExport } from '@/types'
 import { cn } from '@/lib/utils'
+import { toast } from '@/lib/toast'
 
 export function SessionDetailPage() {
   const { id } = useParams<{ id: string }>()
@@ -66,6 +67,7 @@ export function SessionDetailPage() {
       }
     } catch (err) {
       console.error('Export failed:', err)
+      toast.error('Failed to generate export preview')
     } finally {
       setIsExporting(false)
     }
@@ -79,9 +81,11 @@ export function SessionDetailPage() {
         await navigator.clipboard.writeText(content)
         setCopied(true)
         setTimeout(() => setCopied(false), 2000)
+        toast.success('Copied to clipboard')
       }
     } catch (err) {
       console.error('Copy failed:', err)
+      toast.error('Failed to copy to clipboard')
     } finally {
       setIsExporting(false)
     }
diff --git a/frontend/src/pages/SettingsPage.tsx b/frontend/src/pages/SettingsPage.tsx
index 60b48c02..1008accf 100644
--- a/frontend/src/pages/SettingsPage.tsx
+++ b/frontend/src/pages/SettingsPage.tsx
@@ -3,11 +3,17 @@ import { useUserPreferencesStore } from '@/store/userPreferencesStore'
 import { useThemeStore } from '@/store/themeStore'
 import { cn } from '@/lib/utils'
 import { ThemeToggle } from '@/components/common/ThemeToggle'
+import { toast } from '@/lib/toast'
 
 export function SettingsPage() {
   const { defaultExportFormat, setDefaultExportFormat } = useUserPreferencesStore()
   const { theme } = useThemeStore()
 
+  const handleExportFormatChange = (format: 'markdown' | 'text' | 'html') => {
+    setDefaultExportFormat(format)
+    toast.success('Preferences saved successfully')
+  }
+
   return (
     <div className="container mx-auto px-4 py-6 sm:px-6 sm:py-8">
       <div className="mb-8">
@@ -61,7 +67,7 @@ export function SettingsPage() {
             <select
               id="export-format"
               value={defaultExportFormat}
-              onChange={(e) => setDefaultExportFormat(e.target.value as 'markdown' | 'text' | 'html')}
+              onChange={(e) => handleExportFormatChange(e.target.value as 'markdown' | 'text' | 'html')}
               className={cn(
                 'mt-2 block w-full rounded-md border border-input bg-background px-3 py-2',
                 'text-sm text-foreground',
diff --git a/frontend/src/pages/TreeEditorPage.tsx b/frontend/src/pages/TreeEditorPage.tsx
index 781fa26f..cf49fe66 100644
--- a/frontend/src/pages/TreeEditorPage.tsx
+++ b/frontend/src/pages/TreeEditorPage.tsx
@@ -10,6 +10,7 @@ import { ValidationSummary } from '@/components/tree-editor/ValidationSummary'
 import { useKeyboardShortcuts } from '@/hooks/useKeyboardShortcuts'
 import { usePermissions } from '@/hooks/usePermissions'
 import { cn } from '@/lib/utils'
+import { toast } from '@/lib/toast'
 
 export function TreeEditorPage() {
   const { id } = useParams<{ id: string }>()
@@ -40,7 +41,6 @@ export function TreeEditorPage() {
   const { undo, redo, pastStates, futureStates } = useStore(useTreeEditorTemporal)
 
   const [showDraftPrompt, setShowDraftPrompt] = useState(false)
-  const [saveError, setSaveError] = useState<string | null>(null)
 
   // Mobile detection
   const [isMobile, setIsMobile] = useState(false)
@@ -160,13 +160,11 @@ export function TreeEditorPage() {
   }
 
   const handleSave = useCallback(async () => {
-    setSaveError(null)
-
     // Validate first
     const errors = validate()
     const hasErrors = errors.some(e => e.severity === 'error')
     if (hasErrors) {
-      setSaveError('Please fix validation errors before saving')
+      toast.error('Please fix validation errors before saving')
       return
     }
 
@@ -176,16 +174,18 @@ export function TreeEditorPage() {
       if (isEditMode) {
         await treesApi.update(id!, treeData as TreeUpdate)
         markSaved()
+        toast.success('Tree updated successfully')
       } else {
         const newTree = await treesApi.create(treeData as TreeCreate)
         // Mark saved BEFORE navigating to avoid triggering the blocker
         markSaved()
+        toast.success('Tree created successfully')
         // Navigate to edit mode with the new ID
         navigate(`/trees/${newTree.id}/edit`, { replace: true })
       }
     } catch (err) {
       console.error('Failed to save tree:', err)
-      setSaveError('Failed to save tree. Please try again.')
+      toast.error('Failed to save tree. Please try again.')
     } finally {
       setSaving(false)
     }
@@ -387,13 +387,6 @@ export function TreeEditorPage() {
         </div>
       </div>
 
-      {/* Error Display */}
-      {saveError && (
-        <div className="bg-destructive/10 px-4 py-2 text-sm text-destructive">
-          {saveError}
-        </div>
-      )}
-
       {/* Validation Summary */}
       {validationErrors.length > 0 && (
         <div className="px-4 py-3">