@snylonue/dsh-context-policy 0.1.0 → 0.2.0

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 CHANGED
@@ -59,6 +59,7 @@ The global entry has the ID percentage-compaction. The following is a profile pa
59
59
  auto: true
60
60
  # summarizationProvider: example-provider # Optional summarization route override.
61
61
  # summarizationModel: example-model
62
+ providerPolicies: []
62
63
  modelPolicies: []
63
64
  headroomTokens: 0 # Accepted for migration; ignored by this plugin.
64
65
  ```
@@ -76,6 +77,7 @@ For an isolated preset, place the configuration on its compaction child. Values
76
77
  | `auto` | true | Enables automatic compaction listeners. |
77
78
  | `summarizationProvider` | Unset | Optional provider override for summarization. |
78
79
  | `summarizationModel` | Unset | Optional model override for summarization. |
80
+ | `providerPolicies` | [] | Default pressure policy for all models on a provider. |
79
81
  | `modelPolicies` | [] | Partial overrides for exact provider/model routes. Both identifiers are required. |
80
82
  | `headroomTokens` | Ignored | Accepted for migration from the upstream configuration. |
81
83
 
@@ -96,7 +98,7 @@ modelPolicies:
96
98
  headroomTokens: 0 # Accepted for migration; ignored by this plugin.
97
99
  ```
98
100
 
99
- Use the provider identifier and model name registered in the target DSH installation. Fields omitted from a route override inherit the service configuration. `auto` is a service-wide option and cannot be overridden per route. The LLM adapter must supply `contextWindow` for pressure compaction.
101
+ Use the provider identifier and model name registered in the target DSH installation. Pressure policy fields inherit from service defaults → provider policy → exact model policy. Set `retainTokens` or `retainRatio` to replace the inherited retention form. Summary and overflow handlers continue to use upstream service/model configuration. `auto` is a service-wide option and cannot be overridden per route. The LLM adapter must supply `contextWindow` for pressure compaction.
100
102
 
101
103
  ## Token-meter configuration
102
104
 
@@ -106,8 +108,9 @@ The global entry has the ID model-token-meter. A profile patch can select a toke
106
108
  - id: model-token-meter
107
109
  config:
108
110
  defaultTokenizer: deepseek_v4
109
- providerTokenizers:
110
- example-provider: o200k_base
111
+ providerPolicies:
112
+ - provider: example-provider
113
+ tokenizer: o200k_base
111
114
  modelPolicies:
112
115
  - provider: example-provider
113
116
  model: example-model
@@ -120,19 +123,19 @@ The global entry has the ID model-token-meter. A profile patch can select a toke
120
123
  tokenizer: o200k_base
121
124
  ```
122
125
 
123
- The identifiers in this example are placeholders. An exact provider/model policy takes precedence over a model-only policy. The matched policy's explicit tokenizer overrides `providerTokenizers[provider]`, which overrides `defaultTokenizer`. A matched policy that omits tokenizer inherits the provider default or the global default. With no request header, the global default applies.
126
+ The identifiers in this example are placeholders. An exact provider/model policy takes precedence over a model-only policy. Each omitted policy field inherits from the provider policy, then from the global default. The matched model policy's explicit fields override the provider policy. With no request header, the global default applies.
124
127
 
125
128
  | Option | Default | Description |
126
129
  | --- | --- | --- |
127
130
  | `defaultTokenizer` | `deepseek_v4` | Registered tokenizer used when no model or provider tokenizer applies. |
128
- | `providerTokenizers` | {} | Provider identifier to default tokenizer mapping, applied to all models on that provider. |
131
+ | `providerPolicies` | [] | Tokenizer and accounting defaults for all models on a provider. |
129
132
  | `modelPolicies` | [] | Route-specific tokenizer and accounting settings. |
130
133
  | `tokensPerMessage` | 3 | Per-message framing allowance. |
131
134
  | `toolsOverhead` | 4 | Allowance added when tool definitions are present. |
132
135
  | `replyPrimingTokens` | 3 | Request-level reply framing allowance. |
133
136
  | `includeReasoning` | false | Includes visible reasoning text in the estimated message surface. |
134
137
 
135
- The last four options belong to model policy entries. Token allowances must be nonnegative integers. For duplicate routes at the same specificity, the first matching entry is used. Unknown tokenizer names fail when text is counted.
138
+ The last four options belong to provider and model policy entries. Token allowances must be nonnegative integers. For duplicate routes at the same specificity, the first matching entry is used. Unknown tokenizer names fail when text is counted.
136
139
 
137
140
  ### Builtin tokenizers
138
141
 
@@ -147,8 +150,9 @@ DeepSeek V4 is the global default. Select GPT token counting for all models on a
147
150
  - id: model-token-meter
148
151
  config:
149
152
  defaultTokenizer: deepseek_v4
150
- providerTokenizers:
151
- openai: o200k_base
153
+ providerPolicies:
154
+ - provider: openai
155
+ tokenizer: o200k_base
152
156
  ```
