@rezti/dsh-rez-suite 0.1.6 → 0.1.7

package/README.md

@@ -8,4 +8,4 @@ dsh plugin --profile web add @rezti/dsh-rez-suite
 
 组成见仓库根 README。子包不要单独 `dsh plugin add`。
 
-配置在 **设置 → 插件 → 插件配置** 展开 **ReZ-TI**（同页还有独立的 ReZ-TI 标签）。Odoo / Nextcloud / WeCom / HA 的地址和密钥都在「配置」页。个人微信在卡片的「微信」页扫码，然后直接在微信里说话。
+配置在 **设置 → 插件 → 插件配置** 展开 **ReZ-TI**（同页还有独立的 ReZ-TI 标签）。Odoo / Nextcloud / WeCom / HA 的地址和密钥都在「配置」页。个人微信在卡片的「微信」页扫码，然后直接在微信里说话。状态页看的是本机已注册的 `mcp__odoo__*` 等工具，不是直接 ping 远端 MCP。

package/README.zh.md

@@ -8,6 +8,6 @@ dsh plugin --profile web add @rezti/dsh-rez-suite
 
 密钥用环境变量或 dsh-credentials：`REZ_ODOO_TOKEN`、`REZ_NEXTCLOUD_PASSWORD`、`REZ_WECHAT_WEBHOOK`、`REZ_HA_TOKEN`。未配置时不拉起对应 MCP。
 
-配置在 **设置 → 插件 → 插件配置** 展开 **ReZ-TI**（同页还有独立的 ReZ-TI 标签）。Odoo / Nextcloud / 企微 / HA 的地址和密钥都在「配置」页。个人微信在卡片的「微信」页扫码，然后直接在微信里说话。
+配置在 **设置 → 插件 → 插件配置** 展开 **ReZ-TI**（同页还有独立的 ReZ-TI 标签）。Odoo / Nextcloud / 企微 / HA 的地址和密钥都在「配置」页。个人微信在卡片的「微信」页扫码，然后直接在微信里说话。状态页看的是本机已注册的 `mcp__odoo__*` 等工具，不是直接 ping 远端 MCP。
 
 子包不要再单独 `dsh plugin add`，否则会重复注册 MCP。

package/lib/client.d.ts

@@ -7307,6 +7307,7 @@ declare const zh: {
   readonly 'config.testResult': "{server}: {status}";
   readonly 'config.testOk': "成功（{tools} 个工具, {latency}ms）";
   readonly 'config.testFail': "失败：{error}";
+  readonly 'status.hint': "绿标表示本机已注册 mcp__<系统>__* 工具。远端 MCP 通了但这里仍红，说明 dsh-mcp-client 还没挂上。";
   readonly 'status.total': "当前角色 {role}，共注册 {count} 个 MCP 工具";
   readonly 'status.col.server': "Server";
   readonly 'status.col.state': "状态";

package/lib/client.js

@@ -68,6 +68,7 @@ const zh = {
 	"config.testResult": "{server}: {status}",
 	"config.testOk": "成功（{tools} 个工具, {latency}ms）",
 	"config.testFail": "失败：{error}",
+	"status.hint": "绿标表示本机已注册 mcp__<系统>__* 工具。远端 MCP 通了但这里仍红，说明 dsh-mcp-client 还没挂上。",
 	"status.total": "当前角色 {role}，共注册 {count} 个 MCP 工具",
 	"status.col.server": "Server",
 	"status.col.state": "状态",
@@ -164,6 +165,7 @@ const en = {
 	"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",
@@ -977,6 +979,10 @@ function StatusTab({ api }) {
 					children: tt("common.refresh")
 				})]
 			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+				className: panel_module_default.message,
+				children: tt("status.hint")
+			}),
 			error !== "" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 				className: panel_module_default.error,
 				children: error

package/lib/index.js

