dsh-mcp-plus 0.1.0

package/lib/index.mjs

@@ -0,0 +1,328 @@
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
+import { dshHomePath } from "@deepseek-ai/dsh-home-paths";
+import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { dirname } from "node:path";
+import z from "@deepseek-ai/schemastery";
+//#region src/config.ts
+/** 运行时校验器:required() 必填、default() 可选带默认值 */
+const ServerSchema = z.object({
+	transport: z.const("stdio"),
+	serverName: z.string().required().pattern(/^[A-Za-z0-9_-]{1,32}$/),
+	command: z.string().required(),
+	args: z.array(String).default([]),
+	env: z.dict(String).default({}),
+	cwd: z.string().default("")
+});
+/** 服务器列表 schema:同时是 cordis 的 Config(如果将来 cordis.yml 传 config 也用得上) */
+const Config = z.object({ servers: z.array(ServerSchema).default([]) });
+/**
+* 把用户输入规范化为 { servers: [...] }:
+* 支持四种顶层形态(统一转成 schema 认识的形状)——
+*   ① { servers: [...] }          —— 原生格式(servers.json 的存储格式)
+*   ② [ {...}, ... ]              —— 裸数组
+*   ③ { "名字": {command,...}}    —— 对象映射,key 即 serverName
+*   ④ { mcpServers: { 形态③ } }  —— Claude Desktop 完整格式(mcpServers 包裹)
+*
+* 另外对每个条目做宽容处理:
+*   - 缺 transport 字段 → 自动补 'stdio'
+*   - 忽略未知字段(enabled 等)
+*/
+function normalizeInput(input) {
+	const root = input;
+	if (typeof root === "object" && root !== null && !Array.isArray(root) && typeof root.mcpServers === "object" && root.mcpServers !== null) return normalizeInput(root.mcpServers);
+	if (typeof root === "object" && root !== null && !Array.isArray(root) && !("servers" in root)) return { servers: Object.entries(root).map(([serverName, raw]) => {
+		const cfg = typeof raw === "object" && raw !== null ? raw : {};
+		return {
+			transport: typeof cfg.transport === "string" ? cfg.transport : "stdio",
+			serverName,
+			command: cfg.command ?? "",
+			args: Array.isArray(cfg.args) ? cfg.args : [],
+			env: typeof cfg.env === "object" && cfg.env !== null ? cfg.env : {},
+			cwd: typeof cfg.cwd === "string" ? cfg.cwd : ""
+		};
+	}) };
+	if (Array.isArray(input)) return { servers: input.map((raw) => {
+		const cfg = typeof raw === "object" && raw !== null ? raw : {};
+		return {
+			transport: typeof cfg.transport === "string" ? cfg.transport : "stdio",
+			...cfg
+		};
+	}) };
+	return input;
+}
+/**
+* 校验一段未知数据(比如从 servers.json 读出来的 JSON)是不是合法的服务器列表。
+* schemastery 是 standard-schema 实现,校验入口是 ['~standard'].validate(input),
+* 返回 { value }(成功)或 { issues }(失败),不会静默填默认值。
+* @returns 校验通过后的服务器列表
+* @throws 校验失败时抛错(带 issues 详情)
+*/
+function validateServers(input) {
+	const result = Config["~standard"].validate(normalizeInput(input));
+	if (result.issues) throw new Error("服务器配置校验失败: " + JSON.stringify(result.issues));
+	return result.value.servers;
+}
+//#endregion
+//#region src/servers-store.ts
+/** 配置文件绝对路径:~/.dsh/dsh-mcp-plus/servers.json */
+const SERVERS_FILE = dshHomePath("dsh-mcp-plus", "servers.json");
+/**
+* 读配置文件,返回服务器列表。
+* - 文件不存在 → 空列表(还没配置过任何服务器,正常情况)
+* - 文件存在但非法 → 抛错(让上层知道配置坏了,别静默吞掉)
+*/
+async function loadServers() {
+	let raw;
+	try {
+		raw = await readFile(SERVERS_FILE, "utf8");
+	} catch (err) {
+		if (err.code === "ENOENT") return [];
+		throw err;
+	}
+	return validateServers(JSON.parse(raw));
+}
+/**
+* 写配置文件(全量覆盖)。
+* 自动创建目录。写入前剥离运行时字段(status 等)——它们不该被持久化,
+* 否则下次读取会被当作配置的一部分(servers.json 里已经出现过这个污染)。
+*/
+async function saveServers(servers) {
+	await mkdir(dirname(SERVERS_FILE), { recursive: true });
+	const clean = servers.map(({ serverName, transport, command, args, env, cwd, enabled }) => ({
+		transport,
+		serverName,
+		command,
+		args,
+		env,
+		cwd,
+		...enabled !== void 0 ? { enabled } : {}
+	}));
+	await writeFile(SERVERS_FILE, JSON.stringify({ servers: clean }, null, 2) + "\n", "utf8");
+}
+//#endregion
+//#region src/http.ts
+/** 我们的路由前缀(绝对路径,无尾斜杠) */
+const ROUTE_PREFIX = "/dsh-mcp-plus";
+/** 模块级连接状态表(serverName → connecting / connected / disconnected / disabled) */
+const connectionStatus = /* @__PURE__ */ new Map();
+/** host 半在每次 connect/disconnect 时更新这张表,UI 通过 GET 拿到 */
+function setConnectionStatus(serverName, status) {
+	connectionStatus.set(serverName, status);
+}
+/** 清空状态表(disconnect 所有连接时) */
+function clearConnectionStatus() {
+	connectionStatus.clear();
+}
+/** 读请求体(UTF-8 字符串) */
+function readBody(req) {
+	return new Promise((resolve, reject) => {
+		const chunks = [];
+		req.on("data", (chunk) => chunks.push(chunk));
+		req.on("end", () => resolve(Buffer.concat(chunks).toString("utf8")));
+		req.on("error", reject);
+	});
+}
+/** 发送 JSON 响应 */
+function sendJson(res, status, body) {
+	res.writeHead(status, { "Content-Type": "application/json; charset=utf-8" });
+	res.end(JSON.stringify(body));
+}
+/**
+* 注册配置读写端点。直接注册到 webServer(不挂 effect → 重连不卸载,端点一直可达)。
+* @param ctx - host 半插件上下文(需要 webServer 服务)
+* @param reload - 保存成功后异步触发的重连函数(不等待,fire-and-forget)
+*/
+function registerHttpRoutes(ctx, reload) {
+	const webServer = ctx.webServer;
+	if (!webServer) {
+		console.log("[dsh-mcp-plus] webServer 服务不可用,HTTP 端点未注册(设置 UI 将无法保存)");
+		return;
+	}
+	webServer.register({
+		kind: "prefix",
+		path: ROUTE_PREFIX,
+		handler: async (req, res) => {
+			const url = (req.url ?? "/").split("?")[0];
+			const method = req.method ?? "GET";
+			const serversPath = "/dsh-mcp-plus/servers";
+			if (url === serversPath && method === "GET") {
+				try {
+					sendJson(res, 200, {
+						servers: (await loadServers()).map((s) => {
+							const liveStatus = connectionStatus.get(s.serverName);
+							const status = s.enabled === false ? "disabled" : liveStatus ?? "connecting";
+							return {
+								...s,
+								status
+							};
+						}),
+						file: SERVERS_FILE
+					});
+				} catch (err) {
+					sendJson(res, 500, { error: "读取配置失败: " + (err instanceof Error ? err.message : String(err)) });
+				}
+				return;
+			}
+			if (url === serversPath && method === "PUT") {
+				try {
+					const body = await readBody(req);
+					const servers = validateServers(JSON.parse(body));
+					await saveServers(servers);
+					reload().catch((err) => {
+						console.log("[dsh-mcp-plus] 重连失败: " + (err instanceof Error ? err.message : String(err)));
+					});
+					sendJson(res, 200, {
+						ok: true,
+						count: servers.length
+					});
+				} catch (err) {
+					sendJson(res, 400, { error: "保存失败: " + (err instanceof Error ? err.message : String(err)) });
+				}
+				return;
+			}
+			sendJson(res, 404, { error: `未知端点: ${method} ${url}` });
+		}
+	});
+}
+//#endregion
+//#region src/dsh-mcp-plus.ts
+const name = "dsh-mcp-plus";
+const inject = ["tools", "webServer"];
+/**
+* 生成模型可见的公开工具名:`mcp__<serverName>__<rawName>`(官方同款格式)
+* 例:serverName=fs, rawName=read_file → mcp__fs__read_file
+*/
+function publicToolName(serverName, rawName) {
+	return `mcp__${serverName}__${rawName}`;
+}
+/**
+* 连接一台 MCP 服务器,发现工具并全部注册进 ctx.tools
+* @returns 清理函数:断开连接
+*/
+async function connectServer(ctx, cfg) {
+	const transport = new StdioClientTransport({
+		command: cfg.command,
+		args: cfg.args,
+		env: cfg.env,
+		cwd: cfg.cwd
+	});
+	const client = new Client({
+		name: "dsh-mcp-plus",
+		version: "0.0.1"
+	});
+	setConnectionStatus(cfg.serverName, "connecting");
+	try {
+		await client.connect(transport);
+	} catch (err) {
+		setConnectionStatus(cfg.serverName, "disconnected");
+		throw err;
+	}
+	setConnectionStatus(cfg.serverName, "connected");
+	console.log(`[dsh-mcp-plus] (${cfg.serverName}) 已连接,开始发现工具...`);
+	const { tools } = await client.listTools();
+	const toolDisposers = [];
+	for (const tool of tools) {
+		const definition = {
+			name: publicToolName(cfg.serverName, tool.name),
+			description: tool.description ?? "",
+			parameters: tool.inputSchema,
+			output: {
+				schema: {
+					type: "object",
+					properties: { content: {
+						type: "array",
+						items: {}
+					} },
+					required: ["content"],
+					additionalProperties: false
+				},
+				render: (_args, value) => {
+					return [{
+						type: "text",
+						text: (value.content ?? []).map((block) => block.type === "text" ? block.text ?? "" : `[${block.type}]`).join("\n")
+					}];
+				}
+			},
+			async execute(args) {
+				const argsObj = typeof args === "object" && args !== null ? args : {};
+				const result = await client.callTool({
+					name: tool.name,
+					arguments: argsObj
+				});
+				if (result.isError) throw new Error(`MCP 工具 ${tool.name} 执行失败`);
+				return { content: result.content };
+			}
+		};
+		try {
+			toolDisposers.push(ctx.tools.register(definition));
+			console.log(`[dsh-mcp-plus] (${cfg.serverName}) 已注册: ${definition.name}`);
+		} catch (err) {
+			console.log(`[dsh-mcp-plus] (${cfg.serverName}) 注册失败 ${definition.name}: ${err instanceof Error ? err.message : String(err)}`);
+		}
+	}
+	console.log(`[dsh-mcp-plus] (${cfg.serverName}) 完成:共 ${tools.length} 个工具`);
+	return async () => {
+		setConnectionStatus(cfg.serverName, "disconnected");
+		for (const dispose of toolDisposers) try {
+			dispose();
+		} catch (err) {
+			console.log(`[dsh-mcp-plus] (${cfg.serverName}) 注销工具失败(继续): ${err instanceof Error ? err.message : String(err)}`);
+		}
+		await client.close();
+	};
+}
+/**
+* 读配置文件 → 连接全部服务器 → 返回总清理函数。
+* 初次加载和 UI 保存后的重连共用这一个函数。
+* enabled === false 的服务器跳过(已配置但不连接)。
+* 单台失败不影响其它服务器(容错),失败仅记日志,状态表标 disconnected。
+*/
+async function connectAllServers(ctx) {
+	clearConnectionStatus();
+	const allServers = await loadServers();
+	const seen = /* @__PURE__ */ new Set();
+	for (const server of allServers) {
+		if (seen.has(server.serverName)) throw new Error(`[dsh-mcp-plus] serverName "${server.serverName}" 重复——每台服务器必须有唯一名字`);
+		seen.add(server.serverName);
+	}
+	const active = allServers.filter((s) => s.enabled !== false);
+	const skipped = allServers.length - active.length;
+	if (skipped > 0) console.log(`[dsh-mcp-plus] 跳过 ${skipped} 台禁用服务器`);
+	for (const s of allServers) if (s.enabled === false) setConnectionStatus(s.serverName, "disabled");
+	const disposers = [];
+	for (const server of active) try {
+		disposers.push(await connectServer(ctx, server));
+	} catch (err) {
+		console.log(`[dsh-mcp-plus] (${server.serverName}) 连接失败: ${err instanceof Error ? err.message : String(err)}`);
+	}
+	console.log(`[dsh-mcp-plus] 加载了 ${active.length} 台服务器(${disposers.length} 成功)`);
+	return async () => {
+		await Promise.all(disposers.map((dispose) => dispose()));
+	};
+}
+function apply(ctx) {
+	let currentDispose;
+	/** 读配置 → 断开旧连接 → 连接新配置(初次加载与重连共用) */
+	const connectAll = async () => {
+		if (currentDispose) {
+			try {
+				await currentDispose();
+			} catch (err) {
+				console.log("[dsh-mcp-plus] 断开旧连接失败(继续): " + (err instanceof Error ? err.message : String(err)));
+			}
+			currentDispose = void 0;
+		}
+		currentDispose = await connectAllServers(ctx);
+	};
+	registerHttpRoutes(ctx, connectAll);
+	ctx.effect(() => {
+		connectAll();
+		return async () => {
+			if (currentDispose) await currentDispose();
+			currentDispose = void 0;
+		};
+	}, "dsh-mcp-plus.servers");
+}
+//#endregion
+export { apply, inject, name };

