dsh-my-config 1.7.2 → 1.8.0

package/README.md

@@ -4,12 +4,21 @@ DeepSeek Harness 插件：在 Web 侧边栏提供「我的技能 / 我的连接
 
 | 模块 | 能力 |
 |---|---|
-| 我的技能 | 创建 / 编辑 / 删除 / 导入技能；**ZIP 技能包导入**（多文件包）；**外部技能市场**（内置精选市场 + 任意 `github://owner/repo` 仓库 + JSON 索引市场）；分组管理 |
-| 我的连接器 | 创建 / 编辑（配置）/ 启停 / 删除 MCP 连接器（streamable-http 与 stdio），通过 `ctx.loader` 动态下发 `@deepseek-ai/dsh-mcp-client` 条目；分组管理 |
-| 我的智能体 | 创建 / 编辑 / 删除自定义 Agent 预设；**关联技能**（独立技能目录，精确限定该智能体可见的技能）与**关联连接器**（工具清单注入系统提示词）；分组管理 |
+| 我的技能 | 创建 / 编辑 / 删除 / 导入技能；**ZIP 技能包导入**（多文件包）；**外部技能市场**（内置精选市场 + 任意 `github://owner/repo` 仓库 + JSON 索引市场）；**全字段编辑**（license / compatibility / metadata / allowed-tools，对齐 Agent Skills 开放规范）；**规范校验**（保存/导入时逐字段拦截并定位错误）；分组管理 |
+| 我的连接器 | 创建 / 编辑（配置）/ 启停 / 删除 MCP 连接器（streamable-http 与 stdio），通过 `ctx.loader` 动态下发 `@deepseek-ai/dsh-mcp-client` 条目；**连接测试**（MCP 握手 + 工具清单预览）；**工具级授权**（白名单拦截 + 自动执行放行，经审批 answerer 实现）；**凭据脱敏**（env / headers 掩码显示，防误覆盖）；分组管理 |
+| 我的智能体 | 创建 / 编辑 / 删除自定义 Agent 预设；**关联技能**（独立技能目录，精确限定该智能体可见的技能）与**关联连接器**（工具清单注入系统提示词）；**模型绑定**（provider/model/reasoningEffort 记录与展示）；**工具组白名单**（文件 / 联网 / 终端 / 技能 四组粒度过滤预设组合）；分组管理 |
 
 三个页面统一布局：搜索框 + 分组筛选 + 刷新 + 新建。
 
