@trazum/core 2.7.12 → 3.0.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.
Files changed (65) hide show
  1. package/dist/advisories.d.ts +14 -7
  2. package/dist/advisories.d.ts.map +1 -1
  3. package/dist/advisories.js +27 -20
  4. package/dist/advisories.js.map +1 -1
  5. package/dist/i18n/en.js +2 -2
  6. package/dist/i18n/en.js.map +1 -1
  7. package/dist/i18n/es.js +2 -2
  8. package/dist/i18n/es.js.map +1 -1
  9. package/dist/i18n/types.d.ts +2 -1
  10. package/dist/i18n/types.d.ts.map +1 -1
  11. package/dist/index.d.ts +3 -1
  12. package/dist/index.d.ts.map +1 -1
  13. package/dist/index.js +2 -1
  14. package/dist/index.js.map +1 -1
  15. package/dist/openrouter.d.ts +1 -1
  16. package/dist/openrouter.d.ts.map +1 -1
  17. package/dist/openrouter.js +1 -2
  18. package/dist/openrouter.js.map +1 -1
  19. package/dist/pricing-overlay.d.ts +1 -1
  20. package/dist/pricing-overlay.d.ts.map +1 -1
  21. package/dist/pricing-overlay.js +19 -9
  22. package/dist/pricing-overlay.js.map +1 -1
  23. package/dist/pricing.d.ts +8 -5
  24. package/dist/pricing.d.ts.map +1 -1
  25. package/dist/pricing.js +11 -99
  26. package/dist/pricing.js.map +1 -1
  27. package/dist/review.js +2 -1
  28. package/dist/review.js.map +1 -1
  29. package/dist/segment.d.ts +31 -1
  30. package/dist/segment.d.ts.map +1 -1
  31. package/dist/segment.js +52 -4
  32. package/dist/segment.js.map +1 -1
  33. package/dist/structure.d.ts +34 -0
  34. package/dist/structure.d.ts.map +1 -1
  35. package/dist/structure.js +143 -12
  36. package/dist/structure.js.map +1 -1
  37. package/dist/types.d.ts +6 -6
  38. package/dist/types.d.ts.map +1 -1
  39. package/dist/usage.js +11 -11
  40. package/dist/watch.d.ts +11 -1
  41. package/dist/watch.d.ts.map +1 -1
  42. package/dist/watch.js.map +1 -1
  43. package/dist/weekly.d.ts +140 -0
  44. package/dist/weekly.d.ts.map +1 -0
  45. package/dist/weekly.js +176 -0
  46. package/dist/weekly.js.map +1 -0
  47. package/dist/write.js +2 -2
  48. package/dist/write.js.map +1 -1
  49. package/package.json +1 -1
  50. package/src/advisories.ts +41 -25
  51. package/src/i18n/en.ts +2 -2
  52. package/src/i18n/es.ts +2 -2
  53. package/src/i18n/types.ts +2 -1
  54. package/src/index.ts +4 -2
  55. package/src/openrouter.ts +1 -2
  56. package/src/pricing-overlay.ts +21 -12
  57. package/src/pricing.ts +13 -101
  58. package/src/review.ts +1 -1
  59. package/src/segment.ts +50 -6
  60. package/src/structure.ts +152 -13
  61. package/src/types.ts +6 -6
  62. package/src/usage.ts +11 -11
  63. package/src/watch.ts +12 -1
  64. package/src/weekly.ts +281 -0
  65. package/src/write.ts +2 -2
