diff --git a/.cursor/hooks/state/continual-learning.json b/.cursor/hooks/state/continual-learning.json
index c25f107..c315349 100644
--- a/.cursor/hooks/state/continual-learning.json
+++ b/.cursor/hooks/state/continual-learning.json
@@ -1,8 +1,8 @@
 {
   "version": 1,
   "lastRunAtMs": 1782633053032,
-  "turnsSinceLastRun": 7,
+  "turnsSinceLastRun": 8,
   "lastTranscriptMtimeMs": 1782633052959.9294,
-  "lastProcessedGenerationId": "5c41c5b1-0c40-4c8e-a6df-b22e873df8f6",
+  "lastProcessedGenerationId": "6d690dcb-cba6-47d2-9361-43956be8667e",
   "trialStartedAtMs": null
 }
diff --git a/memento-note/components/note-card.tsx b/memento-note/components/note-card.tsx
index 184ea45..c3e3fc9 100644
--- a/memento-note/components/note-card.tsx
+++ b/memento-note/components/note-card.tsx
@@ -24,7 +24,7 @@ import {
   AlertDialogHeader,
   AlertDialogTitle,
 } from '@/components/ui/alert-dialog'
-import { Pin, Bell, GripVertical, X, Link2, FolderOpen, StickyNote, LucideIcon, Folder, Briefcase, FileText, Zap, BarChart3, Globe, Sparkles, Book, Heart, Crown, Music, Building2, LogOut, Trash2, AlignLeft, FileCode2, PenLine, ListChecks, ChevronRight, Plus } from 'lucide-react'
+import { Pin, Bell, GripVertical, X, Link2, FolderOpen, StickyNote, LucideIcon, Folder, Briefcase, FileText, Zap, BarChart3, Globe, Sparkles, Book, Heart, Crown, Music, Building2, LogOut, Trash2, AlignLeft, FileCode2, PenLine, ListChecks, ChevronRight, Plus, History } from 'lucide-react'
 import { useState, useEffect, useTransition, useOptimistic, memo, useMemo } from 'react'
 import dynamic from 'next/dynamic'
 import { useSession } from 'next-auth/react'
