@rezti/dsh-rez-suite 0.1.5 → 0.1.7

package/lib/index.js

@@ -1,6 +1,7 @@
 import { createRequire } from "node:module";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
+import { REZ_CREDENTIAL_REFS, REZ_DEFAULT_CONNECTIONS, REZ_SYSTEMS, mergeConnections, secretConfigured, writeManagedCredential } from "@rezti/dsh-rez-sso";
 import { mkdirSync, renameSync, writeFileSync } from "node:fs";
 import { DatabaseSync } from "node:sqlite";
 //#region ../../node_modules/.pnpm/@deepseek-ai+cosmokit@1.8.2/node_modules/@deepseek-ai/cosmokit/lib/index.js
@@ -2841,6 +2842,98 @@ defineMethod("transform", [
 	"preserve"
 ], ({ inner }, isInner) => inner.toString(isInner));
 //#endregion
+//#region src/observe-mcp.ts
+/**
+* Live MCP status without a second host.
+*
+* Official @deepseek-ai/dsh-mcp-client registers tools as mcp__<server>__*.
+* The settings Status tab used to hard-code disconnected after MCP ownership
+* moved; this module reads the same registry the agent sees.
+*/
+const COMPOSED_SERVERS = [
+	"odoo",
+	"nextcloud",
+	"wechat",
+	"homeassistant"
+];
+function mcpToolPrefix(server) {
+	return "mcp__" + server + "__";
+}
+/** Count tools whose public name belongs to one composed MCP server. */
+function countMcpTools(toolNames, server) {
+	const prefix = mcpToolPrefix(server);
+	let count = 0;
+	for (const name of toolNames) if (name.startsWith(prefix)) count += 1;
+	return count;
+}
+function listRegisteredToolNames(tools) {
+	if (tools === void 0 || typeof tools.schemas !== "function") return [];
+	try {
+		return tools.schemas().map((schema) => schema.name);
+	} catch {
+		return [];
+	}
+}
+function isEnabled(config, server) {
+	return config.connections[server].enabled !== false;
+}
+function observeServer(server, input) {
+	const enabled = isEnabled(input.config, server);
+	const secret = (input.secretPresent ?? secretConfigured)(server);
+	const toolCount = countMcpTools(input.toolNames, server);
+	const ref = REZ_CREDENTIAL_REFS[server];
+	if (!enabled) return {
+		server,
+		enabled: false,
+		state: "disconnected",
+		toolCount: 0,
+		registeredTools: 0,
+		lastError: "已在设置中关闭"
+	};
+	if (toolCount > 0) return {
+		server,
+		enabled: true,
+		state: "connected",
+		toolCount,
+		registeredTools: toolCount
+	};
+	if (!secret) return {
+		server,
+		enabled: true,
+		state: "disconnected",
+		toolCount: 0,
+		registeredTools: 0,
+		lastError: "未配置 " + ref
+	};
+	return {
+		server,
+		enabled: true,
+		state: "disconnected",
+		toolCount: 0,
+		registeredTools: 0,
+		lastError: ref + " 已配置，但本机尚未注册 " + mcpToolPrefix(server) + "*（dsh-mcp-client 未挂上）"
+	};
+}
+function observeComposedServers(input) {
+	return COMPOSED_SERVERS.map((server) => observeServer(server, input));
+}
+function testComposedServers(input) {
+	return observeComposedServers(input).map((row) => {
+		if (row.state === "connected") return {
+			server: row.server,
+			ok: true,
+			toolCount: row.toolCount,
+			serverInfo: row.toolCount + " tools registered (" + mcpToolPrefix(row.server) + "*)"
+		};
+		return {
+			server: row.server,
+			ok: false,
+			toolCount: 0,
+			error: row.lastError ?? "disconnected"
+		};
+	});
+}
+//#endregion
 //#region src/protocol.ts
 const REZ_API = {
 	config: "/api/dsh-rez-suite/config",
@@ -2865,13 +2958,14 @@ const FORMAT_VERSION = 1;
 function rezStorePath() {
 	return join(homedir(), ".dsh", "dsh-rez-suite.json");
 }
-/** Defaults: panel-only. Company MCP rows live in cordis.patch.yml. */
+/** Defaults: company MCP endpoints. Secrets live in credentials.yaml / env. */
 function defaultConfig() {
 	return {
 		enabled: true,
 		announceToAgent: true,
 		role: "all",
 		servers: {},
+		connections: JSON.parse(JSON.stringify(REZ_DEFAULT_CONNECTIONS)),
 		billing: {
 			inputCostPer1k: .001,
 			outputCostPer1k: .002,
@@ -2896,10 +2990,37 @@ function maskServer(server) {
 function publicConfig(config) {
 	const servers = {};
 	for (const [id, server] of Object.entries(config.servers)) servers[id] = maskServer(server);
+	const connections = mergeConnections(config.connections);
 	return {
 		enabled: config.enabled,
 		role: config.role,
 		servers,
+		connections: {
+			odoo: {
+				enabled: connections.odoo.enabled,
+				url: connections.odoo.url,
+				secretConfigured: secretConfigured("odoo"),
+				secretRef: REZ_CREDENTIAL_REFS.odoo
+			},
+			nextcloud: {
+				enabled: connections.nextcloud.enabled,
+				url: connections.nextcloud.url,
+				username: connections.nextcloud.username,
+				secretConfigured: secretConfigured("nextcloud"),
+				secretRef: REZ_CREDENTIAL_REFS.nextcloud
+			},
+			wechat: {
+				enabled: connections.wechat.enabled,
+				secretConfigured: secretConfigured("wechat"),
+				secretRef: REZ_CREDENTIAL_REFS.wechat
+			},
+			homeassistant: {
+				enabled: connections.homeassistant.enabled,
+				url: connections.homeassistant.url,
+				secretConfigured: secretConfigured("homeassistant"),
+				secretRef: REZ_CREDENTIAL_REFS.homeassistant
+			}
+		},
 		billing: { ...config.billing }
 	};
 }
@@ -2911,6 +3032,7 @@ function mergeConfig(base, override) {
 	if (typeof value.enabled === "boolean") result.enabled = value.enabled;
 	if (typeof value.announceToAgent === "boolean") result.announceToAgent = value.announceToAgent;
 	if (value.role === "engineer" || value.role === "sales" || value.role === "operations" || value.role === "all") result.role = value.role;
+	result.connections = mergeConnections(value.connections ?? result.connections);
 	if (typeof value.servers === "object" && value.servers !== null) for (const [id, raw] of Object.entries(value.servers)) {
 		if (typeof raw !== "object" || raw === null) continue;
 		const incoming = raw;
@@ -3019,8 +3141,25 @@ function mergeMaskedRecord(base, incoming) {
 /** Apply a browser-safe public patch without overwriting masked secrets. */
 function applyPublicPatch(current, patch) {
 	const next = JSON.parse(JSON.stringify(current));
+	const secrets = [];
 	if (typeof patch.enabled === "boolean") next.enabled = patch.enabled;
 	if (patch.role === "engineer" || patch.role === "sales" || patch.role === "operations" || patch.role === "all") next.role = patch.role;
+	if (typeof patch.connections === "object" && patch.connections !== null) {
+		const incoming = patch.connections;
+		next.connections = mergeConnections({
+			...next.connections,
+			...incoming
+		});
+		for (const system of Object.keys(REZ_CREDENTIAL_REFS)) {
+			const row = incoming[system];
+			if (typeof row !== "object" || row === null) continue;
+			const secret = row.secret;
+			if (typeof secret === "string" && secret.length > 0 && secret !== SECRET_MASK) secrets.push({
+				system,
+				value: secret
+			});
+		}
+	}
 	if (typeof patch.servers === "object" && patch.servers !== null) for (const [id, raw] of Object.entries(patch.servers)) {
 		if (typeof raw !== "object" || raw === null) continue;
 		const incoming = raw;
@@ -3046,11 +3185,14 @@ function applyPublicPatch(current, patch) {
 		if (typeof value.outputCostPer1k === "number") next.billing.outputCostPer1k = value.outputCostPer1k;
 		if (typeof value.monthlyBudget === "number") next.billing.monthlyBudget = value.monthlyBudget;
 	}
-	return next;
+	return {
+		next,
+		secrets
+	};
 }
 /** Build every /api/dsh-rez-suite route (exact paths). */
 function makeRoutes(deps) {
-	const { getConfig, updateConfig, host, tokens } = deps;
+	const { getConfig, updateConfig, host, tokens, onCredentialWritten } = deps;
 	const guard = (req, res, method) => {
 		if (!isLoopbackRequest(req)) {
 			writeJson(res, 403, { error: "forbidden: loopback-only" });
@@ -3077,8 +3219,11 @@ function makeRoutes(deps) {
 					writeJson(res, 400, { error: "invalid JSON body" });
 					return;
 				}
-				const next = applyPublicPatch(getConfig(), body);
-				writeJson(res, 200, { config: publicConfig(await updateConfig(next)) });
+				const { next, secrets } = applyPublicPatch(getConfig(), body);
+				const saved = await updateConfig(next);
+				for (const item of secrets) writeManagedCredential(REZ_CREDENTIAL_REFS[item.system], item.value);
+				for (const system of REZ_SYSTEMS) onCredentialWritten?.(REZ_CREDENTIAL_REFS[system]);
+				writeJson(res, 200, { config: publicConfig(saved) });
 			}
 		},
 		{
@@ -7537,6 +7682,22 @@ const Config = Schema.object({
 		"all"
 	]).default("all"),
 	servers: Schema.dict(serverSchema).default({}),
+	connections: Schema.object({
+		odoo: Schema.object({
+			enabled: Schema.boolean().default(true),
+			url: Schema.string().default(REZ_DEFAULT_CONNECTIONS.odoo.url)
+		}).default(REZ_DEFAULT_CONNECTIONS.odoo),
+		nextcloud: Schema.object({
+			enabled: Schema.boolean().default(true),
+			url: Schema.string().default(REZ_DEFAULT_CONNECTIONS.nextcloud.url),
+			username: Schema.string().default(REZ_DEFAULT_CONNECTIONS.nextcloud.username)
+		}).default(REZ_DEFAULT_CONNECTIONS.nextcloud),
+		wechat: Schema.object({ enabled: Schema.boolean().default(true) }).default(REZ_DEFAULT_CONNECTIONS.wechat),
+		homeassistant: Schema.object({
+			enabled: Schema.boolean().default(true),
+			url: Schema.string().default(REZ_DEFAULT_CONNECTIONS.homeassistant.url)
+		}).default(REZ_DEFAULT_CONNECTIONS.homeassistant)
+	}).default(REZ_DEFAULT_CONNECTIONS),
 	billing: Schema.object({
 		inputCostPer1k: Schema.number().default(.001),
 		outputCostPer1k: Schema.number().default(.002),
@@ -7548,12 +7709,6 @@ const Config = Schema.object({
 	})
 });
 const SECTION_ORDER = 150;
-const COMPOSED_SERVERS = [
-	"odoo",
-	"nextcloud",
-	"wechat",
-	"homeassistant"
-];
 const REZ_GUIDANCE = [
 	"本机已安装 ReZ-TI 套件（一次安装）：工作身份由 dsh-rez-sso 提供，MCP 由官方 dsh-mcp-client 接入 Odoo / Nextcloud / 企业微信 / Home Assistant。",
 	"工具名 mcp__odoo__*、mcp__nextcloud__*、mcp__wechat__*、mcp__homeassistant__*。",
@@ -7565,23 +7720,17 @@ const REZ_GUIDANCE = [
 function normalize(input) {
 	return mergeConfig(defaultConfig(), input ?? {});
 }
-function delegatedHost() {
-	const status = () => COMPOSED_SERVERS.map((server) => ({
-		server,
-		enabled: true,
-		state: "disconnected",
-		toolCount: 0,
-		registeredTools: 0,
-		lastError: "owned by @deepseek-ai/dsh-mcp-client"
-	}));
-	const test = async () => COMPOSED_SERVERS.map((server) => ({
-		server,
-		ok: false,
-		error: "MCP is composed by dsh-mcp-client; set REZ_* credentials and check dsh logs"
-	}));
+function delegatedHost(ctx, getConfig) {
+	const snapshot = () => observeComposedServers({
+		config: getConfig(),
+		toolNames: listRegisteredToolNames(ctx.tools)
+	});
 	return {
-		status,
-		test,
+		status: () => snapshot(),
+		test: async () => testComposedServers({
+			config: getConfig(),
+			toolNames: listRegisteredToolNames(ctx.tools)
+		}),
 		sync: async () => void 0,
 		dispose: async () => void 0
 	};
@@ -7589,7 +7738,7 @@ function delegatedHost() {
 function apply(ctx, config) {
 	let current = () => normalize(config);
 	const tokens = new TokenManager(joinTokenDb());
-	const host = delegatedHost();
+	const host = delegatedHost(ctx, () => current());
 	ctx.effect(() => () => {
 		tokens.close();
 	}, "dsh-rez-suite: ledger view");
@@ -7609,7 +7758,11 @@ function apply(ctx, config) {
 			return value;
 		},
 		host,
-		tokens
+		tokens,
+		onCredentialWritten: (ref) => {
+			const emit = ctx.emit;
+			emit("credentials/updated", ref);
+		}
 	});
 	let disposeRoutes;
 	let disposeTools;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rezti/dsh-rez-suite",
   "description": "ReZ-TI employee plugin for DeepSeek Harness: one install enables company MCP (Odoo / Nextcloud / WeCom / Weixin-ClawBot / Home Assistant) and work identity.",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "type": "module",
   "engines": {
     "node": "^22.19.0 || >=24.0.0"
@@ -38,13 +38,13 @@
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.30.0",
     "zod": "^4.4.3",
-    "@rezti/dsh-rez-ha-bridge": "0.1.4",
-    "@rezti/dsh-rez-sso": "0.1.4",
-    "@rezti/dsh-rez-nextcloud": "0.1.4",
+    "@rezti/dsh-rez-ha-bridge": "0.1.5",
     "@rezti/dsh-rez-intent": "0.1.3",
-    "@rezti/dsh-rez-odoo": "0.1.4",
+    "@rezti/dsh-rez-nextcloud": "0.1.5",
+    "@rezti/dsh-rez-sso": "0.1.5",
+    "@rezti/dsh-rez-odoo": "0.1.5",
     "@rezti/dsh-rez-token-manager": "0.1.3",
-    "@rezti/dsh-rez-wechat": "0.1.4"
+    "@rezti/dsh-rez-wechat": "0.1.5"
   },
   "peerDependencies": {
     "react": "^18.2.0",

package/src/client/locales.ts

@@ -27,16 +27,23 @@ export const zh = {
   'config.env': '环境变量 (JSON)',
   'config.headers': 'Headers (JSON)',
   'config.jsonInvalid': 'JSON 格式错误：{error}',
+  'config.mcpHint': '四个公司 MCP 在这里配。密钥写入 ~/.dsh/.credentials.yaml（REZ_*）。新填的密钥会立刻拉起连接；改 URL 后如果已经连上，需要重启 dsh web。',
+  'config.secretConfigured': '已配置（留空则保持）',
+  'config.secretMissing': '未配置',
   'config.odoo': 'Odoo',
-  'config.odoo.url': 'Odoo URL',
-  'config.odoo.apiKey': 'API Key',
+  'config.odoo.url': 'Odoo MCP URL',
+  'config.odoo.apiKey': 'API Token',
   'config.nextcloud': 'Nextcloud',
-  'config.nextcloud.url': 'Nextcloud URL',
+  'config.nextcloud.url': 'Nextcloud 主机',
   'config.nextcloud.username': '用户名',
   'config.nextcloud.appPassword': 'App Password',
   'config.wecom': '企业微信',
   'config.wecom.botId': 'Bot ID',
   'config.wecom.secret': 'Secret',
+  'config.wecom.webhook': '群机器人 Webhook',
+  'config.ha': 'Home Assistant',
+  'config.ha.url': 'HA MCP URL',
+  'config.ha.token': '长期访问令牌',
   'config.fs': '本地文件 (fs-mcp-server)',
   'config.fs.root': '根目录',
   'config.sqlite': 'SQLite (sqlite-mcp-server)',
@@ -53,6 +60,7 @@ export const zh = {
   'config.testOk': '成功（{tools} 个工具, {latency}ms）',
   'config.testFail': '失败：{error}',
   // status
+  'status.hint': '绿标表示本机已注册 mcp__<系统>__* 工具。远端 MCP 通了但这里仍红，说明 dsh-mcp-client 还没挂上。',
   'status.total': '当前角色 {role}，共注册 {count} 个 MCP 工具',
   'status.col.server': 'Server',
   'status.col.state': '状态',
@@ -122,16 +130,23 @@ export const en: Record<RezKey, string> = {
   'config.env': 'Env vars (JSON)',
   'config.headers': 'Headers (JSON)',
   'config.jsonInvalid': 'Invalid JSON: {error}',
+  'config.mcpHint': 'Company MCP lives here. Secrets go to ~/.dsh/.credentials.yaml (REZ_*). A newly saved secret starts the connection immediately; URL changes after a live connection need a dsh web restart.',
+  'config.secretConfigured': 'Configured (leave blank to keep)',
+  'config.secretMissing': 'Not configured',
   'config.odoo': 'Odoo',
-  'config.odoo.url': 'Odoo URL',
-  'config.odoo.apiKey': 'API Key',
+  'config.odoo.url': 'Odoo MCP URL',
+  'config.odoo.apiKey': 'API token',
   'config.nextcloud': 'Nextcloud',
-  'config.nextcloud.url': 'Nextcloud URL',
+  'config.nextcloud.url': 'Nextcloud host',
   'config.nextcloud.username': 'Username',
-  'config.nextcloud.appPassword': 'App Password',
+  'config.nextcloud.appPassword': 'App password',
   'config.wecom': 'WeCom',
   'config.wecom.botId': 'Bot ID',
   'config.wecom.secret': 'Secret',
+  'config.wecom.webhook': 'Group bot webhook',
+  'config.ha': 'Home Assistant',
+  'config.ha.url': 'HA MCP URL',
+  'config.ha.token': 'Long-lived access token',
   'config.fs': 'Local files (fs-mcp-server)',
   'config.fs.root': 'Root directory',
   'config.sqlite': 'SQLite (sqlite-mcp-server)',
@@ -147,6 +162,7 @@ export const en: Record<RezKey, string> = {
   'config.testResult': '{server}: {status}',
   'config.testOk': 'OK ({tools} tools, {latency}ms)',
   'config.testFail': 'Failed: {error}',
+  'status.hint': 'Green means this host registered mcp__<system>__* tools. A live remote MCP with a red row means dsh-mcp-client has not attached yet.',
   'status.total': 'Role {role}, {count} MCP tools registered',
   'status.col.server': 'Server',
   'status.col.state': 'State',