@snylonue/dsh-context-policy 0.1.1 → 0.2.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 +14 -10
- package/dist/compaction.d.ts +6 -2
- package/dist/compaction.d.ts.map +1 -1
- package/dist/compaction.js +19 -7
- package/dist/compaction.js.map +1 -1
- package/dist/core.d.ts.map +1 -1
- package/dist/core.js +2 -3
- package/dist/core.js.map +1 -1
- package/dist/projection.d.ts +17 -5
- package/dist/projection.d.ts.map +1 -1
- package/dist/projection.js +23 -25
- package/dist/projection.js.map +1 -1
- package/dist/token-meter.d.ts.map +1 -1
- package/dist/token-meter.js +15 -7
- package/dist/token-meter.js.map +1 -1
- package/dist/tokenizers.d.ts.map +1 -1
- package/dist/tokenizers.js +7 -7
- package/dist/tokenizers.js.map +1 -1
- package/dist/types.d.ts +10 -6
- package/dist/types.d.ts.map +1 -1
- package/package.json +21 -11
- package/src/compaction.ts +25 -8
- package/src/core.ts +2 -3
- package/src/projection.ts +38 -32
- package/src/token-meter.ts +18 -7
- package/src/tokenizers.ts +12 -7
- package/src/types.ts +10 -6
- package/tests/policy.test.ts +307 -8
package/dist/tokenizers.js
CHANGED
|
@@ -51,14 +51,14 @@ export function resolvePolicy(config, header) {
|
|
|
51
51
|
const route = header?.config;
|
|
52
52
|
const match = policies.find((p) => p.provider === route?.provider && p.model === route?.model) ??
|
|
53
53
|
policies.find((p) => p.provider === undefined && p.model === route?.model);
|
|
54
|
-
const
|
|
54
|
+
const providerPolicy = route &&
|
|
55
|
+
config.providerPolicies?.find((p) => p.provider === route.provider);
|
|
55
56
|
return Object.freeze({
|
|
56
|
-
tokensPerMessage: 3,
|
|
57
|
-
toolsOverhead: 4,
|
|
58
|
-
replyPrimingTokens: 3,
|
|
59
|
-
includeReasoning: false,
|
|
60
|
-
|
|
61
|
-
tokenizer: match?.tokenizer ?? providerTokenizer ?? config.defaultTokenizer,
|
|
57
|
+
tokensPerMessage: match?.tokensPerMessage ?? providerPolicy?.tokensPerMessage ?? 3,
|
|
58
|
+
toolsOverhead: match?.toolsOverhead ?? providerPolicy?.toolsOverhead ?? 4,
|
|
59
|
+
replyPrimingTokens: match?.replyPrimingTokens ?? providerPolicy?.replyPrimingTokens ?? 3,
|
|
60
|
+
includeReasoning: match?.includeReasoning ?? providerPolicy?.includeReasoning ?? false,
|
|
61
|
+
tokenizer: match?.tokenizer ?? providerPolicy?.tokenizer ?? config.defaultTokenizer,
|
|
62
62
|
});
|
|
63
63
|
}
|
|
64
64
|
//# sourceMappingURL=tokenizers.js.map
|
package/dist/tokenizers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenizers.js","sourceRoot":"","sources":["../src/tokenizers.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tokenizers.js","sourceRoot":"","sources":["../src/tokenizers.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -18,23 +18,28 @@ export type MeterEvent = SessionEvent | {
|
|
|
18
18
|
step: number;
|
|
19
19
|
};
|
|
20
20
|
};
|
|
21
|
-
export interface
|
|
22
|
-
provider?: string;
|
|
23
|
-
model: string;
|
|
21
|
+
export interface TokenPolicy {
|
|
24
22
|
tokenizer?: string;
|
|
25
23
|
tokensPerMessage?: number;
|
|
26
24
|
toolsOverhead?: number;
|
|
27
25
|
replyPrimingTokens?: number;
|
|
28
26
|
includeReasoning?: boolean;
|
|
29
27
|
}
|
|
28
|
+
export interface ProviderPolicy extends TokenPolicy {
|
|
29
|
+
provider: string;
|
|
30
|
+
}
|
|
31
|
+
export interface ModelPolicy extends TokenPolicy {
|
|
32
|
+
provider?: string;
|
|
33
|
+
model: string;
|
|
34
|
+
}
|
|
30
35
|
export interface MeterConfigInput {
|
|
31
36
|
defaultTokenizer?: string;
|
|
32
|
-
|
|
37
|
+
providerPolicies?: ProviderPolicy[];
|
|
33
38
|
modelPolicies?: ModelPolicy[];
|
|
34
39
|
}
|
|
35
40
|
export interface MeterConfig {
|
|
36
41
|
defaultTokenizer: string;
|
|
37
|
-
|
|
42
|
+
providerPolicies?: ProviderPolicy[];
|
|
38
43
|
modelPolicies: ModelPolicy[];
|
|
39
44
|
}
|
|
40
45
|
export interface ResolvedPolicy {
|
|
@@ -47,7 +52,6 @@ export interface ResolvedPolicy {
|
|
|
47
52
|
export interface ReplayNode {
|
|
48
53
|
seq: SessionSeq;
|
|
49
54
|
message: Message | null;
|
|
50
|
-
heuristicTokens: number;
|
|
51
55
|
}
|
|
52
56
|
export interface ReplayState {
|
|
53
57
|
nodes: readonly ReplayNode[];
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,WAAW,EACX,UAAU,EACV,gBAAgB,EAChB,YAAY,EACZ,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEhE,6EAA6E;AAC7E,MAAM,MAAM,UAAU,GACnB,YAAY,GACZ;IACA,IAAI,EAAE,eAAe,CAAC;IACtB,GAAG,EAAE,UAAU,CAAC;IAChB,IAAI,EAAE;QAAE,OAAO,EAAE;YAAE,GAAG,EAAE,UAAU,CAAC;YAAC,YAAY,EAAE,MAAM,EAAE,CAAA;SAAE,EAAE,CAAA;KAAE,CAAC;CAChE,GACD;IACA,IAAI,EAAE,mBAAmB,CAAC;IAC1B,GAAG,EAAE,UAAU,CAAC;IAChB,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CACpC,CAAC;AAEL,MAAM,WAAW,WAAW;IAC3B,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,WAAW,EACX,UAAU,EACV,gBAAgB,EAChB,YAAY,EACZ,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEhE,6EAA6E;AAC7E,MAAM,MAAM,UAAU,GACnB,YAAY,GACZ;IACA,IAAI,EAAE,eAAe,CAAC;IACtB,GAAG,EAAE,UAAU,CAAC;IAChB,IAAI,EAAE;QAAE,OAAO,EAAE;YAAE,GAAG,EAAE,UAAU,CAAC;YAAC,YAAY,EAAE,MAAM,EAAE,CAAA;SAAE,EAAE,CAAA;KAAE,CAAC;CAChE,GACD;IACA,IAAI,EAAE,mBAAmB,CAAC;IAC1B,GAAG,EAAE,UAAU,CAAC;IAChB,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CACpC,CAAC;AAEL,MAAM,WAAW,WAAW;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC3B;AACD,MAAM,WAAW,cAAe,SAAQ,WAAW;IAClD,QAAQ,EAAE,MAAM,CAAC;CACjB;AACD,MAAM,WAAW,WAAY,SAAQ,WAAW;IAC/C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACd;AACD,MAAM,WAAW,gBAAgB;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,cAAc,EAAE,CAAC;IACpC,aAAa,CAAC,EAAE,WAAW,EAAE,CAAC;CAC9B;AACD,MAAM,WAAW,WAAW;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,cAAc,EAAE,CAAC;IACpC,aAAa,EAAE,WAAW,EAAE,CAAC;CAC7B;AACD,MAAM,WAAW,cAAc;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,OAAO,CAAC;CAC1B;AACD,MAAM,WAAW,UAAU;IAC1B,GAAG,EAAE,UAAU,CAAC;IAChB,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;CACxB;AACD,MAAM,WAAW,WAAW;IAC3B,KAAK,EAAE,SAAS,UAAU,EAAE,CAAC;IAC7B,MAAM,EAAE,WAAW,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE;QACP,MAAM,EAAE,WAAW,CAAC;QACpB,KAAK,EAAE,SAAS,UAAU,EAAE,CAAC;QAC7B,KAAK,EAAE,UAAU,CAAC;KAClB,GAAG,IAAI,CAAC;IACT,WAAW,EAAE,gBAAgB,CAAC;CAC9B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@snylonue/dsh-context-policy",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.2.1",
|
|
4
4
|
"description": "Percentage-only compaction and model-configurable GPT and DeepSeek token counting for DSH",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "MIT",
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
},
|
|
17
17
|
"engines": {
|
|
18
18
|
"node": ">=24",
|
|
19
|
-
"dsh": "0.2.0-rc.2"
|
|
19
|
+
"dsh": "^0.2.0-rc.2 || ^0.2.1-rc.1"
|
|
20
20
|
},
|
|
21
21
|
"exports": {
|
|
22
22
|
".": {
|
|
@@ -62,13 +62,13 @@
|
|
|
62
62
|
},
|
|
63
63
|
"peerDependencies": {
|
|
64
64
|
"@deepseek-ai/cordis": "~4.0.4",
|
|
65
|
-
"@deepseek-ai/dsh-compaction": "0.2.0-rc.2",
|
|
66
|
-
"@deepseek-ai/dsh-compaction-basic": "0.2.0-rc.2",
|
|
67
|
-
"@deepseek-ai/dsh-llm": "0.2.0-rc.2",
|
|
68
|
-
"@deepseek-ai/dsh-session": "0.2.0-rc.2",
|
|
69
|
-
"@deepseek-ai/dsh-session-projection": "0.2.0-rc.2",
|
|
70
|
-
"@deepseek-ai/dsh-token-meter": "0.2.0-rc.2",
|
|
71
|
-
"@deepseek-ai/dsh-util-values": "0.2.0-rc.2",
|
|
65
|
+
"@deepseek-ai/dsh-compaction": "^0.2.0-rc.2 || ^0.2.1-rc.1",
|
|
66
|
+
"@deepseek-ai/dsh-compaction-basic": "^0.2.0-rc.2 || ^0.2.1-rc.1",
|
|
67
|
+
"@deepseek-ai/dsh-llm": "^0.2.0-rc.2 || ^0.2.1-rc.1",
|
|
68
|
+
"@deepseek-ai/dsh-session": "^0.2.0-rc.2 || ^0.2.1-rc.1",
|
|
69
|
+
"@deepseek-ai/dsh-session-projection": "^0.2.0-rc.2 || ^0.2.1-rc.1",
|
|
70
|
+
"@deepseek-ai/dsh-token-meter": "^0.2.0-rc.2 || ^0.2.1-rc.1",
|
|
71
|
+
"@deepseek-ai/dsh-util-values": "^0.2.0-rc.2 || ^0.2.1-rc.1",
|
|
72
72
|
"@deepseek-ai/schemastery": "~3.18.4",
|
|
73
73
|
"zod": "^4.4.3"
|
|
74
74
|
},
|
|
@@ -80,9 +80,19 @@
|
|
|
80
80
|
},
|
|
81
81
|
"devDependencies": {
|
|
82
82
|
"@biomejs/biome": "2",
|
|
83
|
-
"@deepseek-ai/
|
|
83
|
+
"@deepseek-ai/cordis": "4.0.5",
|
|
84
|
+
"@deepseek-ai/dsh-app-boot": "0.2.1-rc.1",
|
|
85
|
+
"@deepseek-ai/dsh-compaction": "0.2.1-rc.1",
|
|
86
|
+
"@deepseek-ai/dsh-compaction-basic": "0.2.1-rc.1",
|
|
87
|
+
"@deepseek-ai/dsh-llm": "0.2.1-rc.1",
|
|
88
|
+
"@deepseek-ai/dsh-session": "0.2.1-rc.1",
|
|
89
|
+
"@deepseek-ai/dsh-session-projection": "0.2.1-rc.1",
|
|
90
|
+
"@deepseek-ai/dsh-token-meter": "0.2.1-rc.1",
|
|
91
|
+
"@deepseek-ai/dsh-util-values": "0.2.1-rc.1",
|
|
92
|
+
"@deepseek-ai/schemastery": "3.18.5",
|
|
84
93
|
"@types/node": "24.19.0",
|
|
85
|
-
"typescript": "5.9.3"
|
|
94
|
+
"typescript": "5.9.3",
|
|
95
|
+
"zod": "4.4.3"
|
|
86
96
|
},
|
|
87
97
|
"scripts": {
|
|
88
98
|
"build": "tsc -p tsconfig.json",
|
package/src/compaction.ts
CHANGED
|
@@ -4,6 +4,7 @@ import Schema from "@deepseek-ai/schemastery";
|
|
|
4
4
|
import BasicCompactionEngine from "@deepseek-ai/dsh-compaction-basic";
|
|
5
5
|
import type {
|
|
6
6
|
BasicCompactionConfig,
|
|
7
|
+
CompactionPolicyConfig,
|
|
7
8
|
ResolvedTargetPolicy,
|
|
8
9
|
ResolvedCompactSpec,
|
|
9
10
|
ResolvedRetention,
|
|
@@ -20,6 +21,7 @@ import type { Session } from "@deepseek-ai/dsh-session";
|
|
|
20
21
|
import type { TokenMeasurement } from "@deepseek-ai/dsh-token-meter";
|
|
21
22
|
|
|
22
23
|
export interface PercentageCompactionConfig extends BasicCompactionConfig {
|
|
24
|
+
providerPolicies?: (CompactionPolicyConfig & { provider: string })[];
|
|
23
25
|
thresholdRatio: number;
|
|
24
26
|
maxTokens: number;
|
|
25
27
|
modelPolicies: NonNullable<BasicCompactionConfig["modelPolicies"]>;
|
|
@@ -40,6 +42,15 @@ const fields = {
|
|
|
40
42
|
maxOverflowRetries: Schema.natural(),
|
|
41
43
|
};
|
|
42
44
|
|
|
45
|
+
function mergePolicy<T extends CompactionPolicyConfig>(base: CompactionPolicyConfig, override: T): T {
|
|
46
|
+
const merged = { ...base, ...Object.fromEntries(
|
|
47
|
+
Object.entries(override).filter(([, value]) => value !== undefined),
|
|
48
|
+
) } as T;
|
|
49
|
+
if (override.retainTokens !== undefined && override.retainRatio === undefined) delete merged.retainRatio;
|
|
50
|
+
if (override.retainRatio !== undefined && override.retainTokens === undefined) delete merged.retainTokens;
|
|
51
|
+
return merged;
|
|
52
|
+
}
|
|
53
|
+
|
|
43
54
|
/** Both budgets are percentages of the full context window. */
|
|
44
55
|
export function resolveCompactSpec(
|
|
45
56
|
policy: ResolvedTargetPolicy,
|
|
@@ -151,13 +162,16 @@ export class PercentageCompactionEngine extends BasicCompactionEngine {
|
|
|
151
162
|
"sessionProjections",
|
|
152
163
|
];
|
|
153
164
|
static override Config: Schema<
|
|
154
|
-
|
|
165
|
+
Partial<PercentageCompactionConfig>,
|
|
155
166
|
PercentageCompactionConfig
|
|
156
167
|
> = Schema.object({
|
|
157
168
|
...fields,
|
|
158
169
|
thresholdRatio: Schema.number().min(0).max(1).default(0.8),
|
|
159
170
|
maxTokens: Schema.natural().default(65536),
|
|
160
171
|
auto: Schema.boolean().default(true),
|
|
172
|
+
providerPolicies: Schema.array(
|
|
173
|
+
Schema.object({ ...fields, provider: Schema.string().required() }),
|
|
174
|
+
).default([]),
|
|
161
175
|
modelPolicies: Schema.array(
|
|
162
176
|
Schema.object({
|
|
163
177
|
...fields,
|
|
@@ -166,16 +180,19 @@ export class PercentageCompactionEngine extends BasicCompactionEngine {
|
|
|
166
180
|
}),
|
|
167
181
|
).default([]),
|
|
168
182
|
});
|
|
183
|
+
private readonly providerPolicies: NonNullable<PercentageCompactionConfig["providerPolicies"]>;
|
|
169
184
|
constructor(ctx: Context, config: PercentageCompactionConfig) {
|
|
185
|
+
const { providerPolicies = [], ...basic } = config;
|
|
170
186
|
super(ctx, {
|
|
171
|
-
...
|
|
187
|
+
...basic,
|
|
172
188
|
headroomTokens: 0,
|
|
173
|
-
modelPolicies: config.modelPolicies.map((p) =>
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
maxTokens:
|
|
177
|
-
})
|
|
189
|
+
modelPolicies: config.modelPolicies.map((p) => {
|
|
190
|
+
const provider = providerPolicies.find((policy) => policy.provider === p.provider);
|
|
191
|
+
const merged = mergePolicy(provider ?? {}, p);
|
|
192
|
+
return { ...merged, headroomTokens: 0, maxTokens: merged.maxTokens ?? config.maxTokens };
|
|
193
|
+
}),
|
|
178
194
|
});
|
|
195
|
+
this.providerPolicies = structuredClone(providerPolicies);
|
|
179
196
|
ctx.sessionProjections.register(compactionEntry);
|
|
180
197
|
}
|
|
181
198
|
private entryState(session: Session) {
|
|
@@ -193,7 +210,7 @@ export class PercentageCompactionEngine extends BasicCompactionEngine {
|
|
|
193
210
|
}): ResolvedTargetPolicy {
|
|
194
211
|
const match = this.config.modelPolicies.find(
|
|
195
212
|
(p) => p.provider === target.provider && p.model === target.model,
|
|
196
|
-
);
|
|
213
|
+
) ?? this.providerPolicies.find((p) => p.provider === target.provider);
|
|
197
214
|
let retention: ResolvedRetention;
|
|
198
215
|
if (match?.retainTokens !== undefined)
|
|
199
216
|
retention = { retainTokens: match.retainTokens };
|
package/src/core.ts
CHANGED
|
@@ -31,7 +31,6 @@ import {
|
|
|
31
31
|
headerEquals,
|
|
32
32
|
isSurfaceEvent,
|
|
33
33
|
} from "@deepseek-ai/dsh-session";
|
|
34
|
-
import { estimateMessage as shadowPrice } from "@deepseek-ai/dsh-token-meter/estimate";
|
|
35
34
|
import { lastAssistantStreamChunk } from "@deepseek-ai/dsh-llm";
|
|
36
35
|
import { deepFreeze } from "@deepseek-ai/dsh-util-values";
|
|
37
36
|
import { countText, resolvePolicy } from "./tokenizers.js";
|
|
@@ -105,7 +104,6 @@ export function fold(state: ReplayState, event: MeterEvent): ReplayState {
|
|
|
105
104
|
const node = {
|
|
106
105
|
seq: event.seq,
|
|
107
106
|
message,
|
|
108
|
-
heuristicTokens: message ? shadowPrice(message) : 0,
|
|
109
107
|
};
|
|
110
108
|
if (event.surfaceOp === "append") next.nodes = [...state.nodes, node];
|
|
111
109
|
else {
|
|
@@ -213,7 +211,8 @@ export function priceSurface(
|
|
|
213
211
|
)
|
|
214
212
|
tokens = body + policy.tokensPerMessage;
|
|
215
213
|
}
|
|
216
|
-
|
|
214
|
+
// Upstream compaction reads this compatibility field for shadowedTokenCount.
|
|
215
|
+
return { seq: node.seq, tokens, heuristicTokens: tokens };
|
|
217
216
|
});
|
|
218
217
|
const surfaceTokens = priced.reduce((sum, node) => sum + node.tokens, 0);
|
|
219
218
|
const toolsTokens = header?.tools?.length
|
package/src/projection.ts
CHANGED
|
@@ -6,7 +6,6 @@ import type {
|
|
|
6
6
|
ContextPressureProjection,
|
|
7
7
|
ContextBreakdownProjection,
|
|
8
8
|
} from "@deepseek-ai/dsh-token-meter";
|
|
9
|
-
import { estimateToolsTokens } from "@deepseek-ai/dsh-token-meter/estimate";
|
|
10
9
|
import { z } from "zod";
|
|
11
10
|
import { initialState, fold, measureState } from "./core.js";
|
|
12
11
|
import type { MeterServices } from "./core.js";
|
|
@@ -16,7 +15,6 @@ const count = z.number().int().nonnegative();
|
|
|
16
15
|
const nodeSchema = z.object({
|
|
17
16
|
seq: count.transform(SessionSeq),
|
|
18
17
|
message: z.custom<Message>().nullable(),
|
|
19
|
-
heuristicTokens: count,
|
|
20
18
|
});
|
|
21
19
|
const replaySchema = z.object({
|
|
22
20
|
nodes: z.array(nodeSchema),
|
|
@@ -26,7 +24,7 @@ const replaySchema = z.object({
|
|
|
26
24
|
});
|
|
27
25
|
export const replayProjection: ProjectionDefinition<"contextPolicyMeter"> = {
|
|
28
26
|
key: "contextPolicyMeter",
|
|
29
|
-
stateVersion:
|
|
27
|
+
stateVersion: 2,
|
|
30
28
|
stateSchema: replaySchema,
|
|
31
29
|
init: initialState,
|
|
32
30
|
apply: fold,
|
|
@@ -34,7 +32,8 @@ export const replayProjection: ProjectionDefinition<"contextPolicyMeter"> = {
|
|
|
34
32
|
|
|
35
33
|
// Retain the native state fields so callers of the original keys remain type-compatible.
|
|
36
34
|
interface DisplayState extends ReplayState {
|
|
37
|
-
|
|
35
|
+
systems: { seq: SessionSeq; tokens: number }[];
|
|
36
|
+
nodes: (ReplayNode & { system: boolean; heuristicTokens: number })[];
|
|
38
37
|
surfaceTokens: number;
|
|
39
38
|
breakdown: ContextBreakdownProjection;
|
|
40
39
|
contextWindow?: number;
|
|
@@ -45,7 +44,10 @@ const breakdownSchema = z.object({
|
|
|
45
44
|
messageTokens: count,
|
|
46
45
|
});
|
|
47
46
|
const displaySchema = replaySchema.extend({
|
|
48
|
-
|
|
47
|
+
systems: z.array(z.object({ seq: count.transform(SessionSeq), tokens: count })),
|
|
48
|
+
nodes: z.array(
|
|
49
|
+
nodeSchema.extend({ system: z.boolean(), heuristicTokens: count }),
|
|
50
|
+
),
|
|
49
51
|
surfaceTokens: count,
|
|
50
52
|
breakdown: breakdownSchema,
|
|
51
53
|
contextWindow: z.number().int().positive().optional(),
|
|
@@ -53,12 +55,18 @@ const displaySchema = replaySchema.extend({
|
|
|
53
55
|
function initialDisplayState(): DisplayState {
|
|
54
56
|
return {
|
|
55
57
|
...initialState(),
|
|
58
|
+
systems: [],
|
|
56
59
|
nodes: [],
|
|
57
60
|
surfaceTokens: 0,
|
|
58
61
|
breakdown: { systemTokens: 0, toolsTokens: 0, messageTokens: 0 },
|
|
59
62
|
};
|
|
60
63
|
}
|
|
61
|
-
function foldDisplay(
|
|
64
|
+
function foldDisplay(
|
|
65
|
+
state: DisplayState,
|
|
66
|
+
event: SessionEvent,
|
|
67
|
+
config: MeterConfig,
|
|
68
|
+
services: MeterServices,
|
|
69
|
+
): DisplayState {
|
|
62
70
|
const next = fold(state, event);
|
|
63
71
|
const { contextWindow, ...withoutWindow } = {
|
|
64
72
|
...next,
|
|
@@ -73,32 +81,30 @@ function foldDisplay(state: DisplayState, event: SessionEvent): DisplayState {
|
|
|
73
81
|
window === state.contextWindow
|
|
74
82
|
)
|
|
75
83
|
return state;
|
|
76
|
-
const
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
const
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
84
|
+
const measurement = measureState(next, config, services);
|
|
85
|
+
// Empty system events have no derived Message but still occupy a surface position.
|
|
86
|
+
const systemSeqs = new Set(state.systems.map((node) => node.seq));
|
|
87
|
+
const nodes = next.nodes.map((node, index) => ({
|
|
88
|
+
...node,
|
|
89
|
+
system:
|
|
90
|
+
systemSeqs.has(node.seq) ||
|
|
91
|
+
(event.type === "system/message" && node.seq === event.seq),
|
|
92
|
+
// Native consumers use this field; it carries the model count, not a second estimator.
|
|
93
|
+
heuristicTokens: measurement.nodes[index].tokens,
|
|
94
|
+
}));
|
|
95
|
+
const surfaceTokens = measurement.surfaceTokens;
|
|
96
|
+
const systems = nodes.flatMap((node) =>
|
|
97
|
+
node.system ? [{ seq: node.seq, tokens: node.heuristicTokens }] : [],
|
|
98
|
+
);
|
|
99
|
+
const systemTokens = systems.findLast((node) => node.tokens > 0)?.tokens ?? 0;
|
|
92
100
|
return {
|
|
93
101
|
...withoutWindow,
|
|
102
|
+
systems,
|
|
94
103
|
nodes,
|
|
95
104
|
surfaceTokens,
|
|
96
105
|
breakdown: {
|
|
97
106
|
systemTokens,
|
|
98
|
-
toolsTokens:
|
|
99
|
-
next.header === state.header
|
|
100
|
-
? state.breakdown.toolsTokens
|
|
101
|
-
: estimateToolsTokens(next.header ?? undefined),
|
|
107
|
+
toolsTokens: measurement.toolsTokens,
|
|
102
108
|
messageTokens: surfaceTokens - systemTokens,
|
|
103
109
|
},
|
|
104
110
|
...(window === undefined ? {} : { contextWindow: window }),
|
|
@@ -120,11 +126,10 @@ export function createDisplayProjections(
|
|
|
120
126
|
const cached = views.get(state);
|
|
121
127
|
if (cached) return cached;
|
|
122
128
|
const measurement = measureState(state, config, services);
|
|
123
|
-
const system = state.nodes.findLast(
|
|
124
|
-
(node) => node.system && node.message?.content.length,
|
|
125
|
-
);
|
|
126
129
|
const systemTokens =
|
|
127
|
-
measurement.nodes.
|
|
130
|
+
measurement.nodes.findLast(
|
|
131
|
+
(node, index) => state.nodes[index].system && node.tokens > 0,
|
|
132
|
+
)?.tokens ?? 0;
|
|
128
133
|
const pressure: ContextPressureProjection = {
|
|
129
134
|
projectedTokens: measurement.totalTokens,
|
|
130
135
|
...(measurement.baseline.kind === "usage"
|
|
@@ -144,10 +149,11 @@ export function createDisplayProjections(
|
|
|
144
149
|
return value;
|
|
145
150
|
};
|
|
146
151
|
const replay = {
|
|
147
|
-
stateVersion:
|
|
152
|
+
stateVersion: 9,
|
|
148
153
|
stateSchema: displaySchema,
|
|
149
154
|
init: initialDisplayState,
|
|
150
|
-
apply:
|
|
155
|
+
apply: (state: DisplayState, event: SessionEvent) =>
|
|
156
|
+
foldDisplay(state, event, config, services),
|
|
151
157
|
};
|
|
152
158
|
const pressure = {
|
|
153
159
|
...replay,
|
package/src/token-meter.ts
CHANGED
|
@@ -17,19 +17,30 @@ declare module "@deepseek-ai/dsh-session-projection" {
|
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
19
|
|
|
20
|
+
const policyFields = {
|
|
21
|
+
tokenizer: settings.string(),
|
|
22
|
+
tokensPerMessage: settings.number().min(0).step(1),
|
|
23
|
+
toolsOverhead: settings.number().min(0).step(1),
|
|
24
|
+
replyPrimingTokens: settings.number().min(0).step(1),
|
|
25
|
+
includeReasoning: settings.boolean(),
|
|
26
|
+
};
|
|
27
|
+
|
|
20
28
|
export const Config: settings<MeterConfigInput, MeterConfig> = settings.object({
|
|
21
29
|
defaultTokenizer: settings.string().default("deepseek_v4"),
|
|
22
|
-
|
|
30
|
+
providerPolicies: settings
|
|
31
|
+
.array(
|
|
32
|
+
settings.object({
|
|
33
|
+
...policyFields,
|
|
34
|
+
provider: settings.string().required(),
|
|
35
|
+
}),
|
|
36
|
+
)
|
|
37
|
+
.default([]),
|
|
23
38
|
modelPolicies: settings
|
|
24
39
|
.array(
|
|
25
40
|
settings.object({
|
|
41
|
+
...policyFields,
|
|
26
42
|
provider: settings.string(),
|
|
27
43
|
model: settings.string().required(),
|
|
28
|
-
tokenizer: settings.string(),
|
|
29
|
-
tokensPerMessage: settings.number().min(0).step(1),
|
|
30
|
-
toolsOverhead: settings.number().min(0).step(1),
|
|
31
|
-
replyPrimingTokens: settings.number().min(0).step(1),
|
|
32
|
-
includeReasoning: settings.boolean(),
|
|
33
44
|
}),
|
|
34
45
|
)
|
|
35
46
|
.default([]),
|
|
@@ -66,7 +77,7 @@ export class ModelTokenMeter extends Service {
|
|
|
66
77
|
}
|
|
67
78
|
estimateMessage(message: Message) {
|
|
68
79
|
return priceSurface(
|
|
69
|
-
[{ seq: SessionSeq(0), message
|
|
80
|
+
[{ seq: SessionSeq(0), message }],
|
|
70
81
|
null,
|
|
71
82
|
this.config,
|
|
72
83
|
this.services,
|
package/src/tokenizers.ts
CHANGED
|
@@ -66,13 +66,18 @@ export function resolvePolicy(
|
|
|
66
66
|
(p) => p.provider === route?.provider && p.model === route?.model,
|
|
67
67
|
) ??
|
|
68
68
|
policies.find((p) => p.provider === undefined && p.model === route?.model);
|
|
69
|
-
const
|
|
69
|
+
const providerPolicy =
|
|
70
|
+
route &&
|
|
71
|
+
config.providerPolicies?.find((p) => p.provider === route.provider);
|
|
70
72
|
return Object.freeze({
|
|
71
|
-
tokensPerMessage:
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
73
|
+
tokensPerMessage:
|
|
74
|
+
match?.tokensPerMessage ?? providerPolicy?.tokensPerMessage ?? 3,
|
|
75
|
+
toolsOverhead: match?.toolsOverhead ?? providerPolicy?.toolsOverhead ?? 4,
|
|
76
|
+
replyPrimingTokens:
|
|
77
|
+
match?.replyPrimingTokens ?? providerPolicy?.replyPrimingTokens ?? 3,
|
|
78
|
+
includeReasoning:
|
|
79
|
+
match?.includeReasoning ?? providerPolicy?.includeReasoning ?? false,
|
|
80
|
+
tokenizer:
|
|
81
|
+
match?.tokenizer ?? providerPolicy?.tokenizer ?? config.defaultTokenizer,
|
|
77
82
|
});
|
|
78
83
|
}
|
package/src/types.ts
CHANGED
|
@@ -20,23 +20,28 @@ export type MeterEvent =
|
|
|
20
20
|
data: { turn: number; step: number };
|
|
21
21
|
};
|
|
22
22
|
|
|
23
|
-
export interface
|
|
24
|
-
provider?: string;
|
|
25
|
-
model: string;
|
|
23
|
+
export interface TokenPolicy {
|
|
26
24
|
tokenizer?: string;
|
|
27
25
|
tokensPerMessage?: number;
|
|
28
26
|
toolsOverhead?: number;
|
|
29
27
|
replyPrimingTokens?: number;
|
|
30
28
|
includeReasoning?: boolean;
|
|
31
29
|
}
|
|
30
|
+
export interface ProviderPolicy extends TokenPolicy {
|
|
31
|
+
provider: string;
|
|
32
|
+
}
|
|
33
|
+
export interface ModelPolicy extends TokenPolicy {
|
|
34
|
+
provider?: string;
|
|
35
|
+
model: string;
|
|
36
|
+
}
|
|
32
37
|
export interface MeterConfigInput {
|
|
33
38
|
defaultTokenizer?: string;
|
|
34
|
-
|
|
39
|
+
providerPolicies?: ProviderPolicy[];
|
|
35
40
|
modelPolicies?: ModelPolicy[];
|
|
36
41
|
}
|
|
37
42
|
export interface MeterConfig {
|
|
38
43
|
defaultTokenizer: string;
|
|
39
|
-
|
|
44
|
+
providerPolicies?: ProviderPolicy[];
|
|
40
45
|
modelPolicies: ModelPolicy[];
|
|
41
46
|
}
|
|
42
47
|
export interface ResolvedPolicy {
|
|
@@ -49,7 +54,6 @@ export interface ResolvedPolicy {
|
|
|
49
54
|
export interface ReplayNode {
|
|
50
55
|
seq: SessionSeq;
|
|
51
56
|
message: Message | null;
|
|
52
|
-
heuristicTokens: number;
|
|
53
57
|
}
|
|
54
58
|
export interface ReplayState {
|
|
55
59
|
nodes: readonly ReplayNode[];
|