adp-openclaw 0.0.68 → 0.0.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adp-openclaw",
-  "version": "0.0.68",
+  "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)