@kabmo-labs/kabmo 0.17.0 → 0.18.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/dist/client/index.html +1 -1
- package/dist/client/index.js +538 -457
- package/dist/client/static/js/index-hp75vsv9.css +1 -0
- package/dist/client/static/js/{index-rerjq5th.js → index-tc09dtca.js} +823 -814
- package/package.json +1 -1
- package/src/client/components/common/MarkdownRenderer.tsx +136 -89
- package/src/client/components/common/anchored-menu/index.test.tsx +141 -0
- package/src/client/components/common/anchored-menu/index.tsx +143 -0
- package/src/client/components/common/markdown-review/ReviewPopover.tsx +144 -0
- package/src/client/components/common/markdown-review/ReviewSummary.tsx +108 -0
- package/src/client/components/common/markdown-review/index.tsx +129 -0
- package/src/client/components/common/server-control/Panel.tsx +33 -23
- package/src/client/components/common/server-control/index.test.tsx +11 -5
- package/src/client/components/common/server-control/index.tsx +10 -8
- package/src/client/components/layout/session-sidebar/CategoryHeader.tsx +42 -21
- package/src/client/components/layout/session-sidebar/CategoryHeader.worktree.test.tsx +36 -17
- package/src/client/components/layout/session-sidebar/CategoryItem.tsx +8 -7
- package/src/client/components/layout/session-sidebar/about-modal/NotesDialog.tsx +94 -0
- package/src/client/components/layout/session-sidebar/about-modal/VersionLine.test.tsx +68 -0
- package/src/client/components/layout/session-sidebar/about-modal/VersionLine.tsx +36 -0
- package/src/client/components/layout/session-sidebar/about-modal/index.tsx +57 -34
- package/src/client/components/layout/session-sidebar/modern/WorkspaceHeader.tsx +28 -10
- package/src/client/components/layout/session-sidebar/modern/WorkspaceSection.tsx +7 -6
- package/src/client/components/layout/session-sidebar/modern/workspace-header.test.tsx +1 -1
- package/src/client/components/layout/update-popup/ReleaseNotes.tsx +8 -3
- package/src/client/components/layout/update-popup/index.tsx +5 -1
- package/src/client/components/mobile/mobile-right-sidebar/FullEditor.tsx +13 -15
- package/src/client/components/mobile/mobile-right-sidebar/Header.tsx +23 -1
- package/src/client/components/mobile/mobile-right-sidebar/MissingFileBanner.tsx +30 -0
- package/src/client/components/mobile/mobile-right-sidebar/PreviewScroller.tsx +18 -2
- package/src/client/components/mobile/mobile-session-sidebar/Item.tsx +22 -67
- package/src/client/components/mobile/mobile-session-sidebar/ItemMenu.tsx +110 -0
- package/src/client/components/settings/SettingsSidebarList.tsx +20 -0
- package/src/client/components/settings/categories/AgentSettings.tsx +23 -50
- package/src/client/components/settings/categories/CommandSettings.tsx +2 -2
- package/src/client/components/settings/categories/McpSettings.tsx +4 -21
- package/src/client/components/settings/categories/OmpSettings.tsx +147 -194
- package/src/client/components/settings/categories/SkillSettings.tsx +2 -2
- package/src/client/components/settings/categories/TokenUsageSettings.tsx +211 -229
- package/src/client/components/settings/categories/agent-settings/DetailPane.tsx +229 -237
- package/src/client/components/settings/categories/agent-settings/ModelPicker.tsx +71 -0
- package/src/client/components/settings/categories/agent-settings/SidebarList.tsx +9 -2
- package/src/client/components/settings/categories/agent-settings/levels.ts +38 -0
- package/src/client/components/settings/categories/behavior-settings/Editor.tsx +27 -7
- package/src/client/components/settings/categories/chat-settings/ToolRenderSection.tsx +23 -5
- package/src/client/components/settings/categories/command-settings/DetailPane.tsx +75 -33
- package/src/client/components/settings/categories/command-settings/SidebarList.tsx +7 -0
- package/src/client/components/settings/categories/mcp-settings/DetailPane.tsx +91 -76
- package/src/client/components/settings/categories/mcp-settings/EnvVarsSection.tsx +83 -0
- package/src/client/components/settings/categories/mcp-settings/ImportModal.tsx +26 -13
- package/src/client/components/settings/categories/mcp-settings/SidebarList.tsx +20 -0
- package/src/client/components/settings/categories/omp-settings/ConfigTabs.tsx +97 -36
- package/src/client/components/settings/categories/omp-settings/EngineHeader.tsx +151 -0
- package/src/client/components/settings/categories/omp-settings/ExtensionsPanel.tsx +68 -32
- package/src/client/components/settings/categories/omp-settings/OrderedChips.tsx +119 -0
- package/src/client/components/settings/categories/omp-settings/PresetBar.tsx +14 -7
- package/src/client/components/settings/categories/omp-settings/RoleEditor.tsx +15 -6
- package/src/client/components/settings/categories/omp-settings/RowEditor.tsx +165 -226
- package/src/client/components/settings/categories/omp-settings/types.ts +28 -0
- package/src/client/components/settings/categories/skill-settings/DetailHeader.tsx +35 -7
- package/src/client/components/settings/categories/skill-settings/DetailPane.tsx +34 -14
- package/src/client/components/settings/categories/skill-settings/SidebarList.tsx +21 -0
- package/src/client/components/settings/categories/skill-settings/pane.test.tsx +15 -6
- package/src/client/components/settings/categories/token-usage-settings/Breakdown.tsx +242 -102
- package/src/client/components/settings/categories/token-usage-settings/Chart.tsx +130 -56
- package/src/client/components/settings/categories/token-usage-settings/Controls.tsx +135 -0
- package/src/client/components/settings/categories/token-usage-settings/MetricsGrid.tsx +55 -33
- package/src/client/components/settings/categories/token-usage-settings/Provenance.tsx +59 -0
- package/src/client/components/settings/categories/token-usage-settings/panel.test.tsx +239 -0
- package/src/client/components/workspace/browser-panel/Screencast.test.ts +1 -0
- package/src/client/components/workspace/browser-panel/Screencast.tsx +17 -22
- package/src/client/components/workspace/browser-panel/TabStrip.test.tsx +158 -0
- package/src/client/components/workspace/browser-panel/TabStrip.tsx +90 -0
- package/src/client/components/workspace/browser-panel/index.tsx +50 -4
- package/src/client/components/workspace/browser-toolbar/index.tsx +41 -1
- package/src/client/components/workspace/chat-timeline/ThinkingSection.tsx +3 -1
- package/src/client/components/workspace/chat-timeline/ToolCallingSection.tsx +2 -0
- package/src/client/components/workspace/chat-timeline/block-chrome.test.tsx +13 -2
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Bash.test.ts +88 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Bash.tsx +24 -1
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Read.test.ts +34 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Read.tsx +5 -1
- package/src/client/components/workspace/chat-timeline/tool-renderers/shared/ArtifactChip.tsx +7 -6
- package/src/client/components/workspace/chat-timeline/tool-renderers/styles/Tui.test.tsx +237 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/styles/Tui.tsx +191 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/styles/styles.test.tsx +1 -1
- package/src/client/components/workspace/diff-panel/MergeDiffView.tsx +21 -7
- package/src/client/components/workspace/diff-panel/changes.test.ts +51 -0
- package/src/client/components/workspace/diff-panel/changes.ts +28 -12
- package/src/client/components/workspace/diff-panel/merge.test.ts +28 -0
- package/src/client/components/workspace/diff-panel/merge.ts +21 -1
- package/src/client/components/workspace/editor/Body.tsx +7 -0
- package/src/client/components/workspace/editor/FileDocument.tsx +15 -21
- package/src/client/components/workspace/editor/FilePane.tsx +12 -0
- package/src/client/components/workspace/editor/PreviewPane.tsx +70 -0
- package/src/client/components/workspace/editor/Toolbar.tsx +17 -1
- package/src/client/components/workspace/editor/index.tsx +25 -22
- package/src/client/components/workspace/editor/toolbar-clusters.test.ts +14 -0
- package/src/client/components/workspace/editor/toolbar-clusters.tsx +12 -86
- package/src/client/components/workspace/editor/toolbar-toggle.tsx +53 -0
- package/src/client/components/workspace/editor/toolbar-write-clusters.tsx +112 -0
- package/src/client/components/workspace/git-panel/commit-modal.test.ts +5 -3
- package/src/client/components/workspace/user-browser-panel/AddressBar.tsx +5 -0
- package/src/client/components/workspace/user-browser-panel/AnnotateBar.test.tsx +201 -0
- package/src/client/components/workspace/user-browser-panel/AnnotateBar.tsx +112 -0
- package/src/client/components/workspace/user-browser-panel/AnnotateLayer.test.tsx +225 -0
- package/src/client/components/workspace/user-browser-panel/AnnotateLayer.tsx +217 -0
- package/src/client/components/workspace/user-browser-panel/AnnotateTarget.tsx +99 -0
- package/src/client/components/workspace/user-browser-panel/Frame.tsx +30 -1
- package/src/client/components/workspace/user-browser-panel/index.tsx +81 -2
- package/src/client/data/agent-data/builtin.ts +0 -10
- package/src/client/data/agent-data/orchestrator.ts +0 -45
- package/src/client/data/agent-data/specialist.ts +0 -100
- package/src/client/data/mock/token-usage.ts +170 -120
- package/src/client/data/settings/omp-schema.json +33 -1
- package/src/client/hooks/browser/use-annotate.test.ts +143 -0
- package/src/client/hooks/browser/use-annotate.ts +98 -0
- package/src/client/hooks/browser/use-close-tab.test.ts +148 -0
- package/src/client/hooks/browser/use-close-tab.ts +67 -0
- package/src/client/hooks/browser/use-screencast.ts +13 -1
- package/src/client/hooks/chat/composer/browser-context.test.ts +117 -0
- package/src/client/hooks/chat/composer/browser-context.ts +40 -16
- package/src/client/hooks/chat/composer/items.test.ts +1 -1
- package/src/client/hooks/chat/composer/review-context.ts +38 -0
- package/src/client/hooks/chat/composer/use-draft.test.ts +132 -0
- package/src/client/hooks/chat/composer/use-draft.ts +31 -2
- package/src/client/hooks/chat/timeline/row-window.test.ts +15 -2
- package/src/client/hooks/editor/use-document-annotations.ts +124 -0
- package/src/client/hooks/editor/use-editor-panel-ui.ts +52 -0
- package/src/client/hooks/editor/use-file-review-mode.ts +35 -0
- package/src/client/hooks/editor/use-preview-review.ts +148 -0
- package/src/client/hooks/settings/agents.ts +149 -0
- package/src/client/hooks/settings/crud-list.test.ts +28 -6
- package/src/client/hooks/settings/crud-list.ts +96 -57
- package/src/client/hooks/settings/omp-config.ts +164 -0
- package/src/client/hooks/settings/useTokenUsage.ts +125 -0
- package/src/client/hooks/settings/write-feedback.test.ts +104 -0
- package/src/client/hooks/settings/write-feedback.ts +63 -0
- package/src/client/hooks/ui/markdown-hydration.ts +125 -0
- package/src/client/hooks/ui/updates/index.test.ts +100 -1
- package/src/client/hooks/ui/updates/index.ts +50 -0
- package/src/client/hooks/ui/updates/notes.test.ts +138 -0
- package/src/client/hooks/ui/updates/notes.ts +57 -0
- package/src/client/lib/browser/element-at.test.ts +229 -0
- package/src/client/lib/browser/element-at.ts +139 -0
- package/src/client/lib/review/client.ts +73 -0
- package/src/client/lib/router/search-params.ts +42 -20
- package/src/client/tailwind.css +65 -0
- package/src/server/lib/btw/lifecycle.server.ts +2 -2
- package/src/server/lib/db/schema.ts +7 -0
- package/src/server/lib/db/seed-terminal.test.ts +4 -0
- package/src/server/lib/omp/config/agent-definitions.test.ts +273 -0
- package/src/server/lib/omp/config/agents.ts +231 -61
- package/src/server/lib/omp/config/definitions.test.ts +9 -105
- package/src/server/lib/omp/config/extensions.ts +16 -7
- package/src/server/lib/omp/config/omp-config-files.test.ts +27 -0
- package/src/server/lib/omp/rpc/constants.test.ts +11 -0
- package/src/server/lib/omp/rpc/constants.ts +15 -0
- package/src/server/lib/omp/rpc/process.ts +11 -14
- package/src/server/lib/omp/rpc/session-commands.ts +6 -3
- package/src/server/lib/omp/rpc/utility-agent-dir.test.ts +134 -0
- package/src/server/lib/omp/rpc/utility-agent-dir.ts +138 -0
- package/src/server/lib/omp/rpc/utility.ts +12 -0
- package/src/server/lib/review/schema.server.ts +45 -0
- package/src/server/lib/review/store.server.ts +138 -0
- package/src/server/lib/terminal/attach-replay.test.ts +132 -0
- package/src/server/lib/terminal/output.test.ts +166 -0
- package/src/server/lib/terminal/output.ts +104 -0
- package/src/server/lib/terminal/runtime.server.ts +5 -0
- package/src/server/lib/terminal/send-result.test.ts +33 -0
- package/src/server/lib/terminal/send-result.ts +32 -0
- package/src/server/lib/terminal/session.server.ts +45 -11
- package/src/server/lib/terminal/store-liveness.test.ts +4 -0
- package/src/server/lib/updates/active-notes.test.ts +149 -0
- package/src/server/lib/updates/active-notes.ts +75 -0
- package/src/server/lib/updates/changelog-file.ts +42 -11
- package/src/server/lib/updates/changelog.test.ts +15 -1
- package/src/server/lib/updates/omp.ts +42 -15
- package/src/server/lib/updates/release-url.ts +27 -1
- package/src/server/lib/usage/index-parse.test.ts +200 -0
- package/src/server/lib/usage/index-parse.ts +178 -0
- package/src/server/lib/usage/index-query.server.ts +248 -0
- package/src/server/lib/usage/index-scan.server.ts +343 -0
- package/src/server/lib/usage/index-schema.server.ts +82 -0
- package/src/server/lib/usage/index.test.ts +234 -0
- package/src/server/lib/usage/providers.server.ts +4 -53
- package/src/server/routes/browser/index.ts +3 -0
- package/src/server/routes/browser/stream.ts +31 -2
- package/src/server/routes/browser/tabs.test.ts +94 -0
- package/src/server/routes/browser/tabs.ts +85 -0
- package/src/server/routes/index.ts +2 -0
- package/src/server/routes/review/bindings.ts +11 -0
- package/src/server/routes/review/index.ts +127 -0
- package/src/server/routes/review/routes.test.ts +191 -0
- package/src/server/routes/settings/agents.test.ts +180 -0
- package/src/server/routes/settings/agents.ts +95 -102
- package/src/server/routes/settings/mcp.test.ts +135 -0
- package/src/server/routes/settings/mcp.ts +14 -6
- package/src/server/routes/settings/settings-store-routes.test.ts +6 -113
- package/src/server/routes/telemetry/tokens.test.ts +145 -0
- package/src/server/routes/telemetry/tokens.ts +70 -149
- package/src/server/routes/terminal/ws.ts +6 -5
- package/src/server/routes/updates/index.ts +2 -0
- package/src/server/routes/updates/notes.ts +34 -0
- package/src/server/routes/updates/routes.test.ts +49 -0
- package/src/shared/lib/browser/annotate.test.ts +283 -0
- package/src/shared/lib/browser/annotate.ts +231 -0
- package/src/shared/lib/browser/browser-viewer.test.ts +26 -4
- package/src/shared/lib/browser/frame-gate.test.ts +91 -0
- package/src/shared/lib/browser/frame-gate.ts +69 -0
- package/src/shared/lib/browser/frame-params.test.ts +43 -0
- package/src/shared/lib/browser/frame-params.ts +60 -0
- package/src/shared/lib/browser/frame-pipeline.test.ts +132 -0
- package/src/shared/lib/browser/frame-pipeline.ts +80 -0
- package/src/shared/lib/browser/page-context.ts +60 -4
- package/src/shared/lib/browser/snapshot.test.ts +115 -0
- package/src/shared/lib/browser/snapshot.ts +112 -0
- package/src/shared/lib/browser/tab-close.test.ts +74 -0
- package/src/shared/lib/browser/tab-close.ts +77 -0
- package/src/shared/lib/browser/viewer.ts +45 -26
- package/src/shared/lib/chat/timeline/block-chrome.ts +19 -0
- package/src/shared/lib/chat/timeline/tool-render-mode.ts +17 -4
- package/src/shared/lib/chat/tool/artifact.ts +55 -20
- package/src/shared/lib/chat/tool/bash-facts.ts +96 -0
- package/src/shared/lib/chat/tool/minimized.test.ts +98 -0
- package/src/shared/lib/chat/tool/minimized.ts +64 -0
- package/src/shared/lib/chat/tool/summary.test.ts +28 -8
- package/src/shared/lib/chat/tool/summary.ts +3 -32
- package/src/shared/lib/markdown/blocks/anchor.ts +63 -0
- package/src/shared/lib/markdown/blocks/blocks.test.ts +141 -0
- package/src/shared/lib/markdown/blocks/renderer.ts +120 -0
- package/src/shared/lib/markdown/blocks/scan.ts +100 -0
- package/src/shared/lib/markdown/blocks/types.ts +62 -0
- package/src/shared/lib/markdown/marked.ts +58 -147
- package/src/shared/lib/markdown/math-extensions.ts +168 -0
- package/src/shared/lib/markdown/review/prompt.ts +77 -0
- package/src/shared/lib/markdown/review/reconcile.ts +55 -0
- package/src/shared/lib/markdown/review/review.test.ts +96 -0
- package/src/shared/lib/markdown/xml-sections.test.ts +140 -0
- package/src/shared/lib/markdown/xml-sections.ts +139 -0
- package/src/shared/lib/models/provider/label.ts +57 -0
- package/src/shared/lib/omp/config/agent-file.test.ts +54 -0
- package/src/shared/lib/omp/config/agent-file.ts +43 -0
- package/src/shared/lib/omp/config/row-value.test.ts +95 -0
- package/src/shared/lib/omp/config/row-value.ts +97 -0
- package/src/shared/lib/omp/config/schema.test.ts +31 -0
- package/src/shared/lib/omp/config/schema.ts +6 -0
- package/src/shared/lib/omp/rpc/frame.test.ts +48 -47
- package/src/shared/lib/omp/rpc/frame.ts +49 -40
- package/src/shared/lib/ui/menu-anchor.test.ts +69 -0
- package/src/shared/lib/ui/menu-anchor.ts +89 -0
- package/src/shared/lib/usage/breakdown.test.ts +197 -0
- package/src/shared/lib/usage/breakdown.ts +241 -0
- package/src/shared/lib/usage/range.test.ts +204 -0
- package/src/shared/lib/usage/range.ts +240 -0
- package/src/shared/lib/usage/view.test.ts +85 -0
- package/src/shared/lib/usage/view.ts +74 -0
- package/src/shared/types/browser.ts +78 -0
- package/src/shared/types/index.ts +1 -0
- package/src/shared/types/settings/agent.ts +28 -6
- package/src/shared/types/settings/state.ts +4 -3
- package/src/shared/types/settings/write.ts +6 -0
- package/src/shared/types/tokenUsage.ts +128 -21
- package/src/shared/types/updates.ts +20 -0
- package/dist/client/static/js/index-3ve31rzx.css +0 -1
- package/src/server/lib/omp/session/usage/aggregate-shaping.test.ts +0 -149
- package/src/server/lib/omp/session/usage/aggregate.test.ts +0 -243
- package/src/server/lib/omp/session/usage/aggregate.ts +0 -330
- package/src/server/lib/omp/session/usage/shaping.ts +0 -130
|
@@ -0,0 +1,178 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Folding ONE transcript line into usage counters, without touching disk.
|
|
8
|
+
*
|
|
9
|
+
* Everything here is pure so the arithmetic can be pinned exactly: a wrong
|
|
10
|
+
* total only surfaces later as a bill disagreeing with the panel. The three
|
|
11
|
+
* rules that used to be wrong or missing:
|
|
12
|
+
*
|
|
13
|
+
* - **Provider attribution.** `message.provider` is written on every usage
|
|
14
|
+
* entry (measured: 0 of 143 969 records without it), yet the breakdown
|
|
15
|
+
* keyed on model alone, so two accounts serving `deepseek-v4-1-flash`
|
|
16
|
+
* reported one merged cost. The key is `(canonical provider, model)`.
|
|
17
|
+
* - **The day is LOCAL.** `timestamp.slice(0, 10)` is UTC, while "Today"
|
|
18
|
+
* means the reader's calendar day; a 00:30 WIB record landed in
|
|
19
|
+
* yesterday's chart column but in today's total.
|
|
20
|
+
* - **Explicit totals win.** `usage.totalTokens` (and `cost.total`) are
|
|
21
|
+
* omp's own numbers; the parts are only summed when absent.
|
|
22
|
+
*/
|
|
23
|
+
|
|
24
|
+
import { canonicalProviderSlug } from '@/shared/lib/models/provider/label';
|
|
25
|
+
import { dayKeyOfTimestamp } from '@/shared/lib/usage/range';
|
|
26
|
+
import type { OmpMessageEntry, OmpUsage } from '@/shared/types/omp/session';
|
|
27
|
+
|
|
28
|
+
/** One rollup contribution: a file's share of one (day, provider, model). */
|
|
29
|
+
export interface UsageRollupRow {
|
|
30
|
+
day: string;
|
|
31
|
+
provider: string;
|
|
32
|
+
model: string;
|
|
33
|
+
records: number;
|
|
34
|
+
unpriced: number;
|
|
35
|
+
input: number;
|
|
36
|
+
output: number;
|
|
37
|
+
cacheRead: number;
|
|
38
|
+
cacheWrite: number;
|
|
39
|
+
reasoning: number;
|
|
40
|
+
total: number;
|
|
41
|
+
costTotal: number;
|
|
42
|
+
costInput: number;
|
|
43
|
+
costOutput: number;
|
|
44
|
+
costCacheRead: number;
|
|
45
|
+
costCacheWrite: number;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
/** A parsed usage entry, before the file's project name is attached. */
|
|
49
|
+
export interface ParsedUsageEntry {
|
|
50
|
+
day: string;
|
|
51
|
+
provider: string;
|
|
52
|
+
model: string;
|
|
53
|
+
usage: OmpUsage;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
/**
|
|
57
|
+
* A cheap reject before `JSON.parse` — the same shape the previous scan used,
|
|
58
|
+
* with a narrower filter.
|
|
59
|
+
*
|
|
60
|
+
* A session file is mostly tool output: on the measured tree, 144 365 of
|
|
61
|
+
* 513 140 lines carry usage. `JSON.stringify` writes the `"usage"` key
|
|
62
|
+
* verbatim, so a line without that literal cannot be a usage record. Testing
|
|
63
|
+
* it first removed 80% of the parses and was measured at 493 ms → 281 ms on
|
|
64
|
+
* the same tree.
|
|
65
|
+
*/
|
|
66
|
+
export function couldCarryUsage(raw: string): boolean {
|
|
67
|
+
return raw.includes('"usage"');
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
/** Parse one line; `null` for a non-usage line, a torn write, or a non-message. */
|
|
71
|
+
export function parseUsageLine(raw: string): ParsedUsageEntry | null {
|
|
72
|
+
if (!couldCarryUsage(raw)) return null;
|
|
73
|
+
const line = raw.trim();
|
|
74
|
+
if (!line) return null;
|
|
75
|
+
let entry: OmpMessageEntry;
|
|
76
|
+
try {
|
|
77
|
+
entry = JSON.parse(line) as OmpMessageEntry;
|
|
78
|
+
} catch {
|
|
79
|
+
// Torn write / prefix-window truncation — the fold tolerates these too.
|
|
80
|
+
return null;
|
|
81
|
+
}
|
|
82
|
+
const usage = entry.message?.usage;
|
|
83
|
+
if (entry.type !== 'message' || !usage) return null;
|
|
84
|
+
return {
|
|
85
|
+
day: dayKeyOfTimestamp(entry.timestamp),
|
|
86
|
+
provider: canonicalProviderSlug(entry.message?.provider || 'unknown') || 'unknown',
|
|
87
|
+
model: entry.message?.model || 'unknown',
|
|
88
|
+
usage,
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
/** Accumulate one entry into a keyed map of rollup rows. */
|
|
93
|
+
export function foldUsage(
|
|
94
|
+
rows: Map<string, UsageRollupRow>,
|
|
95
|
+
project: string,
|
|
96
|
+
entry: ParsedUsageEntry,
|
|
97
|
+
): void {
|
|
98
|
+
const usage = entry.usage;
|
|
99
|
+
const key = [entry.day, entry.provider, entry.model, project].join('\u0000');
|
|
100
|
+
let row = rows.get(key);
|
|
101
|
+
if (!row) {
|
|
102
|
+
row = {
|
|
103
|
+
day: entry.day,
|
|
104
|
+
provider: entry.provider,
|
|
105
|
+
model: entry.model,
|
|
106
|
+
records: 0,
|
|
107
|
+
unpriced: 0,
|
|
108
|
+
input: 0,
|
|
109
|
+
output: 0,
|
|
110
|
+
cacheRead: 0,
|
|
111
|
+
cacheWrite: 0,
|
|
112
|
+
reasoning: 0,
|
|
113
|
+
total: 0,
|
|
114
|
+
costTotal: 0,
|
|
115
|
+
costInput: 0,
|
|
116
|
+
costOutput: 0,
|
|
117
|
+
costCacheRead: 0,
|
|
118
|
+
costCacheWrite: 0,
|
|
119
|
+
};
|
|
120
|
+
rows.set(key, row);
|
|
121
|
+
}
|
|
122
|
+
const input = usage.input ?? 0;
|
|
123
|
+
const output = usage.output ?? 0;
|
|
124
|
+
const cacheRead = usage.cacheRead ?? 0;
|
|
125
|
+
const cacheWrite = usage.cacheWrite ?? 0;
|
|
126
|
+
const costTotal = usage.cost?.total ?? 0;
|
|
127
|
+
row.records++;
|
|
128
|
+
row.input += input;
|
|
129
|
+
row.output += output;
|
|
130
|
+
row.cacheRead += cacheRead;
|
|
131
|
+
row.cacheWrite += cacheWrite;
|
|
132
|
+
row.reasoning += usage.reasoningTokens ?? 0;
|
|
133
|
+
row.total += usage.totalTokens ?? input + output + cacheRead + cacheWrite;
|
|
134
|
+
row.costTotal += costTotal;
|
|
135
|
+
row.costInput += usage.cost?.input ?? 0;
|
|
136
|
+
row.costOutput += usage.cost?.output ?? 0;
|
|
137
|
+
row.costCacheRead += usage.cost?.cacheRead ?? 0;
|
|
138
|
+
row.costCacheWrite += usage.cost?.cacheWrite ?? 0;
|
|
139
|
+
// "Unpriced" is a property of the RECORD: it carried tokens and no
|
|
140
|
+
// provider-reported cost. Counting rows instead would report a whole
|
|
141
|
+
// gateway as priced as soon as one entry had a rate.
|
|
142
|
+
if (costTotal === 0 && input + output + cacheRead + cacheWrite > 0) row.unpriced++;
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
/**
|
|
146
|
+
* Fold a chunk of transcript text into rows.
|
|
147
|
+
*
|
|
148
|
+
* `completeOnly` governs the last line: a caller reading the tail of a file
|
|
149
|
+
* being written must drop a partial line, or the next scan would parse its
|
|
150
|
+
* remainder as a new entry. A whole-file read keeps the last line, because a
|
|
151
|
+
* file whose final newline was never flushed still has one valid entry.
|
|
152
|
+
*/
|
|
153
|
+
export function foldUsageText(
|
|
154
|
+
rows: Map<string, UsageRollupRow>,
|
|
155
|
+
project: string,
|
|
156
|
+
text: string,
|
|
157
|
+
completeOnly = false,
|
|
158
|
+
): void {
|
|
159
|
+
const lines = text.split('\n');
|
|
160
|
+
if (completeOnly) lines.pop();
|
|
161
|
+
for (const raw of lines) {
|
|
162
|
+
const entry = parseUsageLine(raw);
|
|
163
|
+
if (entry) foldUsage(rows, project, entry);
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
/**
|
|
168
|
+
* The byte offset just past the last COMPLETE line of `text`.
|
|
169
|
+
*
|
|
170
|
+
* Only newlines matter: a tail read that stopped mid-line must resume from the
|
|
171
|
+
* line's start, never from its middle (whose bytes would then be parsed as a
|
|
172
|
+
* broken entry and lost forever). Multi-byte UTF-8 is safe because `\n` never
|
|
173
|
+
* appears inside a sequence.
|
|
174
|
+
*/
|
|
175
|
+
export function completeLineOffset(text: string): number {
|
|
176
|
+
const lastNewline = text.lastIndexOf('\n');
|
|
177
|
+
return lastNewline < 0 ? 0 : lastNewline + 1;
|
|
178
|
+
}
|
|
@@ -0,0 +1,248 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Reads the Token Usage index and answers with one payload.
|
|
8
|
+
*
|
|
9
|
+
* All arithmetic lives in SQL over `usage_rollup`, which is why a period change
|
|
10
|
+
* is a few milliseconds instead of a transcript scan: the expensive part
|
|
11
|
+
* (parsing 1 580 MB of session files) happened once, in the indexer, and every
|
|
12
|
+
* request only sums rows.
|
|
13
|
+
*
|
|
14
|
+
* `day = ''` means "the entry carried no usable timestamp". Those rows are
|
|
15
|
+
* included in EVERY window — a missing date is not evidence of age — which is
|
|
16
|
+
* why every predicate is `day = '' OR day BETWEEN …` rather than a bare range.
|
|
17
|
+
*/
|
|
18
|
+
|
|
19
|
+
import { getDb } from '@/server/db.server';
|
|
20
|
+
import { ensureUsageIndex } from '@/server/lib/usage/index-scan.server';
|
|
21
|
+
import { dayRangeLabel, dayWindow, timeRangeOptions } from '@/shared/lib/usage/range';
|
|
22
|
+
import type { TimeRangeType } from '@/shared/types';
|
|
23
|
+
import type {
|
|
24
|
+
TokenUsagePayload,
|
|
25
|
+
UsageCounters,
|
|
26
|
+
UsageDayRow,
|
|
27
|
+
UsageModelRow,
|
|
28
|
+
UsageProjectRow,
|
|
29
|
+
UsageProviderRow,
|
|
30
|
+
UsageTotals,
|
|
31
|
+
} from '@/shared/types';
|
|
32
|
+
import { providerDisplayName } from '@/shared/lib/models/provider/label';
|
|
33
|
+
|
|
34
|
+
/** Columns every rollup aggregation sums, under the names SQL returns. */
|
|
35
|
+
const SUM_COLUMNS = `
|
|
36
|
+
SUM(records) AS records,
|
|
37
|
+
SUM(unpriced) AS unpriced,
|
|
38
|
+
SUM(input) AS inputTokens,
|
|
39
|
+
SUM(output) AS outputTokens,
|
|
40
|
+
SUM(cache_read) AS cacheRead,
|
|
41
|
+
SUM(cache_write) AS cacheWrite,
|
|
42
|
+
SUM(reasoning) AS reasoning,
|
|
43
|
+
SUM(total) AS tokens,
|
|
44
|
+
SUM(cost_total) AS cost,
|
|
45
|
+
SUM(cost_cache_read) AS cacheReadCost`;
|
|
46
|
+
|
|
47
|
+
interface SumRow {
|
|
48
|
+
records: number | null;
|
|
49
|
+
unpriced: number | null;
|
|
50
|
+
inputTokens: number | null;
|
|
51
|
+
outputTokens: number | null;
|
|
52
|
+
cacheRead: number | null;
|
|
53
|
+
cacheWrite: number | null;
|
|
54
|
+
reasoning: number | null;
|
|
55
|
+
tokens: number | null;
|
|
56
|
+
cost: number | null;
|
|
57
|
+
cacheReadCost: number | null;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
interface ModelGroupRow extends SumRow {
|
|
61
|
+
provider: string;
|
|
62
|
+
model: string;
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
interface DayGroupRow extends SumRow {
|
|
66
|
+
day: string;
|
|
67
|
+
provider: string;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
interface ProjectGroupRow extends SumRow {
|
|
71
|
+
project: string;
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
function counters(row: SumRow): Counters {
|
|
75
|
+
return {
|
|
76
|
+
cost: row.cost ?? 0,
|
|
77
|
+
tokens: row.tokens ?? 0,
|
|
78
|
+
input: row.inputTokens ?? 0,
|
|
79
|
+
output: row.outputTokens ?? 0,
|
|
80
|
+
cacheRead: row.cacheRead ?? 0,
|
|
81
|
+
cacheWrite: row.cacheWrite ?? 0,
|
|
82
|
+
reasoning: row.reasoning ?? 0,
|
|
83
|
+
cacheReadCost: row.cacheReadCost ?? 0,
|
|
84
|
+
records: row.records ?? 0,
|
|
85
|
+
unpriced: row.unpriced ?? 0,
|
|
86
|
+
};
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
/**
|
|
90
|
+
* The day predicate for a window: undated rows always count, dated rows only
|
|
91
|
+
* inside the range. `null` (all time) matches everything.
|
|
92
|
+
*/
|
|
93
|
+
function windowClause(window: { from: string; to: string } | null): { sql: string; params: string[] } {
|
|
94
|
+
if (!window) return { sql: '', params: [] };
|
|
95
|
+
return { sql: `WHERE (day = '' OR day BETWEEN ? AND ?)`, params: [window.from, window.to] };
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
/**
|
|
99
|
+
* Build the payload for a period.
|
|
100
|
+
*
|
|
101
|
+
* `wait` is for the first request of a process (nothing on screen yet); every
|
|
102
|
+
* later one answers from whatever the index holds and lets the client poll.
|
|
103
|
+
*/
|
|
104
|
+
export async function buildTokenUsagePayload(options: {
|
|
105
|
+
range?: TimeRangeType;
|
|
106
|
+
customFrom?: string | null;
|
|
107
|
+
customTo?: string | null;
|
|
108
|
+
wait?: boolean;
|
|
109
|
+
force?: boolean;
|
|
110
|
+
now?: number;
|
|
111
|
+
} = {}): Promise<TokenUsagePayload> {
|
|
112
|
+
const now = options.now ?? Date.now();
|
|
113
|
+
const range = options.range ?? '30d';
|
|
114
|
+
const window = dayWindow(range, now, { from: options.customFrom, to: options.customTo });
|
|
115
|
+
|
|
116
|
+
const index = await ensureUsageIndex({ wait: options.wait, force: options.force });
|
|
117
|
+
const db = await getDb();
|
|
118
|
+
const where = windowClause(window);
|
|
119
|
+
|
|
120
|
+
const [totalsRow, modelRows, dayRows, projectRows, activeDayRows] = await Promise.all([
|
|
121
|
+
db.get<SumRow & { activeDays: number }>(
|
|
122
|
+
`SELECT ${SUM_COLUMNS}, COUNT(DISTINCT NULLIF(day, '')) AS activeDays FROM usage_rollup ${where.sql}`,
|
|
123
|
+
where.params,
|
|
124
|
+
),
|
|
125
|
+
db.all<ModelGroupRow>(
|
|
126
|
+
`SELECT provider, model, ${SUM_COLUMNS} FROM usage_rollup ${where.sql} GROUP BY provider, model ORDER BY cost DESC`,
|
|
127
|
+
where.params,
|
|
128
|
+
),
|
|
129
|
+
db.all<DayGroupRow>(
|
|
130
|
+
`SELECT day, provider, ${SUM_COLUMNS} FROM usage_rollup ${where.sql} GROUP BY day, provider ORDER BY day`,
|
|
131
|
+
where.params,
|
|
132
|
+
),
|
|
133
|
+
db.all<ProjectGroupRow>(
|
|
134
|
+
`SELECT project, ${SUM_COLUMNS} FROM usage_rollup ${where.sql} GROUP BY project ORDER BY cost DESC`,
|
|
135
|
+
where.params,
|
|
136
|
+
),
|
|
137
|
+
db.all<{ day: string }>(
|
|
138
|
+
`SELECT DISTINCT day FROM usage_rollup ${where.sql ? `${where.sql} AND` : 'WHERE'} day <> ''`,
|
|
139
|
+
where.params,
|
|
140
|
+
),
|
|
141
|
+
]);
|
|
142
|
+
|
|
143
|
+
const totals: UsageTotals = {
|
|
144
|
+
...counters(totalsRow ?? emptySum()),
|
|
145
|
+
activeDays: new Set(activeDayRows.map((row) => row.day).filter(Boolean)).size,
|
|
146
|
+
};
|
|
147
|
+
|
|
148
|
+
return {
|
|
149
|
+
generatedAt: now,
|
|
150
|
+
index,
|
|
151
|
+
timeRanges: timeRangeOptions(now),
|
|
152
|
+
range,
|
|
153
|
+
periodLabel: window ? dayRangeLabel(window.from, window.to, now) : 'All time',
|
|
154
|
+
totals,
|
|
155
|
+
providers: groupProviders(modelRows),
|
|
156
|
+
days: groupDays(dayRows),
|
|
157
|
+
projects: groupProjects(projectRows),
|
|
158
|
+
};
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
function emptySum(): SumRow {
|
|
162
|
+
return {
|
|
163
|
+
records: 0, unpriced: 0, inputTokens: 0, outputTokens: 0, cacheRead: 0,
|
|
164
|
+
cacheWrite: 0, reasoning: 0, tokens: 0, cost: 0, cacheReadCost: 0,
|
|
165
|
+
};
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
/**
|
|
169
|
+
* Fold the (provider, model) groups into the two-level tree the panel draws.
|
|
170
|
+
*
|
|
171
|
+
* Ordering is by cost at both levels: the first row is the answer to "what is
|
|
172
|
+
* costing me", and a collapsed provider's subtotal must be comparable with the
|
|
173
|
+
* row above it.
|
|
174
|
+
*/
|
|
175
|
+
function groupProviders(rows: ModelGroupRow[]): UsageProviderRow[] {
|
|
176
|
+
const providers = new Map<string, UsageProviderRow>();
|
|
177
|
+
for (const row of rows) {
|
|
178
|
+
let provider = providers.get(row.provider);
|
|
179
|
+
if (!provider) {
|
|
180
|
+
provider = {
|
|
181
|
+
id: row.provider,
|
|
182
|
+
name: providerDisplayName(row.provider),
|
|
183
|
+
models: [],
|
|
184
|
+
cost: 0, tokens: 0, input: 0, output: 0, cacheRead: 0, cacheWrite: 0,
|
|
185
|
+
reasoning: 0, cacheReadCost: 0, records: 0, unpriced: 0,
|
|
186
|
+
};
|
|
187
|
+
providers.set(row.provider, provider);
|
|
188
|
+
}
|
|
189
|
+
const model: UsageModelRow = { model: row.model, ...counters(row) };
|
|
190
|
+
provider.models.push(model);
|
|
191
|
+
addCounters(provider, model);
|
|
192
|
+
}
|
|
193
|
+
for (const provider of providers.values()) provider.models.sort((a, b) => b.cost - a.cost);
|
|
194
|
+
return [...providers.values()].sort((a, b) => b.cost - a.cost);
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
interface Counters {
|
|
198
|
+
cost: number;
|
|
199
|
+
tokens: number;
|
|
200
|
+
input: number;
|
|
201
|
+
output: number;
|
|
202
|
+
cacheRead: number;
|
|
203
|
+
cacheWrite: number;
|
|
204
|
+
reasoning: number;
|
|
205
|
+
cacheReadCost: number;
|
|
206
|
+
records: number;
|
|
207
|
+
unpriced: number;
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
function addCounters(target: UsageCounters, source: Counters): void {
|
|
211
|
+
target.cost += source.cost;
|
|
212
|
+
target.tokens += source.tokens;
|
|
213
|
+
target.input += source.input;
|
|
214
|
+
target.output += source.output;
|
|
215
|
+
target.cacheRead += source.cacheRead;
|
|
216
|
+
target.cacheWrite += source.cacheWrite;
|
|
217
|
+
target.reasoning += source.reasoning;
|
|
218
|
+
target.cacheReadCost += source.cacheReadCost;
|
|
219
|
+
target.records += source.records;
|
|
220
|
+
target.unpriced += source.unpriced;
|
|
221
|
+
}
|
|
222
|
+
|
|
223
|
+
function groupDays(rows: DayGroupRow[]): UsageDayRow[] {
|
|
224
|
+
const days = new Map<string, UsageDayRow & Counters>();
|
|
225
|
+
for (const row of rows) {
|
|
226
|
+
let day = days.get(row.day);
|
|
227
|
+
if (!day) {
|
|
228
|
+
day = {
|
|
229
|
+
day: row.day,
|
|
230
|
+
providers: {},
|
|
231
|
+
cost: 0, tokens: 0, input: 0, output: 0, cacheRead: 0, cacheWrite: 0,
|
|
232
|
+
reasoning: 0, cacheReadCost: 0, records: 0, unpriced: 0,
|
|
233
|
+
};
|
|
234
|
+
days.set(row.day, day);
|
|
235
|
+
}
|
|
236
|
+
const counts = counters(row);
|
|
237
|
+
addCounters(day, counts);
|
|
238
|
+
const split = day.providers[row.provider] ?? { cost: 0, tokens: 0 };
|
|
239
|
+
split.cost += counts.cost;
|
|
240
|
+
split.tokens += counts.tokens;
|
|
241
|
+
day.providers[row.provider] = split;
|
|
242
|
+
}
|
|
243
|
+
return [...days.values()].sort((a, b) => (a.day < b.day ? -1 : a.day > b.day ? 1 : 0));
|
|
244
|
+
}
|
|
245
|
+
|
|
246
|
+
function groupProjects(rows: ProjectGroupRow[]): UsageProjectRow[] {
|
|
247
|
+
return rows.map((row) => ({ project: row.project, ...counters(row) }));
|
|
248
|
+
}
|