Skip to content

Commit 705b35a

Browse files
committed
fix(responses): deep-merge provider continuation state
1 parent 7f76107 commit 705b35a

4 files changed

Lines changed: 83 additions & 9 deletions

File tree

‎src/responses/provider-continuation.ts‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,41 @@ import type {
66
const bounded = (value: unknown, max: number): value is string =>
77
typeof value === "string" && value.length > 0 && value.length <= max;
88

9+
const isPlainRecord = (value: unknown): value is Record<string, unknown> => {
10+
if (!value || typeof value !== "object" || Array.isArray(value)) return false;
11+
const prototype = Object.getPrototypeOf(value);
12+
return prototype === Object.prototype || prototype === null;
13+
};
14+
15+
const defineOwn = (target: Record<string, unknown>, key: string, value: unknown): void => {
16+
Object.defineProperty(target, key, {
17+
value,
18+
enumerable: true,
19+
configurable: true,
20+
writable: true,
21+
});
22+
};
23+
24+
/** Recursively merge provider-owned plain objects; arrays and scalar values replace prior state. */
25+
export function mergeProviderContinuationPayload(
26+
inherited: Readonly<Record<string, unknown>>,
27+
emitted: Readonly<Record<string, unknown>>,
28+
): Record<string, unknown> {
29+
const merged: Record<string, unknown> = {};
30+
for (const [key, value] of Object.entries(inherited)) defineOwn(merged, key, value);
31+
for (const [key, value] of Object.entries(emitted)) {
32+
const prior = Object.hasOwn(merged, key) ? merged[key] : undefined;
33+
defineOwn(
34+
merged,
35+
key,
36+
isPlainRecord(prior) && isPlainRecord(value)
37+
? mergeProviderContinuationPayload(prior, value)
38+
: value,
39+
);
40+
}
41+
return merged;
42+
}
43+
944
/** Validate proxy-authored continuation ownership before trusting persisted state. */
1045
export function isValidProviderContinuationOwner(
1146
value: unknown,

‎src/server/responses/core.ts‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import {
3737
} from "../../responses/state";
3838
import {
3939
isValidProviderContinuationOwner,
40+
mergeProviderContinuationPayload,
4041
providerContinuationOwnerFromReplayIdentity,
4142
providerContinuationRouteScope,
4243
sameProviderContinuationOwner,
@@ -2569,13 +2570,10 @@ async function handleResponsesInner(
25692570
const inherited = providerContinuationPayload(parsed._providerContinuation);
25702571
const emittedPayload = providerContinuationPayload(emitted);
25712572
if (!emittedPayload && !inherited && !cursorConversationId) return undefined;
2572-
const merged: OcxProviderContinuationState = { ...(inherited ?? {}) };
2573-
for (const [provider, value] of Object.entries(emittedPayload ?? {})) {
2574-
const prior = merged[provider];
2575-
merged[provider] = prior && value
2576-
? { ...prior, ...value }
2577-
: value;
2578-
}
2573+
const merged = mergeProviderContinuationPayload(
2574+
inherited ?? {},
2575+
emittedPayload ?? {},
2576+
) as OcxProviderContinuationState;
25792577
if (cursorConversationId) {
25802578
merged.cursor = { ...(merged.cursor ?? {}), conversationId: cursorConversationId };
25812579
}

‎tests/responses-state.test.ts‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import { buildResponseJSON } from "../src/bridge";
2121
import { createCursorRequest } from "../src/adapters/cursor/request-builder";
2222
import { createCursorContextUsageTracker } from "../src/adapters/cursor/protobuf-events";
2323
import { parseRequest } from "../src/responses/parser";
24+
import { mergeProviderContinuationPayload } from "../src/responses/provider-continuation";
2425
import { createSseInspector } from "../src/server/relay";
2526
import {
2627
clearResponseStateForTests,
@@ -804,6 +805,24 @@ describe("Responses previous_response_id state", () => {
804805
});
805806
});
806807

808+
test("deep provider-state merge keeps __proto__ as data", () => {
809+
const inherited = JSON.parse(
810+
'{"__proto__":{"stable":"keep"},"future":{"metadata":{"stable":"keep","list":["old"]}}}',
811+
) as Record<string, unknown>;
812+
const emitted = JSON.parse(
813+
'{"__proto__":{"changed":"new"},"future":{"metadata":{"changed":"new","list":["new"]}}}',
814+
) as Record<string, unknown>;
815+
816+
const merged = mergeProviderContinuationPayload(inherited, emitted);
817+
818+
expect(Object.getPrototypeOf(merged)).toBe(Object.prototype);
819+
expect(Object.hasOwn(merged, "__proto__")).toBe(true);
820+
expect(merged["__proto__"]).toEqual({ stable: "keep", changed: "new" });
821+
expect(merged.future).toEqual({
822+
metadata: { stable: "keep", changed: "new", list: ["new"] },
823+
});
824+
});
825+
807826
test("replays a durable spill after simulated process restart", async () => {
808827
setResponseStateByteCapForTests(1_024);
809828
rememberResponseState(

‎tests/server-combo-failover-e2e.test.ts‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1673,11 +1673,27 @@ describe("server combo failover 030 activation matrix", () => {
16731673
providerState: turn === 1
16741674
? {
16751675
cursor: { checkpointRef: "opaque-ref" },
1676-
future: { stable: "keep", changed: "old" },
1676+
future: {
1677+
stable: "keep",
1678+
changed: "old",
1679+
metadata: {
1680+
stable: "keep-nested",
1681+
changed: "old-nested",
1682+
list: ["old"],
1683+
scalar: "old",
1684+
},
1685+
},
16771686
}
16781687
: {
16791688
cursor: { checkpointUsable: true },
1680-
future: { changed: "new" },
1689+
future: {
1690+
changed: "new",
1691+
metadata: {
1692+
changed: "new-nested",
1693+
list: ["new"],
1694+
scalar: 42,
1695+
},
1696+
},
16811697
},
16821698
});
16831699
};
@@ -1699,6 +1715,12 @@ describe("server combo failover 030 activation matrix", () => {
16991715
expect(stored?.future).toEqual({
17001716
stable: "keep",
17011717
changed: "new",
1718+
metadata: {
1719+
stable: "keep-nested",
1720+
changed: "new-nested",
1721+
list: ["new"],
1722+
scalar: 42,
1723+
},
17021724
});
17031725
expect(stored?.cursor).toEqual({ checkpointRef: "opaque-ref", checkpointUsable: true });
17041726
expect(stored?.__ocxOwner?.providerName).toBe("a");

0 commit comments

Comments
 (0)