@rezti/dsh-rez-suite 0.1.5 → 0.1.6

package/README.md

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

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 标签）。个人微信在卡片的「微信」页扫码，然后直接在微信里说话。
+配置在 **设置 → 插件 → 插件配置** 展开 **ReZ-TI**（同页还有独立的 ReZ-TI 标签）。Odoo / Nextcloud / 企微 / HA 的地址和密钥都在「配置」页。个人微信在卡片的「微信」页扫码，然后直接在微信里说话。
 
 子包不要再单独 `dsh plugin add`，否则会重复注册 MCP。

package/lib/client.d.ts

@@ -7275,16 +7275,23 @@ declare const zh: {
   readonly 'config.env': "环境变量 (JSON)";
   readonly 'config.headers': "Headers (JSON)";
   readonly 'config.jsonInvalid': "JSON 格式错误：{error}";
+  readonly 'config.mcpHint': "四个公司 MCP 在这里配。密钥写入 ~/.dsh/.credentials.yaml（REZ_*）。新填的密钥会立刻拉起连接；改 URL 后如果已经连上，需要重启 dsh web。";
+  readonly 'config.secretConfigured': "已配置（留空则保持）";
+  readonly 'config.secretMissing': "未配置";
   readonly 'config.odoo': "Odoo";
-  readonly 'config.odoo.url': "Odoo URL";
-  readonly 'config.odoo.apiKey': "API Key";
+  readonly 'config.odoo.url': "Odoo MCP URL";
+  readonly 'config.odoo.apiKey': "API Token";
   readonly 'config.nextcloud': "Nextcloud";
-  readonly 'config.nextcloud.url': "Nextcloud URL";
+  readonly 'config.nextcloud.url': "Nextcloud 主机";
   readonly 'config.nextcloud.username': "用户名";
   readonly 'config.nextcloud.appPassword': "App Password";
   readonly 'config.wecom': "企业微信";
   readonly 'config.wecom.botId': "Bot ID";
   readonly 'config.wecom.secret': "Secret";
+  readonly 'config.wecom.webhook': "群机器人 Webhook";
+  readonly 'config.ha': "Home Assistant";
+  readonly 'config.ha.url': "HA MCP URL";
+  readonly 'config.ha.token': "长期访问令牌";
   readonly 'config.fs': "本地文件 (fs-mcp-server)";
   readonly 'config.fs.root': "根目录";
   readonly 'config.sqlite': "SQLite (sqlite-mcp-server)";

package/lib/client.js

@@ -36,16 +36,23 @@ 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)",
@@ -125,16 +132,23 @@ const en = {
 	"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)",
@@ -489,8 +503,8 @@ function AuditTab({ api }) {
 //#endregion
 //#region src/client/panel/ConfigTab.tsx
 /**
-* Config tab: role, billing rates, and a generic editor for every MCP server
-* in config.servers (stdio and streamable-http), with one-click tests.
+* Config tab: company MCP connections (Odoo / Nextcloud / WeCom / HA),
+* role, and billing. Secrets are write-only and land in credentials.yaml.
 */
 const ROLES = [
 	{
@@ -510,6 +524,12 @@ const ROLES = [
 		label: "role.operations"
 	}
 ];
+const EMPTY_SECRETS = {
+	odoo: "",
+	nextcloud: "",
+	wechat: "",
+	homeassistant: ""
+};
 function Field({ label, children }) {
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 		className: panel_module_default.field,
@@ -528,42 +548,81 @@ function Section({ title, children }) {
 		}), children]
 	});
 }
