Skip to content

Commit 2d53f87

Browse files
committed
test(opencode): verify instance aliases in usage service fixture
1 parent 698c163 commit 2d53f87

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,
@@ -1019,6 +1021,17 @@ describe("UsageService", () => {
10191021
yield* Effect.promise(async () => {
10201022
await NodeFSP.mkdir(opencode);
10211023
await NodeFSP.symlink(opencode, opencodeAlias, "junction");
1024+
const messages = NodePath.join(opencode, "storage", "message", "session-1");
1025+
await NodeFSP.mkdir(messages, { recursive: true });
1026+
await NodeFSP.writeFile(
1027+
NodePath.join(messages, "msg-aliased.json"),
1028+
JSON.stringify({
1029+
role: "assistant",
1030+
modelID: "example-model",
1031+
time: { created: Date.parse("2026-08-01T10:00:00Z") },
1032+
tokens: { input: 100, output: 20 },
1033+
}),
1034+
);
10221035
await NodeFSP.mkdir(conversations);
10231036
await NodeFSP.mkdir(antigravityA);
10241037
await NodeFSP.mkdir(antigravityB);
@@ -1033,12 +1046,63 @@ describe("UsageService", () => {
10331046
"junction",
10341047
);
10351048
});
1049+
const instances = [
1050+
{
1051+
instanceId: ProviderInstanceId.make("opencode-first"),
1052+
config: undefined,
1053+
environment: { OPENCODE_DATA_DIR: ` ${opencode}, ${opencodeAlias} ` },
1054+
configured: true,
1055+
},
1056+
{
1057+
instanceId: ProviderInstanceId.make("opencode-second"),
1058+
config: undefined,
1059+
environment: { OPENCODE_DATA_DIR: opencodeAlias },
1060+
configured: true,
1061+
},
1062+
];
1063+
const reader = OpenCodeDriver.usage;
1064+
if (reader?.kind !== "scan") throw new Error("Expected an OpenCode scan reader");
1065+
const scans = yield* reader
1066+
.scan({
1067+
instances,
1068+
settings: DEFAULT_SERVER_SETTINGS,
1069+
windowStartMs: 0,
1070+
retentionCutoffMs: 0,
1071+
awaitRefresh: true,
1072+
})
1073+
.pipe(Effect.provide(NodeServices.layer));
1074+
assert.strictEqual(scans.length, 1);
1075+
assert.strictEqual(scans[0]?.dir, yield* Effect.promise(() => NodeFSP.realpath(opencode)));
1076+
assert.deepStrictEqual(
1077+
scans.flatMap(
1078+
(scan) =>
1079+
scan.files?.flatMap((file) => file.records.map((record) => record.dedupeKey)) ?? [],
1080+
),
1081+
["opencode:msg-aliased"],
1082+
);
10361083
const service = yield* UsageService.make.pipe(
10371084
Effect.provide(
10381085
layerService({
10391086
prefix: "usage-service-aliased-roots-test",
10401087
home,
1041-
settings,
1088+
settings: {
1089+
providerInstances: {
1090+
...settings.providerInstances,
1091+
...Object.fromEntries(
1092+
instances.map((instance) => [
1093+
instance.instanceId,
1094+
{
1095+
driver: ProviderDriverKind.make("opencode"),
1096+
environment: Object.entries(instance.environment).map(([name, value]) => ({
1097+
name,
1098+
value,
1099+
sensitive: false,
1100+
})),
1101+
},
1102+
]),
1103+
),
1104+
},
1105+
},
10421106
environment: {
10431107
OPENCODE_DATA_DIR: `${opencode},${opencodeAlias}`,
10441108
ANTIGRAVITY_DATA_DIR: `${antigravityA},${antigravityB}`,
@@ -1051,6 +1115,10 @@ describe("UsageService", () => {
10511115
summary.sources.filter((source) => source.fingerprint.provider === provider);
10521116
assert.strictEqual(sourcesFor("opencode").length, 1);
10531117
assert.strictEqual(sourcesFor("antigravity").length, 1);
1118+
assert.strictEqual(
1119+
summary.buckets.find((bucket) => bucket.provider === "opencode")?.totals.outputTokens,
1120+
20,
1121+
);
10541122
assert.strictEqual(
10551123
sourcesFor("opencode")[0]?.fingerprint.resolvedHomePath,
10561124
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";
@@ -367,39 +363,6 @@ describe("openCodeUsageReader", () => {
367363
}).pipe(Effect.provide(NodeServices.layer)),
368364
);
369365

370-
it.effect("scans canonical aliases shared by instances only once", () =>
371-
Effect.gen(function* () {
372-
const fileSystem = yield* FileSystem.FileSystem;
373-
const path = yield* Path.Path;
374-
const temp = yield* fileSystem.makeTempDirectoryScoped({ prefix: "usage-aliases-test-" });
375-
const home = yield* fileSystem.realPath(temp);
376-
const root = path.join(home, "store");
377-
const alias = path.join(home, "alias");
378-
yield* seedHistory(root, "msg-shared");
379-
yield* Effect.tryPromise(() => NodeFSP.symlink(root, alias, "junction"));
380-
const sources = yield* scanUsage([
381-
usageInstance("opencode-first", { OPENCODE_DATA_DIR: ` ${root}, ${alias} ` }),
382-
usageInstance("opencode-second", { OPENCODE_DATA_DIR: alias }),
383-
]).pipe(
384-
Effect.provideService(HostProcess.Environment, {
385-
OPENCODE_DATA_DIR: path.join(home, "host"),
386-
}),
387-
);
388-
389-
assert.deepStrictEqual(
390-
sources.map((source) => source.dir),
391-
[root],
392-
);
393-
assert.deepStrictEqual(
394-
sources.flatMap(
395-
(source) =>
396-
source.files?.flatMap((file) => file.records.map((record) => record.dedupeKey)) ?? [],
397-
),
398-
["opencode:msg-shared"],
399-
);
400-
}).pipe(Effect.provide(NodeServices.layer)),
401-
);
402-
403366
it.effect.each([
404367
{ dataHome: "absolute", dataDirs: undefined },
405368
{ dataHome: "relative", dataDirs: " , " },

0 commit comments

Comments
 (0)