The Open Framework for Building Agents
fix(sandbox): untrack a stopped sandbox when its session ends (#5283)
Andrew Barba9d804f2a3966
diff --git a/.changeset/stopped-sandbox-untrack.md b/.changeset/stopped-sandbox-untrack.mdnew file mode 100644index 000000000..c07640965--- /dev/null+++ b/.changeset/stopped-sandbox-untrack.md@@ -0,0 +1,5 @@+---+"eve": patch+---++A sandbox that was stopped and then ended no longer stays registered for server shutdown, so long-running eve servers stop accumulating ended sessions and shutdown no longer stops their connections again.diff --git a/packages/eve/src/execution/invoke-tool.test.ts b/packages/eve/src/execution/invoke-tool.test.tsindex 84764d367..0738a9b60 100644--- a/packages/eve/src/execution/invoke-tool.test.ts+++ b/packages/eve/src/execution/invoke-tool.test.ts@@ -317,12 +317,12 @@ describe("invokeTool", () => {expect(closed).toHaveBeenCalledTimes(1);expect(reasons()).toEqual(["completed"]);- // A stopped connection can resume, so shutdown stops it again; it closes only once.+ // A call that stopped and then ended its sandbox leaves nothing for shutdown to stop.expect(await invokeTool(runtime, "pause", {}, { auth: alice })).toMatchObject({status: "completed",});await shutdownActiveSandboxHandles();- expect(shutdown).toHaveBeenCalledTimes(2);+ expect(shutdown).toHaveBeenCalledOnce();expect(closed).toHaveBeenCalledTimes(2);expect(await invokeTool(runtime, "discard", {}, { auth: alice })).toMatchObject({diff --git a/packages/eve/src/execution/sandbox/ensure.ts b/packages/eve/src/execution/sandbox/ensure.tsindex 865ce1f63..4fe50cd5b 100644--- a/packages/eve/src/execution/sandbox/ensure.ts+++ b/packages/eve/src/execution/sandbox/ensure.ts@@ -108,11 +108,13 @@ export async function ensureSandboxAccess(let opened: OpenedSandbox | undefined;let opening: Promise<SandboxProviderHandle> | undefined;let requiring: Promise<SandboxProviderHandle> | undefined;+ // The handle this access registered for shutdown. A stopped handle stays+ // registered, since its connection can resume, until the session lets go.+ let tracked: Parameters<typeof untrackActiveSandboxHandle>[0] | undefined;const track: typeof trackActiveSandboxHandle = (entry) => {- if (input.borrowed !== true) trackActiveSandboxHandle(entry);- };- const untrack: typeof untrackActiveSandboxHandle = (entry) => {- if (input.borrowed !== true) untrackActiveSandboxHandle(entry);+ if (input.borrowed === true) return;+ trackActiveSandboxHandle(entry);+ tracked = entry;};const appRoot =getRuntimeCompiledArtifactsSandboxAppRoot(input.compiledArtifactsSource) ?? process.cwd();@@ -366,13 +368,8 @@ export async function ensureSandboxAccess(function forgetHandle() {const current = opened;- if (current !== undefined) {- untrack({- handle: current.handle,- providerName: current.providerName,- sessionId: input.sessionId,- });- }+ if (tracked !== undefined) untrackActiveSandboxHandle(tracked);+ tracked = undefined;opened = undefined;opening = undefined;requiring = undefined;