dingtalk-ask-mcp-server 0.1.5 → 0.1.6

package/README.md

@@ -66,11 +66,13 @@ dingtalk-ask install --client-id <AppKey> --client-secret <AppSecret> \
 
 | 宿主 | 改动的文件 | 写入内容 |
 |---|---|---|
-| **Claude Code** | `<当前目录>/.mcp.json` | `mcpServers.dingtalk-ask`(服务 + 凭证 env) |
-| | `<当前目录>/.claude/settings.json`(`--global` 则 `~/.claude/settings.json`) | `PermissionRequest` 钩子 + `env.MCP_TOOL_TIMEOUT` |
+| **Claude Code**(项目级) | `<当前目录>/.mcp.json` | `mcpServers.dingtalk-ask`(服务 + 凭证 env) |
+| | `<当前目录>/.claude/settings.json` | `PermissionRequest` 钩子 + `env.MCP_TOOL_TIMEOUT` |
+| **Claude Code**(`--global`·所有项目) | `~/.claude.json`(先备份 `.bak`) | `mcpServers.dingtalk-ask` |
+| | `~/.claude/settings.json` | 钩子 + `MCP_TOOL_TIMEOUT` |
 | **Codex** | `~/.codex/config.toml` | `[mcp_servers.dingtalk-ask]`(含 `tool_timeout_sec=1500` + 凭证,先备份 `.bak`) |
 
-默认 **CC 必装,检测到 `~/.codex` 时 Codex 一并装**。装完**重启 Claude Code / 重开 Codex 会话**生效。
+默认 **CC 必装,检测到 `~/.codex` 时 Codex 一并装**。CC 默认写**项目级**(只对当前项目生效);加 **`--global`** 写**用户级**,免每个项目各装一次(合并保留你其它 MCP server)。装完**重启 Claude Code / 重开 Codex 会话**生效。
 
 ### 方式 B:手动接入(想自己控制时)
 

package/dist/installCli.js

@@ -55,17 +55,22 @@ function writeJson(path, obj) {
     mkdirSync(dirname(path), { recursive: true });
     writeFileSync(path, `${JSON.stringify(obj, null, 2)}\n`, 'utf8');
 }
-/** 装 Claude Code：.mcp.json（MCP server）+ .claude/settings.json（钩子 + MCP_TOOL_TIMEOUT）。 */
+/** 装 Claude Code：MCP server（项目 .mcp.json 或 --global 用户级 ~/.claude.json）+ 钩子 + MCP_TOOL_TIMEOUT。 */
 function installClaudeCode(config, argv, nodePath, indexPath) {
     const cwd = process.cwd();
-    // 1. .mcp.json
-    const mcpPath = join(cwd, '.mcp.json');
+    const global = argv.includes('--global');
+    // 1. MCP server：--global 写 ~/.claude.json（用户级，所有项目可见），否则项目 .mcp.json。
+    const mcpPath = global ? join(homedir(), '.claude.json') : join(cwd, '.mcp.json');
     const entry = buildMcpEntry(config, nodePath, indexPath);
-    const { settings: mcpMerged, existed } = mergeMcpServers(readJson(mcpPath), MCP_SERVER_NAME, entry);
+    const before = readJson(mcpPath); // 解析失败会抛错中止，绝不覆盖（保护 ~/.claude.json）。
+    const { settings: mcpMerged, existed } = mergeMcpServers(before, MCP_SERVER_NAME, entry);
+    if (global && existsSync(mcpPath)) {
+        copyFileSync(mcpPath, `${mcpPath}.bak`);
+    }
     writeJson(mcpPath, mcpMerged);
-    console.log(`✅ [CC] ${existed ? '更新' : '写入'} MCP server 到 ${mcpPath}`);
-    // 2. .claude/settings.json：钩子 + MCP_TOOL_TIMEOUT（略大于 ask 超时）
-    const settingsPath = resolveSettingsPath(argv.includes('--global') ? ['--global'] : [], cwd, homedir());
+    console.log(`✅ [CC] ${existed ? '更新' : '写入'} MCP server 到 ${mcpPath}${global ? '（用户级·所有项目可见，已备份 .bak）' : ''}`);
+    // 2. .claude/settings.json：钩子 + MCP_TOOL_TIMEOUT（略大于 ask 超时）。
+    const settingsPath = resolveSettingsPath(global ? ['--global'] : [], cwd, homedir());
     const command = `node "${permissionHookPath()}"`;
     const hookMerged = mergeHook(readJson(settingsPath), command);
     const tmMerged = ensureMcpToolTimeout(hookMerged.settings, config.timeoutMs + 60_000);
@@ -161,6 +166,8 @@ async function runInfo() {
     console.log('\n【配置 · Claude Code】');
     const mcp = inspectMcpJson(tolerantJson(join(cwd, '.mcp.json')));
     console.log(`  .mcp.json (${cwd})：${mcp.configured ? `✅ 已配（command=${mcp.command ?? '?'}, userId=${mask(mcp.userId)}）` : '❌ 未配'}`);
+    const userMcp = inspectMcpJson(tolerantJson(join(homedir(), '.claude.json')));
+    console.log(`  用户级 ~/.claude.json：${userMcp.configured ? `✅ 已配（所有项目可见，userId=${mask(userMcp.userId)}）` : '❌ 未配'}`);
     const projSettings = inspectSettingsHook(tolerantJson(join(cwd, '.claude', 'settings.json')));
     // MCP_TOOL_TIMEOUT 可能在 settings.json 或 settings.local.json，两处都看。
     const localTimeout = inspectSettingsHook(tolerantJson(join(cwd, '.claude', 'settings.local.json'))).mcpToolTimeout;
@@ -288,16 +295,20 @@ function runUninstall(rest) {
     const doCc = host === undefined || host === 'cc' || host === 'both';
     const doCodex = host === 'codex' || host === 'both' || (host === undefined && existsSync(join(homedir(), '.codex')));
     if (doCc) {
-        const mcpPath = join(cwd, '.mcp.json');
+        const global = rest.includes('--global');
+        const mcpPath = global ? join(homedir(), '.claude.json') : join(cwd, '.mcp.json');
         const mcp = removeMcpServer(tolerantJson(mcpPath), MCP_SERVER_NAME);
         if (mcp.removed) {
+            if (global && existsSync(mcpPath)) {
+                copyFileSync(mcpPath, `${mcpPath}.bak`);
+            }
             writeJson(mcpPath, mcp.settings);
-            console.log(`· [CC] 从 ${mcpPath} 移除 MCP server`);
+            console.log(`· [CC] 从 ${mcpPath} 移除 MCP server${global ? '（已备份 .bak）' : ''}`);
         }
         else {
             console.log(`· [CC] ${mcpPath} 无 dingtalk-ask，跳过`);
         }
-        const settingsPath = resolveSettingsPath(rest.includes('--global') ? ['--global'] : [], cwd, homedir());
+        const settingsPath = resolveSettingsPath(global ? ['--global'] : [], cwd, homedir());
         const hookRes = removeHook(tolerantJson(settingsPath));
         if (hookRes.removed) {
             writeJson(settingsPath, hookRes.settings);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dingtalk-ask-mcp-server",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Human-in-the-loop MCP server：把 code agent（Claude Code / Codex）的决策与命令审批推送到钉钉，阻塞等你在手机回复。离开电脑也能远程拍板。",
   "keywords": [
     "mcp",