dingtalk-wiki 1.2.4 → 1.2.6

package/index.js

@@ -510,7 +510,7 @@ class DingTalkClient {
     const url = `${DINGTALK_API_V2}${pathName}`;
 
     try {
-      const response = await axios({
+      const requestConfig = {
         method,
         url,
         headers: {
@@ -522,10 +522,16 @@ class DingTalkClient {
           ...extraParams
         },
         data
-      });
+      };
+      if (pathName.includes('blocks')) {
+        console.error(`[DEBUG] docRequest: ${method} ${url} operatorId=${resolvedOperatorId} extraParams=${JSON.stringify(extraParams)}`);
+      }
+      const response = await axios(requestConfig);
       return response.data;
     } catch (error) {
       if (error.response) {
+        const fullErr = JSON.stringify(error.response.data);
+        console.error(`[DEBUG] docRequest error (${pathName}): status=${error.response.status} data=${fullErr}`);
         throw new Error(`${error.response.data?.message || error.message} (code: ${error.response.data?.code})`);
       }
       throw error;
@@ -850,7 +856,11 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
           properties: {
             doc_key: {
               type: 'string',
-              description: '文档 docKey。wiki nodes 返回的 nodeId 本质是 dentryUuid，可直接用于此处'
+              description: '文档标识。支持 wiki nodes 的 nodeId（dentryUuid）、docKey，或文档 URL。重要：create_wiki_doc 返回的 nodeId 不能用于内容读写，请使用 docKey 或 dentryUuid。若传入 create 的 nodeId，需额外提供 workspace_id 以自动查找'
+            },
+            workspace_id: {
+              type: 'string',
+              description: '知识库 ID（可选）。当 doc_key 来自 create_wiki_doc 返回的 nodeId 时，提供此参数可自动查找正确的 dentryUuid'
             },
             operator_id: {
               type: 'string',
@@ -868,12 +878,16 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
           properties: {
             doc_key: {
               type: 'string',
-              description: '文档 docKey。wiki nodes 返回的 nodeId 本质是 dentryUuid，可直接用于此处'
+              description: '文档标识。支持 wiki nodes 的 nodeId（dentryUuid）、docKey，或文档 URL。重要：create_wiki_doc 返回的 nodeId 不能用于内容读写，请使用 docKey 或 dentryUuid。若传入 create 的 nodeId，需额外提供 workspace_id 以自动查找'
             },
             content: {
               type: 'string',
               description: '要写入的 Markdown 内容'
             },
+            workspace_id: {
+              type: 'string',
+              description: '知识库 ID（可选）。当 doc_key 来自 create_wiki_doc 返回的 nodeId 时，提供此参数可自动查找正确的 dentryUuid'
+            },
             operator_id: {
               type: 'string',
               description: '操作者 unionid（不传则使用默认用户）'
@@ -1144,6 +1158,38 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
   };
 });
 
+async function resolveDocKey(docKey, operatorId, dingtalkInstance) {
+  const rawInput = docKey;
+
+  // 从 URL 中提取 ID
+  const urlMatch = String(docKey).match(/\/i\/nodes\/([^\/\?#]+)/);
+  docKey = urlMatch ? urlMatch[1] : docKey;
+  console.error(`[DEBUG] resolveDocKey: rawInput=${rawInput}, extracted=${docKey}`);
+
+  try {
+    const nodeInfo = await dingtalkInstance.docRequest('GET', `/v2.0/wiki/nodes/${docKey}`, { operatorId });
+    const node = nodeInfo.node || nodeInfo;
+    console.error(`[DEBUG] resolveDocKey: wiki/nodes response keys=${Object.keys(node).join(',')}`);
+
+    // wiki/nodes 的 nodeId = dentryUuid，直接可用
+    // 但 node.document.docKey 可能是不同的值，优先使用
+    if (node.document?.docKey) {
+      console.error(`[DEBUG] resolveDocKey: found document.docKey=${node.document.docKey}`);
+      return node.document.docKey;
+    }
+    // 部分响应直接把 docKey 放在顶层
+    if (node.docKey) {
+      console.error(`[DEBUG] resolveDocKey: found top-level docKey=${node.docKey}`);
+      return node.docKey;
+    }
+    console.error(`[DEBUG] resolveDocKey: no docKey in response, returning raw docKey=${docKey}`);
+  } catch (e) {
+    console.error(`[DEBUG] resolveDocKey: wiki/nodes failed: ${e.message}`);
+  }
+
+  return docKey;
+}
+
 // 工具调用处理
 server.setRequestHandler(CallToolRequestSchema, async (request) => {
   const { name, arguments: args } = request.params;
@@ -1297,11 +1343,14 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             '',
             `${typeIcon} ${name}`,
             `🗂️ 类型: ${doc_type}`,
-            `🆔 Node ID: ${doc.nodeId}`
+            `🆔 Node ID: ${doc.nodeId}`,
           ];
 
           if (doc.docKey) {
-            lines.push(`🔑 DocKey: ${doc.docKey}`);
+            lines.push(`🔑 DocKey（用于内容读写）: ${doc.docKey}`);
+          }
+          if (doc.dentryUuid) {
+            lines.push(`📄 dentryUuid（用于内容读写）: ${doc.dentryUuid}`);
           }
           if (doc.url) {
             lines.push(`🔗 链接: ${doc.url}`);
@@ -1319,8 +1368,10 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
               url: doc.url || '',
               type: doc_type,
             });
-            if (args.content && doc.nodeId) {
-              dingtalk.docRequest('POST', `/v1.0/doc/suites/documents/${doc.nodeId}/overwriteContent`, {
+            const contentId = doc.docKey || doc.dentryUuid || doc.nodeId;
+            if (args.content && contentId) {
+              dingtalk.docRequest('POST', `/v1.0/doc/suites/documents/${contentId}/overwriteContent`, {
+                operatorId: opId,
                 data: { content: args.content, contentType: 'markdown' }
               }).catch(() => {});
             }
@@ -1557,20 +1608,31 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       }
 
       case 'get_wiki_doc_content': {
-        const { doc_key: docKey, operator_id } = args;
+        const { doc_key: docKey, workspace_id: workspaceId, operator_id } = args;
         if (operator_id) {
           dingtalk.setOperatorId(operator_id);
         }
 
-        // nodeId 可能不等于 docKey，先尝试解析
-        let realDocKey = docKey;
-        try {
-          const nodeInfo = await dingtalk.docRequest('GET', `/v2.0/wiki/nodes/${docKey}`, { operatorId: operator_id || null });
-          if (nodeInfo.document?.docKey) {
-            realDocKey = nodeInfo.document.docKey;
-          }
-        } catch (e) { /* 非 nodeId，直接用原始值 */ }
+        let realDocKey = await resolveDocKey(docKey, operator_id || null, dingtalk);
+        console.error(`[DEBUG] get_wiki_doc_content: input=${docKey}, resolved=${realDocKey}`);
+
+        // 如果 resolve 后值没变（可能是 create 返回的 nodeId），尝试搜索 API 查找
+        if (realDocKey === docKey && workspaceId) {
+          try {
+            const searchRes = await dingtalk.docRequest('GET', `/v1.0/doc/docs`, {
+              operatorId: operator_id || null,
+              extraParams: { workspaceId, keyword: '', maxResults: 50 }
+            });
+            const docs = searchRes.docs || [];
+            const matched = docs.find(d => d.nodeBO?.nodeId === docKey || d.nodeBO?.nodeId === realDocKey) || docs[0];
+            if (matched?.nodeBO?.nodeId) {
+              realDocKey = matched.nodeBO.nodeId;
+              console.error(`[DEBUG] get_wiki_doc_content: search fallback resolved to ${realDocKey}`);
+            }
+          } catch (e) { console.error(`[DEBUG] get_wiki_doc_content: search fallback failed: ${e.message}`); }
+        }
 
+        console.error(`[DEBUG] get_wiki_doc_content: calling blocks API with docKey=${realDocKey}`);
         const result = await dingtalk.docRequest('GET', `/v1.0/doc/suites/documents/${realDocKey}/blocks`, { operatorId: operator_id || null });
         const blocks = result.result?.data || [];
         let output = '';
@@ -1590,19 +1652,26 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       }
 
       case 'update_wiki_doc_content': {
-        const { doc_key: docKey, content, operator_id } = args;
+        const { doc_key: docKey, content, workspace_id: workspaceId, operator_id } = args;
         if (operator_id) {
           dingtalk.setOperatorId(operator_id);
         }
 
-        // nodeId 可能不等于 docKey，先尝试解析
-        let realDocKey = docKey;
-        try {
-          const nodeInfo = await dingtalk.docRequest('GET', `/v2.0/wiki/nodes/${docKey}`, { operatorId: operator_id || null });
-          if (nodeInfo.document?.docKey) {
-            realDocKey = nodeInfo.document.docKey;
-          }
-        } catch (e) { /* 非 nodeId，直接用原始值 */ }
+        let realDocKey = await resolveDocKey(docKey, operator_id || null, dingtalk);
+
+        if (realDocKey === docKey && workspaceId) {
+          try {
+            const searchRes = await dingtalk.docRequest('GET', `/v1.0/doc/docs`, {
+              operatorId: operator_id || null,
+              extraParams: { workspaceId, keyword: '', maxResults: 50 }
+            });
+            const docs = searchRes.docs || [];
+            const matched = docs.find(d => d.nodeBO?.nodeId === docKey || d.nodeBO?.nodeId === realDocKey) || docs[0];
+            if (matched?.nodeBO?.nodeId) {
+              realDocKey = matched.nodeBO.nodeId;
+            }
+          } catch (e) { /* ignore */ }
+        }
 
         await dingtalk.docRequest('POST', `/v1.0/doc/suites/documents/${realDocKey}/overwriteContent`, {
           operatorId: operator_id || null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dingtalk-wiki",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "DingTalk Wiki / Docs read-write MCP server that fills the gap left by DingTalk official MCP.",
   "main": "index.js",
   "bin": {