package/package.json

@@ -0,0 +1,62 @@
+{
+  "name": "dsh-mcp-plus",
+  "version": "0.1.0",
+  "type": "module",
+  "main": "lib/index.mjs",
+  "description": "DSH 增强型 MCP 客户端插件:在设置界面管理多台 MCP 服务器,自动发现并注册工具给 Agent",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sojo-negai/dsh-mcp-plus.git"
+  },
+  "keywords": [
+    "dsh",
+    "dsh-plugin",
+    "deepseek-harness",
+    "mcp",
+    "mcp-client",
+    "model-context-protocol"
+  ],
+  "exports": {
+    ".": {
+      "default": "./lib/index.mjs"
+    },
+    "./client": {
+      "default": "./lib/client.iife.js"
+    },
+    "./src/*": "./src/*",
+    "./cordis.patch.yml": "./cordis.patch.yml",
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "lib",
+    "src",
+    "scripts",
+    "cordis.patch.yml",
+    "README.md",
+    "LICENSE"
+  ],
+  "scripts": {
+    "build": "tsdown && tsdown --config ./tsdown.client.config.ts",
+    "prepack": "npm run build"
+  },
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "platform": "web"
+    }
+  },
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.12.0"
+  },
+  "peerDependencies": {
+    "@deepseek-ai/dsh-home-paths": ">=0.1.0-0 <0.1.1-0 || >=0.1.1-0 <0.1.2-0 || >=0.1.2-0 <0.2.0-0",
+    "@deepseek-ai/schemastery": "^3.18.1"
+  },
+  "devDependencies": {
+    "tsdown": "^0.23.0",
+    "typescript": "^5.9.2"
+  }
+}