-function parseRecord(text) {
-	const value = JSON.parse(text);
-	if (typeof value !== "object" || value === null || Array.isArray(value)) throw new Error("expected a JSON object");
-	const out = {};
-	for (const [key, item] of Object.entries(value)) out[key] = String(item);
-	return out;
+function SecretField({ label, configured, value, onChange }) {
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Field, {
+		label,
+		children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+			className: panel_module_default.input,
+			type: "password",
+			autoComplete: "off",
+			value,
+			placeholder: configured ? tt("config.secretConfigured") : tt("config.secretMissing"),
+			onChange: (event) => {
+				onChange(event.target.value);
+			}
+		})
+	});
+}
+function McpSection({ title, row, secret, onEnabled, onUrl, onUsername, onSecret, urlLabel, secretLabel, usernameLabel }) {
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Section, {
+		title,
+		children: [
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Field, {
+				label: tt("config.enabled"),
+				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+					className: panel_module_default.checkbox,
+					type: "checkbox",
+					checked: row.enabled,
+					onChange: (event) => {
+						onEnabled(event.target.checked);
+					}
+				})
+			}),
+			onUrl !== void 0 && urlLabel !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Field, {
+				label: urlLabel,
+				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+					className: panel_module_default.input,
+					value: row.url ?? "",
+					onChange: (event) => {
+						onUrl(event.target.value);
+					}
+				})
+			}),
+			onUsername !== void 0 && usernameLabel !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Field, {
+				label: usernameLabel,
+				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+					className: panel_module_default.input,
+					value: row.username ?? "",
+					onChange: (event) => {
+						onUsername(event.target.value);
+					}
+				})
+			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(SecretField, {
+				label: secretLabel,
+				configured: row.secretConfigured,
+				value: secret,
+				onChange: onSecret
+			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+				className: panel_module_default.message,
+				children: row.secretRef
+			})
+		]
+	});
 }
 function ConfigTab({ api }) {
 	const [config, setConfig] = (0, react.useState)(null);
+	const [secrets, setSecrets] = (0, react.useState)(EMPTY_SECRETS);
 	const [loading, setLoading] = (0, react.useState)(true);
 	const [saving, setSaving] = (0, react.useState)(false);
 	const [testing, setTesting] = (0, react.useState)(false);
 	const [message, setMessage] = (0, react.useState)("");
 	const [error, setError] = (0, react.useState)("");
 	const [results, setResults] = (0, react.useState)([]);
-	const [argsText, setArgsText] = (0, react.useState)({});
-	const [envText, setEnvText] = (0, react.useState)({});
-	const [headerText, setHeaderText] = (0, react.useState)({});
-	const initTexts = (next) => {
-		const args = {};
-		const envs = {};
-		const headers = {};
-		for (const [id, server] of Object.entries(next.servers)) {
-			args[id] = (server.args ?? []).join("\n");
-			envs[id] = JSON.stringify(server.env ?? {}, null, 2);
-			headers[id] = JSON.stringify(server.headers ?? {}, null, 2);
-		}
-		setArgsText(args);
-		setEnvText(envs);
-		setHeaderText(headers);
-	};
 	const load = async () => {
 		try {
-			const next = await api.getConfig();
-			setConfig(next);
-			initTexts(next);
+			setConfig(await api.getConfig());
 		} catch (err) {
 			setError(errorMessage(err));
 		} finally {
@@ -587,13 +646,13 @@ function ConfigTab({ api }) {
 			[key]: value
 		});
 	};
-	const updateServer = (id, patch) => {
+	const patchConnection = (id, patch) => {
 		setConfig((prev) => prev === null ? prev : {
 			...prev,
-			servers: {
-				...prev.servers,
+			connections: {
+				...prev.connections,
 				[id]: {
-					...prev.servers[id],
+					...prev.connections[id],
 					...patch
 				}
 			}
@@ -604,9 +663,32 @@ function ConfigTab({ api }) {
 		setMessage("");
 		setError("");
 		try {
-			const saved = await api.saveConfig(config);
+			const payload = {
+				enabled: config.enabled,
+				role: config.role,
+				billing: config.billing,
+				connections: {
+					odoo: {
+						...config.connections.odoo,
+						secret: secrets.odoo || void 0
+					},
+					nextcloud: {
+						...config.connections.nextcloud,
+						secret: secrets.nextcloud || void 0
+					},
+					wechat: {
+						...config.connections.wechat,
+						secret: secrets.wechat || void 0
+					},
+					homeassistant: {
+						...config.connections.homeassistant,
+						secret: secrets.homeassistant || void 0
+					}
+				}
+			};
+			const saved = await api.saveConfig(payload);
 			setConfig(saved);
-			initTexts(saved);
+			setSecrets(EMPTY_SECRETS);
 			setMessage(tt("config.saved"));
 		} catch (err) {
 			setError(errorMessage(err));
@@ -628,28 +710,22 @@ function ConfigTab({ api }) {
 		}
 	};
 	const renderResult = (result) => {
-		if (result.ok) return tt("config.testOk", {
-			tools: result.toolCount ?? 0,
-			latency: result.latencyMs ?? 0
-		});
-		return tt("config.testFail", { error: result.error ?? "" });
-	};
-	const commitArgs = (id) => {
-		updateServer(id, { args: argsText[id] === "" ? [] : argsText[id].split("\n").map((line) => line.trim()).filter(Boolean) });
-	};
-	const commitRecord = (id, kind) => {
-		const text = kind === "env" ? envText[id] : headerText[id];
-		try {
-			const record = parseRecord(text ?? "{}");
-			updateServer(id, kind === "env" ? { env: record } : { headers: record });
-			setError("");
-		} catch (err) {
-			setError(tt("config.jsonInvalid", { error: errorMessage(err) }));
+		if (result.ok) {
+			if (result.serverInfo !== void 0) return result.serverInfo;
+			return tt("config.testOk", {
+				tools: result.toolCount ?? 0,
+				latency: result.latencyMs ?? 0
+			});
 		}
+		return tt("config.testFail", { error: result.error ?? "" });
 	};
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 		className: panel_module_default.tabBody,
 		children: [
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+				className: panel_module_default.message,
+				children: tt("config.mcpHint")
+			}),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Section, {
 				title: tt("config.role"),
 				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Field, {
@@ -677,110 +753,82 @@ function ConfigTab({ api }) {
 					})
 				})]
 			}),
-			Object.entries(config.servers).map(([id, server]) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Section, {
-				title: id,
-				children: [
-					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Field, {
-						label: tt("config.enabled"),
-						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-							className: panel_module_default.checkbox,
-							type: "checkbox",
-							checked: server.enabled,
-							onChange: (event) => {
-								updateServer(id, { enabled: event.target.checked });
-							}
-						})
-					}),
-					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Field, {
-						label: tt("config.transport"),
-						children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("select", {
-							className: panel_module_default.select,
-							value: server.transport,
-							onChange: (event) => {
-								updateServer(id, { transport: event.target.value });
-							},
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
-								value: "stdio",
-								children: "stdio"
-							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
-								value: "streamable-http",
-								children: "streamable-http"
-							})]
-						})
-					}),
-					server.transport === "stdio" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Field, {
-							label: tt("config.command"),
-							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-								className: panel_module_default.input,
-								value: server.command ?? "",
-								onChange: (event) => {
-									updateServer(id, { command: event.target.value });
-								}
-							})
-						}),
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Field, {
-							label: tt("config.args"),
-							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("textarea", {
-								className: panel_module_default.input,
-								rows: 3,
-								value: argsText[id] ?? "",
-								onChange: (event) => {
-									setArgsText((prev) => ({
-										...prev,
-										[id]: event.target.value
-									}));
-								},
-								onBlur: () => {
-									commitArgs(id);
-								}
-							})
-						}),
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Field, {
-							label: tt("config.env"),
-							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("textarea", {
-								className: panel_module_default.input,
-								rows: 4,
-								value: envText[id] ?? "{}",
-								onChange: (event) => {
-									setEnvText((prev) => ({
-										...prev,
-										[id]: event.target.value
-									}));
-								},
-								onBlur: () => {
-									commitRecord(id, "env");
-								}
-							})
-						})
-					] }) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Field, {
-						label: tt("config.url"),
-						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-							className: panel_module_default.input,
-							value: server.url ?? "",
-							onChange: (event) => {
-								updateServer(id, { url: event.target.value });
-							}
-						})
-					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Field, {
-						label: tt("config.headers"),
-						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("textarea", {
-							className: panel_module_default.input,
-							rows: 4,
-							value: headerText[id] ?? "{}",
-							onChange: (event) => {
-								setHeaderText((prev) => ({
-									...prev,
-									[id]: event.target.value
-								}));
-							},
-							onBlur: () => {
-								commitRecord(id, "headers");
-							}
-						})
-					})] })
-				]
-			}, id)),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(McpSection, {
+				title: tt("config.odoo"),
+				row: config.connections.odoo,
+				secret: secrets.odoo,
+				onEnabled: (enabled) => {
+					patchConnection("odoo", { enabled });
+				},
+				onUrl: (url) => {
+					patchConnection("odoo", { url });
+				},
+				onSecret: (value) => {
+					setSecrets((prev) => ({
+						...prev,
+						odoo: value
+					}));
+				},
+				urlLabel: tt("config.odoo.url"),
+				secretLabel: tt("config.odoo.apiKey")
+			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(McpSection, {
+				title: tt("config.nextcloud"),
+				row: config.connections.nextcloud,
+				secret: secrets.nextcloud,
+				onEnabled: (enabled) => {
+					patchConnection("nextcloud", { enabled });
+				},
+				onUrl: (url) => {
+					patchConnection("nextcloud", { url });
+				},
+				onUsername: (username) => {
+					patchConnection("nextcloud", { username });
+				},
+				onSecret: (value) => {
+					setSecrets((prev) => ({
+						...prev,
+						nextcloud: value
+					}));
+				},
+				urlLabel: tt("config.nextcloud.url"),
+				usernameLabel: tt("config.nextcloud.username"),
+				secretLabel: tt("config.nextcloud.appPassword")
+			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(McpSection, {
+				title: tt("config.wecom"),
+				row: config.connections.wechat,
+				secret: secrets.wechat,
+				onEnabled: (enabled) => {
+					patchConnection("wechat", { enabled });
+				},
+				onSecret: (value) => {
+					setSecrets((prev) => ({
+						...prev,
+						wechat: value
+					}));
+				},
+				secretLabel: tt("config.wecom.webhook")
+			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(McpSection, {
+				title: tt("config.ha"),
+				row: config.connections.homeassistant,
+				secret: secrets.homeassistant,
+				onEnabled: (enabled) => {
+					patchConnection("homeassistant", { enabled });
+				},
+				onUrl: (url) => {
+					patchConnection("homeassistant", { url });
+				},
+				onSecret: (value) => {
+					setSecrets((prev) => ({
+						...prev,
+						homeassistant: value
+					}));
+				},
+				urlLabel: tt("config.ha.url"),
+				secretLabel: tt("config.ha.token")
+			}),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Section, {
 				title: tt("config.billing"),
 				children: [

package/lib/index.d.ts

@@ -1702,12 +1702,32 @@ interface RezMcpServerSpec {
   /** Per-tool-call timeout in milliseconds. */
   toolCallTimeoutMs?: number;
 }
+/** Company MCP endpoints persisted under ~/.dsh/dsh-rez-suite.json. Secrets are not stored here. */
+interface RezConnections {
+  odoo: {
+    enabled: boolean;
+    url: string;
+  };
+  nextcloud: {
+    enabled: boolean;
+    url: string;
+    username: string;
+  };
+  wechat: {
+    enabled: boolean;
+  };
+  homeassistant: {
+    enabled: boolean;
+    url: string;
+  };
+}
 /** Full plugin configuration persisted under ~/.dsh/dsh-rez-suite.json. */
 interface RezConfig {
   enabled: boolean;
   announceToAgent: boolean;
   role: RezRoleId;
   servers: Record<string, RezMcpServerSpec>;
+  connections: RezConnections;
   billing: {
     inputCostPer1k: number;
     outputCostPer1k: number;