dingtalk-wiki 1.2.16 → 1.2.18

package/index.js

@@ -223,7 +223,7 @@ async function rebuildSearchIndex() {
                   method: 'POST',
                   url: `${DINGTALK_API_V2}/v1.0/storage/spaces/${child.spaceId}/dentries/${child.dentryId}/downloadInfos/query`,
                   headers: { 'x-acs-dingtalk-access-token': token, 'Content-Type': 'application/json' },
-                  params: { unionId: await dingtalk.getCurrentUserUnionId() || '' },
+                  params: { unionId: await dingtalk.resolveOperatorId(null) },
                   data: {}
                 });
                 const data = dlRes.data;
@@ -747,28 +747,6 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
           required: ['node_id']
         }
       },
-      {
-        name: 'debug_resolve_doc_key',
-        description: '[调试] 诊断 docKey 解析问题，测试所有可能的 API 路径并返回原始响应',
-        inputSchema: {
-          type: 'object',
-          properties: {
-            doc_key: {
-              type: 'string',
-              description: '文档标识（dentryUuid / docKey / nodeId / URL）'
-            },
-            workspace_id: {
-              type: 'string',
-              description: '知识库 ID（可选）'
-            },
-            operator_id: {
-              type: 'string',
-              description: '操作者 unionid（不传则使用默认用户）'
-            }
-          },
-          required: ['doc_key']
-        }
-      },
       {
         name: 'search_wiki',
         description: '按名称搜索知识库中的文档和文件夹（遍历目录树，无需索引即可使用）',
@@ -893,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',
@@ -915,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',
@@ -1214,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) {
@@ -1329,410 +1312,6 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         };
       }
 
