@rezti/dsh-rez-suite 0.1.4 → 0.1.6

package/src/client/locales.ts

@@ -5,6 +5,8 @@
 export const zh = {
   'entry.label': 'Rez',
   'entry.tooltip': 'Rez Suite 配置与审计面板',
+  'settings.title': 'ReZ-TI',
+  'settings.description': '公司 MCP（Odoo / Nextcloud / 企微 / HA）与个人微信扫码通道。',
   'panel.title': 'Rez Suite',
   'tab.config': '配置',
   'tab.weixin': '微信',
@@ -25,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)',
@@ -99,6 +108,8 @@ export type RezKey = keyof typeof zh
 export const en: Record<RezKey, string> = {
   'entry.label': 'Rez',
   'entry.tooltip': 'Rez Suite configuration and audit panel',
+  'settings.title': 'ReZ-TI',
+  'settings.description': 'Company MCP (Odoo / Nextcloud / WeCom / HA) and personal WeChat scan-and-chat.',
   'panel.title': 'Rez Suite',
   'tab.config': 'Config',
   'tab.weixin': 'WeChat',
@@ -118,16 +129,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)',

package/src/client/panel/AuditTab.tsx

@@ -48,12 +48,12 @@ export function AuditTab({ api }: { api: RezApi }) {
       </div>
       {error !== '' && <div className={css.error}>{error}</div>}
       <div className={css.cards}>
-        <div className={css.card}><div className={css.cardLabel}>{tt('audit.totalCalls')}</div><div className={css.cardValue}>{audit.totalCalls}</div></div>
-        <div className={css.card}><div className={css.cardLabel}>{tt('audit.inputTokens')}</div><div className={css.cardValue}>{audit.totalInputTokens}</div></div>
-        <div className={css.card}><div className={css.cardLabel}>{tt('audit.outputTokens')}</div><div className={css.cardValue}>{audit.totalOutputTokens}</div></div>
-        <div className={css.card}><div className={css.cardLabel}>{tt('audit.totalCost')}</div><div className={css.cardValue}>{audit.totalCost.toFixed(4)}</div></div>
-        <div className={css.card}><div className={css.cardLabel}>{tt('audit.monthCost')}</div><div className={css.cardValue}>{audit.monthCost.toFixed(4)}</div></div>
-        <div className={css.card}><div className={css.cardLabel}>{tt('audit.budget')}</div><div className={css.cardValue}>{audit.monthlyBudget.toFixed(2)}</div></div>
+        <div className={css.stat}><div className={css.cardLabel}>{tt('audit.totalCalls')}</div><div className={css.cardValue}>{audit.totalCalls}</div></div>
+        <div className={css.stat}><div className={css.cardLabel}>{tt('audit.inputTokens')}</div><div className={css.cardValue}>{audit.totalInputTokens}</div></div>
+        <div className={css.stat}><div className={css.cardLabel}>{tt('audit.outputTokens')}</div><div className={css.cardValue}>{audit.totalOutputTokens}</div></div>
+        <div className={css.stat}><div className={css.cardLabel}>{tt('audit.totalCost')}</div><div className={css.cardValue}>{audit.totalCost.toFixed(4)}</div></div>
+        <div className={css.stat}><div className={css.cardLabel}>{tt('audit.monthCost')}</div><div className={css.cardValue}>{audit.monthCost.toFixed(4)}</div></div>
+        <div className={css.stat}><div className={css.cardLabel}>{tt('audit.budget')}</div><div className={css.cardValue}>{audit.monthlyBudget.toFixed(2)}</div></div>
       </div>
       <div className={css.tableWrap}>
         <table className={css.table}>

package/src/client/panel/ConfigTab.tsx

@@ -1,11 +1,11 @@
 /**
- * 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.
  */
 
 import { useEffect, useState, type ReactNode } from 'react'
 import type { RezApi } from '../api.ts'
-import type { RezMcpServerSpec, RezPublicConfig, RezRoleId, RezTestResult } from '../../protocol.ts'
+import type { RezPublicConfig, RezPublicConnection, RezRoleId, RezTestResult } from '../../protocol.ts'
 import { errorMessage, tt } from './helpers.ts'
 import css from './panel.module.css'
 
@@ -16,6 +16,15 @@ const ROLES: Array<{ value: RezRoleId; label: string }> = [
   { value: 'operations', label: 'role.operations' },
 ]
 
+type SecretDrafts = {
+  odoo: string
+  nextcloud: string
+  wechat: string
+  homeassistant: string
+}
+
+const EMPTY_SECRETS: SecretDrafts = { odoo: '', nextcloud: '', wechat: '', homeassistant: '' }
+
 function Field({ label, children }: { label: string; children: ReactNode }) {
   return (
     <div className={css.field}>
@@ -34,47 +43,88 @@ function Section({ title, children }: { title: string; children: ReactNode }) {
   )
 }
 
-function parseRecord(text: string): Record<string, string> {
-  const value: unknown = JSON.parse(text)
-  if (typeof value !== 'object' || value === null || Array.isArray(value)) throw new Error('expected a JSON object')
-  const out: Record<string, string> = {}
-  for (const [key, item] of Object.entries(value as Record<string, unknown>)) {
-    out[key] = String(item)
-  }
-  return out
+function SecretField({
+  label,
+  configured,
+  value,
+  onChange,
+}: {
+  label: string
+  configured: boolean
+  value: string
+  onChange: (value: string) => void
+}) {
+  return (
+    <Field label={label}>
+      <input
+        className={css.input}
+        type="password"
+        autoComplete="off"
+        value={value}
+        placeholder={configured ? tt('config.secretConfigured') : tt('config.secretMissing')}
+        onChange={event => { onChange(event.target.value) }}
+      />
+    </Field>
+  )
+}
+
+function McpSection({
+  title,
+  row,
+  secret,
+  onEnabled,
+  onUrl,
+  onUsername,
+  onSecret,
+  urlLabel,
+  secretLabel,
+  usernameLabel,
+}: {
+  title: string
+  row: RezPublicConnection
+  secret: string
+  onEnabled: (enabled: boolean) => void
+  onUrl?: (url: string) => void
+  onUsername?: (username: string) => void
+  onSecret: (secret: string) => void
+  urlLabel?: string
+  secretLabel: string
+  usernameLabel?: string
+}) {
+  return (
+    <Section title={title}>
+      <Field label={tt('config.enabled')}>
+        <input className={css.checkbox} type="checkbox" checked={row.enabled} onChange={event => { onEnabled(event.target.checked) }} />
+      </Field>
+      {onUrl !== undefined && urlLabel !== undefined && (
+        <Field label={urlLabel}>
+          <input className={css.input} value={row.url ?? ''} onChange={event => { onUrl(event.target.value) }} />
+        </Field>
+      )}
+      {onUsername !== undefined && usernameLabel !== undefined && (
+        <Field label={usernameLabel}>
+          <input className={css.input} value={row.username ?? ''} onChange={event => { onUsername(event.target.value) }} />
+        </Field>
+      )}
+      <SecretField label={secretLabel} configured={row.secretConfigured} value={secret} onChange={onSecret} />
+      <p className={css.message}>{row.secretRef}</p>
+    </Section>
+  )
 }
 
 export function ConfigTab({ api }: { api: RezApi }) {
   const [config, setConfig] = useState<RezPublicConfig | null>(null)
+  const [secrets, setSecrets] = useState<SecretDrafts>(EMPTY_SECRETS)
   const [loading, setLoading] = useState(true)
   const [saving, setSaving] = useState(false)
   const [testing, setTesting] = useState(false)
   const [message, setMessage] = useState('')
   const [error, setError] = useState('')
   const [results, setResults] = useState<RezTestResult[]>([])
-  const [argsText, setArgsText] = useState<Record<string, string>>({})
-  const [envText, setEnvText] = useState<Record<string, string>>({})
-  const [headerText, setHeaderText] = useState<Record<string, string>>({})
-
-  const initTexts = (next: RezPublicConfig): void => {
-    const args: Record<string, string> = {}
-    const envs: Record<string, string> = {}
-    const headers: Record<string, string> = {}
-    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 (): Promise<void> => {
     try {
-      const next = await api.getConfig()
-      setConfig(next)
-      initTexts(next)
+      setConfig(await api.getConfig())
     } catch (err) {
       setError(errorMessage(err))
     } finally {
@@ -91,10 +141,10 @@ export function ConfigTab({ api }: { api: RezApi }) {
     setConfig(prev => prev === null ? prev : { ...prev, [key]: value })
   }
 
-  const updateServer = (id: string, patch: Partial<RezMcpServerSpec>): void => {
+  const patchConnection = (id: keyof RezPublicConfig['connections'], patch: Partial<RezPublicConnection>): void => {
     setConfig(prev => prev === null ? prev : {
       ...prev,
-      servers: { ...prev.servers, [id]: { ...prev.servers[id], ...patch } },
+      connections: { ...prev.connections, [id]: { ...prev.connections[id], ...patch } },
     })
   }
 
@@ -103,9 +153,20 @@ export function ConfigTab({ api }: { api: RezApi }) {
     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 || undefined },
+          nextcloud: { ...config.connections.nextcloud, secret: secrets.nextcloud || undefined },
+          wechat: { ...config.connections.wechat, secret: secrets.wechat || undefined },
+          homeassistant: { ...config.connections.homeassistant, secret: secrets.homeassistant || undefined },
+        },
+      }
+      const saved = await api.saveConfig(payload)
       setConfig(saved)
-      initTexts(saved)
+      setSecrets(EMPTY_SECRETS)
       setMessage(tt('config.saved'))
     } catch (err) {
       setError(errorMessage(err))
@@ -129,27 +190,16 @@ export function ConfigTab({ api }: { api: RezApi }) {
   }
 
   const renderResult = (result: RezTestResult): string => {
-    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: string): void => {
-    updateServer(id, { args: argsText[id] === '' ? [] : argsText[id].split('\n').map(line => line.trim()).filter(Boolean) })
-  }
-
-  const commitRecord = (id: string, kind: 'env' | 'headers'): void => {
-    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 !== undefined) return result.serverInfo
+      return tt('config.testOk', { tools: result.toolCount ?? 0, latency: result.latencyMs ?? 0 })
     }
+    return tt('config.testFail', { error: result.error ?? '' })
   }
 
   return (
     <div className={css.tabBody}>
+      <p className={css.message}>{tt('config.mcpHint')}</p>
       <Section title={tt('config.role')}>
         <Field label={tt('config.role')}>
           <select className={css.select} value={config.role} onChange={event => { setTop('role', event.target.value as RezRoleId) }}>
@@ -161,41 +211,46 @@ export function ConfigTab({ api }: { api: RezApi }) {
         </Field>
       </Section>
 
-      {Object.entries(config.servers).map(([id, server]) => (
-        <Section key={id} title={id}>
-          <Field label={tt('config.enabled')}>
-            <input className={css.checkbox} type="checkbox" checked={server.enabled} onChange={event => { updateServer(id, { enabled: event.target.checked }) }} />
-          </Field>
-          <Field label={tt('config.transport')}>
-            <select className={css.select} value={server.transport} onChange={event => { updateServer(id, { transport: event.target.value as RezMcpServerSpec['transport'] }) }}>
-              <option value="stdio">stdio</option>
-              <option value="streamable-http">streamable-http</option>
-            </select>
-          </Field>
-          {server.transport === 'stdio' ? (
-            <>
-              <Field label={tt('config.command')}>
-                <input className={css.input} value={server.command ?? ''} onChange={event => { updateServer(id, { command: event.target.value }) }} />
-              </Field>
-              <Field label={tt('config.args')}>
-                <textarea className={css.input} rows={3} value={argsText[id] ?? ''} onChange={event => { setArgsText(prev => ({ ...prev, [id]: event.target.value })) }} onBlur={() => { commitArgs(id) }} />
-              </Field>
-              <Field label={tt('config.env')}>
-                <textarea className={css.input} rows={4} value={envText[id] ?? '{}'} onChange={event => { setEnvText(prev => ({ ...prev, [id]: event.target.value })) }} onBlur={() => { commitRecord(id, 'env') }} />
-              </Field>
-            </>
-          ) : (
-            <>
-              <Field label={tt('config.url')}>
-                <input className={css.input} value={server.url ?? ''} onChange={event => { updateServer(id, { url: event.target.value }) }} />
-              </Field>
-              <Field label={tt('config.headers')}>
-                <textarea className={css.input} rows={4} value={headerText[id] ?? '{}'} onChange={event => { setHeaderText(prev => ({ ...prev, [id]: event.target.value })) }} onBlur={() => { commitRecord(id, 'headers') }} />
-              </Field>
-            </>
-          )}
-        </Section>
-      ))}
+      <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')}
+      />
+      <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')}
+      />
+      <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')}
+      />
+      <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')}
+      />
 
       <Section title={tt('config.billing')}>
         <Field label={tt('config.billing.input')}>