@@ -3613,6 +3613,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
36133613 event.type === "turn.terminal",
36143614 );
36153615 return {
3616+ adapter,
36163617 attachmentsDir,
36173618 runtime,
36183619 providerThread,
@@ -8966,6 +8967,129 @@ describe("ClaudeAdapterV2 background wake turns", () => {
89668967 ),
89678968 );
89688969
8970+ it.effect("keeps each session on the window its own Claude process reports", () =>
8971+ Effect.gen(function* () {
8972+ const harness = yield* makeWakeHarnessWithOptions({ freshQueueOnReopen: true });
8973+ const modelSelection = {
8974+ instanceId: ProviderInstanceId.make(ClaudeAdapterV2.CLAUDE_PROVIDER),
8975+ model: "claude-opus-5-5",
8976+ } satisfies ModelSelection;
8977+ const usage = { ...zeroUsage, input_tokens: 9_667, output_tokens: 2 };
8978+ const reportedWindow = (uuid: string, contextWindow: number) =>
8979+ makeResultFrame({
8980+ uuid,
8981+ result: "OK",
8982+ modelUsage: {
8983+ "claude-opus-5-5": {
8984+ inputTokens: 9_667,
8985+ outputTokens: 2,
8986+ cacheReadInputTokens: 0,
8987+ cacheCreationInputTokens: 0,
8988+ webSearchRequests: 0,
8989+ costUSD: 0,
8990+ contextWindow,
8991+ maxOutputTokens: 32_000,
8992+ },
8993+ },
8994+ });
8995+ const windows = (events: ReadonlyArray<ProviderAdapter.ProviderAdapterV2Event>) =>
8996+ events.flatMap((event) =>
8997+ event.type === "provider_turn.updated" && event.providerTurn.tokenUsage
8998+ ? [event.providerTurn.tokenUsage.maxTokens]
8999+ : [],
9000+ );
9001+ const startTurn = (
9002+ runtime: ProviderAdapter.ProviderAdapterV2SessionRuntime,
9003+ threadId: ThreadId,
9004+ providerThread: typeof harness.providerThread,
9005+ attemptId: string,
9006+ ) =>
9007+ Effect.gen(function* () {
9008+ yield* runtime.startTurn(
9009+ makeClaudeTestTurnInput({
9010+ threadId,
9011+ providerThread,
9012+ now: yield* DateTime.now,
9013+ attemptId: RunAttemptId.make(attemptId),
9014+ text: "Continue.",
9015+ attachments: [],
9016+ modelSelection,
9017+ }),
9018+ );
9019+ });
9020+
9021+ yield* startTurn(harness.runtime, harness.threadId, harness.providerThread, "attempt-a-1");
9022+ yield* Queue.offer(
9023+ harness.sdkMessages,
9024+ usageStreamFrame({ type: "message_start", message: { id: "msg_a1", usage } }),
9025+ );
9026+ yield* Queue.offer(
9027+ harness.sdkMessages,
9028+ reportedWindow("00000000-0000-4000-8000-000000000690", 200_000),
9029+ );
9030+ assert.equal((yield* Queue.take(harness.terminalReceipts)).status, "completed");
9031+
9032+ const threadB = ThreadId.make("thread-claude-wake-b");
9033+ const runtimeB = yield* harness.adapter.openSession({
9034+ threadId: threadB,
9035+ providerSessionId: ProviderSessionId.make("provider-session-claude-wake-b"),
9036+ modelSelection,
9037+ runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
9038+ });
9039+ const providerThreadB = yield* runtimeB.ensureThread({
9040+ threadId: threadB,
9041+ modelSelection,
9042+ runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
9043+ });
9044+ const eventsB: Array<ProviderAdapter.ProviderAdapterV2Event> = [];
9045+ const terminalsB = yield* Queue.unbounded<ProviderAdapter.ProviderAdapterV2Event>();
9046+ yield* runtimeB.events.pipe(
9047+ Stream.runForEach((event) =>
9048+ Effect.gen(function* () {
9049+ eventsB.push(event);
9050+ if (event.type === "turn.terminal") yield* Queue.offer(terminalsB, event);
9051+ }),
9052+ ),
9053+ Effect.forkScoped,
9054+ );
9055+ yield* startTurn(runtimeB, threadB, providerThreadB, "attempt-b-1");
9056+ const queueB = harness.processQueues.at(-1);
9057+ assert.isDefined(queueB);
9058+ assert.notStrictEqual(queueB, harness.sdkMessages);
9059+ yield* Queue.offer(
9060+ queueB,
9061+ usageStreamFrame({ type: "message_start", message: { id: "msg_b1", usage } }),
9062+ );
9063+ yield* Queue.offer(queueB, reportedWindow("00000000-0000-4000-8000-000000000691", 1_000_000));
9064+ yield* Queue.take(terminalsB);
9065+
9066+ yield* startTurn(harness.runtime, harness.threadId, harness.providerThread, "attempt-a-2");
9067+ yield* Queue.offer(
9068+ harness.sdkMessages,
9069+ usageStreamFrame({ type: "message_start", message: { id: "msg_a2", usage } }),
9070+ );
9071+ yield* Queue.offer(
9072+ harness.sdkMessages,
9073+ reportedWindow("00000000-0000-4000-8000-000000000692", 200_000),
9074+ );
9075+ assert.equal((yield* Queue.take(harness.terminalReceipts)).status, "completed");
9076+
9077+ assert.deepEqual(windows(harness.events), [1_000_000, 200_000, 200_000]);
9078+ assert.deepEqual(windows(eventsB), [1_000_000, 1_000_000]);
9079+ assert.strictEqual(harness.runtime.getModelContextWindow?.(modelSelection), 200_000);
9080+ assert.strictEqual(runtimeB.getModelContextWindow?.(modelSelection), 1_000_000);
9081+ }).pipe(
9082+ Effect.provide(
9083+ Layer.mergeAll(
9084+ IdAllocator.layer,
9085+ McpProviderSessions.layer,
9086+ NodeServices.layer,
9087+ NodeCrypto.layer,
9088+ ),
9089+ ),
9090+ ),
9091+ );
9092+
89699093 it.effect("merges cumulative stream usage into the message_start counts", () =>
89709094 Effect.gen(function* () {
89719095 const harness = yield* makeWakeHarnessWithOptions({
0 commit comments