From b853118fa018ebc2039f360bb050be6f932af366 Mon Sep 17 00:00:00 2001
From: Kirigaya <1193466151@qq.com>
Date: Thu, 22 May 2025 03:31:18 +0800
Subject: [PATCH] =?UTF-8?q?0.1.0=20=E5=AE=8C=E6=88=90=20vscode=20=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E7=AB=AF=E7=9A=84=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 renderer/src/App.vue                   | 10 +++++-----
 renderer/src/components/guide/tour.vue | 20 +++++++++++++++++---
 renderer/src/hook/setting.ts           |  2 +-
 renderer/src/views/connect/index.ts    |  3 +++
 renderer/src/views/connect/index.vue   |  5 ++++-
 service/src/mcp/connect.service.ts     |  2 +-
 src/sidebar/installed.controller.ts    |  2 ++
 src/webview/webview.service.ts         | 13 ++++++++++++-
 8 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/renderer/src/App.vue b/renderer/src/App.vue
index edde560..7888882 100644
--- a/renderer/src/App.vue
+++ b/renderer/src/App.vue
@@ -48,11 +48,11 @@ onMounted(async () => {
 	pinkLog('OpenMCP Client 启动');
 
 	// 跳转到首页
-	// if (route.name !== 'debug') {
-	// 	const targetRoute = import.meta.env.BASE_URL + 'debug';
-	// 	console.log('go to ' + targetRoute);
-	// 	router.push(targetRoute);
-	// }
+	if (route.name !== 'debug') {
+		const targetRoute = import.meta.env.BASE_URL + 'debug';
+		console.log('go to ' + targetRoute);
+		router.push(targetRoute);
+	}
 
 	// 进行桥接	
 	await bridge.awaitForWebsocket();		
diff --git a/renderer/src/components/guide/tour.vue b/renderer/src/components/guide/tour.vue
index 175e75a..327bd53 100644
--- a/renderer/src/components/guide/tour.vue
+++ b/renderer/src/components/guide/tour.vue
@@ -58,7 +58,7 @@
         </el-tour-step>
 
         <el-tour-step
-            :target="client.connectionSettingRef"
+            :target="mcpClientAdapter.clients[0].connectionSettingRef"
             :prev-button-props="{ children: '上一步' }"
             :next-button-props="{ children: '下一步' }"
             :show-close="false"
@@ -78,7 +78,7 @@
         </el-tour-step>
 
         <el-tour-step
-            :target="client.connectionLogRef"
+            :target="mcpClientAdapter.clients[0].connectionLogRef"
             :prev-button-props="{ children: '上一步' }"
             :next-button-props="{ children: '下一步' }"
             :show-close="false"
@@ -92,6 +92,20 @@
             </div>
         </el-tour-step>
 
+        <el-tour-step
+            :target="mcpServerAddRef"
+            :prev-button-props="{ children: '上一步' }"
+            :next-button-props="{ children: '下一步' }"
+            :show-close="false"
+        >
+            <template #header>
+                <TourTitle>调试</TourTitle>
+            </template>
+            <div class="tour-common-text">
+                你可以点击最右侧的加号来添加额外的 mcp 服务器，让你当前正在调试的 agent 零成本快速获得额外的能力。
+            </div>
+        </el-tour-step>
+
         <el-tour-step
             target="#sidebar-debug"
             :prev-button-props="{ children: '上一步' }"
@@ -253,13 +267,13 @@ import { llmSettingRef } from '@/views/setting/api';
 import { userHasReadGuide } from './tour';
 import { setTour } from '@/hook/setting';
 import { mcpClientAdapter } from '@/views/connect/core';
+import { mcpServerAddRef } from '@/views/connect';
 
 const openTour = ref(true);
 
 const { t } = useI18n();
 
 const router = useRouter();
-const client = mcpClientAdapter.masterNode;
 
 const baseUrl = import.meta.env.BASE_URL;
 
diff --git a/renderer/src/hook/setting.ts b/renderer/src/hook/setting.ts
index 8faa3fd..c5c4699 100644
--- a/renderer/src/hook/setting.ts
+++ b/renderer/src/hook/setting.ts
@@ -32,7 +32,7 @@ export async function getTour() {
     const { code, msg } = await bridge.commandRequest('setting/get-tour');
     
     if (code === 200) {
-        pinkLog('获取引导状态成功');
+        pinkLog('获取引导状态成功 ' + msg.userHasReadGuide);
         userHasReadGuide.value = msg.userHasReadGuide || false;
     }
 }
diff --git a/renderer/src/views/connect/index.ts b/renderer/src/views/connect/index.ts
index 1be9787..b5dd88c 100644
--- a/renderer/src/views/connect/index.ts
+++ b/renderer/src/views/connect/index.ts
@@ -3,6 +3,9 @@ import { ElLoading } from "element-plus";
 import { pinkLog } from "../setting/util";
 import { mcpClientAdapter } from "./core";
 import { isConnecting } from "@/components/sidebar/connected";
+import { ref } from "vue";
+
+export const mcpServerAddRef = ref<any>(null);
 
 export async function initialise() {
 
diff --git a/renderer/src/views/connect/index.vue b/renderer/src/views/connect/index.vue
index 808e8c9..392e4cb 100644
--- a/renderer/src/views/connect/index.vue
+++ b/renderer/src/views/connect/index.vue
@@ -1,6 +1,8 @@
 <template>
 	<div class="connection-container-wrapper">
-		<div class="server-list">
+		<div class="server-list"
+			:ref="el => mcpServerAddRef = el"
+		>
 			<el-segmented 
 				v-model="mcpClientAdapter.currentClientIndex" 
 				:options="serverOptions"
@@ -47,6 +49,7 @@ import { defineComponent, computed } from 'vue';
 import ConnectionPanel from './connection-panel.vue';
 import { McpClient, mcpClientAdapter } from './core';
 import { ElMessage } from 'element-plus';
+import { mcpServerAddRef } from '.';
 
 defineComponent({ name: 'connection' });
 
diff --git a/service/src/mcp/connect.service.ts b/service/src/mcp/connect.service.ts
index 60a06cb..60c9f89 100644
--- a/service/src/mcp/connect.service.ts
+++ b/service/src/mcp/connect.service.ts
@@ -175,7 +175,7 @@ async function initNpm(option: McpOptions, cwd: string, webview?: PostMessageble
 	let projectDir = cwd;
 
 	while (projectDir !== path.dirname(projectDir)) {
-		if (fs.readFileSync(projectDir).includes('package.json')) {
+		if (fs.readdirSync(projectDir).includes('package.json')) {
 			break;
 		}
 		projectDir = path.dirname(projectDir);
diff --git a/src/sidebar/installed.controller.ts b/src/sidebar/installed.controller.ts
index 72c7531..1ae6eba 100644
--- a/src/sidebar/installed.controller.ts
+++ b/src/sidebar/installed.controller.ts
@@ -34,6 +34,8 @@ export class McpInstalledConnectProvider implements vscode.TreeDataProvider<Conn
     @RegisterCommand('revealWebviewPanel')
     public revealWebviewPanel(context: vscode.ExtensionContext, view: ConnectionViewItem) {
         const item = view.item;
+        console.log(item);
+        
         const masterNode = Array.isArray(item)? item[0] : item;
         const name = masterNode.filePath || masterNode.name || '';
         revealOpenMcpWebviewPanel(context, 'installed', name, item);
diff --git a/src/webview/webview.service.ts b/src/webview/webview.service.ts
index c6b5ab4..7146b37 100644
--- a/src/webview/webview.service.ts
+++ b/src/webview/webview.service.ts
@@ -1,7 +1,7 @@
 import * as vscode from 'vscode';
 import * as fs from 'fs';
 import * as fspath from 'path';
-import { McpOptions, panels, updateInstalledConnectionConfig, updateWorkspaceConnectionConfig } from '../global';
+import { ConnectionType, McpOptions, panels, updateInstalledConnectionConfig, updateWorkspaceConnectionConfig } from '../global';
 import { routeMessage } from '../../openmcp-sdk/service';
 
 export function getWebviewContent(context: vscode.ExtensionContext, panel: vscode.WebviewPanel): string | undefined {
@@ -43,6 +43,17 @@ export function revealOpenMcpWebviewPanel(
         return panel;
     }
 
+    // 对老版本的 option 进行调整
+    option = Array.isArray(option)? option : [option];
+    option.forEach(item => {
+        const itemType = (item.type || item.connectionType).toUpperCase() as ConnectionType;
+        item.type = undefined;
+        item.connectionType = itemType;
+        if (itemType === 'STDIO') {
+            item.commandString = [item.command, ...(item.args || [])]?.join(' ');
+        }
+    })
+
     const panel = vscode.window.createWebviewPanel(
         'OpenMCP',
         'OpenMCP',