@geminixiang/mikan 1.4.0 → 1.5.0-beta.0

package/dist/harness/tools/jev-browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jev-browser.d.ts","sourceRoot":"","sources":["../../../src/harness/tools/jev-browser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,IAAI,EAAe,MAAM,SAAS,CAAC;AAG5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAkC,KAAK,YAAY,EAAE,MAAM,WAAW,CAAC;AAI9E,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAe9C,QAAA,MAAM,gBAAgB;;;;;;;;EAuCpB,CAAC;AAIH,UAAU,OAAO;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAcD,UAAU,gBAAgB;IACxB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAMD,iBAAS,kBAAkB,CAAC,YAAY,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,GAAG,SAAS,GAAG,MAAM,CAY9F;AA4ED,iBAAS,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAEnD;AA2CD,iBAAS,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IACtD,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IAC3B,IAAI,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IAC1B,MAAM,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;CAC7B,CAOA;AAmBD,UAAU,YAAY;IACpB,SAAS,EAAE,YAAY,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC;AAED,iBAAS,iBAAiB,CACxB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,WAAW,EAAE,OAAO,EACpB,aAAa,EAAE,OAAO,EACtB,QAAQ,SAAK,GACZ,YAAY,CAiDd;AAED,MAAM,MAAM,kBAAkB,GAAG,CAC/B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,WAAW,KACjB,OAAO,CAAC,MAAM,CAAC,CAAC;AAkCrB,iBAAS,aAAa,CACpB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,CAAC,EACzD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,MAAM,GAAG,SAAS,CAUpB;AAuWD,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,YAAY,GAAG,SAAS,EACtC,YAAY,CAAC,EAAE,kBAAkB,GAChC,SAAS,CAAC,OAAO,gBAAgB,CAAC,CAqBpC;AAED,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,cAAc,EAAE,QAAQ,EAAE,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"jev-browser.d.ts","sourceRoot":"","sources":["../../../src/harness/tools/jev-browser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,IAAI,EAAe,MAAM,SAAS,CAAC;AAG5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAkC,KAAK,YAAY,EAAE,MAAM,WAAW,CAAC;AAM9E,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAe9C,QAAA,MAAM,gBAAgB;;;;;;;;;EA6CpB,CAAC;AAIH,UAAU,OAAO;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAcD,UAAU,gBAAgB;IACxB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAMD,iBAAS,kBAAkB,CAAC,YAAY,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,GAAG,SAAS,GAAG,MAAM,CAY9F;AA2HD,iBAAS,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAEnD;AAuDD,iBAAS,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IACtD,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IAC3B,IAAI,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IAC1B,MAAM,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;CAC7B,CAOA;AAmBD,UAAU,YAAY;IACpB,SAAS,EAAE,YAAY,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC;AAED,iBAAS,iBAAiB,CACxB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,WAAW,EAAE,OAAO,EACpB,aAAa,EAAE,OAAO,EACtB,QAAQ,SAAK,GACZ,YAAY,CAiDd;AAED,MAAM,MAAM,kBAAkB,GAAG,CAC/B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,WAAW,KACjB,OAAO,CAAC,MAAM,CAAC,CAAC;AAkCrB,iBAAS,aAAa,CACpB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,CAAC,EACzD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,MAAM,GAAG,SAAS,CAUpB;AAcD,UAAU,cAAc;IACtB,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC;AAED,MAAM,MAAM,cAAc,GAAG,SAAS,CAAC,OAAO,gBAAgB,CAAC,GAAG;IAChE,UAAU,CAAC,OAAO,EAAE,cAAc,GAAG,SAAS,GAAG,IAAI,CAAC;CACvD,CAAC;AAEF,UAAU,iBAAiB;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AA0cD,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,YAAY,GAAG,SAAS,EACtC,YAAY,CAAC,EAAE,kBAAkB,EACjC,OAAO,GAAE,iBAAsB,GAC9B,cAAc,CAqBhB;AAED,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,cAAc,EAAE,QAAQ,EAAE,kBAAkB,EAAE,CAAC"}

package/dist/harness/tools/jev-browser.js

@@ -4,6 +4,7 @@ import { BACKGROUND_CONTEXT, withAbortSignal } from "@earendil-works/chord/conte
 import { evaluateWithJev } from "../jev.js";
 import { LABEL_PARAMETER } from "./host-fn-tool.js";
 import { isRecord } from "../../unknown-values.js";
