Skip to content

Commit 1218288

Browse files
committed
fix(server): preserve pending attachment budgets through compaction
1 parent bc836a0 commit 1218288

2 files changed

Lines changed: 253 additions & 27 deletions

File tree

‎apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts‎

Lines changed: 186 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3378,10 +3378,163 @@ describe("ClaudeAdapterV2 background wake turns", () => {
33783378
});
33793379
const makeWakeHarness = makeWakeHarnessWithOptions();
33803380

3381+
it.effect.each(["release-after", "cancel-after", "release-before"] as const)(
3382+
"keeps attachment reservations across compaction: %s boundary",
3383+
(outcome) =>
3384+
Effect.gen(function* () {
3385+
const fileSystem = yield* FileSystem.FileSystem;
3386+
const path = yield* Path.Path;
3387+
const idAllocator = yield* IdAllocator.IdAllocatorV2;
3388+
const backgrounding = yield* Deferred.make<void>();
3389+
const release = yield* Deferred.make<void>();
3390+
const harness = yield* makeWakeHarnessWithOptions({
3391+
backgroundTasks: () =>
3392+
Deferred.succeed(backgrounding, undefined).pipe(
3393+
Effect.andThen(Deferred.await(release)),
3394+
Effect.as(true),
3395+
),
3396+
});
3397+
const document = ChatFileAttachment.make({
3398+
type: "file",
3399+
id: ChatAttachmentId.make("compacting-document"),
3400+
name: "compacting.pdf",
3401+
mimeType: "application/pdf",
3402+
sizeBytes: 19 * 1024 * 1024,
3403+
});
3404+
const pages = Buffer.from(
3405+
`%PDF-1.7\n1 0 obj << /Type /Catalog /Pages 2 0 R >> endobj\n2 0 obj << /Type /Pages /Count 60 >> endobj\n${Array.from({ length: 60 }, (_, i) => `${i + 3} 0 obj << /Type /Page /Parent 2 0 R >> endobj`).join("\n")}\n`,
3406+
);
3407+
yield* fileSystem.writeFile(
3408+
path.join(harness.attachmentsDir, attachmentRelativePath(document)!),
3409+
Buffer.concat([
3410+
pages,
3411+
Buffer.alloc(document.sizeBytes - pages.length - 5, 32),
3412+
Buffer.from("%%EOF"),
3413+
]),
3414+
);
3415+
const input = makeClaudeTestTurnInput({
3416+
threadId: harness.threadId,
3417+
providerThread: harness.providerThread,
3418+
now: yield* DateTime.now,
3419+
attemptId: RunAttemptId.make("compacting-reservation"),
3420+
text: "Audit with a subagent.",
3421+
attachments: [],
3422+
});
3423+
yield* harness.runtime.startTurn(input);
3424+
yield* harness.offerAndWait(
3425+
claudeSdkFrame({
3426+
type: "system",
3427+
subtype: "task_started",
3428+
task_id: "compacting-task",
3429+
tool_use_id: "compacting-tool",
3430+
description: "Audit",
3431+
subagent_type: "general-purpose",
3432+
is_backgrounded: false,
3433+
task_type: "local_agent",
3434+
prompt: "Audit.",
3435+
uuid: "00000000-0000-4000-8000-000000000811",
3436+
session_id: WAKE_NATIVE_SESSION,
3437+
}),
3438+
);
3439+
const steer = harness.runtime.steerTurn({
3440+
threadId: harness.threadId,
3441+
runId: input.runId,
3442+
providerThread: harness.providerThread,
3443+
providerTurnId: idAllocator.derive.providerTurn({
3444+
driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
3445+
nativeTurnId: `turn:${input.attemptId}`,
3446+
}),
3447+
message: {
3448+
createdBy: "user",
3449+
creationSource: "web",
3450+
messageId: MessageId.make("compacting-steer"),
3451+
text: "Read this PDF.",
3452+
attachments: [document],
3453+
},
3454+
});
3455+
const pending = yield* Effect.forkScoped(steer);
3456+
yield* Deferred.await(backgrounding);
3457+
assert.lengthOf(harness.offeredMessages, 1);
3458+
yield* harness.offerAndWait(
3459+
claudeSdkFrame({
3460+
type: "system",
3461+
subtype: "status",
3462+
status: "compacting",
3463+
uuid: "00000000-0000-4000-8000-000000000812",
3464+
session_id: WAKE_NATIVE_SESSION,
3465+
}),
3466+
);
3467+
if (outcome === "release-before") {
3468+
yield* Deferred.succeed(release, undefined);
3469+
yield* Fiber.join(pending);
3470+
}
3471+
yield* harness.offerAndWait(
3472+
claudeSdkFrame({
3473+
type: "system",
3474+
subtype: "compact_boundary",
3475+
compact_metadata: { trigger: "auto", pre_tokens: 1500, post_tokens: 400 },
3476+
uuid: "00000000-0000-4000-8000-000000000813",
3477+
session_id: WAKE_NATIVE_SESSION,
3478+
}),
3479+
);
3480+
if (outcome === "cancel-after") {
3481+
yield* Fiber.interrupt(pending);
3482+
assert.isTrue(Exit.hasInterrupts(yield* Fiber.await(pending)));
3483+
} else if (outcome === "release-after") {
3484+
yield* Deferred.succeed(release, undefined);
3485+
yield* Fiber.join(pending);
3486+
}
3487+
// Flush the budget update through the event stream before trying again.
3488+
yield* harness.offerAndWait(
3489+
makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000814", result: "Read." }),
3490+
);
3491+
yield* Queue.take(harness.terminalReceipts);
3492+
const updates = harness.events.flatMap((event) =>
3493+
event.type === "provider_thread.updated" ? [event.providerThread] : [],
3494+
);
3495+
for (const thread of updates) {
3496+
yield* decodeProviderThreadJson(yield* encodeProviderThreadJson(thread));
3497+
}
3498+
const persisted = updates.at(-1)!;
3499+
const usage = persisted.nativeMetadata?.claudeAttachmentBudget;
3500+
assert.equal(usage?.pagesUsed, outcome === "cancel-after" ? 0 : 60);
3501+
if (outcome === "cancel-after") assert.equal(usage?.bytesUsed, 0);
3502+
else assert.isAbove(usage?.bytesUsed ?? 0, 25 * 1024 * 1024);
3503+
yield* harness.runtime.startTurn(
3504+
makeClaudeTestTurnInput({
3505+
threadId: harness.threadId,
3506+
providerThread: persisted,
3507+
now: yield* DateTime.now,
3508+
attemptId: RunAttemptId.make("after-compacting-reservation"),
3509+
text: "Read this PDF again.",
3510+
attachments: [document],
3511+
providerTurnOrdinal: 2,
3512+
}),
3513+
);
3514+
const delivered = harness.offeredMessages.slice(1);
3515+
const documents = delivered.flatMap((message) =>
3516+
Array.isArray(message.message.content)
3517+
? message.message.content.filter((block) => block.type === "document")
3518+
: [],
3519+
);
3520+
assert.lengthOf(documents, 1);
3521+
assert.isBelow(
3522+
Buffer.byteLength(encodeJsonString(delivered.map((message) => message.message.content))),
3523+
32_000_000,
3524+
);
3525+
}).pipe(
3526+
Effect.provide(
3527+
Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
3528+
),
3529+
),
3530+
);
3531+
33813532
const attachmentBudgetOutcomes = [
33823533
"resume",
33833534
"legacy",
33843535
"compacted",
3536+
"preserved-segment",
3537+
"preserved-messages",
33853538
"failed",
33863539
"stopped",
33873540
"fork-bytes",
@@ -3434,7 +3587,15 @@ describe("ClaudeAdapterV2 background wake turns", () => {
34343587
const first = harness.offeredMessages[0]?.message.content;
34353588
assert.isArray(first);
34363589
if (Array.isArray(first)) assert.equal(first[0]?.type, "document");
3437-
if (["compacted", "failed", "stopped"].includes(outcome)) {
3590+
if (
3591+
[
3592+
"compacted",
3593+
"preserved-segment",
3594+
"preserved-messages",
3595+
"failed",
3596+
"stopped",
3597+
].includes(outcome)
3598+
) {
34383599
yield* harness.offerAndWait(
34393600
claudeSdkFrame({
34403601
type: "system",
@@ -3446,11 +3607,33 @@ describe("ClaudeAdapterV2 background wake turns", () => {
34463607
);
34473608
yield* harness.offerAndWait(
34483609
claudeSdkFrame(
3449-
outcome === "compacted"
3610+
outcome === "compacted" ||
3611+
outcome === "preserved-segment" ||
3612+
outcome === "preserved-messages"
34503613
? {
34513614
type: "system",
34523615
subtype: "compact_boundary",
3453-
compact_metadata: { trigger: "auto", pre_tokens: 1500, post_tokens: 400 },
3616+
compact_metadata: {
3617+
trigger: "auto",
3618+
pre_tokens: 1500,
3619+
post_tokens: 400,
3620+
...(outcome === "preserved-segment"
3621+
? {
3622+
preserved_segment: {
3623+
head_uuid: harness.promptUuid(0),
3624+
tail_uuid: harness.promptUuid(0),
3625+
anchor_uuid: "00000000-0000-4000-8000-000000000802",
3626+
},
3627+
}
3628+
: outcome === "preserved-messages"
3629+
? {
3630+
preserved_messages: {
3631+
anchor_uuid: "00000000-0000-4000-8000-000000000802",
3632+
uuids: [harness.promptUuid(0)],
3633+
},
3634+
}
3635+
: {}),
3636+
},
34543637
uuid: "00000000-0000-4000-8000-000000000802",
34553638
session_id: WAKE_NATIVE_SESSION,
34563639
}

0 commit comments

Comments
 (0)