@dai_ming/plugin-deliverables 1.1.8 → 1.2.0

package/index.js

@@ -880,6 +880,7 @@ function kbMultipartUpload(fileBuffers, fields, pathsArray) {
           "X-API-Key": kbApiKey(),
           "Content-Length": body.length,
         },
+        timeout: 10000,
       },
       (res) => {
         const chunks = [];
@@ -905,6 +906,9 @@ function kbMultipartUpload(fileBuffers, fields, pathsArray) {
         });
       },
     );
+    req.on("timeout", () => {
+      req.destroy(new Error("kb upload timeout after 10s"));
+    });
     req.on("error", reject);
     req.write(body);
     req.end();
@@ -1802,6 +1806,30 @@ function extractDeliverableURL(line) {
   return "";
 }
 
+function extractAllDeliverableURLs(line) {
+  const text = String(line || "").trim();
+  if (!text) {
+    return [];
+  }
+  const urls = [];
+  const seen = new Set();
+  const markdownLinks = text.matchAll(/\((https?:\/\/[^)\s]+)\)/giu);
+  for (const m of markdownLinks) {
+    const url = m[1].trim();
+    if (url && !seen.has(url)) {
+      seen.add(url);
+      urls.push(url);
+    }
+  }
+  if (urls.length === 0) {
+    const rawLink = text.match(/https?:\/\/\S+/iu);
+    if (rawLink && rawLink[0]) {
+      urls.push(rawLink[0].trim());
+    }
+  }
+  return urls;
+}
+
 function configuredKBHosts() {
   const cfg = loadDeliverableConfig();
   const values = [
@@ -1943,10 +1971,12 @@ function splitDeliverableMessage(text) {
       const normalizedLine = stripBulletPrefix(line).trim();
       if (normalizedLine) {
         linkLines.push(normalizedLine);
-        const url = extractDeliverableURL(normalizedLine);
-        if (url) {
-          linkUrls.push(url);
-          linkItems.push({ line: normalizedLine, url });
+        const urls = extractAllDeliverableURLs(normalizedLine);
+        for (const url of urls) {
+          if (isTrustedDeliverableURL(url)) {
+            linkUrls.push(url);
+            linkItems.push({ line: normalizedLine, url });
+          }
         }
       }
     }
@@ -1965,6 +1995,7 @@ function splitDeliverableMessage(text) {
     linkItems,
     primaryLinkUrl: linkUrls.length > 0 ? linkUrls[0] : "",
     fileLinkUrl: selectPalzFileURL(linkItems),
+    deduplicatedItems: deduplicateLinkItems(linkItems),
   };
 }
 
@@ -2007,6 +2038,31 @@ function selectPalzFileURL(linkItems) {
   return (preview && preview.url) || linkItems[0].url || "";
 }
 
+function deduplicateLinkItems(linkItems) {
+  if (!Array.isArray(linkItems) || linkItems.length === 0) {
+    return { fileItems: [], textItems: [] };
+  }
+  const byIdentity = new Map();
+  const textItems = [];
+  for (const item of linkItems) {
+    const identity = extractDeliverableIdentity(item && item.url);
+    if (!identity) {
+      textItems.push(item);
+      continue;
+    }
+    const existing = byIdentity.get(identity);
+    if (!existing) {
+      byIdentity.set(identity, item);
+    } else if (/\/documents\/preview\//u.test(String(item.url || ""))) {
+      byIdentity.set(identity, item);
+    }
+  }
+  return {
+    fileItems: Array.from(byIdentity.values()),
+    textItems,
+  };
+}
+
 function cloneBody(body, content, suffix) {
   const next = {};
   Object.keys(body).forEach((key) => {
@@ -2063,6 +2119,7 @@ function shouldSplitPalzPayload(body) {
       links: split.links,
       primaryLinkUrl: split.primaryLinkUrl,
       fileLinkUrl: split.fileLinkUrl,
+      deduplicatedItems: split.deduplicatedItems,
     };
   }
   return split;
@@ -2157,16 +2214,15 @@ function installPalzFetchPatch(api) {
       return originalFetch(input, init);
     }
 
+    const dedup = split.deduplicatedItems || { fileItems: [], textItems: [] };
+    const hasFileItems = dedup.fileItems.length > 0;
+    const hasTextItems = dedup.textItems.length > 0;
+
     const summaryBody = cloneBody(parsed, split.summary, "__summary");
-    const fileLinkUrl = split.fileLinkUrl || "";
-    const linksBody = fileLinkUrl
-      ? cloneBodyAsFileLink(parsed, fileLinkUrl, "__links")
-      : cloneBody(parsed, split.links, "__links");
     const summaryBodyStr = JSON.stringify(summaryBody);
-    const linksBodyStr = JSON.stringify(linksBody);
 
     api.logger.info?.(
-      `[plugin-deliverables] split deliverable reply injected by plugin-deliverables target=${String(parsed.conversation_id || "")} summaryMsgId=${String(summaryBody.msg_id || "")} linksMsgId=${String(linksBody.msg_id || "")} linksMode=${fileLinkUrl ? "file_url" : "text"}`,
+      `[plugin-deliverables] split deliverable reply injected by plugin-deliverables target=${String(parsed.conversation_id || "")} summaryMsgId=${String(summaryBody.msg_id || "")} fileLinks=${dedup.fileItems.length} textLinks=${dedup.textItems.length}`,
     );
     api.logger.info?.(
       `[plugin-deliverables] palz summary request body_length=${summaryBodyStr.length}\n  request_body=${summaryBodyStr}`,
@@ -2176,28 +2232,54 @@ function installPalzFetchPatch(api) {
     const summaryInit = Object.assign({}, baseInit, {
       body: summaryBodyStr,
     });
-    const linksInit = Object.assign({}, baseInit, {
-      body: linksBodyStr,
-    });
 
-    const firstResponse = await originalFetch(input, summaryInit);
-    const firstResponseText = await readResponseText(firstResponse);
+    const summaryResponse = await originalFetch(input, summaryInit);
+    const summaryResponseText = await readResponseText(summaryResponse);
     api.logger.info?.(
-      `[plugin-deliverables] palz summary response status=${firstResponse ? firstResponse.status : "unknown"} ok=${Boolean(firstResponse && firstResponse.ok)}\n  response_body=${previewText(firstResponseText)}`,
+      `[plugin-deliverables] palz summary response status=${summaryResponse ? summaryResponse.status : "unknown"} ok=${Boolean(summaryResponse && summaryResponse.ok)}\n  response_body=${previewText(summaryResponseText)}`,
     );
-    if (!firstResponse || !firstResponse.ok) {
-      return firstResponse;
+    if (!summaryResponse || !summaryResponse.ok) {
+      return summaryResponse;
     }
 
-    api.logger.info?.(
-      `[plugin-deliverables] palz links request body_length=${linksBodyStr.length}\n  request_body=${linksBodyStr}`,
-    );
-    const secondResponse = await originalFetch(input, linksInit);
-    const secondResponseText = await readResponseText(secondResponse);
-    api.logger.info?.(
-      `[plugin-deliverables] palz links response status=${secondResponse ? secondResponse.status : "unknown"} ok=${Boolean(secondResponse && secondResponse.ok)}\n  response_body=${previewText(secondResponseText)}`,
-    );
-    return secondResponse;
+    let lastResponse = summaryResponse;
+
+    for (let idx = 0; idx < dedup.fileItems.length; idx += 1) {
+      const item = dedup.fileItems[idx];
+      const fileBody = cloneBodyAsFileLink(parsed, item.url, `__links_${idx}`);
+      const fileBodyStr = JSON.stringify(fileBody);
+      api.logger.info?.(
+        `[plugin-deliverables] palz file_url request [${idx}] body_length=${fileBodyStr.length} url=${item.url}\n  request_body=${fileBodyStr}`,
+      );
+      const fileInit = Object.assign({}, baseInit, { body: fileBodyStr });
+      const fileResponse = await originalFetch(input, fileInit);
+      const fileResponseText = await readResponseText(fileResponse);
+      api.logger.info?.(
+        `[plugin-deliverables] palz file_url response [${idx}] status=${fileResponse ? fileResponse.status : "unknown"} ok=${Boolean(fileResponse && fileResponse.ok)}\n  response_body=${previewText(fileResponseText)}`,
+      );
+      if (!fileResponse || !fileResponse.ok) {
+        return fileResponse;
+      }
+      lastResponse = fileResponse;
+    }
+
+    if (hasTextItems) {
+      const textContent = dedup.textItems.map((item) => item.line).join("\n");
+      const textBody = cloneBody(parsed, textContent, "__links_text");
+      const textBodyStr = JSON.stringify(textBody);
+      api.logger.info?.(
+        `[plugin-deliverables] palz text links request body_length=${textBodyStr.length}\n  request_body=${textBodyStr}`,
+      );
+      const textInit = Object.assign({}, baseInit, { body: textBodyStr });
+      const textResponse = await originalFetch(input, textInit);
+      const textResponseText = await readResponseText(textResponse);
+      api.logger.info?.(
+        `[plugin-deliverables] palz text links response status=${textResponse ? textResponse.status : "unknown"} ok=${Boolean(textResponse && textResponse.ok)}\n  response_body=${previewText(textResponseText)}`,
+      );
+      lastResponse = textResponse;
+    }
+
+    return lastResponse;
   };
 
   globalThis.fetch = patchedFetch;

package/openclaw-plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "plugin-deliverables",
-  "version": "1.1.8",
+  "version": "1.2.0",
   "npm_package": "@dai_ming/plugin-deliverables",
   "description": "Deliverables plugin: native upload tool + skill + AGENTS rules for AI-generated file uploads",
   "skills": {

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "plugin-deliverables",
   "name": "Deliverables",
   "description": "Deliverables runtime guard for upload-first file delivery with Palz split-send diagnostics.",
-  "version": "1.1.8",
+  "version": "1.2.0",
   "skills": ["./skills"],
   "configSchema": {
     "type": "object",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dai_ming/plugin-deliverables",
-  "version": "1.1.8",
+  "version": "1.2.0",
   "description": "OpenClaw deliverables native plugin — upload AI-generated files to OSS and return shareable preview/download links",
   "keywords": [
     "openclaw",