diff options
| author | amankumarsingh77 <amankumarsingh7702@gmail.com> | 2026-07-28 21:55:55 +0530 |
|---|---|---|
| committer | Aman Kumar <145339995+amankumarsingh77@users.noreply.github.com> | 2026-08-02 19:12:46 +0530 |
| commit | 632600ec0a0a68d9327e19bd419a1ae72047955f (patch) | |
| tree | 5ef59b561d055b8f9173154c252e6d464f3a042b /src/domains/snapshot.ts | |
| parent | 893a9d338ceb5d37aefece1df637c9a5888a120e (diff) | |
refactor: one door from a tool to the browser
Four routes coexisted: cdpCall, a raw client.session().call, a session
held in a local and called directly, and client.evaluateJs — and five
files mixed two or three of them. The CdpError-to-ToolErr mapping was
hand-copied at nine sites, plus a private copy in isolated-tab.ts.
domains/cdp-call.ts now owns all of it: cdpErrToToolErr, cdpCall,
cdpCallOnTarget, cdpCallBrowser, evalJs. Every other file under
src/domains goes through them, which also removes a pile of
`if (!r.success) return err({ kind: "cdp_error", ... })` boilerplate in
favour of returning the failed Result as-is.
Two scanner rules keep it that way, scoped to src/domains/ so the layer
that legitimately owns the session — cdp/ and client.ts — is unaffected.
Scoping is new to the rule model; without it the rules fired on the
transport itself.
One deliberate behaviour change: a CDP timeout now surfaces as
kind "timeout" rather than "cdp_error". isolated-tab.ts already did this
and the other 13 sites flattened it; the shared mapper uses the honest
label rather than preserving the mislabel.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'src/domains/snapshot.ts')
| -rw-r--r-- | src/domains/snapshot.ts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/domains/snapshot.ts b/src/domains/snapshot.ts index b33c8f9..848ebb1 100644 --- a/src/domains/snapshot.ts +++ b/src/domains/snapshot.ts @@ -2,7 +2,7 @@ import { readFileSync, writeFileSync } from "node:fs"; import { Type } from "typebox"; import { Container, Image, type ImageTheme, Markdown, Text, truncateToWidth, visibleWidth } from "@mariozechner/pi-tui"; import { getMarkdownTheme, keyHint } from "@mariozechner/pi-coding-agent"; -import type { CdpSession } from "../cdp/session"; +import type { BrowserClient } from "../client"; import type { AxNodeResult } from "../cdp/commands"; import { type Box, boxOf } from "./box"; import { cdpCall } from "./cdp-call"; @@ -229,8 +229,8 @@ export const collectInteractiveTargets = ( return out; }; -const liveValue = async (session: CdpSession, backendId: number): Promise<string | undefined> => { - const resolved = await session.call("DOM.resolveNode", { backendNodeId: backendId }); +const liveValue = async (client: BrowserClient, backendId: number): Promise<string | undefined> => { + const resolved = await cdpCall(client, "DOM.resolveNode", { backendNodeId: backendId }); if (!resolved.success) return undefined; const objectId = resolved.data.object.objectId; if (!objectId) return undefined; @@ -239,7 +239,7 @@ const liveValue = async (session: CdpSession, backendId: number): Promise<string if (typeof this.value === "string") return this.value; return null; }`; - const r = await session.call("Runtime.callFunctionOn", { + const r = await cdpCall(client, "Runtime.callFunctionOn", { objectId, functionDeclaration: fn, returnByValue: true, @@ -312,7 +312,7 @@ export const snapshotTool = defineBrowserTool({ if (box.data.x < 0 || box.data.y < 0) return; node.box = box.data; if (ac.signal.aborted || !VALUE_ROLES.has(node.role)) return; - const live = await liveValue(session, backendId); + const live = await liveValue(client, backendId); if (live !== undefined) node.value = live; }), ); @@ -332,7 +332,7 @@ export const snapshotTool = defineBrowserTool({ let shotPath: string | undefined; if (args.includeScreenshot) { - const shot = await session.call("Page.captureScreenshot", { format: "jpeg", quality: 80 }); + const shot = await cdpCall(client, "Page.captureScreenshot", { format: "jpeg", quality: 80 }); if (shot.success) { shotPath = screenshotPath(client.namespace, "jpeg"); writeFileSync(shotPath, Buffer.from(shot.data.data, "base64")); |
