palz-connector 1.2.9 → 1.3.1

package/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "palz-connector",
   "name": "Palz Connector Channel",
-  "version": "1.2.9",
+  "version": "1.3.1",
   "description": "Palz IM 接入 OpenClaw",
   "channels": [
     "palz-connector"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "palz-connector",
-  "version": "1.2.9",
+  "version": "1.3.1",
   "type": "module",
   "main": "index.ts",
   "description": "Palz IM 接入 OpenClaw — 模块化架构，基于 OpenClaw Runtime 消息管道",

package/src/bot.ts

@@ -14,7 +14,7 @@ import { getPalzRuntime } from "./runtime.js";
 import { resolvePalzAccount } from "./config.js";
 import { tryClaimMessage } from "./dedup.js";
 import { createPalzReplyDispatcher } from "./reply-dispatcher.js";
-import { resolvePalzMediaList } from "./media.js";
+import { resolvePalzMediaList, resolveMediaLocalRoots } from "./media.js";
 import { tracer, trace, context, SpanStatusCode } from "./tracing.js";
 import type { PalzMessageEvent, OpenAIContent, ContentPart, TextContentPart, PalzMediaInfo } from "./types.js";
 
@@ -533,6 +533,17 @@ async function _dispatchPalzMessageInner(params: HandlePalzMessageParams): Promi
     CommandAuthorized: commandAuthorized,
     OriginatingChannel: "palz-connector",
     OriginatingTo: palzTo,
+    GroupSystemPrompt: [
+      "## File Sharing",
+      "When you create or generate a file that the user requested (documents, images, presentations, spreadsheets, archives, etc.), you MUST include a MEDIA: token in your reply so the file gets delivered to the user.",
+      "Always write your normal text reply first (description, summary, or explanation), then append the MEDIA: line(s) at the end.",
+      "Format: place `MEDIA: <absolute-file-path>` on its own line at the end of your reply.",
+      "Example:",
+      "  Here is the presentation you requested. It includes 5 slides covering the main topics.",
+      "  MEDIA: /path/to/workspace/output.pptx",
+      "Without the MEDIA: line, the user only sees text and cannot download the file.",
+      "Multiple files: one MEDIA: line per file.",
+    ].join("\n"),
     ...mediaPayload,
   });
   const step6bOutput = `[STEP 6b 输出] finalized context keys=[${Object.keys(ctx).join(",")}] CommandAuthorized=${ctx.CommandAuthorized}`;
@@ -568,6 +579,7 @@ async function _dispatchPalzMessageInner(params: HandlePalzMessageParams): Promi
     msgId: msg.msg_id,
     msgType: msg.msg_type,
     groupId,
+    mediaLocalRoots: resolveMediaLocalRoots(effectiveAgentId),
   });
 
   // STEP 6d: 分发消息给 AI

package/src/channel.ts

