Skip to content

Commit 60b129d

Browse files
saphidclaude
andcommitted
refactor(usage): keep the project store to plain rows
The store lists provider sessions with their projects. Deciding which project a session belongs to stays with usage, tested on its own. The mobile No project row drops its repeated explanation. Co-Authored-By: Claude Fable 5.2 <[email protected]>
1 parent 393b059 commit 60b129d

5 files changed

Lines changed: 76 additions & 50 deletions

File tree

‎apps/mobile/src/features/usage/UsageRouteScreen.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -910,8 +910,6 @@ function projectDetail(
910910
if (row.kind === "project") {
911911
if (showEnvironment) qualifiers.push(row.environmentLabel);
912912
if (row.duplicateTitleId !== null) qualifiers.push(`ID ${row.duplicateTitleId}`);
913-
} else {
914-
qualifiers.push("Not tied to one T3 project");
915913
}
916914
const partial = !unknown && row.unpricedRecords > 0 ? " · some unpriced" : "";
917915
const figure =

‎apps/server/src/orchestration-v2/ProjectStore.test.ts‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ it.layer(ProjectStore.layer.pipe(Layer.provideMerge(SqlitePersistence.layerMemor
9797
}),
9898
);
9999

100-
it.effect("attributes provider sessions to one project", () =>
100+
it.effect("lists each provider session with its thread's project", () =>
101101
Effect.gen(function* () {
102102
const projects = yield* ProjectStore.ProjectStoreV2;
103103
const sql = yield* SqlClient.SqlClient;
@@ -123,17 +123,15 @@ it.layer(ProjectStore.layer.pipe(Layer.provideMerge(SqlitePersistence.layerMemor
123123
yield* binding("pt-ambiguous-app", "t-main", "ambiguous");
124124
yield* binding("pt-ambiguous-other", "t-other", "ambiguous");
125125

126-
const attributions = yield* projects.listUsageProjectAttributions();
126+
const rows = yield* projects.listProviderSessionProjects();
127127
assert.deepStrictEqual(
128-
attributions.get(ProjectStore.usageProjectSessionKey("claudeAgent", "bound")),
129-
{ projectId: ProjectId.make("p-app"), title: "App" },
130-
);
131-
assert.deepStrictEqual(
132-
attributions.get(ProjectStore.usageProjectSessionKey("claudeAgent", "worktree")),
133-
{ projectId: ProjectId.make("p-app"), title: "App" },
134-
);
135-
assert.isFalse(
136-
attributions.has(ProjectStore.usageProjectSessionKey("claudeAgent", "ambiguous")),
128+
rows.map((row) => `${row.nativeId} ${row.projectId} ${row.title}`).sort(),
129+
[
130+
"ambiguous p-app App",
131+
"ambiguous p-other Other",
132+
"bound p-app App",
133+
"worktree p-app App",
134+
],
137135
);
138136
}),
139137
);

‎apps/server/src/orchestration-v2/ProjectStore.ts‎

Lines changed: 12 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {
22
type ApplicationProjectEvent,
33
IsoDateTime,
4-
type UsageProject,
54
ModelSelection,
65
type OrchestrationProjectShell,
76
StoredProjectIcon,
@@ -56,16 +55,14 @@ const ProjectDbRow = Schema.Struct({
5655
scripts: Schema.fromJsonString(Schema.Array(ProjectScript)),
5756
});
5857

59-
const UsageProjectAttributionRow = Schema.Struct({
58+
const ProviderSessionProjectRow = Schema.Struct({
6059
driver: Schema.String,
6160
nativeId: Schema.String,
6261
projectId: ProjectId,
6362
title: Schema.String,
6463
workspaceRoot: Schema.String,
6564
});
66-
67-
export const usageProjectSessionKey = (driver: string, nativeId: string) =>
68-
`${driver}\u0000${nativeId}`;
65+
export type ProviderSessionProjectRow = typeof ProviderSessionProjectRow.Type;
6966

7067
function toShell(row: ProjectRow): OrchestrationProjectShell {
7168
return {
@@ -99,9 +96,9 @@ export class ProjectStoreV2 extends Context.Service<
9996
readonly projectIds?: ReadonlyArray<ProjectId>;
10097
readonly includeDeleted?: boolean;
10198
}) => Effect.Effect<ReadonlyArray<ProjectRow>, ProjectStoreV2Error>;
102-
/** Keyed by `usageProjectSessionKey`; deleted projects keep their past usage. */
103-
readonly listUsageProjectAttributions: () => Effect.Effect<
104-
ReadonlyMap<string, UsageProject>,
99+
/** One row per provider session a thread ran, with that thread's project, deleted or not. */
100+
readonly listProviderSessionProjects: () => Effect.Effect<
101+
ReadonlyArray<ProviderSessionProjectRow>,
105102
ProjectStoreV2Error
106103
>;
107104
/** Workspace roots match by exact string; callers normalize before asking. */
@@ -159,9 +156,10 @@ export const make = Effect.gen(function* () {
159156
`,
160157
});
161158

162-
const selectUsageProjectAttributionRows = SqlSchema.findAll({
159+
// Worktree threads keep their project's id, so their sessions land on the project.
160+
const selectProviderSessionProjects = SqlSchema.findAll({
163161
Request: Schema.Void,
164-
Result: UsageProjectAttributionRow,
162+
Result: ProviderSessionProjectRow,
165163
execute: () => sql`
166164
SELECT
167165
provider_thread.driver AS "driver",
@@ -252,32 +250,11 @@ export const make = Effect.gen(function* () {
252250
includeDeleted: options?.includeDeleted === true,
253251
}).pipe(NodeSqliteClient.readOnly, mapError("list"));
254252

255-
const listUsageProjectAttributions: ProjectStoreV2["Service"]["listUsageProjectAttributions"] =
253+
const listProviderSessionProjects: ProjectStoreV2["Service"]["listProviderSessionProjects"] =
256254
() =>
257-
selectUsageProjectAttributionRows(undefined).pipe(
255+
selectProviderSessionProjects(undefined).pipe(
258256
NodeSqliteClient.readOnly,
259-
Effect.map((rows) => {
260-
const projects = new Map<string, UsageProject | null>();
261-
for (const row of rows) {
262-
const key = usageProjectSessionKey(row.driver, row.nativeId);
263-
const existing = projects.get(key);
264-
if (existing !== undefined) {
265-
if (existing?.projectId !== row.projectId) projects.set(key, null);
266-
continue;
267-
}
268-
const title =
269-
row.title.trim() ||
270-
row.workspaceRoot.split(/[\\/]/).findLast((part) => part.length > 0) ||
271-
"Untitled project";
272-
projects.set(key, { projectId: row.projectId, title });
273-
}
274-
const resolved = new Map<string, UsageProject>();
275-
for (const [key, project] of projects) {
276-
if (project !== null) resolved.set(key, project);
277-
}
278-
return resolved;
279-
}),
280-
mapError("listUsageProjectAttributions"),
257+
mapError("listProviderSessionProjects"),
281258
);
282259

283260
const findActiveByWorkspaceRoot: ProjectStoreV2["Service"]["findActiveByWorkspaceRoot"] = (
@@ -346,7 +323,7 @@ export const make = Effect.gen(function* () {
346323
apply,
347324
get,
348325
list,
349-
listUsageProjectAttributions,
326+
listProviderSessionProjects,
350327
findActiveByWorkspaceRoot,
351328
getShell: Effect.fn("ProjectStoreV2.getShell")(function (projectId) {
352329
return get(projectId).pipe(Effect.map(Option.map(toShell)));
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import { ProjectId } from "@t3tools/contracts";
2+
import { expect, it } from "@effect/vitest";
3+
4+
import { projectsBySession, sessionKey } from "./UsageProjectAttribution.ts";
5+
6+
it("gives a session to its project unless two projects claim it", () => {
7+
const row = (nativeId: string, project: string) => ({
8+
driver: "claudeAgent",
9+
nativeId,
10+
projectId: ProjectId.make(project),
11+
title: project === "p-app" ? "App" : "",
12+
workspaceRoot: `/work/${project}`,
13+
});
14+
const projects = projectsBySession([
15+
row("bound", "p-app"),
16+
row("bound", "p-app"),
17+
row("untitled", "p-other"),
18+
row("ambiguous", "p-app"),
19+
row("ambiguous", "p-other"),
20+
]);
21+
22+
expect(projects.get(sessionKey("claudeAgent", "bound"))).toEqual({
23+
projectId: "p-app",
24+
title: "App",
25+
});
26+
expect(projects.get(sessionKey("claudeAgent", "untitled"))?.title).toBe("p-other");
27+
expect(projects.has(sessionKey("claudeAgent", "ambiguous"))).toBe(false);
28+
});

‎apps/server/src/usage/UsageProjectAttribution.ts‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,35 @@ export class UsageProjectAttributionReadError extends Schema.TaggedError<UsagePr
1414
}
1515
}
1616

17-
export const sessionKey = ProjectStore.usageProjectSessionKey;
17+
export const sessionKey = (driver: string, nativeId: string) => `${driver}\u0000${nativeId}`;
18+
19+
/** Keyed by `sessionKey`. A session claimed by threads in different projects belongs to neither. */
20+
export function projectsBySession(
21+
rows: ReadonlyArray<ProjectStore.ProviderSessionProjectRow>,
22+
): ReadonlyMap<string, UsageProject> {
23+
const claimed = new Map<string, UsageProject | null>();
24+
for (const row of rows) {
25+
const key = sessionKey(row.driver, row.nativeId);
26+
const existing = claimed.get(key);
27+
if (existing !== undefined) {
28+
if (existing?.projectId !== row.projectId) claimed.set(key, null);
29+
continue;
30+
}
31+
const title =
32+
row.title.trim() ||
33+
row.workspaceRoot.split(/[\\/]/).findLast((part) => part.length > 0) ||
34+
"Untitled project";
35+
claimed.set(key, { projectId: row.projectId, title });
36+
}
37+
const projects = new Map<string, UsageProject>();
38+
for (const [key, project] of claimed) if (project !== null) projects.set(key, project);
39+
return projects;
40+
}
1841

1942
export class UsageProjectAttribution extends Context.Service<
2043
UsageProjectAttribution,
2144
{
45+
/** Keyed by `sessionKey`; deleted projects keep their past usage. */
2246
readonly read: Effect.Effect<
2347
ReadonlyMap<string, UsageProject>,
2448
UsageProjectAttributionReadError
@@ -28,7 +52,8 @@ export class UsageProjectAttribution extends Context.Service<
2852

2953
const make = Effect.gen(function* () {
3054
const projects = yield* ProjectStore.ProjectStoreV2;
31-
const read = projects.listUsageProjectAttributions().pipe(
55+
const read = projects.listProviderSessionProjects().pipe(
56+
Effect.map(projectsBySession),
3257
Effect.mapError((cause) => new UsageProjectAttributionReadError({ cause })),
3358
Effect.withSpan("UsageProjectAttribution.read"),
3459
);

0 commit comments

Comments
 (0)