Skip to content

YC (S26) | Open Computer History | Continuously record your company computer work, map your workflows, help you find work worth automating, and power your agents' context

fix(browser): accept native consent navigation IDs (#7631)

Louis Beaumont0cf9a64a5d76
diff --git a/apps/screenpipe-app-tauri/components/browser-sidebar.test.tsx b/apps/screenpipe-app-tauri/components/browser-sidebar.test.tsx
index f86710842..ce71258d6 100644
--- a/apps/screenpipe-app-tauri/components/browser-sidebar.test.tsx
+++ b/apps/screenpipe-app-tauri/components/browser-sidebar.test.tsx
@@ -20,6 +20,8 @@ const mocks = vi.hoisted(() => ({
ownedBrowserHide: vi.fn(),
ownedBrowserTabHide: vi.fn(),
ownedBrowserNavigate: vi.fn(),
+ ownedBrowserTabNavigate: vi.fn(),
+ ownedBrowserTabClose: vi.fn(),
ownedBrowserSetBounds: vi.fn(),
}));
@@ -79,9 +81,9 @@ vi.mock("@/lib/utils/tauri", () => ({
ownedBrowserResolveSessionAccess: mocks.ownedBrowserResolveSessionAccess,
ownedBrowserSetBounds: mocks.ownedBrowserSetBounds,
ownedBrowserTabClearBrowsingData: vi.fn().mockResolvedValue(undefined),
- ownedBrowserTabClose: vi.fn().mockResolvedValue(undefined),
+ ownedBrowserTabClose: mocks.ownedBrowserTabClose,
ownedBrowserTabHide: mocks.ownedBrowserTabHide,
- ownedBrowserTabNavigate: vi.fn().mockResolvedValue(undefined),
+ ownedBrowserTabNavigate: mocks.ownedBrowserTabNavigate,
ownedBrowserTabSetBounds: vi.fn().mockResolvedValue(undefined),
confirmBrowserCookieAccessForSession: vi.fn().mockResolvedValue(undefined),
setBrowserCookieAccessState: mocks.setBrowserCookieAccessState,
@@ -145,6 +147,8 @@ describe("BrowserSidebar session access", () => {
mocks.ownedBrowserHide.mockReset().mockResolvedValue(undefined);
mocks.ownedBrowserTabHide.mockReset().mockResolvedValue(undefined);
mocks.ownedBrowserNavigate.mockReset().mockResolvedValue(undefined);
+ mocks.ownedBrowserTabNavigate.mockReset().mockResolvedValue(undefined);
+ mocks.ownedBrowserTabClose.mockReset().mockResolvedValue(undefined);
mocks.ownedBrowserSetBounds.mockReset().mockResolvedValue(undefined);
vi.stubGlobal("ResizeObserver", ResizeObserverMock);
vi.spyOn(HTMLElement.prototype, "getBoundingClientRect").mockReturnValue({
@@ -191,7 +195,7 @@ describe("BrowserSidebar session access", () => {
expect(open).toHaveBeenCalledWith("/reports/weekly.md");
});
- it("shows a session prompt emitted immediately after a replacement navigation", async () => {
+ it.each(["navigation_id", "navigationId"])("shows a session prompt emitted immediately after a replacement navigation (%s)", async (navigationKey) => {
render(<BrowserSidebar conversationId="chat-1" />);
expect(mocks.listeners.has("owned-browser:navigate")).toBe(true);
expect(mocks.listeners.has("owned-browser:session-access-request")).toBe(
@@ -224,7 +228,7 @@ describe("BrowserSidebar session access", () => {
url: "https://www.reddit.com/",
host: "reddit.com",
already_granted: false,
- navigationId: "nav-2",
+ [navigationKey]: "nav-2",
owner: "chat-1",
});
});
@@ -246,7 +250,7 @@ describe("BrowserSidebar session access", () => {
});
emit("owned-browser:session-access-request", {
request_id: "request-consent", url: "https://example.com/", host: "example.com",
- already_granted: false, navigationId: "consent", owner: "chat-1",
+ already_granted: false, navigation_id: "consent", owner: "chat-1",
});
});
expect(screen.getByText("Use your browser login?")).toBeInTheDocument();
@@ -259,6 +263,54 @@ describe("BrowserSidebar session access", () => {
expect(mocks.updateSettings).toHaveBeenCalledWith({ browserCookieAccessGranted: allow });
});
+ it.each([true, false])("shows native consent for a user-created tab and resolves the choice: %s", async allow => {
+ render(<BrowserSidebar conversationId="chat-1" />);
+ act(() => {
+ window.dispatchEvent(new CustomEvent("screenpipe:browser-sidebar-new-tab"));
+ });
+ const tabId = screen.getByTestId(/^tab-loading-tab-/).getAttribute("data-testid")!.replace("tab-loading-", "");
+ mocks.ownedBrowserTabHide.mockClear();
+ act(() => {
+ emit("owned-browser:navigate", {
+ tabId, url: "https://google.com/", owner: "chat-1", navigationId: "native-tab-nav", reveal: true,
+ });
+ // Exact field casing serialized by BrowserSessionAccessRequestPayload.
+ emit("owned-browser:session-access-request", {
+ request_id: "native-tab-request", url: "https://google.com/", host: "google.com",
+ already_granted: false, navigation_id: "native-tab-nav", owner: "chat-1",
+ });
+ });
+ expect(screen.getByText("Use your browser login?")).toBeVisible();
+ expect(screen.queryByRole("progressbar")).toBeNull();
+ expect(screen.getByTestId(`tab-loading-${tabId}`)).toHaveTextContent("false");
+ expect(mocks.ownedBrowserTabHide).toHaveBeenCalledWith(tabId);
+ expect(mocks.ownedBrowserResolveSessionAccess).not.toHaveBeenCalled();
+ fireEvent.click(screen.getByRole("button", { name: allow ? "Use browser session" : "Continue logged out" }));
+ await waitFor(() => expect(mocks.ownedBrowserResolveSessionAccess).toHaveBeenCalledWith("native-tab-request", allow));
+ await waitFor(() => expect(screen.queryByText("Use your browser login?")).toBeNull());
+ });
+
+ it.each([
+ ["stale navigation", "chat-1", "old-nav"],
+ ["missing navigation", "chat-1", undefined],
+ ["another chat", "chat-2", "current-nav"],
+ ["missing owner", undefined, "current-nav"],
+ ])("ignores native consent for %s", (_reason, owner, navigationId) => {
+ render(<BrowserSidebar conversationId="chat-1" />);
+ act(() => {
+ emit("owned-browser:navigate", {
+ url: "https://google.com/", owner: "chat-1", navigationId: "current-nav", reveal: true,
+ });
+ emit("owned-browser:session-access-request", {
+ request_id: "ignored-request", url: "https://google.com/", host: "google.com",
+ already_granted: false, navigation_id: navigationId, owner,
+ });
+ });
+ expect(screen.queryByText("Use your browser login?")).toBeNull();
+ expect(mocks.ownedBrowserResolveSessionAccess).not.toHaveBeenCalled();
+ expect(mocks.setBrowserCookieAccessState).not.toHaveBeenCalled();
+ });
+
it("pauses loading indicators while protected-cookie help is visible", () => {
render(<BrowserSidebar conversationId="chat-1" />);
diff --git a/apps/screenpipe-app-tauri/components/browser-sidebar.tsx b/apps/screenpipe-app-tauri/components/browser-sidebar.tsx
index 83a02e93e..2ce03eed0 100644
--- a/apps/screenpipe-app-tauri/components/browser-sidebar.tsx
+++ b/apps/screenpipe-app-tauri/components/browser-sidebar.tsx
@@ -123,6 +123,7 @@ interface SessionAccessEvent {
host: string;
already_granted?: boolean;
alreadyGranted?: boolean;
+ navigation_id?: string | null;
navigationId?: string | null;
/** Conversation that issued the navigation (see `owner` on the navigate
* event). Ownerless payloads are treated as stale/legacy and ignored. */
@@ -657,6 +658,8 @@ export function BrowserSidebar({
useTauriEvent<SessionAccessEvent>(SESSION_ACCESS_REQUEST_EVENT, (e) => {
const payload = e.payload;
const requestId = payload?.requestId ?? payload?.request_id;
+ // BrowserSessionAccessRequestPayload uses Serde's snake_case field names.
+ const navigationId = payload?.navigationId ?? payload?.navigation_id;
if (!requestId || !payload?.url || !payload?.host) return;
// Same ownership gate as the navigate event — a background pipe's
// cookie-consent prompt must not surface in another chat.
@@ -664,7 +667,7 @@ export function BrowserSidebar({
return;
if (
isMismatchedNavigation(
- payload.navigationId,
+ navigationId,
currentNavigationIdRef.current,
)
)
@@ -675,7 +678,7 @@ export function BrowserSidebar({
host: payload.host,
alreadyGranted:
payload.alreadyGranted ?? payload.already_granted ?? false,
- navigationId: payload.navigationId!,
+ navigationId: navigationId!,
owner: payload.owner ?? null,
};
// Block any already-scheduled bounds push before React commits the card;
diff --git a/docs/pr-assets/sidebar-browser-consent/after.jpg b/docs/pr-assets/sidebar-browser-consent/after.jpg
new file mode 100644
index 000000000..6512651bc
Binary files /dev/null and b/docs/pr-assets/sidebar-browser-consent/after.jpg differ
diff --git a/docs/pr-assets/sidebar-browser-consent/before.jpg b/docs/pr-assets/sidebar-browser-consent/before.jpg
new file mode 100644
index 000000000..5b4652af9
Binary files /dev/null and b/docs/pr-assets/sidebar-browser-consent/before.jpg differ