package/dist/weekly.js ADDED
@@ -0,0 +1,176 @@
1
+ /**
2
+ * The week in three paragraphs: what it cost, what moved against the week
3
+ * before, and the three changes worth making first.
4
+ *
5
+ * Nothing here is estimated. The bill and the movement are two measured
6
+ * reports, one per week, priced by the same catalogue; the changes are the
7
+ * ranked actions `buildPlan` already derives from the week's own report, and
8
+ * each carries what was measured before it. A saving that has not happened is
9
+ * a projection and says so; `verify` is what measures it afterwards.
10
+ *
11
+ * **A figure in the summary is a figure in the bill.** The summary is text a
12
+ * person reads in an issue and acts on, so every dollar amount and every
13
+ * percentage it prints has to be one the two reports (or the plan made from
14
+ * them) hold. `billFigures` works the allowed set out from the reports
15
+ * themselves, by a route that shares no code with the builder, and
16
+ * `strayFigures` reads a rendered summary and names what is not in it. The CLI
17
+ * refuses to write a summary with a stray figure in it: a wrong number in a
18
+ * weekly note is worse than no note, because nobody re-adds it.
19
+ *
20
+ * Browser-safe like the rest of the core: reports in, one document out. The
21
+ * words belong to whoever renders it, in the reader's language.
22
+ */
23
+ import { formatUsd } from './savings.js';
24
+ const DAY_MS = 86_400_000;
25
+ export const WEEK_MS = 7 * DAY_MS;
26
+ /** How many changes a weekly summary names. Three is the issue's number; more is a list nobody acts on. */
27
+ export const WEEKLY_CHANGES = 3;
28
+ /** How many models the bill and the movement name before saying how many more there are. */
29
+ export const WEEKLY_MODELS = 5;
30
+ export const WEEKLY_MOVERS = 3;
31
+ const dayOf = (ms) => new Date(ms).toISOString().slice(0, 10);
32
+ const windowOf = (sinceMs, untilMs) => ({
33
+ sinceMs,
34
+ untilMs,
35
+ firstDay: dayOf(sinceMs),
36
+ lastDay: dayOf(untilMs - 1),
37
+ });
38
+ /**
39
+ * The week ending at `untilMs` and the week before it.
40
+ *
41
+ * Seven days each, back to back, with no overlap and no gap: the week before
42
+ * ends at the instant this one begins.
43
+ */
44
+ export function weekWindows(untilMs) {
45
+ return {
46
+ current: windowOf(untilMs - WEEK_MS, untilMs),
47
+ previous: windowOf(untilMs - 2 * WEEK_MS, untilMs - WEEK_MS),
48
+ };
49
+ }
50
+ const pricedModels = (report) => report.byModel
51
+ .filter((row) => !report.unpricedModels.includes(row.model))
52
+ .map((row) => ({ model: row.model, calls: row.breakdown.calls, usd: row.breakdown.totalUsd }));
53
+ /**
54
+ * Builds the summary from the week's report, the week before's, and the plan
55
+ * made from this week's.
56
+ */
57
+ export function buildWeeklySummary(current, previous, plan, windows) {
58
+ const models = pricedModels(current);
59
+ let comparison = null;
60
+ if (previous.total.calls > 0) {
61
+ const before = new Map(pricedModels(previous).map((row) => [row.model, row.usd]));
62
+ const now = new Map(models.map((row) => [row.model, row.usd]));
63
+ const movers = [...new Set([...before.keys(), ...now.keys()])]
64
+ .map((model) => {
65
+ const previousUsd = before.get(model) ?? 0;
66
+ const currentUsd = now.get(model) ?? 0;
67
+ return { model, previousUsd, currentUsd, deltaUsd: currentUsd - previousUsd };
68
+ })
69
+ .filter((row) => row.deltaUsd !== 0)
70
+ .sort((a, b) => Math.abs(b.deltaUsd) - Math.abs(a.deltaUsd) || a.model.localeCompare(b.model))
71
+ .slice(0, WEEKLY_MOVERS);
72
+ const previousUsd = previous.total.totalUsd;
73
+ const deltaUsd = current.total.totalUsd - previousUsd;
74
+ comparison = {
75
+ previousUsd,
76
+ previousCalls: previous.total.calls,
77
+ deltaUsd,
78
+ deltaPct: previousUsd > 0 ? (deltaUsd / previousUsd) * 100 : null,
79
+ movers,
80
+ };
81
+ }
82
+ const changes = plan.actions.slice(0, WEEKLY_CHANGES).map((action, index) => ({
83
+ rank: index + 1,
84
+ kind: action.kind,
85
+ label: action.label,
86
+ model: action.model,
87
+ projectedSavingUsd: action.savingUsd,
88
+ measuredStakeUsd: action.stakeUsd,
89
+ sliceUsd: action.detail.baseline?.usd ?? null,
90
+ sliceCalls: action.detail.baseline?.calls ?? null,
91
+ routeTo: action.detail.routeTo?.displayName ?? null,
92
+ assumes: [...action.assumes],
93
+ }));
94
+ return {
95
+ current: windows.current,
96
+ previous: windows.previous,
97
+ totalUsd: current.total.totalUsd,
98
+ calls: current.total.calls,
99
+ models: models.slice(0, WEEKLY_MODELS),
100
+ moreModels: Math.max(0, models.length - WEEKLY_MODELS),
101
+ unpricedModels: [...current.unpricedModels],
102
+ unpricedCalls: current.unpriced.calls,
103
+ undatedExcluded: current.timeWindow?.undatedExcluded ?? 0,
104
+ comparison,
105
+ changes,
106
+ changesAvailable: plan.actions.length,
107
+ };
108
+ }
109
+ /**
110
+ * What the reports hold, worked out from the reports.
111
+ *
112
+ * It reads the two reports and the plan directly and shares nothing with
113
+ * `buildWeeklySummary`, so a figure the builder gets wrong (a total scaled, a
114
+ * delta taken the wrong way round, a saving summed across actions that
115
+ * overlap) is not in this set and is named by `strayFigures`.
116
+ */
117
+ export function billFigures(current, previous, plan) {
118
+ const usd = new Set(['$0']);
119
+ const pct = new Set();
120
+ const add = (value) => {
121
+ if (value === null || value === undefined || !Number.isFinite(value))
122
+ return;
123
+ usd.add(formatUsd(Math.abs(value)));
124
+ };
125
+ add(current.total.totalUsd);
126
+ add(previous.total.totalUsd);
127
+ add(current.total.totalUsd - previous.total.totalUsd);
128
+ const rows = (report) => new Map(report.byModel.map((row) => [row.model, row.breakdown.totalUsd]));
129
+ const now = rows(current);
130
+ const before = rows(previous);
131
+ for (const model of new Set([...now.keys(), ...before.keys()])) {
132
+ const a = now.get(model) ?? 0;
133
+ const b = before.get(model) ?? 0;
134
+ add(a);
135
+ add(b);
136
+ add(a - b);
137
+ }
138
+ for (const action of plan.actions) {
139
+ add(action.savingUsd);
140
+ add(action.stakeUsd);
141
+ add(action.detail.baseline?.usd);
142
+ }
143
+ if (previous.total.totalUsd > 0) {
144
+ const change = ((current.total.totalUsd - previous.total.totalUsd) / previous.total.totalUsd) * 100;
145
+ pct.add(Math.abs(change).toFixed(1));
146
+ }
147
+ return { usd, pct };
148
+ }
149
+ /**
150
+ * Prose a reader sees as prose is checked; what names a workload, a model or a
151
+ * command is not. Those are written between backticks, and a label such as
152
+ * `50% off` is the author's word, not a figure Trazum computed.
153
+ */
154
+ const withoutCode = (text) => text.replace(/`[^`\n]*`/g, '');
155
+ /**
156
+ * The dollar amounts and percentages in a rendered summary that no report
157
+ * holds. Empty when every one is accounted for.
158
+ */
159
+ export function strayFigures(markdown, figures) {
160
+ const prose = withoutCode(markdown);
161
+ const stray = [];
162
+ for (const [amount] of prose.matchAll(/\$\d[\d,]*(?:\.\d+)?/g)) {
163
+ if (!figures.usd.has(amount))
164
+ stray.push(amount);
165
+ }
166
+ for (const [, number] of prose.matchAll(/(\d+(?:\.\d+)?)%/g)) {
167
+ if (number !== undefined && !figures.pct.has(number))
168
+ stray.push(`${number}%`);
169
+ }
170
+ return [...new Set(stray)];
171
+ }
172
+ /** The identifier a weekly summary carries so a re-run replaces it rather than adding a second. */
173
+ export function weeklyMarker(lastDay) {
174
+ return `<!-- trazum-weekly:${lastDay} -->`;
175
+ }
176
+ //# sourceMappingURL=weekly.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"weekly.js","sourceRoot":"","sources":["../src/weekly.ts"],"names":[],"mappings":"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"}
package/dist/write.js CHANGED
@@ -43,7 +43,7 @@ export const SECTIONS = [
43
43
  * imports the wrong one.
44
44
  */
45
45
  export const OUTPUT_FORMATS = ['prose', 'json', 'list', 'table'];
46
- const answered = (answers, id) => Object.prototype.hasOwnProperty.call(answers, id) && answers[id] !== null;
46
+ const answered = (answers, id) => Object.hasOwn(answers, id) && answers[id] !== null;
47
47
  const shapeIs = (...formats) => (answers) => {
48
48
  const shape = answers['output-shape'];
49
49
  return typeof shape === 'string' && formats.includes(shape);
@@ -86,7 +86,7 @@ export function isOpen(entry, answers) {
86
86
  }
87
87
  export function interview(answers) {
88
88
  const open = SLOTS.filter((entry) => isOpen(entry, answers));
89
- const has = (entry) => Object.prototype.hasOwnProperty.call(answers, entry.id);
89
+ const has = (entry) => Object.hasOwn(answers, entry.id);
90
90
  const unasked = open.filter((entry) => !has(entry));
91
91
  return {
92
92
  next: unasked[0]?.id ?? null,
package/dist/write.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"write.js","sourceRoot":"","sources":["../src/write.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"write.js","sourceRoot":"","sources":["../src/write.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@trazum/core",
3
- "version": "2.7.12",
3
+ "version": "3.0.0",
4
4
  "description": "Trazum core: priced advisories for LLM prompts (caching, model tier, batching, schemas), plus deterministic trimming, token counting and pricing.",
5
5
  "license": "MIT",
6
6
  "author": "David Mu\u00f1oz Rey",
package/src/advisories.ts CHANGED
@@ -15,7 +15,7 @@ import { analyzeExamples, findContradictions, findMovableSchema,
15
15
  findRestatedFormat } from './structure.js';
16
16
  import { bandGoverns, estimateTokens } from './tokenizer.js';
17
17
  import { bandFor } from './band.js';
18
- import type { Advisory, ModelPricing, TokenCounter, UsageProfile } from './types.js';
18
+ import type { Advisory, Capability, ModelPricing, TokenCounter, UsageProfile } from './types.js';
19
19
 
20
20
  function countSignals(haystack: string, signals: readonly string[]): number {
21
21
  let count = 0;
@@ -23,9 +23,16 @@ function countSignals(haystack: string, signals: readonly string[]): number {
23
23
  return count;
24
24
  }
25
25
 
26
+ /**
27
+ * What `recommendTier` answers: a capability a model can carry, in the
28
+ * catalogue's own vocabulary. The heuristic has three answers, so `frontier`
29
+ * and `unknown` are never among them.
30
+ */
31
+ type RecommendedCapability = Extract<Capability, 'small' | 'mid' | 'large'>;
32
+
26
33
  /** What `recommendTierDetailed` saw, not only what it concluded. */
27
34
  export interface TierRecommendation {
28
- tier: ModelPricing['tier'];
35
+ capability: RecommendedCapability;
29
36
  complexSignals: number;
30
37
  simpleSignals: number;
31
38
  /**
@@ -33,7 +40,7 @@ export interface TierRecommendation {
33
40
  * heuristic has no business preferring either.
34
41
  *
35
42
  * The score subtracts one side from the other, so three complex signals
36
- * against three simple ones cancels to zero and returns `sonnet` — the same
43
+ * against three simple ones cancels to zero and returns `mid` — the same
37
44
  * answer as a prompt with **no signals at all**. Those are opposite
38
45
  * situations reported identically: one is "nothing here suggests a tier", the
39
46
  * other is "this prompt contradicts itself about which tier it needs", and
@@ -49,7 +56,7 @@ export interface TierRecommendation {
49
56
  }
50
57
 
51
58
  /**
52
- * Estimates the capability tier the prompt needs, and says what it saw.
59
+ * Estimates the capability the prompt needs, and says what it saw.
53
60
  *
54
61
  * This is a keyword-and-size heuristic, not a judgement about answer quality.
55
62
  * Treat it as a hypothesis to validate with your own evaluations before
@@ -67,9 +74,9 @@ export function recommendTierDetailed(prompt: string, tokens: number): TierRecom
67
74
 
68
75
  if (/```|~~~/.test(prompt)) score += 1;
