From baefeb421953ae5542cf6a186cf97aea1e7e8897 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 21 Nov 2026 13:21:33 +1100 Subject: [PATCH] feat(usage): break usage down by project --- .../src/features/usage/UsageRouteScreen.tsx | 227 ++++++++++++++---- apps/mobile/src/i18n/translations/de.json | 4 +- apps/mobile/src/i18n/translations/en.json | 4 +- apps/mobile/src/i18n/translations/es.json | 4 +- apps/mobile/src/i18n/translations/fr.json | 4 +- apps/mobile/src/i18n/translations/ja.json | 4 +- apps/mobile/src/i18n/translations/ko.json | 4 +- apps/mobile/src/i18n/translations/pt-BR.json | 4 +- apps/mobile/src/i18n/translations/ru.json | 4 +- apps/mobile/src/i18n/translations/sv.json | 4 +- apps/mobile/src/i18n/translations/zh.json | 4 +- .../src/orchestration-v2/ProjectStore.test.ts | 58 +++++ .../src/orchestration-v2/ProjectStore.ts | 60 +++++ apps/server/src/server.ts | 1 + .../src/usage/UsageProjectAttribution.test.ts | 28 +++ .../src/usage/UsageProjectAttribution.ts | 27 +++ apps/server/src/usage/UsageService.test.ts | 66 ++++- apps/server/src/usage/UsageService.ts | 67 +++++- .../server/src/usage/usageAggregation.test.ts | 109 ++++++++- apps/server/src/usage/usageAggregation.ts | 96 +++++++- apps/web/src/components/usage/UsagePage.tsx | 102 +++++++- apps/web/src/i18n/translations/de.json | 2 + apps/web/src/i18n/translations/en.json | 2 + apps/web/src/i18n/translations/es.json | 2 + apps/web/src/i18n/translations/fr.json | 2 + apps/web/src/i18n/translations/ja.json | 2 + apps/web/src/i18n/translations/ko.json | 2 + apps/web/src/i18n/translations/pt-BR.json | 2 + apps/web/src/i18n/translations/ru.json | 2 + apps/web/src/i18n/translations/sv.json | 2 + apps/web/src/i18n/translations/zh.json | 2 + apps/web/src/state/usage.ts | 7 + docs/user/usage.md | 5 +- packages/contracts/src/usage.ts | 29 ++- packages/shared/src/usageMerge.test.ts | 155 +++++++++++- packages/shared/src/usageMerge.ts | 155 +++++++++++- 36 files changed, 1171 insertions(+), 81 deletions(-) create mode 100644 apps/server/src/usage/UsageProjectAttribution.test.ts create mode 100644 apps/server/src/usage/UsageProjectAttribution.ts diff --git a/apps/mobile/src/features/usage/UsageRouteScreen.tsx b/apps/mobile/src/features/usage/UsageRouteScreen.tsx index 48215804ee2d..af725f1623e4 100644 --- a/apps/mobile/src/features/usage/UsageRouteScreen.tsx +++ b/apps/mobile/src/features/usage/UsageRouteScreen.tsx @@ -13,6 +13,7 @@ import { isModelCostUnknown, type DailyTotals, type MergedUsage, + type ProjectTotals, } from "@t3tools/shared/usageMerge"; import { enumerateDays, @@ -50,6 +51,12 @@ import type { UsageChartMetric } from "./usageChartData"; import { PROVIDER_LABEL, useProviderColors, useUsageMixColors } from "./usageProviders"; type UsageView = UsageChartMetric | "limits"; +type UsageBreakdown = "model" | "project"; +const BREAKDOWN_OPTIONS = [ + { value: "model", label: msg("Model") }, + { value: "project", label: msg("Project") }, +] as const satisfies readonly { value: UsageBreakdown; label: string }[]; + const VIEW_OPTIONS = [ { value: "cost", label: msg("Cost", { $context: "usage view tab" }) }, { value: "tokens", label: msg("Tokens", { $context: "usage view tab" }) }, @@ -117,6 +124,7 @@ function UsageScreen(props: { } const { view } = selection; const setView = (view: UsageView) => setSelection({ params: props.tabParam, view }); + const [breakdown, setBreakdown] = useState("model"); const [measuredWidth, setWidth] = useState(0); // A workspace pane knows its width in the render that resizes it; measuring lags a frame. const width = useWorkspaceSettledContentWidth() ?? measuredWidth; @@ -395,7 +403,14 @@ function UsageScreen(props: { columns={width >= 900 ? 6 : wide ? 3 : 2} /> - + 1} + /> )} @@ -838,11 +853,20 @@ function ModelsSection(props: { readonly merged: MergedUsage; readonly metric: UsageChartMetric; readonly columns: 1 | 2; + readonly breakdown: UsageBreakdown; + readonly onBreakdownChange: (value: UsageBreakdown) => void; + readonly showEnvironment: boolean; }) { const { merged, metric } = props; const colors = useProviderColors(); const gt = useGT(); - if (merged.models.length === 0) return null; + const m = useMessages(); + if (merged.models.length === 0 && merged.projects.length === 0) return null; + + const breakdownOptions = BREAKDOWN_OPTIONS.map((option) => ({ + ...option, + label: m(option.label), + })); // Hermes lacks toSorted. const ordered = [...merged.models].sort((a, b) => @@ -852,11 +876,145 @@ function ModelsSection(props: { ); return ( - - - {ordered.map((model, index) => ( + + } + > + {props.breakdown === "project" ? ( + + ) : ( + + {ordered.map((model, index) => ( + = props.columns && "border-t border-border-subtle", + index % props.columns === 1 && "border-l border-border-subtle", + )} + style={{ width: `${100 / props.columns}%` }} + > + + + + {model.model} + + + {metric === "tokens" + ? isModelCostUnknown(model) + ? gt("{share} of tokens · no known rates", { + share: formatPercent(model.tokenShare), + }) + : gt("{share} of tokens · {cost}", { + share: formatPercent(model.tokenShare), + cost: formatUsd(model.costUsd), + }) + : isModelCostUnknown(model) + ? gt("no known rates · {tokens} tokens", { + tokens: formatTokens(model.totalTokens), + }) + : gt("{share} of cost · {tokens} tokens", { + share: formatPercent(model.costShare), + tokens: formatTokens(model.totalTokens), + })} + + + + {metric === "tokens" + ? formatTokens(model.totalTokens) + : isModelCostUnknown(model) + ? gt("Unpriced", { $context: "model with no known price" }) + : formatUsd(model.costUsd)} + + + ))} + + )} + + ); +} + +function ProjectRows(props: { + readonly projects: readonly ProjectTotals[]; + readonly metric: UsageChartMetric; + readonly columns: 1 | 2; + readonly showEnvironment: boolean; +}) { + const { metric } = props; + const gt = useGT(); + // Hermes lacks toSorted. + const ordered = [...props.projects].sort((a, b) => + metric === "cost" + ? b.costUsd - a.costUsd || b.totalTokens - a.totalTokens + : b.totalTokens - a.totalTokens || b.costUsd - a.costUsd, + ); + const peak = + ordered[0] === undefined + ? 0 + : metric === "tokens" + ? ordered[0].totalTokens + : ordered[0].costUsd; + + return ( + + {ordered.map((project, index) => { + const unknown = isModelCostUnknown(project); + const magnitude = metric === "tokens" ? project.totalTokens : project.costUsd; + const label = project.kind === "project" ? project.title : gt("No project"); + const value = + metric === "tokens" + ? formatTokens(project.totalTokens) + : unknown + ? gt("Unpriced", { $context: "model with no known price" }) + : formatUsd(project.costUsd); + const detail = [ + project.kind === "project" && props.showEnvironment ? project.environmentLabel : null, + project.duplicateTitleId !== null + ? gt("ID {id}", { id: project.duplicateTitleId }) + : null, + metric === "tokens" + ? unknown + ? gt("{share} of tokens · no known rates", { + share: formatPercent(project.tokenShare), + }) + : gt("{share} of tokens · {cost}", { + share: formatPercent(project.tokenShare), + cost: formatUsd(project.costUsd), + }) + : unknown + ? gt("no known rates · {tokens} tokens", { + tokens: formatTokens(project.totalTokens), + }) + : gt("{share} of cost · {tokens} tokens", { + share: formatPercent(project.costShare), + tokens: formatTokens(project.totalTokens), + }), + !unknown && project.unpricedRecords > 0 ? gt("Some unpriced") : null, + ] + .filter((part) => part !== null) + .join(" · "); + + return ( = props.columns && "border-t border-border-subtle", @@ -864,45 +1022,32 @@ function ModelsSection(props: { )} style={{ width: `${100 / props.columns}%` }} > - - - {model.model} - - - {metric === "tokens" - ? isModelCostUnknown(model) - ? gt("{share} of tokens · no known rates", { - share: formatPercent(model.tokenShare), - }) - : gt("{share} of tokens · {cost}", { - share: formatPercent(model.tokenShare), - cost: formatUsd(model.costUsd), - }) - : isModelCostUnknown(model) - ? gt("no known rates · {tokens} tokens", { - tokens: formatTokens(model.totalTokens), - }) - : gt("{share} of cost · {tokens} tokens", { - share: formatPercent(model.costShare), - tokens: formatTokens(model.totalTokens), - })} + + {label} + {detail} + {magnitude > 0 && peak > 0 ? ( + + + + ) : null} - - {metric === "tokens" - ? formatTokens(model.totalTokens) - : isModelCostUnknown(model) - ? gt("Unpriced", { $context: "model with no known price" }) - : formatUsd(model.costUsd)} - + {value} - ))} - - + ); + })} + ); } diff --git a/apps/mobile/src/i18n/translations/de.json b/apps/mobile/src/i18n/translations/de.json index 37470078895b..fb9dc92f80b8 100644 --- a/apps/mobile/src/i18n/translations/de.json +++ b/apps/mobile/src/i18n/translations/de.json @@ -5090,10 +5090,12 @@ "c65e6cfd393d8dec": "Nach Typ", "999c1e12be2b0b07": "Nach Geschwindigkeit", "acdde9c11660b3e7": "{cost} Aufpreis", - "52eb4ae22e3de46b": "Nach Modell", + "ef85252c278cb404": "Aufschlüsselung", "0f806caee7d50d39": "{share} der Tokens · keine bekannten Preise", "fa8c94215417c702": "keine bekannten Preise · {tokens} Tokens", "77798cfa0f392e89": "Ohne Preis", + "52d5050fe3b493be": "ID {id}", + "48fb19071dd12d24": "Teilweise ohne Preis", "ab4208cfa3aa2c7c": [ "Einmal gezählt über Umgebungen mit gemeinsamem Transkriptverzeichnis:", " ", diff --git a/apps/mobile/src/i18n/translations/en.json b/apps/mobile/src/i18n/translations/en.json index f89c5bddb7eb..a8f7543c3e9b 100644 --- a/apps/mobile/src/i18n/translations/en.json +++ b/apps/mobile/src/i18n/translations/en.json @@ -5091,10 +5091,12 @@ "c65e6cfd393d8dec": "By type", "999c1e12be2b0b07": "By speed", "acdde9c11660b3e7": "{cost} premium", - "52eb4ae22e3de46b": "By model", + "ef85252c278cb404": "Breakdown", "0f806caee7d50d39": "{share} of tokens · no known rates", "fa8c94215417c702": "no known rates · {tokens} tokens", "77798cfa0f392e89": "Unpriced", + "52d5050fe3b493be": "ID {id}", + "48fb19071dd12d24": "Some unpriced", "ab4208cfa3aa2c7c": [ "Counted once across environments sharing a transcript directory:", " ", diff --git a/apps/mobile/src/i18n/translations/es.json b/apps/mobile/src/i18n/translations/es.json index a0df74614dfd..8785cc26ca6d 100644 --- a/apps/mobile/src/i18n/translations/es.json +++ b/apps/mobile/src/i18n/translations/es.json @@ -5084,10 +5084,12 @@ "c65e6cfd393d8dec": "Por tipo", "999c1e12be2b0b07": "Por velocidad", "acdde9c11660b3e7": "{cost} de recargo", - "52eb4ae22e3de46b": "Por modelo", + "ef85252c278cb404": "Desglose", "0f806caee7d50d39": "{share} de los tokens · sin tarifas conocidas", "fa8c94215417c702": "sin tarifas conocidas · {tokens} tokens", "77798cfa0f392e89": "Sin precio", + "52d5050fe3b493be": "ID {id}", + "48fb19071dd12d24": "Algunos sin precio", "ab4208cfa3aa2c7c": [ "Contado una sola vez entre los entornos que comparten un directorio de transcripciones:", " ", diff --git a/apps/mobile/src/i18n/translations/fr.json b/apps/mobile/src/i18n/translations/fr.json index 9e9d733338af..1f836c095959 100644 --- a/apps/mobile/src/i18n/translations/fr.json +++ b/apps/mobile/src/i18n/translations/fr.json @@ -5084,10 +5084,12 @@ "c65e6cfd393d8dec": "Par type", "999c1e12be2b0b07": "Par vitesse", "acdde9c11660b3e7": "{cost} de supplément", - "52eb4ae22e3de46b": "Par modèle", + "ef85252c278cb404": "Répartition", "0f806caee7d50d39": "{share} des tokens · aucun tarif connu", "fa8c94215417c702": "aucun tarif connu · {tokens} tokens", "77798cfa0f392e89": "Sans prix", + "52d5050fe3b493be": "ID {id}", + "48fb19071dd12d24": "Certains sans prix", "ab4208cfa3aa2c7c": [ "Compté une seule fois pour les environnements qui partagent un répertoire de transcriptions :", " ", diff --git a/apps/mobile/src/i18n/translations/ja.json b/apps/mobile/src/i18n/translations/ja.json index f8c3f391742a..a4f252f9832f 100644 --- a/apps/mobile/src/i18n/translations/ja.json +++ b/apps/mobile/src/i18n/translations/ja.json @@ -5066,10 +5066,12 @@ "c65e6cfd393d8dec": "種類別", "999c1e12be2b0b07": "速度別", "acdde9c11660b3e7": "プレミアム {cost}", - "52eb4ae22e3de46b": "モデル別", + "ef85252c278cb404": "内訳", "0f806caee7d50d39": "トークンの {share} · 単価不明", "fa8c94215417c702": "単価不明 · {tokens} トークン", "77798cfa0f392e89": "価格不明", + "52d5050fe3b493be": "ID {id}", + "48fb19071dd12d24": "一部価格不明", "ab4208cfa3aa2c7c": [ "文字起こしディレクトリを共有する環境間では 1 回だけカウントされます:", " ", diff --git a/apps/mobile/src/i18n/translations/ko.json b/apps/mobile/src/i18n/translations/ko.json index 368b459f45b5..60dfae4f3b0c 100644 --- a/apps/mobile/src/i18n/translations/ko.json +++ b/apps/mobile/src/i18n/translations/ko.json @@ -5070,10 +5070,12 @@ "c65e6cfd393d8dec": "유형별", "999c1e12be2b0b07": "속도별", "acdde9c11660b3e7": "프리미엄 {cost}", - "52eb4ae22e3de46b": "모델별", + "ef85252c278cb404": "분석", "0f806caee7d50d39": "토큰의 {share} · 알려진 요율 없음", "fa8c94215417c702": "알려진 요율 없음 · 토큰 {tokens}개", "77798cfa0f392e89": "가격 없음", + "52d5050fe3b493be": "ID {id}", + "48fb19071dd12d24": "일부 가격 없음", "ab4208cfa3aa2c7c": [ "같은 대화 기록 디렉터리를 공유하는 환경 간에는 한 번만 집계됨:", " ", diff --git a/apps/mobile/src/i18n/translations/pt-BR.json b/apps/mobile/src/i18n/translations/pt-BR.json index 7529fe513885..358221994a7e 100644 --- a/apps/mobile/src/i18n/translations/pt-BR.json +++ b/apps/mobile/src/i18n/translations/pt-BR.json @@ -5084,10 +5084,12 @@ "c65e6cfd393d8dec": "Por tipo", "999c1e12be2b0b07": "Por velocidade", "acdde9c11660b3e7": "{cost} de adicional", - "52eb4ae22e3de46b": "Por modelo", + "ef85252c278cb404": "Detalhamento", "0f806caee7d50d39": "{share} dos tokens · sem taxas conhecidas", "fa8c94215417c702": "sem taxas conhecidas · {tokens} tokens", "77798cfa0f392e89": "Sem preço", + "52d5050fe3b493be": "ID {id}", + "48fb19071dd12d24": "Alguns sem preço", "ab4208cfa3aa2c7c": [ "Contado uma vez entre ambientes que compartilham um diretório de transcrições:", " ", diff --git a/apps/mobile/src/i18n/translations/ru.json b/apps/mobile/src/i18n/translations/ru.json index 976f53ecf6de..477eec02dbbc 100644 --- a/apps/mobile/src/i18n/translations/ru.json +++ b/apps/mobile/src/i18n/translations/ru.json @@ -5163,10 +5163,12 @@ "c65e6cfd393d8dec": "По типу", "999c1e12be2b0b07": "По скорости", "acdde9c11660b3e7": "{cost} премиум", - "52eb4ae22e3de46b": "По модели", + "ef85252c278cb404": "Разбивка", "0f806caee7d50d39": "{share} токенов · цены неизвестны", "fa8c94215417c702": "цены неизвестны · {tokens} токенов", "77798cfa0f392e89": "Без цены", + "52d5050fe3b493be": "ID {id}", + "48fb19071dd12d24": "Часть без цены", "ab4208cfa3aa2c7c": [ "Учитывается один раз для окружений с общей папкой расшифровок:", " ", diff --git a/apps/mobile/src/i18n/translations/sv.json b/apps/mobile/src/i18n/translations/sv.json index 45a259d11d34..859c59253b9d 100644 --- a/apps/mobile/src/i18n/translations/sv.json +++ b/apps/mobile/src/i18n/translations/sv.json @@ -5090,10 +5090,12 @@ "c65e6cfd393d8dec": "Per typ", "999c1e12be2b0b07": "Per hastighet", "acdde9c11660b3e7": "{cost} premium", - "52eb4ae22e3de46b": "Per modell", + "ef85252c278cb404": "Fördelning", "0f806caee7d50d39": "{share} av token · inga kända priser", "fa8c94215417c702": "inga kända priser · {tokens} token", "77798cfa0f392e89": "Utan pris", + "52d5050fe3b493be": "ID {id}", + "48fb19071dd12d24": "Vissa utan pris", "ab4208cfa3aa2c7c": [ "Räknas en gång för miljöer som delar en transkriptkatalog:", " ", diff --git a/apps/mobile/src/i18n/translations/zh.json b/apps/mobile/src/i18n/translations/zh.json index 860ff98a0f10..3fe78c96854a 100644 --- a/apps/mobile/src/i18n/translations/zh.json +++ b/apps/mobile/src/i18n/translations/zh.json @@ -5074,10 +5074,12 @@ "c65e6cfd393d8dec": "按类型", "999c1e12be2b0b07": "按速度", "acdde9c11660b3e7": "{cost} 溢价", - "52eb4ae22e3de46b": "按模型", + "ef85252c278cb404": "明细", "0f806caee7d50d39": "占 token 的 {share} · 无已知费率", "fa8c94215417c702": "无已知费率 · {tokens} token", "77798cfa0f392e89": "未定价", + "52d5050fe3b493be": "ID {id}", + "48fb19071dd12d24": "部分未定价", "ab4208cfa3aa2c7c": [ "在共享同一转写目录的环境间只计一次:", " ", diff --git a/apps/server/src/orchestration-v2/ProjectStore.test.ts b/apps/server/src/orchestration-v2/ProjectStore.test.ts index 322ae0641758..65986c42838c 100644 --- a/apps/server/src/orchestration-v2/ProjectStore.test.ts +++ b/apps/server/src/orchestration-v2/ProjectStore.test.ts @@ -97,6 +97,64 @@ it.layer(ProjectStore.layer.pipe(Layer.provideMerge(SqlitePersistence.layerMemor }), ); + it.effect("lists each provider session with its thread's project", () => + Effect.gen(function* () { + const projects = yield* ProjectStore.ProjectStoreV2; + const sql = yield* SqlClient.SqlClient; + const project = (id: string, title: string) => + sql`INSERT INTO projection_projects (project_id, title, workspace_root, scripts_json, created_at, updated_at) + VALUES (${id}, ${title}, ${`/work/${id}`}, '[]', '2026-08-01', '2026-08-01')`; + const thread = (id: string, projectId: string) => + sql`INSERT INTO orchestration_v2_projection_threads (thread_id, project_id, title, default_provider, runtime_mode, interaction_mode, created_at, updated_at, payload_json) + VALUES (${id}, ${projectId}, ${id}, 'claudeAgent', 'full-access', 'default', '2026-08-01', '2026-08-01', '{}')`; + const binding = (id: string, threadId: string, nativeId: string | null) => + sql`INSERT INTO orchestration_v2_projection_provider_threads (provider_thread_id, thread_id, provider, driver, status, updated_at, payload_json) + VALUES (${id}, ${threadId}, 'claudeAgent', 'claudeAgent', 'idle', '2026-08-01', ${JSON.stringify( + { nativeThreadRef: nativeId === null ? null : { driver: "claudeAgent", nativeId } }, + )})`; + const attempt = ( + id: string, + threadId: string, + providerThreadId: string, + nativeThreadId?: string, + ) => + sql`INSERT INTO orchestration_v2_projection_run_attempts (attempt_id, thread_id, run_id, attempt_ordinal, root_node_id, provider, provider_thread_id, status, payload_json) + VALUES (${id}, ${threadId}, ${id}, 1, ${id}, 'claudeAgent', ${providerThreadId}, 'completed', ${JSON.stringify( + { nativeThreadId }, + )})`; + + yield* project("p-app", "App"); + yield* project("p-other", "Other"); + yield* thread("t-main", "p-app"); + yield* thread("t-worktree", "p-app"); + yield* thread("t-other", "p-other"); + yield* binding("pt-main", "t-main", "bound"); + yield* binding("pt-worktree", "t-worktree", "worktree"); + yield* binding("pt-ambiguous-app", "t-main", "ambiguous"); + yield* binding("pt-ambiguous-other", "t-other", "ambiguous"); + yield* binding("pt-forgotten", "t-worktree", null); + yield* attempt("a-old", "t-main", "pt-main", "before-recovery"); + yield* attempt("a-old-again", "t-main", "pt-main", "before-recovery"); + yield* attempt("a-current", "t-main", "pt-main", "bound"); + yield* attempt("a-forgotten", "t-worktree", "pt-forgotten", "forgotten"); + yield* attempt("a-no-native", "t-main", "pt-main"); + yield* sql`UPDATE projection_projects SET deleted_at = '2026-08-02' WHERE project_id = 'p-app'`; + + const rows = yield* projects.listProviderSessionProjects(); + assert.deepStrictEqual( + rows.map((row) => `${row.nativeId} ${row.projectId} ${row.title}`).sort(), + [ + "ambiguous p-app App", + "ambiguous p-other Other", + "before-recovery p-app App", + "bound p-app App", + "forgotten p-app App", + "worktree p-app App", + ], + ); + }), + ); + it.effect("marks a project's title as custom only once it is renamed", () => Effect.gen(function* () { const projects = yield* ProjectStore.ProjectStoreV2; diff --git a/apps/server/src/orchestration-v2/ProjectStore.ts b/apps/server/src/orchestration-v2/ProjectStore.ts index af39d565109f..1194fe21fefd 100644 --- a/apps/server/src/orchestration-v2/ProjectStore.ts +++ b/apps/server/src/orchestration-v2/ProjectStore.ts @@ -57,6 +57,15 @@ const ProjectDbRow = Schema.Struct({ scripts: Schema.fromJsonString(Schema.Array(ProjectScript)), }); +const ProviderSessionProjectRow = Schema.Struct({ + driver: Schema.String, + nativeId: Schema.String, + projectId: ProjectId, + title: Schema.String, + workspaceRoot: Schema.String, +}); +export type ProviderSessionProjectRow = typeof ProviderSessionProjectRow.Type; + function toShell(row: ProjectRow): OrchestrationProjectShell { return { id: row.projectId, @@ -90,6 +99,11 @@ export class ProjectStoreV2 extends Context.Service< readonly projectIds?: ReadonlyArray; readonly includeDeleted?: boolean; }) => Effect.Effect, ProjectStoreV2Error>; + /** One row per provider session a thread ran, with that thread's project, deleted or not. */ + readonly listProviderSessionProjects: () => Effect.Effect< + ReadonlyArray, + ProjectStoreV2Error + >; /** Workspace roots match by exact string; callers normalize before asking. */ readonly findActiveByWorkspaceRoot: ( workspaceRoot: string, @@ -146,6 +160,44 @@ export const make = Effect.gen(function* () { `, }); + // Recovery reuses provider-thread rows; attempts retain their previous native session ids. + const selectProviderSessionProjects = SqlSchema.findAll({ + Request: Schema.Void, + Result: ProviderSessionProjectRow, + execute: () => sql` + WITH session_bindings AS ( + SELECT + thread_id, + driver, + json_extract(payload_json, '$.nativeThreadRef.nativeId') AS native_id + FROM orchestration_v2_projection_provider_threads + WHERE driver IS NOT NULL + AND json_extract(payload_json, '$.nativeThreadRef.nativeId') IS NOT NULL + UNION + SELECT + attempt.thread_id, + provider_thread.driver, + json_extract(attempt.payload_json, '$.nativeThreadId') AS native_id + FROM orchestration_v2_projection_run_attempts AS attempt + JOIN orchestration_v2_projection_provider_threads AS provider_thread + ON provider_thread.provider_thread_id = attempt.provider_thread_id + WHERE provider_thread.driver IS NOT NULL + AND json_extract(attempt.payload_json, '$.nativeThreadId') IS NOT NULL + ) + SELECT DISTINCT + binding.driver AS "driver", + binding.native_id AS "nativeId", + project.project_id AS "projectId", + project.title AS "title", + project.workspace_root AS "workspaceRoot" + FROM session_bindings AS binding + JOIN orchestration_v2_projection_threads AS thread + ON thread.thread_id = binding.thread_id + JOIN projection_projects AS project + ON project.project_id = thread.project_id + `, + }); + const upsertRow = (row: ProjectRow) => encodeRow(row).pipe( Effect.flatMap( @@ -226,6 +278,13 @@ export const make = Effect.gen(function* () { includeDeleted: options?.includeDeleted === true, }).pipe(NodeSqliteClient.readOnly, mapError("list")); + const listProviderSessionProjects: ProjectStoreV2["Service"]["listProviderSessionProjects"] = + () => + selectProviderSessionProjects(undefined).pipe( + NodeSqliteClient.readOnly, + mapError("listProviderSessionProjects"), + ); + const findActiveByWorkspaceRoot: ProjectStoreV2["Service"]["findActiveByWorkspaceRoot"] = ( workspaceRoot, ) => @@ -293,6 +352,7 @@ export const make = Effect.gen(function* () { apply, get, list, + listProviderSessionProjects, findActiveByWorkspaceRoot, getShell: Effect.fn("ProjectStoreV2.getShell")(function (projectId) { return get(projectId).pipe(Effect.map(Option.map(toShell))); diff --git a/apps/server/src/server.ts b/apps/server/src/server.ts index c838cfc2b787..ef08c71a899a 100644 --- a/apps/server/src/server.ts +++ b/apps/server/src/server.ts @@ -320,6 +320,7 @@ const layerUsage = UsageService.layer.pipe( AntigravityUsage.layer, MuseUsageHome.layer, CodexUsageHistory.layer, + ProjectStore.layer, CursorUsageAccounts.layer.pipe(Layer.provide(CursorAccountReader.layer)), ).pipe(Layer.provide(ProviderHostLive.layer.pipe(Layer.provide(ServerSecretStore.layer)))), ), diff --git a/apps/server/src/usage/UsageProjectAttribution.test.ts b/apps/server/src/usage/UsageProjectAttribution.test.ts new file mode 100644 index 000000000000..da689f105e3f --- /dev/null +++ b/apps/server/src/usage/UsageProjectAttribution.test.ts @@ -0,0 +1,28 @@ +import { ProjectId } from "@t3tools/contracts"; +import { expect, it } from "@effect/vitest"; + +import { projectsBySession, sessionKey } from "./UsageProjectAttribution.ts"; + +it("gives a session to its project unless two projects claim it", () => { + const row = (nativeId: string, project: string) => ({ + driver: "claudeAgent", + nativeId, + projectId: ProjectId.make(project), + title: project === "p-app" ? "App" : "", + workspaceRoot: `/work/${project}`, + }); + const projects = projectsBySession([ + row("bound", "p-app"), + row("bound", "p-app"), + row("untitled", "p-other"), + row("ambiguous", "p-app"), + row("ambiguous", "p-other"), + ]); + + expect(projects.get(sessionKey("claudeAgent", "bound"))).toEqual({ + projectId: "p-app", + title: "App", + }); + expect(projects.get(sessionKey("claudeAgent", "untitled"))?.title).toBe("p-other"); + expect(projects.has(sessionKey("claudeAgent", "ambiguous"))).toBe(false); +}); diff --git a/apps/server/src/usage/UsageProjectAttribution.ts b/apps/server/src/usage/UsageProjectAttribution.ts new file mode 100644 index 000000000000..b38faab5a09b --- /dev/null +++ b/apps/server/src/usage/UsageProjectAttribution.ts @@ -0,0 +1,27 @@ +import type { UsageProject } from "@t3tools/contracts"; +import type { ProviderSessionProjectRow } from "../orchestration-v2/ProjectStore.ts"; + +export const sessionKey = (driver: string, nativeId: string) => `${driver}\u0000${nativeId}`; + +/** Keyed by `sessionKey`. A session claimed by threads in different projects belongs to neither. */ +export function projectsBySession( + rows: ReadonlyArray, +): ReadonlyMap { + const claimed = new Map(); + for (const row of rows) { + const key = sessionKey(row.driver, row.nativeId); + const existing = claimed.get(key); + if (existing !== undefined) { + if (existing?.projectId !== row.projectId) claimed.set(key, null); + continue; + } + const title = + row.title.trim() || + row.workspaceRoot.split(/[\\/]/).findLast((part) => part.length > 0) || + "Untitled project"; + claimed.set(key, { projectId: row.projectId, title }); + } + const projects = new Map(); + for (const [key, project] of claimed) if (project !== null) projects.set(key, project); + return projects; +} diff --git a/apps/server/src/usage/UsageService.test.ts b/apps/server/src/usage/UsageService.test.ts index 0a9b9611eea0..8263c62d2897 100644 --- a/apps/server/src/usage/UsageService.test.ts +++ b/apps/server/src/usage/UsageService.test.ts @@ -16,6 +16,7 @@ import { SpawnExecutableResolution } from "@t3tools/shared/shell"; import { mergeUsage } from "@t3tools/shared/usageMerge"; import { EnvironmentId, + ProjectId, ProviderDriverKind, ProviderInstanceId, UsageDay, @@ -43,6 +44,7 @@ import { HttpClient, HttpClientError, HttpClientRequest, HttpClientResponse } fr import * as ServerConfig from "../config.ts"; import * as ServerSettings from "../serverSettings.ts"; import * as Sqlite from "../persistence/Sqlite.ts"; +import * as ProjectStore from "../orchestration-v2/ProjectStore.ts"; import * as CodexUsageHistory from "./CodexUsageHistory.ts"; import * as CursorAccountReader from "@t3tools/provider-cursor/server/CursorAccountReader"; import * as CursorUsageAccounts from "@t3tools/provider-cursor/server/CursorUsageAccounts"; @@ -201,7 +203,11 @@ const layerService = (input: { Layer.provideMerge(AntigravityUsage.layer), Layer.provideMerge(MuseUsageHome.layer), Layer.provideMerge(ProviderHostLive.layer), - Layer.provideMerge(CodexUsageHistory.layer.pipe(Layer.provideMerge(Sqlite.layerMemory))), + Layer.provideMerge( + Layer.merge(CodexUsageHistory.layer, ProjectStore.layer).pipe( + Layer.provideMerge(Sqlite.layerMemory), + ), + ), Layer.provideMerge(Layer.mock(BackgroundPolicy.BackgroundPolicy)({})), Layer.provideMerge( Layer.mock(ServerSecretStore.ServerSecretStore)({ @@ -1127,7 +1133,23 @@ describe("UsageService", () => { ); }); yield* Effect.gen(function* () { - const service = yield* UsageService.make; + const makeAttributed = UsageService.make.pipe( + Effect.provide( + Layer.mock(ProjectStore.ProjectStoreV2)({ + listProviderSessionProjects: () => + Effect.succeed( + ["parent.jsonl", "fork.jsonl"].map((name) => ({ + driver: "pi", + nativeId: NodePath.join(dir, name), + projectId: ProjectId.make("pi-project"), + title: "Pi project", + workspaceRoot: dir, + })), + ), + }), + ), + ); + const service = yield* makeAttributed; const first = yield* service.readSummary(WINDOW); const pi = first.buckets.filter((bucket) => bucket.provider === "pi"); assert.strictEqual( @@ -1190,9 +1212,45 @@ describe("UsageService", () => { .reduce((total, bucket) => total + bucket.costUsd, 0), 45, ); + assert.ok(grown.projectTotals?.every((row) => row.projectId === "pi-project")); + assert.deepStrictEqual(grown.projects, [ + { projectId: ProjectId.make("pi-project"), title: "Pi project" }, + ]); + yield* Effect.promise(async () => { + for (const name of ["parent.jsonl", "fork.jsonl"]) { + const file = NodePath.join(dir, name); + await NodeFSP.writeFile( + file + ".zst", + NodeZlib.zstdCompressSync(await NodeFSP.readFile(file)), + ); + await NodeFSP.unlink(file); + } + }); + const archived = yield* service.readSummary(WINDOW); + assert.deepStrictEqual(archived.projectTotals, grown.projectTotals); yield* service.awaitPersisted; - const restarted = yield* UsageService.make; - assert.deepStrictEqual((yield* restarted.readSummary(WINDOW)).buckets, grown.buckets); + const restarted = yield* makeAttributed; + const restored = yield* restarted.readSummary(WINDOW); + assert.deepStrictEqual(restored.buckets, grown.buckets); + assert.deepStrictEqual(restored.projectTotals, grown.projectTotals); + // Project-read failures omit the project breakdown while preserving summary totals. + const failingProjects = yield* UsageService.make.pipe( + Effect.provide( + Layer.mock(ProjectStore.ProjectStoreV2)({ + listProviderSessionProjects: () => + Effect.fail( + new ProjectStore.ProjectStoreV2Error({ + operation: "listProviderSessionProjects", + cause: new Error("unavailable"), + }), + ), + }), + ), + ); + const degraded = yield* failingProjects.readSummary(WINDOW); + assert.deepStrictEqual(degraded.buckets, grown.buckets); + assert.strictEqual(degraded.projectTotals, undefined); + assert.strictEqual(degraded.projects, undefined); }).pipe( Effect.scoped, Effect.provide( diff --git a/apps/server/src/usage/UsageService.ts b/apps/server/src/usage/UsageService.ts index 30edc903a580..5c5f580327ac 100644 --- a/apps/server/src/usage/UsageService.ts +++ b/apps/server/src/usage/UsageService.ts @@ -1,8 +1,10 @@ import { + type ProjectId, type ProviderInstanceConfig, ProviderInstanceId, USAGE_CONTRACT_VERSION, type ServerSettings as ServerSettingsValue, + type UsageProject, type UsageProviderKind, type UsageSource, type UsagePricing, @@ -63,6 +65,8 @@ import { type CachedFile, type ScanCache, } from "./usageScanCache.ts"; +import * as ProjectStore from "../orchestration-v2/ProjectStore.ts"; +import { projectsBySession, sessionKey } from "./UsageProjectAttribution.ts"; const LITELLM_RATES_URL = "https://raw.githubusercontent.com/BerriAI/litellm/main/model_prices_and_context_window.json"; @@ -89,6 +93,13 @@ const scanReaders = BUILT_IN_USAGE_DRIVERS.flatMap((driver) => driver.usage?.kind === "scan" ? [{ driver, reader: driver.usage }] : [], ); +// Provider threads key native sessions by driver kind (claudeAgent), not usage provider (claude). +const driverKindByProvider = new Map( + BUILT_IN_USAGE_DRIVERS.flatMap((driver) => + driver.usage === undefined ? [] : [[driver.usage.provider, driver.driverKind] as const], + ), +); + const providerRateModels = new Map( BUILT_IN_USAGE_DRIVERS.flatMap(({ usage }) => usage?.rateModel === undefined ? [] : [[usage.provider, usage.rateModel] as const], @@ -191,6 +202,7 @@ export const make = Effect.gen(function* () { }); const hostname = yield* HostProcess.Hostname; const readerContext = yield* Effect.context(); + const projectStore = yield* ProjectStore.ProjectStoreV2; const fileCache: ScanCache = new Map(); // Reads from concurrent windows can still hold the original record after it is corrected. @@ -906,9 +918,17 @@ export const make = Effect.gen(function* () { ); return { scannedDirs: scanned, fromMemory }; }); - const [{ scannedDirs, fromMemory }] = yield* Effect.all( - [collect, provisional ? Effect.void : ensureRates(false)], - { concurrency: 2 }, + const [{ scannedDirs, fromMemory }, , sessionProjects] = yield* Effect.all( + [ + collect, + provisional ? Effect.void : ensureRates(false), + // Without projects the summary omits its breakdown; totals never depend on it. + projectStore.listProviderSessionProjects().pipe( + Effect.map(projectsBySession), + Effect.catch((error) => Effect.logWarning(error.message).pipe(Effect.as(null))), + ), + ], + { concurrency: 3 }, ); const priceOverrides = createOverrideRateTable(settings.usagePriceOverrides); @@ -1007,6 +1027,23 @@ export const make = Effect.gen(function* () { modelAliases, rateModel: (provider, model) => providerRateModels.get(provider)?.(model), ...(input.modelFilter === undefined ? {} : { modelFilter: input.modelFilter }), + ...(sessionProjects === null + ? {} + : { + attributeProject: (record: UsageRecord, transcriptPath?: string) => { + const driverKind = driverKindByProvider.get(record.provider); + // Pi binds threads to the session file, rather than the header's display id. + const nativeId = + record.provider === "pi" + ? transcriptPath?.replace(/\.jsonl\.zst$/, ".jsonl") + : record.sessionId; + const project = + driverKind === undefined || nativeId === undefined || nativeId.length === 0 + ? undefined + : sessionProjects.get(sessionKey(driverKind, nativeId)); + return project === undefined ? null : project.projectId; + }, + }), }); const windowEndMs = @@ -1103,7 +1140,7 @@ export const make = Effect.gen(function* () { eventOccurrences.set(key, occurrence); usageRecord = { ...record, dedupeKey: key + ":" + occurrence }; } - if (aggregator.add(usageRecord, dir)) { + if (aggregator.add(usageRecord, dir, file.path)) { counted = true; if (record.sessionId.length > 0) sessionIds.add(record.sessionId); } @@ -1168,6 +1205,25 @@ export const make = Effect.gen(function* () { ); const aggregated = aggregator.finish(); + const projectsById = new Map(); + if (sessionProjects !== null) { + for (const project of sessionProjects.values()) { + projectsById.set(project.projectId, project); + } + } + const summaryProjects = + aggregated.projectTotals === undefined + ? undefined + : [ + ...new Set( + aggregated.projectTotals.flatMap((row) => + row.projectId === undefined ? [] : [row.projectId], + ), + ), + ].flatMap((projectId) => { + const project = projectsById.get(projectId); + return project === undefined ? [] : [project]; + }); const readAt = yield* DateTime.now; const finishedAtMs = yield* Clock.currentTimeMillis; @@ -1182,6 +1238,9 @@ export const make = Effect.gen(function* () { pricing: summaryPricing, scanDurationMs: Math.max(0, finishedAtMs - startedAtMs), ...(input.modelFilter === undefined ? {} : { modelFilter: input.modelFilter }), + ...(aggregated.projectTotals === undefined || summaryProjects === undefined + ? {} + : { projectTotals: aggregated.projectTotals, projects: summaryProjects }), } satisfies UsageSummary; return { summary, fromMemory }; }); diff --git a/apps/server/src/usage/usageAggregation.test.ts b/apps/server/src/usage/usageAggregation.test.ts index 58953fbcfafe..0814e029a507 100644 --- a/apps/server/src/usage/usageAggregation.test.ts +++ b/apps/server/src/usage/usageAggregation.test.ts @@ -1,6 +1,8 @@ import { describe, expect, it } from "@effect/vitest"; -import { resolveModelAliases, UsageAggregator } from "./usageAggregation.ts"; +import { ProjectId } from "@t3tools/contracts"; + +import { mergeUsageCopies, resolveModelAliases, UsageAggregator } from "./usageAggregation.ts"; import type { RateTable } from "./usagePricing.ts"; import type { UsageRecord } from "@t3tools/provider-core/server/usage"; @@ -289,6 +291,111 @@ describe("UsageAggregator", () => { expect(result.buckets[0]?.costUsd).toBeCloseTo(0.00925, 9); expect(result.buckets[0]?.unpricedRecords).toBe(0); }); + + it("totals each project per source from only the records that count", () => { + const aggregator = new UsageAggregator({ + timeZone: "UTC", + sinceDay: "2026-08-01", + untilDay: "2026-08-31", + rates, + modelFilter: { exclude: [{ model: "claude-opus-5" }] }, + attributeProject: (item, transcriptPath) => + (item.sessionId === "session-a" && transcriptPath === "/first.jsonl") || + (item.sessionId === "session-b" && transcriptPath === "/other.jsonl") + ? ProjectId.make("p1") + : null, + }); + const partial = record({ + dedupeKey: "msg_1:", + totals: { ...record().totals, outputTokens: 3 }, + }); + const complete = record({ + dedupeKey: "msg_1:", + sessionId: "session-b", + totals: { ...record().totals, outputTokens: 264 }, + }); + aggregator.add(partial, "/claude", "/first.jsonl"); + aggregator.add(complete, "/fork", "/other.jsonl"); + aggregator.add( + record({ timestampMs: Date.parse("2026-07-01T00:00:00Z") }), + "/claude", + "/first.jsonl", + ); + aggregator.add(record({ model: "claude-opus-5" }), "/claude", "/first.jsonl"); + aggregator.add(record({ sessionId: "session-b", model: "kimi-k3" }), "/claude"); + const later = record({ timestampMs: Date.parse("2026-08-09T00:00:00Z") }); + aggregator.add(later, "/claude", "/first.jsonl"); + const result = aggregator.finish(); + const merged = mergeUsageCopies(partial, complete); + const projectCost = aggregate([merged, later]).buckets.reduce( + (sum, bucket) => sum + bucket.costUsd, + 0, + ); + + expect(result.projectTotals).toEqual([ + { + projectId: "p1", + provider: "claude", + sourcePath: "/claude", + totals: { + uncachedInputTokens: 200, + cachedInputTokens: 2000, + cacheCreationTokens: 20, + outputTokens: 314, + reasoningTokens: 0, + }, + costUsd: expect.closeTo(projectCost, 9), + records: 2, + unpricedRecords: 0, + }, + { + provider: "claude", + sourcePath: "/claude", + totals: expect.objectContaining({ outputTokens: 50 }), + costUsd: 0, + records: 1, + unpricedRecords: 1, + }, + ]); + const bucketCost = result.buckets.reduce((sum, bucket) => sum + bucket.costUsd, 0); + expect(bucketCost).toBeCloseTo(projectCost, 9); + expect(aggregate([record()]).projectTotals).toBeUndefined(); + + for (const copyProject of ["p1", "p2", null]) { + for (const copies of [ + [partial, complete, partial], + [complete, partial, complete], + ]) { + const copied = new UsageAggregator({ + timeZone: "UTC", + sinceDay: "2026-08-01", + untilDay: "2026-08-31", + rates, + attributeProject: (item) => + item.sessionId === "session-a" + ? ProjectId.make("p1") + : copyProject === null + ? null + : ProjectId.make(copyProject), + }); + for (const copy of copies) copied.add(copy, "/claude"); + const copiedResult = copied.finish(); + expect(copiedResult.projectTotals).toEqual([ + { + ...(copyProject === "p1" ? { projectId: "p1" } : {}), + provider: "claude", + sourcePath: "/claude", + totals: merged.totals, + costUsd: expect.closeTo(copiedResult.buckets[0]!.costUsd, 9), + records: 1, + unpricedRecords: 0, + }, + ]); + expect(copiedResult.buckets[0]!.totals).toEqual(merged.totals); + expect(copiedResult.duplicatesDropped).toBe(2); + } + } + }); }); describe("resolveModelAliases", () => { diff --git a/apps/server/src/usage/usageAggregation.ts b/apps/server/src/usage/usageAggregation.ts index f4c39753548f..6d6feca1376f 100644 --- a/apps/server/src/usage/usageAggregation.ts +++ b/apps/server/src/usage/usageAggregation.ts @@ -1,10 +1,12 @@ // @effect-diagnostics globalDate:off import type { + ProjectId, UsageBucket, UsageCategoryCost, UsageDay, UsageModelFilter, UsageModelSelector, + UsageProjectTotals, UsageResolution, UsageTokenTotals, } from "@t3tools/contracts"; @@ -63,6 +65,16 @@ interface MutableBucket { sessions: Set; } +interface MutableProjectTotals { + projectId: ProjectId | null; + provider: UsageProjectTotals["provider"]; + sourcePath: string; + totals: MutableBucket["totals"]; + costUsd: number; + records: number; + unpricedRecords: number; +} + export interface AggregateOptions { readonly timeZone: string; readonly sinceDay: string; @@ -75,6 +87,8 @@ export interface AggregateOptions { readonly resolution?: UsageResolution; readonly sinceTimeMs?: number; readonly untilTimeMs?: number; + /** When present, counted records also total per project; null means no T3 project claims it. */ + readonly attributeProject?: (record: UsageRecord, transcriptPath?: string) => ProjectId | null; } export function resolveModelAliases( @@ -138,6 +152,7 @@ export function canonicalModelFilter( export interface AggregateResult { readonly buckets: readonly UsageBucket[]; + readonly projectTotals?: readonly UsageProjectTotals[]; readonly duplicatesDropped: number; readonly outOfWindow: number; } @@ -210,11 +225,13 @@ interface Contribution { record: UsageRecord; /** Null when the first copy fell outside the window. */ readonly bucket: MutableBucket | null; + project: MutableProjectTotals | null; } /** Deduplicates across the whole scan; Claude copies records into resumed/forked transcripts. */ export class UsageAggregator { readonly #buckets = new Map(); + readonly #projects = new Map(); readonly #seen = new Map(); readonly #toDay: (timestampMs: number) => string; readonly #hourlyWindow: { readonly sinceTimeMs: number; readonly untilTimeMs: number } | null; @@ -246,7 +263,7 @@ export class UsageAggregator { } } - add(input: UsageRecord, sourcePath?: string): boolean { + add(input: UsageRecord, sourcePath?: string, transcriptPath?: string): boolean { if (!keepsUsageRecord(this.#options.modelFilter, input)) return false; const record = this.#mapModel(input); if (record.dedupeKey !== null) { @@ -258,19 +275,32 @@ export class UsageAggregator { record.provider === "grok" ? smallestGrokCopy(held.record, record) : mergeUsageCopies(held.record, record); + if ( + held.project !== null && + held.project.projectId !== null && + held.project.projectId !== this.#options.attributeProject?.(record, transcriptPath) + ) { + held.project = this.#projectFor(held.record, held.project.sourcePath, null); + } } return false; } } - const bucket = this.#placeInWindow(record, sourcePath ?? ""); - if (record.dedupeKey !== null) this.#seen.set(record.dedupeKey, { record, bucket }); + const source = sourcePath ?? ""; + const bucket = this.#placeInWindow(record, source); + const attribute = this.#options.attributeProject; + const project = + bucket === null || attribute === undefined + ? null + : this.#projectFor(record, source, attribute(record, transcriptPath)); + if (record.dedupeKey !== null) this.#seen.set(record.dedupeKey, { record, bucket, project }); if (bucket === null) { this.#outOfWindow += 1; return false; } // Keyed usage is counted in finish(), once all its copies are merged. - if (record.dedupeKey === null) this.#accumulate(bucket, record); + if (record.dedupeKey === null) this.#accumulate(bucket, project, record); if (record.sessionId.length > 0) bucket.sessions.add(record.sessionId); return true; } @@ -299,7 +329,33 @@ export class UsageAggregator { return this.#bucketFor(day, hourIndex, record.provider, record.model, source); } - #accumulate(bucket: MutableBucket, record: UsageRecord): void { + #projectFor( + record: UsageRecord, + source: string, + projectId: ProjectId | null, + ): MutableProjectTotals { + const key = `${projectId ?? ""}\u0000${record.provider}\u0000${source}`; + let project = this.#projects.get(key); + if (project === undefined) { + project = { + projectId, + provider: record.provider, + sourcePath: source, + totals: { ...EMPTY_TOTALS }, + costUsd: 0, + records: 0, + unpricedRecords: 0, + }; + this.#projects.set(key, project); + } + return project; + } + + #accumulate( + bucket: MutableBucket, + project: MutableProjectTotals | null, + record: UsageRecord, + ): void { const priced = priceUsage(this.#options.rates, record, this.#options.priceOverrides); const totals = bucket.totals; @@ -340,6 +396,16 @@ export class UsageAggregator { record.totals.outputTokens; } if (priced.costSource === "providerReported") bucket.providerReportedRecords += 1; + if (project !== null) { + project.totals.uncachedInputTokens += record.totals.uncachedInputTokens; + project.totals.cachedInputTokens += record.totals.cachedInputTokens; + project.totals.cacheCreationTokens += record.totals.cacheCreationTokens; + project.totals.outputTokens += record.totals.outputTokens; + project.totals.reasoningTokens += record.totals.reasoningTokens; + project.costUsd += priced.costUsd; + project.records += 1; + if (priced.costSource === "unpriced") project.unpricedRecords += 1; + } } // Aliases use the target's rate. Only an unpriced target goes through the provider's own rate naming. @@ -400,8 +466,8 @@ export class UsageAggregator { } finish(): AggregateResult { - for (const { record, bucket } of this.#seen.values()) { - if (bucket !== null) this.#accumulate(bucket, record); + for (const { record, bucket, project } of this.#seen.values()) { + if (bucket !== null) this.#accumulate(bucket, project, record); } this.#seen.clear(); const buckets: UsageBucket[] = []; @@ -449,8 +515,24 @@ export class UsageAggregator { a.model.localeCompare(b.model), ); + const projectTotals = + this.#options.attributeProject === undefined + ? undefined + : [...this.#projects.values()] + .filter((project) => project.records > 0) + .map((project): UsageProjectTotals => ({ + ...(project.projectId === null ? {} : { projectId: project.projectId }), + provider: project.provider, + ...(project.sourcePath === "" ? {} : { sourcePath: project.sourcePath }), + totals: { ...project.totals }, + costUsd: project.costUsd, + records: project.records, + unpricedRecords: project.unpricedRecords, + })); + return { buckets, + ...(projectTotals === undefined ? {} : { projectTotals }), duplicatesDropped: this.#duplicatesDropped, outOfWindow: this.#outOfWindow, }; diff --git a/apps/web/src/components/usage/UsagePage.tsx b/apps/web/src/components/usage/UsagePage.tsx index adb05afb92eb..85d6de1b1f49 100644 --- a/apps/web/src/components/usage/UsagePage.tsx +++ b/apps/web/src/components/usage/UsagePage.tsx @@ -631,7 +631,7 @@ function UsageOverview({ const gt = useGT(); const locale = useLocale(); const m = useMessages(); - const [breakdown, setBreakdown] = useState<"model" | "time">("model"); + const [breakdown, setBreakdown] = useState<"model" | "project" | "time">("model"); const shownHourly = shownWindow.resolution === "hour"; const loading = usageLoading(showingKept, selectedEnvironments, refreshingUsage, hiddenProviders); // Copy the primitive; JSX reads of loading.partial would merge all derivations into one compiler cache @@ -669,6 +669,14 @@ function UsageOverview({ (peak, model) => Math.max(peak, metric === "tokens" ? model.totalTokens : model.costUsd), 0, ); + const breakdownProjects = + breakdown === "project" && metric === "tokens" + ? merged.projects.toSorted((a, b) => b.totalTokens - a.totalTokens || b.costUsd - a.costUsd) + : merged.projects; + const projectPeak = breakdownProjects.reduce( + (peak, project) => Math.max(peak, metric === "tokens" ? project.totalTokens : project.costUsd), + 0, + ); const rankedProviders = rankProvidersByMetric(activeProviders, merged.providers, metric); return ( @@ -900,12 +908,15 @@ function UsageOverview({ value={[breakdown]} onValueChange={(next) => { const value = next[0]; - if (value === "model" || value === "time") setBreakdown(value); + if (value === "model" || value === "project" || value === "time") { + setBreakdown(value); + } }} > {( [ { value: "model", label: gt("Model") }, + { value: "project", label: gt("Project") }, { value: "time", label: shownHourly ? gt("Hour") : gt("Day") }, ] as const ).map((option) => ( @@ -1000,6 +1011,93 @@ function UsageOverview({ )} + ) : breakdown === "project" ? ( + + + + + + + + + + + + {breakdownProjects.length === 0 ? ( + + + + ) : ( + breakdownProjects.map((project, index) => { + const value = metric === "tokens" ? project.totalTokens : project.costUsd; + const costUnknown = isModelCostUnknown(project); + return ( + + + + + + + + ); + }) + )} + +
# + Project + + Cost + + Share + + Tokens +
+ No activity in this window. +
{index + 1} + + {project.kind === "project" ? project.title : gt("No project")} + + {project.kind === "project" && selectedEnvironments.length > 1 ? ( + {project.environmentLabel} + ) : null} + {project.duplicateTitleId !== null ? ( + + {gt("ID {id}", { id: project.duplicateTitleId })} + + ) : null} + {value > 0 && projectPeak > 0 ? ( +
+
+
+ ) : null} +
+ {costUnknown ? ( + + Unpriced + + ) : ( + <> + {formatUsd(project.costUsd, locale)} + {project.unpricedRecords > 0 ? ( + + Some unpriced + + ) : null} + + )} + + {metric === "tokens" + ? formatPercent(project.tokenShare) + : costUnknown + ? "" + : formatPercent(project.costShare)} + {formatTokens(project.totalTokens)}
) : (
!hiddenProviders.has(source.fingerprint.provider), ), + ...(environment.summary.projectTotals === undefined + ? {} + : { + projectTotals: environment.summary.projectTotals.filter( + (row) => !hiddenProviders.has(row.provider), + ), + }), }, }, ); diff --git a/docs/user/usage.md b/docs/user/usage.md index 43f4c94a1932..b62af3f92b91 100644 --- a/docs/user/usage.md +++ b/docs/user/usage.md @@ -13,7 +13,10 @@ from your connected environments. It shows token use, cache savings, model break cost, split by token type and by speed. These estimates are not your subscription bill. **Premium** is what Fast and Ultrafast requests cost above standard rates. Cost that cannot be split, such as a provider-reported cost for a model without public rates, shows as **Other**. -Select a model under **Breakdown** to see its trend, cache hit rate, and cost per million tokens. +On web and desktop, select a model under **Breakdown** to see its trend, cache hit rate, and cost +per million tokens. Choose **Project** under **Breakdown** to split usage by the T3 project whose +thread ran it, including its worktrees; usage that T3 cannot tie to a single project (sessions run +outside T3, or a server that does not report projects yet) is listed as **No project**. Totals depend on the history available on each server. Grok turns without a saved completed-turn record are missing from the totals. diff --git a/packages/contracts/src/usage.ts b/packages/contracts/src/usage.ts index 427d6c93af5c..c6a66e4c3294 100644 --- a/packages/contracts/src/usage.ts +++ b/packages/contracts/src/usage.ts @@ -1,6 +1,11 @@ import * as Schema from "effect/Schema"; -import { ForwardCompatibleArray, NonNegativeInt, TrimmedNonEmptyString } from "./baseSchemas.ts"; +import { + ForwardCompatibleArray, + NonNegativeInt, + ProjectId, + TrimmedNonEmptyString, +} from "./baseSchemas.ts"; /** Bump for incompatible UsageSummary changes; skipped unknown array variants need no bump. */ export const USAGE_CONTRACT_VERSION = 6 as const; @@ -72,6 +77,25 @@ export const UsageBucket = Schema.Struct({ }); export type UsageBucket = typeof UsageBucket.Type; +/** Window-wide usage of one project in one source; buckets stay unsplit so older clients merge unchanged. */ +export const UsageProjectTotals = Schema.Struct({ + /** Environment-local; absent for usage no T3 thread claims, such as terminal sessions. */ + projectId: Schema.optional(ProjectId), + provider: UsageProviderKind, + sourcePath: Schema.optional(TrimmedNonEmptyString), + totals: UsageTokenTotals, + costUsd: Schema.Number, + records: NonNegativeInt, + unpricedRecords: NonNegativeInt, +}); +export type UsageProjectTotals = typeof UsageProjectTotals.Type; + +export const UsageProject = Schema.Struct({ + projectId: ProjectId, + title: TrimmedNonEmptyString, +}); +export type UsageProject = typeof UsageProject.Type; + export const UsageSourceFingerprint = Schema.Struct({ hostId: TrimmedNonEmptyString, provider: UsageProviderKind, @@ -160,6 +184,9 @@ export const UsageSummary = Schema.Struct({ scanDurationMs: NonNegativeInt, /** The filter the server applied; absent means unfiltered, including servers that predate filters. */ modelFilter: Schema.optional(UsageModelFilter), + /** Absent when the server predates projects or could not read them; totals are unaffected. */ + projectTotals: Schema.optional(ForwardCompatibleArray(UsageProjectTotals)), + projects: Schema.optional(ForwardCompatibleArray(UsageProject)), }); export type UsageSummary = typeof UsageSummary.Type; diff --git a/packages/shared/src/usageMerge.test.ts b/packages/shared/src/usageMerge.test.ts index b2d05ecbbf57..e58edcf78747 100644 --- a/packages/shared/src/usageMerge.test.ts +++ b/packages/shared/src/usageMerge.test.ts @@ -2,6 +2,7 @@ import { USAGE_CONTRACT_VERSION, USAGE_MERGE_COMPATIBLE_SINCE, type EnvironmentId, + type ProjectId, type UsageBucket, type UsageDay, type UsageProviderKind, @@ -77,8 +78,8 @@ function summary( }; } -function environment(id: string, usageSummary: UsageSummary): EnvironmentUsage { - return { environmentId: id as EnvironmentId, label: id, summary: usageSummary }; +function environment(id: string, usageSummary: UsageSummary, label = id): EnvironmentUsage { + return { environmentId: id as EnvironmentId, label, summary: usageSummary }; } describe("mergeUsage", () => { @@ -134,6 +135,156 @@ describe("mergeUsage", () => { expect(merged.contributingEnvironments).toEqual(["env-a"]); }); + it("totals projects per environment from owned sources only", () => { + const shared = { provider: "claude" as const, hostId: "mac", homePath: "/claude" }; + const codex = { provider: "codex" as const, hostId: "mac", homePath: "/codex" }; + const halfTotals = { + uncachedInputTokens: 50, + cachedInputTokens: 500, + cacheCreationTokens: 5, + outputTokens: 25, + reasoningTokens: 0, + }; + const projectRow = ( + provider: UsageProviderKind, + sourcePath: string, + costUsd: number, + projectId?: string, + totals = halfTotals, + ) => ({ + ...(projectId === undefined ? {} : { projectId: projectId as ProjectId }), + provider, + sourcePath, + totals, + costUsd, + records: 1, + unpricedRecords: 0, + }); + const withProjects = ( + usageSummary: UsageSummary, + projectTotals: UsageSummary["projectTotals"], + projects: UsageSummary["projects"] = [{ projectId: "p1" as ProjectId, title: "App" }], + ): UsageSummary => ({ + ...usageSummary, + projectTotals, + projects, + }); + const merged = mergeUsage( + [ + environment( + "env-a", + withProjects(summary([bucket({ sourcePath: "/claude", costUsd: 10 })], [shared]), [ + projectRow("claude", "/claude", 6, "p1"), + projectRow("claude", "/claude", 4), + ]), + "MacBook", + ), + // Its shared Claude copy is env-a's; only its own Codex usage counts here. + environment( + "env-b", + withProjects( + summary( + [ + bucket({ sourcePath: "/claude", costUsd: 10 }), + bucket({ provider: "codex", sourcePath: "/codex", costUsd: 5 }), + ], + [shared, codex], + ), + [ + projectRow("claude", "/claude", 10, "p1", bucket().totals), + projectRow("codex", "/codex", 3, "p1"), + projectRow("codex", "/codex", 2, "p2"), + ], + [ + { projectId: "p1" as ProjectId, title: "App" }, + { projectId: "p2" as ProjectId, title: "App" }, + ], + ), + "MacBook", + ), + // Older servers without projectTotals land in No project so totals still reconcile. + environment( + "env-legacy", + summary( + [bucket({ provider: "grok", sourcePath: "/grok", costUsd: 7 })], + [{ provider: "grok" as const, hostId: "legacy", homePath: "/grok" }], + ), + "Linux", + ), + ], + USAGE_CONTRACT_VERSION, + ); + + expect(merged.costUsd).toBe(22); + expect(merged.projects.reduce((sum, project) => sum + project.costUsd, 0)).toBe(merged.costUsd); + expect(merged.projects.reduce((sum, project) => sum + project.totalTokens, 0)).toBe( + merged.totalTokens, + ); + expect( + merged.projects.map((project) => + project.kind === "none" + ? ["none", project.costUsd] + : [project.environmentLabel, project.title, project.duplicateTitleId, project.costUsd], + ), + ).toEqual([ + ["none", 11], + ["MacBook · env-a", "App", null, 6], + ["MacBook · env-b", "App", "p1", 3], + ["MacBook · env-b", "App", "p2", 2], + ]); + }); + + it("puts supplemental buckets from a newer partial scan into No project", () => { + const shared = { provider: "claude" as const, hostId: "mac", homePath: "/claude" }; + const day1 = bucket({ day: "2026-08-06" as UsageDay, sourcePath: "/claude", costUsd: 10 }); + const day2 = bucket({ day: "2026-08-07" as UsageDay, sourcePath: "/claude", costUsd: 5 }); + const partialBase = summary([day1, day2], [shared]); + const merged = mergeUsage( + [ + environment("env-a", { + ...summary([day1], [shared]), + readAt: "2026-08-07T00:00:00.000Z", + projectTotals: [ + { + projectId: "p1" as ProjectId, + provider: "claude", + sourcePath: "/claude", + totals: day1.totals, + costUsd: 10, + records: day1.records, + unpricedRecords: 0, + }, + ], + projects: [{ projectId: "p1" as ProjectId, title: "App" }], + }), + environment("env-b", { + ...partialBase, + readAt: "2026-08-07T01:00:00.000Z", + sources: partialBase.sources.map((source) => ({ ...source, status: "partial" as const })), + projectTotals: [ + { + projectId: "p2" as ProjectId, + provider: "claude", + sourcePath: "/claude", + totals: day2.totals, + costUsd: 5, + records: day2.records, + unpricedRecords: 0, + }, + ], + projects: [{ projectId: "p2" as ProjectId, title: "Other" }], + }), + ], + USAGE_CONTRACT_VERSION, + ); + + expect(merged.costUsd).toBe(15); + expect(merged.projects.map((p) => [p.kind === "none" ? "none" : p.title, p.costUsd])).toEqual([ + ["App", 10], + ["none", 5], + ]); + }); + it("drops only the duplicated provider, keeping the environment's other one", () => { const sharedClaude = { provider: "claude" as const, diff --git a/packages/shared/src/usageMerge.ts b/packages/shared/src/usageMerge.ts index ce6119692883..892c061c5ac5 100644 --- a/packages/shared/src/usageMerge.ts +++ b/packages/shared/src/usageMerge.ts @@ -1,6 +1,7 @@ import { USAGE_MERGE_COMPATIBLE_SINCE, type EnvironmentId, + type ProjectId, type UsageBucket, type UsageProviderKind, type UsageSource, @@ -39,10 +40,35 @@ export interface ModelTotals { } /** When every record lacks rates, costUsd is unknown and must not be displayed as a dollar figure. */ -export function isModelCostUnknown(model: ModelTotals): boolean { +export function isModelCostUnknown( + model: Pick, +): boolean { return model.records > 0 && model.unpricedRecords >= model.records; } +/** Project ids are environment-local; "none" holds usage that T3 cannot tie to one project. */ +type ProjectIdentity = + | { + readonly kind: "project"; + readonly environmentId: EnvironmentId; + readonly environmentLabel: string; + readonly projectId: ProjectId; + readonly title: string; + } + | { readonly kind: "none" }; + +export type ProjectTotals = ProjectIdentity & { + readonly key: string; + /** Shortest id prefix that tells this project from same-titled ones in its environment. */ + readonly duplicateTitleId: string | null; + readonly costUsd: number; + readonly totalTokens: number; + readonly records: number; + readonly unpricedRecords: number; + readonly costShare: number; + readonly tokenShare: number; +}; + export interface DailyTotals { readonly day: string; readonly costUsd: number; @@ -98,6 +124,7 @@ export interface MergedUsage { readonly sessions: number; readonly providers: readonly ProviderTotals[]; readonly models: readonly ModelTotals[]; + readonly projects: readonly ProjectTotals[]; readonly daily: readonly DailyTotals[]; readonly hourly: readonly HourlyTotals[]; readonly costQuality: CostQuality; @@ -253,6 +280,7 @@ function ownedContribution( sourceKey: (fingerprint: UsageSourceFingerprint) => string, ): { readonly buckets: readonly UsageBucket[]; + readonly owns: (entry: Pick) => boolean; readonly sessionsByProvider: ReadonlyMap; } { const ownedProviders = new Set(); @@ -275,19 +303,20 @@ function ownedContribution( ); } } + const owns = (entry: Pick) => + entry.sourcePath === undefined + ? ownedProviders.has(entry.provider) + : ownedSources.has(`${entry.provider}\u0000${entry.sourcePath}`); return { buckets: environment.summary.buckets.filter( - (bucket) => - supplementalBuckets.has(bucket) || - (bucket.sourcePath === undefined - ? ownedProviders.has(bucket.provider) - : ownedSources.has(`${bucket.provider}\u0000${bucket.sourcePath}`)), + (bucket) => supplementalBuckets.has(bucket) || owns(bucket), ), + owns, sessionsByProvider, }; } -function bucketTokens(bucket: UsageBucket): number { +function bucketTokens(bucket: Pick): number { // reasoningTokens is a subset of outputTokens and must not be added again. return ( bucket.totals.uncachedInputTokens + @@ -313,6 +342,7 @@ const EMPTY_MERGED: MergedUsage = { sessions: 0, providers: [], models: [], + projects: [], daily: [], hourly: [], costQuality: { @@ -328,6 +358,17 @@ const EMPTY_MERGED: MergedUsage = { contractMismatches: [], }; +function distinctIdPrefix(id: string, peers: readonly string[]): string { + let length = Math.min(8, id.length); + while ( + length < id.length && + peers.some((peer) => peer !== id && peer.startsWith(id.slice(0, length))) + ) { + length += 1; + } + return id.slice(0, length); +} + export function mergeUsage( environments: readonly EnvironmentUsage[], expectedContractVersion: number, @@ -409,10 +450,46 @@ export function mergeUsage( byProvider: Map; } >(); + const projectAccumulator = new Map< + string, + { + readonly identity: ProjectIdentity; + costUsd: number; + totalTokens: number; + records: number; + unpricedRecords: number; + } + >(); + const addProjectUsage = ( + key: string, + identity: ProjectIdentity, + usage: Pick, + ) => { + const project = projectAccumulator.get(key) ?? { + identity, + costUsd: 0, + totalTokens: 0, + records: 0, + unpricedRecords: 0, + }; + project.costUsd += usage.costUsd; + project.totalTokens += bucketTokens(usage); + project.records += usage.records; + project.unpricedRecords += usage.unpricedRecords; + projectAccumulator.set(key, project); + }; + const noProjectKey = "none"; + const noProjectIdentity = { kind: "none" } as const; + const idsByLabel = new Map(); + for (const { environmentId, label } of current) { + const ids = idsByLabel.get(label) ?? []; + ids.push(environmentId); + idsByLabel.set(label, ids); + } const contributingEnvironments: EnvironmentId[] = []; for (const environment of current) { - const { buckets, sessionsByProvider } = ownedContribution( + const { buckets, owns, sessionsByProvider } = ownedContribution( environment, ownerScanByFingerprint, supplementalBucketsByEnvironment.get(environment.environmentId) ?? new Set(), @@ -421,6 +498,40 @@ export function mergeUsage( ); if (buckets.length > 0) contributingEnvironments.push(environment.environmentId); + const labelPeers = idsByLabel.get(environment.label) ?? []; + const environmentLabel = + labelPeers.length > 1 + ? `${environment.label} · ${distinctIdPrefix(environment.environmentId, labelPeers)}` + : environment.label; + const { projectTotals, projects = [] } = environment.summary; + if (projectTotals === undefined) { + for (const bucket of buckets) addProjectUsage(noProjectKey, noProjectIdentity, bucket); + } else { + // Window-wide project totals cannot attribute cells retained from another scan. + for (const bucket of buckets) { + if (!owns(bucket)) addProjectUsage(noProjectKey, noProjectIdentity, bucket); + } + const titles = new Map(projects.map((project) => [project.projectId, project.title])); + for (const row of projectTotals) { + if (!owns(row)) continue; + if (row.projectId === undefined) { + addProjectUsage(noProjectKey, noProjectIdentity, row); + continue; + } + addProjectUsage( + JSON.stringify([environment.environmentId, row.projectId]), + { + kind: "project", + environmentId: environment.environmentId, + environmentLabel, + projectId: row.projectId, + title: titles.get(row.projectId) ?? row.projectId, + }, + row, + ); + } + } + for (const [providerKind, providerSessions] of sessionsByProvider) { sessions += providerSessions; if (providerSessions === 0) continue; @@ -566,6 +677,33 @@ export function mergeUsage( })) .sort((a, b) => b.costUsd - a.costUsd || b.totalTokens - a.totalTokens); + const projectIdsByTitle = new Map(); + const titleKey = (identity: ProjectIdentity & { readonly kind: "project" }) => + JSON.stringify([identity.environmentId, identity.title]); + for (const { identity } of projectAccumulator.values()) { + if (identity.kind !== "project") continue; + const peers = projectIdsByTitle.get(titleKey(identity)) ?? []; + peers.push(identity.projectId); + projectIdsByTitle.set(titleKey(identity), peers); + } + const duplicateTitleId = (identity: ProjectIdentity): string | null => { + if (identity.kind !== "project") return null; + const peers = projectIdsByTitle.get(titleKey(identity)) ?? []; + if (peers.length < 2) return null; + return distinctIdPrefix(identity.projectId, peers); + }; + + const projects: ProjectTotals[] = [...projectAccumulator.entries()] + .map(([key, { identity, ...totals }]) => ({ + ...identity, + key, + duplicateTitleId: duplicateTitleId(identity), + ...totals, + costShare: costUsd === 0 ? 0 : totals.costUsd / costUsd, + tokenShare: totalTokens === 0 ? 0 : totals.totalTokens / totalTokens, + })) + .sort((a, b) => b.costUsd - a.costUsd || b.totalTokens - a.totalTokens); + const daily: DailyTotals[] = [...dailyAccumulator.entries()] .map(([day, totals]) => ({ day, @@ -591,6 +729,7 @@ export function mergeUsage( sessions, providers, models, + projects, daily, hourly, costQuality: {