-      case 'debug_resolve_doc_key': {
-        const { doc_key: docKey, workspace_id: workspaceId, operator_id } = args;
-        if (operator_id) {
-          dingtalk.setOperatorId(operator_id);
-        }
-
-        const token = await dingtalk.getAccessToken();
-        const opId = await dingtalk.resolveOperatorId(operator_id || null);
-        const steps = [];
-        const input = String(docKey);
-
-        steps.push({ step: '输入', result: input });
-
-        // Step 1: URL extraction
-        const urlMatch = input.match(/\/i\/nodes\/([^\/\?#]+)/);
-        const urlExtracted = urlMatch ? urlMatch[1] : null;
-        steps.push({ step: 'URL 提取', result: urlExtracted || '无匹配', raw: urlMatch ? urlMatch[0] : null });
-
-        // Step 2: wiki/nodes API
-        let wikiNodeResponse = null;
-        let wikiWsId = null;
-        try {
-          const nodeRes = await axios({
-            method: 'GET',
-            url: `${DINGTALK_API_V2}/v2.0/wiki/nodes/${input}`,
-            headers: { 'x-acs-dingtalk-access-token': token },
-            params: { operatorId: opId }
-          });
-          wikiNodeResponse = nodeRes.data;
-          wikiWsId = wikiNodeResponse.workspaceId || wikiNodeResponse.node?.workspaceId || null;
-          const node = wikiNodeResponse;
-          steps.push({
-            step: 'wiki/nodes API',
-            result: '成功',
-            raw: node
-          });
-        } catch (e) {
-          steps.push({
-            step: 'wiki/nodes API',
-            result: '失败',
-            raw: { message: e.response?.data?.message || e.message, code: e.response?.data?.code || '(无)', status: e.response?.status || '(无)' }
-          });
-        }
-
-        const effectiveWsId = workspaceId || wikiWsId;
-
-        // Step 3: doc metadata API (GET /v1.0/doc/suites/documents/{docKey})
-        try {
-          const metaRes = await axios({
-            method: 'GET',
-            url: `${DINGTALK_API_V2}/v1.0/doc/suites/documents/${input}`,
-            headers: { 'x-acs-dingtalk-access-token': token },
-            params: { operatorId: opId }
-          });
-          steps.push({
-            step: 'doc metadata API (GET /documents/{docKey})',
-            result: '成功',
-            raw: metaRes.data
-          });
-        } catch (e) {
-          steps.push({
-            step: 'doc metadata API (GET /documents/{docKey})',
-            result: '失败',
-            raw: { message: e.response?.data?.message || e.message, code: e.response?.data?.code || '(无)', status: e.response?.status || '(无)' }
-          });
-        }
-
-        // Step 4: blocks API
-        try {
-          const blocksRes = await axios({
-            method: 'GET',
-            url: `${DINGTALK_API_V2}/v1.0/doc/suites/documents/${input}/blocks`,
-            headers: { 'x-acs-dingtalk-access-token': token },
-            params: { operatorId: opId }
-          });
-          const blockCount = blocksRes.data?.result?.data?.length || 0;
-          steps.push({
-            step: 'blocks API',
-            result: `成功 (${blockCount} 个 block)`,
-            raw: blocksRes.data
-          });
-        } catch (e) {
-          steps.push({
-            step: 'blocks API',
-            result: '失败',
-            raw: { message: e.response?.data?.message || e.message, code: e.response?.data?.code || '(无)', status: e.response?.status || '(无)' }
-          });
-        }
-
-        // Step 5: overwriteContent API (test with empty content — don't actually write)
-        try {
-          const overwriteRes = await axios({
-            method: 'POST',
-            url: `${DINGTALK_API_V2}/v1.0/doc/suites/documents/${input}/overwriteContent`,
-            headers: { 'x-acs-dingtalk-access-token': token, 'Content-Type': 'application/json' },
-            params: { operatorId: opId },
-            data: { content: 'test', contentType: 'markdown' }
-          });
-          steps.push({
-            step: 'overwriteContent API',
-            result: '成功（可写入）',
-            raw: overwriteRes.data
-          });
-        } catch (e) {
-          steps.push({
-            step: 'overwriteContent API',
-            result: '失败',
-            raw: { message: e.response?.data?.message || e.message, code: e.response?.data?.code || '(无)', status: e.response?.status || '(无)' }
-          });
-        }
-
-        // Step 6: search docs API (v1.0/doc/docs) — 需要 workspaceId + keyword
-        if (effectiveWsId) {
-          // Try without keyword first (might list all)
-          try {
-            const searchRes = await axios({
-              method: 'GET',
-              url: `${DINGTALK_API_V2}/v1.0/doc/docs`,
-              headers: { 'x-acs-dingtalk-access-token': token },
-              params: { operatorId: opId, workspaceId: effectiveWsId, maxResults: 50 }
-            });
-            const docs = searchRes.data?.docs || [];
-            const matched = docs.find(d => d.nodeBO?.nodeId === input || d.nodeBO?.dentryUuid === input || d.docKey === input || d.nodeBO?.dentryId === input);
-            steps.push({
-              step: `doc search API (workspace=${effectiveWsId}, no keyword)`,
-              result: `成功 (${docs.length} 篇文档)` + (matched ? ', 找到匹配!' : ', 未找到匹配'),
-              raw: docs.length > 0 ? { count: docs.length, firstDocDocKey: docs[0]?.docKey || '(无)', firstDocNodeId: docs[0]?.nodeBO?.nodeId || '(无)', firstDocName: docs[0]?.name || '(无)' } : '空结果'
-            });
-          } catch (e) {
-            steps.push({
-              step: `doc search API (workspace=${effectiveWsId}, no keyword)`,
-              result: '失败',
-              raw: { message: e.response?.data?.message || e.message, code: e.response?.data?.code || '(无)', status: e.response?.status || '(无)' }
-            });
-          }
-          // Try with keyword from wiki/nodes name if available
-          const wikiName = wikiNodeResponse?.node?.name || wikiNodeResponse?.name || '';
-          if (wikiName) {
-            try {
-              const searchRes = await axios({
-                method: 'GET',
-                url: `${DINGTALK_API_V2}/v1.0/doc/docs`,
-                headers: { 'x-acs-dingtalk-access-token': token },
-                params: { operatorId: opId, workspaceId: effectiveWsId, keyword: wikiName.replace(/\.\w+$/, ''), maxResults: 10 }
-              });
-              const docs = searchRes.data?.docs || [];
-              steps.push({
-                step: `doc search API (keyword="${wikiName}")`,
-                result: `成功 (${docs.length} 篇)`,
-                raw: docs.length > 0 ? docs.map(d => ({ docKey: d.docKey || '(无)', name: d.name || '(无)', nodeId: d.nodeBO?.nodeId || '(无)', dentryUuid: d.nodeBO?.dentryUuid || '(无)' })) : '空结果'
-              });
-            } catch (e) {
-              steps.push({
-                step: `doc search API (keyword="${wikiName}")`,
-                result: '失败',
-                raw: { message: e.response?.data?.message || e.message, code: e.response?.data?.code || '(无)', status: e.response?.status || '(无)' }
-              });
-            }
-          }
-        } else {
-          steps.push({ step: 'doc search API', result: '跳过（无法获取 workspace_id）' });
-        }
-
-        // Step 7: 在知识库目录中查找此节点 + 查看是否有 docKey 字段
-        if (effectiveWsId) {
-          try {
-            const dirRes = await axios({
-              method: 'GET',
-              url: `${DINGTALK_API_V2}/v2.0/doc/spaces/${effectiveWsId}/directories`,
-              headers: { 'x-acs-dingtalk-access-token': token },
-              params: { operatorId: opId, maxResults: 500 }
-            });
-            const children = dirRes.data?.children || [];
-            const match = children.find(c => c.dentryUuid === input || c.dentryId === input || c.id === input);
-            // Show first few children's available fields so user can see what fields exist
-            const sampleKeys = children.length > 0 ? Object.keys(children[0]) : [];
-            steps.push({
-              step: `知识库目录 (workspace=${effectiveWsId})`,
-              result: `${children.length} 个子节点` + (match ? ', 找到匹配!' : ', 未找到匹配'),
-              raw: match ? match : { sampleFields: sampleKeys, firstChildSample: children[0] || null }
-            });
-          } catch (e) {
-            steps.push({
-              step: `知识库目录 (workspace=${effectiveWsId})`,
-              result: '失败',
-              raw: { message: e.response?.data?.message || e.message, code: e.response?.data?.code || '(无)', status: e.response?.status || '(无)' }
-            });
-          }
-        }
-
-        // Step 8: 用 workspaceId 再次尝试 overwriteContent（确认文档套件是否完全不可用）
-        if (effectiveWsId) {
-          try {
-            const overwriteRes = await axios({
-              method: 'POST',
-              url: `${DINGTALK_API_V2}/v1.0/doc/suites/documents/${input}/overwriteContent`,
-              headers: { 'x-acs-dingtalk-access-token': token, 'Content-Type': 'application/json' },
-              params: { operatorId: opId },
-              data: { content: 'test', contentType: 'markdown' }
-            });
-            steps.push({
-              step: 'overwriteContent（带 workspaceId）',
-              result: '成功',
-              raw: overwriteRes.data
-            });
-          } catch (e) {
-            steps.push({
-              step: 'overwriteContent（带 workspaceId）',
-              result: '失败',
-              raw: { message: e.response?.data?.message || e.message, code: e.response?.data?.code || '(无)', status: e.response?.status || '(无)' }
-            });
-          }
-        }
-
-        // Step 9: 递归遍历目录树查找文档 + 存储API下载内容
-        let foundDentry = null;
-        let foundSpaceId = null;
-        if (effectiveWsId) {
-          try {
-            // BFS 遍历目录树查找 dentry
-            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: 存储 API v1.0 - 文件下载（.md 文件内容 = 文件下载）
-        if (foundSpaceId) {
-          try {
-            const dlRes = await axios({
-              method: 'POST',
-              url: `${DINGTALK_API_V2}/v1.0/storage/spaces/${foundSpaceId}/dentries/${foundDentry.dentryId}/downloadInfos/query`,
-              headers: { 'x-acs-dingtalk-access-token': token, 'Content-Type': 'application/json' },
-              params: { unionId: opId },
-              data: {}
-            });
-            const data = dlRes.data;
-            steps.push({
-              step: '存储 v1.0 获取下载链接 (POST /v1.0/storage/spaces/{sid}/dentries/{did}/downloadInfos/query)',
-              result: '成功',
-              raw: data
-            });
-            // 如果有下载链接，尝试下载内容
-            const downloadUrl = data.downloadInfo?.resourceUrl || data.resourceUrl || data.downloadUrl || data.url;
-            const downloadHeaders = data.downloadInfo?.headers || data.headers || {};
-            if (downloadUrl) {
-              try {
-                const contentRes = await axios({ method: 'GET', url: downloadUrl, headers: downloadHeaders, responseType: 'text' });
-                steps.push({
-                  step: '文件内容下载',
-                  result: `成功 (${contentRes.data.length} 字符)`,
-                  raw: contentRes.data.slice(0, 1000) + (contentRes.data.length > 1000 ? '\n...(截断)' : '')
-                });
-              } catch (dlErr) {
-                steps.push({ step: '文件内容下载', result: '失败', raw: dlErr.message });
-              }
-            }
-          } catch (e) {
-            steps.push({
-              step: '存储 v1.0 获取下载链接',
-              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} ---`);
-          lines.push(`结果: ${s.result}`);
-          if (s.raw) {
-            lines.push(`详情: ${JSON.stringify(s.raw, null, 2)}`);
-          }
-          lines.push('');
-        });
-        const isAdoc = foundDentry?.name?.endsWith('.adoc') || input.length > 20;
-        lines.push('💡 诊断结论:');
-        lines.push(`   输入 ID: ${input}`);
-        lines.push(`   操作者: ${opId}`);
-        lines.push('');
-        if (foundDentry) {
-          lines.push(`   文档名: ${foundDentry.name}`);
-          lines.push(`   类型推断: ${foundDentry.name?.endsWith('.adoc') ? '✅ .adoc 在线文档（可读写）' : foundDentry.name?.match(/\.(md|docx|xlsx|txt|xmind|mark|markdown)$/i) ? '❌ 导入的文档（非原生. adoc，内容 API 不支持）' : '⚠️ 未知类型'}`);
-        }
-        lines.push('');
-        lines.push('   1️⃣ wiki/nodes API → ✅ 成功。节点存在');
-        lines.push(`   2️⃣ blocks API → ${foundDentry?.name?.endsWith('.adoc') ? '✅ 应对 .adoc 在线文档有效' : '❌ "doc key is illegal"（非 .adoc 文档无 docKey）'}`);
-        lines.push(`   3️⃣ overwriteContent → ${foundDentry?.name?.endsWith('.adoc') ? '✅ 应对 .adoc 在线文档有效' : '❌ 同上错误'}`);
-        lines.push('   4️⃣ doc metadata → ❌ 404（该端点不存在）');
-        lines.push('');
-        lines.push('📌 关键区别：');
-        lines.push('   - 知识库"导入为在线文档" → 转为 .adoc → 有 docKey → blocks API 可读写');
-        lines.push('   - "上传文件" → 保持原格式 → 无 docKey → blocks API 不可用');
-        lines.push('   - create_wiki_doc 创建的是 .adoc 在线文档 → blocks API 可读写');
-        lines.push('');
-        lines.push('📌 存储 v1.0 下载 API (POST /v1.0/storage/spaces/{sid}/dentries/{did}/downloadInfos/query)');
-        lines.push('   使用 unionId 参数，可获取上传文件的下载链接');
-        lines.push('📌 DocContent API (GET /v2.0/doc/dentries/{uuid}/contents) 此前 503');
-        lines.push('📌 请重新运行此工具测试以上 API');
-
-        return { content: [{ type: 'text', text: lines.join('\n') }] };
-      }
-
       case 'create_wiki_doc': {
         const { workspace_id, parent_node_id, name, doc_type = 'DOC', operator_id } = args;
         if (operator_id) {
@@ -1771,6 +1350,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           });
           
           const doc = response.data;
+          const nodeId = doc.nodeId || doc.id;
           const typeLabels = {
             DOC: '文档',
             WORKBOOK: '表格',
@@ -1790,7 +1370,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             '',
             `${typeIcon} ${name}`,
             `🗂️ 类型: ${doc_type}`,
-            `🆔 Node ID: ${doc.nodeId}`,
+            `🆔 Node ID: ${nodeId}`,
           ];
 
           if (doc.docKey) {
@@ -1807,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,
@@ -1815,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,
@@ -1870,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`;
@@ -1932,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);
@@ -1988,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) {
@@ -2059,26 +1640,14 @@ 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}`);
 
-        // 如果 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}`); }
-        }
+        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 });
           const blocks = result.result?.data || [];
@@ -2100,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);
@@ -2119,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
                   });
