From be1ce8f162992fdb1a76cd4ac9b40b1fed4750c5 Mon Sep 17 00:00:00 2001
From: front_cat <luoxi1031596654@gmail.com>
Date: Tue, 15 Jul 2025 00:39:27 +0800
Subject: [PATCH 1/2] fixed: the mcpServer you need maybe undefined when you
 want to use

---
 .../settings/DifyKnowledgeSettings.vue        | 29 +++++++++++++++----
 .../settings/FastGptKnowledgeSettings.vue     | 22 ++++++++++++--
 .../settings/RagflowKnowledgeSettings.vue     | 21 ++++++++++++--
 src/renderer/src/stores/mcp.ts                | 11 +++++--
 src/shared/presenter.d.ts                     |  1 +
 5 files changed, 71 insertions(+), 13 deletions(-)

diff --git a/src/renderer/src/components/settings/DifyKnowledgeSettings.vue b/src/renderer/src/components/settings/DifyKnowledgeSettings.vue
index 9eb765e52..d676eb2d0 100644
--- a/src/renderer/src/components/settings/DifyKnowledgeSettings.vue
+++ b/src/renderer/src/components/settings/DifyKnowledgeSettings.vue
@@ -183,7 +183,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, onMounted, watch, toRaw } from 'vue'
+import { ref, computed, onMounted, watch, toRaw, onUnmounted } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { Icon } from '@iconify/vue'
 import { Button } from '@/components/ui/button'
@@ -402,11 +402,6 @@ watch(
   }
 )
 
-// 组件挂载时加载配置
-onMounted(async () => {
-  await loadDifyConfigFromMcp()
-})
-
 // 监听URL查询参数，设置活动标签页
 watch(
   () => route.query.subtab,
@@ -417,4 +412,26 @@ watch(
   },
   { immediate: true }
 )
+
+// 组件挂载时加载配置
+let unwatch: () => void // only use here, so declare it here
+onMounted(async () => {
+  unwatch = watch(
+    () => mcpStore.config.ready,
+    async (ready) => {
+      if (ready) {
+        unwatch() // only run once to avoid multiple calls
+        await loadDifyConfigFromMcp()
+      }
+    },
+    { immediate: true }
+  )
+})
+
+// cancel the watch to avoid memory leaks
+onUnmounted(() => {
+  if (unwatch) {
+    unwatch()
+  }
+})
 </script>
diff --git a/src/renderer/src/components/settings/FastGptKnowledgeSettings.vue b/src/renderer/src/components/settings/FastGptKnowledgeSettings.vue
index 933bbf413..4855b938a 100644
--- a/src/renderer/src/components/settings/FastGptKnowledgeSettings.vue
+++ b/src/renderer/src/components/settings/FastGptKnowledgeSettings.vue
@@ -183,7 +183,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, onMounted, watch, toRaw } from 'vue'
+import { ref, computed, onMounted, watch, toRaw, onUnmounted } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { Icon } from '@iconify/vue'
 import { Button } from '@/components/ui/button'