@@ -594,6 +594,16 @@ export const NoteCard = memo(function NoteCard({
         />
       )}
 
+      {/* Versioning indicator */}
+      {optimisticNote.historyEnabled && (
+        <div
+          className="absolute bottom-3 end-3 z-10"
+          title={t('notes.historyEnabledTooltip') || 'Version history enabled'}
+        >
+          <History className="h-3.5 w-3.5 text-muted-foreground/50" />
+        </div>
+      )}
+
       {/* Fusion Badge */}
       {note.aiProvider === 'fusion' && optimisticNote.autoGenerated !== null && (
         <div className="px-1.5 py-0.5 rounded text-[10px] font-medium bg-purple-100 dark:bg-purple-900/30 text-purple-700 dark:text-purple-400 border border-purple-200 dark:border-purple-800 flex items-center gap-1 group/badge relative mb-2 w-fit">
diff --git a/memento-note/components/note-editor/note-editor-toolbar.tsx b/memento-note/components/note-editor/note-editor-toolbar.tsx
index 8cb0be6..551e18f 100644
--- a/memento-note/components/note-editor/note-editor-toolbar.tsx
+++ b/memento-note/components/note-editor/note-editor-toolbar.tsx
@@ -19,7 +19,7 @@ import { Badge } from '@/components/ui/badge'
 import {
   X, Plus, Palette, Image as ImageIcon, Bell, Eye, Link as LinkIcon, Sparkles,
   Maximize2, Copy, ArrowLeft, ChevronRight, PanelRight, Check, Loader2, Save, MoreHorizontal,
-  Trash2, LogOut, Wand2, Share2, Wind, Paperclip, GraduationCap, FileDown, FileUp, Mic, MicOff, Printer, PenTool, Loader2 as Loader2Icon, Globe, ExternalLink
+  Trash2, LogOut, Wand2, Share2, Wind, Paperclip, GraduationCap, FileDown, FileUp, Mic, MicOff, Printer, PenTool, Loader2 as Loader2Icon, Globe, ExternalLink, History
 } from 'lucide-react'
 import { FlashcardGenerateDialog } from '@/components/flashcards/flashcard-generate-dialog'
 import { NoteShareDialog } from './note-share-dialog'
@@ -549,6 +549,15 @@ export function NoteEditorToolbar({ mode, onClose, onToggleAttachments, attachme
               : <><Check className="h-3 w-3 text-emerald-500" /><span>{t('notes.savedStatus')}</span></>}
           </span>
 
+          {note.historyEnabled && (
+            <span
+              className="hidden sm:flex items-center gap-1 text-[11px] text-foreground/35 select-none cursor-help"
+              title={t('notes.historyEnabledTooltip') || 'Version history enabled'}
+            >
+              <History className="h-3 w-3" />
+            </span>
+          )}
+
           {state.isMarkdown && !readOnly && (
             <button
               title={state.showMarkdownPreview ? t('notes.markdownEditingTitle') : t('notes.markdownPreviewTitle')}
diff --git a/memento-note/locales/ar.json b/memento-note/locales/ar.json
index 263a506..3cc4c70 100644
--- a/memento-note/locales/ar.json
+++ b/memento-note/locales/ar.json
@@ -282,7 +282,8 @@
     "unarchived": "إلغاء الأرشفة",
     "uploading": "جاري الرفع...",
     "savedJustNow": "Saved",
-    "unsaved": "Unsaved changes"
+    "unsaved": "Unsaved changes",
+    "historyEnabledTooltip": "Version history enabled — changes are tracked"
   },
   "pagination": {
     "previous": "←",
diff --git a/memento-note/locales/de.json b/memento-note/locales/de.json
index 840ab18..5e2cc8d 100644
--- a/memento-note/locales/de.json
+++ b/memento-note/locales/de.json
@@ -282,7 +282,8 @@
     "unarchived": "Entarchiviert",
     "uploading": "Wird hochgeladen...",
     "savedJustNow": "Saved",
-    "unsaved": "Unsaved changes"
+    "unsaved": "Unsaved changes",
+    "historyEnabledTooltip": "Version history enabled — changes are tracked"
   },
   "pagination": {
     "previous": "←",
diff --git a/memento-note/locales/en.json b/memento-note/locales/en.json
index a92ed35..b016582 100644
--- a/memento-note/locales/en.json
+++ b/memento-note/locales/en.json
@@ -315,7 +315,8 @@
     "createFirst": "Create your first note",
     "unarchived": "Unarchived",
     "savedJustNow": "Saved",
-    "unsaved": "Unsaved changes"
+    "unsaved": "Unsaved changes",
+    "historyEnabledTooltip": "Version history enabled — changes are tracked"
   },
   "pagination": {
     "previous": "←",
diff --git a/memento-note/locales/es.json b/memento-note/locales/es.json
index 7cddc2b..60b44cc 100644
--- a/memento-note/locales/es.json
+++ b/memento-note/locales/es.json
@@ -282,7 +282,8 @@
     "unarchived": "Desarchivado",
     "uploading": "Subiendo...",
     "savedJustNow": "Saved",
-    "unsaved": "Unsaved changes"
+    "unsaved": "Unsaved changes",
+    "historyEnabledTooltip": "Version history enabled — changes are tracked"
   },
   "pagination": {
     "previous": "←",
diff --git a/memento-note/locales/fa.json b/memento-note/locales/fa.json
index 49cf1fb..876b1a6 100644
--- a/memento-note/locales/fa.json
+++ b/memento-note/locales/fa.json
@@ -282,7 +282,8 @@
     "unarchived": "خارج بایگانی",
     "uploading": "در حال آپلود...",
     "savedJustNow": "Saved",
-    "unsaved": "Unsaved changes"
+    "unsaved": "Unsaved changes",
+    "historyEnabledTooltip": "Version history enabled — changes are tracked"
   },
   "pagination": {
     "previous": "←",
diff --git a/memento-note/locales/fr.json b/memento-note/locales/fr.json
index ff21074..27a2775 100644
--- a/memento-note/locales/fr.json
+++ b/memento-note/locales/fr.json
@@ -321,7 +321,8 @@
     "createFirst": "Créez votre première note",
     "unarchived": "Désarchivée",
     "savedJustNow": "Sauvegardé",
-    "unsaved": "Non sauvegardé"
+    "unsaved": "Non sauvegardé",
+    "historyEnabledTooltip": "Historique des versions activé — les modifications sont suivies"
   },
   "pagination": {
     "previous": "←",
diff --git a/memento-note/locales/hi.json b/memento-note/locales/hi.json
index b06b0eb..f50eaa1 100644
--- a/memento-note/locales/hi.json
+++ b/memento-note/locales/hi.json
@@ -282,7 +282,8 @@
     "unarchived": "अनार्काइव नहीं",
     "uploading": "अपलोड हो रहा है...",
     "savedJustNow": "Saved",
-    "unsaved": "Unsaved changes"
+    "unsaved": "Unsaved changes",
+    "historyEnabledTooltip": "Version history enabled — changes are tracked"
   },
   "pagination": {
     "previous": "←",
diff --git a/memento-note/locales/it.json b/memento-note/locales/it.json
index dd30710..c199d3e 100644
--- a/memento-note/locales/it.json
+++ b/memento-note/locales/it.json
@@ -282,7 +282,8 @@
     "unarchived": "Dearchiviato",
     "uploading": "Caricamento...",
     "savedJustNow": "Saved",
-    "unsaved": "Unsaved changes"
+    "unsaved": "Unsaved changes",
+    "historyEnabledTooltip": "Version history enabled — changes are tracked"
   },
   "pagination": {
     "previous": "←",
diff --git a/memento-note/locales/ja.json b/memento-note/locales/ja.json
index 9290537..9b96f99 100644
--- a/memento-note/locales/ja.json
+++ b/memento-note/locales/ja.json
@@ -282,7 +282,8 @@
     "unarchived": "アーカイブ解除",
     "uploading": "アップロード中...",
     "savedJustNow": "Saved",
-    "unsaved": "Unsaved changes"
+    "unsaved": "Unsaved changes",
+    "historyEnabledTooltip": "Version history enabled — changes are tracked"
   },
   "pagination": {
     "previous": "←",
diff --git a/memento-note/locales/ko.json b/memento-note/locales/ko.json
index 1a3a723..48c02c3 100644
--- a/memento-note/locales/ko.json
+++ b/memento-note/locales/ko.json
@@ -282,7 +282,8 @@
     "unarchived": "보관 해제됨",
     "uploading": "업로드 중...",
     "savedJustNow": "Saved",
-    "unsaved": "Unsaved changes"
+    "unsaved": "Unsaved changes",
+    "historyEnabledTooltip": "Version history enabled — changes are tracked"
   },
   "pagination": {
     "previous": "←",
diff --git a/memento-note/locales/nl.json b/memento-note/locales/nl.json
index 2b18174..b8a58f3 100644
--- a/memento-note/locales/nl.json
+++ b/memento-note/locales/nl.json
@@ -282,7 +282,8 @@
     "unarchived": "Gearchiveerd",
     "uploading": "Uploaden...",
     "savedJustNow": "Saved",
-    "unsaved": "Unsaved changes"
+    "unsaved": "Unsaved changes",
+    "historyEnabledTooltip": "Version history enabled — changes are tracked"
   },
   "pagination": {
     "previous": "←",
diff --git a/memento-note/locales/pl.json b/memento-note/locales/pl.json
index 23c086e..5291577 100644
--- a/memento-note/locales/pl.json
+++ b/memento-note/locales/pl.json
@@ -282,7 +282,8 @@
     "unarchived": "Wycofane z archiwum",
     "uploading": "Przesyłanie...",
     "savedJustNow": "Saved",
-    "unsaved": "Unsaved changes"
+    "unsaved": "Unsaved changes",
+    "historyEnabledTooltip": "Version history enabled — changes are tracked"
   },
   "pagination": {
     "previous": "←",
diff --git a/memento-note/locales/pt.json b/memento-note/locales/pt.json
index 2ed3acf..fef4c97 100644
--- a/memento-note/locales/pt.json
+++ b/memento-note/locales/pt.json
@@ -282,7 +282,8 @@
     "unarchived": "Desarquivado",
     "uploading": "Enviando...",
     "savedJustNow": "Saved",
-    "unsaved": "Unsaved changes"
+    "unsaved": "Unsaved changes",
+    "historyEnabledTooltip": "Version history enabled — changes are tracked"
   },
   "pagination": {
     "previous": "←",
diff --git a/memento-note/locales/ru.json b/memento-note/locales/ru.json
index 8a5fc3c..f378f2e 100644
--- a/memento-note/locales/ru.json
+++ b/memento-note/locales/ru.json
@@ -282,7 +282,8 @@
     "unarchived": "Разархивировано",
     "uploading": "Загрузка...",
     "savedJustNow": "Saved",
-    "unsaved": "Unsaved changes"
+    "unsaved": "Unsaved changes",
+    "historyEnabledTooltip": "Version history enabled — changes are tracked"
   },
   "pagination": {
     "previous": "←",
diff --git a/memento-note/locales/zh.json b/memento-note/locales/zh.json
index 4bd4c40..f0f9250 100644
--- a/memento-note/locales/zh.json
+++ b/memento-note/locales/zh.json
@@ -282,7 +282,8 @@
     "unarchived": "已取消归档",
     "uploading": "上传中...",
     "savedJustNow": "Saved",
-    "unsaved": "Unsaved changes"
+    "unsaved": "Unsaved changes",
+    "historyEnabledTooltip": "Version history enabled — changes are tracked"
   },
   "pagination": {
     "previous": "←",