@dai_ming/plugin-deliverables 1.0.14 → 1.0.16

package/mcp-servers/deliverables.js

@@ -14,21 +14,19 @@
 
 var http  = require("http");
 var https = require("https");
-var path  = require("path");
 
 var GATEWAY_URL    = (process.env.CLAW_GATEWAY_URL        || "http://claw-gateway:8080").replace(/\/$/, "");
-var RAW_GATEWAY_PUBLIC = (process.env.CLAW_GATEWAY_PUBLIC_URL || GATEWAY_URL).replace(/\/$/, "");
+var GATEWAY_PUBLIC = (process.env.CLAW_GATEWAY_PUBLIC_URL || GATEWAY_URL).replace(/\/$/, "");
 // Some existing pods were created without CLAW_GATEWAY_API_KEY injected.
 // Keep env-driven behavior first, but provide a dev-compatible fallback to avoid
 // breaking deliverable uploads during rolling migration.
 var API_KEY        = process.env.CLAW_GATEWAY_API_KEY || process.env.OPENCLAW_GATEWAY_API_KEY || "api-key-1";
-var GATEWAY_PUBLIC = resolveGatewayPublicBase();
 
 var TOOL_DEFS = [
   {
     name: "upload_deliverable",
     description: [
-      "将 AI 生成的内容（文章、游戏、图片等）上传为交付物，返回一个可直接分享的访问链接。",
+      "将 AI 生成的内容（文章、游戏、图片等）上传为交付物，返回可分享的下载/预览链接。",
       "单文件交付物：提供 content_text 或 content_base64。",
       "多文件交付物（网页游戏/静态站点等）：必须优先提供 files 列表，每项包含 name（相对路径）和 content_text 或 content_base64，不要先打 zip。",
       "静态多文件预览建议在根目录提供 index.html；需要单独启动端口/后端服务的项目不属于交付物预览范围，应走部署流程。",
@@ -56,7 +54,7 @@ var TOOL_DEFS = [
         },
         file_name: {
           type: "string",
-          description: "用户可见的文件名，必须尽量保留原始扩展名，例如 刘德华介绍.md、report.html。多文件交付时这里应是目录名/项目名，不要写成 .zip，除非用户明确要求压缩包。"
+          description: "用户可见的文件名，例如 adventure-game 或 report.md。多文件交付时这里应是目录名/项目名，不要写成 .zip，除非用户明确要求压缩包。"
         },
         content_text: {
           type: "string",
@@ -95,269 +93,6 @@ function parseURL(rawURL) {
   }
 }
 
-function isPrivateIPv4(hostname) {
-  if (!hostname) return false;
-  if (/^10\./.test(hostname)) return true;
-  if (/^127\./.test(hostname)) return true;
-  if (/^192\.168\./.test(hostname)) return true;
-  var m = hostname.match(/^172\.(\d+)\./);
-  if (m) {
-    var second = parseInt(m[1], 10);
-    return second >= 16 && second <= 31;
-  }
-  return false;
-}
-
-function isInternalHostname(hostname) {
-  var host = String(hostname || "").toLowerCase();
-  if (!host) return false;
-  if (host === "localhost" || host === "claw-gateway") return true;
-  if (host.indexOf(".svc") >= 0 || host.indexOf(".cluster.local") >= 0) return true;
-  if (host.indexOf("claw-gateway:") === 0) return true;
-  if (isPrivateIPv4(host)) return true;
-  if (host.indexOf(".") < 0) return true;
-  return false;
-}
-
-function isProbablyInternalURL(rawURL) {
-  var parsed = parseURL(rawURL);
-  if (!parsed) return false;
-  return isInternalHostname(parsed.hostname);
-}
-
-function envGatewayPublicFallback() {
-  var helmEnv = String(process.env.HELM_ENV || process.env.ENV || "").toLowerCase();
-  if (helmEnv === "prod" || helmEnv === "production" || helmEnv === "online") {
-    return "https://claw-gateway.csagentai.com";
-  }
-  if (helmEnv === "dev" || helmEnv === "development" || helmEnv === "staging" || helmEnv === "stage") {
-    return "https://claw-dev.csaiagent.com";
-  }
-  return "";
-}
-
-function resolveGatewayPublicBase() {
-  var candidate = RAW_GATEWAY_PUBLIC;
-  if (candidate && !isProbablyInternalURL(candidate)) {
-    return candidate;
-  }
-  var fallback = envGatewayPublicFallback();
-  if (fallback) {
-    return fallback.replace(/\/$/, "");
-  }
-  return candidate;
-}
-
-function absolutizePublicURL(rawURL) {
-  var val = String(rawURL || "").trim();
-  if (!val) return "";
-  if (/^https?:\/\//i.test(val)) {
-    if (isProbablyInternalURL(val) && GATEWAY_PUBLIC && !isProbablyInternalURL(GATEWAY_PUBLIC)) {
-      var parsed = parseURL(val);
-      if (parsed) {
-        return GATEWAY_PUBLIC + parsed.pathname + (parsed.search || "") + (parsed.hash || "");
-      }
-    }
-    return val;
-  }
-  if (val.charAt(0) !== "/") {
-    val = "/" + val;
-  }
-  return (GATEWAY_PUBLIC || RAW_GATEWAY_PUBLIC || "").replace(/\/$/, "") + val;
-}
-
-function outputPublicBase() {
-  return absolutizePublicURL("/openclaw-gateway/output");
-}
-
-function encodePathSegments(parts) {
-  return parts.map(function(part) {
-    return encodeURIComponent(String(part || ""));
-  }).join("/");
-}
-
-function sanitizePathSegment(v) {
-  var s = String(v || "").trim();
-  if (!s) return "unknown";
-  s = s.replace(/\//g, "_");
-  s = s.replace(/\\/g, "_");
-  s = s.replace(/\.\./g, "_");
-  return s;
-}
-
-function sanitizeFileName(v) {
-  var name = String(v || "").trim();
-  if (!name) return "file";
-  name = name.replace(/^.*[\/\\]/, "");
-  name = name.replace(/\//g, "_");
-  name = name.replace(/\\/g, "_");
-  name = name.replace(/\.\./g, "_");
-  if (!name || name === ".") return "file";
-  return name;
-}
-
-function fileExtension(name) {
-  return path.extname(String(name || ""));
-}
-
-function hasFileExtension(name) {
-  return !!fileExtension(name);
-}
-
-function looksLikeHTML(text) {
-  var s = String(text || "").trim().toLowerCase();
-  if (!s) return false;
-  return s.indexOf("<!doctype html") === 0 ||
-    s.indexOf("<html") === 0 ||
-    s.indexOf("<head") === 0 ||
-    s.indexOf("<body") === 0;
-}
-
-function looksLikeMarkdown(text) {
-  var s = String(text || "").trim();
-  if (!s) return false;
-  return /^#{1,6}\s+\S/m.test(s) ||
-    /^\s*[-*+]\s+\S/m.test(s) ||
-    /^\s*\d+\.\s+\S/m.test(s) ||
-    /\[[^\]]+\]\([^)]+\)/.test(s) ||
-    /```/.test(s);
-}
-
-function defaultExtensionForDeliverable(type, contentText, files) {
-  var kind = String(type || "").trim().toLowerCase();
-  if (files && files.length > 0) return "";
-  switch (kind) {
-    case "article":
-      if (looksLikeHTML(contentText)) return ".html";
-      return ".md";
-    case "game":
-      return ".html";
-    case "image":
-      return ".png";
-    case "video":
-      return ".mp4";
-    case "zip":
-      return ".zip";
-    case "ppt":
-      return ".pptx";
-    case "link":
-      return "";
-    default:
-      if (looksLikeHTML(contentText)) return ".html";
-      if (looksLikeMarkdown(contentText)) return ".md";
-      return "";
-  }
-}
-
-function normalizeDeliverableFileName(fileName, type, contentText, files) {
-  if (String(type || "").trim().toLowerCase() === "link") {
-    return String(fileName || "").trim();
-  }
-  var normalized = sanitizeFileName(fileName);
-  if (files && files.length > 0) {
-    return normalized || "deliverable";
-  }
-  if (hasFileExtension(normalized)) {
-    return normalized;
-  }
-  var ext = defaultExtensionForDeliverable(type, contentText, files);
-  if (!normalized) normalized = "deliverable";
-  return normalized + ext;
-}
-
-function extractUserIDFromResource(resourceID) {
-  var trimmed = String(resourceID || "").trim();
-  var prefix = "user_";
-  if (!trimmed || trimmed.indexOf(prefix) !== 0) {
-    return "";
-  }
-  var rest = trimmed.slice(prefix.length);
-  var end = rest.indexOf("_");
-  if (end <= 0) {
-    return "";
-  }
-  return rest.slice(0, end);
-}
-
-function deriveRelease(release, resourceID, userID) {
-  var rel = sanitizePathSegment(release);
-  if (rel && rel !== "unknown") {
-    return rel;
-  }
-  var uid = String(userID || "").trim();
-  if (!uid) {
-    uid = extractUserIDFromResource(resourceID);
-  }
-  if (uid) {
-    return "user-" + uid;
-  }
-  return "unknown";
-}
-
-function looksLikePreviewRoute(rawURL) {
-  var val = String(rawURL || "").trim();
-  return /\/openclaw-gateway\/preview\/[^/?#]+(?:[?#].*)?$/i.test(val);
-}
-
-function needsOutputURLRepair(data) {
-  if (!data) return false;
-  if (String(data.backend || "").toLowerCase() !== "output") {
-    return false;
-  }
-  var previewURL = String(data.previewUrl || "").trim();
-  var downloadURL = String(data.downloadUrl || "").trim();
-  if (!previewURL || !downloadURL) {
-    return true;
-  }
-  if (previewURL.charAt(0) === "/" || downloadURL.charAt(0) === "/") {
-    return true;
-  }
-  if (isProbablyInternalURL(previewURL) || isProbablyInternalURL(downloadURL)) {
-    return true;
-  }
-  if (looksLikePreviewRoute(previewURL) || looksLikePreviewRoute(downloadURL)) {
-    return true;
-  }
-  return false;
-}
-
-function fetchDeliverableMeta(uuid) {
-  if (!uuid) return Promise.resolve(null);
-  return httpRequest("GET", "/openclaw-gateway/be/deliverables/" + encodeURIComponent(uuid)).then(function(resp) {
-    return resp.body.data || resp.body || null;
-  });
-}
-
-function buildOutputURLs(meta, args, body, data) {
-  var base = outputPublicBase();
-  if (!base) {
-    return null;
-  }
-  var resourceID = sanitizePathSegment((meta && meta.resourceId) || body.resourceId || args.resource_id);
-  var userID = (meta && meta.userId) || body.userId || args.user_id;
-  var release = deriveRelease((meta && meta.release) || body.release, resourceID, userID);
-  var uuid = String((meta && meta.uuid) || (data && data.uuid) || "").trim();
-  if (!resourceID || !uuid) {
-    return null;
-  }
-  var isDirectory = !!(args.files && args.files.length > 0) || String((meta && meta.mime) || "").trim() === "application/x-directory";
-  if (isDirectory) {
-    var dirURL = base.replace(/\/$/, "") + "/" + encodePathSegments([release, resourceID, uuid]);
-    return {
-      previewURL: dirURL,
-      downloadURL: dirURL + "?list=1",
-      isDirectory: true
-    };
-  }
-  var fileName = sanitizeFileName((meta && meta.fileName) || body.fileName || args.file_name);
-  var fileURL = base.replace(/\/$/, "") + "/" + encodePathSegments([release, resourceID, uuid, fileName]);
-  return {
-    previewURL: fileURL,
-    downloadURL: fileURL,
-    isDirectory: false
-  };
-}
-
 function httpRequest(method, path, body) {
   return new Promise(function(resolve, reject) {
     var parsed = parseURL(GATEWAY_URL + path);
@@ -410,41 +145,37 @@ function formatGatewayError(statusCode, message, traceID) {
   return msg;
 }
 
-function resolvePrimaryURL(opts) {
+function buildReplyMarkdown(opts) {
   var previewURL = opts.previewURL || "";
   var downloadURL = opts.downloadURL || "";
-  return previewURL || downloadURL || "";
-}
-
-function buildReplyMarkdown(opts) {
-  var primaryURL = resolvePrimaryURL(opts);
-  if (!primaryURL) {
-    return "交付物已上传成功。";
+  var deliverableType = opts.type || "";
+  var isDirectory = !!opts.isDirectory;
+  var lines = [];
+  if (previewURL) {
+    lines.push("预览链接：[点击预览](" + previewURL + ")");
+  }
+  if (downloadURL) {
+    if (isDirectory || deliverableType === "game") {
+      lines.push("文件列表：[查看目录](" + downloadURL + ")");
+    } else {
+      lines.push("下载链接：[点击下载](" + downloadURL + ")");
+    }
   }
-  return primaryURL;
-}
-
-function resolveReplyURLs(data, args, body) {
-  if (!needsOutputURLRepair(data)) {
-    return Promise.resolve(null);
+  if (lines.length === 0 && !previewURL && !downloadURL) {
+    return "交付物已上传成功。";
   }
-  return fetchDeliverableMeta(data.uuid).catch(function() {
-    return null;
-  }).then(function(meta) {
-    return buildOutputURLs(meta, args, body, data);
-  });
+  return lines.join("\n");
 }
 
 // ─── Tool implementations ─────────────────────────────────────────────────────
 
 function uploadDeliverable(args) {
-  var finalFileName = normalizeDeliverableFileName(args.file_name, args.type, args.content_text, args.files);
   var body = {
     resourceId: args.resource_id,
     groupId:    args.group_id,
     userId:     args.user_id,
     type:       args.type,
-    fileName:   finalFileName,
+    fileName:   args.file_name,
     release:    ""  // overwritten below after release name derivation
   };
 
@@ -474,41 +205,29 @@ function uploadDeliverable(args) {
 
   return httpRequest("POST", "/openclaw-gateway/be/deliverables", body).then(function(resp) {
     var d = resp.body.data || resp.body;
-    return resolveReplyURLs(d, args, body).then(function(repaired) {
-      // Prefer backend-aware previewUrl returned by gateway (OSS/output/link).
-      // Fallback to legacy gateway preview endpoint for compatibility.
-      var previewURL = absolutizePublicURL((repaired && repaired.previewURL) || d.previewUrl || ("/openclaw-gateway/preview/" + d.uuid));
-      var downloadURL = absolutizePublicURL((repaired && repaired.downloadURL) || d.downloadUrl);
-      var isDirectory = !!(repaired && repaired.isDirectory) || !!(args.files && args.files.length > 0);
-      if (!isDirectory && downloadURL && previewURL && downloadURL !== previewURL && /(?:\?|&)list=1(?:&|$)/.test(downloadURL)) {
-        isDirectory = true;
-      }
-      var replyMarkdown = buildReplyMarkdown({
-        previewURL: previewURL,
-        downloadURL: downloadURL,
-        type: args.type,
-        isDirectory: isDirectory
-      });
-      var primaryURL = resolvePrimaryURL({
-        previewURL: previewURL,
-        downloadURL: downloadURL,
-        type: args.type,
-        isDirectory: isDirectory
-      });
-      return {
-        uuid:         d.uuid,
-        file_name:    finalFileName,
-        backend:      d.backend || "",
-        download_url: downloadURL,
-        preview_url:  previewURL,
-        primary_url:  primaryURL,
-        expire_at:    d.expireAt,
-        is_directory: isDirectory,
-        reply_markdown: replyMarkdown,
-        trace_id:     resp.traceID || "",
-        message: replyMarkdown
-      };
+    // Prefer backend-aware previewUrl returned by gateway (OSS/output/link).
+    // Fallback to legacy gateway preview endpoint for compatibility.
+    var previewURL = d.previewUrl || (GATEWAY_PUBLIC + "/openclaw-gateway/preview/" + d.uuid);
+    var isDirectory = !!(args.files && args.files.length > 0);
+    if (!isDirectory && d.downloadUrl && previewURL && d.downloadUrl !== previewURL && /(?:\?|&)list=1(?:&|$)/.test(d.downloadUrl)) {
+      isDirectory = true;
+    }
+    var replyMarkdown = buildReplyMarkdown({
+      previewURL: previewURL,
+      downloadURL: d.downloadUrl,
+      type: args.type,
+      isDirectory: isDirectory
     });
+    return {
+      uuid:         d.uuid,
+      backend:      d.backend || "",
+      download_url: d.downloadUrl,
+      preview_url:  previewURL,
+      expire_at:    d.expireAt,
+      reply_markdown: replyMarkdown,
+      trace_id:     resp.traceID || "",
+      message: replyMarkdown
+    };
   });
 }
 
@@ -533,7 +252,7 @@ function handleMessage(msg) {
       send({ jsonrpc: "2.0", id: id, result: {
         protocolVersion: "2024-11-05",
         capabilities: { tools: {} },
-        serverInfo: { name: "deliverables", version: "1.0.14" }
+        serverInfo: { name: "deliverables", version: "1.0.2" }
       }});
       return Promise.resolve();
 

package/openclaw-plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "plugin-deliverables",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "npm_package": "@dai_ming/plugin-deliverables",
   "description": "Deliverables plugin: MCP server + skill + AGENTS rules for AI-generated file uploads",
   "mcp_servers": {
@@ -26,9 +26,7 @@
   "openclaw_config": {
     "plugins": {
       "entries": {
-        "plugin-deliverables": {
-          "enabled": true
-        }
+        "plugin-deliverables": {}
       }
     }
   }

package/openclaw.plugin.json

@@ -1,8 +1,9 @@
 {
   "id": "plugin-deliverables",
-  "name": "Deliverables Plugin",
-  "version": "1.0.14",
-  "description": "Split deliverable replies into summary and link messages for Palz outbound sends.",
+  "name": "Deliverables",
+  "description": "Deliverables runtime guard for upload-first file delivery with Palz split-send diagnostics.",
+  "version": "1.0.16",
+  "skills": ["./skills"],
   "configSchema": {
     "type": "object",
     "additionalProperties": false,

package/package.json

@@ -1,29 +1,29 @@
 {
   "name": "@dai_ming/plugin-deliverables",
-  "version": "1.0.14",
-  "description": "OpenClaw deliverables plugin — upload AI-generated files to OSS and return a shareable access link",
+  "version": "1.0.16",
+  "description": "OpenClaw deliverables plugin — upload AI-generated files to OSS and return shareable preview/download links",
   "keywords": [
     "openclaw",
     "plugin",
     "deliverables",
     "mcp"
   ],
-  "main": "index.js",
-  "openclaw": {
-    "extensions": [
-      "./index.js"
-    ]
-  },
   "license": "MIT",
+  "main": "index.js",
   "files": [
+    "INSTALL.md",
     "index.js",
-    "install.js",
     "openclaw.plugin.json",
     "openclaw-plugin.json",
     "mcp-servers/",
     "skills/",
     "agents-rules/"
   ],
+  "openclaw": {
+    "extensions": [
+      "./index.js"
+    ]
+  },
   "engines": {
     "node": ">=16"
   }

package/skills/deliverables/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: deliverables
-description: 上传AI生成的文件到交付物系统，返回一个可直接分享的访问链接
+description: 上传AI生成的文件到交付物系统，返回可分享的预览链接
 ---
 
 # 文件交付规则（强制）
@@ -21,8 +21,6 @@ description: 上传AI生成的文件到交付物系统，返回一个可直接
 - 多文件内容（游戏/网站）写到 `output/<目录名>/...`，保持目录结构。
 - 如果你使用 `write` 工具创建交付物文件，目标路径必须在 `output/` 下。
 - 如果你已经误写到工作区根目录，必须先移动或复制到 `output/`，再继续上传交付物并向用户汇报。
-- 交付物文件名必须保留原始扩展名，不要丢后缀。示例：`刘德华介绍.md`、`周杰伦.md`、`996专题.html`。
-- 如果用户要求 Markdown，就保留 `.md`；如果用户要求 HTML，就保留 `.html`；如果是纯文本，就保留 `.txt`。
 
 ## 调用前必须准备的参数（全部必填）
 
@@ -34,7 +32,7 @@ description: 上传AI生成的文件到交付物系统，返回一个可直接
 | `group_id` | 消息元数据中的 `group_id` 或 `conversation_id` | `group_abc123` |
 | `user_id` | 消息元数据中的 `sender_id` 或 `owner_id` | `cbb0fab9...` |
 | `type` | 根据内容选择：`article`/`game`/`image`/`video`/`ppt`/`zip`/`link` | `article` |
-| `file_name` | 有意义的文件名，必须含正确扩展名 | `report-2026.html` |
+| `file_name` | 有意义的文件名，含扩展名 | `report-2026.html` |
 | `content_text` | 文件的完整文本内容（HTML/Markdown等） | `<html>...</html>` |
 
 > **直接对话（direct chat）时**：`group_id` 填 `conversation_id`，`user_id` 填 `owner_id`。
@@ -59,19 +57,13 @@ files: [
 ## 上传成功后
 
 优先规则：
-- 最终消息必须先给出一段更完整的 Markdown 介绍，不要只写一句短确认。
-- 建议结构是：
-  - 一行简短标题或总结
-  - `### 内容概览`
-  - 3-6 个 bullet，概括这份产物实际包含的章节、重点、亮点或功能
-- 这段介绍必须基于实际产物内容，不要使用固定模板，例如：`交付物已上传成功，可直接在线预览或下载。`
-- 对于常见文章、介绍、报告类交付物，链接前的介绍通常应达到约 80-200 个中文字符，明显长于一句话确认。
-- bullet 必须写具体内容，例如“基本信息、代表作品、奖项与影响力”，不要只写“内容完整、结构清晰”这类空话。
-- 如果工具结果里有 `reply_markdown`，先输出 `### 访问链接`，再把它原样放在后面，不要改写其中的 URL。
-- 否则只输出一个最终链接：
-  - 优先 `primary_url`
-  - 没有就退回 `preview_url`
-  - 再没有才用 `download_url`
-- 不要同时输出“预览链接 + 下载链接”两条。
-
-不要在消息里输出文件的完整内容、工作区保存路径，也不要只输出“一句简介 + 两个链接”这种过短格式。
+- 最终消息必须先用你自己的话写 1-2 句简短介绍，粗略说明你生成了什么内容、包含哪些重点。
+- 这句介绍必须基于实际产物内容，不要使用固定模板，例如：`交付物已上传成功，可直接在线预览或下载。`
+- 如果工具结果里有 `reply_markdown`，把它原样放在这句介绍后面，不要改写其中的链接。
+
+否则只发给用户：
+- 预览链接（`preview_url`，必须用 Markdown 链接格式）
+- 下载链接（`download_url`，必须用 Markdown 链接格式）
+- 多文件/游戏目录场景下，第二行也可以是 `文件列表：[查看目录](...)`，不要改成裸 URL 或 zip 描述。
+
+不要在消息里输出文件的完整内容、工作区保存路径或裸链接。