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

it.effect("holds background commands by default when T3CODE_BACKGROUND_COMMANDS_HOLD is on", () =>
Effect.gen(function* () {
const harness = yield* makeWakeHarnessWithOptions({
environment: { [ClaudeAdapterV2.CLAUDE_BACKGROUND_COMMANDS_HOLD_ENV]: "1" },
});
const now = yield* DateTime.now;
const awaitBackgroundTasks = harness.runtime.awaitBackgroundTasks;
if (awaitBackgroundTasks === undefined) {
throw new Error("Claude adapter runtime must expose awaitBackgroundTasks.");
}
const nextRoster = Effect.fn("nextRoster")(function* (
matches: (tasks: ReadonlyArray<OrchestrationV2PendingBackgroundTask>) => boolean,
) {
while (true) {
const { providerThread } = yield* Queue.take(harness.providerThreadReceipts);
const tasks = providerThread.pendingBackgroundTasks ?? [];
if (matches(tasks)) return tasks;
}
});
const marks = (tasks: ReadonlyArray<OrchestrationV2PendingBackgroundTask>) =>
tasks.map((task) => [task.taskId, task.awaited === true]);
yield* harness.runtime.startTurn(
makeClaudeTestTurnInput({
threadId: harness.threadId,
providerThread: harness.providerThread,
now,
attemptId: RunAttemptId.make("attempt-claude-commands-hold"),
text: "Wait for the deploy in the background and start the dev server.",
attachments: [],
}),
);
yield* Queue.offer(
harness.sdkMessages,
claudeSdkFrame({
type: "system",
subtype: "background_tasks_changed",
tasks: ["deploy-wait", "dev-server"].map((taskId) => ({
task_id: taskId,
task_type: "local_bash",
description: taskId,
})),
uuid: "00000000-0000-4000-8000-000000000351",
session_id: WAKE_NATIVE_SESSION,
}),
);
// Unmarked commands hold the thread without a t3_background_wait call.
assert.deepStrictEqual(marks(yield* nextRoster((tasks) => tasks.length === 2)), [
["deploy-wait", true],
["dev-server", true],
]);
// The agent releases a dev server explicitly.
yield* awaitBackgroundTasks({
providerThread: harness.providerThread,
taskIds: ["dev-server"],
awaited: false,
});
assert.deepStrictEqual(
marks(yield* nextRoster((tasks) => tasks.some((task) => task.awaited !== true))),
[
["deploy-wait", true],
["dev-server", false],
],
);
yield* Queue.offer(harness.sdkMessages, turnOneResult);
yield* Queue.take(harness.terminalReceipts);
}).pipe(
Effect.provide(
Layer.mergeAll(
IdAllocator.layer,
McpProviderSessions.layer,
NodeServices.layer,
NodeCrypto.layer,
),
),
),
);

it.effect("keeps a running Claude monitor typed after many newer monitors end", () =>
Effect.gen(function* () {
const harness = yield* makeWakeHarness;
Expand Down
37 changes: 36 additions & 1 deletion apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3756,6 +3756,8 @@ function isClaudeLocalCommandEcho(message: SDKMessage): boolean {
return typeof content === "string" && content.startsWith("<local-command-stdout>");
}

export const CLAUDE_BACKGROUND_COMMANDS_HOLD_ENV = "T3CODE_BACKGROUND_COMMANDS_HOLD";

function claudePendingBackgroundTasksFromRoster(
roster: ReadonlyMap<string, OrchestrationV2PendingBackgroundTask>,
awaitedTaskIds: ReadonlySet<string>,
Expand Down Expand Up @@ -5918,6 +5920,11 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
const awaitedBackgroundTasksByNativeThread = yield* Ref.make(
new Map<string, Set<string>>(),
);
// Opt-in: a background command holds its thread like an awaited one until the agent
// releases it with t3_background_wait waiting:false (a dev server, a watcher).
const backgroundCommandsHold =
adapterOptions.environment[CLAUDE_BACKGROUND_COMMANDS_HOLD_ENV] === "1";
const releasedBackgroundTasksByNativeThread = new Map<string, Set<string>>();
// Wake eligibility is separate from the Waiting roster. It survives empty
// background_tasks_changed levels (SDK: empty level can precede task_notification) and
// is consumed when the first idle notification is buffered/offered so duplicates cannot
Expand Down Expand Up @@ -6119,7 +6126,26 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
roster: ReadonlyMap<string, OrchestrationV2PendingBackgroundTask>,
awaitedTaskIds: ReadonlySet<string>,
): ReadonlyArray<OrchestrationV2PendingBackgroundTask> => {
const tasks = claudePendingBackgroundTasksFromRoster(roster, awaitedTaskIds);
const released =
nativeThreadId === null
? undefined
: releasedBackgroundTasksByNativeThread.get(nativeThreadId);
if (released !== undefined) {
for (const taskId of released) if (!roster.has(taskId)) released.delete(taskId);
}
const tasks = claudePendingBackgroundTasksFromRoster(
roster,
backgroundCommandsHold
? new Set([
...awaitedTaskIds,
...Array.from(roster.values())
.filter(
(task) => task.kind === "command" && released?.has(task.taskId) !== true,
)
.map((task) => task.taskId),
])
: awaitedTaskIds,
);
return nativeThreadId !== null && scheduledWakeupsByNativeThread.has(nativeThreadId)
? [...tasks, CLAUDE_SCHEDULED_WAKEUP_TASK]
: tasks;
Expand Down Expand Up @@ -14233,6 +14259,15 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
);
const matched = [...new Set(taskIds)].filter((taskId) => roster.has(taskId));
if (matched.length === 0) return { matched };
const released =
releasedBackgroundTasksByNativeThread.get(nativeThreadId) ?? new Set();
for (const taskId of matched) {
if (awaited) released.delete(taskId);
else released.add(taskId);
}
if (released.size > 0)
releasedBackgroundTasksByNativeThread.set(nativeThreadId, released);
else releasedBackgroundTasksByNativeThread.delete(nativeThreadId);
if (awaited) {
yield* addTaskIdsToNativeThreadSet(
awaitedBackgroundTasksByNativeThread,
Expand Down
Loading