Skip to content

Commit b85366d

Browse files
fixfonclaudejuliusmarminge
authored
fix(antigravity): read usage from each instance data directory (pingdotgg#17769)
Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: Julius Marminge <[email protected]>
1 parent 393a9f8 commit b85366d

2 files changed

Lines changed: 77 additions & 4 deletions

File tree

‎apps/server/src/provider/Drivers/AntigravityUsage.ts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,13 @@ const make = Effect.gen(function* () {
3232
const fileSystem = yield* FileSystem.FileSystem;
3333
const path = yield* Path.Path;
3434
const host = yield* ProviderHost.ProviderHost;
35-
const hostEnvironment = yield* HostProcess.Environment;
3635
const cache = makeAntigravityUsageCache();
3736

38-
const dataRoots = Effect.gen(function* () {
37+
const dataRoots = Effect.fn("AntigravityUsage.dataRoots")(function* (
38+
environment: NodeJS.ProcessEnv,
39+
) {
3940
const home = yield* HostProcess.HomeDirectory;
40-
const configured = hostEnvironment["ANTIGRAVITY_DATA_DIR"]
41+
const configured = environment["ANTIGRAVITY_DATA_DIR"]
4142
?.split(",")
4243
.map((value) => value.trim())
4344
.filter(Boolean);
@@ -61,7 +62,8 @@ const make = Effect.gen(function* () {
6162
instances,
6263
windowStartMs,
6364
}) {
64-
const roots = yield* dataRoots;
65+
const roots: Array<string> = [];
66+
for (const instance of instances) roots.push(...(yield* dataRoots(instance.environment)));
6567
for (const { instanceId } of instances.filter((instance) => instance.configured)) {
6668
const directories = yield* resolveAntigravityInstanceDirectories(
6769
host.paths.stateDir,

‎apps/server/src/usage/UsageService.test.ts‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,6 +1039,77 @@ describe("UsageService", () => {
10391039
}).pipe(Effect.scoped),
10401040
);
10411041

1042+
it.live("reads Antigravity history from each instance's data directory", () =>
1043+
Effect.gen(function* () {
1044+
const { settings, home } = yield* setup;
1045+
const first = NodePath.join(home, "antigravity-first");
1046+
const second = NodePath.join(home, "antigravity-second");
1047+
yield* Effect.promise(async () => {
1048+
for (const [dir, outputTokens] of [
1049+
[first, 7],
1050+
[second, 11],
1051+
] as const) {
1052+
await NodeFSP.mkdir(dir);
1053+
const db = new NodeSqlite.DatabaseSync(
1054+
NodePath.join(dir, `${NodePath.basename(dir)}.db`),
1055+
);
1056+
try {
1057+
db.exec("CREATE TABLE steps (idx INTEGER, metadata BLOB)");
1058+
// Step protobuf: 100 input tokens, distinct output tokens, and 2026-08-01T10:00Z.
1059+
const metadata = new Uint8Array([
1060+
0x4a,
1061+
4,
1062+
0x10,
1063+
100,
1064+
0x18,
1065+
outputTokens,
1066+
...Buffer.from("420608a087b7d306", "hex"),
1067+
]);
1068+
db.prepare("INSERT INTO steps VALUES (?, ?)").run(0, metadata);
1069+
} finally {
1070+
db.close();
1071+
}
1072+
}
1073+
});
1074+
const instance = (dataDir: string) => ({
1075+
driver: ProviderDriverKind.make("antigravity"),
1076+
environment: [{ name: "ANTIGRAVITY_DATA_DIR", value: dataDir, sensitive: false }],
1077+
});
1078+
const service = yield* UsageService.make.pipe(
1079+
Effect.provide(
1080+
layerService({
1081+
prefix: "usage-service-antigravity-instances-test",
1082+
home,
1083+
settings: {
1084+
providerInstances: {
1085+
...settings.providerInstances,
1086+
[ProviderInstanceId.make("antigravity-first")]: instance(first),
1087+
[ProviderInstanceId.make("antigravity-second")]: instance(` ${second}, `),
1088+
},
1089+
},
1090+
}),
1091+
),
1092+
);
1093+
const summary = yield* service.readSummary(WINDOW);
1094+
const roots = summary.sources
1095+
.filter((source) => source.fingerprint.provider === "antigravity")
1096+
.map((source) => source.fingerprint.resolvedHomePath);
1097+
for (const [dir, outputTokens] of [
1098+
[first, 7],
1099+
[second, 11],
1100+
] as const) {
1101+
const root = yield* Effect.promise(() => NodeFSP.realpath(dir));
1102+
assert.include(roots, root);
1103+
assert.strictEqual(
1104+
summary.buckets
1105+
.filter((bucket) => bucket.provider === "antigravity" && bucket.sourcePath === root)
1106+
.reduce((sum, bucket) => sum + bucket.totals.outputTokens, 0),
1107+
outputTokens,
1108+
);
1109+
}
1110+
}).pipe(Effect.scoped),
1111+
);
1112+
10421113
it.live("reads configured and disabled accounts once across shared and aliased homes", () =>
10431114
Effect.gen(function* () {
10441115
const { transcript, settings, home } = yield* setup;

0 commit comments

Comments
 (0)