Skip to content

Commit 56e10c9

Browse files
committed
test(opencode): verify instance aliases in usage service fixture
1 parent 0b78bf4 commit 56e10c9

2 files changed

Lines changed: 69 additions & 38 deletions

File tree

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

Lines changed: 69 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ import * as NodeSqlite from "node:sqlite";
99
import { assert, describe, it } from "@effect/vitest";
1010
import * as NodeServices from "@effect/platform-node/NodeServices";
1111
import * as HostProcess from "@t3tools/shared/HostProcess";
12+
import { OpenCodeDriver } from "@t3tools/provider-opencode/server";
1213
import { mergeUsage } from "@t3tools/shared/usageMerge";
1314
import {
15+
DEFAULT_SERVER_SETTINGS,
1416
EnvironmentId,
1517
ProviderDriverKind,
1618
ProviderInstanceId,
@@ -983,6 +985,17 @@ describe("UsageService", () => {
983985
yield* Effect.promise(async () => {
984986
await NodeFSP.mkdir(opencode);
985987
await NodeFSP.symlink(opencode, opencodeAlias, "junction");
988+
const messages = NodePath.join(opencode, "storage", "message", "session-1");
989+
await NodeFSP.mkdir(messages, { recursive: true });
990+
await NodeFSP.writeFile(
991+
NodePath.join(messages, "msg-aliased.json"),
992+
JSON.stringify({
993+
role: "assistant",
994+
modelID: "example-model",
995+
time: { created: Date.parse("2026-08-01T10:00:00Z") },
996+
tokens: { input: 100, output: 20 },
997+
}),
998+
);
986999
await NodeFSP.mkdir(conversations);
9871000
await NodeFSP.mkdir(antigravityA);
9881001
await NodeFSP.mkdir(antigravityB);
@@ -997,12 +1010,63 @@ describe("UsageService", () => {
9971010
"junction",
9981011
);
9991012
});
1013+
const instances = [
1014+
{
1015+
instanceId: ProviderInstanceId.make("opencode-first"),
1016+
config: undefined,
1017+
environment: { OPENCODE_DATA_DIR: ` ${opencode}, ${opencodeAlias} ` },
1018+
configured: true,
1019+
},
1020+
{
1021+
instanceId: ProviderInstanceId.make("opencode-second"),
1022+
config: undefined,
1023+
environment: { OPENCODE_DATA_DIR: opencodeAlias },
1024+
configured: true,
1025+
},
1026+
];
1027+
const reader = OpenCodeDriver.usage;
1028+
if (reader?.kind !== "scan") throw new Error("Expected an OpenCode scan reader");
1029+
const scans = yield* reader
1030+
.scan({
1031+
instances,
1032+
settings: DEFAULT_SERVER_SETTINGS,
1033+
windowStartMs: 0,
1034+
retentionCutoffMs: 0,
1035+
awaitRefresh: true,
1036+
})
1037+
.pipe(Effect.provide(NodeServices.layer));
1038+
assert.strictEqual(scans.length, 1);
1039+
assert.strictEqual(scans[0]?.dir, yield* Effect.promise(() => NodeFSP.realpath(opencode)));
1040+
assert.deepStrictEqual(
1041+
scans.flatMap(
1042+
(scan) =>
1043+
scan.files?.flatMap((file) => file.records.map((record) => record.dedupeKey)) ?? [],
1044+
),
1045+
["opencode:msg-aliased"],
1046+
);
10001047
const service = yield* UsageService.make.pipe(
10011048
Effect.provide(
10021049
layerService({
10031050
prefix: "usage-service-aliased-roots-test",
10041051
home,
1005-
settings,
1052+
settings: {
1053+
providerInstances: {
1054+
...settings.providerInstances,
1055+
...Object.fromEntries(
1056+
instances.map((instance) => [
1057+
instance.instanceId,
1058+
{
1059+
driver: ProviderDriverKind.make("opencode"),
1060+
environment: Object.entries(instance.environment).map(([name, value]) => ({
1061+
name,
1062+
value,
1063+
sensitive: false,
1064+
})),
1065+
},
1066+
]),
1067+
),
1068+
},
1069+
},
10061070
environment: {
10071071
OPENCODE_DATA_DIR: `${opencode},${opencodeAlias}`,
10081072
ANTIGRAVITY_DATA_DIR: `${antigravityA},${antigravityB}`,
@@ -1015,6 +1079,10 @@ describe("UsageService", () => {
10151079
summary.sources.filter((source) => source.fingerprint.provider === provider);
10161080
assert.strictEqual(sourcesFor("opencode").length, 1);
10171081
assert.strictEqual(sourcesFor("antigravity").length, 1);
1082+
assert.strictEqual(
1083+
summary.buckets.find((bucket) => bucket.provider === "opencode")?.totals.outputTokens,
1084+
20,
1085+
);
10181086
assert.strictEqual(
10191087
sourcesFor("opencode")[0]?.fingerprint.resolvedHomePath,
10201088
yield* Effect.promise(() => NodeFSP.realpath(opencode)),

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

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
// @effect-diagnostics nodeBuiltinImport:off - directory aliases use junctions on Windows,
2-
// which Effect FileSystem.symlink does not expose.
3-
import * as NodeFSP from "node:fs/promises";
4-
51
import * as NodeServices from "@effect/platform-node/NodeServices";
62
import { assert, describe, it } from "@effect/vitest";
73
import { DEFAULT_SERVER_SETTINGS, ProviderInstanceId } from "@t3tools/contracts";
@@ -415,39 +411,6 @@ describe("openCodeUsageReader", () => {
415411
}).pipe(Effect.provide(NodeServices.layer)),
416412
);
417413

418-
it.effect("scans canonical aliases shared by instances only once", () =>
419-
Effect.gen(function* () {
420-
const fileSystem = yield* FileSystem.FileSystem;
421-
const path = yield* Path.Path;
422-
const temp = yield* fileSystem.makeTempDirectoryScoped({ prefix: "usage-aliases-test-" });
423-
const home = yield* fileSystem.realPath(temp);
424-
const root = path.join(home, "store");
425-
const alias = path.join(home, "alias");
426-
yield* seedHistory(root, "msg-shared");
427-
yield* Effect.tryPromise(() => NodeFSP.symlink(root, alias, "junction"));
428-
const sources = yield* scanUsage([
429-
usageInstance("opencode-first", { OPENCODE_DATA_DIR: ` ${root}, ${alias} ` }),
430-
usageInstance("opencode-second", { OPENCODE_DATA_DIR: alias }),
431-
]).pipe(
432-
Effect.provideService(HostProcess.Environment, {
433-
OPENCODE_DATA_DIR: path.join(home, "host"),
434-
}),
435-
);
436-
437-
assert.deepStrictEqual(
438-
sources.map((source) => source.dir),
439-
[root],
440-
);
441-
assert.deepStrictEqual(
442-
sources.flatMap(
443-
(source) =>
444-
source.files?.flatMap((file) => file.records.map((record) => record.dedupeKey)) ?? [],
445-
),
446-
["opencode:msg-shared"],
447-
);
448-
}).pipe(Effect.provide(NodeServices.layer)),
449-
);
450-
451414
it.effect.each([
452415
{ dataHome: "absolute", dataDirs: undefined },
453416
{ dataHome: "relative", dataDirs: " , " },

0 commit comments

Comments
 (0)