@@ -2842,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",
@@ -7617,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__*。",
@@ -7634,29 +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: secretConfigured(server) ? "owned by @deepseek-ai/dsh-mcp-client" : "missing " + REZ_CREDENTIAL_REFS[server]
-	}));
-	const test = async () => COMPOSED_SERVERS.map((server) => {
-		return secretConfigured(server) ? {
-			server,
-			ok: true,
-			serverInfo: REZ_CREDENTIAL_REFS[server] + " configured"
-		} : {
-			server,
-			ok: false,
-			error: "missing " + REZ_CREDENTIAL_REFS[server]
-		};
+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
 	};
@@ -7664,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");

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.6",
+  "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.5",
+    "@rezti/dsh-rez-intent": "0.1.3",
     "@rezti/dsh-rez-nextcloud": "0.1.5",
-    "@rezti/dsh-rez-odoo": "0.1.5",
     "@rezti/dsh-rez-sso": "0.1.5",
-    "@rezti/dsh-rez-ha-bridge": "0.1.5",
-    "@rezti/dsh-rez-wechat": "0.1.5",
+    "@rezti/dsh-rez-odoo": "0.1.5",
     "@rezti/dsh-rez-token-manager": "0.1.3",
-    "@rezti/dsh-rez-intent": "0.1.3"
+    "@rezti/dsh-rez-wechat": "0.1.5"
   },
   "peerDependencies": {
     "react": "^18.2.0",

package/src/client/locales.ts

@@ -60,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': '状态',
@@ -161,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',

package/src/client/panel/StatusTab.tsx

@@ -36,6 +36,7 @@ export function StatusTab({ api }: { api: RezApi }) {
         <span className={css.message}>{tt('status.total', { role: status.role, count: status.totalRegisteredTools })}</span>
         <button type="button" className={css.button} onClick={() => { void load() }}>{tt('common.refresh')}</button>
       </div>
+      <p className={css.message}>{tt('status.hint')}</p>
       {error !== '' && <div className={css.error}>{error}</div>}
       <div className={css.tableWrap}>
         <table className={css.table}>

package/src/index.ts

@@ -15,13 +15,18 @@ import z from '@deepseek-ai/schemastery'
 import type {} from '@deepseek-ai/dsh-host-webserver'
 import type {} from '@deepseek-ai/dsh-system-prompt'
 import type {} from '@deepseek-ai/dsh-tools'
-import { REZ_CREDENTIAL_REFS, REZ_DEFAULT_CONNECTIONS, secretConfigured } from '@rezti/dsh-rez-sso'
+import { REZ_DEFAULT_CONNECTIONS } from '@rezti/dsh-rez-sso'
 import type { McpHost } from './mcp-host.ts'
+import {
+  listRegisteredToolNames,
+  observeComposedServers,
+  testComposedServers,
+} from './observe-mcp.ts'
 import { makeRoutes } from './routes.ts'
 import { defaultConfig, mergeConfig, saveConfig } from './store.ts'
 import { TokenManager } from './token-manager.ts'
 import { rezConfigTool, rezStatusTool } from './tools.ts'
-import type { RezConfig, RezServerStatus, RezTestResult } from './protocol.ts'
+import type { RezConfig } from './protocol.ts'
 
 export const name = 'rez-suite'
 
@@ -73,8 +78,6 @@ export const Config: z<RezConfig> = z.object({
 
 const SECTION_ORDER = 150
 
-const COMPOSED_SERVERS = ['odoo', 'nextcloud', 'wechat', 'homeassistant'] as const
-
 export const REZ_GUIDANCE = [
   '本机已安装 ReZ-TI 套件（一次安装）：工作身份由 dsh-rez-sso 提供，MCP 由官方 dsh-mcp-client 接入 Odoo / Nextcloud / 企业微信 / Home Assistant。',
   '工具名 mcp__odoo__*、mcp__nextcloud__*、mcp__wechat__*、mcp__homeassistant__*。',
@@ -88,26 +91,17 @@ function normalize(input: Partial<RezConfig> | undefined): RezConfig {
   return mergeConfig(defaultConfig(), input ?? {})
 }
 
-function delegatedHost(): McpHost {
-  const status = (): RezServerStatus[] => COMPOSED_SERVERS.map(server => ({
-    server,
-    enabled: true,
-    state: 'disconnected' as const,
-    toolCount: 0,
-    registeredTools: 0,
-    lastError: secretConfigured(server)
-      ? 'owned by @deepseek-ai/dsh-mcp-client'
-      : 'missing ' + REZ_CREDENTIAL_REFS[server],
-  }))
-  const test = async (): Promise<RezTestResult[]> => COMPOSED_SERVERS.map(server => {
-    const ok = secretConfigured(server)
-    return ok
-      ? { server, ok: true, serverInfo: REZ_CREDENTIAL_REFS[server] + ' configured' }
-      : { server, ok: false, error: 'missing ' + REZ_CREDENTIAL_REFS[server] }
+function delegatedHost(ctx: Context, getConfig: () => RezConfig): McpHost {
+  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 () => undefined,
     dispose: async () => undefined,
   } as unknown as McpHost
@@ -117,7 +111,7 @@ export function apply(ctx: Context, config?: RezConfig): void {
   let current: () => RezConfig = () => normalize(config)
 
   const tokens = new TokenManager(joinTokenDb())
-  const host = delegatedHost()
+  const host = delegatedHost(ctx, () => current())
   ctx.effect(() => () => { tokens.close() }, 'dsh-rez-suite: ledger view')
 
   const tools = [

package/src/observe-mcp.ts

@@ -0,0 +1,121 @@
+/**
+ * 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.
+ */
+
+import { REZ_CREDENTIAL_REFS, secretConfigured, type RezSystem } from '@rezti/dsh-rez-sso'
+import type { RezConfig, RezServerStatus, RezTestResult } from './protocol.ts'
+
+export const COMPOSED_SERVERS = ['odoo', 'nextcloud', 'wechat', 'homeassistant'] as const
+
+export type ComposedServer = (typeof COMPOSED_SERVERS)[number]
+
+export function mcpToolPrefix(server: string): string {
+  return 'mcp__' + server + '__'
+}
+
+/** Count tools whose public name belongs to one composed MCP server. */
+export function countMcpTools(toolNames: readonly string[], server: string): number {
+  const prefix = mcpToolPrefix(server)
+  let count = 0
+  for (const name of toolNames) {
+    if (name.startsWith(prefix)) count += 1
+  }
+  return count
+}
+
+export function listRegisteredToolNames(tools: { schemas?: () => ReadonlyArray<{ name: string }> } | undefined): string[] {
+  if (tools === undefined || typeof tools.schemas !== 'function') return []
+  try {
+    return tools.schemas().map(schema => schema.name)
+  } catch {
+    return []
+  }
+}
+
+export interface ObserveInput {
+  config: RezConfig
+  toolNames: readonly string[]
+  secretPresent?: (server: RezSystem) => boolean
+}
+
+function isEnabled(config: RezConfig, server: ComposedServer): boolean {
+  return config.connections[server].enabled !== false
+}
+
+export function observeServer(
+  server: ComposedServer,
+  input: ObserveInput,
+): RezServerStatus {
+  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 未挂上）',
+  }
+}
+
+export function observeComposedServers(input: ObserveInput): RezServerStatus[] {
+  return COMPOSED_SERVERS.map(server => observeServer(server, input))
+}
+
+export function testComposedServers(input: ObserveInput): RezTestResult[] {
+  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',
+    }
+  })
+}