@marshulll/openclaw-wecom 0.1.24 → 0.1.25

package/README.en.md

@@ -94,6 +94,7 @@ Install guide: `docs/INSTALL.md`
   - Directories are zipped automatically
   - Example: `/sendfile /tmp/openclaw-wecom /home/shu/Desktop/report.pdf`
   - Natural language also works: "send me this file image-xxx.jpg" (default match in `media.tempDir`)
+  - If multiple matches are found, a list will be returned for confirmation
 
 ## Media auto recognition (optional)
 - **Voice send/receive does NOT require API**; only auto transcription needs an OpenAI-compatible API

package/README.md

@@ -96,6 +96,7 @@ openclaw gateway restart
   - 支持目录：自动打包为 zip 后发送
   - 示例：`/sendfile /tmp/openclaw-wecom /home/shu/Desktop/report.pdf`
   - 也支持自然语言：`把这个文件发给我 image-xxx.jpg`（默认仅在 `media.tempDir` 内匹配）
+  - 多文件会先返回列表，回复“全部”或序号再发送
 
 ## 多媒体自动识别（可选）
 - **语音收发不需要 API**，只有开启“语音自动转写”才需要 OpenAI 兼容接口

package/README.zh.md

@@ -96,6 +96,7 @@ openclaw gateway restart
   - 支持目录：自动打包为 zip 后发送
   - 示例：`/sendfile /tmp/openclaw-wecom /home/shu/Desktop/report.pdf`
   - 也支持自然语言：`把这个文件发给我 image-xxx.jpg`（默认仅在 `media.tempDir` 内匹配）
+  - 多文件会先返回列表，回复“全部”或序号再发送
 
 ## 多媒体自动识别（可选）
 - **语音收发不需要 API**，只有开启“语音自动转写”才需要 OpenAI 兼容接口

package/docs/INSTALL.md

@@ -132,6 +132,7 @@ openclaw gateway restart
 - `/sendfile` 仅支持 **服务器绝对路径**
 - 目录会自动打包为 zip 再发送
 - 自然语言也可触发：`把这个文件发给我 image-xxx.jpg`（默认仅在 `media.tempDir` 内匹配）
+  - 如匹配多个文件，会返回列表让你确认（回复“全部”或序号）
 
 示例：
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marshulll/openclaw-wecom",
-  "version": "0.1.24",
+  "version": "0.1.25",
   "type": "module",
   "description": "OpenClaw WeCom channel plugin (intelligent bot + internal app)",
   "author": "OpenClaw",

package/wecom/src/wecom-app.ts

@@ -2,7 +2,7 @@ import type { IncomingMessage, ServerResponse } from "node:http";
 import crypto from "node:crypto";
 import { XMLParser } from "fast-xml-parser";
 import { appendFile, mkdir, readFile, readdir, rm, stat, writeFile } from "node:fs/promises";
-import { tmpdir } from "node:os";
+import { homedir, tmpdir } from "node:os";
 import { basename, dirname, extname, join } from "node:path";
 
 import type { WecomWebhookTarget } from "./monitor.js";
@@ -135,6 +135,28 @@ function resolveSendIntervalMs(target: WecomWebhookTarget): number {
   return typeof interval === "number" && interval >= 0 ? interval : 400;
 }
 