@@ -2163,14 +1732,16 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           let hint = '';
           if (isDocKeyIllegal) {
             hint = `\n\n原因: 此文档不是 .adoc 在线文档，blocks API 无法读取。`;
-            if (workspaceId) {
-              hint += `\n已尝试存储 v1.0 下载 API 但仍失败。`;
+            if (effectiveWsId) {
+              hint += `\n已尝试存储 v1.0 下载 API 但仍失败（需开通 Storage.DownloadInfo.Read 权限）。`;
+            } else {
+              hint += `\n请提供 workspace_id 以尝试存储 v1.0 下载 API。`;
             }
           }
           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
           };
@@ -2185,20 +1756,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
 
         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 */ }
-        }
-
+        // 尝试 overwriteContent API 写入 .adoc 在线文档内容
         try {
           await dingtalk.docRequest('POST', `/v1.0/doc/suites/documents/${realDocKey}/overwriteContent`, {
             operatorId: operator_id || null,
@@ -2208,7 +1766,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           const isDocKeyIllegal = e.message.includes('doc key is illegal');
           let hint = '';
           if (isDocKeyIllegal) {
-            hint = `\n\n原因: 此文档在 Doc Suite API 中无关联 docKey。overwriteContent 仅对通过 create_wiki_doc 创建的文档有效。`;
+            hint = `\n\n原因: 此文档不是 .adoc 在线文档（可能是上传的 .md 文件），不支持修改。overwriteContent 仅对 .adoc 在线文档有效。`;
           }
           return {
             content: [{ type: 'text', text: `❌ 写入文档内容失败\n${e.message}${hint}` }],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dingtalk-wiki",
-  "version": "1.2.16",
+  "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": {