153
157
 
154
158
  Use the provider identifiers configured in your DSH profile; `openai` is an example.
@@ -1,11 +1,14 @@
1
1
  import type { Context } from "@deepseek-ai/cordis";
2
2
  import Schema from "@deepseek-ai/schemastery";
3
3
  import BasicCompactionEngine from "@deepseek-ai/dsh-compaction-basic";
4
- import type { BasicCompactionConfig, ResolvedTargetPolicy, ResolvedCompactSpec } from "@deepseek-ai/dsh-compaction-basic";
4
+ import type { BasicCompactionConfig, CompactionPolicyConfig, ResolvedTargetPolicy, ResolvedCompactSpec } from "@deepseek-ai/dsh-compaction-basic";
5
5
  import type { CompactionResult } from "@deepseek-ai/dsh-compaction";
6
6
  import type { Session } from "@deepseek-ai/dsh-session";
7
7
  import type { TokenMeasurement } from "@deepseek-ai/dsh-token-meter";
8
8
  export interface PercentageCompactionConfig extends BasicCompactionConfig {
9
+ providerPolicies?: (CompactionPolicyConfig & {
10
+ provider: string;
11
+ })[];
9
12
  thresholdRatio: number;
10
13
  maxTokens: number;
11
14
  modelPolicies: NonNullable<BasicCompactionConfig["modelPolicies"]>;
@@ -33,7 +36,8 @@ declare module "@deepseek-ai/dsh-session-projection" {
33
36
  /** Reuse the official summarizer, transactions, commands and overflow listeners. */
34
37
  export declare class PercentageCompactionEngine extends BasicCompactionEngine {
35
38
  static inject: string[];
36
- static Config: Schema<BasicCompactionConfig, PercentageCompactionConfig>;
39
+ static Config: Schema<Partial<PercentageCompactionConfig>, PercentageCompactionConfig>;
40
+ private readonly providerPolicies;
37
41
  constructor(ctx: Context, config: PercentageCompactionConfig);
38
42
  private entryState;
39
43
  private policy;
@@ -1 +1 @@
1
- {"version":3,"file":"compaction.d.ts","sourceRoot":"","sources":["../src/compaction.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,MAAM,MAAM,0BAA0B,CAAC;AAC9C,OAAO,qBAAqB,MAAM,mCAAmC,CAAC;AACtE,OAAO,KAAK,EACX,qBAAqB,EACrB,oBAAoB,EACpB,mBAAmB,EAEnB,MAAM,mCAAmC,CAAC;AAK3C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAIpE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAErE,MAAM,WAAW,0BAA2B,SAAQ,qBAAqB;IACxE,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,WAAW,CAAC,qBAAqB,CAAC,eAAe,CAAC,CAAC,CAAC;IACnE,IAAI,EAAE,OAAO,CAAC;CACd;AAED,KAAK,KAAK,GAAG,UAAU,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACrE,KAAK,OAAO,GAAG,UAAU,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAavE,+DAA+D;AAC/D,wBAAgB,kBAAkB,CACjC,MAAM,EAAE,oBAAoB,EAC5B,aAAa,EAAE,MAAM,GACnB,mBAAmB,CA0BrB;AAED,8DAA8D;AAC9D,wBAAgB,sBAAsB,CACrC,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,gBAAgB,EAC7B,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,OAAO;;;SAyBnB;AAED,UAAU,oBAAoB;IAC7B,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;CACpB;AAED,OAAO,QAAQ,qCAAqC,CAAC;IACpD,UAAU,yBAAyB;QAClC,uBAAuB,EAAE,oBAAoB,CAAC;KAC9C;CACD;AA8BD,oFAAoF;AACpF,qBAAa,0BAA2B,SAAQ,qBAAqB;IACpE,OAAgB,MAAM,WAGpB;IACF,OAAgB,MAAM,EAAE,MAAM,CAC7B,qBAAqB,EACrB,0BAA0B,CAC1B,CAYE;gBACS,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,0BAA0B;IAY5D,OAAO,CAAC,UAAU;IASlB,OAAO,CAAC,MAAM;IA+BC,eAAe,CAC7B,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,WAAW,GAClB,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;CAmEnC;AACD,eAAe,0BAA0B,CAAC"}
1
+ {"version":3,"file":"compaction.d.ts","sourceRoot":"","sources":["../src/compaction.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,MAAM,MAAM,0BAA0B,CAAC;AAC9C,OAAO,qBAAqB,MAAM,mCAAmC,CAAC;AACtE,OAAO,KAAK,EACX,qBAAqB,EACrB,sBAAsB,EACtB,oBAAoB,EACpB,mBAAmB,EAEnB,MAAM,mCAAmC,CAAC;AAK3C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAIpE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAErE,MAAM,WAAW,0BAA2B,SAAQ,qBAAqB;IACxE,gBAAgB,CAAC,EAAE,CAAC,sBAAsB,GAAG;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,CAAC;IACrE,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,WAAW,CAAC,qBAAqB,CAAC,eAAe,CAAC,CAAC,CAAC;IACnE,IAAI,EAAE,OAAO,CAAC;CACd;AAED,KAAK,KAAK,GAAG,UAAU,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACrE,KAAK,OAAO,GAAG,UAAU,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAsBvE,+DAA+D;AAC/D,wBAAgB,kBAAkB,CACjC,MAAM,EAAE,oBAAoB,EAC5B,aAAa,EAAE,MAAM,GACnB,mBAAmB,CA0BrB;AAED,8DAA8D;AAC9D,wBAAgB,sBAAsB,CACrC,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,gBAAgB,EAC7B,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,OAAO;;;SAyBnB;AAED,UAAU,oBAAoB;IAC7B,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;CACpB;AAED,OAAO,QAAQ,qCAAqC,CAAC;IACpD,UAAU,yBAAyB;QAClC,uBAAuB,EAAE,oBAAoB,CAAC;KAC9C;CACD;AA8BD,oFAAoF;AACpF,qBAAa,0BAA2B,SAAQ,qBAAqB;IACpE,OAAgB,MAAM,WAGpB;IACF,OAAgB,MAAM,EAAE,MAAM,CAC7B,OAAO,CAAC,0BAA0B,CAAC,EACnC,0BAA0B,CAC1B,CAeE;IACH,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA8D;gBACnF,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,0BAA0B;IAc5D,OAAO,CAAC,UAAU;IASlB,OAAO,CAAC,MAAM;IA+BC,eAAe,CAC7B,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,WAAW,GAClB,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;CAmEnC;AACD,eAAe,0BAA0B,CAAC"}
@@ -14,6 +14,14 @@ const fields = {
14
14
  compactionRetries: Schema.natural(),
15
15
  maxOverflowRetries: Schema.natural(),
16
16
  };
17
+ function mergePolicy(base, override) {
18
+ const merged = { ...base, ...Object.fromEntries(Object.entries(override).filter(([, value]) => value !== undefined)) };
19
+ if (override.retainTokens !== undefined && override.retainRatio === undefined)
20
+ delete merged.retainRatio;
21
+ if (override.retainRatio !== undefined && override.retainTokens === undefined)
22
+ delete merged.retainTokens;
23
+ return merged;
24
+ }
17
25
  /** Both budgets are percentages of the full context window. */
18
26
  export function resolveCompactSpec(policy, contextWindow) {
19
27
  if (!Number.isSafeInteger(contextWindow) || contextWindow <= 0)
@@ -98,22 +106,26 @@ export class PercentageCompactionEngine extends BasicCompactionEngine {
98
106
  thresholdRatio: Schema.number().min(0).max(1).default(0.8),
99
107
  maxTokens: Schema.natural().default(65536),
100
108
  auto: Schema.boolean().default(true),
109
+ providerPolicies: Schema.array(Schema.object({ ...fields, provider: Schema.string().required() })).default([]),
101
110
  modelPolicies: Schema.array(Schema.object({
102
111
  ...fields,
103
112
  provider: Schema.string().required(),
104
113
  model: Schema.string().required(),
105
114
  })).default([]),
106
115
  });
116
+ providerPolicies;
107
117
  constructor(ctx, config) {
118
+ const { providerPolicies = [], ...basic } = config;
108
119
  super(ctx, {
109
- ...config,
120
+ ...basic,
110
121
  headroomTokens: 0,
111
- modelPolicies: config.modelPolicies.map((p) => ({
112
- ...p,
113
- headroomTokens: 0,
114
- maxTokens: p.maxTokens ?? config.maxTokens,
115
- })),
122
+ modelPolicies: config.modelPolicies.map((p) => {
123
+ const provider = providerPolicies.find((policy) => policy.provider === p.provider);
124
+ const merged = mergePolicy(provider ?? {}, p);
125
+ return { ...merged, headroomTokens: 0, maxTokens: merged.maxTokens ?? config.maxTokens };
126
+ }),
116
127
  });
128
+ this.providerPolicies = structuredClone(providerPolicies);
117
129
  ctx.sessionProjections.register(compactionEntry);
118
130
  }
119
131
  entryState(session) {
@@ -123,7 +135,7 @@ export class PercentageCompactionEngine extends BasicCompactionEngine {
123
135
  return state;
124
136
  }
125
137
  policy(target) {
126
- const match = this.config.modelPolicies.find((p) => p.provider === target.provider && p.model === target.model);
138
+ const match = this.config.modelPolicies.find((p) => p.provider === target.provider && p.model === target.model) ?? this.providerPolicies.find((p) => p.provider === target.provider);
127
139
  let retention;
128
140
  if (match?.retainTokens !== undefined)
129
141
  retention = { retainTokens: match.retainTokens };
@@ -1 +1 @@
1
- {"version":3,"file":"compaction.js","sourceRoot":"","sources":["../src/compaction.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"compaction.js","sourceRoot":"","sources":["../src/compaction.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"token-meter.d.ts","sourceRoot":"","sources":["../src/token-meter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,qCAAqC,CAAC;AAC7C,OAAO,QAAQ,MAAM,0BAA0B,CAAC;AAKhD,OAAO,QAAQ,qCAAqC,CAAC;IACpD,UAAU,yBAAyB;QAClC,kBAAkB,EAAE,WAAW,CAAC;KAChC;CACD;AAED,eAAO,MAAM,MAAM,EAAE,QAAQ,CAAC,gBAAgB,EAAE,WAAW,CAgBzD,CAAC;AACH,eAAO,MAAM,MAAM,UAAyB,CAAC;AAE7C,qBAAa,eAAgB,SAAQ,OAAO;gBAC/B,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW;IAc7C,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,aAAa,CAAC;IACxB,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,WAAW;;;;;;;;;;;;;;;;IAWrD,eAAe,CAAC,OAAO,EAAE,OAAO;CAQhC;AAED,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,QAEtD;;;;;;AAED,wBAAyC"}
1
+ {"version":3,"file":"token-meter.d.ts","sourceRoot":"","sources":["../src/token-meter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,qCAAqC,CAAC;AAC7C,OAAO,QAAQ,MAAM,0BAA0B,CAAC;AAKhD,OAAO,QAAQ,qCAAqC,CAAC;IACpD,UAAU,yBAAyB;QAClC,kBAAkB,EAAE,WAAW,CAAC;KAChC;CACD;AAUD,eAAO,MAAM,MAAM,EAAE,QAAQ,CAAC,gBAAgB,EAAE,WAAW,CAmBzD,CAAC;AACH,eAAO,MAAM,MAAM,UAAyB,CAAC;AAE7C,qBAAa,eAAgB,SAAQ,OAAO;gBAC/B,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW;IAc7C,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,aAAa,CAAC;IACxB,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,WAAW;;;;;;;;;;;;;;;;IAWrD,eAAe,CAAC,OAAO,EAAE,OAAO;CAQhC;AAED,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,QAEtD;;;;;;AAED,wBAAyC"}
@@ -5,18 +5,26 @@ import settings from "@deepseek-ai/schemastery";
5
5
  import { measureState, priceSurface } from "./core.js";
6
6
  import { createDisplayProjections, replayProjection } from "./projection.js";
7
7
  import { usageProjection } from "./usage.js";
8
+ const policyFields = {
9
+ tokenizer: settings.string(),
10
+ tokensPerMessage: settings.number().min(0).step(1),
11
+ toolsOverhead: settings.number().min(0).step(1),
12
+ replyPrimingTokens: settings.number().min(0).step(1),
13
+ includeReasoning: settings.boolean(),
14
+ };
8
15
  export const Config = settings.object({
9
16
  defaultTokenizer: settings.string().default("deepseek_v4"),
10
- providerTokenizers: settings.dict(settings.string()).default({}),
17
+ providerPolicies: settings
18
+ .array(settings.object({
19
+ ...policyFields,
20
+ provider: settings.string().required(),
21
+ }))
22
+ .default([]),
11
23
  modelPolicies: settings
12
24
  .array(settings.object({
25
+ ...policyFields,
13
26
  provider: settings.string(),
14
27
  model: settings.string().required(),
15
- tokenizer: settings.string(),
16
- tokensPerMessage: settings.number().min(0).step(1),
17
- toolsOverhead: settings.number().min(0).step(1),
18
- replyPrimingTokens: settings.number().min(0).step(1),
19
- includeReasoning: settings.boolean(),
20
28
  }))
21
29
  .default([]),
22
30
  });
@@ -1 +1 @@
1
- {"version":3,"file":"token-meter.js","sourceRoot":"","sources":["../src/token-meter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"token-meter.js","sourceRoot":"","sources":["../src/token-meter.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"tokenizers.d.ts","sourceRoot":"","sources":["../src/tokenizers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAc9D,wBAAgB,iBAAiB,CAChC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,cAW/B;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAyBjE;AAED,wBAAgB,aAAa,CAC5B,MAAM,EAAE,WAAW,EACnB,MAAM,EAAE,WAAW,GAAG,IAAI,GACxB,QAAQ,CAAC,cAAc,CAAC,CAiB1B"}
1
+ {"version":3,"file":"tokenizers.d.ts","sourceRoot":"","sources":["../src/tokenizers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAc9D,wBAAgB,iBAAiB,CAChC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,cAW/B;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAyBjE;AAED,wBAAgB,aAAa,CAC5B,MAAM,EAAE,WAAW,EACnB,MAAM,EAAE,WAAW,GAAG,IAAI,GACxB,QAAQ,CAAC,cAAc,CAAC,CAsB1B"}
@@ -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 providerTokenizer = route && config.providerTokenizers?.[route.provider];
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
- ...match,
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
@@ -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 ModelPolicy {
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
- providerTokenizers?: Record<string, string>;
37
+ providerPolicies?: ProviderPolicy[];
33
38
  modelPolicies?: ModelPolicy[];
34
39
  }
35
40
  export interface MeterConfig {
36
41
  defaultTokenizer: string;
37
- providerTokenizers?: Record<string, string>;
42
+ providerPolicies?: ProviderPolicy[];
38
43
  modelPolicies: ModelPolicy[];
39
44
  }
40
45
  export interface ResolvedPolicy {
@@ -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,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,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,gBAAgB;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5C,aAAa,CAAC,EAAE,WAAW,EAAE,CAAC;CAC9B;AACD,MAAM,WAAW,WAAW;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5C,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;IACxB,eAAe,EAAE,MAAM,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"}
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;IACxB,eAAe,EAAE,MAAM,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/locale/en.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "meta": {
3
3
  "title": "Context Policy",
4
- "description": "Percentage-based context compaction and model-configurable GPT and DeepSeek token counting."
4
+ "description": "Percentage-based context compaction and model-configurable token counting."
5
5
  }
6
6
  }
package/locale/zh.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "meta": {
3
- "title": "上下文策略",
4
- "description": "按上下文窗口比例自动压缩,并支持按模型配置 GPT 和 DeepSeek 的 token 计数。"
3
+ "title": "Context Policy",
4
+ "description": "按上下文窗口比例自动压缩,并支持按模型配置的 token 计数。"
5
5
  }
6
6
  }
package/package.json CHANGED
@@ -1,93 +1,94 @@
1
1
  {
2
- "name": "@snylonue/dsh-context-policy",
3
- "version": "0.1.0",
4
- "description": "Percentage-only compaction and model-configurable GPT and DeepSeek token counting for DSH",
5
- "type": "module",
6
- "license": "MIT",
7
- "keywords": [
8
- "dsh-plugin"
9
- ],
10
- "repository": "github:snylonue/dsh-context-policy",
11
- "packageManager": "pnpm@12.3.4",
12
- "publishConfig": {
13
- "access": "public"
14
- },
15
- "engines": {
16
- "node": ">=24",
17
- "dsh": "0.2.0-rc.2"
18
- },
19
- "exports": {
20
- ".": {
21
- "types": "./dist/token-meter.d.ts",
22
- "default": "./dist/token-meter.js"
23
- },
24
- "./token-meter": {
25
- "types": "./dist/token-meter.d.ts",
26
- "default": "./dist/token-meter.js"
27
- },
28
- "./compaction": {
29
- "types": "./dist/compaction.d.ts",
30
- "default": "./dist/compaction.js"
31
- },
32
- "./tokenizers": {
33
- "types": "./dist/tokenizers.d.ts",
34
- "default": "./dist/tokenizers.js"
35
- },
36
- "./core": {
37
- "types": "./dist/core.d.ts",
38
- "default": "./dist/core.js"
39
- },
40
- "./locale/*.json": "./locale/*.json",
41
- "./package.json": "./package.json"
42
- },
43
- "files": [
44
- "dist",
45
- "src",
46
- "assets",
47
- "cordis.patch.yml",
48
- "locale/*.json",
49
- "README.md",
50
- "LICENSE",
51
- "UPSTREAM.md",
52
- "examples",
53
- "tsconfig.json",
54
- "scripts",
55
- "tsconfig.check.json",
56
- "tests"
57
- ],
58
- "scripts": {
59
- "build": "tsc -p tsconfig.json",
60
- "test": "node --test tests/*.test.ts",
61
- "check": "node scripts/check.ts",
62
- "prepack": "node scripts/check.ts",
63
- "format": "biome format --write .",
64
- "lint": "biome lint ."
65
- },
66
- "dependencies": {
67
- "@huggingface/tokenizers": "0.2.0"
68
- },
69
- "peerDependencies": {
70
- "@deepseek-ai/cordis": "~4.0.4",
71
- "@deepseek-ai/schemastery": "~3.18.4",
72
- "@deepseek-ai/dsh-compaction": "0.2.0-rc.2",
73
- "@deepseek-ai/dsh-llm": "0.2.0-rc.2",
74
- "@deepseek-ai/dsh-session": "0.2.0-rc.2",
75
- "@deepseek-ai/dsh-session-projection": "0.2.0-rc.2",
76
- "@deepseek-ai/dsh-util-values": "0.2.0-rc.2",
77
- "@deepseek-ai/dsh-token-meter": "0.2.0-rc.2",
78
- "zod": "^4.4.3",
79
- "@deepseek-ai/dsh-compaction-basic": "0.2.0-rc.2"
80
- },
81
- "dsh": {
82
- "manifestVersion": 1,
83
- "bundle": {
84
- "patch": "./cordis.patch.yml"
85
- }
86
- },
87
- "devDependencies": {
88
- "@biomejs/biome": "2",
89
- "typescript": "5.9.3",
90
- "@types/node": "24.19.0",
91
- "@deepseek-ai/dsh-app-boot": "0.2.0-rc.2"
92
- }
93
- }
2
+ "name": "@snylonue/dsh-context-policy",
3
+ "version": "0.2.0",
4
+ "description": "Percentage-only compaction and model-configurable GPT and DeepSeek token counting for DSH",
5
+ "type": "module",
6
+ "license": "MIT",
7
+ "keywords": [
8
+ "dsh-plugin"
9
+ ],
10
+ "repository": {
11
+ "type": "git",
12
+ "url": "github:snylonue/dsh-context-policy"
13
+ },
14
+ "publishConfig": {
15
+ "access": "public"
16
+ },
17
+ "engines": {
18
+ "node": ">=24",
19
+ "dsh": "0.2.0-rc.2"
20
+ },
21
+ "exports": {
22
+ ".": {
23
+ "types": "./dist/token-meter.d.ts",
24
+ "default": "./dist/token-meter.js"
25
+ },
26
+ "./token-meter": {
27
+ "types": "./dist/token-meter.d.ts",
28
+ "default": "./dist/token-meter.js"
29
+ },
30
+ "./compaction": {
31
+ "types": "./dist/compaction.d.ts",
32
+ "default": "./dist/compaction.js"
33
+ },
34
+ "./tokenizers": {
35
+ "types": "./dist/tokenizers.d.ts",
36
+ "default": "./dist/tokenizers.js"
37
+ },
38
+ "./core": {
39
+ "types": "./dist/core.d.ts",
40
+ "default": "./dist/core.js"
41
+ },
42
+ "./locale/*.json": "./locale/*.json",
43
+ "./package.json": "./package.json"
44
+ },
45
+ "files": [
46
+ "dist",
47
+ "src",
48
+ "assets",
49
+ "cordis.patch.yml",
50
+ "locale/*.json",
51
+ "README.md",
52
+ "LICENSE",
53
+ "UPSTREAM.md",
54
+ "examples",
55
+ "tsconfig.json",
56
+ "scripts",
57
+ "tsconfig.check.json",
58
+ "tests"
59
+ ],
60
+ "dependencies": {
61
+ "@huggingface/tokenizers": "0.2.0"
62
+ },
63
+ "peerDependencies": {
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",
72
+ "@deepseek-ai/schemastery": "~3.18.4",
73
+ "zod": "^4.4.3"
74
+ },
75
+ "dsh": {
76
+ "manifestVersion": 1,
77
+ "bundle": {
78
+ "patch": "./cordis.patch.yml"
79
+ }
80
+ },
81
+ "devDependencies": {
82
+ "@biomejs/biome": "2",
83
+ "@deepseek-ai/dsh-app-boot": "0.2.0-rc.2",
84
+ "@types/node": "24.19.0",
85
+ "typescript": "5.9.3"
86
+ },
87
+ "scripts": {
88
+ "build": "tsc -p tsconfig.json",
89
+ "test": "node --test tests/*.test.ts",
90
+ "check": "node scripts/check.ts",
91
+ "format": "biome format --write .",
92
+ "lint": "biome lint ."
93
+ }
94
+ }
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
- BasicCompactionConfig,
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
- ...config,
187
+ ...basic,
172
188
  headroomTokens: 0,
173
- modelPolicies: config.modelPolicies.map((p) => ({
174
- ...p,
175
- headroomTokens: 0,
176
- maxTokens: p.maxTokens ?? config.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 };
@@ -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
- providerTokenizers: settings.dict(settings.string()).default({}),
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([]),
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 providerTokenizer = route && config.providerTokenizers?.[route.provider];
69
+ const providerPolicy =
70
+ route &&
71
+ config.providerPolicies?.find((p) => p.provider === route.provider);
70
72
  return Object.freeze({
71
- tokensPerMessage: 3,
72
- toolsOverhead: 4,
73
- replyPrimingTokens: 3,
74
- includeReasoning: false,
75
- ...match,
76
- tokenizer: match?.tokenizer ?? providerTokenizer ?? config.defaultTokenizer,
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 ModelPolicy {
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
- providerTokenizers?: Record<string, string>;
39
+ providerPolicies?: ProviderPolicy[];
35
40
  modelPolicies?: ModelPolicy[];
36
41
  }
37
42
  export interface MeterConfig {
38
43
  defaultTokenizer: string;
39
- providerTokenizers?: Record<string, string>;
44
+ providerPolicies?: ProviderPolicy[];
40
45
  modelPolicies: ModelPolicy[];
41
46
  }
42
47
  export interface ResolvedPolicy {
@@ -157,9 +157,9 @@ test("DeepSeek V4 model policies reprice measurement and preserve the default ro
157
157
  test("DeepSeek V4 is the global default; provider defaults price every model on that provider", () => {
158
158
  const defaults = Meter.Config({});
159
159
  assert.equal(defaults.defaultTokenizer, "deepseek_v4");
160
- assert.deepEqual(defaults.providerTokenizers, {});
160
+ assert.deepEqual(defaults.providerPolicies, []);
161
161
  assert.equal(resolvePolicy(defaults, null).tokenizer, "deepseek_v4");
162
- const cfg = Meter.Config({ providerTokenizers: { openai: "o200k_base" } });
162
+ const cfg = Meter.Config({ providerPolicies: [{ provider: "openai", tokenizer: "o200k_base" }] });
163
163
  for (const [provider, model, tokenizer, tokens] of [
164
164
  ["openai", "new-model", "o200k_base", 13],
165
165
  ["openai", "other-model", "o200k_base", 13],
@@ -179,7 +179,10 @@ test("DeepSeek V4 is the global default; provider defaults price every model on
179
179
 
180
180
  test("matched model policy overrides the provider tokenizer, or inherits it when omitted", () => {
181
181
  const cfg = Meter.Config({
182
- providerTokenizers: { openai: "o200k_base", another: "o200k_base" },
182
+ providerPolicies: [
183
+ { provider: "openai", tokenizer: "o200k_base" },
184
+ { provider: "another", tokenizer: "o200k_base" },
185
+ ],
183
186
  modelPolicies: [
184
187
  { model: "shared", tokenizer: "deepseek_v4" },
185
188
  {