adp-openclaw 0.0.50 → 0.0.52

package/index.ts

@@ -97,12 +97,21 @@ const plugin = {
     
     setAdpOpenclawRuntime(api.runtime);
     
-    // Register the ADP file upload tool
-    // This allows AI to send files to users via ADP storage
-    console.log(`[adp-openclaw] Registering tool: ${ADP_UPLOAD_TOOL_NAME}`);
-    api.logger.info?.(`[adp-openclaw] Registering tool: ${ADP_UPLOAD_TOOL_NAME}`);
+    // Register the ADP file upload tool as a factory function
+    // Using a factory so the tool is only available when the message originates from the ADP channel.
+    // This prevents other channels (e.g. DingTalk) with multimodal models from picking up this tool.
+    console.log(`[adp-openclaw] Registering tool factory: ${ADP_UPLOAD_TOOL_NAME}`);
+    api.logger.info?.(`[adp-openclaw] Registering tool factory: ${ADP_UPLOAD_TOOL_NAME}`);
     
-    api.registerTool({
+    api.registerTool((ctx: { messageChannel?: string; [key: string]: unknown }) => {
+      // Only expose this tool when the message comes from the adp-openclaw channel
+      const channel = ctx.messageChannel ?? "";
+      if (channel && channel !== "adp-openclaw") {
+        api.logger.debug?.(`[adp-openclaw] Skipping ${ADP_UPLOAD_TOOL_NAME} for channel: ${channel}`);
+        return null;
+      }
+
+      return {
       name: ADP_UPLOAD_TOOL_NAME,
       description: 
         "If you can see this tool description, you are connected to the ADP server. " +
@@ -238,7 +247,8 @@ const plugin = {
           isError: false,
         };
       },
-    });
+    }; // end of tool object
+    }); // end of factory function passed to registerTool
     
     // Log tool registration success
     console.log(`[adp-openclaw] Tool ${ADP_UPLOAD_TOOL_NAME} registered successfully`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adp-openclaw",
-  "version": "0.0.50",
+  "version": "0.0.52",
   "description": "ADP-OpenClaw demo channel plugin (Go WebSocket backend)",
   "type": "module",
   "dependencies": {

package/src/adp-upload-tool.ts

@@ -518,7 +518,7 @@ export const ADP_UPLOAD_TOOL_NAME = "adp_upload_file";
 
 const ADP_UPLOAD_TOOL_SCHEMA_TITLE = "ADP file upload";
 const ADP_UPLOAD_TOOL_SCHEMA_DESCRIPTION = 
-  "Upload local files from this machine to ADP storage. If the call succeeds, the files are uploaded and signed download URLs are returned. The user can access the files via these URLs.";
+  "Upload local files from this machine to ADP storage. If the call succeeds, the files are uploaded and signed download URLs are returned. The user can access the files via these URLs. IMPORTANT: When presenting download links to users, format them as clickable Markdown links like [filename](url), do NOT wrap URLs in code blocks or backticks.";
 const ADP_UPLOAD_TOOL_PATHS_DESCRIPTION = 
   "Local filesystem paths only (1-10 total). Any file type is accepted, including text, images, documents, PDFs, archives, and binary files. Use absolute or workspace-relative local paths that are readable files.";
 
@@ -659,6 +659,8 @@ export interface UploadedFileInfo {
 export interface AdpUploadToolResult {
   ok: boolean;
   files?: UploadedFileInfo[];
+  /** 预格式化的消息，AI 可以直接展示给用户（不要用代码块包装） */
+  message?: string;
   error?: {
     code: number;
     message: string;
@@ -769,9 +771,16 @@ export const uploadFilesToAdpEndpoint = async (
       }
     );
 
+    // 构建预格式化的消息，告诉 AI 如何展示给用户
+    const formattedLinks = uploadResults.map(f => 
+      `- [${f.name}](${f.downloadUrl})`
+    ).join("\n");
+    const message = `Files uploaded successfully. Present these download links to the user as clickable Markdown links (do NOT use code blocks):\n${formattedLinks}`;
+
     return {
       ok: true,
       files: uploadResults,
+      message,
     };
   } catch (error) {
     return {

package/src/channel.ts

@@ -219,42 +219,78 @@ export const adpOpenclawPlugin: ChannelPlugin<ResolvedAdpOpenclawAccount> = {
       });
     },
   },
-  // Outbound message support for the "message" tool
+  // Outbound message support for the "message" tool and cron tasks
   outbound: {
-    send: async ({ text, to, log }) => {
+    deliveryMode: "direct",
+    
+    // Send text message
+    sendText: async (ctx) => {
+      const { to, text } = ctx;
       const ws = getActiveWebSocket();
+      
       if (!ws) {
-        log?.error?.("[adp-openclaw] No active WebSocket connection for outbound message");
-        return { ok: false, error: "No active WebSocket connection" };
+        console.error("[adp-openclaw] No active WebSocket connection for outbound message");
+        throw new Error("No active WebSocket connection");
       }
       
-      // Parse target: expected format is "adp-openclaw:{userId}" or "adp-openclaw:bot"
-      // The "to" parameter comes from the message tool with format like "adp-openclaw:user123"
+      // Parse target: expected format is "adp-openclaw:{userId}" or just "{userId}"
       const targetParts = to.split(":");
       const targetUserId = targetParts.length > 1 ? targetParts.slice(1).join(":") : to;
       
-      log?.info?.(`[adp-openclaw] Sending outbound message to ${targetUserId}: ${text.slice(0, 50)}...`);
+      console.log(`[adp-openclaw] Sending outbound text to ${targetUserId}: ${text.slice(0, 50)}...`);
+      
+      // Generate unique request ID
+      const requestId = `outbound-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+      
+      const outMsg = {
+        type: "outbound",
+        requestId,
+        payload: {
+          to: targetUserId,
+          text: text,
+        },
+        timestamp: Date.now(),
+      };
+      
+      ws.send(JSON.stringify(outMsg));
+      return { channel: "adp-openclaw", messageId: requestId };
+    },
+    
+    // Send media message (text with optional media URL)
+    sendMedia: async (ctx) => {
+      const { to, text, mediaUrl } = ctx;
+      const ws = getActiveWebSocket();
       
-      try {
-        // Generate unique request ID
-        const requestId = `outbound-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-        
-        const outMsg = {
-          type: "outbound",
-          requestId,
-          payload: {
-            to: targetUserId,
-            text: text,
-          },
-          timestamp: Date.now(),
-        };
-        
-        ws.send(JSON.stringify(outMsg));
-        return { ok: true };
-      } catch (err) {
-        log?.error?.(`[adp-openclaw] Failed to send outbound message: ${err}`);
-        return { ok: false, error: String(err) };
+      if (!ws) {
+        console.error("[adp-openclaw] No active WebSocket connection for outbound media");
+        throw new Error("No active WebSocket connection");
       }
+      
+      // Parse target
+      const targetParts = to.split(":");
+      const targetUserId = targetParts.length > 1 ? targetParts.slice(1).join(":") : to;
+      
+      console.log(`[adp-openclaw] Sending outbound media to ${targetUserId}: ${text.slice(0, 50)}... (media: ${mediaUrl || "none"})`);
+      
+      // Generate unique request ID
+      const requestId = `outbound-media-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+      
+      // Combine text and media URL if present
+      const finalText = mediaUrl ? `${text}\n\n📎 ${mediaUrl}` : text;
+      
+      const outMsg = {
+        type: "outbound",
+        requestId,
+        payload: {
+          to: targetUserId,
+          text: finalText,
+          mediaUrl: mediaUrl,
+        },
+        timestamp: Date.now(),
+      };
+      
+      ws.send(JSON.stringify(outMsg));
+      return { channel: "adp-openclaw", messageId: requestId };
     },
   },
 };