dingtalk-wiki 1.2.17 → 1.2.18

package/index.js

@@ -871,17 +871,17 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
       },
       {
         name: 'get_wiki_doc_content',
-        description: '读取文档正文内容（返回 Block 结构）。注意：仅对 create_wiki_doc 创建的文档有效；知识库中已有文档（非通过此工具创建的）不受支持——钉钉未提供公开 REST API 读取已有知识库文档内容。若需读取已有文档内容，可使用 DingTalk 官方 MCP 服务器的 get_document_content 工具。',
+        description: '读取文档内容。对 .adoc 在线文档使用 blocks API；对上传的 .md 等文件使用存储下载 API（需 Storage.DownloadInfo.Read 权限）。',
         inputSchema: {
           type: 'object',
           properties: {
             doc_key: {
               type: 'string',
-              description: '文档标识。支持 wiki nodes 的 nodeId（dentryUuid）、docKey，或文档 URL。重要：create_wiki_doc 返回的 nodeId 不能用于内容读写，请使用 docKey 或 dentryUuid。若传入 create 的 nodeId，需额外提供 workspace_id 以自动查找'
+              description: '文档标识。支持 nodeId（dentryUuid）、docKey，或文档 URL。'
             },
             workspace_id: {
               type: 'string',
-              description: '知识库 ID（可选）。当 doc_key 来自 create_wiki_doc 返回的 nodeId 时，提供此参数可自动查找正确的 dentryUuid'
+              description: '知识库 ID（可选）。自动通过 wiki/nodes API 解析。'
             },
             operator_id: {
               type: 'string',
@@ -893,13 +893,13 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
       },
       {
         name: 'update_wiki_doc_content',
-        description: '覆写文档正文内容（⚠️ 全量覆盖，不可撤销）。注意：仅对 create_wiki_doc 创建的文档有效；知识库中已有文档（非通过此工具创建的）不受支持。',
+        description: '覆写 .adoc 在线文档正文内容（⚠️ 全量覆盖，不可撤销）。对上传的 .md 等文件不支持修改。',
         inputSchema: {
           type: 'object',
           properties: {
             doc_key: {
               type: 'string',
-              description: '文档标识。支持 wiki nodes 的 nodeId（dentryUuid）、docKey，或文档 URL。重要：create_wiki_doc 返回的 nodeId 不能用于内容读写，请使用 docKey 或 dentryUuid。若传入 create 的 nodeId，需额外提供 workspace_id 以自动查找'
+              description: '文档标识。支持 nodeId（dentryUuid）、docKey，或文档 URL。仅 .adoc 在线文档支持写入。'
             },
             content: {
               type: 'string',
@@ -1192,6 +1192,11 @@ async function resolveDocKey(docKey, operatorId, dingtalkInstance) {
     const node = nodeInfo.node || nodeInfo;
     console.error(`[DEBUG] resolveDocKey: wiki/nodes response keys=${Object.keys(node).join(',')}`);
 
+    // 缓存 workspaceId，供后续 fallback 使用
+    if (node.workspaceId) {
+      dingtalkInstance._resolvedWorkspaceId = node.workspaceId;
+    }
+
     // wiki/nodes 的 nodeId = dentryUuid，直接可用
     // 但 node.document.docKey 可能是不同的值，优先使用
     if (node.document?.docKey) {
@@ -1345,6 +1350,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           });
           
           const doc = response.data;
+          const nodeId = doc.nodeId || doc.id;
           const typeLabels = {
             DOC: '文档',
             WORKBOOK: '表格',
@@ -1364,7 +1370,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             '',
             `${typeIcon} ${name}`,
             `🗂️ 类型: ${doc_type}`,
-            `🆔 Node ID: ${doc.nodeId}`,
+            `🆔 Node ID: ${nodeId}`,
           ];
 
           if (doc.docKey) {
@@ -1381,7 +1387,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           }
 
           setImmediate(() => {
-            wikiIndex.add(doc.nodeId || doc.docKey, {
+            wikiIndex.add(nodeId || doc.docKey, {
               title: name,
               content: args.content || '',
               workspaceId: workspace_id || doc.workspaceId,
@@ -1389,7 +1395,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
               url: doc.url || '',
               type: doc_type,
             });
-            const contentId = doc.docKey || doc.dentryUuid || doc.nodeId;
+            const contentId = doc.docKey || doc.dentryUuid || nodeId;
             if (args.content && contentId) {
               dingtalk.docRequest('POST', `/v1.0/doc/suites/documents/${contentId}/overwriteContent`, {
                 operatorId: opId,
@@ -1444,7 +1450,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         const result = await dingtalk.docRequest('GET', `/v2.0/wiki/nodes/${node_id}`, {
           operatorId: operator_id || null
         });
-        const node = result;
+        const node = result.node || result;
         let output = `📄 节点详情\n\n`;
         output += `名称: ${node.name || '-'}\n`;
         output += `ID: ${node.id || node.nodeId || '-'}\n`;
@@ -1506,7 +1512,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
               for (const child of children) {
                 const name = child.name || '';
                 if (name.includes(keyword)) {
-                  matchedNodes.push({ name, nodeId: child.dentryId || child.nodeId || child.id, workspaceId: ws.workspaceId, workspaceName: ws.name, type: child.contentType === 'folder' ? '文件夹' : '文档', url: child.url || '' });
+                  matchedNodes.push({ name, nodeId: child.dentryUuid || child.dentryId || child.nodeId || child.id, workspaceId: ws.workspaceId, workspaceName: ws.name, type: child.contentType === 'folder' ? '文件夹' : '文档', url: child.url || '' });
                 }
                 const childId = child.dentryId || child.nodeId || child.id;
                 if (child.hasChildren && childId && !visited.has(childId)) queue.push(childId);
@@ -1562,6 +1568,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           const icon = item.type === 'FOLDER' || item.type === 'folder' ? '📁' : '📄';
           output += `${i + 1}. ${icon} ${item.title}\n`;
           output += `   知识库: ${item.workspaceName} (${item.workspaceId})\n`;
+          output += `   Node ID: ${item.id}\n`;
           output += `   匹配度: ${(item.score * 100).toFixed(0)}%\n`;
           if (item.url) output += `   链接: ${item.url}\n`;
           if (item.content) {
@@ -1633,10 +1640,13 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         if (operator_id) {
           dingtalk.setOperatorId(operator_id);
         }
+        dingtalk._resolvedWorkspaceId = null;
 
         let realDocKey = await resolveDocKey(docKey, operator_id || null, dingtalk);
         console.error(`[DEBUG] get_wiki_doc_content: input=${docKey}, resolved=${realDocKey}`);
 
+        const effectiveWsId = workspaceId || dingtalk._resolvedWorkspaceId;
+
         // 尝试 blocks API 读取 .adoc 在线文档内容
         try {
           const result = await dingtalk.docRequest('GET', `/v1.0/doc/suites/documents/${realDocKey}/blocks`, { operatorId: operator_id || null });
@@ -1659,7 +1669,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           const isDocKeyIllegal = blocksErr.message.includes('doc key is illegal');
 
           // Fallback: 尝试存储 v1.0 下载 API（对上传的 .md 等文件有效）
-          if (isDocKeyIllegal && workspaceId) {
+          if (isDocKeyIllegal && effectiveWsId) {
             try {
               const token = await dingtalk.getAccessToken();
               const opId = await dingtalk.resolveOperatorId(operator_id || null);
@@ -1678,7 +1688,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                   if (parentId) dirParams.dentryId = parentId;
                   const dirRes = await axios({
                     method: 'GET',
-                    url: `${DINGTALK_API_V2}/v2.0/doc/spaces/${workspaceId}/directories`,
+                    url: `${DINGTALK_API_V2}/v2.0/doc/spaces/${effectiveWsId}/directories`,
                     headers: { 'x-acs-dingtalk-access-token': token },
                     params: dirParams
                   });
@@ -1722,7 +1732,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           let hint = '';
           if (isDocKeyIllegal) {
             hint = `\n\n原因: 此文档不是 .adoc 在线文档，blocks API 无法读取。`;
-            if (workspaceId) {
+            if (effectiveWsId) {
               hint += `\n已尝试存储 v1.0 下载 API 但仍失败（需开通 Storage.DownloadInfo.Read 权限）。`;
             } else {
               hint += `\n请提供 workspace_id 以尝试存储 v1.0 下载 API。`;
@@ -1731,7 +1741,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           return {
             content: [{
               type: 'text',
-              text: `❌ 读取文档内容失败\n错误: ${blocksErr.message}${hint}\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: ${effectiveWsId || '未提供'}\n- operator_id: ${operator_id || '未提供（将自动解析）'}`
             }],
             isError: true
           };

package/package.json

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