Skip to content

Commit 588b1c2

Browse files
fix(pi): prompts sent during compaction are delivered once it ends
Pi rejects every prompt while compacting, including compaction an extension starts after the turn settled, so turn-start and steer messages sent then were lost as provider errors. The adapter now tracks native compaction session-wide in the event pump, holds outgoing prompts while it runs, and sends them in order on compaction_end (completed, failed, or aborted). A prompt that raced a compaction Pi had already started is re-held when Pi rejects it with its compaction error. The post-compaction settle probe waits for the released prompt's ack, and Stop while a prompt is held restarts Pi as for other compaction. Fixes #24227 Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 7737dcc commit 588b1c2

2 files changed

Lines changed: 230 additions & 51 deletions

File tree

‎packages/provider-pi/src/server/adapter.test.ts‎

Lines changed: 136 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ describe("PiAdapterV2", () => {
707707
);
708708

709709
it.effect.each([false, true])(
710-
"retains native wake ownership after a rejected joining prompt, compaction aborted=%s",
710+
"retains native wake ownership and delivers a joining prompt held through compaction, aborted=%s",
711711
(aborted) =>
712712
Effect.gen(function* () {
713713
const fake = yield* makeFakePi;
@@ -734,9 +734,6 @@ describe("PiAdapterV2", () => {
734734
yield* fake.emit({ type: "agent_settled" });
735735
yield* fake.emit({ type: "compaction_start", reason: "manual" });
736736
yield* startTurn(runtime, providerThread);
737-
yield* fake.takeRequest("prompt");
738-
const rejection = "Cannot submit a prompt while compaction is in progress.";
739-
yield* fake.emit({ type: "response", command: "prompt", success: false, error: rejection });
740737
yield* fake.emit({
741738
type: "extension_ui_request",
742739
id: "native-compaction-dialog",
@@ -752,22 +749,21 @@ describe("PiAdapterV2", () => {
752749
decision: "accept",
753750
});
754751
yield* fake.takeRequest("extension_ui_response");
755-
if (aborted) {
756-
yield* fake.emit({ type: "compaction_end", result: null, aborted: true });
757-
const terminal = yield* takeEvent((event) => event.type === "turn.terminal");
758-
assert.isTrue(
759-
terminal.type === "turn.terminal" &&
760-
terminal.status === "failed" &&
761-
terminal.failure.message === rejection,
762-
);
763-
return;
764-
}
752+
assert.isFalse(fake.allRequests().some((request) => request["type"] === "prompt"));
753+
yield* fake.emit(
754+
aborted
755+
? { type: "compaction_end", result: null, aborted: true }
756+
: {
757+
type: "compaction_end",
758+
result: { summary: "Native compaction finished" },
759+
willRetry: true,
760+
},
761+
);
762+
const prompt = yield* fake.takeRequest("prompt");
763+
assert.equal(prompt["message"], "Hello pi");
765764
fake.queueState({ isStreaming: true });
766-
yield* fake.emit({
767-
type: "compaction_end",
768-
result: { summary: "Native compaction finished" },
769-
willRetry: true,
770-
});
765+
yield* fake.emit({ type: "response", command: "prompt", success: true });
766+
yield* fake.takeRequest("get_state");
771767
yield* fake.emit({ type: "agent_start" });
772768
yield* fake.emit({ type: "message_start", message: { role: "assistant" } });
773769
yield* fake.emit({
@@ -780,13 +776,12 @@ describe("PiAdapterV2", () => {
780776
});
781777
const message = yield* takeEvent((event) => event.type === "message.updated");
782778
assert.isTrue(message.type === "message.updated" && message.message.runId !== null);
783-
yield* fake.takeRequest("get_state");
784779
yield* fake.emit({ type: "agent_settled" });
785780
const terminal = yield* takeEvent((event) => event.type === "turn.terminal");
786-
assert.isTrue(
787-
terminal.type === "turn.terminal" &&
788-
terminal.status === "failed" &&
789-
terminal.failure.message === rejection,
781+
assert.isTrue(terminal.type === "turn.terminal" && terminal.status === "completed");
782+
assert.equal(
783+
fake.allRequests().filter((request) => request["type"] === "prompt").length,
784+
1,
790785
);
791786
}).pipe(Effect.scoped, Effect.provide(layerTest)),
792787
);
@@ -3932,17 +3927,17 @@ describe("PiAdapterV2", () => {
39323927
undefined,
39333928
2,
39343929
);
3935-
yield* fake.takeRequest("prompt");
39363930
fake.setCompacting(false);
39373931
const compactionEnded = fake.allRequests().length;
3938-
fake.queueState({ isStreaming: true, isCompacting: false, pendingMessageCount: 0 });
39393932
yield* fake.emit({
39403933
type: "compaction_end",
39413934
reason: "manual",
39423935
result: { summary: "smaller", tokensBefore: 10_000, estimatedTokensAfter: 2_000 },
39433936
aborted: false,
39443937
willRetry: false,
39453938
});
3939+
const delivered = yield* fake.takeRequest("prompt");
3940+
assert.equal(delivered["message"], "Sent during compaction");
39463941
yield* fake.emit({ type: "agent_start" });
39473942
fake.queueState({ isStreaming: false, isCompacting: false, pendingMessageCount: 0 });
39483943
yield* fake.emit({ type: "agent_settled" });
@@ -3964,6 +3959,119 @@ describe("PiAdapterV2", () => {
39643959
}).pipe(Effect.scoped, Effect.provide(layerTest)),
39653960
);
39663961

3962+
it.effect.each([
3963+
{ error: PI_COMPACTING_PROMPT_ERROR, retried: true },
3964+
{ error: "Model unavailable", retried: false },
3965+
])(
3966+
"retries a prompt Pi rejected because compaction started first, retried=$retried",
3967+
({ error, retried }) =>
3968+
Effect.gen(function* () {
3969+
const fake = yield* makeFakePi;
3970+
const { runtime, takeEvent } = yield* openRuntime(fake);
3971+
const providerThread = yield* runtime.ensureThread({
3972+
threadId: THREAD_ID,
3973+
modelSelection: modelSelection("default"),
3974+
runtimePolicy,
3975+
});
3976+
yield* startTurn(runtime, providerThread);
3977+
yield* fake.takeRequest("prompt");
3978+
yield* fake.emit({ type: "response", command: "prompt", success: true });
3979+
yield* fake.emit({ type: "agent_start" });
3980+
yield* fake.emit({ type: "agent_settled" });
3981+
yield* fake.takeRequest("get_state");
3982+
yield* takeEvent((event) => event.type === "turn.terminal");
3983+
3984+
yield* startTurn(runtime, providerThread, "default", [], "Raced compaction", undefined, 2);
3985+
yield* fake.takeRequest("prompt");
3986+
yield* fake.emit({ type: "compaction_start", reason: "manual" });
3987+
yield* fake.emit({
3988+
type: "response",
3989+
command: "prompt",
3990+
success: false,
3991+
error,
3992+
});
3993+
if (!retried) {
3994+
const failed = yield* takeEvent((event) => event.type === "turn.terminal");
3995+
assert.isTrue(
3996+
failed.type === "turn.terminal" &&
3997+
failed.status === "failed" &&
3998+
failed.failure.message === error,
3999+
);
4000+
return;
4001+
}
4002+
const compactionEnded = fake.allRequests().length;
4003+
yield* fake.emit({ type: "compaction_end", result: null, aborted: true });
4004+
const retriedPrompt = yield* fake.takeRequest("prompt");
4005+
assert.equal(retriedPrompt["message"], "Raced compaction");
4006+
yield* fake.emit({ type: "agent_start" });
4007+
yield* fake.emit({ type: "agent_settled" });
4008+
const terminal = yield* takeEvent((event) => event.type === "turn.terminal");
4009+
assert.isTrue(
4010+
terminal.type === "turn.terminal" && terminal.status === "completed",
4011+
`turn ended ${terminal.type === "turn.terminal" ? terminal.status : terminal.type}`,
4012+
);
4013+
assert.equal(
4014+
fake
4015+
.allRequests()
4016+
.slice(compactionEnded)
4017+
.filter((request) => request["type"] === "prompt").length,
4018+
1,
4019+
);
4020+
}).pipe(Effect.scoped, Effect.provide(layerTest)),
4021+
);
4022+
4023+
it.effect("restarts Pi when Stop interrupts a prompt held for detached compaction", () =>
4024+
Effect.gen(function* () {
4025+
const fake = yield* makeFakePi;
4026+
const { runtime, takeEvent } = yield* openRuntime(fake);
4027+
const providerThread = yield* runtime.ensureThread({
4028+
threadId: THREAD_ID,
4029+
modelSelection: modelSelection("default"),
4030+
runtimePolicy,
4031+
});
4032+
yield* startTurn(runtime, providerThread);
4033+
yield* fake.takeRequest("prompt");
4034+
yield* fake.emit({ type: "agent_start" });
4035+
yield* fake.emit({ type: "agent_settled" });
4036+
yield* fake.takeRequest("get_state");
4037+
yield* takeEvent((event) => event.type === "turn.terminal");
4038+
4039+
fake.setCompacting(true);
4040+
yield* fake.emit({ type: "compaction_start", reason: "manual" });
4041+
yield* startTurn(runtime, providerThread, "default", [], "Held prompt", undefined, 2);
4042+
const running = yield* takeEvent(
4043+
(event) =>
4044+
event.type === "provider_turn.updated" &&
4045+
event.providerTurn.status === "running" &&
4046+
event.providerTurn.ordinal === 2,
4047+
);
4048+
const providerTurnId =
4049+
running.type === "provider_turn.updated" ? running.providerTurn.id : undefined;
4050+
assert.isDefined(providerTurnId);
4051+
4052+
// A dialog the new turn owns proves the pump has observed compaction.
4053+
yield* fake.emit({
4054+
type: "extension_ui_request",
4055+
id: "held-prompt-dialog",
4056+
method: "confirm",
4057+
title: "Continue?",
4058+
});
4059+
yield* takeEvent((event) => event.type === "runtime_request.updated");
4060+
const interruptedAt = fake.allRequests().length;
4061+
yield* runtime.interruptTurn({ providerThread, providerTurnId: providerTurnId! });
4062+
assert.isFalse(fake.allRequests().some((request) => request["type"] === "abort"));
4063+
yield* fake.closeStdout;
4064+
const terminal = yield* takeEvent((event) => event.type === "turn.terminal");
4065+
assert.isTrue(terminal.type === "turn.terminal" && terminal.status === "interrupted");
4066+
assert.isFalse(
4067+
fake
4068+
.allRequests()
4069+
.slice(interruptedAt)
4070+
.some((request) => request["type"] === "prompt"),
4071+
);
4072+
}).pipe(Effect.scoped, Effect.provide(layerTest)),
4073+
);
4074+
39674075
it.effect("delivers a steer sent during in-turn compaction once it ends", () =>
39684076
Effect.gen(function* () {
39694077
const fake = yield* makeFakePi;
@@ -4005,17 +4113,17 @@ describe("PiAdapterV2", () => {
40054113
creationSource: "web",
40064114
},
40074115
});
4008-
yield* fake.takeRequest("prompt");
40094116
fake.setCompacting(false);
40104117
const compactionEnded = fake.allRequests().length;
4011-
fake.queueState({ isStreaming: true, isCompacting: false, pendingMessageCount: 0 });
40124118
yield* fake.emit({
40134119
type: "compaction_end",
40144120
reason: "manual",
40154121
result: { summary: "smaller", tokensBefore: 10_000, estimatedTokensAfter: 2_000 },
40164122
aborted: false,
40174123
willRetry: false,
40184124
});
4125+
const delivered = yield* fake.takeRequest("prompt");
4126+
assert.equal(delivered["message"], "Steer during compaction");
40194127
yield* fake.emit({ type: "agent_start" });
40204128
fake.queueState({ isStreaming: false, isCompacting: false, pendingMessageCount: 0 });
40214129
yield* fake.emit({ type: "agent_settled" });

0 commit comments

Comments
 (0)