Skip to content

Commit 0cccc10

Browse files
fixfonclaude
andcommitted
fix(antigravity): read usage from each instance data directory
Antigravity usage scans resolved ANTIGRAVITY_DATA_DIR from the host environment only, so an instance configured with its own data directory had its history omitted. Resolve the data roots from each instance's merged environment; the existing canonical directory set still counts shared and aliased roots once. Refs #17631. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 173a970 commit 0cccc10

2 files changed

Lines changed: 45 additions & 5 deletions

File tree

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,14 @@ const make = Effect.gen(function* () {
4444
const fileSystem = yield* FileSystem.FileSystem;
4545
const path = yield* Path.Path;
4646
const host = yield* ProviderHost.ProviderHost;
47-
const hostEnvironment = yield* HostProcess.Environment;
4847
const cache = makeAntigravityUsageCache();
4948

50-
/** `ANTIGRAVITY_DATA_DIR` (comma-separated) or the defaults, canonicalized. */
51-
const dataRoots = Effect.gen(function* () {
49+
/** An instance's `ANTIGRAVITY_DATA_DIR` (comma-separated) or the defaults, canonicalized. */
50+
const dataRoots = Effect.fn("AntigravityUsage.dataRoots")(function* (
51+
environment: NodeJS.ProcessEnv,
52+
) {
5253
const home = yield* HostProcess.HomeDirectory;
53-
const configured = hostEnvironment["ANTIGRAVITY_DATA_DIR"]
54+
const configured = environment["ANTIGRAVITY_DATA_DIR"]
5455
?.split(",")
5556
.map((value) => value.trim())
5657
.filter(Boolean);
@@ -74,7 +75,8 @@ const make = Effect.gen(function* () {
7475
instances,
7576
windowStartMs,
7677
}) {
77-
const roots = yield* dataRoots;
78+
const roots: Array<string> = [];
79+
for (const instance of instances) roots.push(...(yield* dataRoots(instance.environment)));
7880
// Only configured instances have a profile; the implicit default never ran.
7981
for (const { instanceId } of instances.filter((instance) => instance.configured)) {
8082
const directories = yield* resolveAntigravityInstanceDirectories(

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,6 +1062,44 @@ describe("UsageService", () => {
10621062
}).pipe(Effect.scoped),
10631063
);
10641064

1065+
it.live("reads Antigravity history from each instance's data directory", () =>
1066+
Effect.gen(function* () {
1067+
const { settings, home } = yield* setup;
1068+
const first = NodePath.join(home, "antigravity-first");
1069+
const second = NodePath.join(home, "antigravity-second");
1070+
yield* Effect.promise(async () => {
1071+
await NodeFSP.mkdir(first);
1072+
await NodeFSP.mkdir(second);
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 of [first, second]) {
1098+
assert.include(roots, yield* Effect.promise(() => NodeFSP.realpath(dir)));
1099+
}
1100+
}).pipe(Effect.scoped),
1101+
);
1102+
10651103
it.live("reads configured and disabled accounts once across shared and aliased homes", () =>
10661104
Effect.gen(function* () {
10671105
const { transcript, settings, home } = yield* setup;

0 commit comments

Comments
 (0)