dingtalk-ask-mcp-server 0.1.2 → 0.1.4

package/README.md

@@ -138,6 +138,7 @@ 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   # 本地切换离开模式

package/dist/daemonClient.js

@@ -6,7 +6,7 @@
  */
 import { request } from 'node:http';
 import { spawn } from 'node:child_process';
-import { openSync, existsSync } from 'node:fs';
+import { openSync, closeSync, existsSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -152,11 +152,22 @@ function resolveDaemonScript() {
  */
 function spawnDaemon(config) {
     const daemonScript = resolveDaemonScript();
-    const logFd = openSync(daemonLogPath(), 'a');
+    // 日志重定向是可选的调试输出：文件被占用/无权限（EPERM）时退回不记日志，绝不因此阻断守护进程拉起。
+    let stdio = ['ignore', 'ignore', 'ignore'];
+    let logFd;
+    let logNote = '无日志(文件不可写)';
+    try {
+        logFd = openSync(daemonLogPath(), 'a');
+        stdio = ['ignore', logFd, logFd];
+        logNote = `日志 ${daemonLogPath()}`;
+    }
+    catch {
+        /* 日志打不开：退回 ignore，仍拉起守护进程 */
+    }
     const child = spawn(process.execPath, [daemonScript], {
         detached: true,
         windowsHide: true,
-        stdio: ['ignore', logFd, logFd],
+        stdio,
         env: {
             ...process.env,
             // 注入解析后的凭证，覆盖可能缺失/过期的 env（支持 CLI 参数来源）。
@@ -168,7 +179,16 @@ function spawnDaemon(config) {
         },
     });
     child.unref();
-    console.error(`已拉起钉钉守护进程（pid=${child.pid ?? '?'}，脚本 ${daemonScript}，日志 ${daemonLogPath()}）。`);
+    // 关闭父进程持有的日志 fd 副本：子进程已继承自己的句柄；不关会泄漏、长期锁住日志文件。
+    if (logFd !== undefined) {
+        try {
+            closeSync(logFd);
+        }
+        catch {
+            /* 忽略 */
+        }
+    }
+    console.error(`已拉起钉钉守护进程（pid=${child.pid ?? '?'}，脚本 ${daemonScript}，${logNote}）。`);
 }
 /**
  * 确保守护进程在跑并就绪，返回其锁（port + token）。

package/dist/installCli.js

@@ -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, inspectMcpJson, inspectSettingsHook, 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,6 +99,7 @@ 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                                               # 查看配置与进程状态');
@@ -201,6 +202,9 @@ function main() {
     if (cmd === 'install') {
         runInstall(rest);
     }
+    else if (cmd === 'uninstall') {
+        runUninstall(rest);
+    }
     else if (cmd === 'daemon') {
         void runDaemon(rest);
     }
@@ -218,7 +222,8 @@ function main() {
     }
 }
 main();
-function runClean() {
+/** 清理运行时状态（停守护进程 + 删锁/离开flag/就绪标记/日志）。clean 与 uninstall 共用。 */
+function cleanRuntime() {
     const tmp = tmpdir();
     // 1. 停守护进程 + 删锁。
     const lock = readDaemonLock(daemonLockPath());
@@ -269,8 +274,60 @@ function runClean() {
     catch {
         /* 忽略 */
     }
+}
+/** clean 子命令：只清运行时状态，不动配置文件。 */
+function runClean() {
+    cleanRuntime();
     console.log('✅ 已清空运行时状态。配置文件(.mcp.json / settings.json / config.toml)未改动。');
 }
+/** 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} 无本工具钩子，跳过`);
+        }
+    }
+    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 会话后彻底生效。');
+}
 /** install 子命令：装 MCP + 钩子。 */
 function runInstall(rest) {
     let config;

package/dist/installConfig.js

@@ -80,6 +80,65 @@ export function inspectSettingsHook(obj) {
     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.2",
+  "version": "0.1.4",
   "description": "Human-in-the-loop MCP server：把 code agent（Claude Code / Codex）的决策与命令审批推送到钉钉，阻塞等你在手机回复。离开电脑也能远程拍板。",
   "keywords": [
     "mcp",