@@ -355,6 +355,7 @@ const updateFastGptConfigToMcp = async () => {
 const loadFastGptConfigFromMcp = async () => {
   try {
     // 获取fastGptKnowledge服务器配置
+    console.log(mcpStore.config)
     const serverConfig = mcpStore.config.mcpServers['fastGptKnowledge']
     if (serverConfig && serverConfig.env) {
       // 解析配置 - env可能是JSON字符串
@@ -412,7 +413,24 @@ watch(
 )
 
 // 组件挂载时加载配置
+let unwatch: () => void // only use here, so declare it here
 onMounted(async () => {
-  await loadFastGptConfigFromMcp()
+  unwatch = watch(
+    () => mcpStore.config.ready,
+    async (ready) => {
+      if (ready) {
+        unwatch() // only run once to avoid multiple calls
+        await loadFastGptConfigFromMcp()
+      }
+    },
+    { immediate: true }
+  )
+})
+
+// cancel the watch to avoid memory leaks
+onUnmounted(() => {
+  if (unwatch) {
+    unwatch()
+  }
 })
 </script>
diff --git a/src/renderer/src/components/settings/RagflowKnowledgeSettings.vue b/src/renderer/src/components/settings/RagflowKnowledgeSettings.vue
index f7d5c7502..e48b634db 100644
--- a/src/renderer/src/components/settings/RagflowKnowledgeSettings.vue
+++ b/src/renderer/src/components/settings/RagflowKnowledgeSettings.vue
@@ -183,7 +183,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, onMounted, watch, toRaw } from 'vue'
+import { ref, computed, onMounted, watch, toRaw, onUnmounted } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { Icon } from '@iconify/vue'
 import { Button } from '@/components/ui/button'
@@ -431,7 +431,24 @@ watch(
 )
 
 // 组件挂载时加载配置
+let unwatch: () => void // only use here, so declare it here
 onMounted(async () => {
-  await loadRagflowConfigFromMcp()
+  unwatch = watch(
+    () => mcpStore.config.ready,
+    async (ready) => {
+      if (ready) {
+        unwatch() // only run once to avoid multiple calls
+        await loadRagflowConfigFromMcp()
+      }
+    },
+    { immediate: true }
+  )
+})
+
+// cancel the watch to avoid memory leaks
+onUnmounted(() => {
+  if (unwatch) {
+    unwatch()
+  }
 })
 </script>
diff --git a/src/renderer/src/stores/mcp.ts b/src/renderer/src/stores/mcp.ts
index a5c7cf36a..032e57bed 100644
--- a/src/renderer/src/stores/mcp.ts
+++ b/src/renderer/src/stores/mcp.ts
@@ -38,7 +38,8 @@ export const useMcpStore = defineStore('mcp', () => {
   const config = ref<MCPConfig>({
     mcpServers: {},
     defaultServers: [],
-    mcpEnabled: false // 添加MCP启用状态
+    mcpEnabled: false, // 添加MCP启用状态
+    ready: false // if init finished, the ready will be true
   })
 
   // MCP全局启用状态
@@ -108,13 +109,17 @@ export const useMcpStore = defineStore('mcp', () => {
         mcpPresenter.getMcpDefaultServers(),
         mcpPresenter.getMcpEnabled()
       ])
-
       config.value = {
         mcpServers: servers,
         defaultServers: defaultServers,
-        mcpEnabled: enabled
+        mcpEnabled: enabled,
+        ready: true // config is loaded
       }
 
+      setTimeout(() => {
+        config.value.ready = false // 设置ready为true，表示配置加载完成
+      }, 1000)
+
       // 获取服务器运行状态
       await updateAllServerStatuses()
     } catch (error) {
diff --git a/src/shared/presenter.d.ts b/src/shared/presenter.d.ts
index c09548b4c..426078284 100644
--- a/src/shared/presenter.d.ts
+++ b/src/shared/presenter.d.ts
@@ -875,6 +875,7 @@ export interface MCPConfig {
   mcpServers: Record<string, MCPServerConfig>
   defaultServers: string[]
   mcpEnabled: boolean
+  ready: boolean
 }
 
 export interface MCPToolDefinition {

From a36282dc1904393ba4411fce6686f087e47aa98b Mon Sep 17 00:00:00 2001
From: front_cat <luoxi1031596654@gmail.com>
Date: Tue, 15 Jul 2025 00:46:07 +0800
Subject: [PATCH 2/2] del: delete the test settimeout

---
 src/renderer/src/stores/mcp.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/renderer/src/stores/mcp.ts b/src/renderer/src/stores/mcp.ts
index 032e57bed..a7a4dd484 100644
--- a/src/renderer/src/stores/mcp.ts
+++ b/src/renderer/src/stores/mcp.ts
@@ -116,10 +116,6 @@ export const useMcpStore = defineStore('mcp', () => {
         ready: true // config is loaded
       }
 
-      setTimeout(() => {
-        config.value.ready = false // 设置ready为true，表示配置加载完成
-      }, 1000)
-
       // 获取服务器运行状态
       await updateAllServerStatuses()
     } catch (error) {