mirror of
https://github.com/Tencent/BrowserSkill.git
synced 2026-09-10 13:01:23 +08:00
Ljy-0827
a4fed136e3
- session_stop: exclude tabs still tracked in agentCreatedTabs from the release decision so a tab that failed to close is no longer mistaken for a user tab (which previously kept the window open and leaked the tab). - Distinguish user-created tabs from agent-created tabs in the Agent Window via a pending-tab counter consumed by chrome.tabs.onCreated, so tabs the user opens themselves (new-tab button / Cmd+T / open in new tab) are never taken over by the BrowserSkill control mask. - background overlay: decide per-tab state BEFORE showing controls (overlayStateForTab + pushOverlayStateForTab) so a user tab receives hidden on its first overlay.ready ping instead of flashing control then hiding. - AgentWindowApi.ensureActiveTab now resolves with the activated/created tab id instead of void, so SessionManager can record homeTabId. This fixes the tsc failure flagged in review (the interface previously returned Promise<void> while callers treated the result as number | null). - Wire the production tabManagement.tabs / tabsQuery deps into tool.session_stop, both in the dispatcher and in the disconnect cleanup. They were never injected, which left the agent-tab cleanup and the window-release path as dead code outside tests (behaviour identical to main). Added a dispatcher-level integration test that fails without the wiring: a surviving user tab must release the window, not close it.
111 lines
3.6 KiB
TypeScript
111 lines
3.6 KiB
TypeScript
import { describe, expect, it } from "vitest";
|
|
import { SessionManager } from "@/session-manager/manager";
|
|
import { lookupSnapshotRef, resolveSnapshotRef } from "../snapshot-ref";
|
|
|
|
function fakeAgentWindow(ids: number[]) {
|
|
let i = 0;
|
|
return {
|
|
create: async () => {
|
|
const id = ids[i++];
|
|
if (id === undefined) throw new Error("ran out of fake ids");
|
|
return id;
|
|
},
|
|
remove: async () => {},
|
|
ensureActiveTab: async () => 1,
|
|
};
|
|
}
|
|
|
|
describe("lookupSnapshotRef", () => {
|
|
it("resolves @e3 and e3 to the same backendNodeId", async () => {
|
|
const sm = new SessionManager({ agentWindow: fakeAgentWindow([100]) });
|
|
const ctx = await sm.start("aa11");
|
|
ctx.refStore.set("e3", 1234, { tabId: 4 });
|
|
|
|
expect(lookupSnapshotRef(ctx, "@e3", 4)).toEqual({
|
|
backendNodeId: 1234,
|
|
refKey: "e3",
|
|
});
|
|
expect(lookupSnapshotRef(ctx, "e3", 4)).toEqual({
|
|
backendNodeId: 1234,
|
|
refKey: "e3",
|
|
});
|
|
});
|
|
|
|
it("returns null for unknown ref", async () => {
|
|
const sm = new SessionManager({ agentWindow: fakeAgentWindow([100]) });
|
|
const ctx = await sm.start("aa11");
|
|
expect(lookupSnapshotRef(ctx, "@e99", 4)).toBeNull();
|
|
});
|
|
|
|
it("returns null when ref belongs to another tab", async () => {
|
|
const sm = new SessionManager({ agentWindow: fakeAgentWindow([100]) });
|
|
const ctx = await sm.start("aa11");
|
|
ctx.refStore.set("e3", 1234, { tabId: 4 });
|
|
expect(lookupSnapshotRef(ctx, "@e3", 5)).toBeNull();
|
|
});
|
|
});
|
|
|
|
describe("resolveSnapshotRef", () => {
|
|
it("preserves the frame and child session needed to route iframe refs", async () => {
|
|
const sm = new SessionManager({ agentWindow: fakeAgentWindow([100]) });
|
|
const ctx = await sm.start("aa11");
|
|
ctx.refStore.set("e3", 1234, {
|
|
tabId: 4,
|
|
frameId: "child-frame",
|
|
cdpSessionId: "child-session",
|
|
});
|
|
|
|
const expected = {
|
|
backendNodeId: 1234,
|
|
refKey: "e3",
|
|
frameId: "child-frame",
|
|
cdpSessionId: "child-session",
|
|
};
|
|
expect(lookupSnapshotRef(ctx, "@e3", 4)).toEqual(expected);
|
|
expect(resolveSnapshotRef(ctx, "@e3", 4)).toEqual(expected);
|
|
});
|
|
|
|
it("returns not_found for unknown ref", async () => {
|
|
const sm = new SessionManager({ agentWindow: fakeAgentWindow([100]) });
|
|
const ctx = await sm.start("aa11");
|
|
const res = resolveSnapshotRef(ctx, "@e99", 4);
|
|
expect(res).toMatchObject({
|
|
code: "not_found",
|
|
data: { reason: "ref_not_found" },
|
|
message: "ref @e99 unknown for tab 4 in session aa11",
|
|
});
|
|
});
|
|
|
|
it("returns not_found when ref belongs to another tab", async () => {
|
|
const sm = new SessionManager({ agentWindow: fakeAgentWindow([100]) });
|
|
const ctx = await sm.start("aa11");
|
|
ctx.refStore.set("e7", 4242, { tabId: 4 });
|
|
const res = resolveSnapshotRef(ctx, "@e7", 5);
|
|
expect(res).toMatchObject({
|
|
code: "not_found",
|
|
data: { reason: "ref_not_found" },
|
|
message: "ref @e7 unknown for tab 5 in session aa11",
|
|
});
|
|
});
|
|
|
|
it("preserves original ref string in error message for bare eN form", async () => {
|
|
const sm = new SessionManager({ agentWindow: fakeAgentWindow([100]) });
|
|
const ctx = await sm.start("aa11");
|
|
const res = resolveSnapshotRef(ctx, "e99", 4);
|
|
expect(res).toMatchObject({
|
|
code: "not_found",
|
|
message: "ref e99 unknown for tab 4 in session aa11",
|
|
});
|
|
});
|
|
|
|
it("returns backendNodeId and refKey on success", async () => {
|
|
const sm = new SessionManager({ agentWindow: fakeAgentWindow([100]) });
|
|
const ctx = await sm.start("aa11");
|
|
ctx.refStore.set("e3", 1234, { tabId: 4 });
|
|
expect(resolveSnapshotRef(ctx, "@e3", 4)).toEqual({
|
|
backendNodeId: 1234,
|
|
refKey: "e3",
|
|
});
|
|
});
|
|
});
|