Skip to content

armgit / eve

Public Imported from GitHub
0

The Open Framework for Building Agents

Fix saved-session resume without Symbol.dispose (#3561)

e0-gh-vercel-connect[bot]b333e7deace4
diff --git a/.changeset/fix-resume-symbol-dispose.md b/.changeset/fix-resume-symbol-dispose.md
new file mode 100644
index 000000000..197cb3610
--- /dev/null
+++ b/.changeset/fix-resume-symbol-dispose.md
@@ -0,0 +1,5 @@
+---
+"eve": patch
+---
+
+Fix saved-session resume in browsers without `Symbol.dispose`.
diff --git a/packages/eve/src/client/eve-agent-store.test.ts b/packages/eve/src/client/eve-agent-store.test.ts
index c7b33e8f8..045ea7129 100644
--- a/packages/eve/src/client/eve-agent-store.test.ts
+++ b/packages/eve/src/client/eve-agent-store.test.ts
@@ -765,6 +765,56 @@ describe("EveAgentStore stream overlap", () => {
});
describe("EveAgentStore session resume", () => {
+ it("resumes a saved session when Symbol.dispose is unavailable", async () => {
+ const originalSymbol = globalThis.Symbol;
+ const missingDisposeSymbol = new Proxy(
+ function (description?: string) {
+ return originalSymbol(description);
+ },
+ {
+ get(_target, property) {
+ if (property === "dispose") return undefined;
+ return Reflect.get(originalSymbol, property);
+ },
+ },
+ ) as typeof Symbol;
+ Object.defineProperty(globalThis, "Symbol", {
+ configurable: true,
+ value: missingDisposeSymbol,
+ writable: true,
+ });
+ vi.resetModules();
+
+ try {
+ const [{ EveAgentStore: FreshEveAgentStore }, { detachEveAgentStore: detachFreshStore }] =
+ await Promise.all([import("#client/index.js"), import("#client/eve-agent-store.js")]);
+ const events = turnEvents();
+ vi.spyOn(globalThis, "fetch")
+ .mockResolvedValueOnce(boundedStreamResponse(events))
+ .mockResolvedValueOnce(boundedStreamResponse([], events.length - 1));
+ const store = new FreshEveAgentStore({
+ initialSession: { sessionId: "session_1", streamIndex: 0 },
+ reducer: defaultMessageReducer(),
+ });
+
+ try {
+ await store.resume();
+ } finally {
+ detachFreshStore(store);
+ }
+
+ expect(store.snapshot.events).toEqual(events);
+ expect(store.snapshot.status).toBe("ready");
+ } finally {
+ Object.defineProperty(globalThis, "Symbol", {
+ configurable: true,
+ value: originalSymbol,
+ writable: true,
+ });
+ vi.resetModules();
+ }
+ });
+
it("resumes an unused prewarmed session and sends its first message on the same stream", async () => {
const live = controlledStreamResponse();
live.response.headers.set("x-eve-stream-tail-index", "-1");
diff --git a/packages/eve/src/client/eve-agent-store.ts b/packages/eve/src/client/eve-agent-store.ts
index d32a026a7..7d0c680cd 100644
--- a/packages/eve/src/client/eve-agent-store.ts
+++ b/packages/eve/src/client/eve-agent-store.ts
@@ -314,13 +314,14 @@ export class EveAgentStore<TData> {
this.#status = "resuming";
this.#publish();
+ let reader: SessionEventReader | undefined;
try {
const stream = this.#ensureStream({
catchUp: true,
startIndex:
this.#events.length === session.state.streamIndex ? session.state.streamIndex : 0,
});
- using reader = stream.subscribe(turn.abortController.signal);
+ reader = stream.subscribe(turn.abortController.signal);
await stream.caughtUp;
if (!this.#isActiveTurn(turn)) return;
reader.discard();
@@ -348,6 +349,7 @@ export class EveAgentStore<TData> {
this.#callbacks.onError?.(this.#error);
}
} finally {
+ reader?.[Symbol.dispose]();
this.#finishTurn(turn);
}
}