Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 87 additions & 0 deletions apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8256,6 +8256,93 @@ describe("ClaudeAdapterV2 background wake turns", () => {
),
);

it.effect("reports an empty context when /clear resets the conversation", () =>
Effect.gen(function* () {
const harness = yield* makeWakeHarness;
yield* harness.runtime.startTurn(
makeClaudeTestTurnInput({
threadId: harness.threadId,
providerThread: harness.providerThread,
now: yield* DateTime.now,
attemptId: RunAttemptId.make("attempt-before-clear"),
text: "Continue.",
attachments: [],
}),
);
yield* Queue.offer(
harness.sdkMessages,
usageSnapshotFrame("msg_before_clear", "00000000-0000-4000-8000-000000000800", {
...zeroUsage,
input_tokens: 166_000,
output_tokens: 100,
}),
);
yield* Queue.offer(
harness.sdkMessages,
makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000801", result: "Done." }),
);
yield* Queue.take(harness.terminalReceipts);

yield* harness.runtime.startTurn(
makeClaudeTestTurnInput({
threadId: harness.threadId,
providerThread: harness.providerThread,
now: yield* DateTime.now,
attemptId: RunAttemptId.make("attempt-clear"),
text: "/clear",
attachments: [],
}),
);
// Claude CLI 2.1.304 answers /clear with these frames and makes no API request.
const frames = [
claudeSdkFrame({
type: "conversation_reset",
trigger: "clear",
new_conversation_id: "00000000-0000-4000-8000-000000000802",
uuid: "00000000-0000-4000-8000-000000000803",
session_id: WAKE_NATIVE_SESSION,
}),
claudeSdkFrame({
type: "system",
subtype: "init",
uuid: "00000000-0000-4000-8000-000000000804",
session_id: WAKE_NATIVE_SESSION,
}),
makeResultFrame({
uuid: "00000000-0000-4000-8000-000000000805",
result: "",
numTurns: 0,
usage: zeroUsage,
}),
];
for (const frame of frames) yield* Queue.offer(harness.sdkMessages, frame);
const terminal = yield* Queue.take(harness.terminalReceipts);
assert.equal(terminal.status, "completed");

const contextReports = harness.events.flatMap((event) =>
event.type === "provider_turn.updated" && event.providerTurn.tokenUsage
? [{ runAttemptId: event.providerTurn.runAttemptId, ...event.providerTurn.tokenUsage }]
: [],
);
const latest = contextReports.at(-1);
assert.deepEqual(
{ runAttemptId: latest?.runAttemptId, usedTokens: latest?.usedTokens },
{ runAttemptId: RunAttemptId.make("attempt-clear"), usedTokens: 0 },
"the newest context report after /clear must be the cleared turn's empty context",
);
assert.equal(latest?.maxTokens, contextReports[0]?.maxTokens);
}).pipe(
Effect.provide(
Layer.mergeAll(
IdAllocator.layer,
McpProviderSessions.layer,
NodeServices.layer,
NodeCrypto.layer,
),
),
),
);

it.effect("reports the settings directory of a reused Claude query", () =>
Effect.gen(function* () {
const fileSystem = yield* FileSystem.FileSystem;
Expand Down
8 changes: 8 additions & 0 deletions apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9243,6 +9243,14 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
}
}

// Every trigger discards the conversation, so reset whatever the trigger is.
if (message.type === "conversation_reset") {
if (context.streamUsage !== null) context.streamUsage.usage = null;
context.compactionTokens = 0;
yield* emitContextUsage(context, 0);
return;
}

if (
message.type === "system" &&
(message.subtype === "compact_boundary" ||
Expand Down
Loading