dingtalk-ask-mcp-server 0.1.1 → 0.1.3

package/README.md

@@ -138,6 +138,8 @@ Codex 若 `approval_policy="never"` 本就不弹命令审批,故只提供 `ask_h
 
 ```bash
 dingtalk-ask install …            # 一键接入(见上)
+dingtalk-ask uninstall [--host …] # 一键卸载:删 MCP+钩子(CC/Codex) + 清运行时(config.toml 先备份 .bak)
+dingtalk-ask info                 # 查看配置与进程状态(守护进程/离开模式/各宿主是否配好)
 dingtalk-ask daemon status|stop   # 查看/停止共享守护进程
 dingtalk-ask away on|off|status   # 本地切换离开模式
 dingtalk-ask clean                # 清空运行时状态(守护进程/锁/flag/就绪标记/日志),不动配置文件

package/dist/installCli.js

@@ -10,7 +10,7 @@
  * 写入均为宿主本地配置（.mcp.json / .claude/settings.json / ~/.codex/config.toml，皆不入库），
  * 合并保留既有内容、幂等。纯逻辑在 installConfig.ts / installHookCore.ts。
  */
-import { readFileSync, writeFileSync, mkdirSync, existsSync, copyFileSync, unlinkSync, readdirSync } from 'node:fs';
+import { readFileSync, writeFileSync, mkdirSync, existsSync, copyFileSync, unlinkSync, readdirSync, statSync } from 'node:fs';
 import { homedir, tmpdir } from 'node:os';
 import { join, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -21,7 +21,7 @@ import { mergeHook, permissionHookPath, resolveSettingsPath } from './installHoo
 import { daemonLockPath, readDaemonLock, removeDaemonLock } from './daemon/lock.js';
 import { probeHealth } from './daemonClient.js';
 import { isAway, setAway, awayFlagPath } from './awayState.js';
-import { buildMcpEntry, mergeMcpServers, ensureMcpToolTimeout, codexHasDingtalk, buildCodexBlock, MCP_SERVER_NAME, } from './installConfig.js';
+import { buildMcpEntry, mergeMcpServers, ensureMcpToolTimeout, codexHasDingtalk, buildCodexBlock, inspectMcpJson, inspectSettingsHook, removeMcpServer, removeHook, removeCodexBlock, MCP_SERVER_NAME, } from './installConfig.js';
 /** 解析目标宿主。默认 CC；Codex 见 resolveCodexTarget。 */
 function parseHost(argv) {
     const i = argv.indexOf('--host');
@@ -99,15 +99,131 @@ function usage() {
     console.log('用法：');
     console.log('  dingtalk-ask install --client-id … --client-secret … --robot-code … --user-id … \\');
     console.log('                       [--timeout <ms>] [--host cc|codex|both]   # 一键装 MCP+钩子');
+    console.log('  dingtalk-ask uninstall [--host cc|codex|both]                   # 一键删 MCP+钩子 + 清运行时');
     console.log('  dingtalk-ask daemon <status|stop>                               # 查看/停止共享守护进程');
     console.log('  dingtalk-ask away <on|off|status>                               # 本地切换离开模式');
+    console.log('  dingtalk-ask info                                               # 查看配置与进程状态');
     console.log('  dingtalk-ask clean                                              # 清空运行时状态(守护进程/锁/flag/标记/日志)');
     console.log('  dingtalk-ask -v | --version                                     # 版本');
     console.log('  dingtalk-ask -h | --help                                        # 帮助');
     process.exit(1);
 }
-/** clean 子命令：清空运行时临时状态（不动配置文件）。 */
-function runClean() {
+/** 宽松读 JSON：文件缺失/损坏都返回空对象（info 用，不抛错）。 */
+function tolerantJson(path) {
+    try {
+        return JSON.parse(readFileSync(path, 'utf8'));
+    }
+    catch {
+        return {};
+    }
+}
+/** 轻度掩码（展示 userId 等，不完全暴露）。 */
+function mask(v) {
+    if (v === undefined || v === '') {
+        return '(未知)';
+    }
+    return v.length <= 4 ? '***' : `${v.slice(0, 3)}***${v.slice(-2)}`;
+}
+/** info 子命令：一屏看配置与进程状态。 */
+async function runInfo() {
+    const tmp = tmpdir();
+    const cwd = process.cwd();
+    console.log(`dingtalk-ask v${packageVersion()}`);
+    console.log('\n【进程】');
+    const lock = readDaemonLock(daemonLockPath());
+    if (lock === undefined) {
+        console.log('  守护进程：未运行');
+    }
+    else {
+        const probe = await probeHealth(lock);
+        console.log(`  守护进程：${probe.ok ? '在跑' : '锁存在但无应答'}  port=${lock.port} pid=${lock.pid} 就绪=${probe.ready}`);
+    }
+    console.log(`  离开模式：${isAway() ? '开（推钉钉）' : '关（只在终端）'}`);
+    let greeted = [];
+    try {
+        greeted = readdirSync(tmp)
+            .filter((f) => f.startsWith('dingtalk-greeted-'))
+            .map((f) => f.replace(/^dingtalk-greeted-/, '').replace(/\.flag$/, ''));
+    }
+    catch {
+        /* 忽略 */
+    }
+    console.log(`  已发就绪提示的机器人：${greeted.length > 0 ? greeted.join('、') : '无'}`);
+    const logPath = join(tmp, 'dingtalk-daemon.log');
+    try {
+        const st = statSync(logPath);
+        console.log(`  守护进程日志：${logPath}（${Math.round(st.size / 1024)}KB）`);
+    }
+    catch {
+        console.log('  守护进程日志：无');
+    }
+    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 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;
+    const mcpToolTimeout = projSettings.mcpToolTimeout ?? localTimeout;
+    console.log(`  项目 settings.json：命令审批钩子 ${projSettings.hook ? '✅' : '❌'}` +
+        `，MCP_TOOL_TIMEOUT=${mcpToolTimeout ?? '未设'}`);
+    const userSettings = inspectSettingsHook(tolerantJson(join(homedir(), '.claude', 'settings.json')));
+    console.log(`  用户 settings.json (~)：命令审批钩子 ${userSettings.hook ? '✅' : '❌'}`);
+    console.log('\n【配置 · Codex】');
+    const codexPath = join(homedir(), '.codex', 'config.toml');
+    let codexContent = '';
+    try {
+        codexContent = readFileSync(codexPath, 'utf8');
+    }
+    catch {
+        codexContent = '';
+    }
+    if (codexContent === '') {
+        console.log(`  ${codexPath}：无文件（未用 Codex？）`);
+    }
+    else if (codexHasDingtalk(codexContent)) {
+        const m = /\[mcp_servers\.dingtalk-ask\][\s\S]*?tool_timeout_sec\s*=\s*(\d+)/.exec(codexContent);
+        console.log(`  ${codexPath}：✅ 已配（tool_timeout_sec=${m ? m[1] : '?'}）`);
+    }
+    else {
+        console.log(`  ${codexPath}：❌ 未配 dingtalk-ask`);
+    }
+}
+function main() {
+    const args = process.argv.slice(2);
+    const cmd = args[0];
+    const rest = args.slice(1);
+    if (cmd === '-v' || cmd === '--version') {
+        console.log(packageVersion());
+        return;
+    }
+    if (cmd === '-h' || cmd === '--help') {
+        usage();
+    }
+    if (cmd === 'install') {
+        runInstall(rest);
+    }
+    else if (cmd === 'uninstall') {
+        runUninstall(rest);
+    }
+    else if (cmd === 'daemon') {
+        void runDaemon(rest);
+    }
+    else if (cmd === 'away') {
+        runAway(rest);
+    }
+    else if (cmd === 'info') {
+        void runInfo();
+    }
+    else if (cmd === 'clean') {
+        runClean();
+    }
+    else {
+        usage();
+    }
+}
+main();
+/** 清理运行时状态（停守护进程 + 删锁/离开flag/就绪标记/日志）。clean 与 uninstall 共用。 */
+function cleanRuntime() {
     const tmp = tmpdir();
     // 1. 停守护进程 + 删锁。
     const lock = readDaemonLock(daemonLockPath());
@@ -158,36 +274,60 @@ function runClean() {
     catch {
         /* 忽略 */
     }
+}
+/** clean 子命令：只清运行时状态，不动配置文件。 */
+function runClean() {
+    cleanRuntime();
     console.log('✅ 已清空运行时状态。配置文件(.mcp.json / settings.json / config.toml)未改动。');
 }
-function main() {
-    const args = process.argv.slice(2);
-    const cmd = args[0];
-    const rest = args.slice(1);
-    if (cmd === '-v' || cmd === '--version') {
-        console.log(packageVersion());
-        return;
-    }
-    if (cmd === '-h' || cmd === '--help') {
-        usage();
-    }
-    if (cmd === 'install') {
-        runInstall(rest);
-    }
-    else if (cmd === 'daemon') {
-        void runDaemon(rest);
-    }
-    else if (cmd === 'away') {
-        runAway(rest);
-    }
-    else if (cmd === 'clean') {
-        runClean();
+/** uninstall 子命令：删 MCP + 钩子(CC/Codex) + 清运行时状态（install 的逆操作）。 */
+function runUninstall(rest) {
+    const cwd = process.cwd();
+    const host = parseHost(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 mcp = removeMcpServer(tolerantJson(mcpPath), MCP_SERVER_NAME);
+        if (mcp.removed) {
+            writeJson(mcpPath, mcp.settings);
+            console.log(`· [CC] 从 ${mcpPath} 移除 MCP server`);
+        }
+        else {
+            console.log(`· [CC] ${mcpPath} 无 dingtalk-ask，跳过`);
+        }
+        const settingsPath = resolveSettingsPath(rest.includes('--global') ? ['--global'] : [], cwd, homedir());
+        const hookRes = removeHook(tolerantJson(settingsPath));
+        if (hookRes.removed) {
+            writeJson(settingsPath, hookRes.settings);
+            console.log(`· [CC] 从 ${settingsPath} 移除命令审批钩子（MCP_TOOL_TIMEOUT 保留，可能被其它 MCP 用）`);
+        }
+        else {
+            console.log(`· [CC] ${settingsPath} 无本工具钩子，跳过`);
+        }
     }
-    else {
-        usage();
+    if (doCodex) {
+        const cfgPath = join(homedir(), '.codex', 'config.toml');
+        let content = '';
+        try {
+            content = readFileSync(cfgPath, 'utf8');
+        }
+        catch {
+            content = '';
+        }
+        const res = removeCodexBlock(content);
+        if (res.removed) {
+            copyFileSync(cfgPath, `${cfgPath}.bak`);
+            writeFileSync(cfgPath, res.content, 'utf8');
+            console.log(`· [Codex] 从 ${cfgPath} 移除 [mcp_servers.dingtalk-ask]（已备份 .bak）`);
+        }
+        else {
+            console.log(`· [Codex] ${cfgPath} 无 dingtalk-ask，跳过`);
+        }
     }
+    cleanRuntime();
+    console.log('\n✅ 已卸载。重启 Claude Code / 重开 Codex 会话后彻底生效。');
 }
-main();
 /** install 子命令：装 MCP + 钩子。 */
 function runInstall(rest) {
     let config;

package/dist/installConfig.js

@@ -54,6 +54,91 @@ export function ensureMcpToolTimeout(settings, ms) {
 export function codexHasDingtalk(content) {
     return content.includes(`[mcp_servers.${MCP_SERVER_NAME}]`);
 }
+/** 检查 .mcp.json 是否配了 dingtalk-ask，并抽取 command / userId 供展示（纯函数）。 */
+export function inspectMcpJson(obj) {
+    const servers = obj.mcpServers;
+    const s = servers?.[MCP_SERVER_NAME];
+    if (s === undefined) {
+        return { configured: false };
+    }
+    let userId = s.env?.DINGTALK_USER_ID;
+    if (userId === undefined && Array.isArray(s.args)) {
+        const i = s.args.indexOf('--user-id');
+        if (i >= 0) {
+            userId = s.args[i + 1];
+        }
+    }
+    return { configured: true, command: s.command, userId };
+}
+/** 检查 settings.json 是否装了命令审批钩子、以及 MCP_TOOL_TIMEOUT（纯函数）。 */
+export function inspectSettingsHook(obj) {
+    const hooks = obj.hooks;
+    const list = hooks?.PermissionRequest;
+    const hook = Array.isArray(list) &&
+        list.some((e) => Array.isArray(e.hooks) && e.hooks.some((h) => typeof h.command === 'string' && h.command.includes('permissionHook.js')));
+    const env = obj.env;
+    const t = env?.MCP_TOOL_TIMEOUT;
+    return { hook, mcpToolTimeout: typeof t === 'string' ? t : undefined };
+}
+/** 从 .mcp.json 对象移除某 server（纯函数）。 */
+export function removeMcpServer(obj, name) {
+    const servers = obj.mcpServers;
+    if (servers === undefined || !(name in servers)) {
+        return { settings: obj, removed: false };
+    }
+    const copy = { ...servers };
+    delete copy[name];
+    return { settings: { ...obj, mcpServers: copy }, removed: true };
+}
+/** 从 settings.json 对象移除本工具的命令审批钩子（纯函数，不动 MCP_TOOL_TIMEOUT）。 */
+export function removeHook(obj) {
+    const hooks = obj.hooks;
+    const list = hooks?.PermissionRequest;
+    if (!Array.isArray(list)) {
+        return { settings: obj, removed: false };
+    }
+    const kept = list.filter((e) => !(Array.isArray(e.hooks) && e.hooks.some((h) => typeof h.command === 'string' && h.command.includes('permissionHook.js'))));
+    if (kept.length === list.length) {
+        return { settings: obj, removed: false };
+    }
+    const newHooks = { ...hooks };
+    if (kept.length === 0) {
+        delete newHooks.PermissionRequest;
+    }
+    else {
+        newHooks.PermissionRequest = kept;
+    }
+    return { settings: { ...obj, hooks: newHooks }, removed: true };
+}
+/**
+ * 从 Codex config.toml 文本移除 dingtalk-ask 的两个 section（纯函数）。
+ *
+ * 逐行扫描：遇到 `[mcp_servers.dingtalk-ask]` 或 `[...dingtalk-ask.env]` 段头即进入跳过，
+ * 直到下一个 `[` 段头或文件末尾。
+ *
+ * @param content 原 config.toml 文本。
+ * @returns { content: 移除后文本, removed: 是否有删除 }。
+ */
+export function removeCodexBlock(content) {
+    const lines = content.split('\n');
+    const out = [];
+    let skipping = false;
+    let removed = false;
+    for (const line of lines) {
+        const trimmed = line.trim();
+        if (trimmed.startsWith('[')) {
+            skipping =
+                trimmed.startsWith(`[mcp_servers.${MCP_SERVER_NAME}]`) || trimmed.startsWith(`[mcp_servers.${MCP_SERVER_NAME}.env]`);
+            if (skipping) {
+                removed = true;
+            }
+        }
+        if (!skipping) {
+            out.push(line);
+        }
+    }
+    return { content: out.join('\n'), removed };
+}
 /**
  * 构造 Codex config.toml 追加块（TOML 基本字符串转义，无需 TOML 库）。
  *

package/package.json

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