draftgo-cli 3.0.38 → 3.0.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "draftgo-cli",
-  "version": "3.0.38",
+  "version": "3.0.39",
   "description": "Install and manage the DraftGo skill across AI coding agents (Claude Code, Codex, Cursor, Windsurf, Antigravity, Copilot, Gemini, Kiro).",
   "bin": {
     "draftgo": "bin/draftgo.js"

package/resources/skill/manifest.json

@@ -2,7 +2,7 @@
   "schema_version": "1.0",
   "id": "draftgo",
   "name": "DraftGo 开发助手",
-  "version": "3.0.38",
+  "version": "3.0.39",
   "entry": "SKILL.md",
   "description": "以 Skill/reference 优先路由、MCP 实时发现、长正文 checkout/commit、验证、本地运行与 Skill 分发的 DraftGo 工作流。",
   "license": "MIT",

package/src/mcp/tools.js

@@ -2,7 +2,7 @@
 
 const { DraftGoMcpClient } = require('./client');
 const { WorktreeError } = require('../worktree/errors');
-const { unwrapToolResult, toolNameMatches } = require('../worktree/backend');
+const { unwrapToolResult, unwrapProtectedResult, toolNameMatches } = require('../worktree/backend');
 
 const TOOL_NAMES = Object.freeze({
   projectOverview: 'draftgo_project_overview',
@@ -15,6 +15,13 @@ const TOOL_NAMES = Object.freeze({
   apiCall: 'draftgo_api_call',
 });
 
+const PROTECTED_RESOURCE_TOOLS = new Set([
+  TOOL_NAMES.resourceList,
+  TOOL_NAMES.resourceSearch,
+  TOOL_NAMES.resourceMetadata,
+  TOOL_NAMES.resourceFragment,
+]);
+
 async function openToolSession(config, expected = [], options = {}) {
   const client = options.client || new DraftGoMcpClient(config);
   await client.initialize(options);
@@ -31,7 +38,10 @@ async function openToolSession(config, expected = [], options = {}) {
 async function callStructured(session, expectedName, args = {}, options = {}) {
   const name = session.names[expectedName] || expectedName;
   const result = await session.client.toolsCall(name, args, options);
-  return unwrapToolResult(result);
+  const data = unwrapToolResult(result);
+  return PROTECTED_RESOURCE_TOOLS.has(expectedName)
+    ? unwrapProtectedResult(data, expectedName)
+    : data;
 }
 
 module.exports = { TOOL_NAMES, openToolSession, callStructured };

package/src/worktree/backend.js

@@ -24,25 +24,111 @@ function toolNameMatches(name, expected) {
 
 function parseJsonText(text, label) {
   try { return JSON.parse(text); } catch {
-    throw new WorktreeError('INVALID_BACKEND_RESPONSE', `${label} did not return structured JSON metadata.`);
+    throw new WorktreeError('INVALID_BACKEND_RESPONSE', `${label} did not return structured JSON.`);
   }
 }
 
-function unwrapToolResult(result) {
+function hasOwn(value, key) {
+  return Object.prototype.hasOwnProperty.call(value, key);
+}
+
+function isMcpPayload(value) {
+  return isObject(value) && (
+    hasOwn(value, 'jsonrpc')
+    || hasOwn(value, 'result')
+    || hasOwn(value, 'structuredContent')
+    || hasOwn(value, 'structured_content')
+    || hasOwn(value, 'content')
+    || hasOwn(value, 'isError')
+    || hasOwn(value, 'ok')
+  );
+}
+
+function toolError(envelope, fallbackCode, fallbackMessage) {
+  const error = isObject(envelope && envelope.error) ? envelope.error : {};
+  return new WorktreeError(
+    String(firstValue(error.code, fallbackCode)),
+    String(firstValue(error.message, fallbackMessage)),
+    isObject(error.details) ? error.details : {},
+  );
+}
+
+function unwrapToolResult(payload) {
+  if (!isObject(payload)) {
+    throw new WorktreeError('INVALID_BACKEND_RESPONSE', 'DraftGo MCP tool returned no structured result.');
+  }
+
+  let result = payload;
+  if (hasOwn(payload, 'jsonrpc') || hasOwn(payload, 'result')) {
+    if (isObject(payload.error)) {
+      throw toolError({ error: payload.error }, 'MCP_RPC_ERROR', 'DraftGo MCP request failed.');
+    }
+    if (!isObject(payload.result)) {
+      throw new WorktreeError('INVALID_BACKEND_RESPONSE', 'DraftGo MCP returned no tool result.');
+    }
+    result = payload.result;
+  }
+
   if (!isObject(result)) {
-    throw new WorktreeError('INVALID_BACKEND_RESPONSE', 'DraftGo metadata tool returned no structured result.');
+    throw new WorktreeError('INVALID_BACKEND_RESPONSE', 'DraftGo MCP returned an invalid tool result.');
+  }
+  if (hasOwn(result, 'isError') && typeof result.isError !== 'boolean') {
+    throw new WorktreeError('INVALID_BACKEND_RESPONSE', 'DraftGo MCP returned an invalid isError value.');
   }
-  if (isObject(result.structuredContent)) return result.structuredContent;
-  if (isObject(result.structured_content)) return result.structured_content;
-  if (isObject(result.data)) return result.data;
-  if (isObject(result.metadata) || isObject(result.resource)) return result;
-  if (Array.isArray(result.content)) {
+
+  let envelope;
+  if (hasOwn(result, 'structuredContent')) {
+    if (!isObject(result.structuredContent)) {
+      throw new WorktreeError('INVALID_BACKEND_RESPONSE', 'DraftGo MCP returned invalid structuredContent.');
+    }
+    envelope = result.structuredContent;
+  } else if (hasOwn(result, 'structured_content')) {
+    if (!isObject(result.structured_content)) {
+      throw new WorktreeError('INVALID_BACKEND_RESPONSE', 'DraftGo MCP returned invalid structured_content.');
+    }
+    envelope = result.structured_content;
+  } else if (Array.isArray(result.content)) {
     const textPart = result.content.find((part) => part && part.type === 'text' && typeof part.text === 'string');
     if (textPart && Buffer.byteLength(textPart.text, 'utf8') <= MAX_JSON_BYTES) {
-      return parseJsonText(textPart.text, 'DraftGo metadata tool');
+      envelope = parseJsonText(textPart.text, 'DraftGo MCP tool');
     }
+  } else if (hasOwn(result, 'ok')) {
+    envelope = result;
+  }
+
+  if (!isObject(envelope)) {
+    throw new WorktreeError('INVALID_BACKEND_RESPONSE', 'DraftGo MCP tool returned no structured JSON result.');
+  }
+  if (result.isError === true) {
+    throw toolError(envelope, 'MCP_TOOL_ERROR', 'DraftGo MCP tool reported an error.');
+  }
+  if (envelope.ok !== true) {
+    throw toolError(envelope, 'INVALID_BACKEND_RESPONSE', 'DraftGo MCP tool did not report success.');
   }
-  return result;
+  return envelope.data;
+}
+
+function unwrapProtectedResult(data, label = 'DraftGo resource tool') {
+  if (!isObject(data) || !hasOwn(data, 'value') || typeof data.omitted !== 'boolean') {
+    throw new WorktreeError(
+      'INVALID_PROTECTED_RESULT',
+      `${label} returned an invalid protected result.`,
+    );
+  }
+  if (data.artifacts !== undefined && !Array.isArray(data.artifacts)) {
+    throw new WorktreeError(
+      'INVALID_PROTECTED_RESULT',
+      `${label} returned invalid artifact descriptors.`,
+    );
+  }
+  if (data.omitted || (Array.isArray(data.artifacts) && data.artifacts.length > 0)) {
+    throw new WorktreeError(
+      'PROTECTED_RESULT_OMITTED',
+      `${label} omitted fields required by the CLI.`,
+      { artifacts: data.artifacts || [] },
+    );
+  }
+  return data.value;
 }
 
 function firstObject(...values) {
@@ -53,12 +139,6 @@ function firstValue(...values) {
   return values.find((value) => value !== undefined && value !== null && value !== '');
 }
 
-function fillTemplate(template, resourceType, resourceId) {
-  return String(template)
-    .replace(/\{resource_type\}/g, encodeURIComponent(resourceType))
-    .replace(/\{resource_id\}/g, encodeURIComponent(String(resourceId)));
-}
-
 function normalizeUrl(config, value, purpose) {
   if (!value) return null;
   let url;
@@ -84,25 +164,20 @@ function normalizeUrl(config, value, purpose) {
 }
 
 function normalizeMetadata(config, resourceType, resourceId, payload) {
-  const outer = unwrapToolResult(payload);
-  const data = firstObject(outer.metadata, outer.resource, outer.data, outer);
-  const links = firstObject(data.links, outer.links, data.urls, outer.urls);
+  const data = isMcpPayload(payload)
+    ? unwrapProtectedResult(unwrapToolResult(payload), 'DraftGo metadata tool')
+    : payload;
+  if (!isObject(data)) {
+    throw new WorktreeError('INVALID_BACKEND_RESPONSE', 'DraftGo returned invalid checkout metadata.');
+  }
+  const checkout = isObject(data.checkout) ? data.checkout : {};
   const checkoutConfig = firstObject(config.checkout);
-  const downloadTemplate = checkoutConfig.download_url_template;
-  const commitTemplate = checkoutConfig.commit_url_template;
   const version = firstValue(data.base_version, data.version, data.revision, data.base_revision);
-  const hash = firstValue(data.content_hash, data.hash, data.sha256, data.base_hash);
-  const contentType = firstValue(data.content_type, data.contentType);
-  const backendExtension = firstValue(data.file_extension, data.extension);
-  const downloadRaw = firstValue(
-    data.download_url, data.downloadUrl, links.download, links.content, links.checkout,
-    downloadTemplate && fillTemplate(downloadTemplate, resourceType, resourceId),
-  );
-  const commitRaw = firstValue(
-    data.commit_url, data.commitUrl, data.upload_url, data.uploadUrl,
-    links.commit, links.upload,
-    commitTemplate && fillTemplate(commitTemplate, resourceType, resourceId),
-  );
+  const hash = data.content_hash;
+  const contentType = data.content_type;
+  const backendExtension = data.file_extension;
+  const downloadRaw = firstValue(checkout.download, data.download_url);
+  const commitRaw = firstValue(checkout.commit, data.commit_url);
 
   if (!contentType || !hash || version === undefined || !downloadRaw || !commitRaw) {
     throw new WorktreeError(
@@ -115,18 +190,18 @@ function normalizeMetadata(config, resourceType, resourceId, payload) {
 
   return {
     resource_type: canonicalResourceType(firstValue(data.resource_type, resourceType)),
-    resource_id: String(firstValue(data.resource_id, data.id, resourceId)),
-    title: String(firstValue(data.title, data.name, '')),
+    resource_id: String(firstValue(data.resource_id, resourceId)),
+    title: String(firstValue(data.title, '')),
     route: firstValue(data.route, null),
     code: firstValue(data.code, null),
     slug: firstValue(data.slug, null),
     content_type: String(contentType),
     file_extension: normalizeExtension(contentType, backendExtension),
-    content_size: data.content_size == null && data.size == null ? null : Number(firstValue(data.content_size, data.size)),
+    content_size: data.content_size == null ? null : Number(data.content_size),
     content_hash: normalizedHash,
     base_version: data.base_version !== undefined ? data.base_version : (data.version !== undefined ? data.version : null),
     base_revision: data.base_revision !== undefined ? data.base_revision : (data.revision !== undefined ? data.revision : null),
-    etag: firstValue(data.etag, data.e_tag, null),
+    etag: firstValue(data.etag, null),
     updated_at: firstValue(data.updated_at, null),
     updated_by: firstValue(data.updated_by, null),
     download_url: normalizeUrl(config, downloadRaw, 'download'),
@@ -202,7 +277,7 @@ async function commit(config, metadata, localPath, current, options = {}) {
   if (!metadata.commit_url) {
     throw new WorktreeError(
       'COMMIT_URL_UNAVAILABLE',
-      'DraftGo metadata did not provide a commit URL and no checkout.commit_url_template is configured.',
+      'DraftGo metadata did not provide a commit URL.',
     );
   }
   if (!['POST', 'PUT', 'PATCH'].includes(metadata.commit_method)) {
@@ -241,6 +316,7 @@ module.exports = {
   METADATA_TOOL,
   toolNameMatches,
   unwrapToolResult,
+  unwrapProtectedResult,
   normalizeMetadata,
   resolveMetadata,
   download,