+## 更新日志
+
+### v1.8.0
+
+- **技能**：编辑器支持 license / compatibility / metadata / allowed-tools 全字段（对齐 agentskills.io 规范）；保存与导入时执行规范校验，错误逐字段定位展示。
+- **连接器**：新增「测试连接」（stdio / streamable-http 真实 MCP 握手，返回工具清单与延迟）；工具级授权（允许使用白名单 + 自动执行列表，经 `approval/request` answerer 拦截/放行）；env / headers 密钥掩码显示与防误覆盖。
+- **智能体**：预设新增模型绑定（provider / model / reasoningEffort）与工具组白名单（文件 / 联网 / 终端 / 技能）。
+- 已知限制：审批拒绝原因经审计日志留痕（内核 outcome 词表无原因通道）；连接器密钥存储仍为本地明文（data.json），请妥善保管该文件。
+
 ## 安装
 
 ```bash

package/client.js

@@ -102,6 +102,18 @@ window.__ModuleLoader__.load({
       skillReadonly: '只读',
       skillInvalid: 'frontmatter 无效',
       skillRoot: '存储目录',
+      skillLicense: '许可证（可选）',
+      skillCompatibility: '兼容性（可选）',
+      skillMetadata: '元数据（键值对，可选）',
+      skillMetadataKey: '键',
+      skillMetadataValue: '值',
+      skillMetadataAdd: '添加一行',
+      skillAllowedTools: '允许的工具（可选）',
+      skillAllowedToolsHint: '实验性功能：写入 frontmatter 的 allowed-tools，空格分隔的工具名',
+      skillErrName: '名称须为小写 kebab-case（字母/数字/连字符），不超过 64 字符',
+      skillErrDescEmpty: '描述不能为空',
+      skillErrDescLong: '描述不能超过 1024 字符',
+      skillErrCompatLong: '兼容性说明不能超过 500 字符',
       marketAdd: '添加市场',
       marketName: '市场名称',
       marketUrl: '市场索引地址（JSON）',
@@ -127,6 +139,16 @@ window.__ModuleLoader__.load({
       connectorLive: '运行中',
       connectorStopped: '未加载',
       connectorToolsHint: '连接后工具以 mcp__{serverName}__ 前缀注册',
+      connectorTest: '测试连接',
+      connectorUntested: '未测试',
+      connectorConnected: '已连接 {n} 个工具',
+      connectorTestFailed: '失败：{reason}',
+      connectorTools: '工具',
+      connectorToolsEmpty: '暂无工具清单，请先点击「测试连接」获取。',
+      connectorToolAllowed: '允许使用',
+      connectorToolAuto: '自动执行',
+      connectorApprovalNever: '当前审批策略为 never，自动执行不生效。',
+      connectorSecretHidden: '敏感值不可查看，如需修改请重新填写。',
       // 智能体
       expertCreate: '创建智能体',
       expertEdit: '编辑智能体',
@@ -139,6 +161,19 @@ window.__ModuleLoader__.load({
       expertDefault: '默认',
       expertBroken: '加载失败',
       expertHint: '自定义智能体注册为 Agent 预设，新会话可在预设选择器中选用。',
+      expertModel: '模型绑定（可选）',
+      expertModelProvider: '提供商（如 anthropic）',
+      expertModelName: '模型名（如 claude-sonnet-4）',
+      expertModelDefault: '跟随默认',
+      expertModelHint: '提供商与模型名均填写才生效；留空 = 跟随默认模型。',
+      expertModelPartial: '模型绑定须同时填写提供商与模型名，或留空。',
+      expertTools: '工具组（可选）',
+      expertToolFs: '文件读写检索',
+      expertToolWeb: '联网',
+      expertToolShell: '终端',
+      expertToolSkills: '技能',
+      expertToolsHint: '留空 = 全部可用。',
+      expertToolsSummary: '工具组',
       // 插件
       pluginInstall: '安装插件',
       pluginSpec: '包名 / Git 地址 / 本地目录',
@@ -242,6 +277,18 @@ window.__ModuleLoader__.load({
       skillReadonly: 'Read-only',
       skillInvalid: 'Invalid frontmatter',
       skillRoot: 'Storage directory',
+      skillLicense: 'License (optional)',
+      skillCompatibility: 'Compatibility (optional)',
+      skillMetadata: 'Metadata (key-value pairs, optional)',
+      skillMetadataKey: 'Key',
+      skillMetadataValue: 'Value',
+      skillMetadataAdd: 'Add row',
+      skillAllowedTools: 'Allowed tools (optional)',
+      skillAllowedToolsHint: 'Experimental: written to frontmatter as allowed-tools, space-separated tool names',
+      skillErrName: 'Name must be lowercase kebab-case (letters/digits/hyphens), max 64 characters',
+      skillErrDescEmpty: 'Description is required',
+      skillErrDescLong: 'Description must be at most 1024 characters',
+      skillErrCompatLong: 'Compatibility must be at most 500 characters',
       marketAdd: 'Add market',
       marketName: 'Market name',
       marketUrl: 'Market index URL (JSON)',
@@ -266,6 +313,16 @@ window.__ModuleLoader__.load({
       connectorLive: 'Live',
       connectorStopped: 'Not loaded',
       connectorToolsHint: 'Tools register with the mcp__{serverName}__ prefix once connected',
+      connectorTest: 'Test connection',
+      connectorUntested: 'Not tested',
+      connectorConnected: 'Connected: {n} tools',
+      connectorTestFailed: 'Failed: {reason}',
+      connectorTools: 'Tools',
+      connectorToolsEmpty: 'No tool list yet. Click "Test connection" to fetch it.',
+      connectorToolAllowed: 'Allow',
+      connectorToolAuto: 'Auto-run',
+      connectorApprovalNever: 'Current approval policy is "never"; auto-run has no effect.',
+      connectorSecretHidden: 'Secret values cannot be viewed. Re-enter to change them.',
       expertCreate: 'New agent',
       expertEdit: 'Edit agent',
       expertId: 'ID (lowercase letters/digits/hyphens)',
@@ -277,6 +334,19 @@ window.__ModuleLoader__.load({
       expertDefault: 'Default',
       expertBroken: 'Broken',
       expertHint: 'Custom agents register as agent presets and can be selected for new sessions.',
+      expertModel: 'Model binding (optional)',
+      expertModelProvider: 'Provider (e.g. anthropic)',
+      expertModelName: 'Model (e.g. claude-sonnet-4)',
+      expertModelDefault: 'Follow default',
+      expertModelHint: 'Both provider and model are required to take effect; empty = follow the default model.',
+      expertModelPartial: 'Model binding requires both provider and model, or leave empty.',
+      expertTools: 'Tool groups (optional)',
+      expertToolFs: 'File read/write & search',
+      expertToolWeb: 'Web access',
+      expertToolShell: 'Terminal',
+      expertToolSkills: 'Skills',
+      expertToolsHint: 'Empty = all available.',
+      expertToolsSummary: 'Tool groups',
       pluginInstall: 'Install plugin',
       pluginSpec: 'Package name / Git URL / local directory',
       pluginUninstall: 'Uninstall',
@@ -350,6 +420,7 @@ window.__ModuleLoader__.load({
 .mc-empty { color: var(--dsw-alias-label-secondary); padding: 48px 0; text-align: center; }
 .mc-error { color: var(--dsw-alias-state-error-primary); padding: 24px 0; text-align: center; display: flex; flex-direction: column; gap: 8px; align-items: center; }
 .mc-hint { font-size: 12px; color: var(--dsw-alias-label-secondary); line-height: 1.6; }
+.mc-field-error { color: var(--dsw-alias-state-error-primary); font-size: 12px; }
 .mc-section { margin-bottom: 20px; }
 .mc-section-title { font-size: 13px; font-weight: 600; margin: 0 0 10px; color: var(--dsw-alias-label-secondary); }
 .mc-row { display: flex; align-items: center; gap: 10px; padding: 10px 14px; background: var(--dsw-alias-bg-layer-1); border: 1px solid var(--dsw-alias-border-l1); border-radius: 10px; margin-bottom: 8px; }
@@ -450,7 +521,11 @@ window.__ModuleLoader__.load({
         clearTimeout(timer);
       }
       const data = await res.json().catch(() => ({ ok: false, message: `HTTP ${res.status} [${url}]` }));
-      if (!data.ok) throw new Error(data.message || `HTTP ${res.status}`);
+      if (!data.ok) {
+        const err = new Error(data.message || `HTTP ${res.status}`);
+        if (Array.isArray(data.errors)) err.fields = data.errors;
+        throw err;
+      }
       return data;
     }
 
@@ -509,17 +584,51 @@ window.__ModuleLoader__.load({
         group: skill?.group ?? '',
         userInvocable: skill?.userInvocable !== false,
         disableModelInvocation: skill?.disableModelInvocation === true,
+        license: skill?.license ?? '',
+        compatibility: skill?.compatibility ?? '',
+        metadata: Object.entries(skill?.metadata ?? {}).map(([key, value]) => ({ key, value: String(value ?? '') })),
+        allowedTools: skill?.allowedTools ?? '',
       });
       const [busy, setBusy] = useState(false);
-      const [error, setError] = useState('');
-      const set = (key) => (e) => setForm({ ...form, [key]: e.target.value });
+      const [error, setError] = useState(undefined); // { message, fields? }
+      const [errors, setErrors] = useState({}); // 本地校验：字段 → 错误文案
+      const validateForm = (f) => {
+        const errs = {};
+        if (f.name.length > 64 || !/^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(f.name)) errs.name = t('skillErrName');
+        if (!f.description.trim()) errs.description = t('skillErrDescEmpty');
+        else if (f.description.length > 1024) errs.description = t('skillErrDescLong');
+        if (f.compatibility.length > 500) errs.compatibility = t('skillErrCompatLong');
+        return errs;
+      };
+      const set = (key) => (e) => {
+        const next = { ...form, [key]: e.target.value };
+        setForm(next);
+        if (Object.keys(errors).length > 0) setErrors(validateForm(next));
+      };
+      const setMetadata = (i, key) => (e) => {
+        const metadata = form.metadata.map((row, idx) => (idx === i ? { ...row, [key]: e.target.value } : row));
+        setForm({ ...form, metadata });
+      };
       const submit = async () => {
-        setBusy(true); setError('');
+        const errs = validateForm(form);
+        setErrors(errs);
+        if (Object.keys(errs).length > 0) return;
+        setBusy(true); setError(undefined);
         try {
-          await api(isEdit ? 'skills.update' : 'skills.create', form);
+          const metadata = {};
+          for (const row of form.metadata) {
+            const k = row.key.trim();
+            if (k) metadata[k] = row.value;
+          }
+          await api(isEdit ? 'skills.update' : 'skills.create', { ...form, metadata });
           onSaved();
-        } catch (err) { setError(err.message); } finally { setBusy(false); }
+        } catch (err) { setError({ message: err.message, fields: err.fields }); } finally { setBusy(false); }
       };
+      const renderServerError = (err) => err && h('div', { className: 'mc-diag' },
+        err.message,
+        (err.fields ?? []).length > 0 && h('ul', { style: { margin: '6px 0 0', paddingLeft: 18 } },
+          err.fields.map((f, i) => h('li', { key: i }, (f.field ? f.field + ': ' : '') + (f.message ?? '')))),
+      );
       return h(Modal, {
         title: isEdit ? t('skillEdit') : t('skillCreate'), onClose,
         footer: [
@@ -527,10 +636,28 @@ window.__ModuleLoader__.load({
           h(Button, { key: 's', kind: 'primary', disabled: busy || !form.name || !form.description, onClick: submit }, busy ? '…' : t('save')),
         ],
       },
-        error && h('div', { className: 'mc-diag' }, error),
-        h(Field, { label: t('skillName') }, h('input', { className: 'mc-input', value: form.name, disabled: isEdit, onChange: set('name'), placeholder: 'my-skill', autoFocus: !isEdit })),
-        h(Field, { label: t('skillDescription') }, h('input', { className: 'mc-input', value: form.description, onChange: set('description') })),
+        renderServerError(error),
+        h(Field, { label: t('skillName') },
+          h('input', { className: 'mc-input', value: form.name, disabled: isEdit, onChange: set('name'), placeholder: 'my-skill', autoFocus: !isEdit }),
+          errors.name && h('span', { className: 'mc-field-error' }, errors.name)),
+        h(Field, { label: t('skillDescription') },
+          h('input', { className: 'mc-input', value: form.description, onChange: set('description') }),
+          errors.description && h('span', { className: 'mc-field-error' }, errors.description)),
         h(Field, { label: t('skillWhenToUse') }, h('input', { className: 'mc-input', value: form.whenToUse, onChange: set('whenToUse') })),
+        h(Field, { label: t('skillCompatibility') },
+          h('input', { className: 'mc-input', value: form.compatibility, onChange: set('compatibility'), placeholder: 'node >= 18, macos' }),
+          errors.compatibility && h('span', { className: 'mc-field-error' }, errors.compatibility)),
+        h(Field, { label: t('skillLicense') }, h('input', { className: 'mc-input', value: form.license, onChange: set('license'), placeholder: 'MIT' })),
+        h(Field, { label: t('skillMetadata') },
+          form.metadata.map((row, i) => h('div', { key: i, style: { display: 'flex', gap: 6, alignItems: 'center' } },
+            h('input', { className: 'mc-input', style: { flex: 1 }, placeholder: t('skillMetadataKey'), value: row.key, onChange: setMetadata(i, 'key') }),
+            h('input', { className: 'mc-input', style: { flex: 2 }, placeholder: t('skillMetadataValue'), value: row.value, onChange: setMetadata(i, 'value') }),
+            h(Button, { className: 'link danger', kind: undefined, 'aria-label': t('delete'), onClick: () => setForm({ ...form, metadata: form.metadata.filter((_, idx) => idx !== i) }) }, '✕'),
+          )),
+          h(Button, { className: 'link', kind: undefined, onClick: () => setForm({ ...form, metadata: [...form.metadata, { key: '', value: '' }] }) }, '+ ' + t('skillMetadataAdd'))),
+        h(Field, { label: t('skillAllowedTools') },
+          h('input', { className: 'mc-input', value: form.allowedTools, onChange: set('allowedTools'), placeholder: 'tool-a tool-b' }),
+          h('span', { className: 'mc-hint' }, t('skillAllowedToolsHint'))),
         h(Field, { label: t('group') }, h('input', { className: 'mc-input', value: form.group, onChange: set('group'), placeholder: t('groupPlaceholder') })),
         h(Field, { label: t('skillContent') }, h('textarea', { className: 'mc-textarea', value: form.content, onChange: set('content'), placeholder: '# ...' })),
         h('label', { className: 'mc-checkbox' }, h('input', { type: 'checkbox', checked: form.userInvocable, onChange: (e) => setForm({ ...form, userInvocable: e.target.checked }) }), t('skillUserInvocable')),
@@ -636,7 +763,7 @@ window.__ModuleLoader__.load({
         setError(undefined);
         if (file.size > 30 * 1024 * 1024) {
           setFileName(''); setContent(''); setZipBase64('');
-          setError(t('importTooLarge'));
+          setError({ message: t('importTooLarge') });
           return;
         }
         setFileName(file.name);
@@ -647,12 +774,12 @@ window.__ModuleLoader__.load({
             let bin = '';
             for (let i = 0; i < buf.length; i += 0x8000) bin += String.fromCharCode.apply(null, buf.subarray(i, i + 0x8000));
             setZipBase64(btoa(bin));
-          } catch { setZipBase64(''); setError(t('importReadFailed')); }
+          } catch { setZipBase64(''); setError({ message: t('importReadFailed') }); }
         } else {
           setZipBase64('');
           const reader = new FileReader();
           reader.onload = () => setContent(String(reader.result ?? ''));
-          reader.onerror = () => setError(t('importReadFailed'));
+          reader.onerror = () => setError({ message: t('importReadFailed') });
           reader.readAsText(file);
         }
       };
@@ -682,7 +809,7 @@ window.__ModuleLoader__.load({
           await api('skills.import', params);
           onImported();
         } catch (err) {
-          setError(err.message);
+          setError({ message: err.message, fields: err.fields });
         } finally {
           setBusy(false);
         }
@@ -713,7 +840,10 @@ window.__ModuleLoader__.load({
         h('label', { style: { display: 'flex', alignItems: 'center', gap: 6, cursor: 'pointer' } },
           h('input', { type: 'checkbox', checked: overwrite, onChange: (e) => setOverwrite(e.target.checked) }),
           t('importOverwrite')),
-        error && h('div', { className: 'mc-error' }, error),
+        error && h('div', { className: 'mc-error' },
+          error.message,
+          (error.fields ?? []).length > 0 && h('ul', { style: { margin: '6px 0 0', paddingLeft: 18, textAlign: 'left' } },
+            error.fields.map((f, i) => h('li', { key: i }, (f.field ? f.field + ': ' : '') + (f.message ?? ''))))),
       );
     }
 
@@ -803,6 +933,8 @@ window.__ModuleLoader__.load({
       });
       const [busy, setBusy] = useState(false);
       const [error, setError] = useState('');
+      // 掩码值（'••••••'）不可查看明文；点击眼睛图标仅提示重新填写
+      const [secretHint, setSecretHint] = useState('');
       const set = (key) => (e) => setForm({ ...form, [key]: e.target.value });
       const submit = async () => {
         setBusy(true); setError('');
@@ -811,6 +943,14 @@ window.__ModuleLoader__.load({
           onSaved();
         } catch (err) { setError(err.message); } finally { setBusy(false); }
       };
+      const secretField = (label, value, key, placeholder) => h(Field, { label },
+        h('textarea', { className: 'mc-textarea', style: { minHeight: 72 }, value, onChange: set(key), placeholder }),
+        h('div', { style: { display: 'flex', alignItems: 'center', gap: 6 } },
+          h(Button, {
+            className: 'link', kind: undefined, 'aria-label': label,
+            onClick: () => setSecretHint(secretHint === key ? '' : key),
+          }, '👁'),
+          secretHint === key && h('span', { className: 'mc-hint' }, t('connectorSecretHidden'))));
       return h(Modal, {
         title: isEdit ? t('connectorEdit') : t('connectorCreate'), onClose,
         footer: [
@@ -829,10 +969,10 @@ window.__ModuleLoader__.load({
           ),
         ),
         form.transport === 'streamable-http' && h(Field, { label: t('connectorUrl') }, h('input', { className: 'mc-input', value: form.url, onChange: set('url'), placeholder: 'https://example.com/mcp' })),
-        form.transport === 'streamable-http' && h(Field, { label: t('connectorHeaders') }, h('textarea', { className: 'mc-textarea', style: { minHeight: 72 }, value: form.headers, onChange: set('headers'), placeholder: 'Authorization=Bearer …' })),
+        form.transport === 'streamable-http' && secretField(t('connectorHeaders'), form.headers, 'headers', 'Authorization=Bearer …'),
         form.transport === 'stdio' && h(Field, { label: t('connectorCommand') }, h('input', { className: 'mc-input', value: form.command, onChange: set('command'), placeholder: 'npx' })),
         form.transport === 'stdio' && h(Field, { label: t('connectorArgs') }, h('textarea', { className: 'mc-textarea', style: { minHeight: 72 }, value: form.args, onChange: set('args'), placeholder: '-y\n@modelcontextprotocol/server-github' })),
-        form.transport === 'stdio' && h(Field, { label: t('connectorEnv') }, h('textarea', { className: 'mc-textarea', style: { minHeight: 72 }, value: form.env, onChange: set('env'), placeholder: 'GITHUB_TOKEN=…' })),
+        form.transport === 'stdio' && secretField(t('connectorEnv'), form.env, 'env', 'GITHUB_TOKEN=…'),
         form.transport === 'stdio' && h(Field, { label: t('connectorCwd') }, h('input', { className: 'mc-input', value: form.cwd, onChange: set('cwd') })),
         h(Field, { label: t('group') }, h('input', { className: 'mc-input', value: form.group, onChange: set('group'), placeholder: t('groupPlaceholder') })),
       );
@@ -846,11 +986,33 @@ window.__ModuleLoader__.load({
       const [busyDelete, setBusyDelete] = useState(false);
       const [groupFilter, setGroupFilter] = useState('');
       const [q, setQ] = useState('');
+      const [expanded, setExpanded] = useState({});
+      // 测试连接结果（易失，不持久）：key → { status:'testing' } | { ok:true, latencyMs, tools } | { ok:false, error }
+      const [testResults, setTestResults] = useState({});
 
       const toggle = async (connector, enabled) => {
         try { await api('connectors.setEnabled', { key: connector.key, enabled }); reload(); }
         catch (err) { toast(err.message, true); }
       };
+      const test = async (connector) => {
+        const key = connector.key;
+        setTestResults((prev) => ({ ...prev, [key]: { status: 'testing' } }));
+        try {
+          const result = await api('connectors.test', { key });
+          setTestResults((prev) => ({ ...prev, [key]: { ok: true, latencyMs: result.latencyMs, tools: result.tools ?? [] } }));
+        } catch (err) {
+          setTestResults((prev) => ({ ...prev, [key]: { ok: false, error: err.message } }));
+        }
+      };
+      const setTools = async (connector, allowed, autoApprove) => {
+        const known = testResults[connector.key]?.tools ?? [];
+        const names = known.map((tool) => tool.name);
+        const mode = allowed.length >= names.length && names.length > 0 ? 'all' : 'whitelist';
+        try {
+          await api('connectors.setTools', { key: connector.key, mode, tools: allowed, autoApprove });
+          reload();
+        } catch (err) { toast(err.message, true); }
+      };
       const doDelete = async () => {
         setBusyDelete(true);
         try { await api('connectors.delete', { key: deleting.key }); toast(t('deleted')); setDeleting(undefined); reload(); }
@@ -863,6 +1025,8 @@ window.__ModuleLoader__.load({
       const connectors = allConnectors.filter((c) =>
         (!groupFilter || c.group === groupFilter) &&
         (!needle || (c.label + ' ' + c.serverName + ' ' + c.key + ' ' + (c.transport ?? '') + ' ' + (c.url || '') + ' ' + (c.command || '')).toLowerCase().includes(needle)));
+      // 审批策略：Host 若暴露则读取（列表级或行级），缺省视为非 never
+      const approvalNever = (state.data?.approvalPolicy ?? '') === 'never';
       return h('div', null,
         h('div', { className: 'mc-toolbar' },
           h('span', { className: 'mc-spacer' }),
@@ -877,26 +1041,80 @@ window.__ModuleLoader__.load({
         state.status === 'error' && h('div', { className: 'mc-error' }, t('loadFailed') + ': ' + state.error.message, h(Button, { onClick: reload }, t('retry'))),
         state.status !== 'error' && h('div', { className: 'mc-grid' },
           connectors.length === 0 && state.status === 'done' && h('div', { className: 'mc-empty' }, t('empty')),
-          connectors.map((connector) => h('div', { key: connector.key, className: 'mc-card' },
-            h('div', { className: 'mc-card-title' }, connector.label || connector.serverName,
-              connector.group && h(Badge, { tone: 'info' }, connector.group),
-              h(Badge, { tone: 'brand' }, connector.transport),
-              connector.external
-                ? h(Badge, null, t('connectorExternal'))
-                : connector.live
-                  ? h(Badge, { tone: connector.enabled === false ? undefined : 'success' }, connector.enabled === false ? t('disabled') : t('connectorLive'))
-                  : h(Badge, { tone: 'warn' }, t('connectorStopped')),
-            ),
-            h('div', { className: 'mc-card-meta' }, 'mcp__' + connector.serverName + '__*'),
-            h('div', { className: 'mc-card-desc' }, connector.transport === 'stdio'
-              ? [connector.command, ...(connector.args ?? [])].join(' ')
-              : connector.url),
-            !connector.external && h('div', { className: 'mc-card-actions' },
-              h(Switch, { checked: connector.enabled !== false, onChange: (v) => toggle(connector, v), title: connector.enabled !== false ? t('disable') : t('enable') }),
-              h(Button, { className: 'link', onClick: () => setEditing(connector) }, t('edit')),
-              h(Button, { className: 'link danger', onClick: () => setDeleting(connector) }, t('delete')),
-            ),
-          )),
+          connectors.map((connector) => {
+            const result = testResults[connector.key];
+            const testing = result?.status === 'testing';
+            const tools = result?.ok ? (result.tools ?? []) : [];
+            const policy = connector.toolPolicy ?? { mode: 'all', tools: [], autoApprove: [] };
+            const allowedSet = new Set(policy.mode === 'all' ? tools.map((tool) => tool.name) : (policy.tools ?? []));
+            const autoSet = new Set(policy.autoApprove ?? []);
+            const open = expanded[connector.key] === true;
+            const saveTools = (nextAllowed, nextAuto) =>
+              setTools(connector, tools.map((tool) => tool.name).filter((name) => nextAllowed.has(name)), tools.map((tool) => tool.name).filter((name) => nextAuto.has(name)));
+            return h('div', { key: connector.key, className: 'mc-card' },
+              h('div', { className: 'mc-card-title' }, connector.label || connector.serverName,
+                connector.group && h(Badge, { tone: 'info' }, connector.group),
+                h(Badge, { tone: 'brand' }, connector.transport),
+                connector.external
+                  ? h(Badge, null, t('connectorExternal'))
+                  : connector.live
+                    ? h(Badge, { tone: connector.enabled === false ? undefined : 'success' }, connector.enabled === false ? t('disabled') : t('connectorLive'))
+                    : h(Badge, { tone: 'warn' }, t('connectorStopped')),
+              ),
+              h('div', { className: 'mc-card-meta' }, 'mcp__' + connector.serverName + '__*'),
+              h('div', { className: 'mc-card-desc' }, connector.transport === 'stdio'
+                ? [connector.command, ...(connector.args ?? [])].join(' ')
+                : connector.url),
+              !connector.external && h('div', { className: 'mc-card-actions' },
+                h(Switch, { checked: connector.enabled !== false, onChange: (v) => toggle(connector, v), title: connector.enabled !== false ? t('disable') : t('enable') }),
+                h(Button, { className: 'link', disabled: testing, onClick: () => test(connector) }, testing ? '…' : t('connectorTest')),
+                h(Badge, {
+                  tone: result?.ok ? 'success' : result?.ok === false ? 'error' : undefined,
+                  title: result?.ok ? result.latencyMs + ' ms' : (result?.error ?? ''),
+                }, testing
+                  ? '…'
+                  : result?.ok
+                    ? t('connectorConnected').replace('{n}', String(result.tools?.length ?? 0))
+                    : result?.ok === false
+                      ? t('connectorTestFailed').replace('{reason}', (result.error || '').slice(0, 60))
+                      : t('connectorUntested')),
+                h('span', { className: 'mc-spacer' }),
+                h(Button, { className: 'link', onClick: () => setExpanded({ ...expanded, [connector.key]: !open }) }, (open ? '▾ ' : '▸ ') + t('connectorTools')),
+                h(Button, { className: 'link', onClick: () => setEditing(connector) }, t('edit')),
+                h(Button, { className: 'link danger', onClick: () => setDeleting(connector) }, t('delete')),
+              ),
+              !connector.external && open && h('div', null,
+                tools.length === 0 && h('div', { className: 'mc-row-sub', style: { marginBottom: 6 } }, t('connectorToolsEmpty')),
+                tools.map((tool) => h('div', { key: tool.name, className: 'mc-row', style: { padding: '6px 10px', marginBottom: 6 } },
+                  h('div', { className: 'mc-row-main' },
+                    h('div', { className: 'mc-row-title' }, tool.name),
+                    tool.description && h('div', { className: 'mc-row-sub' }, tool.description),
+                  ),
+                  h('label', { className: 'mc-checkbox', style: { fontSize: 12 } },
+                    h('input', {
+                      type: 'checkbox', checked: allowedSet.has(tool.name),
+                      onChange: (e) => {
+                        const nextAllowed = new Set(allowedSet);
+                        const nextAuto = new Set(autoSet);
+                        if (e.target.checked) nextAllowed.add(tool.name);
+                        else { nextAllowed.delete(tool.name); nextAuto.delete(tool.name); }
+                        saveTools(nextAllowed, nextAuto);
+                      },
+                    }), t('connectorToolAllowed')),
+                  h('label', { className: 'mc-checkbox', style: { fontSize: 12 } },
+                    h('input', {
+                      type: 'checkbox', checked: autoSet.has(tool.name), disabled: !allowedSet.has(tool.name),
+                      onChange: (e) => {
+                        const nextAuto = new Set(autoSet);
+                        if (e.target.checked) nextAuto.add(tool.name); else nextAuto.delete(tool.name);
+                        saveTools(allowedSet, nextAuto);
+                      },
+                    }), t('connectorToolAuto')),
+                )),
+                approvalNever && h('div', { className: 'mc-hint' }, t('connectorApprovalNever')),
+              ),
+            );
+          }),
         ),
         editing && h(ConnectorEditModal, { t, connector: editing.key ? editing : undefined, onClose: () => setEditing(undefined), onSaved: () => { setEditing(undefined); toast(t('saved')); reload(); } }),
         deleting && h(ConfirmModal, { t, title: t('confirmDelete'), message: t('confirmDeleteBody').replace('{name}', deleting.label || deleting.serverName), busy: busyDelete, onClose: () => setDeleting(undefined), onConfirm: doDelete }),
@@ -957,14 +1175,29 @@ window.__ModuleLoader__.load({
         // undefined（旧数据）= 全部技能；编辑时显式化为全选列表
         skills: expert?.skills ?? (expert ? allSkills.map((s) => s.name) : []),
         connectors: expert?.connectors ?? [],
+        // 模型绑定：provider+model 均填写才提交；否则缺省不传（跟随默认）
+        modelProvider: expert?.model?.provider ?? '',
+        modelModel: expert?.model?.model ?? '',
+        modelReasoning: expert?.model?.reasoningEffort ?? '',
+        // 工具组白名单：空数组/缺省 = 全部可用
+        tools: expert?.tools ?? [],
       });
       const [busy, setBusy] = useState(false);
       const [error, setError] = useState('');
+      const modelError = (form.modelProvider && !form.modelModel) || (!form.modelProvider && form.modelModel)
+        ? t('expertModelPartial') : '';
       const set = (key) => (e) => setForm({ ...form, [key]: e.target.value });
       const submit = async () => {
+        if (modelError) return;
         setBusy(true); setError('');
         try {
-          await api(isEdit ? 'experts.update' : 'experts.create', form);
+          const { modelProvider, modelModel, modelReasoning, ...rest } = form;
+          const payload = { ...rest };
+          if (modelProvider && modelModel) {
+            payload.model = { provider: modelProvider, model: modelModel };
+            if (modelReasoning) payload.model.reasoningEffort = modelReasoning;
+          }
+          await api(isEdit ? 'experts.update' : 'experts.create', payload);
           onSaved();
         } catch (err) { setError(err.message); } finally { setBusy(false); }
       };
@@ -981,6 +1214,25 @@ window.__ModuleLoader__.load({
         h(Field, { label: t('expertDescription') }, h('input', { className: 'mc-input', value: form.description, onChange: set('description') })),
         h(Field, { label: t('group') }, h('input', { className: 'mc-input', value: form.group, onChange: set('group'), placeholder: t('groupPlaceholder') })),
         h(Field, { label: t('expertPrefix') }, h('textarea', { className: 'mc-textarea', value: form.prefix, onChange: set('prefix'), placeholder: 'You are …' })),
+        h(Field, { label: t('expertModel') },
+          h('div', { style: { display: 'flex', gap: 6, flexWrap: 'wrap' } },
+            h('input', { className: 'mc-input', style: { flex: 1, minWidth: 140 }, placeholder: t('expertModelProvider'), value: form.modelProvider, onChange: set('modelProvider') }),
+            h('input', { className: 'mc-input', style: { flex: 1, minWidth: 140 }, placeholder: t('expertModelName'), value: form.modelModel, onChange: set('modelModel') }),
+            h('select', { className: 'mc-select', value: form.modelReasoning, onChange: set('modelReasoning'), title: 'reasoningEffort' },
+              h('option', { value: '' }, t('expertModelDefault')),
+              ['low', 'medium', 'high'].map((v) => h('option', { key: v, value: v }, v)))),
+          h('span', { className: 'mc-hint' }, t('expertModelHint')),
+          modelError && h('span', { className: 'mc-field-error' }, modelError)),
+        h(Field, { label: t('expertTools') },
+          h('div', { style: { display: 'flex', gap: 12, flexWrap: 'wrap' } },
+            [['fs', t('expertToolFs')], ['web', t('expertToolWeb')], ['shell', t('expertToolShell')], ['skills', t('expertToolSkills')]].map(([value, labelText]) =>
+              h('label', { key: value, className: 'mc-checkbox', style: { fontSize: 12 } },
+                h('input', {
+                  type: 'checkbox', checked: form.tools.includes(value),
+                  onChange: (e) => setForm({ ...form, tools: e.target.checked ? [...form.tools, value] : form.tools.filter((v) => v !== value) }),
+                }),
+                labelText))),
+          h('span', { className: 'mc-hint' }, t('expertToolsHint'))),
         h(LinkPicker, {
           t, title: t('expertSkills'), items: allSkills,
           selected: form.skills.filter((n) => allSkills.some((s) => s.name === n)),
@@ -1040,9 +1292,14 @@ window.__ModuleLoader__.load({
               expert.custom ? h(Badge, { tone: 'brand' }, t('expertCustom')) : h(Badge, null, t('expertBuiltin')),
               expert.isDefault && h(Badge, { tone: 'success' }, t('expertDefault')),
               expert.broken && h(Badge, { tone: 'error' }, t('expertBroken')),
+              expert.model && h(Badge, { tone: 'brand' }, expert.model.provider + '/' + expert.model.model),
             ),
             h('div', { className: 'mc-card-desc' }, expert.description || '—'),
             h('div', { className: 'mc-card-meta' }, expert.id + (expert.broken ? ' · ' + expert.broken : '')),
+            expert.custom && (expert.tools ?? []).length > 0 && h('div', { className: 'mc-card-meta' },
+              t('expertToolsSummary') + ': ' + expert.tools
+                .map((v) => ({ fs: t('expertToolFs'), web: t('expertToolWeb'), shell: t('expertToolShell'), skills: t('expertToolSkills') }[v] ?? v))
+                .join(', ')),
             expert.custom && (expert.skills !== undefined || expert.connectors !== undefined) && h('div', { className: 'mc-card-meta' },
               t('expertLinkedMeta')
                 .replace('{skills}', expert.skills === undefined ? t('expertSkillsAll') : expert.skills.length)

package/index.js

@@ -14,6 +14,9 @@ import { promises as fs } from 'node:fs';
 import os from 'node:os';
 import { join, resolve, sep, basename } from 'node:path';
 import { inflateRawSync } from 'node:zlib';
+import { spawn } from 'node:child_process';
+import http from 'node:http';
+import https from 'node:https';
 
 const DSH_HOME = process.env.DSH_HOME || join(os.homedir(), '.dsh');
 const DATA_DIR = join(DSH_HOME, 'manager-center');
@@ -24,6 +27,8 @@ const KEBAB = /^[a-z0-9]+(-[a-z0-9]+)*$/;
 const SERVER_NAME = /^[A-Za-z0-9_-]{1,32}$/;
 const MCP_PACKAGE = '@deepseek-ai/dsh-mcp-client';
 const CONNECTOR_PREFIX = 'mcm-';
+const MASKED_VALUE = '••••••';          // FR-C3：脱敏掩码（前后端约定字面量）
+const CONNECTOR_TEST_TIMEOUT_MS = 8000; // FR-C1：testConnector 单项总超时
 
 /* ───────────────────────── 内置技能市场 ───────────────────────── */
 
@@ -282,9 +287,23 @@ function parseSkillFile(text) {
   const m = /^---\r?\n([\s\S]*?)\r?\n---\r?\n?([\s\S]*)$/.exec(source);
   if (!m) return { fields: {}, body: source };
   const fields = {};
-  for (const line of m[1].split(/\r?\n/)) {
+  const lines = m[1].split(/\r?\n/);
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
     const kv = /^([A-Za-z0-9_-]+):\s*(.*)$/.exec(line);
-    if (kv) fields[kv[1]] = parseYamlScalar(kv[2]);
+    if (!kv) continue;
+    // metadata 为嵌套键值块：收集其后缩进的子行
+    if (kv[1] === 'metadata' && kv[2] === '') {
+      const meta = {};
+      while (i + 1 < lines.length && /^\s+\S/.test(lines[i + 1])) {
+        i++;
+        const mk = /^\s+([A-Za-z0-9_-]+):\s*(.*)$/.exec(lines[i]);
+        if (mk) meta[mk[1]] = parseYamlScalar(mk[2]);
+      }
+      fields.metadata = meta;
+      continue;
+    }
+    fields[kv[1]] = parseYamlScalar(kv[2]);
   }
   return { fields, body: m[2] };
 }
@@ -294,12 +313,65 @@ function buildSkillFile(input) {
   lines.push(`name: ${yamlScalar(input.name)}`);
   lines.push(`description: ${yamlScalar(input.description)}`);
   if (input.whenToUse) lines.push(`whenToUse: ${yamlScalar(input.whenToUse)}`);
+  // 以下四个字段遵循 agentskills.io 规范，有值才写（旧技能缺省字段读为空、不回写）
+  if (input.license) lines.push(`license: ${yamlScalar(input.license)}`);
+  if (input.compatibility) lines.push(`compatibility: ${yamlScalar(input.compatibility)}`);
+  if (input.metadata && typeof input.metadata === 'object' && !Array.isArray(input.metadata)) {
+    const keys = Object.keys(input.metadata);
+    if (keys.length) {
+      lines.push('metadata:');
+      for (const key of keys) lines.push(`  ${key}: ${yamlScalar(input.metadata[key])}`);
+    }
+  }
+  if (input.allowedTools) lines.push(`allowed-tools: ${yamlScalar(input.allowedTools)}`);
   if (input.disableModelInvocation === true) lines.push('disable-model-invocation: true');
   if (input.userInvocable === false) lines.push('user-invocable: false');
   lines.push('---', '');
   return lines.join('\n') + String(input.content ?? '').replace(/^\s+/, '');
 }
 
+/* ───────────────────────── 技能规范校验（FR-S2） ───────────────────────── */
+
+/**
+ * 按 agentskills.io 规范校验技能字段。不抛异常，返回 { errors: [{ field, message }] }。
+ * field 取值：name / description / compatibility / license / metadata。
+ */
+function validateSkillSpec(p) {
+  const errors = [];
+  const name = String(p?.name ?? '');
+  if (!KEBAB.test(name)) errors.push({ field: 'name', message: '技能名须为小写 kebab-case（如 my-skill）' });
+  else if (name.length > 64) errors.push({ field: 'name', message: '技能名长度不能超过 64 个字符' });
+  const description = String(p?.description ?? '');
+  if (!description) errors.push({ field: 'description', message: 'description 必填' });
+  else if (description.length > 1024) errors.push({ field: 'description', message: 'description 长度不能超过 1024 个字符' });
+  const compatibility = p?.compatibility == null ? '' : String(p.compatibility);
+  if (compatibility.length > 500) errors.push({ field: 'compatibility', message: 'compatibility 长度不能超过 500 个字符' });
+  const license = p?.license == null ? '' : String(p.license);
+  if (license.length > 128) errors.push({ field: 'license', message: 'license 长度不能超过 128 个字符' });
+  if (p?.metadata != null) {
+    if (typeof p.metadata !== 'object' || Array.isArray(p.metadata)) {
+      errors.push({ field: 'metadata', message: 'metadata 须为键值对对象（map）' });
+    } else {
+      for (const [key, value] of Object.entries(p.metadata)) {
+        if (typeof value !== 'string') {
+          errors.push({ field: 'metadata', message: `metadata 键 "${key}" 的值须为字符串` });
+        }
+      }
+    }
+  }
+  return { errors };
+}
+
+/** 校验不过则抛出汇总错误（逐字段列出，供前端定位展示）。error.errors 供路由层透传字段级错误。 */
+function assertSkillSpec(p) {
+  const { errors } = validateSkillSpec(p);
+  if (errors.length) {
+    const error = new Error('技能校验失败：\n' + errors.map((e) => `- ${e.field}：${e.message}`).join('\n'));
+    error.errors = errors;
+    throw error;
+  }
+}
+
 function underSkillRoot(path) {
   if (typeof path !== 'string' || path === '') return false;
   const rel = resolve(path).toLowerCase();
@@ -516,6 +588,264 @@ async function removeConnectorEntry(ctx, key) {
   if (loaderHas(ctx, id)) await ctx.loader.remove(id);
 }
 
+/* ──────────────── FR-C1/C2/C3：脱敏、状态缓存、工具探测、审批策略 ──────────────── */
+
+/** 易失状态缓存：testConnector 结果（含失败原因），不持久化，重启即失。 */
+const connectorStatus = new Map();
+
+/** 脱敏输出：env/headers 的值一律替换为掩码，并附被掩码的键名列表。结构其余部分不变。 */
+function maskConnectorSecrets(record) {
+  const out = { ...record };
+  const maskedKeys = [];
+  for (const field of ['env', 'headers']) {
+    if (out[field] && typeof out[field] === 'object') {
+      out[field] = Object.fromEntries(Object.entries(out[field]).map(([k, v]) => {
+        maskedKeys.push(k);
+        return [k, MASKED_VALUE];
+      }));
+    }
+  }
+  out.maskedKeys = maskedKeys;
+  return out;
+}
+
+/** 入参脱敏回填：env/headers 中值为掩码的键表示「保持原值」，从旧记录回填明文，不得落盘掩码。 */
+function unmaskConnectorSecrets(input, old) {
+  if (!input || typeof input !== 'object') return input;
+  const out = { ...input };
+  for (const field of ['env', 'headers']) {
+    const values = out[field];
+    if (!values || typeof values !== 'object') continue;
+    const merged = { ...values };
+    for (const k of Object.keys(merged)) {
+      if (merged[k] === MASKED_VALUE && old?.[field] && old[field][k] !== undefined) {
+        merged[k] = old[field][k];
+      }
+    }
+    out[field] = merged;
+  }
+  return out;
+}
+
+/** 统一 tools/list 结果整形：仅保留 name/description，名称为原始名（不含 mcp__ 前缀）。 */
+function normalizeToolList(list) {
+  return (Array.isArray(list) ? list : []).map((t) => ({
+    name: String(t?.name ?? ''),
+    description: String(t?.description ?? ''),
+  })).filter((t) => t.name);
+}
+
+/** streamable-http 单次 JSON-RPC POST；兼容 text/event-stream 响应。 */
+function httpJsonRpcPost(urlString, headers, payload, timeoutMs) {
+  return new Promise((resolvePromise, rejectPromise) => {
+    let target;
+    try { target = new URL(urlString); } catch { rejectPromise(new Error('url 不是合法地址')); return; }
+    const lib = target.protocol === 'https:' ? https : http;
+    const body = JSON.stringify(payload);
+    const req = lib.request(target, {
+      method: 'POST',
+      headers: {
+        'content-type': 'application/json',
+        accept: 'application/json, text/event-stream',
+        ...(headers && typeof headers === 'object' ? headers : {}),
+        'content-length': Buffer.byteLength(body),
+      },
+      timeout: timeoutMs,
+    }, (res) => {
+      const chunks = [];
+      res.on('data', (chunk) => chunks.push(chunk));
+      res.on('end', () => {
+        const text = Buffer.concat(chunks).toString('utf8');
+        if (res.statusCode < 200 || res.statusCode >= 300) {
+          rejectPromise(new Error(`HTTP ${res.statusCode}: ${text.slice(0, 200)}`));
+          return;
+        }
+        try {
+          if (String(res.headers['content-type'] ?? '').includes('text/event-stream')) {
+            const dataLines = text.split(/\r?\n/).filter((l) => l.startsWith('data:')).map((l) => l.slice(5).trim());
+            resolvePromise(JSON.parse(dataLines[dataLines.length - 1] ?? ''));
+          } else {
+            resolvePromise(JSON.parse(text));
+          }
+        } catch {
+          rejectPromise(new Error('响应不是合法 JSON'));
+        }
+      });
+    });
+    req.on('timeout', () => req.destroy(new Error('请求超时')));
+    req.on('error', (err) => rejectPromise(err instanceof Error ? err : new Error(String(err))));
+    req.write(body);
+    req.end();
+  });
+}
+
+function jsonRpcErrorMessage(msg) {
+  return msg?.error?.message ? String(msg.error.message) : 'JSON-RPC 返回错误';
+}
+
+/** streamable-http 探测：initialize → notifications/initialized → tools/list。 */
+async function probeHttpConnector(record, timeoutMs) {
+  const initMsg = {
+    jsonrpc: '2.0', id: 1, method: 'initialize',
+    params: {
+      protocolVersion: '2025-06-18',
+      capabilities: {},
+      clientInfo: { name: 'dsh-manager-center', version: '1.8.0' },
+    },
+  };
+  const init = await httpJsonRpcPost(record.url, record.headers, initMsg, timeoutMs);
+  if (init?.error) throw new Error(jsonRpcErrorMessage(init));
+  try {
+    await httpJsonRpcPost(record.url, record.headers, { jsonrpc: '2.0', method: 'notifications/initialized' }, timeoutMs);
+  } catch { /* initialized 通知失败不阻断（部分服务端不要求） */ }
+  const list = await httpJsonRpcPost(record.url, record.headers, { jsonrpc: '2.0', id: 2, method: 'tools/list', params: {} }, timeoutMs);
+  if (list?.error) throw new Error(jsonRpcErrorMessage(list));
+  return normalizeToolList(list?.result?.tools);
+}
+
+/**
+ * stdio 传输层探测：对给定子进程跑 initialize → notifications/initialized → tools/list。
+ * 读 stdout 按行解析 JSON-RPC 响应；超时/进程退出即失败；结束务必 kill 防泄漏。
+ */
+function probeStdioTransport(child, timeoutMs) {
+  return new Promise((resolvePromise, rejectPromise) => {
+    const started = Date.now();
+    let settled = false;
+    let stdoutBuf = '';
+    let forceKillTimer;
+    const cleanup = () => {
+      clearTimeout(forceKillTimer);
+      try { child.stdin.end(); } catch { /* 进程可能已退出 */ }
+      child.kill();
+      // Windows 上 SIGTERM 可能杀不掉：宽限 500ms 后强制结束，防泄漏
+      forceKillTimer = setTimeout(() => { try { child.kill('SIGKILL'); } catch { /* ignore */ } }, 500);
+      forceKillTimer.unref?.();
+    };
+    const finish = (err, tools) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      cleanup();
+      if (err) rejectPromise(err);
+      else resolvePromise({ latencyMs: Date.now() - started, tools });
+    };
+    const timer = setTimeout(() => finish(new Error('连接超时')), timeoutMs);
+    child.on('error', (err) => finish(new Error(`无法启动进程: ${err?.message ?? err}`)));
+    child.on('exit', (code, signal) => {
+      finish(new Error(`进程已退出（code=${code ?? 'null'}${signal ? `, signal=${signal}` : ''}），未返回工具清单`));
+    });
+    child.stderr.resume(); // 丢弃 stderr，防管道缓冲顶死
+    child.stdout.on('data', (chunk) => {
+      stdoutBuf += chunk.toString('utf8');
+      let idx;
+      while ((idx = stdoutBuf.indexOf('\n')) >= 0) {
+        const line = stdoutBuf.slice(0, idx).trim();
+        stdoutBuf = stdoutBuf.slice(idx + 1);
+        if (!line) continue;
+        let msg;
+        try { msg = JSON.parse(line); } catch { continue; } // 忽略非 JSON 日志行
+        if (msg?.id !== 2 || settled) continue;
+        if (msg.error) finish(new Error(jsonRpcErrorMessage(msg)));
+        else finish(null, normalizeToolList(msg?.result?.tools));
+      }
+    });
+    const send = (msg) => {
+      try { child.stdin.write(JSON.stringify(msg) + '\n'); } catch { /* 进程可能已退出，由 exit 事件收尾 */ }
+    };
+    send({
+      jsonrpc: '2.0', id: 1, method: 'initialize',
+      params: { protocolVersion: '2025-06-18', capabilities: {}, clientInfo: { name: 'dsh-manager-center', version: '1.8.0' } },
+    });
+    send({ jsonrpc: '2.0', method: 'notifications/initialized' });
+    send({ jsonrpc: '2.0', id: 2, method: 'tools/list', params: {} });
+  });
+}
+
+/** stdio 连接器探测：spawn 子进程（env 合并 process.env），再走统一传输层。绝不同步抛出。 */
+function probeStdioConnector(record, timeoutMs) {
+  let child;
+  try {
+    child = spawn(record.command, Array.isArray(record.args) ? record.args : [], {
+      env: { ...process.env, ...(record.env && typeof record.env === 'object' ? record.env : {}) },
+      ...(record.cwd ? { cwd: record.cwd } : {}),
+      stdio: ['pipe', 'pipe', 'pipe'],
+    });
+  } catch (err) {
+    return Promise.reject(new Error(`无法启动进程: ${err?.message ?? err}`));
+  }
+  return probeStdioTransport(child, timeoutMs);
+}
+
+/* ── FR-C2 审批 answerer：serverName → 工具策略（mode/tools/autoApprove），连接器增删改/启停时刷新 ── */
+
+let approvalPolicy = new Map();
+
+function refreshApprovalPolicy() {
+  const next = new Map();
+  for (const c of store.connectors) {
+    next.set(c.serverName, {
+      enabled: c.enabled !== false,
+      mode: c.toolPolicy?.mode === 'whitelist' ? 'whitelist' : 'all',
+      tools: Array.isArray(c.toolPolicy?.tools) ? c.toolPolicy.tools.map(String) : [],
+      autoApprove: Array.isArray(c.toolPolicy?.autoApprove) ? c.toolPolicy.autoApprove.map(String) : [],
+    });
+  }
+  approvalPolicy = next;
+}
+
+/** 工具名匹配 mcp__<serverName>__<tool>：返回命中策略与原始工具名。 */
+function matchConnectorTool(toolName) {
+  for (const [serverName, policy] of approvalPolicy) {
+    const prefix = `mcp__${serverName}__`;
+    if (toolName.startsWith(prefix)) return { policy, tool: toolName.slice(prefix.length) };
+  }
+  return undefined;
+}
+
+/**
+ * approval/request 瀑布监听（形态抄内核 dsh-acp：ctx.on('approval/request', (request, next) => ...)）。
+ * 仅裁决本插件创建的连接器工具；其余请求 next() 透传给后续 answerer（如人工审批面板）。
+ * outcome 词表（allowed-once/rejected/cancelled/unavailable）无原因通道，
+ * 白名单拒绝时把中文原因写入 request.reason，随 approval/asked 审计事件留痕。
+ */
+function managerApprovalAnswerer(request, next) {
+  try {
+    const toolName = String(request?.toolName ?? '');
+    const hit = matchConnectorTool(toolName);
+    if (!hit || !hit.policy.enabled) return next();
+    const { policy, tool } = hit;
+    if (policy.autoApprove.includes(tool)) return 'allowed-once';
+    if (policy.mode === 'whitelist' && !policy.tools.includes(tool)) {
+      try {
+        request.reason = `连接器工具白名单已拦截：「${toolName}」不在允许列表（当前为白名单模式，仅放行 ${policy.tools.length} 个工具）`;
+      } catch { /* request 只读时忽略，不影响拒绝语义 */ }
+      return 'rejected';
+    }
+    return next(); // 其余情况交人工审批
+  } catch {
+    return next(); // answerer 自身故障不得阻断审批链
+  }
+}
+
+/**
+ * 读取部署级审批策略默认值（dsh-user-approval 的 config.policy，ask|never）。
+ * client 据 listConnectors 根部的 approvalPolicy 显示「自动执行不生效」提示；
+ * 会话级 override 不影响此提示（提示针对部署默认口径）。
+ */
+function approvalPolicyDefault(ctx) {
+  try {
+    const configEditor = ctx.get('configEditor');
+    if (configEditor) {
+      for (const row of configEditor.configuration()) {
+        if (row?.entry?.name !== '@deepseek-ai/dsh-user-approval') continue;
+        const config = { ...(row?.inherited ?? {}), ...(row?.override ?? {}) };
+        if (config.policy === 'ask' || config.policy === 'never') return config.policy;
+      }
+    }
+  } catch { /* configEditor 不可用时按 ask 处理 */ }
+  return 'ask';
+}
+
 /* ───────────────────────── 智能体（专家）预设 ───────────────────────── */
 
 const EXPERT_SKILL_ROOT = join(DATA_DIR, 'expert-skills');
@@ -533,6 +863,35 @@ function normalizeExpertConnectors(value) {
   return [...new Set(value.map((v) => String(v)).filter((k) => valid.has(k)))];
 }
 
+/* FR-A1：模型绑定落地 = 存储 + 展示（预设组合内挂 dsh-agent-default-model 不生效，入口点 selectionFor() 读自身 scope）。 */
+/** 规范化模型绑定：provider/model 为非空字符串才生效；否则 undefined（跟随默认）。 */
+function normalizeExpertModel(value) {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return undefined;
+  const provider = String(value.provider ?? '').trim();
+  const model = String(value.model ?? '').trim();
+  if (!provider || !model) return undefined;
+  const out = { provider, model };
+  const reasoningEffort = String(value.reasoningEffort ?? '').trim();
+  if (reasoningEffort) out.reasoningEffort = reasoningEffort;
+  return out;
+}
+
+/* FR-A2：工具组白名单（组粒度）。 */
+const EXPERT_TOOL_GROUPS = ['fs', 'web', 'shell', 'skills'];
+/** 工具组 → expertPlugins 行 id 映射；persona/compaction 为基础设施，恒保留。 */
+const EXPERT_TOOL_GROUP_ROWS = {
+  fs: new Set(['tool-fs', 'tool-fs-search']),
+  web: new Set(['tool-web']),
+  shell: new Set(['persistent-shell']),
+  skills: new Set(['skill-fs', 'tool-skill']),
+};
+
+/** 规范化工具组：仅保留合法组名去重；非数组 → undefined（全部可用）。空数组语义 = 全部。 */
+function normalizeExpertTools(value) {
+  if (!Array.isArray(value)) return undefined;
+  return [...new Set(value.map((v) => String(v)).filter((g) => EXPERT_TOOL_GROUPS.includes(g)))];
+}
+
 /** 为智能体重建专属技能链接目录：仅包含所选技能（junction/符号链接，失败退化为复制）。 */
 async function rebuildExpertSkillLinks(expert) {
   const dir = join(EXPERT_SKILL_ROOT, expert.id);
@@ -631,6 +990,17 @@ function expertPlugins(expert, skillScope) {
       { id: 'tool-skill', name: '@deepseek-ai/dsh-tool-skill' },
     );
   }
+  // FR-A2 工具组白名单：未选中的组对应行不输出；persona/compaction 恒保留；空数组/缺省 = 保持现状全部
+  const groups = Array.isArray(expert.tools) ? expert.tools.filter((g) => EXPERT_TOOL_GROUPS.includes(g)) : [];
+  if (groups.length > 0) {
+    const allowed = new Set(groups.flatMap((g) => [...EXPERT_TOOL_GROUP_ROWS[g]]));
+    return plugins.filter((plugin) => {
+      for (const rows of Object.values(EXPERT_TOOL_GROUP_ROWS)) {
+        if (rows.has(plugin.id)) return allowed.has(plugin.id);
+      }
+      return true; // 基础设施行（persona/compaction）不受过滤
+    });
+  }
   return plugins;
 }
 
@@ -668,6 +1038,7 @@ function createApi(ctx, diagnostics) {
   }
 
   async function provisionAll() {
+    refreshApprovalPolicy(); // 启动恢复持久化记录后重建审批策略表
     for (const record of store.connectors) {
       try { await provisionConnector(ctx, record); }
       catch (error) { diagnostics.push(`连接器 ${record.serverName}: ${error?.message ?? error}`); }
@@ -727,6 +1098,11 @@ function createApi(ctx, diagnostics) {
       return { skills: [...byName.values()].sort((a, b) => a.name.localeCompare(b.name)), skillRoot: SKILL_ROOT };
     },
 
+    /* FR-S2：规范校验（不抛异常，供前端提交前预检；field 定位供 UI 逐字段展示） */
+    async validateSkillSpec(p) {
+      return validateSkillSpec(p);
+    },
+
     async getSkill(p) {
       const name = String(p?.name ?? '');
       if (!KEBAB.test(name)) throw new Error('技能名须为小写 kebab-case');
@@ -737,6 +1113,10 @@ function createApi(ctx, diagnostics) {
         name,
         description: typeof fields.description === 'string' ? fields.description : '',
         whenToUse: typeof fields.whenToUse === 'string' ? fields.whenToUse : '',
+        license: typeof fields.license === 'string' ? fields.license : '',
+        compatibility: typeof fields.compatibility === 'string' ? fields.compatibility : '',
+        metadata: fields.metadata && typeof fields.metadata === 'object' && !Array.isArray(fields.metadata) ? fields.metadata : {},
+        allowedTools: typeof fields['allowed-tools'] === 'string' ? fields['allowed-tools'] : '',
         userInvocable: fields['user-invocable'] !== false,
         disableModelInvocation: fields['disable-model-invocation'] === true,
         content: body.replace(/^\r?\n/, ''),
@@ -747,8 +1127,7 @@ function createApi(ctx, diagnostics) {
 
     async createSkill(p) {
       const name = String(p?.name ?? '');
-      if (!KEBAB.test(name)) throw new Error('技能名须为小写 kebab-case，如 my-skill');
-      if (!p?.description) throw new Error('description 必填');
+      assertSkillSpec({ ...p, name });
       if (await skillFileFor(name)) throw new Error(`技能 "${name}" 已存在`);
       const dir = join(SKILL_ROOT, name);
       await fs.mkdir(dir, { recursive: true });
@@ -760,8 +1139,7 @@ function createApi(ctx, diagnostics) {
 
     async updateSkill(p) {
       const name = String(p?.name ?? '');
-      if (!KEBAB.test(name)) throw new Error('技能名须为小写 kebab-case');
-      if (!p?.description) throw new Error('description 必填');
+      assertSkillSpec({ ...p, name });
       const file = await skillFileFor(name);
       if (!file) throw new Error(`技能 "${name}" 不存在或不可编辑`);
       await fs.writeFile(file, buildSkillFile({ ...p, name }));
@@ -809,7 +1187,19 @@ function createApi(ctx, diagnostics) {
       const ensureAbsent = async (target) => {
         if (!overwrite && await skillFileFor(target)) throw new Error(`技能 "${target}" 已存在（勾选"覆盖同名技能"可替换）`);
       };
+      /** 安装路径统一复用规范校验：以 frontmatter 解析字段 + 最终技能名校验，失败抛逐字段汇总错误。 */
+      const assertImportedSkill = (text, target) => {
+        const { fields } = parseSkillFile(text);
+        assertSkillSpec({
+          name: target,
+          description: typeof fields.description === 'string' ? fields.description : '',
+          compatibility: fields.compatibility,
+          license: fields.license,
+          metadata: fields.metadata,
+        });
+      };
       const writeContent = async (target, text) => {
+        assertImportedSkill(text, target);
         await ensureAbsent(target);
         const dir = join(SKILL_ROOT, target);
         await fs.mkdir(dir, { recursive: true });
@@ -826,6 +1216,7 @@ function createApi(ctx, diagnostics) {
         const skillMd = files.find((f) => f.rel.toLowerCase() === (root.prefix + 'skill.md').toLowerCase());
         const text = skillMd.data.toString('utf8');
         const target = resolveName(text, root.prefix ? root.prefix.slice(0, -1) : fallbackName);
+        assertImportedSkill(text, target);
         await ensureAbsent(target);
         const dir = join(SKILL_ROOT, target);
         if (overwrite) await fs.rm(dir, { recursive: true, force: true }); // 覆盖时清空重建，避免残留旧文件
@@ -852,7 +1243,9 @@ function createApi(ctx, diagnostics) {
         if (st.isDirectory()) {
           const f = join(src, 'SKILL.md');
           if (!await fs.access(f).then(() => true, () => false)) throw new Error('目录中缺少 SKILL.md');
-          const target = resolveName(await fs.readFile(f, 'utf8'), basename(src));
+          const text = await fs.readFile(f, 'utf8');
+          const target = resolveName(text, basename(src));
+          assertImportedSkill(text, target);
           await ensureAbsent(target);
           await fs.cp(src, join(SKILL_ROOT, target), { recursive: true });
           if (typeof p?.group === 'string') await applyGroup('skills', target, p.group);
@@ -957,7 +1350,8 @@ function createApi(ctx, diagnostics) {
     /* ---- 连接器 ---- */
     async listConnectors() {
       const ours = store.connectors.map((record) => ({
-        ...record,
+        ...maskConnectorSecrets(record),
+        status: connectorStatus.get(record.key), // FR-C1：易失测试状态（未测试为 undefined）
         group: groupOf('connectors', record.key),
         entryId: connectorEntryId(record),
         live: loaderHas(ctx, connectorEntryId(record)),
@@ -984,7 +1378,7 @@ function createApi(ctx, diagnostics) {
           }
         } catch { /* configEditor 不可用时忽略外部条目 */ }
       }
-      return { connectors: [...ours, ...external] };
+      return { connectors: [...ours, ...external], approvalPolicy: approvalPolicyDefault(ctx) };
     },
 
     async createConnector(p) {
@@ -997,22 +1391,25 @@ function createApi(ctx, diagnostics) {
       if (typeof p?.group === 'string') store.groups.connectors[record.key] = String(p.group).trim() || undefined;
       if (store.groups.connectors[record.key] === undefined) delete store.groups.connectors[record.key];
       await save();
-      return { connector: { ...record, entryId: connectorEntryId(record), group: groupOf('connectors', record.key) } };
+      refreshApprovalPolicy();
+      return { connector: { ...maskConnectorSecrets(record), entryId: connectorEntryId(record), group: groupOf('connectors', record.key) } };
     },
 
     async updateConnector(p) {
       const key = String(p?.key ?? '');
       const index = store.connectors.findIndex((c) => c.key === key);
       if (index < 0) throw new Error('连接器不存在');
-      const record = normalizeConnector({ ...store.connectors[index], ...p, key });
+      // FR-C3：掩码值表示「保持原值」，先从旧记录回填明文再规范化
+      const record = normalizeConnector({ ...store.connectors[index], ...unmaskConnectorSecrets(p, store.connectors[index]), key });
       if (store.connectors.some((c) => c.key !== key && c.serverName === record.serverName)) {
         throw new Error(`serverName "${record.serverName}" 已被占用`);
       }
       await provisionConnector(ctx, record);
       store.connectors[index] = record;
+      refreshApprovalPolicy();
       if (typeof p?.group === 'string') await applyGroup('connectors', key, p.group);
       else await save();
-      return { connector: { ...record, group: groupOf('connectors', key) } };
+      return { connector: { ...maskConnectorSecrets(record), group: groupOf('connectors', key) } };
     },
 
     async deleteConnector(p) {
@@ -1022,7 +1419,9 @@ function createApi(ctx, diagnostics) {
       await removeConnectorEntry(ctx, key);
       store.connectors.splice(index, 1);
       clearGroup('connectors', key);
+      connectorStatus.delete(key);
       await save();
+      refreshApprovalPolicy();
       return { key };
     },
 
@@ -1033,7 +1432,41 @@ function createApi(ctx, diagnostics) {
       record.enabled = p?.enabled !== false;
       await provisionConnector(ctx, record);
       await save();
-      return { connector: record };
+      refreshApprovalPolicy();
+      return { connector: maskConnectorSecrets(record) };
+    },
+
+    /* FR-C1：测试连接（streamable-http / stdio），结果只进易失缓存，不持久化。 */
+    async testConnector(p) {
+      const key = String(p?.key ?? '');
+      const record = store.connectors.find((c) => c.key === key);
+      if (!record) throw new Error('连接器不存在');
+      const started = Date.now();
+      let result;
+      try {
+        const probed = record.transport === 'stdio'
+          ? await probeStdioConnector(record, CONNECTOR_TEST_TIMEOUT_MS)
+          : { latencyMs: Date.now() - started, tools: await probeHttpConnector(record, CONNECTOR_TEST_TIMEOUT_MS) };
+        result = { ok: true, latencyMs: probed.latencyMs, tools: probed.tools };
+      } catch (error) {
+        result = { ok: false, latencyMs: Date.now() - started, tools: [], error: error?.message ?? String(error) };
+      }
+      connectorStatus.set(key, { ...result, testedAt: Date.now() });
+      return result;
+    },
+
+    /* FR-C2：持久化工具策略（白名单/自动执行）；旧记录无 toolPolicy 字段 = 默认 all。 */
+    async setConnectorTools(p) {
+      const key = String(p?.key ?? '');
+      const record = store.connectors.find((c) => c.key === key);
+      if (!record) throw new Error('连接器不存在');
+      const mode = p?.mode === 'whitelist' ? 'whitelist' : 'all';
+      const tools = Array.isArray(p?.tools) ? [...new Set(p.tools.map(String))] : [];
+      const autoApprove = Array.isArray(p?.autoApprove) ? [...new Set(p.autoApprove.map(String))] : [];
+      record.toolPolicy = { mode, tools, autoApprove };
+      await save();
+      refreshApprovalPolicy();
+      return { connector: { ...maskConnectorSecrets(record), group: groupOf('connectors', key) } };
     },
 
     /* ---- 智能体（专家） ---- */
@@ -1053,11 +1486,13 @@ function createApi(ctx, diagnostics) {
           group: groupOf('experts', preset.id),
           skills: custom?.skills,
           connectors: custom?.connectors,
+          model: custom?.model, // FR-A1：旧记录无 = 跟随默认
+          tools: custom?.tools,
         };
       });
       for (const expert of store.experts) {
         if (!rows.some((r) => r.id === expert.id)) {
-          rows.push({ id: expert.id, name: expert.name, description: expert.description, isDefault: false, custom: true, broken: '注册失败或未注册', group: groupOf('experts', expert.id), skills: expert.skills, connectors: expert.connectors });
+          rows.push({ id: expert.id, name: expert.name, description: expert.description, isDefault: false, custom: true, broken: '注册失败或未注册', group: groupOf('experts', expert.id), skills: expert.skills, connectors: expert.connectors, model: expert.model, tools: expert.tools });
         }
       }
       return { experts: rows };
@@ -1072,6 +1507,8 @@ function createApi(ctx, diagnostics) {
       if (!prefix) throw new Error('系统提示词必填');
       const skills = normalizeExpertSkills(p?.skills);
       const connectors = normalizeExpertConnectors(p?.connectors);
+      const model = normalizeExpertModel(p?.model);
+      const tools = normalizeExpertTools(p?.tools);
       const agentPresets = ctx.get('agentPresets');
       if (agentPresets) {
         const roster = await agentPresets.list().catch(() => []);
@@ -1081,6 +1518,8 @@ function createApi(ctx, diagnostics) {
       const expert = { id, name, description: String(p?.description ?? ''), prefix, createdAt: Date.now() };
       if (skills !== undefined) expert.skills = skills;
       if (connectors !== undefined) expert.connectors = connectors;
+      if (model !== undefined) expert.model = model;
+      if (tools !== undefined) expert.tools = tools;
       await registerExpert(expert);
       store.experts.push(expert);
       if (typeof p?.group === 'string' && String(p.group).trim()) store.groups.experts[id] = String(p.group).trim();
@@ -1103,6 +1542,17 @@ function createApi(ctx, diagnostics) {
       };
       if (skills !== undefined) expert.skills = skills;
       if (connectors !== undefined) expert.connectors = connectors;
+      // FR-A1/A2：入参显式携带 model/tools 键时更新；model 传 null 或 tools 传非数组 = 清除（跟随默认/全部）
+      if (p && 'model' in p) {
+        const model = normalizeExpertModel(p.model);
+        if (model) expert.model = model;
+        else delete expert.model;
+      }
+      if (p && 'tools' in p) {
+        const tools = normalizeExpertTools(p.tools);
+        if (tools) expert.tools = tools; // 空数组也落盘，语义 = 全部可用
+        else delete expert.tools;
+      }
       await registerExpert(expert);
       store.experts[index] = expert;
       if (typeof p?.group === 'string') await applyGroup('experts', id, p.group);
@@ -1285,6 +1735,7 @@ const API_METHODS = new Map([
   ['skills.get', (api, p) => api.getSkill(p)],
   ['skills.create', (api, p) => api.createSkill(p)],
   ['skills.update', (api, p) => api.updateSkill(p)],
+  ['skills.validate', (api, p) => api.validateSkillSpec(p)],
   ['skills.delete', (api, p) => api.deleteSkill(p)],
   ['skills.import', (api, p) => api.importSkill(p)],
   ['markets.list', (api) => api.listMarkets()],
@@ -1297,6 +1748,8 @@ const API_METHODS = new Map([
   ['connectors.update', (api, p) => api.updateConnector(p)],
   ['connectors.delete', (api, p) => api.deleteConnector(p)],
   ['connectors.setEnabled', (api, p) => api.setConnectorEnabled(p)],
+  ['connectors.test', (api, p) => api.testConnector(p)],
+  ['connectors.setTools', (api, p) => api.setConnectorTools(p)],
   ['experts.list', (api) => api.listExperts()],
   ['experts.create', (api, p) => api.createExpert(p)],
   ['experts.update', (api, p) => api.updateExpert(p)],
@@ -1338,7 +1791,9 @@ function mountRoutes(wctx, api, trustedHosts) {
         await ensureLoaded();
         writeJson(res, 200, { ok: true, ...(await dispatch(api, body?.params ?? {})) }, cors);
       } catch (error) {
-        writeJson(res, 400, { ok: false, message: error instanceof Error ? error.message : String(error) }, cors);
+        const message = error instanceof Error ? error.message : String(error);
+        // FR-S2：校验类错误附带字段级 errors，供 client 逐字段红字展示（api() 失败信封透传）
+        writeJson(res, 400, { ok: false, message, ...(Array.isArray(error?.errors) ? { errors: error.errors } : {}) }, cors);
       }
     },
   });
@@ -1362,6 +1817,9 @@ export function apply(ctx) {
 
   ctx.effect(() => () => { void api.disposeAll(); }, 'manager-center: dispose experts');
 
+  // FR-C2：审批 answerer——本插件连接器的工具自动执行/白名单拦截，其余请求透传给后续 answerer。
+  ctx.effect(() => ctx.on('approval/request', managerApprovalAnswerer), 'manager-center: approval answerer');
+
   // Web 路由：优先 webStartup，兼容旧版 webRuntime；非 web 部署不挂载。
   // 路由注册挂在「本插件 ctx 的 effect」上：插件卸载/重载时旧路由一定随之下线，
   // 避免在 webStartup ctx 上注册导致重复激活后路由泄漏、多个 handler 争抢同一请求。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-my-config",
-  "version": "1.7.2",
+  "version": "1.8.0",
   "description": "My Config (我的配置): manage skills (with external skill markets and zip import), MCP connectors and agent experts from dedicated Web sidebar panels.",
   "type": "module",
   "main": "index.js",