sema-core 2.0.16 → 2.1.1

package/dist/util/tokens.d.ts

@@ -1,8 +1,16 @@
 import { Message } from '../types/message';
 import { Usage } from '../events/types';
-export declare function countTokens(messages: Message[]): {
+/**
+ * 从后往前找最近一条带有效 usage 的 assistant 消息（跳过合成消息与零 usage），返回其 token 数。
+ * index 为该消息在 messages 中的下标，未找到时为 -1；调用方据此估算该消息之后新增的内容。
+ */
+export interface TokenCount {
     inputTokens: number;
     outputTokens: number;
-};
+    index: number;
+    cacheReadTokens?: number;
+    cacheWriteTokens?: number;
+}
+export declare function countTokens(messages: Message[]): TokenCount;
 export declare function getTokens(messages: Message[], sessionId?: string): Usage;
 //# sourceMappingURL=tokens.d.ts.map

package/dist/util/tokens.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../src/util/tokens.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAE1C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAGvC,wBAAgB,WAAW,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAkD9F;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,KAAK,CAgBxE"}
+{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../src/util/tokens.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAE1C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAGvC;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAC1B;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,UAAU,CAkD3D;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,KAAK,CAexE"}

package/dist/util/tokens.js

@@ -26,13 +26,15 @@ function countTokens(messages) {
                         i--;
                         continue;
                     }
-                    return {
-                        inputTokens,
-                        outputTokens
-                    };
+                    const result = { inputTokens, outputTokens, index: i };
+                    if (typeof usage.cache_read_input_tokens === 'number')
+                        result.cacheReadTokens = usage.cache_read_input_tokens;
+                    if (typeof usage.cache_creation_input_tokens === 'number')
+                        result.cacheWriteTokens = usage.cache_creation_input_tokens;
+                    return result;
                 }
                 else if ('prompt_tokens' in usage && 'completion_tokens' in usage) {
-                    // OpenAI 格式
+                    // OpenAI 格式（旧历史兼容，prompt_tokens 已含缓存部分）
                     const inputTokens = usage.prompt_tokens;
                     const outputTokens = usage.completion_tokens;
                     // 如果 tokens 都为 0，跳过此消息，继续向前查找
@@ -40,16 +42,17 @@ function countTokens(messages) {
                         i--;
                         continue;
                     }
-                    return {
-                        inputTokens,
-                        outputTokens
-                    };
+                    const result = { inputTokens, outputTokens, index: i };
+                    const cached = usage.prompt_tokens_details?.cached_tokens ?? usage.prompt_cache_hit_tokens;
+                    if (typeof cached === 'number')
+                        result.cacheReadTokens = cached;
+                    return result;
                 }
             }
         }
         i--;
     }
-    return { inputTokens: 0, outputTokens: 0 };
+    return { inputTokens: 0, outputTokens: 0, index: -1 };
 }
 function getTokens(messages, sessionId) {
     const tokens = countTokens(messages);
@@ -59,10 +62,11 @@ function getTokens(messages, sessionId) {
     const modelProfile = modelManager.getModel('main', sessionId); // 获取主模型配置（含会话级覆盖）
     // 如果没有找到模型配置，使用默认值
     const maxTokens = modelProfile?.contextLength || 128000;
-    return {
-        useTokens,
-        maxTokens,
-        promptTokens
-    };
+    const usage = { useTokens, maxTokens, promptTokens };
+    if (tokens.cacheReadTokens !== undefined)
+        usage.cacheReadTokens = tokens.cacheReadTokens;
+    if (tokens.cacheWriteTokens !== undefined)
+        usage.cacheWriteTokens = tokens.cacheWriteTokens;
+    return usage;
 }
 //# sourceMappingURL=tokens.js.map

package/dist/util/tokens.js.map

@@ -1 +1 @@
-{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../src/util/tokens.ts"],"names":[],"mappings":";;AAKA,kCAkDC;AAED,8BAgBC;AAxED,uCAAgD;AAEhD,0DAAyD;AAEzD,SAAgB,WAAW,CAAC,QAAmB;IAC7C,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAA;IAC3B,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACd,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;QAC3B,IACE,OAAO,EAAE,IAAI,KAAK,WAAW;YAC7B,OAAO,IAAI,OAAO,CAAC,OAAO;YAC1B,CAAC,CACC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,MAAM;gBAC3C,IAAA,8BAAoB,EAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CACtD,EACD,CAAC;YACD,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,KAAY,CAAA;YAE1C,mBAAmB;YACnB,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBACvC,IAAI,cAAc,IAAI,KAAK,IAAI,eAAe,IAAI,KAAK,EAAE,CAAC;oBACxD,mBAAmB;oBACnB,MAAM,WAAW,GAAG,KAAK,CAAC,YAAY;wBACpC,CAAC,KAAK,CAAC,2BAA2B,IAAI,CAAC,CAAC;wBACxC,CAAC,KAAK,CAAC,uBAAuB,IAAI,CAAC,CAAC,CAAA;oBACtC,MAAM,YAAY,GAAG,KAAK,CAAC,aAAa,CAAA;oBACxC,8BAA8B;oBAC9B,IAAI,WAAW,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;wBAC5C,CAAC,EAAE,CAAA;wBACH,SAAQ;oBACV,CAAC;oBACD,OAAO;wBACL,WAAW;wBACX,YAAY;qBACb,CAAA;gBACH,CAAC;qBAAM,IAAI,eAAe,IAAI,KAAK,IAAI,mBAAmB,IAAI,KAAK,EAAE,CAAC;oBACpE,YAAY;oBACZ,MAAM,WAAW,GAAG,KAAK,CAAC,aAAa,CAAA;oBACvC,MAAM,YAAY,GAAG,KAAK,CAAC,iBAAiB,CAAA;oBAC5C,8BAA8B;oBAC9B,IAAI,WAAW,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;wBAC5C,CAAC,EAAE,CAAA;wBACH,SAAQ;oBACV,CAAC;oBACD,OAAO;wBACL,WAAW;wBACX,YAAY;qBACb,CAAA;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QACD,CAAC,EAAE,CAAA;IACL,CAAC;IACD,OAAO,EAAE,WAAW,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAA;AAC5C,CAAC;AAED,SAAgB,SAAS,CAAC,QAAmB,EAAE,SAAkB;IAC/D,MAAM,MAAM,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;IACrC,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC,YAAY,CAAC;IAC3D,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,CAAC;IAExC,MAAM,YAAY,GAAG,IAAA,8BAAe,GAAE,CAAA;IACtC,MAAM,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA,CAAC,kBAAkB;IAEhF,mBAAmB;IACnB,MAAM,SAAS,GAAG,YAAY,EAAE,aAAa,IAAI,MAAM,CAAC;IAExD,OAAO;QACL,SAAS;QACT,SAAS;QACT,YAAY;KACb,CAAC;AACJ,CAAC"}
+{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../src/util/tokens.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sema-core",
-  "version": "2.0.16",
+  "version": "2.1.1",
   "description": "Event-driven core library for Sema AI assistant",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -28,6 +28,7 @@
   },
   "scripts": {
     "build": "tsc",
+    "test": "tsx --test \"tests/**/*.test.ts\"",
     "lint": "eslint src/**/*.ts",
     "prepublishOnly": "npm run build"
   },
@@ -61,6 +62,7 @@
     "openai": "^6.9.1",
     "shell-quote": "^1.8.3",
     "spawn-rx": "^5.1.2",
+    "turndown": "^7.2.4",
     "undici": "^7.16.0",
     "zod": "^3.25.76",
     "zod-to-json-schema": "^3.24.6"