Skip to content

Commit f449f39

Browse files
fix(opencode): isolate token usage across native turns
1 parent 16568d9 commit f449f39

3 files changed

Lines changed: 265 additions & 20 deletions

File tree

‎apps/server/src/provider/Layers/OpenCodeAdapter.test.ts‎

Lines changed: 173 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4549,6 +4549,19 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {
45494549
const succeeded = promiseWithResolvers<unknown>();
45504550
const sessionID = "http://127.0.0.1:9999/session";
45514551
runtimeMock.state.subscribedEvents = [
4552+
{
4553+
id: "step-started",
4554+
created: 1,
4555+
type: "session.step.started",
4556+
durable: { aggregateID: sessionID, seq: 1, version: 1 },
4557+
data: {
4558+
sessionID,
4559+
assistantMessageID: "msg",
4560+
agent: "build",
4561+
model: { providerID: "openai", id: "gpt-5" },
4562+
started: 1,
4563+
},
4564+
} satisfies OpenCodeEvent,
45524565
text.promise,
45534566
reasoning.promise,
45544567
step.promise,
@@ -4586,7 +4599,7 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {
45864599
id: "step",
45874600
created: 3,
45884601
type: "session.step.ended",
4589-
durable: { aggregateID: sessionID, seq: 1, version: 1 },
4602+
durable: { aggregateID: sessionID, seq: 2, version: 1 },
45904603
data: {
45914604
sessionID,
45924605
assistantMessageID: "msg",
@@ -4599,7 +4612,7 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {
45994612
id: "done",
46004613
created: 4,
46014614
type: "session.execution.succeeded",
4602-
durable: { aggregateID: sessionID, seq: 2, version: 1 },
4615+
durable: { aggregateID: sessionID, seq: 3, version: 1 },
46034616
data: { sessionID },
46044617
} satisfies OpenCodeEvent);
46054618
const events = Array.from(yield* Fiber.join(eventsFiber));
@@ -4632,6 +4645,145 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {
46324645
}),
46334646
);
46344647

4648+
it.effect("does not charge a replayed step to the next native turn", () =>
4649+
Effect.gen(function* () {
4650+
const adapter = yield* OpenCodeAdapter;
4651+
const threadId = asThreadId("thread-native-replayed-step-usage");
4652+
const firstStarted = promiseWithResolvers<unknown>();
4653+
const firstSucceeded = promiseWithResolvers<unknown>();
4654+
const secondStarted = promiseWithResolvers<unknown>();
4655+
const replayedFirstStep = promiseWithResolvers<unknown>();
4656+
const secondStep = promiseWithResolvers<unknown>();
4657+
const secondSucceeded = promiseWithResolvers<unknown>();
4658+
const firstCompletionSignal = promiseWithResolvers<void>();
4659+
const sessionID = "http://127.0.0.1:9999/session";
4660+
let firstTurnId: string | undefined;
4661+
runtimeMock.state.subscribedEvents = [
4662+
firstStarted.promise,
4663+
firstSucceeded.promise,
4664+
secondStarted.promise,
4665+
replayedFirstStep.promise,
4666+
secondStep.promise,
4667+
secondSucceeded.promise,
4668+
];
4669+
const completed = yield* adapter.streamEvents.pipe(
4670+
Stream.filter((event) => event.threadId === threadId && event.type === "turn.completed"),
4671+
Stream.tap((event) =>
4672+
event.turnId === firstTurnId
4673+
? Effect.sync(() => firstCompletionSignal.resolve(undefined))
4674+
: Effect.void,
4675+
),
4676+
Stream.take(2),
4677+
Stream.runCollect,
4678+
Effect.forkChild,
4679+
);
4680+
yield* adapter.startSession({
4681+
provider: ProviderDriverKind.make("opencode"),
4682+
threadId,
4683+
runtimeMode: "full-access",
4684+
});
4685+
const firstTurn = yield* adapter.sendTurn({
4686+
threadId,
4687+
input: "First turn",
4688+
modelSelection: createModelSelection(ProviderInstanceId.make("opencode"), "openai/gpt-5"),
4689+
});
4690+
firstTurnId = firstTurn.turnId;
4691+
firstStarted.resolve({
4692+
id: "first-started",
4693+
created: 1,
4694+
type: "session.step.started",
4695+
durable: { aggregateID: sessionID, seq: 1, version: 1 },
4696+
data: {
4697+
sessionID,
4698+
assistantMessageID: "first-message",
4699+
agent: "build",
4700+
model: { providerID: "openai", id: "gpt-5" },
4701+
started: 1,
4702+
},
4703+
} satisfies OpenCodeEvent);
4704+
firstSucceeded.resolve({
4705+
id: "first-succeeded",
4706+
created: 3,
4707+
type: "session.execution.succeeded",
4708+
durable: { aggregateID: sessionID, seq: 3, version: 1 },
4709+
data: { sessionID },
4710+
} satisfies OpenCodeEvent);
4711+
yield* Effect.promise(() => firstCompletionSignal.promise);
4712+
const secondTurn = yield* adapter.sendTurn({
4713+
threadId,
4714+
input: "Second turn",
4715+
modelSelection: createModelSelection(ProviderInstanceId.make("opencode"), "openai/gpt-5"),
4716+
});
4717+
secondStarted.resolve({
4718+
id: "second-started",
4719+
created: 4,
4720+
type: "session.step.started",
4721+
durable: { aggregateID: sessionID, seq: 4, version: 1 },
4722+
data: {
4723+
sessionID,
4724+
assistantMessageID: "second-message",
4725+
agent: "build",
4726+
model: { providerID: "openai", id: "gpt-5" },
4727+
started: 4,
4728+
},
4729+
} satisfies OpenCodeEvent);
4730+
replayedFirstStep.resolve({
4731+
id: "replayed-first-step",
4732+
created: 5,
4733+
type: "session.step.ended",
4734+
durable: { aggregateID: sessionID, seq: 2, version: 1 },
4735+
data: {
4736+
sessionID,
4737+
assistantMessageID: "first-message",
4738+
finish: "stop",
4739+
cost: 0,
4740+
tokens: { input: 100, output: 50, reasoning: 10, cache: { read: 9, write: 8 } },
4741+
},
4742+
} satisfies OpenCodeEvent);
4743+
secondStep.resolve({
4744+
id: "second-step",
4745+
created: 6,
4746+
type: "session.step.ended",
4747+
durable: { aggregateID: sessionID, seq: 5, version: 1 },
4748+
data: {
4749+
sessionID,
4750+
assistantMessageID: "second-message",
4751+
finish: "stop",
4752+
cost: 0,
4753+
tokens: { input: 10, output: 5, reasoning: 2, cache: { read: 3, write: 1 } },
4754+
},
4755+
} satisfies OpenCodeEvent);
4756+
secondSucceeded.resolve({
4757+
id: "second-succeeded",
4758+
created: 7,
4759+
type: "session.execution.succeeded",
4760+
durable: { aggregateID: sessionID, seq: 6, version: 1 },
4761+
data: { sessionID },
4762+
} satisfies OpenCodeEvent);
4763+
4764+
const turns = Array.from(yield* Fiber.join(completed));
4765+
const firstCompleted = turns.find((event) => event.turnId === firstTurn.turnId);
4766+
const secondCompleted = turns.find((event) => event.turnId === secondTurn.turnId);
4767+
NodeAssert.equal(firstCompleted?.type, "turn.completed");
4768+
if (firstCompleted?.type === "turn.completed") {
4769+
NodeAssert.equal(firstCompleted.payload.tokenUsage?.usageStatus, "partial");
4770+
}
4771+
NodeAssert.equal(secondCompleted?.type, "turn.completed");
4772+
if (secondCompleted?.type === "turn.completed") {
4773+
NodeAssert.deepEqual(secondCompleted.payload.tokenUsage, {
4774+
usageStatus: "complete",
4775+
usageScope: "main_agent",
4776+
inputTokens: 14,
4777+
cachedInputTokens: 3,
4778+
cacheCreationTokens: 1,
4779+
outputTokens: 7,
4780+
reasoningTokens: 2,
4781+
hasSubagents: false,
4782+
});
4783+
}
4784+
}),
4785+
);
4786+
46354787
it.effect("uses real native renamed titles and ignores placeholders", () =>
46364788
Effect.gen(function* () {
46374789
const adapter = yield* OpenCodeAdapter;
@@ -4867,13 +5019,15 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {
48675019
const childCreated = promiseWithResolvers<unknown>();
48685020
const childStep = promiseWithResolvers<unknown>();
48695021
const childSucceeded = promiseWithResolvers<unknown>();
5022+
const parentStepStarted = promiseWithResolvers<unknown>();
48705023
const parentStep = promiseWithResolvers<unknown>();
48715024
const parentSucceeded = promiseWithResolvers<unknown>();
48725025
runtimeMock.state.subscribedEvents = [
48735026
parentStarted.promise,
48745027
childCreated.promise,
48755028
childStep.promise,
48765029
childSucceeded.promise,
5030+
parentStepStarted.promise,
48775031
parentStep.promise,
48785032
parentSucceeded.promise,
48795033
];
@@ -4935,11 +5089,24 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {
49355089
durable: { aggregateID: childSessionID, seq: 3, version: 1 },
49365090
data: { sessionID: childSessionID },
49375091
} satisfies OpenCodeEvent);
5092+
parentStepStarted.resolve({
5093+
id: "parent-step-started",
5094+
created: 5,
5095+
type: "session.step.started",
5096+
durable: { aggregateID: sessionID, seq: 2, version: 1 },
5097+
data: {
5098+
sessionID,
5099+
assistantMessageID: "parent-message",
5100+
agent: "build",
5101+
model: { providerID: "openai", id: "gpt-5" },
5102+
started: 5,
5103+
},
5104+
} satisfies OpenCodeEvent);
49385105
parentStep.resolve({
49395106
id: "parent-step",
4940-
created: 5,
5107+
created: 6,
49415108
type: "session.step.ended",
4942-
durable: { aggregateID: sessionID, seq: 2, version: 1 },
5109+
durable: { aggregateID: sessionID, seq: 3, version: 1 },
49435110
data: {
49445111
sessionID,
49455112
assistantMessageID: "parent-message",
@@ -4950,9 +5117,9 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {
49505117
} satisfies OpenCodeEvent);
49515118
parentSucceeded.resolve({
49525119
id: "parent-succeeded",
4953-
created: 6,
5120+
created: 7,
49545121
type: "session.execution.succeeded",
4955-
durable: { aggregateID: sessionID, seq: 3, version: 1 },
5122+
durable: { aggregateID: sessionID, seq: 4, version: 1 },
49565123
data: { sessionID },
49575124
} satisfies OpenCodeEvent);
49585125
const completed = Option.getOrThrow(yield* Fiber.join(completedFiber));

0 commit comments

Comments
 (0)