Skip to content

Commit 67f9a23

Browse files
committed
fix(pi): reject ambiguous session ancestry before reconciliation
1 parent a240756 commit 67f9a23

2 files changed

Lines changed: 64 additions & 7 deletions

File tree

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

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2231,6 +2231,10 @@ describe("PiAdapterV2", () => {
22312231
yield* fake.emit({ type: "response", command: "prompt", success: true });
22322232
yield* fake.emit({ type: "agent_start" });
22332233
yield* fake.emit({ type: "agent_settled" });
2234+
yield* takeEvent(
2235+
(event) =>
2236+
event.type === "provider_turn.updated" && event.providerTurn.status === "completed",
2237+
);
22342238
const thread = yield* takeEvent(
22352239
(event) =>
22362240
event.type === "provider_thread.updated" && event.providerThread.status === "idle",
@@ -2241,6 +2245,56 @@ describe("PiAdapterV2", () => {
22412245
}).pipe(Effect.scoped, Effect.provide(layerTest)),
22422246
);
22432247

2248+
it.effect.each(["missing parent", "invalid parent", "duplicate id"] as const)(
2249+
"does not reconcile malformed session entries: %s",
2250+
(malformed) =>
2251+
Effect.gen(function* () {
2252+
const fake = yield* makeFakePi;
2253+
const { runtime, takeEvent } = yield* openRuntime(fake);
2254+
const root = { type: "model_change", id: "root", parentId: null };
2255+
fake.queueEntries({ entries: [root], leafId: "root" });
2256+
const providerThread = yield* runtime.ensureThread({
2257+
threadId: THREAD_ID,
2258+
modelSelection: modelSelection("default"),
2259+
runtimePolicy,
2260+
});
2261+
yield* startTurn(runtime, providerThread);
2262+
yield* fake.takeRequest("prompt");
2263+
const entry = {
2264+
type: "message",
2265+
id: "x",
2266+
message: { role: "user", content: [] },
2267+
...(malformed === "missing parent"
2268+
? {}
2269+
: { parentId: malformed === "invalid parent" ? 42 : null }),
2270+
};
2271+
fake.queueEntries({ entries: [], leafId: "x" });
2272+
fake.queueEntries({
2273+
entries: [
2274+
root,
2275+
entry,
2276+
...(malformed === "duplicate id" ? [{ ...entry, parentId: "root" }] : []),
2277+
],
2278+
leafId: "x",
2279+
});
2280+
yield* fake.emit({ type: "response", command: "prompt", success: true });
2281+
yield* fake.emit({ type: "agent_start" });
2282+
yield* fake.emit({ type: "agent_settled" });
2283+
yield* takeEvent(
2284+
(event) =>
2285+
event.type === "provider_turn.updated" && event.providerTurn.status === "completed",
2286+
);
2287+
const thread = yield* takeEvent(
2288+
(event) =>
2289+
event.type === "provider_thread.updated" && event.providerThread.status === "idle",
2290+
);
2291+
assert.isUndefined(
2292+
thread.type === "provider_thread.updated" ? thread.retainedNativeTurnIds : null,
2293+
);
2294+
yield* takeEvent((event) => event.type === "turn.terminal");
2295+
}).pipe(Effect.scoped, Effect.provide(layerTest)),
2296+
);
2297+
22442298
it.effect("does not reconcile a replacement session tree as a native rewind", () =>
22452299
Effect.gen(function* () {
22462300
const fake = yield* makeFakePi;

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,8 +1405,9 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
14051405
request({ type: "get_entries", ...(since === null ? {} : { since }) }, timeoutMs).pipe(
14061406
Effect.map((data) => {
14071407
const leafId = recordField(data, "leafId");
1408-
return typeof leafId === "string" || leafId === null
1409-
? { entries: piSessionEntries(recordField(data, "entries")), leafId }
1408+
const entries = piSessionEntries(recordField(data, "entries"));
1409+
return entries !== null && (typeof leafId === "string" || leafId === null)
1410+
? { entries, leafId }
14101411
: null;
14111412
}),
14121413
Effect.orElseSucceed(() => null),
@@ -3129,15 +3130,17 @@ interface PiSessionEntry {
31293130
readonly isUserMessage: boolean;
31303131
}
31313132

3132-
/** Index a `get_entries` listing by entry id. */
3133-
function piSessionEntries(entries: unknown): ReadonlyMap<string, PiSessionEntry> {
3133+
/** Index a `get_entries` listing, rejecting ambiguous ancestry. */
3134+
function piSessionEntries(entries: unknown): ReadonlyMap<string, PiSessionEntry> | null {
31343135
const byId = new Map<string, PiSessionEntry>();
3135-
if (!Array.isArray(entries)) return byId;
3136+
if (!Array.isArray(entries)) return null;
31363137
for (const entry of entries) {
31373138
const id = recordString(entry, "id");
3138-
if (id === undefined) continue;
3139+
const parentId = recordField(entry, "parentId");
3140+
if (id === undefined || byId.has(id) || (parentId !== null && typeof parentId !== "string"))
3141+
return null;
31393142
byId.set(id, {
3140-
parentId: recordString(entry, "parentId") ?? null,
3143+
parentId,
31413144
isUserMessage:
31423145
recordField(entry, "type") === "message" &&
31433146
recordString(recordField(entry, "message"), "role") === "user",

0 commit comments

Comments
 (0)