@xdarkicex/openclaw-memory-libravdb 1.9.10-beta.10 → 1.9.10-beta.12

package/dist/context-engine.js

@@ -16,6 +16,11 @@ const EXACT_RECALL_MAX_TOKENS = 4;
 const RESERVED_CURRENT_TURN_TOKENS = 150;
 const AFTER_TURN_INGEST_MAX_TOKENS = 2048;
 const OPENCLAW_LEADING_TIMESTAMP_PREFIX_RE = /^\[[A-Za-z]{3} \d{4}-\d{2}-\d{2} \d{2}:\d{2}[^\]]*\] */;
+const OPENCLAW_CONTEXT_PREFIX_RE = /^\[OpenClaw context: [^\]]*\][\r\n]*/;
+const SELECTED_CONTEXT_HEADER = "Conversation context (untrusted, chronological, selected for current message):";
+const RETRIEVAL_QUERY_MAX_CHARS = 1000;
+const SELECTED_CONTEXT_TURN_RE = /^#\d+\s+[A-Za-z]{3}\s+\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}(?::\d{2})?\s+\S+\s+([^:\n]{1,80}):\s*(.*)$/;
+const ASSISTANT_SPEAKER_RE = /\b(?:assistant|openclaw|z3robot|bot)\b/i;
 const OPENCLAW_METADATA_HEADERS = [
     "Conversation info (untrusted metadata):",
     "Sender (untrusted metadata):",
@@ -196,6 +201,55 @@ function normalizeKernelContent(content, options = {}) {
         retainContext: options.retainOpenClawContext === true,
     });
 }
