Skip to content

Commit f57c3f9

Browse files
committed
fix(provider-pi): retire sessions after lifecycle rpc failures
1 parent 81a09ea commit f57c3f9

2 files changed

Lines changed: 24 additions & 12 deletions

File tree

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

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -836,9 +836,9 @@ describe("PiAdapterV2", () => {
836836
}).pipe(Effect.scoped, Effect.provide(layerTest)),
837837
);
838838

839-
it.effect.each([false, true])(
840-
"preserves native status publications during session switch hooks, cancelled=%s",
841-
(cancelled) =>
839+
it.effect.each(["success", "cancelled", "error"] as const)(
840+
"handles native status publications during session switch hooks, outcome=%s",
841+
(outcome) =>
842842
Effect.gen(function* () {
843843
const fake = yield* makeFakePi;
844844
const { runtime, takeEvent } = yield* openRuntime(fake);
@@ -877,13 +877,24 @@ describe("PiAdapterV2", () => {
877877
type: "response",
878878
id: request["id"],
879879
command: "switch_session",
880-
success: true,
881-
data: { cancelled },
880+
success: outcome !== "error",
881+
data: { cancelled: outcome === "cancelled" },
882+
...(outcome === "error" ? { error: "Session replacement failed" } : {}),
882883
});
883884
const exit = yield* Fiber.join(switching);
884-
assert.equal(Exit.isFailure(exit), cancelled);
885+
assert.equal(Exit.isFailure(exit), outcome !== "success");
886+
if (outcome === "error") {
887+
const reuse = yield* runtime.resumeThread({ providerThread }).pipe(Effect.exit);
888+
assert.isTrue(Exit.isFailure(reuse));
889+
yield* takeEvent(
890+
(event) =>
891+
event.type === "provider_session.updated" && event.providerSession.status === "error",
892+
);
893+
assert.deepEqual(runtime.providerSession.extensionStatuses, []);
894+
return;
895+
}
885896
assert.deepEqual(runtime.providerSession.extensionStatuses, [
886-
...(cancelled ? [{ key: "lint", text: "Lint clean" }] : []),
897+
...(outcome === "cancelled" ? [{ key: "lint", text: "Lint clean" }] : []),
887898
{ key: "startup", text: "Fresh status" },
888899
]);
889900
}).pipe(Effect.scoped, Effect.provide(layerTest)),

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -778,18 +778,19 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
778778
},
779779
(effect, record) =>
780780
effect.pipe(
781-
// Timeout does not cancel Pi's lifecycle hook; retire the process before fallback can race it.
782781
Effect.tapError((error) =>
783782
Effect.logWarning("Pi session lifecycle request failed", {
784783
providerSessionId: input.providerSessionId,
785784
operation: record["type"],
786785
errorTag: error._tag,
787786
}),
788787
),
789-
Effect.catchTags({
790-
PiRpcTimeoutError: (error) =>
791-
connection.terminate.pipe(Effect.andThen(Effect.fail(error))),
792-
}),
788+
// A failed lifecycle RPC can leave Pi's previous native session disposed.
789+
Effect.tapError((error) =>
790+
error._tag === "PiRpcError" || error._tag === "PiRpcTimeoutError"
791+
? connection.terminate
792+
: Effect.void,
793+
),
793794
Effect.onInterrupt(() => connection.terminate),
794795
),
795796
);

0 commit comments

Comments
 (0)