@@ -72,7 +72,7 @@ export const palzPlugin = {
 
   agentPrompt: {
     messageToolHints: () => [
-      "- Palz targeting: omit `target` to reply to the current conversation (auto-inferred). Explicit targets: `<senderId>:<conversationId>`.",
+      "- Palz targeting: DO NOT set `target` — always omit it so the system auto-infers the correct conversation. Never use sender_id or conversation_id alone as target. If you must specify an explicit target, the only valid format is `<senderId>:<conversationId>`.",
     ],
   },
 

package/src/media.ts

@@ -18,6 +18,23 @@ import { uploadFileToOss, uploadBufferToOss } from "./oss.js";
 
 /** OpenClaw 允许访问的媒体目录 */
 const MEDIA_DIR = path.join(os.homedir(), ".openclaw", "media");
+const STATE_DIR = path.join(os.homedir(), ".openclaw");
+
+/**
+ * 根据 agentId 构造媒体文件搜索根路径列表，
+ * 与 OpenClaw 的 getAgentScopedMediaLocalRoots 逻辑对齐。
+ */
+export function resolveMediaLocalRoots(agentId?: string): string[] {
+  const roots = [MEDIA_DIR, path.join(STATE_DIR, "workspace"), path.join(STATE_DIR, "sandboxes")];
+  if (agentId?.trim()) {
+    // workspace-{agentId} 形式（非 default agent，或 main 作为非 default 时）
+    const workspaceDirById = path.join(STATE_DIR, `workspace-${agentId}`);
+    if (!roots.includes(workspaceDirById)) {
+      roots.push(workspaceDirById);
+    }
+  }
+  return roots;
+}
 
 function saveBufferToMediaDir(
   buffer: Buffer,
@@ -205,11 +222,13 @@ export async function resolvePalzMediaList(
 export async function loadMediaAsOssUrl(
   mediaUrl: string,
   log?: (...args: any[]) => void,
+  localRoots?: readonly string[],
 ): Promise<string | null> {
   log?.(`palz-media: [loadAsOssUrl] 输入: url=${mediaUrl.slice(0, 200)}`);
 
   if (
     mediaUrl.startsWith("https://oss.csaiagent.com/") ||
+    mediaUrl.startsWith("https://claw.csaiagent.com") ||
     mediaUrl.startsWith("https://cstv-data.oss-cn-beijing.aliyuncs.com/")
   ) {
     log?.(`palz-media: [loadAsOssUrl] 已是OSS链接, 直接返回`);
@@ -241,7 +260,25 @@ export async function loadMediaAsOssUrl(
 
   // 本地文件路径（绝对或相对）→ 上传到 OSS
   const rawPath = mediaUrl.replace(/^MEDIA:/, "");
-  let filePath = path.isAbsolute(rawPath) ? rawPath : path.resolve(rawPath);
+  let filePath = path.isAbsolute(rawPath) ? rawPath : "";
+
+  // 相对路径：在 localRoots 中逐个查找
+  if (!filePath && localRoots && localRoots.length > 0) {
+    for (const root of localRoots) {
+      const candidate = path.resolve(root, rawPath);
+      if (fs.existsSync(candidate)) {
+        log?.(`palz-media: [loadAsOssUrl] 在localRoot找到: root=${root} → ${candidate}`);
+        filePath = candidate;
+        break;
+      }
+    }
+  }
+
+  // 兜底：cwd 解析
+  if (!filePath) {
+    filePath = path.resolve(rawPath);
+  }
+
   if (!fs.existsSync(filePath)) {
     const fallback = path.join(MEDIA_DIR, path.basename(filePath));
     if (fs.existsSync(fallback)) {

package/src/oss.ts

@@ -52,12 +52,13 @@ export async function uploadFileToOss(
   try {
     const client = getOssClient();
     const ext = path.extname(localPath) || ".png";
-    const objectName = `${OSS_UPLOAD_PREFIX}/${Date.now()}_${Math.random().toString(36).slice(2, 8)}${ext}`;
+    const baseName = path.basename(localPath, ext);
+    const objectName = `${OSS_UPLOAD_PREFIX}/${baseName}_${Date.now()}_${Math.random().toString(36).slice(2, 8)}${ext}`;
 
     const fileBuffer = fs.readFileSync(localPath);
     await client.put(objectName, fileBuffer);
 
-    const fileUrl = `https://${OSS_CUSTOM_DOMAIN}/${objectName}`;
+    const fileUrl = `https://${OSS_CUSTOM_DOMAIN}/${objectName.split('/').map(s => encodeURIComponent(s)).join('/')}`;
     log?.(`palz-oss: [upload] 成功: objectName=${objectName} url=${fileUrl}`);
     return fileUrl;
   } catch (err: any) {

package/src/outbound.ts

@@ -14,6 +14,18 @@ import type { ContentPart, TextContentPart, OpenAIContent } from "./types.js";
 export const palzOutbound = {
   deliveryMode: "direct" as const,
 
+  resolveTarget: (params: { to?: string; mode?: string }) => {
+    const to = params.to?.trim();
+    if (!to) {
+      return { ok: false as const, error: new Error("Palz target is required. Format: <senderId>:<conversationId> or chat:<conversationId>") };
+    }
+    // Must contain ":" — bare sender_id or bare conversation_id is invalid
+    if (!to.includes(":")) {
+      return { ok: false as const, error: new Error(`Invalid Palz target "${to}": must be <senderId>:<conversationId> or chat:<conversationId>. A bare ID without ":" is not a valid target.`) };
+    }
+    return { ok: true as const, to };
+  },
+
   sendText: async (ctx: any) => {
     const { cfg, to, text, accountId } = ctx;
     const log = typeof ctx.log === "function" ? ctx.log : console.log;
@@ -37,7 +49,7 @@ export const palzOutbound = {
   },
 
   sendMedia: async (ctx: any) => {
-    const { cfg, to, text, mediaUrl, accountId } = ctx;
+    const { cfg, to, text, mediaUrl, accountId, mediaLocalRoots } = ctx;
     const log = typeof ctx.log === "function" ? ctx.log : console.log;
 
     const account = resolvePalzAccount({ cfg, accountId });
@@ -52,7 +64,7 @@ export const palzOutbound = {
     }
 
     if (mediaUrl) {
-      const ossUrl = await loadMediaAsOssUrl(mediaUrl, log);
+      const ossUrl = await loadMediaAsOssUrl(mediaUrl, log, mediaLocalRoots);
       if (ossUrl) {
         contentParts.push({ type: "file", file_url: { url: ossUrl } });
         log(`palz-outbound: [sendMedia] 媒体转换成功: ossUrl=${ossUrl}`);

package/src/reply-dispatcher.ts

@@ -43,6 +43,7 @@ export interface CreatePalzReplyDispatcherParams {
   msgId: string;
   msgType?: string;
   groupId?: string;
+  mediaLocalRoots?: readonly string[];
 }
 
 export function createPalzReplyDispatcher(params: CreatePalzReplyDispatcherParams) {
@@ -59,6 +60,7 @@ export function createPalzReplyDispatcher(params: CreatePalzReplyDispatcherParam
     msgId,
     msgType,
     groupId,
+    mediaLocalRoots,
   } = params;
 
   const log = typeof runtime?.log === "function" ? runtime.log : console.log;
@@ -125,7 +127,7 @@ export function createPalzReplyDispatcher(params: CreatePalzReplyDispatcherParam
 
         for (let i = 0; i < mediaUrls.length; i++) {
           log(`${tag}: [DELIVER 媒体] ${i + 1}/${mediaUrls.length} url=${mediaUrls[i].slice(0, 200)}`);
-          const ossUrl = await loadMediaAsOssUrl(mediaUrls[i], log);
+          const ossUrl = await loadMediaAsOssUrl(mediaUrls[i], log, mediaLocalRoots);
           if (ossUrl) {
             contentParts.push({ type: "file", file_url: { url: ossUrl } });
             log(`${tag}: [DELIVER 媒体转换成功] ${i + 1}/${mediaUrls.length} ossUrl=${ossUrl}`);