@psiclawops/hypercompositor 0.9.7 → 0.9.9

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -812,6 +812,67 @@ function extractTextFromInboundContent(content) {
         .map(part => part.text ?? '')
         .join('\n');
 }
+function isToolResultRole(role) {
+    return role === 'tool' || role === 'tool_result' || role === 'toolResult';
+}
+function isPersistableInboundRole(role) {
+    return role === 'user' || role === 'assistant' || role === 'system' || isToolResultRole(role);
+}
+function isSenderMetadataText(text) {
+    const trimmed = text.trim();
+    if (!trimmed)
+        return false;
+    if (/^Sender \(untrusted metadata\):/i.test(trimmed))
+        return true;
+    return stripMessageMetadata(trimmed).trim().length === 0 && /Sender \(untrusted metadata\):/i.test(trimmed);
+}
+function shouldDropInboundMessage(msg) {
+    if (isPersistableInboundRole(msg.role))
+        return false;
+    const text = extractTextFromInboundContent(msg.content);
+    // OpenClaw/webchat may carry adjacent sender envelopes as role='custom'. They
+    // are transport metadata, not conversation turns. Persisting or replaying them
+    // lets the metadata row become the latest assistant-ish history item, which can
+    // mask the real user prompt under load.
+    if (msg.role === 'custom' && isSenderMetadataText(text))
+        return true;
+    // Unknown roles are not part of the provider transcript contract. Dropping is
+    // safer than casting them to assistant in toNeutralMessage().
+    return true;
+}
+function sanitizeInboundMessageForModel(msg) {
+    if (shouldDropInboundMessage(msg))
+        return null;
+    // OpenClaw prepends untrusted inbound metadata directly to user-role text for
+    // the current provider prompt. That context is useful for the live inbound
+    // turn, but if HyperMem replays it from the message window it becomes duplicate
+    // user content and can make the model repeat the previous message. Strip it at
+    // the context-engine boundary while preserving the actual user text.
+    if (msg.role !== 'user')
+        return msg;
+    if (typeof msg.content === 'string') {
+        const stripped = stripMessageMetadata(msg.content);
+        return stripped === msg.content ? msg : { ...msg, content: stripped };
+    }
+    if (Array.isArray(msg.content)) {
+        let changed = false;
+        const content = msg.content.map((part) => {
+            if (!part || part.type !== 'text' || typeof part.text !== 'string')
+                return part;
+            const stripped = stripMessageMetadata(part.text);
+            if (stripped !== part.text)
+                changed = true;
+            return stripped === part.text ? part : { ...part, text: stripped };
+        });
+        return changed ? { ...msg, content } : msg;
+    }
+    return msg;
+}
+function sanitizeInboundMessagesForModel(messages) {
+    return messages
+        .map((msg) => sanitizeInboundMessageForModel(msg))
+        .filter((msg) => Boolean(msg));
+}
 /**
  * Determine whether a user turn is "topic-bearing" (substantive).
  *
@@ -1045,7 +1106,7 @@ function toNeutralMessage(msg) {
         toolCalls = contentBlockToolCalls;
     }
     // OpenClaw uses role 'toolResult' (camelCase). Support all three spellings.
-    const isToolResultMsg = msg.role === 'tool' || msg.role === 'tool_result' || msg.role === 'toolResult';
+    const isToolResultMsg = isToolResultRole(msg.role);
     // Tool results must stay on the result side of the transcript. If we persist them as
     // assistant rows with orphaned toolResults, later replay can retain a tool_result after
     // trimming away the matching assistant tool_use, which Anthropic rejects with a 400.
@@ -1066,6 +1127,27 @@ function toNeutralMessage(msg) {
         toolResults,
     };
 }
+function isPlainUserTurnMessage(msg) {
+    if (msg.role !== 'user' || shouldDropInboundMessage(msg))
+        return false;
+    const neutral = toNeutralMessage(msg);
+    return neutral.role === 'user'
+        && !neutral.toolResults?.length
+        && stripMessageMetadata(neutral.textContent ?? '').trim().length > 0;
+}
+function findBoundaryPlainUserMessage(messages, prePromptMessageCount) {
+    const start = Math.min(prePromptMessageCount - 1, messages.length - 1);
+    for (let i = start; i >= 0; i--) {
+        const msg = messages[i];
+        if (shouldDropInboundMessage(msg))
+            continue;
+        if (isPlainUserTurnMessage(msg))
+            return msg;
+        if (msg.role === 'assistant' || msg.role === 'system' || isToolResultRole(msg.role))
+            return null;
+    }
+    return null;
+}
 // ─── Context Engine Implementation ─────────────────────────────
 /**
  * In-flight warm dedup map.
@@ -1639,7 +1721,7 @@ function createHyperMemEngine() {
             }
             // Skip system messages — they come from the runtime, not the conversation
             const msg = message;
-            if (msg.role === 'system') {
+            if (msg.role === 'system' || shouldDropInboundMessage(msg)) {
                 return { ingested: false };
             }
             try {
@@ -1754,7 +1836,7 @@ function createHyperMemEngine() {
                 const agentId = extractAgentId(sk);
                 for (const message of messages) {
                     const msg = message;
-                    if (msg.role === 'system')
+                    if (msg.role === 'system' || shouldDropInboundMessage(msg))
                         continue;
                     const neutral = toNeutralMessage(msg);
                     if (neutral.role === 'user' && !neutral.toolResults?.length) {
@@ -1784,6 +1866,11 @@ function createHyperMemEngine() {
          *   systemPromptAddition — facts/recall/episodes injected before runtime system prompt
          */
         async assemble({ sessionId, sessionKey, messages, tokenBudget, prompt, model }) {
+            // Drop non-provider transcript metadata before any pass-through, token
+            // estimate, or persistence-adjacent decision. The current user prompt is
+            // carried separately as `prompt`; adjacent role='custom' sender envelopes
+            // must never become the final model message.
+            messages = sanitizeInboundMessagesForModel(messages);
             // ── Tool-loop guard ──────────────────────────────────────────────────────
             // When the last message is a toolResult, the runtime is mid tool-loop:
             // the model already has full context from the initial turn assembly.
@@ -2794,7 +2881,10 @@ ${replayRecovery.emittedText}`
          *
          * IMPORTANT: When afterTurn is defined, the runtime calls ONLY afterTurn —
          * it never calls ingest() or ingestBatch(). So we must ingest the new
-         * messages here, using messages.slice(prePromptMessageCount).
+         * messages here. Some OpenClaw runtimes include the current user + adjacent
+         * transport metadata in prePromptMessageCount, leaving only assistant/tool
+         * outputs in messages.slice(prePromptMessageCount). Reconcile the boundary
+         * user turn explicitly so SQLite preserves the real user→assistant order.
          */
         async afterTurn({ sessionId, sessionKey, messages, prePromptMessageCount, isHeartbeat, runtimeContext }) {
             if (isHeartbeat)
@@ -2803,12 +2893,25 @@ ${replayRecovery.emittedText}`
                 const hm = await getHyperMem();
                 const sk = resolveSessionKey(sessionId, sessionKey);
                 const agentId = extractAgentId(sk);
-                // Ingest only the new messages produced this turn
+                // Ingest only the new messages produced this turn, plus the boundary
+                // user turn when OpenClaw counted it as pre-prompt context. The write
+                // path is idempotent, so if an ingress/runtime variant already persisted
+                // this user message, recordUserMessage() suppresses the duplicate.
                 const newMessages = messages.slice(prePromptMessageCount);
-                for (const msg of newMessages) {
+                const hasNewPlainUserMessage = newMessages
+                    .map(m => m)
+                    .some(m => isPlainUserTurnMessage(m));
+                const boundaryUserMessage = hasNewPlainUserMessage
+                    ? null
+                    : findBoundaryPlainUserMessage(messages, prePromptMessageCount);
+                const currentTurnMessages = boundaryUserMessage
+                    ? [boundaryUserMessage, ...newMessages]
+                    : newMessages;
+                for (const msg of currentTurnMessages) {
                     const m = msg;
-                    // Skip system messages — they come from the runtime, not the conversation
-                    if (m.role === 'system')
+                    // Skip system and non-provider metadata messages — they come from the
+                    // runtime/transport, not the conversation.
+                    if (m.role === 'system' || shouldDropInboundMessage(m))
                         continue;
                     if (m.role === 'toolResult' && extractTextFromInboundContent(m.content).trim() === SYNTHETIC_MISSING_TOOL_RESULT_TEXT) {
                         const toolCallId = typeof m.toolCallId === 'string' ? m.toolCallId : 'unknown';
@@ -2844,7 +2947,7 @@ ${replayRecovery.emittedText}`
                     }
                 }
                 try {
-                    const lastAssistantMessage = [...newMessages].reverse().find(m => m.role === 'assistant');
+                    const lastAssistantMessage = [...currentTurnMessages].reverse().find(m => m.role === 'assistant');
                     if (lastAssistantMessage) {
                         const modelState = await hm.cache.getModelState(agentId, sk).catch(() => null);
                         const promptCacheUsage = runtimeContext?.promptCache?.lastCallUsage;
@@ -2892,7 +2995,7 @@ ${replayRecovery.emittedText}`
                 // Non-fatal: topic detection never blocks afterTurn
                 let adaptiveTopicShiftConfidence;
                 try {
-                    const inboundUserMsg = newMessages
+                    const inboundUserMsg = currentTurnMessages
                         .map(m => m)
                         .find(m => m.role === 'user');
                     if (inboundUserMsg) {
@@ -2953,7 +3056,7 @@ ${replayRecovery.emittedText}`
                         const modelState = await hm.cache.getModelState(agentId, sk);
                         const gradientBudget = modelState?.tokenBudget;
                         const gradientDepth = modelState?.historyDepth;
-                        const inboundUserMsg = newMessages
+                        const inboundUserMsg = currentTurnMessages
                             .map(m => m)
                             .find(m => m.role === 'user');
                         const inboundUserText = inboundUserMsg

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@psiclawops/hypercompositor",
-  "version": "0.9.7",
-  "description": "HyperCompositor — context engine plugin for OpenClaw",
+  "version": "0.9.9",
+  "description": "HyperCompositor \u2014 context engine plugin for OpenClaw",
   "type": "module",
   "main": "dist/index.js",
   "license": "Apache-2.0",
@@ -18,7 +18,7 @@
   "openclaw": {
     "plugin": {
       "id": "hypercompositor",
-      "name": "HyperCompositor — Context Engine",
+      "name": "HyperCompositor \u2014 Context Engine",
       "kind": "context-engine"
     },
     "extensions": [
@@ -29,8 +29,8 @@
       "minGatewayVersion": "2026.4.12"
     },
     "build": {
-      "openclawVersion": "2026.5.2",
-      "pluginSdkVersion": "2026.5.2"
+      "openclawVersion": "2026.5.7",
+      "pluginSdkVersion": "2026.5.7"
     }
   },
   "scripts": {
@@ -40,11 +40,11 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@psiclawops/hypermem": "0.9.7",
+    "@psiclawops/hypermem": "0.9.9",
     "zod": "^4.0.0"
   },
   "devDependencies": {
-    "openclaw": "2026.5.2",
+    "openclaw": "2026.5.7",
     "typescript": "^5.4.0"
   },
   "peerDependencies": {
@@ -65,6 +65,7 @@
     "LICENSE"
   ],
   "overrides": {
-    "uuid": "14.0.0"
+    "uuid": "14.0.0",
+    "fast-xml-builder": "1.2.0"
   }
 }