adp-openclaw 0.0.65 → 0.0.67

package/package.json

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

package/src/monitor.ts

@@ -388,8 +388,29 @@ async function connectAndHandle(params: ConnectParams): Promise<void> {
                 envelope: envelopeOptions,
               });
 
+              // Build delivery target for cron jobs
+              // Format: adp-openclaw:{userId} for direct delivery via this channel
+              const cronDeliveryTarget = `${userIdentifier}`;
+              const nowMs = Date.now();
+
+              // Build BodyForAgent with context info for cron jobs (like QQBot does)
+              // This tells AI how to set up cron job delivery parameters
+              const contextInfo = `你正在通过 ADP-OpenClaw 与用户对话。
+
+【会话上下文】
+- 用户: ${inMsg.user?.username || inMsg.from} (${userIdentifier})
+- 场景: 私聊
+- 当前时间戳(ms): ${nowMs}
+- 定时提醒投递地址: channel=adp-openclaw, to=${cronDeliveryTarget}`;
+
+              // If message is a command (starts with /), don't inject context
+              const agentBody = inMsg.text.startsWith("/")
+                ? inMsg.text
+                : `${contextInfo}\n\n${inMsg.text}`;
+
               const ctx = runtime.channel.reply.finalizeInboundContext({
                 Body: formattedBody,
+                BodyForAgent: agentBody, // AI sees this context with cron delivery info
                 RawBody: inMsg.text,
                 CommandBody: inMsg.text,
                 // User identity: format as "adp-openclaw:{tenantId}:{userId}" for multi-tenant support
@@ -770,8 +791,23 @@ async function connectAndHandle(params: ConnectParams): Promise<void> {
               
               let result: ChatHistoryResponse;
               
-              if (historyPayload.sessionKey) {
-                // If sessionKey is provided directly, use it as-is
+              // Check if sessionKey is in old format: agent:main:direct:{id}
+              // We need to extract the id and merge old + new format histories
+              const oldFormatMatch = historyPayload.sessionKey?.match(/^agent:main:direct:(.+)$/);
+              
+              if (oldFormatMatch) {
+                // Old format sessionKey detected, need to merge with new format
+                // Old: agent:main:direct:{conversationId}
+                // New: agent:main:adp-openclaw:direct:{conversationId}
+                const extractedId = oldFormatMatch[1];
+                log?.info(`[adp-openclaw] Old format sessionKey detected, extracting id: ${extractedId}`);
+                log?.info(`[adp-openclaw] Merging old and new session histories for id: ${extractedId}`);
+                result = await getMergedChatHistory(extractedId, {
+                  limit,
+                  log,
+                });
+              } else if (historyPayload.sessionKey) {
+                // Non-old-format sessionKey, use directly
                 log?.info(`[adp-openclaw] Using provided sessionKey: ${historyPayload.sessionKey}`);
                 result = await getChatHistory(historyPayload.sessionKey, {
                   limit,