+function normalizeRetrievalQuery(primaryText, fallbackText = "") {
+    const primary = normalizeRetrievalCandidate(primaryText);
+    if (primary)
+        return primary;
+    return normalizeRetrievalCandidate(fallbackText);
+}
+function normalizeRetrievalCandidate(text) {
+    const normalized = text
+        .replace(OPENCLAW_CONTEXT_PREFIX_RE, "")
+        .replace(OPENCLAW_LEADING_TIMESTAMP_PREFIX_RE, "")
+        .replace(/\r\n/g, "\n")
+        .trim();
+    if (!normalized)
+        return "";
+    const selected = extractLatestSelectedContextUtterance(normalized);
+    const candidate = selected || normalized;
+    return capRetrievalQuery(candidate.replace(/\s+/g, " ").trim());
+}
+function extractLatestSelectedContextUtterance(text) {
+    if (!text.startsWith(SELECTED_CONTEXT_HEADER))
+        return "";
+    const turns = [];
+    for (const rawLine of text.slice(SELECTED_CONTEXT_HEADER.length).split("\n")) {
+        const line = rawLine.trim();
+        if (!line)
+            continue;
+        const match = line.match(SELECTED_CONTEXT_TURN_RE);
+        if (match) {
+            turns.push({ speaker: match[1].trim(), text: [match[2].trim()] });
+            continue;
+        }
+        if (turns.length > 0) {
+            turns[turns.length - 1].text.push(line);
+        }
+    }
+    for (let i = turns.length - 1; i >= 0; i--) {
+        const turn = turns[i];
+        const content = turn.text.join(" ").trim();
+        if (content && !ASSISTANT_SPEAKER_RE.test(turn.speaker)) {
+            return content;
+        }
+    }
+    return "";
+}
+function capRetrievalQuery(text) {
+    if (text.length <= RETRIEVAL_QUERY_MAX_CHARS)
+        return text;
+    return text.slice(text.length - RETRIEVAL_QUERY_MAX_CHARS);
+}
 /**
  * Symbol-keyed hook that drains all pending async ingestion queues.
  * Tests import this symbol to access the drain function. Using a
@@ -1342,7 +1396,6 @@ export function buildContextEngineFactory(runtime, cfg, logger = console) {
         // Then run the standard metadata envelope stripping.
         return stripOpenClawUntrustedMetadataEnvelope(stripped);
     }
-    const OPENCLAW_CONTEXT_PREFIX_RE = /^\[OpenClaw context: [^\]]*\][\r\n]*/;
     function formatRetrievedMemory(predictions) {
         if (!predictions?.length)
             return "";
@@ -1721,6 +1774,8 @@ export function buildContextEngineFactory(runtime, cfg, logger = console) {
             const isPostToolContinuation = lastUserIndex >= 0 && lastUserIndex < messages.length - 1
                 && hasLiveToolProtocolAfterLastUser(messages, lastUserIndex);
             const lastUserMessage = findLastReplaySafeUserMessage(messages);
+            const latestUserContent = typeof lastUserMessage?.content === "string" ? lastUserMessage.content : "";
+            const retrievalQuery = normalizeRetrievalQuery(strippedPrompt, latestUserContent);
             const reservedCurrentTurnTokens = lastUserMessage
                 ? approximateMessageTokens(lastUserMessage)
                 : RESERVED_CURRENT_TURN_TOKENS;
@@ -1856,7 +1911,7 @@ export function buildContextEngineFactory(runtime, cfg, logger = console) {
                             ]);
                             const maxMemories = cfg.beforeTurnMaxMemories ?? 5;
                             const clamped = btResult.predictions && btResult.predictions.length > maxMemories
-                                ? selectTopByRelevance(btResult.predictions, strippedPrompt, maxMemories)
+                                ? selectTopByRelevance(btResult.predictions, retrievalQuery, maxMemories)
                                 : btResult.predictions;
                             turnCache.set(sessionId, `${messages.length}:${beforeTurnQueryHint}`, { predictions: clamped });
                             beforeTurnPredictions = clamped;
@@ -1873,7 +1928,7 @@ export function buildContextEngineFactory(runtime, cfg, logger = console) {
                             sessionId,
                             sessionKey: args.sessionKey,
                             userId,
-                            prompt: strippedPrompt,
+                            prompt: retrievalQuery,
                             messages,
                             tokenBudget: args.tokenBudget,
                             config: buildAssemblyConfig(args.tokenBudget),
@@ -1894,7 +1949,7 @@ export function buildContextEngineFactory(runtime, cfg, logger = console) {
                         ? { ...assembled, systemPromptAddition: appendSystemPromptAddition(assembled.systemPromptAddition, continuityContext) }
                         : assembled;
                     enforced = enforceTokenBudgetInvariant(await augmentWithExactRecall(withContinuity, {
-                        queryText: strippedPrompt || (messages[messages.length - 1]?.content ?? ""),
+                        queryText: retrievalQuery,
                         userId,
                         sessionId,
                         tokenBudget: args.tokenBudget,

package/dist/index.js

@@ -35491,6 +35491,11 @@ var EXACT_RECALL_MAX_TOKENS = 4;
 var RESERVED_CURRENT_TURN_TOKENS = 150;
 var AFTER_TURN_INGEST_MAX_TOKENS = 2048;
 var OPENCLAW_LEADING_TIMESTAMP_PREFIX_RE = /^\[[A-Za-z]{3} \d{4}-\d{2}-\d{2} \d{2}:\d{2}[^\]]*\] */;
+var OPENCLAW_CONTEXT_PREFIX_RE = /^\[OpenClaw context: [^\]]*\][\r\n]*/;
+var SELECTED_CONTEXT_HEADER = "Conversation context (untrusted, chronological, selected for current message):";
+var RETRIEVAL_QUERY_MAX_CHARS = 1e3;
+var SELECTED_CONTEXT_TURN_RE = /^#\d+\s+[A-Za-z]{3}\s+\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}(?::\d{2})?\s+\S+\s+([^:\n]{1,80}):\s*(.*)$/;
+var ASSISTANT_SPEAKER_RE = /\b(?:assistant|openclaw|z3robot|bot)\b/i;
 var OPENCLAW_METADATA_HEADERS = [
   "Conversation info (untrusted metadata):",
   "Sender (untrusted metadata):",
@@ -35656,6 +35661,46 @@ function normalizeKernelContent(content, options = {}) {
     retainContext: options.retainOpenClawContext === true
   });
 }
+function normalizeRetrievalQuery(primaryText, fallbackText = "") {
+  const primary = normalizeRetrievalCandidate(primaryText);
+  if (primary) return primary;
+  return normalizeRetrievalCandidate(fallbackText);
+}
+function normalizeRetrievalCandidate(text) {
+  const normalized = text.replace(OPENCLAW_CONTEXT_PREFIX_RE, "").replace(OPENCLAW_LEADING_TIMESTAMP_PREFIX_RE, "").replace(/\r\n/g, "\n").trim();
+  if (!normalized) return "";
+  const selected = extractLatestSelectedContextUtterance(normalized);
+  const candidate = selected || normalized;
+  return capRetrievalQuery(candidate.replace(/\s+/g, " ").trim());
+}
+function extractLatestSelectedContextUtterance(text) {
+  if (!text.startsWith(SELECTED_CONTEXT_HEADER)) return "";
+  const turns = [];
+  for (const rawLine of text.slice(SELECTED_CONTEXT_HEADER.length).split("\n")) {
+    const line = rawLine.trim();
+    if (!line) continue;
+    const match = line.match(SELECTED_CONTEXT_TURN_RE);
+    if (match) {
+      turns.push({ speaker: match[1].trim(), text: [match[2].trim()] });
+      continue;
+    }
+    if (turns.length > 0) {
+      turns[turns.length - 1].text.push(line);
+    }
+  }
+  for (let i = turns.length - 1; i >= 0; i--) {
+    const turn = turns[i];
+    const content = turn.text.join(" ").trim();
+    if (content && !ASSISTANT_SPEAKER_RE.test(turn.speaker)) {
+      return content;
+    }
+  }
+  return "";
+}
+function capRetrievalQuery(text) {
+  if (text.length <= RETRIEVAL_QUERY_MAX_CHARS) return text;
+  return text.slice(text.length - RETRIEVAL_QUERY_MAX_CHARS);
+}
 var FLUSH_ASYNC_INGESTION = /* @__PURE__ */ Symbol("flushAsyncIngestion");
 var maxOptimizationMemoCacheSize = 5e4;
 var metadataEnvelopeCache = /* @__PURE__ */ new Map();
@@ -36593,7 +36638,6 @@ function buildContextEngineFactory(runtime, cfg, logger = console) {
     const stripped = text.replace(OPENCLAW_CONTEXT_PREFIX_RE, "").trimStart();
     return stripOpenClawUntrustedMetadataEnvelope(stripped);
   }
-  const OPENCLAW_CONTEXT_PREFIX_RE = /^\[OpenClaw context: [^\]]*\][\r\n]*/;
   function formatRetrievedMemory(predictions) {
     if (!predictions?.length) return "";
     if (cfg.beforeTurnDebug) {
@@ -36950,6 +36994,8 @@ function buildContextEngineFactory(runtime, cfg, logger = console) {
       const lastUserIndex = findLastUserMessageIndex(messages);
       const isPostToolContinuation = lastUserIndex >= 0 && lastUserIndex < messages.length - 1 && hasLiveToolProtocolAfterLastUser(messages, lastUserIndex);
       const lastUserMessage = findLastReplaySafeUserMessage(messages);
+      const latestUserContent = typeof lastUserMessage?.content === "string" ? lastUserMessage.content : "";
+      const retrievalQuery = normalizeRetrievalQuery(strippedPrompt, latestUserContent);
       const reservedCurrentTurnTokens = lastUserMessage ? approximateMessageTokens(lastUserMessage) : RESERVED_CURRENT_TURN_TOKENS;
       const currentContextTokens = resolvePredictiveCompactionTokenCount({
         currentTokenCount: args.currentTokenCount,
@@ -37084,7 +37130,7 @@ function buildContextEngineFactory(runtime, cfg, logger = console) {
                 )
               ]);
               const maxMemories = cfg.beforeTurnMaxMemories ?? 5;
-              const clamped = btResult.predictions && btResult.predictions.length > maxMemories ? selectTopByRelevance(btResult.predictions, strippedPrompt, maxMemories) : btResult.predictions;
+              const clamped = btResult.predictions && btResult.predictions.length > maxMemories ? selectTopByRelevance(btResult.predictions, retrievalQuery, maxMemories) : btResult.predictions;
               turnCache.set(sessionId, `${messages.length}:${beforeTurnQueryHint}`, { predictions: clamped });
               beforeTurnPredictions = clamped;
               clearBeforeTurnCircuit(sessionId);
@@ -37101,7 +37147,7 @@ function buildContextEngineFactory(runtime, cfg, logger = console) {
               sessionId,
               sessionKey: args.sessionKey,
               userId,
-              prompt: strippedPrompt,
+              prompt: retrievalQuery,
               messages,
               tokenBudget: args.tokenBudget,
               config: buildAssemblyConfig(args.tokenBudget),
@@ -37123,7 +37169,7 @@ function buildContextEngineFactory(runtime, cfg, logger = console) {
           const withContinuity = continuityContext ? { ...assembled, systemPromptAddition: appendSystemPromptAddition(assembled.systemPromptAddition, continuityContext) } : assembled;
           enforced = enforceTokenBudgetInvariant(
             await augmentWithExactRecall(withContinuity, {
-              queryText: strippedPrompt || (messages[messages.length - 1]?.content ?? ""),
+              queryText: retrievalQuery,
               userId,
               sessionId,
               tokenBudget: args.tokenBudget,

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "libravdb-memory",
   "name": "LibraVDB Memory",
   "description": "Persistent vector memory with three-tier hybrid scoring",
-  "version": "1.9.10-beta.10",
+  "version": "1.9.10-beta.12",
   "kind": [
     "memory",
     "context-engine"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xdarkicex/openclaw-memory-libravdb",
-  "version": "1.9.10-beta.10",
+  "version": "1.9.10-beta.12",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",