Skip to content
Merged
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
61 changes: 61 additions & 0 deletions apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11529,6 +11529,67 @@ describe("ClaudeAdapterV2 background wake turns", () => {
),
);

it.effect("keeps a foreground fork running past the placeholder result for its own launch", () =>
Effect.scoped(
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-claude-foreground-fork"),
text: "Fork this.",
attachments: [],
}),
);
yield* harness.offerAndWait(
makeSubagentTaskStartedFrame({
taskId: "agent-fork",
toolUseId: "toolu-fork",
uuid: "00000000-0000-4000-8000-000000000901",
}),
);
// Claude Code opens a foreground fork's own stream with a placeholder result for its launch.
yield* harness.offerAndWait(
claudeSdkFrame({
type: "user",
message: {
role: "user",
content: [
{
type: "tool_result",
tool_use_id: "toolu-fork",
content: "Fork started — that fork is you.",
},
],
},
parent_tool_use_id: "toolu-fork",
uuid: "00000000-0000-4000-8000-000000000902",
session_id: WAKE_NATIVE_SESSION,
}),
);
yield* harness.offerAndWait(
makeSubagentNotificationFrame({
taskId: "agent-fork",
toolUseId: "toolu-fork",
summary: "FORK-DONE",
uuid: "00000000-0000-4000-8000-000000000903",
}),
);
let settled = yield* Queue.take(harness.subagentReceipts);
while (settled.subagent.status === "running") {
settled = yield* Queue.take(harness.subagentReceipts);
}
assert.equal(settled.subagent.result, "FORK-DONE");
}).pipe(
Effect.provide(
Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
),
),
),
);

it.effect("releases the idle pin when a post-settle subagent stops without completing", () =>
Effect.scoped(
Effect.gen(function* () {
Expand Down
2 changes: 2 additions & 0 deletions apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8819,6 +8819,8 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
}

for (const { toolResult, output } of claudeToolResultEntriesFromMessage(message)) {
// A foreground fork's stream opens with a placeholder result for its own launch call.
if (parentToolUseIdFromSdkMessage(message) === toolResult.tool_use_id) continue;
const subagent = yield* resolveSubagentByToolUseId(context, toolResult.tool_use_id);
const runHandles = parseClaudeWorkflowRunHandles(claudeNativeToolOutputValue(output));
if (subagent !== undefined && runHandles !== undefined) {
Expand Down
Loading