@joshuaswarren/openclaw-engram 9.0.87 → 9.0.88

package/dist/index.js

@@ -42046,7 +42046,22 @@ Use this context naturally when relevant. Never quote or expose this memory cont
         try {
           if (orchestrator.lcmEngine?.enabled) {
             try {
-              const tokensBefore = typeof event.tokenCount === "number" ? event.tokenCount : typeof event.tokensBefore === "number" ? event.tokensBefore : 0;
+              let tokensBefore = 0;
+              if (typeof event.tokenCount === "number") {
+                tokensBefore = event.tokenCount;
+              } else if (Array.isArray(event.messages)) {
+                for (const msg of event.messages) {
+                  if (typeof msg.content === "string") {
+                    tokensBefore += estimateTokens2(msg.content);
+                  } else if (Array.isArray(msg.content)) {
+                    for (const block of msg.content) {
+                      if (typeof block === "string") tokensBefore += estimateTokens2(block);
+                      else if (block && typeof block === "object" && typeof block.text === "string")
+                        tokensBefore += estimateTokens2(block.text);
+                    }
+                  }
+                }
+              }
               lcmTokensBefore.set(sessionKey, tokensBefore);
               await orchestrator.lcmEngine.preCompactionFlush(sessionKey);
             } catch (lcmErr) {
@@ -42079,7 +42094,18 @@ Use this context naturally when relevant. Never quote or expose this memory cont
         try {
           if (orchestrator.lcmEngine?.enabled) {
             try {
-              const tokensAfter = typeof event.tokenCount === "number" ? event.tokenCount : typeof event.tokensAfter === "number" ? event.tokensAfter : 0;
+              let tokensAfter = 0;
+              if (typeof event.tokenCount === "number") {
+                tokensAfter = event.tokenCount;
+              } else {
+                const storedBefore = lcmTokensBefore.get(sessionKey) ?? 0;
+                const msgCountAfter = typeof event.messageCount === "number" ? event.messageCount : 0;
+                const compacted = typeof event.compactedCount === "number" ? event.compactedCount : 0;
+                const msgCountBefore = msgCountAfter + compacted;
+                if (storedBefore > 0 && msgCountBefore > 0) {
+                  tokensAfter = Math.round(storedBefore * (msgCountAfter / msgCountBefore));
+                }
+              }
               const tokensBefore = lcmTokensBefore.get(sessionKey) ?? 0;
               lcmTokensBefore.delete(sessionKey);
               await orchestrator.lcmEngine.recordCompaction(sessionKey, tokensBefore, tokensAfter);