Skip to content

Commit 135b16f

Browse files
fix(opencode): read usage from each instance data directory (pingdotgg#17759)
Co-authored-by: Julius Marminge <[email protected]>
1 parent cbcd0fd commit 135b16f

3 files changed

Lines changed: 145 additions & 5 deletions

File tree

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

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -985,6 +985,85 @@ describe("UsageService", () => {
985985
}).pipe(Effect.scoped),
986986
);
987987

988+
it.live("includes host and merged OpenCode instance histories once across list aliases", () =>
989+
Effect.gen(function* () {
990+
const { settings, home } = yield* setup;
991+
const hostRoot = NodePath.join(home, "opencode");
992+
const instanceRoot = NodePath.join(home, "opencode-work");
993+
const alias = NodePath.join(home, "opencode-alias");
994+
const dataHome = NodePath.join(home, "data");
995+
const xdgRoot = NodePath.join(dataHome, "opencode");
996+
const histories = [
997+
{ root: hostRoot, id: "host", output: 5 },
998+
{ root: instanceRoot, id: "work", output: 7 },
999+
{ root: xdgRoot, id: "xdg", output: 11 },
1000+
];
1001+
yield* Effect.promise(async () => {
1002+
for (const { root, id, output } of histories) {
1003+
const directory = NodePath.join(root, "storage", "message", "session-1");
1004+
await NodeFSP.mkdir(directory, { recursive: true });
1005+
await NodeFSP.writeFile(
1006+
NodePath.join(directory, `${id}.json`),
1007+
encodeUnknownJsonString({
1008+
role: "assistant",
1009+
modelID: "example-model",
1010+
time: { created: Date.parse("2026-08-01T10:00:00Z") },
1011+
tokens: { input: 10, output },
1012+
}),
1013+
);
1014+
}
1015+
await NodeFSP.symlink(instanceRoot, alias, "junction");
1016+
});
1017+
const service = yield* UsageService.make.pipe(
1018+
Effect.provide(
1019+
layerService({
1020+
prefix: "usage-service-opencode-instances",
1021+
home,
1022+
environment: { XDG_DATA_HOME: dataHome },
1023+
settings: {
1024+
...settings,
1025+
providerInstances: {
1026+
...settings.providerInstances,
1027+
[ProviderInstanceId.make("opencode-work")]: {
1028+
driver: ProviderDriverKind.make("opencode"),
1029+
environment: [
1030+
{
1031+
name: "OPENCODE_DATA_DIR",
1032+
value: ` ${instanceRoot}, ${alias} `,
1033+
sensitive: false,
1034+
},
1035+
],
1036+
},
1037+
[ProviderInstanceId.make("opencode-xdg")]: {
1038+
driver: ProviderDriverKind.make("opencode"),
1039+
environment: [{ name: "OPENCODE_DATA_DIR", value: "", sensitive: false }],
1040+
},
1041+
},
1042+
},
1043+
}),
1044+
),
1045+
);
1046+
const summary = yield* service.readSummary(WINDOW);
1047+
const sources = summary.sources.filter(
1048+
(source) => source.fingerprint.provider === "opencode",
1049+
);
1050+
const expectedRoots = yield* Effect.promise(() =>
1051+
Promise.all(histories.map(({ root }) => NodeFSP.realpath(root))),
1052+
);
1053+
assert.deepStrictEqual(
1054+
sources.map((source) => source.fingerprint.resolvedHomePath).sort(),
1055+
expectedRoots.sort(),
1056+
);
1057+
assert.deepStrictEqual(
1058+
summary.buckets
1059+
.filter((bucket) => bucket.provider === "opencode")
1060+
.map((bucket) => bucket.totals.outputTokens)
1061+
.sort((a, b) => a - b),
1062+
[5, 7, 11],
1063+
);
1064+
}).pipe(Effect.scoped),
1065+
);
1066+
9881067
it.live("counts aliased OpenCode and Antigravity directories once", () =>
9891068
Effect.gen(function* () {
9901069
const { settings, home } = yield* setup;

‎packages/provider-opencode/src/server/usage.test.ts‎

Lines changed: 58 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import * as NodeServices from "@effect/platform-node/NodeServices";
22
import { assert, describe, it } from "@effect/vitest";
3+
import { DEFAULT_SERVER_SETTINGS, ProviderInstanceId } from "@t3tools/contracts";
4+
import * as HostProcess from "@t3tools/shared/HostProcess";
35
import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
46
import * as Context from "effect/Context";
57
import * as Effect from "effect/Effect";
@@ -9,7 +11,7 @@ import * as Path from "effect/Path";
911
import * as SqlClient from "effect/sql/SqlClient";
1012
import { vi } from "vite-plus/test";
1113

12-
import { readOpenCodeUsage } from "./usage.ts";
14+
import { openCodeUsageReader, readOpenCodeUsage } from "./usage.ts";
1315

1416
const openDatabase = (filename: string) =>
1517
Layer.build(NodeSqliteClient.layer({ filename })).pipe(
@@ -322,3 +324,58 @@ describe("readOpenCodeUsage", () => {
322324
);
323325
});
324326
import * as NodeSqlite from "node:sqlite";
327+
328+
describe("openCodeUsageReader", () => {
329+
it.effect("scans canonical instance roots once, including XDG and home defaults", () =>
330+
Effect.gen(function* () {
331+
const fileSystem = yield* FileSystem.FileSystem;
332+
const path = yield* Path.Path;
333+
const temp = yield* fileSystem.makeTempDirectoryScoped({ prefix: "usage-instances-test-" });
334+
const home = yield* fileSystem.realPath(temp);
335+
const defaultRoot = path.join(home, ".local", "share", "opencode");
336+
const instanceRoot = path.join(home, "instance");
337+
const dataHome = path.join(home, "xdg");
338+
const xdgRoot = path.join(dataHome, "opencode");
339+
const alias = path.join(home, "default-alias");
340+
for (const root of [defaultRoot, instanceRoot, xdgRoot]) {
341+
yield* fileSystem.makeDirectory(root, { recursive: true });
342+
}
343+
yield* fileSystem.symlink(defaultRoot, alias);
344+
const instances = [
345+
{ id: "opencode", environment: {}, configured: false },
346+
{
347+
id: "opencode-list",
348+
environment: { OPENCODE_DATA_DIR: ` ${instanceRoot}, ${alias}, ${defaultRoot}, , ` },
349+
configured: true,
350+
},
351+
{
352+
id: "opencode-xdg",
353+
environment: { XDG_DATA_HOME: dataHome },
354+
configured: true,
355+
},
356+
];
357+
if (openCodeUsageReader.kind !== "scan") throw new Error("Expected an OpenCode scan reader");
358+
const sources = yield* openCodeUsageReader
359+
.scan({
360+
instances: instances.map(({ id, environment, configured }) => ({
361+
instanceId: ProviderInstanceId.make(id),
362+
config: undefined,
363+
environment,
364+
configured,
365+
})),
366+
settings: DEFAULT_SERVER_SETTINGS,
367+
windowStartMs: 0,
368+
retentionCutoffMs: 0,
369+
awaitRefresh: true,
370+
})
371+
.pipe(
372+
Effect.provideService(HostProcess.Environment, {}),
373+
Effect.provideService(HostProcess.HomeDirectory, home),
374+
);
375+
assert.deepStrictEqual(
376+
sources.map((source) => source.dir).sort(),
377+
[defaultRoot, instanceRoot, xdgRoot].sort(),
378+
);
379+
}).pipe(Effect.provide(NodeServices.layer)),
380+
);
381+
});

‎packages/provider-opencode/src/server/usage.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -302,10 +302,11 @@ export const readOpenCodeUsage = Effect.fn("readOpenCodeUsage")(function* (
302302
return { files, missing: !found && !error, error };
303303
});
304304

305-
const resolveOpenCodeDataDirs = Effect.fn("resolveOpenCodeDataDirs")(function* () {
305+
const resolveOpenCodeDataDirs = Effect.fn("resolveOpenCodeDataDirs")(function* (
306+
environment: NodeJS.ProcessEnv,
307+
) {
306308
const fileSystem = yield* FileSystem.FileSystem;
307309
const path = yield* Path.Path;
308-
const environment = yield* HostProcess.Environment;
309310
const homeDirectory = yield* HostProcess.HomeDirectory;
310311
const roots = environment["OPENCODE_DATA_DIR"]
311312
?.split(",")
@@ -333,8 +334,11 @@ export type OpenCodeUsageReaderEnv = FileSystem.FileSystem | Path.Path;
333334
export const openCodeUsageReader: ProviderUsageReader<OpenCodeSettings, OpenCodeUsageReaderEnv> = {
334335
kind: "scan",
335336
provider: "opencode",
336-
scan: Effect.fn("openCodeUsageReader.scan")(function* ({ windowStartMs }) {
337-
const roots = yield* resolveOpenCodeDataDirs();
337+
scan: Effect.fn("openCodeUsageReader.scan")(function* ({ instances, windowStartMs }) {
338+
const roots = new Set<string>();
339+
for (const instance of instances) {
340+
for (const root of yield* resolveOpenCodeDataDirs(instance.environment)) roots.add(root);
341+
}
338342
return yield* Effect.forEach(
339343
roots,
340344
(dir) =>

0 commit comments

Comments
 (0)