Skip to content
Merged
213 changes: 208 additions & 5 deletions apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2636,7 +2636,7 @@ describe("ClaudeAdapterV2 attachments", () => {
},
});

assert.equal(offeredMessages[1]?.priority, "now");
assert.equal(offeredMessages[1]?.priority, "next");
assert.deepEqual(offeredMessages[1]?.message.content, expectedContent);
const documentPath = path.join(attachmentsDir, attachmentRelativePath(document)!);
for (const scenario of [
Expand Down Expand Up @@ -5739,7 +5739,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
},
});
const attachmentNote = `\n\n[Attached file "requirements.pdf" is saved at: ${path.join(harness.attachmentsDir, attachmentRelativePath(attachment)!)}]`;
assert.equal(harness.offeredMessages[1]?.priority, "now");
assert.equal(harness.offeredMessages[1]?.priority, "next");
assert.deepEqual(harness.offeredMessages[1]?.message.content, [
{ type: "text", text: `${leadingText}${attachmentNote}` },
{ type: "text", text: `/implement the fixes${attachmentNote}` },
Expand Down Expand Up @@ -5830,7 +5830,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
},
}),
);
// Past task_started the CLI queues a "now" steer until the call returns.
// Past task_started the CLI queues a steer until the call returns.
yield* harness.offerAndWait(
claudeSdkFrame({
type: "system",
Expand Down Expand Up @@ -6008,7 +6008,47 @@ describe("ClaudeAdapterV2 background wake turns", () => {
user_message_uuid: harness.promptUuid(0),
}),
);
// Claude answers the unread steer as its next native turn, which belongs to this turn.
assert.equal(harness.terminalEvents().length, 0);
yield* expectSteers({
"message-steer-read": "completed",
"message-steer-unread": "pending",
});
const decision = yield* Effect.promise(() =>
harness.getOpenedOptions()!.canUseTool!(
"Read",
{ file_path: "README.md" },
{
signal: new AbortController().signal,
toolUseID: "steer-read",
requestId: "request-steer-read",
},
),
).pipe(Effect.forkScoped);
const first = yield* Effect.raceFirst(
Queue.take(harness.runtimeRequestReceipts).pipe(Effect.as("request")),
Fiber.join(decision).pipe(Effect.map((result) => result?.behavior)),
);
assert.notEqual(first, "deny");
yield* harness.offerAndWait(
makeAssistantTextFrame({
uuid: "00000000-0000-4000-8000-000000002397",
text: "Steer reply.",
}),
);
yield* harness.offerAndWait(
claudeSdkFrame({
...makeResultFrame({ uuid: "00000000-0000-4000-8000-000000002398", result: "Done." }),
user_message_uuid: harness.promptUuid(2),
}),
);
yield* harness.awaitTerminal(1);
assert.equal(harness.terminalEvents()[0]?.status, "completed");
assert.ok(
harness.events.some(
(event) => event.type === "message.updated" && event.message.text === "Steer reply.",
),
);
yield* expectSteers({
"message-steer-read": "completed",
"message-steer-unread": "completed",
Expand All @@ -6026,13 +6066,176 @@ describe("ClaudeAdapterV2 background wake turns", () => {
),
);

// A steer Claude starts after holding the result answers in this turn, so dropping another
// steer then must not end the turn under it.
it.effect("keeps the turn open for a started steer when Claude drops another", () =>
Effect.gen(function* () {
const harness = yield* makeWakeHarness;
const idAllocator = yield* IdAllocator.IdAllocatorV2;
const attemptId = RunAttemptId.make("attempt-steer-dropped");
const input = makeClaudeTestTurnInput({
threadId: harness.threadId,
providerThread: harness.providerThread,
now: yield* DateTime.now,
attemptId,
text: "Run the build.",
attachments: [],
});
yield* harness.runtime.startTurn(input);
for (const id of ["message-steer-started", "message-steer-dropped"]) {
yield* harness.runtime.steerTurn({
threadId: harness.threadId,
runId: input.runId,
providerThread: harness.providerThread,
providerTurnId: idAllocator.derive.providerTurn({
driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
nativeTurnId: `turn:${attemptId}`,
}),
message: {
createdBy: "user",
creationSource: "web",
messageId: MessageId.make(id),
text: `Steer ${id}`,
attachments: [],
},
});
}
const lifecycle = (index: number, state: string, uuid: string) =>
harness.offerAndWait(
claudeSdkFrame({
type: "command_lifecycle",
command_uuid: harness.promptUuid(index),
state,
uuid,
session_id: WAKE_NATIVE_SESSION,
}),
);
yield* harness.offerAndWait(
claudeSdkFrame({
...makeResultFrame({ uuid: "00000000-0000-4000-8000-000000002500", result: "Built." }),
user_message_uuid: harness.promptUuid(0),
}),
);
yield* lifecycle(1, "started", "00000000-0000-4000-8000-000000002501");
yield* lifecycle(2, "cancelled", "00000000-0000-4000-8000-000000002502");
yield* harness.offerAndWait(
makeAssistantTextFrame({
uuid: "00000000-0000-4000-8000-000000002503",
text: "Steer reply.",
}),
);
yield* harness.offerAndWait(
claudeSdkFrame({
...makeResultFrame({ uuid: "00000000-0000-4000-8000-000000002504", result: "Done." }),
user_message_uuid: harness.promptUuid(1),
}),
);
yield* harness.awaitTerminal(1);
const reply = harness.events.find(
(event) => event.type === "message.updated" && event.message.text === "Steer reply.",
);
assert.equal(reply?.type === "message.updated" ? reply.message.runId : null, input.runId);
assert.deepEqual(
harness.events.flatMap((event) =>
event.type === "steer.updated" ? [[event.messageId, event.status]] : [],
),
[
["message-steer-started", "pending"],
["message-steer-dropped", "pending"],
["message-steer-started", "completed"],
],
);
}).pipe(
Effect.scoped,
Effect.provide(
Layer.mergeAll(
IdAllocator.layer,
McpProviderSessions.layer,
NodeServices.layer,
NodeCrypto.layer,
),
),
),
);

it.effect("keeps both result-only replies of a steered turn", () =>
Effect.gen(function* () {
const harness = yield* makeWakeHarness;
const idAllocator = yield* IdAllocator.IdAllocatorV2;
const attemptId = RunAttemptId.make("attempt-steer-result-only");
const input = makeClaudeTestTurnInput({
threadId: harness.threadId,
providerThread: harness.providerThread,
now: yield* DateTime.now,
attemptId,
text: "Run the build.",
attachments: [],
});
yield* harness.runtime.startTurn(input);
yield* harness.runtime.steerTurn({
threadId: harness.threadId,
runId: input.runId,
providerThread: harness.providerThread,
providerTurnId: idAllocator.derive.providerTurn({
driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
nativeTurnId: `turn:${attemptId}`,
}),
message: {
createdBy: "user",
creationSource: "web",
messageId: MessageId.make("message-steer-result-only"),
text: "Steer",
attachments: [],
},
});
yield* harness.offerAndWait(
claudeSdkFrame({
...makeResultFrame({ uuid: "00000000-0000-4000-8000-000000002510", result: "Built." }),
user_message_uuid: harness.promptUuid(0),
}),
);
yield* harness.offerAndWait(
claudeSdkFrame({
type: "command_lifecycle",
command_uuid: harness.promptUuid(1),
state: "started",
uuid: "00000000-0000-4000-8000-000000002511",
session_id: WAKE_NATIVE_SESSION,
}),
);
yield* harness.offerAndWait(
claudeSdkFrame({
...makeResultFrame({ uuid: "00000000-0000-4000-8000-000000002512", result: "Done." }),
user_message_uuid: harness.promptUuid(1),
}),
);
yield* harness.awaitTerminal(1);
const replies = harness.events.flatMap((event) =>
event.type === "message.updated" && event.message.role === "assistant"
? [event.message.text]
: [],
);
assert.equal(replies.at(-1), "Built.\n\nDone.");
}).pipe(
Effect.scoped,
Effect.provide(
Layer.mergeAll(
IdAllocator.layer,
McpProviderSessions.layer,
NodeServices.layer,
NodeCrypto.layer,
),
),
),
);

// Claude can answer a steer while its offer is still being logged.
it.effect("settles a turn whose result echoes only a steer before the offer returns", () =>
Effect.gen(function* () {
let settleDuringOffer: (message: SDKUserMessage) => Effect.Effect<void> = () => Effect.void;
const harness = yield* makeWakeHarnessWithOptions({
offer: (message) =>
message.priority === "now"
message.priority === "next"
? Effect.suspend(() => settleDuringOffer(message))
: Effect.void,
});
Expand Down Expand Up @@ -8187,7 +8390,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
attachments: [],
},
});
assert.equal(harness.offeredMessages[1]?.priority, "now");
assert.equal(harness.offeredMessages[1]?.priority, "next");
}
const partialText = "The audit covers the `integ";
if (!queryExits)
Expand Down
Loading
Loading