dsh-mcp-connector 0.2.47 → 0.2.49

package/CHANGELOG.md

@@ -4,6 +4,29 @@
 
 ## [Unreleased]
 
+## [0.2.49] - 2026-09-15
+
+### Fixed
+
+- 修复钉钉 CLI 状态查询返回 `success: true, authenticated: false` 时误显示已连接：枚举工具前严格检查授权布尔值，异常响应安全拒绝，并提示官方 OAuth 登录命令。
+- 重建运行配置时精确升级旧市场钉钉桥接版本，保留用户自定义命令与凭据。
+
+### Changed
+
+- 卡片、详情和连接入口显示提供方、授权方式、运行位置和权限提示；连接失败在弹窗内保留原因。
+- 增加 0.2.50 授权设计及 WPS / 腾讯会议接入验证清单，尚不代表完成真实租户验收。
+
+## [0.2.48] - 2026-09-15
+
+### Added
+
+- 新增受控 CLI→MCP Provider 框架，首批把钉钉官方 `dws` 的通讯录、日程、待办、文档、OA 待审批和日志查询映射为 11 个只读 MCP 工具。
+- 连接时通过官方 `dws auth status` 验证 OAuth 就绪状态，未登录、无权限或 Token 无法刷新时不误报“已连接”。
+
+### Security
+
+- CLI 只能执行代码审核的命令与参数，不经 Shell；写入动词、未声明参数和控制字符均拒绝。子进程超时、输出大小受限，成功及失败输出中的 Token/Secret 都在返回 Host 前脱敏。
+
 ## [0.2.47] - 2026-09-14
 
 ### Changed
@@ -717,7 +740,8 @@
 - 外部 URL 与导入 Header 执行安全校验。
 - iframe 消息校验同源和消息来源。
 
-[Unreleased]: https://github.com/duhu2000/dsh-mcp-connector/compare/v0.2.47...HEAD
+[Unreleased]: https://github.com/duhu2000/dsh-mcp-connector/compare/v0.2.48...HEAD
+[0.2.48]: https://github.com/duhu2000/dsh-mcp-connector/compare/v0.2.47...v0.2.48
 [0.2.47]: https://github.com/duhu2000/dsh-mcp-connector/compare/v0.2.46...v0.2.47
 [0.2.46]: https://github.com/duhu2000/dsh-mcp-connector/compare/v0.2.45...v0.2.46
 [0.2.45]: https://github.com/duhu2000/dsh-mcp-connector/compare/v0.2.44...v0.2.45

package/README.en.md

@@ -190,7 +190,7 @@ npm run dev:ui
 
 Every Registry merge regenerates `catalog-stats.json`; an hourly workflow in this repository synchronizes the Chinese and English product copy plus a local stats snapshot. The static npm README updates with package releases, while the live badges above read the Registry directly and therefore stay current without another npm release.
 
