@dai_ming/plugin-deliverables 1.2.0 → 1.2.2

package/index.js

@@ -287,6 +287,7 @@ function deliverableTypeForPath(filePath, isDirectory) {
 
 function isAllowedWorkspacePath(candidatePath) {
   const normalized = normalizeSlash(path.resolve(candidatePath));
+  // 老布局：根目录直接挂 workspace（保持向后兼容）。
   if (
     normalized.indexOf("/data/workspace-") === 0 ||
     normalized.indexOf("/home/node/.openclaw/workspace") === 0
@@ -294,7 +295,13 @@ function isAllowedWorkspacePath(candidatePath) {
     return true;
   }
   const openclawRoot = normalizeSlash(path.resolve(__dirname, "..", ".."));
-  return normalized.indexOf(openclawRoot + "/workspace") === 0;
+  if (normalized.indexOf(openclawRoot + "/workspace") === 0) {
+    return true;
+  }
+  // 新布局（多租户）及通用情况：绝对路径中任意位置含有 `xxx/workspace-*`
+  // 目录段都允许，覆盖 /data/tenants/<user>/workspace-<lobster>、
+  // /home/node/.openclaw/<user>/workspace-<lobster> 等。
+  return /\/workspace-[^/]+(?:\/|$)/.test(normalized);
 }
 
 function shouldIgnorePath(candidatePath) {
@@ -308,42 +315,74 @@ function shouldIgnorePath(candidatePath) {
   return IGNORED_FILE_NAMES.has(path.basename(normalized));
 }
 
-function safeStat(candidatePath) {
+async function safeStat(candidatePath) {
   try {
-    return fs.statSync(candidatePath);
+    return await fs.promises.stat(candidatePath);
   } catch (_err) {
     return null;
   }
 }
 
-function workspaceRoots() {
+async function workspaceRoots() {
   const roots = [];
-  ["/home/node/.openclaw/workspace-main", "/home/node/.openclaw/workspace"].forEach((root) => {
-    if (safeStat(root)) {
+  for (const root of ["/home/node/.openclaw/workspace-main", "/home/node/.openclaw/workspace"]) {
+    if (await safeStat(root)) {
       roots.push(root);
     }
-  });
+  }
   try {
-    for (const entry of fs.readdirSync("/data")) {
+    for (const entry of await fs.promises.readdir("/data")) {
       if (!entry || entry.indexOf("workspace-") !== 0) {
         continue;
       }
       const root = path.join("/data", entry);
-      if (safeStat(root)) {
+      if (await safeStat(root)) {
         roots.push(root);
       }
     }
   } catch (_err) {
     // /data is not guaranteed in non-pod test environments.
   }
+  // 多租户布局：枚举 <base>/<tenant-or-user>/workspace-* 下的 workspace 根目录，
+  // 覆盖 /data/tenants/<user>/workspace-<lobster>、
+  // /home/node/.openclaw/<user>/workspace-<lobster> 等。
+  for (const base of ["/data/tenants", "/home/node/.openclaw"]) {
+    let tenants;
+    try {
+      tenants = await fs.promises.readdir(base);
+    } catch (_err) {
+      continue;
+    }
+    for (const tenant of tenants) {
+      if (!tenant || tenant.indexOf("workspace") === 0) {
+        continue;
+      }
+      const tenantDir = path.join(base, tenant);
+      let children;
+      try {
+        children = await fs.promises.readdir(tenantDir);
+      } catch (_err) {
+        continue;
+      }
+      for (const child of children) {
+        if (!child || child.indexOf("workspace-") !== 0) {
+          continue;
+        }
+        const root = path.join(tenantDir, child);
+        if ((await safeStat(root)) && roots.indexOf(root) === -1) {
+          roots.push(root);
+        }
+      }
+    }
+  }
   const openclawRoot = path.resolve(__dirname, "..", "..");
   try {
-    for (const entry of fs.readdirSync(openclawRoot)) {
+    for (const entry of await fs.promises.readdir(openclawRoot)) {
       if (!entry || entry.indexOf("workspace") !== 0) {
         continue;
       }
       const root = path.join(openclawRoot, entry);
-      if (safeStat(root) && roots.indexOf(root) === -1) {
+      if ((await safeStat(root)) && roots.indexOf(root) === -1) {
         roots.push(root);
       }
     }
@@ -364,12 +403,12 @@ function resolveCandidatePath(rawPath) {
   return cleaned;
 }
 
-function findFileByRelativeOrBaseName(rawRef) {
+async function findFileByRelativeOrBaseName(rawRef) {
   const cleaned = stripTrailingPathPunctuation(trimString(rawRef)).replace(/^\.\//, "");
   if (!cleaned || isURLLike(cleaned) || !hasFileExtension(cleaned)) {
     return "";
   }
-  const roots = workspaceRoots();
+  const roots = await workspaceRoots();
   const directCandidates = [];
   for (const root of roots) {
     directCandidates.push(path.join(root, cleaned));
@@ -378,7 +417,7 @@ function findFileByRelativeOrBaseName(rawRef) {
     directCandidates.push(path.join(root, "output", path.basename(cleaned)));
   }
   for (const candidate of directCandidates) {
-    const stat = safeStat(candidate);
+    const stat = await safeStat(candidate);
     if (stat && (stat.isFile() || stat.isDirectory()) && isAllowedWorkspacePath(candidate) && !shouldIgnorePath(candidate)) {
       return path.resolve(candidate);
     }
@@ -387,13 +426,13 @@ function findFileByRelativeOrBaseName(rawRef) {
   const basename = path.basename(cleaned);
   const found = [];
   let visited = 0;
-  function scan(dir, depth) {
+  async function scan(dir, depth) {
     if (depth < 0 || visited > AUTO_UPLOAD_SCAN_MAX_ENTRIES || shouldIgnorePath(dir)) {
       return;
     }
     let entries;
     try {
-      entries = fs.readdirSync(dir, { withFileTypes: true });
+      entries = await fs.promises.readdir(dir, { withFileTypes: true });
     } catch (_err) {
       return;
     }
@@ -407,11 +446,11 @@ function findFileByRelativeOrBaseName(rawRef) {
         continue;
       }
       if (entry.isDirectory()) {
-        scan(full, depth - 1);
+        await scan(full, depth - 1);
         continue;
       }
       if (entry.isFile() && entry.name === basename) {
-        const stat = safeStat(full);
+        const stat = await safeStat(full);
         if (stat) {
           found.push({ path: full, mtimeMs: stat.mtimeMs });
         }
@@ -419,7 +458,7 @@ function findFileByRelativeOrBaseName(rawRef) {
     }
   }
   for (const root of roots) {
-    scan(root, AUTO_UPLOAD_SCAN_DEPTH);
+    await scan(root, AUTO_UPLOAD_SCAN_DEPTH);
   }
   found.sort((a, b) => b.mtimeMs - a.mtimeMs);
   return found.length > 0 ? path.resolve(found[0].path) : "";
@@ -457,16 +496,16 @@ function extractFileReferencesFromText(text) {
   return refs;
 }
 
-function resolveFileReference(ref) {
+async function resolveFileReference(ref) {
   if (!ref || !ref.value) {
     return null;
   }
   const candidate = resolveCandidatePath(ref.value);
-  const resolved = path.isAbsolute(candidate) ? candidate : findFileByRelativeOrBaseName(candidate);
+  const resolved = path.isAbsolute(candidate) ? candidate : await findFileByRelativeOrBaseName(candidate);
   if (!resolved) {
     return null;
   }
-  const stat = safeStat(resolved);
+  const stat = await safeStat(resolved);
   if (!stat || (!stat.isFile() && !stat.isDirectory())) {
     return null;
   }
@@ -483,17 +522,17 @@ function resolveFileReference(ref) {
   };
 }
 
-function collectDirectoryFiles(dirPath) {
+async function collectDirectoryFiles(dirPath) {
   const files = [];
   let total = 0;
   let visited = 0;
-  function scan(current, depth) {
+  async function scan(current, depth) {
     if (depth < 0 || visited > AUTO_UPLOAD_SCAN_MAX_ENTRIES || shouldIgnorePath(current)) {
       return;
     }
     let entries;
     try {
-      entries = fs.readdirSync(current, { withFileTypes: true });
+      entries = await fs.promises.readdir(current, { withFileTypes: true });
     } catch (_err) {
       return;
     }
@@ -507,26 +546,26 @@ function collectDirectoryFiles(dirPath) {
         continue;
       }
       if (entry.isDirectory()) {
-        scan(full, depth - 1);
+        await scan(full, depth - 1);
         continue;
       }
       if (!entry.isFile()) {
         continue;
       }
-      const stat = safeStat(full);
+      const stat = await safeStat(full);
       if (!stat || total + stat.size > AUTO_UPLOAD_MAX_BYTES) {
         continue;
       }
       total += stat.size;
       const rel = normalizeSlash(path.relative(dirPath, full));
       if (isTextLikeFile(full)) {
-        files.push({ name: rel, contentText: fs.readFileSync(full, "utf8") });
+        files.push({ name: rel, contentText: await fs.promises.readFile(full, "utf8") });
       } else {
-        files.push({ name: rel, contentBase64: fs.readFileSync(full).toString("base64") });
+        files.push({ name: rel, contentBase64: (await fs.promises.readFile(full)).toString("base64") });
       }
     }
   }
-  scan(dirPath, AUTO_UPLOAD_SCAN_DEPTH);
+  await scan(dirPath, AUTO_UPLOAD_SCAN_DEPTH);
   return files;
 }
 
@@ -689,7 +728,7 @@ function rememberPendingFile(event) {
   });
 }
 
-function pendingCandidatesForPayload(body) {
+async function pendingCandidatesForPayload(body) {
   const resourceId = payloadResourceId(body);
   if (!resourceId) {
     return [];
@@ -702,7 +741,7 @@ function pendingCandidatesForPayload(body) {
       continue;
     }
     const ref = { raw: entry.path, value: entry.path, kind: "pending" };
-    const resolved = resolveFileReference(ref);
+    const resolved = await resolveFileReference(ref);
     if (resolved) {
       out.push(resolved);
     }
@@ -1155,11 +1194,11 @@ function normalizeNativeToolFiles(files) {
   }));
 }
 
-function buildNativeUploadRequestBody(args) {
+async function buildNativeUploadRequestBody(args) {
   const rawFilePath = trimString(args && args.file_path);
   let fileCandidate = null;
   if (rawFilePath) {
-    fileCandidate = resolveFileReference({ raw: rawFilePath, value: rawFilePath, kind: "tool" });
+    fileCandidate = await resolveFileReference({ raw: rawFilePath, value: rawFilePath, kind: "tool" });
     if (!fileCandidate) {
       throw new Error(`file_path is not readable or not under an OpenClaw workspace: ${rawFilePath}`);
     }
@@ -1168,7 +1207,7 @@ function buildNativeUploadRequestBody(args) {
   const body = {};
 
   if (fileCandidate) {
-    const stat = safeStat(fileCandidate.path);
+    const stat = await safeStat(fileCandidate.path);
     const isDirectory = !!(stat && stat.isDirectory());
     const requestedType = trimString(args.type);
     body.type =
@@ -1177,15 +1216,15 @@ function buildNativeUploadRequestBody(args) {
         : requestedType || deliverableTypeForPath(fileCandidate.path, isDirectory);
     body.fileName = normalizeDeliverableFileName(args, fileCandidate.fileName);
     if (isDirectory) {
-      const files = collectDirectoryFiles(fileCandidate.path);
+      const files = await collectDirectoryFiles(fileCandidate.path);
       if (files.length === 0) {
         throw new Error(`directory has no uploadable files: ${fileCandidate.fileName}`);
       }
       body.files = files;
     } else if (isTextLikeFile(fileCandidate.path)) {
-      body.contentText = fs.readFileSync(fileCandidate.path, "utf8");
+      body.contentText = await fs.promises.readFile(fileCandidate.path, "utf8");
     } else {
-      body.contentBase64 = fs.readFileSync(fileCandidate.path).toString("base64");
+      body.contentBase64 = (await fs.promises.readFile(fileCandidate.path)).toString("base64");
     }
     return { body, isDirectory };
   }
@@ -1223,7 +1262,7 @@ function buildNativeUploadRequestBody(args) {
 }
 
 async function uploadDeliverable(args) {
-  const { body, isDirectory } = buildNativeUploadRequestBody(args || {});
+  const { body, isDirectory } = await buildNativeUploadRequestBody(args || {});
   const userId = payloadUserId(args) || "default";
   const groupId = payloadGroupId(args) || DEFAULT_GROUP_ID;
   const groupName = extractStringField(args || {}, ["group_name", "groupName", "group_subject", "groupSubject"]);
@@ -1274,7 +1313,7 @@ async function uploadCandidate(candidate, body) {
     return cached.result;
   }
 
-  const stat = safeStat(candidate.path);
+  const stat = await safeStat(candidate.path);
   if (!stat) {
     throw new Error(`file no longer exists: ${candidate.fileName}`);
   }
@@ -1286,7 +1325,7 @@ async function uploadCandidate(candidate, body) {
 
   let fileBuffers;
   if (stat.isDirectory()) {
-    const files = collectDirectoryFiles(candidate.path);
+    const files = await collectDirectoryFiles(candidate.path);
     if (files.length === 0) {
       throw new Error(`directory has no uploadable files: ${candidate.fileName}`);
     }
@@ -1298,7 +1337,7 @@ async function uploadCandidate(candidate, body) {
     if (stat.size > AUTO_UPLOAD_MAX_BYTES) {
       throw new Error(`file exceeds auto-upload limit: ${candidate.fileName}`);
     }
-    fileBuffers = [{ fileName, content: fs.readFileSync(candidate.path) }];
+    fileBuffers = [{ fileName, content: await fs.promises.readFile(candidate.path) }];
   }
 
   const response = await kbMultipartUpload(fileBuffers, {
@@ -1397,8 +1436,8 @@ async function autoUploadAndRewritePayload(body, api) {
     return body;
   }
   const refs = extractFileReferencesFromText(body.content);
-  const explicitCandidates = refs.map(resolveFileReference).filter(Boolean);
-  const candidates = dedupeCandidates(explicitCandidates.concat(pendingCandidatesForPayload(body)));
+  const explicitCandidates = (await Promise.all(refs.map(resolveFileReference))).filter(Boolean);
+  const candidates = dedupeCandidates(explicitCandidates.concat(await pendingCandidatesForPayload(body)));
   if (candidates.length === 0) {
     return body;
   }
@@ -2294,6 +2333,13 @@ const plugin = {
   name: "Deliverables",
   description: "Upload-first runtime guard for generated file deliverables.",
   register(api) {
+    // Warm the config cache once at startup so the synchronous read in
+    // loadDeliverableConfig() never lands on the message hot path.
+    try {
+      loadDeliverableConfig();
+    } catch (err) {
+      api.logger.warn?.(`[plugin-deliverables] config preload failed: ${err.message}`);
+    }
     installPalzFetchPatch(api);
 
     if (api && typeof api.registerTool === "function") {

package/openclaw-plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "plugin-deliverables",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "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.2.0",
+  "version": "1.2.2",
   "skills": ["./skills"],
   "configSchema": {
     "type": "object",

package/package.json

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