@@ -15,6 +15,7 @@ import * as HostProcess from "@t3tools/shared/HostProcess";
1515import { mergeUsage } from "@t3tools/shared/usageMerge" ;
1616import {
1717 EnvironmentId ,
18+ ProjectId ,
1819 ProviderDriverKind ,
1920 ProviderInstanceId ,
2021 UsageDay ,
@@ -42,6 +43,7 @@ import * as ServerConfig from "../config.ts";
4243import * as ServerSettings from "../serverSettings.ts" ;
4344import * as Sqlite from "../persistence/Sqlite.ts" ;
4445import * as CodexUsageHistory from "./CodexUsageHistory.ts" ;
46+ import * as UsageProjectAttribution from "./UsageProjectAttribution.ts" ;
4547import * as CursorAccountReader from "@t3tools/provider-cursor/server/CursorAccountReader" ;
4648import * as CursorKeychain from "@t3tools/provider-cursor/server/CursorKeychain" ;
4749import * as CursorUsageAccounts from "@t3tools/provider-cursor/server/CursorUsageAccounts" ;
@@ -159,7 +161,11 @@ const layerService = (input: {
159161 Layer . provideMerge ( AntigravityUsage . layer ) ,
160162 Layer . provideMerge ( MuseUsageHome . layer ) ,
161163 Layer . provideMerge ( ProviderHostLive . layer ) ,
162- Layer . provideMerge ( CodexUsageHistory . layer . pipe ( Layer . provideMerge ( Sqlite . layerMemory ) ) ) ,
164+ Layer . provideMerge (
165+ Layer . merge ( CodexUsageHistory . layer , UsageProjectAttribution . layer ) . pipe (
166+ Layer . provideMerge ( Sqlite . layerMemory ) ,
167+ ) ,
168+ ) ,
163169 Layer . provideMerge ( Layer . mock ( BackgroundPolicy . BackgroundPolicy ) ( { } ) ) ,
164170 Layer . provideMerge (
165171 Layer . mock ( ServerSecretStore . ServerSecretStore ) ( {
@@ -2402,6 +2408,109 @@ describe("UsageService", () => {
24022408 } ) . pipe ( Effect . scoped ) ,
24032409 ) ;
24042410
2411+ it . effect ( "totals usage per T3 project from provider thread bindings" , ( ) =>
2412+ Effect . gen ( function * ( ) {
2413+ const { transcript, settings, home } = yield * setup ;
2414+ const piTranscript = NodePath . join ( home , "pi" , "sessions" , "bound.jsonl" ) ;
2415+ yield * Effect . promise ( async ( ) => {
2416+ await NodeFSP . mkdir ( NodePath . dirname ( piTranscript ) , { recursive : true } ) ;
2417+ await NodeFSP . writeFile (
2418+ piTranscript ,
2419+ [
2420+ { type : "session" , id : "pi-header-id" } ,
2421+ {
2422+ type : "usage" ,
2423+ id : "pi-event" ,
2424+ timestamp : "2026-08-01T10:00:00Z" ,
2425+ provider : "openai" ,
2426+ model : "model" ,
2427+ usage : { output : 17 } ,
2428+ } ,
2429+ ]
2430+ . map ( ( line ) => encodeUnknownJsonString ( line ) )
2431+ . join ( "\n" ) + "\n" ,
2432+ ) ;
2433+ } ) ;
2434+ yield * Effect . promise ( ( ) =>
2435+ NodeFSP . writeFile (
2436+ transcript ,
2437+ claudeLine ( 1 , 3 , "claude-fable-5" , "bound" ) +
2438+ claudeLine ( 2 , 5 , "claude-fable-5" , "worktree" ) +
2439+ claudeLine ( 3 , 7 , "claude-fable-5" , "ambiguous" ) +
2440+ claudeLine ( 4 , 11 , "claude-fable-5" , "terminal" ) +
2441+ claudeLine ( 5 , 13 , "claude-fable-5" , "deleted-project" ) ,
2442+ ) ,
2443+ ) ;
2444+ const projectRows = ( summary : UsageSummary ) =>
2445+ ( summary . projectTotals ?? [ ] )
2446+ . filter ( ( row ) => row . provider !== "pi" )
2447+ . map ( ( row ) => [ String ( row . projectId ?? null ) , row . totals . outputTokens , row . sessions ] )
2448+ . toSorted ( ( [ a ] , [ b ] ) => String ( a ) . localeCompare ( String ( b ) ) ) ;
2449+
2450+ yield * Effect . gen ( function * ( ) {
2451+ const sql = yield * SqlClient . SqlClient ;
2452+ const project = ( id : string , title : string , deletedAt : string | null = null ) =>
2453+ sql `INSERT INTO projection_projects (project_id, title, workspace_root, scripts_json, created_at, updated_at, deleted_at)
2454+ VALUES (${ id } , ${ title } , ${ `/work/${ id } ` } , '[]', '2026-08-01', '2026-08-01', ${ deletedAt } )` ;
2455+ const thread = ( id : string , projectId : string ) =>
2456+ sql `INSERT INTO orchestration_v2_projection_threads (thread_id, project_id, title, default_provider, runtime_mode, interaction_mode, created_at, updated_at, payload_json)
2457+ VALUES (${ id } , ${ projectId } , ${ id } , 'claudeAgent', 'full-access', 'default', '2026-08-01', '2026-08-01', '{}')` ;
2458+ const binding = ( id : string , threadId : string , nativeId : string , driver = "claudeAgent" ) =>
2459+ sql `INSERT INTO orchestration_v2_projection_provider_threads (provider_thread_id, thread_id, provider, driver, status, updated_at, payload_json)
2460+ VALUES (${ id } , ${ threadId } , ${ driver } , ${ driver } , 'idle', '2026-08-01', ${ encodeUnknownJsonString (
2461+ { nativeThreadRef : { driver, nativeId } } ,
2462+ ) } )`;
2463+ yield * project ( "p-app" , "App" ) ;
2464+ yield * project ( "p-other" , "Other" ) ;
2465+ yield * project ( "p-gone" , "Gone" , "2026-08-02" ) ;
2466+ yield * thread ( "t-main" , "p-app" ) ;
2467+ yield * thread ( "t-worktree" , "p-app" ) ;
2468+ yield * thread ( "t-other" , "p-other" ) ;
2469+ yield * thread ( "t-gone" , "p-gone" ) ;
2470+ yield * binding ( "pt-1" , "t-main" , "bound" ) ;
2471+ yield * binding ( "pt-2" , "t-worktree" , "worktree" ) ;
2472+ yield * binding ( "pt-3" , "t-main" , "ambiguous" ) ;
2473+ yield * binding ( "pt-4" , "t-other" , "ambiguous" ) ;
2474+ yield * binding ( "pt-5" , "t-gone" , "deleted-project" ) ;
2475+ // Another driver's identical native id must not claim a Claude session.
2476+ yield * binding ( "pt-6" , "t-other" , "terminal" , "codex" ) ;
2477+ yield * binding ( "pt-7" , "t-main" , piTranscript , "pi" ) ;
2478+ yield * binding ( "pt-8" , "t-other" , "pi-header-id" , "pi" ) ;
2479+
2480+ const service = yield * UsageService . make ;
2481+ const summary = yield * service . readSummary ( WINDOW ) ;
2482+ assert . deepStrictEqual ( projectRows ( summary ) , [
2483+ [ "null" , 18 , 2 ] ,
2484+ [ "p-app" , 8 , 2 ] ,
2485+ [ "p-gone" , 13 , 1 ] ,
2486+ ] ) ;
2487+ assert . deepStrictEqual (
2488+ summary . projectTotals
2489+ ?. filter ( ( row ) => row . provider === "pi" )
2490+ . map ( ( row ) => [ row . projectId , row . totals . outputTokens , row . sessions ] ) ,
2491+ [ [ ProjectId . make ( "p-app" ) , 17 , 1 ] ] ,
2492+ ) ;
2493+ assert . deepStrictEqual (
2494+ summary . projects ?. toSorted ( ( a , b ) => a . projectId . localeCompare ( b . projectId ) ) ,
2495+ [
2496+ { projectId : ProjectId . make ( "p-app" ) , title : "App" } ,
2497+ { projectId : ProjectId . make ( "p-gone" ) , title : "Gone" } ,
2498+ ] ,
2499+ ) ;
2500+ assert . strictEqual ( totalOutputTokens ( summary ) , 56 ) ;
2501+
2502+ yield * sql `DROP TABLE orchestration_v2_projection_provider_threads` ;
2503+ const unattributed = yield * service . readSummary ( { ...WINDOW , awaitRefresh : true } ) ;
2504+ assert . strictEqual ( unattributed . projectTotals , undefined ) ;
2505+ assert . strictEqual ( unattributed . projects , undefined ) ;
2506+ assert . strictEqual ( totalOutputTokens ( unattributed ) , 56 ) ;
2507+ } ) . pipe (
2508+ Effect . scoped ,
2509+ Effect . provide ( layerService ( { prefix : "usage-service-project-test" , home, settings } ) ) ,
2510+ ) ;
2511+ } ) . pipe ( Effect . scoped ) ,
2512+ ) ;
2513+
24052514 it . live ( "reprices unchanged transcripts when custom prices are added, edited, or removed" , ( ) =>
24062515 Effect . gen ( function * ( ) {
24072516 const { transcript, settings, home } = yield * setup ;
0 commit comments