-The current public version is [`dsh-mcp-connector@0.2.47`](https://www.npmjs.com/package/dsh-mcp-connector), with [GitHub Release v0.2.47](https://github.com/duhu2000/dsh-mcp-connector/releases/tag/v0.2.47).
+The current public version is [`dsh-mcp-connector@0.2.49`](https://www.npmjs.com/package/dsh-mcp-connector), with [GitHub Release v0.2.49](https://github.com/duhu2000/dsh-mcp-connector/releases/tag/v0.2.49).
 
 See [CHANGELOG.md](CHANGELOG.md) for version history and [docs/DESKTOP-E2E.md](docs/DESKTOP-E2E.md) for the Desktop release checklist.
 
@@ -202,6 +202,7 @@ See [CHANGELOG.md](CHANGELOG.md) for version history and [docs/DESKTOP-E2E.md](d
 - External URLs use HTTPS by default, and HTTP is allowed for loopback development. A user-created connection may explicitly opt in to plaintext HTTP for literal RFC1918 IPv4 or RFC4193 IPv6 ULA addresses; hostnames, public HTTP, link-local addresses, and cloud metadata addresses remain blocked.
 - Remote descriptors and catalogs are limited to 2 MiB, Web API requests to 1 MiB, and imported JSON is scanned for credential fields before normalization.
 - Streamable HTTP and stdio are supported end to end. Legacy `sse` entries are normalized to Streamable HTTP. The connector passes stdio `command/args/env/cwd` to `@deepseek-ai/dsh-mcp-client` instead of reimplementing process transport.
+- Official CLIs that are not MCP servers can be exposed through a separate [controlled CLI Provider](docs/CLI-PROVIDERS.md). Only code-reviewed commands and arguments are available; the initial DingTalk `dws` provider is read-only.
 - stdio starts a local process. Import or connect only trusted commands and packages. Catalog descriptors may declare `credentialFields` and `credentialBindings`, but may never contain actual token/secret values; user input is injected only into the local Host process environment.
 - OAuth DCR client secrets share the same local-only boundary as access and refresh tokens and are omitted from catalog/status responses and logs.
 - OAuth failures identify resource discovery, server discovery, client registration, browser callback, or token exchange. A DCR HTTP 403 is reported as provider-side client admission rejection rather than a missing user authorization.

package/README.md

@@ -185,7 +185,7 @@ npm run dev:ui
 
 公共 Registry 每次合并后会生成 `catalog-stats.json`；本仓库的定时工作流每小时同步中英文介绍和统计快照。npm 页面中的静态正文随版本发布更新，上方动态统计徽标则直接读取 Registry，可在不发布新 npm 版本时保持实时数量一致。
 
-当前公开版本为 [`dsh-mcp-connector@0.2.47`](https://www.npmjs.com/package/dsh-mcp-connector)，对应 [GitHub Release v0.2.47](https://github.com/duhu2000/dsh-mcp-connector/releases/tag/v0.2.47)。
+当前公开版本为 [`dsh-mcp-connector@0.2.49`](https://www.npmjs.com/package/dsh-mcp-connector)，对应 [GitHub Release v0.2.49](https://github.com/duhu2000/dsh-mcp-connector/releases/tag/v0.2.49)。
 
 版本能力与变更记录见 [CHANGELOG.md](CHANGELOG.md)。
 Desktop 发版回归见 [docs/DESKTOP-E2E.md](docs/DESKTOP-E2E.md)。
@@ -201,6 +201,7 @@ stdio 传输的架构、透传边界与安全约束见 [docs/STDIO-SUPPORT.md](d
 - 外部 URL 默认仅允许 HTTPS，HTTP 默认仅允许回环地址。用户自建连接可在明确风险确认后放行 RFC1918 IPv4 / RFC4193 IPv6 ULA 字面量；域名、公网 HTTP、链路本地与云元数据地址仍拒绝。
 - 远程目录/描述响应限制 2 MiB，Web API 请求限制 1 MiB；原始 JSON 在归一化前扫描凭据字段。
 - 完整覆盖 Streamable HTTP 与 stdio；旧 `sse` 配置在导入/恢复时归一为 Streamable HTTP。stdio 的 `command/args/env/cwd` 原样交给 `@deepseek-ai/dsh-mcp-client`，插件本身不重复实现进程传输。
+- 对本身不是 MCP Server 的官方 CLI，使用独立的[受控 CLI Provider](docs/CLI-PROVIDERS.md)桥接为 stdio MCP；只允许代码登记的命令与参数，首个钉钉 `dws` Provider 仅开放只读能力。
 - stdio 会启动本机进程：仅导入或连接可信命令/软件包。市场目录只能用 `credentialFields` + `credentialBindings` 声明输入与 env 映射，不得携带真实 token/secret；用户填写值只写入本机连接记录并交给 Host。
 - OAuth DCR 的 `client_secret` 与 Access/Refresh Token 采用相同的本机存储边界，不会进入市场 API、状态输出或日志。
 - OAuth 连接失败会标明资源发现、服务发现、客户端注册、授权回调或 Token 换取阶段；DCR HTTP 403 表示服务商拒绝未准入客户端，不是用户未点击授权。

package/docs/CLI-PROVIDERS.md

@@ -0,0 +1,58 @@
+# 受控 CLI Provider
+
+MCP 连接器原生支持 Streamable HTTP 和 stdio MCP。对于钉钉 `dws` 这类面向人类与 Agent、但本身不是 MCP Server 的官方 CLI，插件通过独立的 CLI→MCP 桥接进程暴露经过审核的结构化工具。
+
+## 安全边界
+
+- Provider 在代码中显式登记，市场卡片和工具参数均不能指定任意可执行文件。
+- 子进程通过 `spawn(command, args, { shell: false })` 启动，不解析 Shell 表达式。
+- 首个 `dingtalk-dws` Provider 仅登记只读命令；创建、发送、审批、拒绝、删除、更新和上传均不暴露。
+- 每个工具只接受 JSON Schema 声明过的字段，参数作为独立 argv 传递。
+- stdout/stderr 均受大小限制，执行有超时；错误中的 Token 和 Secret 在返回 Host 前脱敏。
+- MCP 客户端枚举工具前执行官方 `dws auth status` 预检；只有 JSON 明确返回 `success: true` 且 `authenticated: true` 才列出工具。退出码为 0 不代表已登录；未授权或响应异常时拒绝连接并提供登录提示。预检不代表全部业务权限已获批，具体工具仍由官方 CLI 校验权限。
+- 首次登录请在运行 DSH 的同一电脑、同一系统用户下执行 `npx -y dingtalk-workspace-cli@1.0.61 auth login`（无浏览器环境加 `--device`），完成后重新连接。不会自动替用户登录或读取聊天记录。
+- Authentication readiness requires both `success === true` and `authenticated === true`; a successful status query alone is insufficient. Invalid responses fail closed without exposing identity or tokens. Run the login command above as the same OS user running DSH, then reconnect. Per-tool permissions are still enforced by the official CLI.
+- 登录、Token 刷新、企业管理员授权、租户隔离和 API 审计由官方 CLI 与开放平台负责。
+
+## 钉钉前置条件
+
+1. 市场卡片固定使用已审核的 `dingtalk-workspace-cli@1.0.61`，无需全局安装 `dws`。
+2. 首次连接前，在普通终端执行 `npx -y dingtalk-workspace-cli@1.0.61 auth login`；无浏览器环境加 `--device`。
+3. 企业管理员需在钉钉开发者平台开启 CLI 访问。
+4. 多组织用户可在工具参数里传稳定的 `corpId:userId` profile；不传时使用当前 profile。
+
+授权信息保存在钉钉官方 CLI 的用户配置和系统 Keychain 中，不写入 Connector 配置。后续升级 `dws` 需先复核官方命令、权限和输出 Schema，然后通过 Registry PR 更换固定版本。
+
+启动 MCP 桥接：
+
+```json
+{
+  "mcpServers": {
+    "dingtalk-workspace": {
+      "command": "npx",
+      "args": [
+        "-y",
+        "--legacy-peer-deps",
+        "--package",
+        "dsh-mcp-connector@0.2.48",
+        "--package",
+        "dingtalk-workspace-cli@1.0.61",
+        "dsh-mcp-cli-bridge",
+        "--provider",
+        "dingtalk-dws"
+      ]
+    }
+  }
+}
+```
+
+## 首批只读能力
+
+- 当前用户、通讯录搜索与用户详情
+- 日程列表与日程详情
+- 待办列表与待办详情
+- 文档搜索
+- 待处理 OA 审批列表
+- 收到的日志和日志模板
+
+后续增加 Provider 或命令时，必须同时提供：官方来源、固定命令路径、输入 Schema、风险级别、只读/写入分类、脱敏策略和单元测试。写入命令不得混入只读 Provider。

package/docs/STDIO-SUPPORT.md

@@ -12,9 +12,9 @@
 
 ## 一、背景与目标
 
-### 1.1 现状缺口
+### 1.1 实施前的现状缺口（历史记录）
 
-当前 `dsh-mcp-connector` 的传输方式（`transport`）仅支持：
+以下内容记录实施前的缺口；当前版本已经支持 stdio。实施前 `dsh-mcp-connector` 的传输方式（`transport`）仅支持：
 
 - `streamable-http`
 - `sse`
@@ -23,11 +23,11 @@
 
 | 传输方式 | WorkBuddy | TraeWork | Qwen Code | 我们 |
 |---------|:--------:|:--------:|:--------:|:----:|
-| stdio（本地进程） | ✅ | ✅ | ✅ | ❌ |
+| stdio（本地进程） | ✅ | ✅ | ✅ | ✅（当前已完成） |
 | HTTP / streamable-http | ❓ | ✅ | ✅ | ✅ |
 | SSE | ❓ | ❓ | ✅ | ✅ |
 
-**缺失 stdio 导致**：无法接入大量社区 stdio 型 MCP server（GitHub、filesystem、playwright、memory 等 npm/pip 包）。
+**历史影响**：缺失 stdio 时无法接入大量社区 stdio 型 MCP server（GitHub、filesystem、playwright、memory 等 npm/pip 包）；该缺口现已关闭。
 
 ### 1.2 补齐目标
 

package/lib/cli-providers.js

@@ -0,0 +1,459 @@
+import { spawn } from 'node:child_process';
+
+const MAX_OUTPUT_BYTES = 1024 * 1024;
+const DEFAULT_TIMEOUT_MS = 30_000;
+const WRITE_VERBS = new Set([
+  'add', 'approve', 'create', 'delete', 'disable', 'done', 'enable', 'insert',
+  'invite', 'move', 'recall', 'reject', 'remove', 'rename', 'reply', 'revoke',
+  'send', 'switch', 'update', 'upload',
+]);
+
+function stringField(flag, options = {}) {
+  return { flag, type: 'string', ...options };
+}
+
+function integerField(flag, options = {}) {
+  return { flag, type: 'integer', ...options };
+}
+
+function booleanField(flag, options = {}) {
+  return { flag, type: 'boolean', ...options };
+}
+
+function stringArrayField(flag, options = {}) {
+  return { flag, type: 'string-array', ...options };
+}
+
+const profileField = stringField('--profile', {
+  global: true,
+  description: '可选的钉钉账号 profile（建议使用 corpId:userId）。不填写时使用 dws 当前 profile。',
+});
+
+function readTool(name, description, command, fields = {}) {
+  return { name, description, command, fields, readOnly: true };
+}
+
+const dingtalkDwsTools = [
+  readTool(
+    'dingtalk_get_current_user',
+    '读取当前钉钉 OAuth 身份的用户、组织和部门信息。',
+    ['contact', 'user', 'get-self'],
+    { profile: profileField },
+  ),
+  readTool(
+    'dingtalk_search_users',
+    '按关键词只读搜索钉钉企业通讯录。多人同名时应展示候选，不得自动选择。',
+    ['contact', 'user', 'search'],
+    {
+      profile: profileField,
+      query: stringField('--query', { required: true, description: '姓名、职位或通讯录关键词。' }),
+    },
+  ),
+  readTool(
+    'dingtalk_get_users',
+    '按一个或多个 userId 批量读取钉钉用户资料。',
+    ['contact', 'user', 'get'],
+    {
+      profile: profileField,
+      ids: stringArrayField('--ids', { required: true, description: '钉钉 userId 列表。' }),
+    },
+  ),
+  readTool(
+    'dingtalk_list_calendar_events',
+    '只读列出当前用户在指定时间范围内的钉钉日程；不传时间时由 dws 使用默认范围。',
+    ['calendar', 'event', 'list'],
+    {
+      profile: profileField,
+      start: stringField('--start', { description: 'ISO 8601 开始时间。' }),
+      end: stringField('--end', { description: 'ISO 8601 结束时间。' }),
+    },
+  ),
+  readTool(
+    'dingtalk_get_calendar_event',
+    '按日程 ID 只读获取钉钉日程详情。',
+    ['calendar', 'event', 'get'],
+    {
+      profile: profileField,
+      id: stringField('--id', { required: true, description: '日程 ID。' }),
+    },
+  ),
+  readTool(
+    'dingtalk_list_todos',
+    '只读列出当前用户的钉钉待办。',
+    ['todo', 'task', 'list'],
+    {
+      profile: profileField,
+      page: integerField('--page', { minimum: 1, maximum: 10000, description: '页码。' }),
+      size: integerField('--size', { minimum: 1, maximum: 100, description: '每页数量。' }),
+      completed: booleanField('--status', { description: 'true 仅已完成，false 仅未完成；不传则不过滤。' }),
+    },
+  ),
+  readTool(
+    'dingtalk_get_todo',
+    '按待办 ID 只读获取钉钉待办详情。',
+    ['todo', 'task', 'get'],
+    {
+      profile: profileField,
+      taskId: stringField('--task-id', { required: true, description: '待办任务 ID。' }),
+    },
+  ),
+  readTool(
+    'dingtalk_search_documents',
+    '只读搜索当前用户有权访问的钉钉文件和文档。',
+    ['drive', 'search'],
+    {
+      profile: profileField,
+      query: stringField('--query', { required: true, description: '文件或文档标题、内容关键词。' }),
+    },
+  ),
+  readTool(
+    'dingtalk_list_pending_approvals',
+    '只读列出指定时间范围内当前用户待处理的钉钉 OA 审批实例；不会执行同意或拒绝。',
+    ['oa', 'approval', 'list-pending'],
+    {
+      profile: profileField,
+      start: stringField('--start', { required: true, description: 'ISO 8601 开始时间。' }),
+      end: stringField('--end', { required: true, description: 'ISO 8601 结束时间。' }),
+      page: integerField('--page', { minimum: 1, maximum: 10000, description: '页码。' }),
+      limit: integerField('--limit', { minimum: 1, maximum: 100, description: '每页数量。' }),
+    },
+  ),
+  readTool(
+    'dingtalk_list_reports',
+    '只读列出指定时间范围内当前用户收到的钉钉日志。',
+    ['report', 'inbox', 'list'],
+    {
+      profile: profileField,
+      start: stringField('--start', { required: true, description: 'ISO 8601 开始时间。' }),
+      end: stringField('--end', { required: true, description: 'ISO 8601 结束时间。' }),
+      cursor: integerField('--cursor', { minimum: 0, description: '分页游标。' }),
+      size: integerField('--size', { minimum: 1, maximum: 20, description: '返回数量。' }),
+    },
+  ),
+  readTool(
+    'dingtalk_list_report_templates',
+    '只读列出当前用户可用的钉钉日志模板。',
+    ['report', 'template', 'list'],
+    { profile: profileField },
+  ),
+];
+
+export const CLI_PROVIDERS = Object.freeze({
+  'dingtalk-dws': Object.freeze({
+    id: 'dingtalk-dws',
+    name: '钉钉工作台 CLI',
+    executable: 'dws',
+    homepage: 'https://github.com/DingTalk-Real-AI/dingtalk-workspace-cli',
+    preflight: Object.freeze(['auth', 'status']),
+    tools: Object.freeze(dingtalkDwsTools),
+  }),
+});
+
+function inputSchema(tool) {
+  const properties = {};
+  const required = [];
+  for (const [name, field] of Object.entries(tool.fields)) {
+    const schema = { description: field.description };
+    if (field.type === 'integer') {
+      schema.type = 'integer';
+      if (field.minimum !== undefined) schema.minimum = field.minimum;
+      if (field.maximum !== undefined) schema.maximum = field.maximum;
+    } else if (field.type === 'boolean') {
+      schema.type = 'boolean';
+    } else if (field.type === 'string-array') {
+      schema.type = 'array';
+      schema.items = { type: 'string', minLength: 1 };
+      schema.minItems = 1;
+      schema.maxItems = 100;
+    } else {
+      schema.type = 'string';
+      schema.minLength = 1;
+    }
+    properties[name] = schema;
+    if (field.required) required.push(name);
+  }
+  return {
+    type: 'object',
+    properties,
+    additionalProperties: false,
+    ...(required.length ? { required } : {}),
+  };
+}
+
+export function listCliProviderTools(providerId) {
+  const provider = CLI_PROVIDERS[providerId];
+  if (!provider) throw new Error(`unknown CLI provider: ${providerId}`);
+  return provider.tools.map((tool) => ({
+    name: tool.name,
+    description: tool.description,
+    inputSchema: inputSchema(tool),
+    annotations: {
+      readOnlyHint: true,
+      destructiveHint: false,
+      idempotentHint: true,
+      openWorldHint: true,
+    },
+  }));
+}
+
+function assertSafeExecutable(executable) {
+  const value = String(executable ?? '').trim();
+  if (!value || /[\0\r\n]/.test(value) || /\s/.test(value)) {
+    throw new Error('CLI executable must be one command name or an absolute path without whitespace');
+  }
+  return value;
+}
+
+function validateField(name, value, field) {
+  if (value === undefined || value === null || value === '') {
+    if (field.required) throw new Error(`missing required argument: ${name}`);
+    return undefined;
+  }
+  if (field.type === 'string') {
+    if (typeof value !== 'string' || !value.trim()) throw new Error(`${name} must be a non-empty string`);
+    if (/[\0\r\n]/.test(value)) throw new Error(`${name} contains forbidden control characters`);
+    return value;
+  }
+  if (field.type === 'integer') {
+    if (!Number.isInteger(value)) throw new Error(`${name} must be an integer`);
+    if (field.minimum !== undefined && value < field.minimum) throw new Error(`${name} must be >= ${field.minimum}`);
+    if (field.maximum !== undefined && value > field.maximum) throw new Error(`${name} must be <= ${field.maximum}`);
+    return String(value);
+  }
+  if (field.type === 'boolean') {
+    if (typeof value !== 'boolean') throw new Error(`${name} must be a boolean`);
+    return String(value);
+  }
+  if (field.type === 'string-array') {
+    if (!Array.isArray(value) || !value.length || value.length > 100) {
+      throw new Error(`${name} must be an array containing 1-100 strings`);
+    }
+    const values = value.map((item) => {
+      if (typeof item !== 'string' || !item.trim() || /[\0\r\n,]/.test(item)) {
+        throw new Error(`${name} contains an invalid item`);
+      }
+      return item;
+    });
+    return values.join(',');
+  }
+  throw new Error(`unsupported field type for ${name}`);
+}
+
+export function buildCliInvocation(providerId, toolName, input = {}, options = {}) {
+  const provider = CLI_PROVIDERS[providerId];
+  if (!provider) throw new Error(`unknown CLI provider: ${providerId}`);
+  const tool = provider.tools.find((candidate) => candidate.name === toolName);
+  if (!tool) throw new Error(`unknown tool for ${providerId}: ${toolName}`);
+  if (!tool.readOnly || tool.command.some((part) => WRITE_VERBS.has(part))) {
+    throw new Error(`CLI provider tool is not approved for read-only execution: ${toolName}`);
+  }
+  if (!input || typeof input !== 'object' || Array.isArray(input)) {
+    throw new Error('tool arguments must be an object');
+  }
+  const unknown = Object.keys(input).filter((key) => !Object.hasOwn(tool.fields, key));
+  if (unknown.length) throw new Error(`unknown tool arguments: ${unknown.join(', ')}`);
+
+  const globalArgs = [];
+  const commandArgs = [];
+  for (const [name, field] of Object.entries(tool.fields)) {
+    const value = validateField(name, input[name], field);
+    if (value === undefined) continue;
+    const target = field.global ? globalArgs : commandArgs;
+    target.push(field.flag, value);
+  }
+  return {
+    command: assertSafeExecutable(options.executable ?? process.env.DSH_MCP_DINGTALK_DWS_BIN ?? provider.executable),
+    args: [...globalArgs, ...tool.command, ...commandArgs, '--format', 'json'],
+    provider,
+    tool,
+  };
+}
+
+export function buildCliPreflightInvocation(providerId, options = {}) {
+  const provider = CLI_PROVIDERS[providerId];
+  if (!provider) throw new Error(`unknown CLI provider: ${providerId}`);
+  if (!Array.isArray(provider.preflight) || !provider.preflight.length) return null;
+  if (provider.preflight.some((part) => WRITE_VERBS.has(part))) {
+    throw new Error(`CLI provider preflight is not approved for read-only execution: ${providerId}`);
+  }
+  return {
+    command: assertSafeExecutable(options.executable ?? process.env.DSH_MCP_DINGTALK_DWS_BIN ?? provider.executable),
+    args: [...provider.preflight, '--format', 'json'],
+  };
+}
+
+export function redactCliError(value) {
+  return String(value ?? '')
+    .replace(/(authorization\s*[:=]\s*bearer\s+)[^\s"']+/gi, '$1[REDACTED]')
+    .replace(/(["']?(?:(?:access|refresh)[_-]?token|client[_-]?secret|app[_-]?secret)["']?\s*[=:]\s*["']?)[^\s,"'}]+/gi, '$1[REDACTED]')
+    .replace(/Bearer\s+[A-Za-z0-9._~+\/-]+/gi, 'Bearer [REDACTED]')
+    .trim();
+}
+
+export function runCliProcess(command, args, options = {}) {
+  const timeoutMs = Number.isInteger(options.timeoutMs) ? options.timeoutMs : DEFAULT_TIMEOUT_MS;
+  const maxOutputBytes = Number.isInteger(options.maxOutputBytes) ? options.maxOutputBytes : MAX_OUTPUT_BYTES;
+  return new Promise((resolve, reject) => {
+    const child = spawn(command, args, {
+      shell: false,
+      windowsHide: true,
+      stdio: ['ignore', 'pipe', 'pipe'],
+      env: options.env ?? process.env,
+    });
+    const stdout = [];
+    const stderr = [];
+    let stdoutBytes = 0;
+    let stderrBytes = 0;
+    let settled = false;
+    const fail = (error) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      reject(error);
+    };
+    const timer = setTimeout(() => {
+      child.kill('SIGTERM');
+      fail(new Error(`CLI command timed out after ${timeoutMs}ms`));
+    }, Math.max(1000, Math.min(timeoutMs, 300_000)));
+
+    child.once('error', (error) => {
+      if (error?.code === 'ENOENT') {
+        fail(new Error(`未找到官方 CLI 命令“${command}”；请先完成安装和 OAuth 登录，再重启 DSH`));
+        return;
+      }
+      fail(error);
+    });
+    child.stdout.on('data', (chunk) => {
+      stdoutBytes += chunk.length;
+      if (stdoutBytes > maxOutputBytes) {
+        child.kill('SIGTERM');
+        fail(new Error(`CLI stdout exceeded ${maxOutputBytes} bytes`));
+        return;
+      }
+      stdout.push(chunk);
+    });
+    child.stderr.on('data', (chunk) => {
+      stderrBytes += chunk.length;
+      if (stderrBytes <= maxOutputBytes) stderr.push(chunk);
+    });
+    child.once('close', (code, signal) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      const output = Buffer.concat(stdout).toString('utf8').trim();
+      const errorOutput = redactCliError(Buffer.concat(stderr).toString('utf8'));
+      if (code !== 0) {
+        const hint = {
+          2: '身份认证或授权失败；请运行 dws auth login，并确认企业管理员已开启 CLI 访问',
+          3: '参数未通过当前固定 dws 版本校验；请核对工具参数或升级 MCP 连接器目录',
+          4: '钉钉要求补充权限授权；请按官方授权提示完成后重试',
+          6: 'dws 命令或服务发现失败；请检查网络、登录状态与 MCP 连接器目录版本',
+        }[code] ?? '';
+        const details = [hint, errorOutput, signal ? `signal=${signal}` : ''].filter(Boolean).join('；');
+        reject(new Error(`CLI command failed with exit code ${code}${details ? `: ${details}` : ''}`));
+        return;
+      }
+      resolve(output);
+    });
+  });
+}
+
+export async function executeCliProviderTool(providerId, toolName, input = {}, options = {}) {
+  const invocation = buildCliInvocation(providerId, toolName, input, options);
+  const runner = options.runner ?? runCliProcess;
+  const output = await runner(invocation.command, invocation.args, options);
+  let normalized = redactCliError(output || '{"ok":true}');
+  try {
+    normalized = JSON.stringify(JSON.parse(normalized), null, 2);
+  } catch {
+    // Keep non-JSON success output readable; dws normally emits JSON with --format json.
+  }
+  return {
+    content: [{ type: 'text', text: normalized }],
+    isError: false,
+  };
+}
+
+export async function ensureCliProviderReady(providerId, options = {}) {
+  const invocation = buildCliPreflightInvocation(providerId, options);
+  if (!invocation) return;
+  const runner = options.runner ?? runCliProcess;
+  const output = await runner(invocation.command, invocation.args, options);
+  // Exit code 0 / success:true means the status query succeeded, not that
+  // the user is authenticated. Never expose the raw status (identity/tokens).
+  let status;
+  try {
+    status = JSON.parse(output);
+  } catch {
+    throw new Error('无法验证钉钉 OAuth 状态：官方 CLI 未返回有效 JSON；请检查 CLI 版本后重试');
+  }
+  if (!status || typeof status !== 'object' || Array.isArray(status)
+    || status.success !== true || status.authenticated !== true) {
+    throw new Error('钉钉 OAuth 未就绪：请先在运行 DSH 的同一电脑、同一系统用户下执行 npx -y dingtalk-workspace-cli@1.0.61 auth login（无浏览器环境加 --device），完成授权后重新连接；如仍失败，请确认企业管理员已开启 CLI 访问');
+  }
+}
+
+// Upgrade only the exact managed legacy invocation; preserve custom commands,
+// environment, cwd and credentials. Applied on every provision, including restore.
+export function cliBridgeArgs(record) {
+  const legacy = ['--yes', '--legacy-peer-deps', '--package', 'dsh-mcp-connector@0.2.48',
+    '--package', 'dingtalk-workspace-cli@1.0.61', 'dsh-mcp-cli-bridge', '--provider', 'dingtalk-dws'];
+  const args = record.args ?? [];
+  if (record.connectorId !== 'dingtalk' || record.command !== 'npx'
+    || JSON.stringify(args) !== JSON.stringify(legacy)) return args;
+  return args.map((arg) => arg === 'dsh-mcp-connector@0.2.48' ? 'dsh-mcp-connector@0.2.49' : arg);
+}
+
+export async function handleCliBridgeRequest(message, options = {}) {
+  const providerId = options.providerId ?? 'dingtalk-dws';
+  if (!message || typeof message !== 'object') throw new Error('invalid JSON-RPC message');
+  if (!Object.hasOwn(message, 'id')) return null;
+  const base = { jsonrpc: '2.0', id: message.id };
+  try {
+    if (message.method === 'initialize') {
+      return {
+        ...base,
+        result: {
+          protocolVersion: message.params?.protocolVersion ?? '2025-06-18',
+          capabilities: { tools: { listChanged: false } },
+          serverInfo: { name: `dsh-mcp-cli-bridge/${providerId}`, version: '1.0.0' },
+        },
+      };
+    }
+    if (message.method === 'ping') return { ...base, result: {} };
+    if (message.method === 'tools/list') {
+      try {
+        const preflight = options.preflight ?? ensureCliProviderReady;
+        await preflight(providerId, options);
+      } catch (error) {
+        return {
+          ...base,
+          error: {
+            code: -32001,
+            message: `CLI Provider 未就绪：${redactCliError(error?.message ?? error)}`,
+          },
+        };
+      }
+      return { ...base, result: { tools: listCliProviderTools(providerId) } };
+    }
+    if (message.method === 'tools/call') {
+      const name = message.params?.name;
+      const args = message.params?.arguments ?? {};
+      try {
+        const execute = options.execute ?? executeCliProviderTool;
+        return { ...base, result: await execute(providerId, name, args, options) };
+      } catch (error) {
+        return {
+          ...base,
+          result: {
+            content: [{ type: 'text', text: redactCliError(error?.message ?? error) }],
+            isError: true,
+          },
+        };
+      }
+    }
+    return { ...base, error: { code: -32601, message: `Method not found: ${message.method}` } };
+  } catch (error) {
+    return { ...base, error: { code: -32603, message: redactCliError(error?.message ?? error) } };
+  }
+}

package/lib/mcp-provision.js

@@ -3,6 +3,8 @@
  * entryId = {entryPrefix}-{record.key}；serverName 决定工具名前缀，生命周期内不变 → 幂等。
  */
 
+import { cliBridgeArgs } from './cli-providers.js';
+
 export function entryIdFor(config, record) {
   return `${config.entryPrefix}-${record.key}`;
 }
@@ -35,7 +37,7 @@ export function buildEntryConfig(record, grants, { failOnStartupError = false }
       transport: 'stdio',
       serverName: record.serverName,
       command: record.command,
-      args: record.args ?? [],
+      args: cliBridgeArgs(record),
       env,
       cwd: record.cwd || process.cwd(),
       failOnStartupError,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-mcp-connector",
-  "version": "0.2.47",
+  "version": "0.2.49",
   "description": "DeepSeek Harness MCP Connector: connect servers, search tools across active connections, and troubleshoot discovery. Includes a continuously updated catalog; supports OAuth 2.0 PKCE, API keys, Streamable HTTP/stdio, and mcpServers JSON import.",
   "type": "module",
   "main": "lib/index.js",
@@ -10,7 +10,8 @@
     "./package.json": "./package.json"
   },
   "bin": {
-    "dsh-mcp-connector-probe": "scripts/probe-connector.mjs"
+    "dsh-mcp-connector-probe": "scripts/probe-connector.mjs",
+    "dsh-mcp-cli-bridge": "scripts/cli-bridge.mjs"
   },
   "files": [
     "lib",
@@ -25,6 +26,7 @@
     "docs/TOOL-GOVERNANCE.md",
     "docs/FIRST-CONTRIBUTION.md",
     "docs/STDIO-SUPPORT.md",
+    "docs/CLI-PROVIDERS.md",
     "docs/USER-GUIDE.md",
     "docs/screenshots",
     "cordis.patch.yml",
@@ -36,12 +38,13 @@
     "LICENSE",
     "install.sh",
     "scripts/probe-connector.mjs",
+    "scripts/cli-bridge.mjs",
     "scripts/build-registry.mjs",
     "scripts/ui-harness.mjs"
   ],
   "scripts": {
     "test": "node --test",
-    "lint": "node --check lib/discovery-policy.js && node --check lib/index.js && node --check lib/web.js && node --check lib/client.js && node --check lib/settings.js && node --check lib/version-status.js && node --check lib/schema.js && node --check lib/catalog.js && node --check lib/prompts.js && node --check lib/probe.js && node --check lib/diagnostics.js && node --check lib/connection-backup.js && node --check lib/connection-editor.js && node --check lib/connection-scopes.js && node --check lib/governance.js && node --check lib/tool-catalog-cache.js && node --check lib/status-events.js && node --check lib/mcp-validation.js && node --check lib/mcp-http.js && node --check lib/migration.js && node --check lib/stores.js && node --check lib/grant-journal.js && node --check lib/oauth.js && node --check lib/grant-lifecycle.js && node --check lib/callback-server.js && node --check lib/mcp-provision.js && node --check lib/util.js && node --check lib/constants.js && node --check lib/tools.js && node --check lib/connectors/oauth-connector.js && node --check lib/connectors/manual-connector.js && node --check lib/connectors/json-connector.js && node --check scripts/probe-connector.mjs && node --check scripts/build-registry.mjs && node --check scripts/ui-harness.mjs && node --check scripts/check-market-registration.mjs && node --check scripts/check-distribution-sync.mjs && node --check scripts/check-readme-version.mjs && node --check scripts/check-marketing-metadata.mjs && node --check scripts/check-storefront-screenshots.mjs && node --check scripts/sync-registry-stats.mjs && node --check scripts/verify-pack.mjs",
+    "lint": "node --check lib/discovery-policy.js && node --check lib/index.js && node --check lib/web.js && node --check lib/client.js && node --check lib/settings.js && node --check lib/version-status.js && node --check lib/schema.js && node --check lib/catalog.js && node --check lib/prompts.js && node --check lib/probe.js && node --check lib/diagnostics.js && node --check lib/connection-backup.js && node --check lib/connection-editor.js && node --check lib/connection-scopes.js && node --check lib/governance.js && node --check lib/tool-catalog-cache.js && node --check lib/status-events.js && node --check lib/mcp-validation.js && node --check lib/mcp-http.js && node --check lib/migration.js && node --check lib/stores.js && node --check lib/grant-journal.js && node --check lib/oauth.js && node --check lib/grant-lifecycle.js && node --check lib/callback-server.js && node --check lib/mcp-provision.js && node --check lib/cli-providers.js && node --check lib/util.js && node --check lib/constants.js && node --check lib/tools.js && node --check lib/connectors/oauth-connector.js && node --check lib/connectors/manual-connector.js && node --check lib/connectors/json-connector.js && node --check scripts/probe-connector.mjs && node --check scripts/cli-bridge.mjs && node --check scripts/build-registry.mjs && node --check scripts/ui-harness.mjs && node --check scripts/check-market-registration.mjs && node --check scripts/check-distribution-sync.mjs && node --check scripts/check-readme-version.mjs && node --check scripts/check-marketing-metadata.mjs && node --check scripts/check-storefront-screenshots.mjs && node --check scripts/sync-registry-stats.mjs && node --check scripts/verify-pack.mjs",
     "registry:build": "node scripts/build-registry.mjs",
     "registry:validate": "node scripts/probe-connector.mjs catalog/catalog.json --validate-only",
     "dev:ui": "node scripts/ui-harness.mjs",

package/scripts/cli-bridge.mjs

@@ -0,0 +1,36 @@
+#!/usr/bin/env node
+import { handleCliBridgeRequest } from '../lib/cli-providers.js';
+
+function providerFromArgs(argv) {
+  const index = argv.indexOf('--provider');
+  if (index < 0) return 'dingtalk-dws';
+  const value = argv[index + 1];
+  if (!value || value.startsWith('-')) throw new Error('--provider requires a value');
+  return value;
+}
+
+const providerId = providerFromArgs(process.argv.slice(2));
+let buffer = '';
+
+function send(message) {
+  process.stdout.write(`${JSON.stringify(message)}\n`);
+}
+
+process.stdin.setEncoding('utf8');
+process.stdin.on('data', (chunk) => {
+  buffer += chunk;
+  while (buffer.includes('\n')) {
+    const index = buffer.indexOf('\n');
+    const line = buffer.slice(0, index).trim();
+    buffer = buffer.slice(index + 1);
+    if (!line) continue;
+    Promise.resolve()
+      .then(() => handleCliBridgeRequest(JSON.parse(line), { providerId }))
+      .then((response) => { if (response) send(response); })
+      .catch((error) => send({
+        jsonrpc: '2.0',
+        id: null,
+        error: { code: -32700, message: String(error?.message ?? error) },
+      }));
+  }
+});

package/ui/index.html

@@ -1155,6 +1155,15 @@
     }
   }
 
+  function connectionLabels(d) {
+    const local = (d.servers || []).some((s) => s.transport === 'stdio');
+    const auth = d.id === 'dingtalk' ? '官方 CLI OAuth'
+      : ({ 'oauth2-pkce': 'OAuth 授权', bearer: 'Bearer 凭据', 'api-key': 'API Key' }[d.authMode] || '按服务要求授权');
+    return [d.vendor ? `提供方：${d.vendor}` : '提供方：待核实', auth,
+      local ? '运行于 DSH 主机' : '远程服务',
+      d.id === 'dingtalk' ? '当前桥接仅提供只读工具' : '权限以授权页和工具策略为准'];
+  }
+
   function cardHtml(d) {
     const icon = isImageIcon(d.icon)
       ? `<img src="${esc(d.icon)}" alt="" onerror="this.parentElement.innerHTML='🔌';" />`
@@ -1166,6 +1175,7 @@
       <div class="content">
         <div class="name">${esc(d.name)} ${probe}</div>
         <div class="summary">${esc(d.summary || '')}</div>
+        <div class="hint">${connectionLabels(d).map(esc).join(' · ')}</div>
       </div>
       <div class="actions">${actions}</div>
     </div>`;
@@ -1408,6 +1418,7 @@
     if (!connector) return;
     openModal(`连接 ${connector.name}`, `
       <input id="scope-connector-id" type="hidden" value="${esc(connectorId)}" />
+      <div class="form-note">${connectionLabels(connector).map(esc).join(' · ')}${connector.credentialDescription ? `<p>${esc(connector.credentialDescription)}</p>` : ''}${connectorId === 'dingtalk' ? '<p>尚未登录？请在运行 DSH 的同一系统用户终端执行 <code>npx -y dingtalk-workspace-cli@1.0.61 auth login</code>，完成后点击确认连接。本版本不会自动发起登录；工具注册不代表已获得全部业务权限。</p>' : ''}</div>
       <div class="form-note"><strong>选择连接影响范围</strong>连接配置与凭据仍只保存一份；项目范围会由 Host 在工具可见性和执行层强制隔离。</div>
       ${scopeFieldHtml()}
       <div class="inline-error" id="modal-error" tabindex="-1"></div>
@@ -1571,6 +1582,7 @@
       const r = await call('connect', { connectorId, ...scopeParams }, { timeoutMs });
       setModalBusy(false);
       showToast(r.message, r.ok);
+      if (!r.ok) showModalError(r.message);
       if (r.ok) {
         markCommunityCtaEligible();
         closeModal();
@@ -1881,6 +1893,7 @@
         : (d.connectionLabel || (d.connected?.length ? '已配置' : '未连接'));
       $('#detail-vendor').textContent = d.vendor ? `${d.vendor} · ${initialStateLabel} ${d.connected?.length || 0} 个服务` : `${initialStateLabel} ${d.connected?.length || 0} 个服务`;
       $('#detail-desc').textContent = d.description || d.summary || '';
+      $('#detail-desc').textContent += '\n' + connectionLabels(d).join(' · ');
       detailPrompts = (d.prompts || []).filter((prompt) => prompt?.text || prompt?.title);
       promptPage = 0;
       renderPromptPage();