@humanlikememory/human-like-mem 0.3.10 → 0.3.12

package/index.js

@@ -6,8 +6,9 @@
  * @license Apache-2.0
  */
 
-const PLUGIN_VERSION = "0.3.4";
-const USER_QUERY_MARKER = "--- User Query ---";
+const PLUGIN_VERSION = "0.3.4";
+const USER_QUERY_MARKER = "--- User Query ---";
+const CACHE_DEDUP_WINDOW_MS = 4000;
 
 /**
  * Session cache for tracking conversation history
@@ -114,31 +115,101 @@ function extractFeishuTailBlock(text) {
 /**
  * Whether text is only transport metadata rather than a real utterance.
  */
-function isMetadataOnlyText(text) {
-  if (!text) return true;
-  const value = String(text).trim();
-  if (!value) return true;
-  if (/^\[message_id:\s*[^\]]+\]$/i.test(value)) return true;
-  if (/^\[\[reply_to[^\]]*\]\]$/i.test(value)) return true;
-  return false;
-}
+function isMetadataOnlyText(text) {
+  if (!text) return true;
+  const value = String(text).trim();
+  if (!value) return true;
+  if (/^\[message_id:\s*[^\]]+\]$/i.test(value)) return true;
+  if (/^\[\[reply_to[^\]]*\]\]$/i.test(value)) return true;
+  return false;
+}
+
+/**
+ * Remove injected relay metadata blocks/lines from user content.
+ */
+function stripInjectedMetadata(text) {
+  if (!text || typeof text !== "string") return "";
+
+  let result = text.replace(/\r\n/g, "\n");
+
+  // Remove labeled untrusted metadata JSON blocks.
+  // Examples:
+  // Conversation info (untrusted metadata): ```json ... ```
+  // Sender (untrusted metadata): ```json ... ```
+  result = result.replace(
+    /(^|\n)[^\n]*\(untrusted metadata(?:,\s*for context)?\)\s*:\s*```json[\s\S]*?```(?=\n|$)/gi,
+    "\n"
+  );
+
+  // Remove transport/system hint lines that are not user utterances.
+  result = result.replace(/^\[System:[^\n]*\]\s*$/gim, "");
+  result = result.replace(/^\[message_id:\s*[^\]]+\]\s*$/gim, "");
+
+  // Collapse extra blank lines.
+  result = result.replace(/\n{3,}/g, "\n\n").trim();
+  return result;
+}
+
+/**
+ * Keep the latest meaningful line from cleaned metadata-injected payload.
+ */
+function extractLatestUtteranceFromCleanText(text) {
+  if (!text || typeof text !== "string") return "";
+  const lines = text
+    .split("\n")
+    .map((line) => line.trim())
+    .filter(Boolean)
+    .filter((line) => !isMetadataOnlyText(line));
+  if (lines.length === 0) return "";
+  return lines[lines.length - 1];
+}
+
+function escapeRegex(text) {
+  return String(text).replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
+/**
+ * Prefix utterance with parsed sender name when available.
+ * This preserves who said it in multi-user group contexts.
+ */
+function attachSenderPrefix(utterance, senderName) {
+  const content = String(utterance || "").trim();
+  if (!content) return "";
+  const sender = String(senderName || "").trim();
+  if (!sender) return content;
+
+  const senderRegex = new RegExp(`^${escapeRegex(sender)}\\s*[:：]`);
+  if (senderRegex.test(content)) return content;
+  return `${sender}: ${content}`;
+}
 
 /**
  * Normalize user message text before caching/storing.
  * For channel-formatted payloads (e.g. Feishu), keep only the actual user utterance
  * and drop prepended system transcript lines.
  */
-function normalizeUserMessageContent(content) {
-  const text = stripPrependedPrompt(content);
-  if (!text) return "";
-
-  const normalized = String(text).replace(/\r\n/g, "\n").trim();
-  if (!normalized) return "";
-
-  // Feishu: preserve the final traceable tail block (contains platform user id/message_id).
-  const feishuTailBlock = extractFeishuTailBlock(normalized);
-  if (feishuTailBlock && !isMetadataOnlyText(feishuTailBlock)) {
-    return feishuTailBlock;
+function normalizeUserMessageContent(content) {
+  const text = stripPrependedPrompt(content);
+  if (!text) return "";
+
+  const normalized = String(text).replace(/\r\n/g, "\n").trim();
+  if (!normalized) return "";
+
+  const parsedIdentity = parseIdentityFromUntrustedMetadata(normalized);
+
+  // New relay payload format: strip injected metadata blocks first.
+  const strippedMetadata = stripInjectedMetadata(normalized);
+  if (strippedMetadata && strippedMetadata !== normalized) {
+    const latestUtterance = extractLatestUtteranceFromCleanText(strippedMetadata);
+    if (latestUtterance && !isMetadataOnlyText(latestUtterance)) {
+      return attachSenderPrefix(latestUtterance, parsedIdentity?.userName);
+    }
+  }
+
+  // Feishu: preserve the final traceable tail block (contains platform user id/message_id).
+  const feishuTailBlock = extractFeishuTailBlock(normalized);
+  if (feishuTailBlock && !isMetadataOnlyText(feishuTailBlock)) {
+    return feishuTailBlock;
   }
 
   // Generic channel relays: fallback to latest "System: ...: <message>" line.
@@ -160,16 +231,18 @@ function normalizeUserMessageContent(content) {
 
   // Discord-style channel-formatted payload:
   // [from: username (id)] actual message
-  const discordTail = normalized.match(
-    /\[from:\s*[^\(\]\n]+?\s*\(\d{6,}\)\]\s*([\s\S]*?)$/i
-  );
-  if (discordTail && discordTail[1]) {
-    const candidate = discordTail[1].trim();
-    if (!isMetadataOnlyText(candidate)) return candidate;
-  }
-
-  return isMetadataOnlyText(normalized) ? "" : normalized;
-}
+  const discordTail = normalized.match(
+    /\[from:\s*[^\(\]\n]+?\s*\(\d{6,}\)\]\s*([\s\S]*?)$/i
+  );
+  if (discordTail && discordTail[1]) {
+    const candidate = discordTail[1].trim();
+    if (!isMetadataOnlyText(candidate)) return candidate;
+  }
+
+  return isMetadataOnlyText(normalized)
+    ? ""
+    : attachSenderPrefix(normalized, parsedIdentity?.userName);
+}
 
 /**
  * Normalize assistant message text before caching/storing.
@@ -183,12 +256,139 @@ function normalizeAssistantMessageContent(content) {
   return normalized;
 }
 
-/**
- * Parse platform identity hints from channel-formatted message text.
- * Returns null when no platform-specific id can be extracted.
- */
-function parsePlatformIdentity(text) {
-  if (!text || typeof text !== "string") return null;
+/**
+ * Parse JSON objects from markdown code fences after a specific label.
+ * Example:
+ * Sender (untrusted metadata):
+ * ```json
+ * { "id": "123" }
+ * ```
+ */
+function parseJsonFencesAfterLabel(text, labelPattern) {
+  if (!text || typeof text !== "string") return [];
+
+  const results = [];
+  const regex = new RegExp(`${labelPattern}\\s*:\\s*\`\`\`json\\s*([\\s\\S]*?)\\s*\`\`\``, "gi");
+  let match;
+  while ((match = regex.exec(text)) !== null) {
+    if (!match[1]) continue;
+    try {
+      const parsed = JSON.parse(match[1]);
+      if (parsed && typeof parsed === "object") {
+        results.push(parsed);
+      }
+    } catch (_) {
+      // Ignore malformed JSON blocks and continue matching others.
+    }
+  }
+  return results;
+}
+
+/**
+ * Normalize potential user id values into non-empty strings.
+ */
+function normalizeParsedUserId(value) {
+  if (value === undefined || value === null) return "";
+  const normalized = String(value).trim();
+  return normalized || "";
+}
+
+/**
+ * Extract user id from a display label like:
+ * "用户250389 (ou_xxx)" / "name (123456789)".
+ */
+function extractUserIdFromLabel(label) {
+  const text = normalizeParsedUserId(label);
+  if (!text) return "";
+  const match = text.match(/\(\s*((?:ou|on|u)_[A-Za-z0-9]+|\d{6,})\s*\)$/i);
+  return match?.[1] ? match[1] : "";
+}
+
+/**
+ * Extract transport message id from current relay payload.
+ */
+function extractRelayMessageId(text) {
+  if (!text || typeof text !== "string") return "";
+
+  const conversationMetaList = parseJsonFencesAfterLabel(
+    text,
+    "Conversation info \\(untrusted metadata\\)"
+  );
+  for (let i = conversationMetaList.length - 1; i >= 0; i--) {
+    const conversationMeta = conversationMetaList[i];
+    const messageId =
+      normalizeParsedUserId(conversationMeta?.message_id) ||
+      normalizeParsedUserId(conversationMeta?.messageId);
+    if (messageId) return messageId;
+  }
+
+  const messageIdMatch = text.match(/\[message_id:\s*([^\]\n]+)\]/i);
+  if (messageIdMatch?.[1]) return messageIdMatch[1].trim();
+
+  return "";
+}
+
+/**
+ * Parse identity from new "untrusted metadata" JSON blocks.
+ * Priority:
+ * 1) Sender (untrusted metadata).id
+ * 2) Conversation info (untrusted metadata).sender_id
+ */
+function parseIdentityFromUntrustedMetadata(text) {
+  if (!text || typeof text !== "string") return null;
+
+  const senderMetaList = parseJsonFencesAfterLabel(text, "Sender \\(untrusted metadata\\)");
+  for (let i = senderMetaList.length - 1; i >= 0; i--) {
+    const senderMeta = senderMetaList[i];
+    const userId =
+      normalizeParsedUserId(senderMeta?.id) ||
+      extractUserIdFromLabel(senderMeta?.label);
+    if (userId) {
+      return {
+        platform: null,
+        userId,
+        userName: senderMeta?.name || senderMeta?.username || senderMeta?.label || null,
+        source: "sender-untrusted-metadata-json",
+      };
+    }
+  }
+
+  const conversationMetaList = parseJsonFencesAfterLabel(
+    text,
+    "Conversation info \\(untrusted metadata\\)"
+  );
+  for (let i = conversationMetaList.length - 1; i >= 0; i--) {
+    const conversationMeta = conversationMetaList[i];
+    const userId =
+      normalizeParsedUserId(conversationMeta?.sender_id) ||
+      normalizeParsedUserId(conversationMeta?.senderId);
+    if (userId) {
+      return {
+        platform: null,
+        userId,
+        userName: conversationMeta?.sender || null,
+        source: "conversation-untrusted-metadata-json",
+      };
+    }
+  }
+
+  return null;
+}
+
+/**
+ * Parse platform identity hints from channel-formatted message text.
+ * Returns null when no platform-specific id can be extracted.
+ */
+function parsePlatformIdentity(text) {
+  if (!text || typeof text !== "string") return null;
+
+  // New Discord format first:
+  // Sender (untrusted metadata): ```json { "id": "116..." } ```
+  // Conversation info (untrusted metadata): ```json { "sender_id": "116..." } ```
+  const metadataIdentity = parseIdentityFromUntrustedMetadata(text);
+  if (metadataIdentity?.userId) {
+    return metadataIdentity;
+  }
 
   // Discord example:
   // [from: huang yongqing (1470374017541079042)]
@@ -220,18 +420,39 @@ function parsePlatformIdentity(text) {
 /**
  * Parse all platform user ids from a text blob.
  */
-function parseAllPlatformUserIds(text) {
-  if (!text || typeof text !== "string") return [];
-
-  const ids = [];
-
-  // Discord example:
-  // [from: huang yongqing (1470374017541079042)]
-  const discordRegex = /\[from:\s*[^\(\]\n]+?\s*\((\d{6,})\)\]/gi;
-  let match;
-  while ((match = discordRegex.exec(text)) !== null) {
-    if (match[1]) ids.push(match[1]);
-  }
+function parseAllPlatformUserIds(text) {
+  if (!text || typeof text !== "string") return [];
+
+  const ids = [];
+  let match;
+
+  // New format: "Sender (untrusted metadata)" JSON blocks.
+  const senderMetaList = parseJsonFencesAfterLabel(text, "Sender \\(untrusted metadata\\)");
+  for (const senderMeta of senderMetaList) {
+    const parsedId =
+      normalizeParsedUserId(senderMeta?.id) ||
+      extractUserIdFromLabel(senderMeta?.label);
+    if (parsedId) ids.push(parsedId);
+  }
+
+  // New format: "Conversation info (untrusted metadata)" JSON blocks.
+  const conversationMetaList = parseJsonFencesAfterLabel(
+    text,
+    "Conversation info \\(untrusted metadata\\)"
+  );
+  for (const conversationMeta of conversationMetaList) {
+    const parsedId =
+      normalizeParsedUserId(conversationMeta?.sender_id) ||
+      normalizeParsedUserId(conversationMeta?.senderId);
+    if (parsedId) ids.push(parsedId);
+  }
+
+  // Discord example:
+  // [from: huang yongqing (1470374017541079042)]
+  const discordRegex = /\[from:\s*[^\(\]\n]+?\s*\((\d{6,})\)\]/gi;
+  while ((match = discordRegex.exec(text)) !== null) {
+    if (match[1]) ids.push(match[1]);
+  }
 
   // Feishu example:
   // [Feishu ...:ou_17b624... Wed ...] username: message
@@ -246,8 +467,8 @@ function parseAllPlatformUserIds(text) {
 /**
  * Collect distinct user ids parsed from all messages.
  */
-function collectUniqueUserIdsFromMessages(messages, fallbackUserId) {
-  const unique = new Set();
+function collectUniqueUserIdsFromMessages(messages, fallbackUserId) {
+  const unique = new Set();
 
   if (Array.isArray(messages)) {
     for (const msg of messages) {
@@ -263,12 +484,96 @@ function collectUniqueUserIdsFromMessages(messages, fallbackUserId) {
     unique.add(fallbackUserId);
   }
 
-  return Array.from(unique);
-}
-
-/**
- * Get latest user message text from cached messages.
- */
+  return Array.from(unique);
+}
+
+function extractUserNameFromLabel(label) {
+  const text = normalizeParsedUserId(label);
+  if (!text) return "";
+  const match = text.match(
+    /^(.*?)\s*\(\s*(?:(?:ou|on|u)_[A-Za-z0-9]+|\d{6,})\s*\)\s*$/i
+  );
+  return match?.[1] ? match[1].trim() : text;
+}
+
+/**
+ * Parse name-id pairs from supported relay payload formats.
+ */
+function parseNameIdPairsFromText(text) {
+  if (!text || typeof text !== "string") return [];
+  const pairs = [];
+
+  // New format: Sender (untrusted metadata)
+  const senderMetaList = parseJsonFencesAfterLabel(text, "Sender \\(untrusted metadata\\)");
+  for (const senderMeta of senderMetaList) {
+    const id =
+      normalizeParsedUserId(senderMeta?.id) ||
+      extractUserIdFromLabel(senderMeta?.label);
+    const name =
+      normalizeParsedUserId(senderMeta?.name) ||
+      normalizeParsedUserId(senderMeta?.username) ||
+      extractUserNameFromLabel(senderMeta?.label);
+    if (name && id) pairs.push([name, id]);
+  }
+
+  // New format: Conversation info (untrusted metadata)
+  const conversationMetaList = parseJsonFencesAfterLabel(
+    text,
+    "Conversation info \\(untrusted metadata\\)"
+  );
+  for (const conversationMeta of conversationMetaList) {
+    const id =
+      normalizeParsedUserId(conversationMeta?.sender_id) ||
+      normalizeParsedUserId(conversationMeta?.senderId);
+    const name = normalizeParsedUserId(conversationMeta?.sender);
+    if (name && id) pairs.push([name, id]);
+  }
+
+  // Old Discord: [from: name (id)]
+  const discordRegex = /\[from:\s*([^\(\]\n]+?)\s*\((\d{6,})\)\]/gi;
+  let match;
+  while ((match = discordRegex.exec(text)) !== null) {
+    const name = normalizeParsedUserId(match[1]);
+    const id = normalizeParsedUserId(match[2]);
+    if (name && id) pairs.push([name, id]);
+  }
+
+  // Old Feishu: [Feishu ...:ou_xxx ...] name:
+  const feishuRegex = /\[Feishu[^\]]*:((?:ou|on|u)_[A-Za-z0-9]+)[^\]]*\]\s*([^:\n]+):/gi;
+  while ((match = feishuRegex.exec(text)) !== null) {
+    const id = normalizeParsedUserId(match[1]);
+    const name = normalizeParsedUserId(match[2]);
+    if (name && id) pairs.push([name, id]);
+  }
+
+  return pairs;
+}
+
+/**
+ * Collect distinct name->id mapping from all messages.
+ */
+function collectNameIdMapFromMessages(messages) {
+  const map = {};
+
+  if (!Array.isArray(messages)) return map;
+
+  for (const msg of messages) {
+    if (!msg) continue;
+    const sourceText = msg.rawContent !== undefined ? msg.rawContent : msg.content;
+    const text = typeof sourceText === "string" ? sourceText : extractText(sourceText);
+    const pairs = parseNameIdPairsFromText(text);
+    for (const [name, id] of pairs) {
+      if (!name || !id) continue;
+      map[name] = id;
+    }
+  }
+
+  return map;
+}
+
+/**
+ * Get latest user message text from cached messages.
+ */
 function getLatestUserMessageText(messages) {
   if (!Array.isArray(messages)) return "";
   for (let i = messages.length - 1; i >= 0; i--) {
@@ -284,9 +589,9 @@ function getLatestUserMessageText(messages) {
  * Resolve request identity with fallback:
  * platform user id -> configured user id -> "openclaw-user"
  */
-function resolveRequestIdentity(promptText, cfg, ctx) {
-  const parsed = parsePlatformIdentity(promptText);
-  if (parsed?.userId) {
+function resolveRequestIdentity(promptText, cfg) {
+  const parsed = parsePlatformIdentity(promptText);
+  if (parsed?.userId) {
     return {
       userId: parsed.userId,
       userName: parsed.userName || null,
@@ -295,7 +600,7 @@ function resolveRequestIdentity(promptText, cfg, ctx) {
     };
   }
 
-  if (cfg?.configuredUserId) {
+  if (cfg?.configuredUserId) {
     return {
       userId: cfg.configuredUserId,
       userName: null,
@@ -304,17 +609,8 @@ function resolveRequestIdentity(promptText, cfg, ctx) {
     };
   }
 
-  if (ctx?.userId) {
-    return {
-      userId: ctx.userId,
-      userName: null,
-      platform: null,
-      source: "ctx-user-id",
-    };
-  }
-
-  return {
-    userId: "openclaw-user",
+  return {
+    userId: "openclaw-user",
     userName: null,
     platform: null,
     source: "default-user-id",
@@ -507,7 +803,7 @@ async function retrieveMemory(prompt, cfg, ctx, log) {
   if (log?.info) {
     log.info(`[Memory Plugin] Recall request URL: ${url}`);
   }
-  const identity = resolveRequestIdentity(prompt, cfg, ctx);
+  const identity = resolveRequestIdentity(prompt, cfg);
   const userId = sanitizeUserId(identity.userId);
   const payload = {
     query: prompt,
@@ -566,18 +862,25 @@ async function addMemory(messages, cfg, ctx, log) {
   }
   const sessionId = resolveSessionId(ctx, null) || `session-${Date.now()}`;
   const latestUserText = getLatestUserMessageText(messages);
-  const identity = resolveRequestIdentity(latestUserText, cfg, ctx);
+  const identity = resolveRequestIdentity(latestUserText, cfg);
   const userId = sanitizeUserId(identity.userId);
-  const metadataUserIds = (() => {
-    const parsed = collectUniqueUserIdsFromMessages(messages, null)
-      .map((id) => sanitizeUserId(id))
-      .filter(Boolean);
-    if (parsed.length > 0) {
-      return Array.from(new Set(parsed));
-    }
-    return [userId];
-  })();
-  const agentId = cfg.agentId || ctx?.agentId || "main";
+  const metadataUserIds = (() => {
+    const parsed = collectUniqueUserIdsFromMessages(messages, null)
+      .map((id) => sanitizeUserId(id))
+      .filter(Boolean);
+    if (parsed.length > 0) {
+      return Array.from(new Set(parsed));
+    }
+    return [userId];
+  })();
+  const nameIdMap = (() => {
+    const parsed = collectNameIdMapFromMessages(messages);
+    if (identity?.userName && userId && !parsed[identity.userName]) {
+      parsed[identity.userName] = userId;
+    }
+    return parsed;
+  })();
+  const agentId = cfg.agentId || ctx?.agentId || "main";
 
   const payload = {
     user_id: userId,
@@ -591,21 +894,22 @@ async function addMemory(messages, cfg, ctx, log) {
     async_mode: true,
     custom_workflows: {
       stream_params: {
-        metadata: JSON.stringify({
-          user_ids: metadataUserIds,
-          agent_ids: [agentId],
-          session_id: sessionId,
-          scenario: cfg.scenario || "openclaw-plugin",
-        }),
-      },
-    },
+        metadata: JSON.stringify({
+          user_ids: metadataUserIds,
+          agent_ids: [agentId],
+          name_id_map: nameIdMap,
+          session_id: sessionId,
+          scenario: cfg.scenario || "openclaw-plugin",
+        }),
+      },
+    },
   };
 
   if (log?.debug) {
-    log.debug(
-      `[Memory Plugin] add/message payload: user_id=${userId}, agent_id=${agentId}, conversation_id=${sessionId}, metadata.user_ids=${JSON.stringify(metadataUserIds)}, metadata.agent_ids=${JSON.stringify([agentId])}`
-    );
-  }
+    log.debug(
+      `[Memory Plugin] add/message payload: user_id=${userId}, agent_id=${agentId}, conversation_id=${sessionId}, metadata.user_ids=${JSON.stringify(metadataUserIds)}, metadata.agent_ids=${JSON.stringify([agentId])}, metadata.name_id_map=${JSON.stringify(nameIdMap)}`
+    );
+  }
 
   try {
     const result = await httpRequest(url, {
@@ -850,18 +1154,44 @@ function getSessionCache(sessionId) {
 /**
  * Add message to session cache
  */
-function addToSessionCache(sessionId, message) {
-  const cache = getSessionCache(sessionId);
-  cache.messages.push(message);
-  cache.lastActivity = Date.now();
-
-  // Count turns (user message after assistant = new turn)
-  if (message.role === "user" && cache.messages.length > 1) {
-    const prevMsg = cache.messages[cache.messages.length - 2];
-    if (prevMsg && prevMsg.role === "assistant") {
-      cache.turnCount++;
-    }
-  }
+function addToSessionCache(sessionId, message) {
+  const cache = getSessionCache(sessionId);
+  const now = Date.now();
+  const incoming = {
+    ...message,
+    cachedAt: now,
+  };
+
+  const prev = cache.messages.length > 0 ? cache.messages[cache.messages.length - 1] : null;
+  if (prev) {
+    const sameRole = prev.role === incoming.role;
+    const sameMessageId =
+      incoming.messageId &&
+      prev.messageId &&
+      String(incoming.messageId) === String(prev.messageId);
+    const sameContent =
+      sameRole &&
+      String(prev.content || "") === String(incoming.content || "") &&
+      String(prev.rawContent || "") === String(incoming.rawContent || "");
+    const withinWindow = now - (prev.cachedAt || 0) <= CACHE_DEDUP_WINDOW_MS;
+
+    // Dedup duplicate hook triggers for the same relay message.
+    if ((sameRole && sameMessageId) || (sameContent && withinWindow)) {
+      cache.lastActivity = now;
+      return cache;
+    }
+  }
+
+  cache.messages.push(incoming);
+  cache.lastActivity = Date.now();
+
+  // Count turns (user message after assistant = new turn)
+  if (incoming.role === "user" && cache.messages.length > 1) {
+    const prevMsg = cache.messages[cache.messages.length - 2];
+    if (prevMsg && prevMsg.role === "assistant") {
+      cache.turnCount++;
+    }
+  }
 
   return cache;
 }
@@ -1018,12 +1348,18 @@ function registerPlugin(api) {
       return;
     }
 
-    const sessionId = resolveSessionId(ctx, event) || `session-${Date.now()}`;
-    const userContent = normalizeUserMessageContent(prompt);
-    const rawUserContent = stripPrependedPrompt(prompt);
-    if (userContent) {
-      addToSessionCache(sessionId, { role: "user", content: userContent, rawContent: rawUserContent });
-    }
+    const sessionId = resolveSessionId(ctx, event) || `session-${Date.now()}`;
+    const userContent = normalizeUserMessageContent(prompt);
+    const rawUserContent = stripPrependedPrompt(prompt);
+    const messageId = extractRelayMessageId(rawUserContent || prompt);
+    if (userContent) {
+      addToSessionCache(sessionId, {
+        role: "user",
+        content: userContent,
+        rawContent: rawUserContent,
+        messageId: messageId || undefined,
+      });
+    }
 
     try {
       const memories = await retrieveMemory(prompt, cfg, ctx, log);
@@ -1150,12 +1486,18 @@ function createHooksPlugin(config) {
       return;
     }
 
-    const sessionId = resolveSessionId(ctx, event) || `session-${Date.now()}`;
-    const userContent = normalizeUserMessageContent(prompt);
-    const rawUserContent = stripPrependedPrompt(prompt);
-    if (userContent) {
-      addToSessionCache(sessionId, { role: "user", content: userContent, rawContent: rawUserContent });
-    }
+    const sessionId = resolveSessionId(ctx, event) || `session-${Date.now()}`;
+    const userContent = normalizeUserMessageContent(prompt);
+    const rawUserContent = stripPrependedPrompt(prompt);
+    const messageId = extractRelayMessageId(rawUserContent || prompt);
+    if (userContent) {
+      addToSessionCache(sessionId, {
+        role: "user",
+        content: userContent,
+        rawContent: rawUserContent,
+        messageId: messageId || undefined,
+      });
+    }
 
     try {
       const memories = await retrieveMemory(prompt, cfg, ctx, log);
@@ -1223,13 +1565,19 @@ function createHooksPlugin(config) {
           const content = msg.role === "user"
             ? normalizeUserMessageContent(msg.content)
             : normalizeAssistantMessageContent(msg.content);
-          const rawSource = msg.role === "user"
-            ? stripPrependedPrompt(msg.content)
-            : extractText(msg.content);
-          if (content) {
-            addToSessionCache(sessionId, { role: msg.role, content, rawContent: rawSource || undefined });
-          }
-        }
+          const rawSource = msg.role === "user"
+            ? stripPrependedPrompt(msg.content)
+            : extractText(msg.content);
+          const messageId = msg.role === "user" ? extractRelayMessageId(rawSource || "") : "";
+          if (content) {
+            addToSessionCache(sessionId, {
+              role: msg.role,
+              content,
+              rawContent: rawSource || undefined,
+              messageId: messageId || undefined,
+            });
+          }
+        }
       } else {
         // Only add last assistant message
         for (let i = event.messages.length - 1; i >= 0; i--) {

package/openclaw.plugin.json

@@ -3,7 +3,7 @@
   "id": "human-like-mem",
   "name": "Human-Like Memory Plugin",
   "description": "Long-term memory plugin with automatic recall and storage.",
-  "version": "0.3.10",
+  "version": "0.3.12",
   "kind": "lifecycle",
   "main": "./index.js",
   "author": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@humanlikememory/human-like-mem",
-  "version": "0.3.10",
+  "version": "0.3.12",
   "description": "Long-term memory plugin for OpenClaw - AI Social Memory Integration",
   "main": "index.js",
   "type": "module",
@@ -50,8 +50,7 @@
     "jest": "^29.7.0",
     "prettier": "^3.2.0"
   },
-  "publishConfig": {
-    "access": "public"
-  }
-}
-
+  "publishConfig": {
+    "access": "public"
+  }
+}