69
76
 
70
- const tier = score >= 3 ? 'opus' : score >= 0 ? 'sonnet' : 'haiku';
77
+ const capability: RecommendedCapability = score >= 3 ? 'large' : score >= 0 ? 'mid' : 'small';
71
78
  return {
72
- tier,
79
+ capability,
73
80
  complexSignals,
74
81
  simpleSignals,
75
82
  conflicted:
@@ -78,37 +85,42 @@ export function recommendTierDetailed(prompt: string, tokens: number): TierRecom
78
85
  }
79
86
 
80
87
  /**
81
- * The tier alone, unchanged.
88
+ * The capability alone: `small`, `mid` or `large`, the names a model's
89
+ * `capability` carries. Until 3.0.0 it answered `haiku`, `sonnet` or `opus`.
82
90
  *
83
- * Kept because it is public API and the 1.x line does not change shapes.
84
91
  * Callers that need to know whether the answer is trustworthy reach for
85
92
  * `recommendTierDetailed`.
86
93
  */
87
- export function recommendTier(prompt: string, tokens: number): ModelPricing['tier'] {
88
- return recommendTierDetailed(prompt, tokens).tier;
94
+ export function recommendTier(prompt: string, tokens: number): RecommendedCapability {
95
+ return recommendTierDetailed(prompt, tokens).capability;
89
96
  }
90
97
 
91
- const TIER_ORDER: Record<ModelPricing['tier'], number> = {
98
+ /**
99
+ * Capabilities in order, so a suggestion can be compared with the model in use.
100
+ *
101
+ * Keyed by `capability`, the one scale a model and a recommendation share.
102
+ */
103
+ const CAPABILITY_ORDER: Record<Capability, number> = {
92
104
  /**
93
105
  * Below every real tier, so no tier is ever "less capable than unknown".
94
106
  *
95
107
  * The value carries the intent rather than the guard below carrying it alone.
96
108
  * Set the other way — above everything — the comparison
97
- * `TIER_ORDER[suggested] < TIER_ORDER['unknown']` is true for every prompt,
109
+ * `CAPABILITY_ORDER[suggested] < CAPABILITY_ORDER['unknown']` is true for every prompt,
98
110
  * and the only thing left standing between that and a recommendation is an
99
111
  * unrelated provider filter. Mutation testing found exactly that: deleting
100
112
  * the guard changed no test result, because a second accident was covering
101
113
  * for it. Two accidents in a row is not a design.
102
114
  */
103
115
  unknown: Number.NEGATIVE_INFINITY,
104
- haiku: 0,
105
- sonnet: 1,
106
- opus: 2,
116
+ small: 0,
117
+ mid: 1,
118
+ large: 2,
107
119
  frontier: 3,
108
120
  };
109
121
 
110
122
  /**
111
- * Cheapest model of a capability tier, using today's effective input price.
123
+ * Cheapest model of a capability, using today's effective input price.
112
124
  *
113
125
  * **Within the same provider**, which is a product decision rather than an
114
126
  * implementation detail. Dropping from Opus to Sonnet is a one-line change;
@@ -120,8 +132,8 @@ const TIER_ORDER: Record<ModelPricing['tier'], number> = {
120
132
  * A model with no provider recorded only matches others with none, so an overlay
121
133
  * that adds a bare model cannot pull a switch out of thin air.
122
134
  */
123
- function cheapestInTier(
124
- tier: ModelPricing['tier'],
135
+ function cheapestInCapability(
136
+ capability: Capability,
125
137
  on: Date,
126
138
  pricing: PricingCatalogue,
127
139
  provider: string | undefined,
@@ -129,7 +141,7 @@ function cheapestInTier(
129
141
  ): ModelPricing | undefined {
130
142
  const candidates = pricing.models.filter(
131
143
  (m) =>
132
- m.tier === tier &&
144
+ m.capability === capability &&
133
145
  m.provider === provider &&
134
146
  // Not generally available, or refused outright by the provider:
135
147
  // recommending a model the reader cannot call is worse than
@@ -464,14 +476,14 @@ export function buildAdvisories(
464
476
 
465
477
  // --- Recommended model ---
466
478
  const recommendation = recommendTierDetailed(optimizedPrompt, tokensAfter);
467
- const suggestedTier = recommendation.tier;
479
+ const suggestedCapability = recommendation.capability;
468
480
 
469
481
  /**
470
482
  * When the prompt argues with itself about which tier it needs, say so and
471
483
  * recommend nothing.
472
484
  *
473
485
  * The score subtracts one side from the other, so a prompt demanding depth
474
- * and brevity in equal measure cancels to zero and lands on `sonnet` — the
486
+ * and brevity in equal measure cancels to zero and lands on `mid` — the
475
487
  * identical answer to a prompt with no signals at all. Reporting two opposite
476
488
  * situations with one number is the failure; the fix is not a better score,
477
489
  * it is declining to pretend there is one.
@@ -502,14 +514,18 @@ export function buildAdvisories(
502
514
  * stop reading the prompt.
503
515
  *
504
516
  * **Deliberately redundant**, and the one surviving mutant in this change.
505
- * `TIER_ORDER.unknown` is `-Infinity`, so the comparison is already false and
517
+ * `CAPABILITY_ORDER.unknown` is `-Infinity`, so the comparison is already false and
506
518
  * deleting this clause changes no behaviour and no test. It stays because the
507
519
  * two express the same rule in different places: an ordering that forgets it
508
520
  * and a condition that forgets it both have to happen before a model of
509
521
  * unrecorded capability is told it is overpowered.
510
522
  */
511
- if (!recommendation.conflicted && model.tier !== 'unknown' && TIER_ORDER[suggestedTier] < TIER_ORDER[model.tier]) {
512
- const candidate = cheapestInTier(suggestedTier, on, pricing, model.provider, size);
523
+ if (
524
+ !recommendation.conflicted &&
525
+ model.capability !== 'unknown' &&
526
+ CAPABILITY_ORDER[suggestedCapability] < CAPABILITY_ORDER[model.capability]
527
+ ) {
528
+ const candidate = cheapestInCapability(suggestedCapability, on, pricing, model.provider, size);
513
529
  if (candidate) {
514
530
  const candidatePricing = effectivePricing(candidate, on, size);
515
531
  /**
@@ -540,7 +556,7 @@ export function buildAdvisories(
540
556
  severity: 'opportunity',
541
557
  ...t.advisories.modelDowngrade({
542
558
  modelName: model.displayName,
543
- tier: suggestedTier,
559
+ capability: suggestedCapability,
544
560
  candidateName: candidate.displayName,
545
561
  currentUsd: formatUsd(monthlyInputUsd + monthlyOutputUsd),
546
562
  candidateUsd: formatUsd(candidateMonthly),
package/src/i18n/en.ts CHANGED
@@ -198,9 +198,9 @@ export const en: CoreMessages = {
198
198
  'The Batch API applies a 50% discount on both input and output. Most batches finish in under an hour, with a 24-hour maximum. It fits bulk classification, data enrichment or evaluations: anything that is not answering a user in real time.',
199
199
  }),
200
200
 
201
- modelDowngrade: ({ modelName, tier, candidateName, currentUsd, candidateUsd }) => ({
201
+ modelDowngrade: ({ modelName, capability, candidateName, currentUsd, candidateUsd }) => ({
202
202
  title: `This task may not need ${modelName}`,
203
- detail: `By length and vocabulary the prompt looks like "${tier}" complexity. On ${candidateName} you would go from ${currentUsd} to ${candidateUsd} per month. This is a keyword heuristic, not a judgement about answer quality. Measure it before switching in production: \`trazum route <log.jsonl> --prompt-file <prompt> --cases <cases> --yes\` sends the same cases to both models and reports whether the cheaper one still does the job.`,
203
+ detail: `By length and vocabulary the prompt looks like "${capability}" complexity. On ${candidateName} you would go from ${currentUsd} to ${candidateUsd} per month. This is a keyword heuristic, not a judgement about answer quality. Measure it before switching in production: \`trazum route <log.jsonl> --prompt-file <prompt> --cases <cases> --yes\` sends the same cases to both models and reports whether the cheaper one still does the job.`,
204
204
  }),
205
205
 
206
206
  tierSignalsConflict: ({ complexSignals, simpleSignals }) => ({
package/src/i18n/es.ts CHANGED
@@ -182,9 +182,9 @@ export const es: CoreMessages = {
182
182
  'La Batch API aplica un 50% de descuento sobre entrada y salida. La mayoría de lotes terminan en menos de una hora, con un máximo de 24. Sirve para clasificación masiva, enriquecimiento de datos o evaluaciones: cualquier cosa que no responda a un usuario en tiempo real.',
183
183
  }),
184
184
 
185
- modelDowngrade: ({ modelName, tier, candidateName, currentUsd, candidateUsd }) => ({
185
+ modelDowngrade: ({ modelName, capability, candidateName, currentUsd, candidateUsd }) => ({
186
186
  title: `Esta tarea quizá no necesite ${modelName}`,
187
- detail: `Por longitud y vocabulario, el prompt parece de complejidad "${tier}". Con ${candidateName} pasarías de ${currentUsd} a ${candidateUsd} al mes. Es una heurística por palabras clave, no un juicio de calidad. Mídelo antes de cambiar en producción: \`trazum route <log.jsonl> --prompt-file <prompt> --cases <casos> --yes\` envía los mismos casos a ambos modelos y dice si el barato sigue haciendo el trabajo.`,
187
+ detail: `Por longitud y vocabulario, el prompt parece de complejidad "${capability}". Con ${candidateName} pasarías de ${currentUsd} a ${candidateUsd} al mes. Es una heurística por palabras clave, no un juicio de calidad. Mídelo antes de cambiar en producción: \`trazum route <log.jsonl> --prompt-file <prompt> --cases <casos> --yes\` envía los mismos casos a ambos modelos y dice si el barato sigue haciendo el trabajo.`,
188
188
  }),
189
189
 
190
190
  tierSignalsConflict: ({ complexSignals, simpleSignals }) => ({
package/src/i18n/types.ts CHANGED
@@ -149,7 +149,8 @@ export interface CachePrefixReorderParams {
149
149
 
150
150
  export interface ModelDowngradeParams {
151
151
  modelName: string;
152
- tier: string;
152
+ /** What the prompt looks like it needs: `small`, `mid` or `large`. */
153
+ capability: string;
153
154
  candidateName: string;
154
155
  currentUsd: string;
155
156
  candidateUsd: string;
package/src/index.ts CHANGED
@@ -79,6 +79,8 @@ export { buildPlan, planLabelName, parsePlanDocument, PLAN_ACTION_KINDS } from '
79
79
  export type { PlanParseFailure, PlanParseResult } from './plan.js';
80
80
  export type { PlanAction, PlanActionKind, PlanAssumption, PlanDocument } from './plan.js';
81
81
  export { verifyPlan } from './verify.js';
82
+ export { buildWeeklySummary, billFigures, strayFigures, weekWindows, weeklyMarker, WEEK_MS, WEEKLY_CHANGES, WEEKLY_MODELS, WEEKLY_MOVERS } from './weekly.js';
83
+ export type { BillFigures, WeekWindow, WeeklyChange, WeeklyModelRow, WeeklyMover, WeeklySummary } from './weekly.js';
82
84
  export { buildHistory, storedReportFrom, MIN_RUN } from './history.js';
83
85
  export { outcomeReport, judgeOutcome, OUTCOME_UNLOCKS } from './outcome.js';
84
86
  export {
@@ -442,9 +444,9 @@ export {
442
444
  getModel,
443
445
  listModels,
444
446
  effectivePricing,
445
- cheapestOfTier,
447
+ cheapestOfCapability,
446
448
  modelFrom,
447
- cheapestOfTierIn,
449
+ cheapestOfCapabilityIn,
448
450
  multipliersFor,
449
451
  isOffered,
450
452
  serviceTierOf,
package/src/openrouter.ts CHANGED
@@ -61,7 +61,7 @@ function perMillion(raw: unknown): number | null {
61
61
  *
62
62
  * `knownIds` is the set the bundled catalogue already has. For those, only the
63
63
  * three things OpenRouter actually knows are overridden — price in, price out,
64
- * context window. `cacheMinTokens`, `caching`, `capability` and `tier` are left
64
+ * context window. `cacheMinTokens`, `caching` and `capability` are left
65
65
  * alone, because the bundled entry was written by somebody who looked them up
66
66
  * and this feed has nothing to say about them. Overwriting a researched fact
67
67
  * with a blank is not a refresh.
@@ -117,7 +117,6 @@ export function openrouterOverlay(
117
117
  cacheMinTokens: null,
118
118
  caching: 'unknown',
119
119
  capability: 'unknown',
120
- tier: 'unknown',
121
120
  };
122
121
  }
123
122
 
@@ -29,7 +29,6 @@ export const PRICING_MODEL_KEYS = [
29
29
  'outputPerMTok',
30
30
  'contextWindow',
31
31
  'cacheMinTokens',
32
- 'tier',
33
32
  'capability',
34
33
  'caching',
35
34
  'notes',
@@ -61,7 +60,6 @@ const PROMO_KEYS = ['inputPerMTok', 'outputPerMTok', 'until'] as const;
61
60
  */
62
61
  const MULTIPLIER_KEYS = ['cacheRead', 'cacheWrite5m', 'cacheWrite1h', 'batch', 'batchCacheRead'] as const;
63
62
 
64
- const TIERS: ModelPricing['tier'][] = ['frontier', 'opus', 'sonnet', 'haiku', 'unknown'];
65
63
  const CAPABILITIES: Capability[] = ['small', 'mid', 'large', 'frontier', 'unknown'];
66
64
  const CACHING_MODES: CachingMode[] = ['explicit', 'automatic', 'none', 'unknown'];
67
65
 
@@ -182,6 +180,24 @@ function parseMultipliers(raw: unknown, label: string, source: string): CostMult
182
180
  return multipliers;
183
181
  }
184
182
 
183
+ /**
184
+ * `tier` was a key on a model until 3.0.0, which removed it.
185
+ *
186
+ * Refused by name, ahead of the unknown-key check, so the reader is told what
187
+ * to write instead rather than offered the nearest spelling. Not ignored: a
188
+ * key somebody wrote and nothing reads is a setting that looks set. Checked on
189
+ * a parsed document and again on an overlay handed to `applyPricingOverlay` as
190
+ * an object, which no parser has read.
191
+ */
192
+ function refuseTier(raw: unknown, id: string, source: string): void {
193
+ if (!isPlainObject(raw) || !('tier' in raw)) return;
194
+ throw new PricingOverlayError(
195
+ `"models.${id}.tier" was removed in 3.0.0. Write "capability" instead: ` +
196
+ 'haiku is "small", sonnet is "mid", opus is "large", frontier is "frontier", unknown is "unknown"',
197
+ source,
198
+ );
199
+ }
200
+
185
201
  function parseModel(
186
202
  raw: unknown,
187
203
  id: string,
@@ -190,6 +206,7 @@ function parseModel(
190
206
  if (!isPlainObject(raw)) {
191
207
  throw new PricingOverlayError(`"models.${id}" must be an object`, source);
192
208
  }
209
+ refuseTier(raw, id, source);
193
210
  rejectUnknownKeys(raw, PRICING_MODEL_KEYS, source, `models.${id}.`);
194
211
  if (Object.keys(raw).length === 0) {
195
212
  throw new PricingOverlayError(
@@ -243,15 +260,6 @@ function parseModel(
243
260
  }
244
261
  model.caching = raw.caching as CachingMode;
245
262
  }
246
- if (raw.tier !== undefined) {
247
- if (typeof raw.tier !== 'string' || !TIERS.includes(raw.tier as ModelPricing['tier'])) {
248
- throw new PricingOverlayError(
249
- `"models.${id}.tier" must be one of ${TIERS.join(', ')}`,
250
- source,
251
- );
252
- }
253
- model.tier = raw.tier as ModelPricing['tier'];
254
- }
255
263
  if (raw.notes !== undefined) {
256
264
  if (typeof raw.notes !== 'string') {
257
265
  throw new PricingOverlayError(`"models.${id}.notes" must be a string`, source);
@@ -356,6 +364,7 @@ export function applyPricingOverlay(
356
364
  ): PricingCatalogue {
357
365
  const overridden: string[] = [];
358
366
  const added: string[] = [];
367
+ for (const [id, patch] of Object.entries(overlay.models)) refuseTier(patch, id, source);
359
368
 
360
369
  const models = base.models.map((model) => {
361
370
  const patch = overlay.models[model.id];
@@ -389,7 +398,7 @@ export function applyPricingOverlay(
389
398
  // `cacheMinTokens` is checked for `undefined` and not for falsiness, so an
390
399
  // explicit `null` counts as supplied. That is the point of it: saying "not
391
400
  // known" is an answer, leaving it out is not.
392
- const missing = (['displayName', 'inputPerMTok', 'outputPerMTok', 'contextWindow', 'cacheMinTokens', 'tier', 'capability'] as const).filter(
401
+ const missing = (['displayName', 'inputPerMTok', 'outputPerMTok', 'contextWindow', 'cacheMinTokens', 'capability'] as const).filter(
393
402
  (key) => patch[key] === undefined,
394
403
  );
395
404
  if (missing.length > 0) {