Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion agent/hooks/task-state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ const update = (event: HookEvent, ctx: { session: { id: string } }) =>
taskState.update((current) => applyTaskEvent(current, event, ctx.session.id));

const cancel = async (event: HookEvent<"turn.cancelled">, ctx: { session: { id: string } }) => {
update(event, ctx);
await closeBrowserRuntime(ctx.session.id);
update(event, ctx);
};

export default defineHook({
events: {
"session.started": update,
Expand Down
1 change: 1 addition & 0 deletions server/browser/privacy-lock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export async function quarantineBrowser(): Promise<void> {

export async function withBrowserPrivacyLock<T>(sessionId: string, operation: () => Promise<T>, database?: Pool, existingBrowser = false): Promise<T> {
if (!database && isLinkSandbox()) {
if (!process.env.LINK_SANDBOX_ACCESS_TOKEN?.trim()) return operation();
let state = sandboxBrowsers.get(sessionId);
if (!state && existingBrowser) throw new Error("The sandbox cannot recover a browser from another process. Use human handoff to inspect the existing purchase; do not retry it.");
if (!state) { state = { tail: Promise.resolve(), quarantined: false }; sandboxBrowsers.set(sessionId, state); }
Expand Down
19 changes: 19 additions & 0 deletions tests/browser/browser-close.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import Browserbase from "@browserbasehq/sdk";
import { BrowserSession } from "../../server/browser/browser-session";
import type { ConversationState } from "../../server/browser/types";
import { browserChannelEvents, closeBrowserRuntime, hasBrowserRuntime, runBrowserOperation } from "../../agent/lib/browser-runtime";
import taskHooks from "../../agent/hooks/task-state";
import { taskState } from "../../agent/lib/task-state";
import { ContextContainer, contextStorage } from "../../node_modules/eve/dist/src/context/container.js";

Expand Down Expand Up @@ -105,4 +106,22 @@ describe("terminal cleanup in a fresh Eve worker", () => {
await closeBrowserRuntime(id);
}
}));

it("turn.cancelled releases the persisted browser before clearing its ID", () =>
contextStorage.run(new ContextContainer(), async () => {
const id = "fresh-worker-cancel";
taskState.update((current) => ({
...current,
browser: { lifecycle: "active", sessionId: "persisted-browser" },
}));
release.mockResolvedValue({ status: "COMPLETED" });
await taskHooks.events!["turn.cancelled"]!(
{ type: "turn.cancelled", meta: { id: "evt_cancel" } } as never,
{ session: { id } } as never,
);
expect(release).toHaveBeenCalledExactlyOnceWith("persisted-browser", { status: "REQUEST_RELEASE" });
expect(taskState.get()).toMatchObject({ status: "canceled", browser: { lifecycle: "closed" } });
expect(taskState.get().browser.sessionId).toBeUndefined();
expect(hasBrowserRuntime(id)).toBe(false);
}));
});
Loading