@ppagent/memory 0.4.1 → 0.4.2

package/dist/index.js

@@ -1874,7 +1874,7 @@ var LlmService = class {
 
 \u8F93\u51FA\u5FC5\u987B\u662F\u5408\u6CD5\u7684 JSON \u5BF9\u8C61\uFF0C\u4E0D\u8981\u5305\u542B\u4EFB\u4F55 markdown \u6807\u8BB0\uFF0C\u683C\u5F0F\u5982\u4E0B\uFF1A
 {"title": "...", "summary": "..."}`;
-    const formatted = messages.map((m) => formatStoredMessage(m)).join("\n");
+    const formatted = messages.map((m) => formatStoredMessageForCompression(m)).join("\n");
     const response = await this.chatCompletionWithUsage(
       systemPrompt,
       `\u8BF7\u538B\u7F29\u4EE5\u4E0B\u5BF9\u8BDD\uFF1A
@@ -2039,11 +2039,81 @@ ${text}`
 ${context}`, false);
   }
 };
-function formatStoredMessage(message) {
-  const extras = [message.parts, message.metadata, message.payload].filter((value) => value && value !== "[]" && value !== "{}").join(" ");
+function formatStoredMessageForCompression(message) {
+  const metadata = stripToolCallContentFromMetadata(message.metadata);
+  const extras = [message.parts, metadata, message.payload].filter((value) => value && value !== "[]" && value !== "{}").join(" ");
   return `[${new Date(message.createdAt).toISOString()}] ${message.talkerId || "user"}: ${message.content}${extras ? `
 meta=${extras}` : ""}`;
 }
+var OMIT_COMPRESSION_VALUE = Symbol("omit-compression-value");
+var TOOL_CALL_CONTAINER_KEYS = /* @__PURE__ */ new Set([
+  "toolcall",
+  "toolcalls",
+  "toolresult",
+  "toolresults",
+  "tooloutput",
+  "tooloutputs",
+  "toolresponse",
+  "toolresponses",
+  "tooluse",
+  "tooluses",
+  "functioncall",
+  "functioncalls",
+  "functionresponse",
+  "functionresponses"
+]);
+var TOOL_CALL_ID_KEYS = /* @__PURE__ */ new Set(["toolcallid", "tooluseid"]);
+var TOOL_BLOCK_TYPES = /* @__PURE__ */ new Set([
+  "toolcall",
+  "tooloutput",
+  "toolresponse",
+  "toolresult",
+  "tooluse",
+  "functioncall",
+  "functionresponse"
+]);
+function stripToolCallContentFromMetadata(metadata) {
+  if (!metadata || metadata === "{}") return metadata;
+  try {
+    const parsed = JSON.parse(metadata);
+    const sanitized = stripToolCallContent(parsed);
+    return JSON.stringify(sanitized === OMIT_COMPRESSION_VALUE ? {} : sanitized);
+  } catch {
+    return metadata;
+  }
+}
+function stripToolCallContent(value) {
+  if (Array.isArray(value)) {
+    return value.map((item) => stripToolCallContent(item)).filter((item) => item !== OMIT_COMPRESSION_VALUE);
+  }
+  if (!isRecord(value)) return value;
+  if (isToolCallBlock(value)) return OMIT_COMPRESSION_VALUE;
+  const sanitized = {};
+  for (const [key, child] of Object.entries(value)) {
+    const normalizedKey = normalizeToolKey(key);
+    if (TOOL_CALL_CONTAINER_KEYS.has(normalizedKey) || TOOL_CALL_ID_KEYS.has(normalizedKey)) {
+      continue;
+    }
+    const next = stripToolCallContent(child);
+    if (next !== OMIT_COMPRESSION_VALUE) sanitized[key] = next;
+  }
+  return sanitized;
+}
+function isToolCallBlock(value) {
+  const role = typeof value.role === "string" ? normalizeToolKey(value.role) : "";
+  const type = typeof value.type === "string" ? normalizeToolKey(value.type) : "";
+  if (role === "tool" || role === "function") return true;
+  if (TOOL_BLOCK_TYPES.has(type)) return true;
+  const normalizedKeys = new Set(Object.keys(value).map(normalizeToolKey));
+  const hasToolCallId = [...TOOL_CALL_ID_KEYS].some((key) => normalizedKeys.has(key));
+  return hasToolCallId && ["content", "output", "result", "response"].some((key) => normalizedKeys.has(key));
+}
+function normalizeToolKey(value) {
+  return value.replace(/[\s_-]/g, "").toLowerCase();
+}
+function isRecord(value) {
+  return value !== null && typeof value === "object";
+}
 
 // src/manager/compress.manager.ts
 import { v4 as uuidv4 } from "uuid";

package/llms.txt

@@ -375,6 +375,7 @@ The package intentionally separates durable base writes from expensive graph con
 
 - Registers its write synchronously, so a caller may intentionally fire-and-forget it and a following `getHistoryWindow` will still wait for that write.
 - Calculates tokens over `content`, `parts`, `payload`, and `metadata`, embeds the searchable text, and upserts raw messages by stable `messageId` before resolving.
+- Raw-message token usage always counts the complete stored `metadata`. When a raw batch is summarized, common tool-call/tool-result fields are removed only from the temporary LLM compression input; persisted metadata and uncompressed `recentMessages` remain unchanged.
 - Creates or updates the session record.
 - Updates the in-memory session cache.
 - Once `getHistoryWindow` has supplied the current model size, reaching the precompression threshold starts background compression.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ppagent/memory",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "独立记忆系统模块，向量存储支持 LanceDB / SQLite(sqlite-vec) 双后端自动切换 + Grafeo 知识图谱",
   "type": "module",
   "main": "dist/index.js",