Skip to content

Commit 1c46529

Browse files
committed
fix(pi): preserve prompt ownership through handled follow-ups
Correlate prompt replies and defer idle completion until outstanding prompt replies resolve. Re-arm settlement after consumed or refused follow-ups without bypassing active work or compaction. Cover both reply orders, late replies, consumed follow-ups, and compaction before acknowledgment. Keep the existing idle probe and legacy response support.
1 parent 1e7246f commit 1c46529

2 files changed

Lines changed: 184 additions & 19 deletions

File tree

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

Lines changed: 133 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ interface FakePi {
164164
readonly deferNextState: () => void;
165165
readonly resolveDeferredState: (data: unknown) => Effect.Effect<void>;
166166
readonly failNextState: () => void;
167-
readonly deferNextLifecycle: (type: "switch_session" | "new_session" | "fork") => void;
167+
readonly deferNextLifecycle: (type: "switch_session" | "new_session" | "fork" | "prompt") => void;
168168
readonly deferNextModelSelection: () => void;
169169
readonly queueModels: (models: ReadonlyArray<unknown>) => void;
170170
readonly vetoNextNewSession: () => void;
@@ -817,6 +817,7 @@ describe("PiAdapterV2", () => {
817817
yield* Queue.take(offers);
818818
yield* fake.emit({ type: "agent_settled" });
819819
yield* fake.emit({ type: "compaction_start", reason: "manual" });
820+
fake.deferNextLifecycle("prompt");
820821
yield* startTurn(runtime, providerThread);
821822
yield* fake.takeRequest("prompt");
822823
const rejection = "Cannot submit a prompt while compaction is in progress.";
@@ -1160,6 +1161,7 @@ describe("PiAdapterV2", () => {
11601161
event.type === "provider_session.updated" && event.providerSession.status === "ready",
11611162
);
11621163
}
1164+
fake.deferNextLifecycle("prompt");
11631165
yield* startTurn(runtime, providerThread);
11641166
const prompt = yield* fake.takeRequest("prompt");
11651167
assert.equal(prompt["message"], "Hello pi");
@@ -1233,6 +1235,7 @@ describe("PiAdapterV2", () => {
12331235
});
12341236
yield* fake.emit({ type: "agent_start" });
12351237
yield* Queue.take(offers);
1238+
fake.deferNextLifecycle("prompt");
12361239
yield* startTurn(runtime, providerThread);
12371240
yield* fake.takeRequest("prompt");
12381241
yield* fake.emit({ type: "agent_settled", aborted });
@@ -1288,6 +1291,7 @@ describe("PiAdapterV2", () => {
12881291
(event) =>
12891292
event.type === "provider_session.updated" && event.providerSession.status === "ready",
12901293
);
1294+
fake.deferNextLifecycle("prompt");
12911295
yield* startTurn(runtime, providerThread, "default", [], "/hello");
12921296
yield* fake.takeRequest("prompt");
12931297
if (resumes) yield* fake.emit({ type: "agent_start" });
@@ -2960,9 +2964,82 @@ describe("PiAdapterV2", () => {
29602964
);
29612965

29622966
it.effect.each([
2963-
{ text: "/command-only", data: undefined },
2964-
{ text: "Plain input consumed by an extension", data: { disposition: "handled" } },
2965-
])("settles consumed input from its deferred ack and idle probe: $text", ({ text, data }) =>
2967+
{ first: "initial", accepted: true },
2968+
{ first: "steer", accepted: true },
2969+
{ first: "steer", accepted: false },
2970+
])(
2971+
"waits for consumed input acknowledgments, first=$first accepted=$accepted",
2972+
({ first, accepted }) =>
2973+
Effect.gen(function* () {
2974+
const fake = yield* makeFakePi;
2975+
const { runtime, takeEvent } = yield* openRuntime(fake);
2976+
const providerThread = yield* runtime.ensureThread({
2977+
threadId: THREAD_ID,
2978+
modelSelection: modelSelection("default"),
2979+
runtimePolicy,
2980+
});
2981+
fake.deferNextLifecycle("prompt");
2982+
yield* startTurn(runtime, providerThread);
2983+
const initial = yield* fake.takeRequest("prompt");
2984+
fake.deferNextLifecycle("prompt");
2985+
const running = yield* takeEvent((event) => event.type === "provider_turn.updated");
2986+
assert.isTrue(running.type === "provider_turn.updated");
2987+
if (running.type !== "provider_turn.updated") return;
2988+
yield* runtime.steerTurn({
2989+
threadId: THREAD_ID,
2990+
runId: RunId.make("run:thread-pi-test:1"),
2991+
providerThread,
2992+
providerTurnId: running.providerTurn.id,
2993+
message: {
2994+
messageId: "message:handled-steer-first" as never,
2995+
text: "Consumed steer",
2996+
attachments: [],
2997+
createdBy: "user",
2998+
creationSource: "web",
2999+
},
3000+
});
3001+
const steer = yield* fake.takeRequest("prompt");
3002+
const stateRequests = fake
3003+
.allRequests()
3004+
.filter((request) => request["type"] === "get_state").length;
3005+
yield* fake.emit({
3006+
type: "response",
3007+
id: (first === "steer" ? steer : initial)["id"],
3008+
command: "prompt",
3009+
success: accepted,
3010+
data: { disposition: "handled" },
3011+
error: accepted ? undefined : "Input refused",
3012+
});
3013+
yield* fake.emit({
3014+
type: "extension_ui_request",
3015+
method: "notify",
3016+
message: "Steer acknowledged",
3017+
});
3018+
yield* takeEvent(
3019+
(event) => event.type === "turn_item.updated" && event.turnItem.type === "system_notice",
3020+
);
3021+
assert.equal(runtime.providerSession.status, "running");
3022+
assert.equal(
3023+
fake.allRequests().filter((request) => request["type"] === "get_state").length,
3024+
stateRequests,
3025+
);
3026+
yield* fake.emit({
3027+
type: "response",
3028+
id: (first === "steer" ? initial : steer)["id"],
3029+
command: "prompt",
3030+
success: true,
3031+
data: { disposition: "handled" },
3032+
});
3033+
const terminal = yield* takeEvent((event) => event.type === "turn.terminal");
3034+
assert.isTrue(terminal.type === "turn.terminal" && terminal.status === "completed");
3035+
}).pipe(Effect.scoped, Effect.provide(layerTest)),
3036+
);
3037+
3038+
it.effect.each([
3039+
{ text: "/command-only", data: undefined, compacts: false },
3040+
{ text: "Plain handled input", data: { disposition: "handled" }, compacts: false },
3041+
{ text: "Handled input after compaction", data: { disposition: "handled" }, compacts: true },
3042+
])("settles consumed input after its ack: $text", ({ text, data, compacts }) =>
29663043
Effect.gen(function* () {
29673044
const fake = yield* makeFakePi;
29683045
const { runtime, takeEvent } = yield* openRuntime(fake);
@@ -2971,16 +3048,34 @@ describe("PiAdapterV2", () => {
29713048
modelSelection: modelSelection("default"),
29723049
runtimePolicy,
29733050
});
3051+
if (compacts) yield* fake.takeRequest("get_state");
3052+
fake.deferNextLifecycle("prompt");
29743053
yield* startTurn(runtime, providerThread, "default", [], text);
29753054
yield* fake.takeRequest("prompt");
3055+
if (compacts) {
3056+
yield* fake.emit({ type: "compaction_start", reason: "manual" });
3057+
yield* fake.emit({
3058+
type: "compaction_end",
3059+
reason: "manual",
3060+
result: { summary: "Smaller context", tokensBefore: 1000, estimatedTokensAfter: 100 },
3061+
aborted: false,
3062+
willRetry: false,
3063+
});
3064+
yield* takeEvent(
3065+
(event) =>
3066+
event.type === "turn_item.updated" &&
3067+
event.turnItem.type === "compaction" &&
3068+
event.turnItem.status === "completed",
3069+
);
3070+
yield* fake.takeRequest("get_state");
3071+
}
29763072
yield* fake.emit({
29773073
type: "extension_ui_request",
29783074
id: "ui-cmd",
29793075
method: "notify",
29803076
message: "Command finished\nwith details",
29813077
notifyType: "info",
29823078
});
2983-
yield* fake.emit({ type: "response", command: "prompt", success: true, data });
29843079
const notice = yield* takeEvent(
29853080
(event) =>
29863081
(event.type === "turn_item.updated" && event.turnItem.type === "system_notice") ||
@@ -2992,6 +3087,8 @@ describe("PiAdapterV2", () => {
29923087
notice.turnItem.status === "completed" &&
29933088
notice.turnItem.message === "Command finished\nwith details",
29943089
);
3090+
assert.equal(runtime.providerSession.status, "running");
3091+
yield* fake.emit({ type: "response", command: "prompt", success: true, data });
29953092
const terminal = yield* takeEvent((event) => event.type === "turn.terminal");
29963093
assert.isTrue(terminal.type === "turn.terminal" && terminal.status === "completed");
29973094
}).pipe(Effect.scoped, Effect.provide(layerTest)),
@@ -3595,7 +3692,7 @@ describe("PiAdapterV2", () => {
35953692
runtimePolicy,
35963693
});
35973694
yield* startTurn(runtime, providerThread, "default", [], "/my-command");
3598-
yield* fake.takeRequest("prompt");
3695+
const firstPrompt = yield* fake.takeRequest("prompt");
35993696
yield* fake.emit({ type: "agent_start" });
36003697
yield* fake.emit({ type: "agent_settled" });
36013698
const firstTerminal = yield* takeEvent((event) => event.type === "turn.terminal");
@@ -3605,6 +3702,7 @@ describe("PiAdapterV2", () => {
36053702
yield* fake.takeRequest("prompt");
36063703
yield* fake.emit({
36073704
type: "response",
3705+
id: firstPrompt["id"],
36083706
command: "prompt",
36093707
success: false,
36103708
error: "late command rejection",
@@ -4219,7 +4317,12 @@ describe("PiAdapterV2", () => {
42194317
}).pipe(Effect.scoped, Effect.provide(layerTest)),
42204318
);
42214319

4222-
it.effect.each([false, true])("ignores stale idle probes, handled=%s", (handled) =>
4320+
it.effect.each([
4321+
{ handled: false, steer: "starts" },
4322+
{ handled: true, steer: "starts" },
4323+
{ handled: true, steer: "handled" },
4324+
{ handled: true, steer: "rejected" },
4325+
])("ignores stale idle probes, handled=$handled steer=$steer", ({ handled, steer }) =>
42234326
Effect.gen(function* () {
42244327
const fake = yield* makeFakePi;
42254328
const { runtime, takeEvent } = yield* openRuntime(fake);
@@ -4228,6 +4331,7 @@ describe("PiAdapterV2", () => {
42284331
modelSelection: modelSelection("default"),
42294332
runtimePolicy,
42304333
});
4334+
if (handled) fake.deferNextLifecycle("prompt");
42314335
yield* startTurn(runtime, providerThread);
42324336
yield* fake.takeRequest("prompt");
42334337
const running = yield* takeEvent(
@@ -4252,6 +4356,7 @@ describe("PiAdapterV2", () => {
42524356
: { type: "agent_settled" },
42534357
);
42544358
yield* fake.takeRequest("get_state");
4359+
fake.deferNextLifecycle("prompt");
42554360
yield* runtime.steerTurn({
42564361
threadId: THREAD_ID,
42574362
runId: RunId.make("run:thread-pi-test:1"),
@@ -4265,12 +4370,25 @@ describe("PiAdapterV2", () => {
42654370
creationSource: "web",
42664371
},
42674372
});
4268-
yield* fake.takeRequest("prompt");
4373+
const steeredPrompt = yield* fake.takeRequest("prompt");
42694374
yield* fake.resolveDeferredState({
42704375
isStreaming: false,
42714376
isCompacting: false,
42724377
pendingMessageCount: 0,
42734378
});
4379+
if (steer !== "starts") {
4380+
yield* fake.emit({
4381+
type: "response",
4382+
id: steeredPrompt["id"],
4383+
command: "prompt",
4384+
success: steer === "handled",
4385+
data: { disposition: "handled" },
4386+
error: steer === "rejected" ? "Input refused" : undefined,
4387+
});
4388+
const terminal = yield* takeEvent((event) => event.type === "turn.terminal");
4389+
assert.isTrue(terminal.type === "turn.terminal" && terminal.status === "completed");
4390+
return;
4391+
}
42744392

42754393
yield* fake.emit({ type: "agent_start" });
42764394
yield* fake.emit({ type: "message_start", message: { role: "assistant" } });
@@ -4298,6 +4416,13 @@ describe("PiAdapterV2", () => {
42984416
assistantItem.turnItem.text === "Recovered",
42994417
);
43004418

4419+
yield* fake.emit({
4420+
type: "response",
4421+
id: steeredPrompt["id"],
4422+
command: "prompt",
4423+
success: true,
4424+
data: { disposition: "started" },
4425+
});
43014426
fake.queueState({ isStreaming: false, isCompacting: false, pendingMessageCount: 0 });
43024427
yield* fake.emit({ type: "agent_settled" });
43034428
yield* fake.takeRequest("get_state");

0 commit comments

Comments
 (0)