diff --git a/src-tauri/src/error.rs b/src-tauri/src/error.rs
index ec8950c..97ca0e5 100644
--- a/src-tauri/src/error.rs
+++ b/src-tauri/src/error.rs
@@ -1,6 +1,7 @@
 use serde::Serialize;
 
-/// 传给前端的统一错误类型（保留供未来使用，当前命令返回 Result<T, String>）
+/// 传给前端的统一错误类型（保留供未来迁移使用，届时所有命令改为返回 Result<T, AppError>）
+#[allow(dead_code)]
 #[derive(Debug, Serialize)]
 pub struct AppError {
     pub message: String,
diff --git a/src/components/toolbar/ActionButtons.tsx b/src/components/toolbar/ActionButtons.tsx
index ccfb686..535c35c 100644
--- a/src/components/toolbar/ActionButtons.tsx
+++ b/src/components/toolbar/ActionButtons.tsx
@@ -1,5 +1,6 @@
 import { useTranslation } from 'react-i18next';
 import { useAppStore } from '@/store/app-store';
+import { btnClass, btnStyle } from '@/components/ui/buttons';
 
 interface ActionButtonsProps {
   onNew: () => void;
@@ -24,14 +25,6 @@ export function ActionButtons({
   const isAdmin = useAppStore((s) => s.isAdmin);
   const disabled = !isAdmin;
 
-  const btnClass =
-    'px-3 py-1 text-sm rounded border transition-colors disabled:opacity-40 disabled:cursor-not-allowed';
-  const btnStyle = {
-    backgroundColor: 'var(--app-bg)',
-    color: 'var(--app-fg)',
-    borderColor: 'var(--app-border)',
-  };
-
   return (
     <div className="flex gap-1 flex-wrap">
       <button className={btnClass} style={btnStyle} disabled={disabled} onClick={onNew}>
diff --git a/src/components/toolbar/ToolBar.tsx b/src/components/toolbar/ToolBar.tsx
index 561a0be..b3a17af 100644
--- a/src/components/toolbar/ToolBar.tsx
+++ b/src/components/toolbar/ToolBar.tsx
@@ -1,5 +1,6 @@
 import { useTranslation } from 'react-i18next';
 import { useAppStore } from '@/store/app-store';
+import { btnClass, btnStyle } from '@/components/ui/buttons';
 import { SearchInput } from './SearchInput';
 import { ActionButtons } from './ActionButtons';
 import { UndoRedoButtons } from './UndoRedoButtons';
@@ -26,14 +27,6 @@ export function ToolBar(props: ToolBarProps) {
   const isAdmin = useAppStore((s) => s.isAdmin);
   const isModified = useAppStore((s) => s.isModified);
 
-  const sysBtnClass =
-    'px-3 py-1 text-sm rounded border transition-colors disabled:opacity-40 disabled:cursor-not-allowed';
-  const sysBtnStyle = {
-    backgroundColor: 'var(--app-bg)',
-    color: 'var(--app-fg)',
-    borderColor: 'var(--app-border)',
-  };
-
   return (
     <div className="space-y-2 pb-2 border-b" style={{ borderColor: 'var(--app-border)' }}>
       {/* 第一行: 搜索 + 系统按钮 */}
@@ -42,38 +35,38 @@ export function ToolBar(props: ToolBarProps) {
         <div className="flex-1" />
         <UndoRedoButtons />
         <button
-          className={sysBtnClass}
-          style={sysBtnStyle}
+          className={btnClass}
+          style={btnStyle}
           disabled={!isAdmin}
           onClick={props.onImport}
         >
           {t('button.import')}
         </button>
-        <button className={sysBtnClass} style={sysBtnStyle} onClick={props.onExport}>
+        <button className={btnClass} style={btnStyle} onClick={props.onExport}>
           {t('button.export')}
         </button>
         <button
-          className={sysBtnClass}
+          className={btnClass}
           style={{
-            ...sysBtnStyle,
-            backgroundColor: isModified ? '#2563eb' : sysBtnStyle.backgroundColor,
-            color: isModified ? '#fff' : sysBtnStyle.color,
+            ...btnStyle,
+            backgroundColor: isModified ? '#2563eb' : btnStyle.backgroundColor,
+            color: isModified ? '#fff' : btnStyle.color,
           }}
           disabled={!isAdmin}
           onClick={props.onSave}
         >
           {t('button.save')}
         </button>
-        <button className={sysBtnClass} style={sysBtnStyle} onClick={props.onCancel}>
+        <button className={btnClass} style={btnStyle} onClick={props.onCancel}>
           {t('button.cancel')}
         </button>
-        <button className={sysBtnClass} style={sysBtnStyle} onClick={props.onHelp}>
+        <button className={btnClass} style={btnStyle} onClick={props.onHelp}>
           {t('button.help')}
         </button>
-        <button className={sysBtnClass} style={sysBtnStyle} onClick={props.onLanguage}>
+        <button className={btnClass} style={btnStyle} onClick={props.onLanguage}>
           {t('button.language')}
         </button>
-        <button className={sysBtnClass} style={sysBtnStyle} onClick={props.onDarkMode}>
+        <button className={btnClass} style={btnStyle} onClick={props.onDarkMode}>
           {t('button.darkMode')}
         </button>
       </div>
diff --git a/src/components/toolbar/UndoRedoButtons.tsx b/src/components/toolbar/UndoRedoButtons.tsx
index dcb007b..9a977fd 100644
--- a/src/components/toolbar/UndoRedoButtons.tsx
+++ b/src/components/toolbar/UndoRedoButtons.tsx
@@ -1,5 +1,6 @@
 import { useTranslation } from 'react-i18next';
 import { useAppStore } from '@/store/app-store';
+import { btnClass, btnStyle } from '@/components/ui/buttons';
 
 export function UndoRedoButtons() {
   const { t } = useTranslation();
@@ -8,14 +9,6 @@ export function UndoRedoButtons() {
   const undo = useAppStore((s) => s.undo);
   const redo = useAppStore((s) => s.redo);
 
-  const btnClass =
-    'px-3 py-1 text-sm rounded border transition-colors disabled:opacity-40 disabled:cursor-not-allowed';
-  const btnStyle = {
-    backgroundColor: 'var(--app-bg)',
-    color: 'var(--app-fg)',
-    borderColor: 'var(--app-border)',
-  };
-
   return (
     <div className="flex gap-1">
       <button
diff --git a/src/components/ui/buttons.ts b/src/components/ui/buttons.ts
new file mode 100644
index 0000000..dad96d2
--- /dev/null
+++ b/src/components/ui/buttons.ts
@@ -0,0 +1,7 @@
+export const btnClass = 'px-3 py-1 text-sm rounded border transition-colors disabled:opacity-40 disabled:cursor-not-allowed';
+
+export const btnStyle: React.CSSProperties = {
+  backgroundColor: 'var(--app-bg)',
+  color: 'var(--app-fg)',
+  borderColor: 'var(--app-border)',
+};
diff --git a/src/core/import-export.ts b/src/core/import-export.ts
index d82a6a9..3cbf1e0 100644
--- a/src/core/import-export.ts
+++ b/src/core/import-export.ts
@@ -193,10 +193,10 @@ export function importFromContent(
   content: string,
   filepath: string,
 ): ImportResult {
-  const ext = filepath.toLowerCase();
-  if (ext.endsWith('.csv')) {
+  const lower = filepath.toLowerCase();
+  if (lower.endsWith('.csv')) {
     return importFromCsv(content);
-  } else if (ext.endsWith('.json')) {
+  } else if (lower.endsWith('.json')) {
     return importFromJson(content);
   } else {
     // TXT 文件：所有路径放入 system（用户后续可选择目标）
diff --git a/src/hooks/use-app-actions.ts b/src/hooks/use-app-actions.ts
index 7dd2bdf..5a031c9 100644
--- a/src/hooks/use-app-actions.ts
+++ b/src/hooks/use-app-actions.ts
@@ -108,7 +108,7 @@ export function useAppActions(activeTab: TabId, dialogs: DialogState) {
     const content = isCsv ? exportToCsv(data) : exportToJson(data);
     const mime = isCsv ? 'text/csv' : 'application/json';
     const ext = isCsv ? '.csv' : '.json';
-    const blob = new Blob([isCsv ? '' : '', content], { type: mime });
+    const blob = new Blob([content], { type: mime });
     const url = URL.createObjectURL(blob);
     const a = document.createElement('a');
     a.href = url;
diff --git a/src/store/app-store.ts b/src/store/app-store.ts
index bb066fc..32c7e38 100644
--- a/src/store/app-store.ts
+++ b/src/store/app-store.ts
@@ -39,8 +39,6 @@ interface AppState {
 
   undo: () => void;
   redo: () => void;
-  canUndo: () => boolean;
-  canRedo: () => boolean;
 
   loadPaths: () => Promise<void>;
   savePaths: () => Promise<void>;
@@ -227,9 +225,6 @@ export const useAppStore = create<AppState>((set, get) => ({
     set({ isModified: !(arraysEqual(sysPaths, _savedSys) && arraysEqual(userPaths, _savedUser)) });
   },
 
-  canUndo: () => get().undoRedo.canUndo(),
-  canRedo: () => get().undoRedo.canRedo(),
-
   loadPaths: async () => {
     try {
       set({ isLoading: true });