Skip to content

Supercharge your AI agents with data from the web and beyond. Building the library for superintelligence. 🔥

feat(browser): add +2 credits/min ZDR surcharge to Interact sessions (#5048)

claude[bot]3f5f906ca28f
diff --git a/apps/api/src/controllers/v2/__tests__/browser-billing.test.ts b/apps/api/src/controllers/v2/__tests__/browser-billing.test.ts
index 5a14751a6..e055c4cb7 100644
--- a/apps/api/src/controllers/v2/__tests__/browser-billing.test.ts
+++ b/apps/api/src/controllers/v2/__tests__/browser-billing.test.ts
@@ -24,7 +24,9 @@ vi.mock("../../../lib/logger", () => ({
import {
calculateBrowserSessionCredits,
+ browserCreditsPerHour,
BROWSER_CREDITS_PER_HOUR,
+ BROWSER_ZDR_CREDITS_PER_HOUR,
INTERACT_CREDITS_PER_HOUR,
} from "../../../lib/browser-billing";
@@ -55,6 +57,44 @@ describe("billing constants", () => {
it("interact rate is 420 credits/hour (7 credits/min)", () => {
expect(INTERACT_CREDITS_PER_HOUR).toBe(420);
});
+
+ it("ZDR surcharge is 120 credits/hour (2 credits/min)", () => {
+ expect(BROWSER_ZDR_CREDITS_PER_HOUR).toBe(120);
+ });
+});
+
+// ---------------------------------------------------------------------------
+// browserCreditsPerHour
+// ---------------------------------------------------------------------------
+
+describe("browserCreditsPerHour", () => {
+ it("uses the base rates without ZDR", () => {
+ expect(browserCreditsPerHour(false, false)).toBe(120);
+ expect(browserCreditsPerHour(true, false)).toBe(420);
+ });
+
+ it("adds 2 credits/min to both rates with ZDR", () => {
+ expect(browserCreditsPerHour(false, true)).toBe(240);
+ expect(browserCreditsPerHour(true, true)).toBe(540);
+ });
+
+ it("bills ZDR code-only sessions at 4 credits/min (minimum 4)", () => {
+ const rate = browserCreditsPerHour(false, true);
+ expect(calculateBrowserSessionCredits(0, rate)).toBe(4);
+ expect(calculateBrowserSessionCredits(60_000, rate)).toBe(4);
+ expect(calculateBrowserSessionCredits(5 * 60_000, rate)).toBe(20);
+ expect(calculateBrowserSessionCredits(3_600_000, rate)).toBe(240);
+ });
+
+ it("bills ZDR prompt sessions at 9 credits/min (minimum 9)", () => {
+ const rate = browserCreditsPerHour(true, true);
+ expect(calculateBrowserSessionCredits(0, rate)).toBe(9);
+ expect(calculateBrowserSessionCredits(60_000, rate)).toBe(9);
+ expect(calculateBrowserSessionCredits(5 * 60_000, rate)).toBe(45);
+ expect(calculateBrowserSessionCredits(3_600_000, rate)).toBe(540);
+ // 91s / 3600s * 540 = 13.65 → ceil = 14
+ expect(calculateBrowserSessionCredits(91_000, rate)).toBe(14);
+ });
});
// ---------------------------------------------------------------------------
diff --git a/apps/api/src/controllers/v2/__tests__/scrape-browser.test.ts b/apps/api/src/controllers/v2/__tests__/scrape-browser.test.ts
index fc76952fc..401485b96 100644
--- a/apps/api/src/controllers/v2/__tests__/scrape-browser.test.ts
+++ b/apps/api/src/controllers/v2/__tests__/scrape-browser.test.ts
@@ -6,6 +6,9 @@ import {
insertBrowserSession,
getBrowserSession,
listUnsettledHangarSessions,
+ settleBrowserSessionOnce,
+ withLockedBrowserSession,
+ didBrowserSessionUsePrompt,
} from "../../../lib/browser-sessions";
import {
createHangarBrowser,
@@ -27,6 +30,8 @@ import {
getBrowserZDR,
BrowserSessionError,
reconcileBrowserSessions,
+ settleBrowserSession,
+ reserveBrowserPromptCredits,
} from "../../../lib/browser-lifecycle";
import { logRequest } from "../../../services/logging/log_job";
import { getModel } from "../../../lib/generic-ai";
@@ -116,6 +121,7 @@ vi.mock("../../../lib/browser-sessions", () => ({
updateBrowserSessionActivity: vi.fn(() => Promise.resolve()),
updateBrowserSessionScrapeId: vi.fn(() => Promise.resolve()),
settleBrowserSessionOnce: vi.fn(),
+ withLockedBrowserSession: vi.fn(),
getBrowserSessionFromScrape: vi.fn(),
markBrowserSessionUsedPrompt: vi.fn(() => Promise.resolve()),
didBrowserSessionUsePrompt: vi.fn(),
@@ -290,6 +296,61 @@ describe("scrapeInteractController", () => {
);
});
+ it("reserves the ZDR code-only rate at create", async () => {
+ await browserCreateController(buildRequest(), buildRes());
+ // 600s default TTL at 240/hr
+ expect(updateKeylessBrowserCredits).toHaveBeenCalledWith(
+ "team-123",
+ "session-123",
+ 40,
+ );
+ });
+
+ it("reserves the ZDR prompt rate on the first prompt", async () => {
+ const row = {
+ ...session,
+ should_bill: true,
+ ttl_total: 600,
+ credits_used: null,
+ };
+ vi.mocked(didBrowserSessionUsePrompt)
+ .mockResolvedValueOnce(false)
+ .mockResolvedValueOnce(false);
+ vi.mocked(withLockedBrowserSession).mockImplementationOnce(
+ async (_id, fn) => fn(row, undefined as any),
+ );
+ await reserveBrowserPromptCredits(buildRequest(), row);
+ // 600s TTL at 540/hr
+ expect(updateKeylessBrowserCredits).toHaveBeenCalledWith(
+ "team-123",
+ "session-123",
+ 90,
+ );
+ });
+
+ it.each([
+ [false, 20],
+ [true, 45],
+ ])(
+ "settles a 5 minute ZDR session (usedPrompt=%s) at %i credits",
+ async (usedPrompt, expected) => {
+ const row = { ...session, should_bill: true };
+ vi.mocked(didBrowserSessionUsePrompt).mockResolvedValueOnce(usedPrompt);
+ vi.mocked(settleBrowserSessionOnce).mockImplementationOnce(
+ async (_id, bill) => ({
+ creditsBilled: await bill(row),
+ newlySettled: false,
+ }),
+ );
+ const result = await settleBrowserSession(row, {
+ status: "stopped",
+ created_at: 0,
+ ended_at: 300,
+ } as any);
+ expect(result?.creditsBilled).toBe(expected);
+ },
+ );
+
it("keeps the session's ZDR policy when later execution omits the option and team flag", async () => {
const req = {
...buildRequest(),
diff --git a/apps/api/src/lib/browser-billing.ts b/apps/api/src/lib/browser-billing.ts
index 592619258..730c28f5c 100644
--- a/apps/api/src/lib/browser-billing.ts
+++ b/apps/api/src/lib/browser-billing.ts
@@ -1,5 +1,17 @@
export const BROWSER_CREDITS_PER_HOUR = 120;
export const INTERACT_CREDITS_PER_HOUR = 420;
+// Zero Data Retention surcharge, added on top of either rate (+2 credits/min).
+export const BROWSER_ZDR_CREDITS_PER_HOUR = 120;
+
+export function browserCreditsPerHour(
+ usedPrompt: boolean,
+ zeroDataRetention: boolean,
+): number {
+ return (
+ (usedPrompt ? INTERACT_CREDITS_PER_HOUR : BROWSER_CREDITS_PER_HOUR) +
+ (zeroDataRetention ? BROWSER_ZDR_CREDITS_PER_HOUR : 0)
+ );
+}
export function calculateBrowserSessionCredits(
durationMs: number,
diff --git a/apps/api/src/lib/browser-lifecycle.ts b/apps/api/src/lib/browser-lifecycle.ts
index 9ed1bf4be..f4d9a61fd 100644
--- a/apps/api/src/lib/browser-lifecycle.ts
+++ b/apps/api/src/lib/browser-lifecycle.ts
@@ -24,8 +24,7 @@ import {
} from "./browser-sessions";
import {
calculateBrowserSessionCredits,
- BROWSER_CREDITS_PER_HOUR,
- INTERACT_CREDITS_PER_HOUR,
+ browserCreditsPerHour,
} from "./browser-billing";
import { HOBBY_CONCURRENCY_LIMIT } from "./concurrency-limit";
import {
@@ -159,7 +158,10 @@ async function createBrowserSessionInternal(
if (invalidInterop) throw invalidInterop;
const shouldBill = options.shouldBill ?? true;
const estimatedCredits = shouldBill
- ? calculateBrowserSessionCredits(options.ttl * 1000)
+ ? calculateBrowserSessionCredits(
+ options.ttl * 1000,
+ browserCreditsPerHour(false, zeroDataRetention),
+ )
: 0;
const teamLimit =
req.acuc?.concurrency_limit ?? DEFAULT_TEAM_LIMITS.concurrency_limit;
@@ -323,7 +325,7 @@ async function settleBrowserSessionInternal(
return current.should_bill
? calculateBrowserSessionCredits(
sessionDurationMs,
- usedPrompt ? INTERACT_CREDITS_PER_HOUR : BROWSER_CREDITS_PER_HOUR,
+ browserCreditsPerHour(usedPrompt, current.zero_data_retention),
)
: 0;
},
@@ -403,7 +405,7 @@ export async function reserveBrowserPromptCredits(
if (await didBrowserSessionUsePrompt(session.id)) return;
const credits = calculateBrowserSessionCredits(
session.ttl_total * 1000,
- INTERACT_CREDITS_PER_HOUR,
+ browserCreditsPerHour(true, session.zero_data_retention),
);
if (session.should_bill && req.acuc?.org_id) {
const credit = await autumnService.checkCredits({