@snylonue/dsh-context-policy 0.2.1 → 0.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -2
- package/dist/builtin-tokenizers.js +1 -1
- package/dist/builtin-tokenizers.js.map +1 -1
- package/dist/compact.d.ts +56 -0
- package/dist/compact.d.ts.map +1 -0
- package/dist/compact.js +139 -0
- package/dist/compact.js.map +1 -0
- package/dist/core.d.ts +17 -4
- package/dist/core.d.ts.map +1 -1
- package/dist/core.js +36 -15
- package/dist/core.js.map +1 -1
- package/dist/projection.d.ts +267 -34
- package/dist/projection.d.ts.map +1 -1
- package/dist/projection.js +27 -38
- package/dist/projection.js.map +1 -1
- package/dist/token-meter.d.ts +3 -2
- package/dist/token-meter.d.ts.map +1 -1
- package/dist/token-meter.js +5 -4
- package/dist/token-meter.js.map +1 -1
- package/dist/tokenizers.d.ts +2 -0
- package/dist/tokenizers.d.ts.map +1 -1
- package/dist/tokenizers.js +5 -0
- package/dist/tokenizers.js.map +1 -1
- package/dist/types.d.ts +12 -3
- package/dist/types.d.ts.map +1 -1
- package/package.json +102 -103
- package/scripts/check.ts +4 -0
- package/src/builtin-tokenizers.ts +1 -1
- package/src/compact.ts +189 -0
- package/src/core.ts +55 -27
- package/src/projection.ts +45 -47
- package/src/token-meter.ts +13 -6
- package/src/tokenizers.ts +6 -0
- package/src/types.ts +12 -3
- package/tests/compact.test.ts +475 -0
- package/tests/current-host.test.ts +15 -0
- package/tests/policy.test.ts +6 -6
- package/tests/replay.test.ts +255 -0
package/README.md
CHANGED
|
@@ -5,7 +5,7 @@ Percentage-based automatic compaction and model-configurable token accounting fo
|
|
|
5
5
|
## Requirements
|
|
6
6
|
|
|
7
7
|
- Node.js 24 or later.
|
|
8
|
-
- DSH 0.2.
|
|
8
|
+
- DSH 0.2.1-rc.2 only; older-host support is removed.
|
|
9
9
|
|
|
10
10
|
## Installation
|
|
11
11
|
|
|
@@ -201,7 +201,7 @@ Compared with DSH 0.2.0-rc.2's official `dsh-token-meter` and `dsh-compaction-ba
|
|
|
201
201
|
|
|
202
202
|
The compaction service extends `BasicCompactionEngine` and replaces automatic pressure range selection. Summarization, durable transactions, manual commands, and overflow listeners use the upstream implementation.
|
|
203
203
|
|
|
204
|
-
The meter uses the public Cordis service lifecycle and projection registration API. Its billing fold is maintained locally because the upstream definition is not exported at runtime. Replay state does not retain fixed-density heuristic prices. Projection state, wire composition, and durable compaction shadow prices all use model-configured token counts. The upstream `heuristicTokens`
|
|
204
|
+
The meter uses the public Cordis service lifecycle and projection registration API. Its billing fold is maintained locally because the upstream definition is not exported at runtime. Replay state does not retain fixed-density heuristic prices. Projection state, wire composition, and durable compaction shadow prices all use model-configured token counts. The current host still requires the upstream `heuristicTokens` field; it carries the same model count as `tokens`, not an older-host estimator. This does not change independent history estimators owned by other plugins.
|
|
205
205
|
|
|
206
206
|
## Development and release
|
|
207
207
|
|
|
@@ -10,6 +10,6 @@ export function createTokenizerCounter(asset) {
|
|
|
10
10
|
data.added_tokens = [];
|
|
11
11
|
return new Tokenizer(data, {});
|
|
12
12
|
});
|
|
13
|
-
return (text) => tokenizer.value.
|
|
13
|
+
return (text) => tokenizer.value.tokenize(text, { add_special_tokens: false }).length;
|
|
14
14
|
}
|
|
15
15
|
//# sourceMappingURL=builtin-tokenizers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builtin-tokenizers.js","sourceRoot":"","sources":["../src/builtin-tokenizers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAE3B,MAAM,UAAU,sBAAsB,CACrC,KAAa;IAEb,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;QAClC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CACtB,UAAU,CACT,YAAY,CACX,IAAI,GAAG,CAAC,aAAa,KAAK,oBAAoB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAChE,CACD,CAAC,QAAQ,CAAC,MAAM,CAAC,CAClB,CAAC;QACF,qEAAqE;QACrE,yCAAyC;QACzC,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,OAAO,IAAI,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,IAAI,EAAE,EAAE,CACf,SAAS,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"builtin-tokenizers.js","sourceRoot":"","sources":["../src/builtin-tokenizers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAE3B,MAAM,UAAU,sBAAsB,CACrC,KAAa;IAEb,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;QAClC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CACtB,UAAU,CACT,YAAY,CACX,IAAI,GAAG,CAAC,aAAa,KAAK,oBAAoB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAChE,CACD,CAAC,QAAQ,CAAC,MAAM,CAAC,CAClB,CAAC;QACF,qEAAqE;QACrE,yCAAyC;QACzC,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,OAAO,IAAI,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,IAAI,EAAE,EAAE,CACf,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC;AACvE,CAAC"}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import { SessionLogOffset, SessionSeq } from "@deepseek-ai/dsh-session";
|
|
2
|
+
import type { FileBlock, ImageBlock, TokenUsage } from "@deepseek-ai/dsh-llm";
|
|
3
|
+
import { z } from "zod";
|
|
4
|
+
import type { MeterConfig, MeterEvent } from "./types.js";
|
|
5
|
+
export { measureState as measureCompact } from "./core.js";
|
|
6
|
+
export declare const compactSchema: z.ZodObject<{
|
|
7
|
+
nodes: z.ZodArray<z.ZodObject<{
|
|
8
|
+
seq: z.ZodPipe<z.ZodNumber, z.ZodTransform<SessionSeq, number>>;
|
|
9
|
+
system: z.ZodBoolean;
|
|
10
|
+
counts: z.ZodObject<{
|
|
11
|
+
text: z.ZodRecord<z.ZodString, z.ZodNumber>;
|
|
12
|
+
reasoning: z.ZodRecord<z.ZodString, z.ZodNumber>;
|
|
13
|
+
envelope: z.ZodBoolean;
|
|
14
|
+
}, z.core.$strip>;
|
|
15
|
+
message: z.ZodNullable<z.ZodObject<{
|
|
16
|
+
content: z.ZodArray<z.ZodCustom<ImageBlock | FileBlock, ImageBlock | FileBlock>>;
|
|
17
|
+
}, z.core.$strip>>;
|
|
18
|
+
heuristicTokens: z.ZodOptional<z.ZodNumber>;
|
|
19
|
+
}, z.core.$strip>>;
|
|
20
|
+
header: z.ZodNullable<z.ZodObject<{
|
|
21
|
+
config: z.ZodCustom<import("@deepseek-ai/dsh-llm").LlmCallConfig, import("@deepseek-ai/dsh-llm").LlmCallConfig>;
|
|
22
|
+
adapterDefaults: z.ZodOptional<z.ZodCustom<import("@deepseek-ai/dsh-llm").LlmCallConfigAdapterDefaults | undefined, import("@deepseek-ai/dsh-llm").LlmCallConfigAdapterDefaults | undefined>>;
|
|
23
|
+
toolsKey: z.ZodString;
|
|
24
|
+
toolCounts: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodNumber>>;
|
|
25
|
+
}, z.core.$strip>>;
|
|
26
|
+
anchor: z.ZodNullable<z.ZodObject<{
|
|
27
|
+
header: z.ZodObject<{
|
|
28
|
+
config: z.ZodCustom<import("@deepseek-ai/dsh-llm").LlmCallConfig, import("@deepseek-ai/dsh-llm").LlmCallConfig>;
|
|
29
|
+
adapterDefaults: z.ZodOptional<z.ZodCustom<import("@deepseek-ai/dsh-llm").LlmCallConfigAdapterDefaults | undefined, import("@deepseek-ai/dsh-llm").LlmCallConfigAdapterDefaults | undefined>>;
|
|
30
|
+
toolsKey: z.ZodString;
|
|
31
|
+
toolCounts: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodNumber>>;
|
|
32
|
+
}, z.core.$strip>;
|
|
33
|
+
nodes: z.ZodArray<z.ZodObject<{
|
|
34
|
+
seq: z.ZodPipe<z.ZodNumber, z.ZodTransform<SessionSeq, number>>;
|
|
35
|
+
system: z.ZodBoolean;
|
|
36
|
+
counts: z.ZodObject<{
|
|
37
|
+
text: z.ZodRecord<z.ZodString, z.ZodNumber>;
|
|
38
|
+
reasoning: z.ZodRecord<z.ZodString, z.ZodNumber>;
|
|
39
|
+
envelope: z.ZodBoolean;
|
|
40
|
+
}, z.core.$strip>;
|
|
41
|
+
message: z.ZodNullable<z.ZodObject<{
|
|
42
|
+
content: z.ZodArray<z.ZodCustom<ImageBlock | FileBlock, ImageBlock | FileBlock>>;
|
|
43
|
+
}, z.core.$strip>>;
|
|
44
|
+
heuristicTokens: z.ZodOptional<z.ZodNumber>;
|
|
45
|
+
}, z.core.$strip>>;
|
|
46
|
+
usage: z.ZodCustom<TokenUsage, TokenUsage>;
|
|
47
|
+
}, z.core.$strip>>;
|
|
48
|
+
logRevision: z.ZodPipe<z.ZodNumber, z.ZodTransform<SessionLogOffset, number>>;
|
|
49
|
+
}, z.core.$strip>;
|
|
50
|
+
export type CompactState = z.infer<typeof compactSchema>;
|
|
51
|
+
export declare const initialCompactState: () => CompactState;
|
|
52
|
+
/** Counts cannot be reused across schema or policy changes. */
|
|
53
|
+
export declare function compactVersion(config: MeterConfig): number;
|
|
54
|
+
/** The existing fold owns usage, offload and replacement semantics; only its new payloads are summarized. */
|
|
55
|
+
export declare function foldCompact(state: CompactState, event: MeterEvent, config: MeterConfig): CompactState;
|
|
56
|
+
//# sourceMappingURL=compact.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compact.d.ts","sourceRoot":"","sources":["../src/compact.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,OAAO,KAAK,EACX,WAAW,EACX,UAAU,EAGV,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,YAAY,IAAI,cAAc,EAAE,MAAM,WAAW,CAAC;AAoB3D,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAWxB,CAAC;AACH,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AACzD,eAAO,MAAM,mBAAmB,QAA2B,YAAY,CAAC;AAExE,+DAA+D;AAC/D,wBAAgB,cAAc,CAAC,MAAM,EAAE,WAAW,UAKjD;AAyGD,6GAA6G;AAC7G,wBAAgB,WAAW,CAC1B,KAAK,EAAE,YAAY,EACnB,KAAK,EAAE,UAAU,EACjB,MAAM,EAAE,WAAW,GACjB,YAAY,CAuBd"}
|
package/dist/compact.js
ADDED
|
@@ -0,0 +1,139 @@
|
|
|
1
|
+
import { createHash } from "node:crypto";
|
|
2
|
+
import { SessionLogOffset, SessionSeq } from "@deepseek-ai/dsh-session";
|
|
3
|
+
import { z } from "zod";
|
|
4
|
+
import { contentTokens, fold, headerToolsKey, initialState } from "./core.js";
|
|
5
|
+
import { deepFreeze } from "@deepseek-ai/dsh-util-values";
|
|
6
|
+
import { countText, tokenizerGeneration } from "./tokenizers.js";
|
|
7
|
+
export { measureState as measureCompact } from "./core.js";
|
|
8
|
+
const count = z.number().int().nonnegative();
|
|
9
|
+
const counts = z.record(z.string(), count);
|
|
10
|
+
const nodeSchema = z.object({
|
|
11
|
+
seq: count.transform(SessionSeq),
|
|
12
|
+
system: z.boolean(),
|
|
13
|
+
counts: z.object({ text: counts, reasoning: counts, envelope: z.boolean() }),
|
|
14
|
+
// Only durable attachment references survive; never text or tool-call bodies.
|
|
15
|
+
message: z
|
|
16
|
+
.object({ content: z.array(z.custom()) })
|
|
17
|
+
.nullable(),
|
|
18
|
+
heuristicTokens: count.optional(),
|
|
19
|
+
});
|
|
20
|
+
const headerSchema = z.object({
|
|
21
|
+
config: z.custom(),
|
|
22
|
+
adapterDefaults: z.custom().optional(),
|
|
23
|
+
toolsKey: z.string(),
|
|
24
|
+
toolCounts: counts.nullable(),
|
|
25
|
+
});
|
|
26
|
+
export const compactSchema = z.object({
|
|
27
|
+
nodes: z.array(nodeSchema),
|
|
28
|
+
header: headerSchema.nullable(),
|
|
29
|
+
anchor: z
|
|
30
|
+
.object({
|
|
31
|
+
header: headerSchema,
|
|
32
|
+
nodes: z.array(nodeSchema),
|
|
33
|
+
usage: z.custom(),
|
|
34
|
+
})
|
|
35
|
+
.nullable(),
|
|
36
|
+
logRevision: count.transform(SessionLogOffset),
|
|
37
|
+
});
|
|
38
|
+
export const initialCompactState = () => initialState();
|
|
39
|
+
/** Counts cannot be reused across schema or policy changes. */
|
|
40
|
+
export function compactVersion(config) {
|
|
41
|
+
const hash = createHash("sha256")
|
|
42
|
+
.update(JSON.stringify([2, config]))
|
|
43
|
+
.digest("hex");
|
|
44
|
+
return 0x100000000 + Number.parseInt(hash.slice(0, 8), 16);
|
|
45
|
+
}
|
|
46
|
+
function tokenizerNames(config) {
|
|
47
|
+
return [
|
|
48
|
+
...new Set([
|
|
49
|
+
config.defaultTokenizer,
|
|
50
|
+
...[...(config.providerPolicies ?? []), ...config.modelPolicies].flatMap((p) => (p.tokenizer === undefined ? [] : [p.tokenizer])),
|
|
51
|
+
]),
|
|
52
|
+
];
|
|
53
|
+
}
|
|
54
|
+
// The host cold-replays one whole projection at a time. A bounded text cache
|
|
55
|
+
// cannot bridge those passes. Share only immutable numeric payload summaries:
|
|
56
|
+
// never a fold state, body, tool schema, attachment, or strong event reference.
|
|
57
|
+
let payloads = new WeakMap();
|
|
58
|
+
let payloadGeneration = -1;
|
|
59
|
+
function payloadCounts(event, config) {
|
|
60
|
+
const generation = tokenizerGeneration();
|
|
61
|
+
if (generation !== payloadGeneration) {
|
|
62
|
+
payloads = new WeakMap();
|
|
63
|
+
payloadGeneration = generation;
|
|
64
|
+
}
|
|
65
|
+
let policies = payloads.get(event);
|
|
66
|
+
if (!policies) {
|
|
67
|
+
policies = new Map();
|
|
68
|
+
payloads.set(event, policies);
|
|
69
|
+
}
|
|
70
|
+
// Overheads and route/reasoning selection do not affect these base counts.
|
|
71
|
+
const key = JSON.stringify(tokenizerNames(config));
|
|
72
|
+
let summary = policies.get(key);
|
|
73
|
+
if (!summary) {
|
|
74
|
+
summary = {};
|
|
75
|
+
policies.set(key, summary);
|
|
76
|
+
}
|
|
77
|
+
return summary;
|
|
78
|
+
}
|
|
79
|
+
function compactHeader(header, config, memo) {
|
|
80
|
+
if (!memo.header) {
|
|
81
|
+
const tools = header.tools?.length ? JSON.stringify(header.tools) : null;
|
|
82
|
+
memo.header = deepFreeze({
|
|
83
|
+
toolsKey: headerToolsKey(header),
|
|
84
|
+
toolCounts: tools === null
|
|
85
|
+
? null
|
|
86
|
+
: Object.fromEntries(tokenizerNames(config).map((name) => [
|
|
87
|
+
name,
|
|
88
|
+
countText(tools, name),
|
|
89
|
+
])),
|
|
90
|
+
});
|
|
91
|
+
}
|
|
92
|
+
return {
|
|
93
|
+
config: header.config,
|
|
94
|
+
...(header.adapterDefaults
|
|
95
|
+
? { adapterDefaults: header.adapterDefaults }
|
|
96
|
+
: {}),
|
|
97
|
+
...memo.header,
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
function compactNode(node, system, config, memo) {
|
|
101
|
+
const content = node.message?.content ?? [];
|
|
102
|
+
const attachments = content.filter((b) => b.type === "image" || b.type === "file");
|
|
103
|
+
if (!memo.node) {
|
|
104
|
+
const text = content.filter((b) => b.type !== "image" && b.type !== "file");
|
|
105
|
+
const names = tokenizerNames(config);
|
|
106
|
+
const prices = (blocks, includeReasoning) => Object.fromEntries(names.map((tokenizer) => [
|
|
107
|
+
tokenizer,
|
|
108
|
+
contentTokens(blocks, { tokenizer, includeReasoning }),
|
|
109
|
+
]));
|
|
110
|
+
memo.node = deepFreeze({
|
|
111
|
+
text: prices(text, false),
|
|
112
|
+
reasoning: prices(text.filter((b) => b.type === "reasoning"), true),
|
|
113
|
+
envelope: text.some((b) => b.type === "text" || b.type === "tool-call"),
|
|
114
|
+
});
|
|
115
|
+
}
|
|
116
|
+
return {
|
|
117
|
+
seq: node.seq,
|
|
118
|
+
system,
|
|
119
|
+
counts: memo.node,
|
|
120
|
+
message: attachments.length ? { content: attachments } : null,
|
|
121
|
+
};
|
|
122
|
+
}
|
|
123
|
+
/** The existing fold owns usage, offload and replacement semantics; only its new payloads are summarized. */
|
|
124
|
+
export function foldCompact(state, event, config) {
|
|
125
|
+
const next = fold(state, event);
|
|
126
|
+
return {
|
|
127
|
+
...next,
|
|
128
|
+
header: next.header === state.header
|
|
129
|
+
? state.header
|
|
130
|
+
: next.header &&
|
|
131
|
+
compactHeader(next.header, config, payloadCounts(event, config)),
|
|
132
|
+
nodes: next.nodes === state.nodes
|
|
133
|
+
? state.nodes
|
|
134
|
+
: next.nodes.map((node) => node.counts
|
|
135
|
+
? node
|
|
136
|
+
: compactNode(node, event.type === "system/message", config, payloadCounts(event, config))),
|
|
137
|
+
};
|
|
138
|
+
}
|
|
139
|
+
//# sourceMappingURL=compact.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compact.js","sourceRoot":"","sources":["../src/compact.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAExE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAOjE,OAAO,EAAE,YAAY,IAAI,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3D,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC;AAC7C,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,KAAK,CAAC,CAAC;AAC3C,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC;IAChC,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE;IACnB,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;IAC5E,8EAA8E;IAC9E,OAAO,EAAE,CAAC;SACR,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAA0B,CAAC,EAAE,CAAC;SAChE,QAAQ,EAAE;IACZ,eAAe,EAAE,KAAK,CAAC,QAAQ,EAAE;CACjC,CAAC,CAAC;AACH,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAyB;IACzC,eAAe,EAAE,CAAC,CAAC,MAAM,EAAkC,CAAC,QAAQ,EAAE;IACtE,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,UAAU,EAAE,MAAM,CAAC,QAAQ,EAAE;CAC7B,CAAC,CAAC;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC;IAC1B,MAAM,EAAE,YAAY,CAAC,QAAQ,EAAE;IAC/B,MAAM,EAAE,CAAC;SACP,MAAM,CAAC;QACP,MAAM,EAAE,YAAY;QACpB,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC;QAC1B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAc;KAC7B,CAAC;SACD,QAAQ,EAAE;IACZ,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,CAAC;CAC9C,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,EAAE,CAAC,YAAY,EAAkB,CAAC;AAExE,+DAA+D;AAC/D,MAAM,UAAU,cAAc,CAAC,MAAmB;IACjD,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC;SAC/B,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;SACnC,MAAM,CAAC,KAAK,CAAC,CAAC;IAChB,OAAO,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAC5D,CAAC;AACD,SAAS,cAAc,CAAC,MAAmB;IAC1C,OAAO;QACN,GAAG,IAAI,GAAG,CAAC;YACV,MAAM,CAAC,gBAAgB;YACvB,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,gBAAgB,IAAI,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CACvE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CACvD;SACD,CAAC;KACF,CAAC;AACH,CAAC;AAKD,6EAA6E;AAC7E,8EAA8E;AAC9E,gFAAgF;AAChF,IAAI,QAAQ,GAAG,IAAI,OAAO,EAA0C,CAAC;AACrE,IAAI,iBAAiB,GAAG,CAAC,CAAC,CAAC;AAC3B,SAAS,aAAa,CAAC,KAAiB,EAAE,MAAmB;IAC5D,MAAM,UAAU,GAAG,mBAAmB,EAAE,CAAC;IACzC,IAAI,UAAU,KAAK,iBAAiB,EAAE,CAAC;QACtC,QAAQ,GAAG,IAAI,OAAO,EAAE,CAAC;QACzB,iBAAiB,GAAG,UAAU,CAAC;IAChC,CAAC;IACD,IAAI,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACnC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACf,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;QACrB,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC/B,CAAC;IACD,2EAA2E;IAC3E,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;IACnD,IAAI,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAChC,IAAI,CAAC,OAAO,EAAE,CAAC;QACd,OAAO,GAAG,EAAE,CAAC;QACb,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAC5B,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC;AACD,SAAS,aAAa,CACrB,MAAoB,EACpB,MAAmB,EACnB,IAAmB;IAEnB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QAClB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACzE,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC;YACxB,QAAQ,EAAE,cAAc,CAAC,MAAM,CAAC;YAChC,UAAU,EACT,KAAK,KAAK,IAAI;gBACb,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC,MAAM,CAAC,WAAW,CAClB,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;oBACpC,IAAI;oBACJ,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC;iBACtB,CAAC,CACF;SACJ,CAAC,CAAC;IACJ,CAAC;IACD,OAAO;QACN,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,GAAG,CAAC,MAAM,CAAC,eAAe;YACzB,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,eAAe,EAAE;YAC7C,CAAC,CAAC,EAAE,CAAC;QACN,GAAG,IAAI,CAAC,MAAM;KACd,CAAC;AACH,CAAC;AACD,SAAS,WAAW,CACnB,IAAgB,EAChB,MAAe,EACf,MAAmB,EACnB,IAAmB;IAEnB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,IAAI,EAAE,CAAC;IAC5C,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CACjC,CAAC,CAAC,EAA+B,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,CAC3E,CAAC;IACF,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAChB,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;QAC5E,MAAM,KAAK,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;QACrC,MAAM,MAAM,GAAG,CAAC,MAAsB,EAAE,gBAAyB,EAAE,EAAE,CACpE,MAAM,CAAC,WAAW,CACjB,KAAK,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC;YACxB,SAAS;YACT,aAAa,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,gBAAgB,EAAE,CAAC;SACtD,CAAC,CACF,CAAC;QACH,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;YACtB,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC;YACzB,SAAS,EAAE,MAAM,CAChB,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,EAC1C,IAAI,CACJ;YACD,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC;SACvE,CAAC,CAAC;IACJ,CAAC;IACD,OAAO;QACN,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,MAAM;QACN,MAAM,EAAE,IAAI,CAAC,IAAI;QACjB,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI;KAC7D,CAAC;AACH,CAAC;AAED,6GAA6G;AAC7G,MAAM,UAAU,WAAW,CAC1B,KAAmB,EACnB,KAAiB,EACjB,MAAmB;IAEnB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChC,OAAO;QACN,GAAG,IAAI;QACP,MAAM,EACL,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM;YAC3B,CAAC,CAAC,KAAK,CAAC,MAAM;YACd,CAAC,CAAC,IAAI,CAAC,MAAM;gBACZ,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACnE,KAAK,EACJ,IAAI,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK;YACzB,CAAC,CAAC,KAAK,CAAC,KAAK;YACb,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACxB,IAAI,CAAC,MAAM;gBACV,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC,WAAW,CACX,IAAI,EACJ,KAAK,CAAC,IAAI,KAAK,gBAAgB,EAC/B,MAAM,EACN,aAAa,CAAC,KAAK,EAAE,MAAM,CAAC,CAC5B,CACH;KACY,CAAC;AACnB,CAAC"}
|
package/dist/core.d.ts
CHANGED
|
@@ -1,11 +1,22 @@
|
|
|
1
|
+
import type { LlmImageRequestPrice, LlmImageRequestPricing, default as LlmService, Message, TokenUsage } from "@deepseek-ai/dsh-llm";
|
|
1
2
|
import type { EpochHeader, SessionEvent } from "@deepseek-ai/dsh-session";
|
|
2
|
-
import type { TokenMeasurementBaseline } from "@deepseek-ai/dsh-token-meter";
|
|
3
3
|
import { SessionLogOffset } from "@deepseek-ai/dsh-session";
|
|
4
|
-
import type {
|
|
5
|
-
import type { MeterConfig, MeterEvent,
|
|
4
|
+
import type { TokenMeasurementBaseline } from "@deepseek-ai/dsh-token-meter";
|
|
5
|
+
import type { MeterConfig, MeterEvent, ReplayHeader, ReplayNode, ReplayState } from "./types.js";
|
|
6
6
|
export interface MeterServices {
|
|
7
7
|
llm?: Pick<LlmService, "imageRequestPricing" | "fileRequestText">;
|
|
8
8
|
}
|
|
9
|
+
interface Attachments {
|
|
10
|
+
imagePricing?: LlmImageRequestPricing;
|
|
11
|
+
fileText?: LlmService["fileRequestText"];
|
|
12
|
+
imagePrices: readonly LlmImageRequestPrice[];
|
|
13
|
+
imageCursor: number;
|
|
14
|
+
unpricedImages: boolean;
|
|
15
|
+
unpricedFiles: boolean;
|
|
16
|
+
}
|
|
17
|
+
import { resolvePolicy } from "./tokenizers.js";
|
|
18
|
+
/** Tool schemas compare in order, identically for raw and summarized headers. */
|
|
19
|
+
export declare const headerToolsKey: (header: ReplayHeader) => string;
|
|
9
20
|
export declare const initialState: () => ReplayState;
|
|
10
21
|
export declare function inputTokens(usage: TokenUsage): number;
|
|
11
22
|
export declare function usageOf(event: Extract<SessionEvent, {
|
|
@@ -13,7 +24,8 @@ export declare function usageOf(event: Extract<SessionEvent, {
|
|
|
13
24
|
}>): TokenUsage | undefined;
|
|
14
25
|
/** Custom counting state driven by the host projection registry. */
|
|
15
26
|
export declare function fold(state: ReplayState, event: MeterEvent): ReplayState;
|
|
16
|
-
export declare function
|
|
27
|
+
export declare function contentTokens(blocks: Message["content"], policy: Pick<ReturnType<typeof resolvePolicy>, "tokenizer" | "includeReasoning">, attachments?: Attachments): number;
|
|
28
|
+
export declare function priceSurface(nodes: readonly ReplayNode[], header: ReplayHeader | null, config: MeterConfig, services: MeterServices): {
|
|
17
29
|
nodes: {
|
|
18
30
|
seq: import("@deepseek-ai/dsh-session").SessionSeq;
|
|
19
31
|
tokens: number;
|
|
@@ -46,4 +58,5 @@ export declare function measureState(state: ReplayState, config: MeterConfig, se
|
|
|
46
58
|
unpricedImages: boolean;
|
|
47
59
|
unpricedFiles: boolean;
|
|
48
60
|
};
|
|
61
|
+
export {};
|
|
49
62
|
//# sourceMappingURL=core.d.ts.map
|
package/dist/core.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACX,oBAAoB,EACpB,sBAAsB,EACtB,OAAO,IAAI,UAAU,EACrB,OAAO,EACP,UAAU,EACV,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,KAAK,EACX,WAAW,EACX,UAAU,EACV,YAAY,EACZ,UAAU,EACV,WAAW,EACX,MAAM,YAAY,CAAC;AACpB,MAAM,WAAW,aAAa;IAC7B,GAAG,CAAC,EAAE,IAAI,CAAC,UAAU,EAAE,qBAAqB,GAAG,iBAAiB,CAAC,CAAC;CAClE;AACD,UAAU,WAAW;IACpB,YAAY,CAAC,EAAE,sBAAsB,CAAC;IACtC,QAAQ,CAAC,EAAE,UAAU,CAAC,iBAAiB,CAAC,CAAC;IACzC,WAAW,EAAE,SAAS,oBAAoB,EAAE,CAAC;IAC7C,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,OAAO,CAAC;CACvB;AAUD,OAAO,EAAa,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE3D,iFAAiF;AACjF,eAAO,MAAM,cAAc,GAAI,QAAQ,YAAY,WAInC,CAAC;AAQjB,eAAO,MAAM,YAAY,QAAO,WAK9B,CAAC;AAEH,wBAAgB,WAAW,CAAC,KAAK,EAAE,UAAU,UAM5C;AAED,wBAAgB,OAAO,CACtB,KAAK,EAAE,OAAO,CACb,YAAY,EACZ;IAAE,IAAI,EAAE,mBAAmB,GAAG,mBAAmB,CAAA;CAAE,CACnD,GACC,UAAU,GAAG,SAAS,CAIxB;AAED,oEAAoE;AACpE,wBAAgB,IAAI,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,GAAG,WAAW,CA0DvE;AAED,wBAAgB,aAAa,CAC5B,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,EAC1B,MAAM,EAAE,IAAI,CACX,UAAU,CAAC,OAAO,aAAa,CAAC,EAChC,WAAW,GAAG,kBAAkB,CAChC,EACD,WAAW,GAAE,WAKZ,UAwCD;AAED,wBAAgB,YAAY,CAC3B,KAAK,EAAE,SAAS,UAAU,EAAE,EAC5B,MAAM,EAAE,YAAY,GAAG,IAAI,EAC3B,MAAM,EAAE,WAAW,EACnB,QAAQ,EAAE,aAAa;;;;;;;;;;;;;EA+DvB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC3B,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,WAAW,EACnB,QAAQ,GAAE,aAAkB,EAC5B,aAAa,CAAC,EAAE,WAAW;;;;;;;;;;;;;;;EAkC3B"}
|
package/dist/core.js
CHANGED
|
@@ -1,8 +1,20 @@
|
|
|
1
|
+
import { createHash } from "node:crypto";
|
|
1
2
|
import { SessionLogOffset } from "@deepseek-ai/dsh-session";
|
|
2
|
-
import { canonicalHeader, deriveEventMessage, headerEquals, isSurfaceEvent, } from "@deepseek-ai/dsh-session";
|
|
3
3
|
import { lastAssistantStreamChunk } from "@deepseek-ai/dsh-llm";
|
|
4
|
+
import { canonicalHeader, deriveEventMessage, headerEquals, isSurfaceEvent, } from "@deepseek-ai/dsh-session";
|
|
4
5
|
import { deepFreeze } from "@deepseek-ai/dsh-util-values";
|
|
5
6
|
import { countText, resolvePolicy } from "./tokenizers.js";
|
|
7
|
+
/** Tool schemas compare in order, identically for raw and summarized headers. */
|
|
8
|
+
export const headerToolsKey = (header) => header.toolsKey ??
|
|
9
|
+
createHash("sha256")
|
|
10
|
+
.update(JSON.stringify(header.tools ?? []))
|
|
11
|
+
.digest("hex");
|
|
12
|
+
function meterHeaderEquals(a, b) {
|
|
13
|
+
return a.toolsKey || b.toolsKey
|
|
14
|
+
? headerEquals({ ...a, tools: undefined }, { ...b, tools: undefined }) &&
|
|
15
|
+
headerToolsKey(a) === headerToolsKey(b)
|
|
16
|
+
: headerEquals(a, b);
|
|
17
|
+
}
|
|
6
18
|
export const initialState = () => ({
|
|
7
19
|
nodes: [],
|
|
8
20
|
header: null,
|
|
@@ -79,7 +91,12 @@ export function fold(state, event) {
|
|
|
79
91
|
}
|
|
80
92
|
return next;
|
|
81
93
|
}
|
|
82
|
-
function contentTokens(blocks, policy, attachments
|
|
94
|
+
export function contentTokens(blocks, policy, attachments = {
|
|
95
|
+
imagePrices: [],
|
|
96
|
+
imageCursor: 0,
|
|
97
|
+
unpricedImages: false,
|
|
98
|
+
unpricedFiles: false,
|
|
99
|
+
}) {
|
|
83
100
|
const count = (text) => countText(text, policy.tokenizer);
|
|
84
101
|
let tokens = 0;
|
|
85
102
|
for (const block of blocks) {
|
|
@@ -145,21 +162,25 @@ export function priceSurface(nodes, header, config, services) {
|
|
|
145
162
|
throw new Error("Invalid route image pricing");
|
|
146
163
|
const priced = nodes.map((node) => {
|
|
147
164
|
const message = node.message;
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
165
|
+
const counts = node.counts;
|
|
166
|
+
const body = contentTokens(message?.content ?? [], policy, attachments) +
|
|
167
|
+
(counts?.text[policy.tokenizer] ?? 0) +
|
|
168
|
+
(policy.includeReasoning
|
|
169
|
+
? (counts?.reasoning[policy.tokenizer] ?? 0)
|
|
170
|
+
: 0);
|
|
171
|
+
const envelope = counts?.envelope ||
|
|
172
|
+
message?.content.some((b) => b.type === "text" || b.type === "tool-call");
|
|
173
|
+
const tokens = body > 0 || envelope ? body + policy.tokensPerMessage : 0;
|
|
174
|
+
// DSH 0.2.1-rc.2 compaction requires this field for shadowedTokenCount.
|
|
156
175
|
return { seq: node.seq, tokens, heuristicTokens: tokens };
|
|
157
176
|
});
|
|
158
177
|
const surfaceTokens = priced.reduce((sum, node) => sum + node.tokens, 0);
|
|
159
|
-
const toolsTokens = header?.
|
|
160
|
-
?
|
|
161
|
-
|
|
162
|
-
|
|
178
|
+
const toolsTokens = header?.toolCounts
|
|
179
|
+
? header.toolCounts[policy.tokenizer] + policy.toolsOverhead
|
|
180
|
+
: header?.tools?.length
|
|
181
|
+
? countText(JSON.stringify(header.tools), policy.tokenizer) +
|
|
182
|
+
policy.toolsOverhead
|
|
183
|
+
: 0;
|
|
163
184
|
const primingTokens = header || nodes.length ? policy.replyPrimingTokens : 0;
|
|
164
185
|
return {
|
|
165
186
|
nodes: priced,
|
|
@@ -179,7 +200,7 @@ export function measureState(state, config, services = {}, requestHeader) {
|
|
|
179
200
|
const header = requestHeader === undefined ? state.header : canonicalHeader(requestHeader);
|
|
180
201
|
const current = priceSurface(state.nodes, header, config, services);
|
|
181
202
|
const anchor = state.anchor;
|
|
182
|
-
const reusable = anchor && header &&
|
|
203
|
+
const reusable = anchor && header && meterHeaderEquals(anchor.header, header);
|
|
183
204
|
let baseline;
|
|
184
205
|
let surfaceDeltaTokens = 0;
|
|
185
206
|
if (reusable) {
|
package/dist/core.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.js","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"core.js","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":"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"}
|