diff --git a/frontend/src/common/constant/editor.ts b/frontend/src/common/constant/editor.ts
index 1616f7e..f73d48d 100644
--- a/frontend/src/common/constant/editor.ts
+++ b/frontend/src/common/constant/editor.ts
@@ -5,7 +5,7 @@
 // 编辑器实例管理
 export const EDITOR_CONFIG = {
   /** 最多缓存的编辑器实例数量 */
-  MAX_INSTANCES: 5,
+  MAX_INSTANCES: 10,
   /** 语法树缓存过期时间（毫秒） */
   SYNTAX_TREE_CACHE_TIMEOUT: 30000,
   /** 加载状态延迟时间（毫秒） */
diff --git a/frontend/src/components/tabs/TabContainer.vue b/frontend/src/components/tabs/TabContainer.vue
index 2a37e23..5973029 100644
--- a/frontend/src/components/tabs/TabContainer.vue
+++ b/frontend/src/components/tabs/TabContainer.vue
@@ -37,10 +37,12 @@ import TabContextMenu from './TabContextMenu.vue';
 import { useTabStore } from '@/stores/tabStore';
 import { useDocumentStore } from '@/stores/documentStore';
 import { useEditorStore } from '@/stores/editorStore';
+import { useEditorStateStore } from '@/stores/editorStateStore';
 
 const tabStore = useTabStore();
 const documentStore = useDocumentStore();
 const editorStore = useEditorStore();
+const editorStateStore = useEditorStateStore();
 
 // DOM 引用
 const tabBarRef = ref<HTMLElement>();
@@ -55,15 +57,34 @@ const contextMenuTargetId = ref<number | null>(null);
 
 // 标签页操作
 const switchToTab = async (documentId: number) => {
+
+  // 保存旧文档的光标位置
+  const oldDocId = documentStore.currentDocumentId;
+  if (oldDocId) {
+    const cursorPos = editorStore.getCurrentCursorPosition();
+    editorStateStore.saveCursorPosition(oldDocId, cursorPos);
+  }
+
+  // 如果旧文档有未保存修改，保存它
+  if (oldDocId && editorStore.hasUnsavedChanges(oldDocId)) {
+    try {
+      const content = editorStore.getCurrentContent();
+      await documentStore.saveDocument(oldDocId, content);
+      editorStore.syncAfterSave(oldDocId);
+    } catch (error) {
+      console.error('save document error:', error);
+    }
+  }
+
+  // 切换文档
   await tabStore.switchToTabAndDocument(documentId);
   
-  const doc = documentStore.currentDocument;
-  if (doc && doc.id !== undefined && editorStore.hasContainer) {
-    await editorStore.loadEditor(doc.id, doc.content || '');
-  }
+  // 切换到新编辑器
+  await editorStore.switchToEditor(documentId);
   
-  if (doc && tabStore.isTabsEnabled) {
-    tabStore.addOrActivateTab(doc);
+  // 更新标签页
+  if (documentStore.currentDocument && tabStore.isTabsEnabled) {
+    tabStore.addOrActivateTab(documentStore.currentDocument);
   }
 };
 
diff --git a/frontend/src/components/toolbar/BlockLanguageSelector.vue b/frontend/src/components/toolbar/BlockLanguageSelector.vue
index 13d5bca..2ba0558 100644
--- a/frontend/src/components/toolbar/BlockLanguageSelector.vue
+++ b/frontend/src/components/toolbar/BlockLanguageSelector.vue
@@ -51,13 +51,13 @@ let editorScope: ReturnType<typeof effectScope> | null = null;
 
 // 更新当前块语言信息
 const updateCurrentBlockLanguage = () => {
-  if (!editorStore.editorView) {
+  if (!editorStore.currentEditor) {
     currentBlockLanguage.value = { name: 'text', auto: false };
     return;
   }
 
   try {
-    const state = editorStore.editorView.state;
+    const state = editorStore.currentEditor.state;
     const activeBlock = getActiveNoteBlock(state as any);
     if (activeBlock) {
       const newLanguage = {
@@ -128,7 +128,7 @@ const setupEventListeners = (view: any) => {
 
 // 监听编辑器状态变化
 watch(
-  () => editorStore.editorView,
+  () => editorStore.currentEditor,
   (newView) => {
     if (newView) {
       setupEventListeners(newView);
@@ -175,13 +175,13 @@ const closeLanguageMenu = () => {
 
 // 选择语言 - 优化性能
 const selectLanguage = (languageId: SupportedLanguage) => {
-  if (!editorStore.editorView) {
+  if (!editorStore.currentEditor) {
     closeLanguageMenu();
     return;
   }
 
   try {
-    const view = editorStore.editorView;
+    const view = editorStore.currentEditor;
     const state = view.state;
     const dispatch = view.dispatch;
 
diff --git a/frontend/src/components/toolbar/DocumentSelector.vue b/frontend/src/components/toolbar/DocumentSelector.vue
index 743f536..3ab069d 100644
--- a/frontend/src/components/toolbar/DocumentSelector.vue
+++ b/frontend/src/components/toolbar/DocumentSelector.vue
@@ -3,12 +3,13 @@ import {computed, nextTick, reactive, ref, watch} from 'vue';
 import {useDocumentStore} from '@/stores/documentStore';
 import {useTabStore} from '@/stores/tabStore';
 import {useEditorStore} from '@/stores/editorStore';
+import {useEditorStateStore} from '@/stores/editorStateStore';
 import {useWindowStore} from '@/stores/windowStore';
 import {useI18n} from 'vue-i18n';
 import {useConfirm} from '@/composables';
 import {validateDocumentTitle} from '@/common/utils/validation';
 import {formatDateTime, truncateString} from '@/common/utils/formatter';
-import type {Document} from '@/../bindings/voidraft/internal/models/ent/models';
+import {Document} from '@/../bindings/voidraft/internal/models/ent/models';
 
 // 类型定义
 interface DocumentItem extends Document {
@@ -18,6 +19,7 @@ interface DocumentItem extends Document {
 const documentStore = useDocumentStore();
 const tabStore = useTabStore();
 const editorStore = useEditorStore();
+const editorStateStore = useEditorStateStore();
 const windowStore = useWindowStore();
 const {t} = useI18n();
 
@@ -29,6 +31,7 @@ const editInputRef = ref<HTMLInputElement>();
 const state = reactive({
   isLoaded: false,
   searchQuery: '',
+  documentList: [] as Document[],  // 缓存文档列表
   editing: {
     id: null as number | null,
     title: ''
@@ -46,7 +49,7 @@ const currentDocName = computed(() => {
 });
 
 const filteredItems = computed<DocumentItem[]>(() => {
-  const docs = documentStore.documentList;
+  const docs = state.documentList;
   const query = state.searchQuery.trim();
 
   if (!query) return docs;
@@ -69,7 +72,7 @@ const filteredItems = computed<DocumentItem[]>(() => {
 
 // 核心操作
 const openMenu = async () => {
-  await documentStore.getDocumentMetaList();
+  state.documentList = await documentStore.getDocumentList();
   documentStore.openDocumentSelector();
   state.isLoaded = true;
   await nextTick();
@@ -90,7 +93,7 @@ const closeMenu = () => {
   resetDeleteConfirm();
 };
 
-const selectDoc = async (doc: Document) => {
+const selectDoc = async (doc: DocumentItem) => {
   if (doc.id === undefined) return;
 
   // 如果选择的就是当前文档，直接关闭菜单
@@ -106,16 +109,32 @@ const selectDoc = async (doc: Document) => {
   }
 
 
+  // 保存旧文档的光标位置
+  const oldDocId = documentStore.currentDocumentId;
+  if (oldDocId) {
+    const cursorPos = editorStore.getCurrentCursorPosition();
+    editorStateStore.saveCursorPosition(oldDocId, cursorPos);
+  }
+
+  // 如果旧文档有未保存修改，保存它
+  if (oldDocId && editorStore.hasUnsavedChanges(oldDocId)) {
+
+    const content = editorStore.getCurrentContent();
+    await documentStore.saveDocument(oldDocId, content);
+    editorStore.syncAfterSave(oldDocId);
+
+  }
+
+  // 打开新文档
   const success = await documentStore.openDocument(doc.id);
   if (!success) return;
 
-  const fullDoc = documentStore.currentDocument;
-  if (fullDoc && editorStore.hasContainer) {
-    await editorStore.loadEditor(fullDoc.id!, fullDoc.content || '');
-  }
+  // 切换到新编辑器
+  await editorStore.switchToEditor(doc.id);
 
-  if (fullDoc && tabStore.isTabsEnabled) {
-    tabStore.addOrActivateTab(fullDoc);
+  // 更新标签页
+  if (documentStore.currentDocument && tabStore.isTabsEnabled) {
+    tabStore.addOrActivateTab(documentStore.currentDocument);
   }
 
   closeMenu();
@@ -128,7 +147,9 @@ const createDoc = async (title: string) => {
 
   try {
     const newDoc = await documentStore.createNewDocument(trimmedTitle);
-    if (newDoc) await selectDoc(newDoc);
+    if (newDoc && newDoc.id) {
+      await selectDoc(newDoc);
+    }
   } catch (error) {
     console.error('Failed to create document:', error);
   }
@@ -151,7 +172,7 @@ const handleSearchEnter = () => {
 };
 
 // 编辑操作
-const renameDoc = (doc: Document, event: Event) => {
+const renameDoc = (doc: DocumentItem, event: Event) => {
   event.stopPropagation();
   state.editing.id = doc.id ?? null;
   state.editing.title = doc.title || '';
@@ -174,8 +195,8 @@ const saveEdit = async () => {
   if (error) return;
 
   try {
-    await documentStore.updateDocumentMetadata(state.editing.id, trimmedTitle);
-    await documentStore.getDocumentMetaList();
+    await documentStore.updateDocumentTitle(state.editing.id, trimmedTitle);
+    state.documentList = await documentStore.getDocumentList();
 
     // 如果tabs功能开启且该文档有标签页，更新标签页标题
     if (tabStore.isTabsEnabled && tabStore.hasTab(state.editing.id)) {
@@ -195,7 +216,7 @@ const cancelEdit = () => {
 };
 
 // 其他操作
-const openInNewWindow = async (doc: Document, event: Event) => {
+const openInNewWindow = async (doc: DocumentItem, event: Event) => {
   event.stopPropagation();
   if (doc.id === undefined) return;
   try {
@@ -209,7 +230,7 @@ const openInNewWindow = async (doc: Document, event: Event) => {
   }
 };
 
-const handleDelete = async (doc: Document, event: Event) => {
+const handleDelete = async (doc: DocumentItem, event: Event) => {
   event.stopPropagation();
   if (doc.id === undefined) return;
 
@@ -224,10 +245,10 @@ const handleDelete = async (doc: Document, event: Event) => {
 
     const deleteSuccess = await documentStore.deleteDocument(doc.id);
     if (deleteSuccess) {
-      await documentStore.getDocumentMetaList();
+      state.documentList = await documentStore.getDocumentList();
       // 如果删除的是当前文档，切换到第一个文档
-      if (documentStore.currentDocument?.id === doc.id && documentStore.documentList.length > 0) {
-        const firstDoc = documentStore.documentList[0];
+      if (documentStore.currentDocument?.id === doc.id && state.documentList.length > 0) {
+        const firstDoc = state.documentList[0];
         if (firstDoc) await selectDoc(firstDoc);
       }
     }
@@ -366,7 +387,7 @@ watch(() => documentStore.showDocumentSelector, (isOpen) => {
                   </svg>
                 </button>
                 <button
-                    v-if="documentStore.documentList.length > 1 && item.id !== 1"
+                    v-if="state.documentList.length > 1 && item.id !== 1"
                     class="action-btn delete-btn"
                     :class="{ 'delete-confirm': isDeleting(item.id!) }"
                     @click="handleDelete(item, $event)"
diff --git a/frontend/src/components/toolbar/Toolbar.vue b/frontend/src/components/toolbar/Toolbar.vue
index 4821b5d..2191455 100644
--- a/frontend/src/components/toolbar/Toolbar.vue
+++ b/frontend/src/components/toolbar/Toolbar.vue
@@ -3,6 +3,7 @@ import {useI18n} from 'vue-i18n';
 import {computed, onMounted, onUnmounted, ref, watch, shallowRef, readonly, toRefs, effectScope, onScopeDispose} from 'vue';
 import {useConfigStore} from '@/stores/configStore';
 import {useEditorStore} from '@/stores/editorStore';
+import {useEditorStateStore} from '@/stores/editorStateStore';
 import {useUpdateStore} from '@/stores/updateStore';
 import {useWindowStore} from '@/stores/windowStore';
 import {useSystemStore} from '@/stores/systemStore';
@@ -15,6 +16,7 @@ import {formatBlockContent} from '@/views/editor/extensions/codeblock/formatCode
 import {createDebounce} from '@/common/utils/debounce';
 
 const editorStore = useEditorStore();
+const editorStateStore = useEditorStateStore();
 const configStore = useConfigStore();
 const updateStore = useUpdateStore();
 const windowStore = useWindowStore();
@@ -25,7 +27,6 @@ const router = useRouter();
 const canFormatCurrentBlock = ref(false);
 const isLoaded = shallowRef(false);
 
-const { documentStats } = toRefs(editorStore);
 const { config } = toRefs(configStore);
 
 // 窗口置顶状态
@@ -57,14 +58,14 @@ const goToSettings = () => {
 
 // 执行格式化
 const formatCurrentBlock = () => {
-  if (!canFormatCurrentBlock.value || !editorStore.editorView) return;
-  formatBlockContent(editorStore.editorView);
+  if (!canFormatCurrentBlock.value || !editorStore.currentEditor) return;
+  formatBlockContent(editorStore.currentEditor);
 };
 
 
 // 统一更新按钮状态
 const updateButtonStates = () => {
-  const view: any = editorStore.editorView;
+  const view: any = editorStore.currentEditor;
   if (!view) {
     canFormatCurrentBlock.value = false;
     return;
@@ -125,7 +126,7 @@ const setupEditorListeners = (view: any) => {
 
 // 监听编辑器视图变化
 watch(
-    () => editorStore.editorView,
+    () => editorStore.currentEditor,
     (newView) => {
       // 在 scope 中管理副作用
       editorScope.run(() => {
@@ -191,11 +192,13 @@ const updateButtonTitle = computed(() => {
 });
 
 // 统计数据的计算属性
-const statsData = computed(() => ({
-  lines: documentStats.value.lines,
-  characters: documentStats.value.characters,
-  selectedCharacters: documentStats.value.selectedCharacters
-}));
+const statsData = computed(() => {
+  const docId = editorStore.currentEditorId;
+  if (!docId) {
+    return { lines: 0, characters: 0, selectedCharacters: 0 };
+  }
+  return editorStateStore.getDocumentStats(docId);
+});
 </script>
 
 <template>
diff --git a/frontend/src/stores/documentStore.ts b/frontend/src/stores/documentStore.ts
index dd584aa..d715321 100644
--- a/frontend/src/stores/documentStore.ts
+++ b/frontend/src/stores/documentStore.ts
@@ -1,43 +1,24 @@
 import {defineStore} from 'pinia';
-import {computed, ref} from 'vue';
+import {ref} from 'vue';
 import {DocumentService} from '@/../bindings/voidraft/internal/services';
 import {OpenDocumentWindow} from '@/../bindings/voidraft/internal/services/windowservice';
 import {Document} from '@/../bindings/voidraft/internal/models/ent/models';
-import type {EditorViewState} from '@/stores/editorStore';
+import type {TimerManager} from '@/common/utils/timerUtils';
+import {createTimerManager} from '@/common/utils/timerUtils';
 
 export const useDocumentStore = defineStore('document', () => {
 
-    // === 核心状态 ===
-    const documents = ref<Record<number, Document>>({});
     const currentDocumentId = ref<number | null>(null);
     const currentDocument = ref<Document | null>(null);
-
-    // === 编辑器状态持久化 ===
-    const documentStates = ref<Record<number, EditorViewState>>({});
+    
+    // 自动保存定时器
+    const autoSaveTimers = ref<Map<number, TimerManager>>(new Map());
 
     // === UI状态 ===
     const showDocumentSelector = ref(false);
     const selectorError = ref<{ docId: number; message: string } | null>(null);
     const isLoading = ref(false);
 
-    // === 计算属性 ===
-    const documentList = computed(() =>
-        Object.values(documents.value).sort((a, b) => {
-            const timeA = a.updated_at ? new Date(a.updated_at).getTime() : 0;
-            const timeB = b.updated_at ? new Date(b.updated_at).getTime() : 0;
-            return timeB - timeA;
-        })
-    );
-
-    const setDocuments = (docs: Document[]) => {
-        documents.value = {};
-        docs.forEach(doc => {
-            if (doc.id !== undefined) {
-                documents.value[doc.id] = doc;
-            }
-        });
-    };
-
     // === 错误处理 ===
     const setError = (docId: number, message: string) => {
         selectorError.value = {docId, message};
@@ -65,6 +46,39 @@ export const useDocumentStore = defineStore('document', () => {
     };
 
 
+    // 获取文档列表
+    const getDocumentList = async (): Promise<Document[]> => {
+        try {
+            isLoading.value = true;
+            const docs = await DocumentService.ListAllDocumentsMeta();
+            return docs?.filter((doc): doc is Document => doc !== null) || [];
+        } catch (_error) {
+            return [];
+        } finally {
+            isLoading.value = false;
+        }
+    };
+    
+    // 获取单个文档
+    const getDocument = async (docId: number): Promise<Document | null> => {
+        try {
+            return await DocumentService.GetDocumentByID(docId);
+        } catch (error) {
+            console.error('Failed to get document:', error);
+            return null;
+        }
+    };
+    
+    // 保存文档内容
+    const saveDocument = async (docId: number, content: string): Promise<Document | null> => {
+        try {
+            await DocumentService.UpdateDocumentContent(docId, content);
+            return await DocumentService.GetDocumentByID(docId);
+        } catch (error) {
+            console.error('Failed to save document:', error);
+            throw error;
+        }
+    };
 
     // 在新窗口中打开文档
     const openDocumentInNewWindow = async (docId: number): Promise<boolean> => {
@@ -81,36 +95,16 @@ export const useDocumentStore = defineStore('document', () => {
     const createNewDocument = async (title: string): Promise<Document | null> => {
         try {
             const doc = await DocumentService.CreateDocument(title);
-            if (doc && doc.id !== undefined) {
-                documents.value[doc.id] = doc;
-                return doc;
-            }
-            return null;
+            return doc || null;
         } catch (error) {
             console.error('Failed to create document:', error);
             return null;
         }
     };
 
-    // 获取文档列表
-    const getDocumentMetaList = async () => {
-        try {
-            isLoading.value = true;
-            const docs = await DocumentService.ListAllDocumentsMeta();
-            if (docs) {
-                setDocuments(docs.filter((doc): doc is Document => doc !== null));
-            }
-        } catch (error) {
-            console.error('Failed to update documents:', error);
-        } finally {
-            isLoading.value = false;
-        }
-    };
-
-    // 打开文档 - 只负责文档数据管理
+    // 打开文档
     const openDocument = async (docId: number): Promise<boolean> => {
         try {
-            // 获取完整文档数据
             const doc = await DocumentService.GetDocumentByID(docId);
             if (!doc) {
                 throw new Error(`Document ${docId} not found`);
@@ -118,7 +112,6 @@ export const useDocumentStore = defineStore('document', () => {
 
             currentDocumentId.value = docId;
             currentDocument.value = doc;
-
             return true;
         } catch (error) {
             console.error('Failed to open document:', error);
@@ -126,18 +119,12 @@ export const useDocumentStore = defineStore('document', () => {
         }
     };
 
-    // 更新文档元数据 - 只负责文档数据管理
-    const updateDocumentMetadata = async (docId: number, title: string): Promise<boolean> => {
+    // 更新文档标题
+    const updateDocumentTitle = async (docId: number, title: string): Promise<boolean> => {
         try {
             await DocumentService.UpdateDocumentTitle(docId, title);
 
-            // 更新本地状态
-            const doc = documents.value[docId];
-            if (doc) {
-                doc.title = title;
-                doc.updated_at = new Date().toISOString();
-            }
-
+            // 更新当前文档状态
             if (currentDocument.value?.id === docId) {
                 currentDocument.value.title = title;
                 currentDocument.value.updated_at = new Date().toISOString();
@@ -145,24 +132,28 @@ export const useDocumentStore = defineStore('document', () => {
 
             return true;
         } catch (error) {
-            console.error('Failed to update document metadata:', error);
+            console.error('Failed to update document title:', error);
             return false;
         }
     };
 
-    // 删除文档 - 只负责文档数据管理
+    // 删除文档
     const deleteDocument = async (docId: number): Promise<boolean> => {
         try {
             await DocumentService.DeleteDocument(docId);
 
-            // 更新本地状态
-            delete documents.value[docId];
+            // 清理定时器
+            const timer = autoSaveTimers.value.get(docId);
+            if (timer) {
+                timer.clear();
+                autoSaveTimers.value.delete(docId);
+            }
 
             // 如果删除的是当前文档，切换到第一个可用文档
             if (currentDocumentId.value === docId) {
-                const availableDocs = Object.values(documents.value);
-                if (availableDocs.length > 0 && availableDocs[0].id !== undefined) {
-                    await openDocument(availableDocs[0].id);
+                const docs = await getDocumentList();
+                if (docs.length > 0 && docs[0].id !== undefined) {
+                    await openDocument(docs[0].id);
                 } else {
                     currentDocumentId.value = null;
                     currentDocument.value = null;
@@ -175,23 +166,46 @@ export const useDocumentStore = defineStore('document', () => {
             return false;
         }
     };
+    
+    // 调度自动保存
+    const scheduleAutoSave = (docId: number, saveCallback: () => Promise<void>, delay: number = 2000) => {
+        let timer = autoSaveTimers.value.get(docId);
+        if (!timer) {
+            timer = createTimerManager();
+            autoSaveTimers.value.set(docId, timer);
+        }
+        
+        timer.set(async () => {
+            try {
+                await saveCallback();
+            } catch (error) {
+                console.error(`auto save for document ${docId} failed:`, error);
+            }
+        }, delay);
+    };
+    
+    // 取消自动保存
+    const cancelAutoSave = (docId: number) => {
+        const timer = autoSaveTimers.value.get(docId);
+        if (timer) {
+            timer.clear();
+        }
+    };
 
-    // === 初始化 ===
+    // 初始化文档
     const initDocument = async (urlDocumentId?: number): Promise<void> => {
         try {
-            await getDocumentMetaList();
+            const docs = await getDocumentList();
 
             // 优先使用URL参数中的文档ID
-            if (urlDocumentId && documents.value[urlDocumentId]) {
+            if (urlDocumentId) {
                 await openDocument(urlDocumentId);
-            } else if (currentDocumentId.value && documents.value[currentDocumentId.value]) {
-                // 如果URL中没有指定文档ID，则使用持久化的文档ID
+            } else if (currentDocumentId.value) {
+                // 使用持久化的文档ID
                 await openDocument(currentDocumentId.value);
-            } else {
-                // 否则打开第一个文档
-                if (documentList.value[0].id) {
-                    await openDocument(documentList.value[0].id);
-                }
+            } else if (docs.length > 0 && docs[0].id !== undefined) {
+                // 打开第一个文档
+                await openDocument(docs[0].id);
             }
         } catch (error) {
             console.error('Failed to initialize document store:', error);
@@ -200,32 +214,38 @@ export const useDocumentStore = defineStore('document', () => {
 
     return {
         // 状态
-        documents,
-        documentList,
         currentDocumentId,
         currentDocument,
-        documentStates,
         showDocumentSelector,
         selectorError,
         isLoading,
 
-        // 方法
-        getDocumentMetaList,
+        getDocumentList,
+        getDocument,
+        saveDocument,
+        createNewDocument,
+        updateDocumentTitle,
+        deleteDocument,
         openDocument,
         openDocumentInNewWindow,
-        createNewDocument,
-        updateDocumentMetadata,
-        deleteDocument,
+        
+        // 自动保存
+        scheduleAutoSave,
+        cancelAutoSave,
+        
+        // UI 控制
         openDocumentSelector,
         closeDocumentSelector,
         setError,
         clearError,
+        
+        // 初始化
         initDocument,
     };
 }, {
     persist: {
         key: 'voidraft-document',
         storage: localStorage,
-        pick: ['currentDocumentId', 'documents', 'documentStates']
+        pick: ['currentDocumentId']
     }
 });
\ No newline at end of file
diff --git a/frontend/src/stores/editorStateStore.ts b/frontend/src/stores/editorStateStore.ts
new file mode 100644
index 0000000..aae440a
--- /dev/null
+++ b/frontend/src/stores/editorStateStore.ts
@@ -0,0 +1,70 @@
+import {defineStore} from 'pinia';
+import {ref} from 'vue';
+
+export interface DocumentStats {
+    lines: number;
+    characters: number;
+    selectedCharacters: number;
+}
+
+export const useEditorStateStore = defineStore('editorState', () => {
+    // 光标位置存储 Record<docId, cursorPosition>
+    const cursorPositions = ref<Record<number, number>>({});
+
+    // 文档统计数据存储 Record<docId, DocumentStats>
+    const documentStats = ref<Record<number, DocumentStats>>({});
+
+    // 保存光标位置
+    const saveCursorPosition = (docId: number, position: number) => {
+        cursorPositions.value[docId] = position;
+    };
+
+    // 获取光标位置
+    const getCursorPosition = (docId: number): number | undefined => {
+        return cursorPositions.value[docId];
+    };
+
+    // 保存文档统计数据
+    const saveDocumentStats = (docId: number, stats: DocumentStats) => {
+        documentStats.value[docId] = stats;
+    };
+
+    // 获取文档统计数据
+    const getDocumentStats = (docId: number): DocumentStats => {
+        return documentStats.value[docId] || {
+            lines: 0,
+            characters: 0,
+            selectedCharacters: 0
+        };
+    };
+
+    // 清除文档状态
+    const clearDocumentState = (docId: number) => {
+        delete cursorPositions.value[docId];
+        delete documentStats.value[docId];
+    };
+
+    // 清除所有状态
+    const clearAllStates = () => {
+        cursorPositions.value = {};
+        documentStats.value = {};
+    };
+
+    return {
+        cursorPositions,
+        documentStats,
+        saveCursorPosition,
+        getCursorPosition,
+        saveDocumentStats,
+        getDocumentStats,
+        clearDocumentState,
+        clearAllStates
+    };
+}, {
+    persist: {
+        key: 'voidraft-editor-state',
+        storage: localStorage,
+        pick: ['cursorPositions']
+    }
+});
+
diff --git a/frontend/src/stores/editorStore.ts b/frontend/src/stores/editorStore.ts
index a5b504f..0538d35 100644
--- a/frontend/src/stores/editorStore.ts
+++ b/frontend/src/stores/editorStore.ts
@@ -1,11 +1,10 @@
 import {defineStore} from 'pinia';
-import {computed, nextTick, ref} from 'vue';
+import {computed, readonly, ref} from 'vue';
 import {EditorView} from '@codemirror/view';
 import {EditorState, Extension} from '@codemirror/state';
+import {Document} from '@/../bindings/voidraft/internal/models/ent/models';
 import {useConfigStore} from './configStore';
 import {useDocumentStore} from './documentStore';
-import {DocumentService, ExtensionService} from '@/../bindings/voidraft/internal/services';
-import {ensureSyntaxTree} from "@codemirror/language";
 import {createBasicSetup} from '@/views/editor/basic/basicSetup';
 import {createThemeExtension, updateEditorTheme} from '@/views/editor/basic/themeExtension';
 import {getTabExtensions, updateTabConfig} from '@/views/editor/basic/tabExtension';
@@ -17,121 +16,65 @@ import {createCursorPositionExtension, scrollToCursor} from '@/views/editor/basi
 import {createDynamicKeymapExtension, updateKeymapExtension} from '@/views/editor/keymap';
 import {
     createDynamicExtensions,
-    getExtensionManager,
     removeExtensionManagerView,
     setExtensionManagerView
 } from '@/views/editor/manager';
-import {useExtensionStore} from './extensionStore';
 import createCodeBlockExtension from "@/views/editor/extensions/codeblock";
 import {LruCache} from '@/common/utils/lruCache';
-import {generateContentHash} from "@/common/utils/hashUtils";
-import {createTimerManager, type TimerManager} from '@/common/utils/timerUtils';
 import {EDITOR_CONFIG} from '@/common/constant/editor';
-import {createDebounce} from '@/common/utils/debounce';
-import {useKeybindingStore} from "@/stores/keybindingStore";
-
-export interface DocumentStats {
-    lines: number;
-    characters: number;
-    selectedCharacters: number;
-}
-
-export interface EditorViewState {
-    cursorPos: number;
-}
+import {useEditorStateStore, type DocumentStats} from './editorStateStore';
 
+// 编辑器实例
 interface EditorInstance {
     view: EditorView;
     documentId: number;
-    content: string;
+    contentTimestamp: string;  // 文档时间戳
+    contentLength: number;     // 内容长度
     isDirty: boolean;
-    lastModified: Date;
-    autoSaveTimer: TimerManager;
-    syntaxTreeCache: {
-        lastDocLength: number;
-        lastContentHash: string;
-        lastParsed: Date;
-    } | null;
-    editorState?: EditorViewState;
+    lastModified: number;
 }
 
 export const useEditorStore = defineStore('editor', () => {
-    // === 依赖store ===
     const configStore = useConfigStore();
     const documentStore = useDocumentStore();
-    const extensionStore = useExtensionStore();
+    const editorStateStore = useEditorStateStore();
 
-    // === 核心状态 ===
     const editorCache = new LruCache<number, EditorInstance>(EDITOR_CONFIG.MAX_INSTANCES);
     const containerElement = ref<HTMLElement | null>(null);
-
-    const currentEditor = ref<EditorView | null>(null);
-    const documentStats = ref<DocumentStats>({
-        lines: 0,
-        characters: 0,
-        selectedCharacters: 0
-    });
-
-    // 编辑器加载状态
+    const currentEditorId = ref<number | null>(null);
     const isLoading = ref(false);
 
-    // 自动保存设置 - 从配置动态获取
-    const getAutoSaveDelay = () => configStore.config.editing.autoSaveDelay;
 
-    // 创建防抖的语法树缓存清理函数
-    const debouncedClearSyntaxCache = createDebounce((instance) => {
-        if (instance) {
-            instance.syntaxTreeCache = null;
-        }
-    }, {delay: 500}); // 500ms 内的多次输入只清理一次
+    // 验证缓存是否有效
+    const isCacheValid = (cached: EditorInstance, doc: Document): boolean => {
+        return cached.contentTimestamp === doc.updated_at 
+            && cached.contentLength === (doc.content || '').length;
+    };
 
-
-    // 缓存化的语法树确保方法
-    const ensureSyntaxTreeCached = (view: EditorView, documentId: number): void => {
-        const instance = editorCache.get(documentId);
-        if (!instance) return;
-
-        const docLength = view.state.doc.length;
-        const content = view.state.doc.toString();
-        const contentHash = generateContentHash(content);
-        const now = new Date();
-
-        // 检查是否需要重新构建语法树
-        const cache = instance.syntaxTreeCache;
-        const shouldRebuild = !cache ||
-            cache.lastDocLength !== docLength ||
-            cache.lastContentHash !== contentHash ||
-            (now.getTime() - cache.lastParsed.getTime()) > EDITOR_CONFIG.SYNTAX_TREE_CACHE_TIMEOUT;
-
-        if (shouldRebuild) {
-            ensureSyntaxTree(view.state, docLength, 5000);
-
-            // 更新缓存
-            instance.syntaxTreeCache = {
-                lastDocLength: docLength,
-                lastContentHash: contentHash,
-                lastParsed: now
-            };
-
-        }
+    // 检查内容是否真的不同
+    const hasContentChanged = (cached: EditorInstance, doc: Document): boolean => {
+        const currentContent = cached.view.state.doc.toString();
+        return currentContent !== (doc.content || '');
     };
 
     // 创建编辑器实例
     const createEditorInstance = async (
-        content: string,
-        documentId: number
-    ): Promise<EditorView> => {
+        docId: number,
+        doc: Document
+    ): Promise<EditorInstance> => {
         if (!containerElement.value) {
             throw new Error('Editor container not set');
         }
 
-        // 获取基本扩展
+        const content = doc.content || '';
+
+        // 基本扩展
         const basicExtensions = createBasicSetup();
 
-        // 获取主题扩展
+        // 主题扩展
         const themeExtension = createThemeExtension();
 
-        // Tab相关扩展
+        // Tab 扩展
         const tabExtensions = getTabExtensions(
             configStore.config.editing.tabSize,
             configStore.config.editing.enableTabIndent,
@@ -146,6 +89,7 @@ export const useEditorStore = defineStore('editor', () => {
             fontWeight: configStore.config.editing.fontWeight
         });
 
+        // 滚轮缩放扩展
         const wheelZoomExtension = createWheelZoomExtension({
             increaseFontSize: () => configStore.increaseFontSizeLocal(),
             decreaseFontSize: () => configStore.decreaseFontSizeLocal(),
@@ -154,10 +98,16 @@ export const useEditorStore = defineStore('editor', () => {
         });
 
         // 统计扩展
-        const statsExtension = createStatsUpdateExtension(updateDocumentStats);
+        const statsExtension = createStatsUpdateExtension((stats: DocumentStats) => {
+            if (currentEditorId.value) {
+                editorStateStore.saveDocumentStats(currentEditorId.value, stats);
+            }
+        });
 
         // 内容变化扩展
-        const contentChangeExtension = createContentChangePlugin();
+        const contentChangeExtension = createContentChangePlugin(() => {
+            handleContentChange(docId);
+        });
 
         // 代码块扩展
         const codeBlockExtension = createCodeBlockExtension({
@@ -166,12 +116,12 @@ export const useEditorStore = defineStore('editor', () => {
         });
 
         // 光标位置持久化扩展
-        const cursorPositionExtension = createCursorPositionExtension(documentId);
+        const cursorPositionExtension = createCursorPositionExtension(docId);
 
         // 快捷键扩展
         const keymapExtension = await createDynamicKeymapExtension();
 
-        // 动态扩展，传递文档ID以便扩展管理器可以预初始化
+        // 动态扩展
         const dynamicExtensions = await createDynamicExtensions();
 
         // 组合所有扩展
@@ -190,213 +140,191 @@ export const useEditorStore = defineStore('editor', () => {
         ];
 
         // 获取保存的光标位置
-        const savedState = documentStore.documentStates[documentId];
+        const savedCursorPos = editorStateStore.getCursorPosition(docId);
         const docLength = content.length;
-        const initialCursorPos = savedState?.cursorPos !== undefined
-            ? Math.min(savedState.cursorPos, docLength)
+        const initialCursorPos = savedCursorPos !== undefined
+            ? Math.min(savedCursorPos, docLength)
             : docLength;
 
-
-        // 创建编辑器状态，设置初始光标位置
+        // 创建编辑器状态
         const state = EditorState.create({
             doc: content,
             extensions,
             selection: {anchor: initialCursorPos, head: initialCursorPos}
         });
 
-        return new EditorView({
-            state
-        });
-    };
+        const view = new EditorView({state});
 
-    // 添加编辑器到缓存
-    const addEditorToCache = (documentId: number, view: EditorView, content: string) => {
-        const instance: EditorInstance = {
+        return {
             view,
-            documentId,
-            content,
+            documentId: docId,
+            contentTimestamp: doc.updated_at || '',
+            contentLength: content.length,
             isDirty: false,
-            lastModified: new Date(),
-            autoSaveTimer: createTimerManager(),
-            syntaxTreeCache: null,
-            editorState: documentStore.documentStates[documentId]
+            lastModified: Date.now()
         };
-
-        // 使用LRU缓存的onEvict回调处理被驱逐的实例
-        editorCache.set(documentId, instance, (_evictedKey, evictedInstance) => {
-            // 清除自动保存定时器
-            evictedInstance.autoSaveTimer.clear();
-            // 移除DOM元素
-            if (evictedInstance.view.dom.parentElement) {
-                evictedInstance.view.dom.remove();
-            }
-            evictedInstance.view.destroy();
-        });
-
-        // 初始化语法树缓存
-        ensureSyntaxTreeCached(view, documentId);
     };
 
-    // 获取或创建编辑器
-    const getOrCreateEditor = async (
-        documentId: number,
-        content: string
-    ): Promise<EditorView> => {
-        // 检查缓存
-        const cached = editorCache.get(documentId);
-        if (cached) {
-            return cached.view;
+    // 更新编辑器内容
+    const updateEditorContent = (instance: EditorInstance, doc: Document) => {
+        const currentContent = instance.view.state.doc.toString();
+        const newContent = doc.content || '';
+
+        // 如果内容相同，只更新元数据
+        if (currentContent === newContent) {
+            instance.contentTimestamp = doc.updated_at || '';
+            instance.contentLength = newContent.length;
+            return;
         }
 
-        // 创建新的编辑器实例
-        const view = await createEditorInstance(content, documentId);
+        // 保存当前光标位置
+        const currentCursorPos = instance.view.state.selection.main.head;
 
-        addEditorToCache(documentId, view, content);
+        // 更新内容
+        instance.view.dispatch({
+            changes: {
+                from: 0,
+                to: instance.view.state.doc.length,
+                insert: newContent
+            }
+        });
 
-        return view;
+        // 智能恢复光标位置
+        const newContentLength = newContent.length;
+        const safeCursorPos = Math.min(currentCursorPos, newContentLength);
+
+        if (safeCursorPos > 0 && safeCursorPos < newContentLength) {
+            instance.view.dispatch({
+                selection: {anchor: safeCursorPos, head: safeCursorPos}
+            });
+        }
+
+        // 同步元数据
+        instance.contentTimestamp = doc.updated_at || '';
+        instance.contentLength = newContent.length;
+        instance.isDirty = false;
     };
 
     // 显示编辑器
-    const showEditor = (documentId: number) => {
-        const instance = editorCache.get(documentId);
-        if (!instance || !containerElement.value) return;
+    const showEditor = (instance: EditorInstance) => {
+        if (!containerElement.value) return;
 
         try {
-            // 移除当前编辑器DOM
-            if (currentEditor.value && currentEditor.value.dom && currentEditor.value.dom.parentElement) {
-                currentEditor.value.dom.remove();
+            // 移除当前编辑器 DOM
+            const currentEditor = editorCache.get(currentEditorId.value || 0);
+            if (currentEditor && currentEditor.view.dom && currentEditor.view.dom.parentElement) {
+                currentEditor.view.dom.remove();
             }
 
-            // 将目标编辑器DOM添加到容器
+            // 添加目标编辑器 DOM
             containerElement.value.appendChild(instance.view.dom);
-            currentEditor.value = instance.view;
+            currentEditorId.value = instance.documentId;
 
             // 设置扩展管理器视图
-            setExtensionManagerView(instance.view, documentId);
+            setExtensionManagerView(instance.view, instance.documentId);
 
-            //使用 nextTick + requestAnimationFrame 确保 DOM 完全渲染
-            nextTick(() => {
-                requestAnimationFrame(() => {
-                    // 滚动到当前光标位置
-                    scrollToCursor(instance.view);
-
-                    // 聚焦编辑器
-                    instance.view.focus();
-
-                    // 使用缓存的语法树确保方法
-                    ensureSyntaxTreeCached(instance.view, documentId);
-                });
+            // 使用 requestAnimationFrame 确保 DOM 渲染
+            requestAnimationFrame(() => {
+                scrollToCursor(instance.view);
+                instance.view.focus();
             });
         } catch (error) {
             console.error('Error showing editor:', error);
         }
     };
 
-    // 保存编辑器内容
-    const saveEditorContent = async (documentId: number): Promise<boolean> => {
-        const instance = editorCache.get(documentId);
-        if (!instance || !instance.isDirty) return true;
-
-        try {
-            const content = instance.view.state.doc.toString();
-            const lastModified = instance.lastModified;
-
-            await DocumentService.UpdateDocumentContent(documentId, content);
-
-            // 检查在保存期间内容是否又被修改了
-            if (instance.lastModified === lastModified) {
-                instance.content = content;
-                instance.isDirty = false;
-                instance.lastModified = new Date();
-            }
-
-            return true;
-        } catch (error) {
-            console.error('Failed to save editor content:', error);
-            return false;
-        }
-    };
-
     // 内容变化处理
-    const onContentChange = () => {
-        const documentId = documentStore.currentDocumentId;
-        if (!documentId) return;
-        const instance = editorCache.get(documentId);
+    const handleContentChange = (docId: number) => {
+        const instance = editorCache.get(docId);
         if (!instance) return;
 
-        // 立即设置脏标记和修改时间（切换文档时需要判断）
+        // 标记为脏数据
         instance.isDirty = true;
-        instance.lastModified = new Date();
+        instance.lastModified = Date.now();
 
-        // 优使用防抖清理语法树缓存
-        debouncedClearSyntaxCache.debouncedFn(instance);
-
-        // 设置自动保存定时器（已经是防抖效果：每次重置定时器）
-        instance.autoSaveTimer.set(() => {
-            saveEditorContent(documentId);
-        }, getAutoSaveDelay());
+        // 调度自动保存
+        const autoSaveDelay = configStore.config.editing.autoSaveDelay;
+        documentStore.scheduleAutoSave(
+            docId,
+            async () => {
+                const content = instance.view.state.doc.toString();
+                const savedDoc = await documentStore.saveDocument(docId, content);
+                
+                // 同步版本信息
+                if (savedDoc) {
+                    instance.contentTimestamp = savedDoc.updated_at || '';
+                    instance.contentLength = (savedDoc.content || '').length;
+                    instance.isDirty = false;
+                }
+            },
+            autoSaveDelay
+        );
     };
 
 
-    // 检查容器是否已设置
-    const hasContainer = computed(() => containerElement.value !== null);
-
-    // 设置编辑器容器
-    const setEditorContainer = (container: HTMLElement | null) => {
-        containerElement.value = container;
-        // watch 会自动监听并加载编辑器，无需手动调用
-    };
-
-    // 加载编辑器
-    const loadEditor = async (documentId: number, content: string) => {
+    // 切换到指定编辑器
+    const switchToEditor = async (docId: number) => {
         isLoading.value = true;
 
         try {
-            // 验证参数
-            if (!documentId) {
-                throw new Error('Invalid parameters for loadEditor');
+            // 直接从后端获取文档
+            const doc = await documentStore.getDocument(docId);
+            if (!doc) {
+                throw new Error(`Failed to load document ${docId}`);
             }
 
-            // 保存当前编辑器内容
-            if (currentEditor.value) {
-                const currentDocId = documentStore.currentDocumentId;
-                if (currentDocId && currentDocId !== documentId) {
-                    await saveEditorContent(currentDocId);
+            const cached = editorCache.get(docId);
+
+            if (cached) {
+                // 场景1：缓存有效
+                if (isCacheValid(cached, doc)) {
+                    showEditor(cached);
+                    return;
                 }
-            }
 
-            // 获取或创建编辑器
-            const view = await getOrCreateEditor(documentId, content);
-
-            // 更新内容
-            const instance = editorCache.get(documentId);
-            if (instance && instance.content !== content) {
-                // 确保编辑器视图有效
-                if (view && view.state && view.dispatch) {
-                    const contentLength = content.length;
-                    view.dispatch({
-                        changes: {
-                            from: 0,
-                            to: view.state.doc.length,
-                            insert: content
-                        },
-                        selection: {anchor: contentLength, head: contentLength}
-                    });
-                    instance.content = content;
-                    instance.isDirty = false;
-                    // 清理语法树缓存，因为内容已更新
-                    instance.syntaxTreeCache = null;
-                    // 修复：内容变了，清空光标位置，避免越界
-                    instance.editorState = undefined;
-                    delete documentStore.documentStates[documentId];
+                // 场景2：有未保存修改
+                if (cached.isDirty) {
+                    // 检查内容是否真的不同
+                    if (!hasContentChanged(cached, doc)) {
+                        // 内容实际相同，只是元数据变了，同步元数据
+                        cached.contentTimestamp = doc.updated_at || '';
+                        cached.contentLength = (doc.content || '').length;
+                        cached.isDirty = false;
+                    }
+                    // 内容不同，保留用户编辑
+                    showEditor(cached);
+                    return;
                 }
+
+                // 场景3：缓存失效且无脏数据，更新内容
+                updateEditorContent(cached, doc);
+                showEditor(cached);
+            } else {
+                // 场景4：创建新编辑器
+                const editor = await createEditorInstance(docId, doc);
+                
+                // 添加到缓存
+                editorCache.set(docId, editor, (_evictedKey, evictedInstance) => {
+                    // 保存光标位置
+                    const cursorPos = evictedInstance.view.state.selection.main.head;
+                    editorStateStore.saveCursorPosition(evictedInstance.documentId, cursorPos);
+                    
+                    // 从扩展管理器移除
+                    removeExtensionManagerView(evictedInstance.documentId);
+                    
+                    // 移除 DOM
+                    if (evictedInstance.view.dom.parentElement) {
+                        evictedInstance.view.dom.remove();
+                    }
+                    
+                    // 销毁编辑器
+                    evictedInstance.view.destroy();
+                });
+
+                showEditor(editor);
             }
-
-            // 显示编辑器
-            showEditor(documentId);
-
         } catch (error) {
-            console.error('Failed to load editor:', error);
+            console.error('Failed to switch editor:', error);
         } finally {
             setTimeout(() => {
                 isLoading.value = false;
@@ -404,49 +332,100 @@ export const useEditorStore = defineStore('editor', () => {
         }
     };
 
-    // 移除编辑器
-    const removeEditor = async (documentId: number) => {
-        const instance = editorCache.get(documentId);
-        if (instance) {
-            try {
-                if (instance.isDirty) {
-                    await saveEditorContent(documentId);
-                }
+    // 获取当前内容
+    const getCurrentContent = (): string => {
+        if (!currentEditorId.value) return '';
+        const instance = editorCache.get(currentEditorId.value);
+        return instance ? instance.view.state.doc.toString() : '';
+    };
 
-                // 清除自动保存定时器
-                instance.autoSaveTimer.clear();
+    // 获取当前光标位置
+    const getCurrentCursorPosition = (): number => {
+        if (!currentEditorId.value) return 0;
+        const instance = editorCache.get(currentEditorId.value);
+        return instance ? instance.view.state.selection.main.head : 0;
+    };
 
-                // 从扩展管理器中移除视图
-                removeExtensionManagerView(documentId);
+    // 检查是否有未保存修改
+    const hasUnsavedChanges = (docId: number): boolean => {
+        const instance = editorCache.get(docId);
+        return instance?.isDirty || false;
+    };
 
-                // 移除DOM元素
-                if (instance.view && instance.view.dom && instance.view.dom.parentElement) {
-                    instance.view.dom.remove();
-                }
+    // 同步保存后的版本信息
+    const syncAfterSave = async (docId: number) => {
+        const instance = editorCache.get(docId);
+        if (!instance) return;
 
-                // 销毁编辑器
-                if (instance.view && instance.view.destroy) {
-                    instance.view.destroy();
-                }
-
-                // 清理引用
-                if (currentEditor.value === instance.view) {
-                    currentEditor.value = null;
-                }
-
-                // 从缓存中删除
-                editorCache.delete(documentId);
-            } catch (error) {
-                console.error('Error removing editor:', error);
-            }
+        const doc = await documentStore.getDocument(docId);
+        if (doc) {
+            instance.contentTimestamp = doc.updated_at || '';
+            instance.contentLength = (doc.content || '').length;
+            instance.isDirty = false;
         }
     };
 
-    // 更新文档统计
-    const updateDocumentStats = (stats: DocumentStats) => {
-        documentStats.value = stats;
+    // 销毁编辑器
+    const destroyEditor = async (docId: number) => {
+        const instance = editorCache.get(docId);
+        if (!instance) return;
+
+        try {
+            // 保存光标位置
+            const cursorPos = instance.view.state.selection.main.head;
+            editorStateStore.saveCursorPosition(docId, cursorPos);
+
+            // 从扩展管理器移除
+            removeExtensionManagerView(docId);
+
+            // 移除 DOM
+            if (instance.view.dom && instance.view.dom.parentElement) {
+                instance.view.dom.remove();
+            }
+
+            // 销毁编辑器
+            instance.view.destroy();
+
+            // 从缓存删除
+            editorCache.delete(docId);
+
+            // 清空当前编辑器引用
+            if (currentEditorId.value === docId) {
+                currentEditorId.value = null;
+            }
+        } catch (error) {
+            console.error('Error destroying editor:', error);
+        }
     };
 
+    // 清空所有编辑器
+    const destroyAllEditors = () => {
+        editorCache.clear((_documentId, instance) => {
+            // 保存光标位置
+            const cursorPos = instance.view.state.selection.main.head;
+            editorStateStore.saveCursorPosition(instance.documentId, cursorPos);
+            
+            // 从扩展管理器移除
+            removeExtensionManagerView(instance.documentId);
+            
+            // 移除 DOM
+            if (instance.view.dom.parentElement) {
+                instance.view.dom.remove();
+            }
+            
+            // 销毁编辑器
+            instance.view.destroy();
+        });
+
+        currentEditorId.value = null;
+    };
+
+    // 设置编辑器容器
+    const setEditorContainer = (container: HTMLElement | null) => {
+        containerElement.value = container;
+    };
+
+
     // 应用字体设置
     const applyFontSettings = () => {
         editorCache.values().forEach(instance => {
@@ -466,8 +445,7 @@ export const useEditorStore = defineStore('editor', () => {
         });
     };
 
-
-    // 应用Tab设置
+    // 应用 Tab 设置
     const applyTabSettings = () => {
         editorCache.values().forEach(instance => {
             updateTabConfig(
@@ -481,7 +459,6 @@ export const useEditorStore = defineStore('editor', () => {
 
     // 应用快捷键设置
     const applyKeymapSettings = async () => {
-        // 确保所有编辑器实例的快捷键都更新
         await Promise.all(
             editorCache.values().map(instance =>
                 updateKeymapExtension(instance.view)
@@ -489,74 +466,36 @@ export const useEditorStore = defineStore('editor', () => {
         );
     };
 
-    // 清空所有编辑器
-    const clearAllEditors = () => {
-        editorCache.clear((_documentId, instance) => {
-            // 清除自动保存定时器
-            instance.autoSaveTimer.clear();
-            // 从扩展管理器移除
-            removeExtensionManagerView(instance.documentId);
-            // 移除DOM元素
-            if (instance.view.dom.parentElement) {
-                instance.view.dom.remove();
-            }
-            // 销毁编辑器
-            instance.view.destroy();
-        });
-
-        currentEditor.value = null;
-    };
-
-    // 更新扩展
-    const updateExtension = async (id: number, enabled: boolean, config?: any) => {
-        // 更新启用状态
-        await ExtensionService.UpdateExtensionEnabled(id, enabled);
-
-        // 如果需要更新配置
-        if (config !== undefined) {
-            await ExtensionService.UpdateExtensionConfig(id, config);
-        }
-
-        // 重新加载扩展配置
-        await extensionStore.loadExtensions();
-
-        // 获取更新后的扩展名称
-        const extension = extensionStore.extensions.find(ext => ext.id === id);
-        if (!extension) return;
-
-        // 更新前端编辑器扩展 - 应用于所有实例
-        const manager = getExtensionManager();
-        if (manager) {
-            // 直接更新前端扩展至所有视图
-            manager.updateExtension(extension.name, enabled, config);
-        }
-
-        await useKeybindingStore().loadKeyBindings();
-        await applyKeymapSettings();
-    };
+    const hasContainer = computed(() => containerElement.value !== null);
+    const currentEditor = computed(() => {
+        if (!currentEditorId.value) return null;
+        const instance = editorCache.get(currentEditorId.value);
+        return instance ? instance.view : null;
+    });
 
     return {
         // 状态
+        currentEditorId: readonly(currentEditorId),
         currentEditor,
-        documentStats,
-        isLoading,
+        isLoading: readonly(isLoading),
         hasContainer,
 
-        // 方法
+        // 编辑器管理
         setEditorContainer,
-        loadEditor,
-        removeEditor,
-        clearAllEditors,
-        onContentChange,
+        switchToEditor,
+        destroyEditor,
+        destroyAllEditors,
 
+        // 查询方法
+        getCurrentContent,
+        getCurrentCursorPosition,
+        hasUnsavedChanges,
+        syncAfterSave,
+
+        // 配置应用
         applyFontSettings,
         applyThemeSettings,
         applyTabSettings,
         applyKeymapSettings,
-
-        // 扩展管理方法
-        updateExtension,
-
-        editorView: currentEditor,
     };
 });
diff --git a/frontend/src/stores/tabStore.ts b/frontend/src/stores/tabStore.ts
index bd398bc..1400235 100644
--- a/frontend/src/stores/tabStore.ts
+++ b/frontend/src/stores/tabStore.ts
@@ -151,8 +151,9 @@ export const useTabStore = defineStore('tab', () => {
     /**
      * 验证并清理无效的标签页
      */
-    const validateTabs = () => {
-        const validDocIds = Object.keys(documentStore.documents).map(Number);
+    const validateTabs = async () => {
+        const docs = await documentStore.getDocumentList();
+        const validDocIds = docs.map(doc => doc.id).filter((id): id is number => id !== undefined);
 
         // 找出无效的标签页（文档已被删除）
         const invalidTabIds = tabOrder.value.filter(docId => !validDocIds.includes(docId));
@@ -169,9 +170,9 @@ export const useTabStore = defineStore('tab', () => {
     /**
      * 初始化标签页（当前文档）
      */
-    const initTab = () => {
+    const initTab = async () => {
         // 先验证并清理无效的标签页
-        validateTabs();
+        await validateTabs();
 
         if (isTabsEnabled.value) {
             const currentDoc = documentStore.currentDocument;
diff --git a/frontend/src/views/editor/Editor.vue b/frontend/src/views/editor/Editor.vue
index 2d68ec1..201a5ee 100644
--- a/frontend/src/views/editor/Editor.vue
+++ b/frontend/src/views/editor/Editor.vue
@@ -32,9 +32,9 @@ onMounted(async () => {
 
   editorStore.setEditorContainer(editorElement.value);
 
-  const currentDoc = documentStore.currentDocument;
-  if (currentDoc && currentDoc.id !== undefined) {
-    await editorStore.loadEditor(currentDoc.id, currentDoc.content || '');
+  const currentDocId = documentStore.currentDocumentId;
+  if (currentDocId) {
+    await editorStore.switchToEditor(currentDocId);
   }
 
   await tabStore.initTab();
diff --git a/frontend/src/views/editor/basic/contentChangeExtension.ts b/frontend/src/views/editor/basic/contentChangeExtension.ts
index 7abc4e8..811a881 100644
--- a/frontend/src/views/editor/basic/contentChangeExtension.ts
+++ b/frontend/src/views/editor/basic/contentChangeExtension.ts
@@ -1,13 +1,13 @@
 import {EditorView, ViewPlugin, ViewUpdate} from '@codemirror/view';
 import type {Text} from '@codemirror/state';
-import {useEditorStore} from '@/stores/editorStore';
 
 /**
+ * 内容变化监听扩展
+ * 通过回调函数解耦，不直接依赖 Store
  */
-export function createContentChangePlugin() {
+export function createContentChangePlugin(onContentChange: () => void) {
   return ViewPlugin.fromClass(
     class ContentChangePlugin {
-      private readonly editorStore = useEditorStore();
       private lastDoc: Text;
       private rafId: number | null = null;
       private pendingNotification = false;
@@ -40,7 +40,7 @@ export function createContentChangePlugin() {
         this.rafId = requestAnimationFrame(() => {
           this.pendingNotification = false;
           this.rafId = null;
-          this.editorStore.onContentChange();
+          onContentChange();  // 调用注入的回调
         });
       }
     }
diff --git a/frontend/src/views/editor/basic/cursorPositionExtension.ts b/frontend/src/views/editor/basic/cursorPositionExtension.ts
index 084ad07..7411d2b 100644
--- a/frontend/src/views/editor/basic/cursorPositionExtension.ts
+++ b/frontend/src/views/editor/basic/cursorPositionExtension.ts
@@ -1,15 +1,15 @@
 import {EditorView, ViewPlugin, ViewUpdate} from '@codemirror/view';
-import {useDocumentStore} from '@/stores/documentStore';
+import {useEditorStateStore} from '@/stores/editorStateStore';
 import {createDebounce} from '@/common/utils/debounce';
 
 /**
  * 光标位置持久化扩展
- * 实时监听光标位置变化并持久化到 documentStore
+ * 实时监听光标位置变化并持久化到 editorStateStore
  */
 export function createCursorPositionExtension(documentId: number) {
     return ViewPlugin.fromClass(
         class CursorPositionPlugin {
-            private readonly documentStore = useDocumentStore();
+            private readonly editorStateStore = useEditorStateStore();
             private readonly debouncedSave;
 
             constructor(private view: EditorView) {
@@ -42,11 +42,7 @@ export function createCursorPositionExtension(documentId: number) {
 
             private saveCursorPosition() {
                 const cursorPos = this.view.state.selection.main.head;
-                if (!this.documentStore.documentStates[documentId]) {
-                    this.documentStore.documentStates[documentId] = {cursorPos};
-                } else {
-                    this.documentStore.documentStates[documentId].cursorPos = cursorPos;
-                }
+                this.editorStateStore.saveCursorPosition(documentId, cursorPos);
             }
         }
     );
diff --git a/frontend/src/views/editor/basic/statsExtension.ts b/frontend/src/views/editor/basic/statsExtension.ts
index 429ae1a..f56f508 100644
--- a/frontend/src/views/editor/basic/statsExtension.ts
+++ b/frontend/src/views/editor/basic/statsExtension.ts
@@ -1,6 +1,6 @@
 import {Extension} from '@codemirror/state';
 import {EditorView} from '@codemirror/view';
-import {DocumentStats} from '@/stores/editorStore';
+import {DocumentStats} from '@/stores/editorStateStore';
 import {getActiveNoteBlock} from '@/views/editor/extensions/codeblock/state';
 
 // 更新编辑器文档统计信息
diff --git a/frontend/src/views/settings/pages/ExtensionsPage.vue b/frontend/src/views/settings/pages/ExtensionsPage.vue
index cecafab..ebec5b8 100644
--- a/frontend/src/views/settings/pages/ExtensionsPage.vue
+++ b/frontend/src/views/settings/pages/ExtensionsPage.vue
@@ -3,6 +3,7 @@ import {computed, onMounted, ref} from 'vue';
 import {useI18n} from 'vue-i18n';
 import {useEditorStore} from '@/stores/editorStore';
 import {useExtensionStore} from '@/stores/extensionStore';
+import {useKeybindingStore} from '@/stores/keybindingStore';
 import {ExtensionService} from '@/../bindings/voidraft/internal/services';
 import {
   getExtensionDefaultConfig,
@@ -10,6 +11,7 @@ import {
   getExtensionDisplayName, getExtensionsMap,
   hasExtensionConfig
 } from '@/views/editor/manager/extensions';
+import {getExtensionManager} from '@/views/editor/manager';
 import SettingSection from '../components/SettingSection.vue';
 import SettingItem from '../components/SettingItem.vue';
 import ToggleSwitch from '../components/ToggleSwitch.vue';
@@ -17,6 +19,7 @@ import ToggleSwitch from '../components/ToggleSwitch.vue';
 const {t} = useI18n();
 const editorStore = useEditorStore();
 const extensionStore = useExtensionStore();
+const keybindingStore = useKeybindingStore();
 
 // 页面初始化时加载扩展数据
 onMounted(async () => {
@@ -55,7 +58,25 @@ const toggleExpanded = (extensionId: number) => {
 // 更新扩展状态
 const updateExtension = async (extensionId: number, enabled: boolean) => {
   try {
-    await editorStore.updateExtension(extensionId, enabled);
+    // 更新后端
+    await ExtensionService.UpdateExtensionEnabled(extensionId, enabled);
+    
+    // 重新加载各个 Store 的状态
+    await extensionStore.loadExtensions();
+    await keybindingStore.loadKeyBindings();
+    
+    // 获取更新后的扩展
+    const extension = extensionStore.extensions.find(ext => ext.id === extensionId);
+    if (!extension) return;
+    
+    // 应用到编辑器
+    const manager = getExtensionManager();
+    if (manager) {
+      manager.updateExtension(extension.name, enabled, extension.config);
+    }
+    
+    // 更新快捷键
+    await editorStore.applyKeymapSettings();
   } catch (error) {
     console.error('Failed to update extension:', error);
   }
@@ -75,9 +96,18 @@ const updateExtensionConfig = async (extensionId: number, configKey: string, val
     } else {
       updatedConfig[configKey] = value;
     }
-    // 使用editorStore的updateExtension方法更新，确保应用到所有编辑器实例
-    await editorStore.updateExtension(extensionId, extension.enabled ?? false, updatedConfig);
-
+    
+    // 更新后端配置
+    await ExtensionService.UpdateExtensionConfig(extensionId, updatedConfig);
+    
+    // 重新加载状态
+    await extensionStore.loadExtensions();
+    
+    // 应用到编辑器
+    const manager = getExtensionManager();
+    if (manager) {
+      manager.updateExtension(extension.name, extension.enabled ?? false, updatedConfig);
+    }
   } catch (error) {
     console.error('Failed to update extension config:', error);
   }
@@ -89,14 +119,16 @@ const resetExtension = async (extensionId: number) => {
     // 重置到默认配置
     await ExtensionService.ResetExtensionConfig(extensionId);
 
-    // 重新加载扩展状态以获取最新配置
+    // 重新加载扩展状态
     await extensionStore.loadExtensions();
 
-    // 获取重置后的状态，立即应用到所有编辑器视图
+    // 获取重置后的状态，应用到编辑器
     const extension = extensionStore.extensions.find(ext => ext.id === extensionId);
     if (extension) {
-      // 通过editorStore更新，确保所有视图都能同步
-      await editorStore.updateExtension(extensionId, extension.enabled ?? false, extension.config);
+      const manager = getExtensionManager();
+      if (manager) {
+        manager.updateExtension(extension.name, extension.enabled ?? false, extension.config);
+      }
     }
   } catch (error) {
     console.error('Failed to reset extension:', error);