+import { DESKTOP_COMMAND, DESKTOP_RUNTIME_DIR, parseDesktopStatus } from "../../sandbox/desktop.js";
 export const JEV_BROWSER_TOOL = "jev_browser";
 const AGENT_BROWSER_BIN = "agent-browser";
 const AGENT_BROWSER_UNAVAILABLE = "agent-browser CLI is unavailable in the current sandbox. Ask the operator to provision " +
@@ -38,6 +39,9 @@ const jevBrowserSchema = Type.Object({
         minimum: 1,
         maximum: HARD_MAX_STEPS,
     })),
+    handOff: Type.Optional(Type.String({
+        description: "Give the browser to the person on the office desktop for a step only they can do, such as signing in or solving a challenge: what they should do, in their language. Use alone. It opens the desktop, moves the current page onto it, posts the step with a desktop link, and ends your turn. Continue after they say they are done.",
+    })),
 });
 function lifecycleOf(result) {
     return result.data?.lifecycle;
@@ -57,21 +61,64 @@ function describeContinuity(expectedOpen, first) {
 function tabNumber(tab) {
     return Number(tab.tabId.replace(/^t/, ""));
 }
-async function closeOldestTabs(env, sessionId, keep, signal) {
-    const listed = await runAgentBrowser(env, sessionId, ["tab", "list"], signal);
+async function closeOldestTabs(browser, agentTargets, keep, signal) {
+    const listed = await runAgentBrowser(browser, ["tab", "list"], signal);
     const tabs = listed.success && Array.isArray(listed.data?.tabs) ? listed.data.tabs : [];
-    const oldest = tabs
+    const opened = agentTargets
+        ? tabs.filter((tab) => tab.targetId !== undefined && agentTargets.has(tab.targetId))
+        : tabs;
+    const oldest = opened
         .filter((tab) => !tab.active)
         .toSorted((a, b) => tabNumber(a) - tabNumber(b))
-        .slice(0, Math.max(0, tabs.length - keep));
+        .slice(0, Math.max(0, opened.length - keep));
     const closed = [];
     for (const tab of oldest) {
-        const result = await runAgentBrowser(env, sessionId, ["tab", "close", tab.tabId], signal);
-        if (result.success)
-            closed.push(tab.url ?? tab.tabId);
+        const result = await runAgentBrowser(browser, ["tab", "close", tab.tabId], signal);
+        if (!result.success)
+            continue;
+        if (tab.targetId)
+            agentTargets?.delete(tab.targetId);
+        closed.push(tab.url ?? tab.tabId);
     }
     return closed;
 }
+function targetIdOf(result) {
+    const data = result.data;
+    return isRecord(data) && typeof data.targetId === "string" ? data.targetId : undefined;
+}
+async function readDesktopStatus(env, signal) {
+    let stdout = "";
+    const result = await env.exec([DESKTOP_COMMAND, "status"], {
+        timeout: COMMAND_TIMEOUT_SECONDS,
+        onOutput: (text, _context, info) => {
+            if (info.stream === "stdout")
+                stdout += text;
+        },
+    }, signal ? withAbortSignal(signal, BACKGROUND_CONTEXT) : BACKGROUND_CONTEXT);
+    if (!result.ok || result.value.exitCode !== 0)
+        return { display: undefined, control: "agent" };
+    return parseDesktopStatus(stdout);
+}
+function desktopLaunchEnv(display) {
+    return {
+        AGENT_BROWSER_HEADED: "1",
+        AGENT_BROWSER_ARGS: "--ozone-platform=wayland",
+        WAYLAND_DISPLAY: `${DESKTOP_RUNTIME_DIR}/${display}`,
+    };
+}
+const PERSON_HAS_CONTROL = "A person is using this browser on the office desktop. Do not use the browser until they hand it back: they press Hand back to agent on the desktop page or close it. Tell them what you need and end your turn.";
+const NO_DESKTOP_STATUS = { display: undefined, control: "agent" };
+function personHasControlResult() {
+    return {
+        content: [
+            {
+                type: "text",
+                text: JSON.stringify({ status: "person-has-control", message: PERSON_HAS_CONTROL }),
+            },
+        ],
+        details: undefined,
+    };
+}
 const CLICK_TARGET_KEY = "click_target";
 const TYPE_TARGET_KEY = "type_target";
 const SELECT_TARGET_KEY = "select_target";
@@ -98,10 +145,11 @@ const TEXT_VALUE_INSTRUCTIONS = 'Return a JSON object with exactly one key, "tex
 function truncate(text, max) {
     return text.length > max ? `${text.slice(0, max)}…` : text;
 }
-async function runAgentBrowser(env, sessionId, args, signal) {
+async function runAgentBrowser(browser, args, signal) {
     const output = { stdout: "", stderr: "" };
-    const result = await env.exec([AGENT_BROWSER_BIN, "--session", sessionId, ...args, "--json"], {
+    const result = await browser.env.exec([AGENT_BROWSER_BIN, "--session", browser.sessionId, ...args, "--json"], {
         timeout: COMMAND_TIMEOUT_SECONDS,
+        env: browser.launchEnv,
         onOutput: (text, _context, info) => {
             output[info.stream] += text;
         },
@@ -119,7 +167,12 @@ async function runAgentBrowser(env, sessionId, args, signal) {
     }
     if (stdout.trim()) {
         try {
-            return JSON.parse(stdout);
+            const parsed = JSON.parse(stdout);
+            const lifecycle = lifecycleOf(parsed);
+            if (lifecycle?.launched === true || lifecycle?.relaunchedBrowser === true) {
+                browser.onLaunch?.(browser.launchEnv !== undefined);
+            }
+            return parsed;
         }
         catch (error) {
             if (code === 0)
@@ -232,24 +285,106 @@ function resolveTarget(operation, answers, singles) {
     const choice = answers[key]?.choice;
     return typeof choice === "string" ? choice : undefined;
 }
-async function openPage(env, sessionId, url, inNewTab, signal) {
+async function openPage(browser, url, inNewTab, signal) {
     if (!inNewTab)
-        return runAgentBrowser(env, sessionId, ["open", url], signal);
-    const tab = await runAgentBrowser(env, sessionId, ["tab", "new"], signal);
+        return runAgentBrowser(browser, ["open", url], signal);
+    const tab = await runAgentBrowser(browser, ["tab", "new"], signal);
     if (!tab.success)
         return tab;
-    return runAgentBrowser(env, sessionId, ["open", url], signal);
+    return runAgentBrowser(browser, ["open", url], signal);
+}
+const NO_PAGE_TO_HAND_OFF = "The browser has no page to hand over. Open the page with url first; it now opens on the desktop. Then call handOff again.";
+const HAND_OFF_UNAVAILABLE = "Handing the browser to a person needs the office desktop and a direct message to send its link privately; this conversation has neither, so ask the person in chat instead.";
+async function setBrowserControl(env, owner, signal) {
+    const result = await env.exec([DESKTOP_COMMAND, "control", owner], { timeout: COMMAND_TIMEOUT_SECONDS }, signal ? withAbortSignal(signal, BACKGROUND_CONTEXT) : BACKGROUND_CONTEXT);
+    return result.ok && result.value.exitCode === 0;
+}
+function handedOffResult() {
+    return {
+        content: [
+            {
+                type: "text",
+                text: JSON.stringify({
+                    status: "handed-off",
+                    message: "The person controls the browser now and was asked to do this step.",
+                }),
+            },
+        ],
+        details: { handedOff: true },
+        terminate: true,
+    };
+}
+function newSessionId() {
+    return `mikan-jb-${randomUUID()}`;
 }
-function createUnlockedJevBrowserTool(getEnv, generateText) {
-    const sessionId = `mikan-jb-${randomUUID()}`;
+function createUnlockedJevBrowserTool(getEnv, generateText, options) {
+    let sessionId = newSessionId();
+    const agentTargets = new Set();
+    let handOff;
     let browserOpen = false;
+    let openedOnDesktop = false;
+    const desktopStatus = (env, signal) => options.desktop ? readDesktopStatus(env, signal) : Promise.resolve(NO_DESKTOP_STATUS);
+    const target = (env, launchEnv) => ({
+        env,
+        sessionId,
+        launchEnv,
+        onLaunch: (onDesktop) => {
+            openedOnDesktop = onDesktop;
+        },
+    });
+    async function moveBrowserToDesktop(env, display, signal) {
+        const headless = target(env);
+        let launchedNow = false;
+        headless.onLaunch = () => {
+            launchedNow = true;
+        };
+        const current = await runAgentBrowser(headless, ["get", "url"], signal);
+        const url = current.success && !launchedNow ? current.data?.url : undefined;
+        await runAgentBrowser(headless, ["close"], signal);
+        agentTargets.clear();
+        browserOpen = false;
+        openedOnDesktop = false;
+        sessionId = newSessionId();
+        if (!url)
+            throw new Error(NO_PAGE_TO_HAND_OFF);
+        const reopened = await runAgentBrowser(target(env, desktopLaunchEnv(display)), ["open", url], signal);
+        if (!reopened.success) {
+            throw new Error(`Could not reopen ${url} on the desktop: ${reopened.error}. ${NO_PAGE_TO_HAND_OFF}`);
+        }
+        const opened = targetIdOf(reopened);
+        if (opened)
+            agentTargets.add(opened);
+        browserOpen = true;
+    }
+    async function handBrowserToPerson(env, step, signal) {
+        if (!handOff || !(await handOff.openDesktop()))
+            throw new Error(HAND_OFF_UNAVAILABLE);
+        const desktop = await desktopStatus(env, signal);
+        if (!desktop.display)
+            throw new Error(HAND_OFF_UNAVAILABLE);
+        if (!openedOnDesktop)
+            await moveBrowserToDesktop(env, desktop.display, signal);
+        if (!(await setBrowserControl(env, "user", signal)))
+            throw new Error(HAND_OFF_UNAVAILABLE);
+        try {
+            await handOff.announce(step);
+        }
+        catch (error) {
+            await setBrowserControl(env, "agent").catch(() => false);
+            throw error;
+        }
+        return handedOffResult();
+    }
     let closedByCall = false;
     return {
+        setHandOff: (next) => {
+            handOff = next;
+        },
         name: JEV_BROWSER_TOOL,
         label: "jev browser",
         description: [
             "Control a real Chrome browser in this conversation's sandbox (not the host): give a goal that Jev drives step by step (click, type, select, scroll, wait), run raw agent-browser commands, or both; commands run first.",
-            `Each thread has one browser that stays open across calls; url opens a new tab, and past ${BROWSER_TAB_LIMIT} tabs the oldest closes.`,
+            `Each thread has one browser that stays open across calls; url opens a new tab, and past ${BROWSER_TAB_LIMIT} tabs it opened the oldest closes; tabs a person opened stay.`,
             "Read the page from lastPageSnapshot (accessibility text; the tool does not summarize) and command output from commandResults. A browserContinuity of unknown is missing metadata, not a failure.",
             'CLI success is not goal completion: verify the visible state. To submit a typed input, run ["press","Enter"]: press takes a key, not a ref. After navigation, snapshot again and use the new @refs. If content sits in an iframe, set frame instead of scrolling. find may act, not only read. When syntax is unclear, run ["<command>","--help"]; after one informed retry, report the blocker instead of trying more selectors.',
             "If agent-browser is missing from the sandbox, report it; never install it on the host.",
@@ -271,10 +406,22 @@ function createUnlockedJevBrowserTool(getEnv, generateText) {
                     throw new Error('press takes a key, not a target ref: use ["press","Enter"] after focusing the input. Check ["press","--help"] for native syntax.');
                 }
             }
+            if (args.handOff !== undefined) {
+                if (args.url || args.goal || args.commands?.length || args.close || args.frame) {
+                    throw new Error("Use handOff alone, without url, goal, commands, frame, or close.");
+                }
+                return handBrowserToPerson(env, args.handOff, signal);
+            }
+            const desktop = await desktopStatus(env, signal);
+            if (desktop.control === "user")
+                return personHasControlResult();
+            const browser = target(env, desktop.display ? desktopLaunchEnv(desktop.display) : undefined);
+            const ownTabs = desktop.display ? agentTargets : undefined;
             if (args.close === true && !args.url && !args.goal && !args.commands?.length) {
-                const result = await runAgentBrowser(env, sessionId, ["close"], signal);
+                const result = await runAgentBrowser(browser, ["close"], signal);
                 if (!result.success)
                     throw new Error(`Failed to close the browser: ${result.error}`);
+                agentTargets.clear();
                 browserOpen = false;
                 closedByCall = true;
                 return {
@@ -307,26 +454,32 @@ function createUnlockedJevBrowserTool(getEnv, generateText) {
             try {
                 if (args.url) {
                     if (browserOpen) {
-                        closedTabs.push(...(await closeOldestTabs(env, sessionId, BROWSER_TAB_LIMIT - 1, signal)));
+                        closedTabs.push(...(await closeOldestTabs(browser, ownTabs, BROWSER_TAB_LIMIT - 1, signal)));
                     }
-                    const openResult = await openPage(env, sessionId, args.url, browserOpen, signal);
+                    const openResult = await openPage(browser, args.url, browserOpen, signal);
                     captureLifecycle(openResult);
                     if (!openResult.success) {
                         throw new Error(`Failed to open ${args.url}: ${openResult.error}`);
                     }
+                    const opened = targetIdOf(openResult);
+                    if (opened)
+                        agentTargets.add(opened);
                     browserOpen = true;
                     closedByCall = false;
                 }
                 if (args.frame !== undefined) {
-                    const switched = await runAgentBrowser(env, sessionId, ["frame", args.frame], signal);
+                    const switched = await runAgentBrowser(browser, ["frame", args.frame], signal);
                     if (!switched.success)
                         throw new Error(`Failed to switch browser frame: ${switched.error}`);
                 }
                 for (const command of args.commands ?? []) {
                     if (signal?.aborted)
                         throw new Error("Operation aborted");
-                    const result = await runAgentBrowser(env, sessionId, command, signal);
+                    const result = await runAgentBrowser(browser, command, signal);
                     captureLifecycle(result);
+                    const newTab = command[0] === "tab" && command[1] === "new" ? targetIdOf(result) : undefined;
+                    if (newTab)
+                        agentTargets.add(newTab);
                     commandResults.push({
                         command,
                         success: result.success,
@@ -362,7 +515,12 @@ function createUnlockedJevBrowserTool(getEnv, generateText) {
                 for (let step = 1; step <= maxSteps; step++) {
                     if (signal?.aborted)
                         throw new Error("Operation aborted");
-                    const snap = await runAgentBrowser(env, sessionId, ["snapshot"], signal);
+                    if (step > 1 && (await desktopStatus(env, signal)).control === "user") {
+                        status = "blocked";
+                        message = PERSON_HAS_CONTROL;
+                        break;
+                    }
+                    const snap = await runAgentBrowser(browser, ["snapshot"], signal);
                     captureLifecycle(snap);
                     if (!snap.success || !snap.data) {
                         status = "blocked";
@@ -430,7 +588,7 @@ function createUnlockedJevBrowserTool(getEnv, generateText) {
                         const command = operation === "WAIT"
                             ? ["wait", "1000"]
                             : ["scroll", operation === "SCROLL_DOWN" ? "down" : "up", "500"];
-                        const action = await runAgentBrowser(env, sessionId, command, signal);
+                        const action = await runAgentBrowser(browser, command, signal);
                         if (!action.success) {
                             status = "blocked";
                             message = `${operation} failed: ${action.error}`;
@@ -447,7 +605,7 @@ function createUnlockedJevBrowserTool(getEnv, generateText) {
                     }
                     const targetInfo = refs[targetRef];
                     if (operation === "CLICK") {
-                        const clickResult = await runAgentBrowser(env, sessionId, ["click", `@${targetRef}`], signal);
+                        const clickResult = await runAgentBrowser(browser, ["click", `@${targetRef}`], signal);
                         if (!clickResult.success) {
                             status = "blocked";
                             message = `Click on ${targetRef} failed: ${clickResult.error}`;
@@ -469,7 +627,7 @@ function createUnlockedJevBrowserTool(getEnv, generateText) {
                         forSelect: operation === "SELECT",
                     }, signal);
                     const command = operation === "SELECT" ? "select" : "fill";
-                    const actResult = await runAgentBrowser(env, sessionId, [command, `@${targetRef}`, text], signal);
+                    const actResult = await runAgentBrowser(browser, [command, `@${targetRef}`, text], signal);
                     if (!actResult.success) {
                         status = "blocked";
                         message = `${command} on ${targetRef} failed: ${actResult.error}`;
@@ -478,7 +636,7 @@ function createUnlockedJevBrowserTool(getEnv, generateText) {
                     history.push({ step, operation, target: targetRef, label: targetInfo?.name, text });
                 }
                 if (status === "step-limit") {
-                    const finalSnapshot = await runAgentBrowser(env, sessionId, ["snapshot"], signal);
+                    const finalSnapshot = await runAgentBrowser(browser, ["snapshot"], signal);
                     if (!finalSnapshot.success || !finalSnapshot.data) {
                         throw new Error(`Final snapshot failed: ${finalSnapshot.error}`);
                     }
@@ -488,10 +646,11 @@ function createUnlockedJevBrowserTool(getEnv, generateText) {
             }
             finally {
                 if (args.close === true) {
-                    await runAgentBrowser(env, sessionId, ["close"])
+                    await runAgentBrowser(browser, ["close"])
                         .then((result) => {
                         if (!result.success)
                             return;
+                        agentTargets.clear();
                         browserOpen = false;
                         closedByCall = true;
                     })
@@ -520,8 +679,8 @@ function createUnlockedJevBrowserTool(getEnv, generateText) {
         },
     };
 }
-export function createJevBrowserTool(getEnv, generateText) {
-    const tool = createUnlockedJevBrowserTool(getEnv, generateText);
+export function createJevBrowserTool(getEnv, generateText, options = {}) {
+    const tool = createUnlockedJevBrowserTool(getEnv, generateText, options);
     const execute = tool.execute.bind(tool);
     let executionTail = Promise.resolve();
     return {