adp-openclaw 0.0.66 → 0.0.68

package/package.json

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

package/src/monitor.ts

@@ -390,7 +390,7 @@ async function connectAndHandle(params: ConnectParams): Promise<void> {
 
               // Build delivery target for cron jobs
               // Format: adp-openclaw:{userId} for direct delivery via this channel
-              const cronDeliveryTarget = `adp-openclaw:${userIdentifier}`;
+              const cronDeliveryTarget = `${userIdentifier}`;
               const nowMs = Date.now();
 
               // Build BodyForAgent with context info for cron jobs (like QQBot does)
@@ -791,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,

package/src/session-history.ts

@@ -761,6 +761,53 @@ async function executeClawCommand(
   });
 }
 
+/**
+ * Filter messages to only include those after the last /new or session reset.
+ * This handles the case where OpenClaw returns old session history after a /new command.
+ * 
+ * We look for messages containing "New session started" which is the indicator
+ * that a new session was started via /new or /reset command.
+ */
+function filterMessagesAfterLastNewSession(
+  messages: OpenClawMessage[],
+  log?: PluginLogger,
+): OpenClawMessage[] {
+  if (messages.length === 0) {
+    return messages;
+  }
+  
+  // Find the index of the last "New session started" message
+  // This message is typically from the assistant after processing /new
+  let lastNewSessionIndex = -1;
+  
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const msg = messages[i];
+    // Check for the "New session started" indicator from OpenClaw
+    // This appears in assistant messages after /new command
+    if (
+      msg.role === "assistant" &&
+      msg.content &&
+      (msg.content.includes("New session started") || 
+       msg.content.includes("✅ New session started"))
+    ) {
+      lastNewSessionIndex = i;
+      break;
+    }
+  }
+  
+  if (lastNewSessionIndex === -1) {
+    // No /new found, return all messages
+    log?.debug?.(`[session-history] No "New session started" marker found, returning all ${messages.length} messages`);
+    return messages;
+  }
+  
+  // Return messages from the last "New session started" onwards
+  const filteredMessages = messages.slice(lastNewSessionIndex);
+  log?.info?.(`[session-history] Filtered messages after last /new: ${messages.length} -> ${filteredMessages.length} messages`);
+  
+  return filteredMessages;
+}
+
 /**
  * Get chat history via CLI command
  * Uses: openclaw gateway call chat.history --params '{"sessionKey":"<key>","limit":<n>}' --json
@@ -771,9 +818,10 @@ export async function getOpenClawChatHistoryViaCli(
     limit?: number;
     log?: PluginLogger;
     gatewayUrl?: string;
+    filterAfterNewSession?: boolean;  // Default true: filter out messages before last /new
   },
 ): Promise<ChatHistoryResponse> {
-  const { limit = 200, log, gatewayUrl } = options ?? {};
+  const { limit = 200, log, gatewayUrl, filterAfterNewSession = true } = options ?? {};
   
   log?.info?.(`[session-history] Fetching chat history via CLI for session: ${sessionKey}`);
   
@@ -807,9 +855,10 @@ export async function getOpenClawChatHistoryViaCli(
         id?: string;
         timestamp?: string;
       }>;
+      sessionId?: string;  // OpenClaw may return the current sessionId
     };
     
-    const messages: OpenClawMessage[] = (parsed.messages ?? []).map((msg) => ({
+    let messages: OpenClawMessage[] = (parsed.messages ?? []).map((msg) => ({
       role: msg.role as "user" | "assistant" | "system",
       content: typeof msg.content === "string"
         ? msg.content
@@ -823,6 +872,12 @@ export async function getOpenClawChatHistoryViaCli(
     
     log?.info?.(`[session-history] Got ${messages.length} messages via CLI`);
     
+    // Filter out messages before the last /new session if enabled
+    // This handles the case where OpenClaw returns old session history
+    if (filterAfterNewSession) {
+      messages = filterMessagesAfterLastNewSession(messages, log);
+    }
+    
     return {
       sessionKey,
       messages,