+type PendingSendList = {
+  items: { name: string; path: string }[];
+  dirLabel: string;
+  createdAt: number;
+  expiresAt: number;
+};
+
+const pendingSendLists = new Map<string, PendingSendList>();
+const PENDING_TTL_MS = 10 * 60 * 1000;
+const MAX_LIST_PREVIEW = 30;
+
+function pendingKey(fromUser: string, chatId?: string): string {
+  return chatId ? `${fromUser}::${chatId}` : fromUser;
+}
+
+function prunePendingLists(): void {
+  const now = Date.now();
+  for (const [key, entry] of pendingSendLists.entries()) {
+    if (entry.expiresAt <= now) pendingSendLists.delete(key);
+  }
+}
+
 function extractFilenameCandidates(text: string): string[] {
   const candidates = new Set<string>();
   const normalized = text.replace(/[，,；;|]/g, " ");
@@ -146,6 +168,52 @@ function extractFilenameCandidates(text: string): string[] {
   return Array.from(candidates);
 }
 
+function extractExtension(text: string): string | null {
+  const match = text.match(/(?:\.|格式|后缀)?\s*([A-Za-z0-9]{2,8})/i);
+  if (!match) return null;
+  const ext = match[1]?.toLowerCase();
+  if (!ext) return null;
+  const allowed = new Set([
+    "png", "jpg", "jpeg", "gif", "bmp", "webp",
+    "pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx",
+    "zip", "rar", "7z",
+    "txt", "log", "csv", "json", "xml", "yaml", "yml",
+    "mp3", "wav", "amr", "mp4", "mov",
+  ]);
+  return allowed.has(ext) ? ext : null;
+}
+
+function resolveSearchDir(text: string, target: WecomWebhookTarget): { path: string; label: string } {
+  const lower = text.toLowerCase();
+  if (text.includes("桌面")) return { path: join(homedir(), "Desktop"), label: "桌面" };
+  if (text.includes("下载") || lower.includes("download")) return { path: join(homedir(), "Downloads"), label: "下载" };
+  if (text.includes("临时") || lower.includes("tmp")) return { path: resolveMediaTempDir(target), label: "临时目录" };
+  return { path: resolveMediaTempDir(target), label: "临时目录" };
+}
+
+function parseSelection(text: string, items: { name: string; path: string }[]): { name: string; path: string }[] | null {
+  const trimmed = text.trim();
+  if (!trimmed) return null;
+  if (/全部|都要|全都|都给我/.test(trimmed)) return items;
+  const picked: { name: string; path: string }[] = [];
+  const numbers = Array.from(trimmed.matchAll(/\d+/g)).map((m) => Number(m[0]));
+  if (numbers.length > 0) {
+    for (const idx of numbers) {
+      const item = items[idx - 1];
+      if (item) picked.push(item);
+    }
+  }
+  const names = extractFilenameCandidates(trimmed);
+  if (names.length > 0) {
+    const map = new Map(items.map((item) => [item.name, item]));
+    for (const name of names) {
+      const item = map.get(name);
+      if (item) picked.push(item);
+    }
+  }
+  return picked.length > 0 ? picked : null;
+}
+
 async function tryHandleNaturalFileSend(params: {
   target: WecomWebhookTarget;
   text: string;
@@ -155,41 +223,69 @@ async function tryHandleNaturalFileSend(params: {
 }): Promise<boolean> {
   const { target, text, fromUser, chatId, isGroup } = params;
   if (!text || text.trim().startsWith("/")) return false;
+  prunePendingLists();
+  const key = pendingKey(fromUser, chatId);
+  const pending = pendingSendLists.get(key);
+  if (pending) {
+    const selection = parseSelection(text, pending.items);
+    if (selection) {
+      pendingSendLists.delete(key);
+      await sendFilesByPath({ target, fromUser, chatId, isGroup, items: selection });
+      return true;
+    }
+  }
+
   if (!/(发给我|发送给我|发我|给我)/.test(text)) return false;
   const names = extractFilenameCandidates(text);
-  if (names.length === 0) return false;
+  const ext = extractExtension(text);
+  if (names.length === 0 && !ext) return false;
 
-  const tempDir = resolveMediaTempDir(target);
+  const searchDir = resolveSearchDir(text, target);
   let dirEntries: string[] = [];
   try {
-    dirEntries = await readdir(tempDir);
+    dirEntries = await readdir(searchDir.path);
   } catch {
     dirEntries = [];
   }
   const dirSet = new Set(dirEntries);
 
-  const resolved: string[] = [];
+  const resolved: { name: string; path: string }[] = [];
   const missing: string[] = [];
-  for (const name of names) {
-    let fullPath = "";
-    if (name.startsWith("/")) {
-      fullPath = name;
-    } else if (dirSet.has(name)) {
-      fullPath = join(tempDir, name);
-    }
-    if (!fullPath) {
-      missing.push(name);
-      continue;
-    }
-    try {
-      const info = await stat(fullPath);
-      if (info.isFile()) {
-        resolved.push(fullPath);
-      } else {
+  if (names.length > 0) {
+    for (const name of names) {
+      let fullPath = "";
+      if (name.startsWith("/")) {
+        fullPath = name;
+      } else if (dirSet.has(name)) {
+        fullPath = join(searchDir.path, name);
+      }
+      if (!fullPath) {
         missing.push(name);
+        continue;
+      }
+      try {
+        const info = await stat(fullPath);
+        if (info.isFile()) {
+          resolved.push({ name: basename(fullPath), path: fullPath });
+        } else {
+          missing.push(name);
+        }
+      } catch {
+        missing.push(name);
+      }
+    }
+  } else if (ext) {
+    for (const entry of dirEntries) {
+      if (!entry.toLowerCase().endsWith(`.${ext}`)) continue;
+      const fullPath = join(searchDir.path, entry);
+      try {
+        const info = await stat(fullPath);
+        if (info.isFile()) {
+          resolved.push({ name: entry, path: fullPath });
+        }
+      } catch {
+        // ignore
       }
-    } catch {
-      missing.push(name);
     }
   }
 
@@ -204,25 +300,55 @@ async function tryHandleNaturalFileSend(params: {
     return true;
   }
 
+  if (resolved.length === 1) {
+    await sendFilesByPath({ target, fromUser, chatId, isGroup, items: resolved });
+    return true;
+  }
+
+  const preview = resolved.slice(0, MAX_LIST_PREVIEW)
+    .map((item, idx) => `${idx + 1}. ${item.name}`)
+    .join("\n");
+  const tail = resolved.length > MAX_LIST_PREVIEW ? `\n…共 ${resolved.length} 个文件` : "";
+  pendingSendLists.set(key, {
+    items: resolved,
+    dirLabel: searchDir.label,
+    createdAt: Date.now(),
+    expiresAt: Date.now() + PENDING_TTL_MS,
+  });
+  await sendWecomText({
+    account: target.account,
+    toUser: fromUser,
+    chatId: isGroup ? chatId : undefined,
+    text: `在${searchDir.label}找到 ${resolved.length} 个文件：\n${preview}${tail}\n\n回复“全部”或“1 3 5”或直接发送具体文件名。`,
+  });
+  return true;
+}
+
+async function sendFilesByPath(params: {
+  target: WecomWebhookTarget;
+  fromUser: string;
+  chatId?: string;
+  isGroup: boolean;
+  items: { name: string; path: string }[];
+}): Promise<void> {
+  const { target, fromUser, chatId, isGroup, items } = params;
   const maxBytes = resolveMediaMaxBytes(target);
   const intervalMs = resolveSendIntervalMs(target);
   let sent = 0;
   const failed: string[] = [];
-
-  for (const path of resolved) {
+  for (const item of items) {
     try {
-      const info = await stat(path);
+      const info = await stat(item.path);
       if (maxBytes && info.size > maxBytes) {
-        failed.push(`${basename(path)}(过大)`);
+        failed.push(`${item.name}(过大)`);
         continue;
       }
-      const buffer = await readFile(path);
-      const filename = basename(path) || "file.bin";
+      const buffer = await readFile(item.path);
       const mediaId = await uploadWecomMedia({
         account: target.account,
         type: "file",
         buffer,
-        filename,
+        filename: item.name,
       });
       await sendWecomFile({
         account: target.account,
@@ -236,31 +362,29 @@ async function tryHandleNaturalFileSend(params: {
         accountId: target.account.accountId,
         toUser: fromUser,
         chatId,
-        path,
+        path: item.path,
         size: info.size,
       });
       if (intervalMs) await sleep(intervalMs);
     } catch (err) {
-      failed.push(basename(path));
+      failed.push(item.name);
       await appendOperationLog(target, {
         action: "natural-sendfile",
         accountId: target.account.accountId,
         toUser: fromUser,
         chatId,
-        path,
+        path: item.path,
         error: String(err),
       });
     }
   }
-
-  const summary = `已发送 ${sent} 个文件${failed.length ? `，失败：${failed.join(", ")}` : ""}${missing.length ? `，未找到：${missing.join(", ")}` : ""}`;
+  const summary = `已发送 ${sent} 个文件${failed.length ? `，失败：${failed.join(", ")}` : ""}`;
   await sendWecomText({
     account: target.account,
     toUser: fromUser,
     chatId: isGroup ? chatId : undefined,
     text: summary,
   });
-  return true;
 }
 
 async function appendOperationLog(target: WecomWebhookTarget, entry: Record<string, unknown>): Promise<void> {