dingtalk-ask-mcp-server 0.1.4 → 0.1.6

package/README.md

@@ -60,15 +60,19 @@ dingtalk-ask install --client-id <AppKey> --client-secret <AppSecret> \
                      [--timeout 1440000] [--host cc|codex|both]
 ```
 
+> **不想记参数?** 在终端直接跑 `dingtalk-ask install`(不带凭证)会进入**交互式向导**,一步步问你 AppKey / AppSecret / robotCode / userId / 宿主(有默认值回车即用)。
+
 它会自动改这些(合并保留既有内容、幂等):
 
 | 宿主 | 改动的文件 | 写入内容 |
 |---|---|---|
-| **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

@@ -14,6 +14,7 @@ import { readFileSync, writeFileSync, mkdirSync, existsSync, copyFileSync, unlin
 import { homedir, tmpdir } from 'node:os';
 import { join, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { createInterface } from 'node:readline/promises';
 import { resolveDingtalkConfig } from './dingtalk/config.js';
 import { mergeArgsIntoEnv } from './cliArgs.js';
 import { packageVersion } from './version.js';
@@ -54,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);
@@ -160,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;
@@ -200,7 +208,7 @@ function main() {
         usage();
     }
     if (cmd === 'install') {
-        runInstall(rest);
+        void runInstall(rest);
     }
     else if (cmd === 'uninstall') {
         runUninstall(rest);
@@ -287,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);
@@ -328,23 +340,75 @@ function runUninstall(rest) {
     cleanRuntime();
     console.log('\n✅ 已卸载。重启 Claude Code / 重开 Codex 会话后彻底生效。');
 }
-/** install 子命令：装 MCP + 钩子。 */
-function runInstall(rest) {
+/** 交互式逐步收集凭证（缺配置时的向导）。返回解析后的 config 与可选 host。 */
+async function promptConfig(env, cwd) {
+    const existing = inspectMcpJson(tolerantJson(join(cwd, '.mcp.json')));
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    try {
+        console.log('未检测到完整凭证，进入交互式配置（直接回车用【中括号】内默认值）：\n');
+        const ask = async (label, def) => {
+            const a = (await rl.question(`  ${label}${def ? ` [${def}]` : ''}: `)).trim();
+            return a || def || '';
+        };
+        const askSecret = async (label, realDef) => {
+            const a = (await rl.question(`  ${label}${realDef ? ` [${mask(realDef)}]` : ''}: `)).trim();
+            return a || realDef || '';
+        };
+        const clientId = await ask('AppKey (client-id)', env.DINGTALK_CLIENT_ID);
+        const clientSecret = await askSecret('AppSecret (client-secret)', env.DINGTALK_CLIENT_SECRET);
+        const robotCode = await ask('机器人 robotCode（一般同 AppKey）', env.DINGTALK_ROBOT_CODE ?? clientId);
+        const userId = await ask('你的钉钉 userId', env.DINGTALK_USER_ID ?? existing.userId);
+        const defaultHost = existsSync(join(homedir(), '.codex')) ? 'both' : 'cc';
+        const hostRaw = await ask('装到哪个宿主 cc/codex/both', defaultHost);
+        const host = hostRaw === 'cc' || hostRaw === 'codex' || hostRaw === 'both' ? hostRaw : undefined;
+        const merged = {
+            ...env,
+            DINGTALK_CLIENT_ID: clientId,
+            DINGTALK_CLIENT_SECRET: clientSecret,
+            DINGTALK_ROBOT_CODE: robotCode || clientId,
+            DINGTALK_USER_ID: userId,
+        };
+        let config;
+        try {
+            config = resolveDingtalkConfig(merged);
+        }
+        catch (error) {
+            console.error(`\n凭证不完整：${error instanceof Error ? error.message : String(error)}`);
+            process.exit(1);
+        }
+        return { config, host };
+    }
+    finally {
+        rl.close();
+    }
+}
+/** install 子命令：装 MCP + 钩子（缺凭证时进交互式向导）。 */
+async function runInstall(rest) {
+    const cwd = process.cwd();
+    const env = mergeArgsIntoEnv(process.env, rest);
     let config;
+    let interactiveHost;
     try {
-        config = resolveDingtalkConfig(mergeArgsIntoEnv(process.env, rest));
+        config = resolveDingtalkConfig(env);
     }
-    catch (error) {
-        console.error(`配置错误：${error instanceof Error ? error.message : String(error)}`);
-        console.error('请用 --client-id / --client-secret / --robot-code / --user-id 提供凭证。');
-        process.exit(1);
+    catch {
+        // 缺凭证：交互式终端 → 逐步引导输入；非交互（管道/CI）→ 报错提示用参数。
+        if (process.stdin.isTTY !== true) {
+            console.error('缺少钉钉凭证。请用 --client-id / --client-secret / --robot-code / --user-id 提供，');
+            console.error('或在交互式终端直接运行 `dingtalk-ask install` 逐步输入。');
+            process.exit(1);
+        }
+        const r = await promptConfig(env, cwd);
+        config = r.config;
+        interactiveHost = r.host;
     }
     const nodePath = process.execPath;
     const indexPath = fileURLToPath(new URL('./index.js', import.meta.url));
-    // 目标宿主：显式 --host 优先；否则 CC 必装，Codex 存在则一并装。
-    const host = parseHost(rest);
+    // 目标宿主：显式 --host 优先，其次交互式选择；否则 CC 必装、Codex 存在则一并装。
+    const host = parseHost(rest) ?? interactiveHost;
     const doCc = host === undefined || host === 'cc' || host === 'both';
     const doCodex = host === 'codex' || host === 'both' || (host === undefined && existsSync(join(homedir(), '.codex')));
+    console.log('');
     if (doCc) {
         installClaudeCode(config, rest, nodePath, indexPath);
     }

package/package.json

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