From eee3774e934c1c71f40de8a6c61a909c3e33135e Mon Sep 17 00:00:00 2001
From: zerob13 <zerob13@gmail.com>
Date: Fri, 29 Aug 2025 21:12:50 +0800
Subject: [PATCH 1/8] feat: enhance web content length limit setting with
 counter-style UI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Improve the web content length limit setting in CommonSettings with:
- Replace simple input with interactive counter design
- Add -/+ buttons for quick adjustments (±100 step)
- Enable click-to-edit number for direct input
- Update range to 0-10000 characters
- Maintain single-row compact layout
- Add visual feedback and hover states

🤖 Generated with [Claude Code](https://claude.ai/code)
---
 .../components/settings/CommonSettings.vue    | 79 ++++++++++++++++---
 1 file changed, 67 insertions(+), 12 deletions(-)

diff --git a/src/renderer/src/components/settings/CommonSettings.vue b/src/renderer/src/components/settings/CommonSettings.vue
index e11a1db9c..4b627051a 100644
--- a/src/renderer/src/components/settings/CommonSettings.vue
+++ b/src/renderer/src/components/settings/CommonSettings.vue
@@ -61,17 +61,48 @@
             {{ t('settings.common.webContentLengthLimitHint') }}
           </div>
         </span>
-        <div class="flex-shrink-0 min-w-32">
-          <Input
-            type="number"
-            :min="0"
-            :max="50000"
-            :step="1000"
-            :model-value="webContentLengthLimit"
-            @update:model-value="handleWebContentLengthLimitChange"
-            class="text-right"
-            placeholder="3000"
-          />
+        <div class="flex-shrink-0 flex items-center gap-1">
+          <Button
+            variant="outline"
+            size="icon"
+            class="h-8 w-8 rounded-full"
+            @click="decreaseWebContentLimit"
+            :disabled="webContentLengthLimit <= 0"
+          >
+            <Icon icon="lucide:minus" class="h-3 w-3" />
+          </Button>
+          <div class="relative">
+            <div
+              v-if="!isEditingLimit"
+              @click="startEditingLimit"
+              class="min-w-16 h-8 flex items-center justify-center text-sm font-semibold cursor-pointer hover:bg-accent rounded px-2"
+            >
+              {{ webContentLengthLimit }}
+            </div>
+            <Input
+              v-else
+              ref="limitInputRef"
+              type="number"
+              :min="0"
+              :max="10000"
+              :model-value="webContentLengthLimit"
+              @update:model-value="handleWebContentLengthLimitChange"
+              @blur="stopEditingLimit"
+              @keydown.enter="stopEditingLimit"
+              @keydown.escape="stopEditingLimit"
+              class="min-w-16 h-8 text-center text-sm font-semibold"
+            />
+          </div>
+          <Button
+            variant="outline"
+            size="icon"
+            class="h-8 w-8 rounded-full"
+            @click="increaseWebContentLimit"
+            :disabled="webContentLengthLimit >= 10000"
+          >
+            <Icon icon="lucide:plus" class="h-3 w-3" />
+          </Button>
+          <span class="text-xs text-muted-foreground ml-1">字符</span>
         </div>
       </div>
 
@@ -414,6 +445,8 @@ const showUrlError = ref(false)
 
 // 网页内容长度限制
 const webContentLengthLimit = ref(3000)
+const isEditingLimit = ref(false)
+const limitInputRef = ref<HTMLInputElement>()
 
 // 新增搜索引擎相关
 const isAddSearchEngineDialogOpen = ref(false)
@@ -688,7 +721,7 @@ const handleLoggingChange = (value: boolean) => {
 // 处理网页内容长度限制变更
 const handleWebContentLengthLimitChange = async (value: string | number) => {
   const numValue = typeof value === 'string' ? parseInt(value, 10) : value
-  if ((numValue >= 1 && numValue <= 50000) || numValue === 0) {
+  if (numValue >= 0 && numValue <= 10000 && !isNaN(numValue)) {
     try {
       const displayText = numValue === 0 ? '无限制' : `${numValue}字符`
       console.log('设置网页内容长度限制:', displayText)
@@ -702,6 +735,28 @@ const handleWebContentLengthLimitChange = async (value: string | number) => {
   }
 }
 
+// 增加网页内容长度限制
+const increaseWebContentLimit = () => {
+  const newValue = Math.min(webContentLengthLimit.value + 100, 20000)
+  handleWebContentLengthLimitChange(newValue)
+}
+
+// 减少网页内容长度限制
+const decreaseWebContentLimit = () => {
+  const newValue = Math.max(webContentLengthLimit.value - 100, 0)
+  handleWebContentLengthLimitChange(newValue)
+}
+
+// 开始编辑限制值
+const startEditingLimit = () => {
+  isEditingLimit.value = true
+}
+
+// 结束编辑限制值
+const stopEditingLimit = () => {
+  isEditingLimit.value = false
+}
+
 const cancelLoggingChange = () => {
   isLoggingDialogOpen.value = false
 }

From 0f7b2458258dc4f9974de7f02ca31ffc7f02e370 Mon Sep 17 00:00:00 2001
From: zerob13 <zerob13@gmail.com>
Date: Fri, 29 Aug 2025 21:45:58 +0800
Subject: [PATCH 2/8] feat: image generate model remove systemprompt and tool
 use

---
 src/main/presenter/threadPresenter/index.ts | 23 +++++++---
 src/renderer/src/components/ChatConfig.vue  | 48 ++++++++++++++++++---
 src/renderer/src/components/NewThread.vue   | 17 +++++---
 src/renderer/src/components/TitleView.vue   |  4 +-
 4 files changed, 75 insertions(+), 17 deletions(-)

diff --git a/src/main/presenter/threadPresenter/index.ts b/src/main/presenter/threadPresenter/index.ts
index 7aee5f262..a91eef570 100644
--- a/src/main/presenter/threadPresenter/index.ts
+++ b/src/main/presenter/threadPresenter/index.ts
@@ -30,6 +30,7 @@ import {
   UserMessageMentionBlock,
   UserMessageCodeBlock
 } from '@shared/chat'
+import { ModelType } from '@shared/model'
 import { approximateTokenSize } from 'tokenx'
 import { generateSearchPrompt, SearchManager } from './searchManager'
 import { getFileContext } from './fileContext'
@@ -2094,24 +2095,34 @@ export class ThreadPresenter implements IThreadPresenter {
     userMessage: Message,
     vision: boolean,
     imageFiles: MessageFile[],
-    supportsFunctionCall: boolean
+    supportsFunctionCall: boolean,
+    modelType?: ModelType
   ): Promise<{
     finalContent: ChatMessage[]
     promptTokens: number
   }> {
     const { systemPrompt, contextLength, artifacts, enabledMcpTools } = conversation.settings
 
-    const searchPrompt = searchResults ? generateSearchPrompt(userContent, searchResults) : ''
+    // 判断是否为图片生成模型
+    const isImageGeneration = modelType === ModelType.ImageGeneration
+
+    // 图片生成模型不使用搜索、系统提示词和MCP工具
+    const searchPrompt =
+      !isImageGeneration && searchResults ? generateSearchPrompt(userContent, searchResults) : ''
     const enrichedUserMessage =
-      urlResults.length > 0
+      !isImageGeneration && urlResults.length > 0
         ? '\n\n' + ContentEnricher.enrichUserMessageWithUrlContent(userContent, urlResults)
         : ''
 
     // 计算token数量
     const searchPromptTokens = searchPrompt ? approximateTokenSize(searchPrompt ?? '') : 0
-    const systemPromptTokens = systemPrompt ? approximateTokenSize(systemPrompt ?? '') : 0
+    const systemPromptTokens =
+      !isImageGeneration && systemPrompt ? approximateTokenSize(systemPrompt ?? '') : 0
     const userMessageTokens = approximateTokenSize(userContent + enrichedUserMessage)
-    const mcpTools = await presenter.mcpPresenter.getAllToolDefinitions(enabledMcpTools)
+    // 图片生成模型不使用MCP工具
+    const mcpTools = !isImageGeneration
+      ? await presenter.mcpPresenter.getAllToolDefinitions(enabledMcpTools)
+      : []
     const mcpToolsTokens = mcpTools.reduce(
       (acc, tool) => acc + approximateTokenSize(JSON.stringify(tool)),
       0
@@ -2131,7 +2142,7 @@ export class ThreadPresenter implements IThreadPresenter {
     // 格式化消息
     const formattedMessages = this.formatMessagesForCompletion(
       selectedContextMessages,
-      systemPrompt,
+      isImageGeneration ? '' : systemPrompt, // 图片生成模型不使用系统提示词
       artifacts,
       searchPrompt,
       userContent,
diff --git a/src/renderer/src/components/ChatConfig.vue b/src/renderer/src/components/ChatConfig.vue
index 57f702230..3c9fbfa82 100644
--- a/src/renderer/src/components/ChatConfig.vue
+++ b/src/renderer/src/components/ChatConfig.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useI18n } from 'vue-i18n'
-import { computed } from 'vue'
+import { computed, watch } from 'vue'
 import { Label } from '@/components/ui/label'
 import { Slider } from '@/components/ui/slider'
 import { Icon } from '@iconify/vue'
@@ -30,9 +30,25 @@ const props = defineProps<{
   providerId?: string
   reasoningEffort?: 'minimal' | 'low' | 'medium' | 'high'
   verbosity?: 'low' | 'medium' | 'high'
+  modelType?: 'chat' | 'imageGeneration' | 'embedding' | 'rerank'
 }>()
 
 const systemPrompt = defineModel<string>('systemPrompt')
+
+// 判断是否为图片生成模型
+const isImageGenerationModel = computed(() => {
+  return props.modelType === 'imageGeneration'
+})
+
+// 当模型类型改变且为图片生成模型时，清空系统提示词
+watch(
+  () => props.modelType,
+  (newType) => {
+    if (newType === 'imageGeneration' && systemPrompt.value) {
+      systemPrompt.value = ''
+    }
+  }
+)
 // Define emits to send updates to parent
 const emit = defineEmits<{
   'update:temperature': [value: number]
@@ -122,11 +138,33 @@ const handleDynamicThinkingToggle = (enabled: boolean) => {
 
 <template>
   <div class="pt-2 pb-6 px-2" :dir="langStore.dir">
-    <h2 class="text-xs text-muted-foreground px-2">{{ t('settings.model.title') }}</h2>
+    <div class="flex items-center gap-2 px-2 mb-2">
+      <h2 class="text-xs text-muted-foreground">{{ t('settings.model.title') }}</h2>
+      <Icon
+        v-if="props.modelType === 'chat'"
+        icon="lucide:message-circle"
+        class="w-3 h-3 text-muted-foreground"
+      />
+      <Icon
+        v-else-if="props.modelType === 'imageGeneration'"
+        icon="lucide:image"
+        class="w-3 h-3 text-muted-foreground"
+      />
+      <Icon
+        v-else-if="props.modelType === 'embedding'"
+        icon="lucide:layers"
+        class="w-3 h-3 text-muted-foreground"
+      />
+      <Icon
+        v-else-if="props.modelType === 'rerank'"
+        icon="lucide:arrow-up-down"
+        class="w-3 h-3 text-muted-foreground"
+      />
+    </div>
 
     <div class="space-y-6">
-      <!-- System Prompt -->
-      <div class="space-y-2 px-2">
+      <!-- System Prompt (隐藏图片生成模型的系统提示词) -->
+      <div v-if="!isImageGenerationModel" class="space-y-2 px-2">
         <div class="flex items-center space-x-2 py-1.5">
           <Icon icon="lucide:terminal" class="w-4 h-4 text-muted-foreground" />
           <Label class="text-xs font-medium">{{ t('settings.model.systemPrompt.label') }}</Label>
@@ -339,7 +377,7 @@ const handleDynamicThinkingToggle = (enabled: boolean) => {
       </div>
 
       <!-- Verbosity (详细程度 - 仅 GPT-5 系列) -->
-      <div v-if="isGPT5Model && verbosity !== undefined" class="space-y-4 px-2">
+      <div v-if="isGPT5Model && props.verbosity !== undefined" class="space-y-4 px-2">
         <div class="flex items-center space-x-2">
           <Icon icon="lucide:message-square-text" class="w-4 h-4 text-muted-foreground" />
           <Label class="text-xs font-medium">{{
diff --git a/src/renderer/src/components/NewThread.vue b/src/renderer/src/components/NewThread.vue
index 0073123e2..18034833a 100644
--- a/src/renderer/src/components/NewThread.vue
+++ b/src/renderer/src/components/NewThread.vue
@@ -97,6 +97,7 @@
                 :max-tokens-limit="maxTokensLimit"
                 :model-id="activeModel?.id"
                 :provider-id="activeModel?.providerId"
+                :model-type="activeModel?.type"
               />
             </ScrollablePopover>
           </div>
@@ -145,12 +146,14 @@ const activeModel = ref({
   name: '',
   id: '',
   providerId: '',
-  tags: []
+  tags: [],
+  type: ModelType.Chat
 } as {
   name: string
   id: string
   providerId: string
   tags: string[]
+  type: ModelType
 })
 
 const temperature = ref(0.6)
@@ -209,7 +212,8 @@ watch(
                     name: model.name,
                     id: model.id,
                     providerId: provider.providerId,
-                    tags: []
+                    tags: [],
+                    type: model.type ?? ModelType.Chat
                   }
                   return
                 }
@@ -235,7 +239,8 @@ watch(
                   name: model.name,
                   id: model.id,
                   providerId: provider.providerId,
-                  tags: []
+                  tags: [],
+                  type: model.type ?? ModelType.Chat
                 }
                 return
               }
@@ -259,7 +264,8 @@ watch(
           name: model.name,
           id: model.id,
           providerId: model.providerId,
-          tags: []
+          tags: [],
+          type: model.type ?? ModelType.Chat
         }
       }
     }
@@ -290,7 +296,8 @@ const handleModelUpdate = (model: MODEL_META, providerId: string) => {
     name: model.name,
     id: model.id,
     providerId: providerId,
-    tags: []
+    tags: [],
+    type: model.type ?? ModelType.Chat
   }
   chatStore.updateChatConfig({
     modelId: model.id,
diff --git a/src/renderer/src/components/TitleView.vue b/src/renderer/src/components/TitleView.vue
index 0493df41a..97c5d747e 100644
--- a/src/renderer/src/components/TitleView.vue
+++ b/src/renderer/src/components/TitleView.vue
@@ -74,6 +74,7 @@
           :verbosity="verbosity"
           :model-id="chatStore.chatConfig.modelId"
           :provider-id="chatStore.chatConfig.providerId"
+          :model-type="modelType"
           @update:temperature="updateTemperature"
           @update:context-length="updateContextLength"
           @update:max-tokens="updateMaxTokens"
@@ -122,7 +123,7 @@ const artifacts = ref(chatStore.chatConfig.artifacts)
 const thinkingBudget = ref(chatStore.chatConfig.thinkingBudget)
 const reasoningEffort = ref(chatStore.chatConfig.reasoningEffort)
 const verbosity = ref(chatStore.chatConfig.verbosity)
-
+const modelType = ref(ModelType.Chat)
 // 获取模型配置来初始化默认值
 const loadModelConfig = async () => {
   const modelId = chatStore.chatConfig.modelId
@@ -131,6 +132,7 @@ const loadModelConfig = async () => {
   if (modelId && providerId) {
     try {
       const config = await configPresenter.getModelDefaultConfig(modelId, providerId)
+      modelType.value = config.type
       if (config.thinkingBudget !== undefined) {
         if (thinkingBudget.value === undefined) {
           thinkingBudget.value = config.thinkingBudget

From 7e281a055d1c30dfd861c088c34ec4dc3d9617eb Mon Sep 17 00:00:00 2001
From: zerob13 <zerob13@gmail.com>
Date: Fri, 29 Aug 2025 22:16:35 +0800
Subject: [PATCH 3/8] fix: add missing TypeScript interface methods for
 resetToDefaultPrompt and clearSystemPrompt

---
 package.json                                  |   2 +-
 src/main/presenter/configPresenter/index.ts   |  28 +++-
 .../src/components/settings/PromptSetting.vue | 128 +++++++++++++++---
 src/renderer/src/i18n/en-US/settings.json     |   4 +
 src/renderer/src/i18n/fa-IR/settings.json     |   4 +
 src/renderer/src/i18n/fr-FR/settings.json     |   4 +
 src/renderer/src/i18n/ja-JP/settings.json     |   4 +
 src/renderer/src/i18n/ko-KR/settings.json     |   4 +
 src/renderer/src/i18n/ru-RU/settings.json     |   4 +
 src/renderer/src/i18n/zh-CN/settings.json     |   4 +
 src/renderer/src/i18n/zh-HK/settings.json     |   4 +
 src/renderer/src/i18n/zh-TW/settings.json     |   4 +
 src/renderer/src/stores/settings.ts           |  12 ++
 src/shared/presenter.d.ts                     |   2 +
 14 files changed, 187 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index c8148f69a..8f58d4e7e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "DeepChat",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "DeepChat，一个简单易用的AI客户端",
   "main": "./out/main/index.js",
   "author": "ThinkInAIXYZ",
diff --git a/src/main/presenter/configPresenter/index.ts b/src/main/presenter/configPresenter/index.ts
index fb593d07d..37154c005 100644
--- a/src/main/presenter/configPresenter/index.ts
+++ b/src/main/presenter/configPresenter/index.ts
@@ -30,6 +30,12 @@ import { defaultShortcutKey, ShortcutKeySetting } from './shortcutKeySettings'
 import { ModelConfigHelper } from './modelConfig'
 import { KnowledgeConfHelper } from './knowledgeConfHelper'
 
+// 默认系统提示词常量
+const DEFAULT_SYSTEM_PROMPT = `You are DeepChat, a highly capable AI assistant. Your goal is to fully complete the user’s requested task before handing the conversation back to them. Keep working autonomously until the task is fully resolved.
+Be thorough in gathering information. Before replying, make sure you have all the details necessary to provide a complete solution. Use additional tools or ask clarifying questions when needed, but if you can find the answer on your own, avoid asking the user for help.
+When using tools, briefly describe your intended steps first—for example, which tool you’ll use and for what purpose.
+Adhere to this in all languages.Always respond in the same language as the user's query.`
+
 // 定义应用设置的接口
 interface IAppSettings {
   // 在这里定义你的配置项，例如：
@@ -147,7 +153,7 @@ export class ConfigPresenter implements IConfigPresenter {
       const oldVersion = this.store.get('appVersion')
       this.store.set('appVersion', this.currentAppVersion)
       // 迁移数据
-      this.migrateModelData(oldVersion)
+      this.migrateConfigData(oldVersion)
       this.mcpConfHelper.onUpgrade(oldVersion)
     }
 
@@ -184,7 +190,7 @@ export class ConfigPresenter implements IConfigPresenter {
     return this.providersModelStores.get(providerId)!
   }
 
-  private migrateModelData(oldVersion: string | undefined): void {
+  private migrateConfigData(oldVersion: string | undefined): void {
     // 0.2.4 版本之前，minimax 的 baseUrl 是错误的，需要修正
     if (oldVersion && compare(oldVersion, '0.2.4', '<')) {
       const providers = this.getProviders()
@@ -267,6 +273,14 @@ export class ConfigPresenter implements IConfigPresenter {
         this.setProviders(filteredProviders)
       }
     }
+
+    // 0.3.4 版本之前，如果默认系统提示词为空，则设置为内置的默认提示词
+    if (oldVersion && compare(oldVersion, '0.3.4', '<')) {
+      const currentPrompt = this.getSetting<string>('default_system_prompt')
+      if (!currentPrompt || currentPrompt.trim() === '') {
+        this.setSetting('default_system_prompt', DEFAULT_SYSTEM_PROMPT)
+      }
+    }
   }
 
   getSetting<T>(key: string): T | undefined {
@@ -1190,6 +1204,16 @@ export class ConfigPresenter implements IConfigPresenter {
     this.setSetting('default_system_prompt', prompt)
   }
 
+  // 重置为默认系统提示词
+  async resetToDefaultPrompt(): Promise<void> {
+    this.setSetting('default_system_prompt', DEFAULT_SYSTEM_PROMPT)
+  }
+
+  // 清空系统提示词
+  async clearSystemPrompt(): Promise<void> {
+    this.setSetting('default_system_prompt', '')
+  }
+
   // 获取默认快捷键
   getDefaultShortcutKey(): ShortcutKeySetting {
     return {
diff --git a/src/renderer/src/components/settings/PromptSetting.vue b/src/renderer/src/components/settings/PromptSetting.vue
index 777fcbe46..2d5972477 100644
--- a/src/renderer/src/components/settings/PromptSetting.vue
+++ b/src/renderer/src/components/settings/PromptSetting.vue
@@ -25,24 +25,54 @@
 
       <!-- 默认系统提示词设置区域 -->
       <div class="bg-card border border-border rounded-lg p-4">
-        <div class="flex items-center gap-2 mb-3">
-          <Icon
-            :icon="getStatusIcon()"
-            :class="[
-              'w-5 h-5 transition-colors duration-200',
-              getStatusColor(),
-              defaultPromptSaveStatus === 'saving' ? 'animate-spin' : ''
-            ]"
-          />
-          <Label class="text-base font-medium">{{ t('promptSetting.defaultSystemPrompt') }}</Label>
-          <div class="flex items-center gap-1 text-xs text-muted-foreground">
-            <span v-if="defaultPromptSaveStatus === 'typing'">{{ t('promptSetting.typing') }}</span>
-            <span v-else-if="defaultPromptSaveStatus === 'saving'">{{
-              t('promptSetting.saving')
-            }}</span>
-            <span v-else-if="defaultPromptSaveStatus === 'saved'">{{
-              t('promptSetting.saved')
-            }}</span>
+        <div class="flex items-center justify-between mb-3">
+          <div class="flex items-center gap-2">
+            <Icon
+              :icon="getStatusIcon()"
+              :class="[
+                'w-5 h-5 transition-colors duration-200',
+                getStatusColor(),
+                defaultPromptSaveStatus === 'saving' ? 'animate-spin' : ''
+              ]"
+            />
+            <Label class="text-base font-medium">{{
+              t('promptSetting.defaultSystemPrompt')
+            }}</Label>
+            <div class="flex items-center gap-1 text-xs text-muted-foreground">
+              <span v-if="defaultPromptSaveStatus === 'typing'">{{
+                t('promptSetting.typing')
+              }}</span>
+              <span v-else-if="defaultPromptSaveStatus === 'saving'">{{
+                t('promptSetting.saving')
+              }}</span>
+              <span v-else-if="defaultPromptSaveStatus === 'saved'">{{
+                t('promptSetting.saved')
+              }}</span>
+            </div>
+          </div>
+
+          <!-- 操作按钮 -->
+          <div class="flex items-center gap-2">
+            <Button
+              variant="outline"
+              size="sm"
+              class="h-7 px-3 text-xs"
+              :disabled="defaultPromptSaveStatus === 'saving'"
+              @click="resetToDefaultPrompt"
+            >
+              <Icon icon="lucide:rotate-ccw" class="w-3.5 h-3.5" />
+              {{ t('settings.promptSetting.resetToDefault') }}
+            </Button>
+            <Button
+              variant="outline"
+              size="sm"
+              class="h-7 px-3 text-xs text-destructive hover:bg-destructive hover:text-destructive-foreground"
+              :disabled="defaultPromptSaveStatus === 'saving'"
+              @click="clearSystemPrompt"
+            >
+              <Icon icon="lucide:trash-2" class="w-3.5 h-3.5" />
+              {{ t('settings.promptSetting.clear') }}
+            </Button>
           </div>
         </div>
         <div class="space-y-2">
@@ -1012,6 +1042,68 @@ const getStatusColor = () => {
   }
 }
 
+// 重置为默认系统提示词
+const resetToDefaultPrompt = async () => {
+  if (defaultPromptSaveStatus.value === 'saving') return
+
+  try {
+    defaultPromptSaveStatus.value = 'saving'
+    await settingsStore.resetToDefaultPrompt()
+    // 重新加载当前值
+    defaultSystemPrompt.value = await settingsStore.getDefaultSystemPrompt()
+    defaultPromptSaveStatus.value = 'saved'
+
+    toast({
+      title: t('promptSetting.resetToDefaultSuccess'),
+      variant: 'default'
+    })
+
+    // 2秒后重置状态
+    setTimeout(() => {
+      if (defaultPromptSaveStatus.value === 'saved') {
+        defaultPromptSaveStatus.value = 'idle'
+      }
+    }, 2000)
+  } catch {
+    defaultPromptSaveStatus.value = 'idle'
+    toast({
+      title: t('promptSetting.resetToDefaultFailed'),
+      variant: 'destructive'
+    })
+  }
+}
+
+// 清空系统提示词
+const clearSystemPrompt = async () => {
+  if (defaultPromptSaveStatus.value === 'saving') return
+
+  try {
+    defaultPromptSaveStatus.value = 'saving'
+    await settingsStore.clearSystemPrompt()
+    // 清空当前值
+    defaultSystemPrompt.value = ''
+    defaultPromptSaveStatus.value = 'saved'
+
+    toast({
+      title: t('promptSetting.clearSuccess'),
+      variant: 'default'
+    })
+
+    // 2秒后重置状态
+    setTimeout(() => {
+      if (defaultPromptSaveStatus.value === 'saved') {
+        defaultPromptSaveStatus.value = 'idle'
+      }
+    }, 2000)
+  } catch {
+    defaultPromptSaveStatus.value = 'idle'
+    toast({
+      title: t('promptSetting.clearFailed'),
+      variant: 'destructive'
+    })
+  }
+}
+
 const filePresenter = usePresenter('filePresenter')
 
 // 文件管理相关方法
diff --git a/src/renderer/src/i18n/en-US/settings.json b/src/renderer/src/i18n/en-US/settings.json
index eeb68ac0c..7ad42125e 100644
--- a/src/renderer/src/i18n/en-US/settings.json
+++ b/src/renderer/src/i18n/en-US/settings.json
@@ -793,5 +793,9 @@
     "confirmDisable": "Disable Limit",
     "disabled": "Rate Limit Disabled",
     "disabledDescription": "Rate limiting has been disabled"
+  },
+  "promptSetting": {
+    "resetToDefault": "Reset to default prompt",
+    "clear": "Clear prompt words"
   }
 }
diff --git a/src/renderer/src/i18n/fa-IR/settings.json b/src/renderer/src/i18n/fa-IR/settings.json
index d8812cebd..5d51055d9 100644
--- a/src/renderer/src/i18n/fa-IR/settings.json
+++ b/src/renderer/src/i18n/fa-IR/settings.json
@@ -793,5 +793,9 @@
     "confirmDisable": "غیرفعال کردن محدودیت",
     "disabled": "محدودیت نرخ غیرفعال شد",
     "disabledDescription": "محدودیت نرخ غیرفعال شده است"
+  },
+  "promptSetting": {
+    "resetToDefault": "تنظیم مجدد به پیش فرض کلمه سریع",
+    "clear": "کلمات سریع را پاک کنید"
   }
 }
diff --git a/src/renderer/src/i18n/fr-FR/settings.json b/src/renderer/src/i18n/fr-FR/settings.json
index 6be41cb10..58a88ece9 100644
--- a/src/renderer/src/i18n/fr-FR/settings.json
+++ b/src/renderer/src/i18n/fr-FR/settings.json
@@ -793,5 +793,9 @@
     "confirmDisable": "Désactiver la limitation",
     "disabled": "Limitation de débit désactivée",
     "disabledDescription": "La limitation de débit a été désactivée"
+  },
+  "promptSetting": {
+    "resetToDefault": "Réinitialiser avec un mot rapide par défaut",
+    "clear": "Effacer les mots rapides"
   }
 }
diff --git a/src/renderer/src/i18n/ja-JP/settings.json b/src/renderer/src/i18n/ja-JP/settings.json
index 4e1683762..5694e67b6 100644
--- a/src/renderer/src/i18n/ja-JP/settings.json
+++ b/src/renderer/src/i18n/ja-JP/settings.json
@@ -793,5 +793,9 @@
     "confirmDisable": "制限を無効化",
     "disabled": "レート制限が無効化されました",
     "disabledDescription": "レート制限機能が無効化されました"
+  },
+  "promptSetting": {
+    "resetToDefault": "デフォルトのプロンプトワードにリセットします",
+    "clear": "迅速な単語を明確にします"
   }
 }
diff --git a/src/renderer/src/i18n/ko-KR/settings.json b/src/renderer/src/i18n/ko-KR/settings.json
index 6772f9a13..6cb34fcf7 100644
--- a/src/renderer/src/i18n/ko-KR/settings.json
+++ b/src/renderer/src/i18n/ko-KR/settings.json
@@ -793,5 +793,9 @@
     "confirmDisable": "제한 비활성화",
     "disabled": "속도 제한이 비활성화됨",
     "disabledDescription": "속도 제한 기능이 비활성화되었습니다"
+  },
+  "promptSetting": {
+    "resetToDefault": "기본 프롬프트 단어로 재설정하십시오",
+    "clear": "명확한 신속한 단어"
   }
 }
diff --git a/src/renderer/src/i18n/ru-RU/settings.json b/src/renderer/src/i18n/ru-RU/settings.json
index f099ebcd3..fb3cee2ee 100644
--- a/src/renderer/src/i18n/ru-RU/settings.json
+++ b/src/renderer/src/i18n/ru-RU/settings.json
@@ -793,5 +793,9 @@
     "confirmDisable": "Отключить ограничение",
     "disabled": "Ограничение скорости отключено",
     "disabledDescription": "Ограничение скорости было отключено"
+  },
+  "promptSetting": {
+    "resetToDefault": "Сбросить в приглашение по умолчанию слово",
+    "clear": "Чистые быстрые слова"
   }
 }
diff --git a/src/renderer/src/i18n/zh-CN/settings.json b/src/renderer/src/i18n/zh-CN/settings.json
index 2ad1d15f1..7465fda33 100644
--- a/src/renderer/src/i18n/zh-CN/settings.json
+++ b/src/renderer/src/i18n/zh-CN/settings.json
@@ -793,5 +793,9 @@
     "confirmDisable": "关闭限制",
     "disabled": "速率限制已关闭",
     "disabledDescription": "速率限制功能已关闭"
+  },
+  "promptSetting": {
+    "clear": "清空提示词",
+    "resetToDefault": "重置为默认提示词"
   }
 }
diff --git a/src/renderer/src/i18n/zh-HK/settings.json b/src/renderer/src/i18n/zh-HK/settings.json
index 9a2bf92c5..f5ef20456 100644
--- a/src/renderer/src/i18n/zh-HK/settings.json
+++ b/src/renderer/src/i18n/zh-HK/settings.json
@@ -793,5 +793,9 @@
     "confirmDisable": "關閉限制",
     "disabled": "速率限制已關閉",
     "disabledDescription": "速率限制功能已關閉"
+  },
+  "promptSetting": {
+    "resetToDefault": "重置為默認提示詞",
+    "clear": "清空提示詞"
   }
 }
diff --git a/src/renderer/src/i18n/zh-TW/settings.json b/src/renderer/src/i18n/zh-TW/settings.json
index f510b615f..b7fab8775 100644
--- a/src/renderer/src/i18n/zh-TW/settings.json
+++ b/src/renderer/src/i18n/zh-TW/settings.json
@@ -793,5 +793,9 @@
     "confirmDisable": "關閉限制",
     "disabled": "速率限制已關閉",
     "disabledDescription": "速率限制功能已關閉"
+  },
+  "promptSetting": {
+    "resetToDefault": "重置為默認提示詞",
+    "clear": "清空提示詞"
   }
 }
diff --git a/src/renderer/src/stores/settings.ts b/src/renderer/src/stores/settings.ts
index 776ded724..43996234c 100644
--- a/src/renderer/src/stores/settings.ts
+++ b/src/renderer/src/stores/settings.ts
@@ -1629,6 +1629,16 @@ export const useSettingsStore = defineStore('settings', () => {
     await configP.setDefaultSystemPrompt(prompt)
   }
 
+  // 重置为默认系统提示词
+  const resetToDefaultPrompt = async (): Promise<void> => {
+    await configP.resetToDefaultPrompt()
+  }
+
+  // 清空系统提示词
+  const clearSystemPrompt = async (): Promise<void> => {
+    await configP.clearSystemPrompt()
+  }
+
   // 模型配置相关方法
   const getModelConfig = async (modelId: string, providerId: string): Promise<any> => {
     return await configP.getModelDefaultConfig(modelId, providerId)
@@ -1730,6 +1740,8 @@ export const useSettingsStore = defineStore('settings', () => {
     getAwsBedrockCredential,
     getDefaultSystemPrompt,
     setDefaultSystemPrompt,
+    resetToDefaultPrompt,
+    clearSystemPrompt,
     setupProviderListener,
     getModelConfig,
     setModelConfig,
diff --git a/src/shared/presenter.d.ts b/src/shared/presenter.d.ts
index f08436b8f..32c5a0690 100644
--- a/src/shared/presenter.d.ts
+++ b/src/shared/presenter.d.ts
@@ -458,6 +458,8 @@ export interface IConfigPresenter {
   // 默认系统提示词设置
   getDefaultSystemPrompt(): Promise<string>
   setDefaultSystemPrompt(prompt: string): Promise<void>
+  resetToDefaultPrompt(): Promise<void>
+  clearSystemPrompt(): Promise<void>
   // 快捷键设置
   getDefaultShortcutKey(): ShortcutKeySetting
   getShortcutKey(): ShortcutKeySetting

From 69e7702cb79868f3e06348cf7f442154455a1804 Mon Sep 17 00:00:00 2001
From: zerob13 <zerob13@gmail.com>
Date: Fri, 29 Aug 2025 22:22:59 +0800
Subject: [PATCH 4/8] fix: resolve data import failure by fixing schema
 mismatch in DataImporter

- Add missing fields (enabled_mcp_tools, thinking_budget, reasoning_effort, verbosity) to SELECT query
- Add compatibility handling for different database schema versions
- Use try-catch to fall back to basic fields when new fields are not available
- Ensure INSERT and SELECT statements have matching field structure

Fixes data import error: Failed to import data
---
 .../presenter/sqlitePresenter/importData.ts   | 138 +++++++++++++-----
 1 file changed, 103 insertions(+), 35 deletions(-)

diff --git a/src/main/presenter/sqlitePresenter/importData.ts b/src/main/presenter/sqlitePresenter/importData.ts
index 8fec3ccaa..a8fe4185f 100644
--- a/src/main/presenter/sqlitePresenter/importData.ts
+++ b/src/main/presenter/sqlitePresenter/importData.ts
@@ -67,16 +67,52 @@ export class DataImporter {
    * @returns 导入的会话数量
    */
   public async importData(): Promise<number> {
-    // 获取所有会话
-    const conversations = this.sourceDb
-      .prepare(
-        `SELECT
-          conv_id, title, created_at, updated_at, system_prompt,
-          temperature, context_length, max_tokens, provider_id,
-          model_id, is_pinned, is_new, artifacts
-        FROM conversations`
-      )
-      .all() as any[]
+    // 获取所有会话 - 兼容不同版本的数据库schema
+    let conversations: any[]
+
+    try {
+      // 尝试使用包含所有新字段的查询
+      conversations = this.sourceDb
+        .prepare(
+          `SELECT
+            conv_id, title, created_at, updated_at, system_prompt,
+            temperature, context_length, max_tokens, provider_id,
+            model_id, 
+            COALESCE(is_pinned, 0) as is_pinned, 
+            COALESCE(is_new, 0) as is_new, 
+            COALESCE(artifacts, 0) as artifacts,
+            enabled_mcp_tools,
+            thinking_budget,
+            reasoning_effort,
+            verbosity
+          FROM conversations`
+        )
+        .all() as any[]
+    } catch (error) {
+      // 如果失败，使用基础字段查询（兼容旧版本数据库）
+      console.warn('Failed to query with new fields, falling back to basic query:', error)
+      conversations = this.sourceDb
+        .prepare(
+          `SELECT
+            conv_id, title, created_at, updated_at, system_prompt,
+            temperature, context_length, max_tokens, provider_id,
+            model_id, 
+            COALESCE(is_pinned, 0) as is_pinned, 
+            COALESCE(is_new, 0) as is_new, 
+            COALESCE(artifacts, 0) as artifacts
+          FROM conversations`
+        )
+        .all() as any[]
+
+      // 为缺失的字段设置默认值
+      conversations = conversations.map((conv) => ({
+        ...conv,
+        enabled_mcp_tools: null,
+        thinking_budget: null,
+        reasoning_effort: null,
+        verbosity: null
+      }))
+    }
 
     // 使用better-sqlite3的transaction API来处理事务
     const importTransaction = this.targetDb.transaction(() => {
@@ -114,31 +150,63 @@ export class DataImporter {
     // const newConvId = nanoid()
     // this.idMappings.conversations.set(conv.conv_id, newConvId)
 
-    // 插入会话
-    this.targetDb
-      .prepare(
-        `INSERT INTO conversations (
-          conv_id, title, created_at, updated_at, system_prompt,
-          temperature, context_length, max_tokens, provider_id,
-          model_id, is_pinned, is_new, artifacts, thinking_budget
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
-      )
-      .run(
-        conv.conv_id,
-        conv.title,
-        conv.created_at,
-        conv.updated_at,
-        conv.system_prompt,
-        conv.temperature,
-        conv.context_length,
-        conv.max_tokens,
-        conv.provider_id,
-        conv.model_id,
-        conv.is_pinned || 0,
-        conv.is_new || 0,
-        conv.artifacts || 0,
-        conv.thinking_budget !== undefined ? conv.thinking_budget : null
-      )
+    try {
+      // 首先尝试使用包含所有新字段的INSERT语句
+      this.targetDb
+        .prepare(
+          `INSERT INTO conversations (
+            conv_id, title, created_at, updated_at, system_prompt,
+            temperature, context_length, max_tokens, provider_id,
+            model_id, is_pinned, is_new, artifacts, enabled_mcp_tools,
+            thinking_budget, reasoning_effort, verbosity
+          ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+        )
+        .run(
+          conv.conv_id,
+          conv.title,
+          conv.created_at,
+          conv.updated_at,
+          conv.system_prompt,
+          conv.temperature,
+          conv.context_length,
+          conv.max_tokens,
+          conv.provider_id,
+          conv.model_id,
+          conv.is_pinned || 0,
+          conv.is_new || 0,
+          conv.artifacts || 0,
+          conv.enabled_mcp_tools || null,
+          conv.thinking_budget || null,
+          conv.reasoning_effort || null,
+          conv.verbosity || null
+        )
+    } catch (error) {
+      // 如果失败，使用基础字段的INSERT语句（兼容旧版本目标数据库）
+      console.warn('Failed to insert with new fields, falling back to basic insert:', error)
+      this.targetDb
+        .prepare(
+          `INSERT INTO conversations (
+            conv_id, title, created_at, updated_at, system_prompt,
+            temperature, context_length, max_tokens, provider_id,
+            model_id, is_pinned, is_new, artifacts
+          ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+        )
+        .run(
+          conv.conv_id,
+          conv.title,
+          conv.created_at,
+          conv.updated_at,
+          conv.system_prompt,
+          conv.temperature,
+          conv.context_length,
+          conv.max_tokens,
+          conv.provider_id,
+          conv.model_id,
+          conv.is_pinned || 0,
+          conv.is_new || 0,
+          conv.artifacts || 0
+        )
+    }
 
     // 导入该会话的所有消息
     this.importMessages(conv.conv_id)

From 99b31a71e9aaa58f969ee6143e1c476b01ef9f38 Mon Sep 17 00:00:00 2001
From: zerob13 <zerob13@gmail.com>
Date: Fri, 29 Aug 2025 22:29:44 +0800
Subject: [PATCH 5/8] fix: resolve schema mismatch in message_attachments table
 during data import

- Fix 'no such column: metadata' error in message_attachments table
- Add schema compatibility handling for both source and target databases
- Use try-catch pattern to fall back to basic schema when metadata column is not available
- Fix TypeScript errors by properly handling unknown error types
- Ensure both SELECT and INSERT operations are compatible with different schema versions

Resolves the core issue causing data import failures: SqliteError: no such column: metadata
---
 .../presenter/sqlitePresenter/importData.ts   | 515 ++++++++++++------
 1 file changed, 337 insertions(+), 178 deletions(-)

diff --git a/src/main/presenter/sqlitePresenter/importData.ts b/src/main/presenter/sqlitePresenter/importData.ts
index a8fe4185f..84e5c111b 100644
--- a/src/main/presenter/sqlitePresenter/importData.ts
+++ b/src/main/presenter/sqlitePresenter/importData.ts
@@ -67,19 +67,22 @@ export class DataImporter {
    * @returns 导入的会话数量
    */
   public async importData(): Promise<number> {
+    console.log('DataImporter: Starting data import...')
+
     // 获取所有会话 - 兼容不同版本的数据库schema
     let conversations: any[]
 
     try {
+      console.log('DataImporter: Attempting to query conversations with all new fields...')
       // 尝试使用包含所有新字段的查询
       conversations = this.sourceDb
         .prepare(
           `SELECT
             conv_id, title, created_at, updated_at, system_prompt,
             temperature, context_length, max_tokens, provider_id,
-            model_id, 
-            COALESCE(is_pinned, 0) as is_pinned, 
-            COALESCE(is_new, 0) as is_new, 
+            model_id,
+            COALESCE(is_pinned, 0) as is_pinned,
+            COALESCE(is_new, 0) as is_new,
             COALESCE(artifacts, 0) as artifacts,
             enabled_mcp_tools,
             thinking_budget,
@@ -88,56 +91,95 @@ export class DataImporter {
           FROM conversations`
         )
         .all() as any[]
+      console.log(
+        `DataImporter: Successfully queried ${conversations.length} conversations with all fields`
+      )
     } catch (error) {
       // 如果失败，使用基础字段查询（兼容旧版本数据库）
-      console.warn('Failed to query with new fields, falling back to basic query:', error)
-      conversations = this.sourceDb
-        .prepare(
-          `SELECT
-            conv_id, title, created_at, updated_at, system_prompt,
-            temperature, context_length, max_tokens, provider_id,
-            model_id, 
-            COALESCE(is_pinned, 0) as is_pinned, 
-            COALESCE(is_new, 0) as is_new, 
-            COALESCE(artifacts, 0) as artifacts
-          FROM conversations`
+      console.warn(
+        'DataImporter: Failed to query with new fields, falling back to basic query:',
+        error
+      )
+      try {
+        conversations = this.sourceDb
+          .prepare(
+            `SELECT
+              conv_id, title, created_at, updated_at, system_prompt,
+              temperature, context_length, max_tokens, provider_id,
+              model_id,
+              COALESCE(is_pinned, 0) as is_pinned,
+              COALESCE(is_new, 0) as is_new,
+              COALESCE(artifacts, 0) as artifacts
+            FROM conversations`
+          )
+          .all() as any[]
+
+        console.log(
+          `DataImporter: Successfully queried ${conversations.length} conversations with basic fields`
         )
-        .all() as any[]
 
-      // 为缺失的字段设置默认值
-      conversations = conversations.map((conv) => ({
-        ...conv,
-        enabled_mcp_tools: null,
-        thinking_budget: null,
-        reasoning_effort: null,
-        verbosity: null
-      }))
+        // 为缺失的字段设置默认值
+        conversations = conversations.map((conv) => ({
+          ...conv,
+          enabled_mcp_tools: null,
+          thinking_budget: null,
+          reasoning_effort: null,
+          verbosity: null
+        }))
+      } catch (fallbackError) {
+        console.error(
+          'DataImporter: Failed to query conversations even with basic fields:',
+          fallbackError
+        )
+        throw new Error(
+          `Failed to query conversations: ${fallbackError instanceof Error ? fallbackError.message : String(fallbackError)}`
+        )
+      }
     }
 
+    console.log(`DataImporter: Preparing to import ${conversations.length} conversations`)
+
     // 使用better-sqlite3的transaction API来处理事务
     const importTransaction = this.targetDb.transaction(() => {
       let importedCount = 0
       for (const conv of conversations) {
-        // 如果是增量导入模式，检查会话是否已存在
-        const existingConv = this.targetDb
-          .prepare('SELECT conv_id FROM conversations WHERE conv_id = ?')
-          .get(conv.conv_id)
-        if (existingConv) {
-          continue // 跳过已存在的会话
-        }
+        console.log(`DataImporter: Processing conversation ${conv.conv_id}`)
 
-        this.importConversation(conv)
-        importedCount++
+        try {
+          // 如果是增量导入模式，检查会话是否已存在
+          const existingConv = this.targetDb
+            .prepare('SELECT conv_id FROM conversations WHERE conv_id = ?')
+            .get(conv.conv_id)
+          if (existingConv) {
+            console.log(`DataImporter: Conversation ${conv.conv_id} already exists, skipping`)
+            continue // 跳过已存在的会话
+          }
+
+          this.importConversation(conv)
+          importedCount++
+          console.log(`DataImporter: Successfully imported conversation ${conv.conv_id}`)
+        } catch (convError) {
+          console.error(`DataImporter: Failed to import conversation ${conv.conv_id}:`, convError)
+          throw convError
+        }
       }
       return importedCount
     })
 
     try {
+      console.log('DataImporter: Starting transaction...')
       // 执行事务并返回导入的会话数量
-      return importTransaction()
-    } catch {
-      // 事务会自动回滚，直接抛出错误
-      throw new Error('Failed to import data')
+      const result = importTransaction()
+      console.log(
+        `DataImporter: Transaction completed successfully. Imported ${result} conversations`
+      )
+      return result
+    } catch (transactionError) {
+      console.error('DataImporter: Transaction failed:', transactionError)
+      // 事务会自动回滚，抛出详细错误
+      throw new Error(
+        `Failed to import data: ${transactionError instanceof Error ? transactionError.message : String(transactionError)}`
+      )
     }
   }
 
@@ -146,11 +188,14 @@ export class DataImporter {
    * @param conv 会话数据
    */
   private importConversation(conv: any): void {
+    console.log(`DataImporter: Importing conversation ${conv.conv_id} - ${conv.title}`)
+
     // 为会话生成新ID
     // const newConvId = nanoid()
     // this.idMappings.conversations.set(conv.conv_id, newConvId)
 
     try {
+      console.log(`DataImporter: Attempting to insert conversation ${conv.conv_id} with all fields`)
       // 首先尝试使用包含所有新字段的INSERT语句
       this.targetDb
         .prepare(
@@ -180,36 +225,67 @@ export class DataImporter {
           conv.reasoning_effort || null,
           conv.verbosity || null
         )
+      console.log(
+        `DataImporter: Successfully inserted conversation ${conv.conv_id} with all fields`
+      )
     } catch (error) {
       // 如果失败，使用基础字段的INSERT语句（兼容旧版本目标数据库）
-      console.warn('Failed to insert with new fields, falling back to basic insert:', error)
-      this.targetDb
-        .prepare(
-          `INSERT INTO conversations (
-            conv_id, title, created_at, updated_at, system_prompt,
-            temperature, context_length, max_tokens, provider_id,
-            model_id, is_pinned, is_new, artifacts
-          ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+      console.warn(
+        `DataImporter: Failed to insert conversation ${conv.conv_id} with new fields, falling back to basic insert:`,
+        error
+      )
+      try {
+        this.targetDb
+          .prepare(
+            `INSERT INTO conversations (
+              conv_id, title, created_at, updated_at, system_prompt,
+              temperature, context_length, max_tokens, provider_id,
+              model_id, is_pinned, is_new, artifacts
+            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+          )
+          .run(
+            conv.conv_id,
+            conv.title,
+            conv.created_at,
+            conv.updated_at,
+            conv.system_prompt,
+            conv.temperature,
+            conv.context_length,
+            conv.max_tokens,
+            conv.provider_id,
+            conv.model_id,
+            conv.is_pinned || 0,
+            conv.is_new || 0,
+            conv.artifacts || 0
+          )
+        console.log(
+          `DataImporter: Successfully inserted conversation ${conv.conv_id} with basic fields`
         )
-        .run(
-          conv.conv_id,
-          conv.title,
-          conv.created_at,
-          conv.updated_at,
-          conv.system_prompt,
-          conv.temperature,
-          conv.context_length,
-          conv.max_tokens,
-          conv.provider_id,
-          conv.model_id,
-          conv.is_pinned || 0,
-          conv.is_new || 0,
-          conv.artifacts || 0
+      } catch (fallbackError) {
+        console.error(
+          `DataImporter: Failed to insert conversation ${conv.conv_id} even with basic fields:`,
+          fallbackError
+        )
+        throw new Error(
+          `Failed to insert conversation ${conv.conv_id}: ${fallbackError instanceof Error ? fallbackError.message : String(fallbackError)}`
         )
+      }
     }
 
     // 导入该会话的所有消息
-    this.importMessages(conv.conv_id)
+    console.log(`DataImporter: Starting to import messages for conversation ${conv.conv_id}`)
+    try {
+      this.importMessages(conv.conv_id)
+      console.log(`DataImporter: Successfully imported messages for conversation ${conv.conv_id}`)
+    } catch (messageError) {
+      console.error(
+        `DataImporter: Failed to import messages for conversation ${conv.conv_id}:`,
+        messageError
+      )
+      throw new Error(
+        `Failed to import messages for conversation ${conv.conv_id}: ${messageError instanceof Error ? messageError.message : String(messageError)}`
+      )
+    }
   }
 
   /**
@@ -217,57 +293,75 @@ export class DataImporter {
    * @param oldConvId 原会话ID
    */
   private importMessages(oldConvId: string): void {
-    // 获取会话的所有消息
-    const messages = this.sourceDb
-      .prepare(
-        `SELECT
-          msg_id, parent_id, role, content, created_at,
-          order_seq, token_count, status, metadata,
-          is_context_edge, is_variant
-        FROM messages
-        WHERE conversation_id = ?
-        ORDER BY order_seq`
-      )
-      .all(oldConvId) as any[]
-
-    // 逐个导入消息
-    for (const msg of messages) {
-      const newMsgId = nanoid()
-      this.idMappings.messages.set(msg.msg_id, newMsgId)
-
-      // 处理父消息ID映射
-      let newParentId = ''
-      if (msg.parent_id && msg.parent_id !== '') {
-        newParentId = this.idMappings.messages.get(msg.parent_id) || ''
-      }
-
-      // 插入消息
-      this.targetDb
+    try {
+      // 获取会话的所有消息
+      const messages = this.sourceDb
         .prepare(
-          `INSERT INTO messages (
-            msg_id, conversation_id, parent_id, role, content,
-            created_at, order_seq, token_count, status, metadata,
+          `SELECT
+            msg_id, parent_id, role, content, created_at,
+            order_seq, token_count, status, metadata,
             is_context_edge, is_variant
-          ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
-        )
-        .run(
-          newMsgId,
-          oldConvId,
-          newParentId,
-          msg.role,
-          msg.content,
-          msg.created_at,
-          msg.order_seq,
-          msg.token_count || 0,
-          msg.status || 'sent',
-          msg.metadata || null,
-          msg.is_context_edge || 0,
-          msg.is_variant || 0
+          FROM messages
+          WHERE conversation_id = ?
+          ORDER BY order_seq`
         )
+        .all(oldConvId) as any[]
+
+      console.log(`DataImporter: Found ${messages.length} messages for conversation ${oldConvId}`)
+
+      // 逐个导入消息
+      for (const msg of messages) {
+        console.log(`DataImporter: Importing message ${msg.msg_id} (role: ${msg.role})`)
+
+        const newMsgId = nanoid()
+        this.idMappings.messages.set(msg.msg_id, newMsgId)
+
+        // 处理父消息ID映射
+        let newParentId = ''
+        if (msg.parent_id && msg.parent_id !== '') {
+          newParentId = this.idMappings.messages.get(msg.parent_id) || ''
+        }
+
+        try {
+          // 插入消息
+          this.targetDb
+            .prepare(
+              `INSERT INTO messages (
+                msg_id, conversation_id, parent_id, role, content,
+                created_at, order_seq, token_count, status, metadata,
+                is_context_edge, is_variant
+              ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+            )
+            .run(
+              newMsgId,
+              oldConvId,
+              newParentId,
+              msg.role,
+              msg.content,
+              msg.created_at,
+              msg.order_seq,
+              msg.token_count || 0,
+              msg.status || 'sent',
+              msg.metadata || null,
+              msg.is_context_edge || 0,
+              msg.is_variant || 0
+            )
+
+          console.log(`DataImporter: Successfully inserted message ${msg.msg_id} -> ${newMsgId}`)
 
-      // 导入消息的附件
-      this.importAttachments(msg.msg_id, newMsgId)
-      this.importMessageAttachments(msg.msg_id, newMsgId)
+          // 导入消息的附件
+          this.importAttachments(msg.msg_id, newMsgId)
+          this.importMessageAttachments(msg.msg_id, newMsgId)
+        } catch (msgError) {
+          console.error(`DataImporter: Failed to insert message ${msg.msg_id}:`, msgError)
+          throw new Error(
+            `Failed to insert message ${msg.msg_id}: ${msgError instanceof Error ? msgError.message : String(msgError)}`
+          )
+        }
+      }
+    } catch (error) {
+      console.error(`DataImporter: Failed to import messages for conversation ${oldConvId}:`, error)
+      throw error
     }
   }
 
@@ -277,54 +371,61 @@ export class DataImporter {
    * @param newMsgId 新消息ID
    */
   private importAttachments(oldMsgId: string, newMsgId: string): void {
-    // 获取消息的所有附件
-    const attachments = this.sourceDb
-      .prepare(
-        `SELECT
-          attach_id, attachment_type, file_name, file_size,
-          storage_type, storage_path, thumbnail, vectorized,
-          data_summary, mime_type, created_at
-        FROM attachments
-        WHERE message_id = ?`
-      )
-      .all(oldMsgId) as any[]
-
-    // 逐个导入附件
-    for (const attachment of attachments) {
-      const newAttachId = nanoid()
-      this.idMappings.attachments.set(attachment.attach_id, newAttachId)
-
-      // 处理存储路径
-      let storagePath = attachment.storage_path
-      if (storagePath && attachment.storage_type === 'path') {
-        // 如果是文件路径，可能需要复制文件或调整路径
-        // 这里简单处理，实际应用中可能需要更复杂的逻辑
-        storagePath = path.basename(storagePath)
-      }
-
-      // 插入附件
-      this.targetDb
+    try {
+      // 获取消息的所有附件
+      const attachments = this.sourceDb
         .prepare(
-          `INSERT INTO attachments (
-            attach_id, message_id, attachment_type, file_name,
-            file_size, storage_type, storage_path, thumbnail,
-            vectorized, data_summary, mime_type, created_at
-          ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
-        )
-        .run(
-          newAttachId,
-          newMsgId,
-          attachment.attachment_type,
-          attachment.file_name,
-          attachment.file_size || 0,
-          attachment.storage_type,
-          storagePath,
-          attachment.thumbnail,
-          attachment.vectorized || 0,
-          attachment.data_summary,
-          attachment.mime_type,
-          attachment.created_at
+          `SELECT
+            attach_id, attachment_type, file_name, file_size,
+            storage_type, storage_path, thumbnail, vectorized,
+            data_summary, mime_type, created_at
+          FROM attachments
+          WHERE message_id = ?`
         )
+        .all(oldMsgId) as any[]
+
+      console.log(`DataImporter: Found ${attachments.length} attachments for message ${oldMsgId}`)
+
+      // 逐个导入附件
+      for (const attachment of attachments) {
+        const newAttachId = nanoid()
+        this.idMappings.attachments.set(attachment.attach_id, newAttachId)
+
+        // 处理存储路径
+        let storagePath = attachment.storage_path
+        if (storagePath && attachment.storage_type === 'path') {
+          // 如果是文件路径，可能需要复制文件或调整路径
+          // 这里简单处理，实际应用中可能需要更复杂的逻辑
+          storagePath = path.basename(storagePath)
+        }
+
+        // 插入附件
+        this.targetDb
+          .prepare(
+            `INSERT INTO attachments (
+              attach_id, message_id, attachment_type, file_name,
+              file_size, storage_type, storage_path, thumbnail,
+              vectorized, data_summary, mime_type, created_at
+            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+          )
+          .run(
+            newAttachId,
+            newMsgId,
+            attachment.attachment_type,
+            attachment.file_name,
+            attachment.file_size || 0,
+            attachment.storage_type,
+            storagePath,
+            attachment.thumbnail,
+            attachment.vectorized || 0,
+            attachment.data_summary,
+            attachment.mime_type,
+            attachment.created_at
+          )
+      }
+    } catch (error) {
+      console.error(`DataImporter: Failed to import attachments for message ${oldMsgId}:`, error)
+      throw error
     }
   }
 
@@ -334,35 +435,93 @@ export class DataImporter {
    * @param newMsgId 新消息ID
    */
   private importMessageAttachments(oldMsgId: string, newMsgId: string): void {
-    // 获取消息的所有message_attachments
-    const messageAttachments = this.sourceDb
-      .prepare(
-        `SELECT
-          attachment_id, type, content, created_at, metadata
-        FROM message_attachments
-        WHERE message_id = ?`
+    try {
+      // 获取消息的所有message_attachments - 兼容不同的schema版本
+      let messageAttachments: any[]
+
+      try {
+        // 首先尝试包含metadata字段的查询
+        messageAttachments = this.sourceDb
+          .prepare(
+            `SELECT
+              attachment_id, type, content, created_at, metadata
+            FROM message_attachments
+            WHERE message_id = ?`
+          )
+          .all(oldMsgId) as any[]
+      } catch (queryError) {
+        // 如果失败，使用不包含metadata的查询（兼容新版本schema）
+        console.warn(
+          `DataImporter: Failed to query message_attachments with metadata field, trying without metadata:`,
+          queryError
+        )
+        messageAttachments = this.sourceDb
+          .prepare(
+            `SELECT
+              attachment_id, type, content, created_at
+            FROM message_attachments
+            WHERE message_id = ?`
+          )
+          .all(oldMsgId) as any[]
+
+        // 为缺失的字段设置默认值
+        messageAttachments = messageAttachments.map((attachment) => ({
+          ...attachment,
+          metadata: null
+        }))
+      }
+
+      console.log(
+        `DataImporter: Found ${messageAttachments.length} message attachments for message ${oldMsgId}`
       )
-      .all(oldMsgId) as any[]
 
-    // 逐个导入message_attachments
-    for (const attachment of messageAttachments) {
-      const newAttachmentId = nanoid()
+      // 逐个导入message_attachments
+      for (const attachment of messageAttachments) {
+        const newAttachmentId = nanoid()
 
-      // 插入message_attachment
-      this.targetDb
-        .prepare(
-          `INSERT INTO message_attachments (
-            attachment_id, message_id, type, content, created_at, metadata
-          ) VALUES (?, ?, ?, ?, ?, ?)`
-        )
-        .run(
-          newAttachmentId,
-          newMsgId,
-          attachment.type,
-          attachment.content,
-          attachment.created_at,
-          attachment.metadata
-        )
+        try {
+          // 首先尝试包含metadata字段的INSERT
+          this.targetDb
+            .prepare(
+              `INSERT INTO message_attachments (
+                attachment_id, message_id, type, content, created_at, metadata
+              ) VALUES (?, ?, ?, ?, ?, ?)`
+            )
+            .run(
+              newAttachmentId,
+              newMsgId,
+              attachment.type,
+              attachment.content,
+              attachment.created_at,
+              attachment.metadata
+            )
+        } catch (insertError) {
+          // 如果失败，使用不包含metadata的INSERT（兼容新版本schema）
+          console.warn(
+            `DataImporter: Failed to insert message_attachment with metadata, trying without metadata:`,
+            insertError
+          )
+          this.targetDb
+            .prepare(
+              `INSERT INTO message_attachments (
+                attachment_id, message_id, type, content, created_at
+              ) VALUES (?, ?, ?, ?, ?)`
+            )
+            .run(
+              newAttachmentId,
+              newMsgId,
+              attachment.type,
+              attachment.content,
+              attachment.created_at
+            )
+        }
+      }
+    } catch (error) {
+      console.error(
+        `DataImporter: Failed to import message attachments for message ${oldMsgId}:`,
+        error
+      )
+      throw error
     }
   }
 

From 5f64d2be505cabcf78722e9e5adee2586109361b Mon Sep 17 00:00:00 2001
From: zerob13 <zerob13@gmail.com>
Date: Fri, 29 Aug 2025 22:43:02 +0800
Subject: [PATCH 6/8] refactor: clean up debug logs from DataImporter

- Remove verbose console.log statements used for debugging
- Remove unnecessary try-catch wrappers that only rethrow errors
- Keep essential error handling and schema compatibility features
- Fix TypeScript errors related to unused catch parameters

Code is now production-ready after successful debugging phase.
---
 .../presenter/sqlitePresenter/importData.ts   | 433 +++++++-----------
 1 file changed, 168 insertions(+), 265 deletions(-)

diff --git a/src/main/presenter/sqlitePresenter/importData.ts b/src/main/presenter/sqlitePresenter/importData.ts
index 84e5c111b..7cb13418b 100644
--- a/src/main/presenter/sqlitePresenter/importData.ts
+++ b/src/main/presenter/sqlitePresenter/importData.ts
@@ -67,13 +67,10 @@ export class DataImporter {
    * @returns 导入的会话数量
    */
   public async importData(): Promise<number> {
-    console.log('DataImporter: Starting data import...')
-
     // 获取所有会话 - 兼容不同版本的数据库schema
     let conversations: any[]
 
     try {
-      console.log('DataImporter: Attempting to query conversations with all new fields...')
       // 尝试使用包含所有新字段的查询
       conversations = this.sourceDb
         .prepare(
@@ -91,15 +88,8 @@ export class DataImporter {
           FROM conversations`
         )
         .all() as any[]
-      console.log(
-        `DataImporter: Successfully queried ${conversations.length} conversations with all fields`
-      )
-    } catch (error) {
+    } catch {
       // 如果失败，使用基础字段查询（兼容旧版本数据库）
-      console.warn(
-        'DataImporter: Failed to query with new fields, falling back to basic query:',
-        error
-      )
       try {
         conversations = this.sourceDb
           .prepare(
@@ -114,10 +104,6 @@ export class DataImporter {
           )
           .all() as any[]
 
-        console.log(
-          `DataImporter: Successfully queried ${conversations.length} conversations with basic fields`
-        )
-
         // 为缺失的字段设置默认值
         conversations = conversations.map((conv) => ({
           ...conv,
@@ -127,55 +113,34 @@ export class DataImporter {
           verbosity: null
         }))
       } catch (fallbackError) {
-        console.error(
-          'DataImporter: Failed to query conversations even with basic fields:',
-          fallbackError
-        )
         throw new Error(
           `Failed to query conversations: ${fallbackError instanceof Error ? fallbackError.message : String(fallbackError)}`
         )
       }
     }
 
-    console.log(`DataImporter: Preparing to import ${conversations.length} conversations`)
-
     // 使用better-sqlite3的transaction API来处理事务
     const importTransaction = this.targetDb.transaction(() => {
       let importedCount = 0
       for (const conv of conversations) {
-        console.log(`DataImporter: Processing conversation ${conv.conv_id}`)
-
-        try {
-          // 如果是增量导入模式，检查会话是否已存在
-          const existingConv = this.targetDb
-            .prepare('SELECT conv_id FROM conversations WHERE conv_id = ?')
-            .get(conv.conv_id)
-          if (existingConv) {
-            console.log(`DataImporter: Conversation ${conv.conv_id} already exists, skipping`)
-            continue // 跳过已存在的会话
-          }
-
-          this.importConversation(conv)
-          importedCount++
-          console.log(`DataImporter: Successfully imported conversation ${conv.conv_id}`)
-        } catch (convError) {
-          console.error(`DataImporter: Failed to import conversation ${conv.conv_id}:`, convError)
-          throw convError
+        // 如果是增量导入模式，检查会话是否已存在
+        const existingConv = this.targetDb
+          .prepare('SELECT conv_id FROM conversations WHERE conv_id = ?')
+          .get(conv.conv_id)
+        if (existingConv) {
+          continue // 跳过已存在的会话
         }
+
+        this.importConversation(conv)
+        importedCount++
       }
       return importedCount
     })
 
     try {
-      console.log('DataImporter: Starting transaction...')
       // 执行事务并返回导入的会话数量
-      const result = importTransaction()
-      console.log(
-        `DataImporter: Transaction completed successfully. Imported ${result} conversations`
-      )
-      return result
+      return importTransaction()
     } catch (transactionError) {
-      console.error('DataImporter: Transaction failed:', transactionError)
       // 事务会自动回滚，抛出详细错误
       throw new Error(
         `Failed to import data: ${transactionError instanceof Error ? transactionError.message : String(transactionError)}`
@@ -188,14 +153,11 @@ export class DataImporter {
    * @param conv 会话数据
    */
   private importConversation(conv: any): void {
-    console.log(`DataImporter: Importing conversation ${conv.conv_id} - ${conv.title}`)
-
     // 为会话生成新ID
     // const newConvId = nanoid()
     // this.idMappings.conversations.set(conv.conv_id, newConvId)
 
     try {
-      console.log(`DataImporter: Attempting to insert conversation ${conv.conv_id} with all fields`)
       // 首先尝试使用包含所有新字段的INSERT语句
       this.targetDb
         .prepare(
@@ -225,15 +187,8 @@ export class DataImporter {
           conv.reasoning_effort || null,
           conv.verbosity || null
         )
-      console.log(
-        `DataImporter: Successfully inserted conversation ${conv.conv_id} with all fields`
-      )
-    } catch (error) {
+    } catch {
       // 如果失败，使用基础字段的INSERT语句（兼容旧版本目标数据库）
-      console.warn(
-        `DataImporter: Failed to insert conversation ${conv.conv_id} with new fields, falling back to basic insert:`,
-        error
-      )
       try {
         this.targetDb
           .prepare(
@@ -258,14 +213,7 @@ export class DataImporter {
             conv.is_new || 0,
             conv.artifacts || 0
           )
-        console.log(
-          `DataImporter: Successfully inserted conversation ${conv.conv_id} with basic fields`
-        )
       } catch (fallbackError) {
-        console.error(
-          `DataImporter: Failed to insert conversation ${conv.conv_id} even with basic fields:`,
-          fallbackError
-        )
         throw new Error(
           `Failed to insert conversation ${conv.conv_id}: ${fallbackError instanceof Error ? fallbackError.message : String(fallbackError)}`
         )
@@ -273,15 +221,9 @@ export class DataImporter {
     }
 
     // 导入该会话的所有消息
-    console.log(`DataImporter: Starting to import messages for conversation ${conv.conv_id}`)
     try {
       this.importMessages(conv.conv_id)
-      console.log(`DataImporter: Successfully imported messages for conversation ${conv.conv_id}`)
     } catch (messageError) {
-      console.error(
-        `DataImporter: Failed to import messages for conversation ${conv.conv_id}:`,
-        messageError
-      )
       throw new Error(
         `Failed to import messages for conversation ${conv.conv_id}: ${messageError instanceof Error ? messageError.message : String(messageError)}`
       )
@@ -293,75 +235,63 @@ export class DataImporter {
    * @param oldConvId 原会话ID
    */
   private importMessages(oldConvId: string): void {
-    try {
-      // 获取会话的所有消息
-      const messages = this.sourceDb
-        .prepare(
-          `SELECT
-            msg_id, parent_id, role, content, created_at,
-            order_seq, token_count, status, metadata,
-            is_context_edge, is_variant
-          FROM messages
-          WHERE conversation_id = ?
-          ORDER BY order_seq`
-        )
-        .all(oldConvId) as any[]
-
-      console.log(`DataImporter: Found ${messages.length} messages for conversation ${oldConvId}`)
-
-      // 逐个导入消息
-      for (const msg of messages) {
-        console.log(`DataImporter: Importing message ${msg.msg_id} (role: ${msg.role})`)
-
-        const newMsgId = nanoid()
-        this.idMappings.messages.set(msg.msg_id, newMsgId)
-
-        // 处理父消息ID映射
-        let newParentId = ''
-        if (msg.parent_id && msg.parent_id !== '') {
-          newParentId = this.idMappings.messages.get(msg.parent_id) || ''
-        }
+    // 获取会话的所有消息
+    const messages = this.sourceDb
+      .prepare(
+        `SELECT
+          msg_id, parent_id, role, content, created_at,
+          order_seq, token_count, status, metadata,
+          is_context_edge, is_variant
+        FROM messages
+        WHERE conversation_id = ?
+        ORDER BY order_seq`
+      )
+      .all(oldConvId) as any[]
 
-        try {
-          // 插入消息
-          this.targetDb
-            .prepare(
-              `INSERT INTO messages (
-                msg_id, conversation_id, parent_id, role, content,
-                created_at, order_seq, token_count, status, metadata,
-                is_context_edge, is_variant
-              ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
-            )
-            .run(
-              newMsgId,
-              oldConvId,
-              newParentId,
-              msg.role,
-              msg.content,
-              msg.created_at,
-              msg.order_seq,
-              msg.token_count || 0,
-              msg.status || 'sent',
-              msg.metadata || null,
-              msg.is_context_edge || 0,
-              msg.is_variant || 0
-            )
+    // 逐个导入消息
+    for (const msg of messages) {
+      const newMsgId = nanoid()
+      this.idMappings.messages.set(msg.msg_id, newMsgId)
 
-          console.log(`DataImporter: Successfully inserted message ${msg.msg_id} -> ${newMsgId}`)
+      // 处理父消息ID映射
+      let newParentId = ''
+      if (msg.parent_id && msg.parent_id !== '') {
+        newParentId = this.idMappings.messages.get(msg.parent_id) || ''
+      }
 
-          // 导入消息的附件
-          this.importAttachments(msg.msg_id, newMsgId)
-          this.importMessageAttachments(msg.msg_id, newMsgId)
-        } catch (msgError) {
-          console.error(`DataImporter: Failed to insert message ${msg.msg_id}:`, msgError)
-          throw new Error(
-            `Failed to insert message ${msg.msg_id}: ${msgError instanceof Error ? msgError.message : String(msgError)}`
+      try {
+        // 插入消息
+        this.targetDb
+          .prepare(
+            `INSERT INTO messages (
+              msg_id, conversation_id, parent_id, role, content,
+              created_at, order_seq, token_count, status, metadata,
+              is_context_edge, is_variant
+            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
           )
-        }
+          .run(
+            newMsgId,
+            oldConvId,
+            newParentId,
+            msg.role,
+            msg.content,
+            msg.created_at,
+            msg.order_seq,
+            msg.token_count || 0,
+            msg.status || 'sent',
+            msg.metadata || null,
+            msg.is_context_edge || 0,
+            msg.is_variant || 0
+          )
+
+        // 导入消息的附件
+        this.importAttachments(msg.msg_id, newMsgId)
+        this.importMessageAttachments(msg.msg_id, newMsgId)
+      } catch (msgError) {
+        throw new Error(
+          `Failed to insert message ${msg.msg_id}: ${msgError instanceof Error ? msgError.message : String(msgError)}`
+        )
       }
-    } catch (error) {
-      console.error(`DataImporter: Failed to import messages for conversation ${oldConvId}:`, error)
-      throw error
     }
   }
 
@@ -371,61 +301,54 @@ export class DataImporter {
    * @param newMsgId 新消息ID
    */
   private importAttachments(oldMsgId: string, newMsgId: string): void {
-    try {
-      // 获取消息的所有附件
-      const attachments = this.sourceDb
+    // 获取消息的所有附件
+    const attachments = this.sourceDb
+      .prepare(
+        `SELECT
+          attach_id, attachment_type, file_name, file_size,
+          storage_type, storage_path, thumbnail, vectorized,
+          data_summary, mime_type, created_at
+        FROM attachments
+        WHERE message_id = ?`
+      )
+      .all(oldMsgId) as any[]
+
+    // 逐个导入附件
+    for (const attachment of attachments) {
+      const newAttachId = nanoid()
+      this.idMappings.attachments.set(attachment.attach_id, newAttachId)
+
+      // 处理存储路径
+      let storagePath = attachment.storage_path
+      if (storagePath && attachment.storage_type === 'path') {
+        // 如果是文件路径，可能需要复制文件或调整路径
+        // 这里简单处理，实际应用中可能需要更复杂的逻辑
+        storagePath = path.basename(storagePath)
+      }
+
+      // 插入附件
+      this.targetDb
         .prepare(
-          `SELECT
-            attach_id, attachment_type, file_name, file_size,
-            storage_type, storage_path, thumbnail, vectorized,
-            data_summary, mime_type, created_at
-          FROM attachments
-          WHERE message_id = ?`
+          `INSERT INTO attachments (
+            attach_id, message_id, attachment_type, file_name,
+            file_size, storage_type, storage_path, thumbnail,
+            vectorized, data_summary, mime_type, created_at
+          ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+        )
+        .run(
+          newAttachId,
+          newMsgId,
+          attachment.attachment_type,
+          attachment.file_name,
+          attachment.file_size || 0,
+          attachment.storage_type,
+          storagePath,
+          attachment.thumbnail,
+          attachment.vectorized || 0,
+          attachment.data_summary,
+          attachment.mime_type,
+          attachment.created_at
         )
-        .all(oldMsgId) as any[]
-
-      console.log(`DataImporter: Found ${attachments.length} attachments for message ${oldMsgId}`)
-
-      // 逐个导入附件
-      for (const attachment of attachments) {
-        const newAttachId = nanoid()
-        this.idMappings.attachments.set(attachment.attach_id, newAttachId)
-
-        // 处理存储路径
-        let storagePath = attachment.storage_path
-        if (storagePath && attachment.storage_type === 'path') {
-          // 如果是文件路径，可能需要复制文件或调整路径
-          // 这里简单处理，实际应用中可能需要更复杂的逻辑
-          storagePath = path.basename(storagePath)
-        }
-
-        // 插入附件
-        this.targetDb
-          .prepare(
-            `INSERT INTO attachments (
-              attach_id, message_id, attachment_type, file_name,
-              file_size, storage_type, storage_path, thumbnail,
-              vectorized, data_summary, mime_type, created_at
-            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
-          )
-          .run(
-            newAttachId,
-            newMsgId,
-            attachment.attachment_type,
-            attachment.file_name,
-            attachment.file_size || 0,
-            attachment.storage_type,
-            storagePath,
-            attachment.thumbnail,
-            attachment.vectorized || 0,
-            attachment.data_summary,
-            attachment.mime_type,
-            attachment.created_at
-          )
-      }
-    } catch (error) {
-      console.error(`DataImporter: Failed to import attachments for message ${oldMsgId}:`, error)
-      throw error
     }
   }
 
@@ -435,93 +358,73 @@ export class DataImporter {
    * @param newMsgId 新消息ID
    */
   private importMessageAttachments(oldMsgId: string, newMsgId: string): void {
+    // 获取消息的所有message_attachments - 兼容不同的schema版本
+    let messageAttachments: any[]
+
     try {
-      // 获取消息的所有message_attachments - 兼容不同的schema版本
-      let messageAttachments: any[]
+      // 首先尝试包含metadata字段的查询
+      messageAttachments = this.sourceDb
+        .prepare(
+          `SELECT
+            attachment_id, type, content, created_at, metadata
+          FROM message_attachments
+          WHERE message_id = ?`
+        )
+        .all(oldMsgId) as any[]
+    } catch {
+      // 如果失败，使用不包含metadata的查询（兼容新版本schema）
+      messageAttachments = this.sourceDb
+        .prepare(
+          `SELECT
+            attachment_id, type, content, created_at
+          FROM message_attachments
+          WHERE message_id = ?`
+        )
+        .all(oldMsgId) as any[]
+
+      // 为缺失的字段设置默认值
+      messageAttachments = messageAttachments.map((attachment) => ({
+        ...attachment,
+        metadata: null
+      }))
+    }
+
+    // 逐个导入message_attachments
+    for (const attachment of messageAttachments) {
+      const newAttachmentId = nanoid()
 
       try {
-        // 首先尝试包含metadata字段的查询
-        messageAttachments = this.sourceDb
+        // 首先尝试包含metadata字段的INSERT
+        this.targetDb
           .prepare(
-            `SELECT
-              attachment_id, type, content, created_at, metadata
-            FROM message_attachments
-            WHERE message_id = ?`
+            `INSERT INTO message_attachments (
+              attachment_id, message_id, type, content, created_at, metadata
+            ) VALUES (?, ?, ?, ?, ?, ?)`
           )
-          .all(oldMsgId) as any[]
-      } catch (queryError) {
-        // 如果失败，使用不包含metadata的查询（兼容新版本schema）
-        console.warn(
-          `DataImporter: Failed to query message_attachments with metadata field, trying without metadata:`,
-          queryError
-        )
-        messageAttachments = this.sourceDb
+          .run(
+            newAttachmentId,
+            newMsgId,
+            attachment.type,
+            attachment.content,
+            attachment.created_at,
+            attachment.metadata
+          )
+      } catch {
+        // 如果失败，使用不包含metadata的INSERT（兼容新版本schema）
+        this.targetDb
           .prepare(
-            `SELECT
-              attachment_id, type, content, created_at
-            FROM message_attachments
-            WHERE message_id = ?`
+            `INSERT INTO message_attachments (
+              attachment_id, message_id, type, content, created_at
+            ) VALUES (?, ?, ?, ?, ?)`
           )
-          .all(oldMsgId) as any[]
-
-        // 为缺失的字段设置默认值
-        messageAttachments = messageAttachments.map((attachment) => ({
-          ...attachment,
-          metadata: null
-        }))
-      }
-
-      console.log(
-        `DataImporter: Found ${messageAttachments.length} message attachments for message ${oldMsgId}`
-      )
-
-      // 逐个导入message_attachments
-      for (const attachment of messageAttachments) {
-        const newAttachmentId = nanoid()
-
-        try {
-          // 首先尝试包含metadata字段的INSERT
-          this.targetDb
-            .prepare(
-              `INSERT INTO message_attachments (
-                attachment_id, message_id, type, content, created_at, metadata
-              ) VALUES (?, ?, ?, ?, ?, ?)`
-            )
-            .run(
-              newAttachmentId,
-              newMsgId,
-              attachment.type,
-              attachment.content,
-              attachment.created_at,
-              attachment.metadata
-            )
-        } catch (insertError) {
-          // 如果失败，使用不包含metadata的INSERT（兼容新版本schema）
-          console.warn(
-            `DataImporter: Failed to insert message_attachment with metadata, trying without metadata:`,
-            insertError
+          .run(
+            newAttachmentId,
+            newMsgId,
+            attachment.type,
+            attachment.content,
+            attachment.created_at
           )
-          this.targetDb
-            .prepare(
-              `INSERT INTO message_attachments (
-                attachment_id, message_id, type, content, created_at
-              ) VALUES (?, ?, ?, ?, ?)`
-            )
-            .run(
-              newAttachmentId,
-              newMsgId,
-              attachment.type,
-              attachment.content,
-              attachment.created_at
-            )
-        }
       }
-    } catch (error) {
-      console.error(
-        `DataImporter: Failed to import message attachments for message ${oldMsgId}:`,
-        error
-      )
-      throw error
     }
   }
 

From e2770cab44b04936b4a2dd2b96f90553326b3674 Mon Sep 17 00:00:00 2001
From: yyhhyyyyyy <yyhhyyyyyy8@gmail.com>
Date: Sat, 30 Aug 2025 00:40:10 +0800
Subject: [PATCH 7/8] fix: resolve missing i18n translations for system prompt
 operations

---
 src/renderer/src/components/settings/PromptSetting.vue | 8 ++++----
 src/renderer/src/i18n/en-US/settings.json              | 6 +++++-
 src/renderer/src/i18n/fa-IR/settings.json              | 6 +++++-
 src/renderer/src/i18n/fr-FR/settings.json              | 6 +++++-
 src/renderer/src/i18n/ja-JP/settings.json              | 6 +++++-
 src/renderer/src/i18n/ko-KR/settings.json              | 6 +++++-
 src/renderer/src/i18n/ru-RU/settings.json              | 6 +++++-
 src/renderer/src/i18n/zh-CN/settings.json              | 6 +++++-
 src/renderer/src/i18n/zh-HK/settings.json              | 6 +++++-
 src/renderer/src/i18n/zh-TW/settings.json              | 6 +++++-
 10 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/src/renderer/src/components/settings/PromptSetting.vue b/src/renderer/src/components/settings/PromptSetting.vue
index 2d5972477..65418ce24 100644
--- a/src/renderer/src/components/settings/PromptSetting.vue
+++ b/src/renderer/src/components/settings/PromptSetting.vue
@@ -1054,7 +1054,7 @@ const resetToDefaultPrompt = async () => {
     defaultPromptSaveStatus.value = 'saved'
 
     toast({
-      title: t('promptSetting.resetToDefaultSuccess'),
+      title: t('settings.promptSetting.resetToDefaultSuccess'),
       variant: 'default'
     })
 
@@ -1067,7 +1067,7 @@ const resetToDefaultPrompt = async () => {
   } catch {
     defaultPromptSaveStatus.value = 'idle'
     toast({
-      title: t('promptSetting.resetToDefaultFailed'),
+      title: t('settings.promptSetting.resetToDefaultFailed'),
       variant: 'destructive'
     })
   }
@@ -1085,7 +1085,7 @@ const clearSystemPrompt = async () => {
     defaultPromptSaveStatus.value = 'saved'
 
     toast({
-      title: t('promptSetting.clearSuccess'),
+      title: t('settings.promptSetting.clearSuccess'),
       variant: 'default'
     })
 
@@ -1098,7 +1098,7 @@ const clearSystemPrompt = async () => {
   } catch {
     defaultPromptSaveStatus.value = 'idle'
     toast({
-      title: t('promptSetting.clearFailed'),
+      title: t('settings.promptSetting.clearFailed'),
       variant: 'destructive'
     })
   }
diff --git a/src/renderer/src/i18n/en-US/settings.json b/src/renderer/src/i18n/en-US/settings.json
index 7ad42125e..fbb546cdc 100644
--- a/src/renderer/src/i18n/en-US/settings.json
+++ b/src/renderer/src/i18n/en-US/settings.json
@@ -796,6 +796,10 @@
   },
   "promptSetting": {
     "resetToDefault": "Reset to default prompt",
-    "clear": "Clear prompt words"
+    "clear": "Clear prompt words",
+    "resetToDefaultSuccess": "Reset to default system prompt successfully",
+    "resetToDefaultFailed": "Failed to reset, please try again",
+    "clearSuccess": "System prompt cleared successfully",
+    "clearFailed": "Failed to clear, please try again"
   }
 }
diff --git a/src/renderer/src/i18n/fa-IR/settings.json b/src/renderer/src/i18n/fa-IR/settings.json
index 5d51055d9..c15c20f81 100644
--- a/src/renderer/src/i18n/fa-IR/settings.json
+++ b/src/renderer/src/i18n/fa-IR/settings.json
@@ -796,6 +796,10 @@
   },
   "promptSetting": {
     "resetToDefault": "تنظیم مجدد به پیش فرض کلمه سریع",
-    "clear": "کلمات سریع را پاک کنید"
+    "clear": "کلمات سریع را پاک کنید",
+    "resetToDefaultSuccess": "تنظیم مجدد به اعلان سیستم پیش‌فرض با موفقیت انجام شد",
+    "resetToDefaultFailed": "تنظیم مجدد ناموفق، لطفا دوباره تلاش کنید",
+    "clearSuccess": "اعلان سیستم با موفقیت پاک شد",
+    "clearFailed": "پاک کردن ناموفق، لطفا دوباره تلاش کنید"
   }
 }
diff --git a/src/renderer/src/i18n/fr-FR/settings.json b/src/renderer/src/i18n/fr-FR/settings.json
index 58a88ece9..d39489fde 100644
--- a/src/renderer/src/i18n/fr-FR/settings.json
+++ b/src/renderer/src/i18n/fr-FR/settings.json
@@ -796,6 +796,10 @@
   },
   "promptSetting": {
     "resetToDefault": "Réinitialiser avec un mot rapide par défaut",
-    "clear": "Effacer les mots rapides"
+    "clear": "Effacer les mots rapides",
+    "resetToDefaultSuccess": "Réinitialisé avec succès à l'invite système par défaut",
+    "resetToDefaultFailed": "Échec de la réinitialisation, veuillez réessayer",
+    "clearSuccess": "Invite système effacée avec succès",
+    "clearFailed": "Échec de l'effacement, veuillez réessayer"
   }
 }
diff --git a/src/renderer/src/i18n/ja-JP/settings.json b/src/renderer/src/i18n/ja-JP/settings.json
index 5694e67b6..9d9dd23a3 100644
--- a/src/renderer/src/i18n/ja-JP/settings.json
+++ b/src/renderer/src/i18n/ja-JP/settings.json
@@ -796,6 +796,10 @@
   },
   "promptSetting": {
     "resetToDefault": "デフォルトのプロンプトワードにリセットします",
-    "clear": "迅速な単語を明確にします"
+    "clear": "迅速な単語を明確にします",
+    "resetToDefaultSuccess": "デフォルトのシステムプロンプトに正常にリセットしました",
+    "resetToDefaultFailed": "リセットに失敗しました。もう一度お試しください",
+    "clearSuccess": "システムプロンプトが正常にクリアされました",
+    "clearFailed": "クリアに失敗しました。もう一度お試しください"
   }
 }
diff --git a/src/renderer/src/i18n/ko-KR/settings.json b/src/renderer/src/i18n/ko-KR/settings.json
index 6cb34fcf7..d32ce6cb9 100644
--- a/src/renderer/src/i18n/ko-KR/settings.json
+++ b/src/renderer/src/i18n/ko-KR/settings.json
@@ -796,6 +796,10 @@
   },
   "promptSetting": {
     "resetToDefault": "기본 프롬프트 단어로 재설정하십시오",
-    "clear": "명확한 신속한 단어"
+    "clear": "명확한 신속한 단어",
+    "resetToDefaultSuccess": "기본 시스템 프롬프트로 성공적으로 재설정되었습니다",
+    "resetToDefaultFailed": "재설정에 실패했습니다. 다시 시도해 주세요",
+    "clearSuccess": "시스템 프롬프트가 성공적으로 지워졌습니다",
+    "clearFailed": "지우기에 실패했습니다. 다시 시도해 주세요"
   }
 }
diff --git a/src/renderer/src/i18n/ru-RU/settings.json b/src/renderer/src/i18n/ru-RU/settings.json
index fb3cee2ee..9679d8cc2 100644
--- a/src/renderer/src/i18n/ru-RU/settings.json
+++ b/src/renderer/src/i18n/ru-RU/settings.json
@@ -796,6 +796,10 @@
   },
   "promptSetting": {
     "resetToDefault": "Сбросить в приглашение по умолчанию слово",
-    "clear": "Чистые быстрые слова"
+    "clear": "Чистые быстрые слова",
+    "resetToDefaultSuccess": "Успешно сброшено к системному приглашению по умолчанию",
+    "resetToDefaultFailed": "Ошибка сброса, пожалуйста, попробуйте еще раз",
+    "clearSuccess": "Системное приглашение успешно очищено",
+    "clearFailed": "Ошибка очистки, пожалуйста, попробуйте еще раз"
   }
 }
diff --git a/src/renderer/src/i18n/zh-CN/settings.json b/src/renderer/src/i18n/zh-CN/settings.json
index 7465fda33..509ff1071 100644
--- a/src/renderer/src/i18n/zh-CN/settings.json
+++ b/src/renderer/src/i18n/zh-CN/settings.json
@@ -796,6 +796,10 @@
   },
   "promptSetting": {
     "clear": "清空提示词",
-    "resetToDefault": "重置为默认提示词"
+    "resetToDefault": "重置为默认提示词",
+    "resetToDefaultSuccess": "已重置为默认系统提示词",
+    "resetToDefaultFailed": "重置失败，请重试",
+    "clearSuccess": "已清空系统提示词",
+    "clearFailed": "清空失败，请重试"
   }
 }
diff --git a/src/renderer/src/i18n/zh-HK/settings.json b/src/renderer/src/i18n/zh-HK/settings.json
index f5ef20456..b52a7e1ee 100644
--- a/src/renderer/src/i18n/zh-HK/settings.json
+++ b/src/renderer/src/i18n/zh-HK/settings.json
@@ -796,6 +796,10 @@
   },
   "promptSetting": {
     "resetToDefault": "重置為默認提示詞",
-    "clear": "清空提示詞"
+    "clear": "清空提示詞",
+    "resetToDefaultSuccess": "已重置為默認系統提示詞",
+    "resetToDefaultFailed": "重置失敗，請重試",
+    "clearSuccess": "已清空系統提示詞",
+    "clearFailed": "清空失敗，請重試"
   }
 }
diff --git a/src/renderer/src/i18n/zh-TW/settings.json b/src/renderer/src/i18n/zh-TW/settings.json
index b7fab8775..8d1263959 100644
--- a/src/renderer/src/i18n/zh-TW/settings.json
+++ b/src/renderer/src/i18n/zh-TW/settings.json
@@ -796,6 +796,10 @@
   },
   "promptSetting": {
     "resetToDefault": "重置為默認提示詞",
-    "clear": "清空提示詞"
+    "clear": "清空提示詞",
+    "resetToDefaultSuccess": "已重置為默認系統提示詞",
+    "resetToDefaultFailed": "重置失敗，請重試",
+    "clearSuccess": "已清空系統提示詞",
+    "clearFailed": "清空失敗，請重試"
   }
 }

From 1c5205f58d6d30825169f5d2c4e18f414e6a55bb Mon Sep 17 00:00:00 2001
From: yyhhyyyyyy <yyhhyyyyyy8@gmail.com>
Date: Sat, 30 Aug 2025 09:51:22 +0800
Subject: [PATCH 8/8] fix: center window when restored position is out of
 screen bounds

---
 src/main/presenter/windowPresenter/index.ts | 47 ++++++++++++++++++---
 1 file changed, 42 insertions(+), 5 deletions(-)

diff --git a/src/main/presenter/windowPresenter/index.ts b/src/main/presenter/windowPresenter/index.ts
index 24e98ecca..83c091f3a 100644
--- a/src/main/presenter/windowPresenter/index.ts
+++ b/src/main/presenter/windowPresenter/index.ts
@@ -1,5 +1,5 @@
 // src\main\presenter\windowPresenter\index.ts
-import { BrowserWindow, shell, nativeImage, ipcMain } from 'electron'
+import { BrowserWindow, shell, nativeImage, ipcMain, screen } from 'electron'
 import { join } from 'path'
 import icon from '../../../../resources/icon.png?asset' // 应用图标 (macOS/Linux)
 import iconWin from '../../../../resources/icon.ico?asset' // 应用图标 (Windows)
@@ -575,10 +575,25 @@ export class WindowPresenter implements IWindowPresenter {
       defaultHeight: 620
     })
 
-    // 计算初始位置，确保 Y 坐标不为负数
-    const initialX = options?.x !== undefined ? options.x : shellWindowState.x
-    let initialY = options?.y !== undefined ? options?.y : shellWindowState.y
-    initialY = Math.max(0, initialY || 0)
+    // 计算初始位置，确保窗口完全在屏幕范围内
+    const initialX =
+      options?.x !== undefined
+        ? options.x
+        : this.validateWindowPosition(
+            shellWindowState.x,
+            shellWindowState.width,
+            shellWindowState.y,
+            shellWindowState.height
+          ).x
+    let initialY =
+      options?.y !== undefined
+        ? options?.y
+        : this.validateWindowPosition(
+            shellWindowState.x,
+            shellWindowState.width,
+            shellWindowState.y,
+            shellWindowState.height
+          ).y
 
     const shellWindow = new BrowserWindow({
       width: shellWindowState.width,
@@ -1179,4 +1194,26 @@ export class WindowPresenter implements IWindowPresenter {
   public setApplicationQuitting(isQuitting: boolean): void {
     this.isQuitting = isQuitting
   }
+
+  private validateWindowPosition(
+    x: number,
+    width: number,
+    y: number,
+    height: number
+  ): { x: number; y: number } {
+    const primaryDisplay = screen.getPrimaryDisplay()
+    const { workArea } = primaryDisplay
+    const isXValid = x >= workArea.x && x + width <= workArea.x + workArea.width
+    const isYValid = y >= workArea.y && y + height <= workArea.y + workArea.height
+    if (!isXValid || !isYValid) {
+      console.log(
+        `Window position out of bounds (x: ${x}, y: ${y}, width: ${width}, height: ${height}), centering window`
+      )
+      return {
+        x: workArea.x + Math.max(0, (workArea.width - width) / 2),
+        y: workArea.y + Math.max(0, (workArea.height - height) / 2)
+      }
+    }
+    return { x, y }
+  }
 }