Merge branch 'main' of github.com:OpenAgentPlatform/Dive

Author: ckaznable

mcp-host

@@ -2,7 +2,7 @@ import { RouterProvider } from "react-router-dom"
 import { router } from "./router"
 import { useAtom, useAtomValue, useSetAtom } from "jotai"
 import { removeOapConfigAtom, writeOapConfigAtom } from "./atoms/configState"
-import { useEffect } from "react"
+import { useEffect, useRef, useState } from "react"
 import { handleGlobalHotkey } from "./atoms/hotkeyState"
 import { handleWindowResizeAtom } from "./atoms/sidebarState"
 import { systemThemeAtom } from "./atoms/themeState"
@@ -16,8 +16,11 @@ import { setModelSettings } from "./ipc/config"
 import { oapGetMe, oapGetToken, oapLogout, registBackendEvent } from "./ipc"
 import { refreshConfig } from "./ipc/host"
 import { openOverlayAtom } from "./atoms/layerState"
+import PopupConfirm from "./components/PopupConfirm"
 
 function App() {
+  const { t } = useTranslation()
+
   const setSystemTheme = useSetAtom(systemThemeAtom)
   const handleWindowResize = useSetAtom(handleWindowResizeAtom)
   const setOAPUser = useSetAtom(oapUserAtom)
@@ -32,7 +35,10 @@ function App() {
   const loadMcpConfig = useSetAtom(loadMcpConfigAtom)
   const loadOapTools = useSetAtom(loadOapToolsAtom)
   const openOverlay = useSetAtom(openOverlayAtom)
+
   const setInstallToolBuffer = useSetAtom(installToolBufferAtom)
+  const installToolBuffer = useRef<{ name: string, config: any } | null>(null)
+  const [installToolConfirm, setInstallToolConfirm] = useState(false)
 
   useEffect(() => {
     console.log("set model setting", modelSetting)
@@ -67,6 +73,21 @@ function App() {
     }
   }
 
+  const openToolPageWithMcpServerJson = (data?: { name: string, config: any }) => {
+    if (!data && !installToolBuffer.current) {
+      return
+    }
+
+    try {
+      data = data || installToolBuffer.current!
+      const { name, config } = data
+      setInstallToolBuffer(prev => [...prev, { name, config }])
+      openOverlay("Tools")
+    } catch(e) {
+      console.error("mcp install error", e)
+    }
+  }
+
   // handle backend event
   useEffect(() => {
     const unregistLogin = registBackendEvent("login", () => {
@@ -100,15 +121,18 @@ function App() {
     })
 
     const unlistenMcpInstall = registBackendEvent("mcp.install", (data: { name: string, config: string }) => {
-      try {
-        const { name } = data
-        const config = JSON.parse(atob(data.config))
-        console.log(config)
-        setInstallToolBuffer(prev => [...prev, { name, config }])
-        openOverlay("Tools")
-      } catch(e) {
-        console.error("oap mcp install error", e)
+      const _config = JSON.parse(atob(data.config))
+      if (!_config.transport) {
+        return
       }
+
+      if (_config.transport === "stdio") {
+        setInstallToolConfirm(true)
+        installToolBuffer.current = { name: data.name, config: _config }
+        return
+      }
+
+      openToolPageWithMcpServerJson({ name: data.name, config: _config })
     })
 
     return () => {
@@ -161,10 +185,35 @@ function App() {
     document.documentElement.lang = langCode
   }, [i18n.language])
 
+  const closeInstallTool = () => {
+    setInstallToolConfirm(false)
+    installToolBuffer.current = null
+  }
+
   return (
     <>
       <RouterProvider router={router} />
       <Updater />
+
+      {installToolConfirm &&
+        <PopupConfirm
+          confirmText={t("common.confirm")}
+          cancelText={t("common.cancel")}
+          onConfirm={() => {
+            openToolPageWithMcpServerJson()
+            closeInstallTool()
+          }}
+          onCancel={closeInstallTool}
+          onClickOutside={closeInstallTool}
+          noBorder
+          footerType="center"
+          zIndex={1000}
+          className="mcp-install-confirm-modal"
+        >
+          {t("deeplink.mcpInstallConfirm")}
+          <pre>{installToolBuffer.current!.config.command} {installToolBuffer.current!.config.args.join(" ")}</pre>
+        </PopupConfirm>
+    }
     </>
   )
 }

src/App.tsx

@@ -3,7 +3,7 @@ import { ModelConfig, ModelConfigMap, ModelParameter, RawModelConfig } from "../
 import { defaultInterface } from "../atoms/interfaceState"
 import isMatch from "lodash/isMatch"
 import merge from "lodash/merge"
-import { getVerifyKeyFromModelConfig } from "./verify"
+import { getVerifyKey, getVerifyKeyFromModelConfig } from "./verify"
 import { getVerifyStatus } from "../views/Overlay/Model/ModelVerify"
 
 export type GroupTerm = Partial<Omit<LLMGroup, "models">>
@@ -267,13 +267,24 @@ export function getGroupAndModel(groupTerm: GroupTerm, modelTerm: ModelTerm, gro
 export function intoModelConfig(group: LLMGroup, model: BaseModel): ModelConfig {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const { active, models, extra, custom, baseURL, apiKey, ...baseConfig } = group
-  const { disableStreaming, toolsInPrompt, extra: modelExtra, custom: modelCustom, model: modelName } = model
+  const { disableStreaming, extra: modelExtra, custom: modelCustom, model: modelName } = model
+
+  const allVerifiedList: Record<string, any> = JSON.parse(localStorage.getItem("modelVerify") || "{}")
+  const status = getVerifyStatus(allVerifiedList?.[getVerifyKey(group)][modelName] ?? null)
 
   const modelConfig = baseConfig as unknown as ModelConfig
   modelConfig.disable_streaming = disableStreaming
-  modelConfig.toolsInPrompt = toolsInPrompt
+  modelConfig.toolsInPrompt = status === "successInPrompt"
   modelConfig.model = modelName
-  modelConfig.modelProvider = group.modelProvider === "openai_compatible" ? "openai" : group.modelProvider
+  modelConfig.modelProvider = [
+    "openai_compatible",
+    "lmstudio",
+    "openrouter",
+    "groq",
+    "grok",
+    "nvdia",
+    "perplexity",
+  ].includes(group.modelProvider) ? "openai" : group.modelProvider
 
   if (apiKey) {
     modelConfig.apiKey = apiKey

src/helper/model.ts

@@ -406,5 +406,8 @@
     "retry": "Retry",
     "stop": "Stop",
     "tip": "If an error occurs during download, please close this window first and restart the application to re-download."
+  },
+  "deeplink": {
+    "mcpInstallConfirm": "Add stdio MCP Service - You will add MCP via the following command, please confirm:"
   }
 }

src/locales/en/translation.json

@@ -406,5 +406,8 @@
     "retry": "Reintentar",
     "stop": "Detener",
     "tip": "Si ocurre un error durante la descarga, cierre primero esta ventana y reinicie la aplicación para volver a descargar."
+  },
+  "deeplink": {
+    "mcpInstallConfirm": "Agregar servicio stdio MCP - Agregarás MCP mediante el siguiente comando, por favor confirma:"
   }
 }

src/locales/es/translation.json

@@ -406,5 +406,8 @@
     "retry": "再試行",
     "stop": "停止",
     "tip": "ダウンロード中にエラーが発生した場合は、まずこのウィンドウを閉じてアプリケーションを再起動すると、再ダウンロードできます。"
+  },
+  "deeplink": {
+    "mcpInstallConfirm": "stdio MCP サービスを追加 - 以下のコマンドで MCP を追加します。確認してください："
   }
 }

src/locales/ja/translation.json

@@ -406,5 +406,8 @@
     "retry": "다시 시도",
     "stop": "중지",
     "tip": "다운로드 중 오류가 발생하면 이 창을 닫고 애플리케이션을 다시 시작하여 다시 시도하세요."
+  },
+  "deeplink": {
+    "mcpInstallConfirm": "stdio MCP 서비스 추가 - 다음 명령을 통해 MCP를 추가합니다. 확인하세요:"
   }
 }

src/locales/ko/translation.json

@@ -406,5 +406,8 @@
     "retry": "重新尝试",
     "stop": "停止",
     "tip": "下载发生错误时，请先关闭此窗口，重新启动应用程序即可重新下载。"
+  },
+  "deeplink": {
+    "mcpInstallConfirm": "新增 stdio MCP 服务 - 你将会通过下列命令新增 MCP，请确认："
   }
 }

src/locales/zh-CN/translation.json

@@ -406,5 +406,8 @@
     "retry": "重新嘗試",
     "stop": "停止",
     "tip": "下載發生錯誤時，請先關閉此視窗，重新啟動應用程式即可重新下載。"
+  },
+  "deeplink": {
+    "mcpInstallConfirm": "新增 stdio MCP 服務 - 你將會透過下列命令新增 MCP, 請確認: "
   }
 }

src/locales/zh-TW/translation.json

@@ -408,4 +408,8 @@
       }
     }
   }
+
+  &.mcp-install-confirm-modal {
+    padding: 15px;
+  }
 }