@cogitator-ai/memory 0.11.7 → 0.12.0

package/dist/token-counter.js

@@ -6,6 +6,15 @@
  */
 const CHARS_PER_TOKEN = 4;
 const MESSAGE_OVERHEAD = 4;
+const TOOL_CALL_OVERHEAD = 8;
+/**
+ * Tokens an image costs. Providers bill images by their pixel size, which a message does not
+ * carry, so this is an upper estimate: about what Anthropic charges for an image at its maximum
+ * size, and above OpenAI's high-detail cost for a 1024px image. `detail: 'low'` images are a
+ * flat 85 tokens on OpenAI.
+ */
+const IMAGE_TOKENS = 1600;
+const LOW_DETAIL_IMAGE_TOKENS = 85;
 /**
  * Estimate token count for a string
  */
@@ -14,23 +23,43 @@ export function countTokens(text) {
         return 0;
     return Math.ceil(text.length / CHARS_PER_TOKEN);
 }
+function countPartTokens(part) {
+    switch (part.type) {
+        case 'text':
+            return countTokens(part.text);
+        case 'image_url':
+            return part.image_url.detail === 'low' ? LOW_DETAIL_IMAGE_TOKENS : IMAGE_TOKENS;
+        case 'image_base64':
+            return IMAGE_TOKENS;
+    }
+}
+function countContentTokens(content) {
+    if (typeof content === 'string')
+        return countTokens(content);
+    return content.reduce((sum, part) => sum + countPartTokens(part), 0);
+}
 /**
- * Extract text content from a message
+ * Estimate token count for tool calls: their names and JSON arguments
  */
-function getTextContent(content) {
-    if (typeof content === 'string') {
-        return content;
-    }
-    return content
-        .filter((part) => part.type === 'text')
-        .map((part) => part.text)
-        .join(' ');
+export function countToolCallsTokens(toolCalls) {
+    return toolCalls.reduce((sum, call) => sum +
+        TOOL_CALL_OVERHEAD +
+        countTokens(call.name) +
+        countTokens(JSON.stringify(call.arguments ?? {})), 0);
+}
+/** The tool calls an assistant message carries, when it carries any */
+function toolCallsOf(message) {
+    const toolCalls = message.toolCalls;
+    return Array.isArray(toolCalls) ? toolCalls : undefined;
 }
 /**
- * Estimate token count for a message (includes overhead)
+ * Estimate token count for a message: its text, images and tool calls, plus overhead
  */
 export function countMessageTokens(message) {
-    return countTokens(getTextContent(message.content)) + MESSAGE_OVERHEAD;
+    const toolCalls = toolCallsOf(message);
+    return (countContentTokens(message.content) +
+        MESSAGE_OVERHEAD +
+        (toolCalls ? countToolCallsTokens(toolCalls) : 0));
 }
 /**
  * Estimate token count for an array of messages
@@ -38,6 +67,17 @@ export function countMessageTokens(message) {
 export function countMessagesTokens(messages) {
     return messages.reduce((sum, msg) => sum + countMessageTokens(msg), 0);
 }
+/**
+ * Tokens a stored entry takes in a context. Counted from its message and tool calls rather
+ * than trusted from `tokenCount`, which may have been saved by an older estimate that left out
+ * tool arguments and images; the larger of the two wins, so a count from a real tokenizer is
+ * kept.
+ */
+export function countEntryTokens(entry) {
+    const messageCalls = toolCallsOf(entry.message);
+    const entryCalls = !messageCalls && entry.toolCalls ? countToolCallsTokens(entry.toolCalls) : 0;
+    return Math.max(entry.tokenCount ?? 0, countMessageTokens(entry.message) + entryCalls);
+}
 /**
  * Truncate text to fit within token limit
  */

package/dist/token-counter.js.map

@@ -1 +1 @@
-{"version":3,"file":"token-counter.js","sourceRoot":"","sources":["../src/token-counter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,MAAM,eAAe,GAAG,CAAC,CAAC;AAC1B,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAE3B;;GAEG;AACH,MAAM,UAAU,WAAW,CAAC,IAAY;IACtC,IAAI,CAAC,IAAI;QAAE,OAAO,CAAC,CAAC;IACpB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,CAAC;AAClD,CAAC;AAED;;GAEG;AACH,SAAS,cAAc,CAAC,OAA2B;IACjD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAChC,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,OAAO,OAAO;SACX,MAAM,CAAC,CAAC,IAAI,EAA0C,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC;SAC9E,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;SACxB,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAAgB;IACjD,OAAO,WAAW,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,gBAAgB,CAAC;AACzE,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAC,QAAmB;IACrD,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;AACzE,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAY,EAAE,SAAiB;IAC9D,MAAM,aAAa,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;IACxC,IAAI,aAAa,IAAI,SAAS,EAAE,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,QAAQ,GAAG,SAAS,GAAG,eAAe,CAAC;IAC7C,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;AACjC,CAAC"}
+{"version":3,"file":"token-counter.js","sourceRoot":"","sources":["../src/token-counter.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cogitator-ai/memory",
-  "version": "0.11.7",
+  "version": "0.12.0",
   "description": "Memory adapters for Cogitator AI agents",
   "keywords": [
     "cogitator",
@@ -22,7 +22,8 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.js"
+      "import": "./dist/index.js",
+      "default": "./dist/index.js"
     }
   },
   "files": [
@@ -32,32 +33,34 @@
     "node": ">=22.12.0"
   },
   "dependencies": {
-    "@cogitator-ai/redis": "0.5.1",
-    "@cogitator-ai/types": "0.34.0",
+    "@cogitator-ai/redis": "0.5.2",
+    "@cogitator-ai/types": "0.36.0",
     "nanoid": "^6.0.1",
     "zod": "^4.6.5"
   },
-  "optionalDependencies": {
-    "@qdrant/js-client-rest": "^1.19.0",
-    "better-sqlite3": "^13.0.3",
-    "ioredis": "^6.0.0",
-    "mongodb": "^7.7.0",
-    "pg": "^8.23.1"
-  },
   "devDependencies": {
+    "@qdrant/js-client-rest": "^1.19.0",
     "@types/better-sqlite3": "^9.6.0",
     "@types/node": "^22.20.4",
     "@types/pg": "^8.23.1",
+    "better-sqlite3": "^13.0.3",
+    "ioredis": "^6.0.0",
+    "mongodb": "^7.7.0",
+    "pg": "^8.23.1",
     "typescript": "^6.0.3",
     "vitest": "^5.0.3"
   },
   "peerDependencies": {
+    "@qdrant/js-client-rest": "^1.10.0",
     "better-sqlite3": "^11.0.0 || ^12.0.0 || ^13.0.0",
     "ioredis": "^5.0.0 || ^6.0.0",
     "mongodb": "^6.0.0 || ^7.0.0",
     "pg": "^8.0.0"
   },
   "peerDependenciesMeta": {
+    "@qdrant/js-client-rest": {
+      "optional": true
+    },
     "better-sqlite3": {
       "optional": true
     },