dingtalk-wiki 1.2.10 → 1.2.12

package/index.js

@@ -872,7 +872,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
       },
       {
         name: 'get_wiki_doc_content',
-        description: '读取文档正文内容（返回 Block 结构，含标题、段落、表格等）',
+        description: '读取文档正文内容（返回 Block 结构）。注意：仅对 create_wiki_doc 创建的文档有效；知识库中已有文档（非通过此工具创建的）不受支持——钉钉未提供公开 REST API 读取已有知识库文档内容。若需读取已有文档内容，可使用 DingTalk 官方 MCP 服务器的 get_document_content 工具。',
         inputSchema: {
           type: 'object',
           properties: {
@@ -894,7 +894,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
       },
       {
         name: 'update_wiki_doc_content',
-        description: '覆写文档正文内容（⚠️ 全量覆盖，不可撤销）',
+        description: '覆写文档正文内容（⚠️ 全量覆盖，不可撤销）。注意：仅对 create_wiki_doc 创建的文档有效；知识库中已有文档（非通过此工具创建的）不受支持。',
         inputSchema: {
           type: 'object',
           properties: {
@@ -1522,6 +1522,159 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           }
         }
 
+        // Step 9: 递归遍历目录树查找文档 + 存储API下载内容
+        if (effectiveWsId) {
+          try {
+            // BFS 遍历目录树查找 dentry
+            let foundDentry = null;
+            let foundSpaceId = null;
+            const queue = [''];
+            const visited = new Set();
+            while (queue.length > 0 && !foundDentry) {
+              const parentId = queue.shift();
+              if (visited.has(parentId)) continue;
+              visited.add(parentId);
+              try {
+                const dirParams = { operatorId: opId, maxResults: 500 };
+                if (parentId) dirParams.dentryId = parentId;
+                const dirRes = await axios({
+                  method: 'GET',
+                  url: `${DINGTALK_API_V2}/v2.0/doc/spaces/${effectiveWsId}/directories`,
+                  headers: { 'x-acs-dingtalk-access-token': token },
+                  params: dirParams
+                });
+                const children = dirRes.data?.children || [];
+                for (const child of children) {
+                  if (child.dentryUuid === input || child.dentryId === input) {
+                    foundDentry = child;
+                    foundSpaceId = child.spaceId;
+                    break;
+                  }
+                  if (child.hasChildren && child.dentryId && !visited.has(child.dentryId)) {
+                    queue.push(child.dentryId);
+                  }
+                }
+              } catch (e) { /* skip */ }
+            }
+
+            if (foundDentry) {
+              steps.push({
+                step: 'BFS 目录遍历找到文档',
+                result: `spaceId=${foundSpaceId}, dentryId=${foundDentry.dentryId}, name=${foundDentry.name}`,
+                raw: foundDentry
+              });
+
+              // 尝试存储 API 获取 dentry 详情（含 docKey）
+              try {
+                const dentryRes = await axios({
+                  method: 'GET',
+                  url: `${DINGTALK_API_V2}/v2.0/storage/spaces/${foundSpaceId}/dentries/${foundDentry.dentryId}`,
+                  headers: { 'x-acs-dingtalk-access-token': token },
+                  params: { operatorId: opId }
+                });
+                steps.push({
+                  step: '存储 API dentry 详情',
+                  result: '成功',
+                  raw: dentryRes.data
+                });
+              } catch (e) {
+                steps.push({
+                  step: '存储 API dentry 详情',
+                  result: '失败',
+                  raw: { message: e.response?.data?.message || e.message, code: e.response?.data?.code || '(无)', status: e.response?.status || '(无)' }
+                });
+              }
+
+              // 尝试存储 API 下载
+              try {
+                const dlRes = await axios({
+                  method: 'POST',
+                  url: `${DINGTALK_API_V2}/v2.0/storage/spaces/${foundSpaceId}/dentries/${foundDentry.dentryId}/downloadInfos/query`,
+                  headers: { 'x-acs-dingtalk-access-token': token, 'Content-Type': 'application/json' },
+                  params: { operatorId: opId },
+                  data: {}
+                });
+                steps.push({
+                  step: '存储 API 获取下载链接',
+                  result: '成功',
+                  raw: dlRes.data
+                });
+                // 尝试从下载链接获取内容
+                const dlInfo = dlRes.data;
+                const downloadUrl = dlInfo.headerSignatureInfo?.resourceUrls?.[0] || dlInfo.downloadUrl || dlInfo.url;
+                if (downloadUrl) {
+                  try {
+                    const contentRes = await axios({ method: 'GET', url: downloadUrl, responseType: 'text' });
+                    steps.push({
+                      step: '存储 API 下载内容',
+                      result: `成功 (${contentRes.data.length} 字符)`,
+                      raw: contentRes.data.slice(0, 500) + (contentRes.data.length > 500 ? '\n... (截断)' : '')
+                    });
+                  } catch (dlErr) {
+                    steps.push({
+                      step: '存储 API 下载内容',
+                      result: '失败',
+                      raw: dlErr.message
+                    });
+                  }
+                }
+              } catch (e) {
+                steps.push({
+                  step: '存储 API 获取下载链接',
+                  result: '失败',
+                  raw: { message: e.response?.data?.message || e.message, code: e.response?.data?.code || '(无)', status: e.response?.status || '(无)' }
+                });
+              }
+            } else {
+              steps.push({ step: 'BFS 目录遍历', result: '未找到匹配（文档可能在深层目录）' });
+            }
+          } catch (e) {
+            steps.push({ step: 'BFS 目录遍历', result: '失败', raw: e.message });
+          }
+        }
+
+        // Step 10: doc_2.0 API - DocContent (direct dentry content read, async returns taskId)
+        try {
+          const docContentRes = await axios({
+            method: 'GET',
+            url: `${DINGTALK_API_V2}/v2.0/doc/dentries/${input}/contents`,
+            headers: { 'x-acs-dingtalk-access-token': token },
+            params: { operatorId: opId }
+          });
+          steps.push({
+            step: 'doc_2.0 DocContent GET /v2.0/doc/dentries/{uuid}/contents',
+            result: '成功',
+            raw: docContentRes.data
+          });
+        } catch (e) {
+          steps.push({
+            step: 'doc_2.0 DocContent GET /v2.0/doc/dentries/{uuid}/contents',
+            result: '失败',
+            raw: { message: e.response?.data?.message || e.message, code: e.response?.data?.code || '(无)', status: e.response?.status || '(无)' }
+          });
+        }
+
+        // Step 11: doc_2.0 API - GetDocContent (another way to get content)
+        try {
+          const getDocContentRes = await axios({
+            method: 'GET',
+            url: `${DINGTALK_API_V2}/v2.0/doc/me/query/${input}/contents`,
+            headers: { 'x-acs-dingtalk-access-token': token },
+            params: { targetFormat: 'markdown' }
+          });
+          steps.push({
+            step: 'doc_2.0 GetDocContent GET /v2.0/doc/me/query/{uuid}/contents',
+            result: '成功',
+            raw: getDocContentRes.data
+          });
+        } catch (e) {
+          steps.push({
+            step: 'doc_2.0 GetDocContent GET /v2.0/doc/me/query/{uuid}/contents',
+            result: '失败',
+            raw: { message: e.response?.data?.message || e.message, code: e.response?.data?.code || '(无)', status: e.response?.status || '(无)' }
+          });
+        }
+
         const lines = ['🔍 docKey 诊断报告', '', `输入: ${input}`, `operatorId: ${opId}`, ''];
         steps.forEach(s => {
           lines.push(`--- ${s.step} ---`);
@@ -1917,10 +2070,15 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             }]
           };
         } catch (blocksErr) {
+          const isDocKeyIllegal = blocksErr.message.includes('doc key is illegal');
+          let hint = '';
+          if (isDocKeyIllegal) {
+            hint = `\n\n原因: 此文档的 dentryUuid 在 Doc Suite API 中无关联 docKey。blocks/overwriteContent\n仅对通过 create_wiki_doc 创建的文档有效。对于知识库中已有文档，钉钉未提供公\n开 REST API 读取内容。可通过 DingTalk 官方 MCP 服务器读取（get_document_content）。`;
+          }
           return {
             content: [{
               type: 'text',
-              text: `❌ blocks API 调用失败\n错误: ${blocksErr.message}\n\n调试信息:\n- 输入 doc_key: ${docKey}\n- 解析后 realDocKey: ${realDocKey}\n- workspaceId: ${workspaceId || '未提供'}\n- operator_id: ${operator_id || '未提供（将自动解析）'}`
+              text: `❌ 读取文档内容失败\n错误: ${blocksErr.message}${hint}\n\n调试信息:\n- 输入 doc_key: ${docKey}\n- 解析后 realDocKey: ${realDocKey}\n- workspaceId: ${workspaceId || '未提供'}\n- operator_id: ${operator_id || '未提供（将自动解析）'}`
             }],
             isError: true
           };
@@ -1949,10 +2107,22 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           } catch (e) { /* ignore */ }
         }
 
-        await dingtalk.docRequest('POST', `/v1.0/doc/suites/documents/${realDocKey}/overwriteContent`, {
-          operatorId: operator_id || null,
-          data: { content, contentType: 'markdown' }
-        });
+        try {
+          await dingtalk.docRequest('POST', `/v1.0/doc/suites/documents/${realDocKey}/overwriteContent`, {
+            operatorId: operator_id || null,
+            data: { content, contentType: 'markdown' }
+          });
+        } catch (e) {
+          const isDocKeyIllegal = e.message.includes('doc key is illegal');
+          let hint = '';
+          if (isDocKeyIllegal) {
+            hint = `\n\n原因: 此文档在 Doc Suite API 中无关联 docKey。overwriteContent 仅对通过 create_wiki_doc 创建的文档有效。`;
+          }
+          return {
+            content: [{ type: 'text', text: `❌ 写入文档内容失败\n${e.message}${hint}` }],
+            isError: true
+          };
+        }
         setImmediate(() => { wikiIndex.update(docKey, { content }); });
         return {
           content: [{ type: 'text', text: '✅ 文档内容已更新' }]

package/package.json

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