dsh-token-total 1.0.2 → 1.0.4

package/src/client/stats-icons.tsx

@@ -0,0 +1,83 @@
+/**
+ * The stat-pill glyphs.
+ *
+ * The shell freezes its primitives table, and that table's icon names moved
+ * with the host line: 0.2.1-rc.2 exports `IconGaugeOutlineRegular` /
+ * `IconDatabaseOutlineRegular` (plus the `Medium` weight) and no longer
+ * exports the `…Outline16` names this plugin used to import. A missing named
+ * export is `undefined` at runtime, and React then throws "Element type is
+ * invalid" on the entry's first render — the shell's slot boundary catches it,
+ * ABDICATES the entry, and the shadowed official pill silently returns. That
+ * failure mode is invisible in types (the package's own declarations still
+ * describe the old names) and looks exactly like "the plugin did nothing".
+ *
+ * So the glyph is resolved from the runtime table by preference order and
+ * falls back to an inline drawing of the same shape when no name exists, which
+ * keeps one published build rendering on every host line.
+ */
+import * as primitives from '@deepseek-ai/dsh-client-ui-primitives'
+
+type IconComponent = () => JSX.Element
+
+const table = primitives as unknown as Record<string, unknown>
+
+/** First exported function component among `names`, or null when the shell
+ *  exports none of them (an older or newer icon roster). */
+function resolveIcon(...names: readonly string[]): IconComponent | null {
+  for (const name of names) {
+    const candidate = table[name]
+    if (typeof candidate === 'function') return candidate as IconComponent
+  }
+  return null
+}
+
+const resolvedGauge = resolveIcon(
+  'IconGaugeOutlineRegular',
+  'IconGaugeOutlineMedium',
+  'IconGaugeOutline16',
+)
+const resolvedDatabase = resolveIcon(
+  'IconDatabaseOutlineRegular',
+  'IconDatabaseOutlineMedium',
+  'IconDatabaseOutline16',
+)
+
+/** Gauge glyph for the activity pill (counts + throughput). */
+export function GaugeIcon(): JSX.Element {
+  if (resolvedGauge !== null) {
+    const Icon = resolvedGauge
+    return <Icon />
+  }
+  return (
+    <svg viewBox="0 0 16 16" aria-hidden="true">
+      <path
+        d="M8 2.5a5.5 5.5 0 0 1 5.5 5.5M8 8l2.6-2.6M2.5 8A5.5 5.5 0 0 1 8 2.5"
+        fill="none"
+        stroke="currentColor"
+        strokeWidth="1.3"
+        strokeLinecap="round"
+      />
+      <circle cx="8" cy="8" r="1" fill="currentColor" />
+    </svg>
+  )
+}
+
+/** Database glyph for the token-usage pill. */
+export function DatabaseIcon(): JSX.Element {
+  if (resolvedDatabase !== null) {
+    const Icon = resolvedDatabase
+    return <Icon />
+  }
+  return (
+    <svg viewBox="0 0 16 16" aria-hidden="true">
+      <ellipse cx="8" cy="3.6" rx="4.6" ry="1.9" fill="none" stroke="currentColor" strokeWidth="1.3" />
+      <path
+        d="M3.4 3.6v8.8c0 1.05 2.06 1.9 4.6 1.9s4.6-.85 4.6-1.9V3.6M3.4 8c0 1.05 2.06 1.9 4.6 1.9s4.6-.85 4.6-1.9"
+        fill="none"
+        stroke="currentColor"
+        strokeWidth="1.3"
+        strokeLinecap="round"
+      />
+    </svg>
+  )
+}

package/src/query.ts

@@ -104,6 +104,9 @@ export function aggregateSamples(
   const from = filter.from
   const to = filter.to
   const buckets = bucketsInRange(from, to, granularity)
+  // Materialize once: the qualified-name pre-pass below and the main fold
+  // both walk the samples, and a generator input may only be consumed once.
+  const all = [...samples]
   const out: TokenTotalRange = {
     from,
     to,
@@ -151,7 +154,11 @@ export function aggregateSamples(
   const bucketCacheHit = new Map<string, number>()
   const bucketCacheMiss = new Map<string, number>()
 
-  for (const sample of samples) {
+  // One model, one row: every qualified routing name folds onto its bare
+  // model key before the first aggregation (see aliasQualifiedModels).
+  const modelAlias = aliasQualifiedModels(new Set(all.map((sample) => modelKeyOf(sample))))
+
+  for (const sample of all) {
     const bucket = bucketOf(sample, from, to, granularity)
     if (bucket === null) continue
     if (sample.turn) {
@@ -192,7 +199,8 @@ export function aggregateSamples(
     out.cacheMiss += missSide
     const modelRef = sample.model && sample.model !== '' ? sample.model : '(unknown)'
     const provider = providerOf(modelRef)
-    const model = normalizeModelName(sample.modelName?.trim() || modelNameOf(modelRef))
+    const modelBase = modelKeyOf(sample)
+    const model = modelAlias.get(modelBase) ?? modelBase
     const sources = modelProviders.get(model) ?? new Set<string>()
     sources.add(provider)
     modelProviders.set(model, sources)
@@ -272,6 +280,49 @@ export function aggregateSamples(
   return out
 }
 
+/** The aggregation key of one sample: the resolved display name when the
+ *  host resolved one, else the bare model ref — normalized like every
+ *  display name so the key is stable across routes and refreshes. */
+function modelKeyOf(sample: UsageSample): string {
+  const modelRef = sample.model && sample.model !== '' ? sample.model : '(unknown)'
+  return normalizeModelName(sample.modelName?.trim() || modelNameOf(modelRef))
+}
+
+/**
+ * Qualified-name aliases: "workbuddy-ai-plugin/deepseek-v4.1-flash" and
+ * "deepseek-v4.1-flash" are the same model reached through a routing
+ * namespace, so a name containing "/" merges onto the LONGEST suffix after a
+ * "/" that is itself a model key in this dataset (chains like a/b/c → b/c → c
+ * resolve transitively). The merge is dataset-relative on purpose: a slash
+ * that names no bare model in the data ("GPT/6.1 sol" beside "gpt-6.1-sol")
+ * is a genuinely different name and stays its own row — see the
+ * distinct-slashes case in tests/model-aggregation.test.mjs.
+ */
+function aliasQualifiedModels(names: Set<string>): Map<string, string> {
+  const alias = new Map<string, string>()
+  for (const name of names) {
+    if (!name.includes('/')) continue
+    const parts = name.split('/')
+    for (let i = 1; i < parts.length; i++) {
+      const suffix = parts.slice(i).join('/')
+      if (names.has(suffix)) {
+        alias.set(name, suffix)
+        break
+      }
+    }
+  }
+  for (const name of [...alias.keys()]) {
+    let target = alias.get(name)!
+    const seen = new Set([name])
+    while (alias.has(target) && !seen.has(target)) {
+      seen.add(target)
+      target = alias.get(target)!
+    }
+    alias.set(name, target)
+  }
+  return alias
+}
+
 function modelsSorted(
   totals: Map<string, number>,
   cache: Map<string, { hit: number; miss: number }>,