package/scripts/install.mjs

@@ -0,0 +1,105 @@
+// scripts/install.mjs —— 把 dsh-mcp-plus 装进指定 DSH profile
+//
+// 用法:
+//   node scripts/install.mjs --profile web         # 装到单个 profile
+//   node scripts/install.mjs --all                 # 装到所有 profile
+//   node scripts/install.mjs --profile web --remove  # 从 web 卸载
+//
+// 装入的动作:
+//   1. 在 <profile>/package.json 加 file: 依赖,指向当前插件根目录
+//   2. 把 'dsh-mcp-plus' 加到 dsh.profile.bundles 数组(bundle 才会被加载)
+//
+// 卸载时反向操作:从 dependencies / bundles 移除。
+
+import { readFileSync, writeFileSync, existsSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+const __dirname = dirname(fileURLToPath(import.meta.url))
+// 插件根 = scripts/ 的上一级
+const PLUGIN_ROOT = dirname(__dirname)
+const PLUGIN_PATH = PLUGIN_ROOT // file: 路径要求绝对路径
+
+const PROFILE_DIR = process.env.DSH_HOME ?? join(process.env.USERPROFILE ?? process.env.HOME, '.dsh')
+const ALL_PROFILES = ['desktop', 'web', 'open-design'] // 按需扩展
+
+function parseArgs(argv) {
+  const args = { profile: null, all: false, remove: false, help: false }
+  for (let i = 2; i < argv.length; i++) {
+    const a = argv[i]
+    if (a === '--profile') args.profile = argv[++i]
+    else if (a === '--all') args.all = true
+    else if (a === '--remove') args.remove = true
+    else if (a === '--help' || a === '-h') args.help = true
+  }
+  return args
+}
+
+function usage() {
+  console.log(`用法:
+  node scripts/install.mjs --profile <name>            安装到指定 profile
+  node scripts/install.mjs --all                        安装到所有 profile
+  node scripts/install.mjs --profile <name> --remove   从指定 profile 卸载
+
+可用 profile: ${ALL_PROFILES.join(', ')}`)
+}
+
+function listProfiles() {
+  return ALL_PROFILES.filter((n) => existsSync(join(PROFILE_DIR, 'profiles', n, 'package.json')))
+}
+
+function applyProfile(profileName, remove) {
+  const pkgPath = join(PROFILE_DIR, 'profiles', profileName, 'package.json')
+  const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'))
+  const deps = pkg.dependencies ?? {}
+  const dshProfile = pkg.dsh?.profile ?? {}
+  const bundles = dshProfile.bundles ?? []
+
+  if (remove) {
+    let changed = false
+    if (deps['dsh-mcp-plus']) {
+      delete deps['dsh-mcp-plus']
+      changed = true
+    }
+    const idx = bundles.indexOf('dsh-mcp-plus')
+    if (idx >= 0) {
+      bundles.splice(idx, 1)
+      changed = true
+    }
+    if (changed) {
+      pkg.dependencies = deps
+      pkg.dsh = pkg.dsh ?? {}
+      pkg.dsh.profile = dshProfile
+      pkg.dsh.profile.bundles = bundles
+      writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n', 'utf8')
+      console.log(`  ✓ 已从 ${profileName} 卸载`)
+    } else {
+      console.log(`  - ${profileName} 本来就没装`)
+    }
+  } else {
+    deps['dsh-mcp-plus'] = `file:${PLUGIN_PATH}`
+    if (!bundles.includes('dsh-mcp-plus')) bundles.push('dsh-mcp-plus')
+    pkg.dependencies = deps
+    pkg.dsh = pkg.dsh ?? {}
+    pkg.dsh.profile = dshProfile
+    pkg.dsh.profile.bundles = bundles
+    writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n', 'utf8')
+    console.log(`  ✓ 已装到 ${profileName}`)
+  }
+}
+
+const args = parseArgs(process.argv)
+if (args.help || (!args.profile && !args.all)) {
+  usage()
+  process.exit(args.help ? 0 : 1)
+}
+
+const targets = args.all ? listProfiles() : [args.profile]
+for (const name of targets) {
+  if (!existsSync(join(PROFILE_DIR, 'profiles', name))) {
+    console.warn(`! ${name} 不存在,跳过`)
+    continue
+  }
+  applyProfile(name, args.remove)
+}
+console.log('完成。')