adp-openclaw 0.0.67 → 0.0.69

package/package.json

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

package/src/session-history.ts

@@ -498,9 +498,10 @@ export async function getMergedChatHistory(
   options?: {
     limit?: number;
     log?: PluginLogger;
+    filterAfterNewSession?: boolean;  // Default true: filter out messages before last /new
   },
 ): Promise<ChatHistoryResponse> {
-  const { limit = 200, log } = options ?? {};
+  const { limit = 200, log, filterAfterNewSession = true } = options ?? {};
   
   // Build both old and new session key formats
   const oldSessionKey = `agent:main:direct:${conversationId}`;
@@ -511,6 +512,7 @@ export async function getMergedChatHistory(
   log?.info?.(`[session-history] New sessionKey: ${newSessionKey}`);
   
   // Fetch history from both session keys in parallel
+  // Note: getChatHistory already applies filterAfterNewSession for each session individually
   const [oldResult, newResult] = await Promise.all([
     getChatHistory(oldSessionKey, { limit, log }).catch((err) => {
       log?.debug?.(`[session-history] Failed to fetch old session history: ${err}`);
@@ -537,7 +539,7 @@ export async function getMergedChatHistory(
   
   // Deduplicate by message id (if available) or content+timestamp
   const seen = new Set<string>();
-  const dedupedMessages = allMessages.filter((msg) => {
+  let dedupedMessages = allMessages.filter((msg) => {
     // Create a unique key for deduplication
     const key = msg.id || `${msg.role}:${msg.timestamp}:${msg.content.slice(0, 100)}`;
     if (seen.has(key)) {
@@ -547,6 +549,13 @@ export async function getMergedChatHistory(
     return true;
   });
   
+  // Filter out messages before the last /new session on the MERGED result
+  // This is important because the /new might be in the old sessionKey but we still
+  // want to filter the combined history based on the latest /new across both sessions
+  if (filterAfterNewSession) {
+    dedupedMessages = filterMessagesAfterLastNewSession(dedupedMessages, log);
+  }
+  
   // Apply limit (return last N messages if exceeds limit)
   const limitedMessages = dedupedMessages.length > limit
     ? dedupedMessages.slice(-limit)
@@ -761,6 +770,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 +827,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 +864,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 +881,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,